feat: add task type

api/.env.example

@@ -33,9 +33,6 @@ TRIGGER_URL=http://localhost:5001
 # The time in seconds after the signature is rejected
 FILES_ACCESS_TIMEOUT=300
 
-# Collaboration mode toggle
-ENABLE_COLLABORATION_MODE=false
-
 # Access token expiration time in minutes
 ACCESS_TOKEN_EXPIRE_MINUTES=60
 

api/agent-notes/controllers/console/datasets/datasets_document.py.md

@@ -1,52 +0,0 @@
-## Purpose
-
-`api/controllers/console/datasets/datasets_document.py` contains the console (authenticated) APIs for managing dataset documents (list/create/update/delete, processing controls, estimates, etc.).
-
-## Storage model (uploaded files)
-
-- For local file uploads into a knowledge base, the binary is stored via `extensions.ext_storage.storage` under the key:
-  - `upload_files/<tenant_id>/<uuid>.<ext>`
-- File metadata is stored in the `upload_files` table (`UploadFile` model), keyed by `UploadFile.id`.
-- Dataset `Document` records reference the uploaded file via:
-  - `Document.data_source_info.upload_file_id`
-
-## Download endpoint
-
-- `GET /datasets/<dataset_id>/documents/<document_id>/download`
-
-  - Only supported when `Document.data_source_type == "upload_file"`.
-  - Performs dataset permission + tenant checks via `DocumentResource.get_document(...)`.
-  - Delegates `Document -> UploadFile` validation and signed URL generation to `DocumentService.get_document_download_url(...)`.
-  - Applies `cloud_edition_billing_rate_limit_check("knowledge")` to match other KB operations.
-  - Response body is **only**: `{ "url": "<signed-url>" }`.
-
-- `POST /datasets/<dataset_id>/documents/download-zip`
-
-  - Accepts `{ "document_ids": ["..."] }` (upload-file only).
-  - Returns `application/zip` as a single attachment download.
-  - Rationale: browsers often block multiple automatic downloads; a ZIP avoids that limitation.
-  - Applies `cloud_edition_billing_rate_limit_check("knowledge")`.
-  - Delegates dataset permission checks, document/upload-file validation, and download-name generation to
-    `DocumentService.prepare_document_batch_download_zip(...)` before streaming the ZIP.
-
-## Verification plan
-
-- Upload a document from a local file into a dataset.
-- Call the download endpoint and confirm it returns a signed URL.
-- Open the URL and confirm:
-  - Response headers force download (`Content-Disposition`), and
-  - Downloaded bytes match the uploaded file.
-- Select multiple uploaded-file documents and download as ZIP; confirm all selected files exist in the archive.
-
-## Shared helper
-
-- `DocumentService.get_document_download_url(document)` resolves the `UploadFile` and signs a download URL.
-- `DocumentService.prepare_document_batch_download_zip(...)` performs dataset permission checks, batches
-  document + upload file lookups, preserves request order, and generates the client-visible ZIP filename.
-- Internal helpers now live in `DocumentService` (`_get_upload_file_id_for_upload_file_document(...)`,
-  `_get_upload_file_for_upload_file_document(...)`, `_get_upload_files_by_document_id_for_zip_download(...)`).
-- ZIP packing is handled by `FileService.build_upload_files_zip_tempfile(...)`, which also:
-  - sanitizes entry names to avoid path traversal, and
-  - deduplicates names while preserving extensions (e.g., `doc.txt` → `doc (1).txt`).
-    Streaming the response and deferring cleanup is handled by the route via `send_file(path, ...)` + `ExitStack` +
-    `response.call_on_close(...)` (the file is deleted when the response is closed).

api/agent-notes/services/dataset_service.py.md

@@ -1,18 +0,0 @@
-## Purpose
-
-`api/services/dataset_service.py` hosts dataset/document service logic used by console and API controllers.
-
-## Batch document operations
-
-- Batch document workflows should avoid N+1 database queries by using set-based lookups.
-- Tenant checks must be enforced consistently across dataset/document operations.
-- `DocumentService.get_documents_by_ids(...)` fetches documents for a dataset using `id.in_(...)`.
-- `FileService.get_upload_files_by_ids(...)` performs tenant-scoped batch lookup for `UploadFile` (dedupes ids with `set(...)`).
-- `DocumentService.get_document_download_url(...)` and `prepare_document_batch_download_zip(...)` handle
-  dataset/document permission checks plus `Document -> UploadFile` validation for download endpoints.
-
-## Verification plan
-
-- Exercise document list and download endpoints that use the service helpers.
-- Confirm batch download uses constant query count for documents + upload files.
-- Request a ZIP with a missing document id and confirm a 404 is returned.

api/agent-notes/services/file_service.py.md

@@ -1,35 +0,0 @@
-## Purpose
-
-`api/services/file_service.py` owns business logic around `UploadFile` objects: upload validation, storage persistence,
-previews/generators, and deletion.
-
-## Key invariants
-
-- All storage I/O goes through `extensions.ext_storage.storage`.
-- Uploaded file keys follow: `upload_files/<tenant_id>/<uuid>.<ext>`.
-- Upload validation is enforced in `FileService.upload_file(...)` (blocked extensions, size limits, dataset-only types).
-
-## Batch lookup helpers
-
-- `FileService.get_upload_files_by_ids(tenant_id, upload_file_ids)` is the canonical tenant-scoped batch loader for
-  `UploadFile`.
-
-## Dataset document download helpers
-
-The dataset document download/ZIP endpoints now delegate “Document → UploadFile” validation and permission checks to
-`DocumentService` (`api/services/dataset_service.py`). `FileService` stays focused on generic `UploadFile` operations
-(uploading, previews, deletion), plus generic ZIP serving.
-
-### ZIP serving
-
-- `FileService.build_upload_files_zip_tempfile(...)` builds a ZIP from `UploadFile` objects and yields a seeked
-  tempfile **path** so callers can stream it (e.g., `send_file(path, ...)`) without hitting "read of closed file"
-  issues from file-handle lifecycle during streamed responses.
-- Flask `send_file(...)` and the `ExitStack`/`call_on_close(...)` cleanup pattern are handled in the route layer.
-
-## Verification plan
-
-- Unit: `api/tests/unit_tests/controllers/console/datasets/test_datasets_document_download.py`
-  - Verify signed URL generation for upload-file documents and ZIP download behavior for multiple documents.
-- Unit: `api/tests/unit_tests/services/test_file_service_zip_and_lookup.py`
-  - Verify ZIP packing produces a valid, openable archive and preserves file content.

api/agent-notes/tests/unit_tests/controllers/console/datasets/test_datasets_document_download.py.md

@@ -1,28 +0,0 @@
-## Purpose
-
-Unit tests for the console dataset document download endpoint:
-
-- `GET /datasets/<dataset_id>/documents/<document_id>/download`
-
-## Testing approach
-
-- Uses `Flask.test_request_context()` and calls the `Resource.get(...)` method directly.
-- Monkeypatches console decorators (`login_required`, `setup_required`, rate limit) to no-ops to keep the test focused.
-- Mocks:
-  - `DatasetService.get_dataset` / `check_dataset_permission`
-  - `DocumentService.get_document` for single-file download tests
-  - `DocumentService.get_documents_by_ids` + `FileService.get_upload_files_by_ids` for ZIP download tests
-  - `FileService.get_upload_files_by_ids` for `UploadFile` lookups in single-file tests
-  - `services.dataset_service.file_helpers.get_signed_file_url` to return a deterministic URL
-- Document mocks include `id` fields so batch lookups can map documents by id.
-
-## Covered cases
-
-- Success returns `{ "url": "<signed>" }` for upload-file documents.
-- 404 when document is not `upload_file`.
-- 404 when `upload_file_id` is missing.
-- 404 when referenced `UploadFile` row does not exist.
-- 403 when document tenant does not match current tenant.
-- Batch ZIP download returns `application/zip` for upload-file documents.
-- Batch ZIP download rejects non-upload-file documents.
-- Batch ZIP download uses a random `.zip` attachment name (`download_name`), so tests only assert the suffix.

api/agent-notes/tests/unit_tests/services/test_file_service_zip_and_lookup.py.md

@@ -1,18 +0,0 @@
-## Purpose
-
-Unit tests for `api/services/file_service.py` helper methods that are not covered by higher-level controller tests.
-
-## What’s covered
-
-- `FileService.build_upload_files_zip_tempfile(...)`
-  - ZIP entry name sanitization (no directory components / traversal)
-  - name deduplication while preserving extensions
-  - writing streamed bytes from `storage.load(...)` into ZIP entries
-  - yields a tempfile path so callers can open/stream the ZIP without holding a live file handle
-- `FileService.get_upload_files_by_ids(...)`
-  - returns `{}` for empty id lists
-  - returns an id-keyed mapping for non-empty lists
-
-## Notes
-
-- These tests intentionally stub `storage.load` and `db.session.scalars(...).all()` to avoid needing a real DB/storage.

api/app.py

@@ -1,4 +1,3 @@
-import os
 import sys
 
 
@@ -9,15 +8,10 @@ def is_db_command() -> bool:
 
 
 # create app
-flask_app = None
-socketio_app = None
-
 if is_db_command():
     from app_factory import create_migrations_app
 
     app = create_migrations_app()
-    socketio_app = app
-    flask_app = app
 else:
     # Gunicorn and Celery handle monkey patching automatically in production by
     # specifying the `gevent` worker class. Manual monkey patching is not required here.
@@ -28,15 +22,8 @@ else:
 
     from app_factory import create_app
 
-    socketio_app, flask_app = create_app()
-    app = flask_app
-    celery = flask_app.extensions["celery"]
+    app = create_app()
+    celery = app.extensions["celery"]
 
 if __name__ == "__main__":
-    from gevent import pywsgi
-    from geventwebsocket.handler import WebSocketHandler  # type: ignore[reportMissingTypeStubs]
-
-    host = os.environ.get("HOST", "0.0.0.0")
-    port = int(os.environ.get("PORT", 5001))
-    server = pywsgi.WSGIServer((host, port), socketio_app, handler_class=WebSocketHandler)
-    server.serve_forever()
+    app.run(host="0.0.0.0", port=5001)

api/app_factory.py

@@ -1,7 +1,6 @@
 import logging
 import time
 
-import socketio  # type: ignore[reportMissingTypeStubs]
 from opentelemetry.trace import get_current_span
 from opentelemetry.trace.span import INVALID_SPAN_ID, INVALID_TRACE_ID
 
@@ -9,7 +8,6 @@ from configs import dify_config
 from contexts.wrapper import RecyclableContextVar
 from core.logging.context import init_request_context
 from dify_app import DifyApp
-from extensions.ext_socketio import sio
 
 logger = logging.getLogger(__name__)
 
@@ -62,23 +60,17 @@ def create_flask_app_with_configs() -> DifyApp:
     return dify_app
 
 
-def create_app() -> tuple[socketio.WSGIApp, DifyApp]:
+def create_app() -> DifyApp:
     start_time = time.perf_counter()
     app = create_flask_app_with_configs()
     initialize_extensions(app)
-
-    sio.app = app
-    socketio_app = socketio.WSGIApp(sio, app)
-
     end_time = time.perf_counter()
     if dify_config.DEBUG:
         logger.info("Finished create_app (%s ms)", round((end_time - start_time) * 1000, 2))
-    return socketio_app, app
+    return app
 
 
 def initialize_extensions(app: DifyApp):
-    # Initialize Flask context capture for workflow execution
-    from context.flask_app_context import init_flask_context
     from extensions import (
         ext_app_metrics,
         ext_blueprints,
@@ -108,8 +100,6 @@ def initialize_extensions(app: DifyApp):
         ext_warnings,
     )
 
-    init_flask_context()
-
     extensions = [
         ext_timezone,
         ext_logging,

api/configs/feature/__init__.py

@@ -1219,13 +1219,6 @@ class PositionConfig(BaseSettings):
         return {item.strip() for item in self.POSITION_TOOL_EXCLUDES.split(",") if item.strip() != ""}
 
 
-class CollaborationConfig(BaseSettings):
-    ENABLE_COLLABORATION_MODE: bool = Field(
-        description="Whether to enable collaboration mode features across the workspace",
-        default=False,
-    )
-
-
 class LoginConfig(BaseSettings):
     ENABLE_EMAIL_CODE_LOGIN: bool = Field(
         description="whether to enable email code login",
@@ -1340,7 +1333,6 @@ class FeatureConfig(
     WorkflowConfig,
     WorkflowNodeExecutionConfig,
     WorkspaceConfig,
-    CollaborationConfig,
     LoginConfig,
     AccountConfig,
     SwaggerUIConfig,

api/context/__init__.py

@@ -1,74 +0,0 @@
-"""
-Core Context - Framework-agnostic context management.
-
-This module provides context management that is independent of any specific
-web framework. Framework-specific implementations register their context
-capture functions at application initialization time.
-
-This ensures the workflow layer remains completely decoupled from Flask
-or any other web framework.
-"""
-
-import contextvars
-from collections.abc import Callable
-
-from core.workflow.context.execution_context import (
-    ExecutionContext,
-    IExecutionContext,
-    NullAppContext,
-)
-
-# Global capturer function - set by framework-specific modules
-_capturer: Callable[[], IExecutionContext] | None = None
-
-
-def register_context_capturer(capturer: Callable[[], IExecutionContext]) -> None:
-    """
-    Register a context capture function.
-
-    This should be called by framework-specific modules (e.g., Flask)
-    during application initialization.
-
-    Args:
-        capturer: Function that captures current context and returns IExecutionContext
-    """
-    global _capturer
-    _capturer = capturer
-
-
-def capture_current_context() -> IExecutionContext:
-    """
-    Capture current execution context.
-
-    This function uses the registered context capturer. If no capturer
-    is registered, it returns a minimal context with only contextvars
-    (suitable for non-framework environments like tests or standalone scripts).
-
-    Returns:
-        IExecutionContext with captured context
-    """
-    if _capturer is None:
-        # No framework registered - return minimal context
-        return ExecutionContext(
-            app_context=NullAppContext(),
-            context_vars=contextvars.copy_context(),
-        )
-
-    return _capturer()
-
-
-def reset_context_provider() -> None:
-    """
-    Reset the context capturer.
-
-    This is primarily useful for testing to ensure a clean state.
-    """
-    global _capturer
-    _capturer = None
-
-
-__all__ = [
-    "capture_current_context",
-    "register_context_capturer",
-    "reset_context_provider",
-]

api/context/flask_app_context.py

@@ -1,198 +0,0 @@
-"""
-Flask App Context - Flask implementation of AppContext interface.
-"""
-
-import contextvars
-from collections.abc import Generator
-from contextlib import contextmanager
-from typing import Any, final
-
-from flask import Flask, current_app, g
-
-from context import register_context_capturer
-from core.workflow.context.execution_context import (
-    AppContext,
-    IExecutionContext,
-)
-
-
-@final
-class FlaskAppContext(AppContext):
-    """
-    Flask implementation of AppContext.
-
-    This adapts Flask's app context to the AppContext interface.
-    """
-
-    def __init__(self, flask_app: Flask) -> None:
-        """
-        Initialize Flask app context.
-
-        Args:
-            flask_app: The Flask application instance
-        """
-        self._flask_app = flask_app
-
-    def get_config(self, key: str, default: Any = None) -> Any:
-        """Get configuration value from Flask app config."""
-        return self._flask_app.config.get(key, default)
-
-    def get_extension(self, name: str) -> Any:
-        """Get Flask extension by name."""
-        return self._flask_app.extensions.get(name)
-
-    @contextmanager
-    def enter(self) -> Generator[None, None, None]:
-        """Enter Flask app context."""
-        with self._flask_app.app_context():
-            yield
-
-    @property
-    def flask_app(self) -> Flask:
-        """Get the underlying Flask app instance."""
-        return self._flask_app
-
-
-def capture_flask_context(user: Any = None) -> IExecutionContext:
-    """
-    Capture current Flask execution context.
-
-    This function captures the Flask app context and contextvars from the
-    current environment. It should be called from within a Flask request or
-    app context.
-
-    Args:
-        user: Optional user object to include in context
-
-    Returns:
-        IExecutionContext with captured Flask context
-
-    Raises:
-        RuntimeError: If called outside Flask context
-    """
-    # Get Flask app instance
-    flask_app = current_app._get_current_object()  # type: ignore
-
-    # Save current user if available
-    saved_user = user
-    if saved_user is None:
-        # Check for user in g (flask-login)
-        if hasattr(g, "_login_user"):
-            saved_user = g._login_user
-
-    # Capture contextvars
-    context_vars = contextvars.copy_context()
-
-    return FlaskExecutionContext(
-        flask_app=flask_app,
-        context_vars=context_vars,
-        user=saved_user,
-    )
-
-
-@final
-class FlaskExecutionContext:
-    """
-    Flask-specific execution context.
-
-    This is a specialized version of ExecutionContext that includes Flask app
-    context. It provides the same interface as ExecutionContext but with
-    Flask-specific implementation.
-    """
-
-    def __init__(
-        self,
-        flask_app: Flask,
-        context_vars: contextvars.Context,
-        user: Any = None,
-    ) -> None:
-        """
-        Initialize Flask execution context.
-
-        Args:
-            flask_app: Flask application instance
-            context_vars: Python contextvars
-            user: Optional user object
-        """
-        self._app_context = FlaskAppContext(flask_app)
-        self._context_vars = context_vars
-        self._user = user
-        self._flask_app = flask_app
-
-    @property
-    def app_context(self) -> FlaskAppContext:
-        """Get Flask app context."""
-        return self._app_context
-
-    @property
-    def context_vars(self) -> contextvars.Context:
-        """Get context variables."""
-        return self._context_vars
-
-    @property
-    def user(self) -> Any:
-        """Get user object."""
-        return self._user
-
-    def __enter__(self) -> "FlaskExecutionContext":
-        """Enter the Flask execution context."""
-        # Restore context variables
-        for var, val in self._context_vars.items():
-            var.set(val)
-
-        # Save current user from g if available
-        saved_user = None
-        if hasattr(g, "_login_user"):
-            saved_user = g._login_user
-
-        # Enter Flask app context
-        self._cm = self._app_context.enter()
-        self._cm.__enter__()
-
-        # Restore user in new app context
-        if saved_user is not None:
-            g._login_user = saved_user
-
-        return self
-
-    def __exit__(self, *args: Any) -> None:
-        """Exit the Flask execution context."""
-        if hasattr(self, "_cm"):
-            self._cm.__exit__(*args)
-
-    @contextmanager
-    def enter(self) -> Generator[None, None, None]:
-        """Enter Flask execution context as context manager."""
-        # Restore context variables
-        for var, val in self._context_vars.items():
-            var.set(val)
-
-        # Save current user from g if available
-        saved_user = None
-        if hasattr(g, "_login_user"):
-            saved_user = g._login_user
-
-        # Enter Flask app context
-        with self._flask_app.app_context():
-            # Restore user in new app context
-            if saved_user is not None:
-                g._login_user = saved_user
-            yield
-
-
-def init_flask_context() -> None:
-    """
-    Initialize Flask context capture by registering the capturer.
-
-    This function should be called during Flask application initialization
-    to register the Flask-specific context capturer with the core context module.
-
-    Example:
-        app = Flask(__name__)
-        init_flask_context()  # Register Flask context capturer
-
-    Note:
-        This function does not need the app instance as it uses Flask's
-        `current_app` to get the app when capturing context.
-    """
-    register_context_capturer(capture_flask_context)

api/controllers/console/__init__.py

@@ -63,7 +63,6 @@ from .app import (
     statistic,
     workflow,
     workflow_app_log,
-    workflow_comment,
     workflow_draft_variable,
     workflow_run,
     workflow_statistic,
@@ -113,7 +112,6 @@ from .explore import (
     recommended_app,
     saved_message,
 )
-from .socketio import workflow as socketio_workflow  # pyright: ignore[reportUnusedImport]
 
 # Import tag controllers
 from .tag import tags
@@ -205,7 +203,6 @@ __all__ = [
     "website",
     "workflow",
     "workflow_app_log",
-    "workflow_comment",
     "workflow_draft_variable",
     "workflow_run",
     "workflow_statistic",

api/controllers/console/app/app.py

@@ -1,3 +1,4 @@
+import re
 import uuid
 from datetime import datetime
 from typing import Any, Literal, TypeAlias
@@ -67,6 +68,48 @@ class AppListQuery(BaseModel):
             raise ValueError("Invalid UUID format in tag_ids.") from exc
 
 
+# XSS prevention: patterns that could lead to XSS attacks
+# Includes: script tags, iframe tags, javascript: protocol, SVG with onload, etc.
+_XSS_PATTERNS = [
+    r"<script[^>]*>.*?</script>",  # Script tags
+    r"<iframe\b[^>]*?(?:/>|>.*?</iframe>)",  # Iframe tags (including self-closing)
+    r"javascript:",  # JavaScript protocol
+    r"<svg[^>]*?\s+onload\s*=[^>]*>",  # SVG with onload handler (attribute-aware, flexible whitespace)
+    r"<.*?on\s*\w+\s*=",  # Event handlers like onclick, onerror, etc.
+    r"<object\b[^>]*(?:\s*/>|>.*?</object\s*>)",  # Object tags (opening tag)
+    r"<embed[^>]*>",  # Embed tags (self-closing)
+    r"<link[^>]*>",  # Link tags with javascript
+]
+
+
+def _validate_xss_safe(value: str | None, field_name: str = "Field") -> str | None:
+    """
+    Validate that a string value doesn't contain potential XSS payloads.
+
+    Args:
+        value: The string value to validate
+        field_name: Name of the field for error messages
+
+    Returns:
+        The original value if safe
+
+    Raises:
+        ValueError: If the value contains XSS patterns
+    """
+    if value is None:
+        return None
+
+    value_lower = value.lower()
+    for pattern in _XSS_PATTERNS:
+        if re.search(pattern, value_lower, re.DOTALL | re.IGNORECASE):
+            raise ValueError(
+                f"{field_name} contains invalid characters or patterns. "
+                "HTML tags, JavaScript, and other potentially dangerous content are not allowed."
+            )
+
+    return value
+
+
 class CreateAppPayload(BaseModel):
     name: str = Field(..., min_length=1, description="App name")
     description: str | None = Field(default=None, description="App description (max 400 chars)", max_length=400)
@@ -75,6 +118,11 @@ class CreateAppPayload(BaseModel):
     icon: str | None = Field(default=None, description="Icon")
     icon_background: str | None = Field(default=None, description="Icon background color")
 
+    @field_validator("name", "description", mode="before")
+    @classmethod
+    def validate_xss_safe(cls, value: str | None, info) -> str | None:
+        return _validate_xss_safe(value, info.field_name)
+
 
 class UpdateAppPayload(BaseModel):
     name: str = Field(..., min_length=1, description="App name")
@@ -85,6 +133,11 @@ class UpdateAppPayload(BaseModel):
     use_icon_as_answer_icon: bool | None = Field(default=None, description="Use icon as answer icon")
     max_active_requests: int | None = Field(default=None, description="Maximum active requests")
 
+    @field_validator("name", "description", mode="before")
+    @classmethod
+    def validate_xss_safe(cls, value: str | None, info) -> str | None:
+        return _validate_xss_safe(value, info.field_name)
+
 
 class CopyAppPayload(BaseModel):
     name: str | None = Field(default=None, description="Name for the copied app")
@@ -93,6 +146,11 @@ class CopyAppPayload(BaseModel):
     icon: str | None = Field(default=None, description="Icon")
     icon_background: str | None = Field(default=None, description="Icon background color")
 
+    @field_validator("name", "description", mode="before")
+    @classmethod
+    def validate_xss_safe(cls, value: str | None, info) -> str | None:
+        return _validate_xss_safe(value, info.field_name)
+
 
 class AppExportQuery(BaseModel):
     include_secret: bool = Field(default=False, description="Include secrets in export")

api/controllers/console/app/workflow.py

@@ -32,10 +32,8 @@ from core.trigger.debug.event_selectors import (
 from core.workflow.enums import NodeType
 from core.workflow.graph_engine.manager import GraphEngineManager
 from extensions.ext_database import db
-from extensions.ext_redis import redis_client
 from factories import file_factory, variable_factory
 from fields.member_fields import simple_account_fields
-from fields.online_user_fields import online_user_list_fields
 from fields.workflow_fields import workflow_fields, workflow_pagination_fields
 from fields.workflow_run_fields import workflow_run_node_execution_fields
 from libs import helper
@@ -45,7 +43,6 @@ from libs.login import current_account_with_tenant, login_required
 from models import App
 from models.model import AppMode
 from models.workflow import Workflow
-from repositories.workflow_collaboration_repository import WORKFLOW_ONLINE_USERS_PREFIX
 from services.app_generate_service import AppGenerateService
 from services.errors.app import WorkflowHashNotEqualError
 from services.errors.llm import InvokeRateLimitError
@@ -183,14 +180,6 @@ class WorkflowUpdatePayload(BaseModel):
     marked_comment: str | None = Field(default=None, max_length=100)
 
 
-class WorkflowFeaturesPayload(BaseModel):
-    features: dict[str, Any] = Field(..., description="Workflow feature configuration")
-
-
-class WorkflowOnlineUsersQuery(BaseModel):
-    workflow_ids: str = Field(..., description="Comma-separated workflow IDs")
-
-
 class DraftWorkflowTriggerRunPayload(BaseModel):
     node_id: str
 
@@ -214,8 +203,6 @@ reg(DefaultBlockConfigQuery)
 reg(ConvertToWorkflowPayload)
 reg(WorkflowListQuery)
 reg(WorkflowUpdatePayload)
-reg(WorkflowFeaturesPayload)
-reg(WorkflowOnlineUsersQuery)
 reg(DraftWorkflowTriggerRunPayload)
 reg(DraftWorkflowTriggerRunAllPayload)
 
@@ -804,31 +791,6 @@ class ConvertToWorkflowApi(Resource):
         }
 
 
-@console_ns.route("/apps/<uuid:app_id>/workflows/draft/features")
-class WorkflowFeaturesApi(Resource):
-    """Update draft workflow features."""
-
-    @console_ns.expect(console_ns.models[WorkflowFeaturesPayload.__name__])
-    @console_ns.doc("update_workflow_features")
-    @console_ns.doc(description="Update draft workflow features")
-    @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Workflow features updated successfully")
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    def post(self, app_model: App):
-        current_user, _ = current_account_with_tenant()
-
-        args = WorkflowFeaturesPayload.model_validate(console_ns.payload or {})
-        features = args.features
-
-        workflow_service = WorkflowService()
-        workflow_service.update_draft_workflow_features(app_model=app_model, features=features, account=current_user)
-
-        return {"result": "success"}
-
-
 @console_ns.route("/apps/<uuid:app_id>/workflows")
 class PublishedAllWorkflowApi(Resource):
     @console_ns.expect(console_ns.models[WorkflowListQuery.__name__])
@@ -1204,32 +1166,3 @@ class DraftWorkflowTriggerRunAllApi(Resource):
                     "status": "error",
                 }
             ), 400
-
-
-@console_ns.route("/apps/workflows/online-users")
-class WorkflowOnlineUsersApi(Resource):
-    @console_ns.expect(console_ns.models[WorkflowOnlineUsersQuery.__name__])
-    @console_ns.doc("get_workflow_online_users")
-    @console_ns.doc(description="Get workflow online users")
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @marshal_with(online_user_list_fields)
-    def get(self):
-        args = WorkflowOnlineUsersQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
-
-        workflow_ids = [workflow_id.strip() for workflow_id in args.workflow_ids.split(",") if workflow_id.strip()]
-
-        results = []
-        for workflow_id in workflow_ids:
-            users_json = redis_client.hgetall(f"{WORKFLOW_ONLINE_USERS_PREFIX}{workflow_id}")
-
-            users = []
-            for _, user_info_json in users_json.items():
-                try:
-                    users.append(json.loads(user_info_json))
-                except Exception:
-                    continue
-            results.append({"workflow_id": workflow_id, "users": users})
-
-        return {"data": results}

api/controllers/console/app/workflow_comment.py

@@ -1,317 +0,0 @@
-import logging
-
-from flask_restx import Resource, fields, marshal_with
-from pydantic import BaseModel, Field
-
-from controllers.console import console_ns
-from controllers.console.app.wraps import get_app_model
-from controllers.console.wraps import account_initialization_required, setup_required
-from fields.member_fields import account_with_role_fields
-from fields.workflow_comment_fields import (
-    workflow_comment_basic_fields,
-    workflow_comment_create_fields,
-    workflow_comment_detail_fields,
-    workflow_comment_reply_create_fields,
-    workflow_comment_reply_update_fields,
-    workflow_comment_resolve_fields,
-    workflow_comment_update_fields,
-)
-from libs.login import current_user, login_required
-from models import App
-from services.account_service import TenantService
-from services.workflow_comment_service import WorkflowCommentService
-
-logger = logging.getLogger(__name__)
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
-
-class WorkflowCommentCreatePayload(BaseModel):
-    position_x: float = Field(..., description="Comment X position")
-    position_y: float = Field(..., description="Comment Y position")
-    content: str = Field(..., description="Comment content")
-    mentioned_user_ids: list[str] = Field(default_factory=list, description="Mentioned user IDs")
-
-
-class WorkflowCommentUpdatePayload(BaseModel):
-    content: str = Field(..., description="Comment content")
-    position_x: float | None = Field(default=None, description="Comment X position")
-    position_y: float | None = Field(default=None, description="Comment Y position")
-    mentioned_user_ids: list[str] = Field(default_factory=list, description="Mentioned user IDs")
-
-
-class WorkflowCommentReplyCreatePayload(BaseModel):
-    content: str = Field(..., description="Reply content")
-    mentioned_user_ids: list[str] = Field(default_factory=list, description="Mentioned user IDs")
-
-
-class WorkflowCommentReplyUpdatePayload(BaseModel):
-    content: str = Field(..., description="Reply content")
-    mentioned_user_ids: list[str] = Field(default_factory=list, description="Mentioned user IDs")
-
-
-for model in (
-    WorkflowCommentCreatePayload,
-    WorkflowCommentUpdatePayload,
-    WorkflowCommentReplyCreatePayload,
-    WorkflowCommentReplyUpdatePayload,
-):
-    console_ns.schema_model(model.__name__, model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-workflow_comment_basic_model = console_ns.model("WorkflowCommentBasic", workflow_comment_basic_fields)
-workflow_comment_detail_model = console_ns.model("WorkflowCommentDetail", workflow_comment_detail_fields)
-workflow_comment_create_model = console_ns.model("WorkflowCommentCreate", workflow_comment_create_fields)
-workflow_comment_update_model = console_ns.model("WorkflowCommentUpdate", workflow_comment_update_fields)
-workflow_comment_resolve_model = console_ns.model("WorkflowCommentResolve", workflow_comment_resolve_fields)
-workflow_comment_reply_create_model = console_ns.model(
-    "WorkflowCommentReplyCreate", workflow_comment_reply_create_fields
-)
-workflow_comment_reply_update_model = console_ns.model(
-    "WorkflowCommentReplyUpdate", workflow_comment_reply_update_fields
-)
-workflow_comment_mention_users_model = console_ns.model(
-    "WorkflowCommentMentionUsers",
-    {"users": fields.List(fields.Nested(account_with_role_fields))},
-)
-
-
-@console_ns.route("/apps/<uuid:app_id>/workflow/comments")
-class WorkflowCommentListApi(Resource):
-    """API for listing and creating workflow comments."""
-
-    @console_ns.doc("list_workflow_comments")
-    @console_ns.doc(description="Get all comments for a workflow")
-    @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Comments retrieved successfully", workflow_comment_basic_model)
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    @marshal_with(workflow_comment_basic_model, envelope="data")
-    def get(self, app_model: App):
-        """Get all comments for a workflow."""
-        comments = WorkflowCommentService.get_comments(tenant_id=current_user.current_tenant_id, app_id=app_model.id)
-
-        return comments
-
-    @console_ns.doc("create_workflow_comment")
-    @console_ns.doc(description="Create a new workflow comment")
-    @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[WorkflowCommentCreatePayload.__name__])
-    @console_ns.response(201, "Comment created successfully", workflow_comment_create_model)
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    @marshal_with(workflow_comment_create_model)
-    def post(self, app_model: App):
-        """Create a new workflow comment."""
-        payload = WorkflowCommentCreatePayload.model_validate(console_ns.payload or {})
-
-        result = WorkflowCommentService.create_comment(
-            tenant_id=current_user.current_tenant_id,
-            app_id=app_model.id,
-            created_by=current_user.id,
-            content=payload.content,
-            position_x=payload.position_x,
-            position_y=payload.position_y,
-            mentioned_user_ids=payload.mentioned_user_ids,
-        )
-
-        return result, 201
-
-
-@console_ns.route("/apps/<uuid:app_id>/workflow/comments/<string:comment_id>")
-class WorkflowCommentDetailApi(Resource):
-    """API for managing individual workflow comments."""
-
-    @console_ns.doc("get_workflow_comment")
-    @console_ns.doc(description="Get a specific workflow comment")
-    @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID"})
-    @console_ns.response(200, "Comment retrieved successfully", workflow_comment_detail_model)
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    @marshal_with(workflow_comment_detail_model)
-    def get(self, app_model: App, comment_id: str):
-        """Get a specific workflow comment."""
-        comment = WorkflowCommentService.get_comment(
-            tenant_id=current_user.current_tenant_id, app_id=app_model.id, comment_id=comment_id
-        )
-
-        return comment
-
-    @console_ns.doc("update_workflow_comment")
-    @console_ns.doc(description="Update a workflow comment")
-    @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID"})
-    @console_ns.expect(console_ns.models[WorkflowCommentUpdatePayload.__name__])
-    @console_ns.response(200, "Comment updated successfully", workflow_comment_update_model)
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    @marshal_with(workflow_comment_update_model)
-    def put(self, app_model: App, comment_id: str):
-        """Update a workflow comment."""
-        payload = WorkflowCommentUpdatePayload.model_validate(console_ns.payload or {})
-
-        result = WorkflowCommentService.update_comment(
-            tenant_id=current_user.current_tenant_id,
-            app_id=app_model.id,
-            comment_id=comment_id,
-            user_id=current_user.id,
-            content=payload.content,
-            position_x=payload.position_x,
-            position_y=payload.position_y,
-            mentioned_user_ids=payload.mentioned_user_ids,
-        )
-
-        return result
-
-    @console_ns.doc("delete_workflow_comment")
-    @console_ns.doc(description="Delete a workflow comment")
-    @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID"})
-    @console_ns.response(204, "Comment deleted successfully")
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    def delete(self, app_model: App, comment_id: str):
-        """Delete a workflow comment."""
-        WorkflowCommentService.delete_comment(
-            tenant_id=current_user.current_tenant_id,
-            app_id=app_model.id,
-            comment_id=comment_id,
-            user_id=current_user.id,
-        )
-
-        return {"result": "success"}, 204
-
-
-@console_ns.route("/apps/<uuid:app_id>/workflow/comments/<string:comment_id>/resolve")
-class WorkflowCommentResolveApi(Resource):
-    """API for resolving and reopening workflow comments."""
-
-    @console_ns.doc("resolve_workflow_comment")
-    @console_ns.doc(description="Resolve a workflow comment")
-    @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID"})
-    @console_ns.response(200, "Comment resolved successfully", workflow_comment_resolve_model)
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    @marshal_with(workflow_comment_resolve_model)
-    def post(self, app_model: App, comment_id: str):
-        """Resolve a workflow comment."""
-        comment = WorkflowCommentService.resolve_comment(
-            tenant_id=current_user.current_tenant_id,
-            app_id=app_model.id,
-            comment_id=comment_id,
-            user_id=current_user.id,
-        )
-
-        return comment
-
-
-@console_ns.route("/apps/<uuid:app_id>/workflow/comments/<string:comment_id>/replies")
-class WorkflowCommentReplyApi(Resource):
-    """API for managing comment replies."""
-
-    @console_ns.doc("create_workflow_comment_reply")
-    @console_ns.doc(description="Add a reply to a workflow comment")
-    @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID"})
-    @console_ns.expect(console_ns.models[WorkflowCommentReplyCreatePayload.__name__])
-    @console_ns.response(201, "Reply created successfully", workflow_comment_reply_create_model)
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    @marshal_with(workflow_comment_reply_create_model)
-    def post(self, app_model: App, comment_id: str):
-        """Add a reply to a workflow comment."""
-        # Validate comment access first
-        WorkflowCommentService.validate_comment_access(
-            comment_id=comment_id, tenant_id=current_user.current_tenant_id, app_id=app_model.id
-        )
-
-        payload = WorkflowCommentReplyCreatePayload.model_validate(console_ns.payload or {})
-
-        result = WorkflowCommentService.create_reply(
-            comment_id=comment_id,
-            content=payload.content,
-            created_by=current_user.id,
-            mentioned_user_ids=payload.mentioned_user_ids,
-        )
-
-        return result, 201
-
-
-@console_ns.route("/apps/<uuid:app_id>/workflow/comments/<string:comment_id>/replies/<string:reply_id>")
-class WorkflowCommentReplyDetailApi(Resource):
-    """API for managing individual comment replies."""
-
-    @console_ns.doc("update_workflow_comment_reply")
-    @console_ns.doc(description="Update a comment reply")
-    @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID", "reply_id": "Reply ID"})
-    @console_ns.expect(console_ns.models[WorkflowCommentReplyUpdatePayload.__name__])
-    @console_ns.response(200, "Reply updated successfully", workflow_comment_reply_update_model)
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    @marshal_with(workflow_comment_reply_update_model)
-    def put(self, app_model: App, comment_id: str, reply_id: str):
-        """Update a comment reply."""
-        # Validate comment access first
-        WorkflowCommentService.validate_comment_access(
-            comment_id=comment_id, tenant_id=current_user.current_tenant_id, app_id=app_model.id
-        )
-
-        payload = WorkflowCommentReplyUpdatePayload.model_validate(console_ns.payload or {})
-
-        reply = WorkflowCommentService.update_reply(
-            reply_id=reply_id,
-            user_id=current_user.id,
-            content=payload.content,
-            mentioned_user_ids=payload.mentioned_user_ids,
-        )
-
-        return reply
-
-    @console_ns.doc("delete_workflow_comment_reply")
-    @console_ns.doc(description="Delete a comment reply")
-    @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID", "reply_id": "Reply ID"})
-    @console_ns.response(204, "Reply deleted successfully")
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    def delete(self, app_model: App, comment_id: str, reply_id: str):
-        """Delete a comment reply."""
-        # Validate comment access first
-        WorkflowCommentService.validate_comment_access(
-            comment_id=comment_id, tenant_id=current_user.current_tenant_id, app_id=app_model.id
-        )
-
-        WorkflowCommentService.delete_reply(reply_id=reply_id, user_id=current_user.id)
-
-        return {"result": "success"}, 204
-
-
-@console_ns.route("/apps/<uuid:app_id>/workflow/comments/mention-users")
-class WorkflowCommentMentionUsersApi(Resource):
-    """API for getting mentionable users for workflow comments."""
-
-    @console_ns.doc("workflow_comment_mention_users")
-    @console_ns.doc(description="Get all users in current tenant for mentions")
-    @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Mentionable users retrieved successfully", workflow_comment_mention_users_model)
-    @login_required
-    @setup_required
-    @account_initialization_required
-    @get_app_model()
-    @marshal_with(workflow_comment_mention_users_model)
-    def get(self, app_model: App):
-        """Get all users in current tenant for mentions."""
-        members = TenantService.get_tenant_members(current_user.current_tenant)
-        return {"users": members}

api/controllers/console/app/workflow_draft_variable.py

@@ -21,9 +21,9 @@ from core.variables.segments import ArrayFileSegment, FileSegment, Segment
 from core.variables.types import SegmentType
 from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
 from extensions.ext_database import db
-from factories import variable_factory
 from factories.file_factory import build_from_mapping, build_from_mappings
-from libs.login import current_user, login_required
+from factories.variable_factory import build_segment_with_type
+from libs.login import login_required
 from models import App, AppMode
 from models.workflow import WorkflowDraftVariable
 from services.workflow_draft_variable_service import WorkflowDraftVariableList, WorkflowDraftVariableService
@@ -43,16 +43,6 @@ class WorkflowDraftVariableUpdatePayload(BaseModel):
     value: Any | None = Field(default=None, description="Variable value")
 
 
-class ConversationVariableUpdatePayload(BaseModel):
-    conversation_variables: list[dict[str, Any]] = Field(
-        ..., description="Conversation variables for the draft workflow"
-    )
-
-
-class EnvironmentVariableUpdatePayload(BaseModel):
-    environment_variables: list[dict[str, Any]] = Field(..., description="Environment variables for the draft workflow")
-
-
 console_ns.schema_model(
     WorkflowDraftVariableListQuery.__name__,
     WorkflowDraftVariableListQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
@@ -61,14 +51,6 @@ console_ns.schema_model(
     WorkflowDraftVariableUpdatePayload.__name__,
     WorkflowDraftVariableUpdatePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
 )
-console_ns.schema_model(
-    ConversationVariableUpdatePayload.__name__,
-    ConversationVariableUpdatePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-console_ns.schema_model(
-    EnvironmentVariableUpdatePayload.__name__,
-    EnvironmentVariableUpdatePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
 
 
 def _convert_values_to_json_serializable_object(value: Segment):
@@ -401,7 +383,7 @@ class VariableApi(Resource):
                 if len(raw_value) > 0 and not isinstance(raw_value[0], dict):
                     raise InvalidArgumentError(description=f"expected dict for files[0], got {type(raw_value)}")
                 raw_value = build_from_mappings(mappings=raw_value, tenant_id=app_model.tenant_id)
-            new_value = variable_factory.build_segment_with_type(variable.value_type, raw_value)
+            new_value = build_segment_with_type(variable.value_type, raw_value)
         draft_var_srv.update_variable(variable, name=new_name, value=new_value)
         db.session.commit()
         return variable
@@ -494,34 +476,6 @@ class ConversationVariableCollectionApi(Resource):
         db.session.commit()
         return _get_variable_list(app_model, CONVERSATION_VARIABLE_NODE_ID)
 
-    @console_ns.expect(console_ns.models[ConversationVariableUpdatePayload.__name__])
-    @console_ns.doc("update_conversation_variables")
-    @console_ns.doc(description="Update conversation variables for workflow draft")
-    @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Conversation variables updated successfully")
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @edit_permission_required
-    @get_app_model(mode=AppMode.ADVANCED_CHAT)
-    def post(self, app_model: App):
-        payload = ConversationVariableUpdatePayload.model_validate(console_ns.payload or {})
-
-        workflow_service = WorkflowService()
-
-        conversation_variables_list = payload.conversation_variables
-        conversation_variables = [
-            variable_factory.build_conversation_variable_from_mapping(obj) for obj in conversation_variables_list
-        ]
-
-        workflow_service.update_draft_workflow_conversation_variables(
-            app_model=app_model,
-            account=current_user,
-            conversation_variables=conversation_variables,
-        )
-
-        return {"result": "success"}
-
 
 @console_ns.route("/apps/<uuid:app_id>/workflows/draft/system-variables")
 class SystemVariableCollectionApi(Resource):
@@ -573,31 +527,3 @@ class EnvironmentVariableCollectionApi(Resource):
             )
 
         return {"items": env_vars_list}
-
-    @console_ns.expect(console_ns.models[EnvironmentVariableUpdatePayload.__name__])
-    @console_ns.doc("update_environment_variables")
-    @console_ns.doc(description="Update environment variables for workflow draft")
-    @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Environment variables updated successfully")
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @edit_permission_required
-    @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    def post(self, app_model: App):
-        payload = EnvironmentVariableUpdatePayload.model_validate(console_ns.payload or {})
-
-        workflow_service = WorkflowService()
-
-        environment_variables_list = payload.environment_variables
-        environment_variables = [
-            variable_factory.build_environment_variable_from_mapping(obj) for obj in environment_variables_list
-        ]
-
-        workflow_service.update_draft_workflow_environment_variables(
-            app_model=app_model,
-            account=current_user,
-            environment_variables=environment_variables,
-        )
-
-        return {"result": "success"}

api/controllers/console/auth/activate.py

@@ -69,13 +69,6 @@ class ActivateCheckApi(Resource):
         if invitation:
             data = invitation.get("data", {})
             tenant = invitation.get("tenant", None)
-
-            # Check workspace permission
-            if tenant:
-                from libs.workspace_permission import check_workspace_member_invite_permission
-
-                check_workspace_member_invite_permission(tenant.id)
-
             workspace_name = tenant.name if tenant else None
             workspace_id = tenant.id if tenant else None
             invitee_email = data.get("email") if data else None

api/controllers/console/datasets/datasets_document.py

@@ -2,12 +2,10 @@ import json
 import logging
 from argparse import ArgumentTypeError
 from collections.abc import Sequence
-from contextlib import ExitStack
-from typing import Any, Literal, cast
-from uuid import UUID
+from typing import Literal, cast
 
 import sqlalchemy as sa
-from flask import request, send_file
+from flask import request
 from flask_restx import Resource, fields, marshal, marshal_with
 from pydantic import BaseModel, Field
 from sqlalchemy import asc, desc, select
@@ -44,7 +42,6 @@ from models import DatasetProcessRule, Document, DocumentSegment, UploadFile
 from models.dataset import DocumentPipelineExecutionLog
 from services.dataset_service import DatasetService, DocumentService
 from services.entities.knowledge_entities.knowledge_entities import KnowledgeConfig, ProcessRule, RetrievalModel
-from services.file_service import FileService
 
 from ..app.error import (
     ProviderModelCurrentlyNotSupportError,
@@ -68,9 +65,6 @@ from ..wraps import (
 
 logger = logging.getLogger(__name__)
 
-# NOTE: Keep constants near the top of the module for discoverability.
-DOCUMENT_BATCH_DOWNLOAD_ZIP_MAX_DOCS = 100
-
 
 def _get_or_create_model(model_name: str, field_def):
     existing = console_ns.models.get(model_name)
@@ -110,12 +104,6 @@ class DocumentRenamePayload(BaseModel):
     name: str
 
 
-class DocumentBatchDownloadZipPayload(BaseModel):
-    """Request payload for bulk downloading documents as a zip archive."""
-
-    document_ids: list[UUID] = Field(..., min_length=1, max_length=DOCUMENT_BATCH_DOWNLOAD_ZIP_MAX_DOCS)
-
-
 class DocumentDatasetListParam(BaseModel):
     page: int = Field(1, title="Page", description="Page number.")
     limit: int = Field(20, title="Limit", description="Page size.")
@@ -132,7 +120,6 @@ register_schema_models(
     RetrievalModel,
     DocumentRetryPayload,
     DocumentRenamePayload,
-    DocumentBatchDownloadZipPayload,
 )
 
 
@@ -866,62 +853,6 @@ class DocumentApi(DocumentResource):
         return {"result": "success"}, 204
 
 
-@console_ns.route("/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/download")
-class DocumentDownloadApi(DocumentResource):
-    """Return a signed download URL for a dataset document's original uploaded file."""
-
-    @console_ns.doc("get_dataset_document_download_url")
-    @console_ns.doc(description="Get a signed download URL for a dataset document's original uploaded file")
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @cloud_edition_billing_rate_limit_check("knowledge")
-    def get(self, dataset_id: str, document_id: str) -> dict[str, Any]:
-        # Reuse the shared permission/tenant checks implemented in DocumentResource.
-        document = self.get_document(str(dataset_id), str(document_id))
-        return {"url": DocumentService.get_document_download_url(document)}
-
-
-@console_ns.route("/datasets/<uuid:dataset_id>/documents/download-zip")
-class DocumentBatchDownloadZipApi(DocumentResource):
-    """Download multiple uploaded-file documents as a single ZIP (avoids browser multi-download limits)."""
-
-    @console_ns.doc("download_dataset_documents_as_zip")
-    @console_ns.doc(description="Download selected dataset documents as a single ZIP archive (upload-file only)")
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @cloud_edition_billing_rate_limit_check("knowledge")
-    @console_ns.expect(console_ns.models[DocumentBatchDownloadZipPayload.__name__])
-    def post(self, dataset_id: str):
-        """Stream a ZIP archive containing the requested uploaded documents."""
-        # Parse and validate request payload.
-        payload = DocumentBatchDownloadZipPayload.model_validate(console_ns.payload or {})
-
-        current_user, current_tenant_id = current_account_with_tenant()
-        dataset_id = str(dataset_id)
-        document_ids: list[str] = [str(document_id) for document_id in payload.document_ids]
-        upload_files, download_name = DocumentService.prepare_document_batch_download_zip(
-            dataset_id=dataset_id,
-            document_ids=document_ids,
-            tenant_id=current_tenant_id,
-            current_user=current_user,
-        )
-
-        # Delegate ZIP packing to FileService, but keep Flask response+cleanup in the route.
-        with ExitStack() as stack:
-            zip_path = stack.enter_context(FileService.build_upload_files_zip_tempfile(upload_files=upload_files))
-            response = send_file(
-                zip_path,
-                mimetype="application/zip",
-                as_attachment=True,
-                download_name=download_name,
-            )
-            cleanup = stack.pop_all()
-            response.call_on_close(cleanup.close)
-        return response
-
-
 @console_ns.route("/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/processing/<string:action>")
 class DocumentProcessingApi(DocumentResource):
     @console_ns.doc("update_document_processing")

api/controllers/console/socketio/__init__.py

@@ -1 +0,0 @@
-

api/controllers/console/socketio/workflow.py

@@ -1,112 +0,0 @@
-import logging
-from collections.abc import Callable
-from typing import cast
-
-from flask import Request as FlaskRequest
-
-from extensions.ext_socketio import sio
-from libs.passport import PassportService
-from libs.token import extract_access_token
-from repositories.workflow_collaboration_repository import WorkflowCollaborationRepository
-from services.account_service import AccountService
-from services.workflow_collaboration_service import WorkflowCollaborationService
-
-repository = WorkflowCollaborationRepository()
-collaboration_service = WorkflowCollaborationService(repository, sio)
-
-
-def _sio_on(event: str) -> Callable[[Callable[..., object]], Callable[..., object]]:
-    return cast(Callable[[Callable[..., object]], Callable[..., object]], sio.on(event))
-
-
-@_sio_on("connect")
-def socket_connect(sid, environ, auth):
-    """
-    WebSocket connect event, do authentication here.
-    """
-    try:
-        request_environ = FlaskRequest(environ)
-        token = extract_access_token(request_environ)
-    except Exception:
-        logging.exception("Failed to extract token")
-        token = None
-
-    if not token:
-        logging.warning("Socket connect rejected: missing token (sid=%s)", sid)
-        return False
-
-    try:
-        decoded = PassportService().verify(token)
-        user_id = decoded.get("user_id")
-        if not user_id:
-            logging.warning("Socket connect rejected: missing user_id (sid=%s)", sid)
-            return False
-
-        with sio.app.app_context():
-            user = AccountService.load_logged_in_account(account_id=user_id)
-            if not user:
-                logging.warning(
-                    "Socket connect rejected: user not found (user_id=%s, sid=%s)", user_id, sid
-                )
-                return False
-            if not user.has_edit_permission:
-                logging.warning(
-                    "Socket connect rejected: no edit permission (user_id=%s, sid=%s)", user_id, sid
-                )
-                return False
-
-            collaboration_service.save_session(sid, user)
-            return True
-
-    except Exception:
-        logging.exception("Socket authentication failed")
-        return False
-
-
-@_sio_on("user_connect")
-def handle_user_connect(sid, data):
-    """
-    Handle user connect event. Each session (tab) is treated as an independent collaborator.
-    """
-    workflow_id = data.get("workflow_id")
-    if not workflow_id:
-        return {"msg": "workflow_id is required"}, 400
-
-    result = collaboration_service.register_session(workflow_id, sid)
-    if not result:
-        return {"msg": "unauthorized"}, 401
-
-    user_id, is_leader = result
-    return {"msg": "connected", "user_id": user_id, "sid": sid, "isLeader": is_leader}
-
-
-@_sio_on("disconnect")
-def handle_disconnect(sid):
-    """
-    Handle session disconnect event. Remove the specific session from online users.
-    """
-    collaboration_service.disconnect_session(sid)
-
-
-@_sio_on("collaboration_event")
-def handle_collaboration_event(sid, data):
-    """
-    Handle general collaboration events, include:
-    1. mouse_move
-    2. vars_and_features_update
-    3. sync_request (ask leader to update graph)
-    4. app_state_update
-    5. mcp_server_update
-    6. workflow_update
-    7. comments_update
-    8. node_panel_presence
-    """
-    return collaboration_service.relay_collaboration_event(sid, data)
-
-
-@_sio_on("graph_event")
-def handle_graph_event(sid, data):
-    """
-    Handle graph events - simple broadcast relay.
-    """
-    return collaboration_service.relay_graph_event(sid, data)

api/controllers/console/workspace/account.py

@@ -36,7 +36,6 @@ from controllers.console.wraps import (
     only_edition_cloud,
     setup_required,
 )
-from core.file import helpers as file_helpers
 from extensions.ext_database import db
 from fields.member_fields import account_fields
 from libs.datetime_utils import naive_utc_now
@@ -74,10 +73,6 @@ class AccountAvatarPayload(BaseModel):
     avatar: str
 
 
-class AccountAvatarQuery(BaseModel):
-    avatar: str = Field(..., description="Avatar file ID")
-
-
 class AccountInterfaceLanguagePayload(BaseModel):
     interface_language: str
 
@@ -163,7 +158,6 @@ def reg(cls: type[BaseModel]):
 reg(AccountInitPayload)
 reg(AccountNamePayload)
 reg(AccountAvatarPayload)
-reg(AccountAvatarQuery)
 reg(AccountInterfaceLanguagePayload)
 reg(AccountInterfaceThemePayload)
 reg(AccountTimezonePayload)
@@ -254,18 +248,6 @@ class AccountNameApi(Resource):
 
 @console_ns.route("/account/avatar")
 class AccountAvatarApi(Resource):
-    @console_ns.expect(console_ns.models[AccountAvatarQuery.__name__])
-    @console_ns.doc("get_account_avatar")
-    @console_ns.doc(description="Get account avatar url")
-    @setup_required
-    @login_required
-    @account_initialization_required
-    def get(self):
-        args = AccountAvatarQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
-
-        avatar_url = file_helpers.get_signed_file_url(args.avatar)
-        return {"avatar_url": avatar_url}
-
     @console_ns.expect(console_ns.models[AccountAvatarPayload.__name__])
     @setup_required
     @login_required

api/controllers/console/workspace/members.py

@@ -107,12 +107,6 @@ class MemberInviteEmailApi(Resource):
         inviter = current_user
         if not inviter.current_tenant:
             raise ValueError("No current tenant")
-
-        # Check workspace permission for member invitations
-        from libs.workspace_permission import check_workspace_member_invite_permission
-
-        check_workspace_member_invite_permission(inviter.current_tenant.id)
-
         invitation_results = []
         console_web_url = dify_config.CONSOLE_WEB_URL
 

api/controllers/console/workspace/workspace.py

@@ -20,7 +20,6 @@ from controllers.console.error import AccountNotLinkTenantError
 from controllers.console.wraps import (
     account_initialization_required,
     cloud_edition_billing_resource_check,
-    only_edition_enterprise,
     setup_required,
 )
 from enums.cloud_plan import CloudPlan
@@ -29,7 +28,6 @@ from libs.helper import TimestampField
 from libs.login import current_account_with_tenant, login_required
 from models.account import Tenant, TenantStatus
 from services.account_service import TenantService
-from services.enterprise.enterprise_service import EnterpriseService
 from services.feature_service import FeatureService
 from services.file_service import FileService
 from services.workspace_service import WorkspaceService
@@ -290,31 +288,3 @@ class WorkspaceInfoApi(Resource):
         db.session.commit()
 
         return {"result": "success", "tenant": marshal(WorkspaceService.get_tenant_info(tenant), tenant_fields)}
-
-
-@console_ns.route("/workspaces/current/permission")
-class WorkspacePermissionApi(Resource):
-    """Get workspace permissions for the current workspace."""
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @only_edition_enterprise
-    def get(self):
-        """
-        Get workspace permission settings.
-        Returns permission flags that control workspace features like member invitations and owner transfer.
-        """
-        _, current_tenant_id = current_account_with_tenant()
-
-        if not current_tenant_id:
-            raise ValueError("No current tenant")
-
-        # Get workspace permissions from enterprise service
-        permission = EnterpriseService.WorkspacePermissionService.get_permission(current_tenant_id)
-
-        return {
-            "workspace_id": permission.workspace_id,
-            "allow_member_invite": permission.allow_member_invite,
-            "allow_owner_transfer": permission.allow_owner_transfer,
-        }, 200

api/controllers/console/wraps.py

@@ -286,12 +286,13 @@ def enable_change_email(view: Callable[P, R]):
 def is_allow_transfer_owner(view: Callable[P, R]):
     @wraps(view)
     def decorated(*args: P.args, **kwargs: P.kwargs):
-        from libs.workspace_permission import check_workspace_owner_transfer_permission
-
         _, current_tenant_id = current_account_with_tenant()
-        # Check both billing/plan level and workspace policy level permissions
-        check_workspace_owner_transfer_permission(current_tenant_id)
-        return view(*args, **kwargs)
+        features = FeatureService.get_features(current_tenant_id)
+        if features.is_allow_transfer_workspace:
+            return view(*args, **kwargs)
+
+        # otherwise, return 403
+        abort(403)
 
     return decorated
 

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

@@ -8,7 +8,7 @@ from typing import Any, Literal, Union, overload
 from flask import Flask, current_app
 from pydantic import ValidationError
 from sqlalchemy import select
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import Session, sessionmaker
 
 import contexts
 from configs import dify_config
@@ -23,7 +23,6 @@ from core.app.apps.workflow.generate_response_converter import WorkflowAppGenera
 from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
 from core.app.entities.task_entities import WorkflowAppBlockingResponse, WorkflowAppStreamResponse
-from core.db.session_factory import session_factory
 from core.helper.trace_id_helper import extract_external_trace_id_from_args
 from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.ops.ops_trace_manager import TraceQueueManager
@@ -477,7 +476,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
         :return:
         """
         with preserve_flask_contexts(flask_app, context_vars=context):
-            with session_factory.create_session() as session:
+            with Session(db.engine, expire_on_commit=False) as session:
                 workflow = session.scalar(
                     select(Workflow).where(
                         Workflow.tenant_id == application_generate_entity.app_config.tenant_id,

api/core/plugin/impl/base.py

@@ -320,17 +320,18 @@ class BasePluginClient:
             case PluginInvokeError.__name__:
                 error_object = json.loads(message)
                 invoke_error_type = error_object.get("error_type")
+                args = error_object.get("args")
                 match invoke_error_type:
                     case InvokeRateLimitError.__name__:
-                        raise InvokeRateLimitError(description=error_object.get("message"))
+                        raise InvokeRateLimitError(description=args.get("description"))
                     case InvokeAuthorizationError.__name__:
-                        raise InvokeAuthorizationError(description=error_object.get("message"))
+                        raise InvokeAuthorizationError(description=args.get("description"))
                     case InvokeBadRequestError.__name__:
-                        raise InvokeBadRequestError(description=error_object.get("message"))
+                        raise InvokeBadRequestError(description=args.get("description"))
                     case InvokeConnectionError.__name__:
-                        raise InvokeConnectionError(description=error_object.get("message"))
+                        raise InvokeConnectionError(description=args.get("description"))
                     case InvokeServerUnavailableError.__name__:
-                        raise InvokeServerUnavailableError(description=error_object.get("message"))
+                        raise InvokeServerUnavailableError(description=args.get("description"))
                     case CredentialsValidateFailedError.__name__:
                         raise CredentialsValidateFailedError(error_object.get("message"))
                     case EndpointSetupFailedError.__name__:
@@ -338,11 +339,11 @@ class BasePluginClient:
                     case TriggerProviderCredentialValidationError.__name__:
                         raise TriggerProviderCredentialValidationError(error_object.get("message"))
                     case TriggerPluginInvokeError.__name__:
-                        raise TriggerPluginInvokeError(description=error_object.get("message"))
+                        raise TriggerPluginInvokeError(description=error_object.get("description"))
                     case TriggerInvokeError.__name__:
                         raise TriggerInvokeError(error_object.get("message"))
                     case EventIgnoreError.__name__:
-                        raise EventIgnoreError(description=error_object.get("message"))
+                        raise EventIgnoreError(description=error_object.get("description"))
                     case _:
                         raise PluginInvokeError(description=message)
             case PluginDaemonInternalServerError.__name__:

api/core/tools/workflow_as_tool/tool.py

@@ -5,6 +5,7 @@ import logging
 from collections.abc import Generator, Mapping, Sequence
 from typing import Any, cast
 
+from flask import has_request_context
 from sqlalchemy import select
 
 from core.db.session_factory import session_factory
@@ -28,21 +29,6 @@ from models.workflow import Workflow
 logger = logging.getLogger(__name__)
 
 
-def _try_resolve_user_from_request() -> Account | EndUser | None:
-    """
-    Try to resolve user from Flask request context.
-
-    Returns None if not in a request context or if user is not available.
-    """
-    # Note: `current_user` is a LocalProxy. Never compare it with None directly.
-    # Use _get_current_object() to dereference the proxy
-    user = getattr(current_user, "_get_current_object", lambda: current_user)()
-    # Check if we got a valid user object
-    if user is not None and hasattr(user, "id"):
-        return user
-    return None
-
-
 class WorkflowTool(Tool):
     """
     Workflow tool.
@@ -223,13 +209,21 @@ class WorkflowTool(Tool):
         Returns:
             Account | EndUser | None: The resolved user object, or None if resolution fails.
         """
-        # Try to resolve user from request context first
-        user = _try_resolve_user_from_request()
-        if user is not None:
-            return user
+        if has_request_context():
+            return self._resolve_user_from_request()
+        else:
+            return self._resolve_user_from_database(user_id=user_id)
 
-        # Fall back to database resolution
-        return self._resolve_user_from_database(user_id=user_id)
+    def _resolve_user_from_request(self) -> Account | EndUser | None:
+        """
+        Resolve user from Flask request context.
+        """
+        try:
+            # Note: `current_user` is a LocalProxy. Never compare it with None directly.
+            return getattr(current_user, "_get_current_object", lambda: current_user)()
+        except Exception as e:
+            logger.warning("Failed to resolve user from request context: %s", e)
+            return None
 
     def _resolve_user_from_database(self, user_id: str) -> Account | EndUser | None:
         """

api/core/workflow/context/__init__.py

@@ -1,22 +0,0 @@
-"""
-Execution Context - Context management for workflow execution.
-
-This package provides Flask-independent context management for workflow
-execution in multi-threaded environments.
-"""
-
-from core.workflow.context.execution_context import (
-    AppContext,
-    ExecutionContext,
-    IExecutionContext,
-    NullAppContext,
-    capture_current_context,
-)
-
-__all__ = [
-    "AppContext",
-    "ExecutionContext",
-    "IExecutionContext",
-    "NullAppContext",
-    "capture_current_context",
-]

api/core/workflow/context/execution_context.py

@@ -1,216 +0,0 @@
-"""
-Execution Context - Abstracted context management for workflow execution.
-"""
-
-import contextvars
-from abc import ABC, abstractmethod
-from collections.abc import Generator
-from contextlib import AbstractContextManager, contextmanager
-from typing import Any, Protocol, final, runtime_checkable
-
-
-class AppContext(ABC):
-    """
-    Abstract application context interface.
-
-    This abstraction allows workflow execution to work with or without Flask
-    by providing a common interface for application context management.
-    """
-
-    @abstractmethod
-    def get_config(self, key: str, default: Any = None) -> Any:
-        """Get configuration value by key."""
-        pass
-
-    @abstractmethod
-    def get_extension(self, name: str) -> Any:
-        """Get Flask extension by name (e.g., 'db', 'cache')."""
-        pass
-
-    @abstractmethod
-    def enter(self) -> AbstractContextManager[None]:
-        """Enter the application context."""
-        pass
-
-
-@runtime_checkable
-class IExecutionContext(Protocol):
-    """
-    Protocol for execution context.
-
-    This protocol defines the interface that all execution contexts must implement,
-    allowing both ExecutionContext and FlaskExecutionContext to be used interchangeably.
-    """
-
-    def __enter__(self) -> "IExecutionContext":
-        """Enter the execution context."""
-        ...
-
-    def __exit__(self, *args: Any) -> None:
-        """Exit the execution context."""
-        ...
-
-    @property
-    def user(self) -> Any:
-        """Get user object."""
-        ...
-
-
-@final
-class ExecutionContext:
-    """
-    Execution context for workflow execution in worker threads.
-
-    This class encapsulates all context needed for workflow execution:
-    - Application context (Flask app or standalone)
-    - Context variables for Python contextvars
-    - User information (optional)
-
-    It is designed to be serializable and passable to worker threads.
-    """
-
-    def __init__(
-        self,
-        app_context: AppContext | None = None,
-        context_vars: contextvars.Context | None = None,
-        user: Any = None,
-    ) -> None:
-        """
-        Initialize execution context.
-
-        Args:
-            app_context: Application context (Flask or standalone)
-            context_vars: Python contextvars to preserve
-            user: User object (optional)
-        """
-        self._app_context = app_context
-        self._context_vars = context_vars
-        self._user = user
-
-    @property
-    def app_context(self) -> AppContext | None:
-        """Get application context."""
-        return self._app_context
-
-    @property
-    def context_vars(self) -> contextvars.Context | None:
-        """Get context variables."""
-        return self._context_vars
-
-    @property
-    def user(self) -> Any:
-        """Get user object."""
-        return self._user
-
-    @contextmanager
-    def enter(self) -> Generator[None, None, None]:
-        """
-        Enter this execution context.
-
-        This is a convenience method that creates a context manager.
-        """
-        # Restore context variables if provided
-        if self._context_vars:
-            for var, val in self._context_vars.items():
-                var.set(val)
-
-        # Enter app context if available
-        if self._app_context is not None:
-            with self._app_context.enter():
-                yield
-        else:
-            yield
-
-    def __enter__(self) -> "ExecutionContext":
-        """Enter the execution context."""
-        self._cm = self.enter()
-        self._cm.__enter__()
-        return self
-
-    def __exit__(self, *args: Any) -> None:
-        """Exit the execution context."""
-        if hasattr(self, "_cm"):
-            self._cm.__exit__(*args)
-
-
-class NullAppContext(AppContext):
-    """
-    Null implementation of AppContext for non-Flask environments.
-
-    This is used when running without Flask (e.g., in tests or standalone mode).
-    """
-
-    def __init__(self, config: dict[str, Any] | None = None) -> None:
-        """
-        Initialize null app context.
-
-        Args:
-            config: Optional configuration dictionary
-        """
-        self._config = config or {}
-        self._extensions: dict[str, Any] = {}
-
-    def get_config(self, key: str, default: Any = None) -> Any:
-        """Get configuration value by key."""
-        return self._config.get(key, default)
-
-    def get_extension(self, name: str) -> Any:
-        """Get extension by name."""
-        return self._extensions.get(name)
-
-    def set_extension(self, name: str, extension: Any) -> None:
-        """Set extension by name."""
-        self._extensions[name] = extension
-
-    @contextmanager
-    def enter(self) -> Generator[None, None, None]:
-        """Enter null context (no-op)."""
-        yield
-
-
-class ExecutionContextBuilder:
-    """
-    Builder for creating ExecutionContext instances.
-
-    This provides a fluent API for building execution contexts.
-    """
-
-    def __init__(self) -> None:
-        self._app_context: AppContext | None = None
-        self._context_vars: contextvars.Context | None = None
-        self._user: Any = None
-
-    def with_app_context(self, app_context: AppContext) -> "ExecutionContextBuilder":
-        """Set application context."""
-        self._app_context = app_context
-        return self
-
-    def with_context_vars(self, context_vars: contextvars.Context) -> "ExecutionContextBuilder":
-        """Set context variables."""
-        self._context_vars = context_vars
-        return self
-
-    def with_user(self, user: Any) -> "ExecutionContextBuilder":
-        """Set user."""
-        self._user = user
-        return self
-
-    def build(self) -> ExecutionContext:
-        """Build the execution context."""
-        return ExecutionContext(
-            app_context=self._app_context,
-            context_vars=self._context_vars,
-            user=self._user,
-        )
-
-
-def capture_current_context() -> IExecutionContext:
-    """
-    Capture current execution context from the calling environment.
-
-    Returns:
-        IExecutionContext with captured context
-    """
-    from context import capture_current_context
-
-    return capture_current_context()

api/core/workflow/graph_engine/graph_engine.py

@@ -7,13 +7,15 @@ Domain-Driven Design principles for improved maintainability and testability.
 
 from __future__ import annotations
 
+import contextvars
 import logging
 import queue
 import threading
 from collections.abc import Generator
 from typing import TYPE_CHECKING, cast, final
 
-from core.workflow.context import capture_current_context
+from flask import Flask, current_app
+
 from core.workflow.enums import NodeExecutionType
 from core.workflow.graph import Graph
 from core.workflow.graph_events import (
@@ -157,8 +159,17 @@ class GraphEngine:
         self._layers: list[GraphEngineLayer] = []
 
         # === Worker Pool Setup ===
-        # Capture execution context for worker threads
-        execution_context = capture_current_context()
+        # Capture Flask app context for worker threads
+        flask_app: Flask | None = None
+        try:
+            app = current_app._get_current_object()  # type: ignore
+            if isinstance(app, Flask):
+                flask_app = app
+        except RuntimeError:
+            pass
+
+        # Capture context variables for worker threads
+        context_vars = contextvars.copy_context()
 
         # Create worker pool for parallel node execution
         self._worker_pool = WorkerPool(
@@ -166,7 +177,8 @@ class GraphEngine:
             event_queue=self._event_queue,
             graph=self._graph,
             layers=self._layers,
-            execution_context=execution_context,
+            flask_app=flask_app,
+            context_vars=context_vars,
             min_workers=self._min_workers,
             max_workers=self._max_workers,
             scale_up_threshold=self._scale_up_threshold,

api/core/workflow/graph_engine/worker.py

@@ -5,27 +5,26 @@ Workers pull node IDs from the ready_queue, execute nodes, and push events
 to the event_queue for the dispatcher to process.
 """
 
+import contextvars
 import queue
 import threading
 import time
 from collections.abc import Sequence
 from datetime import datetime
-from typing import TYPE_CHECKING, final
+from typing import final
 from uuid import uuid4
 
+from flask import Flask
 from typing_extensions import override
 
-from core.workflow.context import IExecutionContext
 from core.workflow.graph import Graph
 from core.workflow.graph_engine.layers.base import GraphEngineLayer
 from core.workflow.graph_events import GraphNodeEventBase, NodeRunFailedEvent
 from core.workflow.nodes.base.node import Node
+from libs.flask_utils import preserve_flask_contexts
 
 from .ready_queue import ReadyQueue
 
-if TYPE_CHECKING:
-    pass
-
 
 @final
 class Worker(threading.Thread):
@@ -45,7 +44,8 @@ class Worker(threading.Thread):
         layers: Sequence[GraphEngineLayer],
         stop_event: threading.Event,
         worker_id: int = 0,
-        execution_context: IExecutionContext | None = None,
+        flask_app: Flask | None = None,
+        context_vars: contextvars.Context | None = None,
     ) -> None:
         """
         Initialize worker thread.
@@ -56,17 +56,19 @@ class Worker(threading.Thread):
             graph: Graph containing nodes to execute
             layers: Graph engine layers for node execution hooks
             worker_id: Unique identifier for this worker
-            execution_context: Optional execution context for context preservation
+            flask_app: Optional Flask application for context preservation
+            context_vars: Optional context variables to preserve in worker thread
         """
         super().__init__(name=f"GraphWorker-{worker_id}", daemon=True)
         self._ready_queue = ready_queue
         self._event_queue = event_queue
         self._graph = graph
         self._worker_id = worker_id
-        self._execution_context = execution_context
+        self._flask_app = flask_app
+        self._context_vars = context_vars
+        self._last_task_time = time.time()
         self._stop_event = stop_event
         self._layers = layers if layers is not None else []
-        self._last_task_time = time.time()
 
     def stop(self) -> None:
         """Worker is controlled via shared stop_event from GraphEngine.
@@ -133,9 +135,11 @@ class Worker(threading.Thread):
 
         error: Exception | None = None
 
-        # Execute the node with preserved context if execution context is provided
-        if self._execution_context is not None:
-            with self._execution_context:
+        if self._flask_app and self._context_vars:
+            with preserve_flask_contexts(
+                flask_app=self._flask_app,
+                context_vars=self._context_vars,
+            ):
                 self._invoke_node_run_start_hooks(node)
                 try:
                     node_events = node.run()

api/core/workflow/graph_engine/worker_management/worker_pool.py

@@ -8,10 +8,9 @@ DynamicScaler, and WorkerFactory into a single class.
 import logging
 import queue
 import threading
-from typing import final
+from typing import TYPE_CHECKING, final
 
 from configs import dify_config
-from core.workflow.context import IExecutionContext
 from core.workflow.graph import Graph
 from core.workflow.graph_events import GraphNodeEventBase
 
@@ -21,6 +20,11 @@ from ..worker import Worker
 
 logger = logging.getLogger(__name__)
 
+if TYPE_CHECKING:
+    from contextvars import Context
+
+    from flask import Flask
+
 
 @final
 class WorkerPool:
@@ -38,7 +42,8 @@ class WorkerPool:
         graph: Graph,
         layers: list[GraphEngineLayer],
         stop_event: threading.Event,
-        execution_context: IExecutionContext | None = None,
+        flask_app: "Flask | None" = None,
+        context_vars: "Context | None" = None,
         min_workers: int | None = None,
         max_workers: int | None = None,
         scale_up_threshold: int | None = None,
@@ -52,7 +57,8 @@ class WorkerPool:
             event_queue: Queue for worker events
             graph: The workflow graph
             layers: Graph engine layers for node execution hooks
-            execution_context: Optional execution context for context preservation
+            flask_app: Optional Flask app for context preservation
+            context_vars: Optional context variables
             min_workers: Minimum number of workers
             max_workers: Maximum number of workers
             scale_up_threshold: Queue depth to trigger scale up
@@ -61,7 +67,8 @@ class WorkerPool:
         self._ready_queue = ready_queue
         self._event_queue = event_queue
         self._graph = graph
-        self._execution_context = execution_context
+        self._flask_app = flask_app
+        self._context_vars = context_vars
         self._layers = layers
 
         # Scaling parameters with defaults
@@ -145,7 +152,8 @@ class WorkerPool:
             graph=self._graph,
             layers=self._layers,
             worker_id=worker_id,
-            execution_context=self._execution_context,
+            flask_app=self._flask_app,
+            context_vars=self._context_vars,
             stop_event=self._stop_event,
         )
 

api/core/workflow/nodes/iteration/iteration_node.py

@@ -1,9 +1,11 @@
+import contextvars
 import logging
 from collections.abc import Generator, Mapping, Sequence
 from concurrent.futures import Future, ThreadPoolExecutor, as_completed
 from datetime import UTC, datetime
 from typing import TYPE_CHECKING, Any, NewType, cast
 
+from flask import Flask, current_app
 from typing_extensions import TypeIs
 
 from core.model_runtime.entities.llm_entities import LLMUsage
@@ -37,6 +39,7 @@ from core.workflow.nodes.base.node import Node
 from core.workflow.nodes.iteration.entities import ErrorHandleMode, IterationNodeData
 from core.workflow.runtime import VariablePool
 from libs.datetime_utils import naive_utc_now
+from libs.flask_utils import preserve_flask_contexts
 
 from .exc import (
     InvalidIteratorValueError,
@@ -48,7 +51,6 @@ from .exc import (
 )
 
 if TYPE_CHECKING:
-    from core.workflow.context import IExecutionContext
     from core.workflow.graph_engine import GraphEngine
 
 logger = logging.getLogger(__name__)
@@ -250,7 +252,8 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]):
                     self._execute_single_iteration_parallel,
                     index=index,
                     item=item,
-                    execution_context=self._capture_execution_context(),
+                    flask_app=current_app._get_current_object(),  # type: ignore
+                    context_vars=contextvars.copy_context(),
                 )
                 future_to_index[future] = index
 
@@ -303,10 +306,11 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]):
         self,
         index: int,
         item: object,
-        execution_context: "IExecutionContext",
+        flask_app: Flask,
+        context_vars: contextvars.Context,
     ) -> tuple[datetime, list[GraphNodeEventBase], object | None, dict[str, Variable], LLMUsage]:
         """Execute a single iteration in parallel mode and return results."""
-        with execution_context:
+        with preserve_flask_contexts(flask_app=flask_app, context_vars=context_vars):
             iter_start_at = datetime.now(UTC).replace(tzinfo=None)
             events: list[GraphNodeEventBase] = []
             outputs_temp: list[object] = []
@@ -335,12 +339,6 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]):
                 graph_engine.graph_runtime_state.llm_usage,
             )
 
-    def _capture_execution_context(self) -> "IExecutionContext":
-        """Capture current execution context for parallel iterations."""
-        from core.workflow.context import capture_current_context
-
-        return capture_current_context()
-
     def _handle_iteration_success(
         self,
         started_at: datetime,

api/docker/entrypoint.sh

@@ -119,16 +119,14 @@ elif [[ "${MODE}" == "job" ]]; then
 
 else
   if [[ "${DEBUG}" == "true" ]]; then
-    export HOST=${DIFY_BIND_ADDRESS:-0.0.0.0}
-    export PORT=${DIFY_PORT:-5001}
-    exec python -m app
+    exec flask run --host=${DIFY_BIND_ADDRESS:-0.0.0.0} --port=${DIFY_PORT:-5001} --debug
   else
     exec gunicorn \
       --bind "${DIFY_BIND_ADDRESS:-0.0.0.0}:${DIFY_PORT:-5001}" \
       --workers ${SERVER_WORKER_AMOUNT:-1} \
-      --worker-class ${SERVER_WORKER_CLASS:-geventwebsocket.gunicorn.workers.GeventWebSocketWorker} \
+      --worker-class ${SERVER_WORKER_CLASS:-gevent} \
       --worker-connections ${SERVER_WORKER_CONNECTIONS:-10} \
       --timeout ${GUNICORN_TIMEOUT:-200} \
-      app:socketio_app
+      app:app
   fi
 fi

api/extensions/ext_socketio.py

@@ -1,5 +0,0 @@
-import socketio  # type: ignore[reportMissingTypeStubs]
-
-from configs import dify_config
-
-sio = socketio.Server(async_mode="gevent", cors_allowed_origins=dify_config.CONSOLE_CORS_ALLOW_ORIGINS)

api/fields/online_user_fields.py

@@ -1,17 +0,0 @@
-from flask_restx import fields
-
-online_user_partial_fields = {
-    "user_id": fields.String,
-    "username": fields.String,
-    "avatar": fields.String,
-    "sid": fields.String,
-}
-
-workflow_online_users_fields = {
-    "workflow_id": fields.String,
-    "users": fields.List(fields.Nested(online_user_partial_fields)),
-}
-
-online_user_list_fields = {
-    "data": fields.List(fields.Nested(workflow_online_users_fields)),
-}

api/fields/workflow_comment_fields.py

@@ -1,96 +0,0 @@
-from flask_restx import fields
-
-from libs.helper import AvatarUrlField, TimestampField
-
-# basic account fields for comments
-account_fields = {
-    "id": fields.String,
-    "name": fields.String,
-    "email": fields.String,
-    "avatar_url": AvatarUrlField,
-}
-
-# Comment mention fields
-workflow_comment_mention_fields = {
-    "mentioned_user_id": fields.String,
-    "mentioned_user_account": fields.Nested(account_fields, allow_null=True),
-    "reply_id": fields.String,
-}
-
-# Comment reply fields
-workflow_comment_reply_fields = {
-    "id": fields.String,
-    "content": fields.String,
-    "created_by": fields.String,
-    "created_by_account": fields.Nested(account_fields, allow_null=True),
-    "created_at": TimestampField,
-}
-
-# Basic comment fields (for list views)
-workflow_comment_basic_fields = {
-    "id": fields.String,
-    "position_x": fields.Float,
-    "position_y": fields.Float,
-    "content": fields.String,
-    "created_by": fields.String,
-    "created_by_account": fields.Nested(account_fields, allow_null=True),
-    "created_at": TimestampField,
-    "updated_at": TimestampField,
-    "resolved": fields.Boolean,
-    "resolved_at": TimestampField,
-    "resolved_by": fields.String,
-    "resolved_by_account": fields.Nested(account_fields, allow_null=True),
-    "reply_count": fields.Integer,
-    "mention_count": fields.Integer,
-    "participants": fields.List(fields.Nested(account_fields)),
-}
-
-# Detailed comment fields (for single comment view)
-workflow_comment_detail_fields = {
-    "id": fields.String,
-    "position_x": fields.Float,
-    "position_y": fields.Float,
-    "content": fields.String,
-    "created_by": fields.String,
-    "created_by_account": fields.Nested(account_fields, allow_null=True),
-    "created_at": TimestampField,
-    "updated_at": TimestampField,
-    "resolved": fields.Boolean,
-    "resolved_at": TimestampField,
-    "resolved_by": fields.String,
-    "resolved_by_account": fields.Nested(account_fields, allow_null=True),
-    "replies": fields.List(fields.Nested(workflow_comment_reply_fields)),
-    "mentions": fields.List(fields.Nested(workflow_comment_mention_fields)),
-}
-
-# Comment creation response fields (simplified)
-workflow_comment_create_fields = {
-    "id": fields.String,
-    "created_at": TimestampField,
-}
-
-# Comment update response fields (simplified)
-workflow_comment_update_fields = {
-    "id": fields.String,
-    "updated_at": TimestampField,
-}
-
-# Comment resolve response fields
-workflow_comment_resolve_fields = {
-    "id": fields.String,
-    "resolved": fields.Boolean,
-    "resolved_at": TimestampField,
-    "resolved_by": fields.String,
-}
-
-# Reply creation response fields (simplified)
-workflow_comment_reply_create_fields = {
-    "id": fields.String,
-    "created_at": TimestampField,
-}
-
-# Reply update response fields
-workflow_comment_reply_update_fields = {
-    "id": fields.String,
-    "updated_at": TimestampField,
-}

api/libs/workspace_permission.py

@@ -1,74 +0,0 @@
-"""
-Workspace permission helper functions.
-
-These helpers check both billing/plan level and workspace-specific policy level permissions.
-Checks are performed at two levels:
-1. Billing/plan level - via FeatureService (e.g., SANDBOX plan restrictions)
-2. Workspace policy level - via EnterpriseService (admin-configured per workspace)
-"""
-
-import logging
-
-from werkzeug.exceptions import Forbidden
-
-from configs import dify_config
-from services.enterprise.enterprise_service import EnterpriseService
-from services.feature_service import FeatureService
-
-logger = logging.getLogger(__name__)
-
-
-def check_workspace_member_invite_permission(workspace_id: str) -> None:
-    """
-    Check if workspace allows member invitations at both billing and policy levels.
-
-    Checks performed:
-    1. Billing/plan level - For future expansion (currently no plan-level restriction)
-    2. Enterprise policy level - Admin-configured workspace permission
-
-    Args:
-        workspace_id: The workspace ID to check permissions for
-
-    Raises:
-        Forbidden: If either billing plan or workspace policy prohibits member invitations
-    """
-    # Check enterprise workspace policy level (only if enterprise enabled)
-    if dify_config.ENTERPRISE_ENABLED:
-        try:
-            permission = EnterpriseService.WorkspacePermissionService.get_permission(workspace_id)
-            if not permission.allow_member_invite:
-                raise Forbidden("Workspace policy prohibits member invitations")
-        except Forbidden:
-            raise
-        except Exception:
-            logger.exception("Failed to check workspace invite permission for %s", workspace_id)
-
-
-def check_workspace_owner_transfer_permission(workspace_id: str) -> None:
-    """
-    Check if workspace allows owner transfer at both billing and policy levels.
-
-    Checks performed:
-    1. Billing/plan level - SANDBOX plan blocks owner transfer
-    2. Enterprise policy level - Admin-configured workspace permission
-
-    Args:
-        workspace_id: The workspace ID to check permissions for
-
-    Raises:
-        Forbidden: If either billing plan or workspace policy prohibits ownership transfer
-    """
-    features = FeatureService.get_features(workspace_id)
-    if not features.is_allow_transfer_workspace:
-        raise Forbidden("Your current plan does not allow workspace ownership transfer")
-
-    # Check enterprise workspace policy level (only if enterprise enabled)
-    if dify_config.ENTERPRISE_ENABLED:
-        try:
-            permission = EnterpriseService.WorkspacePermissionService.get_permission(workspace_id)
-            if not permission.allow_owner_transfer:
-                raise Forbidden("Workspace policy prohibits ownership transfer")
-        except Forbidden:
-            raise
-        except Exception:
-            logger.exception("Failed to check workspace transfer permission for %s", workspace_id)

api/migrations/versions/2026_01_17_1726-227822d22895_add_workflow_comments_table.py

@@ -1,90 +0,0 @@
-"""Add workflow comments table
-
-Revision ID: 227822d22895
-Revises: 288345cd01d1
-Create Date: 2025-08-22 17:26:15.255980
-
-"""
-from alembic import op
-import models as models
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '227822d22895'
-down_revision = '288345cd01d1'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('workflow_comments',
-    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuidv7()'), nullable=False),
-    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-    sa.Column('app_id', models.types.StringUUID(), nullable=False),
-    sa.Column('position_x', sa.Float(), nullable=False),
-    sa.Column('position_y', sa.Float(), nullable=False),
-    sa.Column('content', sa.Text(), nullable=False),
-    sa.Column('created_by', models.types.StringUUID(), nullable=False),
-    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-    sa.Column('resolved', sa.Boolean(), server_default=sa.text('false'), nullable=False),
-    sa.Column('resolved_at', sa.DateTime(), nullable=True),
-    sa.Column('resolved_by', models.types.StringUUID(), nullable=True),
-    sa.PrimaryKeyConstraint('id', name='workflow_comments_pkey')
-    )
-    with op.batch_alter_table('workflow_comments', schema=None) as batch_op:
-        batch_op.create_index('workflow_comments_app_idx', ['tenant_id', 'app_id'], unique=False)
-        batch_op.create_index('workflow_comments_created_at_idx', ['created_at'], unique=False)
-
-    op.create_table('workflow_comment_replies',
-    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuidv7()'), nullable=False),
-    sa.Column('comment_id', models.types.StringUUID(), nullable=False),
-    sa.Column('content', sa.Text(), nullable=False),
-    sa.Column('created_by', models.types.StringUUID(), nullable=False),
-    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-    sa.ForeignKeyConstraint(['comment_id'], ['workflow_comments.id'], name=op.f('workflow_comment_replies_comment_id_fkey'), ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('id', name='workflow_comment_replies_pkey')
-    )
-    with op.batch_alter_table('workflow_comment_replies', schema=None) as batch_op:
-        batch_op.create_index('comment_replies_comment_idx', ['comment_id'], unique=False)
-        batch_op.create_index('comment_replies_created_at_idx', ['created_at'], unique=False)
-
-    op.create_table('workflow_comment_mentions',
-    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuidv7()'), nullable=False),
-    sa.Column('comment_id', models.types.StringUUID(), nullable=False),
-    sa.Column('reply_id', models.types.StringUUID(), nullable=True),
-    sa.Column('mentioned_user_id', models.types.StringUUID(), nullable=False),
-    sa.ForeignKeyConstraint(['comment_id'], ['workflow_comments.id'], name=op.f('workflow_comment_mentions_comment_id_fkey'), ondelete='CASCADE'),
-    sa.ForeignKeyConstraint(['reply_id'], ['workflow_comment_replies.id'], name=op.f('workflow_comment_mentions_reply_id_fkey'), ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('id', name='workflow_comment_mentions_pkey')
-    )
-    with op.batch_alter_table('workflow_comment_mentions', schema=None) as batch_op:
-        batch_op.create_index('comment_mentions_comment_idx', ['comment_id'], unique=False)
-        batch_op.create_index('comment_mentions_reply_idx', ['reply_id'], unique=False)
-        batch_op.create_index('comment_mentions_user_idx', ['mentioned_user_id'], unique=False)
-
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('workflow_comment_mentions', schema=None) as batch_op:
-        batch_op.drop_index('comment_mentions_user_idx')
-        batch_op.drop_index('comment_mentions_reply_idx')
-        batch_op.drop_index('comment_mentions_comment_idx')
-
-    op.drop_table('workflow_comment_mentions')
-    with op.batch_alter_table('workflow_comment_replies', schema=None) as batch_op:
-        batch_op.drop_index('comment_replies_created_at_idx')
-        batch_op.drop_index('comment_replies_comment_idx')
-
-    op.drop_table('workflow_comment_replies')
-    with op.batch_alter_table('workflow_comments', schema=None) as batch_op:
-        batch_op.drop_index('workflow_comments_created_at_idx')
-        batch_op.drop_index('workflow_comments_app_idx')
-
-    op.drop_table('workflow_comments')
-    # ### end Alembic commands ###

api/models/__init__.py

@@ -9,11 +9,6 @@ from .account import (
     TenantStatus,
 )
 from .api_based_extension import APIBasedExtension, APIBasedExtensionPoint
-from .comment import (
-    WorkflowComment,
-    WorkflowCommentMention,
-    WorkflowCommentReply,
-)
 from .dataset import (
     AppDatasetJoin,
     Dataset,
@@ -202,9 +197,6 @@ __all__ = [
     "Workflow",
     "WorkflowAppLog",
     "WorkflowAppLogCreatedFrom",
-    "WorkflowComment",
-    "WorkflowCommentMention",
-    "WorkflowCommentReply",
     "WorkflowNodeExecutionModel",
     "WorkflowNodeExecutionOffload",
     "WorkflowNodeExecutionTriggeredFrom",

api/models/comment.py

@@ -1,210 +0,0 @@
-"""Workflow comment models."""
-
-from datetime import datetime
-from typing import Optional
-
-from sqlalchemy import Index, func
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from .account import Account
-from .base import Base
-from .engine import db
-from .types import StringUUID
-
-
-class WorkflowComment(Base):
-    """Workflow comment model for canvas commenting functionality.
-
-    Comments are associated with apps rather than specific workflow versions,
-    since an app has only one draft workflow at a time and comments should persist
-    across workflow version changes.
-
-    Attributes:
-        id: Comment ID
-        tenant_id: Workspace ID
-        app_id: App ID (primary association, comments belong to apps)
-        position_x: X coordinate on canvas
-        position_y: Y coordinate on canvas
-        content: Comment content
-        created_by: Creator account ID
-        created_at: Creation time
-        updated_at: Last update time
-        resolved: Whether comment is resolved
-        resolved_at: Resolution time
-        resolved_by: Resolver account ID
-    """
-
-    __tablename__ = "workflow_comments"
-    __table_args__ = (
-        db.PrimaryKeyConstraint("id", name="workflow_comments_pkey"),
-        Index("workflow_comments_app_idx", "tenant_id", "app_id"),
-        Index("workflow_comments_created_at_idx", "created_at"),
-    )
-
-    id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuidv7()"))
-    tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    position_x: Mapped[float] = mapped_column(db.Float)
-    position_y: Mapped[float] = mapped_column(db.Float)
-    content: Mapped[str] = mapped_column(db.Text, nullable=False)
-    created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
-    updated_at: Mapped[datetime] = mapped_column(
-        db.DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
-    )
-    resolved: Mapped[bool] = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
-    resolved_at: Mapped[datetime | None] = mapped_column(db.DateTime)
-    resolved_by: Mapped[str | None] = mapped_column(StringUUID)
-
-    # Relationships
-    replies: Mapped[list["WorkflowCommentReply"]] = relationship(
-        "WorkflowCommentReply", back_populates="comment", cascade="all, delete-orphan"
-    )
-    mentions: Mapped[list["WorkflowCommentMention"]] = relationship(
-        "WorkflowCommentMention", back_populates="comment", cascade="all, delete-orphan"
-    )
-
-    @property
-    def created_by_account(self):
-        """Get creator account."""
-        if hasattr(self, "_created_by_account_cache"):
-            return self._created_by_account_cache
-        return db.session.get(Account, self.created_by)
-
-    def cache_created_by_account(self, account: Account | None) -> None:
-        """Cache creator account to avoid extra queries."""
-        self._created_by_account_cache = account
-
-    @property
-    def resolved_by_account(self):
-        """Get resolver account."""
-        if hasattr(self, "_resolved_by_account_cache"):
-            return self._resolved_by_account_cache
-        if self.resolved_by:
-            return db.session.get(Account, self.resolved_by)
-        return None
-
-    def cache_resolved_by_account(self, account: Account | None) -> None:
-        """Cache resolver account to avoid extra queries."""
-        self._resolved_by_account_cache = account
-
-    @property
-    def reply_count(self):
-        """Get reply count."""
-        return len(self.replies)
-
-    @property
-    def mention_count(self):
-        """Get mention count."""
-        return len(self.mentions)
-
-    @property
-    def participants(self):
-        """Get all participants (creator + repliers + mentioned users)."""
-        participant_ids = set()
-
-        # Add comment creator
-        participant_ids.add(self.created_by)
-
-        # Add reply creators
-        participant_ids.update(reply.created_by for reply in self.replies)
-
-        # Add mentioned users
-        participant_ids.update(mention.mentioned_user_id for mention in self.mentions)
-
-        # Get account objects
-        participants = []
-        for user_id in participant_ids:
-            account = db.session.get(Account, user_id)
-            if account:
-                participants.append(account)
-
-        return participants
-
-
-class WorkflowCommentReply(Base):
-    """Workflow comment reply model.
-
-    Attributes:
-        id: Reply ID
-        comment_id: Parent comment ID
-        content: Reply content
-        created_by: Creator account ID
-        created_at: Creation time
-    """
-
-    __tablename__ = "workflow_comment_replies"
-    __table_args__ = (
-        db.PrimaryKeyConstraint("id", name="workflow_comment_replies_pkey"),
-        Index("comment_replies_comment_idx", "comment_id"),
-        Index("comment_replies_created_at_idx", "created_at"),
-    )
-
-    id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuidv7()"))
-    comment_id: Mapped[str] = mapped_column(
-        StringUUID, db.ForeignKey("workflow_comments.id", ondelete="CASCADE"), nullable=False
-    )
-    content: Mapped[str] = mapped_column(db.Text, nullable=False)
-    created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    created_at: Mapped[datetime] = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
-    updated_at: Mapped[datetime] = mapped_column(
-        db.DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
-    )
-    # Relationships
-    comment: Mapped["WorkflowComment"] = relationship("WorkflowComment", back_populates="replies")
-
-    @property
-    def created_by_account(self):
-        """Get creator account."""
-        if hasattr(self, "_created_by_account_cache"):
-            return self._created_by_account_cache
-        return db.session.get(Account, self.created_by)
-
-    def cache_created_by_account(self, account: Account | None) -> None:
-        """Cache creator account to avoid extra queries."""
-        self._created_by_account_cache = account
-
-
-class WorkflowCommentMention(Base):
-    """Workflow comment mention model.
-
-    Mentions are only for internal accounts since end users
-    cannot access workflow canvas and commenting features.
-
-    Attributes:
-        id: Mention ID
-        comment_id: Parent comment ID
-        mentioned_user_id: Mentioned account ID
-    """
-
-    __tablename__ = "workflow_comment_mentions"
-    __table_args__ = (
-        db.PrimaryKeyConstraint("id", name="workflow_comment_mentions_pkey"),
-        Index("comment_mentions_comment_idx", "comment_id"),
-        Index("comment_mentions_reply_idx", "reply_id"),
-        Index("comment_mentions_user_idx", "mentioned_user_id"),
-    )
-
-    id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuidv7()"))
-    comment_id: Mapped[str] = mapped_column(
-        StringUUID, db.ForeignKey("workflow_comments.id", ondelete="CASCADE"), nullable=False
-    )
-    reply_id: Mapped[str | None] = mapped_column(
-        StringUUID, db.ForeignKey("workflow_comment_replies.id", ondelete="CASCADE"), nullable=True
-    )
-    mentioned_user_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-
-    # Relationships
-    comment: Mapped["WorkflowComment"] = relationship("WorkflowComment", back_populates="mentions")
-    reply: Mapped[Optional["WorkflowCommentReply"]] = relationship("WorkflowCommentReply")
-
-    @property
-    def mentioned_user_account(self):
-        """Get mentioned account."""
-        if hasattr(self, "_mentioned_user_account_cache"):
-            return self._mentioned_user_account_cache
-        return db.session.get(Account, self.mentioned_user_id)
-
-    def cache_mentioned_user_account(self, account: Account | None) -> None:
-        """Cache mentioned account to avoid extra queries."""
-        self._mentioned_user_account_cache = account

api/models/workflow.py

@@ -401,7 +401,7 @@ class Workflow(Base):  # bug
 
         :return: hash
         """
-        entity = {"graph": self.graph_dict}
+        entity = {"graph": self.graph_dict, "features": self.features_dict}
 
         return helper.generate_text_hash(json.dumps(entity, sort_keys=True))
 

api/pyproject.toml

@@ -21,7 +21,6 @@ dependencies = [
     "flask-orjson~=2.0.0",
     "flask-sqlalchemy~=3.1.1",
     "gevent~=25.9.1",
-    "gevent-websocket~=0.10.1",
     "gmpy2~=2.2.1",
     "google-api-core==2.18.0",
     "google-api-python-client==2.90.0",
@@ -73,7 +72,6 @@ dependencies = [
     "pypdfium2==5.2.0",
     "python-docx~=1.1.0",
     "python-dotenv==1.0.1",
-    "python-socketio~=5.13.0",
     "pyyaml~=6.0.1",
     "readabilipy~=0.3.0",
     "redis[hiredis]~=6.1.0",

api/repositories/workflow_collaboration_repository.py

@@ -1,147 +0,0 @@
-from __future__ import annotations
-
-import json
-from typing import TypedDict
-
-from extensions.ext_redis import redis_client
-
-SESSION_STATE_TTL_SECONDS = 3600
-WORKFLOW_ONLINE_USERS_PREFIX = "workflow_online_users:"
-WORKFLOW_LEADER_PREFIX = "workflow_leader:"
-WS_SID_MAP_PREFIX = "ws_sid_map:"
-
-
-class WorkflowSessionInfo(TypedDict):
-    user_id: str
-    username: str
-    avatar: str | None
-    sid: str
-    connected_at: int
-
-
-class SidMapping(TypedDict):
-    workflow_id: str
-    user_id: str
-
-
-class WorkflowCollaborationRepository:
-    def __init__(self) -> None:
-        self._redis = redis_client
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}(redis_client={self._redis})"
-
-    @staticmethod
-    def workflow_key(workflow_id: str) -> str:
-        return f"{WORKFLOW_ONLINE_USERS_PREFIX}{workflow_id}"
-
-    @staticmethod
-    def leader_key(workflow_id: str) -> str:
-        return f"{WORKFLOW_LEADER_PREFIX}{workflow_id}"
-
-    @staticmethod
-    def sid_key(sid: str) -> str:
-        return f"{WS_SID_MAP_PREFIX}{sid}"
-
-    @staticmethod
-    def _decode(value: str | bytes | None) -> str | None:
-        if value is None:
-            return None
-        if isinstance(value, bytes):
-            return value.decode("utf-8")
-        return value
-
-    def refresh_session_state(self, workflow_id: str, sid: str) -> None:
-        workflow_key = self.workflow_key(workflow_id)
-        sid_key = self.sid_key(sid)
-        if self._redis.exists(workflow_key):
-            self._redis.expire(workflow_key, SESSION_STATE_TTL_SECONDS)
-        if self._redis.exists(sid_key):
-            self._redis.expire(sid_key, SESSION_STATE_TTL_SECONDS)
-
-    def set_session_info(self, workflow_id: str, session_info: WorkflowSessionInfo) -> None:
-        workflow_key = self.workflow_key(workflow_id)
-        self._redis.hset(workflow_key, session_info["sid"], json.dumps(session_info))
-        self._redis.set(
-            self.sid_key(session_info["sid"]),
-            json.dumps({"workflow_id": workflow_id, "user_id": session_info["user_id"]}),
-            ex=SESSION_STATE_TTL_SECONDS,
-        )
-        self.refresh_session_state(workflow_id, session_info["sid"])
-
-    def get_sid_mapping(self, sid: str) -> SidMapping | None:
-        raw = self._redis.get(self.sid_key(sid))
-        if not raw:
-            return None
-        value = self._decode(raw)
-        if not value:
-            return None
-        try:
-            return json.loads(value)
-        except (TypeError, json.JSONDecodeError):
-            return None
-
-    def delete_session(self, workflow_id: str, sid: str) -> None:
-        self._redis.hdel(self.workflow_key(workflow_id), sid)
-        self._redis.delete(self.sid_key(sid))
-
-    def session_exists(self, workflow_id: str, sid: str) -> bool:
-        return bool(self._redis.hexists(self.workflow_key(workflow_id), sid))
-
-    def sid_mapping_exists(self, sid: str) -> bool:
-        return bool(self._redis.exists(self.sid_key(sid)))
-
-    def get_session_sids(self, workflow_id: str) -> list[str]:
-        raw_sids = self._redis.hkeys(self.workflow_key(workflow_id))
-        decoded_sids: list[str] = []
-        for sid in raw_sids:
-            decoded = self._decode(sid)
-            if decoded:
-                decoded_sids.append(decoded)
-        return decoded_sids
-
-    def list_sessions(self, workflow_id: str) -> list[WorkflowSessionInfo]:
-        sessions_json = self._redis.hgetall(self.workflow_key(workflow_id))
-        users: list[WorkflowSessionInfo] = []
-
-        for session_info_json in sessions_json.values():
-            value = self._decode(session_info_json)
-            if not value:
-                continue
-            try:
-                session_info = json.loads(value)
-            except (TypeError, json.JSONDecodeError):
-                continue
-
-            if not isinstance(session_info, dict):
-                continue
-            if "user_id" not in session_info or "username" not in session_info or "sid" not in session_info:
-                continue
-
-            users.append(
-                {
-                    "user_id": str(session_info["user_id"]),
-                    "username": str(session_info["username"]),
-                    "avatar": session_info.get("avatar"),
-                    "sid": str(session_info["sid"]),
-                    "connected_at": int(session_info.get("connected_at") or 0),
-                }
-            )
-
-        return users
-
-    def get_current_leader(self, workflow_id: str) -> str | None:
-        raw = self._redis.get(self.leader_key(workflow_id))
-        return self._decode(raw)
-
-    def set_leader_if_absent(self, workflow_id: str, sid: str) -> bool:
-        return bool(self._redis.set(self.leader_key(workflow_id), sid, nx=True, ex=SESSION_STATE_TTL_SECONDS))
-
-    def set_leader(self, workflow_id: str, sid: str) -> None:
-        self._redis.set(self.leader_key(workflow_id), sid, ex=SESSION_STATE_TTL_SECONDS)
-
-    def delete_leader(self, workflow_id: str) -> None:
-        self._redis.delete(self.leader_key(workflow_id))
-
-    def expire_leader(self, workflow_id: str) -> None:
-        self._redis.expire(self.leader_key(workflow_id), SESSION_STATE_TTL_SECONDS)

api/services/account_service.py

@@ -1381,11 +1381,6 @@ class RegisterService:
         normalized_email = email.lower()
 
         """Invite new member"""
-        # Check workspace permission for member invitations
-        from libs.workspace_permission import check_workspace_member_invite_permission
-
-        check_workspace_member_invite_permission(tenant.id)
-
         with Session(db.engine) as session:
             account = AccountService.get_account_by_email_with_case_fallback(email, session=session)
 

api/services/dataset_service.py

@@ -13,11 +13,10 @@ import sqlalchemy as sa
 from redis.exceptions import LockNotOwnedError
 from sqlalchemy import exists, func, select
 from sqlalchemy.orm import Session
-from werkzeug.exceptions import Forbidden, NotFound
+from werkzeug.exceptions import NotFound
 
 from configs import dify_config
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
-from core.file import helpers as file_helpers
 from core.helper.name_generator import generate_incremental_name
 from core.model_manager import ModelManager
 from core.model_runtime.entities.model_entities import ModelFeature, ModelType
@@ -74,7 +73,6 @@ from services.errors.document import DocumentIndexingError
 from services.errors.file import FileNotExistsError
 from services.external_knowledge_service import ExternalDatasetService
 from services.feature_service import FeatureModel, FeatureService
-from services.file_service import FileService
 from services.rag_pipeline.rag_pipeline import RagPipelineService
 from services.tag_service import TagService
 from services.vector_service import VectorService
@@ -1164,7 +1162,6 @@ class DocumentService:
             Document.archived.is_(True),
         ),
     }
-    DOCUMENT_BATCH_DOWNLOAD_ZIP_FILENAME_EXTENSION = ".zip"
 
     @classmethod
     def normalize_display_status(cls, status: str | None) -> str | None:
@@ -1291,143 +1288,6 @@ class DocumentService:
         else:
             return None
 
-    @staticmethod
-    def get_documents_by_ids(dataset_id: str, document_ids: Sequence[str]) -> Sequence[Document]:
-        """Fetch documents for a dataset in a single batch query."""
-        if not document_ids:
-            return []
-        document_id_list: list[str] = [str(document_id) for document_id in document_ids]
-        # Fetch all requested documents in one query to avoid N+1 lookups.
-        documents: Sequence[Document] = db.session.scalars(
-            select(Document).where(
-                Document.dataset_id == dataset_id,
-                Document.id.in_(document_id_list),
-            )
-        ).all()
-        return documents
-
-    @staticmethod
-    def get_document_download_url(document: Document) -> str:
-        """
-        Return a signed download URL for an upload-file document.
-        """
-        upload_file = DocumentService._get_upload_file_for_upload_file_document(document)
-        return file_helpers.get_signed_file_url(upload_file_id=upload_file.id, as_attachment=True)
-
-    @staticmethod
-    def prepare_document_batch_download_zip(
-        *,
-        dataset_id: str,
-        document_ids: Sequence[str],
-        tenant_id: str,
-        current_user: Account,
-    ) -> tuple[list[UploadFile], str]:
-        """
-        Resolve upload files for batch ZIP downloads and generate a client-visible filename.
-        """
-        dataset = DatasetService.get_dataset(dataset_id)
-        if not dataset:
-            raise NotFound("Dataset not found.")
-        try:
-            DatasetService.check_dataset_permission(dataset, current_user)
-        except NoPermissionError as e:
-            raise Forbidden(str(e))
-
-        upload_files_by_document_id = DocumentService._get_upload_files_by_document_id_for_zip_download(
-            dataset_id=dataset_id,
-            document_ids=document_ids,
-            tenant_id=tenant_id,
-        )
-        upload_files = [upload_files_by_document_id[document_id] for document_id in document_ids]
-        download_name = DocumentService._generate_document_batch_download_zip_filename()
-        return upload_files, download_name
-
-    @staticmethod
-    def _generate_document_batch_download_zip_filename() -> str:
-        """
-        Generate a random attachment filename for the batch download ZIP.
-        """
-        return f"{uuid.uuid4().hex}{DocumentService.DOCUMENT_BATCH_DOWNLOAD_ZIP_FILENAME_EXTENSION}"
-
-    @staticmethod
-    def _get_upload_file_id_for_upload_file_document(
-        document: Document,
-        *,
-        invalid_source_message: str,
-        missing_file_message: str,
-    ) -> str:
-        """
-        Normalize and validate `Document -> UploadFile` linkage for download flows.
-        """
-        if document.data_source_type != "upload_file":
-            raise NotFound(invalid_source_message)
-
-        data_source_info: dict[str, Any] = document.data_source_info_dict or {}
-        upload_file_id: str | None = data_source_info.get("upload_file_id")
-        if not upload_file_id:
-            raise NotFound(missing_file_message)
-
-        return str(upload_file_id)
-
-    @staticmethod
-    def _get_upload_file_for_upload_file_document(document: Document) -> UploadFile:
-        """
-        Load the `UploadFile` row for an upload-file document.
-        """
-        upload_file_id = DocumentService._get_upload_file_id_for_upload_file_document(
-            document,
-            invalid_source_message="Document does not have an uploaded file to download.",
-            missing_file_message="Uploaded file not found.",
-        )
-        upload_files_by_id = FileService.get_upload_files_by_ids(document.tenant_id, [upload_file_id])
-        upload_file = upload_files_by_id.get(upload_file_id)
-        if not upload_file:
-            raise NotFound("Uploaded file not found.")
-        return upload_file
-
-    @staticmethod
-    def _get_upload_files_by_document_id_for_zip_download(
-        *,
-        dataset_id: str,
-        document_ids: Sequence[str],
-        tenant_id: str,
-    ) -> dict[str, UploadFile]:
-        """
-        Batch load upload files keyed by document id for ZIP downloads.
-        """
-        document_id_list: list[str] = [str(document_id) for document_id in document_ids]
-
-        documents = DocumentService.get_documents_by_ids(dataset_id, document_id_list)
-        documents_by_id: dict[str, Document] = {str(document.id): document for document in documents}
-
-        missing_document_ids: set[str] = set(document_id_list) - set(documents_by_id.keys())
-        if missing_document_ids:
-            raise NotFound("Document not found.")
-
-        upload_file_ids: list[str] = []
-        upload_file_ids_by_document_id: dict[str, str] = {}
-        for document_id, document in documents_by_id.items():
-            if document.tenant_id != tenant_id:
-                raise Forbidden("No permission.")
-
-            upload_file_id = DocumentService._get_upload_file_id_for_upload_file_document(
-                document,
-                invalid_source_message="Only uploaded-file documents can be downloaded as ZIP.",
-                missing_file_message="Only uploaded-file documents can be downloaded as ZIP.",
-            )
-            upload_file_ids.append(upload_file_id)
-            upload_file_ids_by_document_id[document_id] = upload_file_id
-
-        upload_files_by_id = FileService.get_upload_files_by_ids(tenant_id, upload_file_ids)
-        missing_upload_file_ids: set[str] = set(upload_file_ids) - set(upload_files_by_id.keys())
-        if missing_upload_file_ids:
-            raise NotFound("Only uploaded-file documents can be downloaded as ZIP.")
-
-        return {
-            document_id: upload_files_by_id[upload_file_id]
-            for document_id, upload_file_id in upload_file_ids_by_document_id.items()
-        }
-
     @staticmethod
     def get_document_by_id(document_id: str) -> Document | None:
         document = db.session.query(Document).where(Document.id == document_id).first()

api/services/enterprise/enterprise_service.py

@@ -13,23 +13,6 @@ class WebAppSettings(BaseModel):
     )
 
 
-class WorkspacePermission(BaseModel):
-    workspace_id: str = Field(
-        description="The ID of the workspace.",
-        alias="workspaceId",
-    )
-    allow_member_invite: bool = Field(
-        description="Whether to allow members to invite new members to the workspace.",
-        default=False,
-        alias="allowMemberInvite",
-    )
-    allow_owner_transfer: bool = Field(
-        description="Whether to allow owners to transfer ownership of the workspace.",
-        default=False,
-        alias="allowOwnerTransfer",
-    )
-
-
 class EnterpriseService:
     @classmethod
     def get_info(cls):
@@ -61,16 +44,6 @@ class EnterpriseService:
         except ValueError as e:
             raise ValueError(f"Invalid date format: {data}") from e
 
-    class WorkspacePermissionService:
-        @classmethod
-        def get_permission(cls, workspace_id: str):
-            if not workspace_id:
-                raise ValueError("workspace_id must be provided.")
-            data = EnterpriseRequest.send_request("GET", f"/workspaces/{workspace_id}/permission")
-            if not data or "permission" not in data:
-                raise ValueError("No data found.")
-            return WorkspacePermission.model_validate(data["permission"])
-
     class WebAppAuth:
         @classmethod
         def is_user_allowed_to_access_webapp(cls, user_id: str, app_id: str):

api/services/enterprise/workspace_sync.py

@@ -12,6 +12,8 @@ logger = logging.getLogger(__name__)
 WORKSPACE_SYNC_QUEUE = "enterprise:workspace:sync:queue"
 WORKSPACE_SYNC_PROCESSING = "enterprise:workspace:sync:processing"
 
+TASK_TYPE_SYNC_TO_WORKSPACE = "sync_to_workspace"
+
 
 class WorkspaceSyncService:
     """Service to publish workspace sync tasks to Redis queue for enterprise backend consumption"""
@@ -38,6 +40,7 @@ class WorkspaceSyncService:
                 "retry_count": 0,
                 "created_at": datetime.now(UTC).isoformat(),
                 "source": source,
+                "type": TASK_TYPE_SYNC_TO_WORKSPACE,
             }
 
             # Push to Redis list (queue) - LPUSH adds to the head, worker consumes from tail with RPOP

api/services/feature_service.py

@@ -161,7 +161,6 @@ class SystemFeatureModel(BaseModel):
     enable_email_code_login: bool = False
     enable_email_password_login: bool = True
     enable_social_oauth_login: bool = False
-    enable_collaboration_mode: bool = False
     is_allow_register: bool = False
     is_allow_create_workspace: bool = False
     is_email_setup: bool = False
@@ -223,7 +222,6 @@ class FeatureService:
         system_features.enable_email_code_login = dify_config.ENABLE_EMAIL_CODE_LOGIN
         system_features.enable_email_password_login = dify_config.ENABLE_EMAIL_PASSWORD_LOGIN
         system_features.enable_social_oauth_login = dify_config.ENABLE_SOCIAL_OAUTH_LOGIN
-        system_features.enable_collaboration_mode = dify_config.ENABLE_COLLABORATION_MODE
         system_features.is_allow_register = dify_config.ALLOW_REGISTER
         system_features.is_allow_create_workspace = dify_config.ALLOW_CREATE_WORKSPACE
         system_features.is_email_setup = dify_config.MAIL_TYPE is not None and dify_config.MAIL_TYPE != ""

api/services/file_service.py

@@ -2,11 +2,7 @@ import base64
 import hashlib
 import os
 import uuid
-from collections.abc import Iterator, Sequence
-from contextlib import contextmanager, suppress
-from tempfile import NamedTemporaryFile
 from typing import Literal, Union
-from zipfile import ZIP_DEFLATED, ZipFile
 
 from sqlalchemy import Engine, select
 from sqlalchemy.orm import Session, sessionmaker
@@ -21,7 +17,6 @@ from constants import (
 )
 from core.file import helpers as file_helpers
 from core.rag.extractor.extract_processor import ExtractProcessor
-from extensions.ext_database import db
 from extensions.ext_storage import storage
 from libs.datetime_utils import naive_utc_now
 from libs.helper import extract_tenant_id
@@ -172,9 +167,6 @@ class FileService:
         return upload_file
 
     def get_file_preview(self, file_id: str):
-        """
-        Return a short text preview extracted from a document file.
-        """
         with self._session_maker(expire_on_commit=False) as session:
             upload_file = session.query(UploadFile).where(UploadFile.id == file_id).first()
 
@@ -261,101 +253,3 @@ class FileService:
                 return
             storage.delete(upload_file.key)
             session.delete(upload_file)
-
-    @staticmethod
-    def get_upload_files_by_ids(tenant_id: str, upload_file_ids: Sequence[str]) -> dict[str, UploadFile]:
-        """
-        Fetch `UploadFile` rows for a tenant in a single batch query.
-
-        This is a generic `UploadFile` lookup helper (not dataset/document specific), so it lives in `FileService`.
-        """
-        if not upload_file_ids:
-            return {}
-
-        # Normalize and deduplicate ids before using them in the IN clause.
-        upload_file_id_list: list[str] = [str(upload_file_id) for upload_file_id in upload_file_ids]
-        unique_upload_file_ids: list[str] = list(set(upload_file_id_list))
-
-        # Fetch upload files in one query for efficient batch access.
-        upload_files: Sequence[UploadFile] = db.session.scalars(
-            select(UploadFile).where(
-                UploadFile.tenant_id == tenant_id,
-                UploadFile.id.in_(unique_upload_file_ids),
-            )
-        ).all()
-        return {str(upload_file.id): upload_file for upload_file in upload_files}
-
-    @staticmethod
-    def _sanitize_zip_entry_name(name: str) -> str:
-        """
-        Sanitize a ZIP entry name to avoid path traversal and weird separators.
-
-        We keep this conservative: the upload flow already rejects `/` and `\\`, but older rows (or imported data)
-        could still contain unsafe names.
-        """
-        # Drop any directory components and prevent empty names.
-        base = os.path.basename(name).strip() or "file"
-
-        # ZIP uses forward slashes as separators; remove any residual separator characters.
-        return base.replace("/", "_").replace("\\", "_")
-
-    @staticmethod
-    def _dedupe_zip_entry_name(original_name: str, used_names: set[str]) -> str:
-        """
-        Return a unique ZIP entry name, inserting suffixes before the extension.
-        """
-        # Keep the original name when it's not already used.
-        if original_name not in used_names:
-            return original_name
-
-        # Insert suffixes before the extension (e.g., "doc.txt" -> "doc (1).txt").
-        stem, extension = os.path.splitext(original_name)
-        suffix = 1
-        while True:
-            candidate = f"{stem} ({suffix}){extension}"
-            if candidate not in used_names:
-                return candidate
-            suffix += 1
-
-    @staticmethod
-    @contextmanager
-    def build_upload_files_zip_tempfile(
-        *,
-        upload_files: Sequence[UploadFile],
-    ) -> Iterator[str]:
-        """
-        Build a ZIP from `UploadFile`s and yield a tempfile path.
-
-        We yield a path (rather than an open file handle) to avoid "read of closed file" issues when Flask/Werkzeug
-        streams responses. The caller is expected to keep this context open until the response is fully sent, then
-        close it (e.g., via `response.call_on_close(...)`) to delete the tempfile.
-        """
-        used_names: set[str] = set()
-
-        # Build a ZIP in a temp file and keep it on disk until the caller finishes streaming it.
-        tmp_path: str | None = None
-        try:
-            with NamedTemporaryFile(mode="w+b", suffix=".zip", delete=False) as tmp:
-                tmp_path = tmp.name
-                with ZipFile(tmp, mode="w", compression=ZIP_DEFLATED) as zf:
-                    for upload_file in upload_files:
-                        # Ensure the entry name is safe and unique.
-                        safe_name = FileService._sanitize_zip_entry_name(upload_file.name)
-                        arcname = FileService._dedupe_zip_entry_name(safe_name, used_names)
-                        used_names.add(arcname)
-
-                        # Stream file bytes from storage into the ZIP entry.
-                        with zf.open(arcname, "w") as entry:
-                            for chunk in storage.load(upload_file.key, stream=True):
-                                entry.write(chunk)
-
-                # Flush so `send_file(path, ...)` can re-open it safely on all platforms.
-                tmp.flush()
-
-            assert tmp_path is not None
-            yield tmp_path
-        finally:
-            # Remove the temp file when the context is closed (typically after the response finishes streaming).
-            if tmp_path is not None:
-                with suppress(FileNotFoundError):
-                    os.remove(tmp_path)

api/services/workflow_collaboration_service.py

@@ -1,196 +0,0 @@
-from __future__ import annotations
-
-import logging
-import time
-from collections.abc import Mapping
-
-from models.account import Account
-from repositories.workflow_collaboration_repository import WorkflowCollaborationRepository, WorkflowSessionInfo
-
-
-class WorkflowCollaborationService:
-    def __init__(self, repository: WorkflowCollaborationRepository, socketio) -> None:
-        self._repository = repository
-        self._socketio = socketio
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}(repository={self._repository})"
-
-    def save_session(self, sid: str, user: Account) -> None:
-        self._socketio.save_session(
-            sid,
-            {
-                "user_id": user.id,
-                "username": user.name,
-                "avatar": user.avatar,
-            },
-        )
-
-    def register_session(self, workflow_id: str, sid: str) -> tuple[str, bool] | None:
-        session = self._socketio.get_session(sid)
-        user_id = session.get("user_id")
-        if not user_id:
-            return None
-
-        session_info: WorkflowSessionInfo = {
-            "user_id": str(user_id),
-            "username": str(session.get("username", "Unknown")),
-            "avatar": session.get("avatar"),
-            "sid": sid,
-            "connected_at": int(time.time()),
-        }
-
-        self._repository.set_session_info(workflow_id, session_info)
-
-        leader_sid = self.get_or_set_leader(workflow_id, sid)
-        is_leader = leader_sid == sid
-
-        self._socketio.enter_room(sid, workflow_id)
-        self.broadcast_online_users(workflow_id)
-
-        self._socketio.emit("status", {"isLeader": is_leader}, room=sid)
-
-        return str(user_id), is_leader
-
-    def disconnect_session(self, sid: str) -> None:
-        mapping = self._repository.get_sid_mapping(sid)
-        if not mapping:
-            return
-
-        workflow_id = mapping["workflow_id"]
-        self._repository.delete_session(workflow_id, sid)
-
-        self.handle_leader_disconnect(workflow_id, sid)
-        self.broadcast_online_users(workflow_id)
-
-    def relay_collaboration_event(self, sid: str, data: Mapping[str, object]) -> tuple[dict[str, str], int]:
-        mapping = self._repository.get_sid_mapping(sid)
-        if not mapping:
-            return {"msg": "unauthorized"}, 401
-
-        workflow_id = mapping["workflow_id"]
-        user_id = mapping["user_id"]
-        self.refresh_session_state(workflow_id, sid)
-
-        event_type = data.get("type")
-        event_data = data.get("data")
-        timestamp = data.get("timestamp", int(time.time()))
-
-        if not event_type:
-            return {"msg": "invalid event type"}, 400
-
-        self._socketio.emit(
-            "collaboration_update",
-            {"type": event_type, "userId": user_id, "data": event_data, "timestamp": timestamp},
-            room=workflow_id,
-            skip_sid=sid,
-        )
-
-        return {"msg": "event_broadcasted"}, 200
-
-    def relay_graph_event(self, sid: str, data: object) -> tuple[dict[str, str], int]:
-        mapping = self._repository.get_sid_mapping(sid)
-        if not mapping:
-            return {"msg": "unauthorized"}, 401
-
-        workflow_id = mapping["workflow_id"]
-        self.refresh_session_state(workflow_id, sid)
-
-        self._socketio.emit("graph_update", data, room=workflow_id, skip_sid=sid)
-
-        return {"msg": "graph_update_broadcasted"}, 200
-
-    def get_or_set_leader(self, workflow_id: str, sid: str) -> str:
-        current_leader = self._repository.get_current_leader(workflow_id)
-
-        if current_leader:
-            if self.is_session_active(workflow_id, current_leader):
-                return current_leader
-            self._repository.delete_session(workflow_id, current_leader)
-            self._repository.delete_leader(workflow_id)
-
-        was_set = self._repository.set_leader_if_absent(workflow_id, sid)
-
-        if was_set:
-            if current_leader:
-                self.broadcast_leader_change(workflow_id, sid)
-            return sid
-
-        current_leader = self._repository.get_current_leader(workflow_id)
-        if current_leader:
-            return current_leader
-
-        return sid
-
-    def handle_leader_disconnect(self, workflow_id: str, disconnected_sid: str) -> None:
-        current_leader = self._repository.get_current_leader(workflow_id)
-        if not current_leader:
-            return
-
-        if current_leader != disconnected_sid:
-            return
-
-        session_sids = self._repository.get_session_sids(workflow_id)
-        if session_sids:
-            new_leader_sid = session_sids[0]
-            self._repository.set_leader(workflow_id, new_leader_sid)
-            self.broadcast_leader_change(workflow_id, new_leader_sid)
-        else:
-            self._repository.delete_leader(workflow_id)
-
-    def broadcast_leader_change(self, workflow_id: str, new_leader_sid: str) -> None:
-        for sid in self._repository.get_session_sids(workflow_id):
-            try:
-                is_leader = sid == new_leader_sid
-                self._socketio.emit("status", {"isLeader": is_leader}, room=sid)
-            except Exception:
-                logging.exception("Failed to emit leader status to session %s", sid)
-
-    def get_current_leader(self, workflow_id: str) -> str | None:
-        return self._repository.get_current_leader(workflow_id)
-
-    def broadcast_online_users(self, workflow_id: str) -> None:
-        users = self._repository.list_sessions(workflow_id)
-        users.sort(key=lambda x: x.get("connected_at") or 0)
-
-        leader_sid = self.get_current_leader(workflow_id)
-
-        self._socketio.emit(
-            "online_users",
-            {"workflow_id": workflow_id, "users": users, "leader": leader_sid},
-            room=workflow_id,
-        )
-
-    def refresh_session_state(self, workflow_id: str, sid: str) -> None:
-        self._repository.refresh_session_state(workflow_id, sid)
-        self._ensure_leader(workflow_id, sid)
-
-    def _ensure_leader(self, workflow_id: str, sid: str) -> None:
-        current_leader = self._repository.get_current_leader(workflow_id)
-        if current_leader and self.is_session_active(workflow_id, current_leader):
-            self._repository.expire_leader(workflow_id)
-            return
-
-        if current_leader:
-            self._repository.delete_leader(workflow_id)
-
-        self._repository.set_leader(workflow_id, sid)
-        self.broadcast_leader_change(workflow_id, sid)
-
-    def is_session_active(self, workflow_id: str, sid: str) -> bool:
-        if not sid:
-            return False
-
-        try:
-            if not self._socketio.manager.is_connected(sid, "/"):
-                return False
-        except AttributeError:
-            return False
-
-        if not self._repository.session_exists(workflow_id, sid):
-            return False
-
-        if not self._repository.sid_mapping_exists(sid):
-            return False
-
-        return True

api/services/workflow_comment_service.py

@@ -1,345 +0,0 @@
-import logging
-from collections.abc import Sequence
-
-from sqlalchemy import desc, select
-from sqlalchemy.orm import Session, selectinload
-from werkzeug.exceptions import Forbidden, NotFound
-
-from extensions.ext_database import db
-from libs.datetime_utils import naive_utc_now
-from libs.helper import uuid_value
-from models import WorkflowComment, WorkflowCommentMention, WorkflowCommentReply
-from models.account import Account
-
-logger = logging.getLogger(__name__)
-
-
-class WorkflowCommentService:
-    """Service for managing workflow comments."""
-
-    @staticmethod
-    def _validate_content(content: str) -> None:
-        if len(content.strip()) == 0:
-            raise ValueError("Comment content cannot be empty")
-
-        if len(content) > 1000:
-            raise ValueError("Comment content cannot exceed 1000 characters")
-
-    @staticmethod
-    def get_comments(tenant_id: str, app_id: str) -> Sequence[WorkflowComment]:
-        """Get all comments for a workflow."""
-        with Session(db.engine) as session:
-            # Get all comments with eager loading
-            stmt = (
-                select(WorkflowComment)
-                .options(selectinload(WorkflowComment.replies), selectinload(WorkflowComment.mentions))
-                .where(WorkflowComment.tenant_id == tenant_id, WorkflowComment.app_id == app_id)
-                .order_by(desc(WorkflowComment.created_at))
-            )
-
-            comments = session.scalars(stmt).all()
-
-            # Batch preload all Account objects to avoid N+1 queries
-            WorkflowCommentService._preload_accounts(session, comments)
-
-            return comments
-
-    @staticmethod
-    def _preload_accounts(session: Session, comments: Sequence[WorkflowComment]) -> None:
-        """Batch preload Account objects for comments, replies, and mentions."""
-        # Collect all user IDs
-        user_ids: set[str] = set()
-        for comment in comments:
-            user_ids.add(comment.created_by)
-            if comment.resolved_by:
-                user_ids.add(comment.resolved_by)
-            user_ids.update(reply.created_by for reply in comment.replies)
-            user_ids.update(mention.mentioned_user_id for mention in comment.mentions)
-
-        if not user_ids:
-            return
-
-        # Batch query all accounts
-        accounts = session.scalars(select(Account).where(Account.id.in_(user_ids))).all()
-        account_map = {str(account.id): account for account in accounts}
-
-        # Cache accounts on objects
-        for comment in comments:
-            comment.cache_created_by_account(account_map.get(comment.created_by))
-            comment.cache_resolved_by_account(account_map.get(comment.resolved_by) if comment.resolved_by else None)
-            for reply in comment.replies:
-                reply.cache_created_by_account(account_map.get(reply.created_by))
-            for mention in comment.mentions:
-                mention.cache_mentioned_user_account(account_map.get(mention.mentioned_user_id))
-
-    @staticmethod
-    def get_comment(tenant_id: str, app_id: str, comment_id: str, session: Session | None = None) -> WorkflowComment:
-        """Get a specific comment."""
-
-        def _get_comment(session: Session) -> WorkflowComment:
-            stmt = (
-                select(WorkflowComment)
-                .options(selectinload(WorkflowComment.replies), selectinload(WorkflowComment.mentions))
-                .where(
-                    WorkflowComment.id == comment_id,
-                    WorkflowComment.tenant_id == tenant_id,
-                    WorkflowComment.app_id == app_id,
-                )
-            )
-            comment = session.scalar(stmt)
-
-            if not comment:
-                raise NotFound("Comment not found")
-
-            # Preload accounts to avoid N+1 queries
-            WorkflowCommentService._preload_accounts(session, [comment])
-
-            return comment
-
-        if session is not None:
-            return _get_comment(session)
-        else:
-            with Session(db.engine, expire_on_commit=False) as session:
-                return _get_comment(session)
-
-    @staticmethod
-    def create_comment(
-        tenant_id: str,
-        app_id: str,
-        created_by: str,
-        content: str,
-        position_x: float,
-        position_y: float,
-        mentioned_user_ids: list[str] | None = None,
-    ) -> dict:
-        """Create a new workflow comment."""
-        WorkflowCommentService._validate_content(content)
-
-        with Session(db.engine) as session:
-            comment = WorkflowComment(
-                tenant_id=tenant_id,
-                app_id=app_id,
-                position_x=position_x,
-                position_y=position_y,
-                content=content,
-                created_by=created_by,
-            )
-
-            session.add(comment)
-            session.flush()  # Get the comment ID for mentions
-
-            # Create mentions if specified
-            mentioned_user_ids = mentioned_user_ids or []
-            for user_id in mentioned_user_ids:
-                if isinstance(user_id, str) and uuid_value(user_id):
-                    mention = WorkflowCommentMention(
-                        comment_id=comment.id,
-                        reply_id=None,  # This is a comment mention, not reply mention
-                        mentioned_user_id=user_id,
-                    )
-                    session.add(mention)
-
-            session.commit()
-
-            # Return only what we need - id and created_at
-            return {"id": comment.id, "created_at": comment.created_at}
-
-    @staticmethod
-    def update_comment(
-        tenant_id: str,
-        app_id: str,
-        comment_id: str,
-        user_id: str,
-        content: str,
-        position_x: float | None = None,
-        position_y: float | None = None,
-        mentioned_user_ids: list[str] | None = None,
-    ) -> dict:
-        """Update a workflow comment."""
-        WorkflowCommentService._validate_content(content)
-
-        with Session(db.engine, expire_on_commit=False) as session:
-            # Get comment with validation
-            stmt = select(WorkflowComment).where(
-                WorkflowComment.id == comment_id,
-                WorkflowComment.tenant_id == tenant_id,
-                WorkflowComment.app_id == app_id,
-            )
-            comment = session.scalar(stmt)
-
-            if not comment:
-                raise NotFound("Comment not found")
-
-            # Only the creator can update the comment
-            if comment.created_by != user_id:
-                raise Forbidden("Only the comment creator can update it")
-
-            # Update comment fields
-            comment.content = content
-            if position_x is not None:
-                comment.position_x = position_x
-            if position_y is not None:
-                comment.position_y = position_y
-
-            # Update mentions - first remove existing mentions for this comment only (not replies)
-            existing_mentions = session.scalars(
-                select(WorkflowCommentMention).where(
-                    WorkflowCommentMention.comment_id == comment.id,
-                    WorkflowCommentMention.reply_id.is_(None),  # Only comment mentions, not reply mentions
-                )
-            ).all()
-            for mention in existing_mentions:
-                session.delete(mention)
-
-            # Add new mentions
-            mentioned_user_ids = mentioned_user_ids or []
-            for user_id_str in mentioned_user_ids:
-                if isinstance(user_id_str, str) and uuid_value(user_id_str):
-                    mention = WorkflowCommentMention(
-                        comment_id=comment.id,
-                        reply_id=None,  # This is a comment mention
-                        mentioned_user_id=user_id_str,
-                    )
-                    session.add(mention)
-
-            session.commit()
-
-            return {"id": comment.id, "updated_at": comment.updated_at}
-
-    @staticmethod
-    def delete_comment(tenant_id: str, app_id: str, comment_id: str, user_id: str) -> None:
-        """Delete a workflow comment."""
-        with Session(db.engine, expire_on_commit=False) as session:
-            comment = WorkflowCommentService.get_comment(tenant_id, app_id, comment_id, session)
-
-            # Only the creator can delete the comment
-            if comment.created_by != user_id:
-                raise Forbidden("Only the comment creator can delete it")
-
-            # Delete associated mentions (both comment and reply mentions)
-            mentions = session.scalars(
-                select(WorkflowCommentMention).where(WorkflowCommentMention.comment_id == comment_id)
-            ).all()
-            for mention in mentions:
-                session.delete(mention)
-
-            # Delete associated replies
-            replies = session.scalars(
-                select(WorkflowCommentReply).where(WorkflowCommentReply.comment_id == comment_id)
-            ).all()
-            for reply in replies:
-                session.delete(reply)
-
-            session.delete(comment)
-            session.commit()
-
-    @staticmethod
-    def resolve_comment(tenant_id: str, app_id: str, comment_id: str, user_id: str) -> WorkflowComment:
-        """Resolve a workflow comment."""
-        with Session(db.engine, expire_on_commit=False) as session:
-            comment = WorkflowCommentService.get_comment(tenant_id, app_id, comment_id, session)
-            if comment.resolved:
-                return comment
-
-            comment.resolved = True
-            comment.resolved_at = naive_utc_now()
-            comment.resolved_by = user_id
-            session.commit()
-
-        return comment
-
-    @staticmethod
-    def create_reply(
-        comment_id: str, content: str, created_by: str, mentioned_user_ids: list[str] | None = None
-    ) -> dict:
-        """Add a reply to a workflow comment."""
-        WorkflowCommentService._validate_content(content)
-
-        with Session(db.engine, expire_on_commit=False) as session:
-            # Check if comment exists
-            comment = session.get(WorkflowComment, comment_id)
-            if not comment:
-                raise NotFound("Comment not found")
-
-            reply = WorkflowCommentReply(comment_id=comment_id, content=content, created_by=created_by)
-
-            session.add(reply)
-            session.flush()  # Get the reply ID for mentions
-
-            # Create mentions if specified
-            mentioned_user_ids = mentioned_user_ids or []
-            for user_id in mentioned_user_ids:
-                if isinstance(user_id, str) and uuid_value(user_id):
-                    # Create mention linking to specific reply
-                    mention = WorkflowCommentMention(
-                        comment_id=comment_id, reply_id=reply.id, mentioned_user_id=user_id
-                    )
-                    session.add(mention)
-
-            session.commit()
-
-            return {"id": reply.id, "created_at": reply.created_at}
-
-    @staticmethod
-    def update_reply(reply_id: str, user_id: str, content: str, mentioned_user_ids: list[str] | None = None) -> dict:
-        """Update a comment reply."""
-        WorkflowCommentService._validate_content(content)
-
-        with Session(db.engine, expire_on_commit=False) as session:
-            reply = session.get(WorkflowCommentReply, reply_id)
-            if not reply:
-                raise NotFound("Reply not found")
-
-            # Only the creator can update the reply
-            if reply.created_by != user_id:
-                raise Forbidden("Only the reply creator can update it")
-
-            reply.content = content
-
-            # Update mentions - first remove existing mentions for this reply
-            existing_mentions = session.scalars(
-                select(WorkflowCommentMention).where(WorkflowCommentMention.reply_id == reply.id)
-            ).all()
-            for mention in existing_mentions:
-                session.delete(mention)
-
-            # Add mentions
-            mentioned_user_ids = mentioned_user_ids or []
-            for user_id_str in mentioned_user_ids:
-                if isinstance(user_id_str, str) and uuid_value(user_id_str):
-                    mention = WorkflowCommentMention(
-                        comment_id=reply.comment_id, reply_id=reply.id, mentioned_user_id=user_id_str
-                    )
-                    session.add(mention)
-
-            session.commit()
-            session.refresh(reply)  # Refresh to get updated timestamp
-
-            return {"id": reply.id, "updated_at": reply.updated_at}
-
-    @staticmethod
-    def delete_reply(reply_id: str, user_id: str) -> None:
-        """Delete a comment reply."""
-        with Session(db.engine, expire_on_commit=False) as session:
-            reply = session.get(WorkflowCommentReply, reply_id)
-            if not reply:
-                raise NotFound("Reply not found")
-
-            # Only the creator can delete the reply
-            if reply.created_by != user_id:
-                raise Forbidden("Only the reply creator can delete it")
-
-            # Delete associated mentions first
-            mentions = session.scalars(
-                select(WorkflowCommentMention).where(WorkflowCommentMention.reply_id == reply_id)
-            ).all()
-            for mention in mentions:
-                session.delete(mention)
-
-            session.delete(reply)
-            session.commit()
-
-    @staticmethod
-    def validate_comment_access(comment_id: str, tenant_id: str, app_id: str) -> WorkflowComment:
-        """Validate that a comment belongs to the specified tenant and app."""
-        return WorkflowCommentService.get_comment(tenant_id, app_id, comment_id)

api/services/workflow_service.py

@@ -249,78 +249,6 @@ class WorkflowService:
         # return draft workflow
         return workflow
 
-    def update_draft_workflow_environment_variables(
-        self,
-        *,
-        app_model: App,
-        environment_variables: Sequence[VariableBase],
-        account: Account,
-    ):
-        """
-        Update draft workflow environment variables
-        """
-        # fetch draft workflow by app_model
-        workflow = self.get_draft_workflow(app_model=app_model)
-
-        if not workflow:
-            raise ValueError("No draft workflow found.")
-
-        workflow.environment_variables = environment_variables
-        workflow.updated_by = account.id
-        workflow.updated_at = naive_utc_now()
-
-        # commit db session changes
-        db.session.commit()
-
-    def update_draft_workflow_conversation_variables(
-        self,
-        *,
-        app_model: App,
-        conversation_variables: Sequence[VariableBase],
-        account: Account,
-    ):
-        """
-        Update draft workflow conversation variables
-        """
-        # fetch draft workflow by app_model
-        workflow = self.get_draft_workflow(app_model=app_model)
-
-        if not workflow:
-            raise ValueError("No draft workflow found.")
-
-        workflow.conversation_variables = conversation_variables
-        workflow.updated_by = account.id
-        workflow.updated_at = naive_utc_now()
-
-        # commit db session changes
-        db.session.commit()
-
-    def update_draft_workflow_features(
-        self,
-        *,
-        app_model: App,
-        features: dict,
-        account: Account,
-    ):
-        """
-        Update draft workflow features
-        """
-        # fetch draft workflow by app_model
-        workflow = self.get_draft_workflow(app_model=app_model)
-
-        if not workflow:
-            raise ValueError("No draft workflow found.")
-
-        # validate features structure
-        self.validate_features_structure(app_model=app_model, features=features)
-
-        workflow.features = json.dumps(features)
-        workflow.updated_by = account.id
-        workflow.updated_at = naive_utc_now()
-
-        # commit db session changes
-        db.session.commit()
-
     def publish_workflow(
         self,
         *,

api/templates/invite_member_mail_template_en-US.html

@@ -83,30 +83,7 @@
       <p class="content1">Dear {{ to }},</p>
       <p class="content2">{{ inviter_name }} is pleased to invite you to join our workspace on Dify, a platform specifically designed for LLM application development. On Dify, you can explore, create, and collaborate to build and operate AI applications.</p>
       <p class="content2">Click the button below to log in to Dify and join the workspace.</p>
-      <div style="text-align: center; margin-bottom: 32px;">
-        <a href="{{ url }}"
-           style="background-color:#2563eb;
-                  color:#ffffff !important;
-                  text-decoration:none;
-                  display:inline-block;
-                  font-weight:600;
-                  border-radius:4px;
-                  font-size:14px;
-                  line-height:18px;
-                  font-family: Helvetica, Arial, sans-serif;
-                  text-align:center;
-                  border-top: 10px solid #2563eb;
-                  border-bottom: 10px solid #2563eb;
-                  border-left: 20px solid #2563eb;
-                  border-right: 20px solid #2563eb;
-                  ">Login Here</a>
-        <p style="font-size: 12px; color: #666666; margin-top: 20px; margin-bottom: 0;">
-          If the button doesn't work, copy and paste this link into your browser:<br>
-          <a href="{{ url }}" style="color: #2563eb; text-decoration: underline; word-break: break-all;">
-            {{ url }}
-          </a>
-        </p>
-      </div>
+      <p style="text-align: center; margin: 0; margin-bottom: 32px;"><a style="color: #fff; text-decoration: none" class="button" href="{{ url }}">Login Here</a></p>
       <p class="content2">Best regards,</p>
       <p class="content2">Dify Team</p>
     </div>

api/templates/invite_member_mail_template_zh-CN.html

@@ -83,30 +83,7 @@
       <p class="content1">尊敬的 {{ to }}，</p>
       <p class="content2">{{ inviter_name }} 现邀请您加入我们在 Dify 的工作区，这是一个专为 LLM 应用开发而设计的平台。在 Dify 上，您可以探索、创造和合作，构建和运营 AI 应用。</p>
       <p class="content2">点击下方按钮即可登录 Dify 并且加入空间。</p>
-      <div style="text-align: center; margin-bottom: 32px;">
-        <a href="{{ url }}"
-           style="background-color:#2563eb;
-                  color:#ffffff !important;
-                  text-decoration:none;
-                  display:inline-block;
-                  font-weight:600;
-                  border-radius:4px;
-                  font-size:14px;
-                  line-height:18px;
-                  font-family: Helvetica, Arial, sans-serif;
-                  text-align:center;
-                  border-top: 10px solid #2563eb;
-                  border-bottom: 10px solid #2563eb;
-                  border-left: 20px solid #2563eb;
-                  border-right: 20px solid #2563eb;
-                  ">在此登录</a>
-        <p style="font-size: 12px; color: #666666; margin-top: 20px; margin-bottom: 0;">
-          如果按钮无法使用，请将以下链接复制到浏览器打开：<br>
-          <a href="{{ url }}" style="color: #2563eb; text-decoration: underline; word-break: break-all;">
-            {{ url }}
-          </a>
-        </p>
-      </div>
+      <p style="text-align: center; margin: 0; margin-bottom: 32px;"><a style="color: #fff; text-decoration: none" class="button" href="{{ url }}">在此登录</a></p>
       <p class="content2">此致，</p>
       <p class="content2">Dify 团队</p>
     </div>

api/templates/register_email_when_account_exist_template_en-US.html

@@ -115,30 +115,7 @@
             We noticed you tried to sign up, but this email is already registered with an existing account.
 
             Please log in here: </p>
-        <div style="text-align: center; margin-bottom: 20px;">
-          <a href="{{ login_url }}"
-             style="background-color:#2563eb;
-                    color:#ffffff !important;
-                    text-decoration:none;
-                    display:inline-block;
-                    font-weight:600;
-                    border-radius:4px;
-                    font-size:14px;
-                    line-height:18px;
-                    font-family: Helvetica, Arial, sans-serif;
-                    text-align:center;
-                    border-top: 10px solid #2563eb;
-                    border-bottom: 10px solid #2563eb;
-                    border-left: 20px solid #2563eb;
-                    border-right: 20px solid #2563eb;
-                    ">Log In</a>
-          <p style="font-size: 12px; color: #666666; margin-top: 20px; margin-bottom: 0;">
-              If the button doesn't work, copy and paste this link into your browser:<br>
-              <a href="{{ login_url }}" style="color: #2563eb; text-decoration: underline; word-break: break-all;">
-                  {{ login_url }}
-              </a>
-          </p>
-        </div>
+        <a href="{{ login_url }}" class="button">Log In</a>
         <p class="description">
             If you forgot your password, you can reset it here: <a href="{{ reset_password_url }}"
                 class="reset-btn">Reset Password</a>

api/templates/register_email_when_account_exist_template_zh-CN.html

@@ -115,30 +115,7 @@
             我们注意到您尝试注册，但此电子邮件已注册。
 
             请在此登录: </p>
-        <div style="text-align: center; margin-bottom: 20px;">
-          <a href="{{ login_url }}"
-             style="background-color:#2563eb;
-                    color:#ffffff !important;
-                    text-decoration:none;
-                    display:inline-block;
-                    font-weight:600;
-                    border-radius:4px;
-                    font-size:14px;
-                    line-height:18px;
-                    font-family: Helvetica, Arial, sans-serif;
-                    text-align:center;
-                    border-top: 10px solid #2563eb;
-                    border-bottom: 10px solid #2563eb;
-                    border-left: 20px solid #2563eb;
-                    border-right: 20px solid #2563eb;
-                    ">登录</a>
-          <p style="font-size: 12px; color: #666666; margin-top: 20px; margin-bottom: 0;">
-              如果按钮无法使用，请将以下链接复制到浏览器打开：<br>
-              <a href="{{ login_url }}" style="color: #2563eb; text-decoration: underline; word-break: break-all;">
-                  {{ login_url }}
-              </a>
-          </p>
-        </div>
+        <a href="{{ login_url }}" class="button">登录</a>
         <p class="description">
             如果您忘记了密码，可以在此重置: <a href="{{ reset_password_url }}" class="reset-btn">重置密码</a>
         </p>

api/templates/without-brand/invite_member_mail_template_en-US.html

@@ -92,34 +92,12 @@
         platform specifically designed for LLM application development. On {{application_title}}, you can explore,
         create, and collaborate to build and operate AI applications.</p>
       <p class="content2">Click the button below to log in to {{application_title}} and join the workspace.</p>
-      <div style="text-align: center; margin-bottom: 32px;">
-        <a href="{{ url }}"
-           style="background-color:#2563eb;
-                  color:#ffffff !important;
-                  text-decoration:none;
-                  display:inline-block;
-                  font-weight:600;
-                  border-radius:4px;
-                  font-size:14px;
-                  line-height:18px;
-                  font-family: Helvetica, Arial, sans-serif;
-                  text-align:center;
-                  border-top: 10px solid #2563eb;
-                  border-bottom: 10px solid #2563eb;
-                  border-left: 20px solid #2563eb;
-                  border-right: 20px solid #2563eb;
-                  ">Login Here</a>
-        <p style="font-size: 12px; color: #666666; margin-top: 20px; margin-bottom: 0;">
-          If the button doesn't work, copy and paste this link into your browser:<br>
-          <a href="{{ url }}" style="color: #2563eb; text-decoration: underline; word-break: break-all;">
-            {{ url }}
-          </a>
-        </p>
-      </div>
+      <p style="text-align: center; margin: 0; margin-bottom: 32px;"><a style="color: #fff; text-decoration: none"
+          class="button" href="{{ url }}">Login Here</a></p>
       <p class="content2">Best regards,</p>
       <p class="content2">{{application_title}} Team</p>
     </div>
   </div>
 </body>
 
-</html>
+</html>

api/templates/without-brand/invite_member_mail_template_zh-CN.html

@@ -81,30 +81,7 @@
       <p class="content1">尊敬的 {{ to }}，</p>
       <p class="content2">{{ inviter_name }} 现邀请您加入我们在 {{application_title}} 的工作区，这是一个专为 LLM 应用开发而设计的平台。在 {{application_title}} 上，您可以探索、创造和合作，构建和运营 AI 应用。</p>
       <p class="content2">点击下方按钮即可登录 {{application_title}} 并且加入空间。</p>
-      <div style="text-align: center; margin-bottom: 32px;">
-        <a href="{{ url }}"
-           style="background-color:#2563eb;
-                  color:#ffffff !important;
-                  text-decoration:none;
-                  display:inline-block;
-                  font-weight:600;
-                  border-radius:4px;
-                  font-size:14px;
-                  line-height:18px;
-                  font-family: Helvetica, Arial, sans-serif;
-                  text-align:center;
-                  border-top: 10px solid #2563eb;
-                  border-bottom: 10px solid #2563eb;
-                  border-left: 20px solid #2563eb;
-                  border-right: 20px solid #2563eb;
-                  ">在此登录</a>
-        <p style="font-size: 12px; color: #666666; margin-top: 20px; margin-bottom: 0;">
-          如果按钮无法使用，请将以下链接复制到浏览器打开：<br>
-          <a href="{{ url }}" style="color: #2563eb; text-decoration: underline; word-break: break-all;">
-            {{ url }}
-          </a>
-        </p>
-      </div>
+      <p style="text-align: center; margin: 0; margin-bottom: 32px;"><a style="color: #fff; text-decoration: none" class="button" href="{{ url }}">在此登录</a></p>
       <p class="content2">此致，</p>
       <p class="content2">{{application_title}} 团队</p>
     </div>

api/templates/without-brand/register_email_when_account_exist_template_en-US.html

@@ -111,30 +111,7 @@
             We noticed you tried to sign up, but this email is already registered with an existing account.
 
             Please log in here: </p>
-        <div style="text-align: center; margin-bottom: 20px;">
-          <a href="{{ login_url }}"
-             style="background-color:#2563eb;
-                    color:#ffffff !important;
-                    text-decoration:none;
-                    display:inline-block;
-                    font-weight:600;
-                    border-radius:4px;
-                    font-size:14px;
-                    line-height:18px;
-                    font-family: Helvetica, Arial, sans-serif;
-                    text-align:center;
-                    border-top: 10px solid #2563eb;
-                    border-bottom: 10px solid #2563eb;
-                    border-left: 20px solid #2563eb;
-                    border-right: 20px solid #2563eb;
-                    ">Log In</a>
-          <p style="font-size: 12px; color: #666666; margin-top: 20px; margin-bottom: 0;">
-              If the button doesn't work, copy and paste this link into your browser:<br>
-              <a href="{{ login_url }}" style="color: #2563eb; text-decoration: underline; word-break: break-all;">
-                  {{ login_url }}
-              </a>
-          </p>
-        </div>
+        <a href="{{ login_url }}" class="button">Log In</a>
         <p class="description">
             If you forgot your password, you can reset it here: <a href="{{ reset_password_url }}"
                 class="reset-btn">Reset Password</a>

api/templates/without-brand/register_email_when_account_exist_template_zh-CN.html

@@ -111,30 +111,7 @@
             我们注意到您尝试注册，但此电子邮件已注册。
 
             请在此登录: </p>
-        <div style="text-align: center; margin-bottom: 20px;">
-          <a href="{{ login_url }}"
-             style="background-color:#2563eb;
-                    color:#ffffff !important;
-                    text-decoration:none;
-                    display:inline-block;
-                    font-weight:600;
-                    border-radius:4px;
-                    font-size:14px;
-                    line-height:18px;
-                    font-family: Helvetica, Arial, sans-serif;
-                    text-align:center;
-                    border-top: 10px solid #2563eb;
-                    border-bottom: 10px solid #2563eb;
-                    border-left: 20px solid #2563eb;
-                    border-right: 20px solid #2563eb;
-                    ">登录</a>
-          <p style="font-size: 12px; color: #666666; margin-top: 20px; margin-bottom: 0;">
-              如果按钮无法使用，请将以下链接复制到浏览器打开：<br>
-              <a href="{{ login_url }}" style="color: #2563eb; text-decoration: underline; word-break: break-all;">
-                  {{ login_url }}
-              </a>
-          </p>
-        </div>
+        <a href="{{ login_url }}" class="button">登录</a>
         <p class="description">
             如果您忘记了密码，可以在此重置: <a href="{{ reset_password_url }}" class="reset-btn">重置密码</a>
         </p>

api/tests/integration_tests/conftest.py

@@ -38,7 +38,7 @@ os.environ["OPENDAL_FS_ROOT"] = "/tmp/dify-storage"
 os.environ.setdefault("STORAGE_TYPE", "opendal")
 os.environ.setdefault("OPENDAL_SCHEME", "fs")
 
-_SIO_APP, _CACHED_APP = create_app()
+_CACHED_APP = create_app()
 
 
 @pytest.fixture

api/tests/test_containers_integration_tests/conftest.py

@@ -364,7 +364,7 @@ def _create_app_with_containers() -> Flask:
 
     # Create and configure the Flask application
     logger.info("Initializing Flask application...")
-    sio_app, app = create_app()
+    app = create_app()
     logger.info("Flask application created successfully")
 
     # Initialize database schema

api/tests/test_containers_integration_tests/services/test_feature_service.py

@@ -268,7 +268,6 @@ class TestFeatureService:
             mock_config.ENABLE_EMAIL_CODE_LOGIN = True
             mock_config.ENABLE_EMAIL_PASSWORD_LOGIN = True
             mock_config.ENABLE_SOCIAL_OAUTH_LOGIN = False
-            mock_config.ENABLE_COLLABORATION_MODE = True
             mock_config.ALLOW_REGISTER = False
             mock_config.ALLOW_CREATE_WORKSPACE = False
             mock_config.MAIL_TYPE = "smtp"
@@ -293,7 +292,6 @@ class TestFeatureService:
         # Verify authentication settings
         assert result.enable_email_code_login is True
         assert result.enable_email_password_login is False
-        assert result.enable_collaboration_mode is True
         assert result.is_allow_register is False
         assert result.is_allow_create_workspace is False
 
@@ -343,7 +341,6 @@ class TestFeatureService:
             mock_config.ENABLE_EMAIL_CODE_LOGIN = True
             mock_config.ENABLE_EMAIL_PASSWORD_LOGIN = True
             mock_config.ENABLE_SOCIAL_OAUTH_LOGIN = False
-            mock_config.ENABLE_COLLABORATION_MODE = False
             mock_config.ALLOW_REGISTER = True
             mock_config.ALLOW_CREATE_WORKSPACE = True
             mock_config.MAIL_TYPE = "smtp"
@@ -365,7 +362,6 @@ class TestFeatureService:
             assert result.enable_email_code_login is True
             assert result.enable_email_password_login is True
             assert result.enable_social_oauth_login is False
-            assert result.enable_collaboration_mode is False
             assert result.is_allow_register is True
             assert result.is_allow_create_workspace is True
             assert result.is_email_setup is True

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

@@ -0,0 +1,254 @@
+"""
+Unit tests for XSS prevention in App payloads.
+
+This test module validates that HTML tags, JavaScript, and other potentially
+dangerous content are rejected in App names and descriptions.
+"""
+
+import pytest
+
+from controllers.console.app.app import CopyAppPayload, CreateAppPayload, UpdateAppPayload
+
+
+class TestXSSPreventionUnit:
+    """Unit tests for XSS prevention in App payloads."""
+
+    def test_create_app_valid_names(self):
+        """Test CreateAppPayload with valid app names."""
+        # Normal app names should be valid
+        valid_names = [
+            "My App",
+            "Test App 123",
+            "App with - dash",
+            "App with _ underscore",
+            "App with + plus",
+            "App with () parentheses",
+            "App with [] brackets",
+            "App with {} braces",
+            "App with ! exclamation",
+            "App with @ at",
+            "App with # hash",
+            "App with $ dollar",
+            "App with % percent",
+            "App with ^ caret",
+            "App with & ampersand",
+            "App with * asterisk",
+            "Unicode: 测试应用",
+            "Emoji: 🤖",
+            "Mixed: Test 测试 123",
+        ]
+
+        for name in valid_names:
+            payload = CreateAppPayload(
+                name=name,
+                mode="chat",
+            )
+            assert payload.name == name
+
+    def test_create_app_xss_script_tags(self):
+        """Test CreateAppPayload rejects script tags."""
+        xss_payloads = [
+            "<script>alert(document.cookie)</script>",
+            "<Script>alert(1)</Script>",
+            "<SCRIPT>alert('XSS')</SCRIPT>",
+            "<script>alert(String.fromCharCode(88,83,83))</script>",
+            "<script src='evil.js'></script>",
+            "<script>document.location='http://evil.com'</script>",
+        ]
+
+        for name in xss_payloads:
+            with pytest.raises(ValueError) as exc_info:
+                CreateAppPayload(name=name, mode="chat")
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_create_app_xss_iframe_tags(self):
+        """Test CreateAppPayload rejects iframe tags."""
+        xss_payloads = [
+            "<iframe src='evil.com'></iframe>",
+            "<Iframe srcdoc='<script>alert(1)</script>'></iframe>",
+            "<IFRAME src='javascript:alert(1)'></iframe>",
+        ]
+
+        for name in xss_payloads:
+            with pytest.raises(ValueError) as exc_info:
+                CreateAppPayload(name=name, mode="chat")
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_create_app_xss_javascript_protocol(self):
+        """Test CreateAppPayload rejects javascript: protocol."""
+        xss_payloads = [
+            "javascript:alert(1)",
+            "JAVASCRIPT:alert(1)",
+            "JavaScript:alert(document.cookie)",
+            "javascript:void(0)",
+            "javascript://comment%0Aalert(1)",
+        ]
+
+        for name in xss_payloads:
+            with pytest.raises(ValueError) as exc_info:
+                CreateAppPayload(name=name, mode="chat")
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_create_app_xss_svg_onload(self):
+        """Test CreateAppPayload rejects SVG with onload."""
+        xss_payloads = [
+            "<svg onload=alert(1)>",
+            "<SVG ONLOAD=alert(1)>",
+            "<svg/x/onload=alert(1)>",
+        ]
+
+        for name in xss_payloads:
+            with pytest.raises(ValueError) as exc_info:
+                CreateAppPayload(name=name, mode="chat")
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_create_app_xss_event_handlers(self):
+        """Test CreateAppPayload rejects HTML event handlers."""
+        xss_payloads = [
+            "<div onclick=alert(1)>",
+            "<img onerror=alert(1)>",
+            "<body onload=alert(1)>",
+            "<input onfocus=alert(1)>",
+            "<a onmouseover=alert(1)>",
+            "<DIV ONCLICK=alert(1)>",
+            "<img src=x onerror=alert(1)>",
+        ]
+
+        for name in xss_payloads:
+            with pytest.raises(ValueError) as exc_info:
+                CreateAppPayload(name=name, mode="chat")
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_create_app_xss_object_embed(self):
+        """Test CreateAppPayload rejects object and embed tags."""
+        xss_payloads = [
+            "<object data='evil.swf'></object>",
+            "<embed src='evil.swf'>",
+            "<OBJECT data='javascript:alert(1)'></OBJECT>",
+        ]
+
+        for name in xss_payloads:
+            with pytest.raises(ValueError) as exc_info:
+                CreateAppPayload(name=name, mode="chat")
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_create_app_xss_link_javascript(self):
+        """Test CreateAppPayload rejects link tags with javascript."""
+        xss_payloads = [
+            "<link href='javascript:alert(1)'>",
+            "<LINK HREF='javascript:alert(1)'>",
+        ]
+
+        for name in xss_payloads:
+            with pytest.raises(ValueError) as exc_info:
+                CreateAppPayload(name=name, mode="chat")
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_create_app_xss_in_description(self):
+        """Test CreateAppPayload rejects XSS in description."""
+        xss_descriptions = [
+            "<script>alert(1)</script>",
+            "javascript:alert(1)",
+            "<img onerror=alert(1)>",
+        ]
+
+        for description in xss_descriptions:
+            with pytest.raises(ValueError) as exc_info:
+                CreateAppPayload(
+                    name="Valid Name",
+                    mode="chat",
+                    description=description,
+                )
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_create_app_valid_descriptions(self):
+        """Test CreateAppPayload with valid descriptions."""
+        valid_descriptions = [
+            "A simple description",
+            "Description with < and > symbols",
+            "Description with & ampersand",
+            "Description with 'quotes' and \"double quotes\"",
+            "Description with / slashes",
+            "Description with \\ backslashes",
+            "Description with ; semicolons",
+            "Unicode: 这是一个描述",
+            "Emoji: 🎉🚀",
+        ]
+
+        for description in valid_descriptions:
+            payload = CreateAppPayload(
+                name="Valid App Name",
+                mode="chat",
+                description=description,
+            )
+            assert payload.description == description
+
+    def test_create_app_none_description(self):
+        """Test CreateAppPayload with None description."""
+        payload = CreateAppPayload(
+            name="Valid App Name",
+            mode="chat",
+            description=None,
+        )
+        assert payload.description is None
+
+    def test_update_app_xss_prevention(self):
+        """Test UpdateAppPayload also prevents XSS."""
+        xss_names = [
+            "<script>alert(1)</script>",
+            "javascript:alert(1)",
+            "<img onerror=alert(1)>",
+        ]
+
+        for name in xss_names:
+            with pytest.raises(ValueError) as exc_info:
+                UpdateAppPayload(name=name)
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_update_app_valid_names(self):
+        """Test UpdateAppPayload with valid names."""
+        payload = UpdateAppPayload(name="Valid Updated Name")
+        assert payload.name == "Valid Updated Name"
+
+    def test_copy_app_xss_prevention(self):
+        """Test CopyAppPayload also prevents XSS."""
+        xss_names = [
+            "<script>alert(1)</script>",
+            "javascript:alert(1)",
+            "<img onerror=alert(1)>",
+        ]
+
+        for name in xss_names:
+            with pytest.raises(ValueError) as exc_info:
+                CopyAppPayload(name=name)
+            assert "invalid characters or patterns" in str(exc_info.value).lower()
+
+    def test_copy_app_valid_names(self):
+        """Test CopyAppPayload with valid names."""
+        payload = CopyAppPayload(name="Valid Copy Name")
+        assert payload.name == "Valid Copy Name"
+
+    def test_copy_app_none_name(self):
+        """Test CopyAppPayload with None name (should be allowed)."""
+        payload = CopyAppPayload(name=None)
+        assert payload.name is None
+
+    def test_edge_case_angle_brackets_content(self):
+        """Test that angle brackets with actual content are rejected."""
+        # Angle brackets without valid HTML-like patterns should be checked
+        # The regex pattern <.*?on\w+\s*= should catch event handlers
+        # But let's verify other patterns too
+
+        # Valid: angle brackets used as symbols (not matched by our patterns)
+        # Our patterns specifically look for dangerous constructs
+
+        # Invalid: actual HTML tags with event handlers
+        invalid_names = [
+            "<div onclick=xss>",
+            "<img src=x onerror=alert(1)>",
+        ]
+
+        for name in invalid_names:
+            with pytest.raises(ValueError) as exc_info:
+                CreateAppPayload(name=name, mode="chat")
+            assert "invalid characters or patterns" in str(exc_info.value).lower()

api/tests/unit_tests/controllers/console/datasets/test_datasets_document_download.py

@@ -1,430 +0,0 @@
-"""
-Unit tests for the dataset document download endpoint.
-
-These tests validate that the controller returns a signed download URL for
-upload-file documents, and rejects unsupported or missing file cases.
-"""
-
-from __future__ import annotations
-
-import importlib
-import sys
-from collections import UserDict
-from io import BytesIO
-from types import SimpleNamespace
-from typing import Any
-from zipfile import ZipFile
-
-import pytest
-from flask import Flask
-from werkzeug.exceptions import Forbidden, NotFound
-
-
-@pytest.fixture
-def app() -> Flask:
-    """Create a minimal Flask app for request-context based controller tests."""
-    app = Flask(__name__)
-    app.config["TESTING"] = True
-    return app
-
-
-@pytest.fixture
-def datasets_document_module(monkeypatch: pytest.MonkeyPatch):
-    """
-    Reload `controllers.console.datasets.datasets_document` with lightweight decorators.
-
-    We patch auth / setup / rate-limit decorators to no-ops so we can unit test the
-    controller logic without requiring the full console stack.
-    """
-
-    from controllers.console import console_ns, wraps
-    from libs import login
-
-    def _noop(func):  # type: ignore[no-untyped-def]
-        return func
-
-    # Bypass login/setup/account checks in unit tests.
-    monkeypatch.setattr(login, "login_required", _noop)
-    monkeypatch.setattr(wraps, "setup_required", _noop)
-    monkeypatch.setattr(wraps, "account_initialization_required", _noop)
-
-    # Bypass billing-related decorators used by other endpoints in this module.
-    monkeypatch.setattr(wraps, "cloud_edition_billing_resource_check", lambda *_args, **_kwargs: (lambda f: f))
-    monkeypatch.setattr(wraps, "cloud_edition_billing_rate_limit_check", lambda *_args, **_kwargs: (lambda f: f))
-
-    # Avoid Flask-RESTX route registration side effects during import.
-    def _noop_route(*_args, **_kwargs):  # type: ignore[override]
-        def _decorator(cls):
-            return cls
-
-        return _decorator
-
-    monkeypatch.setattr(console_ns, "route", _noop_route)
-
-    module_name = "controllers.console.datasets.datasets_document"
-    sys.modules.pop(module_name, None)
-    return importlib.import_module(module_name)
-
-
-def _mock_user(*, is_dataset_editor: bool = True) -> SimpleNamespace:
-    """Build a minimal user object compatible with dataset permission checks."""
-    return SimpleNamespace(is_dataset_editor=is_dataset_editor, id="user-123")
-
-
-def _mock_document(
-    *,
-    document_id: str,
-    tenant_id: str,
-    data_source_type: str,
-    upload_file_id: str | None,
-) -> SimpleNamespace:
-    """Build a minimal document object used by the controller."""
-    data_source_info_dict: dict[str, Any] | None = None
-    if upload_file_id is not None:
-        data_source_info_dict = {"upload_file_id": upload_file_id}
-    else:
-        data_source_info_dict = {}
-
-    return SimpleNamespace(
-        id=document_id,
-        tenant_id=tenant_id,
-        data_source_type=data_source_type,
-        data_source_info_dict=data_source_info_dict,
-    )
-
-
-def _wire_common_success_mocks(
-    *,
-    module,
-    monkeypatch: pytest.MonkeyPatch,
-    current_tenant_id: str,
-    document_tenant_id: str,
-    data_source_type: str,
-    upload_file_id: str | None,
-    upload_file_exists: bool,
-    signed_url: str,
-) -> None:
-    """Patch controller dependencies to create a deterministic test environment."""
-    import services.dataset_service as dataset_service_module
-
-    # Make `current_account_with_tenant()` return a known user + tenant id.
-    monkeypatch.setattr(module, "current_account_with_tenant", lambda: (_mock_user(), current_tenant_id))
-
-    # Return a dataset object and allow permission checks to pass.
-    monkeypatch.setattr(module.DatasetService, "get_dataset", lambda _dataset_id: SimpleNamespace(id="ds-1"))
-    monkeypatch.setattr(module.DatasetService, "check_dataset_permission", lambda *_args, **_kwargs: None)
-
-    # Return a document that will be validated inside DocumentResource.get_document.
-    document = _mock_document(
-        document_id="doc-1",
-        tenant_id=document_tenant_id,
-        data_source_type=data_source_type,
-        upload_file_id=upload_file_id,
-    )
-    monkeypatch.setattr(module.DocumentService, "get_document", lambda *_args, **_kwargs: document)
-
-    # Mock UploadFile lookup via FileService batch helper.
-    upload_files_by_id: dict[str, Any] = {}
-    if upload_file_exists and upload_file_id is not None:
-        upload_files_by_id[str(upload_file_id)] = SimpleNamespace(id=str(upload_file_id))
-    monkeypatch.setattr(module.FileService, "get_upload_files_by_ids", lambda *_args, **_kwargs: upload_files_by_id)
-
-    # Mock signing helper so the returned URL is deterministic.
-    monkeypatch.setattr(dataset_service_module.file_helpers, "get_signed_file_url", lambda **_kwargs: signed_url)
-
-
-def _mock_send_file(obj, **kwargs):  # type: ignore[no-untyped-def]
-    """Return a lightweight representation of `send_file(...)` for unit tests."""
-
-    class _ResponseMock(UserDict):
-        def __init__(self, sent_file: object, send_file_kwargs: dict[str, object]) -> None:
-            super().__init__({"_sent_file": sent_file, "_send_file_kwargs": send_file_kwargs})
-            self._on_close: object | None = None
-
-        def call_on_close(self, func):  # type: ignore[no-untyped-def]
-            self._on_close = func
-            return func
-
-    return _ResponseMock(obj, kwargs)
-
-
-def test_batch_download_zip_returns_send_file(
-    app: Flask, datasets_document_module, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Ensure batch ZIP download returns a zip attachment via `send_file`."""
-
-    # Arrange common permission mocks.
-    monkeypatch.setattr(datasets_document_module, "current_account_with_tenant", lambda: (_mock_user(), "tenant-123"))
-    monkeypatch.setattr(
-        datasets_document_module.DatasetService, "get_dataset", lambda _dataset_id: SimpleNamespace(id="ds-1")
-    )
-    monkeypatch.setattr(
-        datasets_document_module.DatasetService, "check_dataset_permission", lambda *_args, **_kwargs: None
-    )
-
-    # Two upload-file documents, each referencing an UploadFile.
-    doc1 = _mock_document(
-        document_id="11111111-1111-1111-1111-111111111111",
-        tenant_id="tenant-123",
-        data_source_type="upload_file",
-        upload_file_id="file-1",
-    )
-    doc2 = _mock_document(
-        document_id="22222222-2222-2222-2222-222222222222",
-        tenant_id="tenant-123",
-        data_source_type="upload_file",
-        upload_file_id="file-2",
-    )
-    monkeypatch.setattr(
-        datasets_document_module.DocumentService,
-        "get_documents_by_ids",
-        lambda *_args, **_kwargs: [doc1, doc2],
-    )
-    monkeypatch.setattr(
-        datasets_document_module.FileService,
-        "get_upload_files_by_ids",
-        lambda *_args, **_kwargs: {
-            "file-1": SimpleNamespace(id="file-1", name="a.txt", key="k1"),
-            "file-2": SimpleNamespace(id="file-2", name="b.txt", key="k2"),
-        },
-    )
-
-    # Mock storage streaming content.
-    import services.file_service as file_service_module
-
-    monkeypatch.setattr(file_service_module.storage, "load", lambda _key, stream=True: [b"hello"])
-
-    # Replace send_file used by the controller to avoid a real Flask response object.
-    monkeypatch.setattr(datasets_document_module, "send_file", _mock_send_file)
-
-    # Act
-    with app.test_request_context(
-        "/datasets/ds-1/documents/download-zip",
-        method="POST",
-        json={"document_ids": ["11111111-1111-1111-1111-111111111111", "22222222-2222-2222-2222-222222222222"]},
-    ):
-        api = datasets_document_module.DocumentBatchDownloadZipApi()
-        result = api.post(dataset_id="ds-1")
-
-    # Assert: we returned via send_file with correct mime type and attachment.
-    assert result["_send_file_kwargs"]["mimetype"] == "application/zip"
-    assert result["_send_file_kwargs"]["as_attachment"] is True
-    assert isinstance(result["_send_file_kwargs"]["download_name"], str)
-    assert result["_send_file_kwargs"]["download_name"].endswith(".zip")
-    # Ensure our cleanup hook is registered and execute it to avoid temp file leaks in unit tests.
-    assert getattr(result, "_on_close", None) is not None
-    result._on_close()  # type: ignore[attr-defined]
-
-
-def test_batch_download_zip_response_is_openable_zip(
-    app: Flask, datasets_document_module, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Ensure the real Flask `send_file` response body is a valid ZIP that can be opened."""
-
-    # Arrange: same controller mocks as the lightweight send_file test, but we keep the real `send_file`.
-    monkeypatch.setattr(datasets_document_module, "current_account_with_tenant", lambda: (_mock_user(), "tenant-123"))
-    monkeypatch.setattr(
-        datasets_document_module.DatasetService, "get_dataset", lambda _dataset_id: SimpleNamespace(id="ds-1")
-    )
-    monkeypatch.setattr(
-        datasets_document_module.DatasetService, "check_dataset_permission", lambda *_args, **_kwargs: None
-    )
-
-    doc1 = _mock_document(
-        document_id="33333333-3333-3333-3333-333333333333",
-        tenant_id="tenant-123",
-        data_source_type="upload_file",
-        upload_file_id="file-1",
-    )
-    doc2 = _mock_document(
-        document_id="44444444-4444-4444-4444-444444444444",
-        tenant_id="tenant-123",
-        data_source_type="upload_file",
-        upload_file_id="file-2",
-    )
-    monkeypatch.setattr(
-        datasets_document_module.DocumentService,
-        "get_documents_by_ids",
-        lambda *_args, **_kwargs: [doc1, doc2],
-    )
-    monkeypatch.setattr(
-        datasets_document_module.FileService,
-        "get_upload_files_by_ids",
-        lambda *_args, **_kwargs: {
-            "file-1": SimpleNamespace(id="file-1", name="a.txt", key="k1"),
-            "file-2": SimpleNamespace(id="file-2", name="b.txt", key="k2"),
-        },
-    )
-
-    # Stream distinct bytes per key so we can verify both ZIP entries.
-    import services.file_service as file_service_module
-
-    monkeypatch.setattr(
-        file_service_module.storage, "load", lambda key, stream=True: [b"one"] if key == "k1" else [b"two"]
-    )
-
-    # Act
-    with app.test_request_context(
-        "/datasets/ds-1/documents/download-zip",
-        method="POST",
-        json={"document_ids": ["33333333-3333-3333-3333-333333333333", "44444444-4444-4444-4444-444444444444"]},
-    ):
-        api = datasets_document_module.DocumentBatchDownloadZipApi()
-        response = api.post(dataset_id="ds-1")
-
-    # Assert: response body is a valid ZIP and contains the expected entries.
-    response.direct_passthrough = False
-    data = response.get_data()
-    response.close()
-
-    with ZipFile(BytesIO(data), mode="r") as zf:
-        assert zf.namelist() == ["a.txt", "b.txt"]
-        assert zf.read("a.txt") == b"one"
-        assert zf.read("b.txt") == b"two"
-
-
-def test_batch_download_zip_rejects_non_upload_file_document(
-    app: Flask, datasets_document_module, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Ensure batch ZIP download rejects non upload-file documents."""
-
-    monkeypatch.setattr(datasets_document_module, "current_account_with_tenant", lambda: (_mock_user(), "tenant-123"))
-    monkeypatch.setattr(
-        datasets_document_module.DatasetService, "get_dataset", lambda _dataset_id: SimpleNamespace(id="ds-1")
-    )
-    monkeypatch.setattr(
-        datasets_document_module.DatasetService, "check_dataset_permission", lambda *_args, **_kwargs: None
-    )
-
-    doc = _mock_document(
-        document_id="55555555-5555-5555-5555-555555555555",
-        tenant_id="tenant-123",
-        data_source_type="website_crawl",
-        upload_file_id="file-1",
-    )
-    monkeypatch.setattr(
-        datasets_document_module.DocumentService,
-        "get_documents_by_ids",
-        lambda *_args, **_kwargs: [doc],
-    )
-
-    with app.test_request_context(
-        "/datasets/ds-1/documents/download-zip",
-        method="POST",
-        json={"document_ids": ["55555555-5555-5555-5555-555555555555"]},
-    ):
-        api = datasets_document_module.DocumentBatchDownloadZipApi()
-        with pytest.raises(NotFound):
-            api.post(dataset_id="ds-1")
-
-
-def test_document_download_returns_url_for_upload_file_document(
-    app: Flask, datasets_document_module, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Ensure upload-file documents return a `{url}` JSON payload."""
-
-    _wire_common_success_mocks(
-        module=datasets_document_module,
-        monkeypatch=monkeypatch,
-        current_tenant_id="tenant-123",
-        document_tenant_id="tenant-123",
-        data_source_type="upload_file",
-        upload_file_id="file-123",
-        upload_file_exists=True,
-        signed_url="https://example.com/signed",
-    )
-
-    # Build a request context then call the resource method directly.
-    with app.test_request_context("/datasets/ds-1/documents/doc-1/download", method="GET"):
-        api = datasets_document_module.DocumentDownloadApi()
-        result = api.get(dataset_id="ds-1", document_id="doc-1")
-
-    assert result == {"url": "https://example.com/signed"}
-
-
-def test_document_download_rejects_non_upload_file_document(
-    app: Flask, datasets_document_module, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Ensure non-upload documents raise 404 (no file to download)."""
-
-    _wire_common_success_mocks(
-        module=datasets_document_module,
-        monkeypatch=monkeypatch,
-        current_tenant_id="tenant-123",
-        document_tenant_id="tenant-123",
-        data_source_type="website_crawl",
-        upload_file_id="file-123",
-        upload_file_exists=True,
-        signed_url="https://example.com/signed",
-    )
-
-    with app.test_request_context("/datasets/ds-1/documents/doc-1/download", method="GET"):
-        api = datasets_document_module.DocumentDownloadApi()
-        with pytest.raises(NotFound):
-            api.get(dataset_id="ds-1", document_id="doc-1")
-
-
-def test_document_download_rejects_missing_upload_file_id(
-    app: Flask, datasets_document_module, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Ensure missing `upload_file_id` raises 404."""
-
-    _wire_common_success_mocks(
-        module=datasets_document_module,
-        monkeypatch=monkeypatch,
-        current_tenant_id="tenant-123",
-        document_tenant_id="tenant-123",
-        data_source_type="upload_file",
-        upload_file_id=None,
-        upload_file_exists=False,
-        signed_url="https://example.com/signed",
-    )
-
-    with app.test_request_context("/datasets/ds-1/documents/doc-1/download", method="GET"):
-        api = datasets_document_module.DocumentDownloadApi()
-        with pytest.raises(NotFound):
-            api.get(dataset_id="ds-1", document_id="doc-1")
-
-
-def test_document_download_rejects_when_upload_file_record_missing(
-    app: Flask, datasets_document_module, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Ensure missing UploadFile row raises 404."""
-
-    _wire_common_success_mocks(
-        module=datasets_document_module,
-        monkeypatch=monkeypatch,
-        current_tenant_id="tenant-123",
-        document_tenant_id="tenant-123",
-        data_source_type="upload_file",
-        upload_file_id="file-123",
-        upload_file_exists=False,
-        signed_url="https://example.com/signed",
-    )
-
-    with app.test_request_context("/datasets/ds-1/documents/doc-1/download", method="GET"):
-        api = datasets_document_module.DocumentDownloadApi()
-        with pytest.raises(NotFound):
-            api.get(dataset_id="ds-1", document_id="doc-1")
-
-
-def test_document_download_rejects_tenant_mismatch(
-    app: Flask, datasets_document_module, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    """Ensure tenant mismatch is rejected by the shared `get_document()` permission check."""
-
-    _wire_common_success_mocks(
-        module=datasets_document_module,
-        monkeypatch=monkeypatch,
-        current_tenant_id="tenant-123",
-        document_tenant_id="tenant-999",
-        data_source_type="upload_file",
-        upload_file_id="file-123",
-        upload_file_exists=True,
-        signed_url="https://example.com/signed",
-    )
-
-    with app.test_request_context("/datasets/ds-1/documents/doc-1/download", method="GET"):
-        api = datasets_document_module.DocumentDownloadApi()
-        with pytest.raises(Forbidden):
-            api.get(dataset_id="ds-1", document_id="doc-1")

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

@@ -346,7 +346,6 @@ class TestPluginRuntimeErrorHandling:
         mock_response.status_code = 200
         invoke_error = {
             "error_type": "InvokeRateLimitError",
-            "message": "Rate limit exceeded",
             "args": {"description": "Rate limit exceeded"},
         }
         error_message = json.dumps({"error_type": "PluginInvokeError", "message": json.dumps(invoke_error)})
@@ -365,7 +364,6 @@ class TestPluginRuntimeErrorHandling:
         mock_response.status_code = 200
         invoke_error = {
             "error_type": "InvokeAuthorizationError",
-            "message": "Invalid credentials",
             "args": {"description": "Invalid credentials"},
         }
         error_message = json.dumps({"error_type": "PluginInvokeError", "message": json.dumps(invoke_error)})
@@ -384,7 +382,6 @@ class TestPluginRuntimeErrorHandling:
         mock_response.status_code = 200
         invoke_error = {
             "error_type": "InvokeBadRequestError",
-            "message": "Invalid parameters",
             "args": {"description": "Invalid parameters"},
         }
         error_message = json.dumps({"error_type": "PluginInvokeError", "message": json.dumps(invoke_error)})
@@ -403,7 +400,6 @@ class TestPluginRuntimeErrorHandling:
         mock_response.status_code = 200
         invoke_error = {
             "error_type": "InvokeConnectionError",
-            "message": "Connection to external service failed",
             "args": {"description": "Connection to external service failed"},
         }
         error_message = json.dumps({"error_type": "PluginInvokeError", "message": json.dumps(invoke_error)})
@@ -422,7 +418,6 @@ class TestPluginRuntimeErrorHandling:
         mock_response.status_code = 200
         invoke_error = {
             "error_type": "InvokeServerUnavailableError",
-            "message": "Service temporarily unavailable",
             "args": {"description": "Service temporarily unavailable"},
         }
         error_message = json.dumps({"error_type": "PluginInvokeError", "message": json.dumps(invoke_error)})

api/tests/unit_tests/core/workflow/context/__init__.py

@@ -1 +0,0 @@
-"""Tests for workflow context management."""

api/tests/unit_tests/core/workflow/context/test_execution_context.py

@@ -1,258 +0,0 @@
-"""Tests for execution context module."""
-
-import contextvars
-from typing import Any
-from unittest.mock import MagicMock
-
-import pytest
-
-from core.workflow.context.execution_context import (
-    AppContext,
-    ExecutionContext,
-    ExecutionContextBuilder,
-    IExecutionContext,
-    NullAppContext,
-)
-
-
-class TestAppContext:
-    """Test AppContext abstract base class."""
-
-    def test_app_context_is_abstract(self):
-        """Test that AppContext cannot be instantiated directly."""
-        with pytest.raises(TypeError):
-            AppContext()  # type: ignore
-
-
-class TestNullAppContext:
-    """Test NullAppContext implementation."""
-
-    def test_null_app_context_get_config(self):
-        """Test get_config returns value from config dict."""
-        config = {"key1": "value1", "key2": "value2"}
-        ctx = NullAppContext(config=config)
-
-        assert ctx.get_config("key1") == "value1"
-        assert ctx.get_config("key2") == "value2"
-
-    def test_null_app_context_get_config_default(self):
-        """Test get_config returns default when key not found."""
-        ctx = NullAppContext()
-
-        assert ctx.get_config("nonexistent", "default") == "default"
-        assert ctx.get_config("nonexistent") is None
-
-    def test_null_app_context_get_extension(self):
-        """Test get_extension returns stored extension."""
-        ctx = NullAppContext()
-        extension = MagicMock()
-        ctx.set_extension("db", extension)
-
-        assert ctx.get_extension("db") == extension
-
-    def test_null_app_context_get_extension_not_found(self):
-        """Test get_extension returns None when extension not found."""
-        ctx = NullAppContext()
-
-        assert ctx.get_extension("nonexistent") is None
-
-    def test_null_app_context_enter_yield(self):
-        """Test enter method yields without any side effects."""
-        ctx = NullAppContext()
-
-        with ctx.enter():
-            # Should not raise any exception
-            pass
-
-
-class TestExecutionContext:
-    """Test ExecutionContext class."""
-
-    def test_initialization_with_all_params(self):
-        """Test ExecutionContext initialization with all parameters."""
-        app_ctx = NullAppContext()
-        context_vars = contextvars.copy_context()
-        user = MagicMock()
-
-        ctx = ExecutionContext(
-            app_context=app_ctx,
-            context_vars=context_vars,
-            user=user,
-        )
-
-        assert ctx.app_context == app_ctx
-        assert ctx.context_vars == context_vars
-        assert ctx.user == user
-
-    def test_initialization_with_minimal_params(self):
-        """Test ExecutionContext initialization with minimal parameters."""
-        ctx = ExecutionContext()
-
-        assert ctx.app_context is None
-        assert ctx.context_vars is None
-        assert ctx.user is None
-
-    def test_enter_with_context_vars(self):
-        """Test enter restores context variables."""
-        test_var = contextvars.ContextVar("test_var")
-        test_var.set("original_value")
-
-        # Copy context with the variable
-        context_vars = contextvars.copy_context()
-
-        # Change the variable
-        test_var.set("new_value")
-
-        # Create execution context and enter it
-        ctx = ExecutionContext(context_vars=context_vars)
-
-        with ctx.enter():
-            # Variable should be restored to original value
-            assert test_var.get() == "original_value"
-
-        # After exiting, variable stays at the value from within the context
-        # (this is expected Python contextvars behavior)
-        assert test_var.get() == "original_value"
-
-    def test_enter_with_app_context(self):
-        """Test enter enters app context if available."""
-        app_ctx = NullAppContext()
-        ctx = ExecutionContext(app_context=app_ctx)
-
-        # Should not raise any exception
-        with ctx.enter():
-            pass
-
-    def test_enter_without_app_context(self):
-        """Test enter works without app context."""
-        ctx = ExecutionContext(app_context=None)
-
-        # Should not raise any exception
-        with ctx.enter():
-            pass
-
-    def test_context_manager_protocol(self):
-        """Test ExecutionContext supports context manager protocol."""
-        ctx = ExecutionContext()
-
-        with ctx:
-            # Should not raise any exception
-            pass
-
-    def test_user_property(self):
-        """Test user property returns set user."""
-        user = MagicMock()
-        ctx = ExecutionContext(user=user)
-
-        assert ctx.user == user
-
-
-class TestIExecutionContextProtocol:
-    """Test IExecutionContext protocol."""
-
-    def test_execution_context_implements_protocol(self):
-        """Test that ExecutionContext implements IExecutionContext protocol."""
-        ctx = ExecutionContext()
-
-        # Should have __enter__ and __exit__ methods
-        assert hasattr(ctx, "__enter__")
-        assert hasattr(ctx, "__exit__")
-        assert hasattr(ctx, "user")
-
-    def test_protocol_compatibility(self):
-        """Test that ExecutionContext can be used where IExecutionContext is expected."""
-
-        def accept_context(context: IExecutionContext) -> Any:
-            """Function that accepts IExecutionContext protocol."""
-            # Just verify it has the required protocol attributes
-            assert hasattr(context, "__enter__")
-            assert hasattr(context, "__exit__")
-            assert hasattr(context, "user")
-            return context.user
-
-        ctx = ExecutionContext(user="test_user")
-        result = accept_context(ctx)
-
-        assert result == "test_user"
-
-    def test_protocol_with_flask_execution_context(self):
-        """Test that IExecutionContext protocol is compatible with different implementations."""
-        # Verify the protocol works with ExecutionContext
-        ctx = ExecutionContext(user="test_user")
-
-        # Should have the required protocol attributes
-        assert hasattr(ctx, "__enter__")
-        assert hasattr(ctx, "__exit__")
-        assert hasattr(ctx, "user")
-        assert ctx.user == "test_user"
-
-        # Should work as context manager
-        with ctx:
-            assert ctx.user == "test_user"
-
-
-class TestExecutionContextBuilder:
-    """Test ExecutionContextBuilder class."""
-
-    def test_builder_with_all_params(self):
-        """Test builder with all parameters set."""
-        app_ctx = NullAppContext()
-        context_vars = contextvars.copy_context()
-        user = MagicMock()
-
-        ctx = (
-            ExecutionContextBuilder().with_app_context(app_ctx).with_context_vars(context_vars).with_user(user).build()
-        )
-
-        assert ctx.app_context == app_ctx
-        assert ctx.context_vars == context_vars
-        assert ctx.user == user
-
-    def test_builder_with_partial_params(self):
-        """Test builder with only some parameters set."""
-        app_ctx = NullAppContext()
-
-        ctx = ExecutionContextBuilder().with_app_context(app_ctx).build()
-
-        assert ctx.app_context == app_ctx
-        assert ctx.context_vars is None
-        assert ctx.user is None
-
-    def test_builder_fluent_interface(self):
-        """Test builder provides fluent interface."""
-        builder = ExecutionContextBuilder()
-
-        # Each method should return the builder
-        assert isinstance(builder.with_app_context(NullAppContext()), ExecutionContextBuilder)
-        assert isinstance(builder.with_context_vars(contextvars.copy_context()), ExecutionContextBuilder)
-        assert isinstance(builder.with_user(None), ExecutionContextBuilder)
-
-
-class TestCaptureCurrentContext:
-    """Test capture_current_context function."""
-
-    def test_capture_current_context_returns_context(self):
-        """Test that capture_current_context returns a valid context."""
-        from core.workflow.context.execution_context import capture_current_context
-
-        result = capture_current_context()
-
-        # Should return an object that implements IExecutionContext
-        assert hasattr(result, "__enter__")
-        assert hasattr(result, "__exit__")
-        assert hasattr(result, "user")
-
-    def test_capture_current_context_captures_contextvars(self):
-        """Test that capture_current_context captures context variables."""
-        # Set a context variable before capturing
-        import contextvars
-
-        test_var = contextvars.ContextVar("capture_test_var")
-        test_var.set("test_value_123")
-
-        from core.workflow.context.execution_context import capture_current_context
-
-        result = capture_current_context()
-
-        # Context variables should be captured
-        assert result.context_vars is not None

api/tests/unit_tests/core/workflow/context/test_flask_app_context.py

@@ -1,316 +0,0 @@
-"""Tests for Flask app context module."""
-
-import contextvars
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-
-class TestFlaskAppContext:
-    """Test FlaskAppContext implementation."""
-
-    @pytest.fixture
-    def mock_flask_app(self):
-        """Create a mock Flask app."""
-        app = MagicMock()
-        app.config = {"TEST_KEY": "test_value"}
-        app.extensions = {"db": MagicMock(), "cache": MagicMock()}
-        app.app_context = MagicMock()
-        app.app_context.return_value.__enter__ = MagicMock(return_value=None)
-        app.app_context.return_value.__exit__ = MagicMock(return_value=None)
-        return app
-
-    def test_flask_app_context_initialization(self, mock_flask_app):
-        """Test FlaskAppContext initialization."""
-        # Import here to avoid Flask dependency in test environment
-        from context.flask_app_context import FlaskAppContext
-
-        ctx = FlaskAppContext(mock_flask_app)
-
-        assert ctx.flask_app == mock_flask_app
-
-    def test_flask_app_context_get_config(self, mock_flask_app):
-        """Test get_config returns Flask app config value."""
-        from context.flask_app_context import FlaskAppContext
-
-        ctx = FlaskAppContext(mock_flask_app)
-
-        assert ctx.get_config("TEST_KEY") == "test_value"
-
-    def test_flask_app_context_get_config_default(self, mock_flask_app):
-        """Test get_config returns default when key not found."""
-        from context.flask_app_context import FlaskAppContext
-
-        ctx = FlaskAppContext(mock_flask_app)
-
-        assert ctx.get_config("NONEXISTENT", "default") == "default"
-
-    def test_flask_app_context_get_extension(self, mock_flask_app):
-        """Test get_extension returns Flask extension."""
-        from context.flask_app_context import FlaskAppContext
-
-        ctx = FlaskAppContext(mock_flask_app)
-        db_ext = mock_flask_app.extensions["db"]
-
-        assert ctx.get_extension("db") == db_ext
-
-    def test_flask_app_context_get_extension_not_found(self, mock_flask_app):
-        """Test get_extension returns None when extension not found."""
-        from context.flask_app_context import FlaskAppContext
-
-        ctx = FlaskAppContext(mock_flask_app)
-
-        assert ctx.get_extension("nonexistent") is None
-
-    def test_flask_app_context_enter(self, mock_flask_app):
-        """Test enter method enters Flask app context."""
-        from context.flask_app_context import FlaskAppContext
-
-        ctx = FlaskAppContext(mock_flask_app)
-
-        with ctx.enter():
-            # Should not raise any exception
-            pass
-
-        # Verify app_context was called
-        mock_flask_app.app_context.assert_called_once()
-
-
-class TestFlaskExecutionContext:
-    """Test FlaskExecutionContext class."""
-
-    @pytest.fixture
-    def mock_flask_app(self):
-        """Create a mock Flask app."""
-        app = MagicMock()
-        app.config = {}
-        app.app_context = MagicMock()
-        app.app_context.return_value.__enter__ = MagicMock(return_value=None)
-        app.app_context.return_value.__exit__ = MagicMock(return_value=None)
-        return app
-
-    def test_initialization(self, mock_flask_app):
-        """Test FlaskExecutionContext initialization."""
-        from context.flask_app_context import FlaskExecutionContext
-
-        context_vars = contextvars.copy_context()
-        user = MagicMock()
-
-        ctx = FlaskExecutionContext(
-            flask_app=mock_flask_app,
-            context_vars=context_vars,
-            user=user,
-        )
-
-        assert ctx.context_vars == context_vars
-        assert ctx.user == user
-
-    def test_app_context_property(self, mock_flask_app):
-        """Test app_context property returns FlaskAppContext."""
-        from context.flask_app_context import FlaskAppContext, FlaskExecutionContext
-
-        ctx = FlaskExecutionContext(
-            flask_app=mock_flask_app,
-            context_vars=contextvars.copy_context(),
-        )
-
-        assert isinstance(ctx.app_context, FlaskAppContext)
-        assert ctx.app_context.flask_app == mock_flask_app
-
-    def test_context_manager_protocol(self, mock_flask_app):
-        """Test FlaskExecutionContext supports context manager protocol."""
-        from context.flask_app_context import FlaskExecutionContext
-
-        ctx = FlaskExecutionContext(
-            flask_app=mock_flask_app,
-            context_vars=contextvars.copy_context(),
-        )
-
-        # Should have __enter__ and __exit__ methods
-        assert hasattr(ctx, "__enter__")
-        assert hasattr(ctx, "__exit__")
-
-        # Should work as context manager
-        with ctx:
-            pass
-
-
-class TestCaptureFlaskContext:
-    """Test capture_flask_context function."""
-
-    @patch("context.flask_app_context.current_app")
-    @patch("context.flask_app_context.g")
-    def test_capture_flask_context_captures_app(self, mock_g, mock_current_app):
-        """Test capture_flask_context captures Flask app."""
-        mock_app = MagicMock()
-        mock_app._get_current_object = MagicMock(return_value=mock_app)
-        mock_current_app._get_current_object = MagicMock(return_value=mock_app)
-
-        from context.flask_app_context import capture_flask_context
-
-        ctx = capture_flask_context()
-
-        assert ctx._flask_app == mock_app
-
-    @patch("context.flask_app_context.current_app")
-    @patch("context.flask_app_context.g")
-    def test_capture_flask_context_captures_user_from_g(self, mock_g, mock_current_app):
-        """Test capture_flask_context captures user from Flask g object."""
-        mock_app = MagicMock()
-        mock_app._get_current_object = MagicMock(return_value=mock_app)
-        mock_current_app._get_current_object = MagicMock(return_value=mock_app)
-
-        mock_user = MagicMock()
-        mock_user.id = "user_123"
-        mock_g._login_user = mock_user
-
-        from context.flask_app_context import capture_flask_context
-
-        ctx = capture_flask_context()
-
-        assert ctx.user == mock_user
-
-    @patch("context.flask_app_context.current_app")
-    def test_capture_flask_context_with_explicit_user(self, mock_current_app):
-        """Test capture_flask_context uses explicit user parameter."""
-        mock_app = MagicMock()
-        mock_app._get_current_object = MagicMock(return_value=mock_app)
-        mock_current_app._get_current_object = MagicMock(return_value=mock_app)
-
-        explicit_user = MagicMock()
-        explicit_user.id = "user_456"
-
-        from context.flask_app_context import capture_flask_context
-
-        ctx = capture_flask_context(user=explicit_user)
-
-        assert ctx.user == explicit_user
-
-    @patch("context.flask_app_context.current_app")
-    def test_capture_flask_context_captures_contextvars(self, mock_current_app):
-        """Test capture_flask_context captures context variables."""
-        mock_app = MagicMock()
-        mock_app._get_current_object = MagicMock(return_value=mock_app)
-        mock_current_app._get_current_object = MagicMock(return_value=mock_app)
-
-        # Set a context variable
-        test_var = contextvars.ContextVar("test_var")
-        test_var.set("test_value")
-
-        from context.flask_app_context import capture_flask_context
-
-        ctx = capture_flask_context()
-
-        # Context variables should be captured
-        assert ctx.context_vars is not None
-        # Verify the variable is in the captured context
-        captured_value = ctx.context_vars[test_var]
-        assert captured_value == "test_value"
-
-
-class TestFlaskExecutionContextIntegration:
-    """Integration tests for FlaskExecutionContext."""
-
-    @pytest.fixture
-    def mock_flask_app(self):
-        """Create a mock Flask app with proper app context."""
-        app = MagicMock()
-        app.config = {"TEST": "value"}
-        app.extensions = {"db": MagicMock()}
-
-        # Mock app context
-        mock_app_context = MagicMock()
-        mock_app_context.__enter__ = MagicMock(return_value=None)
-        mock_app_context.__exit__ = MagicMock(return_value=None)
-        app.app_context.return_value = mock_app_context
-
-        return app
-
-    def test_enter_restores_context_vars(self, mock_flask_app):
-        """Test that enter restores captured context variables."""
-        # Create a context variable and set a value
-        test_var = contextvars.ContextVar("integration_test_var")
-        test_var.set("original_value")
-
-        # Capture the context
-        context_vars = contextvars.copy_context()
-
-        # Change the value
-        test_var.set("new_value")
-
-        # Create FlaskExecutionContext and enter it
-        from context.flask_app_context import FlaskExecutionContext
-
-        ctx = FlaskExecutionContext(
-            flask_app=mock_flask_app,
-            context_vars=context_vars,
-        )
-
-        with ctx:
-            # Value should be restored to original
-            assert test_var.get() == "original_value"
-
-        # After exiting, variable stays at the value from within the context
-        # (this is expected Python contextvars behavior)
-        assert test_var.get() == "original_value"
-
-    def test_enter_enters_flask_app_context(self, mock_flask_app):
-        """Test that enter enters Flask app context."""
-        from context.flask_app_context import FlaskExecutionContext
-
-        ctx = FlaskExecutionContext(
-            flask_app=mock_flask_app,
-            context_vars=contextvars.copy_context(),
-        )
-
-        with ctx:
-            # Verify app context was entered
-            assert mock_flask_app.app_context.called
-
-    @patch("context.flask_app_context.g")
-    def test_enter_restores_user_in_g(self, mock_g, mock_flask_app):
-        """Test that enter restores user in Flask g object."""
-        mock_user = MagicMock()
-        mock_user.id = "test_user"
-
-        # Note: FlaskExecutionContext saves user from g before entering context,
-        # then restores it after entering the app context.
-        # The user passed to constructor is NOT restored to g.
-        # So we need to test the actual behavior.
-
-        # Create FlaskExecutionContext with user in constructor
-        from context.flask_app_context import FlaskExecutionContext
-
-        ctx = FlaskExecutionContext(
-            flask_app=mock_flask_app,
-            context_vars=contextvars.copy_context(),
-            user=mock_user,
-        )
-
-        # Set user in g before entering (simulating existing user in g)
-        mock_g._login_user = mock_user
-
-        with ctx:
-            # After entering, the user from g before entry should be restored
-            assert mock_g._login_user == mock_user
-
-        # The user in constructor is stored but not automatically restored to g
-        # (it's available via ctx.user property)
-        assert ctx.user == mock_user
-
-    def test_enter_method_as_context_manager(self, mock_flask_app):
-        """Test enter method returns a proper context manager."""
-        from context.flask_app_context import FlaskExecutionContext
-
-        ctx = FlaskExecutionContext(
-            flask_app=mock_flask_app,
-            context_vars=contextvars.copy_context(),
-        )
-
-        # enter() should return a generator/context manager
-        with ctx.enter():
-            # Should work without issues
-            pass
-
-        # Verify app context was called
-        assert mock_flask_app.app_context.called

api/tests/unit_tests/libs/test_workspace_permission.py

@@ -1,142 +0,0 @@
-from unittest.mock import Mock, patch
-
-import pytest
-from werkzeug.exceptions import Forbidden
-
-from libs.workspace_permission import (
-    check_workspace_member_invite_permission,
-    check_workspace_owner_transfer_permission,
-)
-
-
-class TestWorkspacePermissionHelper:
-    """Test workspace permission helper functions."""
-
-    @patch("libs.workspace_permission.dify_config")
-    @patch("libs.workspace_permission.EnterpriseService")
-    def test_community_edition_allows_invite(self, mock_enterprise_service, mock_config):
-        """Community edition should always allow invitations without calling any service."""
-        mock_config.ENTERPRISE_ENABLED = False
-
-        # Should not raise
-        check_workspace_member_invite_permission("test-workspace-id")
-
-        # EnterpriseService should NOT be called in community edition
-        mock_enterprise_service.WorkspacePermissionService.get_permission.assert_not_called()
-
-    @patch("libs.workspace_permission.dify_config")
-    @patch("libs.workspace_permission.FeatureService")
-    def test_community_edition_allows_transfer(self, mock_feature_service, mock_config):
-        """Community edition should check billing plan but not call enterprise service."""
-        mock_config.ENTERPRISE_ENABLED = False
-        mock_features = Mock()
-        mock_features.is_allow_transfer_workspace = True
-        mock_feature_service.get_features.return_value = mock_features
-
-        # Should not raise
-        check_workspace_owner_transfer_permission("test-workspace-id")
-
-        mock_feature_service.get_features.assert_called_once_with("test-workspace-id")
-
-    @patch("libs.workspace_permission.EnterpriseService")
-    @patch("libs.workspace_permission.dify_config")
-    def test_enterprise_blocks_invite_when_disabled(self, mock_config, mock_enterprise_service):
-        """Enterprise edition should block invitations when workspace policy is False."""
-        mock_config.ENTERPRISE_ENABLED = True
-
-        mock_permission = Mock()
-        mock_permission.allow_member_invite = False
-        mock_enterprise_service.WorkspacePermissionService.get_permission.return_value = mock_permission
-
-        with pytest.raises(Forbidden, match="Workspace policy prohibits member invitations"):
-            check_workspace_member_invite_permission("test-workspace-id")
-
-        mock_enterprise_service.WorkspacePermissionService.get_permission.assert_called_once_with("test-workspace-id")
-
-    @patch("libs.workspace_permission.EnterpriseService")
-    @patch("libs.workspace_permission.dify_config")
-    def test_enterprise_allows_invite_when_enabled(self, mock_config, mock_enterprise_service):
-        """Enterprise edition should allow invitations when workspace policy is True."""
-        mock_config.ENTERPRISE_ENABLED = True
-
-        mock_permission = Mock()
-        mock_permission.allow_member_invite = True
-        mock_enterprise_service.WorkspacePermissionService.get_permission.return_value = mock_permission
-
-        # Should not raise
-        check_workspace_member_invite_permission("test-workspace-id")
-
-        mock_enterprise_service.WorkspacePermissionService.get_permission.assert_called_once_with("test-workspace-id")
-
-    @patch("libs.workspace_permission.EnterpriseService")
-    @patch("libs.workspace_permission.dify_config")
-    @patch("libs.workspace_permission.FeatureService")
-    def test_billing_plan_blocks_transfer(self, mock_feature_service, mock_config, mock_enterprise_service):
-        """SANDBOX billing plan should block owner transfer before checking enterprise policy."""
-        mock_config.ENTERPRISE_ENABLED = True
-        mock_features = Mock()
-        mock_features.is_allow_transfer_workspace = False  # SANDBOX plan
-        mock_feature_service.get_features.return_value = mock_features
-
-        with pytest.raises(Forbidden, match="Your current plan does not allow workspace ownership transfer"):
-            check_workspace_owner_transfer_permission("test-workspace-id")
-
-        # Enterprise service should NOT be called since billing plan already blocks
-        mock_enterprise_service.WorkspacePermissionService.get_permission.assert_not_called()
-
-    @patch("libs.workspace_permission.EnterpriseService")
-    @patch("libs.workspace_permission.dify_config")
-    @patch("libs.workspace_permission.FeatureService")
-    def test_enterprise_blocks_transfer_when_disabled(self, mock_feature_service, mock_config, mock_enterprise_service):
-        """Enterprise edition should block transfer when workspace policy is False."""
-        mock_config.ENTERPRISE_ENABLED = True
-        mock_features = Mock()
-        mock_features.is_allow_transfer_workspace = True  # Billing plan allows
-        mock_feature_service.get_features.return_value = mock_features
-
-        mock_permission = Mock()
-        mock_permission.allow_owner_transfer = False  # Workspace policy blocks
-        mock_enterprise_service.WorkspacePermissionService.get_permission.return_value = mock_permission
-
-        with pytest.raises(Forbidden, match="Workspace policy prohibits ownership transfer"):
-            check_workspace_owner_transfer_permission("test-workspace-id")
-
-        mock_enterprise_service.WorkspacePermissionService.get_permission.assert_called_once_with("test-workspace-id")
-
-    @patch("libs.workspace_permission.EnterpriseService")
-    @patch("libs.workspace_permission.dify_config")
-    @patch("libs.workspace_permission.FeatureService")
-    def test_enterprise_allows_transfer_when_both_enabled(
-        self, mock_feature_service, mock_config, mock_enterprise_service
-    ):
-        """Enterprise edition should allow transfer when both billing and workspace policy allow."""
-        mock_config.ENTERPRISE_ENABLED = True
-        mock_features = Mock()
-        mock_features.is_allow_transfer_workspace = True  # Billing plan allows
-        mock_feature_service.get_features.return_value = mock_features
-
-        mock_permission = Mock()
-        mock_permission.allow_owner_transfer = True  # Workspace policy allows
-        mock_enterprise_service.WorkspacePermissionService.get_permission.return_value = mock_permission
-
-        # Should not raise
-        check_workspace_owner_transfer_permission("test-workspace-id")
-
-        mock_enterprise_service.WorkspacePermissionService.get_permission.assert_called_once_with("test-workspace-id")
-
-    @patch("libs.workspace_permission.logger")
-    @patch("libs.workspace_permission.EnterpriseService")
-    @patch("libs.workspace_permission.dify_config")
-    def test_enterprise_service_error_fails_open(self, mock_config, mock_enterprise_service, mock_logger):
-        """On enterprise service error, should fail-open (allow) and log error."""
-        mock_config.ENTERPRISE_ENABLED = True
-
-        # Simulate enterprise service error
-        mock_enterprise_service.WorkspacePermissionService.get_permission.side_effect = Exception("Service unavailable")
-
-        # Should not raise (fail-open)
-        check_workspace_member_invite_permission("test-workspace-id")
-
-        # Should log the error
-        mock_logger.exception.assert_called_once()
-        assert "Failed to check workspace invite permission" in str(mock_logger.exception.call_args)

api/tests/unit_tests/repositories/test_workflow_collaboration_repository.py

@@ -1,121 +0,0 @@
-import json
-from unittest.mock import Mock
-
-import pytest
-
-from repositories import workflow_collaboration_repository as repo_module
-from repositories.workflow_collaboration_repository import WorkflowCollaborationRepository
-
-
-class TestWorkflowCollaborationRepository:
-    @pytest.fixture
-    def mock_redis(self, monkeypatch: pytest.MonkeyPatch) -> Mock:
-        mock_redis = Mock()
-        monkeypatch.setattr(repo_module, "redis_client", mock_redis)
-        return mock_redis
-
-    def test_get_sid_mapping_returns_mapping(self, mock_redis: Mock) -> None:
-        # Arrange
-        mock_redis.get.return_value = b'{"workflow_id":"wf-1","user_id":"u-1"}'
-        repository = WorkflowCollaborationRepository()
-
-        # Act
-        result = repository.get_sid_mapping("sid-1")
-
-        # Assert
-        assert result == {"workflow_id": "wf-1", "user_id": "u-1"}
-
-    def test_list_sessions_filters_invalid_entries(self, mock_redis: Mock) -> None:
-        # Arrange
-        mock_redis.hgetall.return_value = {
-            b"sid-1": b'{"user_id":"u-1","username":"Jane","sid":"sid-1","connected_at":2}',
-            b"sid-2": b'{"username":"Missing","sid":"sid-2"}',
-            b"sid-3": b"not-json",
-        }
-        repository = WorkflowCollaborationRepository()
-
-        # Act
-        result = repository.list_sessions("wf-1")
-
-        # Assert
-        assert result == [
-            {
-                "user_id": "u-1",
-                "username": "Jane",
-                "avatar": None,
-                "sid": "sid-1",
-                "connected_at": 2,
-            }
-        ]
-
-    def test_set_session_info_persists_payload(self, mock_redis: Mock) -> None:
-        # Arrange
-        mock_redis.exists.return_value = True
-        repository = WorkflowCollaborationRepository()
-        payload = {
-            "user_id": "u-1",
-            "username": "Jane",
-            "avatar": None,
-            "sid": "sid-1",
-            "connected_at": 1,
-        }
-
-        # Act
-        repository.set_session_info("wf-1", payload)
-
-        # Assert
-        assert mock_redis.hset.called
-        workflow_key, sid, session_json = mock_redis.hset.call_args.args
-        assert workflow_key == "workflow_online_users:wf-1"
-        assert sid == "sid-1"
-        assert json.loads(session_json)["user_id"] == "u-1"
-        assert mock_redis.set.called
-
-    def test_refresh_session_state_expires_keys(self, mock_redis: Mock) -> None:
-        # Arrange
-        mock_redis.exists.return_value = True
-        repository = WorkflowCollaborationRepository()
-
-        # Act
-        repository.refresh_session_state("wf-1", "sid-1")
-
-        # Assert
-        assert mock_redis.expire.call_count == 2
-
-    def test_get_current_leader_decodes_bytes(self, mock_redis: Mock) -> None:
-        # Arrange
-        mock_redis.get.return_value = b"sid-1"
-        repository = WorkflowCollaborationRepository()
-
-        # Act
-        result = repository.get_current_leader("wf-1")
-
-        # Assert
-        assert result == "sid-1"
-
-    def test_set_leader_if_absent_uses_nx(self, mock_redis: Mock) -> None:
-        # Arrange
-        mock_redis.set.return_value = True
-        repository = WorkflowCollaborationRepository()
-
-        # Act
-        result = repository.set_leader_if_absent("wf-1", "sid-1")
-
-        # Assert
-        assert result is True
-        _key, _value = mock_redis.set.call_args.args
-        assert _key == "workflow_leader:wf-1"
-        assert _value == "sid-1"
-        assert mock_redis.set.call_args.kwargs["nx"] is True
-        assert "ex" in mock_redis.set.call_args.kwargs
-
-    def test_get_session_sids_decodes(self, mock_redis: Mock) -> None:
-        # Arrange
-        mock_redis.hkeys.return_value = [b"sid-1", "sid-2"]
-        repository = WorkflowCollaborationRepository()
-
-        # Act
-        result = repository.get_session_sids("wf-1")
-
-        # Assert
-        assert result == ["sid-1", "sid-2"]

api/tests/unit_tests/services/test_file_service_zip_and_lookup.py

@@ -1,99 +0,0 @@
-"""
-Unit tests for `services.file_service.FileService` helpers.
-
-We keep these tests focused on:
-- ZIP tempfile building (sanitization + deduplication + content writes)
-- tenant-scoped batch lookup behavior (`get_upload_files_by_ids`)
-"""
-
-from __future__ import annotations
-
-from types import SimpleNamespace
-from typing import Any
-from zipfile import ZipFile
-
-import pytest
-
-import services.file_service as file_service_module
-from services.file_service import FileService
-
-
-def test_build_upload_files_zip_tempfile_sanitizes_and_dedupes_names(monkeypatch: pytest.MonkeyPatch) -> None:
-    """Ensure ZIP entry names are safe and unique while preserving extensions."""
-
-    # Arrange: three upload files that all sanitize down to the same basename ("b.txt").
-    upload_files: list[Any] = [
-        SimpleNamespace(name="a/b.txt", key="k1"),
-        SimpleNamespace(name="c/b.txt", key="k2"),
-        SimpleNamespace(name="../b.txt", key="k3"),
-    ]
-
-    # Stream distinct bytes per key so we can verify content is written to the right entry.
-    data_by_key: dict[str, list[bytes]] = {"k1": [b"one"], "k2": [b"two"], "k3": [b"three"]}
-
-    def _load(key: str, stream: bool = True) -> list[bytes]:
-        # Return the corresponding chunks for this key (the production code iterates chunks).
-        assert stream is True
-        return data_by_key[key]
-
-    monkeypatch.setattr(file_service_module.storage, "load", _load)
-
-    # Act: build zip in a tempfile.
-    with FileService.build_upload_files_zip_tempfile(upload_files=upload_files) as tmp:
-        with ZipFile(tmp, mode="r") as zf:
-            # Assert: names are sanitized (no directory components) and deduped with suffixes.
-            assert zf.namelist() == ["b.txt", "b (1).txt", "b (2).txt"]
-
-            # Assert: each entry contains the correct bytes from storage.
-            assert zf.read("b.txt") == b"one"
-            assert zf.read("b (1).txt") == b"two"
-            assert zf.read("b (2).txt") == b"three"
-
-
-def test_get_upload_files_by_ids_returns_empty_when_no_ids(monkeypatch: pytest.MonkeyPatch) -> None:
-    """Ensure empty input returns an empty mapping without hitting the database."""
-
-    class _Session:
-        def scalars(self, _stmt):  # type: ignore[no-untyped-def]
-            raise AssertionError("db.session.scalars should not be called for empty id lists")
-
-    monkeypatch.setattr(file_service_module, "db", SimpleNamespace(session=_Session()))
-
-    assert FileService.get_upload_files_by_ids("tenant-1", []) == {}
-
-
-def test_get_upload_files_by_ids_returns_id_keyed_mapping(monkeypatch: pytest.MonkeyPatch) -> None:
-    """Ensure batch lookup returns a dict keyed by stringified UploadFile ids."""
-
-    upload_files: list[Any] = [
-        SimpleNamespace(id="file-1", tenant_id="tenant-1"),
-        SimpleNamespace(id="file-2", tenant_id="tenant-1"),
-    ]
-
-    class _ScalarResult:
-        def __init__(self, items: list[Any]) -> None:
-            self._items = items
-
-        def all(self) -> list[Any]:
-            return self._items
-
-    class _Session:
-        def __init__(self, items: list[Any]) -> None:
-            self._items = items
-            self.calls: list[object] = []
-
-        def scalars(self, stmt):  # type: ignore[no-untyped-def]
-            # Capture the statement so we can at least assert the query path is taken.
-            self.calls.append(stmt)
-            return _ScalarResult(self._items)
-
-    session = _Session(upload_files)
-    monkeypatch.setattr(file_service_module, "db", SimpleNamespace(session=session))
-
-    # Provide duplicates to ensure callers can safely pass repeated ids.
-    result = FileService.get_upload_files_by_ids("tenant-1", ["file-1", "file-1", "file-2"])
-
-    assert set(result.keys()) == {"file-1", "file-2"}
-    assert result["file-1"].id == "file-1"
-    assert result["file-2"].id == "file-2"
-    assert len(session.calls) == 1

api/tests/unit_tests/services/test_workflow_collaboration_service.py

@@ -1,271 +0,0 @@
-from unittest.mock import Mock, patch
-
-import pytest
-
-from repositories.workflow_collaboration_repository import WorkflowCollaborationRepository
-from services.workflow_collaboration_service import WorkflowCollaborationService
-
-
-class TestWorkflowCollaborationService:
-    @pytest.fixture
-    def service(self) -> tuple[WorkflowCollaborationService, Mock, Mock]:
-        repository = Mock(spec=WorkflowCollaborationRepository)
-        socketio = Mock()
-        return WorkflowCollaborationService(repository, socketio), repository, socketio
-
-    def test_register_session_returns_leader_status(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, socketio = service
-        socketio.get_session.return_value = {"user_id": "u-1", "username": "Jane", "avatar": None}
-
-        with (
-            patch.object(collaboration_service, "get_or_set_leader", return_value="sid-1"),
-            patch.object(collaboration_service, "broadcast_online_users"),
-        ):
-            # Act
-            result = collaboration_service.register_session("wf-1", "sid-1")
-
-        # Assert
-        assert result == ("u-1", True)
-        repository.set_session_info.assert_called_once()
-        socketio.enter_room.assert_called_once_with("sid-1", "wf-1")
-        socketio.emit.assert_called_once_with("status", {"isLeader": True}, room="sid-1")
-
-    def test_register_session_returns_none_when_missing_user(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, _repository, socketio = service
-        socketio.get_session.return_value = {}
-
-        # Act
-        result = collaboration_service.register_session("wf-1", "sid-1")
-
-        # Assert
-        assert result is None
-
-    def test_relay_collaboration_event_unauthorized(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_sid_mapping.return_value = None
-
-        # Act
-        result = collaboration_service.relay_collaboration_event("sid-1", {})
-
-        # Assert
-        assert result == ({"msg": "unauthorized"}, 401)
-
-    def test_relay_collaboration_event_emits_update(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, socketio = service
-        repository.get_sid_mapping.return_value = {"workflow_id": "wf-1", "user_id": "u-1"}
-        payload = {"type": "mouse_move", "data": {"x": 1}, "timestamp": 123}
-
-        # Act
-        result = collaboration_service.relay_collaboration_event("sid-1", payload)
-
-        # Assert
-        assert result == ({"msg": "event_broadcasted"}, 200)
-        socketio.emit.assert_called_once_with(
-            "collaboration_update",
-            {"type": "mouse_move", "userId": "u-1", "data": {"x": 1}, "timestamp": 123},
-            room="wf-1",
-            skip_sid="sid-1",
-        )
-
-    def test_relay_graph_event_unauthorized(self, service: tuple[WorkflowCollaborationService, Mock, Mock]) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_sid_mapping.return_value = None
-
-        # Act
-        result = collaboration_service.relay_graph_event("sid-1", {"nodes": []})
-
-        # Assert
-        assert result == ({"msg": "unauthorized"}, 401)
-
-    def test_disconnect_session_no_mapping(self, service: tuple[WorkflowCollaborationService, Mock, Mock]) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_sid_mapping.return_value = None
-
-        # Act
-        collaboration_service.disconnect_session("sid-1")
-
-        # Assert
-        repository.delete_session.assert_not_called()
-
-    def test_disconnect_session_cleans_up(self, service: tuple[WorkflowCollaborationService, Mock, Mock]) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_sid_mapping.return_value = {"workflow_id": "wf-1", "user_id": "u-1"}
-
-        with (
-            patch.object(collaboration_service, "handle_leader_disconnect") as handle_leader_disconnect,
-            patch.object(collaboration_service, "broadcast_online_users") as broadcast_online_users,
-        ):
-            # Act
-            collaboration_service.disconnect_session("sid-1")
-
-        # Assert
-        repository.delete_session.assert_called_once_with("wf-1", "sid-1")
-        handle_leader_disconnect.assert_called_once_with("wf-1", "sid-1")
-        broadcast_online_users.assert_called_once_with("wf-1")
-
-    def test_get_or_set_leader_returns_active_leader(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_current_leader.return_value = "sid-1"
-
-        with patch.object(collaboration_service, "is_session_active", return_value=True):
-            # Act
-            result = collaboration_service.get_or_set_leader("wf-1", "sid-2")
-
-        # Assert
-        assert result == "sid-1"
-        repository.set_leader_if_absent.assert_not_called()
-
-    def test_get_or_set_leader_replaces_dead_leader(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_current_leader.return_value = "sid-1"
-        repository.set_leader_if_absent.return_value = True
-
-        with (
-            patch.object(collaboration_service, "is_session_active", return_value=False),
-            patch.object(collaboration_service, "broadcast_leader_change") as broadcast_leader_change,
-        ):
-            # Act
-            result = collaboration_service.get_or_set_leader("wf-1", "sid-2")
-
-        # Assert
-        assert result == "sid-2"
-        repository.delete_session.assert_called_once_with("wf-1", "sid-1")
-        repository.delete_leader.assert_called_once_with("wf-1")
-        broadcast_leader_change.assert_called_once_with("wf-1", "sid-2")
-
-    def test_get_or_set_leader_falls_back_to_existing(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_current_leader.side_effect = [None, "sid-3"]
-        repository.set_leader_if_absent.return_value = False
-
-        # Act
-        result = collaboration_service.get_or_set_leader("wf-1", "sid-2")
-
-        # Assert
-        assert result == "sid-3"
-
-    def test_handle_leader_disconnect_elects_new(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_current_leader.return_value = "sid-1"
-        repository.get_session_sids.return_value = ["sid-2"]
-
-        with patch.object(collaboration_service, "broadcast_leader_change") as broadcast_leader_change:
-            # Act
-            collaboration_service.handle_leader_disconnect("wf-1", "sid-1")
-
-        # Assert
-        repository.set_leader.assert_called_once_with("wf-1", "sid-2")
-        broadcast_leader_change.assert_called_once_with("wf-1", "sid-2")
-
-    def test_handle_leader_disconnect_clears_when_empty(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_current_leader.return_value = "sid-1"
-        repository.get_session_sids.return_value = []
-
-        # Act
-        collaboration_service.handle_leader_disconnect("wf-1", "sid-1")
-
-        # Assert
-        repository.delete_leader.assert_called_once_with("wf-1")
-
-    def test_broadcast_online_users_sorts_and_emits(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, socketio = service
-        repository.list_sessions.return_value = [
-            {"user_id": "u-1", "username": "A", "avatar": None, "sid": "sid-1", "connected_at": 3},
-            {"user_id": "u-2", "username": "B", "avatar": None, "sid": "sid-2", "connected_at": 1},
-        ]
-        repository.get_current_leader.return_value = "sid-1"
-
-        # Act
-        collaboration_service.broadcast_online_users("wf-1")
-
-        # Assert
-        socketio.emit.assert_called_once_with(
-            "online_users",
-            {
-                "workflow_id": "wf-1",
-                "users": [
-                    {"user_id": "u-2", "username": "B", "avatar": None, "sid": "sid-2", "connected_at": 1},
-                    {"user_id": "u-1", "username": "A", "avatar": None, "sid": "sid-1", "connected_at": 3},
-                ],
-                "leader": "sid-1",
-            },
-            room="wf-1",
-        )
-
-    def test_refresh_session_state_expires_active_leader(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_current_leader.return_value = "sid-1"
-
-        with patch.object(collaboration_service, "is_session_active", return_value=True):
-            # Act
-            collaboration_service.refresh_session_state("wf-1", "sid-1")
-
-        # Assert
-        repository.refresh_session_state.assert_called_once_with("wf-1", "sid-1")
-        repository.expire_leader.assert_called_once_with("wf-1")
-        repository.set_leader.assert_not_called()
-
-    def test_refresh_session_state_sets_leader_when_missing(
-        self, service: tuple[WorkflowCollaborationService, Mock, Mock]
-    ) -> None:
-        # Arrange
-        collaboration_service, repository, _socketio = service
-        repository.get_current_leader.return_value = None
-
-        with patch.object(collaboration_service, "broadcast_leader_change") as broadcast_leader_change:
-            # Act
-            collaboration_service.refresh_session_state("wf-1", "sid-2")
-
-        # Assert
-        repository.set_leader.assert_called_once_with("wf-1", "sid-2")
-        broadcast_leader_change.assert_called_once_with("wf-1", "sid-2")
-
-    def test_relay_graph_event_emits_update(self, service: tuple[WorkflowCollaborationService, Mock, Mock]) -> None:
-        # Arrange
-        collaboration_service, repository, socketio = service
-        repository.get_sid_mapping.return_value = {"workflow_id": "wf-1", "user_id": "u-1"}
-
-        # Act
-        result = collaboration_service.relay_graph_event("sid-1", {"nodes": []})
-
-        # Assert
-        assert result == ({"msg": "graph_update_broadcasted"}, 200)
-        repository.refresh_session_state.assert_called_once_with("wf-1", "sid-1")
-        socketio.emit.assert_called_once_with("graph_update", {"nodes": []}, room="wf-1", skip_sid="sid-1")

api/tests/unit_tests/services/test_workflow_comment_service.py

@@ -1,245 +0,0 @@
-from unittest.mock import MagicMock, Mock, patch
-
-import pytest
-from werkzeug.exceptions import Forbidden, NotFound
-
-from services import workflow_comment_service as service_module
-from services.workflow_comment_service import WorkflowCommentService
-
-
-@pytest.fixture
-def mock_session(monkeypatch: pytest.MonkeyPatch) -> Mock:
-    session = Mock()
-    context_manager = MagicMock()
-    context_manager.__enter__.return_value = session
-    context_manager.__exit__.return_value = False
-    mock_db = MagicMock()
-    mock_db.engine = Mock()
-    monkeypatch.setattr(service_module, "Session", Mock(return_value=context_manager))
-    monkeypatch.setattr(service_module, "db", mock_db)
-    return session
-
-
-def _mock_scalars(result_list: list[object]) -> Mock:
-    scalars = Mock()
-    scalars.all.return_value = result_list
-    return scalars
-
-
-class TestWorkflowCommentService:
-    def test_validate_content_rejects_empty(self) -> None:
-        with pytest.raises(ValueError):
-            WorkflowCommentService._validate_content("   ")
-
-    def test_validate_content_rejects_too_long(self) -> None:
-        with pytest.raises(ValueError):
-            WorkflowCommentService._validate_content("a" * 1001)
-
-    def test_create_comment_creates_mentions(self, mock_session: Mock) -> None:
-        comment = Mock()
-        comment.id = "comment-1"
-        comment.created_at = "ts"
-
-        with (
-            patch.object(service_module, "WorkflowComment", return_value=comment),
-            patch.object(service_module, "WorkflowCommentMention", return_value=Mock()),
-            patch.object(service_module, "uuid_value", side_effect=[True, False]),
-        ):
-            result = WorkflowCommentService.create_comment(
-                tenant_id="tenant-1",
-                app_id="app-1",
-                created_by="user-1",
-                content="hello",
-                position_x=1.0,
-                position_y=2.0,
-                mentioned_user_ids=["user-2", "bad-id"],
-            )
-
-        assert result == {"id": "comment-1", "created_at": "ts"}
-        assert mock_session.add.call_args_list[0].args[0] is comment
-        assert mock_session.add.call_count == 2
-        mock_session.commit.assert_called_once()
-
-    def test_update_comment_raises_not_found(self, mock_session: Mock) -> None:
-        mock_session.scalar.return_value = None
-
-        with pytest.raises(NotFound):
-            WorkflowCommentService.update_comment(
-                tenant_id="tenant-1",
-                app_id="app-1",
-                comment_id="comment-1",
-                user_id="user-1",
-                content="hello",
-            )
-
-    def test_update_comment_raises_forbidden(self, mock_session: Mock) -> None:
-        comment = Mock()
-        comment.created_by = "owner"
-        mock_session.scalar.return_value = comment
-
-        with pytest.raises(Forbidden):
-            WorkflowCommentService.update_comment(
-                tenant_id="tenant-1",
-                app_id="app-1",
-                comment_id="comment-1",
-                user_id="intruder",
-                content="hello",
-            )
-
-    def test_update_comment_replaces_mentions(self, mock_session: Mock) -> None:
-        comment = Mock()
-        comment.id = "comment-1"
-        comment.created_by = "owner"
-        mock_session.scalar.return_value = comment
-
-        existing_mentions = [Mock(), Mock()]
-        mock_session.scalars.return_value = _mock_scalars(existing_mentions)
-
-        with patch.object(service_module, "uuid_value", side_effect=[True, False]):
-            result = WorkflowCommentService.update_comment(
-                tenant_id="tenant-1",
-                app_id="app-1",
-                comment_id="comment-1",
-                user_id="owner",
-                content="updated",
-                mentioned_user_ids=["user-2", "bad-id"],
-            )
-
-        assert result == {"id": "comment-1", "updated_at": comment.updated_at}
-        assert mock_session.delete.call_count == 2
-        assert mock_session.add.call_count == 1
-        mock_session.commit.assert_called_once()
-
-    def test_delete_comment_raises_forbidden(self, mock_session: Mock) -> None:
-        comment = Mock()
-        comment.created_by = "owner"
-
-        with patch.object(WorkflowCommentService, "get_comment", return_value=comment):
-            with pytest.raises(Forbidden):
-                WorkflowCommentService.delete_comment("tenant-1", "app-1", "comment-1", "intruder")
-
-    def test_delete_comment_removes_related_entities(self, mock_session: Mock) -> None:
-        comment = Mock()
-        comment.created_by = "owner"
-
-        mentions = [Mock(), Mock()]
-        replies = [Mock()]
-        mock_session.scalars.side_effect = [_mock_scalars(mentions), _mock_scalars(replies)]
-
-        with patch.object(WorkflowCommentService, "get_comment", return_value=comment):
-            WorkflowCommentService.delete_comment("tenant-1", "app-1", "comment-1", "owner")
-
-        assert mock_session.delete.call_count == 4
-        mock_session.commit.assert_called_once()
-
-    def test_resolve_comment_sets_fields(self, mock_session: Mock) -> None:
-        comment = Mock()
-        comment.resolved = False
-        comment.resolved_at = None
-        comment.resolved_by = None
-
-        with (
-            patch.object(WorkflowCommentService, "get_comment", return_value=comment),
-            patch.object(service_module, "naive_utc_now", return_value="now"),
-        ):
-            result = WorkflowCommentService.resolve_comment("tenant-1", "app-1", "comment-1", "user-1")
-
-        assert result is comment
-        assert comment.resolved is True
-        assert comment.resolved_at == "now"
-        assert comment.resolved_by == "user-1"
-        mock_session.commit.assert_called_once()
-
-    def test_resolve_comment_noop_when_already_resolved(self, mock_session: Mock) -> None:
-        comment = Mock()
-        comment.resolved = True
-
-        with patch.object(WorkflowCommentService, "get_comment", return_value=comment):
-            result = WorkflowCommentService.resolve_comment("tenant-1", "app-1", "comment-1", "user-1")
-
-        assert result is comment
-        mock_session.commit.assert_not_called()
-
-    def test_create_reply_requires_comment(self, mock_session: Mock) -> None:
-        mock_session.get.return_value = None
-
-        with pytest.raises(NotFound):
-            WorkflowCommentService.create_reply("comment-1", "hello", "user-1")
-
-    def test_create_reply_creates_mentions(self, mock_session: Mock) -> None:
-        mock_session.get.return_value = Mock()
-        reply = Mock()
-        reply.id = "reply-1"
-        reply.created_at = "ts"
-
-        with (
-            patch.object(service_module, "WorkflowCommentReply", return_value=reply),
-            patch.object(service_module, "WorkflowCommentMention", return_value=Mock()),
-            patch.object(service_module, "uuid_value", side_effect=[True, False]),
-        ):
-            result = WorkflowCommentService.create_reply(
-                comment_id="comment-1",
-                content="hello",
-                created_by="user-1",
-                mentioned_user_ids=["user-2", "bad-id"],
-            )
-
-        assert result == {"id": "reply-1", "created_at": "ts"}
-        assert mock_session.add.call_count == 2
-        mock_session.commit.assert_called_once()
-
-    def test_update_reply_raises_not_found(self, mock_session: Mock) -> None:
-        mock_session.get.return_value = None
-
-        with pytest.raises(NotFound):
-            WorkflowCommentService.update_reply("reply-1", "user-1", "hello")
-
-    def test_update_reply_raises_forbidden(self, mock_session: Mock) -> None:
-        reply = Mock()
-        reply.created_by = "owner"
-        mock_session.get.return_value = reply
-
-        with pytest.raises(Forbidden):
-            WorkflowCommentService.update_reply("reply-1", "intruder", "hello")
-
-    def test_update_reply_replaces_mentions(self, mock_session: Mock) -> None:
-        reply = Mock()
-        reply.id = "reply-1"
-        reply.comment_id = "comment-1"
-        reply.created_by = "owner"
-        reply.updated_at = "updated"
-        mock_session.get.return_value = reply
-        mock_session.scalars.return_value = _mock_scalars([Mock()])
-
-        with patch.object(service_module, "uuid_value", side_effect=[True, False]):
-            result = WorkflowCommentService.update_reply(
-                reply_id="reply-1",
-                user_id="owner",
-                content="new",
-                mentioned_user_ids=["user-2", "bad-id"],
-            )
-
-        assert result == {"id": "reply-1", "updated_at": "updated"}
-        assert mock_session.delete.call_count == 1
-        assert mock_session.add.call_count == 1
-        mock_session.commit.assert_called_once()
-        mock_session.refresh.assert_called_once_with(reply)
-
-    def test_delete_reply_raises_forbidden(self, mock_session: Mock) -> None:
-        reply = Mock()
-        reply.created_by = "owner"
-        mock_session.get.return_value = reply
-
-        with pytest.raises(Forbidden):
-            WorkflowCommentService.delete_reply("reply-1", "intruder")
-
-    def test_delete_reply_removes_mentions(self, mock_session: Mock) -> None:
-        reply = Mock()
-        reply.created_by = "owner"
-        mock_session.get.return_value = reply
-        mock_session.scalars.return_value = _mock_scalars([Mock(), Mock()])
-
-        WorkflowCommentService.delete_reply("reply-1", "owner")
-
-        assert mock_session.delete.call_count == 3
-        mock_session.commit.assert_called_once()

api/tests/unit_tests/services/test_workflow_service.py

@@ -10,7 +10,7 @@ This test suite covers:
 """
 
 import json
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, patch
 
 import pytest
 
@@ -630,79 +630,6 @@ class TestWorkflowService:
         with pytest.raises(ValueError, match="Invalid app mode"):
             workflow_service.validate_features_structure(app, features)
 
-    # ==================== Draft Workflow Variable Update Tests ====================
-    # These tests verify updating draft workflow environment/conversation variables
-
-    def test_update_draft_workflow_environment_variables_updates_workflow(self, workflow_service, mock_db_session):
-        """Test update_draft_workflow_environment_variables updates draft fields."""
-        app = TestWorkflowAssociatedDataFactory.create_app_mock()
-        account = TestWorkflowAssociatedDataFactory.create_account_mock()
-        workflow = TestWorkflowAssociatedDataFactory.create_workflow_mock()
-        variables = [Mock()]
-
-        with (
-            patch.object(workflow_service, "get_draft_workflow", return_value=workflow),
-            patch("services.workflow_service.naive_utc_now", return_value="now"),
-        ):
-            workflow_service.update_draft_workflow_environment_variables(
-                app_model=app,
-                environment_variables=variables,
-                account=account,
-            )
-
-        assert workflow.environment_variables == variables
-        assert workflow.updated_by == account.id
-        assert workflow.updated_at == "now"
-        mock_db_session.session.commit.assert_called_once()
-
-    def test_update_draft_workflow_environment_variables_raises_when_missing(self, workflow_service):
-        """Test update_draft_workflow_environment_variables raises when draft missing."""
-        app = TestWorkflowAssociatedDataFactory.create_app_mock()
-        account = TestWorkflowAssociatedDataFactory.create_account_mock()
-
-        with patch.object(workflow_service, "get_draft_workflow", return_value=None):
-            with pytest.raises(ValueError, match="No draft workflow found."):
-                workflow_service.update_draft_workflow_environment_variables(
-                    app_model=app,
-                    environment_variables=[],
-                    account=account,
-                )
-
-    def test_update_draft_workflow_conversation_variables_updates_workflow(self, workflow_service, mock_db_session):
-        """Test update_draft_workflow_conversation_variables updates draft fields."""
-        app = TestWorkflowAssociatedDataFactory.create_app_mock()
-        account = TestWorkflowAssociatedDataFactory.create_account_mock()
-        workflow = TestWorkflowAssociatedDataFactory.create_workflow_mock()
-        variables = [Mock()]
-
-        with (
-            patch.object(workflow_service, "get_draft_workflow", return_value=workflow),
-            patch("services.workflow_service.naive_utc_now", return_value="now"),
-        ):
-            workflow_service.update_draft_workflow_conversation_variables(
-                app_model=app,
-                conversation_variables=variables,
-                account=account,
-            )
-
-        assert workflow.conversation_variables == variables
-        assert workflow.updated_by == account.id
-        assert workflow.updated_at == "now"
-        mock_db_session.session.commit.assert_called_once()
-
-    def test_update_draft_workflow_conversation_variables_raises_when_missing(self, workflow_service):
-        """Test update_draft_workflow_conversation_variables raises when draft missing."""
-        app = TestWorkflowAssociatedDataFactory.create_app_mock()
-        account = TestWorkflowAssociatedDataFactory.create_account_mock()
-
-        with patch.object(workflow_service, "get_draft_workflow", return_value=None):
-            with pytest.raises(ValueError, match="No draft workflow found."):
-                workflow_service.update_draft_workflow_conversation_variables(
-                    app_model=app,
-                    conversation_variables=[],
-                    account=account,
-                )
-
     # ==================== Publish Workflow Tests ====================
     # These tests verify creating published versions from draft workflows
 

api/uv.lock

@@ -583,15 +583,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/57/f4/a69c20ee4f660081a7dedb1ac57f29be9378e04edfcb90c526b923d4bebc/beautifulsoup4-4.12.2-py3-none-any.whl", hash = "sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a", size = 142979 },
 ]
 
-[[package]]
-name = "bidict"
-version = "0.23.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/9a/6e/026678aa5a830e07cd9498a05d3e7e650a4f56a42f267a53d22bcda1bdc9/bidict-0.23.1.tar.gz", hash = "sha256:03069d763bc387bbd20e7d49914e75fc4132a41937fa3405417e1a5a2d006d71", size = 29093, upload-time = "2024-02-18T19:09:05.748Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/99/37/e8730c3587a65eb5645d4aba2d27aae48e8003614d6aaf15dda67f702f1f/bidict-0.23.1-py3-none-any.whl", hash = "sha256:5dae8d4d79b552a71cbabc7deb25dfe8ce710b17ff41711e13010ead2abfc3e5", size = 32764, upload-time = "2024-02-18T19:09:04.156Z" },
-]
-
 [[package]]
 name = "billiard"
 version = "4.2.3"
@@ -1400,7 +1391,6 @@ dependencies = [
     { name = "flask-restx" },
     { name = "flask-sqlalchemy" },
     { name = "gevent" },
-    { name = "gevent-websocket" },
     { name = "gmpy2" },
     { name = "google-api-core" },
     { name = "google-api-python-client" },
@@ -1451,7 +1441,6 @@ dependencies = [
     { name = "pypdfium2" },
     { name = "python-docx" },
     { name = "python-dotenv" },
-    { name = "python-socketio" },
     { name = "pyyaml" },
     { name = "readabilipy" },
     { name = "redis", extra = ["hiredis"] },
@@ -1600,7 +1589,6 @@ requires-dist = [
     { name = "flask-restx", specifier = "~=1.3.0" },
     { name = "flask-sqlalchemy", specifier = "~=3.1.1" },
     { name = "gevent", specifier = "~=25.9.1" },
-    { name = "gevent-websocket", specifier = "~=0.10.1" },
     { name = "gmpy2", specifier = "~=2.2.1" },
     { name = "google-api-core", specifier = "==2.18.0" },
     { name = "google-api-python-client", specifier = "==2.90.0" },
@@ -1651,7 +1639,6 @@ requires-dist = [
     { name = "pypdfium2", specifier = "==5.2.0" },
     { name = "python-docx", specifier = "~=1.1.0" },
     { name = "python-dotenv", specifier = "==1.0.1" },
-    { name = "python-socketio", specifier = "~=5.13.0" },
     { name = "pyyaml", specifier = "~=6.0.1" },
     { name = "readabilipy", specifier = "~=0.3.0" },
     { name = "redis", extras = ["hiredis"], specifier = "~=6.1.0" },
@@ -2207,18 +2194,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d5/98/caf06d5d22a7c129c1fb2fc1477306902a2c8ddfd399cd26bbbd4caf2141/gevent-25.9.1-cp312-cp312-win_amd64.whl", hash = "sha256:4acd6bcd5feabf22c7c5174bd3b9535ee9f088d2bbce789f740ad8d6554b18f3", size = 1682837 },
 ]
 
-[[package]]
-name = "gevent-websocket"
-version = "0.10.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "gevent" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/98/d2/6fa19239ff1ab072af40ebf339acd91fb97f34617c2ee625b8e34bf42393/gevent-websocket-0.10.1.tar.gz", hash = "sha256:7eaef32968290c9121f7c35b973e2cc302ffb076d018c9068d2f5ca8b2d85fb0", size = 18366, upload-time = "2017-03-12T22:46:05.68Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/7b/84/2dc373eb6493e00c884cc11e6c059ec97abae2678d42f06bf780570b0193/gevent_websocket-0.10.1-py3-none-any.whl", hash = "sha256:17b67d91282f8f4c973eba0551183fc84f56f1c90c8f6b6b30256f31f66f5242", size = 22987, upload-time = "2017-03-12T22:46:03.611Z" },
-]
-
 [[package]]
 name = "gitdb"
 version = "4.0.12"
@@ -5216,18 +5191,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/6a/3e/b68c118422ec867fa7ab88444e1274aa40681c606d59ac27de5a5588f082/python_dotenv-1.0.1-py3-none-any.whl", hash = "sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a", size = 19863 },
 ]
 
-[[package]]
-name = "python-engineio"
-version = "4.12.3"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "simple-websocket" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/c9/d8/63e5535ab21dc4998ba1cfe13690ccf122883a38f025dca24d6e56c05eba/python_engineio-4.12.3.tar.gz", hash = "sha256:35633e55ec30915e7fc8f7e34ca8d73ee0c080cec8a8cd04faf2d7396f0a7a7a", size = 91910, upload-time = "2025-09-28T06:31:36.765Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/d8/f0/c5aa0a69fd9326f013110653543f36ece4913c17921f3e1dbd78e1b423ee/python_engineio-4.12.3-py3-none-any.whl", hash = "sha256:7c099abb2a27ea7ab429c04da86ab2d82698cdd6c52406cb73766fe454feb7e1", size = 59637, upload-time = "2025-09-28T06:31:35.354Z" },
-]
-
 [[package]]
 name = "python-http-client"
 version = "3.3.7"
@@ -5284,19 +5247,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d9/4f/00be2196329ebbff56ce564aa94efb0fbc828d00de250b1980de1a34ab49/python_pptx-1.0.2-py3-none-any.whl", hash = "sha256:160838e0b8565a8b1f67947675886e9fea18aa5e795db7ae531606d68e785cba", size = 472788 },
 ]
 
-[[package]]
-name = "python-socketio"
-version = "5.13.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "bidict" },
-    { name = "python-engineio" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/21/1a/396d50ccf06ee539fa758ce5623b59a9cb27637fc4b2dc07ed08bf495e77/python_socketio-5.13.0.tar.gz", hash = "sha256:ac4e19a0302ae812e23b712ec8b6427ca0521f7c582d6abb096e36e24a263029", size = 121125, upload-time = "2025-04-12T15:46:59.933Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/3c/32/b4fb8585d1be0f68bde7e110dffbcf354915f77ad8c778563f0ad9655c02/python_socketio-5.13.0-py3-none-any.whl", hash = "sha256:51f68d6499f2df8524668c24bcec13ba1414117cfb3a90115c559b601ab10caf", size = 77800, upload-time = "2025-04-12T15:46:58.412Z" },
-]
-
 [[package]]
 name = "pytz"
 version = "2025.2"
@@ -5796,18 +5746,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755 },
 ]
 
-[[package]]
-name = "simple-websocket"
-version = "1.1.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "wsproto" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/b0/d4/bfa032f961103eba93de583b161f0e6a5b63cebb8f2c7d0c6e6efe1e3d2e/simple_websocket-1.1.0.tar.gz", hash = "sha256:7939234e7aa067c534abdab3a9ed933ec9ce4691b0713c78acb195560aa52ae4", size = 17300, upload-time = "2024-10-10T22:39:31.412Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/52/59/0782e51887ac6b07ffd1570e0364cf901ebc36345fea669969d2084baebb/simple_websocket-1.1.0-py3-none-any.whl", hash = "sha256:4af6069630a38ed6c561010f0e11a5bc0d4ca569b36306eb257cd9a192497c8c", size = 13842, upload-time = "2024-10-10T22:39:29.645Z" },
-]
-
 [[package]]
 name = "six"
 version = "1.17.0"
@@ -7228,18 +7166,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ff/21/abdedb4cdf6ff41ebf01a74087740a709e2edb146490e4d9beea054b0b7a/wrapt-1.16.0-py3-none-any.whl", hash = "sha256:6906c4100a8fcbf2fa735f6059214bb13b97f75b1a61777fcf6432121ef12ef1", size = 23362 },
 ]
 
-[[package]]
-name = "wsproto"
-version = "1.2.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "h11" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/c9/4a/44d3c295350d776427904d73c189e10aeae66d7f555bb2feee16d1e4ba5a/wsproto-1.2.0.tar.gz", hash = "sha256:ad565f26ecb92588a3e43bc3d96164de84cd9902482b130d0ddbaa9664a85065", size = 53425, upload-time = "2022-08-23T19:58:21.447Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/78/58/e860788190eba3bcce367f74d29c4675466ce8dddfba85f7827588416f01/wsproto-1.2.0-py3-none-any.whl", hash = "sha256:b9acddd652b585d75b20477888c56642fdade28bdfd3579aa24a4d2c037dd736", size = 24226, upload-time = "2022-08-23T19:58:19.96Z" },
-]
-
 [[package]]
 name = "xinference-client"
 version = "1.2.2"

docker/.env.example

@@ -129,10 +129,6 @@ MIGRATION_ENABLED=true
 # The default value is 300 seconds.
 FILES_ACCESS_TIMEOUT=300
 
-# Collaboration mode toggle
-# To open collaboration features, you also need to set SERVER_WORKER_CLASS=geventwebsocket.gunicorn.workers.GeventWebSocketWorker
-ENABLE_COLLABORATION_MODE=false
-
 # Access token expiration time in minutes
 ACCESS_TOKEN_EXPIRE_MINUTES=60
 
@@ -168,7 +164,6 @@ SERVER_WORKER_AMOUNT=1
 # Modifying it may also decrease throughput.
 #
 # It is strongly discouraged to change this parameter.
-# If enable collaboration mode, it must be set to geventwebsocket.gunicorn.workers.GeventWebSocketWorker
 SERVER_WORKER_CLASS=gevent
 
 # Default number of worker connections, the default is 10.
@@ -406,8 +401,6 @@ CONSOLE_CORS_ALLOW_ORIGINS=*
 COOKIE_DOMAIN=
 # When the frontend and backend run on different subdomains, set NEXT_PUBLIC_COOKIE_DOMAIN=1.
 NEXT_PUBLIC_COOKIE_DOMAIN=
-# WebSocket server URL. 
-NEXT_PUBLIC_SOCKET_URL=ws://localhost
 NEXT_PUBLIC_BATCH_CONCURRENCY=5
 
 # ------------------------------

docker/docker-compose-template.yaml

@@ -139,7 +139,6 @@ services:
       APP_API_URL: ${APP_API_URL:-}
       AMPLITUDE_API_KEY: ${AMPLITUDE_API_KEY:-}
       NEXT_PUBLIC_COOKIE_DOMAIN: ${NEXT_PUBLIC_COOKIE_DOMAIN:-}
-      NEXT_PUBLIC_SOCKET_URL: ${NEXT_PUBLIC_SOCKET_URL:-ws://localhost}
       SENTRY_DSN: ${WEB_SENTRY_DSN:-}
       NEXT_TELEMETRY_DISABLED: ${NEXT_TELEMETRY_DISABLED:-0}
       TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}

docker/docker-compose.yaml

@@ -33,7 +33,6 @@ x-shared-env: &shared-api-worker-env
   OPENAI_API_BASE: ${OPENAI_API_BASE:-https://api.openai.com/v1}
   MIGRATION_ENABLED: ${MIGRATION_ENABLED:-true}
   FILES_ACCESS_TIMEOUT: ${FILES_ACCESS_TIMEOUT:-300}
-  ENABLE_COLLABORATION_MODE: ${ENABLE_COLLABORATION_MODE:-false}
   ACCESS_TOKEN_EXPIRE_MINUTES: ${ACCESS_TOKEN_EXPIRE_MINUTES:-60}
   REFRESH_TOKEN_EXPIRE_DAYS: ${REFRESH_TOKEN_EXPIRE_DAYS:-30}
   APP_DEFAULT_ACTIVE_REQUESTS: ${APP_DEFAULT_ACTIVE_REQUESTS:-0}
@@ -110,7 +109,6 @@ x-shared-env: &shared-api-worker-env
   CONSOLE_CORS_ALLOW_ORIGINS: ${CONSOLE_CORS_ALLOW_ORIGINS:-*}
   COOKIE_DOMAIN: ${COOKIE_DOMAIN:-}
   NEXT_PUBLIC_COOKIE_DOMAIN: ${NEXT_PUBLIC_COOKIE_DOMAIN:-}
-  NEXT_PUBLIC_SOCKET_URL: ${NEXT_PUBLIC_SOCKET_URL:-ws://localhost}
   NEXT_PUBLIC_BATCH_CONCURRENCY: ${NEXT_PUBLIC_BATCH_CONCURRENCY:-5}
   STORAGE_TYPE: ${STORAGE_TYPE:-opendal}
   OPENDAL_SCHEME: ${OPENDAL_SCHEME:-fs}
@@ -825,7 +823,6 @@ services:
       APP_API_URL: ${APP_API_URL:-}
       AMPLITUDE_API_KEY: ${AMPLITUDE_API_KEY:-}
       NEXT_PUBLIC_COOKIE_DOMAIN: ${NEXT_PUBLIC_COOKIE_DOMAIN:-}
-      NEXT_PUBLIC_SOCKET_URL: ${NEXT_PUBLIC_SOCKET_URL:-}
       SENTRY_DSN: ${WEB_SENTRY_DSN:-}
       NEXT_TELEMETRY_DISABLED: ${NEXT_TELEMETRY_DISABLED:-0}
       TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}

docker/nginx/conf.d/default.conf.template

@@ -14,14 +14,6 @@ server {
       include proxy.conf;
     }
 
-    location /socket.io/ {
-      proxy_pass http://api:5001;
-      include proxy.conf;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-      proxy_cache_bypass $http_upgrade;
-    }
-
     location /v1 {
       proxy_pass http://api:5001;
       include proxy.conf;

docker/nginx/proxy.conf.template

@@ -5,7 +5,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 proxy_set_header X-Forwarded-Proto $scheme;
 proxy_set_header X-Forwarded-Port $server_port;
 proxy_http_version 1.1;
-# proxy_set_header Connection "";
+proxy_set_header Connection "";
 proxy_buffering off;
 proxy_read_timeout ${NGINX_PROXY_READ_TIMEOUT};
 proxy_send_timeout ${NGINX_PROXY_SEND_TIMEOUT};

web/.env.example

@@ -14,8 +14,6 @@ NEXT_PUBLIC_API_PREFIX=http://localhost:5001/console/api
 NEXT_PUBLIC_PUBLIC_API_PREFIX=http://localhost:5001/api
 # When the frontend and backend run on different subdomains, set NEXT_PUBLIC_COOKIE_DOMAIN=1.
 NEXT_PUBLIC_COOKIE_DOMAIN=
-# WebSocket server URL.
-NEXT_PUBLIC_SOCKET_URL=ws://localhost:5001
 
 # The API PREFIX for MARKETPLACE
 NEXT_PUBLIC_MARKETPLACE_API_PREFIX=https://marketplace.dify.ai/api/v1

web/README.md

@@ -43,8 +43,6 @@ NEXT_PUBLIC_EDITION=SELF_HOSTED
 # example: http://cloud.dify.ai/console/api
 NEXT_PUBLIC_API_PREFIX=http://localhost:5001/console/api
 NEXT_PUBLIC_COOKIE_DOMAIN=
-# WebSocket server URL.
-NEXT_PUBLIC_SOCKET_URL=ws://localhost:5001
 # The URL for Web APP, refers to the Web App base URL of WEB service if web app domain is different from
 # console or api domain.
 # example: http://udify.app/api

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/card-view.tsx

@@ -6,7 +6,7 @@ import type { UpdateAppSiteCodeResponse } from '@/models/app'
 import type { App } from '@/types/app'
 import type { I18nKeysByPrefix } from '@/types/i18n'
 import * as React from 'react'
-import { useCallback, useEffect, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useContext } from 'use-context-selector'
 import AppCard from '@/app/components/app/overview/app-card'
@@ -15,8 +15,6 @@ import { useStore as useAppStore } from '@/app/components/app/store'
 import Loading from '@/app/components/base/loading'
 import { ToastContext } from '@/app/components/base/toast'
 import MCPServiceCard from '@/app/components/tools/mcp/mcp-service-card'
-import { collaborationManager } from '@/app/components/workflow/collaboration/core/collaboration-manager'
-import { webSocketClient } from '@/app/components/workflow/collaboration/core/websocket-manager'
 import { isTriggerNode } from '@/app/components/workflow/types'
 import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
 import { useDocLink } from '@/context/i18n'
@@ -91,59 +89,28 @@ const CardView: FC<ICardViewProps> = ({ appId, isInPanel, className }) => {
     ? buildTriggerModeMessage(t('mcp.server.title', { ns: 'tools' }))
     : null
 
-  const updateAppDetail = useCallback(async () => {
+  const updateAppDetail = async () => {
     try {
       const res = await fetchAppDetail({ url: '/apps', id: appId })
       setAppDetail({ ...res })
     }
-    catch (error) {
-      console.error(error)
-    }
-  }, [appId, setAppDetail])
+    catch (error) { console.error(error) }
+  }
 
   const handleCallbackResult = (err: Error | null, message?: I18nKeysByPrefix<'common', 'actionMsg.'>) => {
     const type = err ? 'error' : 'success'
 
     message ||= (type === 'success' ? 'modifiedSuccessfully' : 'modifiedUnsuccessfully')
 
-    if (type === 'success') {
+    if (type === 'success')
       updateAppDetail()
 
-      // Emit collaboration event to notify other clients of app state changes
-      const socket = webSocketClient.getSocket(appId)
-      if (socket) {
-        socket.emit('collaboration_event', {
-          type: 'app_state_update',
-          data: { timestamp: Date.now() },
-          timestamp: Date.now(),
-        })
-      }
-    }
-
     notify({
       type,
       message: t(`actionMsg.${message}`, { ns: 'common' }) as string,
     })
   }
 
-  // Listen for collaborative app state updates from other clients
-  useEffect(() => {
-    if (!appId)
-      return
-
-    const unsubscribe = collaborationManager.onAppStateUpdate(async () => {
-      try {
-        // Update app detail when other clients modify app state
-        await updateAppDetail()
-      }
-      catch (error) {
-        console.error('app state update failed:', error)
-      }
-    })
-
-    return unsubscribe
-  }, [appId, updateAppDetail])
-
   const onChangeSiteStatus = async (value: boolean) => {
     const [err] = await asyncRunSafe<App>(
       updateAppSiteStatus({

web/app/components/app-sidebar/app-info.tsx

@@ -14,7 +14,7 @@ import {
 import dynamic from 'next/dynamic'
 import { useRouter } from 'next/navigation'
 import * as React from 'react'
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useContext } from 'use-context-selector'
 import CardView from '@/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/card-view'
@@ -22,12 +22,10 @@ import { useStore as useAppStore } from '@/app/components/app/store'
 import Button from '@/app/components/base/button'
 import ContentDialog from '@/app/components/base/content-dialog'
 import { ToastContext } from '@/app/components/base/toast'
-import { collaborationManager } from '@/app/components/workflow/collaboration/core/collaboration-manager'
-import { webSocketClient } from '@/app/components/workflow/collaboration/core/websocket-manager'
 import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
 import { useAppContext } from '@/context/app-context'
 import { useProviderContext } from '@/context/provider-context'
-import { copyApp, deleteApp, exportAppConfig, fetchAppDetail, updateAppInfo } from '@/service/apps'
+import { copyApp, deleteApp, exportAppConfig, updateAppInfo } from '@/service/apps'
 import { useInvalidateAppList } from '@/service/use-apps'
 import { fetchWorkflowDraft } from '@/service/workflow'
 import { AppModeEnum } from '@/types/app'
@@ -79,19 +77,6 @@ const AppInfo = ({ expand, onlyShowDetail = false, openState = false, onDetailEx
   const [secretEnvList, setSecretEnvList] = useState<EnvironmentVariable[]>([])
   const [showExportWarning, setShowExportWarning] = useState(false)
 
-  const emitAppMetaUpdate = useCallback(() => {
-    if (!appDetail?.id)
-      return
-    const socket = webSocketClient.getSocket(appDetail.id)
-    if (socket) {
-      socket.emit('collaboration_event', {
-        type: 'app_meta_update',
-        data: { timestamp: Date.now() },
-        timestamp: Date.now(),
-      })
-    }
-  }, [appDetail])
-
   const onEdit: CreateAppModalProps['onConfirm'] = useCallback(async ({
     name,
     icon_type,
@@ -120,12 +105,11 @@ const AppInfo = ({ expand, onlyShowDetail = false, openState = false, onDetailEx
         message: t('editDone', { ns: 'app' }),
       })
       setAppDetail(app)
-      emitAppMetaUpdate()
     }
     catch {
       notify({ type: 'error', message: t('editFailed', { ns: 'app' }) })
     }
-  }, [appDetail, notify, setAppDetail, t, emitAppMetaUpdate])
+  }, [appDetail, notify, setAppDetail, t])
 
   const onCopy: DuplicateAppModalProps['onConfirm'] = async ({ name, icon_type, icon, icon_background }) => {
     if (!appDetail)
@@ -223,23 +207,6 @@ const AppInfo = ({ expand, onlyShowDetail = false, openState = false, onDetailEx
     setShowConfirmDelete(false)
   }, [appDetail, invalidateAppList, notify, onPlanInfoChanged, replace, setAppDetail, t])
 
-  useEffect(() => {
-    if (!appDetail?.id)
-      return
-
-    const unsubscribe = collaborationManager.onAppMetaUpdate(async () => {
-      try {
-        const res = await fetchAppDetail({ url: '/apps', id: appDetail.id })
-        setAppDetail({ ...res })
-      }
-      catch (error) {
-        console.error('failed to refresh app detail from collaboration update:', error)
-      }
-    })
-
-    return unsubscribe
-  }, [appDetail?.id, setAppDetail])
-
   const { isCurrentWorkspaceEditor } = useAppContext()
 
   if (!appDetail)

web/app/components/app/annotation/index.tsx

@@ -203,7 +203,7 @@ const Annotation: FC<Props> = (props) => {
         </Filter>
         {isLoading
           ? <Loading type="app" />
-
+          // eslint-disable-next-line sonarjs/no-nested-conditional
           : total > 0
             ? (
                 <List

web/app/components/app/app-publisher/features-wrapper.tsx

@@ -1,7 +1,6 @@
 import type { AppPublisherProps } from '@/app/components/app/app-publisher'
 import type { ModelAndParameter } from '@/app/components/app/configuration/debug/types'
 import type { FileUpload } from '@/app/components/base/features/types'
-import type { PublishWorkflowParams } from '@/types/workflow'
 import { produce } from 'immer'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
@@ -14,7 +13,7 @@ import { SupportUploadFileTypes } from '@/app/components/workflow/types'
 import { Resolution } from '@/types/app'
 
 type Props = Omit<AppPublisherProps, 'onPublish'> & {
-  onPublish?: (params?: ModelAndParameter | PublishWorkflowParams, features?: any) => Promise<any> | any
+  onPublish?: (modelAndParameter?: ModelAndParameter, features?: any) => Promise<any> | any
   publishedConfig?: any
   resetAppConfig?: () => void
 }
@@ -63,8 +62,8 @@ const FeaturesWrappedAppPublisher = (props: Props) => {
     setRestoreConfirmOpen(false)
   }, [featuresStore, props])
 
-  const handlePublish = useCallback((params?: ModelAndParameter | PublishWorkflowParams) => {
-    return props.onPublish?.(params, features)
+  const handlePublish = useCallback((modelAndParameter?: ModelAndParameter) => {
+    return props.onPublish?.(modelAndParameter, features)
   }, [features, props])
 
   return (

web/app/components/app/app-publisher/index.tsx

@@ -1,7 +1,5 @@
 import type { ModelAndParameter } from '../configuration/debug/types'
-import type { CollaborationUpdate } from '@/app/components/workflow/collaboration/types/collaboration'
 import type { InputVar, Variable } from '@/app/components/workflow/types'
-import type { InstalledApp } from '@/models/explore'
 import type { I18nKeysByPrefix } from '@/types/i18n'
 import type { PublishWorkflowParams } from '@/types/workflow'
 import {
@@ -20,7 +18,6 @@ import { useKeyPress } from 'ahooks'
 import {
   memo,
   useCallback,
-  useContext,
   useEffect,
   useMemo,
   useState,
@@ -38,9 +35,6 @@ import {
 } from '@/app/components/base/portal-to-follow-elem'
 import UpgradeBtn from '@/app/components/billing/upgrade-btn'
 import WorkflowToolConfigureButton from '@/app/components/tools/workflow-tool/configure-button'
-import { collaborationManager } from '@/app/components/workflow/collaboration/core/collaboration-manager'
-import { webSocketClient } from '@/app/components/workflow/collaboration/core/websocket-manager'
-import { WorkflowContext } from '@/app/components/workflow/context'
 import { appDefaultIconBackground } from '@/config'
 import { useGlobalPublicStore } from '@/context/global-public-context'
 import { useAsyncWindowOpen } from '@/hooks/use-async-window-open'
@@ -49,8 +43,6 @@ import { AccessMode } from '@/models/access-control'
 import { useAppWhiteListSubjects, useGetUserCanAccessApp } from '@/service/access-control'
 import { fetchAppDetailDirect } from '@/service/apps'
 import { fetchInstalledAppList } from '@/service/explore'
-import { useInvalidateAppWorkflow } from '@/service/use-workflow'
-import { fetchPublishedWorkflow } from '@/service/workflow'
 import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
 import Divider from '../../base/divider'
@@ -64,10 +56,6 @@ import SuggestedAction from './suggested-action'
 
 type AccessModeLabel = I18nKeysByPrefix<'app', 'accessControlDialog.accessItems.'>
 
-type InstalledAppsResponse = {
-  installed_apps?: InstalledApp[]
-}
-
 const ACCESS_MODE_MAP: Record<AccessMode, { label: AccessModeLabel, icon: React.ElementType }> = {
   [AccessMode.ORGANIZATION]: {
     label: 'organization',
@@ -114,8 +102,8 @@ export type AppPublisherProps = {
   debugWithMultipleModel?: boolean
   multipleModelConfigs?: ModelAndParameter[]
   /** modelAndParameter is passed when debugWithMultipleModel is true */
-  onPublish?: (params?: ModelAndParameter | PublishWorkflowParams) => Promise<void> | void
-  onRestore?: () => Promise<void> | void
+  onPublish?: (params?: any) => Promise<any> | any
+  onRestore?: () => Promise<any> | any
   onToggle?: (state: boolean) => void
   crossAxisOffset?: number
   toolPublished?: boolean
@@ -158,7 +146,6 @@ const AppPublisher = ({
   const [isAppAccessSet, setIsAppAccessSet] = useState(true)
   const [embeddingModalOpen, setEmbeddingModalOpen] = useState(false)
 
-  const workflowStore = useContext(WorkflowContext)
   const appDetail = useAppStore(state => state.appDetail)
   const setAppDetail = useAppStore(s => s.setAppDetail)
   const systemFeatures = useGlobalPublicStore(s => s.systemFeatures)
@@ -171,7 +158,6 @@ const AppPublisher = ({
 
   const { data: userCanAccessApp, isLoading: isGettingUserCanAccessApp, refetch } = useGetUserCanAccessApp({ appId: appDetail?.id, enabled: false })
   const { data: appAccessSubjects, isLoading: isGettingAppWhiteListSubjects } = useAppWhiteListSubjects(appDetail?.id, open && systemFeatures.webapp_auth.enabled && appDetail?.access_mode === AccessMode.SPECIFIC_GROUPS_MEMBERS)
-  const invalidateAppWorkflow = useInvalidateAppWorkflow()
   const openAsyncWindow = useAsyncWindowOpen()
 
   const noAccessPermission = useMemo(() => systemFeatures.webapp_auth.enabled && appDetail && appDetail.access_mode !== AccessMode.EXTERNAL_MEMBERS && !userCanAccessApp?.result, [systemFeatures, appDetail, userCanAccessApp])
@@ -207,39 +193,12 @@ const AppPublisher = ({
     try {
       await onPublish?.(params)
       setPublished(true)
-
-      const appId = appDetail?.id
-      const socket = appId ? webSocketClient.getSocket(appId) : null
-      console.warn('[app-publisher] publish success', {
-        appId,
-        hasSocket: Boolean(socket),
-      })
-      if (appId)
-        invalidateAppWorkflow(appId)
-      else
-        console.warn('[app-publisher] missing appId, skip workflow invalidate and socket emit')
-      if (socket) {
-        const timestamp = Date.now()
-        socket.emit('collaboration_event', {
-          type: 'app_publish_update',
-          data: {
-            action: 'published',
-            timestamp,
-          },
-          timestamp,
-        })
-      }
-      else if (appId) {
-        console.warn('[app-publisher] socket not ready, skip collaboration_event emit', { appId })
-      }
-
       trackEvent('app_published_time', { action_mode: 'app', app_id: appDetail?.id, app_name: appDetail?.name })
     }
-    catch (error) {
-      console.warn('[app-publisher] publish failed', error)
+    catch {
       setPublished(false)
     }
-  }, [appDetail, onPublish, invalidateAppWorkflow])
+  }, [appDetail, onPublish])
 
   const handleRestore = useCallback(async () => {
     try {
@@ -268,10 +227,9 @@ const AppPublisher = ({
     await openAsyncWindow(async () => {
       if (!appDetail?.id)
         throw new Error('App not found')
-      const response = (await fetchInstalledAppList(appDetail?.id)) as InstalledAppsResponse
-      const installedApps = response?.installed_apps
-      if (installedApps?.length)
-        return `${basePath}/explore/installed/${installedApps[0].id}`
+      const { installed_apps }: any = await fetchInstalledAppList(appDetail?.id) || {}
+      if (installed_apps?.length > 0)
+        return `${basePath}/explore/installed/${installed_apps[0].id}`
       throw new Error('No app found in Explore')
     }, {
       onError: (err) => {
@@ -299,29 +257,6 @@ const AppPublisher = ({
     handlePublish()
   }, { exactMatch: true, useCapture: true })
 
-  useEffect(() => {
-    const appId = appDetail?.id
-    if (!appId)
-      return
-
-    const unsubscribe = collaborationManager.onAppPublishUpdate((update: CollaborationUpdate) => {
-      const action = typeof update.data.action === 'string' ? update.data.action : undefined
-      if (action === 'published') {
-        invalidateAppWorkflow(appId)
-        fetchPublishedWorkflow(`/apps/${appId}/workflows/publish`)
-          .then((publishedWorkflow) => {
-            if (publishedWorkflow?.created_at)
-              workflowStore?.getState().setPublishedAt(publishedWorkflow.created_at)
-          })
-          .catch((error) => {
-            console.warn('[app-publisher] refresh published workflow failed', error)
-          })
-      }
-    })
-
-    return unsubscribe
-  }, [appDetail?.id, invalidateAppWorkflow, workflowStore])
-
   const hasPublishedVersion = !!publishedAt
   const workflowToolDisabled = !hasPublishedVersion || !workflowToolAvailable
   const workflowToolMessage = workflowToolDisabled ? t('common.workflowAsToolDisabledHint', { ns: 'workflow' }) : undefined

web/app/components/app/configuration/config/automatic/get-automatic-res.tsx

@@ -134,6 +134,7 @@ const GetAutomaticRes: FC<IGetAutomaticResProps> = ({
     },
   ] as const
 
+  // eslint-disable-next-line sonarjs/no-nested-template-literals, sonarjs/no-nested-conditional
   const [instructionFromSessionStorage, setInstruction] = useSessionStorageState<string>(`improve-instruction-${flowId}${isBasicMode ? '' : `-${nodeId}${editorId ? `-${editorId}` : ''}`}`)
   const instruction = instructionFromSessionStorage || ''
   const [ideaOutput, setIdeaOutput] = useState<string>('')

web/app/components/app/configuration/index.tsx

@@ -18,7 +18,6 @@ import type {
   TextToSpeechConfig,
 } from '@/models/debug'
 import type { ModelConfig as BackendModelConfig, UserInputFormItem, VisionSettings } from '@/types/app'
-import type { PublishWorkflowParams } from '@/types/workflow'
 import { CodeBracketIcon } from '@heroicons/react/20/solid'
 import { useBoolean, useGetState } from 'ahooks'
 import { clone } from 'es-toolkit/object'
@@ -761,8 +760,7 @@ const Configuration: FC = () => {
     else { return promptEmpty }
   })()
   const contextVarEmpty = mode === AppModeEnum.COMPLETION && dataSets.length > 0 && !hasSetContextVar
-  const onPublish = async (params?: ModelAndParameter | PublishWorkflowParams, features?: FeaturesData) => {
-    const modelAndParameter = params && 'model' in params ? params : undefined
+  const onPublish = async (modelAndParameter?: ModelAndParameter, features?: FeaturesData) => {
     const modelId = modelAndParameter?.model || modelConfig.model_id
     const promptTemplate = modelConfig.configs.prompt_template
     const promptVariables = modelConfig.configs.prompt_variables

web/app/components/app/overview/settings/index.spec.tsx

@@ -175,7 +175,7 @@ describe('SettingsModal', () => {
     renderSettingsModal()
     fireEvent.click(screen.getByText('appOverview.overview.appInfo.settings.more.entry'))
     const privacyInput = screen.getByPlaceholderText('appOverview.overview.appInfo.settings.more.privacyPolicyPlaceholder')
-
+    // eslint-disable-next-line sonarjs/no-clear-text-protocols
     fireEvent.change(privacyInput, { target: { value: 'ftp://invalid-url' } })
 
     fireEvent.click(screen.getByText('common.operation.save'))

web/app/components/apps/app-card.tsx

@@ -5,7 +5,6 @@ import type { HtmlContentProps } from '@/app/components/base/popover'
 import type { Tag } from '@/app/components/base/tag-management/constant'
 import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
 import type { EnvironmentVariable } from '@/app/components/workflow/types'
-import type { WorkflowOnlineUser } from '@/models/app'
 import type { App } from '@/types/app'
 import { RiBuildingLine, RiGlobalLine, RiLockLine, RiMoreFill, RiVerifiedBadgeLine } from '@remixicon/react'
 import dynamic from 'next/dynamic'
@@ -21,7 +20,6 @@ import CustomPopover from '@/app/components/base/popover'
 import TagSelector from '@/app/components/base/tag-management/selector'
 import Toast, { ToastContext } from '@/app/components/base/toast'
 import Tooltip from '@/app/components/base/tooltip'
-import { UserAvatarList } from '@/app/components/base/user-avatar-list'
 import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
 import { useAppContext } from '@/context/app-context'
 import { useGlobalPublicStore } from '@/context/global-public-context'
@@ -60,10 +58,9 @@ const AccessControl = dynamic(() => import('@/app/components/app/app-access-cont
 export type AppCardProps = {
   app: App
   onRefresh?: () => void
-  onlineUsers?: WorkflowOnlineUser[]
 }
 
-const AppCard = ({ app, onRefresh, onlineUsers = [] }: AppCardProps) => {
+const AppCard = ({ app, onRefresh }: AppCardProps) => {
   const { t } = useTranslation()
   const { notify } = useContext(ToastContext)
   const systemFeatures = useGlobalPublicStore(s => s.systemFeatures)
@@ -351,19 +348,6 @@ const AppCard = ({ app, onRefresh, onlineUsers = [] }: AppCardProps) => {
     return `${t('segment.editedAt', { ns: 'datasetDocuments' })} ${timeText}`
   }, [app.updated_at, app.created_at])
 
-  const onlineUserAvatars = useMemo(() => {
-    if (!onlineUsers.length)
-      return []
-
-    return onlineUsers
-      .map(user => ({
-        id: user.user_id || user.sid || '',
-        name: user.username || 'User',
-        avatar_url: user.avatar || undefined,
-      }))
-      .filter(user => !!user.id)
-  }, [onlineUsers])
-
   return (
     <>
       <div
@@ -416,11 +400,6 @@ const AppCard = ({ app, onRefresh, onlineUsers = [] }: AppCardProps) => {
               </Tooltip>
             )}
           </div>
-          <div>
-            {onlineUserAvatars.length > 0 && (
-              <UserAvatarList users={onlineUserAvatars} maxVisible={3} size={20} />
-            )}
-          </div>
         </div>
         <div className="title-wrapper h-[90px] px-[14px] text-xs leading-normal text-text-tertiary">
           <div

web/app/components/apps/list.spec.tsx

@@ -1,4 +1,3 @@
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { act, fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
 import { useStore as useTagStore } from '@/app/components/base/tag-management/store'
@@ -235,21 +234,6 @@ beforeAll(() => {
   } as unknown as typeof IntersectionObserver
 })
 
-const renderList = () => {
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: {
-        retry: false,
-      },
-    },
-  })
-  return render(
-    <QueryClientProvider client={queryClient}>
-      <List />
-    </QueryClientProvider>,
-  )
-}
-
 describe('List', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -276,13 +260,13 @@ describe('List', () => {
 
   describe('Rendering', () => {
     it('should render without crashing', () => {
-      renderList()
+      render(<List />)
       // Tab slider renders app type tabs
       expect(screen.getByText('app.types.all')).toBeInTheDocument()
     })
 
     it('should render tab slider with all app types', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByText('app.types.all')).toBeInTheDocument()
       expect(screen.getByText('app.types.workflow')).toBeInTheDocument()
@@ -293,48 +277,48 @@ describe('List', () => {
     })
 
     it('should render search input', () => {
-      renderList()
+      render(<List />)
       // Input component renders a searchbox
       expect(screen.getByRole('textbox')).toBeInTheDocument()
     })
 
     it('should render tag filter', () => {
-      renderList()
+      render(<List />)
       // Tag filter renders with placeholder text
       expect(screen.getByText('common.tag.placeholder')).toBeInTheDocument()
     })
 
     it('should render created by me checkbox', () => {
-      renderList()
+      render(<List />)
       expect(screen.getByText('app.showMyCreatedAppsOnly')).toBeInTheDocument()
     })
 
     it('should render app cards when apps exist', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByTestId('app-card-app-1')).toBeInTheDocument()
       expect(screen.getByTestId('app-card-app-2')).toBeInTheDocument()
     })
 
     it('should render new app card for editors', () => {
-      renderList()
+      render(<List />)
       expect(screen.getByTestId('new-app-card')).toBeInTheDocument()
     })
 
     it('should render footer when branding is disabled', () => {
-      renderList()
+      render(<List />)
       expect(screen.getByTestId('footer')).toBeInTheDocument()
     })
 
     it('should render drop DSL hint for editors', () => {
-      renderList()
+      render(<List />)
       expect(screen.getByText('app.newApp.dropDSLToCreateApp')).toBeInTheDocument()
     })
   })
 
   describe('Tab Navigation', () => {
     it('should call setActiveTab when tab is clicked', () => {
-      renderList()
+      render(<List />)
 
       fireEvent.click(screen.getByText('app.types.workflow'))
 
@@ -342,7 +326,7 @@ describe('List', () => {
     })
 
     it('should call setActiveTab for all tab', () => {
-      renderList()
+      render(<List />)
 
       fireEvent.click(screen.getByText('app.types.all'))
 
@@ -352,12 +336,12 @@ describe('List', () => {
 
   describe('Search Functionality', () => {
     it('should render search input field', () => {
-      renderList()
+      render(<List />)
       expect(screen.getByRole('textbox')).toBeInTheDocument()
     })
 
     it('should handle search input change', () => {
-      renderList()
+      render(<List />)
 
       const input = screen.getByRole('textbox')
       fireEvent.change(input, { target: { value: 'test search' } })
@@ -366,7 +350,7 @@ describe('List', () => {
     })
 
     it('should handle search input interaction', () => {
-      renderList()
+      render(<List />)
 
       const input = screen.getByRole('textbox')
       expect(input).toBeInTheDocument()
@@ -376,7 +360,7 @@ describe('List', () => {
       // Set initial keywords to make clear button visible
       mockQueryState.keywords = 'existing search'
 
-      renderList()
+      render(<List />)
 
       // Find and click clear button (Input component uses .group class for clear icon container)
       const clearButton = document.querySelector('.group')
@@ -391,12 +375,12 @@ describe('List', () => {
 
   describe('Tag Filter', () => {
     it('should render tag filter component', () => {
-      renderList()
+      render(<List />)
       expect(screen.getByText('common.tag.placeholder')).toBeInTheDocument()
     })
 
     it('should render tag filter with placeholder', () => {
-      renderList()
+      render(<List />)
 
       // Tag filter is rendered
       expect(screen.getByText('common.tag.placeholder')).toBeInTheDocument()
@@ -405,12 +389,12 @@ describe('List', () => {
 
   describe('Created By Me Filter', () => {
     it('should render checkbox with correct label', () => {
-      renderList()
+      render(<List />)
       expect(screen.getByText('app.showMyCreatedAppsOnly')).toBeInTheDocument()
     })
 
     it('should handle checkbox change', () => {
-      renderList()
+      render(<List />)
 
       // Checkbox component uses data-testid="checkbox-{id}"
       // CheckboxWithLabel doesn't pass testId, so id is undefined
@@ -425,7 +409,7 @@ describe('List', () => {
     it('should not render new app card for non-editors', () => {
       mockIsCurrentWorkspaceEditor.mockReturnValue(false)
 
-      renderList()
+      render(<List />)
 
       expect(screen.queryByTestId('new-app-card')).not.toBeInTheDocument()
     })
@@ -433,7 +417,7 @@ describe('List', () => {
     it('should not render drop DSL hint for non-editors', () => {
       mockIsCurrentWorkspaceEditor.mockReturnValue(false)
 
-      renderList()
+      render(<List />)
 
       expect(screen.queryByText(/drop dsl file to create app/i)).not.toBeInTheDocument()
     })
@@ -443,7 +427,7 @@ describe('List', () => {
     it('should redirect dataset operators to datasets page', () => {
       mockIsCurrentWorkspaceDatasetOperator.mockReturnValue(true)
 
-      renderList()
+      render(<List />)
 
       expect(mockReplace).toHaveBeenCalledWith('/datasets')
     })
@@ -453,7 +437,7 @@ describe('List', () => {
     it('should call refetch when refresh key is set in localStorage', () => {
       localStorage.setItem('needRefreshAppList', '1')
 
-      renderList()
+      render(<List />)
 
       expect(mockRefetch).toHaveBeenCalled()
       expect(localStorage.getItem('needRefreshAppList')).toBeNull()
@@ -462,23 +446,22 @@ describe('List', () => {
 
   describe('Edge Cases', () => {
     it('should handle multiple renders without issues', () => {
-      const { unmount } = renderList()
+      const { rerender } = render(<List />)
       expect(screen.getByText('app.types.all')).toBeInTheDocument()
 
-      unmount()
-      renderList()
+      rerender(<List />)
       expect(screen.getByText('app.types.all')).toBeInTheDocument()
     })
 
     it('should render app cards correctly', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByText('Test App 1')).toBeInTheDocument()
       expect(screen.getByText('Test App 2')).toBeInTheDocument()
     })
 
     it('should render with all filter options visible', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByRole('textbox')).toBeInTheDocument()
       expect(screen.getByText('common.tag.placeholder')).toBeInTheDocument()
@@ -488,14 +471,14 @@ describe('List', () => {
 
   describe('Dragging State', () => {
     it('should show drop hint when DSL feature is enabled for editors', () => {
-      renderList()
+      render(<List />)
       expect(screen.getByText('app.newApp.dropDSLToCreateApp')).toBeInTheDocument()
     })
   })
 
   describe('App Type Tabs', () => {
     it('should render all app type tabs', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByText('app.types.all')).toBeInTheDocument()
       expect(screen.getByText('app.types.workflow')).toBeInTheDocument()
@@ -506,7 +489,7 @@ describe('List', () => {
     })
 
     it('should call setActiveTab for each app type', () => {
-      renderList()
+      render(<List />)
 
       const appTypeTexts = [
         { mode: AppModeEnum.WORKFLOW, text: 'app.types.workflow' },
@@ -525,7 +508,7 @@ describe('List', () => {
 
   describe('Search and Filter Integration', () => {
     it('should display search input with correct attributes', () => {
-      renderList()
+      render(<List />)
 
       const input = screen.getByRole('textbox')
       expect(input).toBeInTheDocument()
@@ -533,13 +516,13 @@ describe('List', () => {
     })
 
     it('should have tag filter component', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByText('common.tag.placeholder')).toBeInTheDocument()
     })
 
     it('should display created by me label', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByText('app.showMyCreatedAppsOnly')).toBeInTheDocument()
     })
@@ -547,14 +530,14 @@ describe('List', () => {
 
   describe('App List Display', () => {
     it('should display all app cards from data', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByTestId('app-card-app-1')).toBeInTheDocument()
       expect(screen.getByTestId('app-card-app-2')).toBeInTheDocument()
     })
 
     it('should display app names correctly', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByText('Test App 1')).toBeInTheDocument()
       expect(screen.getByText('Test App 2')).toBeInTheDocument()
@@ -563,7 +546,7 @@ describe('List', () => {
 
   describe('Footer Visibility', () => {
     it('should render footer when branding is disabled', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByTestId('footer')).toBeInTheDocument()
     })
@@ -575,14 +558,14 @@ describe('List', () => {
   describe('Additional Coverage', () => {
     it('should render dragging state overlay when dragging', () => {
       mockDragging = true
-      const { container } = renderList()
+      const { container } = render(<List />)
 
       // Component should render successfully with dragging state
       expect(container).toBeInTheDocument()
     })
 
     it('should handle app mode filter in query params', () => {
-      renderList()
+      render(<List />)
 
       const workflowTab = screen.getByText('app.types.workflow')
       fireEvent.click(workflowTab)
@@ -591,7 +574,7 @@ describe('List', () => {
     })
 
     it('should render new app card for editors', () => {
-      renderList()
+      render(<List />)
 
       expect(screen.getByTestId('new-app-card')).toBeInTheDocument()
     })
@@ -599,7 +582,7 @@ describe('List', () => {
 
   describe('DSL File Drop', () => {
     it('should handle DSL file drop and show modal', () => {
-      renderList()
+      render(<List />)
 
       // Simulate DSL file drop via the callback
       const mockFile = new File(['test content'], 'test.yml', { type: 'application/yaml' })
@@ -613,7 +596,7 @@ describe('List', () => {
     })
 
     it('should close DSL modal when onClose is called', () => {
-      renderList()
+      render(<List />)
 
       // Open modal via DSL file drop
       const mockFile = new File(['test content'], 'test.yml', { type: 'application/yaml' })
@@ -631,7 +614,7 @@ describe('List', () => {
     })
 
     it('should close DSL modal and refetch when onSuccess is called', () => {
-      renderList()
+      render(<List />)
 
       // Open modal via DSL file drop
       const mockFile = new File(['test content'], 'test.yml', { type: 'application/yaml' })
@@ -654,7 +637,7 @@ describe('List', () => {
   describe('Tag Filter Change', () => {
     it('should handle tag filter value change', () => {
       vi.useFakeTimers()
-      renderList()
+      render(<List />)
 
       // TagFilter component is rendered
       expect(screen.getByTestId('tag-filter')).toBeInTheDocument()
@@ -678,7 +661,7 @@ describe('List', () => {
 
     it('should handle empty tag filter selection', () => {
       vi.useFakeTimers()
-      renderList()
+      render(<List />)
 
       // Trigger tag filter change with empty array
       act(() => {
@@ -700,7 +683,7 @@ describe('List', () => {
   describe('Infinite Scroll', () => {
     it('should call fetchNextPage when intersection observer triggers', () => {
       mockServiceState.hasNextPage = true
-      renderList()
+      render(<List />)
 
       // Simulate intersection
       if (intersectionCallback) {
@@ -717,7 +700,7 @@ describe('List', () => {
 
     it('should not call fetchNextPage when not intersecting', () => {
       mockServiceState.hasNextPage = true
-      renderList()
+      render(<List />)
 
       // Simulate non-intersection
       if (intersectionCallback) {
@@ -735,7 +718,7 @@ describe('List', () => {
     it('should not call fetchNextPage when loading', () => {
       mockServiceState.hasNextPage = true
       mockServiceState.isLoading = true
-      renderList()
+      render(<List />)
 
       if (intersectionCallback) {
         act(() => {
@@ -753,7 +736,7 @@ describe('List', () => {
   describe('Error State', () => {
     it('should handle error state in useEffect', () => {
       mockServiceState.error = new Error('Test error')
-      const { container } = renderList()
+      const { container } = render(<List />)
 
       // Component should still render
       expect(container).toBeInTheDocument()

web/app/components/apps/list.tsx

@@ -8,14 +8,13 @@ import {
   RiMessage3Line,
   RiRobot3Line,
 } from '@remixicon/react'
-import { useQuery } from '@tanstack/react-query'
 import { useDebounceFn } from 'ahooks'
 import dynamic from 'next/dynamic'
 import {
   useRouter,
 } from 'next/navigation'
 import { parseAsString, useQueryState } from 'nuqs'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
 import TabSliderNew from '@/app/components/base/tab-slider-new'
@@ -26,7 +25,6 @@ import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
 import { useAppContext } from '@/context/app-context'
 import { useGlobalPublicStore } from '@/context/global-public-context'
 import { CheckModal } from '@/hooks/use-pay'
-import { fetchWorkflowOnlineUsers } from '@/service/apps'
 import { useInfiniteAppList } from '@/service/use-apps'
 import { AppModeEnum } from '@/types/app'
 import { cn } from '@/utils/classnames'
@@ -112,37 +110,6 @@ const List = () => {
     refetch,
   } = useInfiniteAppList(appListQueryParams, { enabled: !isCurrentWorkspaceDatasetOperator })
 
-  const apps = useMemo(() => data?.pages?.flatMap(page => page.data) ?? [], [data])
-
-  const workflowIds = useMemo(() => {
-    const ids = new Set<string>()
-    apps.forEach((appItem) => {
-      const workflowId = appItem.id
-      if (!workflowId)
-        return
-
-      if (appItem.mode === 'workflow' || appItem.mode === 'advanced-chat')
-        ids.add(workflowId)
-    })
-    return Array.from(ids)
-  }, [apps])
-
-  const { data: onlineUsersByWorkflow = {}, refetch: refreshOnlineUsers } = useQuery({
-    queryKey: ['apps', 'workflow-online-users', workflowIds],
-    queryFn: () => fetchWorkflowOnlineUsers({ workflowIds }),
-    enabled: workflowIds.length > 0,
-  })
-
-  useEffect(() => {
-    const timer = window.setInterval(() => {
-      refetch()
-      if (workflowIds.length)
-        refreshOnlineUsers()
-    }, 10000)
-
-    return () => window.clearInterval(timer)
-  }, [workflowIds.join(','), refetch, refreshOnlineUsers])
-
   const anchorRef = useRef<HTMLDivElement>(null)
   const options = [
     { value: 'all', text: t('types.all', { ns: 'app' }), icon: <RiApps2Line className="mr-1 h-[14px] w-[14px]" /> },
@@ -274,7 +241,7 @@ const List = () => {
 
             if (hasAnyApp) {
               return pages.flatMap(({ data: apps }) => apps).map(app => (
-                <AppCard key={app.id} app={app} onRefresh={refetch} onlineUsers={onlineUsersByWorkflow?.[app.id] ?? []} />
+                <AppCard key={app.id} app={app} onRefresh={refetch} />
               ))
             }
 

web/app/components/base/avatar/index.spec.tsx

@@ -35,14 +35,12 @@ describe('Avatar', () => {
       it.each([
         { size: undefined, expected: '30px', label: 'default (30px)' },
         { size: 50, expected: '50px', label: 'custom (50px)' },
-      ])('should apply $label size to avatar container', ({ size, expected }) => {
+      ])('should apply $label size to img element', ({ size, expected }) => {
         const props = { name: 'Test', avatar: 'https://example.com/avatar.jpg', size }
 
         render(<Avatar {...props} />)
 
-        const img = screen.getByRole('img')
-        const wrapper = img.parentElement as HTMLElement
-        expect(wrapper).toHaveStyle({
+        expect(screen.getByRole('img')).toHaveStyle({
           width: expected,
           height: expected,
           fontSize: expected,
@@ -62,7 +60,7 @@ describe('Avatar', () => {
     })
 
     describe('className prop', () => {
-      it('should merge className with default avatar classes on container', () => {
+      it('should merge className with default avatar classes on img', () => {
         const props = {
           name: 'Test',
           avatar: 'https://example.com/avatar.jpg',
@@ -72,9 +70,8 @@ describe('Avatar', () => {
         render(<Avatar {...props} />)
 
         const img = screen.getByRole('img')
-        const wrapper = img.parentElement as HTMLElement
-        expect(wrapper).toHaveClass('custom-class')
-        expect(wrapper).toHaveClass('shrink-0', 'flex', 'items-center', 'rounded-full', 'bg-primary-600')
+        expect(img).toHaveClass('custom-class')
+        expect(img).toHaveClass('shrink-0', 'flex', 'items-center', 'rounded-full', 'bg-primary-600')
       })
 
       it('should merge className with default avatar classes on fallback div', () => {
@@ -280,11 +277,10 @@ describe('Avatar', () => {
       render(<Avatar {...props} />)
 
       const img = screen.getByRole('img')
-      const wrapper = img.parentElement as HTMLElement
       expect(img).toHaveAttribute('alt', 'Test User')
       expect(img).toHaveAttribute('src', 'https://example.com/avatar.jpg')
-      expect(wrapper).toHaveStyle({ width: '64px', height: '64px' })
-      expect(wrapper).toHaveClass('custom-avatar')
+      expect(img).toHaveStyle({ width: '64px', height: '64px' })
+      expect(img).toHaveClass('custom-avatar')
 
       // Trigger load to verify onError callback
       fireEvent.load(img)

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

@@ -9,7 +9,6 @@ export type AvatarProps = {
   className?: string
   textClassName?: string
   onError?: (x: boolean) => void
-  backgroundColor?: string
 }
 const Avatar = ({
   name,
@@ -18,18 +17,9 @@ const Avatar = ({
   className,
   textClassName,
   onError,
-  backgroundColor,
 }: AvatarProps) => {
-  const avatarClassName = backgroundColor
-    ? 'shrink-0 flex items-center rounded-full'
-    : 'shrink-0 flex items-center rounded-full bg-primary-600'
-  const style = {
-    width: `${size}px`,
-    height: `${size}px`,
-    fontSize: `${size}px`,
-    lineHeight: `${size}px`,
-    ...(backgroundColor && !avatar ? { backgroundColor } : {}),
-  }
+  const avatarClassName = 'shrink-0 flex items-center rounded-full bg-primary-600'
+  const style = { width: `${size}px`, height: `${size}px`, fontSize: `${size}px`, lineHeight: `${size}px` }
   const [imgError, setImgError] = useState(false)
 
   const handleError = () => {
@@ -45,18 +35,14 @@ const Avatar = ({
 
   if (avatar && !imgError) {
     return (
-      <span
+      <img
         className={cn(avatarClassName, className)}
         style={style}
-      >
-        <img
-          className="h-full w-full rounded-full object-cover"
-          alt={name}
-          src={avatar}
-          onError={handleError}
-          onLoad={() => onError?.(false)}
-        />
-      </span>
+        alt={name}
+        src={avatar}
+        onError={handleError}
+        onLoad={() => onError?.(false)}
+      />
     )
   }
 

web/app/components/base/chat/chat/citation/popup.tsx

@@ -1,4 +1,4 @@
-import type { FC, MouseEvent } from 'react'
+import type { FC } from 'react'
 import type { Resources } from './index'
 import Link from 'next/link'
 import { Fragment, useState } from 'react'
@@ -18,8 +18,6 @@ import {
   PortalToFollowElemContent,
   PortalToFollowElemTrigger,
 } from '@/app/components/base/portal-to-follow-elem'
-import { useDocumentDownload } from '@/service/knowledge/use-document'
-import { downloadUrl } from '@/utils/download'
 import ProgressTooltip from './progress-tooltip'
 import Tooltip from './tooltip'
 
@@ -38,30 +36,6 @@ const Popup: FC<PopupProps> = ({
     ? (/\.([^.]*)$/.exec(data.documentName)?.[1] || '')
     : 'notion'
 
-  const { mutateAsync: downloadDocument, isPending: isDownloading } = useDocumentDownload()
-
-  /**
-   * Download the original uploaded file for citations whose data source is upload-file.
-   * We request a signed URL from the dataset document download endpoint, then trigger browser download.
-   */
-  const handleDownloadUploadFile = async (e: MouseEvent<HTMLElement>) => {
-    // Prevent toggling the citation popup when user clicks the download link.
-    e.preventDefault()
-    e.stopPropagation()
-
-    // Only upload-file citations can be downloaded this way (needs dataset/document ids).
-    const isUploadFile = data.dataSourceType === 'upload_file' || data.dataSourceType === 'file'
-    const datasetId = data.sources?.[0]?.dataset_id
-    const documentId = data.documentId || data.sources?.[0]?.document_id
-    if (!isUploadFile || !datasetId || !documentId || isDownloading)
-      return
-
-    // Fetch signed URL (usually points to `/files/<id>/file-preview?...&as_attachment=true`).
-    const res = await downloadDocument({ datasetId, documentId })
-    if (res?.url)
-      downloadUrl({ url: res.url, fileName: data.documentName })
-  }
-
   return (
     <PortalToFollowElem
       open={open}
@@ -75,7 +49,6 @@ const Popup: FC<PopupProps> = ({
       <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
         <div className="flex h-7 max-w-[240px] items-center rounded-lg bg-components-button-secondary-bg px-2">
           <FileIcon type={fileType} className="mr-1 h-4 w-4 shrink-0" />
-          {/* Keep the trigger purely for opening the popup (no download link here). */}
           <div className="truncate text-xs text-text-tertiary">{data.documentName}</div>
         </div>
       </PortalToFollowElemTrigger>
@@ -84,21 +57,7 @@ const Popup: FC<PopupProps> = ({
           <div className="px-4 pb-2 pt-3">
             <div className="flex h-[18px] items-center">
               <FileIcon type={fileType} className="mr-1 h-4 w-4 shrink-0" />
-              <div className="system-xs-medium truncate text-text-tertiary">
-                {/* If it's an upload-file reference, the title becomes a download link. */}
-                {(data.dataSourceType === 'upload_file' || data.dataSourceType === 'file') && !!data.sources?.[0]?.dataset_id
-                  ? (
-                      <button
-                        type="button"
-                        className="cursor-pointer truncate text-text-tertiary hover:underline"
-                        onClick={handleDownloadUploadFile}
-                        disabled={isDownloading}
-                      >
-                        {data.documentName}
-                      </button>
-                    )
-                  : data.documentName}
-              </div>
+              <div className="system-xs-medium truncate text-text-tertiary">{data.documentName}</div>
             </div>
           </div>
           <div className="max-h-[450px] overflow-y-auto rounded-lg bg-components-panel-bg px-4 py-0.5">

web/app/components/base/content-dialog/index.tsx

@@ -19,7 +19,7 @@ const ContentDialog = ({
     <Transition
       show={show}
       as="div"
-      className="absolute left-0 top-0 z-[70] box-border h-full w-full p-2"
+      className="absolute left-0 top-0 z-30 box-border h-full w-full p-2"
     >
       <TransitionChild>
         <div

web/app/components/base/icons/assets/public/common/enter-key.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 4C0 1.79086 1.79086 0 4 0H12C14.2091 0 16 1.79086 16 4V12C16 14.2091 14.2091 16 12 16H4C1.79086 16 0 14.2091 0 12V4Z" fill="white" fill-opacity="0.12"/>
-<path d="M3.42756 8.7358V7.62784H10.8764C11.2003 7.62784 11.4957 7.5483 11.7628 7.3892C12.0298 7.23011 12.2415 7.01705 12.3977 6.75C12.5568 6.48295 12.6364 6.1875 12.6364 5.86364C12.6364 5.53977 12.5568 5.24574 12.3977 4.98153C12.2386 4.71449 12.0256 4.50142 11.7585 4.34233C11.4943 4.18324 11.2003 4.10369 10.8764 4.10369H10.3991V3H10.8764C11.4048 3 11.8849 3.12926 12.3168 3.38778C12.7486 3.64631 13.0938 3.99148 13.3523 4.4233C13.6108 4.85511 13.7401 5.33523 13.7401 5.86364C13.7401 6.25852 13.6648 6.62926 13.5142 6.97585C13.3665 7.32244 13.1619 7.62784 12.9006 7.89205C12.6392 8.15625 12.3352 8.36364 11.9886 8.5142C11.642 8.66193 11.2713 8.7358 10.8764 8.7358H3.42756ZM6.16761 12.0554L2.29403 8.18182L6.16761 4.30824L6.9304 5.07102L3.81534 8.18182L6.9304 11.2926L6.16761 12.0554Z" fill="white"/>
-</svg>