fix test

chore: fix lint
2026-03-08 00:35:10 +00:00 · 2026-02-11 14:41:19 +08:00 · 2026-02-11 14:37:23 +08:00
39 changed files with 919 additions and 689 deletions
--- a/api/.env.example
+++ b/api/.env.example
@@ -715,7 +715,6 @@ ANNOTATION_IMPORT_MAX_CONCURRENT=5
 # Sandbox expired records clean configuration
 SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD=21
 SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_SIZE=1000
-SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL=200
 SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS=30
 SANDBOX_EXPIRED_RECORDS_CLEAN_TASK_LOCK_TTL=90000

--- a/api/configs/feature/init.py
+++ b/api/configs/feature/init.py
@@ -1344,10 +1344,6 @@ class SandboxExpiredRecordsCleanConfig(BaseSettings):
        description="Maximum number of records to process in each batch",
        default=1000,
    )
-    SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL: PositiveInt = Field(
-        description="Maximum interval in milliseconds between batches",
-        default=200,
-    )
    SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS: PositiveInt = Field(
        description="Retention days for sandbox expired workflow_run records and message records",
        default=30,
--- a/api/controllers/console/remote_files.py
+++ b/api/controllers/console/remote_files.py
@@ -1,7 +1,6 @@
 import urllib.parse

 import httpx
-from flask_restx import Resource
 from pydantic import BaseModel, Field

 import services
@@ -11,12 +10,12 @@ from controllers.common.errors import (
    RemoteFileUploadError,
    UnsupportedFileTypeError,
 )
-from controllers.console import console_ns
+from controllers.fastopenapi import console_router
 from core.file import helpers as file_helpers
 from core.helper import ssrf_proxy
 from extensions.ext_database import db
 from fields.file_fields import FileWithSignedUrl, RemoteFileInfo
-from libs.login import current_account_with_tenant, login_required
+from libs.login import current_account_with_tenant
 from services.file_service import FileService


@@ -24,73 +23,69 @@ class RemoteFileUploadPayload(BaseModel):
    url: str = Field(..., description="URL to fetch")


-@console_ns.route("/remote-files/<path:url>")
-class GetRemoteFileInfo(Resource):
-    @login_required
-    def get(self, url: str):
-        decoded_url = urllib.parse.unquote(url)
-        resp = ssrf_proxy.head(decoded_url)
+@console_router.get(
+    "/remote-files/<path:url>",
+    response_model=RemoteFileInfo,
+    tags=["console"],
+)
+def get_remote_file_info(url: str) -> RemoteFileInfo:
+    decoded_url = urllib.parse.unquote(url)
+    resp = ssrf_proxy.head(decoded_url)
+    if resp.status_code != httpx.codes.OK:
+        resp = ssrf_proxy.get(decoded_url, timeout=3)
+    resp.raise_for_status()
+    return RemoteFileInfo(
+        file_type=resp.headers.get("Content-Type", "application/octet-stream"),
+        file_length=int(resp.headers.get("Content-Length", 0)),
+    )
+
+
+@console_router.post(
+    "/remote-files/upload",
+    response_model=FileWithSignedUrl,
+    tags=["console"],
+    status_code=201,
+)
+def upload_remote_file(payload: RemoteFileUploadPayload) -> FileWithSignedUrl:
+    url = payload.url
+
+    try:
+        resp = ssrf_proxy.head(url=url)
        if resp.status_code != httpx.codes.OK:
-            resp = ssrf_proxy.get(decoded_url, timeout=3)
-        resp.raise_for_status()
-        return RemoteFileInfo(
-            file_type=resp.headers.get("Content-Type", "application/octet-stream"),
-            file_length=int(resp.headers.get("Content-Length", 0)),
-        ).model_dump(mode="json")
+            resp = ssrf_proxy.get(url=url, timeout=3, follow_redirects=True)
+        if resp.status_code != httpx.codes.OK:
+            raise RemoteFileUploadError(f"Failed to fetch file from {url}: {resp.text}")
+    except httpx.RequestError as e:
+        raise RemoteFileUploadError(f"Failed to fetch file from {url}: {str(e)}")

+    file_info = helpers.guess_file_info_from_response(resp)

-@console_ns.route("/remote-files/upload")
-class RemoteFileUpload(Resource):
-    @login_required
-    def post(self):
-        payload = RemoteFileUploadPayload.model_validate(console_ns.payload)
-        url = payload.url
+    if not FileService.is_file_size_within_limit(extension=file_info.extension, file_size=file_info.size):
+        raise FileTooLargeError

-        # Try to fetch remote file metadata/content first
-        try:
-            resp = ssrf_proxy.head(url=url)
-            if resp.status_code != httpx.codes.OK:
-                resp = ssrf_proxy.get(url=url, timeout=3, follow_redirects=True)
-            if resp.status_code != httpx.codes.OK:
-                # Normalize into a user-friendly error message expected by tests
-                raise RemoteFileUploadError(f"Failed to fetch file from {url}: {resp.text}")
-        except httpx.RequestError as e:
-            raise RemoteFileUploadError(f"Failed to fetch file from {url}: {str(e)}")
+    content = resp.content if resp.request.method == "GET" else ssrf_proxy.get(url).content

-        file_info = helpers.guess_file_info_from_response(resp)
-
-        # Enforce file size limit with 400 (Bad Request) per tests' expectation
-        if not FileService.is_file_size_within_limit(extension=file_info.extension, file_size=file_info.size):
-            raise FileTooLargeError()
-
-        # Load content if needed
-        content = resp.content if resp.request.method == "GET" else ssrf_proxy.get(url).content
-
-        try:
-            user, _ = current_account_with_tenant()
-            upload_file = FileService(db.engine).upload_file(
-                filename=file_info.filename,
-                content=content,
-                mimetype=file_info.mimetype,
-                user=user,
-                source_url=url,
-            )
-        except services.errors.file.FileTooLargeError as file_too_large_error:
-            raise FileTooLargeError(file_too_large_error.description)
-        except services.errors.file.UnsupportedFileTypeError:
-            raise UnsupportedFileTypeError()
-
-        # Success: return created resource with 201 status
-        return (
-            FileWithSignedUrl(
-                id=upload_file.id,
-                name=upload_file.name,
-                size=upload_file.size,
-                extension=upload_file.extension,
-                url=file_helpers.get_signed_file_url(upload_file_id=upload_file.id),
-                mime_type=upload_file.mime_type,
-                created_by=upload_file.created_by,
-                created_at=int(upload_file.created_at.timestamp()),
-            ).model_dump(mode="json"),
-            201,
+    try:
+        user, _ = current_account_with_tenant()
+        upload_file = FileService(db.engine).upload_file(
+            filename=file_info.filename,
+            content=content,
+            mimetype=file_info.mimetype,
+            user=user,
+            source_url=url,
        )
+    except services.errors.file.FileTooLargeError as file_too_large_error:
+        raise FileTooLargeError(file_too_large_error.description)
+    except services.errors.file.UnsupportedFileTypeError:
+        raise UnsupportedFileTypeError()
+
+    return FileWithSignedUrl(
+        id=upload_file.id,
+        name=upload_file.name,
+        size=upload_file.size,
+        extension=upload_file.extension,
+        url=file_helpers.get_signed_file_url(upload_file_id=upload_file.id),
+        mime_type=upload_file.mime_type,
+        created_by=upload_file.created_by,
+        created_at=int(upload_file.created_at.timestamp()),
+    )
--- a/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
+++ b/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
@@ -157,7 +157,7 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
                            id=self._message_id,
                            mode=self._conversation_mode,
                            message_id=self._message_id,
-                            answer=self._task_state.llm_result.message.get_text_content(),
+                            answer=cast(str, self._task_state.llm_result.message.content),
                            created_at=self._message_created_at,
                            **extras,
                        ),
@@ -170,7 +170,7 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
                            mode=self._conversation_mode,
                            conversation_id=self._conversation_id,
                            message_id=self._message_id,
-                            answer=self._task_state.llm_result.message.get_text_content(),
+                            answer=cast(str, self._task_state.llm_result.message.content),
                            created_at=self._message_created_at,
                            **extras,
                        ),
@@ -283,7 +283,7 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):

                # handle output moderation
                output_moderation_answer = self.handle_output_moderation_when_task_finished(
-                    self._task_state.llm_result.message.get_text_content()
+                    cast(str, self._task_state.llm_result.message.content)
                )
                if output_moderation_answer:
                    self._task_state.llm_result.message.content = output_moderation_answer
@@ -397,7 +397,7 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
        message.message_unit_price = usage.prompt_unit_price
        message.message_price_unit = usage.prompt_price_unit
        message.answer = (
-            PromptTemplateParser.remove_template_variables(llm_result.message.get_text_content().strip())
+            PromptTemplateParser.remove_template_variables(cast(str, llm_result.message.content).strip())
            if llm_result.message.content
            else ""
        )
--- a/api/migrations/versions/2026_02_11_1549-fce013ca180e_fix_index_to_optimize_message_clean_job_.py
+++ b/api/migrations/versions/2026_02_11_1549-fce013ca180e_fix_index_to_optimize_message_clean_job_.py
@@ -1,39 +0,0 @@
-"""fix index to optimize message clean job performance
-
-Revision ID: fce013ca180e
-Revises: f55813ffe2c8
-Create Date: 2026-02-11 15:49:17.603638
-
-"""
-from alembic import op
-import models as models
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = 'fce013ca180e'
-down_revision = 'f55813ffe2c8'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('messages', schema=None) as batch_op:
-        batch_op.drop_index(batch_op.f('message_created_at_idx'))
-
-    with op.batch_alter_table('saved_messages', schema=None) as batch_op:
-        batch_op.create_index('saved_message_message_id_idx', ['message_id'], unique=False)
-
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('saved_messages', schema=None) as batch_op:
-        batch_op.drop_index('saved_message_message_id_idx')
-
-    with op.batch_alter_table('messages', schema=None) as batch_op:
-        batch_op.create_index(batch_op.f('message_created_at_idx'), ['created_at'], unique=False)
-
-    # ### end Alembic commands ###
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -1040,6 +1040,7 @@ class Message(Base):
        Index("message_end_user_idx", "app_id", "from_source", "from_end_user_id"),
        Index("message_account_idx", "app_id", "from_source", "from_account_id"),
        Index("message_workflow_run_id_idx", "conversation_id", "workflow_run_id"),
+        Index("message_created_at_idx", "created_at"),
        Index("message_app_mode_idx", "app_mode"),
        Index("message_created_at_id_idx", "created_at", "id"),
    )
--- a/api/models/web.py
+++ b/api/models/web.py
@@ -16,7 +16,6 @@ class SavedMessage(TypeBase):
    __table_args__ = (
        sa.PrimaryKeyConstraint("id", name="saved_message_pkey"),
        sa.Index("saved_message_message_idx", "app_id", "message_id", "created_by_role", "created_by"),
-        sa.Index("saved_message_message_id_idx", "message_id"),
    )

    id: Mapped[str] = mapped_column(
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "dify-api"
-version = "1.13.0"
+version = "1.12.1"
 requires-python = ">=3.11,<3.13"

 dependencies = [
--- a/api/services/app_generate_service.py
+++ b/api/services/app_generate_service.py
@@ -131,54 +131,33 @@ class AppGenerateService:
            elif app_model.mode == AppMode.ADVANCED_CHAT:
                workflow_id = args.get("workflow_id")
                workflow = cls._get_workflow(app_model, invoke_from, workflow_id)
-
-                if streaming:
-                    # Streaming mode: subscribe to SSE and enqueue the execution on first subscriber
-                    with rate_limit_context(rate_limit, request_id):
-                        payload = AppExecutionParams.new(
-                            app_model=app_model,
-                            workflow=workflow,
-                            user=user,
-                            args=args,
-                            invoke_from=invoke_from,
-                            streaming=True,
-                            call_depth=0,
-                        )
-                        payload_json = payload.model_dump_json()
-
-                    def on_subscribe():
-                        workflow_based_app_execution_task.delay(payload_json)
-
-                    on_subscribe = cls._build_streaming_task_on_subscribe(on_subscribe)
-                    generator = AdvancedChatAppGenerator()
-                    return rate_limit.generate(
-                        generator.convert_to_event_stream(
-                            generator.retrieve_events(
-                                AppMode.ADVANCED_CHAT,
-                                payload.workflow_run_id,
-                                on_subscribe=on_subscribe,
-                            ),
-                        ),
-                        request_id=request_id,
+                with rate_limit_context(rate_limit, request_id):
+                    payload = AppExecutionParams.new(
+                        app_model=app_model,
+                        workflow=workflow,
+                        user=user,
+                        args=args,
+                        invoke_from=invoke_from,
+                        streaming=streaming,
+                        call_depth=0,
                    )
-                else:
-                    # Blocking mode: run synchronously and return JSON instead of SSE
-                    # Keep behaviour consistent with WORKFLOW blocking branch.
-                    advanced_generator = AdvancedChatAppGenerator()
-                    return rate_limit.generate(
-                        advanced_generator.convert_to_event_stream(
-                            advanced_generator.generate(
-                                app_model=app_model,
-                                workflow=workflow,
-                                user=user,
-                                args=args,
-                                invoke_from=invoke_from,
-                                workflow_run_id=str(uuid.uuid4()),
-                                streaming=False,
-                            )
+                    payload_json = payload.model_dump_json()
+
+                def on_subscribe():
+                    workflow_based_app_execution_task.delay(payload_json)
+
+                on_subscribe = cls._build_streaming_task_on_subscribe(on_subscribe)
+                generator = AdvancedChatAppGenerator()
+                return rate_limit.generate(
+                    generator.convert_to_event_stream(
+                        generator.retrieve_events(
+                            AppMode.ADVANCED_CHAT,
+                            payload.workflow_run_id,
+                            on_subscribe=on_subscribe,
                        ),
-                        request_id=request_id,
-                    )
+                    ),
+                    request_id=request_id,
+                )
            elif app_model.mode == AppMode.WORKFLOW:
                workflow_id = args.get("workflow_id")
                workflow = cls._get_workflow(app_model, invoke_from, workflow_id)
--- a/api/services/retention/conversation/messages_clean_service.py
+++ b/api/services/retention/conversation/messages_clean_service.py
@@ -1,13 +1,10 @@
 import datetime
 import logging
-import os
 import random
-import time
 from collections.abc import Sequence
 from typing import cast

-import sqlalchemy as sa
-from sqlalchemy import delete, select, tuple_
+from sqlalchemy import delete, select
 from sqlalchemy.engine import CursorResult
 from sqlalchemy.orm import Session

@@ -196,15 +193,11 @@ class MessagesCleanService:
            self._end_before,
        )

-        max_batch_interval_ms = int(os.environ.get("SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL", 200))
-
        while True:
            stats["batches"] += 1
-            batch_start = time.monotonic()

            # Step 1: Fetch a batch of messages using cursor
            with Session(db.engine, expire_on_commit=False) as session:
-                fetch_messages_start = time.monotonic()
                msg_stmt = (
                    select(Message.id, Message.app_id, Message.created_at)
                    .where(Message.created_at < self._end_before)
@@ -216,13 +209,13 @@ class MessagesCleanService:
                    msg_stmt = msg_stmt.where(Message.created_at >= self._start_from)

                # Apply cursor condition: (created_at, id) > (last_created_at, last_message_id)
+                # This translates to:
+                #   created_at > last_created_at OR (created_at = last_created_at AND id > last_message_id)
                if _cursor:
+                    # Continuing from previous batch
                    msg_stmt = msg_stmt.where(
-                        tuple_(Message.created_at, Message.id)
-                        > tuple_(
-                            sa.literal(_cursor[0], type_=sa.DateTime()),
-                            sa.literal(_cursor[1], type_=Message.id.type),
-                        )
+                        (Message.created_at > _cursor[0])
+                        | ((Message.created_at == _cursor[0]) & (Message.id > _cursor[1]))
                    )

                raw_messages = list(session.execute(msg_stmt).all())
@@ -230,12 +223,6 @@ class MessagesCleanService:
                    SimpleMessage(id=msg_id, app_id=app_id, created_at=msg_created_at)
                    for msg_id, app_id, msg_created_at in raw_messages
                ]
-                logger.info(
-                    "clean_messages (batch %s): fetched %s messages in %sms",
-                    stats["batches"],
-                    len(messages),
-                    int((time.monotonic() - fetch_messages_start) * 1000),
-                )

                # Track total messages fetched across all batches
                stats["total_messages"] += len(messages)
@@ -254,16 +241,8 @@ class MessagesCleanService:
                    logger.info("clean_messages (batch %s): no app_ids found, skip", stats["batches"])
                    continue

-                fetch_apps_start = time.monotonic()
                app_stmt = select(App.id, App.tenant_id).where(App.id.in_(app_ids))
                apps = list(session.execute(app_stmt).all())
-                logger.info(
-                    "clean_messages (batch %s): fetched %s apps for %s app_ids in %sms",
-                    stats["batches"],
-                    len(apps),
-                    len(app_ids),
-                    int((time.monotonic() - fetch_apps_start) * 1000),
-                )

            if not apps:
                logger.info("clean_messages (batch %s): no apps found, skip", stats["batches"])
@@ -273,15 +252,7 @@ class MessagesCleanService:
            app_to_tenant: dict[str, str] = {app.id: app.tenant_id for app in apps}

            # Step 3: Delegate to policy to determine which messages to delete
-            policy_start = time.monotonic()
            message_ids_to_delete = self._policy.filter_message_ids(messages, app_to_tenant)
-            logger.info(
-                "clean_messages (batch %s): policy selected %s/%s messages in %sms",
-                stats["batches"],
-                len(message_ids_to_delete),
-                len(messages),
-                int((time.monotonic() - policy_start) * 1000),
-            )

            if not message_ids_to_delete:
                logger.info("clean_messages (batch %s): no messages to delete, skip", stats["batches"])
@@ -292,20 +263,14 @@ class MessagesCleanService:
            # Step 4: Batch delete messages and their relations
            if not self._dry_run:
                with Session(db.engine, expire_on_commit=False) as session:
-                    delete_relations_start = time.monotonic()
                    # Delete related records first
                    self._batch_delete_message_relations(session, message_ids_to_delete)
-                    delete_relations_ms = int((time.monotonic() - delete_relations_start) * 1000)

                    # Delete messages
-                    delete_messages_start = time.monotonic()
                    delete_stmt = delete(Message).where(Message.id.in_(message_ids_to_delete))
                    delete_result = cast(CursorResult, session.execute(delete_stmt))
                    messages_deleted = delete_result.rowcount
-                    delete_messages_ms = int((time.monotonic() - delete_messages_start) * 1000)
-                    commit_start = time.monotonic()
                    session.commit()
-                    commit_ms = int((time.monotonic() - commit_start) * 1000)

                    stats["total_deleted"] += messages_deleted

@@ -315,19 +280,6 @@ class MessagesCleanService:
                        len(messages),
                        messages_deleted,
                    )
-                    logger.info(
-                        "clean_messages (batch %s): relations %sms,  messages %sms, commit %sms, batch total %sms",
-                        stats["batches"],
-                        delete_relations_ms,
-                        delete_messages_ms,
-                        commit_ms,
-                        int((time.monotonic() - batch_start) * 1000),
-                    )
-
-                # Random sleep between batches to avoid overwhelming the database
-                sleep_ms = random.uniform(0, max_batch_interval_ms)  # noqa: S311
-                logger.info("clean_messages (batch %s): sleeping for %.2fms", stats["batches"], sleep_ms)
-                time.sleep(sleep_ms / 1000)
            else:
                # Log random sample of message IDs that would be deleted (up to 10)
                sample_size = min(10, len(message_ids_to_delete))
--- a/api/services/retention/workflow_run/clear_free_plan_expired_workflow_run_logs.py
+++ b/api/services/retention/workflow_run/clear_free_plan_expired_workflow_run_logs.py
@@ -1,8 +1,5 @@
 import datetime
 import logging
-import os
-import random
-import time
 from collections.abc import Iterable, Sequence

 import click
@@ -75,12 +72,7 @@ class WorkflowRunCleanup:
        batch_index = 0
        last_seen: tuple[datetime.datetime, str] | None = None

-        max_batch_interval_ms = int(os.environ.get("SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL", 200))
-
        while True:
-            batch_start = time.monotonic()
-
-            fetch_start = time.monotonic()
            run_rows = self.workflow_run_repo.get_runs_batch_by_time_range(
                start_from=self.window_start,
                end_before=self.window_end,
@@ -88,30 +80,12 @@ class WorkflowRunCleanup:
                batch_size=self.batch_size,
            )
            if not run_rows:
-                logger.info("workflow_run_cleanup (batch #%s): no more rows to process", batch_index + 1)
                break

            batch_index += 1
            last_seen = (run_rows[-1].created_at, run_rows[-1].id)
-            logger.info(
-                "workflow_run_cleanup (batch #%s): fetched %s rows in %sms",
-                batch_index,
-                len(run_rows),
-                int((time.monotonic() - fetch_start) * 1000),
-            )
-
            tenant_ids = {row.tenant_id for row in run_rows}
-
-            filter_start = time.monotonic()
            free_tenants = self._filter_free_tenants(tenant_ids)
-            logger.info(
-                "workflow_run_cleanup (batch #%s): filtered %s free tenants from %s tenants in %sms",
-                batch_index,
-                len(free_tenants),
-                len(tenant_ids),
-                int((time.monotonic() - filter_start) * 1000),
-            )
-
            free_runs = [row for row in run_rows if row.tenant_id in free_tenants]
            paid_or_skipped = len(run_rows) - len(free_runs)

@@ -130,17 +104,11 @@ class WorkflowRunCleanup:
            total_runs_targeted += len(free_runs)

            if self.dry_run:
-                count_start = time.monotonic()
                batch_counts = self.workflow_run_repo.count_runs_with_related(
                    free_runs,
                    count_node_executions=self._count_node_executions,
                    count_trigger_logs=self._count_trigger_logs,
                )
-                logger.info(
-                    "workflow_run_cleanup (batch #%s, dry_run): counted related records in %sms",
-                    batch_index,
-                    int((time.monotonic() - count_start) * 1000),
-                )
                if related_totals is not None:
                    for key in related_totals:
                        related_totals[key] += batch_counts.get(key, 0)
@@ -152,21 +120,14 @@ class WorkflowRunCleanup:
                        fg="yellow",
                    )
                )
-                logger.info(
-                    "workflow_run_cleanup (batch #%s, dry_run): batch total %sms",
-                    batch_index,
-                    int((time.monotonic() - batch_start) * 1000),
-                )
                continue

            try:
-                delete_start = time.monotonic()
                counts = self.workflow_run_repo.delete_runs_with_related(
                    free_runs,
                    delete_node_executions=self._delete_node_executions,
                    delete_trigger_logs=self._delete_trigger_logs,
                )
-                delete_ms = int((time.monotonic() - delete_start) * 1000)
            except Exception:
                logger.exception("Failed to delete workflow runs batch ending at %s", last_seen[0])
                raise
@@ -182,17 +143,6 @@ class WorkflowRunCleanup:
                    fg="green",
                )
            )
-            logger.info(
-                "workflow_run_cleanup (batch #%s): delete %sms, batch total %sms",
-                batch_index,
-                delete_ms,
-                int((time.monotonic() - batch_start) * 1000),
-            )
-
-            # Random sleep between batches to avoid overwhelming the database
-            sleep_ms = random.uniform(0, max_batch_interval_ms)  # noqa: S311
-            logger.info("workflow_run_cleanup (batch #%s): sleeping for %.2fms", batch_index, sleep_ms)
-            time.sleep(sleep_ms / 1000)

        if self.dry_run:
            if self.window_start:
--- a/api/tests/unit_tests/controllers/console/test_fastopenapi_remote_files.py
+++ b/api/tests/unit_tests/controllers/console/test_fastopenapi_remote_files.py
@@ -1,286 +1,92 @@
-"""Tests for remote file upload API endpoints using Flask-RESTX."""
-
-import contextlib
+import builtins
 from datetime import datetime
 from types import SimpleNamespace
-from unittest.mock import Mock, patch
+from unittest.mock import patch

 import httpx
 import pytest
-from flask import Flask, g
+from flask import Flask
+from flask.views import MethodView
+
+from extensions import ext_fastopenapi
+
+if not hasattr(builtins, "MethodView"):
+    builtins.MethodView = MethodView  # type: ignore[attr-defined]


@pytest.fixture
 def app() -> Flask:
-    """Create Flask app for testing."""
    app = Flask(__name__)
    app.config["TESTING"] = True
-    app.config["SECRET_KEY"] = "test-secret-key"
    return app


-@pytest.fixture
-def client(app):
-    """Create test client with console blueprint registered."""
-    from controllers.console import bp
+def test_console_remote_files_fastopenapi_get_info(app: Flask):
+    ext_fastopenapi.init_app(app)

-    app.register_blueprint(bp)
-    return app.test_client()
-
-
-@pytest.fixture
-def mock_account():
-    """Create a mock account for testing."""
-    from models import Account
-
-    account = Mock(spec=Account)
-    account.id = "test-account-id"
-    account.current_tenant_id = "test-tenant-id"
-    return account
-
-
-@pytest.fixture
-def auth_ctx(app, mock_account):
-    """Context manager to set auth/tenant context in flask.g for a request."""
-
-    @contextlib.contextmanager
-    def _ctx():
-        with app.test_request_context():
-            g._login_user = mock_account
-            g._current_tenant = mock_account.current_tenant_id
-            yield
-
-    return _ctx
-
-
-class TestGetRemoteFileInfo:
-    """Test GET /console/api/remote-files/<path:url> endpoint."""
-
-    def test_get_remote_file_info_success(self, app, client, mock_account):
-        """Test successful retrieval of remote file info."""
-        response = httpx.Response(
-            200,
-            request=httpx.Request("HEAD", "http://example.com/file.txt"),
-            headers={"Content-Type": "text/plain", "Content-Length": "1024"},
-        )
-
-        with (
-            patch(
-                "controllers.console.remote_files.current_account_with_tenant",
-                return_value=(mock_account, "test-tenant-id"),
-            ),
-            patch("controllers.console.remote_files.ssrf_proxy.head", return_value=response),
-            patch("libs.login.check_csrf_token", return_value=None),
-        ):
-            with app.test_request_context():
-                g._login_user = mock_account
-                g._current_tenant = mock_account.current_tenant_id
-                encoded_url = "http%3A%2F%2Fexample.com%2Ffile.txt"
-                resp = client.get(f"/console/api/remote-files/{encoded_url}")
-
-        assert resp.status_code == 200
-        data = resp.get_json()
-        assert data["file_type"] == "text/plain"
-        assert data["file_length"] == 1024
-
-    def test_get_remote_file_info_fallback_to_get_on_head_failure(self, app, client, mock_account):
-        """Test fallback to GET when HEAD returns non-200 status."""
-        head_response = httpx.Response(
-            404,
-            request=httpx.Request("HEAD", "http://example.com/file.pdf"),
-        )
-        get_response = httpx.Response(
-            200,
-            request=httpx.Request("GET", "http://example.com/file.pdf"),
-            headers={"Content-Type": "application/pdf", "Content-Length": "2048"},
-        )
-
-        with (
-            patch(
-                "controllers.console.remote_files.current_account_with_tenant",
-                return_value=(mock_account, "test-tenant-id"),
-            ),
-            patch("controllers.console.remote_files.ssrf_proxy.head", return_value=head_response),
-            patch("controllers.console.remote_files.ssrf_proxy.get", return_value=get_response),
-            patch("libs.login.check_csrf_token", return_value=None),
-        ):
-            with app.test_request_context():
-                g._login_user = mock_account
-                g._current_tenant = mock_account.current_tenant_id
-                encoded_url = "http%3A%2F%2Fexample.com%2Ffile.pdf"
-                resp = client.get(f"/console/api/remote-files/{encoded_url}")
-
-        assert resp.status_code == 200
-        data = resp.get_json()
-        assert data["file_type"] == "application/pdf"
-        assert data["file_length"] == 2048
-
-
-class TestRemoteFileUpload:
-    """Test POST /console/api/remote-files/upload endpoint."""
-
-    @pytest.mark.parametrize(
-        ("head_status", "use_get"),
-        [
-            (200, False),  # HEAD succeeds
-            (405, True),  # HEAD fails -> fallback GET
-        ],
+    response = httpx.Response(
+        200,
+        request=httpx.Request("HEAD", "http://example.com/file.txt"),
+        headers={"Content-Type": "text/plain", "Content-Length": "10"},
    )
-    def test_upload_remote_file_success_paths(self, client, mock_account, auth_ctx, head_status, use_get):
-        url = "http://example.com/file.pdf"
-        head_resp = httpx.Response(
-            head_status,
-            request=httpx.Request("HEAD", url),
-            headers={"Content-Type": "application/pdf", "Content-Length": "1024"},
-        )
-        get_resp = httpx.Response(
-            200,
-            request=httpx.Request("GET", url),
-            headers={"Content-Type": "application/pdf", "Content-Length": "1024"},
-            content=b"file content",
-        )

-        file_info = SimpleNamespace(
-            extension="pdf",
-            size=1024,
-            filename="file.pdf",
-            mimetype="application/pdf",
-        )
-        uploaded_file = SimpleNamespace(
-            id="uploaded-file-id",
-            name="file.pdf",
-            size=1024,
-            extension="pdf",
-            mime_type="application/pdf",
-            created_by="test-account-id",
-            created_at=datetime(2024, 1, 1, 12, 0, 0),
-        )
+    with patch("controllers.console.remote_files.ssrf_proxy.head", return_value=response):
+        client = app.test_client()
+        encoded_url = "http%3A%2F%2Fexample.com%2Ffile.txt"
+        resp = client.get(f"/console/api/remote-files/{encoded_url}")

-        with (
-            patch(
-                "controllers.console.remote_files.current_account_with_tenant",
-                return_value=(mock_account, "test-tenant-id"),
-            ),
-            patch("controllers.console.remote_files.ssrf_proxy.head", return_value=head_resp) as p_head,
-            patch("controllers.console.remote_files.ssrf_proxy.get", return_value=get_resp) as p_get,
-            patch(
-                "controllers.console.remote_files.helpers.guess_file_info_from_response",
-                return_value=file_info,
-            ),
-            patch(
-                "controllers.console.remote_files.FileService.is_file_size_within_limit",
-                return_value=True,
-            ),
-            patch("controllers.console.remote_files.db", spec=["engine"]),
-            patch("controllers.console.remote_files.FileService") as mock_file_service,
-            patch(
-                "controllers.console.remote_files.file_helpers.get_signed_file_url",
-                return_value="http://example.com/signed-url",
-            ),
-            patch("libs.login.check_csrf_token", return_value=None),
-        ):
-            mock_file_service.return_value.upload_file.return_value = uploaded_file
+    assert resp.status_code == 200
+    assert resp.get_json() == {"file_type": "text/plain", "file_length": 10}

-            with auth_ctx():
-                resp = client.post(
-                    "/console/api/remote-files/upload",
-                    json={"url": url},
-                )

-        assert resp.status_code == 201
-        p_head.assert_called_once()
-        # GET is used either for fallback (HEAD fails) or to fetch content after HEAD succeeds
-        p_get.assert_called_once()
-        mock_file_service.return_value.upload_file.assert_called_once()
+def test_console_remote_files_fastopenapi_upload(app: Flask):
+    ext_fastopenapi.init_app(app)

-        data = resp.get_json()
-        assert data["id"] == "uploaded-file-id"
-        assert data["name"] == "file.pdf"
-        assert data["size"] == 1024
-        assert data["extension"] == "pdf"
-        assert data["url"] == "http://example.com/signed-url"
-        assert data["mime_type"] == "application/pdf"
-        assert data["created_by"] == "test-account-id"
-
-    @pytest.mark.parametrize(
-        ("size_ok", "raises", "expected_status", "expected_msg"),
-        [
-            # When size check fails in controller, API returns 413 with message "File size exceeded..."
-            (False, None, 413, "file size exceeded"),
-            # When service raises unsupported type, controller maps to 415 with message "File type not allowed."
-            (True, "unsupported", 415, "file type not allowed"),
-        ],
+    head_response = httpx.Response(
+        200,
+        request=httpx.Request("GET", "http://example.com/file.txt"),
+        content=b"hello",
    )
-    def test_upload_remote_file_errors(
-        self, client, mock_account, auth_ctx, size_ok, raises, expected_status, expected_msg
+    file_info = SimpleNamespace(
+        extension="txt",
+        size=5,
+        filename="file.txt",
+        mimetype="text/plain",
+    )
+    uploaded = SimpleNamespace(
+        id="file-id",
+        name="file.txt",
+        size=5,
+        extension="txt",
+        mime_type="text/plain",
+        created_by="user-id",
+        created_at=datetime(2024, 1, 1),
+    )
+
+    with (
+        patch("controllers.console.remote_files.db", new=SimpleNamespace(engine=object())),
+        patch("controllers.console.remote_files.ssrf_proxy.head", return_value=head_response),
+        patch("controllers.console.remote_files.helpers.guess_file_info_from_response", return_value=file_info),
+        patch("controllers.console.remote_files.FileService.is_file_size_within_limit", return_value=True),
+        patch("controllers.console.remote_files.FileService.__init__", return_value=None),
+        patch("controllers.console.remote_files.current_account_with_tenant", return_value=(object(), "tenant-id")),
+        patch("controllers.console.remote_files.FileService.upload_file", return_value=uploaded),
+        patch("controllers.console.remote_files.file_helpers.get_signed_file_url", return_value="signed-url"),
    ):
-        url = "http://example.com/x.pdf"
-        head_resp = httpx.Response(
-            200,
-            request=httpx.Request("HEAD", url),
-            headers={"Content-Type": "application/pdf", "Content-Length": "9"},
+        client = app.test_client()
+        resp = client.post(
+            "/console/api/remote-files/upload",
+            json={"url": "http://example.com/file.txt"},
        )
-        file_info = SimpleNamespace(extension="pdf", size=9, filename="x.pdf", mimetype="application/pdf")

-        with (
-            patch(
-                "controllers.console.remote_files.current_account_with_tenant",
-                return_value=(mock_account, "test-tenant-id"),
-            ),
-            patch("controllers.console.remote_files.ssrf_proxy.head", return_value=head_resp),
-            patch(
-                "controllers.console.remote_files.helpers.guess_file_info_from_response",
-                return_value=file_info,
-            ),
-            patch(
-                "controllers.console.remote_files.FileService.is_file_size_within_limit",
-                return_value=size_ok,
-            ),
-            patch("controllers.console.remote_files.db", spec=["engine"]),
-            patch("libs.login.check_csrf_token", return_value=None),
-        ):
-            if raises == "unsupported":
-                from services.errors.file import UnsupportedFileTypeError
-
-                with patch("controllers.console.remote_files.FileService") as mock_file_service:
-                    mock_file_service.return_value.upload_file.side_effect = UnsupportedFileTypeError("bad")
-                    with auth_ctx():
-                        resp = client.post(
-                            "/console/api/remote-files/upload",
-                            json={"url": url},
-                        )
-            else:
-                with auth_ctx():
-                    resp = client.post(
-                        "/console/api/remote-files/upload",
-                        json={"url": url},
-                    )
-
-        assert resp.status_code == expected_status
-        data = resp.get_json()
-        msg = (data.get("error") or {}).get("message") or data.get("message", "")
-        assert expected_msg in msg.lower()
-
-    def test_upload_remote_file_fetch_failure(self, client, mock_account, auth_ctx):
-        """Test upload when fetching of remote file fails."""
-        with (
-            patch(
-                "controllers.console.remote_files.current_account_with_tenant",
-                return_value=(mock_account, "test-tenant-id"),
-            ),
-            patch(
-                "controllers.console.remote_files.ssrf_proxy.head",
-                side_effect=httpx.RequestError("Connection failed"),
-            ),
-            patch("libs.login.check_csrf_token", return_value=None),
-        ):
-            with auth_ctx():
-                resp = client.post(
-                    "/console/api/remote-files/upload",
-                    json={"url": "http://unreachable.com/file.pdf"},
-                )
-
-        assert resp.status_code == 400
-        data = resp.get_json()
-        msg = (data.get("error") or {}).get("message") or data.get("message", "")
-        assert "failed to fetch" in msg.lower()
+    assert resp.status_code == 201
+    assert resp.get_json() == {
+        "id": "file-id",
+        "name": "file.txt",
+        "size": 5,
+        "extension": "txt",
+        "url": "signed-url",
+        "mime_type": "text/plain",
+        "created_by": "user-id",
+        "created_at": int(uploaded.created_at.timestamp()),
+    }
--- a/api/tests/unit_tests/core/schemas/test_resolver.py
+++ b/api/tests/unit_tests/core/schemas/test_resolver.py
@@ -496,9 +496,6 @@ class TestSchemaResolverClass:
        avg_time_no_cache = sum(results1) / len(results1)

        # Second run (with cache) - run multiple times
-        # Warm up cache first
-        resolve_dify_schema_refs(schema)
-
        results2 = []
        for _ in range(3):
            start = time.perf_counter()
--- a/api/tests/unit_tests/services/test_app_generate_service.py
+++ b/api/tests/unit_tests/services/test_app_generate_service.py
@@ -63,56 +63,3 @@ def test_workflow_blocking_injects_pause_state_config(mocker, monkeypatch):
    pause_state_config = call_kwargs.get("pause_state_config")
    assert pause_state_config is not None
    assert pause_state_config.state_owner_user_id == "owner-id"
-
-
-def test_advanced_chat_blocking_returns_dict_and_does_not_use_event_retrieval(mocker, monkeypatch):
-    """
-    Regression test: ADVANCED_CHAT in blocking mode should return a plain dict
-    (non-streaming), and must not go through the async retrieve_events path.
-    Keeps behavior consistent with WORKFLOW blocking branch.
-    """
-    # Disable billing and stub RateLimit to a no-op that just passes values through
-    monkeypatch.setattr(app_generate_service_module.dify_config, "BILLING_ENABLED", False)
-    mocker.patch("services.app_generate_service.RateLimit", _DummyRateLimit)
-
-    # Arrange a fake workflow and wire AppGenerateService._get_workflow to return it
-    workflow = MagicMock()
-    workflow.id = "workflow-id"
-    mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
-
-    # Spy on the streaming retrieval path to ensure it's NOT called
-    retrieve_spy = mocker.patch("services.app_generate_service.AdvancedChatAppGenerator.retrieve_events")
-
-    # Make AdvancedChatAppGenerator.generate return a plain dict when streaming=False
-    generate_spy = mocker.patch(
-        "services.app_generate_service.AdvancedChatAppGenerator.generate",
-        return_value={"result": "ok"},
-    )
-
-    # Minimal app model for ADVANCED_CHAT
-    app_model = MagicMock()
-    app_model.mode = AppMode.ADVANCED_CHAT
-    app_model.id = "app-id"
-    app_model.tenant_id = "tenant-id"
-    app_model.max_active_requests = 0
-    app_model.is_agent = False
-
-    user = MagicMock()
-    user.id = "user-id"
-
-    # Must include query and inputs for AdvancedChatAppGenerator
-    args = {"workflow_id": "wf-1", "query": "hello", "inputs": {}}
-
-    # Act: call service with streaming=False (blocking mode)
-    result = AppGenerateService.generate(
-        app_model=app_model,
-        user=user,
-        args=args,
-        invoke_from=MagicMock(),
-        streaming=False,
-    )
-
-    # Assert: returns the dict from generate(), and did not call retrieve_events()
-    assert result == {"result": "ok"}
-    assert generate_spy.call_args.kwargs.get("streaming") is False
-    retrieve_spy.assert_not_called()
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -1366,7 +1366,7 @@ wheels = [

 [[package]]
 name = "dify-api"
-version = "1.13.0"
+version = "1.12.1"
 source = { virtual = "." }
 dependencies = [
    { name = "aliyun-log-python-sdk" },
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -1523,7 +1523,6 @@ AMPLITUDE_API_KEY=
 # Sandbox expired records clean configuration
 SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD=21
 SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_SIZE=1000
-SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL=200
 SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS=30


--- a/docker/docker-compose-template.yaml
+++ b/docker/docker-compose-template.yaml
@@ -21,7 +21,7 @@ services:

  # API service
  api:
-    image: langgenius/dify-api:1.13.0
+    image: langgenius/dify-api:1.12.1
    restart: always
    environment:
      # Use the shared environment variables.
@@ -63,7 +63,7 @@ services:
  # worker service
  # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
  worker:
-    image: langgenius/dify-api:1.13.0
+    image: langgenius/dify-api:1.12.1
    restart: always
    environment:
      # Use the shared environment variables.
@@ -102,7 +102,7 @@ services:
  # worker_beat service
  # Celery beat for scheduling periodic tasks.
  worker_beat:
-    image: langgenius/dify-api:1.13.0
+    image: langgenius/dify-api:1.12.1
    restart: always
    environment:
      # Use the shared environment variables.
@@ -132,7 +132,7 @@ services:

  # Frontend web application.
  web:
-    image: langgenius/dify-web:1.13.0
+    image: langgenius/dify-web:1.12.1
    restart: always
    environment:
      CONSOLE_API_URL: ${CONSOLE_API_URL:-}
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -684,7 +684,6 @@ x-shared-env: &shared-api-worker-env
  AMPLITUDE_API_KEY: ${AMPLITUDE_API_KEY:-}
  SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD: ${SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD:-21}
  SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_SIZE: ${SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_SIZE:-1000}
-  SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL: ${SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL:-200}
  SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS: ${SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS:-30}
  PUBSUB_REDIS_URL: ${PUBSUB_REDIS_URL:-}
  PUBSUB_REDIS_CHANNEL_TYPE: ${PUBSUB_REDIS_CHANNEL_TYPE:-pubsub}
@@ -715,7 +714,7 @@ services:

  # API service
  api:
-    image: langgenius/dify-api:1.13.0
+    image: langgenius/dify-api:1.12.1
    restart: always
    environment:
      # Use the shared environment variables.
@@ -757,7 +756,7 @@ services:
  # worker service
  # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
  worker:
-    image: langgenius/dify-api:1.13.0
+    image: langgenius/dify-api:1.12.1
    restart: always
    environment:
      # Use the shared environment variables.
@@ -796,7 +795,7 @@ services:
  # worker_beat service
  # Celery beat for scheduling periodic tasks.
  worker_beat:
-    image: langgenius/dify-api:1.13.0
+    image: langgenius/dify-api:1.12.1
    restart: always
    environment:
      # Use the shared environment variables.
@@ -826,7 +825,7 @@ services:

  # Frontend web application.
  web:
-    image: langgenius/dify-web:1.13.0
+    image: langgenius/dify-web:1.12.1
    restart: always
    environment:
      CONSOLE_API_URL: ${CONSOLE_API_URL:-}
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,5 +1,5 @@
 # base image
-FROM node:22-alpine AS base
+FROM node:24-alpine AS base
 LABEL maintainer="takatost@gmail.com"

 # if you located in China, you can use aliyun mirror to speed up
@@ -81,8 +81,6 @@ COPY --chown=dify:dify --chmod=755 docker/entrypoint.sh ./entrypoint.sh
 ARG COMMIT_SHA
 ENV COMMIT_SHA=${COMMIT_SHA}

-RUN chown -R dify:dify /app/web
-
 USER dify
 EXPOSE 3000
 ENTRYPOINT ["/bin/sh", "./entrypoint.sh"]
--- a/web/app/account/oauth/authorize/constants.ts
+++ b/web/app/account/oauth/authorize/constants.ts
@@ -0,0 +1,3 @@
+export const OAUTH_AUTHORIZE_PENDING_KEY = 'oauth_authorize_pending'
+export const REDIRECT_URL_KEY = 'oauth_redirect_url'
+export const OAUTH_AUTHORIZE_PENDING_TTL = 60 * 3
--- a/web/app/account/oauth/authorize/page.tsx
+++ b/web/app/account/oauth/authorize/page.tsx
@@ -7,6 +7,7 @@ import {
  RiMailLine,
  RiTranslate2,
 } from '@remixicon/react'
+import dayjs from 'dayjs'
 import { useRouter, useSearchParams } from 'next/navigation'
 import * as React from 'react'
 import { useEffect, useRef } from 'react'
@@ -16,10 +17,22 @@ import Button from '@/app/components/base/button'
 import Loading from '@/app/components/base/loading'
 import Toast from '@/app/components/base/toast'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
-import { setPostLoginRedirect } from '@/app/signin/utils/post-login-redirect'
 import { useAppContext } from '@/context/app-context'
 import { useIsLogin } from '@/service/use-common'
 import { useAuthorizeOAuthApp, useOAuthAppInfo } from '@/service/use-oauth'
+import {
+  OAUTH_AUTHORIZE_PENDING_KEY,
+  OAUTH_AUTHORIZE_PENDING_TTL,
+  REDIRECT_URL_KEY,
+} from './constants'
+
+function setItemWithExpiry(key: string, value: string, ttl: number) {
+  const item = {
+    value,
+    expiry: dayjs().add(ttl, 'seconds').unix(),
+  }
+  localStorage.setItem(key, JSON.stringify(item))
+}

 function buildReturnUrl(pathname: string, search: string) {
  try {
@@ -73,8 +86,8 @@ export default function OAuthAuthorize() {
  const onLoginSwitchClick = () => {
    try {
      const returnUrl = buildReturnUrl('/account/oauth/authorize', `?client_id=${encodeURIComponent(client_id)}&redirect_uri=${encodeURIComponent(redirect_uri)}`)
-      setPostLoginRedirect(returnUrl)
-      router.push('/signin')
+      setItemWithExpiry(OAUTH_AUTHORIZE_PENDING_KEY, returnUrl, OAUTH_AUTHORIZE_PENDING_TTL)
+      router.push(`/signin?${REDIRECT_URL_KEY}=${encodeURIComponent(returnUrl)}`)
    }
    catch {
      router.push('/signin')
@@ -132,7 +145,7 @@ export default function OAuthAuthorize() {
          <div className="text-[var(--color-saas-dify-blue-inverted)]">{authAppInfo?.app_label[language] || authAppInfo?.app_label?.en_US || t('unknownApp', { ns: 'oauth' })}</div>
          {!isLoggedIn && <div className="text-text-primary">{t('tips.notLoggedIn', { ns: 'oauth' })}</div>}
        </div>
-        <div className="text-text-secondary body-md-regular">{isLoggedIn ? `${authAppInfo?.app_label[language] || authAppInfo?.app_label?.en_US || t('unknownApp', { ns: 'oauth' })} ${t('tips.loggedIn', { ns: 'oauth' })}` : t('tips.needLogin', { ns: 'oauth' })}</div>
+        <div className="body-md-regular text-text-secondary">{isLoggedIn ? `${authAppInfo?.app_label[language] || authAppInfo?.app_label?.en_US || t('unknownApp', { ns: 'oauth' })} ${t('tips.loggedIn', { ns: 'oauth' })}` : t('tips.needLogin', { ns: 'oauth' })}</div>
      </div>

      {isLoggedIn && userProfile && (
@@ -141,7 +154,7 @@ export default function OAuthAuthorize() {
            <Avatar avatar={userProfile.avatar_url} name={userProfile.name} size={36} />
            <div>
              <div className="system-md-semi-bold text-text-secondary">{userProfile.name}</div>
-              <div className="text-text-tertiary system-xs-regular">{userProfile.email}</div>
+              <div className="system-xs-regular text-text-tertiary">{userProfile.email}</div>
            </div>
          </div>
          <Button variant="tertiary" size="small" onClick={onLoginSwitchClick}>{t('switchAccount', { ns: 'oauth' })}</Button>
@@ -153,7 +166,7 @@ export default function OAuthAuthorize() {
          {authAppInfo!.scope.split(/\s+/).filter(Boolean).map((scope: string) => {
            const Icon = SCOPE_INFO_MAP[scope]
            return (
-              <div key={scope} className="flex items-center gap-2 text-text-secondary body-sm-medium">
+              <div key={scope} className="body-sm-medium flex items-center gap-2 text-text-secondary">
                {Icon ? <Icon.icon className="h-4 w-4" /> : <RiAccountCircleLine className="h-4 w-4" />}
                {Icon.label}
              </div>
@@ -186,7 +199,7 @@ export default function OAuthAuthorize() {
          </defs>
        </svg>
      </div>
-      <div className="mt-3 text-text-tertiary system-xs-regular">{t('tips.common', { ns: 'oauth' })}</div>
+      <div className="system-xs-regular mt-3 text-text-tertiary">{t('tips.common', { ns: 'oauth' })}</div>
    </div>
  )
 }
--- a/web/app/components/app-initializer.tsx
+++ b/web/app/components/app-initializer.tsx
@@ -84,7 +84,7 @@ export const AppInitializer = ({
          return
        }

-        const redirectUrl = resolvePostLoginRedirect()
+        const redirectUrl = resolvePostLoginRedirect(searchParams)
        if (redirectUrl) {
          location.replace(redirectUrl)
          return
--- a/web/app/components/header/account-setting/members-page/index.tsx
+++ b/web/app/components/header/account-setting/members-page/index.tsx
@@ -104,7 +104,7 @@ const MembersPage = () => {
            <UpgradeBtn className="mr-2" loc="member-invite" />
          )}
          <div className="shrink-0">
-            {isCurrentWorkspaceManager && <InviteButton disabled={isMemberFull} onClick={() => setInviteModalVisible(true)} />}
+            <InviteButton disabled={!isCurrentWorkspaceManager || isMemberFull} onClick={() => setInviteModalVisible(true)} />
          </div>
        </div>
        <div className="overflow-visible lg:overflow-visible">
--- a/web/app/components/provider/serwist.tsx
+++ b/web/app/components/provider/serwist.tsx
@@ -0,0 +1,43 @@
+'use client'
+
+import { SerwistProvider } from '@serwist/turbopack/react'
+import { useEffect } from 'react'
+import { IS_DEV } from '@/config'
+import { env } from '@/env'
+import { isClient } from '@/utils/client'
+
+export function PWAProvider({ children }: { children: React.ReactNode }) {
+  if (IS_DEV) {
+    return <DisabledPWAProvider>{children}</DisabledPWAProvider>
+  }
+
+  const basePath = env.NEXT_PUBLIC_BASE_PATH
+  const swUrl = `${basePath}/serwist/sw.js`
+
+  return (
+    <SerwistProvider swUrl={swUrl}>
+      {children}
+    </SerwistProvider>
+  )
+}
+
+function DisabledPWAProvider({ children }: { children: React.ReactNode }) {
+  useEffect(() => {
+    if (isClient && 'serviceWorker' in navigator) {
+      navigator.serviceWorker.getRegistrations()
+        .then((registrations) => {
+          registrations.forEach((registration) => {
+            registration.unregister()
+              .catch((error) => {
+                console.error('Error unregistering service worker:', error)
+              })
+          })
+        })
+        .catch((error) => {
+          console.error('Error unregistering service workers:', error)
+        })
+    }
+  }, [])
+
+  return <>{children}</>
+}
--- a/web/app/components/rag-pipeline/hooks/use-pipeline-run.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/use-pipeline-run.spec.ts
@@ -92,10 +92,10 @@ vi.mock('@/service/workflow', () => ({
 }))

 const mockInvalidAllLastRun = vi.fn()
-const mockInvalidateRunHistory = vi.fn()
+const mockInvalidateWorkflowRunHistory = vi.fn()
 vi.mock('@/service/use-workflow', () => ({
  useInvalidAllLastRun: () => mockInvalidAllLastRun,
-  useInvalidateWorkflowRunHistory: () => mockInvalidateRunHistory,
+  useInvalidateWorkflowRunHistory: () => mockInvalidateWorkflowRunHistory,
 }))

 // Mock FlowType
@@ -474,7 +474,6 @@ describe('usePipelineRun', () => {
      })

      expect(onWorkflowStarted).toHaveBeenCalledWith({ task_id: 'task-1' })
-      expect(mockInvalidateRunHistory).toHaveBeenCalled()
    })

    it('should call onWorkflowFinished callback when provided', async () => {
@@ -496,7 +495,6 @@ describe('usePipelineRun', () => {
      })

      expect(onWorkflowFinished).toHaveBeenCalledWith({ status: 'succeeded' })
-      expect(mockInvalidateRunHistory).toHaveBeenCalled()
    })

    it('should call onError callback when provided', async () => {
@@ -518,7 +516,6 @@ describe('usePipelineRun', () => {
      })

      expect(onError).toHaveBeenCalledWith({ message: 'error' })
-      expect(mockInvalidateRunHistory).toHaveBeenCalled()
    })

    it('should call onNodeStarted callback when provided', async () => {
--- a/web/app/layout.tsx
+++ b/web/app/layout.tsx
@@ -12,6 +12,7 @@ import { ToastProvider } from './components/base/toast'
 import BrowserInitializer from './components/browser-initializer'
 import { ReactScanLoader } from './components/devtools/react-scan/loader'
 import { I18nServerProvider } from './components/provider/i18n-server'
+import { PWAProvider } from './components/provider/serwist'
 import SentryInitializer from './components/sentry-initializer'
 import RoutePrefixHandle from './routePrefixHandle'
 import './styles/globals.css'
@@ -59,33 +60,35 @@ const LocaleLayout = async ({
        className="color-scheme h-full select-auto"
        {...datasetMap}
      >
-        <ReactScanLoader />
-        <JotaiProvider>
-          <ThemeProvider
-            attribute="data-theme"
-            defaultTheme="system"
-            enableSystem
-            disableTransitionOnChange
-            enableColorScheme={false}
-          >
-            <NuqsAdapter>
-              <BrowserInitializer>
-                <SentryInitializer>
-                  <TanstackQueryInitializer>
-                    <I18nServerProvider>
-                      <ToastProvider>
-                        <GlobalPublicStoreProvider>
-                          {children}
-                        </GlobalPublicStoreProvider>
-                      </ToastProvider>
-                    </I18nServerProvider>
-                  </TanstackQueryInitializer>
-                </SentryInitializer>
-              </BrowserInitializer>
-            </NuqsAdapter>
-          </ThemeProvider>
-        </JotaiProvider>
-        <RoutePrefixHandle />
+        <PWAProvider>
+          <ReactScanLoader />
+          <JotaiProvider>
+            <ThemeProvider
+              attribute="data-theme"
+              defaultTheme="system"
+              enableSystem
+              disableTransitionOnChange
+              enableColorScheme={false}
+            >
+              <NuqsAdapter>
+                <BrowserInitializer>
+                  <SentryInitializer>
+                    <TanstackQueryInitializer>
+                      <I18nServerProvider>
+                        <ToastProvider>
+                          <GlobalPublicStoreProvider>
+                            {children}
+                          </GlobalPublicStoreProvider>
+                        </ToastProvider>
+                      </I18nServerProvider>
+                    </TanstackQueryInitializer>
+                  </SentryInitializer>
+                </BrowserInitializer>
+              </NuqsAdapter>
+            </ThemeProvider>
+          </JotaiProvider>
+          <RoutePrefixHandle />
+        </PWAProvider>
      </body>
    </html>
  )
--- a/web/app/serwist/[path]/route.ts
+++ b/web/app/serwist/[path]/route.ts
@@ -0,0 +1,12 @@
+import { createSerwistRoute } from '@serwist/turbopack'
+import { env } from '@/env'
+
+const basePath = env.NEXT_PUBLIC_BASE_PATH
+
+export const { dynamic, dynamicParams, revalidate, generateStaticParams, GET } = createSerwistRoute({
+  swSrc: 'app/sw.ts',
+  nextConfig: {
+    basePath,
+  },
+  useNativeEsbuild: true,
+})
--- a/web/app/signin/check-code/page.tsx
+++ b/web/app/signin/check-code/page.tsx
@@ -57,7 +57,7 @@ export default function CheckCode() {
          router.replace(`/signin/invite-settings?${searchParams.toString()}`)
        }
        else {
-          const redirectUrl = resolvePostLoginRedirect()
+          const redirectUrl = resolvePostLoginRedirect(searchParams)
          router.replace(redirectUrl || '/apps')
        }
      }
@@ -95,8 +95,8 @@ export default function CheckCode() {
        <RiMailSendFill className="h-6 w-6 text-2xl text-text-accent-light-mode-only" />
      </div>
      <div className="pb-4 pt-2">
-        <h2 className="text-text-primary title-4xl-semi-bold">{t('checkCode.checkYourEmail', { ns: 'login' })}</h2>
-        <p className="mt-2 text-text-secondary body-md-regular">
+        <h2 className="title-4xl-semi-bold text-text-primary">{t('checkCode.checkYourEmail', { ns: 'login' })}</h2>
+        <p className="body-md-regular mt-2 text-text-secondary">
          <span>
            {t('checkCode.tipsPrefix', { ns: 'login' })}
            <strong>{email}</strong>
@@ -107,7 +107,7 @@ export default function CheckCode() {
      </div>

      <form onSubmit={handleSubmit}>
-        <label htmlFor="code" className="mb-1 text-text-secondary system-md-semibold">{t('checkCode.verificationCode', { ns: 'login' })}</label>
+        <label htmlFor="code" className="system-md-semibold mb-1 text-text-secondary">{t('checkCode.verificationCode', { ns: 'login' })}</label>
        <Input
          ref={codeInputRef}
          id="code"
@@ -127,7 +127,7 @@ export default function CheckCode() {
        <div className="inline-block rounded-full bg-background-default-dimmed p-1">
          <RiArrowLeftLine size={12} />
        </div>
-        <span className="ml-2 system-xs-regular">{t('back', { ns: 'login' })}</span>
+        <span className="system-xs-regular ml-2">{t('back', { ns: 'login' })}</span>
      </div>
    </div>
  )
--- a/web/app/signin/components/mail-and-password-auth.tsx
+++ b/web/app/signin/components/mail-and-password-auth.tsx
@@ -78,7 +78,7 @@ export default function MailAndPasswordAuth({ isInvite, isEmailSetup, allowRegis
          router.replace(`/signin/invite-settings?${searchParams.toString()}`)
        }
        else {
-          const redirectUrl = resolvePostLoginRedirect()
+          const redirectUrl = resolvePostLoginRedirect(searchParams)
          router.replace(redirectUrl || '/apps')
        }
      }
@@ -105,7 +105,7 @@ export default function MailAndPasswordAuth({ isInvite, isEmailSetup, allowRegis
  return (
    <form onSubmit={noop}>
      <div className="mb-3">
-        <label htmlFor="email" className="my-2 text-text-secondary system-md-semibold">
+        <label htmlFor="email" className="system-md-semibold my-2 text-text-secondary">
          {t('email', { ns: 'login' })}
        </label>
        <div className="mt-1">
@@ -124,7 +124,7 @@ export default function MailAndPasswordAuth({ isInvite, isEmailSetup, allowRegis

      <div className="mb-3">
        <label htmlFor="password" className="my-2 flex items-center justify-between">
-          <span className="text-text-secondary system-md-semibold">{t('password', { ns: 'login' })}</span>
+          <span className="system-md-semibold text-text-secondary">{t('password', { ns: 'login' })}</span>
          <Link
            href={`/reset-password?${searchParams.toString()}`}
            className={`system-xs-regular ${isEmailSetup ? 'text-components-button-secondary-accent-text' : 'pointer-events-none text-components-button-secondary-accent-text-disabled'}`}
--- a/web/app/signin/invite-settings/page.tsx
+++ b/web/app/signin/invite-settings/page.tsx
@@ -56,7 +56,7 @@ export default function InviteSettingsPage() {
      if (res.result === 'success') {
        // Tokens are now stored in cookies by the backend
        await setLocaleOnClient(language, false)
-        const redirectUrl = resolvePostLoginRedirect()
+        const redirectUrl = resolvePostLoginRedirect(searchParams)
        router.replace(redirectUrl || '/apps')
      }
    }
@@ -72,7 +72,7 @@ export default function InviteSettingsPage() {
      <div className="flex flex-col md:w-[400px]">
        <div className="mx-auto w-full">
          <div className="mb-3 flex h-14 w-14 items-center justify-center rounded-2xl border border-components-panel-border-subtle text-2xl font-bold shadow-lg">🤷‍♂️</div>
-          <h2 className="text-text-primary title-4xl-semi-bold">{t('invalid', { ns: 'login' })}</h2>
+          <h2 className="title-4xl-semi-bold text-text-primary">{t('invalid', { ns: 'login' })}</h2>
        </div>
        <div className="mx-auto mt-6 w-full">
          <Button variant="primary" className="w-full !text-sm">
@@ -89,11 +89,11 @@ export default function InviteSettingsPage() {
        <RiAccountCircleLine className="h-6 w-6 text-2xl text-text-accent-light-mode-only" />
      </div>
      <div className="pb-4 pt-2">
-        <h2 className="text-text-primary title-4xl-semi-bold">{t('setYourAccount', { ns: 'login' })}</h2>
+        <h2 className="title-4xl-semi-bold text-text-primary">{t('setYourAccount', { ns: 'login' })}</h2>
      </div>
      <form onSubmit={noop}>
        <div className="mb-5">
-          <label htmlFor="name" className="my-2 text-text-secondary system-md-semibold">
+          <label htmlFor="name" className="system-md-semibold my-2 text-text-secondary">
            {t('name', { ns: 'login' })}
          </label>
          <div className="mt-1">
@@ -114,7 +114,7 @@ export default function InviteSettingsPage() {
          </div>
        </div>
        <div className="mb-5">
-          <label htmlFor="name" className="my-2 text-text-secondary system-md-semibold">
+          <label htmlFor="name" className="system-md-semibold my-2 text-text-secondary">
            {t('interfaceLanguage', { ns: 'login' })}
          </label>
          <div className="mt-1">
@@ -129,7 +129,7 @@ export default function InviteSettingsPage() {
        </div>
        {/* timezone */}
        <div className="mb-5">
-          <label htmlFor="timezone" className="text-text-secondary system-md-semibold">
+          <label htmlFor="timezone" className="system-md-semibold text-text-secondary">
            {t('timezone', { ns: 'login' })}
          </label>
          <div className="mt-1">
@@ -153,11 +153,11 @@ export default function InviteSettingsPage() {
        </div>
      </form>
      {!systemFeatures.branding.enabled && (
-        <div className="mt-2 block w-full text-text-tertiary system-xs-regular">
+        <div className="system-xs-regular mt-2 block w-full text-text-tertiary">
          {t('license.tip', { ns: 'login' })}
      &nbsp;
          <Link
-            className="text-text-accent-secondary system-xs-medium"
+            className="system-xs-medium text-text-accent-secondary"
            target="_blank"
            rel="noopener noreferrer"
            href={LICENSE_LINK}
--- a/web/app/signin/normal-form.tsx
+++ b/web/app/signin/normal-form.tsx
@@ -42,7 +42,7 @@ const NormalForm = () => {
    try {
      if (isLoggedIn) {
        setIsRedirecting(true)
-        const redirectUrl = resolvePostLoginRedirect()
+        const redirectUrl = resolvePostLoginRedirect(searchParams)
        router.replace(redirectUrl || '/apps')
        return
      }
@@ -98,8 +98,8 @@ const NormalForm = () => {
              <RiContractLine className="h-5 w-5" />
              <RiErrorWarningFill className="absolute -right-1 -top-1 h-4 w-4 text-text-warning-secondary" />
            </div>
-            <p className="text-text-primary system-sm-medium">{t('licenseLost', { ns: 'login' })}</p>
-            <p className="mt-1 text-text-tertiary system-xs-regular">{t('licenseLostTip', { ns: 'login' })}</p>
+            <p className="system-sm-medium text-text-primary">{t('licenseLost', { ns: 'login' })}</p>
+            <p className="system-xs-regular mt-1 text-text-tertiary">{t('licenseLostTip', { ns: 'login' })}</p>
          </div>
        </div>
      </div>
@@ -114,8 +114,8 @@ const NormalForm = () => {
              <RiContractLine className="h-5 w-5" />
              <RiErrorWarningFill className="absolute -right-1 -top-1 h-4 w-4 text-text-warning-secondary" />
            </div>
-            <p className="text-text-primary system-sm-medium">{t('licenseExpired', { ns: 'login' })}</p>
-            <p className="mt-1 text-text-tertiary system-xs-regular">{t('licenseExpiredTip', { ns: 'login' })}</p>
+            <p className="system-sm-medium text-text-primary">{t('licenseExpired', { ns: 'login' })}</p>
+            <p className="system-xs-regular mt-1 text-text-tertiary">{t('licenseExpiredTip', { ns: 'login' })}</p>
          </div>
        </div>
      </div>
@@ -130,8 +130,8 @@ const NormalForm = () => {
              <RiContractLine className="h-5 w-5" />
              <RiErrorWarningFill className="absolute -right-1 -top-1 h-4 w-4 text-text-warning-secondary" />
            </div>
-            <p className="text-text-primary system-sm-medium">{t('licenseInactive', { ns: 'login' })}</p>
-            <p className="mt-1 text-text-tertiary system-xs-regular">{t('licenseInactiveTip', { ns: 'login' })}</p>
+            <p className="system-sm-medium text-text-primary">{t('licenseInactive', { ns: 'login' })}</p>
+            <p className="system-xs-regular mt-1 text-text-tertiary">{t('licenseInactiveTip', { ns: 'login' })}</p>
          </div>
        </div>
      </div>
@@ -144,12 +144,12 @@ const NormalForm = () => {
        {isInviteLink
          ? (
              <div className="mx-auto w-full">
-                <h2 className="text-text-primary title-4xl-semi-bold">
+                <h2 className="title-4xl-semi-bold text-text-primary">
                  {t('join', { ns: 'login' })}
                  {workspaceName}
                </h2>
                {!systemFeatures.branding.enabled && (
-                  <p className="mt-2 text-text-tertiary body-md-regular">
+                  <p className="body-md-regular mt-2 text-text-tertiary">
                    {t('joinTipStart', { ns: 'login' })}
                    {workspaceName}
                    {t('joinTipEnd', { ns: 'login' })}
@@ -159,8 +159,8 @@ const NormalForm = () => {
            )
          : (
              <div className="mx-auto w-full">
-                <h2 className="text-text-primary title-4xl-semi-bold">{systemFeatures.branding.enabled ? t('pageTitleForE', { ns: 'login' }) : t('pageTitle', { ns: 'login' })}</h2>
-                <p className="mt-2 text-text-tertiary body-md-regular">{t('welcome', { ns: 'login' })}</p>
+                <h2 className="title-4xl-semi-bold text-text-primary">{systemFeatures.branding.enabled ? t('pageTitleForE', { ns: 'login' }) : t('pageTitle', { ns: 'login' })}</h2>
+                <p className="body-md-regular mt-2 text-text-tertiary">{t('welcome', { ns: 'login' })}</p>
              </div>
            )}
        <div className="relative">
@@ -177,7 +177,7 @@ const NormalForm = () => {
            <div className="relative mt-6">
              <div className="flex items-center">
                <div className="h-px flex-1 bg-gradient-to-r from-background-gradient-mask-transparent to-divider-regular"></div>
-                <span className="px-3 text-text-tertiary system-xs-medium-uppercase">{t('or', { ns: 'login' })}</span>
+                <span className="system-xs-medium-uppercase px-3 text-text-tertiary">{t('or', { ns: 'login' })}</span>
                <div className="h-px flex-1 bg-gradient-to-l from-background-gradient-mask-transparent to-divider-regular"></div>
              </div>
            </div>
@@ -190,7 +190,7 @@ const NormalForm = () => {
                    <MailAndCodeAuth isInvite={isInviteLink} />
                    {systemFeatures.enable_email_password_login && (
                      <div className="cursor-pointer py-1 text-center" onClick={() => { updateAuthType('password') }}>
-                        <span className="text-components-button-secondary-accent-text system-xs-medium">{t('usePassword', { ns: 'login' })}</span>
+                        <span className="system-xs-medium text-components-button-secondary-accent-text">{t('usePassword', { ns: 'login' })}</span>
                      </div>
                    )}
                  </>
@@ -200,7 +200,7 @@ const NormalForm = () => {
                    <MailAndPasswordAuth isInvite={isInviteLink} isEmailSetup={systemFeatures.is_email_setup} allowRegistration={systemFeatures.is_allow_register} />
                    {systemFeatures.enable_email_code_login && (
                      <div className="cursor-pointer py-1 text-center" onClick={() => { updateAuthType('code') }}>
-                        <span className="text-components-button-secondary-accent-text system-xs-medium">{t('useVerificationCode', { ns: 'login' })}</span>
+                        <span className="system-xs-medium text-components-button-secondary-accent-text">{t('useVerificationCode', { ns: 'login' })}</span>
                      </div>
                    )}
                  </>
@@ -227,8 +227,8 @@ const NormalForm = () => {
                <div className="shadows-shadow-lg mb-2 flex h-10 w-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
                  <RiDoorLockLine className="h-5 w-5" />
                </div>
-                <p className="text-text-primary system-sm-medium">{t('noLoginMethod', { ns: 'login' })}</p>
-                <p className="mt-1 text-text-tertiary system-xs-regular">{t('noLoginMethodTip', { ns: 'login' })}</p>
+                <p className="system-sm-medium text-text-primary">{t('noLoginMethod', { ns: 'login' })}</p>
+                <p className="system-xs-regular mt-1 text-text-tertiary">{t('noLoginMethodTip', { ns: 'login' })}</p>
              </div>
              <div className="relative my-2 py-2">
                <div className="absolute inset-0 flex items-center" aria-hidden="true">
@@ -239,11 +239,11 @@ const NormalForm = () => {
          )}
          {!systemFeatures.branding.enabled && (
            <>
-              <div className="mt-2 block w-full text-text-tertiary system-xs-regular">
+              <div className="system-xs-regular mt-2 block w-full text-text-tertiary">
                {t('tosDesc', { ns: 'login' })}
              &nbsp;
                <Link
-                  className="text-text-secondary system-xs-medium hover:underline"
+                  className="system-xs-medium text-text-secondary hover:underline"
                  target="_blank"
                  rel="noopener noreferrer"
                  href="https://dify.ai/terms"
@@ -252,7 +252,7 @@ const NormalForm = () => {
                </Link>
              &nbsp;&&nbsp;
                <Link
-                  className="text-text-secondary system-xs-medium hover:underline"
+                  className="system-xs-medium text-text-secondary hover:underline"
                  target="_blank"
                  rel="noopener noreferrer"
                  href="https://dify.ai/privacy"
@@ -261,11 +261,11 @@ const NormalForm = () => {
                </Link>
              </div>
              {IS_CE_EDITION && (
-                <div className="w-hull mt-2 block text-text-tertiary system-xs-regular">
+                <div className="w-hull system-xs-regular mt-2 block text-text-tertiary">
                  {t('goToInit', { ns: 'login' })}
              &nbsp;
                  <Link
-                    className="text-text-secondary system-xs-medium hover:underline"
+                    className="system-xs-medium text-text-secondary hover:underline"
                    href="/install"
                  >
                    {t('setAdminAccount', { ns: 'login' })}
--- a/web/app/signin/utils/post-login-redirect.ts
+++ b/web/app/signin/utils/post-login-redirect.ts
@@ -1,15 +1,37 @@
-let postLoginRedirect: string | null = null
+import type { ReadonlyURLSearchParams } from 'next/navigation'
+import dayjs from 'dayjs'
+import { OAUTH_AUTHORIZE_PENDING_KEY, REDIRECT_URL_KEY } from '@/app/account/oauth/authorize/constants'

-export const setPostLoginRedirect = (value: string | null) => {
-  postLoginRedirect = value
+function getItemWithExpiry(key: string): string | null {
+  const itemStr = localStorage.getItem(key)
+  if (!itemStr)
+    return null
+
+  try {
+    const item = JSON.parse(itemStr)
+    localStorage.removeItem(key)
+    if (!item?.value)
+      return null
+
+    return dayjs().unix() > item.expiry ? null : item.value
+  }
+  catch {
+    return null
+  }
 }

-export const resolvePostLoginRedirect = () => {
-  if (postLoginRedirect) {
-    const redirectUrl = postLoginRedirect
-    postLoginRedirect = null
-    return redirectUrl
+export const resolvePostLoginRedirect = (searchParams: ReadonlyURLSearchParams) => {
+  const redirectUrl = searchParams.get(REDIRECT_URL_KEY)
+  if (redirectUrl) {
+    try {
+      localStorage.removeItem(OAUTH_AUTHORIZE_PENDING_KEY)
+      return decodeURIComponent(redirectUrl)
+    }
+    catch (e) {
+      console.error('Failed to decode redirect URL:', e)
+      return redirectUrl
+    }
  }

-  return null
+  return getItemWithExpiry(OAUTH_AUTHORIZE_PENDING_KEY)
 }
--- a/web/app/sw.ts
+++ b/web/app/sw.ts
@@ -0,0 +1,59 @@
+/// <reference no-default-lib="true" />
+/// <reference lib="esnext" />
+/// <reference lib="webworker" />
+
+import type { PrecacheEntry, SerwistGlobalConfig } from 'serwist'
+import { defaultCache } from '@serwist/turbopack/worker'
+import { Serwist } from 'serwist'
+import { withLeadingSlash } from 'ufo'
+
+declare global {
+  // eslint-disable-next-line ts/consistent-type-definitions
+  interface WorkerGlobalScope extends SerwistGlobalConfig {
+    __SW_MANIFEST: (PrecacheEntry | string)[] | undefined
+  }
+}
+
+declare const self: ServiceWorkerGlobalScope
+
+const scopePathname = new URL(self.registration.scope).pathname
+const basePath = scopePathname.replace(/\/serwist\/$/, '').replace(/\/$/, '')
+const offlineUrl = `${basePath}/_offline.html`
+
+const normalizeManifestUrl = (url: string): string => {
+  if (url.startsWith('/serwist/'))
+    return url.replace(/^\/serwist\//, '/')
+
+  return withLeadingSlash(url)
+}
+
+const manifest = self.__SW_MANIFEST?.map((entry) => {
+  if (typeof entry === 'string')
+    return normalizeManifestUrl(entry)
+
+  return {
+    ...entry,
+    url: normalizeManifestUrl(entry.url),
+  }
+})
+
+const serwist = new Serwist({
+  precacheEntries: manifest,
+  skipWaiting: true,
+  disableDevLogs: true,
+  clientsClaim: true,
+  navigationPreload: true,
+  runtimeCaching: defaultCache,
+  fallbacks: {
+    entries: [
+      {
+        url: offlineUrl,
+        matcher({ request }) {
+          return request.destination === 'document'
+        },
+      },
+    ],
+  },
+})
+
+serwist.addEventListeners()
--- a/web/docker/entrypoint.sh
+++ b/web/docker/entrypoint.sh
@@ -43,4 +43,4 @@ export NEXT_PUBLIC_MAX_PARALLEL_LIMIT=${MAX_PARALLEL_LIMIT}
 export NEXT_PUBLIC_MAX_ITERATIONS_NUM=${MAX_ITERATIONS_NUM}
 export NEXT_PUBLIC_MAX_TREE_DEPTH=${MAX_TREE_DEPTH}

-node --heapsnapshot-signal=SIGUSR2 /app/web/server.js
+pm2 start /app/web/server.js --name dify-web --cwd /app/web -i ${PM2_INSTANCES} --no-daemon
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json
@@ -278,6 +278,9 @@
    }
  },
  "app/account/oauth/authorize/page.tsx": {
+    "tailwindcss/enforce-consistent-class-order": {
+      "count": 4
+    },
    "ts/no-explicit-any": {
      "count": 1
    }
@@ -8590,16 +8593,29 @@
      "count": 6
    }
  },
+  "app/signin/check-code/page.tsx": {
+    "tailwindcss/enforce-consistent-class-order": {
+      "count": 4
+    }
+  },
  "app/signin/components/mail-and-code-auth.tsx": {
    "tailwindcss/enforce-consistent-class-order": {
      "count": 1
    }
  },
  "app/signin/components/mail-and-password-auth.tsx": {
+    "tailwindcss/enforce-consistent-class-order": {
+      "count": 2
+    },
    "ts/no-explicit-any": {
      "count": 1
    }
  },
+  "app/signin/invite-settings/page.tsx": {
+    "tailwindcss/enforce-consistent-class-order": {
+      "count": 7
+    }
+  },
  "app/signin/layout.tsx": {
    "tailwindcss/enforce-consistent-class-order": {
      "count": 1
@@ -8608,6 +8624,11 @@
      "count": 1
    }
  },
+  "app/signin/normal-form.tsx": {
+    "tailwindcss/enforce-consistent-class-order": {
+      "count": 20
+    }
+  },
  "app/signin/one-more-step.tsx": {
    "tailwindcss/enforce-consistent-class-order": {
      "count": 7
--- a/web/next.config.ts
+++ b/web/next.config.ts
@@ -25,6 +25,7 @@ const remoteImageURLs = ([hasSetWebPrefix ? new URL(`${env.NEXT_PUBLIC_WEB_PREFI

 const nextConfig: NextConfig = {
  basePath: env.NEXT_PUBLIC_BASE_PATH,
+  serverExternalPackages: ['esbuild'],
  transpilePackages: ['@t3-oss/env-core', '@t3-oss/env-nextjs', 'echarts', 'zrender'],
  turbopack: {
    rules: codeInspectorPlugin({
--- a/web/package.json
+++ b/web/package.json
@@ -1,7 +1,7 @@
 {
  "name": "dify-web",
  "type": "module",
-  "version": "1.13.0",
+  "version": "1.12.1",
  "private": true,
  "packageManager": "pnpm@10.27.0+sha512.72d699da16b1179c14ba9e64dc71c9a40988cbdc65c264cb0e489db7de917f20dcf4d64d8723625f2969ba52d4b7e2a1170682d9ac2a5dcaeaab732b7e16f04a",
  "imports": {
@@ -176,6 +176,7 @@
    "@next/eslint-plugin-next": "16.1.6",
    "@next/mdx": "16.1.5",
    "@rgrove/parse-xml": "4.2.0",
+    "@serwist/turbopack": "9.5.4",
    "@storybook/addon-docs": "10.2.0",
    "@storybook/addon-links": "10.2.0",
    "@storybook/addon-onboarding": "10.2.0",
@@ -214,6 +215,7 @@
    "autoprefixer": "10.4.21",
    "code-inspector-plugin": "1.3.6",
    "cross-env": "10.1.0",
+    "esbuild": "0.27.2",
    "eslint": "9.39.2",
    "eslint-plugin-better-tailwindcss": "https://pkg.pr.new/hyoban/eslint-plugin-better-tailwindcss@c0161c7",
    "eslint-plugin-hyoban": "0.11.1",
@@ -232,6 +234,7 @@
    "postcss-js": "5.0.3",
    "react-scan": "0.4.3",
    "sass": "1.93.2",
+    "serwist": "9.5.4",
    "storybook": "10.2.0",
    "tailwindcss": "3.4.19",
    "tsx": "4.21.0",
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -402,6 +402,9 @@ importers:
      '@rgrove/parse-xml':
        specifier: 4.2.0
        version: 4.2.0
+      '@serwist/turbopack':
+        specifier: 9.5.4
+        version: 9.5.4(@swc/helpers@0.5.18)(esbuild-wasm@0.27.2)(esbuild@0.27.2)(next@16.1.5(@babel/core@7.28.6)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(react@19.2.4)(typescript@5.9.3)
      '@storybook/addon-docs':
        specifier: 10.2.0
        version: 10.2.0(@types/react@19.2.9)(esbuild@0.27.2)(rollup@4.56.0)(storybook@10.2.0(@testing-library/dom@10.4.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@7.3.1(@types/node@24.10.12)(jiti@1.21.7)(sass@1.93.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(webpack@5.104.1(esbuild@0.27.2)(uglify-js@3.19.3))
@@ -516,6 +519,9 @@ importers:
      cross-env:
        specifier: 10.1.0
        version: 10.1.0
+      esbuild:
+        specifier: 0.27.2
+        version: 0.27.2
      eslint:
        specifier: 9.39.2
        version: 9.39.2(jiti@1.21.7)
@@ -570,6 +576,9 @@ importers:
      sass:
        specifier: 1.93.2
        version: 1.93.2
+      serwist:
+        specifier: 9.5.4
+        version: 9.5.4(browserslist@4.28.1)(typescript@5.9.3)
      storybook:
        specifier: 10.2.0
        version: 10.2.0(@testing-library/dom@10.4.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
@@ -933,6 +942,10 @@ packages:
    resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
    engines: {node: '>=18'}

+  '@discoveryjs/json-ext@0.5.7':
+    resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==}
+    engines: {node: '>=10.0.0'}
+
  '@egoist/tailwindcss-icons@1.9.2':
    resolution: {integrity: sha512-I6XsSykmhu2cASg5Hp/ICLsJ/K/1aXPaSKjgbWaNp2xYnb4We/arWMmkhhV+9CglOFCUbqx0A3mM2kWV32ZIhw==}
    peerDependencies:
@@ -2105,6 +2118,10 @@ packages:
      react: '>=18'
      react-dom: '>=18'

+  '@pkgjs/parseargs@0.11.0':
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
+
  '@pkgr/core@0.2.9':
    resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==}
    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
@@ -2571,6 +2588,48 @@ packages:
    peerDependencies:
      react: ^16.14.0 || 17.x || 18.x || 19.x

+  '@serwist/build@9.5.4':
+    resolution: {integrity: sha512-FTiNsNb3luKsLIxjKCvkPiqFZSbx7yVNOFGSUhp4lyfzgnelT1M3/lMC88kLiak90emkuFjSkQgwa6OnyhMZlQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      typescript: '>=5.0.0'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@serwist/turbopack@9.5.4':
+    resolution: {integrity: sha512-HerOIc2z3LWbFVq/gXK44I99KdF+x0uBI7cPHb+Q3q0WpF50d/i5fV5pZZXCf3LCqtc9oH0VlY6FWDcjWjHI8g==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      esbuild: 0.27.2
+      esbuild-wasm: '>=0.25.0 <1.0.0'
+      next: '>=14.0.0'
+      react: '>=18.0.0'
+      typescript: '>=5.0.0'
+    peerDependenciesMeta:
+      esbuild:
+        optional: true
+      esbuild-wasm:
+        optional: true
+      typescript:
+        optional: true
+
+  '@serwist/utils@9.5.4':
+    resolution: {integrity: sha512-uyriGQF1qjNEHXXfsd8XJ5kfK3/MezEaUw//XdHjZeJ0LvLamrgnLJGQQoyJqUfEPCiJ4jJwc4uYMB9LjLiHxA==}
+    peerDependencies:
+      browserslist: '>=4'
+    peerDependenciesMeta:
+      browserslist:
+        optional: true
+
+  '@serwist/window@9.5.4':
+    resolution: {integrity: sha512-52t2G+TgiWDdRwGG0ArU28uy6/oQYICQfNLHs4ywybyS6mHy3BxHFl+JjB5vhg8znIG1LMpGvOmS5b7AuPVYDw==}
+    peerDependencies:
+      typescript: '>=5.0.0'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
  '@sindresorhus/base62@1.0.0':
    resolution: {integrity: sha512-TeheYy0ILzBEI/CO55CP6zJCSdSWeRtGnHy8U8dWSUH4I68iqTsy7HkMktR4xakThc9jotkPQUXT4ITdbV7cHA==}
    engines: {node: '>=18'}
@@ -2716,12 +2775,87 @@ packages:
  '@svgdotjs/svg.js@3.2.5':
    resolution: {integrity: sha512-/VNHWYhNu+BS7ktbYoVGrCmsXDh+chFMaONMwGNdIBcFHrWqk2jY8fNyr3DLdtQUIalvkPfM554ZSFa3dm3nxQ==}

+  '@swc/core-darwin-arm64@1.15.11':
+    resolution: {integrity: sha512-QoIupRWVH8AF1TgxYyeA5nS18dtqMuxNwchjBIwJo3RdwLEFiJq6onOx9JAxHtuPwUkIVuU2Xbp+jCJ7Vzmgtg==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@swc/core-darwin-x64@1.15.11':
+    resolution: {integrity: sha512-S52Gu1QtPSfBYDiejlcfp9GlN+NjTZBRRNsz8PNwBgSE626/FUf2PcllVUix7jqkoMC+t0rS8t+2/aSWlMuQtA==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@swc/core-linux-arm-gnueabihf@1.15.11':
+    resolution: {integrity: sha512-lXJs8oXo6Z4yCpimpQ8vPeCjkgoHu5NoMvmJZ8qxDyU99KVdg6KwU9H79vzrmB+HfH+dCZ7JGMqMF//f8Cfvdg==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@swc/core-linux-arm64-gnu@1.15.11':
+    resolution: {integrity: sha512-chRsz1K52/vj8Mfq/QOugVphlKPWlMh10V99qfH41hbGvwAU6xSPd681upO4bKiOr9+mRIZZW+EfJqY42ZzRyA==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@swc/core-linux-arm64-musl@1.15.11':
+    resolution: {integrity: sha512-PYftgsTaGnfDK4m6/dty9ryK1FbLk+LosDJ/RJR2nkXGc8rd+WenXIlvHjWULiBVnS1RsjHHOXmTS4nDhe0v0w==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@swc/core-linux-x64-gnu@1.15.11':
+    resolution: {integrity: sha512-DKtnJKIHiZdARyTKiX7zdRjiDS1KihkQWatQiCHMv+zc2sfwb4Glrodx2VLOX4rsa92NLR0Sw8WLcPEMFY1szQ==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@swc/core-linux-x64-musl@1.15.11':
+    resolution: {integrity: sha512-mUjjntHj4+8WBaiDe5UwRNHuEzLjIWBTSGTw0JT9+C9/Yyuh4KQqlcEQ3ro6GkHmBGXBFpGIj/o5VMyRWfVfWw==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@swc/core-win32-arm64-msvc@1.15.11':
+    resolution: {integrity: sha512-ZkNNG5zL49YpaFzfl6fskNOSxtcZ5uOYmWBkY4wVAvgbSAQzLRVBp+xArGWh2oXlY/WgL99zQSGTv7RI5E6nzA==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@swc/core-win32-ia32-msvc@1.15.11':
+    resolution: {integrity: sha512-6XnzORkZCQzvTQ6cPrU7iaT9+i145oLwnin8JrfsLG41wl26+5cNQ2XV3zcbrnFEV6esjOceom9YO1w9mGJByw==}
+    engines: {node: '>=10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@swc/core-win32-x64-msvc@1.15.11':
+    resolution: {integrity: sha512-IQ2n6af7XKLL6P1gIeZACskSxK8jWtoKpJWLZmdXTDj1MGzktUy4i+FvpdtxFmJWNavRWH1VmTr6kAubRDHeKw==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@swc/core@1.15.11':
+    resolution: {integrity: sha512-iLmLTodbYxU39HhMPaMUooPwO/zqJWvsqkrXv1ZI38rMb048p6N7qtAtTp37sw9NzSrvH6oli8EdDygo09IZ/w==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@swc/helpers': '>=0.5.17'
+    peerDependenciesMeta:
+      '@swc/helpers':
+        optional: true
+
+  '@swc/counter@0.1.3':
+    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
+
  '@swc/helpers@0.5.15':
    resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}

  '@swc/helpers@0.5.18':
    resolution: {integrity: sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==}

+  '@swc/types@0.1.25':
+    resolution: {integrity: sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==}
+
  '@t3-oss/env-core@0.13.10':
    resolution: {integrity: sha512-NNFfdlJ+HmPHkLi2HKy7nwuat9SIYOxei9K10lO2YlcSObDILY7mHZNSHsieIM3A0/5OOzw/P/b+yLvPdaG52g==}
    peerDependencies:
@@ -3937,6 +4071,10 @@ packages:
    resolution: {integrity: sha512-aRDkn3uyIlCFfk5NUA+VdwMmMsh8JGhc4hapfV4yxymHGQ3BVskMQfoXGpCo5IoBuQ9tS5iiVKhCpTcB4pW4qw==}
    engines: {node: '>= 12.0.0'}

+  common-tags@1.8.2:
+    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
+    engines: {node: '>=4.0.0'}
+
  compare-versions@6.1.1:
    resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}

@@ -4377,6 +4515,11 @@ packages:
  esast-util-from-js@2.0.1:
    resolution: {integrity: sha512-8Ja+rNJ0Lt56Pcf3TAmpBZjmx8ZcK5Ts4cAzIOjsjevg9oSXJnl6SUQ2EevU8tv3h6ZLWmoKL5H4fgWvdvfETw==}

+  esbuild-wasm@0.27.2:
+    resolution: {integrity: sha512-eUTnl8eh+v8UZIZh4MrMOKDAc8Lm7+NqP3pyuTORGFY1s/o9WoiJgKnwXy+te2J3hX7iRbFSHEyig7GsPeeJyw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
  esbuild@0.27.2:
    resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==}
    engines: {node: '>=18'}
@@ -4916,6 +5059,11 @@ packages:
  glob-to-regexp@0.4.1:
    resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}

+  glob@10.5.0:
+    resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==}
+    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+    hasBin: true
+
  glob@11.1.0:
    resolution: {integrity: sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==}
    engines: {node: 20 || >=22}
@@ -5257,6 +5405,9 @@ packages:
    resolution: {integrity: sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==}
    engines: {node: '>=8'}

+  jackspeak@3.4.3:
+    resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
+
  jackspeak@4.1.1:
    resolution: {integrity: sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==}
    engines: {node: 20 || >=22}
@@ -5475,6 +5626,9 @@ packages:
  lodash.merge@4.6.2:
    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}

+  lodash.sortby@4.7.0:
+    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
+
  lodash@4.17.23:
    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}

@@ -5495,6 +5649,9 @@ packages:
  lowlight@1.20.0:
    resolution: {integrity: sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==}

+  lru-cache@10.4.3:
+    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+
  lru-cache@11.2.5:
    resolution: {integrity: sha512-vFrFJkWtJvJnD5hg+hJvVE8Lh/TcMzKnTgCWmtBipwI5yLX/iX+5UB2tfuyODF5E7k9xEzMdYgGqaSb1c0c5Yw==}
    engines: {node: 20 || >=22}
@@ -6031,6 +6188,10 @@ packages:
  path-parse@1.0.7:
    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}

+  path-scurry@1.11.1:
+    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
+    engines: {node: '>=16 || 14 >=14.18'}
+
  path-scurry@2.0.1:
    resolution: {integrity: sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==}
    engines: {node: 20 || >=22}
@@ -6198,6 +6359,10 @@ packages:
    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
    engines: {node: '>= 0.8.0'}

+  pretty-bytes@6.1.1:
+    resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==}
+    engines: {node: ^14.13.1 || >=16.0.0}
+
  pretty-format@27.5.1:
    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -6644,6 +6809,14 @@ packages:
  server-only@0.0.1:
    resolution: {integrity: sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==}

+  serwist@9.5.4:
+    resolution: {integrity: sha512-uTHBzpIeA6rE3oyRt392MbtNQDs2JVZelKD1KkT18UkhX6HRwCeassoI1Nd1h52DqYqa7ZfBeldJ4awy+PYrnQ==}
+    peerDependencies:
+      typescript: '>=5.0.0'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
  sharp@0.33.5:
    resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -6719,6 +6892,11 @@ packages:
    resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
    engines: {node: '>= 12'}

+  source-map@0.8.0-beta.0:
+    resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
+    engines: {node: '>= 8'}
+    deprecated: The work that was done in this beta branch won't be included in future versions
+
  space-separated-tokens@1.1.5:
    resolution: {integrity: sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==}

@@ -6980,6 +7158,9 @@ packages:
    resolution: {integrity: sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==}
    engines: {node: '>=16'}

+  tr46@1.0.1:
+    resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
+
  tr46@6.0.0:
    resolution: {integrity: sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==}
    engines: {node: '>=20'}
@@ -7373,6 +7554,9 @@ packages:
  web-vitals@5.1.0:
    resolution: {integrity: sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==}

+  webidl-conversions@4.0.2:
+    resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
+
  webidl-conversions@8.0.1:
    resolution: {integrity: sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==}
    engines: {node: '>=20'}
@@ -7411,6 +7595,9 @@ packages:
    resolution: {integrity: sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==}
    engines: {node: '>=20'}

+  whatwg-url@7.1.0:
+    resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
+
  which@2.0.2:
    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
    engines: {node: '>= 8'}
@@ -8018,6 +8205,8 @@ snapshots:

  '@csstools/css-tokenizer@3.0.4': {}

+  '@discoveryjs/json-ext@0.5.7': {}
+
  '@egoist/tailwindcss-icons@1.9.2(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))':
    dependencies:
      '@iconify/utils': 3.1.0
@@ -9240,6 +9429,9 @@ snapshots:
      react: 19.2.4
      react-dom: 19.2.4(react@19.2.4)

+  '@pkgjs/parseargs@0.11.0':
+    optional: true
+
  '@pkgr/core@0.2.9': {}

  '@polka/url@1.0.0-next.29':
@@ -9671,6 +9863,52 @@ snapshots:
      hoist-non-react-statics: 3.3.2
      react: 19.2.4

+  '@serwist/build@9.5.4(browserslist@4.28.1)(typescript@5.9.3)':
+    dependencies:
+      '@serwist/utils': 9.5.4(browserslist@4.28.1)
+      common-tags: 1.8.2
+      glob: 10.5.0
+      pretty-bytes: 6.1.1
+      source-map: 0.8.0-beta.0
+      zod: 4.3.6
+    optionalDependencies:
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - browserslist
+
+  '@serwist/turbopack@9.5.4(@swc/helpers@0.5.18)(esbuild-wasm@0.27.2)(esbuild@0.27.2)(next@16.1.5(@babel/core@7.28.6)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(react@19.2.4)(typescript@5.9.3)':
+    dependencies:
+      '@serwist/build': 9.5.4(browserslist@4.28.1)(typescript@5.9.3)
+      '@serwist/utils': 9.5.4(browserslist@4.28.1)
+      '@serwist/window': 9.5.4(browserslist@4.28.1)(typescript@5.9.3)
+      '@swc/core': 1.15.11(@swc/helpers@0.5.18)
+      browserslist: 4.28.1
+      kolorist: 1.8.0
+      next: 16.1.5(@babel/core@7.28.6)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2)
+      react: 19.2.4
+      semver: 7.7.3
+      serwist: 9.5.4(browserslist@4.28.1)(typescript@5.9.3)
+      zod: 4.3.6
+    optionalDependencies:
+      esbuild: 0.27.2
+      esbuild-wasm: 0.27.2
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - '@swc/helpers'
+
+  '@serwist/utils@9.5.4(browserslist@4.28.1)':
+    optionalDependencies:
+      browserslist: 4.28.1
+
+  '@serwist/window@9.5.4(browserslist@4.28.1)(typescript@5.9.3)':
+    dependencies:
+      '@types/trusted-types': 2.0.7
+      serwist: 9.5.4(browserslist@4.28.1)(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - browserslist
+
  '@sindresorhus/base62@1.0.0': {}

  '@solid-primitives/event-listener@2.4.3(solid-js@1.9.11)':
@@ -9851,6 +10089,55 @@ snapshots:

  '@svgdotjs/svg.js@3.2.5': {}

+  '@swc/core-darwin-arm64@1.15.11':
+    optional: true
+
+  '@swc/core-darwin-x64@1.15.11':
+    optional: true
+
+  '@swc/core-linux-arm-gnueabihf@1.15.11':
+    optional: true
+
+  '@swc/core-linux-arm64-gnu@1.15.11':
+    optional: true
+
+  '@swc/core-linux-arm64-musl@1.15.11':
+    optional: true
+
+  '@swc/core-linux-x64-gnu@1.15.11':
+    optional: true
+
+  '@swc/core-linux-x64-musl@1.15.11':
+    optional: true
+
+  '@swc/core-win32-arm64-msvc@1.15.11':
+    optional: true
+
+  '@swc/core-win32-ia32-msvc@1.15.11':
+    optional: true
+
+  '@swc/core-win32-x64-msvc@1.15.11':
+    optional: true
+
+  '@swc/core@1.15.11(@swc/helpers@0.5.18)':
+    dependencies:
+      '@swc/counter': 0.1.3
+      '@swc/types': 0.1.25
+    optionalDependencies:
+      '@swc/core-darwin-arm64': 1.15.11
+      '@swc/core-darwin-x64': 1.15.11
+      '@swc/core-linux-arm-gnueabihf': 1.15.11
+      '@swc/core-linux-arm64-gnu': 1.15.11
+      '@swc/core-linux-arm64-musl': 1.15.11
+      '@swc/core-linux-x64-gnu': 1.15.11
+      '@swc/core-linux-x64-musl': 1.15.11
+      '@swc/core-win32-arm64-msvc': 1.15.11
+      '@swc/core-win32-ia32-msvc': 1.15.11
+      '@swc/core-win32-x64-msvc': 1.15.11
+      '@swc/helpers': 0.5.18
+
+  '@swc/counter@0.1.3': {}
+
  '@swc/helpers@0.5.15':
    dependencies:
      tslib: 2.8.1
@@ -9859,6 +10146,10 @@ snapshots:
    dependencies:
      tslib: 2.8.1

+  '@swc/types@0.1.25':
+    dependencies:
+      '@swc/counter': 0.1.3
+
  '@t3-oss/env-core@0.13.10(typescript@5.9.3)(valibot@1.2.0(typescript@5.9.3))(zod@4.3.6)':
    optionalDependencies:
      typescript: 5.9.3
@@ -10364,8 +10655,7 @@ snapshots:

  '@types/sortablejs@1.15.8': {}

-  '@types/trusted-types@2.0.7':
-    optional: true
+  '@types/trusted-types@2.0.7': {}

  '@types/unist@2.0.11': {}

@@ -11278,6 +11568,8 @@ snapshots:

  comment-parser@1.4.5: {}

+  common-tags@1.8.2: {}
+
  compare-versions@6.1.1: {}

  confbox@0.1.8: {}
@@ -11728,6 +12020,9 @@ snapshots:
      esast-util-from-estree: 2.0.0
      vfile-message: 4.0.3

+  esbuild-wasm@0.27.2:
+    optional: true
+
  esbuild@0.27.2:
    optionalDependencies:
      '@esbuild/aix-ppc64': 0.27.2
@@ -12476,6 +12771,15 @@ snapshots:
  glob-to-regexp@0.4.1:
    optional: true

+  glob@10.5.0:
+    dependencies:
+      foreground-child: 3.3.1
+      jackspeak: 3.4.3
+      minimatch: 9.0.5
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.1
+      path-scurry: 1.11.1
+
  glob@11.1.0:
    dependencies:
      foreground-child: 3.3.1
@@ -12860,6 +13164,12 @@ snapshots:
      html-escaper: 2.0.2
      istanbul-lib-report: 3.0.1

+  jackspeak@3.4.3:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+
  jackspeak@4.1.1:
    dependencies:
      '@isaacs/cliui': 8.0.2
@@ -13085,6 +13395,8 @@ snapshots:

  lodash.merge@4.6.2: {}

+  lodash.sortby@4.7.0: {}
+
  lodash@4.17.23: {}

  log-update@6.1.0:
@@ -13108,6 +13420,8 @@ snapshots:
      fault: 1.0.4
      highlight.js: 10.7.3

+  lru-cache@10.4.3: {}
+
  lru-cache@11.2.5: {}

  lru-cache@5.1.1:
@@ -13947,6 +14261,11 @@ snapshots:

  path-parse@1.0.7: {}

+  path-scurry@1.11.1:
+    dependencies:
+      lru-cache: 10.4.3
+      minipass: 7.1.2
+
  path-scurry@2.0.1:
    dependencies:
      lru-cache: 11.2.5
@@ -14107,6 +14426,8 @@ snapshots:

  prelude-ls@1.2.1: {}

+  pretty-bytes@6.1.1: {}
+
  pretty-format@27.5.1:
    dependencies:
      ansi-regex: 5.0.1
@@ -14682,6 +15003,15 @@ snapshots:

  server-only@0.0.1: {}

+  serwist@9.5.4(browserslist@4.28.1)(typescript@5.9.3):
+    dependencies:
+      '@serwist/utils': 9.5.4(browserslist@4.28.1)
+      idb: 8.0.3
+    optionalDependencies:
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - browserslist
+
  sharp@0.33.5:
    dependencies:
      color: 4.2.3
@@ -14807,6 +15137,10 @@ snapshots:

  source-map@0.7.6: {}

+  source-map@0.8.0-beta.0:
+    dependencies:
+      whatwg-url: 7.1.0
+
  space-separated-tokens@1.1.5: {}

  space-separated-tokens@2.0.2: {}
@@ -15087,6 +15421,10 @@ snapshots:
    dependencies:
      tldts: 7.0.17

+  tr46@1.0.1:
+    dependencies:
+      punycode: 2.3.1
+
  tr46@6.0.0:
    dependencies:
      punycode: 2.3.1
@@ -15459,6 +15797,8 @@ snapshots:

  web-vitals@5.1.0: {}

+  webidl-conversions@4.0.2: {}
+
  webidl-conversions@8.0.1: {}

  webpack-sources@3.3.3:
@@ -15512,6 +15852,12 @@ snapshots:
      tr46: 6.0.0
      webidl-conversions: 8.0.1

+  whatwg-url@7.1.0:
+    dependencies:
+      lodash.sortby: 4.7.0
+      tr46: 1.0.1
+      webidl-conversions: 4.0.2
+
  which@2.0.2:
    dependencies:
      isexe: 2.0.0
--- a/web/public/_offline.html
+++ b/web/public/_offline.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Dify - Offline</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+        
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            min-height: 100vh;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            color: white;
+            text-align: center;
+            padding: 20px;
+        }
+        
+        .container {
+            max-width: 600px;
+            background: rgba(255, 255, 255, 0.1);
+            backdrop-filter: blur(10px);
+            border-radius: 20px;
+            padding: 40px;
+            box-shadow: 0 25px 50px rgba(0, 0, 0, 0.2);
+        }
+        
+        .icon {
+            width: 100px;
+            height: 100px;
+            margin: 0 auto 30px;
+            background: rgba(255, 255, 255, 0.2);
+            border-radius: 20px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 48px;
+        }
+        
+        h1 {
+            font-size: 32px;
+            font-weight: 600;
+            margin-bottom: 15px;
+        }
+        
+        p {
+            font-size: 18px;
+            line-height: 1.6;
+            opacity: 0.9;
+            margin-bottom: 30px;
+        }
+        
+        button {
+            background: white;
+            color: #764ba2;
+            border: none;
+            padding: 15px 30px;
+            font-size: 16px;
+            font-weight: 600;
+            border-radius: 50px;
+            cursor: pointer;
+            transition: transform 0.2s, box-shadow 0.2s;
+        }
+        
+        button:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 10px 25px rgba(0, 0, 0, 0.2);
+        }
+        
+        button:active {
+            transform: translateY(0);
+        }
+        
+        @media (max-width: 640px) {
+            .container {
+                padding: 30px;
+            }
+            
+            h1 {
+                font-size: 24px;
+            }
+            
+            p {
+                font-size: 16px;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="icon">
+            ⚡
+        </div>
+        <h1>You're Offline</h1>
+        <p>
+            It looks like you've lost your internet connection. 
+            Some features may not be available until you're back online.
+        </p>
+        <button onclick="window.location.reload()">
+            Try Again
+        </button>
+    </div>
+    
+    <script>
+        // Check for connection status changes
+        window.addEventListener('online', function() {
+            window.location.reload();
+        });
+        
+        // Periodically check if online
+        setInterval(function() {
+            fetch(window.location.origin, { method: 'HEAD' })
+                .then(function() {
+                    window.location.reload();
+                })
+                .catch(function() {
+                    // Still offline
+                });
+        }, 5000);
+    </script>
+</body>
+</html>
Author	SHA1	Message	Date
Stephen Zhou	97af41b2f5	fix test	2026-02-11 14:41:19 +08:00
Stephen Zhou	9e4ffe5467	chore: fix lint	2026-02-11 14:37:23 +08:00