Merge branch 'main' into feat/storage-path-prefix

Add STORAGE_PATH_PREFIX config field and apply prefix in Storage wrapper
for all operations (save, load, download, exists, delete, scan).
Scan strips prefix from results to prevent double-prefixing.
Aliyun OSS disables its own folder prefix when STORAGE_PATH_PREFIX is set.

README.md

@@ -76,10 +76,11 @@ The easiest way to start the Dify server is through [Docker Compose](docker/dock
 ```bash
 cd dify
 cd docker
-cp .env.example .env
-docker compose up -d
+./dify-compose up -d
 ```
 
+On Windows PowerShell, run `.\dify-compose.ps1 up -d` from the `docker` directory.
+
 After running, you can access the Dify dashboard in your browser at [http://localhost/install](http://localhost/install) and start the initialization process.
 
 #### Seeking help
@@ -137,7 +138,7 @@ Star Dify on GitHub and be instantly notified of new releases.
 
 ### Custom configurations
 
-If you need to customize the configuration, please refer to the comments in our [.env.example](docker/.env.example) file and update the corresponding values in your `.env` file. Additionally, you might need to make adjustments to the `docker-compose.yaml` file itself, such as changing image versions, port mappings, or volume mounts, based on your specific deployment environment and requirements. After making any changes, please re-run `docker compose up -d`. You can find the full list of available environment variables [here](https://docs.dify.ai/getting-started/install-self-hosted/environments).
+If you need to customize the configuration, add only the values you want to override to `docker/.env`. The default values live in [`docker/.env.default`](docker/.env.default), and the full reference remains in [`docker/.env.example`](docker/.env.example). After making any changes, re-run `./dify-compose up -d` or `.\dify-compose.ps1 up -d` from the `docker` directory. You can find the full list of available environment variables [here](https://docs.dify.ai/getting-started/install-self-hosted/environments).
 
 ### Metrics Monitoring with Grafana
 

api/.env.example

@@ -98,8 +98,6 @@ DB_DATABASE=dify
 
 SQLALCHEMY_POOL_PRE_PING=true
 SQLALCHEMY_POOL_TIMEOUT=30
-# Connection pool reset behavior on return
-SQLALCHEMY_POOL_RESET_ON_RETURN=rollback
 
 # Storage configuration
 # use for store upload files, private keys...
@@ -383,7 +381,7 @@ VIKINGDB_ACCESS_KEY=your-ak
 VIKINGDB_SECRET_KEY=your-sk
 VIKINGDB_REGION=cn-shanghai
 VIKINGDB_HOST=api-vikingdb.xxx.volces.com
-VIKINGDB_SCHEME=http
+VIKINGDB_SCHEMA=http
 VIKINGDB_CONNECTION_TIMEOUT=30
 VIKINGDB_SOCKET_TIMEOUT=30
 
@@ -434,6 +432,8 @@ UPLOAD_FILE_EXTENSION_BLACKLIST=
 
 # Model configuration
 MULTIMODAL_SEND_FORMAT=base64
+PROMPT_GENERATION_MAX_TOKENS=512
+CODE_GENERATION_MAX_TOKENS=1024
 PLUGIN_BASED_TOKEN_COUNTING_ENABLED=false
 
 # Mail configuration, support: resend, smtp, sendgrid

api/configs/middleware/__init__.py

@@ -74,6 +74,11 @@ class StorageConfig(BaseSettings):
         default="opendal",
     )
 
+    STORAGE_PATH_PREFIX: str = Field(
+        description="Global path prefix prepended to all storage object keys.",
+        default="",
+    )
+
     STORAGE_LOCAL_PATH: str = Field(
         description="Path for local storage when STORAGE_TYPE is set to 'local'.",
         default="storage",
@@ -114,7 +119,7 @@ class SQLAlchemyEngineOptionsDict(TypedDict):
     pool_pre_ping: bool
     connect_args: dict[str, str]
     pool_use_lifo: bool
-    pool_reset_on_return: Literal["commit", "rollback", None]
+    pool_reset_on_return: None
     pool_timeout: int
 
 
@@ -223,11 +228,6 @@ class DatabaseConfig(BaseSettings):
         default=30,
     )
 
-    SQLALCHEMY_POOL_RESET_ON_RETURN: Literal["commit", "rollback", None] = Field(
-        description="Connection pool reset behavior on return. Options: 'commit', 'rollback', or None",
-        default="rollback",
-    )
-
     RETRIEVAL_SERVICE_EXECUTORS: NonNegativeInt = Field(
         description="Number of processes for the retrieval service, default to CPU cores.",
         default=os.cpu_count() or 1,
@@ -257,7 +257,7 @@ class DatabaseConfig(BaseSettings):
             "pool_pre_ping": self.SQLALCHEMY_POOL_PRE_PING,
             "connect_args": connect_args,
             "pool_use_lifo": self.SQLALCHEMY_POOL_USE_LIFO,
-            "pool_reset_on_return": self.SQLALCHEMY_POOL_RESET_ON_RETURN,
+            "pool_reset_on_return": None,
             "pool_timeout": self.SQLALCHEMY_POOL_TIMEOUT,
         }
         return result

api/constants/recommended_apps.json

@@ -19,7 +19,7 @@
                         "name": "Website Generator"
                     },
                     "app_id": "b53545b1-79ea-4da3-b31a-c39391c6f041",
-                    "categories": ["Programming"],
+                    "category": "Programming",
                     "copyright": null,
                     "description": null,
                     "is_listed": true,
@@ -35,7 +35,7 @@
                         "name": "Investment Analysis Report Copilot"
                     },
                     "app_id": "a23b57fa-85da-49c0-a571-3aff375976c1",
-                    "categories": ["Agent"],
+                    "category": "Agent",
                     "copyright": "Dify.AI",
                     "description": "Welcome to your personalized Investment Analysis Copilot service, where we delve into the depths of stock analysis to provide you with comprehensive insights. \n",
                     "is_listed": true,
@@ -51,7 +51,7 @@
                         "name": "Workflow Planning Assistant "
                     },
                     "app_id": "f3303a7d-a81c-404e-b401-1f8711c998c1",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "An assistant that helps you plan and select the right node for a workflow (V0.6.0).  ",
                     "is_listed": true,
@@ -67,7 +67,7 @@
                         "name": "Automated Email Reply  "
                     },
                     "app_id": "e9d92058-7d20-4904-892f-75d90bef7587",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "Reply emails using Gmail API. It will automatically retrieve email in your inbox and create a response in Gmail. \nConfigure your Gmail API in Google Cloud Console. ",
                     "is_listed": true,
@@ -83,7 +83,7 @@
                         "name": "Book Translation "
                     },
                     "app_id": "98b87f88-bd22-4d86-8b74-86beba5e0ed4",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "A workflow designed to translate a full book up to 15000 tokens per run. Uses Code node to separate text into chunks and Iteration to translate each chunk. ",
                     "is_listed": true,
@@ -99,7 +99,7 @@
                         "name": "Python bug fixer"
                     },
                     "app_id": "cae337e6-aec5-4c7b-beca-d6f1a808bd5e",
-                    "categories": ["Programming"],
+                    "category": "Programming",
                     "copyright": null,
                     "description": null,
                     "is_listed": true,
@@ -115,7 +115,7 @@
                         "name": "Code Interpreter"
                     },
                     "app_id": "d077d587-b072-4f2c-b631-69ed1e7cdc0f",
-                    "categories": ["Programming"],
+                    "category": "Programming",
                     "copyright": "Copyright 2023 Dify",
                     "description": "Code interpreter, clarifying the syntax and semantics of the code.",
                     "is_listed": true,
@@ -131,7 +131,7 @@
                         "name": "SVG Logo Design "
                     },
                     "app_id": "73fbb5f1-c15d-4d74-9cc8-46d9db9b2cca",
-                    "categories": ["Agent"],
+                    "category": "Agent",
                     "copyright": "Dify.AI",
                     "description": "Hello, I am your creative partner in bringing ideas to vivid life! I can assist you in creating stunning designs by leveraging abilities of DALL·E 3.  ",
                     "is_listed": true,
@@ -147,7 +147,7 @@
                         "name": "Long Story Generator (Iteration) "
                     },
                     "app_id": "5efb98d7-176b-419c-b6ef-50767391ab62",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "A workflow demonstrating how to use Iteration node to generate long article that is longer than the context length of LLMs. ",
                     "is_listed": true,
@@ -163,7 +163,7 @@
                         "name": "Text Summarization Workflow"
                     },
                     "app_id": "f00c4531-6551-45ee-808f-1d7903099515",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "Based on users' choice, retrieve external knowledge to more accurately summarize articles.",
                     "is_listed": true,
@@ -179,7 +179,7 @@
                         "name": "YouTube Channel Data Analysis"
                     },
                     "app_id": "be591209-2ca8-410f-8f3b-ca0e530dd638",
-                    "categories": ["Agent"],
+                    "category": "Agent",
                     "copyright": "Dify.AI",
                     "description": "I am a YouTube Channel Data Analysis Copilot, I am here to provide expert data analysis tailored to your needs. ",
                     "is_listed": true,
@@ -195,7 +195,7 @@
                         "name": "Article Grading Bot"
                     },
                     "app_id": "a747f7b4-c48b-40d6-b313-5e628232c05f",
-                    "categories": ["Writing"],
+                    "category": "Writing",
                     "copyright": null,
                     "description": "Assess the quality of articles and text based on user defined criteria. ",
                     "is_listed": true,
@@ -211,7 +211,7 @@
                         "name": "SEO Blog Generator"
                     },
                     "app_id": "18f3bd03-524d-4d7a-8374-b30dbe7c69d5",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "Workflow for retrieving information from the internet, followed by segmented generation of SEO blogs.",
                     "is_listed": true,
@@ -227,7 +227,7 @@
                         "name": "SQL Creator"
                     },
                     "app_id": "050ef42e-3e0c-40c1-a6b6-a64f2c49d744",
-                    "categories": ["Programming"],
+                    "category": "Programming",
                     "copyright": "Copyright 2023 Dify",
                     "description": "Write SQL from natural language by pasting in your schema with the request.Please describe your query requirements in natural language and select the target database type.",
                     "is_listed": true,
@@ -243,7 +243,7 @@
                         "name": "Sentiment Analysis "
                     },
                     "app_id": "f06bf86b-d50c-4895-a942-35112dbe4189",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "Batch sentiment analysis of text, followed by JSON output of sentiment classification along with scores.",
                     "is_listed": true,
@@ -259,7 +259,7 @@
                         "name": "Strategic Consulting Expert"
                     },
                     "app_id": "7e8ca1ae-02f2-4b5f-979e-62d19133bee2",
-                    "categories": ["Assistant"],
+                    "category": "Assistant",
                     "copyright": "Copyright 2023 Dify",
                     "description": "I can answer your questions related to strategic marketing.",
                     "is_listed": true,
@@ -275,7 +275,7 @@
                         "name": "Code Converter"
                     },
                     "app_id": "4006c4b2-0735-4f37-8dbb-fb1a8c5bd87a",
-                    "categories": ["Programming"],
+                    "category": "Programming",
                     "copyright": "Copyright 2023 Dify",
                     "description": "This is an application that provides the ability to convert code snippets in multiple programming languages. You can input the code you wish to convert, select the target programming language, and get the desired output.",
                     "is_listed": true,
@@ -291,7 +291,7 @@
                         "name": "Question Classifier + Knowledge + Chatbot "
                     },
                     "app_id": "d9f6b733-e35d-4a40-9f38-ca7bbfa009f7",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "Basic Workflow Template, a chatbot capable of identifying intents alongside with a knowledge base.",
                     "is_listed": true,
@@ -307,7 +307,7 @@
                         "name": "AI Front-end interviewer"
                     },
                     "app_id": "127efead-8944-4e20-ba9d-12402eb345e0",
-                    "categories": ["HR"],
+                    "category": "HR",
                     "copyright": "Copyright 2023 Dify",
                     "description": "A simulated front-end interviewer that tests the skill level of front-end development through questioning.",
                     "is_listed": true,
@@ -323,7 +323,7 @@
                         "name": "Knowledge Retrieval + Chatbot "
                     },
                     "app_id": "e9870913-dd01-4710-9f06-15d4180ca1ce",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "Basic Workflow Template, A chatbot with a knowledge base. ",
                     "is_listed": true,
@@ -339,7 +339,7 @@
                         "name": "Email Assistant Workflow "
                     },
                     "app_id": "dd5b6353-ae9b-4bce-be6a-a681a12cf709",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "A multifunctional email assistant capable of summarizing, replying, composing, proofreading, and checking grammar.",
                     "is_listed": true,
@@ -355,7 +355,7 @@
                         "name": "Customer Review Analysis Workflow "
                     },
                     "app_id": "9c0cd31f-4b62-4005-adf5-e3888d08654a",
-                    "categories": ["Workflow"],
+                    "category": "Workflow",
                     "copyright": null,
                     "description": "Utilize LLM (Large Language Models) to classify customer reviews and forward them to the internal system.",
                     "is_listed": true,

api/controllers/console/explore/recommended_app.py

@@ -52,7 +52,7 @@ class RecommendedAppResponse(ResponseModel):
     copyright: str | None = None
     privacy_policy: str | None = None
     custom_disclaimer: str | None = None
-    categories: list[str] = Field(default_factory=list)
+    category: str | None = None
     position: int | None = None
     is_listed: bool | None = None
     can_trial: bool | None = None

api/controllers/console/workspace/tool_providers.py

@@ -876,10 +876,10 @@ class ToolBuiltinProviderSetDefaultApi(Resource):
     @login_required
     @account_initialization_required
     def post(self, provider):
-        _, current_tenant_id = current_account_with_tenant()
+        current_user, current_tenant_id = current_account_with_tenant()
         payload = BuiltinProviderDefaultCredentialPayload.model_validate(console_ns.payload or {})
         return BuiltinToolManageService.set_default_provider(
-            tenant_id=current_tenant_id, provider=provider, id=payload.id
+            tenant_id=current_tenant_id, user_id=current_user.id, provider=provider, id=payload.id
         )
 
 

api/core/app/apps/common/workflow_response_converter.py

@@ -842,24 +842,24 @@ class WorkflowResponseConverter:
             return []
 
         files: list[Mapping[str, Any]] = []
-        match value:
-            case FileSegment():
-                files.append(value.value.to_dict())
-            case ArrayFileSegment():
-                files.extend([i.to_dict() for i in value.value])
-            case File():
-                files.append(value.to_dict())
-            case list():
-                for item in value:
-                    file = cls._get_file_var_from_value(item)
-                    if file:
-                        files.append(file)
-            case dict():
-                file = cls._get_file_var_from_value(value)
+        if isinstance(value, FileSegment):
+            files.append(value.value.to_dict())
+        elif isinstance(value, ArrayFileSegment):
+            files.extend([i.to_dict() for i in value.value])
+        elif isinstance(value, File):
+            files.append(value.to_dict())
+        elif isinstance(value, list):
+            for item in value:
+                file = cls._get_file_var_from_value(item)
                 if file:
                     files.append(file)
-            case _:
-                pass
+        elif isinstance(
+            value,
+            dict,
+        ):
+            file = cls._get_file_var_from_value(value)
+            if file:
+                files.append(file)
 
         return files
 

api/core/prompt/utils/prompt_message_util.py

@@ -53,27 +53,24 @@ class PromptMessageUtil:
                 files = []
                 if isinstance(prompt_message.content, list):
                     for content in prompt_message.content:
-                        match content:
-                            case TextPromptMessageContent():
-                                text += content.data
-                            case ImagePromptMessageContent():
-                                files.append(
-                                    {
-                                        "type": "image",
-                                        "data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
-                                        "detail": content.detail.value,
-                                    }
-                                )
-                            case AudioPromptMessageContent():
-                                files.append(
-                                    {
-                                        "type": "audio",
-                                        "data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
-                                        "format": content.format,
-                                    }
-                                )
-                            case _:
-                                continue
+                        if isinstance(content, TextPromptMessageContent):
+                            text += content.data
+                        elif isinstance(content, ImagePromptMessageContent):
+                            files.append(
+                                {
+                                    "type": "image",
+                                    "data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
+                                    "detail": content.detail.value,
+                                }
+                            )
+                        elif isinstance(content, AudioPromptMessageContent):
+                            files.append(
+                                {
+                                    "type": "audio",
+                                    "data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
+                                    "format": content.format,
+                                }
+                            )
                 else:
                     text = cast(str, prompt_message.content)
 

api/core/tools/utils/message_transformer.py

@@ -23,37 +23,36 @@ _TOOL_FILE_URL_PATTERN = re.compile(r"(?:^|/+)files/tools/(?P<tool_file_id>[^/?#
 
 
 def safe_json_value(v):
-    match v:
-        case datetime():
-            tz_name = "UTC"
-            if isinstance(current_user, Account) and current_user.timezone is not None:
-                tz_name = current_user.timezone
-            return v.astimezone(pytz.timezone(tz_name)).isoformat()
-        case date():
-            return v.isoformat()
-        case UUID():
-            return str(v)
-        case Decimal():
-            return float(v)
-        case bytes():
-            try:
-                return v.decode("utf-8")
-            except UnicodeDecodeError:
-                return v.hex()
-        case memoryview():
-            return v.tobytes().hex()
-        case np.integer():
-            return int(v)
-        case np.floating():
-            return float(v)
-        case np.ndarray():
-            return v.tolist()
-        case dict():
-            return safe_json_dict(v)
-        case list() | tuple() | set():
-            return [safe_json_value(i) for i in v]
-        case _:
-            return v
+    if isinstance(v, datetime):
+        tz_name = "UTC"
+        if isinstance(current_user, Account) and current_user.timezone is not None:
+            tz_name = current_user.timezone
+        return v.astimezone(pytz.timezone(tz_name)).isoformat()
+    elif isinstance(v, date):
+        return v.isoformat()
+    elif isinstance(v, UUID):
+        return str(v)
+    elif isinstance(v, Decimal):
+        return float(v)
+    elif isinstance(v, bytes):
+        try:
+            return v.decode("utf-8")
+        except UnicodeDecodeError:
+            return v.hex()
+    elif isinstance(v, memoryview):
+        return v.tobytes().hex()
+    elif isinstance(v, np.integer):
+        return int(v)
+    elif isinstance(v, np.floating):
+        return float(v)
+    elif isinstance(v, np.ndarray):
+        return v.tolist()
+    elif isinstance(v, dict):
+        return safe_json_dict(v)
+    elif isinstance(v, list | tuple | set):
+        return [safe_json_value(i) for i in v]
+    else:
+        return v
 
 
 def safe_json_dict(d: dict[str, Any]):

api/extensions/ext_storage.py

@@ -1,4 +1,5 @@
 import logging
+import posixpath
 from collections.abc import Callable, Generator
 from typing import Literal, Union, overload
 
@@ -17,6 +18,15 @@ class Storage:
         storage_factory = self.get_storage_factory(dify_config.STORAGE_TYPE)
         with app.app_context():
             self.storage_runner = storage_factory()
+            prefix = dify_config.STORAGE_PATH_PREFIX.strip("/") if dify_config.STORAGE_PATH_PREFIX else ""
+            if prefix and ".." in prefix.split("/"):
+                raise ValueError(f"STORAGE_PATH_PREFIX must not contain '..': {dify_config.STORAGE_PATH_PREFIX}")
+            self._path_prefix = prefix
+
+    def _prefix(self, filename: str) -> str:
+        if not self._path_prefix:
+            return filename
+        return posixpath.join(self._path_prefix, filename)
 
     @staticmethod
     def get_storage_factory(storage_type: str) -> Callable[[], BaseStorage]:
@@ -86,7 +96,7 @@ class Storage:
                 raise ValueError(f"unsupported storage type {storage_type}")
 
     def save(self, filename: str, data: bytes):
-        self.storage_runner.save(filename, data)
+        self.storage_runner.save(self._prefix(filename), data)
 
     @overload
     def load(self, filename: str, /, *, stream: Literal[False] = False) -> bytes: ...
@@ -105,22 +115,26 @@ class Storage:
             return self.load_once(filename)
 
     def load_once(self, filename: str) -> bytes:
-        return self.storage_runner.load_once(filename)
+        return self.storage_runner.load_once(self._prefix(filename))
 
     def load_stream(self, filename: str) -> Generator:
-        return self.storage_runner.load_stream(filename)
+        return self.storage_runner.load_stream(self._prefix(filename))
 
     def download(self, filename, target_filepath):
-        self.storage_runner.download(filename, target_filepath)
+        self.storage_runner.download(self._prefix(filename), target_filepath)
 
     def exists(self, filename):
-        return self.storage_runner.exists(filename)
+        return self.storage_runner.exists(self._prefix(filename))
 
     def delete(self, filename: str):
-        return self.storage_runner.delete(filename)
+        return self.storage_runner.delete(self._prefix(filename))
 
     def scan(self, path: str, files: bool = True, directories: bool = False) -> list[str]:
-        return self.storage_runner.scan(path, files=files, directories=directories)
+        results = self.storage_runner.scan(self._prefix(path), files=files, directories=directories)
+        if not self._path_prefix:
+            return results
+        prefix_with_slash = self._path_prefix + "/"
+        return [r.removeprefix(prefix_with_slash) for r in results]
 
 
 storage = Storage()

api/extensions/storage/aliyun_oss_storage.py

@@ -13,7 +13,7 @@ class AliyunOssStorage(BaseStorage):
     def __init__(self):
         super().__init__()
         self.bucket_name = dify_config.ALIYUN_OSS_BUCKET_NAME
-        self.folder = dify_config.ALIYUN_OSS_PATH
+        self.folder = None if dify_config.STORAGE_PATH_PREFIX else dify_config.ALIYUN_OSS_PATH
         oss_auth_method = aliyun_s3.Auth
         region = None
         if dify_config.ALIYUN_OSS_AUTH_VERSION == "v4":

api/migrations/versions/2026_04_29_1200-a4f2d8c9b731_add_recommended_app_categories.py

@@ -1,26 +0,0 @@
-"""add recommended app categories
-
-Revision ID: a4f2d8c9b731
-Revises: 227822d22895
-Create Date: 2026-04-29 12:00:00.000000
-
-"""
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "a4f2d8c9b731"
-down_revision = "227822d22895"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    with op.batch_alter_table("recommended_apps", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("categories", sa.JSON(), nullable=True))
-
-
-def downgrade():
-    with op.batch_alter_table("recommended_apps", schema=None) as batch_op:
-        batch_op.drop_column("categories")

api/models/model.py

@@ -878,7 +878,6 @@ class RecommendedApp(TypeBase):
     copyright: Mapped[str] = mapped_column(String(255), nullable=False)
     privacy_policy: Mapped[str] = mapped_column(String(255), nullable=False)
     category: Mapped[str] = mapped_column(String(255), nullable=False)
-    categories: Mapped[list[str] | None] = mapped_column(sa.JSON, nullable=True, default=None)
     custom_disclaimer: Mapped[str] = mapped_column(LongText, default="")
     position: Mapped[int] = mapped_column(sa.Integer, nullable=False, default=0)
     is_listed: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, default=True)

api/services/recommend_app/category_order.py

@@ -1,49 +0,0 @@
-"""Apply Redis-backed category ordering for DB-backed Explore apps."""
-
-import json
-import logging
-from collections.abc import Collection
-from typing import Any
-
-from extensions.ext_redis import redis_client
-
-logger = logging.getLogger(__name__)
-
-EXPLORE_APP_CATEGORY_ORDER_KEY_PREFIX = "explore:apps:category_order"
-
-
-def _category_order_key(language: str) -> str:
-    return f"{EXPLORE_APP_CATEGORY_ORDER_KEY_PREFIX}:{language}"
-
-
-def get_explore_app_category_order(language: str) -> list[str]:
-    try:
-        raw_categories = redis_client.get(_category_order_key(language))
-    except Exception:
-        logger.exception("Failed to read explore app category order from Redis.")
-        return []
-
-    if not raw_categories:
-        return []
-
-    if isinstance(raw_categories, bytes):
-        raw_categories = raw_categories.decode("utf-8")
-
-    try:
-        categories: Any = json.loads(raw_categories)
-    except (TypeError, json.JSONDecodeError):
-        logger.warning("Invalid explore app category order payload for language %s.", language)
-        return []
-
-    if not isinstance(categories, list):
-        return []
-
-    return [category for category in categories if isinstance(category, str)]
-
-
-def order_categories(categories: Collection[str], language: str) -> list[str]:
-    configured_order = get_explore_app_category_order(language)
-    if configured_order:
-        return configured_order
-
-    return sorted(categories)

api/services/recommend_app/database/database_retrieval.py

@@ -6,7 +6,6 @@ from constants.languages import languages
 from extensions.ext_database import db
 from models.model import App, RecommendedApp
 from services.app_dsl_service import AppDslService
-from services.recommend_app.category_order import order_categories
 from services.recommend_app.recommend_app_base import RecommendAppRetrievalBase
 from services.recommend_app.recommend_app_type import RecommendAppType
 
@@ -19,7 +18,7 @@ class RecommendedAppItemDict(TypedDict):
     copyright: Any
     privacy_policy: Any
     custom_disclaimer: str
-    categories: list[str]
+    category: str
     position: int
     is_listed: bool
 
@@ -81,7 +80,6 @@ class DatabaseRecommendAppRetrieval(RecommendAppRetrievalBase):
             if not site:
                 continue
 
-            app_categories = recommended_app.categories or []
             recommended_app_result: RecommendedAppItemDict = {
                 "id": recommended_app.id,
                 "app": recommended_app.app,
@@ -90,18 +88,15 @@ class DatabaseRecommendAppRetrieval(RecommendAppRetrievalBase):
                 "copyright": site.copyright,
                 "privacy_policy": site.privacy_policy,
                 "custom_disclaimer": site.custom_disclaimer,
-                "categories": app_categories,
+                "category": recommended_app.category,
                 "position": recommended_app.position,
                 "is_listed": recommended_app.is_listed,
             }
             recommended_apps_result.append(recommended_app_result)
 
-            categories.update(app_categories)
+            categories.add(recommended_app.category)
 
-        return RecommendedAppsResultDict(
-            recommended_apps=recommended_apps_result,
-            categories=order_categories(categories, language),
-        )
+        return RecommendedAppsResultDict(recommended_apps=recommended_apps_result, categories=sorted(categories))
 
     @classmethod
     def fetch_recommended_app_detail_from_db(cls, app_id: str) -> RecommendedAppDetailDict | None:

api/services/tools/builtin_tools_manage_service.py

@@ -408,7 +408,7 @@ class BuiltinToolManageService:
         return {"result": "success"}
 
     @staticmethod
-    def set_default_provider(tenant_id: str, provider: str, id: str):
+    def set_default_provider(tenant_id: str, user_id: str, provider: str, id: str):
         """
         set default provider
         """
@@ -422,11 +422,12 @@ class BuiltinToolManageService:
             if target_provider is None:
                 raise ValueError("provider not found")
 
-            # clear default provider (tenant-scoped: only one default per provider per workspace)
+            # clear default provider
             session.execute(
                 update(BuiltinToolProvider)
                 .where(
                     BuiltinToolProvider.tenant_id == tenant_id,
+                    BuiltinToolProvider.user_id == user_id,
                     BuiltinToolProvider.provider == provider,
                     BuiltinToolProvider.is_default.is_(True),
                 )

api/services/variable_truncator.py

@@ -194,15 +194,14 @@ class VariableTruncator(BaseTruncator):
 
         result: _PartResult[Any]
         # Apply type-specific truncation with target size
-        match segment:
-            case ArraySegment():
-                result = self._truncate_array(segment.value, target_size)
-            case StringSegment():
-                result = self._truncate_string(segment.value, target_size)
-            case ObjectSegment():
-                result = self._truncate_object(segment.value, target_size)
-            case _:
-                raise AssertionError("this should be unreachable.")
+        if isinstance(segment, ArraySegment):
+            result = self._truncate_array(segment.value, target_size)
+        elif isinstance(segment, StringSegment):
+            result = self._truncate_string(segment.value, target_size)
+        elif isinstance(segment, ObjectSegment):
+            result = self._truncate_object(segment.value, target_size)
+        else:
+            raise AssertionError("this should be unreachable.")
 
         return _PartResult(
             value=segment.model_copy(update={"value": result.value}),
@@ -220,41 +219,40 @@ class VariableTruncator(BaseTruncator):
             return VariableTruncator.calculate_json_size(value.model_dump(), depth=depth + 1)
         if depth > _MAX_DEPTH:
             raise MaxDepthExceededError()
-        match value:
-            case str():
-                # Ideally, the size of strings should be calculated based on their utf-8 encoded length.
-                # However, this adds complexity as we would need to compute encoded sizes consistently
-                # throughout the code. Therefore, we approximate the size using the string's length.
-                # Rough estimate: number of characters, plus 2 for quotes
-                return len(value) + 2
-            case bool():
-                return 4 if value else 5  # "true" or "false"
-            case int() | float():
-                return len(str(value))
-            case None:
-                return 4  # "null"
-            case list():
-                # Size = sum of elements + separators + brackets
-                total = 2  # "[]"
-                for i, item in enumerate(value):
-                    if i > 0:
-                        total += 1  # ","
-                    total += VariableTruncator.calculate_json_size(item, depth=depth + 1)
-                return total
-            case dict():
-                # Size = sum of keys + values + separators + brackets
-                total = 2  # "{}"
-                for index, key in enumerate(value.keys()):
-                    if index > 0:
-                        total += 1  # ","
-                    total += VariableTruncator.calculate_json_size(str(key), depth=depth + 1)  # Key as string
-                    total += 1  # ":"
-                    total += VariableTruncator.calculate_json_size(value[key], depth=depth + 1)
-                return total
-            case File():
-                return VariableTruncator.calculate_json_size(value.model_dump(), depth=depth + 1)
-            case _:
-                raise UnknownTypeError(f"got unknown type {type(value)}")
+        if isinstance(value, str):
+            # Ideally, the size of strings should be calculated based on their utf-8 encoded length.
+            # However, this adds complexity as we would need to compute encoded sizes consistently
+            # throughout the code. Therefore, we approximate the size using the string's length.
+            # Rough estimate: number of characters, plus 2 for quotes
+            return len(value) + 2
+        elif isinstance(value, (int, float)):
+            return len(str(value))
+        elif isinstance(value, bool):
+            return 4 if value else 5  # "true" or "false"
+        elif value is None:
+            return 4  # "null"
+        elif isinstance(value, list):
+            # Size = sum of elements + separators + brackets
+            total = 2  # "[]"
+            for i, item in enumerate(value):
+                if i > 0:
+                    total += 1  # ","
+                total += VariableTruncator.calculate_json_size(item, depth=depth + 1)
+            return total
+        elif isinstance(value, dict):
+            # Size = sum of keys + values + separators + brackets
+            total = 2  # "{}"
+            for index, key in enumerate(value.keys()):
+                if index > 0:
+                    total += 1  # ","
+                total += VariableTruncator.calculate_json_size(str(key), depth=depth + 1)  # Key as string
+                total += 1  # ":"
+                total += VariableTruncator.calculate_json_size(value[key], depth=depth + 1)
+            return total
+        elif isinstance(value, File):
+            return VariableTruncator.calculate_json_size(value.model_dump(), depth=depth + 1)
+        else:
+            raise UnknownTypeError(f"got unknown type {type(value)}")
 
     def _truncate_string(self, value: str, target_size: int) -> _PartResult[str]:
         if (size := self.calculate_json_size(value)) < target_size:
@@ -421,23 +419,22 @@ class VariableTruncator(BaseTruncator):
         target_size: int,
     ) -> _PartResult[Any]:
         """Truncate a value within an object to fit within budget."""
-        match val:
-            case UpdatedVariable():
-                # TODO(Workflow): push UpdatedVariable normalization closer to its producer.
-                return self._truncate_object(val.model_dump(), target_size)
-            case str():
-                return self._truncate_string(val, target_size)
-            case list():
-                return self._truncate_array(val, target_size)
-            case dict():
-                return self._truncate_object(val, target_size)
-            case File():
-                # File objects should not be truncated, return as-is
-                return _PartResult(val, self.calculate_json_size(val), False)
-            case None | bool() | int() | float():
-                return _PartResult(val, self.calculate_json_size(val), False)
-            case _:
-                raise AssertionError("this statement should be unreachable.")
+        if isinstance(val, UpdatedVariable):
+            # TODO(Workflow): push UpdatedVariable normalization closer to its producer.
+            return self._truncate_object(val.model_dump(), target_size)
+        elif isinstance(val, str):
+            return self._truncate_string(val, target_size)
+        elif isinstance(val, list):
+            return self._truncate_array(val, target_size)
+        elif isinstance(val, dict):
+            return self._truncate_object(val, target_size)
+        elif isinstance(val, File):
+            # File objects should not be truncated, return as-is
+            return _PartResult(val, self.calculate_json_size(val), False)
+        elif val is None or isinstance(val, (bool, int, float)):
+            return _PartResult(val, self.calculate_json_size(val), False)
+        else:
+            raise AssertionError("this statement should be unreachable.")
 
 
 class DummyVariableTruncator(BaseTruncator):

api/tests/test_containers_integration_tests/services/recommend_app/test_database_retrieval.py

@@ -47,7 +47,6 @@ def _create_recommended_app(
     *,
     app_id: str,
     category: str = "chat",
-    categories: list[str] | None = None,
     language: str = "en-US",
     is_listed: bool = True,
     position: int = 1,
@@ -58,7 +57,6 @@ def _create_recommended_app(
         copyright="copy",
         privacy_policy="pp",
         category=category,
-        categories=[category] if categories is None else categories,
         language=language,
         is_listed=is_listed,
         position=position,
@@ -115,53 +113,6 @@ class TestFetchRecommendedAppsFromDb:
         assert "assistant" in result["categories"]
         assert "writing" in result["categories"]
 
-    def test_returns_multiple_categories_for_one_app(
-        self, flask_app_with_containers, db_session_with_containers: Session
-    ):
-        tenant_id = str(uuid4())
-        created_app = _create_app(db_session_with_containers, tenant_id=tenant_id)
-        _create_site(db_session_with_containers, app_id=created_app.id)
-        _create_recommended_app(
-            db_session_with_containers,
-            app_id=created_app.id,
-            category="writing",
-            categories=["writing", "assistant"],
-        )
-
-        db_session_with_containers.expire_all()
-
-        result = DatabaseRecommendAppRetrieval.fetch_recommended_apps_from_db("en-US")
-
-        recommended_app = next(item for item in result["recommended_apps"] if item["app_id"] == created_app.id)
-        assert recommended_app["categories"] == ["writing", "assistant"]
-        assert "writing" in result["categories"]
-        assert "assistant" in result["categories"]
-
-    def test_ignores_legacy_category_when_categories_are_empty(
-        self,
-        flask_app_with_containers,
-        db_session_with_containers: Session,
-    ):
-        legacy_category = f"legacy-empty-{uuid4()}"
-        tenant_id = str(uuid4())
-        created_app = _create_app(db_session_with_containers, tenant_id=tenant_id)
-        _create_site(db_session_with_containers, app_id=created_app.id)
-        _create_recommended_app(
-            db_session_with_containers,
-            app_id=created_app.id,
-            category=legacy_category,
-            categories=[],
-        )
-
-        db_session_with_containers.expire_all()
-
-        result = DatabaseRecommendAppRetrieval.fetch_recommended_apps_from_db("en-US")
-
-        recommended_app = next(item for item in result["recommended_apps"] if item["app_id"] == created_app.id)
-        assert "category" not in recommended_app
-        assert recommended_app["categories"] == []
-        assert legacy_category not in result["categories"]
-
     def test_falls_back_to_default_language_when_empty(
         self, flask_app_with_containers, db_session_with_containers: Session
     ):

api/tests/unit_tests/configs/test_dify_config.py

@@ -114,8 +114,8 @@ def test_flask_configs(monkeypatch: pytest.MonkeyPatch):
         "pool_recycle": 3600,
         "pool_size": 30,
         "pool_use_lifo": False,
+        "pool_reset_on_return": None,
         "pool_timeout": 30,
-        "pool_reset_on_return": "rollback",
     }
 
     assert config["CONSOLE_WEB_URL"] == "https://example.com"

api/tests/unit_tests/controllers/console/explore/test_recommended_app.py

@@ -126,7 +126,7 @@ class TestRecommendedAppResponseModels:
                         },
                         "app_id": "app-1",
                         "description": "desc",
-                        "categories": ["cat", "other"],
+                        "category": "cat",
                         "position": 1,
                         "is_listed": True,
                         "can_trial": False,
@@ -137,5 +137,4 @@ class TestRecommendedAppResponseModels:
         ).model_dump(mode="json")
 
         assert response["recommended_apps"][0]["app_id"] == "app-1"
-        assert response["recommended_apps"][0]["categories"] == ["cat", "other"]
         assert response["categories"] == ["cat"]

api/tests/unit_tests/services/recommend_app/test_category_order.py

@@ -1,26 +0,0 @@
-import json
-from unittest.mock import patch
-
-from services.recommend_app.category_order import get_explore_app_category_order, order_categories
-
-
-@patch("services.recommend_app.category_order.redis_client.get")
-def test_get_explore_app_category_order_returns_redis_list(mock_get):
-    mock_get.return_value = json.dumps(["C", "A", "B"]).encode()
-
-    assert get_explore_app_category_order("en-US") == ["C", "A", "B"]
-    mock_get.assert_called_once_with("explore:apps:category_order:en-US")
-
-
-@patch("services.recommend_app.category_order.redis_client.get")
-def test_order_categories_uses_redis_order_as_source_of_truth(mock_get):
-    mock_get.return_value = json.dumps(["C", "A", "B"]).encode()
-
-    assert order_categories({"A", "B", "C", "D"}, "en-US") == ["C", "A", "B"]
-
-
-@patch("services.recommend_app.category_order.redis_client.get")
-def test_order_categories_falls_back_to_sorted_categories_without_redis_order(mock_get):
-    mock_get.return_value = None
-
-    assert order_categories({"B", "A", "C"}, "en-US") == ["A", "B", "C"]

api/tests/unit_tests/services/tools/test_builtin_tools_manage_service.py

@@ -180,7 +180,7 @@ class TestSetDefaultProvider:
         session.scalar.return_value = None
 
         with pytest.raises(ValueError, match="provider not found"):
-            BuiltinToolManageService.set_default_provider("t", "p", "id")
+            BuiltinToolManageService.set_default_provider("t", "u", "p", "id")
 
     @patch(f"{MODULE}.sessionmaker")
     @patch(f"{MODULE}.db")
@@ -189,29 +189,11 @@ class TestSetDefaultProvider:
         target = MagicMock()
         session.scalar.return_value = target
 
-        result = BuiltinToolManageService.set_default_provider("t", "p", "id")
+        result = BuiltinToolManageService.set_default_provider("t", "u", "p", "id")
 
         assert result == {"result": "success"}
         assert target.is_default is True
 
-    @patch(f"{MODULE}.sessionmaker")
-    @patch(f"{MODULE}.db")
-    def test_clear_default_is_tenant_scoped_not_user_scoped(self, mock_db, mock_sm_cls):
-        # Regression: clearing prior defaults must NOT filter by user_id, otherwise
-        # two workspace members can each leave their own credential as default at
-        # the same time (the default flag is tenant-scoped, not per-user).
-        session = _mock_sessionmaker(mock_sm_cls)
-        session.scalar.return_value = MagicMock()
-
-        BuiltinToolManageService.set_default_provider("tenant-1", "google", "cred-id")
-
-        session.execute.assert_called_once()
-        update_stmt = session.execute.call_args.args[0]
-        compiled = str(update_stmt.compile(compile_kwargs={"literal_binds": True}))
-        assert "user_id" not in compiled
-        assert "tenant_id" in compiled
-        assert "provider" in compiled
-
 
 class TestUpdateBuiltinToolProvider:
     @patch(f"{MODULE}.sessionmaker")

docker/.env.default

@@ -0,0 +1,51 @@
+# ------------------------------------------------------------------
+# Minimal defaults for Docker Compose deployments.
+#
+# Keep local changes in .env. Use .env.example as the full reference
+# for advanced and service-specific settings.
+# ------------------------------------------------------------------
+
+# Public URLs used when Dify generates links. Change these together when
+# exposing Dify under another hostname, IP address, or port.
+CONSOLE_WEB_URL=http://localhost
+SERVICE_API_URL=http://localhost
+APP_WEB_URL=http://localhost
+FILES_URL=http://localhost
+INTERNAL_FILES_URL=http://api:5001
+TRIGGER_URL=http://localhost
+ENDPOINT_URL_TEMPLATE=http://localhost/e/{hook_id}
+NEXT_PUBLIC_SOCKET_URL=ws://localhost
+EXPOSE_PLUGIN_DEBUGGING_HOST=localhost
+EXPOSE_PLUGIN_DEBUGGING_PORT=5003
+
+# Built-in metadata database defaults.
+DB_TYPE=postgresql
+DB_USERNAME=postgres
+DB_PASSWORD=difyai123456
+DB_HOST=db_postgres
+DB_PORT=5432
+DB_DATABASE=dify
+
+# Built-in Redis defaults.
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_PASSWORD=difyai123456
+
+# Default file storage.
+STORAGE_TYPE=opendal
+OPENDAL_SCHEME=fs
+OPENDAL_FS_ROOT=storage
+
+# Default vector database.
+VECTOR_STORE=weaviate
+
+# Internal service authentication. Paired values must match.
+PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
+PLUGIN_DIFY_INNER_API_KEY=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
+
+# Host ports.
+EXPOSE_NGINX_PORT=80
+EXPOSE_NGINX_SSL_PORT=443
+
+# Docker Compose profiles for bundled services.
+COMPOSE_PROFILES=${VECTOR_STORE:-weaviate},${DB_TYPE:-postgresql}

docker/.env.example

@@ -268,8 +268,6 @@ SQLALCHEMY_POOL_USE_LIFO=false
 # Number of seconds to wait for a connection from the pool before raising a timeout error.
 # Default is 30
 SQLALCHEMY_POOL_TIMEOUT=30
-# Connection pool reset behavior on return
-SQLALCHEMY_POOL_RESET_ON_RETURN=rollback
 
 # Maximum number of connections to the database
 # Default is 100
@@ -810,7 +808,7 @@ VIKINGDB_ACCESS_KEY=your-ak
 VIKINGDB_SECRET_KEY=your-sk
 VIKINGDB_REGION=cn-shanghai
 VIKINGDB_HOST=api-vikingdb.xxx.volces.com
-VIKINGDB_SCHEME=http
+VIKINGDB_SCHEMA=http
 VIKINGDB_CONNECTION_TIMEOUT=30
 VIKINGDB_SOCKET_TIMEOUT=30
 
@@ -922,6 +920,18 @@ SCARF_NO_ANALYTICS=true
 # Model Configuration
 # ------------------------------
 
+# The maximum number of tokens allowed for prompt generation.
+# This setting controls the upper limit of tokens that can be used by the LLM
+# when generating a prompt in the prompt generation tool.
+# Default: 512 tokens.
+PROMPT_GENERATION_MAX_TOKENS=512
+
+# The maximum number of tokens allowed for code generation.
+# This setting controls the upper limit of tokens that can be used by the LLM
+# when generating code in the code generation tool.
+# Default: 1024 tokens.
+CODE_GENERATION_MAX_TOKENS=1024
+
 # Enable or disable plugin based token counting. If disabled, token counting will return 0.
 # This can improve performance by skipping token counting operations.
 # Default: false (disabled).
@@ -993,7 +1003,7 @@ NOTION_INTERNAL_SECRET=
 # ------------------------------
 
 # Mail type, support: resend, smtp, sendgrid
-MAIL_TYPE=resend
+MAIL_TYPE=
 
 # Default send from email address, if not specified
 # If using SendGrid, use the 'from' field for authentication if necessary.
@@ -1001,7 +1011,7 @@ MAIL_DEFAULT_SEND_FROM=
 
 # API-Key for the Resend email provider, used when MAIL_TYPE is `resend`.
 RESEND_API_URL=https://api.resend.com
-RESEND_API_KEY=your-resend-api-key
+RESEND_API_KEY=
 
 
 # SMTP server configuration, used when MAIL_TYPE is `smtp`
@@ -1349,10 +1359,10 @@ NGINX_ENABLE_CERTBOT_CHALLENGE=false
 # ------------------------------
 
 # Email address (required to get certificates from Let's Encrypt)
-CERTBOT_EMAIL=your_email@example.com
+CERTBOT_EMAIL=
 
 # Domain name
-CERTBOT_DOMAIN=your_domain.com
+CERTBOT_DOMAIN=
 
 # certbot command options
 # i.e: --force-renewal --dry-run --test-cert --debug
@@ -1463,6 +1473,7 @@ CREATORS_PLATFORM_API_URL=https://creators.dify.ai
 CREATORS_PLATFORM_OAUTH_CLIENT_ID=
 
 FORCE_VERIFYING_SIGNATURE=true
+ENFORCE_LANGGENIUS_PLUGIN_SIGNATURES=true
 
 PLUGIN_STDIO_BUFFER_SIZE=1024
 PLUGIN_STDIO_MAX_BUFFER_SIZE=5242880

docker/README.md

@@ -7,28 +7,28 @@ Welcome to the new `docker` directory for deploying Dify using Docker Compose. T
 - **Certbot Container**: `docker-compose.yaml` now contains `certbot` for managing SSL certificates. This container automatically renews certificates and ensures secure HTTPS connections.\
   For more information, refer `docker/certbot/README.md`.
 
-- **Persistent Environment Variables**: Environment variables are now managed through a `.env` file, ensuring that your configurations persist across deployments.
+- **Persistent Environment Variables**: Default environment variables are managed through `.env.default`, while local overrides are stored in `.env`, ensuring that your configurations persist across deployments.
 
   > What is `.env`? </br> </br>
-  > The `.env` file is a crucial component in Docker and Docker Compose environments, serving as a centralized configuration file where you can define environment variables that are accessible to the containers at runtime. This file simplifies the management of environment settings across different stages of development, testing, and production, providing consistency and ease of configuration to deployments.
+  > The `.env` file is a local override file. Keep it small by adding only the values that differ from `.env.default`. Use `.env.example` as the full reference when you need advanced configuration.
 
 - **Unified Vector Database Services**: All vector database services are now managed from a single Docker Compose file `docker-compose.yaml`. You can switch between different vector databases by setting the `VECTOR_STORE` environment variable in your `.env` file.
 
-- **Mandatory .env File**: A `.env` file is now required to run `docker compose up`. This file is crucial for configuring your deployment and for any custom settings to persist through upgrades.
+- **Local .env Overrides**: The `dify-compose` and `dify-compose.ps1` wrappers create `.env` if it is missing and generate a persistent `SECRET_KEY` for this deployment.
 
 ### How to Deploy Dify with `docker-compose.yaml`
 
 1. **Prerequisites**: Ensure Docker and Docker Compose are installed on your system.
 1. **Environment Setup**:
    - Navigate to the `docker` directory.
-   - Copy the `.env.example` file to a new file named `.env` by running `cp .env.example .env`.
-   - Customize the `.env` file as needed. Refer to the `.env.example` file for detailed configuration options.
-   - **Optional (Recommended for upgrades)**:
-     You may use the environment synchronization tool to help keep your `.env` file aligned with the latest `.env.example` updates, while preserving your custom settings.
-     This is especially useful when upgrading Dify or managing a large, customized `.env` file.
+   - No copy step is required. The `dify-compose` wrappers create `.env` if it is missing and write a generated `SECRET_KEY` to it.
+   - When prompted on first run, press Enter to use the default deployment, or answer `y` to stop and edit `.env` first.
+   - Customize `.env` only when you need to override defaults from `.env.default`. Refer to `.env.example` for the full list of available variables.
+   - **Optional (for advanced deployments)**:
+     If you maintain a full `.env` file copied from `.env.example`, you may use the environment synchronization tool to keep it aligned with the latest `.env.example` updates while preserving your custom settings.
      See the [Environment Variables Synchronization](#environment-variables-synchronization) section below.
 1. **Running the Services**:
-   - Execute `docker compose up` from the `docker` directory to start the services.
+   - Execute `./dify-compose up -d` from the `docker` directory to start the services. On Windows PowerShell, run `.\dify-compose.ps1 up -d`.
    - To specify a vector database, set the `VECTOR_STORE` variable in your `.env` file to your desired vector database service, such as `milvus`, `weaviate`, or `opensearch`.
 1. **SSL Certificate Setup**:
    - Refer `docker/certbot/README.md` to set up SSL certificates using Certbot.
@@ -58,7 +58,13 @@ For users migrating from the `docker-legacy` setup:
 1. **Data Migration**:
    - Ensure that data from services like databases and caches is backed up and migrated appropriately to the new structure if necessary.
 
-### Overview of `.env`
+### Overview of `.env.default`, `.env`, and `.env.example`
+
+- `.env.default` contains the minimal default configuration for Docker Compose deployments.
+- `.env` contains the generated `SECRET_KEY` plus any local overrides.
+- `.env.example` is the full reference for advanced configuration.
+
+The `dify-compose` wrappers merge `.env.default` and `.env` into a temporary environment file, append paired internal service keys when needed, and remove the temporary file after Docker Compose starts.
 
 #### Key Modules and Customization
 
@@ -118,9 +124,11 @@ The `.env.example` file provided in the Docker setup is extensive and covers a w
 
 ### Environment Variables Synchronization
 
-When upgrading Dify or pulling the latest changes, new environment variables may be introduced in `.env.example`.
+When upgrading Dify or pulling the latest changes, new environment variables may be introduced in `.env.default` or `.env.example`.
 
-To help keep your existing `.env` file up to date **without losing your custom values**, an optional environment variables synchronization tool is provided.
+If you use the default override-only workflow, review `.env.default` and add only the values you need to override to `.env`.
+
+If you maintain a full `.env` file copied from `.env.example`, an optional environment variables synchronization tool is provided.
 
 > This tool performs a **one-way synchronization** from `.env.example` to `.env`.
 > Existing values in `.env` are never overwritten automatically.
@@ -143,9 +151,9 @@ Before synchronization, the current `.env` file is saved to the `env-backup/` di
 
 **When to use**
 
-- After upgrading Dify to a newer version
+- After upgrading Dify to a newer version with a full `.env` file
 - When `.env.example` has been updated with new environment variables
-- When managing a large or heavily customized `.env` file
+- When managing a large or heavily customized `.env` file copied from `.env.example`
 
 **Usage**
 

docker/dify-compose

@@ -0,0 +1,334 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+DEFAULT_ENV_FILE=".env.default"
+USER_ENV_FILE=".env"
+
+log() {
+  printf '%s\n' "$*" >&2
+}
+
+die() {
+  printf 'Error: %s\n' "$*" >&2
+  exit 1
+}
+
+detect_compose() {
+  if docker compose version >/dev/null 2>&1; then
+    COMPOSE_CMD=(docker compose)
+    return
+  fi
+
+  if command -v docker-compose >/dev/null 2>&1; then
+    COMPOSE_CMD=(docker-compose)
+    return
+  fi
+
+  die "Docker Compose is not available. Install Docker Compose, then run this command again."
+}
+
+generate_secret_key() {
+  if command -v openssl >/dev/null 2>&1; then
+    openssl rand -base64 42
+    return
+  fi
+
+  if command -v dd >/dev/null 2>&1 && command -v base64 >/dev/null 2>&1; then
+    dd if=/dev/urandom bs=42 count=1 2>/dev/null | base64 | tr -d '\n'
+    printf '\n'
+    return
+  fi
+
+  return 1
+}
+
+ensure_env_files() {
+  [[ -f "$DEFAULT_ENV_FILE" ]] || die "$DEFAULT_ENV_FILE is missing."
+
+  if [[ -f "$USER_ENV_FILE" ]]; then
+    return
+  fi
+
+  : >"$USER_ENV_FILE"
+
+  if [[ ! -t 0 ]]; then
+    log "Created $USER_ENV_FILE for local overrides."
+    return
+  fi
+
+  printf 'Created %s for local overrides.\n' "$USER_ENV_FILE"
+  printf 'Do you need a custom deployment now? (Most users can press Enter to skip.) [y/N] '
+  read -r answer
+
+  case "${answer:-}" in
+    y | Y | yes | YES | Yes)
+      cat <<'EOF'
+Edit .env with the settings you want to override, using .env.example as the full reference.
+Run ./dify-compose up -d again when you are ready.
+EOF
+      exit 0
+      ;;
+  esac
+}
+
+user_env_value() {
+  local key="$1"
+  awk -F= -v target="$key" '
+    /^[[:space:]]*#/ || !/=/{ next }
+    {
+      key = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
+      if (key == target) {
+        value = substr($0, index($0, "=") + 1)
+        gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
+        if ((value ~ /^".*"$/) || (value ~ /^'\''.*'\''$/)) {
+          value = substr(value, 2, length(value) - 2)
+        }
+        result = value
+      }
+    }
+    END { print result }
+  ' "$USER_ENV_FILE"
+}
+
+set_user_env_value() {
+  local key="$1"
+  local value="$2"
+  local temp_file
+
+  temp_file="$(mktemp "${TMPDIR:-/tmp}/dify-env.XXXXXX")"
+  awk -F= -v target="$key" -v replacement="$key=$value" '
+    BEGIN { replaced = 0 }
+    /^[[:space:]]*#/ || !/=/{ print; next }
+    {
+      key = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
+      if (key == target) {
+        if (!replaced) {
+          print replacement
+          replaced = 1
+        }
+        next
+      }
+      print
+    }
+    END {
+      if (!replaced) {
+        print replacement
+      }
+    }
+  ' "$USER_ENV_FILE" >"$temp_file"
+  mv "$temp_file" "$USER_ENV_FILE"
+}
+
+ensure_secret_key() {
+  local current_secret_key
+  local secret_key
+
+  current_secret_key="$(user_env_value SECRET_KEY)"
+  if [[ -n "$current_secret_key" ]]; then
+    return
+  fi
+
+  secret_key="$(generate_secret_key)" || die "Unable to generate SECRET_KEY. Install openssl or configure SECRET_KEY in .env."
+  set_user_env_value SECRET_KEY "$secret_key"
+  log "Generated SECRET_KEY in $USER_ENV_FILE."
+}
+
+env_value() {
+  local key="$1"
+  awk -F= -v target="$key" '
+    /^[[:space:]]*#/ || !/=/{ next }
+    {
+      key = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
+      if (key == target) {
+        value = substr($0, index($0, "=") + 1)
+        gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
+        if ((value ~ /^".*"$/) || (value ~ /^'\''.*'\''$/)) {
+          value = substr(value, 2, length(value) - 2)
+        }
+        result = value
+      }
+    }
+    END { print result }
+  ' "$DEFAULT_ENV_FILE" "$USER_ENV_FILE"
+}
+
+user_overrides() {
+  local key="$1"
+  grep -Eq "^[[:space:]]*${key}[[:space:]]*=" "$USER_ENV_FILE"
+}
+
+write_merged_env() {
+  awk '
+    function trim(s) {
+      sub(/^[[:space:]]+/, "", s)
+      sub(/[[:space:]]+$/, "", s)
+      return s
+    }
+
+    /^[[:space:]]*#/ || !/=/{ next }
+
+    {
+      key = $0
+      sub(/=.*/, "", key)
+      key = trim(key)
+      if (key == "") {
+        next
+      }
+
+      value = substr($0, index($0, "=") + 1)
+      value = trim(value)
+
+      if (!(key in seen)) {
+        order[++count] = key
+        seen[key] = 1
+      }
+
+      values[key] = value
+    }
+
+    END {
+      for (i = 1; i <= count; i++) {
+        key = order[i]
+        print key "=" values[key]
+      }
+    }
+  ' "$DEFAULT_ENV_FILE" "$USER_ENV_FILE" >"$MERGED_ENV_FILE"
+}
+
+set_merged_env_value() {
+  local key="$1"
+  local value="$2"
+  local temp_file
+
+  temp_file="$(mktemp "${TMPDIR:-/tmp}/dify-compose-env.XXXXXX")"
+  awk -F= -v target="$key" -v replacement="$key=$value" '
+    BEGIN { replaced = 0 }
+    /^[[:space:]]*#/ || !/=/{ print; next }
+    {
+      key = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
+      if (key == target) {
+        if (!replaced) {
+          print replacement
+          replaced = 1
+        }
+        next
+      }
+      print
+    }
+    END {
+      if (!replaced) {
+        print replacement
+      }
+    }
+  ' "$MERGED_ENV_FILE" >"$temp_file"
+  mv "$temp_file" "$MERGED_ENV_FILE"
+}
+
+set_if_not_overridden() {
+  local key="$1"
+  local value="$2"
+
+  if user_overrides "$key"; then
+    return
+  fi
+
+  set_merged_env_value "$key" "$value"
+}
+
+metadata_db_host() {
+  case "$1" in
+    mysql) printf 'db_mysql' ;;
+    postgresql | '') printf 'db_postgres' ;;
+    *) printf '%s' "$(env_value DB_HOST)" ;;
+  esac
+}
+
+metadata_db_port() {
+  case "$1" in
+    mysql) printf '3306' ;;
+    postgresql | '') printf '5432' ;;
+    *) printf '%s' "$(env_value DB_PORT)" ;;
+  esac
+}
+
+metadata_db_user() {
+  case "$1" in
+    mysql) printf 'root' ;;
+    postgresql | '') printf 'postgres' ;;
+    *) printf '%s' "$(env_value DB_USERNAME)" ;;
+  esac
+}
+
+build_merged_env() {
+  MERGED_ENV_FILE="$(mktemp "${TMPDIR:-/tmp}/dify-compose.XXXXXX")"
+  trap 'rm -f "$MERGED_ENV_FILE"' EXIT
+
+  write_merged_env
+
+  local db_type
+  local redis_host
+  local redis_port
+  local redis_username
+  local redis_password
+  local redis_auth
+  local code_execution_api_key
+  local weaviate_api_key
+
+  db_type="$(env_value DB_TYPE)"
+
+  set_if_not_overridden DB_HOST "$(metadata_db_host "$db_type")"
+  set_if_not_overridden DB_PORT "$(metadata_db_port "$db_type")"
+  set_if_not_overridden DB_USERNAME "$(metadata_db_user "$db_type")"
+
+  if ! user_overrides CELERY_BROKER_URL; then
+    redis_host="$(env_value REDIS_HOST)"
+    redis_port="$(env_value REDIS_PORT)"
+    redis_username="$(env_value REDIS_USERNAME)"
+    redis_password="$(env_value REDIS_PASSWORD)"
+    redis_auth=""
+
+    if [[ -n "$redis_username" && -n "$redis_password" ]]; then
+      redis_auth="${redis_username}:${redis_password}@"
+    elif [[ -n "$redis_password" ]]; then
+      redis_auth=":${redis_password}@"
+    elif [[ -n "$redis_username" ]]; then
+      redis_auth="${redis_username}@"
+    fi
+
+    set_merged_env_value CELERY_BROKER_URL "redis://${redis_auth}${redis_host:-redis}:${redis_port:-6379}/1"
+  fi
+
+  if ! user_overrides SANDBOX_API_KEY; then
+    code_execution_api_key="$(env_value CODE_EXECUTION_API_KEY)"
+    set_if_not_overridden SANDBOX_API_KEY "${code_execution_api_key:-dify-sandbox}"
+  fi
+
+  if ! user_overrides WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS; then
+    weaviate_api_key="$(env_value WEAVIATE_API_KEY)"
+    set_if_not_overridden WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS \
+      "${weaviate_api_key:-WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih}"
+  fi
+}
+
+main() {
+  detect_compose
+  ensure_env_files
+  ensure_secret_key
+  build_merged_env
+
+  if [[ "$#" -eq 0 ]]; then
+    set -- up -d
+  fi
+
+  "${COMPOSE_CMD[@]}" --env-file "$MERGED_ENV_FILE" "$@"
+}
+
+main "$@"

docker/dify-compose.ps1

@@ -0,0 +1,317 @@
+$ErrorActionPreference = "Stop"
+Set-StrictMode -Version Latest
+
+$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+Set-Location $ScriptDir
+
+$DefaultEnvFile = ".env.default"
+$UserEnvFile = ".env"
+$MergedEnvFile = $null
+$Utf8NoBom = New-Object System.Text.UTF8Encoding -ArgumentList $false
+
+function Write-Info {
+    param([string]$Message)
+    [Console]::Error.WriteLine($Message)
+}
+
+function Fail {
+    param([string]$Message)
+    [Console]::Error.WriteLine("Error: $Message")
+    exit 1
+}
+
+function Test-CommandSuccess {
+    param([string[]]$Command)
+
+    try {
+        $Executable = $Command[0]
+        $CommandArgs = @()
+        if ($Command.Length -gt 1) {
+            $CommandArgs = @($Command[1..($Command.Length - 1)])
+        }
+
+        & $Executable @CommandArgs *> $null
+        return $LASTEXITCODE -eq 0
+    }
+    catch {
+        return $false
+    }
+}
+
+function Get-ComposeCommand {
+    if (Test-CommandSuccess @("docker", "compose", "version")) {
+        return @("docker", "compose")
+    }
+
+    if ((Get-Command "docker-compose" -ErrorAction SilentlyContinue) -and (Test-CommandSuccess @("docker-compose", "version"))) {
+        return @("docker-compose")
+    }
+
+    Fail "Docker Compose is not available. Install Docker Compose, then run this command again."
+}
+
+function New-SecretKey {
+    $Bytes = New-Object byte[] 42
+    $Generator = [System.Security.Cryptography.RandomNumberGenerator]::Create()
+
+    try {
+        $Generator.GetBytes($Bytes)
+    }
+    finally {
+        $Generator.Dispose()
+    }
+
+    return [Convert]::ToBase64String($Bytes)
+}
+
+function Ensure-EnvFiles {
+    if (-not (Test-Path $DefaultEnvFile -PathType Leaf)) {
+        Fail "$DefaultEnvFile is missing."
+    }
+
+    if (Test-Path $UserEnvFile -PathType Leaf) {
+        return
+    }
+
+    New-Item -ItemType File -Path $UserEnvFile | Out-Null
+
+    if ([Console]::IsInputRedirected) {
+        Write-Info "Created $UserEnvFile for local overrides."
+        return
+    }
+
+    Write-Info "Created $UserEnvFile for local overrides."
+    $Answer = Read-Host "Do you need a custom deployment now? (Most users can press Enter to skip.) [y/N]"
+
+    if ($Answer -match "^(y|yes)$") {
+        Write-Output "Edit .env with the settings you want to override, using .env.example as the full reference."
+        Write-Output "Run .\dify-compose.ps1 up -d again when you are ready."
+        exit 0
+    }
+}
+
+function Read-EnvFile {
+    param([string]$Path)
+
+    $Values = [ordered]@{}
+
+    if (-not (Test-Path $Path -PathType Leaf)) {
+        return $Values
+    }
+
+    foreach ($Line in Get-Content -Path $Path) {
+        if ($Line -match "^\s*#" -or $Line -notmatch "=") {
+            continue
+        }
+
+        $SeparatorIndex = $Line.IndexOf("=")
+        $Key = $Line.Substring(0, $SeparatorIndex).Trim()
+        $Value = $Line.Substring($SeparatorIndex + 1).Trim()
+
+        if (($Value.StartsWith('"') -and $Value.EndsWith('"')) -or ($Value.StartsWith("'") -and $Value.EndsWith("'"))) {
+            $Value = $Value.Substring(1, $Value.Length - 2)
+        }
+
+        if ($Key.Length -gt 0) {
+            $Values[$Key] = $Value
+        }
+    }
+
+    return $Values
+}
+
+function Set-UserEnvValue {
+    param(
+        [string]$Key,
+        [string]$Value
+    )
+
+    $Path = [string](Resolve-Path $UserEnvFile)
+    $Lines = [System.IO.File]::ReadAllLines($Path, [System.Text.Encoding]::UTF8)
+    $Output = New-Object System.Collections.Generic.List[string]
+    $Replaced = $false
+
+    foreach ($Line in $Lines) {
+        if ($Line -match "^\s*#" -or $Line -notmatch "=") {
+            $Output.Add($Line)
+            continue
+        }
+
+        $SeparatorIndex = $Line.IndexOf("=")
+        $CurrentKey = $Line.Substring(0, $SeparatorIndex).Trim()
+
+        if ($CurrentKey -eq $Key) {
+            if (-not $Replaced) {
+                $Output.Add("$Key=$Value")
+                $Replaced = $true
+            }
+            continue
+        }
+
+        $Output.Add($Line)
+    }
+
+    if (-not $Replaced) {
+        $Output.Add("$Key=$Value")
+    }
+
+    [System.IO.File]::WriteAllLines($Path, $Output, $Utf8NoBom)
+}
+
+function Ensure-SecretKey {
+    $Values = Read-EnvFile $UserEnvFile
+
+    if ($Values.Contains("SECRET_KEY") -and $Values["SECRET_KEY"]) {
+        return
+    }
+
+    Set-UserEnvValue "SECRET_KEY" (New-SecretKey)
+    Write-Info "Generated SECRET_KEY in $UserEnvFile."
+}
+
+function Merge-EnvValues {
+    $Values = [ordered]@{}
+
+    foreach ($Entry in (Read-EnvFile $DefaultEnvFile).GetEnumerator()) {
+        $Values[$Entry.Key] = $Entry.Value
+    }
+
+    foreach ($Entry in (Read-EnvFile $UserEnvFile).GetEnumerator()) {
+        $Values[$Entry.Key] = $Entry.Value
+    }
+
+    return $Values
+}
+
+function User-Overrides {
+    param([string]$Key)
+
+    if (-not (Test-Path $UserEnvFile -PathType Leaf)) {
+        return $false
+    }
+
+    return [bool](Select-String -Path $UserEnvFile -Pattern "^\s*$([regex]::Escape($Key))\s*=" -Quiet)
+}
+
+function Metadata-DbHost {
+    param([string]$DbType, $Values)
+
+    switch ($DbType) {
+        "mysql" { return "db_mysql" }
+        "postgresql" { return "db_postgres" }
+        "" { return "db_postgres" }
+        default { return $Values["DB_HOST"] }
+    }
+}
+
+function Metadata-DbPort {
+    param([string]$DbType, $Values)
+
+    switch ($DbType) {
+        "mysql" { return "3306" }
+        "postgresql" { return "5432" }
+        "" { return "5432" }
+        default { return $Values["DB_PORT"] }
+    }
+}
+
+function Metadata-DbUser {
+    param([string]$DbType, $Values)
+
+    switch ($DbType) {
+        "mysql" { return "root" }
+        "postgresql" { return "postgres" }
+        "" { return "postgres" }
+        default { return $Values["DB_USERNAME"] }
+    }
+}
+
+function Write-MergedEnv {
+    param($Values)
+
+    $Output = New-Object System.Collections.Generic.List[string]
+
+    foreach ($Entry in $Values.GetEnumerator()) {
+        $Output.Add("$($Entry.Key)=$($Entry.Value)")
+    }
+
+    [System.IO.File]::WriteAllLines($MergedEnvFile, $Output, $Utf8NoBom)
+}
+
+function Build-MergedEnv {
+    $Values = Merge-EnvValues
+    $script:MergedEnvFile = [System.IO.Path]::GetTempFileName()
+
+    $DbType = if ($Values.Contains("DB_TYPE")) { $Values["DB_TYPE"] } else { "postgresql" }
+
+    if (-not (User-Overrides "DB_HOST")) {
+        $Values["DB_HOST"] = Metadata-DbHost $DbType $Values
+    }
+
+    if (-not (User-Overrides "DB_PORT")) {
+        $Values["DB_PORT"] = Metadata-DbPort $DbType $Values
+    }
+
+    if (-not (User-Overrides "DB_USERNAME")) {
+        $Values["DB_USERNAME"] = Metadata-DbUser $DbType $Values
+    }
+
+    if (-not (User-Overrides "CELERY_BROKER_URL")) {
+        $RedisHost = if ($Values.Contains("REDIS_HOST") -and $Values["REDIS_HOST"]) { $Values["REDIS_HOST"] } else { "redis" }
+        $RedisPort = if ($Values.Contains("REDIS_PORT") -and $Values["REDIS_PORT"]) { $Values["REDIS_PORT"] } else { "6379" }
+        $RedisUsername = if ($Values.Contains("REDIS_USERNAME")) { $Values["REDIS_USERNAME"] } else { "" }
+        $RedisPassword = if ($Values.Contains("REDIS_PASSWORD")) { $Values["REDIS_PASSWORD"] } else { "" }
+        $RedisAuth = ""
+
+        if ($RedisUsername -and $RedisPassword) {
+            $RedisAuth = "${RedisUsername}:${RedisPassword}@"
+        }
+        elseif ($RedisPassword) {
+            $RedisAuth = ":${RedisPassword}@"
+        }
+        elseif ($RedisUsername) {
+            $RedisAuth = "${RedisUsername}@"
+        }
+
+        $Values["CELERY_BROKER_URL"] = "redis://$RedisAuth${RedisHost}:${RedisPort}/1"
+    }
+
+    if (-not (User-Overrides "SANDBOX_API_KEY")) {
+        $CodeExecutionApiKey = if ($Values.Contains("CODE_EXECUTION_API_KEY") -and $Values["CODE_EXECUTION_API_KEY"]) { $Values["CODE_EXECUTION_API_KEY"] } else { "dify-sandbox" }
+        $Values["SANDBOX_API_KEY"] = $CodeExecutionApiKey
+    }
+
+    if (-not (User-Overrides "WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS")) {
+        $WeaviateApiKey = if ($Values.Contains("WEAVIATE_API_KEY") -and $Values["WEAVIATE_API_KEY"]) { $Values["WEAVIATE_API_KEY"] } else { "WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih" }
+        $Values["WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS"] = $WeaviateApiKey
+    }
+
+    Write-MergedEnv $Values
+}
+
+$ComposeCommand = Get-ComposeCommand
+
+try {
+    Ensure-EnvFiles
+    Ensure-SecretKey
+    Build-MergedEnv
+
+    $ComposeArgs = @($args)
+    if ($ComposeArgs.Count -eq 0) {
+        $ComposeArgs = @("up", "-d")
+    }
+
+    $ComposeCommandArgs = @()
+    if ($ComposeCommand.Length -gt 1) {
+        $ComposeCommandArgs = @($ComposeCommand[1..($ComposeCommand.Length - 1)])
+    }
+
+    $ComposeExecutable = $ComposeCommand[0]
+    & $ComposeExecutable @ComposeCommandArgs --env-file $MergedEnvFile @ComposeArgs
+    exit $LASTEXITCODE
+}
+finally {
+    if ($MergedEnvFile -and (Test-Path $MergedEnvFile -PathType Leaf)) {
+        Remove-Item -Force $MergedEnvFile
+    }
+}

docker/docker-compose-template.yaml

@@ -170,8 +170,8 @@ services:
       ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
       MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
       MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
-      TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
-      INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-}
+      TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-10}
+      INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-4000}
       LOOP_NODE_MAX_COUNT: ${LOOP_NODE_MAX_COUNT:-100}
       MAX_TOOLS_NUM: ${MAX_TOOLS_NUM:-10}
       MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
@@ -228,7 +228,7 @@ services:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-difyai123456}
       MYSQL_DATABASE: ${DB_DATABASE:-dify}
     command: >
-      --max_connections=${MYSQL_MAX_CONNECTIONS:-1000}
+      --max_connections=1000
       --innodb_buffer_pool_size=${MYSQL_INNODB_BUFFER_POOL_SIZE:-512M}
       --innodb_log_file_size=${MYSQL_INNODB_LOG_FILE_SIZE:-128M}
       --innodb_flush_log_at_trx_commit=${MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT:-2}
@@ -402,8 +402,8 @@ services:
       - ./certbot/update-cert.template.txt:/update-cert.template.txt
       - ./certbot/docker-entrypoint.sh:/docker-entrypoint.sh
     environment:
-      - CERTBOT_EMAIL=${CERTBOT_EMAIL}
-      - CERTBOT_DOMAIN=${CERTBOT_DOMAIN}
+      - CERTBOT_EMAIL=${CERTBOT_EMAIL:-}
+      - CERTBOT_DOMAIN=${CERTBOT_DOMAIN:-}
       - CERTBOT_OPTIONS=${CERTBOT_OPTIONS:-}
     entrypoint: ["/docker-entrypoint.sh"]
     command: ["tail", "-f", "/dev/null"]

docker/docker-compose.middleware.yaml

@@ -51,7 +51,7 @@ services:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-difyai123456}
       MYSQL_DATABASE: ${DB_DATABASE:-dify}
     command: >
-      --max_connections=${MYSQL_MAX_CONNECTIONS:-1000}
+      --max_connections=1000
       --innodb_buffer_pool_size=${MYSQL_INNODB_BUFFER_POOL_SIZE:-512M}
       --innodb_log_file_size=${MYSQL_INNODB_LOG_FILE_SIZE:-128M}
       --innodb_flush_log_at_trx_commit=${MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT:-2}

docker/docker-compose.yaml

@@ -70,7 +70,6 @@ x-shared-env: &shared-api-worker-env
   SQLALCHEMY_POOL_PRE_PING: ${SQLALCHEMY_POOL_PRE_PING:-false}
   SQLALCHEMY_POOL_USE_LIFO: ${SQLALCHEMY_POOL_USE_LIFO:-false}
   SQLALCHEMY_POOL_TIMEOUT: ${SQLALCHEMY_POOL_TIMEOUT:-30}
-  SQLALCHEMY_POOL_RESET_ON_RETURN: ${SQLALCHEMY_POOL_RESET_ON_RETURN:-rollback}
   POSTGRES_MAX_CONNECTIONS: ${POSTGRES_MAX_CONNECTIONS:-200}
   POSTGRES_SHARED_BUFFERS: ${POSTGRES_SHARED_BUFFERS:-128MB}
   POSTGRES_WORK_MEM: ${POSTGRES_WORK_MEM:-4MB}
@@ -362,7 +361,7 @@ x-shared-env: &shared-api-worker-env
   VIKINGDB_SECRET_KEY: ${VIKINGDB_SECRET_KEY:-your-sk}
   VIKINGDB_REGION: ${VIKINGDB_REGION:-cn-shanghai}
   VIKINGDB_HOST: ${VIKINGDB_HOST:-api-vikingdb.xxx.volces.com}
-  VIKINGDB_SCHEME: ${VIKINGDB_SCHEME:-http}
+  VIKINGDB_SCHEMA: ${VIKINGDB_SCHEMA:-http}
   VIKINGDB_CONNECTION_TIMEOUT: ${VIKINGDB_CONNECTION_TIMEOUT:-30}
   VIKINGDB_SOCKET_TIMEOUT: ${VIKINGDB_SOCKET_TIMEOUT:-30}
   LINDORM_URL: ${LINDORM_URL:-http://localhost:30070}
@@ -424,6 +423,8 @@ x-shared-env: &shared-api-worker-env
   UNSTRUCTURED_API_URL: ${UNSTRUCTURED_API_URL:-}
   UNSTRUCTURED_API_KEY: ${UNSTRUCTURED_API_KEY:-}
   SCARF_NO_ANALYTICS: ${SCARF_NO_ANALYTICS:-true}
+  PROMPT_GENERATION_MAX_TOKENS: ${PROMPT_GENERATION_MAX_TOKENS:-512}
+  CODE_GENERATION_MAX_TOKENS: ${CODE_GENERATION_MAX_TOKENS:-1024}
   PLUGIN_BASED_TOKEN_COUNTING_ENABLED: ${PLUGIN_BASED_TOKEN_COUNTING_ENABLED:-false}
   MULTIMODAL_SEND_FORMAT: ${MULTIMODAL_SEND_FORMAT:-base64}
   UPLOAD_IMAGE_FILE_SIZE_LIMIT: ${UPLOAD_IMAGE_FILE_SIZE_LIMIT:-10}
@@ -440,10 +441,10 @@ x-shared-env: &shared-api-worker-env
   NOTION_CLIENT_SECRET: ${NOTION_CLIENT_SECRET:-}
   NOTION_CLIENT_ID: ${NOTION_CLIENT_ID:-}
   NOTION_INTERNAL_SECRET: ${NOTION_INTERNAL_SECRET:-}
-  MAIL_TYPE: ${MAIL_TYPE:-resend}
+  MAIL_TYPE: ${MAIL_TYPE:-}
   MAIL_DEFAULT_SEND_FROM: ${MAIL_DEFAULT_SEND_FROM:-}
   RESEND_API_URL: ${RESEND_API_URL:-https://api.resend.com}
-  RESEND_API_KEY: ${RESEND_API_KEY:-your-resend-api-key}
+  RESEND_API_KEY: ${RESEND_API_KEY:-}
   SMTP_SERVER: ${SMTP_SERVER:-}
   SMTP_PORT: ${SMTP_PORT:-465}
   SMTP_USERNAME: ${SMTP_USERNAME:-}
@@ -585,8 +586,8 @@ x-shared-env: &shared-api-worker-env
   NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
   NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
   NGINX_ENABLE_CERTBOT_CHALLENGE: ${NGINX_ENABLE_CERTBOT_CHALLENGE:-false}
-  CERTBOT_EMAIL: ${CERTBOT_EMAIL:-your_email@example.com}
-  CERTBOT_DOMAIN: ${CERTBOT_DOMAIN:-your_domain.com}
+  CERTBOT_EMAIL: ${CERTBOT_EMAIL:-}
+  CERTBOT_DOMAIN: ${CERTBOT_DOMAIN:-}
   CERTBOT_OPTIONS: ${CERTBOT_OPTIONS:-}
   SSRF_HTTP_PORT: ${SSRF_HTTP_PORT:-3128}
   SSRF_COREDUMP_DIR: ${SSRF_COREDUMP_DIR:-/var/spool/squid}
@@ -632,6 +633,7 @@ x-shared-env: &shared-api-worker-env
   CREATORS_PLATFORM_API_URL: ${CREATORS_PLATFORM_API_URL:-https://creators.dify.ai}
   CREATORS_PLATFORM_OAUTH_CLIENT_ID: ${CREATORS_PLATFORM_OAUTH_CLIENT_ID:-}
   FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true}
+  ENFORCE_LANGGENIUS_PLUGIN_SIGNATURES: ${ENFORCE_LANGGENIUS_PLUGIN_SIGNATURES:-true}
   PLUGIN_STDIO_BUFFER_SIZE: ${PLUGIN_STDIO_BUFFER_SIZE:-1024}
   PLUGIN_STDIO_MAX_BUFFER_SIZE: ${PLUGIN_STDIO_MAX_BUFFER_SIZE:-5242880}
   PLUGIN_PYTHON_ENV_INIT_TIMEOUT: ${PLUGIN_PYTHON_ENV_INIT_TIMEOUT:-120}
@@ -892,8 +894,8 @@ services:
       ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
       MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
       MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
-      TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
-      INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-}
+      TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-10}
+      INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-4000}
       LOOP_NODE_MAX_COUNT: ${LOOP_NODE_MAX_COUNT:-100}
       MAX_TOOLS_NUM: ${MAX_TOOLS_NUM:-10}
       MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
@@ -950,7 +952,7 @@ services:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-difyai123456}
       MYSQL_DATABASE: ${DB_DATABASE:-dify}
     command: >
-      --max_connections=${MYSQL_MAX_CONNECTIONS:-1000}
+      --max_connections=1000
       --innodb_buffer_pool_size=${MYSQL_INNODB_BUFFER_POOL_SIZE:-512M}
       --innodb_log_file_size=${MYSQL_INNODB_LOG_FILE_SIZE:-128M}
       --innodb_flush_log_at_trx_commit=${MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT:-2}
@@ -1124,8 +1126,8 @@ services:
       - ./certbot/update-cert.template.txt:/update-cert.template.txt
       - ./certbot/docker-entrypoint.sh:/docker-entrypoint.sh
     environment:
-      - CERTBOT_EMAIL=${CERTBOT_EMAIL}
-      - CERTBOT_DOMAIN=${CERTBOT_DOMAIN}
+      - CERTBOT_EMAIL=${CERTBOT_EMAIL:-}
+      - CERTBOT_DOMAIN=${CERTBOT_DOMAIN:-}
       - CERTBOT_OPTIONS=${CERTBOT_OPTIONS:-}
     entrypoint: ["/docker-entrypoint.sh"]
     command: ["tail", "-f", "/dev/null"]

eslint-suppressions.json

@@ -202,11 +202,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/annotation/add-annotation-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/annotation/batch-add-annotation-modal/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -235,11 +230,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/annotation/edit-annotation-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/annotation/header-opts/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -262,9 +252,6 @@
     "erasable-syntax-only/enums": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 5
     },
@@ -282,6 +269,11 @@
       "count": 4
     }
   },
+  "web/app/components/app/app-publisher/index.tsx": {
+    "ts/no-explicit-any": {
+      "count": 5
+    }
+  },
   "web/app/components/app/app-publisher/version-info-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -352,9 +344,6 @@
     }
   },
   "web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-hooks/exhaustive-deps": {
       "count": 1
     },
@@ -412,16 +401,6 @@
       "count": 2
     }
   },
-  "web/app/components/app/configuration/configuration-view.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/app/configuration/dataset-config/card-item/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/dataset-config/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -552,9 +531,6 @@
     }
   },
   "web/app/components/app/log/list.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 6
     },
@@ -604,9 +580,6 @@
     }
   },
   "web/app/components/app/workflow-log/list.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 2
     }
@@ -931,11 +904,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/drawer-plus/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/base/emoji-picker/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1061,11 +1029,6 @@
       "count": 3
     }
   },
-  "web/app/components/base/float-right-container/index.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
   "web/app/components/base/form/components/base/base-form.tsx": {
     "ts/no-explicit-any": {
       "count": 6
@@ -1270,7 +1233,7 @@
   },
   "web/app/components/base/icons/src/vender/line/development/index.ts": {
     "no-barrel-files/no-barrel-files": {
-      "count": 1
+      "count": 2
     }
   },
   "web/app/components/base/icons/src/vender/line/editor/index.ts": {
@@ -2181,6 +2144,14 @@
       "count": 1
     }
   },
+  "web/app/components/datasets/documents/detail/batch-modal/index.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
+    "react/set-state-in-effect": {
+      "count": 1
+    }
+  },
   "web/app/components/datasets/documents/detail/completed/common/chunk-content.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -2191,6 +2162,11 @@
       "count": 1
     }
   },
+  "web/app/components/datasets/documents/detail/completed/components/index.ts": {
+    "no-barrel-files/no-barrel-files": {
+      "count": 3
+    }
+  },
   "web/app/components/datasets/documents/detail/completed/components/segment-list-content.tsx": {
     "ts/no-non-null-asserted-optional-chain": {
       "count": 1
@@ -2255,6 +2231,14 @@
       "count": 1
     }
   },
+  "web/app/components/datasets/documents/detail/segment-add/index.tsx": {
+    "erasable-syntax-only/enums": {
+      "count": 1
+    },
+    "react-refresh/only-export-components": {
+      "count": 1
+    }
+  },
   "web/app/components/datasets/documents/detail/settings/pipeline-settings/index.tsx": {
     "ts/no-explicit-any": {
       "count": 6
@@ -2296,9 +2280,6 @@
     }
   },
   "web/app/components/datasets/hit-testing/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/unsupported-syntax": {
       "count": 1
     }
@@ -2338,7 +2319,7 @@
   },
   "web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx": {
     "no-restricted-imports": {
-      "count": 3
+      "count": 2
     }
   },
   "web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx": {
@@ -2832,18 +2813,10 @@
     }
   },
   "web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-detail-panel/model-list.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -2865,9 +2838,6 @@
     }
   },
   "web/app/components/plugins/plugin-detail-panel/strategy-detail.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -2926,9 +2896,6 @@
     }
   },
   "web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 5
     }
@@ -2966,6 +2933,16 @@
       "count": 1
     }
   },
+  "web/app/components/plugins/readme-panel/index.tsx": {
+    "react/unsupported-syntax": {
+      "count": 1
+    }
+  },
+  "web/app/components/plugins/readme-panel/store.ts": {
+    "erasable-syntax-only/enums": {
+      "count": 1
+    }
+  },
   "web/app/components/plugins/reference-setting-modal/auto-update-setting/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
@@ -3193,7 +3170,7 @@
   },
   "web/app/components/tools/edit-custom-collection-modal/config-credentials.tsx": {
     "no-restricted-imports": {
-      "count": 2
+      "count": 1
     }
   },
   "web/app/components/tools/edit-custom-collection-modal/get-schema.tsx": {
@@ -3202,9 +3179,6 @@
     }
   },
   "web/app/components/tools/edit-custom-collection-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 4
     },
@@ -3213,9 +3187,6 @@
     }
   },
   "web/app/components/tools/edit-custom-collection-modal/test-api.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -3225,11 +3196,6 @@
       "count": 1
     }
   },
-  "web/app/components/tools/mcp/detail/provider-detail.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/mcp/mcp-server-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3258,20 +3224,12 @@
       "count": 1
     }
   },
-  "web/app/components/tools/provider/detail.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/provider/empty.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
   "web/app/components/tools/setting/build-in/config-credentials.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 3
     }
@@ -4103,11 +4061,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx": {
     "ts/no-explicit-any": {
       "count": 1

packages/dify-ui/README.md

@@ -28,7 +28,6 @@ Always import from a **subpath export** — there is no barrel:
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Dialog, DialogContent, DialogTrigger } from '@langgenius/dify-ui/dialog'
-import { Drawer, DrawerPopup, DrawerTrigger } from '@langgenius/dify-ui/drawer'
 import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import '@langgenius/dify-ui/styles.css' // once, in the app root
 ```
@@ -37,12 +36,12 @@ Importing from `@langgenius/dify-ui` (no subpath) is intentionally not supported
 
 ## Primitives
 
-| Category | Subpath                                                                                                                                                        | Notes                                             |
-| -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- |
-| Overlay  | `./alert-dialog`, `./autocomplete`, `./combobox`, `./context-menu`, `./dialog`, `./drawer`, `./dropdown-menu`, `./popover`, `./select`, `./toast`, `./tooltip` | Portalled. See [Overlay & portal contract] below. |
-| Form     | `./autocomplete`, `./combobox`, `./number-field`, `./slider`, `./switch`                                                                                       | Controlled / uncontrolled per Base UI defaults.   |
-| Layout   | `./scroll-area`                                                                                                                                                | Custom-styled scrollbar over the host viewport.   |
-| Media    | `./avatar`, `./button`                                                                                                                                         | Button exposes `cva` variants.                    |
+| Category | Subpath                                                                                                                                            | Notes                                             |
+| -------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- |
+| Overlay  | `./alert-dialog`, `./autocomplete`, `./combobox`, `./context-menu`, `./dialog`, `./dropdown-menu`, `./popover`, `./select`, `./toast`, `./tooltip` | Portalled. See [Overlay & portal contract] below. |
+| Form     | `./autocomplete`, `./combobox`, `./number-field`, `./slider`, `./switch`                                                                           | Controlled / uncontrolled per Base UI defaults.   |
+| Layout   | `./scroll-area`                                                                                                                                    | Custom-styled scrollbar over the host viewport.   |
+| Media    | `./avatar`, `./button`                                                                                                                             | Button exposes `cva` variants.                    |
 
 Utilities:
 
@@ -66,7 +65,7 @@ If a consumer uses Dify UI source files through the workspace, add an explicit s
 
 ## Overlay & portal contract
 
-Overlay primitives render their floating surfaces inside a [Base UI Portal] attached to `document.body`. This is the Base UI default — see the upstream [Portals][Base UI Portal] docs for the underlying behavior. Convenience content components such as `DialogContent`, `PopoverContent`, and `SelectContent` own their portal internally; primitives with explicit portal anatomy such as `Drawer` expose the matching `DrawerPortal` part so consumers can compose the full Base UI structure.
+All overlay primitives (`dialog`, `alert-dialog`, `autocomplete`, `combobox`, `popover`, `dropdown-menu`, `context-menu`, `select`, `tooltip`, `toast`) render their content inside a [Base UI Portal] attached to `document.body`. This is the Base UI default — see the upstream [Portals][Base UI Portal] docs for the underlying behavior. Consumers **do not** need to wrap anything in a portal manually.
 
 ### Root isolation requirement
 
@@ -84,19 +83,19 @@ Equivalent: any root element with `isolation: isolate` in CSS. Without it, overl
 
 Every overlay primitive uses a single, shared z-index. Do **not** override it at call sites.
 
-| Layer                                                                                                               | z-index  | Where                                                                      |
-| ------------------------------------------------------------------------------------------------------------------- | -------- | -------------------------------------------------------------------------- |
-| Overlays (Dialog, AlertDialog, Autocomplete, Combobox, Drawer, Popover, DropdownMenu, ContextMenu, Select, Tooltip) | `z-1002` | Positioner / Backdrop                                                      |
-| Toast viewport                                                                                                      | `z-1003` | One layer above overlays so notifications are never hidden under a dialog. |
+| Layer                                                                                                       | z-index  | Where                                                                      |
+| ----------------------------------------------------------------------------------------------------------- | -------- | -------------------------------------------------------------------------- |
+| Overlays (Dialog, AlertDialog, Autocomplete, Combobox, Popover, DropdownMenu, ContextMenu, Select, Tooltip) | `z-1002` | Positioner / Backdrop                                                      |
+| Toast viewport                                                                                              | `z-1003` | One layer above overlays so notifications are never hidden under a dialog. |
 
-Rationale: during Dify's migration from legacy `base/modal` / `base/dialog` / `base/drawer` / `base/drawer-plus` overlays to this package, new and old overlays coexist in the DOM. `z-1002` sits above any common legacy layer, eliminating per-call-site z-index hacks. Among themselves, new primitives share the same z-index and **rely on DOM order** for stacking — the portal mounted later wins.
+Rationale: during Dify's migration from legacy `base/modal` / `base/dialog` overlays to this package, new and old overlays coexist in the DOM. `z-1002` sits above any common legacy layer, eliminating per-call-site z-index hacks. Among themselves, new primitives share the same z-index and **rely on DOM order** for stacking — the portal mounted later wins.
 
 See `[web/docs/overlay-migration.md](../../web/docs/overlay-migration.md)` for the Dify-web migration history. Once the legacy overlays are gone, the values in this table can drop back to `z-50` / `z-51`.
 
 ### Rules
 
 - Never add `z-1003` / `z-9999` / etc. overrides on primitives from this package. If something is getting clipped, the **parent** overlay (typically a legacy one) is the problem and should be migrated.
-- Never create an extra manual portal on top of our primitives — use the exported content / portal parts such as `DialogContent`, `PopoverContent`, and `DrawerPortal`. Base UI handles focus management, scroll-locking, and dismissal.
+- Never portal an overlay manually on top of our primitives — use `DialogTrigger`, `PopoverTrigger`, etc. Base UI handles focus management, scroll-locking, and dismissal.
 - When a primitive needs additional presentation chrome (e.g. a custom backdrop), add it **inside** the exported component, not at call sites.
 
 ## Development

packages/dify-ui/package.json

@@ -37,10 +37,6 @@
       "types": "./src/dialog/index.tsx",
       "import": "./src/dialog/index.tsx"
     },
-    "./drawer": {
-      "types": "./src/drawer/index.tsx",
-      "import": "./src/drawer/index.tsx"
-    },
     "./dropdown-menu": {
       "types": "./src/dropdown-menu/index.tsx",
       "import": "./src/dropdown-menu/index.tsx"

packages/dify-ui/src/drawer/__tests__/index.spec.tsx

@@ -1,61 +0,0 @@
-import { render } from 'vitest-browser-react'
-import {
-  Drawer,
-  DrawerBackdrop,
-  DrawerCloseButton,
-  DrawerContent,
-  DrawerDescription,
-  DrawerPopup,
-  DrawerPortal,
-  DrawerTitle,
-  DrawerTrigger,
-  DrawerViewport,
-} from '../index'
-
-const asHTMLElement = (element: HTMLElement | SVGElement) => element as HTMLElement
-
-describe('Drawer wrapper', () => {
-  describe('User Interactions', () => {
-    it('should open a portalled drawer and close it with the default close button', async () => {
-      const screen = await render(
-        <Drawer>
-          <DrawerTrigger>Open settings</DrawerTrigger>
-          <DrawerPortal>
-            <DrawerBackdrop data-testid="drawer-backdrop" />
-            <DrawerViewport>
-              <DrawerPopup>
-                <DrawerTitle>Settings</DrawerTitle>
-                <DrawerDescription>Configure the current workspace.</DrawerDescription>
-                <DrawerContent>
-                  <p>Workspace controls</p>
-                  <DrawerCloseButton />
-                </DrawerContent>
-              </DrawerPopup>
-            </DrawerViewport>
-          </DrawerPortal>
-        </Drawer>,
-      )
-
-      expect(document.body.querySelector('[role="dialog"]')).not.toBeInTheDocument()
-
-      asHTMLElement(screen.getByRole('button', { name: 'Open settings' }).element()).click()
-
-      await vi.waitFor(() => {
-        expect(document.body.querySelector('[role="dialog"]')).toBeInTheDocument()
-      })
-
-      const dialog = asHTMLElement(document.body.querySelector('[role="dialog"]')!)
-      expect(document.body).toContainElement(dialog)
-      expect(screen.container).not.toContainElement(dialog)
-      await expect.element(dialog).toHaveTextContent('Workspace controls')
-      await expect.element(screen.getByText('Configure the current workspace.')).toBeInTheDocument()
-      await expect.element(screen.getByTestId('drawer-backdrop')).toHaveClass('z-1002')
-
-      asHTMLElement(screen.getByRole('button', { name: 'Close drawer' }).element()).click()
-
-      await vi.waitFor(() => {
-        expect(document.body.querySelector('[role="dialog"]')).not.toBeInTheDocument()
-      })
-    })
-  })
-})

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

@@ -1,116 +0,0 @@
-'use client'
-
-import type { ReactNode } from 'react'
-import { Drawer as BaseDrawer } from '@base-ui/react/drawer'
-import { cn } from '../cn'
-
-export const Drawer = BaseDrawer.Root
-export const DrawerProvider = BaseDrawer.Provider
-export const DrawerIndent = BaseDrawer.Indent
-export const DrawerIndentBackground = BaseDrawer.IndentBackground
-export const DrawerTrigger = BaseDrawer.Trigger
-export const DrawerSwipeArea = BaseDrawer.SwipeArea
-export const DrawerPortal = BaseDrawer.Portal
-export const DrawerTitle = BaseDrawer.Title
-export const DrawerDescription = BaseDrawer.Description
-export const DrawerClose = BaseDrawer.Close
-export const createDrawerHandle = BaseDrawer.createHandle
-
-export type DrawerRootProps<Payload = unknown> = BaseDrawer.Root.Props<Payload>
-export type DrawerRootActions = BaseDrawer.Root.Actions
-export type DrawerRootChangeEventDetails = BaseDrawer.Root.ChangeEventDetails
-export type DrawerRootChangeEventReason = BaseDrawer.Root.ChangeEventReason
-export type DrawerRootSnapPoint = BaseDrawer.Root.SnapPoint
-export type DrawerRootSnapPointChangeEventDetails = BaseDrawer.Root.SnapPointChangeEventDetails
-export type DrawerRootSnapPointChangeEventReason = BaseDrawer.Root.SnapPointChangeEventReason
-export type DrawerTriggerProps<Payload = unknown> = BaseDrawer.Trigger.Props<Payload>
-
-export function DrawerBackdrop({
-  className,
-  ...props
-}: BaseDrawer.Backdrop.Props) {
-  return (
-    <BaseDrawer.Backdrop
-      className={cn(
-        'fixed inset-0 z-1002 bg-background-overlay opacity-[calc(1-var(--drawer-swipe-progress,0))]',
-        'transition-opacity duration-200 data-ending-style:opacity-0 data-starting-style:opacity-0 data-swiping:duration-0 motion-reduce:transition-none',
-        className,
-      )}
-      {...props}
-    />
-  )
-}
-
-export function DrawerViewport({
-  className,
-  ...props
-}: BaseDrawer.Viewport.Props) {
-  return (
-    <BaseDrawer.Viewport
-      className={cn('fixed inset-0 z-1002 touch-none overflow-hidden overscroll-contain outline-hidden', className)}
-      {...props}
-    />
-  )
-}
-
-export function DrawerPopup({
-  className,
-  ...props
-}: BaseDrawer.Popup.Props) {
-  return (
-    <BaseDrawer.Popup
-      className={cn(
-        'fixed z-1002 flex min-h-0 flex-col overflow-hidden border-[0.5px] border-components-panel-border bg-components-panel-bg text-text-primary shadow-xl outline-hidden touch-none',
-        'transition-[transform,opacity,box-shadow] duration-200 data-swiping:select-none data-swiping:duration-0 motion-reduce:transition-none',
-        'data-[swipe-direction=right]:inset-y-0 data-[swipe-direction=right]:right-0 data-[swipe-direction=right]:h-dvh data-[swipe-direction=right]:w-120 data-[swipe-direction=right]:max-w-[calc(100vw-2rem)] data-[swipe-direction=right]:rounded-l-2xl data-[swipe-direction=right]:border-r-0 data-[swipe-direction=right]:transform-[translateX(var(--drawer-swipe-movement-x,0px))]',
-        'data-starting-style:data-[swipe-direction=right]:transform-[translateX(calc(100%+2px))] data-ending-style:data-[swipe-direction=right]:transform-[translateX(calc(100%+2px))]',
-        'data-[swipe-direction=left]:inset-y-0 data-[swipe-direction=left]:left-0 data-[swipe-direction=left]:h-dvh data-[swipe-direction=left]:w-120 data-[swipe-direction=left]:max-w-[calc(100vw-2rem)] data-[swipe-direction=left]:rounded-r-2xl data-[swipe-direction=left]:border-l-0 data-[swipe-direction=left]:transform-[translateX(var(--drawer-swipe-movement-x,0px))]',
-        'data-starting-style:data-[swipe-direction=left]:transform-[translateX(calc(-100%-2px))] data-ending-style:data-[swipe-direction=left]:transform-[translateX(calc(-100%-2px))]',
-        'data-[swipe-direction=down]:inset-x-0 data-[swipe-direction=down]:bottom-0 data-[swipe-direction=down]:max-h-[calc(100dvh-2rem)] data-[swipe-direction=down]:w-full data-[swipe-direction=down]:rounded-t-2xl data-[swipe-direction=down]:border-b-0 data-[swipe-direction=down]:transform-[translateY(calc(var(--drawer-snap-point-offset,0px)+var(--drawer-swipe-movement-y,0px)))]',
-        'data-starting-style:data-[swipe-direction=down]:transform-[translateY(calc(100%+2px))] data-ending-style:data-[swipe-direction=down]:transform-[translateY(calc(100%+2px))]',
-        'data-[swipe-direction=up]:inset-x-0 data-[swipe-direction=up]:top-0 data-[swipe-direction=up]:max-h-[calc(100dvh-2rem)] data-[swipe-direction=up]:w-full data-[swipe-direction=up]:rounded-b-2xl data-[swipe-direction=up]:border-t-0 data-[swipe-direction=up]:transform-[translateY(var(--drawer-swipe-movement-y,0px))]',
-        'data-starting-style:data-[swipe-direction=up]:transform-[translateY(calc(-100%-2px))] data-ending-style:data-[swipe-direction=up]:transform-[translateY(calc(-100%-2px))]',
-        className,
-      )}
-      {...props}
-    />
-  )
-}
-
-export function DrawerContent({
-  className,
-  ...props
-}: BaseDrawer.Content.Props) {
-  return (
-    <BaseDrawer.Content
-      className={cn('min-h-0 flex-1 overflow-y-auto overscroll-contain p-6 pb-[calc(1.5rem+env(safe-area-inset-bottom,0))]', className)}
-      {...props}
-    />
-  )
-}
-
-type DrawerCloseButtonProps = Omit<BaseDrawer.Close.Props, 'children'> & {
-  children?: ReactNode
-}
-
-export function DrawerCloseButton({
-  className,
-  children,
-  type = 'button',
-  'aria-label': ariaLabel = 'Close drawer',
-  ...props
-}: DrawerCloseButtonProps) {
-  return (
-    <BaseDrawer.Close
-      type={type}
-      aria-label={ariaLabel}
-      className={cn(
-        'flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg text-text-tertiary outline-hidden hover:bg-state-base-hover hover:text-text-secondary focus-visible:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover disabled:cursor-not-allowed disabled:opacity-50',
-        className,
-      )}
-      {...props}
-    >
-      {children ?? <span aria-hidden="true" className="i-ri-close-line h-4 w-4" />}
-    </BaseDrawer.Close>
-  )
-}

web/__tests__/explore/explore-app-list-flow.test.tsx

@@ -127,7 +127,7 @@ const createApp = (overrides: Partial<App> = {}): App => ({
   copyright: overrides.copyright ?? '',
   privacy_policy: overrides.privacy_policy ?? null,
   custom_disclaimer: overrides.custom_disclaimer ?? null,
-  categories: overrides.categories ?? ['Writing'],
+  category: overrides.category ?? 'Writing',
   position: overrides.position ?? 1,
   is_listed: overrides.is_listed ?? true,
   install_count: overrides.install_count ?? 0,
@@ -165,9 +165,9 @@ describe('Explore App List Flow', () => {
     mockExploreData = {
       categories: ['Writing', 'Translate', 'Programming'],
       allList: [
-        createApp({ app_id: 'app-1', app: { ...createApp().app, name: 'Writer Bot' }, categories: ['Writing'] }),
-        createApp({ app_id: 'app-2', app: { ...createApp().app, id: 'app-id-2', name: 'Translator' }, categories: ['Translate'] }),
-        createApp({ app_id: 'app-3', app: { ...createApp().app, id: 'app-id-3', name: 'Code Helper' }, categories: ['Programming'] }),
+        createApp({ app_id: 'app-1', app: { ...createApp().app, name: 'Writer Bot' }, category: 'Writing' }),
+        createApp({ app_id: 'app-2', app: { ...createApp().app, id: 'app-id-2', name: 'Translator' }, category: 'Translate' }),
+        createApp({ app_id: 'app-3', app: { ...createApp().app, id: 'app-id-3', name: 'Code Helper' }, category: 'Programming' }),
       ],
     }
   })
@@ -190,30 +190,6 @@ describe('Explore App List Flow', () => {
       expect(screen.queryByText('Code Helper')).not.toBeInTheDocument()
     })
 
-    it('should only use categories when filtering by selected category', () => {
-      mockTabValue = 'Writing'
-      mockExploreData = {
-        categories: ['Writing', 'Translate'],
-        allList: [
-          createApp({
-            app_id: 'app-1',
-            app: { ...createApp().app, name: 'Active Writer' },
-            categories: ['Writing'],
-          }),
-          createApp({
-            app_id: 'app-2',
-            app: { ...createApp().app, id: 'app-id-2', name: 'Legacy Writer' },
-            categories: [],
-          }),
-        ],
-      }
-
-      renderAppList()
-
-      expect(screen.getByText('Active Writer')).toBeInTheDocument()
-      expect(screen.queryByText('Legacy Writer')).not.toBeInTheDocument()
-    })
-
     it('should filter apps by search keyword', async () => {
       renderAppList()
 

web/__tests__/tools/tool-provider-detail-flow.test.tsx

@@ -205,7 +205,7 @@ vi.mock('@/app/components/tools/setting/build-in/config-credentials', () => ({
 }))
 
 vi.mock('@/app/components/tools/workflow-tool', () => ({
-  WorkflowToolDrawer: ({ onHide, onSave, onRemove }: { payload: unknown, onHide: () => void, onSave: (d: unknown) => void, onRemove: () => void }) => (
+  default: ({ onHide, onSave, onRemove }: { payload: unknown, onHide: () => void, onSave: (d: unknown) => void, onRemove: () => void }) => (
     <div data-testid="workflow-tool-modal">
       <button data-testid="wf-modal-hide" onClick={onHide}>Hide</button>
       <button data-testid="wf-modal-save" onClick={() => onSave({ name: 'updated-wf' })}>Save</button>

web/app/(shareLayout)/components/authenticated-layout.tsx

@@ -39,9 +39,7 @@ const AuthenticatedLayout = ({ children }: { children: React.ReactNode }) => {
   const getSigninUrl = useCallback(() => {
     const params = new URLSearchParams(searchParams)
     params.delete('message')
-    const query = params.toString()
-    const fullPath = query ? `${pathname}?${query}` : pathname
-    params.set('redirect_url', fullPath)
+    params.set('redirect_url', pathname)
     return `/webapp-signin?${params.toString()}`
   }, [searchParams, pathname])
 

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

@@ -97,7 +97,7 @@ const AppInfoDetailPanel = ({
     <ContentDialog
       show={show}
       onClose={onClose}
-      className="absolute top-2 bottom-2 left-2 flex w-[452px] max-w-[calc(100vw-1rem)] flex-col rounded-2xl p-0!"
+      className="absolute top-2 bottom-2 left-2 flex w-[420px] flex-col rounded-2xl p-0!"
     >
       <div className="flex shrink-0 flex-col items-start justify-center gap-3 self-stretch p-4">
         <div className="flex items-center gap-3 self-stretch">

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

@@ -20,7 +20,6 @@ const mockOpenAsyncWindow = vi.fn()
 const mockFetchInstalledAppList = vi.fn()
 const mockFetchAppDetailDirect = vi.fn()
 const mockToastError = vi.fn()
-const mockWindowOpen = vi.fn()
 const mockInvalidateAppWorkflow = vi.fn()
 
 const sectionProps = vi.hoisted(() => ({
@@ -38,7 +37,6 @@ vi.mock('react-i18next', () => ({
   useTranslation: () => ({
     t: (key: string) => key,
   }),
-  Trans: ({ i18nKey }: { i18nKey?: string }) => i18nKey ?? null,
 }))
 
 vi.mock('ahooks', async () => {
@@ -93,21 +91,6 @@ vi.mock('@/service/use-workflow', () => ({
   useInvalidateAppWorkflow: () => mockInvalidateAppWorkflow,
 }))
 
-vi.mock('@/service/use-tools', () => ({
-  useWorkflowToolDetailByAppID: () => ({
-    data: undefined,
-    isLoading: false,
-  }),
-  useInvalidateAllWorkflowTools: () => vi.fn(),
-  useInvalidateWorkflowToolDetailByAppID: () => vi.fn(),
-}))
-
-vi.mock('@/context/app-context', () => ({
-  useAppContext: () => ({
-    isCurrentWorkspaceManager: true,
-  }),
-}))
-
 vi.mock('@langgenius/dify-ui/toast', () => ({
   toast: {
     error: (...args: unknown[]) => mockToastError(...args),
@@ -138,15 +121,6 @@ vi.mock('../../app-access-control', () => ({
   ),
 }))
 
-vi.mock('@/app/components/tools/workflow-tool', () => ({
-  WorkflowToolDrawer: ({ onHide }: { onHide: () => void }) => (
-    <div data-testid="workflow-tool-drawer">
-      workflow tool drawer
-      <button onClick={onHide}>close-workflow-tool-drawer</button>
-    </div>
-  ),
-}))
-
 vi.mock('@langgenius/dify-ui/popover', () => import('@/__mocks__/base-ui-popover'))
 
 vi.mock('../sections', () => ({
@@ -169,13 +143,6 @@ vi.mock('../sections', () => ({
       <div>
         <button onClick={props.handleEmbed}>publisher-embed</button>
         <button onClick={() => void props.handleOpenInExplore()}>publisher-open-in-explore</button>
-        {props.handleOpenRunConfig && (
-          <>
-            <button onClick={() => props.handleOpenRunConfig(props.appURL)}>publisher-run-config</button>
-            <button onClick={() => props.handleOpenRunConfig(`${props.appURL}?mode=batch`)}>publisher-batch-run-config</button>
-          </>
-        )}
-        <button onClick={props.onConfigureWorkflowTool}>publisher-workflow-tool</button>
       </div>
     )
   },
@@ -208,10 +175,6 @@ describe('AppPublisher', () => {
     mockOpenAsyncWindow.mockImplementation(async (resolver: () => Promise<string>) => {
       await resolver()
     })
-    Object.defineProperty(window, 'open', {
-      writable: true,
-      value: mockWindowOpen,
-    })
   })
 
   it('should open the publish popover and refetch access permission data', async () => {
@@ -268,94 +231,6 @@ describe('AppPublisher', () => {
     expect(screen.getByTestId('embedded-modal'))!.toBeInTheDocument()
   })
 
-  it('should collect hidden inputs before opening published run links from config actions', async () => {
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-        inputs={[{
-          variable: 'secret',
-          label: 'Secret',
-          type: 'text-input',
-          required: true,
-          hide: true,
-          default: '',
-        } as any]}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-    fireEvent.click(screen.getByText('publisher-run-config'))
-
-    expect(screen.getByText('overview.appInfo.workflowLaunchHiddenInputs.title')).toBeInTheDocument()
-
-    fireEvent.change(screen.getByLabelText('Secret'), {
-      target: { value: 'top-secret' },
-    })
-    fireEvent.click(screen.getByRole('button', { name: 'overview.appInfo.launch' }))
-
-    await waitFor(() => {
-      expect(mockWindowOpen).toHaveBeenCalledWith(
-        `https://example.com${basePath}/chat/token-1?secret=${encodeURIComponent('top-secret')}`,
-        '_blank',
-      )
-    })
-  })
-
-  it('should open batch run config links with the configured hidden inputs', async () => {
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-    }
-
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-        inputs={[{
-          variable: 'batch_secret',
-          label: 'Batch Secret',
-          type: 'text-input',
-          required: true,
-          hide: true,
-          default: '',
-        } as any]}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-    fireEvent.click(screen.getByText('publisher-batch-run-config'))
-
-    fireEvent.change(screen.getByLabelText('Batch Secret'), {
-      target: { value: 'batch-value' },
-    })
-    fireEvent.click(screen.getByRole('button', { name: 'overview.appInfo.launch' }))
-
-    await waitFor(() => {
-      expect(mockWindowOpen).toHaveBeenCalledWith(
-        `https://example.com${basePath}/workflow/token-1?mode=batch&batch_secret=${encodeURIComponent('batch-value')}`,
-        '_blank',
-      )
-    })
-  })
-
-  it('should keep workflow tool drawer mounted after closing the publish popover', () => {
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-    }
-
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-    fireEvent.click(screen.getByText('publisher-workflow-tool'))
-
-    expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
-    expect(screen.getByTestId('workflow-tool-drawer')).toBeInTheDocument()
-  })
-
   it('should close embedded and access control panels through child callbacks', async () => {
     render(
       <AppPublisher

web/app/components/app/app-publisher/__tests__/sections.spec.tsx

@@ -18,32 +18,8 @@ vi.mock('../publish-with-multiple-model', () => ({
 }))
 
 vi.mock('../suggested-action', () => ({
-  default: ({
-    children,
-    onClick,
-    link,
-    disabled,
-    actionButton,
-  }: {
-    children: ReactNode
-    onClick?: () => void
-    link?: string
-    disabled?: boolean
-    actionButton?: { ariaLabel: string, onClick: () => void }
-  }) => (
-    <div>
-      <button type="button" data-link={link} disabled={disabled} onClick={onClick}>{children}</button>
-      {actionButton && (
-        <button
-          type="button"
-          aria-label={actionButton.ariaLabel}
-          disabled={disabled}
-          onClick={actionButton.onClick}
-        >
-          {actionButton.ariaLabel}
-        </button>
-      )}
-    </div>
+  default: ({ children, onClick, link, disabled }: { children: ReactNode, onClick?: () => void, link?: string, disabled?: boolean }) => (
+    <button type="button" data-link={link} disabled={disabled} onClick={onClick}>{children}</button>
   ),
 }))
 
@@ -194,25 +170,9 @@ describe('app-publisher sections', () => {
     expect(render(<AccessModeDisplay />).container).toBeEmptyDOMElement()
   })
 
-  it('should hide access control content when enabled is false', () => {
-    render(
-      <PublisherAccessSection
-        enabled={false}
-        isAppAccessSet
-        isLoading={false}
-        accessMode={AccessMode.PUBLIC}
-        onClick={vi.fn()}
-      />,
-    )
-
-    expect(screen.queryByText('publishApp.title')).not.toBeInTheDocument()
-    expect(screen.queryByText('accessControlDialog.accessItems.anyone')).not.toBeInTheDocument()
-  })
-
   it('should render workflow actions, batch run links, and workflow tool configuration', () => {
     const handleOpenInExplore = vi.fn()
     const handleEmbed = vi.fn()
-    const handleOpenRunConfig = vi.fn()
 
     const { rerender } = render(
       <PublisherActionsSection
@@ -230,30 +190,22 @@ describe('app-publisher sections', () => {
         disabledFunctionTooltip="disabled"
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
-        handleOpenRunConfig={handleOpenRunConfig}
         handlePublish={vi.fn()}
         hasHumanInputNode={false}
         hasTriggerNode={false}
+        inputs={[]}
         missingStartNode={false}
-        published={false}
+        onRefreshData={vi.fn()}
+        outputs={[]}
+        published={true}
         publishedAt={Date.now()}
-        showBatchRunConfig
-        showRunConfig
         toolPublished
         workflowToolAvailable={false}
-        workflowToolIsLoading={false}
-        workflowToolOutdated={false}
-        workflowToolIsCurrentWorkspaceManager
         workflowToolMessage="workflow-disabled"
-        onConfigureWorkflowTool={vi.fn()}
       />,
     )
 
     expect(screen.getByText('common.batchRunApp')).toHaveAttribute('data-link', 'https://example.com/app?mode=batch')
-    fireEvent.click(screen.getAllByRole('button', { name: 'operation.config' })[0]!)
-    expect(handleOpenRunConfig).toHaveBeenCalledWith('https://example.com/app')
-    fireEvent.click(screen.getAllByRole('button', { name: 'operation.config' })[1]!)
-    expect(handleOpenRunConfig).toHaveBeenCalledWith('https://example.com/app?mode=batch')
     fireEvent.click(screen.getByText('common.openInExplore'))
     expect(handleOpenInExplore).toHaveBeenCalled()
     expect(screen.getByText('workflow-tool-configure')).toBeInTheDocument()
@@ -271,19 +223,17 @@ describe('app-publisher sections', () => {
         disabledFunctionTooltip="disabled"
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
-        handleOpenRunConfig={handleOpenRunConfig}
         handlePublish={vi.fn()}
         hasHumanInputNode={false}
         hasTriggerNode={false}
+        inputs={[]}
         missingStartNode
+        onRefreshData={vi.fn()}
+        outputs={[]}
         published={false}
         publishedAt={Date.now()}
         toolPublished={false}
         workflowToolAvailable
-        workflowToolIsLoading={false}
-        workflowToolOutdated={false}
-        workflowToolIsCurrentWorkspaceManager
-        onConfigureWorkflowTool={vi.fn()}
       />,
     )
 
@@ -298,19 +248,16 @@ describe('app-publisher sections', () => {
         disabledFunctionButton={false}
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
-        handleOpenRunConfig={handleOpenRunConfig}
         handlePublish={vi.fn()}
         hasHumanInputNode={false}
         hasTriggerNode
+        inputs={[]}
         missingStartNode={false}
+        outputs={[]}
         published={false}
         publishedAt={undefined}
         toolPublished={false}
         workflowToolAvailable
-        workflowToolIsLoading={false}
-        workflowToolOutdated={false}
-        workflowToolIsCurrentWorkspaceManager
-        onConfigureWorkflowTool={vi.fn()}
       />,
     )
 

web/app/components/app/app-publisher/__tests__/suggested-action.spec.tsx

@@ -46,47 +46,4 @@ describe('SuggestedAction', () => {
 
     expect(handleClick).toHaveBeenCalledTimes(1)
   })
-
-  it('should render and trigger the trailing action button when configured', () => {
-    const handleActionClick = vi.fn()
-
-    render(
-      <SuggestedAction
-        link="https://example.com/docs"
-        actionButton={{
-          ariaLabel: 'Configure action',
-          icon: <span>config</span>,
-          onClick: handleActionClick,
-        }}
-      >
-        Configurable action
-      </SuggestedAction>,
-    )
-
-    fireEvent.click(screen.getByRole('button', { name: 'Configure action' }))
-
-    expect(screen.getByRole('link', { name: 'Configurable action' })).toHaveAttribute('href', 'https://example.com/docs')
-    expect(handleActionClick).toHaveBeenCalledTimes(1)
-  })
-
-  it('should block action button clicks when disabled', () => {
-    const handleActionClick = vi.fn()
-
-    render(
-      <SuggestedAction
-        link="https://example.com/docs"
-        disabled
-        actionButton={{
-          ariaLabel: 'Configure action',
-          icon: <span>config</span>,
-          onClick: handleActionClick,
-        }}
-      >
-        Disabled with action
-      </SuggestedAction>,
-    )
-
-    fireEvent.click(screen.getByRole('button', { name: 'Configure action' }))
-    expect(handleActionClick).not.toHaveBeenCalled()
-  })
 })

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

@@ -1,40 +1,28 @@
-import type { FormEvent } from 'react'
 import type { ModelAndParameter } from '../configuration/debug/types'
-import type { WorkflowHiddenStartVariable, WorkflowLaunchInputValue } from '@/app/components/app/overview/app-card-utils'
 import type { CollaborationUpdate } from '@/app/components/workflow/collaboration/types/collaboration'
 import type { InputVar, Variable } from '@/app/components/workflow/types'
 import type { PublishWorkflowParams } from '@/types/workflow'
 import { Button } from '@langgenius/dify-ui/button'
 import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { toast } from '@langgenius/dify-ui/toast'
+import { RiStoreLine } from '@remixicon/react'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useKeyPress } from 'ahooks'
 import {
-
   memo,
-  use,
   useCallback,
+  useContext,
   useEffect,
   useMemo,
   useState,
 } from 'react'
 import { useTranslation } from 'react-i18next'
-import { WorkflowLaunchDialog } from '@/app/components/app/overview/app-card-sections'
-import {
-  buildWorkflowLaunchUrl,
-  createWorkflowLaunchInitialValues,
-  isWorkflowLaunchInputSupported,
-
-} from '@/app/components/app/overview/app-card-utils'
 import EmbeddedModal from '@/app/components/app/overview/embedded'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import { trackEvent } from '@/app/components/base/amplitude'
-import { WorkflowToolDrawer } from '@/app/components/tools/workflow-tool'
-import { useConfigureButton } from '@/app/components/tools/workflow-tool/hooks/use-configure-button'
 import { collaborationManager } from '@/app/components/workflow/collaboration/core/collaboration-manager'
 import { webSocketClient } from '@/app/components/workflow/collaboration/core/websocket-manager'
 import { WorkflowContext } from '@/app/components/workflow/context'
-import { appDefaultIconBackground } from '@/config'
 import { useAsyncWindowOpen } from '@/hooks/use-async-window-open'
 import { useFormatTimeFromNow } from '@/hooks/use-format-time-from-now'
 import { AccessMode } from '@/models/access-control'
@@ -69,8 +57,8 @@ export type AppPublisherProps = {
   debugWithMultipleModel?: boolean
   multipleModelConfigs?: ModelAndParameter[]
   /** modelAndParameter is passed when debugWithMultipleModel is true */
-  onPublish?: AppPublisherPublishHandler
-  onRestore?: AppPublisherRestoreHandler
+  onPublish?: (params?: any) => Promise<any> | any
+  onRestore?: () => Promise<any> | any
   onToggle?: (state: boolean) => void
   crossAxisOffset?: number
   toolPublished?: boolean
@@ -86,12 +74,6 @@ export type AppPublisherProps = {
 
 const PUBLISH_SHORTCUT = ['ctrl', '⇧', 'P']
 
-type AppPublisherPublishHandler
-  = | ((params?: ModelAndParameter | PublishWorkflowParams) => Promise<unknown> | unknown)
-    | ((params?: unknown) => Promise<unknown> | unknown)
-
-type AppPublisherRestoreHandler = () => Promise<unknown> | unknown
-
 const AppPublisher = ({
   disabled = false,
   publishDisabled = false,
@@ -118,15 +100,11 @@ const AppPublisher = ({
   const [published, setPublished] = useState(false)
   const [open, setOpen] = useState(false)
   const [showAppAccessControl, setShowAppAccessControl] = useState(false)
-  const [workflowToolDrawerOpen, setWorkflowToolDrawerOpen] = useState(false)
 
   const [embeddingModalOpen, setEmbeddingModalOpen] = useState(false)
-  const [workflowLaunchDialogOpen, setWorkflowLaunchDialogOpen] = useState(false)
-  const [workflowLaunchTargetUrl, setWorkflowLaunchTargetUrl] = useState('')
-  const [workflowLaunchValues, setWorkflowLaunchValues] = useState<Record<string, WorkflowLaunchInputValue>>({})
   const [publishingToMarketplace, setPublishingToMarketplace] = useState(false)
 
-  const workflowStore = use(WorkflowContext)
+  const workflowStore = useContext(WorkflowContext)
   const appDetail = useAppStore(state => state.appDetail)
   const setAppDetail = useAppStore(s => s.setAppDetail)
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
@@ -135,22 +113,6 @@ const AppPublisher = ({
 
   const appURL = getPublisherAppUrl({ appBaseUrl: appBaseURL, accessToken, mode: appDetail?.mode })
   const isChatApp = [AppModeEnum.CHAT, AppModeEnum.AGENT_CHAT, AppModeEnum.COMPLETION].includes(appDetail?.mode || AppModeEnum.CHAT)
-  const hiddenLaunchVariables = useMemo<WorkflowHiddenStartVariable[]>(
-    () => (inputs ?? []).filter(input => input.hide === true),
-    [inputs],
-  )
-  const supportedWorkflowLaunchVariables = useMemo(
-    () => hiddenLaunchVariables.filter(isWorkflowLaunchInputSupported),
-    [hiddenLaunchVariables],
-  )
-  const unsupportedWorkflowLaunchVariables = useMemo(
-    () => hiddenLaunchVariables.filter(variable => !isWorkflowLaunchInputSupported(variable)),
-    [hiddenLaunchVariables],
-  )
-  const initialWorkflowLaunchValues = useMemo(
-    () => createWorkflowLaunchInitialValues(supportedWorkflowLaunchVariables),
-    [supportedWorkflowLaunchVariables],
-  )
 
   const { data: userCanAccessApp, isLoading: isGettingUserCanAccessApp, refetch } = useGetUserCanAccessApp({ appId: appDetail?.id, enabled: false })
   const { data: appAccessSubjects, isLoading: isGettingAppWhiteListSubjects } = useAppWhiteListSubjects(appDetail?.id, open && systemFeatures.webapp_auth.enabled && appDetail?.access_mode === AccessMode.SPECIFIC_GROUPS_MEMBERS)
@@ -260,31 +222,6 @@ const AppPublisher = ({
     }
   }, [appDetail, setAppDetail])
 
-  const handleOpenWorkflowLaunchDialog = useCallback((targetUrl: string) => {
-    setWorkflowLaunchValues(initialWorkflowLaunchValues)
-    setWorkflowLaunchTargetUrl(targetUrl)
-    setWorkflowLaunchDialogOpen(true)
-  }, [initialWorkflowLaunchValues])
-
-  const handleWorkflowLaunchValueChange = useCallback((variable: string, value: WorkflowLaunchInputValue) => {
-    setWorkflowLaunchValues(prev => ({
-      ...prev,
-      [variable]: value,
-    }))
-  }, [])
-
-  const handleWorkflowLaunchConfirm = useCallback(async (event: FormEvent<HTMLFormElement>) => {
-    event.preventDefault()
-
-    const targetUrl = await buildWorkflowLaunchUrl({
-      accessibleUrl: workflowLaunchTargetUrl,
-      variables: supportedWorkflowLaunchVariables,
-      values: workflowLaunchValues,
-    })
-
-    window.open(targetUrl, '_blank')
-    setWorkflowLaunchDialogOpen(false)
-  }, [supportedWorkflowLaunchVariables, workflowLaunchTargetUrl, workflowLaunchValues])
   const handlePublishToMarketplace = useCallback(async () => {
     if (!appDetail?.id || publishingToMarketplace)
       return
@@ -336,31 +273,6 @@ const AppPublisher = ({
   const workflowToolMessage = !hasPublishedVersion || !workflowToolAvailable
     ? t('common.workflowAsToolDisabledHint', { ns: 'workflow' })
     : undefined
-  const workflowToolVisible = appDetail?.mode === AppModeEnum.WORKFLOW && !hasHumanInputNode && !hasTriggerNode
-  const workflowToolPublished = !!toolPublished
-  const closeWorkflowToolDrawer = useCallback(() => setWorkflowToolDrawerOpen(false), [])
-  const workflowToolIcon = useMemo(() => ({
-    content: (appDetail?.icon_type === 'image' ? '🤖' : appDetail?.icon) || '🤖',
-    background: (appDetail?.icon_type === 'image' ? appDefaultIconBackground : appDetail?.icon_background) || appDefaultIconBackground,
-  }), [appDetail?.icon, appDetail?.icon_background, appDetail?.icon_type])
-  const workflowTool = useConfigureButton({
-    enabled: workflowToolVisible,
-    published: workflowToolPublished,
-    detailNeedUpdate: workflowToolPublished && published,
-    workflowAppId: appDetail?.id ?? '',
-    icon: workflowToolIcon,
-    name: appDetail?.name ?? '',
-    description: appDetail?.description ?? '',
-    inputs,
-    outputs,
-    handlePublish,
-    onRefreshData,
-    onConfigured: closeWorkflowToolDrawer,
-  })
-  const openWorkflowToolDrawer = useCallback(() => {
-    handleOpenChange(false)
-    setWorkflowToolDrawerOpen(true)
-  }, [handleOpenChange])
   const upgradeHighlightStyle = useMemo(() => ({
     background: 'linear-gradient(97deg, var(--components-input-border-active-prompt-1, rgba(11, 165, 236, 0.95)) -3.64%, var(--components-input-border-active-prompt-2, rgba(21, 90, 239, 0.95)) 45.14%)',
     WebkitBackgroundClip: 'text',
@@ -431,27 +343,23 @@ const AppPublisher = ({
                 handleOpenChange(false)
                 handleOpenInExplore()
               }}
-              handleOpenRunConfig={handleOpenWorkflowLaunchDialog}
               handlePublish={handlePublish}
               hasHumanInputNode={hasHumanInputNode}
               hasTriggerNode={hasTriggerNode}
+              inputs={inputs}
               missingStartNode={missingStartNode}
+              onRefreshData={onRefreshData}
+              outputs={outputs}
               published={published}
               publishedAt={publishedAt}
-              showBatchRunConfig={hiddenLaunchVariables.length > 0 && (appDetail?.mode === AppModeEnum.WORKFLOW || appDetail?.mode === AppModeEnum.COMPLETION)}
-              showRunConfig={hiddenLaunchVariables.length > 0}
               toolPublished={toolPublished}
               workflowToolAvailable={workflowToolAvailable}
-              workflowToolIsLoading={workflowTool.isLoading}
-              workflowToolOutdated={workflowTool.outdated}
-              workflowToolIsCurrentWorkspaceManager={workflowTool.isCurrentWorkspaceManager}
               workflowToolMessage={workflowToolMessage}
-              onConfigureWorkflowTool={openWorkflowToolDrawer}
             />
             {systemFeatures.enable_creators_platform && (
               <div className="border-t border-divider-subtle p-4">
                 <SuggestedAction
-                  icon={<span className="i-ri-store-line h-4 w-4" />}
+                  icon={<RiStoreLine className="h-4 w-4" />}
                   disabled={!publishedAt || publishingToMarketplace}
                   onClick={handlePublishToMarketplace}
                 >
@@ -469,29 +377,9 @@ const AppPublisher = ({
           onClose={() => setEmbeddingModalOpen(false)}
           appBaseUrl={appBaseURL}
           accessToken={accessToken}
-          hiddenInputs={hiddenLaunchVariables}
         />
         {showAppAccessControl && <AccessControl app={appDetail!} onConfirm={handleAccessControlUpdate} onClose={() => { setShowAppAccessControl(false) }} />}
-        <WorkflowLaunchDialog
-          t={t}
-          open={workflowLaunchDialogOpen}
-          hiddenVariables={supportedWorkflowLaunchVariables}
-          unsupportedVariables={unsupportedWorkflowLaunchVariables}
-          values={workflowLaunchValues}
-          onOpenChange={setWorkflowLaunchDialogOpen}
-          onValueChange={handleWorkflowLaunchValueChange}
-          onSubmit={handleWorkflowLaunchConfirm}
-        />
       </Popover>
-      {workflowToolDrawerOpen && (
-        <WorkflowToolDrawer
-          isAdd={!workflowToolPublished}
-          payload={workflowTool.payload}
-          onHide={closeWorkflowToolDrawer}
-          onCreate={workflowTool.handleCreate}
-          onSave={workflowTool.handleUpdate}
-        />
-      )}
     </>
   )
 }

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

@@ -8,12 +8,13 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from '@langgenius/dify-ui/tooltip'
-import { RiSettings2Line } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
+import { CodeBrowser } from '@/app/components/base/icons/src/vender/line/development'
 import Loading from '@/app/components/base/loading'
 import UpgradeBtn from '@/app/components/billing/upgrade-btn'
 import WorkflowToolConfigureButton from '@/app/components/tools/workflow-tool/configure-button'
+import { appDefaultIconBackground } from '@/config'
 import { AppModeEnum } from '@/types/app'
 import ShortcutsName from '../../workflow/shortcuts-name'
 import PublishWithMultipleModel from './publish-with-multiple-model'
@@ -45,8 +46,11 @@ type AccessSectionProps = {
 
 type ActionsSectionProps = Pick<AppPublisherProps, | 'hasHumanInputNode'
   | 'hasTriggerNode'
+  | 'inputs'
   | 'missingStartNode'
+  | 'onRefreshData'
   | 'toolPublished'
+  | 'outputs'
   | 'publishedAt'
   | 'workflowToolAvailable'> & {
     appDetail: {
@@ -63,16 +67,9 @@ type ActionsSectionProps = Pick<AppPublisherProps, | 'hasHumanInputNode'
     disabledFunctionTooltip?: string
     handleEmbed: () => void
     handleOpenInExplore: () => void
-    handleOpenRunConfig?: (url: string) => void
     handlePublish: (params?: ModelAndParameter | PublishWorkflowParams) => Promise<void>
     published: boolean
-    showBatchRunConfig?: boolean
-    showRunConfig?: boolean
-    workflowToolIsLoading: boolean
-    workflowToolOutdated: boolean
-    workflowToolIsCurrentWorkspaceManager: boolean
     workflowToolMessage?: string
-    onConfigureWorkflowTool: () => void
   }
 
 export const AccessModeDisplay = ({ mode }: { mode?: keyof typeof ACCESS_MODE_MAP }) => {
@@ -259,20 +256,18 @@ export const PublisherActionsSection = ({
   disabledFunctionTooltip,
   handleEmbed,
   handleOpenInExplore,
-  handleOpenRunConfig,
+  handlePublish,
   hasHumanInputNode = false,
   hasTriggerNode = false,
+  inputs,
   missingStartNode = false,
+  onRefreshData,
+  outputs,
+  published,
   publishedAt,
-  showBatchRunConfig = false,
-  showRunConfig = false,
   toolPublished,
   workflowToolAvailable = true,
-  workflowToolIsLoading,
-  workflowToolOutdated,
-  workflowToolIsCurrentWorkspaceManager,
   workflowToolMessage,
-  onConfigureWorkflowTool,
 }: ActionsSectionProps) => {
   const { t } = useTranslation()
 
@@ -289,13 +284,6 @@ export const PublisherActionsSection = ({
           disabled={disabledFunctionButton}
           link={appURL}
           icon={<span className="i-ri-play-circle-line h-4 w-4" />}
-          actionButton={showRunConfig
-            ? {
-                ariaLabel: t('operation.config', { ns: 'common' }),
-                icon: <RiSettings2Line className="h-4 w-4" />,
-                onClick: () => handleOpenRunConfig?.(appURL),
-              }
-            : undefined}
         >
           {t('common.runApp', { ns: 'workflow' })}
         </SuggestedAction>
@@ -308,13 +296,6 @@ export const PublisherActionsSection = ({
                 disabled={disabledFunctionButton}
                 link={`${appURL}${appURL.includes('?') ? '&' : '?'}mode=batch`}
                 icon={<span className="i-ri-play-list-2-line h-4 w-4" />}
-                actionButton={showBatchRunConfig
-                  ? {
-                      ariaLabel: t('operation.config', { ns: 'common' }),
-                      icon: <RiSettings2Line className="h-4 w-4" />,
-                      onClick: () => handleOpenRunConfig?.(`${appURL}${appURL.includes('?') ? '&' : '?'}mode=batch`),
-                    }
-                  : undefined}
               >
                 {t('common.batchRunApp', { ns: 'workflow' })}
               </SuggestedAction>
@@ -324,7 +305,7 @@ export const PublisherActionsSection = ({
             <SuggestedAction
               onClick={handleEmbed}
               disabled={!publishedAt}
-              icon={<span className="i-custom-vender-line-development-code-browser h-4 w-4" />}
+              icon={<CodeBrowser className="h-4 w-4" />}
             >
               {t('common.embedIntoSite', { ns: 'workflow' })}
             </SuggestedAction>
@@ -359,10 +340,18 @@ export const PublisherActionsSection = ({
         <WorkflowToolConfigureButton
           disabled={workflowToolDisabled}
           published={!!toolPublished}
-          isLoading={workflowToolIsLoading}
-          outdated={workflowToolOutdated}
-          isCurrentWorkspaceManager={workflowToolIsCurrentWorkspaceManager}
-          onConfigure={onConfigureWorkflowTool}
+          detailNeedUpdate={!!toolPublished && published}
+          workflowAppId={appDetail?.id ?? ''}
+          icon={{
+            content: (appDetail.icon_type === 'image' ? '🤖' : appDetail?.icon) || '🤖',
+            background: (appDetail.icon_type === 'image' ? appDefaultIconBackground : appDetail?.icon_background) || appDefaultIconBackground,
+          }}
+          name={appDetail?.name ?? ''}
+          description={appDetail?.description ?? ''}
+          inputs={inputs}
+          outputs={outputs}
+          handlePublish={handlePublish}
+          onRefreshData={onRefreshData}
           disabledReason={workflowToolMessage}
         />
       )}

web/app/components/app/app-publisher/suggested-action.tsx

@@ -1,93 +1,33 @@
-import type { HTMLProps, PropsWithChildren, MouseEvent as ReactMouseEvent } from 'react'
+import type { HTMLProps, PropsWithChildren } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiArrowRightUpLine } from '@remixicon/react'
 
-type SuggestedActionButton = {
-  ariaLabel: string
-  icon: React.ReactNode
-  onClick: (event: ReactMouseEvent<HTMLButtonElement>) => void
-}
-
 type SuggestedActionProps = PropsWithChildren<HTMLProps<HTMLAnchorElement> & {
   icon?: React.ReactNode
   link?: string
   disabled?: boolean
-  actionButton?: SuggestedActionButton
 }>
 
-const SuggestedAction = ({
-  icon,
-  link,
-  disabled,
-  children,
-  className,
-  onClick,
-  actionButton,
-  ...props
-}: SuggestedActionProps) => {
-  const handleClick = (event: ReactMouseEvent<HTMLAnchorElement>) => {
-    if (disabled) {
-      event.preventDefault()
+const SuggestedAction = ({ icon, link, disabled, children, className, onClick, ...props }: SuggestedActionProps) => {
+  const handleClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
+    if (disabled)
       return
-    }
-
-    onClick?.(event)
+    onClick?.(e)
   }
-
-  const handleActionClick = (event: ReactMouseEvent<HTMLButtonElement>) => {
-    if (disabled) {
-      event.preventDefault()
-      return
-    }
-
-    actionButton?.onClick(event)
-  }
-
-  const mainAction = (
+  return (
     <a
       href={disabled ? undefined : link}
       target="_blank"
       rel="noreferrer"
-      className={cn(
-        'flex min-w-0 items-center justify-start gap-2 px-2.5 py-2 text-text-secondary transition-colors',
-        actionButton ? 'flex-1 rounded-l-lg' : 'rounded-lg bg-background-section-burn not-first:mt-1',
-        disabled ? 'cursor-not-allowed opacity-30 shadow-xs' : 'cursor-pointer hover:bg-state-accent-hover hover:text-text-accent',
-      )}
+      className={cn('flex items-center justify-start gap-2 rounded-lg bg-background-section-burn px-2.5 py-2 text-text-secondary transition-colors not-first:mt-1', disabled ? 'cursor-not-allowed opacity-30 shadow-xs' : 'cursor-pointer text-text-secondary hover:bg-state-accent-hover hover:text-text-accent', className)}
       onClick={handleClick}
       {...props}
     >
-      <div className="relative h-4 w-4 shrink-0">{icon}</div>
+      <div className="relative h-4 w-4">{icon}</div>
       <div className="shrink grow basis-0 system-sm-medium">{children}</div>
-      <RiArrowRightUpLine className="h-3.5 w-3.5 shrink-0" />
+      <RiArrowRightUpLine className="h-3.5 w-3.5" />
     </a>
   )
-
-  if (!actionButton)
-    return mainAction
-
-  return (
-    <div
-      className={cn(
-        'flex items-stretch rounded-lg bg-background-section-burn not-first:mt-1',
-        disabled ? 'opacity-30 shadow-xs' : '',
-        className,
-      )}
-    >
-      {mainAction}
-      <button
-        type="button"
-        aria-label={actionButton.ariaLabel}
-        disabled={disabled}
-        className={cn(
-          'flex w-9 shrink-0 items-center justify-center rounded-r-lg border-l-[0.5px] border-divider-subtle text-text-tertiary transition-colors',
-          disabled ? 'cursor-not-allowed' : 'cursor-pointer hover:bg-state-accent-hover hover:text-text-accent',
-        )}
-        onClick={handleActionClick}
-      >
-        {actionButton.icon}
-      </button>
-    </div>
-  )
 }
 
 export default SuggestedAction

web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx

@@ -4,29 +4,6 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import { InputVarType } from '@/app/components/workflow/types'
 import ConfigModalFormFields from '../form-fields'
 
-vi.mock('react-i18next', async () => {
-  const React = await import('react')
-  return {
-    useTranslation: () => ({
-      t: (key: string, options?: Record<string, unknown>) => {
-        const ns = options?.ns as string | undefined
-        return ns ? `${ns}.${key}` : key
-      },
-      i18n: { language: 'en', changeLanguage: vi.fn() },
-    }),
-    Trans: ({ i18nKey, components }: { i18nKey: string, components?: Record<string, ReactNode> }) => (
-      <span data-i18n-key={i18nKey}>
-        {i18nKey}
-        {components?.docLink}
-      </span>
-    ),
-  }
-})
-
-vi.mock('@/context/i18n', () => ({
-  useDocLink: () => (path?: string) => `https://docs.example.com${path || ''}`,
-}))
-
 vi.mock('@/app/components/base/file-uploader', () => ({
   FileUploaderInAttachmentWrapper: ({
     onChange,
@@ -97,12 +74,6 @@ vi.mock('@langgenius/dify-ui/select', async (importOriginal) => {
   }
 })
 
-vi.mock('@langgenius/dify-ui/tooltip', () => ({
-  Tooltip: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-  TooltipTrigger: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-  TooltipContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-}))
-
 vi.mock('../field', () => ({
   default: ({ children, title }: { children: ReactNode, title: string }) => (
     <div>
@@ -205,18 +176,7 @@ describe('ConfigModalFormFields', () => {
     expect(selectProps.payloadChangeHandlers.default).toHaveBeenCalledWith('beta')
   })
 
-  it('should wire file, json schema, and visibility controls', async () => {
-    const textInputProps = createBaseProps()
-    const textInputView = render(<ConfigModalFormFields {...textInputProps} />)
-    expect(screen.getByText('variableConfig.hidden')).toBeInTheDocument()
-    fireEvent.click(screen.getByRole('button', { name: 'variableConfig.hiddenDescription' }))
-    expect(await screen.findByText('variableConfig.hiddenDescription')).toBeInTheDocument()
-    const docLink = await screen.findByRole('link')
-    expect(docLink).toHaveAttribute('href', 'https://docs.example.com/use-dify/nodes/user-input#hide-and-pre-fill-input-fields')
-    expect(docLink).toHaveAttribute('target', '_blank')
-    expect(docLink).toHaveAttribute('rel', 'noopener noreferrer')
-    textInputView.unmount()
-
+  it('should wire file, json schema, and visibility controls', () => {
     const singleFileProps = createBaseProps()
     singleFileProps.tempPayload = {
       ...singleFileProps.tempPayload,
@@ -225,20 +185,18 @@ describe('ConfigModalFormFields', () => {
       allowed_file_extensions: [],
       allowed_file_upload_methods: ['remote_url'],
     }
-    const singleFileView = render(<ConfigModalFormFields {...singleFileProps} />)
-    expect(screen.queryByText('variableConfig.hidden')).not.toBeInTheDocument()
-    expect(screen.queryByText('variableConfig.hiddenDescription')).not.toBeInTheDocument()
+    render(<ConfigModalFormFields {...singleFileProps} />)
     fireEvent.click(screen.getByText('single-file-setting'))
     fireEvent.click(screen.getByText('upload-file'))
     fireEvent.click(screen.getAllByText('unchecked')[0]!)
+    fireEvent.click(screen.getAllByText('unchecked')[1]!)
 
     expect(singleFileProps.onFilePayloadChange).toHaveBeenCalledWith({ number_limits: 1 })
     expect(singleFileProps.payloadChangeHandlers.default).toHaveBeenCalledWith(expect.objectContaining({
       fileId: 'file-1',
     }))
     expect(singleFileProps.payloadChangeHandlers.required).toHaveBeenCalledWith(true)
-    expect(singleFileProps.payloadChangeHandlers.hide).not.toHaveBeenCalled()
-    singleFileView.unmount()
+    expect(singleFileProps.payloadChangeHandlers.hide).toHaveBeenCalledWith(true)
 
     const multiFileProps = createBaseProps()
     multiFileProps.tempPayload = {
@@ -249,9 +207,8 @@ describe('ConfigModalFormFields', () => {
       allowed_file_upload_methods: ['remote_url'],
     }
     render(<ConfigModalFormFields {...multiFileProps} />)
-    expect(screen.queryByText('variableConfig.hidden')).not.toBeInTheDocument()
     fireEvent.click(screen.getByText('multi-file-setting'))
-    fireEvent.click(screen.getAllByText('upload-file')[0]!)
+    fireEvent.click(screen.getAllByText('upload-file')[1]!)
     expect(multiFileProps.onFilePayloadChange).toHaveBeenCalledWith({ number_limits: 3 })
     expect(multiFileProps.payloadChangeHandlers.default).toHaveBeenCalledWith([
       expect.objectContaining({ fileId: 'file-1' }),
@@ -410,23 +367,4 @@ describe('ConfigModalFormFields', () => {
 
     expect(screen.getByRole('spinbutton')).toHaveValue(null)
   })
-
-  it('should disable hide checkbox when required is true and disable required when hide is true', () => {
-    const requiredProps = createBaseProps()
-    requiredProps.tempPayload = { ...requiredProps.tempPayload, type: InputVarType.textInput, required: true, hide: false }
-    const { unmount } = render(<ConfigModalFormFields {...requiredProps} />)
-
-    const buttons = screen.getAllByRole('button')
-    const hideButton = buttons.find(btn => btn.textContent === 'unchecked' && btn !== buttons[0])
-    expect(hideButton).toBeDefined()
-    unmount()
-
-    const hideProps = createBaseProps()
-    hideProps.tempPayload = { ...hideProps.tempPayload, type: InputVarType.textInput, required: false, hide: true }
-    render(<ConfigModalFormFields {...hideProps} />)
-
-    const allButtons = screen.getAllByRole('button')
-    const checkedHideButton = allButtons.find(btn => btn.textContent === 'checked')
-    expect(checkedHideButton).toBeDefined()
-  })
 })

web/app/components/app/configuration/config-var/config-modal/__tests__/index-logic.spec.tsx

@@ -25,7 +25,6 @@ vi.mock('../form-fields', () => ({
     return (
       <div data-testid="config-form-fields">
         <div data-testid="payload-type">{String(props.tempPayload.type)}</div>
-        <div data-testid="payload-hide">{String(props.tempPayload.hide)}</div>
         <div data-testid="payload-label">{String(props.tempPayload.label ?? '')}</div>
         <div data-testid="payload-schema">{String(props.tempPayload.json_schema ?? '')}</div>
         <div data-testid="payload-default">{String(props.tempPayload.default ?? '')}</div>
@@ -116,7 +115,7 @@ describe('ConfigModal logic', () => {
   })
 
   it('should derive payload fields from mocked form-field callbacks', async () => {
-    renderConfigModal(createPayload({ hide: true }))
+    renderConfigModal()
 
     fireEvent.click(screen.getByTestId('valid-key-blur'))
     await waitFor(() => {
@@ -139,7 +138,6 @@ describe('ConfigModal logic', () => {
     fireEvent.click(screen.getByTestId('type-change'))
     await waitFor(() => {
       expect(screen.getByTestId('payload-type')).toHaveTextContent(InputVarType.singleFile)
-      expect(screen.getByTestId('payload-hide')).toHaveTextContent('false')
     })
 
     fireEvent.click(screen.getByTestId('file-payload-change'))

web/app/components/app/configuration/config-var/config-modal/__tests__/utils.spec.ts

@@ -49,13 +49,11 @@ describe('config-modal utils', () => {
       const payload = createInputVar({
         type: InputVarType.textInput,
         default: 'hello',
-        hide: true,
       })
 
       const nextPayload = createPayloadForType(payload, InputVarType.multiFiles)
 
       expect(nextPayload.type).toBe(InputVarType.multiFiles)
-      expect(nextPayload.hide).toBe(false)
       expect(nextPayload.max_length).toBe(DEFAULT_FILE_UPLOAD_SETTING.max_length)
       expect(nextPayload.allowed_file_types).toEqual(DEFAULT_FILE_UPLOAD_SETTING.allowed_file_types)
       expect(nextPayload.default).toBe('hello')
@@ -251,24 +249,6 @@ describe('config-modal utils', () => {
       })
     })
 
-    it('should force file inputs to stay visible when saving', () => {
-      const result = validateConfigModalPayload({
-        tempPayload: createInputVar({
-          type: InputVarType.singleFile,
-          hide: true,
-          allowed_file_types: [SupportUploadFileTypes.document],
-          allowed_file_extensions: [],
-        }),
-        payload: createInputVar(),
-        checkVariableName: () => true,
-        t,
-      })
-
-      expect(result.payloadToSave).toEqual(expect.objectContaining({
-        hide: false,
-      }))
-    })
-
     it('should stop validation when the variable name checker rejects the payload', () => {
       const result = validateConfigModalPayload({
         tempPayload: createInputVar({

web/app/components/app/configuration/config-var/config-modal/form-fields.tsx

@@ -13,17 +13,14 @@ import {
   SelectValue,
 } from '@langgenius/dify-ui/select'
 import * as React from 'react'
-import { Trans } from 'react-i18next'
 import Checkbox from '@/app/components/base/checkbox'
 import { FileUploaderInAttachmentWrapper } from '@/app/components/base/file-uploader'
-import { Infotip } from '@/app/components/base/infotip'
 import Input from '@/app/components/base/input'
 import Textarea from '@/app/components/base/textarea'
 import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
 import FileUploadSetting from '@/app/components/workflow/nodes/_base/components/file-upload-setting'
 import { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
 import { InputVarType, SupportUploadFileTypes } from '@/app/components/workflow/types'
-import { useDocLink } from '@/context/i18n'
 import { TransferMethod } from '@/types/app'
 import ConfigSelect from '../config-select'
 import ConfigString from '../config-string'
@@ -71,9 +68,6 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
   t,
 }) => {
   const { type, label, variable } = tempPayload
-  const isFileInput = [InputVarType.singleFile, InputVarType.multiFiles].includes(type)
-  const docLink = useDocLink()
-  const hiddenDescriptionAriaLabel = t('variableConfig.hiddenDescription', { ns: 'appDebug' }).replace(/<[^>]+>/g, '')
 
   return (
     <div className="space-y-2">
@@ -111,7 +105,7 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
       {type === InputVarType.textInput && (
         <Field title={t('variableConfig.defaultValue', { ns: 'appDebug' })}>
           <Input
-            value={typeof tempPayload.default === 'string' ? tempPayload.default : ''}
+            value={tempPayload.default || ''}
             onChange={e => onPayloadChange('default')(e.target.value || undefined)}
             placeholder={t('variableConfig.inputPlaceholder', { ns: 'appDebug' })}
           />
@@ -132,7 +126,7 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
         <Field title={t('variableConfig.defaultValue', { ns: 'appDebug' })}>
           <Input
             type="number"
-            value={typeof tempPayload.default === 'number' || typeof tempPayload.default === 'string' ? tempPayload.default : ''}
+            value={tempPayload.default || ''}
             onChange={e => onPayloadChange('default')(e.target.value || undefined)}
             placeholder={t('variableConfig.inputPlaceholder', { ns: 'appDebug' })}
           />
@@ -192,7 +186,7 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
         </>
       )}
 
-      {isFileInput && (
+      {[InputVarType.singleFile, InputVarType.multiFiles].includes(type) && (
         <>
           <FileUploadSetting
             payload={tempPayload as UploadFileSetting}
@@ -233,37 +227,14 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
       )}
 
       <div className="mt-5! flex h-6 items-center space-x-2">
-        <Checkbox checked={tempPayload.required} disabled={!isFileInput && tempPayload.hide} onCheck={() => onPayloadChange('required')(!tempPayload.required)} />
+        <Checkbox checked={tempPayload.required} disabled={tempPayload.hide} onCheck={() => onPayloadChange('required')(!tempPayload.required)} />
         <span className="system-sm-semibold text-text-secondary">{t('variableConfig.required', { ns: 'appDebug' })}</span>
       </div>
 
-      {!isFileInput && (
-        <div className="mt-5! flex h-6 items-center space-x-2">
-          <Checkbox checked={tempPayload.hide} disabled={tempPayload.required} onCheck={() => onPayloadChange('hide')(!tempPayload.hide)} />
-          <div className="flex items-center gap-1">
-            <span className="system-sm-semibold text-text-secondary">{t('variableConfig.hidden', { ns: 'appDebug' })}</span>
-            <Infotip
-              aria-label={hiddenDescriptionAriaLabel}
-              popupClassName="max-w-[300px]"
-            >
-              <Trans
-                i18nKey="variableConfig.hiddenDescription"
-                ns="appDebug"
-                components={{
-                  docLink: (
-                    <a
-                      href={docLink('/use-dify/nodes/user-input#hide-and-pre-fill-input-fields')}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="text-text-accent hover:underline"
-                    />
-                  ),
-                }}
-              />
-            </Infotip>
-          </div>
-        </div>
-      )}
+      <div className="mt-5! flex h-6 items-center space-x-2">
+        <Checkbox checked={tempPayload.hide} disabled={tempPayload.required} onCheck={() => onPayloadChange('hide')(!tempPayload.hide)} />
+        <span className="system-sm-semibold text-text-secondary">{t('variableConfig.hide', { ns: 'appDebug' })}</span>
+      </div>
     </div>
   )
 }

web/app/components/app/configuration/config-var/config-modal/utils.ts

@@ -88,9 +88,7 @@ export const createPayloadForType = (payload: InputVar, type: InputVarType) => {
       draft.default = undefined
 
     if ([InputVarType.singleFile, InputVarType.multiFiles].includes(type)) {
-      draft.hide = false
-      const fileUploadSettingKeys = Object.keys(DEFAULT_FILE_UPLOAD_SETTING) as Array<keyof typeof DEFAULT_FILE_UPLOAD_SETTING>
-      fileUploadSettingKeys.forEach((key) => {
+      (Object.keys(DEFAULT_FILE_UPLOAD_SETTING) as Array<keyof typeof DEFAULT_FILE_UPLOAD_SETTING>).forEach((key) => {
         if (key !== 'max_length')
           draft[key] = DEFAULT_FILE_UPLOAD_SETTING[key] as never
       })
@@ -160,41 +158,38 @@ export const validateConfigModalPayload = ({
   checkVariableName,
   t,
 }: ValidateConfigModalPayloadOptions): ValidateConfigModalPayloadResult => {
-  const normalizedTempPayload = [InputVarType.singleFile, InputVarType.multiFiles].includes(tempPayload.type)
-    ? { ...tempPayload, hide: false }
-    : tempPayload
   const jsonSchemaValue = tempPayload.json_schema
   const schemaEmpty = isJsonSchemaEmpty(jsonSchemaValue)
   const normalizedJsonSchema = schemaEmpty ? undefined : jsonSchemaValue
-  const payloadToSave = normalizedTempPayload.type === InputVarType.jsonObject && schemaEmpty
-    ? { ...normalizedTempPayload, json_schema: undefined }
-    : normalizedTempPayload
+  const payloadToSave = tempPayload.type === InputVarType.jsonObject && schemaEmpty
+    ? { ...tempPayload, json_schema: undefined }
+    : tempPayload
 
-  const moreInfo = normalizedTempPayload.variable === payload?.variable
+  const moreInfo = tempPayload.variable === payload?.variable
     ? undefined
     : {
         type: ChangeType.changeVarName,
-        payload: { beforeKey: payload?.variable || '', afterKey: normalizedTempPayload.variable },
+        payload: { beforeKey: payload?.variable || '', afterKey: tempPayload.variable },
       }
 
-  if (!checkVariableName(normalizedTempPayload.variable))
+  if (!checkVariableName(tempPayload.variable))
     return {}
 
-  if (!normalizedTempPayload.label) {
+  if (!tempPayload.label) {
     return {
       errorMessage: t('variableConfig.errorMsg.labelNameRequired', { ns: 'appDebug' }),
     }
   }
 
-  if (normalizedTempPayload.type === InputVarType.select) {
-    if (!normalizedTempPayload.options?.length) {
+  if (tempPayload.type === InputVarType.select) {
+    if (!tempPayload.options?.length) {
       return {
         errorMessage: t('variableConfig.errorMsg.atLeastOneOption', { ns: 'appDebug' }),
       }
     }
 
     const duplicated = new Set<string>()
-    const hasRepeatedItem = normalizedTempPayload.options.some((option) => {
+    const hasRepeatedItem = tempPayload.options.some((option) => {
       if (duplicated.has(option))
         return true
 
@@ -209,8 +204,8 @@ export const validateConfigModalPayload = ({
     }
   }
 
-  if ([InputVarType.singleFile, InputVarType.multiFiles].includes(normalizedTempPayload.type)) {
-    if (!normalizedTempPayload.allowed_file_types?.length) {
+  if ([InputVarType.singleFile, InputVarType.multiFiles].includes(tempPayload.type)) {
+    if (!tempPayload.allowed_file_types?.length) {
       return {
         errorMessage: t('errorMsg.fieldRequired', {
           ns: 'workflow',
@@ -219,7 +214,7 @@ export const validateConfigModalPayload = ({
       }
     }
 
-    if (normalizedTempPayload.allowed_file_types.includes(SupportUploadFileTypes.custom) && !normalizedTempPayload.allowed_file_extensions?.length) {
+    if (tempPayload.allowed_file_types.includes(SupportUploadFileTypes.custom) && !tempPayload.allowed_file_extensions?.length) {
       return {
         errorMessage: t('errorMsg.fieldRequired', {
           ns: 'workflow',
@@ -229,7 +224,7 @@ export const validateConfigModalPayload = ({
     }
   }
 
-  if (normalizedTempPayload.type === InputVarType.jsonObject && !schemaEmpty && typeof normalizedJsonSchema === 'string') {
+  if (tempPayload.type === InputVarType.jsonObject && !schemaEmpty && typeof normalizedJsonSchema === 'string') {
     try {
       const schema = JSON.parse(normalizedJsonSchema)
       if (schema?.type !== 'object') {

web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx

@@ -35,7 +35,7 @@ const mockApp: App = {
   copyright: 'Test Corp',
   privacy_policy: null,
   custom_disclaimer: null,
-  categories: ['Assistant'],
+  category: 'Assistant',
   position: 1,
   is_listed: true,
   install_count: 100,
@@ -253,7 +253,7 @@ describe('AppCard', () => {
         template_id: mockApp.app_id,
         template_name: mockApp.app.name,
         template_mode: mockApp.app.mode,
-        template_categories: mockApp.categories,
+        template_category: mockApp.category,
         page: 'studio',
       })
       expect(mockSetShowTryAppPanel).toHaveBeenCalledWith(true, {

web/app/components/app/create-app-dialog/app-card/index.tsx

@@ -35,7 +35,7 @@ const AppCard = ({
       template_id: app.app_id,
       template_name: appBasicInfo.name,
       template_mode: appBasicInfo.mode,
-      template_categories: app.categories,
+      template_category: app.category,
       page: 'studio',
     })
     setShowTryAppPanel?.(true, { appId: app.app_id, app })

web/app/components/app/create-app-dialog/app-list/__tests__/index.spec.tsx

@@ -115,7 +115,7 @@ vi.mock('@/next/navigation', () => ({
 
 const createAppEntry = (name: string, category: string) => ({
   app_id: name,
-  categories: [category],
+  category,
   app: {
     id: name,
     name,

web/app/components/app/create-app-dialog/app-list/index.tsx

@@ -74,7 +74,7 @@ const Apps = ({
     const filteredByCategory = allList.filter((item) => {
       if (currCategory === allCategoriesEn)
         return true
-      return item.categories?.includes(currCategory) ?? false
+      return item.category === currCategory
     })
     if (currentType.length === 0)
       return filteredByCategory

web/app/components/app/overview/__tests__/app-card-sections.spec.tsx

@@ -1,38 +1,8 @@
-import type { FormEvent } from 'react'
 import type { AppDetailResponse } from '@/models/app'
 import { fireEvent, render, screen, within } from '@testing-library/react'
-import { InputVarType } from '@/app/components/workflow/types'
 import { AccessMode } from '@/models/access-control'
 import { AppModeEnum } from '@/types/app'
-import { AppCardAccessControlSection, AppCardDialogs, AppCardOperations, AppCardUrlSection, createAppCardOperations, WorkflowLaunchDialog } from '../app-card-sections'
-
-vi.mock('react-i18next', () => ({
-  useTranslation: () => ({
-    t: (key: string) => key,
-  }),
-  Trans: ({ i18nKey }: { i18nKey: string }) => <span>{i18nKey}</span>,
-}))
-
-vi.mock('../settings', () => ({
-  default: () => <div data-testid="settings-modal" />,
-}))
-
-vi.mock('../embedded', () => ({
-  default: () => <div data-testid="embedded-modal" />,
-}))
-
-vi.mock('../customize', () => ({
-  default: () => <div data-testid="customize-modal" />,
-}))
-
-vi.mock('../../app-access-control', () => ({
-  default: ({ onClose, onConfirm }: { onClose: () => void, onConfirm: () => void }) => (
-    <div data-testid="access-control">
-      <button type="button" onClick={onClose}>close-access</button>
-      <button type="button" onClick={onConfirm}>confirm-access</button>
-    </div>
-  ),
-}))
+import { AppCardAccessControlSection, AppCardOperations, AppCardUrlSection, createAppCardOperations } from '../app-card-sections'
 
 describe('app-card-sections', () => {
   const t = (key: string) => key
@@ -82,7 +52,6 @@ describe('app-card-sections', () => {
 
   it('should render operation buttons and execute enabled actions', () => {
     const onLaunch = vi.fn()
-    const onLaunchConfig = vi.fn()
     const operations = createAppCardOperations({
       operationKeys: ['launch', 'embedded'],
       t: t as never,
@@ -99,19 +68,12 @@ describe('app-card-sections', () => {
       <AppCardOperations
         t={t as never}
         operations={operations}
-        launchConfigAction={{
-          label: 'operation.config',
-          disabled: false,
-          onClick: onLaunchConfig,
-        }}
       />,
     )
 
     fireEvent.click(screen.getByRole('button', { name: /overview\.appInfo\.launch/i }))
-    fireEvent.click(screen.getByRole('button', { name: /operation\.config/i }))
 
     expect(onLaunch).toHaveBeenCalledTimes(1)
-    expect(onLaunchConfig).toHaveBeenCalledTimes(1)
     expect(screen.getByRole('button', { name: /overview\.appInfo\.embedded\.entry/i })).toBeInTheDocument()
   })
 
@@ -165,127 +127,4 @@ describe('app-card-sections', () => {
     fireEvent.click(within(dialog).getByRole('button', { name: /operation\.confirm/i }))
     expect(onRegenerate).toHaveBeenCalledTimes(1)
   })
-
-  it('should disable all operations when triggerModeDisabled is true', () => {
-    const operations = createAppCardOperations({
-      operationKeys: ['launch', 'settings'],
-      t: t as never,
-      runningStatus: true,
-      triggerModeDisabled: true,
-      onLaunch: vi.fn(),
-      onEmbedded: vi.fn(),
-      onCustomize: vi.fn(),
-      onSettings: vi.fn(),
-      onDevelop: vi.fn(),
-    })
-
-    expect(operations[0]!.disabled).toBe(true)
-    expect(operations[1]!.disabled).toBe(true)
-  })
-
-  it('should render WorkflowLaunchDialog and submit values', () => {
-    const onOpenChange = vi.fn()
-    const onValueChange = vi.fn()
-    const onSubmit = vi.fn((event: FormEvent<HTMLFormElement>) => {
-      event.preventDefault()
-    })
-
-    render(
-      <WorkflowLaunchDialog
-        t={t as never}
-        open
-        hiddenVariables={[{
-          variable: 'secret',
-          label: 'Secret',
-          type: InputVarType.textInput,
-          hide: true,
-          required: true,
-        }]}
-        unsupportedVariables={[]}
-        values={{ secret: 'hello' }}
-        onOpenChange={onOpenChange}
-        onValueChange={onValueChange}
-        onSubmit={onSubmit}
-      />,
-    )
-
-    expect(screen.getByText('overview.appInfo.workflowLaunchHiddenInputs.title')).toBeInTheDocument()
-    fireEvent.submit(screen.getByRole('button', { name: /overview\.appInfo\.launch/i }).closest('form')!)
-    expect(onSubmit).toHaveBeenCalled()
-  })
-
-  it('should return null for WorkflowLaunchDialog when no variables are provided', () => {
-    const { container } = render(
-      <WorkflowLaunchDialog
-        t={t as never}
-        open
-        hiddenVariables={[]}
-        unsupportedVariables={[]}
-        values={{}}
-        onOpenChange={vi.fn()}
-        onValueChange={vi.fn()}
-        onSubmit={vi.fn()}
-      />,
-    )
-
-    expect(container).toBeEmptyDOMElement()
-  })
-
-  it('should render AppCardDialogs with all modals for web apps', () => {
-    const appInfo = {
-      id: 'app-1',
-      mode: AppModeEnum.CHAT,
-      enable_site: true,
-      enable_api: false,
-      site: { app_base_url: 'https://example.com', access_token: 'token-1' },
-      api_base_url: 'https://api.example.com',
-    } as never
-
-    render(
-      <AppCardDialogs
-        isApp
-        appInfo={appInfo}
-        appMode={AppModeEnum.CHAT}
-        showSettingsModal
-        showEmbedded
-        showCustomizeModal
-        showAccessControl
-        appDetail={{ id: 'app-1', access_mode: AccessMode.PUBLIC } as AppDetailResponse}
-        onCloseSettings={vi.fn()}
-        onCloseEmbedded={vi.fn()}
-        onCloseCustomize={vi.fn()}
-        onCloseAccessControl={vi.fn()}
-        onSaveSiteConfig={vi.fn()}
-        onConfirmAccessControl={vi.fn()}
-      />,
-    )
-
-    expect(screen.getByTestId('settings-modal')).toBeInTheDocument()
-    expect(screen.getByTestId('embedded-modal')).toBeInTheDocument()
-    expect(screen.getByTestId('customize-modal')).toBeInTheDocument()
-    expect(screen.getByTestId('access-control')).toBeInTheDocument()
-  })
-
-  it('should return null for AppCardDialogs when not an app', () => {
-    const { container } = render(
-      <AppCardDialogs
-        isApp={false}
-        appInfo={{} as never}
-        appMode={AppModeEnum.CHAT}
-        showSettingsModal={false}
-        showEmbedded={false}
-        showCustomizeModal={false}
-        showAccessControl={false}
-        appDetail={null}
-        onCloseSettings={vi.fn()}
-        onCloseEmbedded={vi.fn()}
-        onCloseCustomize={vi.fn()}
-        onCloseAccessControl={vi.fn()}
-        onSaveSiteConfig={vi.fn()}
-        onConfirmAccessControl={vi.fn()}
-      />,
-    )
-
-    expect(container).toBeEmptyDOMElement()
-  })
 })

web/app/components/app/overview/__tests__/app-card-utils.spec.ts

@@ -1,22 +1,9 @@
 import type { AppDetailResponse } from '@/models/app'
-import { BlockEnum, InputVarType } from '@/app/components/workflow/types'
+import { BlockEnum } from '@/app/components/workflow/types'
 import { AccessMode } from '@/models/access-control'
 import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
-import {
-  buildWorkflowLaunchUrl,
-  compressAndEncodeBase64,
-  createWorkflowLaunchInitialValues,
-  getAppCardDisplayState,
-  getAppCardOperationKeys,
-  getAppHiddenLaunchVariables,
-  getEmbeddedIframeSnippet,
-  getEmbeddedScriptSnippet,
-  getWorkflowHiddenStartVariables,
-  hasWorkflowStartNode,
-  isAppAccessConfigured,
-  isWorkflowLaunchInputSupported,
-} from '../app-card-utils'
+import { getAppCardDisplayState, getAppCardOperationKeys, hasWorkflowStartNode, isAppAccessConfigured } from '../app-card-utils'
 
 describe('app-card-utils', () => {
   const baseAppInfo = {
@@ -46,108 +33,6 @@ describe('app-card-utils', () => {
     })).toBe(false)
   })
 
-  it('should return hidden workflow start variables and their initial launch values', () => {
-    const hiddenVariables = getWorkflowHiddenStartVariables({
-      graph: {
-        nodes: [{
-          data: {
-            type: BlockEnum.Start,
-            variables: [
-              {
-                variable: 'visible',
-                label: 'Visible',
-                type: InputVarType.textInput,
-                hide: false,
-                required: false,
-              },
-              {
-                variable: 'secret',
-                label: 'Secret',
-                type: InputVarType.textInput,
-                hide: true,
-                default: 'prefilled',
-                required: false,
-              },
-              {
-                variable: 'enabled',
-                label: 'Enabled',
-                type: InputVarType.checkbox,
-                hide: true,
-                default: true,
-                required: false,
-              },
-            ],
-          },
-        }],
-      },
-    })
-
-    expect(hiddenVariables.map(variable => variable.variable)).toEqual(['secret', 'enabled'])
-    expect(createWorkflowLaunchInitialValues(hiddenVariables)).toEqual({
-      secret: 'prefilled',
-      enabled: true,
-    })
-  })
-
-  it('should return hidden advanced-chat launch variables from the workflow start node first', () => {
-    const hiddenVariables = getAppHiddenLaunchVariables({
-      appInfo: {
-        ...baseAppInfo,
-        mode: AppModeEnum.ADVANCED_CHAT,
-        model_config: {
-          user_input_form: [
-            {
-              'text-input': {
-                label: 'Visible',
-                variable: 'visible',
-                required: true,
-                max_length: 48,
-                default: '',
-                hide: false,
-              },
-            },
-            {
-              checkbox: {
-                label: 'Hidden Toggle',
-                variable: 'hidden_toggle',
-                required: false,
-                default: true,
-                hide: true,
-              },
-            },
-          ],
-        },
-      } as AppDetailResponse,
-      currentWorkflow: {
-        graph: {
-          nodes: [{
-            data: {
-              type: BlockEnum.Start,
-              variables: [
-                {
-                  variable: 'start_secret',
-                  label: 'Start Secret',
-                  type: InputVarType.textInput,
-                  hide: true,
-                  default: 'from-start',
-                  required: false,
-                },
-              ],
-            },
-          }],
-        },
-      },
-    })
-
-    expect(hiddenVariables).toEqual([
-      expect.objectContaining({
-        variable: 'start_secret',
-        type: InputVarType.textInput,
-        default: 'from-start',
-      }),
-    ])
-  })
-
   it('should build the display state for a published web app', () => {
     const state = getAppCardDisplayState({
       appInfo: baseAppInfo,
@@ -219,108 +104,4 @@ describe('app-card-utils', () => {
       isCurrentWorkspaceEditor: false,
     })).toEqual(['launch', 'embedded', 'customize'])
   })
-
-  it('should build a workflow launch URL with serialized parameters', async () => {
-    const url = await buildWorkflowLaunchUrl({
-      accessibleUrl: 'https://example.com/app/workflow/token-1',
-      variables: [
-        { variable: 'name', label: 'Name', type: InputVarType.textInput, hide: true, required: false },
-        { variable: 'enabled', label: 'Enabled', type: InputVarType.checkbox, hide: true, required: false },
-      ],
-      values: { name: 'Alice', enabled: true },
-    })
-
-    const parsed = new URL(url)
-    expect(parsed.searchParams.get('name')).toBe('Alice')
-    expect(parsed.searchParams.get('enabled')).toBe('true')
-  })
-
-  it('should serialize checkbox false and empty string values in launch URL', async () => {
-    const url = await buildWorkflowLaunchUrl({
-      accessibleUrl: 'https://example.com/app/workflow/token-1',
-      variables: [
-        { variable: 'flag', label: 'Flag', type: InputVarType.checkbox, hide: true, required: false },
-        { variable: 'empty', label: 'Empty', type: InputVarType.textInput, hide: true, required: false },
-      ],
-      values: { flag: false, empty: '' },
-    })
-
-    const parsed = new URL(url)
-    expect(parsed.searchParams.get('flag')).toBe('false')
-    expect(parsed.searchParams.get('empty')).toBe('')
-  })
-
-  it('should generate an iframe snippet with the provided URL', () => {
-    const snippet = getEmbeddedIframeSnippet('https://example.com/chatbot/token-1')
-    expect(snippet).toContain('src="https://example.com/chatbot/token-1"')
-    expect(snippet).toContain('frameborder="0"')
-    expect(snippet).toContain('allow="microphone"')
-  })
-
-  it('should generate an embedded script snippet with inputs', () => {
-    const snippet = getEmbeddedScriptSnippet({
-      url: 'https://example.com',
-      token: 'abc123',
-      primaryColor: '#FF0000',
-      isTestEnv: true,
-      inputValues: { name: 'Alice', count: '5' },
-    })
-
-    expect(snippet).toContain('token: \'abc123\'')
-    expect(snippet).toContain('isDev: true')
-    expect(snippet).toContain('name: "Alice"')
-    expect(snippet).toContain('count: "5"')
-    expect(snippet).toContain('background-color: #FF0000')
-  })
-
-  it('should generate an embedded script snippet with empty inputs comment', () => {
-    const snippet = getEmbeddedScriptSnippet({
-      url: 'https://example.com',
-      token: 'abc123',
-      primaryColor: '#1C64F2',
-      inputValues: {},
-    })
-
-    expect(snippet).toContain('// You can define the inputs from the Start node here')
-    expect(snippet).not.toContain('isDev: true')
-  })
-
-  it('should compress and encode base64 using CompressionStream when available', async () => {
-    const result = await compressAndEncodeBase64('hello')
-    expect(typeof result).toBe('string')
-    expect(result.length).toBeGreaterThan(0)
-  })
-
-  it('should fallback to plain base64 when CompressionStream is unavailable', async () => {
-    const original = globalThis.CompressionStream
-    // @ts-expect-error remove for test
-    delete globalThis.CompressionStream
-
-    const result = await compressAndEncodeBase64('hello')
-    expect(result).toBe(btoa('hello'))
-
-    globalThis.CompressionStream = original
-  })
-
-  it('should identify supported workflow launch input types', () => {
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.textInput, hide: true, required: false })).toBe(true)
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.paragraph, hide: true, required: false })).toBe(true)
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.select, hide: true, required: false })).toBe(true)
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.number, hide: true, required: false })).toBe(true)
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.checkbox, hide: true, required: false })).toBe(true)
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.json, hide: true, required: false })).toBe(true)
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.jsonObject, hide: true, required: false })).toBe(true)
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.url, hide: true, required: false })).toBe(true)
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.files, hide: true, required: false })).toBe(false)
-    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.singleFile, hide: true, required: false })).toBe(false)
-  })
-
-  it('should coerce numeric defaults to string in createWorkflowLaunchInitialValues', () => {
-    const result = createWorkflowLaunchInitialValues([
-      { variable: 'count', label: 'Count', type: InputVarType.number, hide: true, required: false, default: 42 },
-      { variable: 'empty', label: 'Empty', type: InputVarType.textInput, hide: true, required: false },
-    ])
-
-    expect(result).toEqual({ count: '42', empty: '' })
-  })
 })

web/app/components/app/overview/__tests__/app-card.spec.tsx

@@ -2,7 +2,6 @@ import type { ReactElement, ReactNode } from 'react'
 import type { AppDetailResponse } from '@/models/app'
 import { fireEvent, screen, waitFor } from '@testing-library/react'
 import { renderWithSystemFeatures } from '@/__tests__/utils/mock-system-features'
-import { InputVarType } from '@/app/components/workflow/types'
 import { AccessMode } from '@/models/access-control'
 import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
@@ -18,7 +17,7 @@ const mockSetAppDetail = vi.fn()
 const mockOnChangeStatus = vi.fn()
 const mockOnGenerateCode = vi.fn()
 
-let mockWorkflow: { graph?: { nodes?: Array<{ data?: { type?: string, variables?: Array<Record<string, unknown>> } }> } } | null = null
+let mockWorkflow: { graph?: { nodes?: Array<{ data?: { type?: string } }> } } | null = null
 let mockAccessSubjects: { groups?: unknown[], members?: unknown[] } = { groups: [], members: [] }
 let mockAppDetail: AppDetailResponse | undefined
 
@@ -26,7 +25,6 @@ vi.mock('react-i18next', () => ({
   useTranslation: () => ({
     t: (key: string) => key,
   }),
-  Trans: ({ i18nKey }: { i18nKey?: string }) => i18nKey ?? null,
 }))
 
 vi.mock('@/context/app-context', () => ({
@@ -166,182 +164,6 @@ describe('AppCard', () => {
     expect(mockWindowOpen).toHaveBeenCalledWith(`https://example.com${basePath}/chat/access-token`, '_blank')
   })
 
-  it('should open the workflow web app directly when launch is clicked even with hidden inputs', () => {
-    mockWorkflow = {
-      graph: {
-        nodes: [{
-          data: {
-            type: 'start',
-            variables: [
-              {
-                variable: 'secret',
-                label: 'Secret',
-                type: InputVarType.textInput,
-                hide: true,
-                required: true,
-                default: '',
-              },
-            ],
-          },
-        }],
-      },
-    }
-
-    render(
-      <AppCard
-        appInfo={{
-          ...appInfo,
-          mode: AppModeEnum.WORKFLOW,
-        }}
-        onChangeStatus={mockOnChangeStatus}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('overview.appInfo.launch'))
-
-    expect(mockWindowOpen).toHaveBeenCalledWith(
-      `https://example.com${basePath}/workflow/access-token`,
-      '_blank',
-    )
-    expect(screen.queryByText('overview.appInfo.workflowLaunchHiddenInputs.title')).not.toBeInTheDocument()
-  })
-
-  it('should collect hidden workflow inputs from the config action before launching the workflow web app', async () => {
-    mockWorkflow = {
-      graph: {
-        nodes: [{
-          data: {
-            type: 'start',
-            variables: [
-              {
-                variable: 'secret',
-                label: 'Secret',
-                type: InputVarType.textInput,
-                hide: true,
-                required: true,
-                default: '',
-              },
-            ],
-          },
-        }],
-      },
-    }
-
-    render(
-      <AppCard
-        appInfo={{
-          ...appInfo,
-          mode: AppModeEnum.WORKFLOW,
-        }}
-        onChangeStatus={mockOnChangeStatus}
-      />,
-    )
-
-    fireEvent.click(screen.getByRole('button', { name: 'operation.config' }))
-
-    expect(screen.getByText('overview.appInfo.workflowLaunchHiddenInputs.title')).toBeInTheDocument()
-
-    fireEvent.change(screen.getByLabelText('Secret'), {
-      target: { value: 'top-secret' },
-    })
-    fireEvent.click(screen.getByRole('button', { name: 'overview.appInfo.launch' }))
-
-    await waitFor(() => {
-      expect(mockWindowOpen).toHaveBeenCalledWith(
-        `https://example.com${basePath}/workflow/access-token?secret=${encodeURIComponent('top-secret')}`,
-        '_blank',
-      )
-    })
-  })
-
-  it('should open the chat web app directly when launch is clicked even with hidden inputs', () => {
-    mockWorkflow = {
-      graph: {
-        nodes: [{
-          data: {
-            type: 'start',
-            variables: [
-              {
-                variable: 'chat_secret',
-                label: 'Chat Secret',
-                type: InputVarType.textInput,
-                hide: true,
-                required: true,
-                default: '',
-              },
-            ],
-          },
-        }],
-      },
-    }
-
-    render(
-      <AppCard
-        appInfo={{
-          ...appInfo,
-          mode: AppModeEnum.ADVANCED_CHAT,
-        } as AppDetailResponse}
-        onChangeStatus={mockOnChangeStatus}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('overview.appInfo.launch'))
-
-    expect(mockWindowOpen).toHaveBeenCalledWith(
-      `https://example.com${basePath}/chat/access-token`,
-      '_blank',
-    )
-    expect(screen.queryByText('overview.appInfo.workflowLaunchHiddenInputs.title')).not.toBeInTheDocument()
-  })
-
-  it('should collect hidden chatflow inputs from the config action before launching the chat web app', async () => {
-    mockWorkflow = {
-      graph: {
-        nodes: [{
-          data: {
-            type: 'start',
-            variables: [
-              {
-                variable: 'chat_secret',
-                label: 'Chat Secret',
-                type: InputVarType.textInput,
-                hide: true,
-                required: true,
-                default: '',
-              },
-            ],
-          },
-        }],
-      },
-    }
-
-    render(
-      <AppCard
-        appInfo={{
-          ...appInfo,
-          mode: AppModeEnum.ADVANCED_CHAT,
-        } as AppDetailResponse}
-        onChangeStatus={mockOnChangeStatus}
-      />,
-    )
-
-    fireEvent.click(screen.getByRole('button', { name: 'operation.config' }))
-
-    expect(screen.getByText('overview.appInfo.workflowLaunchHiddenInputs.title')).toBeInTheDocument()
-
-    fireEvent.change(screen.getByLabelText('Chat Secret'), {
-      target: { value: 'chat-secret' },
-    })
-    fireEvent.click(screen.getByRole('button', { name: 'overview.appInfo.launch' }))
-
-    await waitFor(() => {
-      expect(mockWindowOpen).toHaveBeenCalledWith(
-        `https://example.com${basePath}/chat/access-token?chat_secret=${encodeURIComponent('chat-secret')}`,
-        '_blank',
-      )
-    })
-  })
-
   it('should show the access-control not-set badge when specific access has no subjects', () => {
     render(
       <AppCard
@@ -480,7 +302,7 @@ describe('AppCard', () => {
   })
 
   it('should report refresh failures from access control updates', async () => {
-    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { })
+    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
     mockFetchAppDetailDirect.mockRejectedValueOnce(new Error('refresh failed'))
 
     render(

web/app/components/app/overview/__tests__/workflow-hidden-input-fields.spec.tsx

@@ -1,214 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import { InputVarType } from '@/app/components/workflow/types'
-import WorkflowHiddenInputFields from '../workflow-hidden-input-fields'
-
-describe('WorkflowHiddenInputFields', () => {
-  const onValueChange = vi.fn()
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('should render a text input with label and placeholder', () => {
-    render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'name',
-          label: 'Full Name',
-          type: InputVarType.textInput,
-          hide: true,
-          required: true,
-        }]}
-        values={{ name: 'Alice' }}
-        onValueChange={onValueChange}
-      />,
-    )
-
-    const input = screen.getByLabelText('Full Name')
-    expect(input).toHaveValue('Alice')
-
-    fireEvent.change(input, { target: { value: 'Bob' } })
-    expect(onValueChange).toHaveBeenCalledWith('name', 'Bob')
-  })
-
-  it('should render a number input for number-typed variables', () => {
-    render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'count',
-          label: 'Count',
-          type: InputVarType.number,
-          hide: true,
-          required: false,
-        }]}
-        values={{ count: '5' }}
-        onValueChange={onValueChange}
-      />,
-    )
-
-    const input = screen.getByLabelText('Count')
-    expect(input).toHaveAttribute('type', 'number')
-
-    fireEvent.change(input, { target: { value: '10' } })
-    expect(onValueChange).toHaveBeenCalledWith('count', '10')
-  })
-
-  it('should render a checkbox input without a separate label element above', () => {
-    render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'enabled',
-          label: 'Enable Feature',
-          type: InputVarType.checkbox,
-          hide: true,
-          required: false,
-        }]}
-        values={{ enabled: true }}
-        onValueChange={onValueChange}
-      />,
-    )
-
-    const checkbox = screen.getByRole('checkbox')
-    expect(checkbox).toBeChecked()
-    expect(screen.getByText('Enable Feature')).toBeInTheDocument()
-
-    fireEvent.click(checkbox)
-    expect(onValueChange).toHaveBeenCalledWith('enabled', false)
-  })
-
-  it('should render a select dropdown for select-typed variables', () => {
-    render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'color',
-          label: 'Color',
-          type: InputVarType.select,
-          hide: true,
-          required: false,
-          options: ['red', 'green', 'blue'],
-        }]}
-        values={{ color: 'red' }}
-        onValueChange={onValueChange}
-      />,
-    )
-
-    expect(screen.getByRole('combobox', { name: 'Color' })).toBeInTheDocument()
-  })
-
-  it('should render a textarea for paragraph-typed variables', () => {
-    render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'description',
-          label: 'Description',
-          type: InputVarType.paragraph,
-          hide: true,
-          required: false,
-          max_length: 500,
-        }]}
-        values={{ description: 'Hello world' }}
-        onValueChange={onValueChange}
-      />,
-    )
-
-    const textarea = screen.getByPlaceholderText('Description')
-    expect(textarea).toHaveValue('Hello world')
-
-    fireEvent.change(textarea, { target: { value: 'Updated' } })
-    expect(onValueChange).toHaveBeenCalledWith('description', 'Updated')
-  })
-
-  it('should render a textarea for json-typed variables', () => {
-    render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'config',
-          label: 'Config JSON',
-          type: InputVarType.json,
-          hide: true,
-          required: false,
-        }]}
-        values={{ config: '{"key": "value"}' }}
-        onValueChange={onValueChange}
-      />,
-    )
-
-    const textarea = screen.getByPlaceholderText('Config JSON')
-    expect(textarea).toHaveValue('{"key": "value"}')
-  })
-
-  it('should render a textarea for jsonObject-typed variables', () => {
-    render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'schema',
-          label: 'Schema',
-          type: InputVarType.jsonObject,
-          hide: true,
-          required: false,
-        }]}
-        values={{ schema: '{}' }}
-        onValueChange={onValueChange}
-      />,
-    )
-
-    const textarea = screen.getByPlaceholderText('Schema')
-    expect(textarea).toHaveValue('{}')
-  })
-
-  it('should use the variable key as label when label is not a string', () => {
-    render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'my_var',
-          label: { nodeType: 'start' as never, nodeName: 'Start', variable: 'my_var' },
-          type: InputVarType.textInput,
-          hide: true,
-          required: false,
-        }]}
-        values={{ my_var: '' }}
-        onValueChange={onValueChange}
-      />,
-    )
-
-    expect(screen.getByText('my_var')).toBeInTheDocument()
-  })
-
-  it('should use the custom fieldIdPrefix for element ids', () => {
-    const { container } = render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'token',
-          label: 'Token',
-          type: InputVarType.textInput,
-          hide: true,
-          required: false,
-        }]}
-        values={{ token: 'abc' }}
-        onValueChange={onValueChange}
-        fieldIdPrefix="custom-prefix"
-      />,
-    )
-
-    expect(container.querySelector('#custom-prefix-token')).toBeInTheDocument()
-  })
-
-  it('should render empty string for non-string fieldValue in text inputs', () => {
-    render(
-      <WorkflowHiddenInputFields
-        hiddenVariables={[{
-          variable: 'flag',
-          label: 'Flag',
-          type: InputVarType.textInput,
-          hide: true,
-          required: false,
-        }]}
-        values={{ flag: true as never }}
-        onValueChange={onValueChange}
-      />,
-    )
-
-    const input = screen.getByLabelText('Flag')
-    expect(input).toHaveValue('')
-  })
-})

web/app/components/app/overview/app-card-sections.tsx

@@ -1,11 +1,7 @@
 /* eslint-disable react-refresh/only-export-components */
 import type { TFunction } from 'i18next'
-import type { ComponentType, FormEvent, ReactNode } from 'react'
-import type {
-  OverviewOperationKey,
-  WorkflowHiddenStartVariable,
-  WorkflowLaunchInputValue,
-} from './app-card-utils'
+import type { ComponentType, ReactNode } from 'react'
+import type { OverviewOperationKey } from './app-card-utils'
 import type { ConfigParams } from './settings'
 import type { AppDetailResponse } from '@/models/app'
 import type { AppSSO } from '@/types/app'
@@ -19,19 +15,12 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogTitle,
-} from '@langgenius/dify-ui/dialog'
 import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
 } from '@langgenius/dify-ui/tooltip'
-import { RiArrowRightSLine, RiBookOpenLine, RiBuildingLine, RiEqualizer2Line, RiExternalLinkLine, RiGlobalLine, RiLockLine, RiPaintBrushLine, RiSettings2Line, RiVerifiedBadgeLine, RiWindowLine } from '@remixicon/react'
-import { Trans } from 'react-i18next'
+import { RiArrowRightSLine, RiBookOpenLine, RiBuildingLine, RiEqualizer2Line, RiExternalLinkLine, RiGlobalLine, RiLockLine, RiPaintBrushLine, RiVerifiedBadgeLine, RiWindowLine } from '@remixicon/react'
 import CopyFeedback from '@/app/components/base/copy-feedback'
 import Divider from '@/app/components/base/divider'
 import ShareQRCode from '@/app/components/base/qrcode'
@@ -42,7 +31,6 @@ import CustomizeModal from './customize'
 import EmbeddedModal from './embedded'
 import SettingsModal from './settings'
 import style from './style.module.css'
-import WorkflowHiddenInputFields from './workflow-hidden-input-fields'
 
 type AppInfo = AppDetailResponse & Partial<AppSSO>
 
@@ -62,12 +50,6 @@ type AppCardOperation = {
   onClick: () => void
 }
 
-type LaunchConfigAction = {
-  label: string
-  disabled: boolean
-  onClick: () => void
-}
-
 const OPERATION_ICON_MAP: Record<OverviewOperationKey, OperationIcon> = {
   launch: RiExternalLinkLine,
   embedded: RiWindowLine,
@@ -114,65 +96,6 @@ const MaybeTooltip = ({
   )
 }
 
-export const WorkflowLaunchDialog = ({
-  t,
-  open,
-  hiddenVariables,
-  unsupportedVariables,
-  values,
-  onOpenChange,
-  onValueChange,
-  onSubmit,
-}: {
-  t: TFunction
-  open: boolean
-  hiddenVariables: WorkflowHiddenStartVariable[]
-  unsupportedVariables: WorkflowHiddenStartVariable[]
-  values: Record<string, WorkflowLaunchInputValue>
-  onOpenChange: (open: boolean) => void
-  onValueChange: (variable: string, value: WorkflowLaunchInputValue) => void
-  onSubmit: (event: FormEvent<HTMLFormElement>) => void
-}) => {
-  if (!hiddenVariables.length && !unsupportedVariables.length)
-    return null
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="w-[560px]! max-w-[calc(100vw-2rem)]! p-0!">
-        <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-          <DialogTitle className="title-2xl-semi-bold text-text-primary">
-            {t('overview.appInfo.workflowLaunchHiddenInputs.title', { ns: 'appOverview' })}
-          </DialogTitle>
-          <DialogDescription className="system-md-regular text-text-tertiary">
-            <Trans
-              i18nKey="overview.appInfo.workflowLaunchHiddenInputs.description"
-              ns="appOverview"
-              components={{ bold: <span className="system-md-medium" /> }}
-            />
-          </DialogDescription>
-        </div>
-        <form onSubmit={onSubmit}>
-          <div className="space-y-4 px-6 pb-4">
-            <WorkflowHiddenInputFields
-              hiddenVariables={hiddenVariables}
-              values={values}
-              onValueChange={onValueChange}
-            />
-          </div>
-          <div className="flex items-center justify-end gap-2 border-t-[0.5px] border-divider-subtle px-6 py-4">
-            <Button onClick={() => onOpenChange(false)}>
-              {t('operation.cancel', { ns: 'common' })}
-            </Button>
-            <Button type="submit" variant="primary">
-              {t('overview.appInfo.launch', { ns: 'appOverview' })}
-            </Button>
-          </div>
-        </form>
-      </DialogContent>
-    </Dialog>
-  )
-}
-
 export const createAppCardOperations = ({
   operationKeys,
   t,
@@ -328,15 +251,20 @@ export const AppCardAccessControlSection = ({
 export const AppCardOperations = ({
   t,
   operations,
-  launchConfigAction,
 }: {
   t: TFunction
   operations: AppCardOperation[]
-  launchConfigAction?: LaunchConfigAction
 }) => (
   <>
-    {operations.map(({ key, label, Icon, disabled, onClick }) => {
-      const buttonContent = (
+    {operations.map(({ key, label, Icon, disabled, onClick }) => (
+      <Button
+        className="mr-1 min-w-[88px]"
+        size="small"
+        variant="ghost"
+        key={key}
+        onClick={onClick}
+        disabled={disabled}
+      >
         <MaybeTooltip
           content={t('overview.appInfo.preUseReminder', { ns: 'appOverview' }) ?? ''}
           tooltipClassName="mt-[-8px]"
@@ -347,72 +275,8 @@ export const AppCardOperations = ({
             <div className={`${disabled ? 'text-components-button-ghost-text-disabled' : 'text-text-tertiary'} px-[3px] system-xs-medium`}>{label}</div>
           </div>
         </MaybeTooltip>
-      )
-
-      if (key === 'launch' && launchConfigAction) {
-        return (
-          <MaybeTooltip
-            key={key}
-            content={t('overview.appInfo.preUseReminder', { ns: 'appOverview' }) ?? ''}
-            tooltipClassName="mt-[-8px]"
-            show={disabled}
-          >
-            <Button
-              className="mr-1 border-0 px-0 py-0 shadow-none backdrop-blur-none hover:bg-components-button-secondary-bg"
-              size="small"
-              variant="secondary"
-              onClick={onClick}
-              disabled={disabled}
-            >
-              <div className="flex h-full min-w-[88px] items-center justify-center rounded-l-md px-2 hover:bg-components-button-secondary-bg-hover">
-                <div className="flex items-center justify-center gap-px">
-                  <Icon className="h-3.5 w-3.5" />
-                  <div className="px-[3px] system-xs-medium">{label}</div>
-                </div>
-              </div>
-              <div
-                aria-hidden="true"
-                className="h-4 w-px shrink-0 bg-divider-regular opacity-100"
-              />
-              <div
-                className="flex h-full w-8 shrink-0 items-center justify-center rounded-r-md hover:bg-components-button-secondary-bg-hover"
-                onClick={(event) => {
-                  event.stopPropagation()
-                  launchConfigAction.onClick()
-                }}
-                aria-label={launchConfigAction.label}
-                role="button"
-                tabIndex={disabled ? -1 : 0}
-                onKeyDown={(event) => {
-                  if (disabled)
-                    return
-                  if (event.key === 'Enter' || event.key === ' ') {
-                    event.preventDefault()
-                    event.stopPropagation()
-                    launchConfigAction.onClick()
-                  }
-                }}
-              >
-                <RiSettings2Line className="h-3.5 w-3.5" />
-              </div>
-            </Button>
-          </MaybeTooltip>
-        )
-      }
-
-      return (
-        <Button
-          className="mr-1 min-w-[88px]"
-          size="small"
-          variant="ghost"
-          key={key}
-          onClick={onClick}
-          disabled={disabled}
-        >
-          {buttonContent}
-        </Button>
-      )
-    })}
+      </Button>
+    ))}
   </>
 )
 
@@ -431,7 +295,6 @@ export const AppCardDialogs = ({
   onCloseAccessControl,
   onSaveSiteConfig,
   onConfirmAccessControl,
-  hiddenInputs,
 }: {
   isApp: boolean
   appInfo: AppInfo
@@ -447,7 +310,6 @@ export const AppCardDialogs = ({
   onCloseAccessControl: () => void
   onSaveSiteConfig?: (params: ConfigParams) => Promise<void>
   onConfirmAccessControl: () => Promise<void>
-  hiddenInputs?: WorkflowHiddenStartVariable[]
 }) => {
   if (!isApp)
     return null
@@ -467,7 +329,6 @@ export const AppCardDialogs = ({
         onClose={onCloseEmbedded}
         appBaseUrl={appInfo.site?.app_base_url}
         accessToken={appInfo.site?.access_token}
-        hiddenInputs={hiddenInputs}
       />
       <CustomizeModal
         isShow={showCustomizeModal}

web/app/components/app/overview/app-card-utils.ts

@@ -1,8 +1,6 @@
-import type { InputVar } from '@/app/components/workflow/types'
 import type { AppDetailResponse } from '@/models/app'
 import type { AppSSO } from '@/types/app'
-import { BlockEnum, InputVarType } from '@/app/components/workflow/types'
-import { IS_CE_EDITION } from '@/config'
+import { BlockEnum } from '@/app/components/workflow/types'
 import { AccessMode } from '@/models/access-control'
 import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
@@ -10,11 +8,6 @@ import { basePath } from '@/utils/var'
 type OverviewCardType = 'api' | 'webapp'
 
 export type OverviewOperationKey = 'launch' | 'embedded' | 'customize' | 'settings' | 'develop'
-export type WorkflowLaunchInputValue = string | boolean
-export type WorkflowHiddenStartVariable = Pick<
-  InputVar,
-  'default' | 'hide' | 'label' | 'max_length' | 'options' | 'required' | 'type' | 'variable'
->
 
 type AppInfo = AppDetailResponse & Partial<AppSSO>
 
@@ -23,7 +16,6 @@ type WorkflowLike = {
     nodes?: Array<{
       data?: {
         type?: string
-        variables?: InputVar[]
       }
     }>
   }
@@ -50,173 +42,10 @@ const getCardAppMode = (mode: AppModeEnum) => {
   return (mode !== AppModeEnum.COMPLETION && mode !== AppModeEnum.WORKFLOW) ? AppModeEnum.CHAT : mode
 }
 
-const SUPPORTED_WORKFLOW_LAUNCH_INPUT_TYPES = new Set<InputVarType>([
-  InputVarType.textInput,
-  InputVarType.paragraph,
-  InputVarType.select,
-  InputVarType.number,
-  InputVarType.checkbox,
-  InputVarType.json,
-  InputVarType.jsonObject,
-  InputVarType.url,
-])
-
-const coerceWorkflowLaunchDefaultValue = (variable: WorkflowHiddenStartVariable): WorkflowLaunchInputValue => {
-  if (variable.type === InputVarType.checkbox) {
-    if (typeof variable.default === 'boolean')
-      return variable.default
-
-    return String(variable.default).toLowerCase() === 'true'
-  }
-
-  if (typeof variable.default === 'number')
-    return String(variable.default)
-
-  return String(variable.default ?? '')
-}
-
 export const hasWorkflowStartNode = (currentWorkflow: WorkflowLike) => {
   return currentWorkflow?.graph?.nodes?.some(node => node.data?.type === BlockEnum.Start) ?? false
 }
 
-export const getWorkflowHiddenStartVariables = (currentWorkflow: WorkflowLike): WorkflowHiddenStartVariable[] => {
-  const startNode = currentWorkflow?.graph?.nodes?.find(node => node.data?.type === BlockEnum.Start)
-  return (startNode?.data?.variables ?? []).filter(variable => variable.hide === true)
-}
-
-export const getAppHiddenLaunchVariables = ({
-  appInfo,
-  currentWorkflow,
-}: {
-  appInfo: AppInfo
-  currentWorkflow: WorkflowLike
-}) => {
-  if ([AppModeEnum.WORKFLOW, AppModeEnum.ADVANCED_CHAT].includes(appInfo.mode))
-    return getWorkflowHiddenStartVariables(currentWorkflow)
-}
-
-export const isWorkflowLaunchInputSupported = (variable: WorkflowHiddenStartVariable) => {
-  return SUPPORTED_WORKFLOW_LAUNCH_INPUT_TYPES.has(variable.type)
-}
-
-export const createWorkflowLaunchInitialValues = (variables: WorkflowHiddenStartVariable[]) => {
-  return variables.reduce<Record<string, WorkflowLaunchInputValue>>((acc, variable) => {
-    acc[variable.variable] = coerceWorkflowLaunchDefaultValue(variable)
-    return acc
-  }, {})
-}
-
-export const buildWorkflowLaunchUrl = async ({
-  accessibleUrl,
-  variables,
-  values,
-}: {
-  accessibleUrl: string
-  variables: WorkflowHiddenStartVariable[]
-  values: Record<string, WorkflowLaunchInputValue>
-}) => {
-  const targetUrl = new URL(accessibleUrl, window.location.origin)
-  variables.forEach((variable) => {
-    const rawValue = values[variable.variable]
-    const serializedValue = variable.type === InputVarType.checkbox
-      ? String(Boolean(rawValue))
-      : String(rawValue ?? '')
-
-    targetUrl.searchParams.set(variable.variable, serializedValue)
-  })
-
-  return targetUrl.toString()
-}
-
-export const getEmbeddedIframeSnippet = (iframeUrl: string) =>
-  `<iframe
- src="${iframeUrl}"
- style="width: 100%; height: 100%; min-height: 700px"
- frameborder="0"
- allow="microphone">
-</iframe>`
-
-const getScriptInputsContent = (values: Record<string, WorkflowLaunchInputValue>) => {
-  const entries = Object.entries(values)
-
-  if (!entries.length) {
-    return `{
-    // You can define the inputs from the Start node here
-    // key is the variable name
-    // e.g.
-    // name: "NAME"
-  }`
-  }
-
-  return `{
-${entries.map(([key, value]) => `    ${key}: ${JSON.stringify(value)},`).join('\n')}
-  }`
-}
-
-export const getEmbeddedScriptSnippet = ({
-  url,
-  token,
-  primaryColor,
-  isTestEnv,
-  inputValues,
-}: {
-  url: string
-  token: string
-  primaryColor: string
-  isTestEnv?: boolean
-  inputValues: Record<string, WorkflowLaunchInputValue>
-}) =>
-  `<script>
- window.difyChatbotConfig = {
-  token: '${token}'${isTestEnv
-    ? `,
-  isDev: true`
-    : ''}${IS_CE_EDITION
-    ? `,
-  baseUrl: '${url}${basePath}'`
-    : ''},
-  inputs: ${getScriptInputsContent(inputValues)},
-  systemVariables: {
-    // user_id: 'YOU CAN DEFINE USER ID HERE',
-    // conversation_id: 'YOU CAN DEFINE CONVERSATION ID HERE, IT MUST BE A VALID UUID',
-  },
-  userVariables: {
-    // avatar_url: 'YOU CAN DEFINE USER AVATAR URL HERE',
-    // name: 'YOU CAN DEFINE USER NAME HERE',
-  },
- }
-</script>
-<script
- src="${url}${basePath}/embed.min.js"
- id="${token}"
- defer>
-</script>
-<style>
-  #dify-chatbot-bubble-button {
-    background-color: ${primaryColor} !important;
-  }
-  #dify-chatbot-bubble-window {
-    width: 24rem !important;
-    height: 40rem !important;
-  }
-</style>`
-
-export const getChromePluginContent = (iframeUrl: string) => `ChatBot URL: ${iframeUrl}`
-
-export const compressAndEncodeBase64 = async (input: string) => {
-  const uint8Array = new TextEncoder().encode(input)
-  if (typeof CompressionStream === 'undefined')
-    return btoa(String.fromCharCode(...uint8Array))
-
-  const compressedStream = new Response(
-    new Blob([uint8Array])
-      .stream()
-      .pipeThrough(new CompressionStream('gzip')),
-  ).arrayBuffer()
-  const compressedUint8Array = new Uint8Array(await compressedStream)
-  return btoa(String.fromCharCode(...compressedUint8Array))
-}
-
 export const getAppCardDisplayState = ({
   appInfo,
   cardType,

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

@@ -1,5 +1,4 @@
 'use client'
-import type { WorkflowLaunchInputValue } from './app-card-utils'
 import type { ConfigParams } from './settings'
 import type { AppDetailResponse } from '@/models/app'
 import type { AppSSO } from '@/types/app'
@@ -29,16 +28,11 @@ import {
   AppCardOperations,
   AppCardUrlSection,
   createAppCardOperations,
-  WorkflowLaunchDialog,
 } from './app-card-sections'
 import {
-  buildWorkflowLaunchUrl,
-  createWorkflowLaunchInitialValues,
   getAppCardDisplayState,
   getAppCardOperationKeys,
-  getAppHiddenLaunchVariables,
   isAppAccessConfigured,
-  isWorkflowLaunchInputSupported,
 } from './app-card-utils'
 
 export type IAppCardProps = {
@@ -69,8 +63,7 @@ function AppCard({
   const router = useRouter()
   const pathname = usePathname()
   const { isCurrentWorkspaceManager, isCurrentWorkspaceEditor } = useAppContext()
-  const shouldFetchWorkflow = appInfo.mode === AppModeEnum.WORKFLOW || appInfo.mode === AppModeEnum.ADVANCED_CHAT
-  const { data: currentWorkflow } = useAppWorkflow(shouldFetchWorkflow ? appInfo.id : '')
+  const { data: currentWorkflow } = useAppWorkflow(appInfo.mode === AppModeEnum.WORKFLOW ? appInfo.id : '')
   const docLink = useDocLink()
   const appDetail = useAppStore(state => state.appDetail)
   const setAppDetail = useAppStore(state => state.setAppDetail)
@@ -80,8 +73,6 @@ function AppCard({
   const [genLoading, setGenLoading] = useState(false)
   const [showConfirmDelete, setShowConfirmDelete] = useState(false)
   const [showAccessControl, setShowAccessControl] = useState(false)
-  const [showWorkflowLaunchDialog, setShowWorkflowLaunchDialog] = useState(false)
-  const [workflowLaunchValues, setWorkflowLaunchValues] = useState<Record<string, WorkflowLaunchInputValue>>({})
   const { t } = useTranslation()
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
   const { data: appAccessSubjects } = useAppWhiteListSubjects(
@@ -107,25 +98,6 @@ function AppCard({
     () => isAppAccessConfigured(appDetail, appAccessSubjects),
     [appAccessSubjects, appDetail],
   )
-  const hiddenLaunchVariables = useMemo(
-    () => getAppHiddenLaunchVariables({
-      appInfo,
-      currentWorkflow,
-    }) || [],
-    [appInfo, currentWorkflow],
-  )
-  const supportedWorkflowLaunchVariables = useMemo(
-    () => hiddenLaunchVariables.filter(isWorkflowLaunchInputSupported),
-    [hiddenLaunchVariables],
-  )
-  const unsupportedWorkflowLaunchVariables = useMemo(
-    () => hiddenLaunchVariables.filter(variable => !isWorkflowLaunchInputSupported(variable)),
-    [hiddenLaunchVariables],
-  )
-  const initialWorkflowLaunchValues = useMemo(
-    () => createWorkflowLaunchInitialValues(supportedWorkflowLaunchVariables),
-    [supportedWorkflowLaunchVariables],
-  )
 
   const onGenCode = async () => {
     if (!onGenerateCode)
@@ -167,31 +139,6 @@ function AppCard({
     window.open(cardState.accessibleUrl, '_blank')
   }, [cardState.accessibleUrl])
 
-  const handleOpenWorkflowLaunchDialog = useCallback(() => {
-    setWorkflowLaunchValues(initialWorkflowLaunchValues)
-    setShowWorkflowLaunchDialog(true)
-  }, [initialWorkflowLaunchValues])
-
-  const handleWorkflowLaunchValueChange = useCallback((variable: string, value: WorkflowLaunchInputValue) => {
-    setWorkflowLaunchValues(prev => ({
-      ...prev,
-      [variable]: value,
-    }))
-  }, [])
-
-  const handleWorkflowLaunchConfirm = useCallback(async (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault()
-
-    const targetUrl = await buildWorkflowLaunchUrl({
-      accessibleUrl: cardState.accessibleUrl,
-      variables: supportedWorkflowLaunchVariables,
-      values: workflowLaunchValues,
-    })
-
-    window.open(targetUrl, '_blank')
-    setShowWorkflowLaunchDialog(false)
-  }, [cardState.accessibleUrl, supportedWorkflowLaunchVariables, workflowLaunchValues])
-
   const handleOpenCustomize = useCallback(() => {
     setShowCustomizeModal(true)
   }, [])
@@ -357,17 +304,7 @@ function AppCard({
         {!cardState.isMinimalState && (
           <div className="flex items-center gap-1 self-stretch p-3">
             {!isApp && <SecretKeyButton appId={appInfo.id} />}
-            <AppCardOperations
-              t={t}
-              operations={operations}
-              launchConfigAction={hiddenLaunchVariables.length > 0
-                ? {
-                    label: t('operation.config', { ns: 'common' }),
-                    disabled: triggerModeDisabled || !cardState.runningStatus,
-                    onClick: handleOpenWorkflowLaunchDialog,
-                  }
-                : undefined}
-            />
+            <AppCardOperations t={t} operations={operations} />
           </div>
         )}
       </div>
@@ -386,17 +323,6 @@ function AppCard({
         onCloseAccessControl={() => setShowAccessControl(false)}
         onSaveSiteConfig={onSaveSiteConfig}
         onConfirmAccessControl={handleAccessControlUpdate}
-        hiddenInputs={hiddenLaunchVariables}
-      />
-      <WorkflowLaunchDialog
-        t={t}
-        open={showWorkflowLaunchDialog}
-        hiddenVariables={supportedWorkflowLaunchVariables}
-        unsupportedVariables={unsupportedWorkflowLaunchVariables}
-        values={workflowLaunchValues}
-        onOpenChange={setShowWorkflowLaunchDialog}
-        onValueChange={handleWorkflowLaunchValueChange}
-        onSubmit={handleWorkflowLaunchConfirm}
       />
     </div>
   )

web/app/components/app/overview/embedded/__tests__/index.spec.tsx

@@ -1,11 +1,10 @@
 import type { SiteInfo } from '@/models/share'
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { fireEvent, render, screen } from '@testing-library/react'
 import copy from 'copy-to-clipboard'
 import * as React from 'react'
-import { act } from 'react'
 
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
-import { InputVarType } from '@/app/components/workflow/types'
+import { act } from 'react'
+import { afterAll, afterEach, describe, expect, it, vi } from 'vitest'
 import Embedded from '../index'
 
 vi.mock('../style.module.css', () => ({
@@ -47,7 +46,6 @@ vi.mock('@/context/app-context', () => ({
 }))
 const mockWindowOpen = vi.spyOn(window, 'open').mockImplementation(() => null)
 const mockedCopy = vi.mocked(copy)
-const originalCompressionStream = globalThis.CompressionStream
 
 const siteInfo: SiteInfo = {
   title: 'test site',
@@ -72,22 +70,6 @@ const getCopyButton = () => {
 }
 
 describe('Embedded', () => {
-  beforeAll(() => {
-    class MockCompressionStream {
-      readable: ReadableStream<Uint8Array>
-      writable: WritableStream<Uint8Array>
-
-      constructor() {
-        const transformStream = new TransformStream<Uint8Array, Uint8Array>()
-        this.readable = transformStream.readable
-        this.writable = transformStream.writable
-      }
-    }
-
-    // @ts-expect-error test polyfill
-    globalThis.CompressionStream = MockCompressionStream
-  })
-
   afterEach(() => {
     vi.clearAllMocks()
     mockWindowOpen.mockClear()
@@ -95,7 +77,6 @@ describe('Embedded', () => {
 
   afterAll(() => {
     mockWindowOpen.mockRestore()
-    globalThis.CompressionStream = originalCompressionStream
   })
 
   it('builds theme and copies iframe snippet', async () => {
@@ -103,20 +84,14 @@ describe('Embedded', () => {
       render(<Embedded {...baseProps} />)
     })
 
-    await waitFor(() => {
-      expect(screen.getByText((content, node) => node?.tagName.toLowerCase() === 'pre' && content.includes('/chatbot/token'))).toBeInTheDocument()
-    })
-
     const actionButton = getCopyButton()
     const innerDiv = actionButton.querySelector('div')
-    await act(async () => {
+    act(() => {
       fireEvent.click(innerDiv ?? actionButton)
     })
 
     expect(mockThemeBuilder.buildTheme).toHaveBeenCalledWith(siteInfo.chat_color_theme, siteInfo.chat_color_theme_inverted)
-    await waitFor(() => {
-      expect(mockedCopy).toHaveBeenCalledWith(expect.stringContaining('/chatbot/token'))
-    })
+    expect(mockedCopy).toHaveBeenCalledWith(expect.stringContaining('/chatbot/token'))
   })
 
   it('opens chrome plugin store link when chrome option selected', async () => {
@@ -141,106 +116,4 @@ describe('Embedded', () => {
       'noopener,noreferrer',
     )
   })
-
-  it('keeps hidden inputs collapsed by default and updates iframe and script content when values change', async () => {
-    render(
-      <Embedded
-        {...baseProps}
-        hiddenInputs={[{
-          variable: 'secret',
-          label: 'Secret',
-          type: InputVarType.textInput,
-          hide: true,
-          required: true,
-          default: '',
-        }]}
-      />,
-    )
-
-    expect(screen.queryByLabelText('Secret')).not.toBeInTheDocument()
-
-    await act(async () => {
-      fireEvent.click(screen.getByText('appOverview.overview.appInfo.embedded.hiddenInputs.title').closest('button')!)
-    })
-
-    await waitFor(() => {
-      expect(screen.getByLabelText('Secret')).toBeInTheDocument()
-    })
-
-    await act(async () => {
-      fireEvent.change(screen.getByLabelText('Secret'), {
-        target: { value: 'top-secret' },
-      })
-    })
-
-    expect(document.querySelector('pre')?.textContent ?? '').toContain('/chatbot/token')
-
-    await waitFor(() => {
-      const codeBlock = document.querySelector('pre')
-      expect(codeBlock?.textContent ?? '').toContain('/chatbot/token?secret=dG9wLXNlY3JldA%3D%3D')
-    })
-
-    const optionButtons = document.body.querySelectorAll('[class*="option"]')
-    act(() => {
-      fireEvent.click(optionButtons[1]!)
-    })
-
-    await waitFor(() => {
-      const codeBlock = document.querySelector('pre')
-      expect(codeBlock?.textContent ?? '').toContain('secret: "top-secret"')
-    })
-  })
-
-  it('copies script content when scripts option is selected', async () => {
-    await act(async () => {
-      render(<Embedded {...baseProps} />)
-    })
-
-    const optionButtons = document.body.querySelectorAll('[class*="option"]')
-    act(() => {
-      fireEvent.click(optionButtons[1]!)
-    })
-
-    await waitFor(() => {
-      const codeBlock = document.querySelector('pre')
-      expect(codeBlock?.textContent ?? '').toContain('token: \'token\'')
-    })
-
-    const actionButton = getCopyButton()
-    const innerDiv = actionButton.querySelector('div')
-    await act(async () => {
-      fireEvent.click(innerDiv ?? actionButton)
-    })
-
-    await waitFor(() => {
-      expect(mockedCopy).toHaveBeenCalledWith(expect.stringContaining('token: \'token\''))
-    })
-  })
-
-  it('copies chrome plugin URL (without prefix) when chromePlugin option is selected', async () => {
-    await act(async () => {
-      render(<Embedded {...baseProps} />)
-    })
-
-    const optionButtons = document.body.querySelectorAll('[class*="option"]')
-    act(() => {
-      fireEvent.click(optionButtons[2]!)
-    })
-
-    await waitFor(() => {
-      const codeBlock = document.querySelector('pre')
-      expect(codeBlock?.textContent ?? '').toContain('ChatBot URL:')
-    })
-
-    const actionButton = getCopyButton()
-    const innerDiv = actionButton.querySelector('div')
-    await act(async () => {
-      fireEvent.click(innerDiv ?? actionButton)
-    })
-
-    await waitFor(() => {
-      expect(mockedCopy).toHaveBeenCalledWith(expect.stringContaining('/chatbot/token'))
-      expect(mockedCopy).not.toHaveBeenCalledWith(expect.stringContaining('ChatBot URL:'))
-    })
-  })
 })

web/app/components/app/overview/embedded/index.tsx

@@ -1,46 +1,88 @@
-import type { MutableRefObject } from 'react'
-import type { WorkflowHiddenStartVariable, WorkflowLaunchInputValue } from '../app-card-utils'
 import type { SiteInfo } from '@/models/share'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
-import {
-  RiArrowDownSLine,
-  RiArrowRightSLine,
-} from '@remixicon/react'
 import copy from 'copy-to-clipboard'
-import { Suspense, use, useEffect, useMemo, useRef, useState } from 'react'
+import * as React from 'react'
+import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import { useThemeContext } from '@/app/components/base/chat/embedded-chatbot/theme/theme-context'
-import { InputVarType } from '@/app/components/workflow/types'
+import { IS_CE_EDITION } from '@/config'
 import { useAppContext } from '@/context/app-context'
 import { basePath } from '@/utils/var'
-import {
-  compressAndEncodeBase64,
-  createWorkflowLaunchInitialValues,
-  getChromePluginContent,
-  getEmbeddedIframeSnippet,
-  getEmbeddedScriptSnippet,
-  isWorkflowLaunchInputSupported,
-} from '../app-card-utils'
-import WorkflowHiddenInputFields from '../workflow-hidden-input-fields'
 import style from './style.module.css'
 
 type Props = {
   siteInfo?: SiteInfo
   isShow: boolean
   onClose: () => void
-  accessToken?: string
-  appBaseUrl?: string
-  hiddenInputs?: WorkflowHiddenStartVariable[]
+  accessToken: string
+  appBaseUrl: string
   className?: string
 }
 
-const OPTION_KEYS = ['iframe', 'scripts', 'chromePlugin'] as const
+const OPTION_MAP = {
+  iframe: {
+    getContent: (url: string, token: string) =>
+      `<iframe
+ src="${url}${basePath}/chatbot/${token}"
+ style="width: 100%; height: 100%; min-height: 700px"
+ frameborder="0"
+ allow="microphone">
+</iframe>`,
+  },
+  scripts: {
+    getContent: (url: string, token: string, primaryColor: string, isTestEnv?: boolean) =>
+      `<script>
+ window.difyChatbotConfig = {
+  token: '${token}'${isTestEnv
+    ? `,
+  isDev: true`
+    : ''}${IS_CE_EDITION
+    ? `,
+  baseUrl: '${url}${basePath}'`
+    : ''},
+  inputs: {
+    // You can define the inputs from the Start node here
+    // key is the variable name
+    // e.g.
+    // name: "NAME"
+  },
+  systemVariables: {
+    // user_id: 'YOU CAN DEFINE USER ID HERE',
+    // conversation_id: 'YOU CAN DEFINE CONVERSATION ID HERE, IT MUST BE A VALID UUID',
+  },
+  userVariables: {
+    // avatar_url: 'YOU CAN DEFINE USER AVATAR URL HERE',
+    // name: 'YOU CAN DEFINE USER NAME HERE',
+  },
+ }
+</script>
+<script
+ src="${url}${basePath}/embed.min.js"
+ id="${token}"
+ defer>
+</script>
+<style>
+  #dify-chatbot-bubble-button {
+    background-color: ${primaryColor} !important;
+  }
+  #dify-chatbot-bubble-window {
+    width: 24rem !important;
+    height: 40rem !important;
+  }
+</style>`,
+  },
+  chromePlugin: {
+    getContent: (url: string, token: string) => `ChatBot URL: ${url}${basePath}/chatbot/${token}`,
+  },
+}
 const prefixEmbedded = 'overview.appInfo.embedded'
 
-type Option = typeof OPTION_KEYS[number]
+type Option = keyof typeof OPTION_MAP
+
+const OPTIONS: Option[] = ['iframe', 'scripts', 'chromePlugin']
 
 const optionIconClassName: Record<Option, string> = {
   iframe: style.iframeIcon!,
@@ -48,274 +90,38 @@ const optionIconClassName: Record<Option, string> = {
   chromePlugin: style.chromePluginIcon!,
 }
 
-const getSerializedHiddenInputValue = (
-  variable: WorkflowHiddenStartVariable,
-  values: Record<string, WorkflowLaunchInputValue>,
-) => {
-  const rawValue = values[variable.variable]
-  if (variable.type === InputVarType.checkbox)
-    return String(Boolean(rawValue))
-
-  return String(rawValue ?? '')
-}
-
-const buildEmbeddedIframeUrl = async ({
-  appBaseUrl,
-  accessToken,
-  variables,
-  values,
-}: {
-  appBaseUrl: string
-  accessToken: string
-  variables: WorkflowHiddenStartVariable[]
-  values: Record<string, WorkflowLaunchInputValue>
-}) => {
-  const iframeUrl = new URL(`${appBaseUrl}${basePath}/chatbot/${accessToken}`, window.location.origin)
-
-  await Promise.all(variables.map(async (variable) => {
-    iframeUrl.searchParams.set(variable.variable, await compressAndEncodeBase64(getSerializedHiddenInputValue(variable, values)))
-  }))
-
-  return iframeUrl.toString()
-}
-
-const AsyncEmbeddedOptionContent = ({
-  option,
-  iframeUrlPromise,
-  latestResolvedIframeUrlRef,
-}: {
-  option: Option
-  iframeUrlPromise: Promise<string>
-  latestResolvedIframeUrlRef: MutableRefObject<string>
-}) => {
-  const iframeUrl = use(iframeUrlPromise)
-  latestResolvedIframeUrlRef.current = iframeUrl
-
-  if (option === 'chromePlugin')
-    return getChromePluginContent(iframeUrl)
-
-  return getEmbeddedIframeSnippet(iframeUrl)
-}
-
-const EmbeddedContent = ({
-  siteInfo,
-  appBaseUrl,
-  accessToken,
-  hiddenInputs,
-}: Required<Pick<Props, 'accessToken' | 'appBaseUrl'>> & Pick<Props, 'siteInfo' | 'hiddenInputs'>) => {
+const Embedded = ({ siteInfo, isShow, onClose, appBaseUrl, accessToken, className }: Props) => {
   const { t } = useTranslation()
-  const supportedHiddenInputs = useMemo<WorkflowHiddenStartVariable[]>(
-    () => (hiddenInputs ?? []).filter(isWorkflowLaunchInputSupported),
-    [hiddenInputs],
-  )
-  const initialHiddenInputValues = useMemo(
-    () => createWorkflowLaunchInitialValues(supportedHiddenInputs),
-    [supportedHiddenInputs],
-  )
   const [option, setOption] = useState<Option>('iframe')
   const [copiedOption, setCopiedOption] = useState<Option | null>(null)
-  const [hiddenInputsCollapsed, setHiddenInputsCollapsed] = useState(true)
-  const [hiddenInputValues, setHiddenInputValues] = useState<Record<string, WorkflowLaunchInputValue>>(
-    () => initialHiddenInputValues,
-  )
-  const [previewIframeUrlPromise, setPreviewIframeUrlPromise] = useState<Promise<string>>(
-    () => buildEmbeddedIframeUrl({
-      appBaseUrl,
-      accessToken,
-      variables: supportedHiddenInputs,
-      values: initialHiddenInputValues,
-    }),
-  )
-  const latestResolvedIframeUrlRef = useRef('')
 
   const { langGeniusVersionInfo } = useAppContext()
   const themeBuilder = useThemeContext()
+  themeBuilder.buildTheme(siteInfo?.chat_color_theme ?? null, siteInfo?.chat_color_theme_inverted ?? false)
   const isTestEnv = langGeniusVersionInfo.current_env === 'TESTING' || langGeniusVersionInfo.current_env === 'DEVELOPMENT'
-
-  const handleHiddenInputValueChange = (variable: string, value: WorkflowLaunchInputValue) => {
-    const nextHiddenInputValues = {
-      ...hiddenInputValues,
-      [variable]: value,
-    }
-
-    setCopiedOption(null)
-    setHiddenInputValues(nextHiddenInputValues)
-    setPreviewIframeUrlPromise(buildEmbeddedIframeUrl({
-      appBaseUrl,
-      accessToken,
-      variables: supportedHiddenInputs,
-      values: nextHiddenInputValues,
-    }))
-  }
-  const scriptsContent = useMemo(() => getEmbeddedScriptSnippet({
-    url: appBaseUrl,
-    token: accessToken,
-    primaryColor: themeBuilder.theme?.primaryColor ?? '#1C64F2',
-    isTestEnv,
-    inputValues: hiddenInputValues,
-  }), [accessToken, appBaseUrl, hiddenInputValues, isTestEnv, themeBuilder.theme?.primaryColor])
-
-  const onClickCopy = async () => {
-    const latestIframeUrl = await buildEmbeddedIframeUrl({
-      appBaseUrl,
-      accessToken,
-      variables: supportedHiddenInputs,
-      values: hiddenInputValues,
-    })
-
+  const onClickCopy = () => {
     if (option === 'chromePlugin') {
-      const splitUrl = getChromePluginContent(latestIframeUrl).split(': ')
+      const splitUrl = OPTION_MAP[option].getContent(appBaseUrl, accessToken).split(': ')
       if (splitUrl.length > 1)
         copy(splitUrl[1]!)
     }
-    else if (option === 'iframe') {
-      copy(getEmbeddedIframeSnippet(latestIframeUrl))
-    }
     else {
-      copy(scriptsContent)
+      copy(OPTION_MAP[option].getContent(appBaseUrl, accessToken, themeBuilder.theme?.primaryColor ?? '#1C64F2', isTestEnv))
     }
     setCopiedOption(option)
   }
-  const previewFallback = latestResolvedIframeUrlRef.current
-    ? (option === 'chromePlugin'
-        ? getChromePluginContent(latestResolvedIframeUrlRef.current)
-        : getEmbeddedIframeSnippet(latestResolvedIframeUrlRef.current))
-    : ''
 
   const navigateToChromeUrl = () => {
     window.open('https://chrome.google.com/webstore/detail/dify-chatbot/ceehdapohffmjmkdcifjofadiaoeggaf', '_blank', 'noopener,noreferrer')
   }
 
-  useEffect(() => {
-    themeBuilder.buildTheme(siteInfo?.chat_color_theme ?? null, siteInfo?.chat_color_theme_inverted ?? false)
-  }, [siteInfo?.chat_color_theme, siteInfo?.chat_color_theme_inverted, themeBuilder])
-
-  return (
-    <>
-      <div className="mt-8 mb-4 system-sm-medium text-text-primary">
-        {t(`${prefixEmbedded}.explanation`, { ns: 'appOverview' })}
-      </div>
-      {supportedHiddenInputs.length > 0 && (
-        <div className="mb-6 rounded-xl border-[0.5px] border-components-panel-border bg-background-section">
-          <button
-            type="button"
-            className="flex w-full items-center justify-between gap-3 px-4 py-3 text-left"
-            onClick={() => setHiddenInputsCollapsed(prev => !prev)}
-          >
-            <div>
-              <div className="system-sm-medium text-text-primary">
-                {t(`${prefixEmbedded}.hiddenInputs.title`, { ns: 'appOverview' })}
-              </div>
-              <div className="mt-1 system-xs-regular text-text-tertiary">
-                {t(`${prefixEmbedded}.hiddenInputs.description`, { ns: 'appOverview' })}
-              </div>
-            </div>
-            {hiddenInputsCollapsed
-              ? <RiArrowRightSLine className="h-4 w-4 shrink-0 text-text-tertiary" />
-              : <RiArrowDownSLine className="h-4 w-4 shrink-0 text-text-tertiary" />}
-          </button>
-          {!hiddenInputsCollapsed && (
-            <div className="max-h-72 space-y-4 overflow-y-auto border-t-[0.5px] border-divider-subtle px-4 py-4">
-              <WorkflowHiddenInputFields
-                hiddenVariables={supportedHiddenInputs}
-                values={hiddenInputValues}
-                onValueChange={handleHiddenInputValueChange}
-                fieldIdPrefix="embedded-hidden-input"
-              />
-            </div>
-          )}
-        </div>
-      )}
-      <div className="flex flex-wrap items-center justify-between gap-y-2">
-        {OPTION_KEYS.map((v) => {
-          return (
-            <button
-              type="button"
-              key={v}
-              aria-label={t(`${prefixEmbedded}.${v}`, { ns: 'appOverview' }) || v}
-              className={cn(
-                style.option,
-                optionIconClassName[v],
-                option === v && style.active,
-              )}
-              onClick={() => {
-                setOption(v)
-                setCopiedOption(null)
-              }}
-            >
-            </button>
-          )
-        })}
-      </div>
-      {option === 'chromePlugin' && (
-        <div className="mt-6 w-full">
-          <button
-            type="button"
-            className={cn('inline-flex w-full items-center justify-center gap-2 rounded-lg py-3', 'shrink-0 bg-primary-600 text-white hover:bg-primary-600/75 hover:shadow-sm')}
-            onClick={navigateToChromeUrl}
-          >
-            <div className={`relative h-4 w-4 ${style.pluginInstallIcon}`}></div>
-            <div className="font-['Inter'] text-sm leading-tight font-medium text-white">{t(`${prefixEmbedded}.chromePlugin`, { ns: 'appOverview' })}</div>
-          </button>
-        </div>
-      )}
-      <div className={cn('inline-flex w-full flex-col items-start justify-start rounded-lg border-[0.5px] border-components-panel-border bg-background-section', 'mt-6')}>
-        <div className="inline-flex items-center justify-start gap-2 self-stretch rounded-t-lg bg-background-section-burn py-1 pr-1 pl-3">
-          <div className="shrink-0 grow system-sm-medium text-text-secondary">
-            {t(`${prefixEmbedded}.${option}`, { ns: 'appOverview' })}
-          </div>
-          <Tooltip>
-            <TooltipTrigger
-              render={(
-                <ActionButton
-                  aria-label={(copiedOption === option
-                    ? t(`${prefixEmbedded}.copied`, { ns: 'appOverview' })
-                    : t(`${prefixEmbedded}.copy`, { ns: 'appOverview' })) || ''}
-                  onClick={() => void onClickCopy()}
-                >
-                  {copiedOption === option && <span aria-hidden="true" className="i-ri-clipboard-fill h-4 w-4" />}
-                  {copiedOption !== option && <span aria-hidden="true" className="i-ri-clipboard-line h-4 w-4" />}
-                </ActionButton>
-              )}
-            />
-            <TooltipContent>
-              {(copiedOption === option
-                ? t(`${prefixEmbedded}.copied`, { ns: 'appOverview' })
-                : t(`${prefixEmbedded}.copy`, { ns: 'appOverview' })) || ''}
-            </TooltipContent>
-          </Tooltip>
-        </div>
-        <div className="flex max-h-[clamp(180px,calc(100dvh-320px),360px)] w-full items-start justify-start gap-2 overflow-auto p-3">
-          <div className="shrink grow basis-0 font-mono text-[13px] leading-tight text-text-secondary">
-            <pre className="select-text">
-              {option === 'scripts'
-                ? scriptsContent
-                : (
-                    <Suspense fallback={previewFallback}>
-                      <AsyncEmbeddedOptionContent
-                        option={option}
-                        iframeUrlPromise={previewIframeUrlPromise}
-                        latestResolvedIframeUrlRef={latestResolvedIframeUrlRef}
-                      />
-                    </Suspense>
-                  )}
-            </pre>
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}
-
-const Embedded = ({ siteInfo, isShow, onClose, appBaseUrl, accessToken, hiddenInputs, className }: Props) => {
-  const { t } = useTranslation()
-
   return (
     <Dialog
       open={isShow}
       onOpenChange={(open) => {
         if (open)
           return
+        setCopiedOption(null)
         onClose()
       }}
     >
@@ -324,16 +130,73 @@ const Embedded = ({ siteInfo, isShow, onClose, appBaseUrl, accessToken, hiddenIn
           {t(`${prefixEmbedded}.title`, { ns: 'appOverview' })}
         </DialogTitle>
         <DialogCloseButton />
-        <div className="max-h-[calc(90vh-88px)] overflow-y-auto">
-          {isShow && (
-            <EmbeddedContent
-              key={`${appBaseUrl ?? ''}:${accessToken ?? ''}:${JSON.stringify(hiddenInputs ?? [])}`}
-              siteInfo={siteInfo}
-              appBaseUrl={appBaseUrl ?? ''}
-              accessToken={accessToken ?? ''}
-              hiddenInputs={hiddenInputs}
-            />
-          )}
+        <div className="mt-8 mb-4 system-sm-medium text-text-primary">
+          {t(`${prefixEmbedded}.explanation`, { ns: 'appOverview' })}
+        </div>
+        <div className="flex flex-wrap items-center justify-between gap-y-2">
+          {OPTIONS.map((v) => {
+            return (
+              <button
+                type="button"
+                key={v}
+                aria-label={t(`${prefixEmbedded}.${v}`, { ns: 'appOverview' }) || v}
+                className={cn(
+                  style.option,
+                  optionIconClassName[v],
+                  option === v && style.active,
+                )}
+                onClick={() => {
+                  setOption(v)
+                  setCopiedOption(null)
+                }}
+              >
+              </button>
+            )
+          })}
+        </div>
+        {option === 'chromePlugin' && (
+          <div className="mt-6 w-full">
+            <button
+              type="button"
+              className={cn('inline-flex w-full items-center justify-center gap-2 rounded-lg py-3', 'shrink-0 bg-primary-600 text-white hover:bg-primary-600/75 hover:shadow-sm')}
+              onClick={navigateToChromeUrl}
+            >
+              <div className={`relative h-4 w-4 ${style.pluginInstallIcon}`}></div>
+              <div className="font-['Inter'] text-sm leading-tight font-medium text-white">{t(`${prefixEmbedded}.chromePlugin`, { ns: 'appOverview' })}</div>
+            </button>
+          </div>
+        )}
+        <div className={cn('inline-flex w-full flex-col items-start justify-start rounded-lg border-[0.5px] border-components-panel-border bg-background-section', 'mt-6')}>
+          <div className="inline-flex items-center justify-start gap-2 self-stretch rounded-t-lg bg-background-section-burn py-1 pr-1 pl-3">
+            <div className="shrink-0 grow system-sm-medium text-text-secondary">
+              {t(`${prefixEmbedded}.${option}`, { ns: 'appOverview' })}
+            </div>
+            <Tooltip>
+              <TooltipTrigger
+                render={(
+                  <ActionButton
+                    aria-label={(copiedOption === option
+                      ? t(`${prefixEmbedded}.copied`, { ns: 'appOverview' })
+                      : t(`${prefixEmbedded}.copy`, { ns: 'appOverview' })) || ''}
+                    onClick={onClickCopy}
+                  >
+                    {copiedOption === option && <span aria-hidden="true" className="i-ri-clipboard-fill h-4 w-4" />}
+                    {copiedOption !== option && <span aria-hidden="true" className="i-ri-clipboard-line h-4 w-4" />}
+                  </ActionButton>
+                )}
+              />
+              <TooltipContent>
+                {(copiedOption === option
+                  ? t(`${prefixEmbedded}.copied`, { ns: 'appOverview' })
+                  : t(`${prefixEmbedded}.copy`, { ns: 'appOverview' })) || ''}
+              </TooltipContent>
+            </Tooltip>
+          </div>
+          <div className="flex max-h-[clamp(180px,calc(100dvh-320px),360px)] w-full items-start justify-start gap-2 overflow-auto p-3">
+            <div className="shrink grow basis-0 font-mono text-[13px] leading-tight text-text-secondary">
+              <pre className="select-text">{OPTION_MAP[option].getContent(appBaseUrl, accessToken, themeBuilder.theme?.primaryColor ?? '#1C64F2', isTestEnv)}</pre>
+            </div>
+          </div>
         </div>
       </DialogContent>
     </Dialog>

web/app/components/app/overview/workflow-hidden-input-fields.tsx

@@ -1,116 +0,0 @@
-import type { ChangeEvent } from 'react'
-import type { WorkflowHiddenStartVariable, WorkflowLaunchInputValue } from './app-card-utils'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@langgenius/dify-ui/select'
-import Input from '@/app/components/base/input'
-import Textarea from '@/app/components/base/textarea'
-
-import { InputVarType } from '@/app/components/workflow/types'
-
-type WorkflowHiddenInputFieldsProps = {
-  hiddenVariables: WorkflowHiddenStartVariable[]
-  values: Record<string, WorkflowLaunchInputValue>
-  onValueChange: (variable: string, value: WorkflowLaunchInputValue) => void
-  fieldIdPrefix?: string
-}
-
-const WorkflowHiddenInputFields = ({
-  hiddenVariables,
-  values,
-  onValueChange,
-  fieldIdPrefix = 'workflow-launch-hidden-input',
-}: WorkflowHiddenInputFieldsProps) => {
-  const renderField = (variable: WorkflowHiddenStartVariable) => {
-    const fieldId = `${fieldIdPrefix}-${variable.variable}`
-    const fieldValue = values[variable.variable]
-    const label = typeof variable.label === 'string' ? variable.label : variable.variable
-
-    if (variable.type === InputVarType.select) {
-      return (
-        <Select
-          value={typeof fieldValue === 'string' ? fieldValue : ''}
-          onValueChange={value => onValueChange(variable.variable, value ?? '')}
-        >
-          <SelectTrigger className="w-full" aria-label={label}>
-            <SelectValue placeholder={label} />
-          </SelectTrigger>
-          <SelectContent>
-            {(variable.options ?? []).map(option => (
-              <SelectItem key={option} value={option}>
-                {option}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-      )
-    }
-
-    if (variable.type === InputVarType.checkbox) {
-      return (
-        <label className="flex min-h-10 w-full cursor-pointer items-center gap-3 rounded-lg bg-components-input-bg-normal px-3 py-2">
-          <input
-            id={fieldId}
-            type="checkbox"
-            checked={Boolean(fieldValue)}
-            onChange={(event: ChangeEvent<HTMLInputElement>) => onValueChange(variable.variable, event.target.checked)}
-            className="h-4 w-4 rounded border-divider-subtle"
-          />
-          <span className="system-sm-regular text-text-secondary">{label}</span>
-        </label>
-      )
-    }
-
-    if (
-      variable.type === InputVarType.paragraph
-      || variable.type === InputVarType.json
-      || variable.type === InputVarType.jsonObject
-    ) {
-      return (
-        <Textarea
-          id={fieldId}
-          value={typeof fieldValue === 'string' ? fieldValue : ''}
-          onChange={(event: ChangeEvent<HTMLTextAreaElement>) => onValueChange(variable.variable, event.target.value)}
-          placeholder={label}
-          maxLength={variable.max_length}
-          className="min-h-24"
-        />
-      )
-    }
-
-    return (
-      <Input
-        id={fieldId}
-        type={variable.type === InputVarType.number ? 'number' : 'text'}
-        value={typeof fieldValue === 'string' ? fieldValue : ''}
-        onChange={(event: ChangeEvent<HTMLInputElement>) => onValueChange(variable.variable, event.target.value)}
-        placeholder={label}
-        maxLength={variable.max_length}
-      />
-    )
-  }
-
-  return (
-    <>
-      {hiddenVariables.map(variable => (
-        <div key={variable.variable} className="space-y-1.5">
-          {variable.type !== InputVarType.checkbox && (
-            <label
-              htmlFor={`${fieldIdPrefix}-${variable.variable}`}
-              className="block system-sm-medium text-text-secondary"
-            >
-              {typeof variable.label === 'string' ? variable.label : variable.variable}
-            </label>
-          )}
-          {renderField(variable)}
-        </div>
-      ))}
-    </>
-  )
-}
-
-export default WorkflowHiddenInputFields

web/app/components/apps/__tests__/index.spec.tsx

@@ -31,7 +31,7 @@ const mockFetchAppDetail = vi.mocked(fetchAppDetail)
 
 const mockTemplateApp: App = {
   app_id: 'template-1',
-  categories: ['Assistant'],
+  category: 'Assistant',
   app: {
     id: 'template-1',
     mode: AppModeEnum.CHAT,

web/app/components/apps/index.tsx

@@ -151,7 +151,7 @@ const Apps = () => {
           <TryApp
             appId={currentTryAppParams?.appId || ''}
             app={currentTryAppParams?.app}
-            categories={currentTryAppParams?.app?.categories}
+            category={currentTryAppParams?.app?.category}
             onClose={hideTryAppPanel}
             onCreate={handleShowFromTryApp}
           />

web/app/components/base/chat/__tests__/utils.spec.ts

@@ -321,86 +321,47 @@ describe('chat utils - url params and answer helpers', () => {
       expect(res).toEqual({ custom: '123', encoded: 'a b' })
     })
 
-    it('getRawInputsFromUrlParams keeps encoded launch params as decoded plain values', async () => {
-      setSearch(`?custom=${encodeURIComponent('YWJjZA==')}`)
-      const res = await getRawInputsFromUrlParams()
-      expect(res).toEqual({ custom: 'YWJjZA==' })
-    })
-
     it('getRawUserVariablesFromUrlParams extracts only user. prefixed params', async () => {
       setSearch('?custom=123&sys.param=456&user.param=789&user.encoded=a%20b')
       const res = await getRawUserVariablesFromUrlParams()
       expect(res).toEqual({ param: '789', encoded: 'a b' })
     })
 
-    it('getRawUserVariablesFromUrlParams keeps encoded user values as decoded plain values', async () => {
-      setSearch(`?user.param=${encodeURIComponent('YWJjZA==')}`)
-      const res = await getRawUserVariablesFromUrlParams()
-      expect(res).toEqual({ param: 'YWJjZA==' })
-    })
-
     it('getProcessedInputsFromUrlParams decompresses base64 inputs', async () => {
-      setSearch(`?custom=${encodeURIComponent('YWJjZA==')}&sys.param=456&user.param=789`)
+      setSearch('?custom=123&sys.param=456&user.param=789')
       const res = await getProcessedInputsFromUrlParams()
       expect(res).toEqual({ custom: 'decompressed_text' })
     })
 
-    it('getProcessedInputsFromUrlParams returns undefined for plain decoded values', async () => {
-      vi.stubGlobal('atob', () => {
-        throw new Error('invalid')
-      })
-      setSearch('?custom=a%20b')
-      const res = await getProcessedInputsFromUrlParams()
-      expect(res).toEqual({ custom: undefined })
-    })
-
     it('getProcessedSystemVariablesFromUrlParams decompresses sys. prefixed params', async () => {
-      setSearch(`?custom=123&sys.param=${encodeURIComponent('YWJjZA==')}&user.param=789`)
+      setSearch('?custom=123&sys.param=456&user.param=789')
       const res = await getProcessedSystemVariablesFromUrlParams()
       expect(res).toEqual({ param: 'decompressed_text' })
     })
 
-    it('getProcessedSystemVariablesFromUrlParams returns undefined for plain decoded values', async () => {
-      vi.stubGlobal('atob', () => {
-        throw new Error('invalid')
-      })
-      setSearch('?sys.param=a%20b')
-      const res = await getProcessedSystemVariablesFromUrlParams()
-      expect(res).toEqual({ param: undefined })
-    })
-
     it('getProcessedSystemVariablesFromUrlParams parses redirect_url without query string', async () => {
-      setSearch(`?redirect_url=${encodeURIComponent('http://example.com')}&sys.param=${encodeURIComponent('YWJjZA==')}`)
+      setSearch(`?redirect_url=${encodeURIComponent('http://example.com')}&sys.param=456`)
       const res = await getProcessedSystemVariablesFromUrlParams()
       expect(res).toEqual({ param: 'decompressed_text' })
     })
 
     it('getProcessedSystemVariablesFromUrlParams parses redirect_url', async () => {
-      setSearch(`?redirect_url=${encodeURIComponent(`http://example.com?sys.redirected=${encodeURIComponent('YWJjZA==')}`)}&sys.param=${encodeURIComponent('YWJjZA==')}`)
+      setSearch(`?redirect_url=${encodeURIComponent('http://example.com?sys.redirected=abc')}&sys.param=456`)
       const res = await getProcessedSystemVariablesFromUrlParams()
       expect(res).toEqual({ param: 'decompressed_text', redirected: 'decompressed_text' })
     })
 
     it('getProcessedUserVariablesFromUrlParams decompresses user. prefixed params', async () => {
-      setSearch(`?custom=123&sys.param=456&user.param=${encodeURIComponent('YWJjZA==')}`)
+      setSearch('?custom=123&sys.param=456&user.param=789')
       const res = await getProcessedUserVariablesFromUrlParams()
       expect(res).toEqual({ param: 'decompressed_text' })
     })
 
-    it('getProcessedUserVariablesFromUrlParams returns undefined for plain decoded values', async () => {
-      vi.stubGlobal('atob', () => {
-        throw new Error('invalid')
-      })
-      setSearch('?user.param=a%20b')
-      const res = await getProcessedUserVariablesFromUrlParams()
-      expect(res).toEqual({ param: undefined })
-    })
-
     it('decodeBase64AndDecompress failure returns undefined softly', async () => {
       vi.stubGlobal('atob', () => {
         throw new Error('invalid')
       })
-      setSearch(`?custom=${encodeURIComponent('YWJjZA==')}`)
+      setSearch('?custom=invalid_base64')
       const res = await getProcessedInputsFromUrlParams()
       expect(res).toEqual({ custom: undefined })
     })

web/app/components/base/chat/chat-with-history/sidebar/operation.tsx

@@ -54,22 +54,22 @@ const Operation: FC<Props> = ({
       onOpenChange={setOpen}
     >
       <DropdownMenuTrigger
-        render={(
-          <ActionButton
-            className={cn((isItemHovering || open) ? 'pointer-events-auto opacity-100' : 'pointer-events-none opacity-0')}
-            state={
-              isActive
-                ? ActionButtonState.Active
-                : open
-                  ? ActionButtonState.Hover
-                  : ActionButtonState.Default
-            }
-          >
-            <span aria-hidden className="i-ri-more-fill h-4 w-4" />
-          </ActionButton>
-        )}
+        render={<div />}
         onClick={e => e.stopPropagation()}
-      />
+      >
+        <ActionButton
+          className={cn((isItemHovering || open) ? 'pointer-events-auto opacity-100' : 'pointer-events-none opacity-0')}
+          state={
+            isActive
+              ? ActionButtonState.Active
+              : open
+                ? ActionButtonState.Hover
+                : ActionButtonState.Default
+          }
+        >
+          <span aria-hidden className="i-ri-more-fill h-4 w-4" />
+        </ActionButton>
+      </DropdownMenuTrigger>
       <DropdownMenuContent
         placement="bottom-end"
         sideOffset={4}

web/app/components/base/chat/chat/__tests__/use-chat-layout.spec.tsx

@@ -182,13 +182,11 @@ describe('useChatLayout', () => {
 
       act(() => {
         capturedResizeCallbacks[0]?.([makeResizeEntry(80, 400)], {} as ResizeObserver)
-        flushAnimationFrames()
       })
       expect(screen.getByTestId('chat-container').style.paddingBottom).toBe('80px')
 
       act(() => {
         capturedResizeCallbacks[1]?.([makeResizeEntry(50, 560)], {} as ResizeObserver)
-        flushAnimationFrames()
       })
       expect(screen.getByTestId('chat-footer').style.width).toBe('560px')
 

web/app/components/base/chat/chat/use-chat-layout.ts

@@ -12,11 +12,6 @@ type UseChatLayoutOptions = {
   sidebarCollapseState?: boolean
 }
 
-const setStyleValue = (element: HTMLElement, property: 'paddingBottom' | 'width', value: string) => {
-  if (element.style[property] !== value)
-    element.style[property] = value
-}
-
 export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutOptions) => {
   const [width, setWidth] = useState(0)
   const chatContainerRef = useRef<HTMLDivElement>(null)
@@ -26,9 +21,6 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
   const userScrolledRef = useRef(false)
   const isAutoScrollingRef = useRef(false)
   const prevFirstMessageIdRef = useRef<string | undefined>(undefined)
-  const resizeObserverFrameRef = useRef<number | null>(null)
-  const pendingFooterBlockSizeRef = useRef<number | null>(null)
-  const pendingContainerInlineSizeRef = useRef<number | null>(null)
 
   const handleScrollToBottom = useCallback(() => {
     if (chatList.length > 1 && chatContainerRef.current && !userScrolledRef.current) {
@@ -42,39 +34,16 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
   }, [chatList.length])
 
   const handleWindowResize = useCallback(() => {
-    if (chatContainerRef.current) {
-      const nextWidth = document.body.clientWidth - (chatContainerRef.current.clientWidth + 16) - 8
-      setWidth(currentWidth => currentWidth === nextWidth ? currentWidth : nextWidth)
-    }
+    if (chatContainerRef.current)
+      setWidth(document.body.clientWidth - (chatContainerRef.current.clientWidth + 16) - 8)
 
     if (chatContainerRef.current && chatFooterRef.current)
-      setStyleValue(chatFooterRef.current, 'width', `${chatContainerRef.current.clientWidth}px`)
+      chatFooterRef.current.style.width = `${chatContainerRef.current.clientWidth}px`
 
     if (chatContainerInnerRef.current && chatFooterInnerRef.current)
-      setStyleValue(chatFooterInnerRef.current, 'width', `${chatContainerInnerRef.current.clientWidth}px`)
+      chatFooterInnerRef.current.style.width = `${chatContainerInnerRef.current.clientWidth}px`
   }, [])
 
-  const scheduleResizeObserverUpdate = useCallback(() => {
-    if (resizeObserverFrameRef.current !== null)
-      return
-
-    resizeObserverFrameRef.current = requestAnimationFrame(() => {
-      resizeObserverFrameRef.current = null
-
-      const footerBlockSize = pendingFooterBlockSizeRef.current
-      pendingFooterBlockSizeRef.current = null
-      if (footerBlockSize !== null && chatContainerRef.current) {
-        setStyleValue(chatContainerRef.current, 'paddingBottom', `${footerBlockSize}px`)
-        handleScrollToBottom()
-      }
-
-      const containerInlineSize = pendingContainerInlineSizeRef.current
-      pendingContainerInlineSizeRef.current = null
-      if (containerInlineSize !== null && chatFooterRef.current)
-        setStyleValue(chatFooterRef.current, 'width', `${containerInlineSize}px`)
-    })
-  }, [handleScrollToBottom])
-
   useEffect(() => {
     handleScrollToBottom()
     const animationFrame = requestAnimationFrame(handleWindowResize)
@@ -108,31 +77,26 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
       const resizeContainerObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
           const { blockSize } = entry.borderBoxSize[0]!
-          pendingFooterBlockSizeRef.current = blockSize
+          chatContainerRef.current!.style.paddingBottom = `${blockSize}px`
+          handleScrollToBottom()
         }
-        scheduleResizeObserverUpdate()
       })
       resizeContainerObserver.observe(chatFooterRef.current)
 
       const resizeFooterObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
           const { inlineSize } = entry.borderBoxSize[0]!
-          pendingContainerInlineSizeRef.current = inlineSize
+          chatFooterRef.current!.style.width = `${inlineSize}px`
         }
-        scheduleResizeObserverUpdate()
       })
       resizeFooterObserver.observe(chatContainerRef.current)
 
       return () => {
-        if (resizeObserverFrameRef.current !== null) {
-          cancelAnimationFrame(resizeObserverFrameRef.current)
-          resizeObserverFrameRef.current = null
-        }
         resizeContainerObserver.disconnect()
         resizeFooterObserver.disconnect()
       }
     }
-  }, [scheduleResizeObserverUpdate])
+  }, [handleScrollToBottom])
 
   useEffect(() => {
     const setUserScrolled = () => {

web/app/components/base/chat/utils.ts

@@ -19,13 +19,11 @@ async function getRawInputsFromUrlParams(): Promise<Record<string, any>> {
   const urlParams = new URLSearchParams(window.location.search)
   const inputs: Record<string, any> = {}
   const entriesArray = Array.from(urlParams.entries())
-  await Promise.all(entriesArray.map(async ([key, value]) => {
+  entriesArray.forEach(([key, value]) => {
     const prefixArray = ['sys.', 'user.']
-    if (prefixArray.some(prefix => key.startsWith(prefix)))
-      return
-
-    inputs[key] = decodeURIComponent(value)
-  }))
+    if (!prefixArray.some(prefix => key.startsWith(prefix)))
+      inputs[key] = decodeURIComponent(value)
+  })
   return inputs
 }
 
@@ -83,12 +81,10 @@ async function getRawUserVariablesFromUrlParams(): Promise<Record<string, any>>
   const urlParams = new URLSearchParams(window.location.search)
   const userVariables: Record<string, any> = {}
   const entriesArray = Array.from(urlParams.entries())
-  await Promise.all(entriesArray.map(async ([key, value]) => {
-    if (!key.startsWith('user.'))
-      return
-
-    userVariables[key.slice(5)] = decodeURIComponent(value)
-  }))
+  entriesArray.forEach(([key, value]) => {
+    if (key.startsWith('user.'))
+      userVariables[key.slice(5)] = decodeURIComponent(value)
+  })
   return userVariables
 }
 

web/app/components/base/icons/src/vender/line/development/index.ts

@@ -1 +1,2 @@
 export { default as BracketsX } from './BracketsX'
+export { default as CodeBrowser } from './CodeBrowser'

web/app/components/datasets/documents/detail/__tests__/index.spec.tsx

@@ -120,12 +120,18 @@ vi.mock('../document-title', () => ({
 }))
 
 vi.mock('../segment-add', () => ({
-  SegmentAdd: ({ showNewSegmentModal, showBatchModal, embedding }: { showNewSegmentModal?: () => void, showBatchModal?: () => void, embedding?: boolean }) => (
+  default: ({ showNewSegmentModal, showBatchModal, embedding }: { showNewSegmentModal?: () => void, showBatchModal?: () => void, embedding?: boolean }) => (
     <div data-testid="segment-add" data-embedding={embedding}>
       <button data-testid="new-segment-btn" onClick={showNewSegmentModal}>New Segment</button>
       <button data-testid="batch-btn" onClick={showBatchModal}>Batch Import</button>
     </div>
   ),
+  ProcessStatus: {
+    WAITING: 'waiting',
+    PROCESSING: 'processing',
+    ERROR: 'error',
+    COMPLETED: 'completed',
+  },
 }))
 
 vi.mock('../../components/operations', () => ({

web/app/components/datasets/documents/detail/batch-modal/index.tsx

@@ -2,15 +2,12 @@
 import type { FC } from 'react'
 import type { ChunkingMode, FileItem } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
-import {
-  Dialog,
-  DialogCloseButton,
-  DialogContent,
-  DialogTitle,
-} from '@langgenius/dify-ui/dialog'
+import { RiCloseLine } from '@remixicon/react'
+import { noop } from 'es-toolkit/function'
 import * as React from 'react'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import Modal from '@/app/components/base/modal'
 import CSVDownloader from './csv-downloader'
 import CSVUploader from './csv-uploader'
 
@@ -21,9 +18,8 @@ type IBatchModalProps = {
   onConfirm: (file: FileItem) => void
 }
 
-type BatchModalContentProps = Omit<IBatchModalProps, 'isShow'>
-
-const BatchModalContent: FC<BatchModalContentProps> = ({
+const BatchModal: FC<IBatchModalProps> = ({
+  isShow,
   docForm,
   onCancel,
   onConfirm,
@@ -39,13 +35,17 @@ const BatchModalContent: FC<BatchModalContentProps> = ({
     onConfirm(currentCSV)
   }
 
+  useEffect(() => {
+    if (!isShow)
+      setCurrentCSV(undefined)
+  }, [isShow])
+
   return (
-    <DialogContent className="w-[520px]! overflow-hidden! rounded-xl! border-0! px-8 py-6">
-      <DialogTitle className="relative pb-1 text-xl leading-[30px] font-medium text-text-primary">{t('list.batchModal.title', { ns: 'datasetDocuments' })}</DialogTitle>
-      <DialogCloseButton
-        className="top-4 right-4"
-        aria-label={t('list.batchModal.cancel', { ns: 'datasetDocuments' })}
-      />
+    <Modal isShow={isShow} onClose={noop} className="max-w-[520px]! rounded-xl! px-8 py-6">
+      <div className="relative pb-1 text-xl leading-[30px] font-medium text-text-primary">{t('list.batchModal.title', { ns: 'datasetDocuments' })}</div>
+      <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={onCancel}>
+        <RiCloseLine className="h-4 w-4 text-text-secondary" />
+      </div>
       <CSVUploader
         file={currentCSV}
         updateFile={handleFile}
@@ -61,33 +61,7 @@ const BatchModalContent: FC<BatchModalContentProps> = ({
           {t('list.batchModal.run', { ns: 'datasetDocuments' })}
         </Button>
       </div>
-    </DialogContent>
+    </Modal>
   )
 }
-
-const BatchModal: FC<IBatchModalProps> = ({
-  isShow,
-  docForm,
-  onCancel,
-  onConfirm,
-}) => {
-  return (
-    <Dialog
-      open={isShow}
-      onOpenChange={open => !open && onCancel()}
-      disablePointerDismissal
-    >
-      {isShow
-        ? (
-            <BatchModalContent
-              docForm={docForm}
-              onCancel={onCancel}
-              onConfirm={onConfirm}
-            />
-          )
-        : null}
-    </Dialog>
-  )
-}
-
 export default React.memo(BatchModal)

web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx

@@ -137,8 +137,9 @@ vi.mock('../hooks/use-child-segment-data', () => ({
   },
 }))
 
-vi.mock('../components/menu-bar', () => ({
-  default: ({ totalText, onInputChange, inputValue, isLoading, onSelectedAll, onChangeStatus }: {
+// Mock child components to simplify testing
+vi.mock('../components', () => ({
+  MenuBar: ({ totalText, onInputChange, inputValue, isLoading, onSelectedAll, onChangeStatus }: {
     totalText: string
     onInputChange: (value: string) => void
     inputValue: string
@@ -166,13 +167,7 @@ vi.mock('../components/menu-bar', () => ({
       )}
     </div>
   ),
-}))
-
-vi.mock('../components/drawer-group', () => ({
   DrawerGroup: () => <div data-testid="drawer-group" />,
-}))
-
-vi.mock('../components/segment-list-content', () => ({
   FullDocModeContent: () => <div data-testid="full-doc-mode-content" />,
   GeneralModeContent: () => <div data-testid="general-mode-content" />,
 }))
@@ -568,7 +563,7 @@ describe('Edge Cases', () => {
     expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
   })
 
-  it('should handle completed importStatus', () => {
+  it('should handle ProcessStatus.COMPLETED importStatus', () => {
     render(<Completed {...defaultProps} importStatus="completed" />, { wrapper: createWrapper() })
 
     expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()

web/app/components/datasets/documents/detail/completed/__tests__/segment-detail.spec.tsx

@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { IndexingType } from '@/app/components/datasets/create/step-two'
 import { ChunkingMode } from '@/models/datasets'
 
-import { SegmentDetail } from '../segment-detail'
+import SegmentDetail from '../segment-detail'
 
 // Mock dataset detail context
 let mockIndexingTechnique = IndexingType.QUALIFIED
@@ -167,6 +167,7 @@ describe('SegmentDetail', () => {
     onCancel: vi.fn(),
     isEditMode: false,
     docForm: ChunkingMode.text,
+    onModalStateChange: vi.fn(),
   }
 
   describe('Rendering', () => {
@@ -351,12 +352,35 @@ describe('SegmentDetail', () => {
       expect(screen.getByTestId('regeneration-modal'))!.toBeInTheDocument()
     })
 
+    it('should call onModalStateChange when regeneration modal opens', () => {
+      const mockOnModalStateChange = vi.fn()
+      render(
+        <SegmentDetail
+          {...defaultProps}
+          isEditMode={true}
+          onModalStateChange={mockOnModalStateChange}
+        />,
+      )
+
+      fireEvent.click(screen.getByTestId('regenerate-btn'))
+
+      expect(mockOnModalStateChange).toHaveBeenCalledWith(true)
+    })
+
     it('should close modal when cancel is clicked', () => {
-      render(<SegmentDetail {...defaultProps} isEditMode={true} />)
+      const mockOnModalStateChange = vi.fn()
+      render(
+        <SegmentDetail
+          {...defaultProps}
+          isEditMode={true}
+          onModalStateChange={mockOnModalStateChange}
+        />,
+      )
       fireEvent.click(screen.getByTestId('regenerate-btn'))
 
       fireEvent.click(screen.getByTestId('cancel-regeneration'))
 
+      expect(mockOnModalStateChange).toHaveBeenCalledWith(false)
       expect(screen.queryByTestId('regeneration-modal')).not.toBeInTheDocument()
     })
   })
@@ -480,18 +504,22 @@ describe('SegmentDetail', () => {
 
     it('should close modal and edit drawer when close after regeneration is clicked', () => {
       const mockOnCancel = vi.fn()
+      const mockOnModalStateChange = vi.fn()
       render(
         <SegmentDetail
           {...defaultProps}
           isEditMode={true}
           onCancel={mockOnCancel}
+          onModalStateChange={mockOnModalStateChange}
         />,
       )
 
+      // Open regeneration modal
       fireEvent.click(screen.getByTestId('regenerate-btn'))
 
       fireEvent.click(screen.getByTestId('close-regeneration'))
 
+      expect(mockOnModalStateChange).toHaveBeenCalledWith(false)
       expect(mockOnCancel).toHaveBeenCalled()
     })
   })

web/app/components/datasets/documents/detail/completed/common/__tests__/drawer.spec.tsx

@@ -1,16 +1,27 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { CompletedDrawer } from '../drawer'
+import Drawer from '../drawer'
 
-(
-  globalThis as typeof globalThis & {
-    BASE_UI_ANIMATIONS_DISABLED: boolean
-  }
-).BASE_UI_ANIMATIONS_DISABLED = true
+let capturedKeyPressCallback: ((e: KeyboardEvent) => void) | undefined
 
-const getOverlay = () =>
-  Array.from(document.querySelectorAll<HTMLElement>('[class]'))
-    .find(element => element.className.includes('bg-background-overlay'))
+// Mock useKeyPress: required because tests capture the registered callback
+// and invoke it directly to verify ESC key handling behavior.
+vi.mock('ahooks', () => ({
+  useKeyPress: vi.fn((_key: string, cb: (e: KeyboardEvent) => void) => {
+    capturedKeyPressCallback = cb
+  }),
+}))
+
+vi.mock('../..', () => ({
+  useSegmentListContext: (selector: (state: {
+    currSegment: { showModal: boolean }
+    currChildChunk: { showModal: boolean }
+  }) => unknown) =>
+    selector({
+      currSegment: { showModal: false },
+      currChildChunk: { showModal: false },
+    }),
+}))
 
 describe('Drawer', () => {
   const defaultProps = {
@@ -20,109 +31,103 @@ describe('Drawer', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
+    capturedKeyPressCallback = undefined
   })
 
   describe('Rendering', () => {
     it('should return null when open is false', () => {
       const { container } = render(
-        <CompletedDrawer open={false} onClose={vi.fn()}>
+        <Drawer open={false} onClose={vi.fn()}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
       expect(container.innerHTML).toBe('')
       expect(screen.queryByText('Content')).not.toBeInTheDocument()
     })
 
-    it('should render children in the drawer portal when open is true', () => {
+    it('should render children in portal when open is true', () => {
       render(
-        <CompletedDrawer {...defaultProps}>
+        <Drawer {...defaultProps}>
           <span>Drawer content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
       expect(screen.getByText('Drawer content')).toBeInTheDocument()
+    })
+
+    it('should render dialog with role="dialog"', () => {
+      render(
+        <Drawer {...defaultProps}>
+          <span>Content</span>
+        </Drawer>,
+      )
+
       expect(screen.getByRole('dialog')).toBeInTheDocument()
     })
   })
 
-  describe('Variant', () => {
-    it('should render a panel drawer without overlay by default', () => {
+  // Overlay visibility
+  describe('Overlay', () => {
+    it('should show overlay when showOverlay is true', () => {
       render(
-        <CompletedDrawer {...defaultProps}>
+        <Drawer {...defaultProps} showOverlay={true}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
-      expect(getOverlay()).toBeUndefined()
-      expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'false')
+      const overlay = document.querySelector('[aria-hidden="true"]')
+      expect(overlay).toBeInTheDocument()
     })
 
-    it('should render a modal drawer with overlay', () => {
+    it('should hide overlay when showOverlay is false', () => {
       render(
-        <CompletedDrawer {...defaultProps} modal>
+        <Drawer {...defaultProps} showOverlay={false}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
-      expect(getOverlay()).toBeInTheDocument()
-      expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'true')
+      const overlay = document.querySelector('[aria-hidden="true"]')
+      expect(overlay).not.toBeInTheDocument()
     })
   })
 
-  describe('Dismissal', () => {
-    it('should call onClose when Escape is pressed', async () => {
-      const onClose = vi.fn()
+  // aria-modal attribute
+  describe('aria-modal', () => {
+    it('should set aria-modal="true" when modal is true', () => {
       render(
-        <CompletedDrawer open={true} onClose={onClose}>
+        <Drawer {...defaultProps} modal={true}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
-      fireEvent.keyDown(document, { key: 'Escape' })
-
-      await waitFor(() => {
-        expect(onClose).toHaveBeenCalledTimes(1)
-      })
+      expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'true')
     })
 
-    it('should keep a panel drawer open when the underlying page is clicked', () => {
-      const onClose = vi.fn()
+    it('should set aria-modal="false" when modal is false', () => {
       render(
-        <>
-          <button type="button">Outside</button>
-          <CompletedDrawer open={true} onClose={onClose}>
-            <span>Content</span>
-          </CompletedDrawer>
-        </>,
-      )
-
-      fireEvent.pointerDown(screen.getByRole('button', { name: 'Outside' }))
-
-      expect(onClose).not.toHaveBeenCalled()
-    })
-
-    it('should keep a panel drawer open when the pointer down starts inside content', () => {
-      const onClose = vi.fn()
-      render(
-        <CompletedDrawer open={true} onClose={onClose}>
-          <button type="button">Inside</button>
-        </CompletedDrawer>,
-      )
-
-      fireEvent.pointerDown(screen.getByRole('button', { name: 'Inside' }))
-
-      expect(onClose).not.toHaveBeenCalled()
-    })
-    it('should close a modal drawer when the overlay is clicked', () => {
-      const onClose = vi.fn()
-      render(
-        <CompletedDrawer open={true} onClose={onClose} modal>
+        <Drawer {...defaultProps} modal={false}>
           <span>Content</span>
-        </CompletedDrawer>,
+        </Drawer>,
       )
 
-      fireEvent.click(getOverlay()!)
+      expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'false')
+    })
+  })
+
+  // ESC key handling
+  describe('ESC Key', () => {
+    it('should call onClose when ESC is pressed and drawer is open', () => {
+      const onClose = vi.fn()
+      render(
+        <Drawer open={true} onClose={onClose}>
+          <span>Content</span>
+        </Drawer>,
+      )
+
+      expect(capturedKeyPressCallback).toBeDefined()
+      const fakeEvent = { preventDefault: vi.fn() } as unknown as KeyboardEvent
+      capturedKeyPressCallback!(fakeEvent)
 
       expect(onClose).toHaveBeenCalledTimes(1)
     })

web/app/components/datasets/documents/detail/completed/common/__tests__/full-screen-drawer.spec.tsx

@@ -1,11 +1,11 @@
 import type { ReactNode } from 'react'
 import { render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { DocumentDetailDrawer } from '../full-screen-drawer'
+import FullScreenDrawer from '../full-screen-drawer'
 
 // Mock the Drawer component since it has high complexity
 vi.mock('../drawer', () => ({
-  CompletedDrawer: ({ children, open, panelClassName, panelContentClassName, modal }: { children: ReactNode, open: boolean, panelClassName: string, panelContentClassName: string, modal: boolean }) => {
+  default: ({ children, open, panelClassName, panelContentClassName, showOverlay, needCheckChunks, modal }: { children: ReactNode, open: boolean, panelClassName: string, panelContentClassName: string, showOverlay: boolean, needCheckChunks: boolean, modal: boolean }) => {
     if (!open)
       return null
     return (
@@ -13,6 +13,8 @@ vi.mock('../drawer', () => ({
         data-testid="drawer-mock"
         data-panel-class={panelClassName}
         data-panel-content-class={panelContentClassName}
+        data-show-overlay={showOverlay}
+        data-need-check-chunks={needCheckChunks}
         data-modal={modal}
       >
         {children}
@@ -21,7 +23,7 @@ vi.mock('../drawer', () => ({
   },
 }))
 
-describe('DocumentDetailDrawer', () => {
+describe('FullScreenDrawer', () => {
   beforeEach(() => {
     vi.clearAllMocks()
   })
@@ -29,9 +31,9 @@ describe('DocumentDetailDrawer', () => {
   describe('Rendering', () => {
     it('should render without crashing when open', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.getByTestId('drawer-mock')).toBeInTheDocument()
@@ -39,9 +41,9 @@ describe('DocumentDetailDrawer', () => {
 
     it('should not render when closed', () => {
       render(
-        <DocumentDetailDrawer open={false} fullScreen={false}>
+        <FullScreenDrawer isOpen={false} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.queryByTestId('drawer-mock')).not.toBeInTheDocument()
@@ -49,9 +51,9 @@ describe('DocumentDetailDrawer', () => {
 
     it('should render children content', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Test Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.getByText('Test Content')).toBeInTheDocument()
@@ -61,46 +63,86 @@ describe('DocumentDetailDrawer', () => {
   describe('Props', () => {
     it('should pass fullScreen=true to Drawer with full width class', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={true}>
+        <FullScreenDrawer isOpen={true} fullScreen={true}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
       expect(drawer.getAttribute('data-panel-class')).toContain('w-full')
-      expect(drawer.getAttribute('data-panel-class')).toContain('data-[swipe-direction=right]:w-full')
-      expect(drawer.getAttribute('data-panel-class')).toContain('data-[swipe-direction=left]:w-full')
     })
 
     it('should pass fullScreen=false to Drawer with fixed width class', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
       expect(drawer.getAttribute('data-panel-class')).toContain('w-[568px]')
-      expect(drawer.getAttribute('data-panel-class')).toContain('data-[swipe-direction=right]:w-[568px]')
-      expect(drawer.getAttribute('data-panel-class')).toContain('data-[swipe-direction=left]:w-[568px]')
     })
 
-    it('should render as non-modal by default', () => {
+    it('should pass showOverlay prop with default true', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
+      )
+
+      const drawer = screen.getByTestId('drawer-mock')
+      expect(drawer.getAttribute('data-show-overlay')).toBe('true')
+    })
+
+    it('should pass showOverlay=false when specified', () => {
+      render(
+        <FullScreenDrawer isOpen={true} fullScreen={false} showOverlay={false}>
+          <div>Content</div>
+        </FullScreenDrawer>,
+      )
+
+      const drawer = screen.getByTestId('drawer-mock')
+      expect(drawer.getAttribute('data-show-overlay')).toBe('false')
+    })
+
+    it('should pass needCheckChunks prop with default false', () => {
+      render(
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
+          <div>Content</div>
+        </FullScreenDrawer>,
+      )
+
+      const drawer = screen.getByTestId('drawer-mock')
+      expect(drawer.getAttribute('data-need-check-chunks')).toBe('false')
+    })
+
+    it('should pass needCheckChunks=true when specified', () => {
+      render(
+        <FullScreenDrawer isOpen={true} fullScreen={false} needCheckChunks={true}>
+          <div>Content</div>
+        </FullScreenDrawer>,
+      )
+
+      const drawer = screen.getByTestId('drawer-mock')
+      expect(drawer.getAttribute('data-need-check-chunks')).toBe('true')
+    })
+
+    it('should pass modal prop with default false', () => {
+      render(
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
+          <div>Content</div>
+        </FullScreenDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
       expect(drawer.getAttribute('data-modal')).toBe('false')
     })
 
-    it('should pass modal when specified', () => {
+    it('should pass modal=true when specified', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false} modal>
+        <FullScreenDrawer isOpen={true} fullScreen={false} modal={true}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
@@ -112,9 +154,9 @@ describe('DocumentDetailDrawer', () => {
   describe('Styling', () => {
     it('should apply panel content classes for non-fullScreen mode', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
@@ -125,9 +167,9 @@ describe('DocumentDetailDrawer', () => {
 
     it('should apply panel content classes without border for fullScreen mode', () => {
       render(
-        <DocumentDetailDrawer open={true} fullScreen={true}>
+        <FullScreenDrawer isOpen={true} fullScreen={true}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
@@ -142,24 +184,24 @@ describe('DocumentDetailDrawer', () => {
       // Arrange & Act & Assert - should not throw
       expect(() => {
         render(
-          <DocumentDetailDrawer open={true} fullScreen={false}>
+          <FullScreenDrawer isOpen={true} fullScreen={false}>
             <div>Content</div>
-          </DocumentDetailDrawer>,
+          </FullScreenDrawer>,
         )
       }).not.toThrow()
     })
 
     it('should maintain structure when rerendered', () => {
       const { rerender } = render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       rerender(
-        <DocumentDetailDrawer open={true} fullScreen={true}>
+        <FullScreenDrawer isOpen={true} fullScreen={true}>
           <div>Updated Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.getByText('Updated Content')).toBeInTheDocument()
@@ -167,16 +209,16 @@ describe('DocumentDetailDrawer', () => {
 
     it('should handle toggle between open and closed states', () => {
       const { rerender } = render(
-        <DocumentDetailDrawer open={true} fullScreen={false}>
+        <FullScreenDrawer isOpen={true} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
       expect(screen.getByTestId('drawer-mock')).toBeInTheDocument()
 
       rerender(
-        <DocumentDetailDrawer open={false} fullScreen={false}>
+        <FullScreenDrawer isOpen={false} fullScreen={false}>
           <div>Content</div>
-        </DocumentDetailDrawer>,
+        </FullScreenDrawer>,
       )
 
       expect(screen.queryByTestId('drawer-mock')).not.toBeInTheDocument()

web/app/components/datasets/documents/detail/completed/common/drawer.tsx

@@ -1,92 +1,143 @@
-import type { ComponentProps, ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
-import {
-  Drawer,
-  DrawerBackdrop,
-  DrawerContent,
-  DrawerPopup,
-  DrawerPortal,
-  DrawerViewport,
-} from '@langgenius/dify-ui/drawer'
+import { useKeyPress } from 'ahooks'
+import * as React from 'react'
+import { useCallback, useEffect, useRef } from 'react'
+import { createPortal } from 'react-dom'
+import { useSegmentListContext } from '..'
 
-type DrawerSide = 'right' | 'left' | 'bottom' | 'top'
-type DrawerSwipeDirection = 'right' | 'left' | 'down' | 'up'
-type DrawerOpenChange = NonNullable<ComponentProps<typeof Drawer>['onOpenChange']>
-
-type CompletedDrawerProps = {
+type DrawerProps = {
   open: boolean
   onClose: () => void
-  side?: DrawerSide
+  side?: 'right' | 'left' | 'bottom' | 'top'
+  showOverlay?: boolean
+  modal?: boolean // click outside event can pass through if modal is false
+  closeOnOutsideClick?: boolean
   panelClassName?: string
   panelContentClassName?: string
-  modal?: boolean
-  children: ReactNode
+  needCheckChunks?: boolean
 }
 
-const SIDE_TO_SWIPE_DIRECTION: Record<DrawerSide, DrawerSwipeDirection> = {
-  right: 'right',
-  left: 'left',
-  bottom: 'down',
-  top: 'up',
+const SIDE_POSITION_CLASS = {
+  right: 'right-0',
+  left: 'left-0',
+  bottom: 'bottom-0',
+  top: 'top-0',
+} as const
+
+function containsTarget(selector: string, target: Node | null): boolean {
+  const elements = document.querySelectorAll(selector)
+  return Array.from(elements).some(el => el?.contains(target))
 }
 
-const DRAWER_POPUP_CLASS_NAME = [
-  'pointer-events-auto overflow-visible border-0 bg-transparent shadow-none',
-  'data-[swipe-direction=right]:h-screen data-[swipe-direction=right]:max-w-none data-[swipe-direction=right]:rounded-none data-[swipe-direction=right]:border-0',
-  'data-[swipe-direction=left]:h-screen data-[swipe-direction=left]:max-w-none data-[swipe-direction=left]:rounded-none data-[swipe-direction=left]:border-0',
-  'data-[swipe-direction=down]:max-h-none data-[swipe-direction=down]:rounded-none data-[swipe-direction=down]:border-0',
-  'data-[swipe-direction=up]:max-h-none data-[swipe-direction=up]:rounded-none data-[swipe-direction=up]:border-0',
-].join(' ')
+function shouldReopenChunkDetail(
+  isClickOnChunk: boolean,
+  isClickOnChildChunk: boolean,
+  segmentModalOpen: boolean,
+  childChunkModalOpen: boolean,
+): boolean {
+  if (segmentModalOpen && isClickOnChildChunk)
+    return true
+  if (childChunkModalOpen && isClickOnChunk && !isClickOnChildChunk)
+    return true
+  return !isClickOnChunk && !isClickOnChildChunk
+}
 
-export function CompletedDrawer({
+const Drawer = ({
   open,
   onClose,
   side = 'right',
+  showOverlay = true,
+  modal = false,
+  needCheckChunks = false,
   children,
   panelClassName,
   panelContentClassName,
-  modal = false,
-}: CompletedDrawerProps) {
-  const handleOpenChange: DrawerOpenChange = (nextOpen, eventDetails) => {
-    if (nextOpen)
-      return
+}: React.PropsWithChildren<DrawerProps>) => {
+  const panelContentRef = useRef<HTMLDivElement>(null)
+  const currSegment = useSegmentListContext(s => s.currSegment)
+  const currChildChunk = useSegmentListContext(s => s.currChildChunk)
 
-    if (eventDetails.reason === 'focus-out' || eventDetails.reason === 'outside-press')
+  useKeyPress('esc', (e) => {
+    if (!open)
       return
-
+    e.preventDefault()
     onClose()
-  }
+  }, { exactMatch: true, useCapture: true })
+
+  const shouldCloseDrawer = useCallback((target: Node | null) => {
+    const panelContent = panelContentRef.current
+    if (!panelContent || !target)
+      return false
+
+    if (panelContent.contains(target))
+      return false
+
+    if (containsTarget('.image-previewer', target))
+      return false
+
+    if (!needCheckChunks)
+      return true
+
+    const isClickOnChunk = containsTarget('.chunk-card', target)
+    const isClickOnChildChunk = containsTarget('.child-chunk', target)
+    return shouldReopenChunkDetail(isClickOnChunk, isClickOnChildChunk, currSegment.showModal, currChildChunk.showModal)
+  }, [currSegment.showModal, currChildChunk.showModal, needCheckChunks])
+
+  const onDownCapture = useCallback((e: PointerEvent) => {
+    if (!open || modal)
+      return
+    const panelContent = panelContentRef.current
+    if (!panelContent)
+      return
+    const target = e.target as Node | null
+    if (shouldCloseDrawer(target))
+      queueMicrotask(onClose)
+  }, [shouldCloseDrawer, onClose, open, modal])
+
+  useEffect(() => {
+    window.addEventListener('pointerdown', onDownCapture, { capture: true })
+    return () =>
+      window.removeEventListener('pointerdown', onDownCapture, { capture: true })
+  }, [onDownCapture])
+
+  const isHorizontal = side === 'left' || side === 'right'
+
+  const overlayPointerEvents = modal && open ? 'pointer-events-auto' : 'pointer-events-none'
+
+  const content = (
+    <div className="pointer-events-none fixed inset-0 z-9999">
+      {showOverlay && (
+        <div
+          onClick={modal ? onClose : undefined}
+          aria-hidden="true"
+          className={cn(
+            'fixed inset-0 bg-black/30 opacity-0 transition-opacity duration-200 ease-in',
+            open && 'opacity-100',
+            overlayPointerEvents,
+          )}
+        />
+      )}
+      <div
+        role="dialog"
+        aria-modal={modal ? 'true' : 'false'}
+        className={cn(
+          'pointer-events-auto fixed flex flex-col',
+          SIDE_POSITION_CLASS[side],
+          isHorizontal ? 'h-screen' : 'w-screen',
+          panelClassName,
+        )}
+      >
+        <div ref={panelContentRef} className={cn('flex grow flex-col', panelContentClassName)}>
+          {children}
+        </div>
+      </div>
+    </div>
+  )
 
   if (!open)
     return null
 
-  return (
-    <Drawer
-      open={open}
-      modal={modal}
-      swipeDirection={SIDE_TO_SWIPE_DIRECTION[side]}
-      disablePointerDismissal
-      onOpenChange={handleOpenChange}
-    >
-      <DrawerPortal>
-        {modal && (
-          <DrawerBackdrop
-            onClick={onClose}
-          />
-        )}
-        <DrawerViewport className="pointer-events-none">
-          <DrawerPopup
-            aria-modal={modal ? 'true' : 'false'}
-            className={cn(DRAWER_POPUP_CLASS_NAME, panelClassName)}
-          >
-            <DrawerContent
-              className={cn('flex grow flex-col overflow-visible p-0 pb-0', panelContentClassName)}
-            >
-              {children}
-            </DrawerContent>
-          </DrawerPopup>
-        </DrawerViewport>
-      </DrawerPortal>
-    </Drawer>
-  )
+  return createPortal(content, document.body)
 }
+
+export default Drawer

web/app/components/datasets/documents/detail/completed/common/full-screen-drawer.tsx

@@ -1,39 +1,46 @@
-import type { ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import { noop } from 'es-toolkit/function'
-import { CompletedDrawer } from './drawer'
+import * as React from 'react'
+import Drawer from './drawer'
 
-type DocumentDetailDrawerProps = {
-  open: boolean
+type IFullScreenDrawerProps = {
+  isOpen: boolean
   onClose?: () => void
   fullScreen: boolean
+  showOverlay?: boolean
+  needCheckChunks?: boolean
   modal?: boolean
-  children: ReactNode
 }
 
-export function DocumentDetailDrawer({
-  open,
+const FullScreenDrawer = ({
+  isOpen,
   onClose = noop,
   fullScreen,
   children,
+  showOverlay = true,
+  needCheckChunks = false,
   modal = false,
-}: DocumentDetailDrawerProps) {
+}: React.PropsWithChildren<IFullScreenDrawerProps>) => {
   return (
-    <CompletedDrawer
-      open={open}
+    <Drawer
+      open={isOpen}
       onClose={onClose}
       panelClassName={cn(
         fullScreen
-          ? 'w-full data-[swipe-direction=left]:w-full data-[swipe-direction=right]:w-full'
-          : 'w-[568px] pt-16 pr-2 pb-2 data-[swipe-direction=left]:w-[568px] data-[swipe-direction=right]:w-[568px]',
+          ? 'w-full'
+          : 'w-[568px] pt-16 pr-2 pb-2',
       )}
       panelContentClassName={cn(
         'bg-components-panel-bg',
         !fullScreen && 'rounded-xl border-[0.5px] border-components-panel-border',
       )}
+      showOverlay={showOverlay}
+      needCheckChunks={needCheckChunks}
       modal={modal}
     >
       {children}
-    </CompletedDrawer>
+    </Drawer>
   )
 }
+
+export default FullScreenDrawer

web/app/components/datasets/documents/detail/completed/components/__tests__/drawer-group.spec.tsx

@@ -2,16 +2,16 @@ import type { ChildChunkDetail, SegmentDetailModel } from '@/models/datasets'
 import { render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ChunkingMode } from '@/models/datasets'
-import { DrawerGroup } from '../drawer-group'
+import DrawerGroup from '../drawer-group'
 
 vi.mock('../../common/full-screen-drawer', () => ({
-  DocumentDetailDrawer: ({ open, children, modal = false }: { open: boolean, children: React.ReactNode, modal?: boolean }) => (
-    open ? <div data-testid="document-detail-drawer" data-modal={modal}>{children}</div> : null
+  default: ({ isOpen, children }: { isOpen: boolean, children: React.ReactNode }) => (
+    isOpen ? <div data-testid="full-screen-drawer">{children}</div> : null
   ),
 }))
 
 vi.mock('../../segment-detail', () => ({
-  SegmentDetail: () => <div data-testid="segment-detail" />,
+  default: () => <div data-testid="segment-detail" />,
 }))
 
 vi.mock('../../child-segment-detail', () => ({
@@ -31,6 +31,8 @@ describe('DrawerGroup', () => {
     currSegment: { segInfo: undefined, showModal: false, isEditMode: false },
     onCloseSegmentDetail: vi.fn(),
     onUpdateSegment: vi.fn(),
+    isRegenerationModalOpen: false,
+    setIsRegenerationModalOpen: vi.fn(),
     showNewSegmentModal: false,
     onCloseNewSegmentModal: vi.fn(),
     onSaveNewSegment: vi.fn(),
@@ -53,7 +55,7 @@ describe('DrawerGroup', () => {
 
   it('should render nothing when all modals are closed', () => {
     const { container } = render(<DrawerGroup {...defaultProps} />)
-    expect(container.querySelector('[data-testid="document-detail-drawer"]')).toBeNull()
+    expect(container.querySelector('[data-testid="full-screen-drawer"]')).toBeNull()
   })
 
   it('should render segment detail when segment modal is open', () => {
@@ -64,7 +66,6 @@ describe('DrawerGroup', () => {
       />,
     )
     expect(screen.getByTestId('segment-detail')).toBeInTheDocument()
-    expect(screen.getByTestId('document-detail-drawer')).toHaveAttribute('data-modal', 'false')
   })
 
   it('should render new segment modal when showNewSegmentModal is true', () => {
@@ -72,7 +73,6 @@ describe('DrawerGroup', () => {
       <DrawerGroup {...defaultProps} showNewSegmentModal={true} />,
     )
     expect(screen.getByTestId('new-segment')).toBeInTheDocument()
-    expect(screen.getByTestId('document-detail-drawer')).toHaveAttribute('data-modal', 'true')
   })
 
   it('should render child segment detail when child chunk modal is open', () => {
@@ -83,7 +83,6 @@ describe('DrawerGroup', () => {
       />,
     )
     expect(screen.getByTestId('child-segment-detail')).toBeInTheDocument()
-    expect(screen.getByTestId('document-detail-drawer')).toHaveAttribute('data-modal', 'false')
   })
 
   it('should render new child segment modal when showNewChildSegmentModal is true', () => {
@@ -91,7 +90,6 @@ describe('DrawerGroup', () => {
       <DrawerGroup {...defaultProps} showNewChildSegmentModal={true} />,
     )
     expect(screen.getByTestId('new-child-segment')).toBeInTheDocument()
-    expect(screen.getByTestId('document-detail-drawer')).toHaveAttribute('data-modal', 'true')
   })
 
   it('should render multiple drawers simultaneously', () => {

web/app/components/datasets/documents/detail/completed/components/drawer-group.tsx

@@ -1,13 +1,15 @@
 'use client'
+import type { FC } from 'react'
 import type { FileEntity } from '@/app/components/datasets/common/image-uploader/types'
 import type { ChildChunkDetail, ChunkingMode, SegmentDetailModel } from '@/models/datasets'
 import NewSegment from '@/app/components/datasets/documents/detail/new-segment'
 import ChildSegmentDetail from '../child-segment-detail'
-import { DocumentDetailDrawer } from '../common/full-screen-drawer'
+import FullScreenDrawer from '../common/full-screen-drawer'
 import NewChildSegment from '../new-child-segment'
-import { SegmentDetail } from '../segment-detail'
+import SegmentDetail from '../segment-detail'
 
 type DrawerGroupProps = {
+  // Segment detail drawer
   currSegment: {
     segInfo?: SegmentDetailModel
     showModal: boolean
@@ -23,10 +25,14 @@ type DrawerGroupProps = {
     summary?: string,
     needRegenerate?: boolean,
   ) => Promise<void>
+  isRegenerationModalOpen: boolean
+  setIsRegenerationModalOpen: (open: boolean) => void
+  // New segment drawer
   showNewSegmentModal: boolean
   onCloseNewSegmentModal: () => void
   onSaveNewSegment: () => void
   viewNewlyAddedChunk: () => void
+  // Child segment detail drawer
   currChildChunk: {
     childChunkInfo?: ChildChunkDetail
     showModal: boolean
@@ -34,39 +40,52 @@ type DrawerGroupProps = {
   currChunkId: string
   onCloseChildSegmentDetail: () => void
   onUpdateChildChunk: (segmentId: string, childChunkId: string, content: string) => Promise<void>
+  // New child segment drawer
   showNewChildSegmentModal: boolean
   onCloseNewChildChunkModal: () => void
   onSaveNewChildChunk: (newChildChunk?: ChildChunkDetail) => void
   viewNewlyAddedChildChunk: () => void
+  // Common props
   fullScreen: boolean
   docForm: ChunkingMode
 }
 
-export function DrawerGroup({
+const DrawerGroup: FC<DrawerGroupProps> = ({
+  // Segment detail drawer
   currSegment,
   onCloseSegmentDetail,
   onUpdateSegment,
+  isRegenerationModalOpen,
+  setIsRegenerationModalOpen,
+  // New segment drawer
   showNewSegmentModal,
   onCloseNewSegmentModal,
   onSaveNewSegment,
   viewNewlyAddedChunk,
+  // Child segment detail drawer
   currChildChunk,
   currChunkId,
   onCloseChildSegmentDetail,
   onUpdateChildChunk,
+  // New child segment drawer
   showNewChildSegmentModal,
   onCloseNewChildChunkModal,
   onSaveNewChildChunk,
   viewNewlyAddedChildChunk,
+  // Common props
   fullScreen,
   docForm,
-}: DrawerGroupProps) {
+}) => {
   return (
     <>
-      <DocumentDetailDrawer
-        open={currSegment.showModal}
+      {/* Edit or view segment detail */}
+      <FullScreenDrawer
+        isOpen={currSegment.showModal}
         fullScreen={fullScreen}
         onClose={onCloseSegmentDetail}
+        showOverlay={false}
+        needCheckChunks
+        modal={isRegenerationModalOpen}
       >
         <SegmentDetail
           key={currSegment.segInfo?.id}
@@ -75,11 +94,13 @@ export function DrawerGroup({
           isEditMode={currSegment.isEditMode}
           onUpdate={onUpdateSegment}
           onCancel={onCloseSegmentDetail}
+          onModalStateChange={setIsRegenerationModalOpen}
         />
-      </DocumentDetailDrawer>
+      </FullScreenDrawer>
 
-      <DocumentDetailDrawer
-        open={showNewSegmentModal}
+      {/* Create New Segment */}
+      <FullScreenDrawer
+        isOpen={showNewSegmentModal}
         fullScreen={fullScreen}
         onClose={onCloseNewSegmentModal}
         modal
@@ -90,12 +111,15 @@ export function DrawerGroup({
           onSave={onSaveNewSegment}
           viewNewlyAddedChunk={viewNewlyAddedChunk}
         />
-      </DocumentDetailDrawer>
+      </FullScreenDrawer>
 
-      <DocumentDetailDrawer
-        open={currChildChunk.showModal}
+      {/* Edit or view child segment detail */}
+      <FullScreenDrawer
+        isOpen={currChildChunk.showModal}
         fullScreen={fullScreen}
         onClose={onCloseChildSegmentDetail}
+        showOverlay={false}
+        needCheckChunks
       >
         <ChildSegmentDetail
           key={currChildChunk.childChunkInfo?.id}
@@ -105,10 +129,11 @@ export function DrawerGroup({
           onUpdate={onUpdateChildChunk}
           onCancel={onCloseChildSegmentDetail}
         />
-      </DocumentDetailDrawer>
+      </FullScreenDrawer>
 
-      <DocumentDetailDrawer
-        open={showNewChildSegmentModal}
+      {/* Create New Child Segment */}
+      <FullScreenDrawer
+        isOpen={showNewChildSegmentModal}
         fullScreen={fullScreen}
         onClose={onCloseNewChildChunkModal}
         modal
@@ -119,7 +144,9 @@ export function DrawerGroup({
           onSave={onSaveNewChildChunk}
           viewNewlyAddedChildChunk={viewNewlyAddedChildChunk}
         />
-      </DocumentDetailDrawer>
+      </FullScreenDrawer>
     </>
   )
 }
+
+export default DrawerGroup

web/app/components/datasets/documents/detail/completed/components/index.ts

@@ -0,0 +1,3 @@
+export { default as DrawerGroup } from './drawer-group'
+export { default as MenuBar } from './menu-bar'
+export { FullDocModeContent, GeneralModeContent } from './segment-list-content'

web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-modal-state.spec.ts

@@ -1,9 +1,7 @@
 import type { ChildChunkDetail, SegmentDetailModel } from '@/models/datasets'
 import { act, renderHook } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import * as modalStateHooks from '../use-modal-state'
-
-const renderDatasetModalState = modalStateHooks.useModalState
+import { useModalState } from '../use-modal-state'
 
 describe('useModalState', () => {
   const onNewSegmentModalChange = vi.fn()
@@ -12,21 +10,22 @@ describe('useModalState', () => {
     vi.clearAllMocks()
   })
 
-  const renderModalState = () =>
-    renderHook(() => renderDatasetModalState({ onNewSegmentModalChange }))
+  const renderUseModalState = () =>
+    renderHook(() => useModalState({ onNewSegmentModalChange }))
 
   it('should initialize with all modals closed', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     expect(result.current.currSegment.showModal).toBe(false)
     expect(result.current.currChildChunk.showModal).toBe(false)
     expect(result.current.showNewChildSegmentModal).toBe(false)
+    expect(result.current.isRegenerationModalOpen).toBe(false)
     expect(result.current.fullScreen).toBe(false)
     expect(result.current.isCollapsed).toBe(true)
   })
 
   it('should open segment detail on card click', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
     const detail = { id: 'seg-1', content: 'test' } as unknown as SegmentDetailModel
 
     act(() => {
@@ -38,25 +37,8 @@ describe('useModalState', () => {
     expect(result.current.currSegment.isEditMode).toBe(true)
   })
 
-  it('should close child detail when opening segment detail', () => {
-    const { result } = renderModalState()
-    const childDetail = { id: 'child-1', segment_id: 'seg-1' } as unknown as ChildChunkDetail
-    const segmentDetail = { id: 'seg-1' } as unknown as SegmentDetailModel
-
-    act(() => {
-      result.current.onClickSlice(childDetail)
-    })
-    act(() => {
-      result.current.onClickCard(segmentDetail)
-    })
-
-    expect(result.current.currSegment.showModal).toBe(true)
-    expect(result.current.currSegment.segInfo).toBe(segmentDetail)
-    expect(result.current.currChildChunk.showModal).toBe(false)
-  })
-
   it('should close segment detail and reset fullscreen', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.onClickCard({ id: 'seg-1' } as unknown as SegmentDetailModel)
@@ -73,7 +55,7 @@ describe('useModalState', () => {
   })
 
   it('should open child segment detail on slice click', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
     const childDetail = { id: 'child-1', segment_id: 'seg-1' } as unknown as ChildChunkDetail
 
     act(() => {
@@ -85,25 +67,8 @@ describe('useModalState', () => {
     expect(result.current.currChunkId).toBe('seg-1')
   })
 
-  it('should close segment detail when opening child detail', () => {
-    const { result } = renderModalState()
-    const segmentDetail = { id: 'seg-1' } as unknown as SegmentDetailModel
-    const childDetail = { id: 'child-1', segment_id: 'seg-1' } as unknown as ChildChunkDetail
-
-    act(() => {
-      result.current.onClickCard(segmentDetail)
-    })
-    act(() => {
-      result.current.onClickSlice(childDetail)
-    })
-
-    expect(result.current.currSegment.showModal).toBe(false)
-    expect(result.current.currChildChunk.showModal).toBe(true)
-    expect(result.current.currChildChunk.childChunkInfo).toBe(childDetail)
-  })
-
   it('should close child segment detail', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.onClickSlice({ id: 'c1', segment_id: 's1' } as unknown as ChildChunkDetail)
@@ -116,7 +81,7 @@ describe('useModalState', () => {
   })
 
   it('should handle new child chunk modal', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.handleAddNewChildChunk('parent-chunk-1')
@@ -133,7 +98,7 @@ describe('useModalState', () => {
   })
 
   it('should close new segment modal and notify parent', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.onCloseNewSegmentModal()
@@ -143,7 +108,7 @@ describe('useModalState', () => {
   })
 
   it('should toggle full screen', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.toggleFullScreen()
@@ -157,7 +122,7 @@ describe('useModalState', () => {
   })
 
   it('should toggle collapsed', () => {
-    const { result } = renderModalState()
+    const { result } = renderUseModalState()
 
     act(() => {
       result.current.toggleCollapsed()
@@ -169,4 +134,13 @@ describe('useModalState', () => {
     })
     expect(result.current.isCollapsed).toBe(true)
   })
+
+  it('should set regeneration modal state', () => {
+    const { result } = renderUseModalState()
+
+    act(() => {
+      result.current.setIsRegenerationModalOpen(true)
+    })
+    expect(result.current.isRegenerationModalOpen).toBe(true)
+  })
 })

web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-segment-list-data.spec.ts

@@ -1,12 +1,11 @@
 import type { FileEntity } from '@/app/components/datasets/common/image-uploader/types'
 import type { DocumentContextValue } from '@/app/components/datasets/documents/detail/context'
 import type { ChunkingMode, ParentMode, SegmentDetailModel, SegmentsResponse } from '@/models/datasets'
-import type { SegmentImportStatus } from '@/types/dataset'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { act, renderHook } from '@testing-library/react'
 import * as React from 'react'
 import { ChunkingMode as ChunkingModeEnum } from '@/models/datasets'
-import { segmentImportStatus } from '@/types/dataset'
+import { ProcessStatus } from '../../../segment-add'
 import { useSegmentListData } from '../use-segment-list-data'
 
 // Type for mutation callbacks
@@ -177,7 +176,7 @@ const defaultOptions = {
   searchValue: '',
   selectedStatus: 'all' as boolean | 'all',
   selectedSegmentIds: [] as string[],
-  importStatus: undefined as SegmentImportStatus | undefined,
+  importStatus: undefined as ProcessStatus | string | undefined,
   currentPage: 1,
   limit: 10,
   onCloseSegmentDetail: vi.fn(),
@@ -690,7 +689,7 @@ describe('useSegmentListData', () => {
 
       renderHook(() => useSegmentListData({
         ...defaultOptions,
-        importStatus: segmentImportStatus.completed,
+        importStatus: ProcessStatus.COMPLETED,
         clearSelection,
       }), {
         wrapper: createWrapper(),

web/app/components/datasets/documents/detail/completed/hooks/use-modal-state.ts

@@ -13,20 +13,29 @@ type CurrChildChunkType = {
 }
 
 type UseModalStateReturn = {
+  // Segment detail modal
   currSegment: CurrSegmentType
   onClickCard: (detail: SegmentDetailModel, isEditMode?: boolean) => void
   onCloseSegmentDetail: () => void
+  // Child segment detail modal
   currChildChunk: CurrChildChunkType
   currChunkId: string
   onClickSlice: (detail: ChildChunkDetail) => void
   onCloseChildSegmentDetail: () => void
+  // New segment modal
   onCloseNewSegmentModal: () => void
+  // New child segment modal
   showNewChildSegmentModal: boolean
   handleAddNewChildChunk: (parentChunkId: string) => void
   onCloseNewChildChunkModal: () => void
+  // Regeneration modal
+  isRegenerationModalOpen: boolean
+  setIsRegenerationModalOpen: (open: boolean) => void
+  // Full screen
   fullScreen: boolean
   toggleFullScreen: () => void
   setFullScreen: (fullScreen: boolean) => void
+  // Collapsed state
   isCollapsed: boolean
   toggleCollapsed: () => void
 }
@@ -38,15 +47,25 @@ type UseModalStateOptions = {
 export const useModalState = (options: UseModalStateOptions): UseModalStateReturn => {
   const { onNewSegmentModalChange } = options
 
+  // Segment detail modal state
   const [currSegment, setCurrSegment] = useState<CurrSegmentType>({ showModal: false })
+
+  // Child segment detail modal state
   const [currChildChunk, setCurrChildChunk] = useState<CurrChildChunkType>({ showModal: false })
   const [currChunkId, setCurrChunkId] = useState('')
+
+  // New child segment modal state
   const [showNewChildSegmentModal, setShowNewChildSegmentModal] = useState(false)
+
+  // Regeneration modal state
+  const [isRegenerationModalOpen, setIsRegenerationModalOpen] = useState(false)
+
+  // Display state
   const [fullScreen, setFullScreen] = useState(false)
   const [isCollapsed, setIsCollapsed] = useState(true)
 
+  // Segment detail handlers
   const onClickCard = useCallback((detail: SegmentDetailModel, isEditMode = false) => {
-    setCurrChildChunk({ showModal: false })
     setCurrSegment({ segInfo: detail, showModal: true, isEditMode })
   }, [])
 
@@ -55,8 +74,8 @@ export const useModalState = (options: UseModalStateOptions): UseModalStateRetur
     setFullScreen(false)
   }, [])
 
+  // Child segment detail handlers
   const onClickSlice = useCallback((detail: ChildChunkDetail) => {
-    setCurrSegment({ showModal: false })
     setCurrChildChunk({ childChunkInfo: detail, showModal: true })
     setCurrChunkId(detail.segment_id)
   }, [])
@@ -66,11 +85,13 @@ export const useModalState = (options: UseModalStateOptions): UseModalStateRetur
     setFullScreen(false)
   }, [])
 
+  // New segment modal handlers
   const onCloseNewSegmentModal = useCallback(() => {
     onNewSegmentModalChange(false)
     setFullScreen(false)
   }, [onNewSegmentModalChange])
 
+  // New child segment modal handlers
   const handleAddNewChildChunk = useCallback((parentChunkId: string) => {
     setShowNewChildSegmentModal(true)
     setCurrChunkId(parentChunkId)
@@ -81,6 +102,7 @@ export const useModalState = (options: UseModalStateOptions): UseModalStateRetur
     setFullScreen(false)
   }, [])
 
+  // Display handlers - handles both direct calls and click events
   const toggleFullScreen = useCallback(() => {
     setFullScreen(prev => !prev)
   }, [])
@@ -90,20 +112,29 @@ export const useModalState = (options: UseModalStateOptions): UseModalStateRetur
   }, [])
 
   return {
+    // Segment detail modal
     currSegment,
     onClickCard,
     onCloseSegmentDetail,
+    // Child segment detail modal
     currChildChunk,
     currChunkId,
     onClickSlice,
     onCloseChildSegmentDetail,
+    // New segment modal
     onCloseNewSegmentModal,
+    // New child segment modal
     showNewChildSegmentModal,
     handleAddNewChildChunk,
     onCloseNewChildChunkModal,
+    // Regeneration modal
+    isRegenerationModalOpen,
+    setIsRegenerationModalOpen,
+    // Full screen
     fullScreen,
     toggleFullScreen,
     setFullScreen,
+    // Collapsed state
     isCollapsed,
     toggleCollapsed,
   }

web/app/components/datasets/documents/detail/completed/hooks/use-segment-list-data.ts

@@ -1,6 +1,5 @@
 import type { FileEntity } from '@/app/components/datasets/common/image-uploader/types'
 import type { SegmentDetailModel, SegmentsResponse, SegmentUpdater } from '@/models/datasets'
-import type { SegmentImportStatus } from '@/types/dataset'
 import { toast } from '@langgenius/dify-ui/toast'
 import { useQueryClient } from '@tanstack/react-query'
 import { useCallback, useEffect, useMemo, useRef } from 'react'
@@ -10,16 +9,16 @@ import { ChunkingMode } from '@/models/datasets'
 import { usePathname } from '@/next/navigation'
 import { useChunkListAllKey, useChunkListDisabledKey, useChunkListEnabledKey, useDeleteSegment, useDisableSegment, useEnableSegment, useSegmentList, useSegmentListKey, useUpdateSegment } from '@/service/knowledge/use-segment'
 import { useInvalid } from '@/service/use-base'
-import { segmentImportStatus } from '@/types/dataset'
 import { formatNumber } from '@/utils/format'
 import { useDocumentContext } from '../../context'
+import { ProcessStatus } from '../../segment-add'
 
 const DEFAULT_LIMIT = 10
 type UseSegmentListDataOptions = {
   searchValue: string
   selectedStatus: boolean | 'all'
   selectedSegmentIds: string[]
-  importStatus: SegmentImportStatus | undefined
+  importStatus: ProcessStatus | string | undefined
   currentPage: number
   limit: number
   onCloseSegmentDetail: () => void
@@ -93,7 +92,7 @@ export const useSegmentListData = (options: UseSegmentListDataOptions): UseSegme
   }, [pathname])
   // Reset list on import completion
   useEffect(() => {
-    if (importStatus === segmentImportStatus.completed) {
+    if (importStatus === ProcessStatus.COMPLETED) {
       clearSelection()
       invalidSegmentList()
     }

web/app/components/datasets/documents/detail/completed/index.tsx

@@ -1,7 +1,7 @@
 'use client'
 import type { FC } from 'react'
+import type { ProcessStatus } from '../segment-add'
 import type { SegmentListContextValue } from './segment-list-context'
-import type { SegmentImportStatus } from '@/types/dataset'
 import { useCallback, useMemo, useState } from 'react'
 import Divider from '@/app/components/base/divider'
 import Pagination from '@/app/components/base/pagination'
@@ -13,9 +13,7 @@ import {
 import { useInvalid } from '@/service/use-base'
 import { useDocumentContext } from '../context'
 import BatchAction from './common/batch-action'
-import { DrawerGroup } from './components/drawer-group'
-import MenuBar from './components/menu-bar'
-import { FullDocModeContent, GeneralModeContent } from './components/segment-list-content'
+import { DrawerGroup, FullDocModeContent, GeneralModeContent, MenuBar } from './components'
 import {
   useChildSegmentData,
   useModalState,
@@ -34,7 +32,7 @@ type ICompletedProps = {
   embeddingAvailable: boolean
   showNewSegmentModal: boolean
   onNewSegmentModalChange: (state: boolean) => void
-  importStatus: SegmentImportStatus | undefined
+  importStatus: ProcessStatus | string | undefined
   archived?: boolean
 }
 
@@ -227,6 +225,8 @@ const Completed: FC<ICompletedProps> = ({
           currSegment={modalState.currSegment}
           onCloseSegmentDetail={modalState.onCloseSegmentDetail}
           onUpdateSegment={segmentListDataHook.handleUpdateSegment}
+          isRegenerationModalOpen={modalState.isRegenerationModalOpen}
+          setIsRegenerationModalOpen={modalState.setIsRegenerationModalOpen}
           showNewSegmentModal={showNewSegmentModal}
           onCloseNewSegmentModal={modalState.onCloseNewSegmentModal}
           onSaveNewSegment={segmentListDataHook.resetList}

web/app/components/datasets/documents/detail/completed/segment-detail.tsx

@@ -1,3 +1,4 @@
+import type { FC } from 'react'
 import type { FileEntity } from '@/app/components/datasets/common/image-uploader/types'
 import type { SegmentDetailModel } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
@@ -6,6 +7,7 @@ import {
   RiCollapseDiagonalLine,
   RiExpandDiagonalLine,
 } from '@remixicon/react'
+import * as React from 'react'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { v4 as uuid4 } from 'uuid'
@@ -40,15 +42,20 @@ type ISegmentDetailProps = {
   onCancel: () => void
   isEditMode?: boolean
   docForm: ChunkingMode
+  onModalStateChange?: (isOpen: boolean) => void
 }
 
-export function SegmentDetail({
+/**
+ * Show all the contents of the segment
+ */
+const SegmentDetail: FC<ISegmentDetailProps> = ({
   segInfo,
   onUpdate,
   onCancel,
   isEditMode,
   docForm,
-}: ISegmentDetailProps) {
+  onModalStateChange,
+}) => {
   const { t } = useTranslation()
   const [question, setQuestion] = useState(isEditMode ? segInfo?.content || '' : segInfo?.sign_content || '')
   const [answer, setAnswer] = useState(segInfo?.answer || '')
@@ -92,16 +99,19 @@ export function SegmentDetail({
 
   const handleRegeneration = useCallback(() => {
     setShowRegenerationModal(true)
-  }, [])
+    onModalStateChange?.(true)
+  }, [onModalStateChange])
 
   const onCancelRegeneration = useCallback(() => {
     setShowRegenerationModal(false)
-  }, [])
+    onModalStateChange?.(false)
+  }, [onModalStateChange])
 
   const onCloseAfterRegeneration = useCallback(() => {
     setShowRegenerationModal(false)
-    onCancel()
-  }, [onCancel])
+    onModalStateChange?.(false)
+    onCancel() // Close the edit drawer
+  }, [onCancel, onModalStateChange])
 
   const onConfirmRegeneration = useCallback(() => {
     onUpdate(segInfo?.id || '', question, answer, keywords, attachments, summary, true)
@@ -231,3 +241,5 @@ export function SegmentDetail({
     </div>
   )
 }
+
+export default React.memo(SegmentDetail)

web/app/components/datasets/documents/detail/index.tsx

@@ -1,7 +1,6 @@
 'use client'
 import type { FC } from 'react'
 import type { DataSourceInfo, DocumentDisplayStatus, FileItem, FullDocumentDetail, LegacyDataSourceInfo } from '@/models/datasets'
-import type { SegmentImportStatus } from '@/types/dataset'
 import { cn } from '@langgenius/dify-ui/cn'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
@@ -18,7 +17,6 @@ import { useRouter, useSearchParams } from '@/next/navigation'
 import { useDocumentDetail, useDocumentMetadata, useInvalidDocumentList } from '@/service/knowledge/use-document'
 import { useCheckSegmentBatchImportProgress, useChildSegmentListKey, useSegmentBatchImport, useSegmentListKey } from '@/service/knowledge/use-segment'
 import { useInvalid } from '@/service/use-base'
-import { segmentImportStatus } from '@/types/dataset'
 import Operations from '../components/operations'
 import StatusItem from '../status-item'
 import BatchModal from './batch-modal'
@@ -26,7 +24,7 @@ import Completed from './completed'
 import { DocumentContext } from './context'
 import { DocumentTitle } from './document-title'
 import Embedding from './embedding'
-import { SegmentAdd } from './segment-add'
+import SegmentAdd, { ProcessStatus } from './segment-add'
 import style from './style.module.css'
 
 type DocumentDetailProps = {
@@ -55,20 +53,20 @@ const DocumentDetail: FC<DocumentDetailProps> = ({ datasetId, documentId }) => {
   const [showMetadata, setShowMetadata] = useState(!isMobile)
   const [newSegmentModalVisible, setNewSegmentModalVisible] = useState(false)
   const [batchModalVisible, setBatchModalVisible] = useState(false)
-  const [importStatus, setImportStatus] = useState<SegmentImportStatus>()
+  const [importStatus, setImportStatus] = useState<ProcessStatus | string>()
   const showNewSegmentModal = () => setNewSegmentModalVisible(true)
   const showBatchModal = () => setBatchModalVisible(true)
   const hideBatchModal = () => setBatchModalVisible(false)
-  const resetImportStatus = () => setImportStatus(undefined)
+  const resetProcessStatus = () => setImportStatus('')
 
   const { mutateAsync: checkSegmentBatchImportProgress } = useCheckSegmentBatchImportProgress()
   const checkProcess = async (jobID: string) => {
     await checkSegmentBatchImportProgress({ jobID }, {
       onSuccess: (res) => {
         setImportStatus(res.job_status)
-        if (res.job_status === segmentImportStatus.waiting || res.job_status === segmentImportStatus.processing)
+        if (res.job_status === ProcessStatus.WAITING || res.job_status === ProcessStatus.PROCESSING)
           setTimeout(() => checkProcess(res.job_id), 2500)
-        if (res.job_status === segmentImportStatus.error)
+        if (res.job_status === ProcessStatus.ERROR)
           toast.error(`${t('list.batchModal.runError', { ns: 'datasetDocuments' })}`)
       },
       onError: (e) => {
@@ -224,7 +222,7 @@ const DocumentDetail: FC<DocumentDetailProps> = ({ datasetId, documentId }) => {
               <>
                 <SegmentAdd
                   importStatus={importStatus}
-                  clearImportStatus={resetImportStatus}
+                  clearProcessStatus={resetProcessStatus}
                   showNewSegmentModal={showNewSegmentModal}
                   showBatchModal={showBatchModal}
                   embedding={embedding}

web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx

@@ -1,10 +1,8 @@
-import type { SegmentImportStatus } from '@/types/dataset'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { Plan } from '@/app/components/billing/type'
-import { segmentImportStatus } from '@/types/dataset'
 
-import { SegmentAdd } from '../index'
+import SegmentAdd, { ProcessStatus } from '../index'
 
 // Mock provider context
 let mockPlan = { type: Plan.professional }
@@ -24,8 +22,8 @@ describe('SegmentAdd', () => {
   })
 
   const defaultProps = {
-    importStatus: undefined as SegmentImportStatus | undefined,
-    clearImportStatus: vi.fn(),
+    importStatus: undefined as ProcessStatus | string | undefined,
+    clearProcessStatus: vi.fn(),
     showNewSegmentModal: vi.fn(),
     showBatchModal: vi.fn(),
     embedding: false,
@@ -54,33 +52,33 @@ describe('SegmentAdd', () => {
   // Import Status displays
   describe('Import Status Display', () => {
     it('should show processing indicator when status is WAITING', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.waiting} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.WAITING} />)
 
       expect(screen.getByText(/list\.batchModal\.processing/i)).toBeInTheDocument()
     })
 
     it('should show processing indicator when status is PROCESSING', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.processing} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.PROCESSING} />)
 
       expect(screen.getByText(/list\.batchModal\.processing/i)).toBeInTheDocument()
     })
 
     it('should show completed status with ok button', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.completed} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.COMPLETED} />)
 
       expect(screen.getByText(/list\.batchModal\.completed/i)).toBeInTheDocument()
       expect(screen.getByText(/list\.batchModal\.ok/i)).toBeInTheDocument()
     })
 
     it('should show error status with ok button', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.error} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.ERROR} />)
 
       expect(screen.getByText(/list\.batchModal\.error/i)).toBeInTheDocument()
       expect(screen.getByText(/list\.batchModal\.ok/i)).toBeInTheDocument()
     })
 
     it('should not show add button when importStatus is set', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.processing} />)
+      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.PROCESSING} />)
 
       expect(screen.queryByText(/list\.action\.addButton/i)).not.toBeInTheDocument()
     })
@@ -96,34 +94,34 @@ describe('SegmentAdd', () => {
       expect(mockShowNewSegmentModal).toHaveBeenCalledTimes(1)
     })
 
-    it('should call clearImportStatus when ok is clicked on completed status', () => {
-      const mockClearImportStatus = vi.fn()
+    it('should call clearProcessStatus when ok is clicked on completed status', () => {
+      const mockClearProcessStatus = vi.fn()
       render(
         <SegmentAdd
           {...defaultProps}
-          importStatus={segmentImportStatus.completed}
-          clearImportStatus={mockClearImportStatus}
+          importStatus={ProcessStatus.COMPLETED}
+          clearProcessStatus={mockClearProcessStatus}
         />,
       )
 
       fireEvent.click(screen.getByText(/list\.batchModal\.ok/i))
 
-      expect(mockClearImportStatus).toHaveBeenCalledTimes(1)
+      expect(mockClearProcessStatus).toHaveBeenCalledTimes(1)
     })
 
-    it('should call clearImportStatus when ok is clicked on error status', () => {
-      const mockClearImportStatus = vi.fn()
+    it('should call clearProcessStatus when ok is clicked on error status', () => {
+      const mockClearProcessStatus = vi.fn()
       render(
         <SegmentAdd
           {...defaultProps}
-          importStatus={segmentImportStatus.error}
-          clearImportStatus={mockClearImportStatus}
+          importStatus={ProcessStatus.ERROR}
+          clearProcessStatus={mockClearProcessStatus}
         />,
       )
 
       fireEvent.click(screen.getByText(/list\.batchModal\.ok/i))
 
-      expect(mockClearImportStatus).toHaveBeenCalledTimes(1)
+      expect(mockClearProcessStatus).toHaveBeenCalledTimes(1)
     })
 
     it('should render batch add option in dropdown', async () => {
@@ -217,14 +215,14 @@ describe('SegmentAdd', () => {
   // Progress bar width tests
   describe('Progress Bar', () => {
     it('should show 3/12 width progress bar for WAITING status', () => {
-      const { container } = render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.waiting} />)
+      const { container } = render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.WAITING} />)
 
       const progressBar = container.querySelector('.w-3\\/12')
       expect(progressBar).toBeInTheDocument()
     })
 
     it('should show 2/3 width progress bar for PROCESSING status', () => {
-      const { container } = render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.processing} />)
+      const { container } = render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.PROCESSING} />)
 
       const progressBar = container.querySelector('.w-2\\/3')
       expect(progressBar).toBeInTheDocument()
@@ -232,6 +230,15 @@ describe('SegmentAdd', () => {
   })
 
   describe('Edge Cases', () => {
+    it('should handle unknown importStatus string', () => {
+      // Arrange & Act - pass unknown status
+      const { container } = render(<SegmentAdd {...defaultProps} importStatus="unknown" />)
+
+      // Assert - empty fragment is rendered for unknown status (container exists but has no visible content)
+      expect(container).toBeInTheDocument()
+      expect(container.textContent).toBe('')
+    })
+
     it('should maintain structure when rerendered', () => {
       const { rerender } = render(<SegmentAdd {...defaultProps} />)
 

web/app/components/datasets/documents/detail/segment-add/index.tsx

@@ -1,5 +1,5 @@
 'use client'
-import type { SegmentImportStatus } from '@/types/dataset'
+import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
   DropdownMenu,
@@ -7,92 +7,95 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@langgenius/dify-ui/dropdown-menu'
-import { useRef, useState } from 'react'
+import { useBoolean } from 'ahooks'
+import * as React from 'react'
+import { useCallback, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { PlanUpgradeModal } from '@/app/components/billing/plan-upgrade-modal'
 import { Plan } from '@/app/components/billing/type'
 import { useProviderContext } from '@/context/provider-context'
-import { segmentImportStatus } from '@/types/dataset'
 
-type SegmentAddProps = {
-  importStatus: SegmentImportStatus | undefined
-  clearImportStatus: () => void
+type ISegmentAddProps = {
+  importStatus: ProcessStatus | string | undefined
+  clearProcessStatus: () => void
   showNewSegmentModal: () => void
   showBatchModal: () => void
   embedding: boolean
 }
 
-export function SegmentAdd({
+export enum ProcessStatus {
+  WAITING = 'waiting',
+  PROCESSING = 'processing',
+  COMPLETED = 'completed',
+  ERROR = 'error',
+}
+
+const SegmentAdd: FC<ISegmentAddProps> = ({
   importStatus,
-  clearImportStatus,
+  clearProcessStatus,
   showNewSegmentModal,
   showBatchModal,
   embedding,
-}: SegmentAddProps) {
+}) => {
   const { t } = useTranslation()
-  const [isBatchMenuOpen, setIsBatchMenuOpen] = useState(false)
-  const [isPlanUpgradeModalOpen, setIsPlanUpgradeModalOpen] = useState(false)
-  const batchMenuAnchorRef = useRef<HTMLDivElement>(null)
+  const [isShowPlanUpgradeModal, {
+    setTrue: showPlanUpgradeModal,
+    setFalse: hidePlanUpgradeModal,
+  }] = useBoolean(false)
   const { plan, enableBilling } = useProviderContext()
-  const canAddChunks = !enableBilling || plan.type !== Plan.sandbox
+  const { type } = plan
+  const canAdd = enableBilling ? type !== Plan.sandbox : true
+  const [isBatchMenuOpen, setIsBatchMenuOpen] = useState(false)
+  const batchMenuAnchorRef = useRef<HTMLDivElement>(null)
 
-  const textColor = embedding
-    ? 'text-components-button-secondary-accent-text-disabled'
-    : 'text-components-button-secondary-accent-text'
-
-  const handleAddClick = () => {
-    if (!canAddChunks) {
-      setIsPlanUpgradeModalOpen(true)
-      return
+  const withNeedUpgradeCheck = useCallback((fn: () => void) => {
+    return () => {
+      if (!canAdd) {
+        showPlanUpgradeModal()
+        return
+      }
+      fn()
     }
-
-    showNewSegmentModal()
-  }
-
-  const handleBatchAddClick = () => {
-    setIsBatchMenuOpen(false)
-
-    if (!canAddChunks) {
-      setIsPlanUpgradeModalOpen(true)
-      return
-    }
-
-    showBatchModal()
-  }
+  }, [canAdd, showPlanUpgradeModal])
+  const textColor = useMemo(() => {
+    return embedding
+      ? 'text-components-button-secondary-accent-text-disabled'
+      : 'text-components-button-secondary-accent-text'
+  }, [embedding])
 
   if (importStatus) {
     return (
       <>
-        {(importStatus === segmentImportStatus.waiting || importStatus === segmentImportStatus.processing) && (
+        {(importStatus === ProcessStatus.WAITING || importStatus === ProcessStatus.PROCESSING) && (
           <div className="relative mr-2 inline-flex items-center overflow-hidden rounded-lg border-[0.5px] border-components-progress-bar-border
             bg-components-progress-bar-border px-2.5 py-2 text-components-button-secondary-accent-text
             shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]"
           >
-            <div className={cn('absolute top-0 left-0 z-0 h-full border-r-[1.5px] border-r-components-progress-bar-progress-highlight bg-components-progress-bar-progress', importStatus === segmentImportStatus.waiting ? 'w-3/12' : 'w-2/3')} />
+            <div className={cn('absolute top-0 left-0 z-0 h-full border-r-[1.5px] border-r-components-progress-bar-progress-highlight bg-components-progress-bar-progress', importStatus === ProcessStatus.WAITING ? 'w-3/12' : 'w-2/3')} />
             <span aria-hidden className="mr-1 i-ri-loader-2-line h-4 w-4 animate-spin" />
             <span className="z-10 pr-0.5 system-sm-medium">{t('list.batchModal.processing', { ns: 'datasetDocuments' })}</span>
           </div>
         )}
-        {importStatus === segmentImportStatus.completed && (
+        {importStatus === ProcessStatus.COMPLETED && (
           <div className="relative mr-2 inline-flex items-center overflow-hidden rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]">
             <div className="inline-flex items-center border-r border-r-divider-subtle px-2.5 py-2 text-text-success">
               <span aria-hidden className="mr-1 i-custom-vender-solid-general-check-circle h-4 w-4" />
               <span className="pr-0.5 system-sm-medium">{t('list.batchModal.completed', { ns: 'datasetDocuments' })}</span>
             </div>
             <div className="m-1 inline-flex items-center">
-              <span className="cursor-pointer rounded-md px-1.5 py-1 system-xs-medium text-components-button-ghost-text hover:bg-components-button-ghost-bg-hover" onClick={clearImportStatus}>{t('list.batchModal.ok', { ns: 'datasetDocuments' })}</span>
+              <span className="cursor-pointer rounded-md px-1.5 py-1 system-xs-medium text-components-button-ghost-text hover:bg-components-button-ghost-bg-hover" onClick={clearProcessStatus}>{t('list.batchModal.ok', { ns: 'datasetDocuments' })}</span>
             </div>
             <div className="absolute top-0 left-0 -z-10 h-full w-full bg-dataset-chunk-process-success-bg opacity-40" />
           </div>
         )}
-        {importStatus === segmentImportStatus.error && (
+        {importStatus === ProcessStatus.ERROR && (
           <div className="relative mr-2 inline-flex items-center overflow-hidden rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]">
             <div className="inline-flex items-center border-r border-r-divider-subtle px-2.5 py-2 text-text-destructive">
               <span aria-hidden className="mr-1 i-ri-error-warning-fill h-4 w-4" />
               <span className="pr-0.5 system-sm-medium">{t('list.batchModal.error', { ns: 'datasetDocuments' })}</span>
             </div>
             <div className="m-1 inline-flex items-center">
-              <span className="cursor-pointer rounded-md px-1.5 py-1 system-xs-medium text-components-button-ghost-text hover:bg-components-button-ghost-bg-hover" onClick={clearImportStatus}>{t('list.batchModal.ok', { ns: 'datasetDocuments' })}</span>
+              <span className="cursor-pointer rounded-md px-1.5 py-1 system-xs-medium text-components-button-ghost-text hover:bg-components-button-ghost-bg-hover" onClick={clearProcessStatus}>{t('list.batchModal.ok', { ns: 'datasetDocuments' })}</span>
             </div>
             <div className="absolute top-0 left-0 -z-10 h-full w-full bg-dataset-chunk-process-error-bg opacity-40" />
           </div>
@@ -113,7 +116,7 @@ export function SegmentAdd({
         type="button"
         className={`inline-flex items-center rounded-l-lg border-r border-r-divider-subtle px-2.5 py-2
           hover:bg-state-base-hover disabled:cursor-not-allowed disabled:hover:bg-transparent`}
-        onClick={handleAddClick}
+        onClick={withNeedUpgradeCheck(showNewSegmentModal)}
         disabled={embedding}
       >
         <span aria-hidden className={cn('i-ri-add-line h-4 w-4', textColor)} />
@@ -139,20 +142,25 @@ export function SegmentAdd({
           placement="bottom-start"
           sideOffset={4}
           positionerProps={{ anchor: batchMenuAnchorRef }}
-          popupClassName="w-[var(--anchor-width)]"
+          popupClassName="w-[var(--anchor-width)] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-0 shadow-xl shadow-shadow-shadow-5 backdrop-blur-[5px]"
         >
-          <DropdownMenuItem
-            className="system-md-regular"
-            onClick={handleBatchAddClick}
-          >
-            {t('list.action.batchAdd', { ns: 'datasetDocuments' })}
-          </DropdownMenuItem>
+          <div className="w-full p-1">
+            <DropdownMenuItem
+              className="h-auto w-full px-2 py-1.5 system-md-regular"
+              onClick={() => {
+                setIsBatchMenuOpen(false)
+                withNeedUpgradeCheck(showBatchModal)()
+              }}
+            >
+              {t('list.action.batchAdd', { ns: 'datasetDocuments' })}
+            </DropdownMenuItem>
+          </div>
         </DropdownMenuContent>
       </DropdownMenu>
-      {isPlanUpgradeModalOpen && (
+      {isShowPlanUpgradeModal && (
         <PlanUpgradeModal
           show
-          onClose={() => setIsPlanUpgradeModalOpen(false)}
+          onClose={hidePlanUpgradeModal}
           title={t('upgrade.addChunks.title', { ns: 'billing' })!}
           description={t('upgrade.addChunks.description', { ns: 'billing' })!}
         />
@@ -161,3 +169,4 @@ export function SegmentAdd({
 
   )
 }
+export default React.memo(SegmentAdd)

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

@@ -22,7 +22,7 @@ const createApp = (overrides?: Partial<App>): App => ({
   copyright: '2024',
   privacy_policy: null,
   custom_disclaimer: null,
-  categories: ['Assistant'],
+  category: 'Assistant',
   position: 1,
   is_listed: true,
   install_count: 0,
@@ -167,7 +167,7 @@ describe('AppCard', () => {
         template_id: app.app_id,
         template_name: app.app.name,
         template_mode: app.app.mode,
-        template_categories: app.categories,
+        template_category: app.category,
         page: 'explore',
       })
     })

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

@@ -37,7 +37,7 @@ const AppCard = ({
       template_id: app.app_id,
       template_name: appBasicInfo.name,
       template_mode: appBasicInfo.mode,
-      template_categories: app.categories,
+      template_category: app.category,
       page: 'explore',
     })
     onTry({ appId: app.app_id, app })

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

@@ -115,7 +115,7 @@ const createApp = (overrides: Partial<App> = {}): App => ({
   copyright: overrides.copyright ?? '',
   privacy_policy: overrides.privacy_policy ?? null,
   custom_disclaimer: overrides.custom_disclaimer ?? null,
-  categories: overrides.categories ?? ['Writing'],
+  category: overrides.category ?? 'Writing',
   position: overrides.position ?? 1,
   is_listed: overrides.is_listed ?? true,
   install_count: overrides.install_count ?? 0,
@@ -185,7 +185,7 @@ describe('AppList', () => {
     it('should render app cards when data is available', () => {
       mockExploreData = {
         categories: ['Writing', 'Translate'],
-        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, categories: ['Translate'] })],
+        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, category: 'Translate' })],
       }
 
       renderAppList()
@@ -199,7 +199,7 @@ describe('AppList', () => {
     it('should filter apps by selected category', () => {
       mockExploreData = {
         categories: ['Writing', 'Translate'],
-        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, categories: ['Translate'] })],
+        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, category: 'Translate' })],
       }
 
       renderAppList(false, undefined, { category: 'Writing' })

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

@@ -77,10 +77,7 @@ const Apps = ({
   const filteredList = useMemo(() => {
     if (!data)
       return []
-    return data.allList.filter(item => (
-      currCategory === allCategoriesEn
-      || item.categories?.includes(currCategory)
-    ))
+    return data.allList.filter(item => currCategory === allCategoriesEn || item.category === currCategory)
   }, [data, currCategory, allCategoriesEn])
 
   const searchFilteredList = useMemo(() => {
@@ -280,7 +277,7 @@ const Apps = ({
         <TryApp
           appId={currentTryApp?.appId || ''}
           app={currentTryApp?.app}
-          categories={currentTryApp?.app?.categories}
+          category={currentTryApp?.app?.category}
           onClose={hideTryAppPanel}
           onCreate={handleShowFromTryApp}
         />

web/app/components/explore/category.tsx

@@ -33,11 +33,6 @@ const Category: FC<ICategoryProps> = ({
     isSelected && 'border-components-main-nav-nav-button-border bg-components-main-nav-nav-button-bg-active text-components-main-nav-nav-button-text-active shadow-xs',
   )
 
-  const renderCategoryName = (name: AppCategory) => {
-    const categoryKey = `category.${name}` as keyof typeof exploreI18n
-    return categoryKey in exploreI18n ? t(categoryKey, { ns: 'explore' }) : name
-  }
-
   return (
     <div className={cn(className, 'flex flex-wrap gap-1 text-[13px]')}>
       <div
@@ -53,7 +48,7 @@ const Category: FC<ICategoryProps> = ({
           className={itemClassName(name === value)}
           onClick={() => onChange(name)}
         >
-          {renderCategoryName(name)}
+          {`category.${name}` in exploreI18n ? t(`category.${name}`, { ns: 'explore' }) : name}
         </div>
       ))}
     </div>

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

@@ -39,14 +39,14 @@ vi.mock('../app-info', () => ({
   default: ({
     appId,
     appDetail,
-    categories,
+    category,
     className,
     onCreate,
-  }: { appId: string, appDetail: TryAppInfo, categories?: string[], className?: string, onCreate: () => void }) => (
+  }: { appId: string, appDetail: TryAppInfo, category?: string, className?: string, onCreate: () => void }) => (
     <div
       data-testid="app-info-component"
       data-app-id={appId}
-      data-categories={categories?.join(',')}
+      data-category={category}
       className={className}
     >
       <button data-testid="create-button" onClick={onCreate}>Create</button>
@@ -283,12 +283,12 @@ describe('TryApp (main index.tsx)', () => {
     })
   })
 
-  describe('categories prop', () => {
-    it('passes categories to AppInfo when provided', async () => {
+  describe('category prop', () => {
+    it('passes category to AppInfo when provided', async () => {
       render(
         <TryApp
           appId="test-app-id"
-          categories={['AI Assistant', 'Workflow']}
+          category="AI Assistant"
           onClose={vi.fn()}
           onCreate={vi.fn()}
         />,
@@ -296,11 +296,11 @@ describe('TryApp (main index.tsx)', () => {
 
       await waitFor(() => {
         const appInfo = document.body.querySelector('[data-testid="app-info-component"]')
-        expect(appInfo).toHaveAttribute('data-categories', 'AI Assistant,Workflow')
+        expect(appInfo).toHaveAttribute('data-category', 'AI Assistant')
       })
     })
 
-    it('does not pass categories to AppInfo when not provided', async () => {
+    it('does not pass category to AppInfo when not provided', async () => {
       render(
         <TryApp
           appId="test-app-id"
@@ -311,7 +311,7 @@ describe('TryApp (main index.tsx)', () => {
 
       await waitFor(() => {
         const appInfo = document.body.querySelector('[data-testid="app-info-component"]')
-        expect(appInfo).not.toHaveAttribute('data-categories', expect.any(String))
+        expect(appInfo).not.toHaveAttribute('data-category', expect.any(String))
       })
     })
   })

web/app/components/explore/try-app/app-info/__tests__/index.spec.tsx

@@ -235,8 +235,8 @@ describe('AppInfo', () => {
     })
   })
 
-  describe('categories', () => {
-    it('renders categories when provided', () => {
+  describe('category', () => {
+    it('renders category when provided', () => {
       const appDetail = createMockAppDetail('chat')
       const mockOnCreate = vi.fn()
 
@@ -244,17 +244,16 @@ describe('AppInfo', () => {
         <AppInfo
           appId="test-app-id"
           appDetail={appDetail}
-          categories={['AI Assistant', 'Workflow']}
+          category="AI Assistant"
           onCreate={mockOnCreate}
         />,
       )
 
       expect(screen.getByText('explore.tryApp.category')).toBeInTheDocument()
       expect(screen.getByText('AI Assistant')).toBeInTheDocument()
-      expect(screen.getByText('Workflow')).toBeInTheDocument()
     })
 
-    it('does not render categories section when not provided', () => {
+    it('does not render category section when not provided', () => {
       const appDetail = createMockAppDetail('chat')
       const mockOnCreate = vi.fn()
 

web/app/components/explore/try-app/app-info/index.tsx

@@ -12,7 +12,7 @@ import useGetRequirements from './use-get-requirements'
 type Props = {
   appId: string
   appDetail: TryAppInfo
-  categories?: string[]
+  category?: string
   className?: string
   onCreate: () => void
 }
@@ -52,13 +52,12 @@ const RequirementIcon: FC<RequirementIconProps> = ({ iconUrl }) => {
 const AppInfo: FC<Props> = ({
   appId,
   className,
-  categories,
+  category,
   appDetail,
   onCreate,
 }) => {
   const { t } = useTranslation()
   const mode = appDetail?.mode
-  const visibleCategories = Array.from(new Set(categories?.filter(Boolean) ?? []))
   const { requirements } = useGetRequirements({ appDetail, appId })
   return (
     <div className={cn('flex h-full flex-col px-4 pt-2', className)}>
@@ -99,19 +98,10 @@ const AppInfo: FC<Props> = ({
         <span className="truncate">{t('tryApp.createFromSampleApp', { ns: 'explore' })}</span>
       </Button>
 
-      {visibleCategories.length > 0 && (
+      {category && (
         <div className="mt-6 shrink-0">
           <div className={headerClassName}>{t('tryApp.category', { ns: 'explore' })}</div>
-          <div className="flex flex-wrap gap-1.5">
-            {visibleCategories.map(category => (
-              <span
-                key={category}
-                className="rounded-md border-[0.5px] border-components-panel-border-subtle bg-components-badge-white-to-dark px-2 py-0.5 system-xs-medium text-text-secondary shadow-xs"
-              >
-                {category}
-              </span>
-            ))}
-          </div>
+          <div className="system-md-regular text-text-secondary">{category}</div>
         </div>
       )}
       {requirements.length > 0 && (