fix(web): confirm app deletion with enter key

.github/workflows/api-tests.yml

@@ -98,7 +98,7 @@ jobs:
 
       - name: Set up dotenvs
         run: |
-          ./docker/init-env.sh
+          cp docker/.env.example docker/.env
           cp docker/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports

.github/workflows/main-ci.yml

@@ -56,9 +56,7 @@ jobs:
               - 'api/**'
               - '.github/workflows/api-tests.yml'
               - '.github/workflows/expose_service_ports.sh'
-              - 'docker/.env.all'
               - 'docker/.env.example'
-              - 'docker/init-env.sh'
               - 'docker/middleware.env.example'
               - 'docker/docker-compose.middleware.yaml'
               - 'docker/docker-compose-template.yaml'
@@ -95,9 +93,7 @@ jobs:
               - 'api/providers/vdb/*/tests/**'
               - '.github/workflows/vdb-tests.yml'
               - '.github/workflows/expose_service_ports.sh'
-              - 'docker/.env.all'
               - 'docker/.env.example'
-              - 'docker/init-env.sh'
               - 'docker/middleware.env.example'
               - 'docker/docker-compose.yaml'
               - 'docker/docker-compose-template.yaml'

.github/workflows/vdb-tests-full.yml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Set up dotenvs
         run: |
-          ./docker/init-env.sh
+          cp docker/.env.example docker/.env
           cp docker/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports

.github/workflows/vdb-tests.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Set up dotenvs
         run: |
-          ./docker/init-env.sh
+          cp docker/.env.example docker/.env
           cp docker/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports

README.md

@@ -76,16 +76,10 @@ The easiest way to start the Dify server is through [Docker Compose](docker/dock
 ```bash
 cd dify
 cd docker
-./init-env.sh
-docker compose up -d
+./dify-compose up -d
 ```
 
-On Windows PowerShell, initialize `.env`, then run `docker compose up -d` from the `docker` directory.
-
-```powershell
-.\init-env.ps1
-docker 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.
 
@@ -144,7 +138,7 @@ Star Dify on GitHub and be instantly notified of new releases.
 
 ### Custom configurations
 
-If you need to customize the configuration, edit `docker/.env` after running the initialization script. The full reference remains in [`docker/.env.all`](docker/.env.all). After making any changes, re-run `docker compose 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).
+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
 

dev/pytest/pytest_config_tests.py

@@ -92,7 +92,7 @@ BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF: frozenset[str] = frozenset(
 )
 
 API_CONFIG_SET = set(dotenv_values(Path("api") / Path(".env.example")).keys())
-DOCKER_CONFIG_SET = set(dotenv_values(Path("docker") / Path(".env.all")).keys())
+DOCKER_CONFIG_SET = set(dotenv_values(Path("docker") / Path(".env.example")).keys())
 DOCKER_COMPOSE_CONFIG_SET = set()
 
 with open(Path("docker") / Path("docker-compose.yaml")) as f:
@@ -101,23 +101,15 @@ with open(Path("docker") / Path("docker-compose.yaml")) as f:
 
 def test_yaml_config():
     # python set == operator is used to compare two sets
-    DIFF_API_WITH_DOCKER = (
-        API_CONFIG_SET - DOCKER_CONFIG_SET - BASE_API_AND_DOCKER_CONFIG_SET_DIFF
-    )
+    DIFF_API_WITH_DOCKER = API_CONFIG_SET - DOCKER_CONFIG_SET - BASE_API_AND_DOCKER_CONFIG_SET_DIFF
     if DIFF_API_WITH_DOCKER:
-        print(
-            f"API and Docker config sets are different with key: {DIFF_API_WITH_DOCKER}"
-        )
+        print(f"API and Docker config sets are different with key: {DIFF_API_WITH_DOCKER}")
         raise Exception("API and Docker config sets are different")
     DIFF_API_WITH_DOCKER_COMPOSE = (
-        API_CONFIG_SET
-        - DOCKER_COMPOSE_CONFIG_SET
-        - BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF
+        API_CONFIG_SET - DOCKER_COMPOSE_CONFIG_SET - BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF
     )
     if DIFF_API_WITH_DOCKER_COMPOSE:
-        print(
-            f"API and Docker Compose config sets are different with key: {DIFF_API_WITH_DOCKER_COMPOSE}"
-        )
+        print(f"API and Docker Compose config sets are different with key: {DIFF_API_WITH_DOCKER_COMPOSE}")
         raise Exception("API and Docker Compose config sets are different")
     print("All tests passed!")
 

dev/pytest/pytest_full.sh

@@ -14,7 +14,7 @@ export OPENDAL_FS_ROOT=${OPENDAL_FS_ROOT:-/tmp/dify-storage}
 mkdir -p "${OPENDAL_FS_ROOT}"
 
 # Prepare env files like CI
-./docker/init-env.sh
+cp -n docker/.env.example docker/.env || true
 cp -n docker/middleware.env.example docker/middleware.env || true
 cp -n api/tests/integration_tests/.env.example api/tests/integration_tests/.env || true
 

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/README.md

@@ -7,38 +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**: Default deployment values are provided in `.env.example`. Initialize `.env` from it and keep local changes there so your configuration persists 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 your local Docker Compose environment file. Start from `.env.example`, then customize it as needed. Use `.env.all` as the full reference when you need advanced configuration.
+  > 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.
 
-- **Full Configuration Reference**: `.env.all` keeps the complete variable list for advanced and service-specific settings, while `.env.example` stays focused on the default self-hosted deployment path.
+- **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.
-   - Create `.env` and generate a deployment-specific `SECRET_KEY`:
-
-     ```bash
-     ./init-env.sh
-     ```
-
-     On Windows PowerShell:
-
-     ```powershell
-     .\init-env.ps1
-     ```
-
-   - Customize `.env` only when you need to override defaults. Refer to `.env.all` for the full list of available variables.
+   - 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.all`, you may use the environment synchronization tool to keep it aligned with the latest `.env.all` updates while preserving your custom settings.
+     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 -d` 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.
@@ -68,11 +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.example`, `.env`, and `.env.all`
+### Overview of `.env.default`, `.env`, and `.env.example`
 
-- `.env.example` contains the minimal default configuration for Docker Compose deployments.
-- `.env` is your local copy. It contains the generated `SECRET_KEY` plus any local changes.
-- `.env.all` is the full reference for advanced configuration.
+- `.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
 
@@ -82,7 +74,7 @@ For users migrating from the `docker-legacy` setup:
 
 #### Other notable variables
 
-The `.env.all` file provided in the Docker setup is extensive and covers a wide range of configuration options. It is structured into several sections, each pertaining to different aspects of the application and its services. Here are some of the key sections and variables:
+The `.env.example` file provided in the Docker setup is extensive and covers a wide range of configuration options. It is structured into several sections, each pertaining to different aspects of the application and its services. Here are some of the key sections and variables:
 
 1. **Common Variables**:
 
@@ -132,25 +124,25 @@ The `.env.all` file provided in the Docker setup is extensive and covers a wide
 
 ### Environment Variables Synchronization
 
-When upgrading Dify or pulling the latest changes, new environment variables may be introduced in `.env.example` or `.env.all`.
+When upgrading Dify or pulling the latest changes, new environment variables may be introduced in `.env.default` or `.env.example`.
 
-If you use the default workflow, review `.env.example` and add only the values you need to customize to `.env`.
+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.all`, an optional environment variables synchronization tool is provided.
+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.all` to `.env`.
+> This tool performs a **one-way synchronization** from `.env.example` to `.env`.
 > Existing values in `.env` are never overwritten automatically.
 
 #### `dify-env-sync.sh` (Optional)
 
-This script compares your current `.env` file with the latest `.env.all` template and helps safely apply new or updated environment variables.
+This script compares your current `.env` file with the latest `.env.example` template and helps safely apply new or updated environment variables.
 
 **What it does**
 
 - Creates a backup of the current `.env` file before making any changes
-- Synchronizes newly added environment variables from `.env.all`
+- Synchronizes newly added environment variables from `.env.example`
 - Preserves all existing custom values in `.env`
-- Displays differences and variables removed from `.env.all` for review
+- Displays differences and variables removed from `.env.example` for review
 
 **Backup behavior**
 
@@ -160,8 +152,8 @@ Before synchronization, the current `.env` file is saved to the `env-backup/` di
 **When to use**
 
 - After upgrading Dify to a newer version with a full `.env` file
-- When `.env.all` has been updated with new environment variables
-- When managing a large or heavily customized `.env` file copied from `.env.all`
+- When `.env.example` has been updated with new environment variables
+- When managing a large or heavily customized `.env` file copied from `.env.example`
 
 **Usage**
 
@@ -176,6 +168,6 @@ chmod +x dify-env-sync.sh
 ### Additional Information
 
 - **Continuous Improvement Phase**: We are actively seeking feedback from the community to refine and enhance the deployment process. As more users adopt this new method, we will continue to make improvements based on your experiences and suggestions.
-- **Support**: For detailed configuration options and environment variable settings, refer to the `.env.all` file and the Docker Compose configuration files in the `docker` directory.
+- **Support**: For detailed configuration options and environment variable settings, refer to the `.env.example` file and the Docker Compose configuration files in the `docker` directory.
 
 This README aims to guide you through the deployment process using the new Docker Compose setup. For any issues or further assistance, please refer to the official documentation or contact support.

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/dify-env-sync.py

@@ -4,7 +4,7 @@
 # Dify Environment Variables Synchronization Script
 #
 # Features:
-# - Synchronize latest settings from .env.all to .env
+# - Synchronize latest settings from .env.example to .env
 # - Preserve custom settings in existing .env
 # - Add new environment variables
 # - Detect removed environment variables
@@ -93,25 +93,25 @@ def parse_env_file(path: Path) -> dict[str, str]:
 
 
 def check_files(work_dir: Path) -> None:
-    """Verify required files exist; create .env from .env.all if absent.
+    """Verify required files exist; create .env from .env.example if absent.
 
     Args:
-        work_dir: Directory that must contain .env.all (and optionally .env).
+        work_dir: Directory that must contain .env.example (and optionally .env).
 
     Raises:
-        SystemExit: If .env.all does not exist.
+        SystemExit: If .env.example does not exist.
     """
     log_info("Checking required files...")
 
-    example_file = work_dir / ".env.all"
+    example_file = work_dir / ".env.example"
     env_file = work_dir / ".env"
 
     if not example_file.exists():
-        log_error(".env.all file not found")
+        log_error(".env.example file not found")
         sys.exit(1)
 
     if not env_file.exists():
-        log_warning(".env file does not exist. Creating from .env.all.")
+        log_warning(".env file does not exist. Creating from .env.example.")
         shutil.copy2(example_file, env_file)
         log_success(".env file created")
 
@@ -147,7 +147,7 @@ def analyze_value_change(current: str, recommended: str) -> str | None:
 
     Args:
         current: Value currently set in .env.
-        recommended: Value present in .env.all.
+        recommended: Value present in .env.example.
 
     Returns:
         A human-readable description string, or None when no analysis applies.
@@ -199,20 +199,20 @@ def analyze_value_change(current: str, recommended: str) -> str | None:
 
 
 def detect_differences(env_vars: dict[str, str], example_vars: dict[str, str]) -> dict[str, tuple[str, str]]:
-    """Find variables whose values differ between .env and .env.all.
+    """Find variables whose values differ between .env and .env.example.
 
     Only variables present in *both* files are compared; new or removed
     variables are handled by separate functions.
 
     Args:
         env_vars: Parsed key/value pairs from .env.
-        example_vars: Parsed key/value pairs from .env.all.
+        example_vars: Parsed key/value pairs from .env.example.
 
     Returns:
         Mapping of key -> (env_value, example_value) for every key whose
         values differ.
     """
-    log_info("Detecting differences between .env and .env.all...")
+    log_info("Detecting differences between .env and .env.example...")
 
     diffs: dict[str, tuple[str, str]] = {}
     for key, example_value in example_vars.items():
@@ -248,11 +248,11 @@ def show_differences_detail(diffs: dict[str, tuple[str, str]]) -> None:
         if use_colors:
             print(f"{YELLOW}[{count}] {key}{NC}")
             print(f"  {GREEN}.env (current){NC}             : {env_value}")
-            print(f"  {BLUE}.env.all (recommended){NC} : {example_value}")
+            print(f"  {BLUE}.env.example (recommended){NC} : {example_value}")
         else:
             print(f"[{count}] {key}")
             print(f"  .env (current)             : {env_value}")
-            print(f"  .env.all (recommended) : {example_value}")
+            print(f"  .env.example (recommended) : {example_value}")
 
         analysis = analyze_value_change(env_value, example_value)
         if analysis:
@@ -266,21 +266,21 @@ def show_differences_detail(diffs: dict[str, tuple[str, str]]) -> None:
 
 
 def detect_removed_variables(env_vars: dict[str, str], example_vars: dict[str, str]) -> list[str]:
-    """Identify variables present in .env but absent from .env.all.
+    """Identify variables present in .env but absent from .env.example.
 
     Args:
         env_vars: Parsed key/value pairs from .env.
-        example_vars: Parsed key/value pairs from .env.all.
+        example_vars: Parsed key/value pairs from .env.example.
 
     Returns:
-        Sorted list of variable names that no longer appear in .env.all.
+        Sorted list of variable names that no longer appear in .env.example.
     """
     log_info("Detecting removed environment variables...")
 
     removed = sorted(set(env_vars) - set(example_vars))
 
     if removed:
-        log_warning("The following environment variables have been removed from .env.all:")
+        log_warning("The following environment variables have been removed from .env.example:")
         for var in removed:
             log_warning(f"  - {var}")
         log_warning("Consider manually removing these variables from .env")
@@ -291,22 +291,22 @@ def detect_removed_variables(env_vars: dict[str, str], example_vars: dict[str, s
 
 
 def sync_env_file(work_dir: Path, env_vars: dict[str, str], diffs: dict[str, tuple[str, str]]) -> None:
-    """Rewrite .env based on .env.all while preserving custom values.
+    """Rewrite .env based on .env.example while preserving custom values.
 
-    The output file follows the exact line structure of .env.all
+    The output file follows the exact line structure of .env.example
     (preserving comments, blank lines, and ordering).  For every variable
     that exists in .env with a different value from the example, the
-    current .env value is kept.  Variables that are new in .env.all
+    current .env value is kept.  Variables that are new in .env.example
     (not present in .env at all) are added with the example's default.
 
     Args:
-        work_dir: Directory containing .env and .env.all.
+        work_dir: Directory containing .env and .env.example.
         env_vars: Parsed key/value pairs from the original .env.
-        diffs: Keys whose .env values differ from .env.all (to preserve).
+        diffs: Keys whose .env values differ from .env.example (to preserve).
     """
     log_info("Starting partial synchronization of .env file...")
 
-    example_file = work_dir / ".env.all"
+    example_file = work_dir / ".env.example"
     new_env_file = work_dir / ".env.new"
 
     # Keys whose current .env value should override the example default
@@ -350,24 +350,24 @@ def sync_env_file(work_dir: Path, env_vars: dict[str, str], diffs: dict[str, tup
     log_success("Successfully created new .env file")
     log_success("Partial synchronization of .env file completed")
     log_info(f"  Preserved .env values: {preserved_count}")
-    log_info(f"  Updated to .env.all values: {updated_count}")
+    log_info(f"  Updated to .env.example values: {updated_count}")
 
 
 def show_statistics(work_dir: Path) -> None:
     """Print a summary of variable counts from both env files.
 
     Args:
-        work_dir: Directory containing .env and .env.all.
+        work_dir: Directory containing .env and .env.example.
     """
     log_info("Synchronization statistics:")
 
-    example_file = work_dir / ".env.all"
+    example_file = work_dir / ".env.example"
     env_file = work_dir / ".env"
 
     example_count = len(parse_env_file(example_file)) if example_file.exists() else 0
     env_count = len(parse_env_file(env_file)) if env_file.exists() else 0
 
-    log_info(f"  .env.all environment variables: {example_count}")
+    log_info(f"  .env.example environment variables: {example_count}")
     log_info(f"  .env environment variables: {env_count}")
 
 
@@ -380,7 +380,7 @@ def build_arg_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         prog="dify-env-sync",
         description=(
-            "Synchronize .env with .env.all: add new variables, "
+            "Synchronize .env with .env.example: add new variables, "
             "preserve custom values, and report removed variables."
         ),
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -396,7 +396,7 @@ def build_arg_parser() -> argparse.ArgumentParser:
         "--dir",
         metavar="DIRECTORY",
         default=".",
-        help="Working directory containing .env and .env.all (default: current directory)",
+        help="Working directory containing .env and .env.example (default: current directory)",
     )
     parser.add_argument(
         "--no-backup",
@@ -427,7 +427,7 @@ def main() -> None:
 
     # 3. Parse both files
     env_vars = parse_env_file(work_dir / ".env")
-    example_vars = parse_env_file(work_dir / ".env.all")
+    example_vars = parse_env_file(work_dir / ".env.example")
 
     # 4. Report differences (values that changed in the example)
     diffs = detect_differences(env_vars, example_vars)

docker/dify-env-sync.sh

@@ -4,7 +4,7 @@
 # Dify Environment Variables Synchronization Script
 #
 # Features:
-# - Synchronize latest settings from .env.all to .env
+# - Synchronize latest settings from .env.example to .env
 # - Preserve custom settings in existing .env
 # - Add new environment variables
 # - Detect removed environment variables
@@ -61,18 +61,18 @@ log_error() {
 }
 
 # Check for required files and create .env if missing
-# Verifies that .env.all exists and creates .env from template if needed
+# Verifies that .env.example exists and creates .env from template if needed
 check_files() {
     log_info "Checking required files..."
 
-    if [[ ! -f ".env.all" ]]; then
-        log_error ".env.all file not found"
+    if [[ ! -f ".env.example" ]]; then
+        log_error ".env.example file not found"
         exit 1
     fi
 
     if [[ ! -f ".env" ]]; then
-        log_warning ".env file does not exist. Creating from .env.all."
-        cp ".env.all" ".env"
+        log_warning ".env file does not exist. Creating from .env.example."
+        cp ".env.example" ".env"
         log_success ".env file created"
     fi
 
@@ -98,9 +98,9 @@ create_backup() {
     fi
 }
 
-# Detect differences between .env and .env.all (optimized for large files)
+# Detect differences between .env and .env.example (optimized for large files)
 detect_differences() {
-    log_info "Detecting differences between .env and .env.all..."
+    log_info "Detecting differences between .env and .env.example..."
 
     # Create secure temporary directory
     local temp_dir=$(mktemp -d)
@@ -140,7 +140,7 @@ detect_differences() {
         }
     }
     END { print diff_count }
-    ' .env .env.all)
+    ' .env .env.example)
 
     if [[ $diff_count -gt 0 ]]; then
         log_success "Detected differences in $diff_count environment variables"
@@ -201,7 +201,7 @@ show_differences_detail() {
         echo ""
         echo -e "${YELLOW}[$count] $key${NC}"
         echo -e "  ${GREEN}.env (current)${NC}      : ${env_value}"
-        echo -e "  ${BLUE}.env.all (recommended)${NC}: ${example_value}"
+        echo -e "  ${BLUE}.env.example (recommended)${NC}: ${example_value}"
 
         # Analyze value changes
         analyze_value_change "$env_value" "$example_value"
@@ -261,8 +261,8 @@ analyze_value_change() {
     fi
 }
 
-# Synchronize .env file with .env.all while preserving custom values
-# Creates a new .env file based on .env.all structure, preserving existing custom values
+# Synchronize .env file with .env.example while preserving custom values
+# Creates a new .env file based on .env.example structure, preserving existing custom values
 # Global variables used: DIFF_FILE, TEMP_DIR
 sync_env_file() {
     log_info "Starting partial synchronization of .env file..."
@@ -281,7 +281,7 @@ sync_env_file() {
     fi
 
     # Use AWK for efficient processing (much faster than bash loop for large files)
-    log_info "Processing $(wc -l < .env.all) lines with AWK..."
+    log_info "Processing $(wc -l < .env.example) lines with AWK..."
 
     local preserved_keys_file="${TEMP_DIR}/preserved_keys"
     local awk_preserved_count_file="${TEMP_DIR}/awk_preserved_count"
@@ -332,7 +332,7 @@ sync_env_file() {
         print preserved_count > preserved_count_file
         print updated_count > updated_count_file
     }
-    ' .env.all > "$new_env_file"
+    ' .env.example > "$new_env_file"
 
     # Read counters and preserved keys
     if [[ -f "$awk_preserved_count_file" ]]; then
@@ -372,7 +372,7 @@ sync_env_file() {
 
     log_success "Partial synchronization of .env file completed"
     log_info "  Preserved .env values: $preserved_count"
-    log_info "  Updated to .env.all values: $updated_count"
+    log_info "  Updated to .env.example values: $updated_count"
 }
 
 # Detect removed environment variables
@@ -394,8 +394,8 @@ detect_removed_variables() {
         cleanup_temp_dir="$temp_dir"
     fi
 
-    # Get keys from .env.all and .env, sorted for comm
-    awk -F= '!/^[[:space:]]*#/ && /=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1); print $1}' .env.all | sort > "$temp_example_keys"
+    # Get keys from .env.example and .env, sorted for comm
+    awk -F= '!/^[[:space:]]*#/ && /=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1); print $1}' .env.example | sort > "$temp_example_keys"
     awk -F= '!/^[[:space:]]*#/ && /=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1); print $1}' .env | sort > "$temp_current_keys"
 
     # Get keys from existing .env and check for removals
@@ -410,7 +410,7 @@ detect_removed_variables() {
     fi
 
     if [[ ${#removed_vars[@]} -gt 0 ]]; then
-        log_warning "The following environment variables have been removed from .env.all:"
+        log_warning "The following environment variables have been removed from .env.example:"
         for var in "${removed_vars[@]}"; do
             log_warning "  - $var"
         done
@@ -424,10 +424,10 @@ detect_removed_variables() {
 show_statistics() {
     log_info "Synchronization statistics:"
 
-    local total_example=$(grep -c "^[^#]*=" .env.all 2>/dev/null || echo "0")
+    local total_example=$(grep -c "^[^#]*=" .env.example 2>/dev/null || echo "0")
     local total_env=$(grep -c "^[^#]*=" .env 2>/dev/null || echo "0")
 
-    log_info "  .env.all environment variables: $total_example"
+    log_info "  .env.example environment variables: $total_example"
     log_info "  .env environment variables: $total_env"
 }
 

docker/docker-compose.yaml

@@ -1,6 +1,6 @@
 # ==================================================================
 # WARNING: This file is auto-generated by generate_docker_compose
-# Do not modify this file directly. Instead, update the .env.all
+# Do not modify this file directly. Instead, update the .env.example
 # or docker-compose-template.yaml and regenerate this file.
 # ==================================================================
 
@@ -27,7 +27,7 @@ x-shared-env: &shared-api-worker-env
   DEBUG: ${DEBUG:-false}
   FLASK_DEBUG: ${FLASK_DEBUG:-false}
   ENABLE_REQUEST_LOGGING: ${ENABLE_REQUEST_LOGGING:-False}
-  SECRET_KEY: ${SECRET_KEY:?SECRET_KEY must be set. Run ./init-env.sh, or .\\init-env.ps1 on Windows, to generate one in .env.}
+  SECRET_KEY: ${SECRET_KEY:-sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U}
   INIT_PASSWORD: ${INIT_PASSWORD:-}
   DEPLOY_ENV: ${DEPLOY_ENV:-PRODUCTION}
   CHECK_UPDATE_URL: ${CHECK_UPDATE_URL:-https://updates.dify.ai}

docker/generate_docker_compose

@@ -18,9 +18,9 @@ SHARED_ENV_EXCLUDE = frozenset(
 )
 
 
-def parse_env_all(file_path):
+def parse_env_example(file_path):
     """
-    Parses the .env.all file and returns a dictionary with variable names as keys and default values as values.
+    Parses the .env.example file and returns a dictionary with variable names as keys and default values as values.
     """
     env_vars = {}
     with open(file_path, "r", encoding="utf-8") as f:
@@ -53,11 +53,6 @@ def generate_shared_env_block(env_vars, anchor_name="shared-api-worker-env"):
     for key, default in env_vars.items():
         if key in SHARED_ENV_EXCLUDE:
             continue
-        if key == "SECRET_KEY":
-            lines.append(
-                "  SECRET_KEY: ${SECRET_KEY:?SECRET_KEY must be set. Run ./init-env.sh, or .\\\\init-env.ps1 on Windows, to generate one in .env.}"
-            )
-            continue
         # If default value is empty, use ${KEY:-}
         if default == "":
             lines.append(f"  {key}: ${{{key}:-}}")
@@ -95,7 +90,7 @@ def insert_shared_env(template_path, output_path, shared_env_block, header_comme
 
 
 def main():
-    env_all_path = ".env.all"
+    env_example_path = ".env.example"
     template_path = "docker-compose-template.yaml"
     output_path = "docker-compose.yaml"
     anchor_name = "shared-api-worker-env"  # Can be modified as needed
@@ -104,22 +99,22 @@ def main():
     header_comments = (
         "# ==================================================================\n"
         "# WARNING: This file is auto-generated by generate_docker_compose\n"
-        "# Do not modify this file directly. Instead, update the .env.all\n"
+        "# Do not modify this file directly. Instead, update the .env.example\n"
         "# or docker-compose-template.yaml and regenerate this file.\n"
         "# ==================================================================\n"
     )
 
     # Check if required files exist
-    for path in [env_all_path, template_path]:
+    for path in [env_example_path, template_path]:
         if not os.path.isfile(path):
             print(f"Error: File {path} does not exist.")
             sys.exit(1)
 
-    # Parse .env.all file
-    env_vars = parse_env_all(env_all_path)
+    # Parse .env.example file
+    env_vars = parse_env_example(env_example_path)
 
     if not env_vars:
-        print("Warning: No environment variables found in .env.all.")
+        print("Warning: No environment variables found in .env.example.")
 
     # Generate shared environment variables block
     shared_env_block = generate_shared_env_block(env_vars, anchor_name)

docker/init-env.ps1

@@ -1,101 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-Set-Location $ScriptDir
-
-$EnvExampleFile = ".env.example"
-$EnvFile = ".env"
-
-function New-SecretKey {
-    $bytes = New-Object byte[] 42
-    [System.Security.Cryptography.RandomNumberGenerator]::Fill($bytes)
-    [Convert]::ToBase64String($bytes)
-}
-
-function Get-EnvValue {
-    param([string]$Key)
-
-    if (-not (Test-Path $EnvFile)) {
-        return ""
-    }
-
-    $result = ""
-    foreach ($line in Get-Content $EnvFile) {
-        if ($line -match "^\s*#" -or $line -notmatch "=") {
-            continue
-        }
-
-        $parts = $line.Split("=", 2)
-        if ($parts[0].Trim() -eq $Key) {
-            $value = $parts[1].Trim()
-            if (($value.StartsWith('"') -and $value.EndsWith('"')) -or ($value.StartsWith("'") -and $value.EndsWith("'"))) {
-                $value = $value.Substring(1, $value.Length - 2)
-            }
-            $result = $value
-        }
-    }
-
-    $result
-}
-
-function Set-EnvValue {
-    param(
-        [string]$Key,
-        [string]$Value
-    )
-
-    $output = New-Object System.Collections.Generic.List[string]
-    $replaced = $false
-
-    if (Test-Path $EnvFile) {
-        foreach ($line in Get-Content $EnvFile) {
-            if ($line -match "^\s*#" -or $line -notmatch "=") {
-                $output.Add($line)
-                continue
-            }
-
-            $parts = $line.Split("=", 2)
-            if ($parts[0].Trim() -eq $Key) {
-                if (-not $replaced) {
-                    $output.Add("$Key=$Value")
-                    $replaced = $true
-                }
-                continue
-            }
-
-            $output.Add($line)
-        }
-    }
-
-    if (-not $replaced) {
-        $output.Add("$Key=$Value")
-    }
-
-    $fullPath = Join-Path $ScriptDir $EnvFile
-    $utf8NoBom = New-Object System.Text.UTF8Encoding $false
-    [System.IO.File]::WriteAllLines($fullPath, [string[]]$output, $utf8NoBom)
-}
-
-if (Test-Path $EnvFile) {
-    Write-Output "Using existing $EnvFile."
-}
-else {
-    if (-not (Test-Path $EnvExampleFile)) {
-        Write-Error "$EnvExampleFile is missing."
-        exit 1
-    }
-
-    Copy-Item $EnvExampleFile $EnvFile
-    Write-Output "Created $EnvFile from $EnvExampleFile."
-}
-
-$currentSecretKey = Get-EnvValue "SECRET_KEY"
-if ($currentSecretKey) {
-    Write-Output "SECRET_KEY already exists in $EnvFile."
-}
-else {
-    Set-EnvValue "SECRET_KEY" (New-SecretKey)
-    Write-Output "Generated SECRET_KEY in $EnvFile."
-}
-
-Write-Output "Environment is ready. Run docker compose up -d to start Dify."

docker/init-env.sh

@@ -1,117 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
-
-ENV_EXAMPLE_FILE=".env.example"
-ENV_FILE=".env"
-
-log() {
-  printf '%s\n' "$*"
-}
-
-die() {
-  printf 'Error: %s\n' "$*" >&2
-  exit 1
-}
-
-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
-}
-
-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 }
-  ' "$ENV_FILE"
-}
-
-set_env_value() {
-  local key="$1"
-  local value="$2"
-  local temp_file
-
-  temp_file="$(mktemp "${TMPDIR:-/tmp}/dify-env.XXXXXX")"
-  if 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
-      }
-    }
-  ' "$ENV_FILE" >"$temp_file"; then
-    mv "$temp_file" "$ENV_FILE"
-  else
-    rm -f "$temp_file"
-    return 1
-  fi
-}
-
-ensure_env_file() {
-  if [[ -f "$ENV_FILE" ]]; then
-    log "Using existing $ENV_FILE."
-    return
-  fi
-
-  [[ -f "$ENV_EXAMPLE_FILE" ]] || die "$ENV_EXAMPLE_FILE is missing."
-  cp "$ENV_EXAMPLE_FILE" "$ENV_FILE"
-  log "Created $ENV_FILE from $ENV_EXAMPLE_FILE."
-}
-
-ensure_secret_key() {
-  local current_secret_key
-  local secret_key
-
-  current_secret_key="$(env_value SECRET_KEY)"
-  if [[ -n "$current_secret_key" ]]; then
-    log "SECRET_KEY already exists in $ENV_FILE."
-    return
-  fi
-
-  secret_key="$(generate_secret_key)" || die "Unable to generate SECRET_KEY. Install openssl or set SECRET_KEY in $ENV_FILE."
-  set_env_value SECRET_KEY "$secret_key"
-  log "Generated SECRET_KEY in $ENV_FILE."
-}
-
-ensure_env_file
-ensure_secret_key
-log "Environment is ready. Run docker compose up -d to start Dify."

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__/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/components/app/app-publisher/__tests__/index.spec.tsx

@@ -91,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),
@@ -136,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', () => ({
@@ -167,7 +143,6 @@ vi.mock('../sections', () => ({
       <div>
         <button onClick={props.handleEmbed}>publisher-embed</button>
         <button onClick={() => void props.handleOpenInExplore()}>publisher-open-in-explore</button>
-        <button onClick={props.onConfigureWorkflowTool}>publisher-workflow-tool</button>
       </div>
     )
   },
@@ -256,25 +231,6 @@ describe('AppPublisher', () => {
     expect(screen.getByTestId('embedded-modal'))!.toBeInTheDocument()
   })
 
-  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

@@ -190,17 +190,18 @@ describe('app-publisher sections', () => {
         disabledFunctionTooltip="disabled"
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
+        handlePublish={vi.fn()}
         hasHumanInputNode={false}
         hasTriggerNode={false}
+        inputs={[]}
         missingStartNode={false}
+        onRefreshData={vi.fn()}
+        outputs={[]}
+        published={true}
         publishedAt={Date.now()}
         toolPublished
         workflowToolAvailable={false}
-        workflowToolIsLoading={false}
-        workflowToolOutdated={false}
-        workflowToolIsCurrentWorkspaceManager
         workflowToolMessage="workflow-disabled"
-        onConfigureWorkflowTool={vi.fn()}
       />,
     )
 
@@ -222,16 +223,17 @@ describe('app-publisher sections', () => {
         disabledFunctionTooltip="disabled"
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
+        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()}
       />,
     )
 
@@ -246,16 +248,16 @@ describe('app-publisher sections', () => {
         disabledFunctionButton={false}
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
+        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/index.tsx

@@ -5,12 +5,13 @@ 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,
@@ -19,12 +20,9 @@ import { useTranslation } from 'react-i18next'
 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'
@@ -59,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
@@ -76,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,
@@ -108,12 +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 [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())
@@ -282,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',
@@ -377,22 +343,23 @@ const AppPublisher = ({
                 handleOpenChange(false)
                 handleOpenInExplore()
               }}
+              handlePublish={handlePublish}
               hasHumanInputNode={hasHumanInputNode}
               hasTriggerNode={hasTriggerNode}
+              inputs={inputs}
               missingStartNode={missingStartNode}
+              onRefreshData={onRefreshData}
+              outputs={outputs}
+              published={published}
               publishedAt={publishedAt}
               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}
                 >
@@ -413,15 +380,6 @@ const AppPublisher = ({
         />
         {showAppAccessControl && <AccessControl app={appDetail!} onConfirm={handleAccessControlUpdate} onClose={() => { setShowAppAccessControl(false) }} />}
       </Popover>
-      {workflowToolDrawerOpen && (
-        <WorkflowToolDrawer
-          isAdd={!workflowToolPublished}
-          payload={workflowTool.payload}
-          onHide={closeWorkflowToolDrawer}
-          onCreate={workflowTool.handleCreate}
-          onSave={workflowTool.handleUpdate}
-        />
-      )}
     </>
   )
 }

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

@@ -10,9 +10,11 @@ import {
 } from '@langgenius/dify-ui/tooltip'
 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'
@@ -44,8 +46,11 @@ type AccessSectionProps = {
 
 type ActionsSectionProps = Pick<AppPublisherProps, | 'hasHumanInputNode'
   | 'hasTriggerNode'
+  | 'inputs'
   | 'missingStartNode'
+  | 'onRefreshData'
   | 'toolPublished'
+  | 'outputs'
   | 'publishedAt'
   | 'workflowToolAvailable'> & {
     appDetail: {
@@ -62,11 +67,9 @@ type ActionsSectionProps = Pick<AppPublisherProps, | 'hasHumanInputNode'
     disabledFunctionTooltip?: string
     handleEmbed: () => void
     handleOpenInExplore: () => void
-    workflowToolIsLoading: boolean
-    workflowToolOutdated: boolean
-    workflowToolIsCurrentWorkspaceManager: boolean
+    handlePublish: (params?: ModelAndParameter | PublishWorkflowParams) => Promise<void>
+    published: boolean
     workflowToolMessage?: string
-    onConfigureWorkflowTool: () => void
   }
 
 export const AccessModeDisplay = ({ mode }: { mode?: keyof typeof ACCESS_MODE_MAP }) => {
@@ -253,17 +256,18 @@ export const PublisherActionsSection = ({
   disabledFunctionTooltip,
   handleEmbed,
   handleOpenInExplore,
+  handlePublish,
   hasHumanInputNode = false,
   hasTriggerNode = false,
+  inputs,
   missingStartNode = false,
+  onRefreshData,
+  outputs,
+  published,
   publishedAt,
   toolPublished,
   workflowToolAvailable = true,
-  workflowToolIsLoading,
-  workflowToolOutdated,
-  workflowToolIsCurrentWorkspaceManager,
   workflowToolMessage,
-  onConfigureWorkflowTool,
 }: ActionsSectionProps) => {
   const { t } = useTranslation()
 
@@ -301,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>
@@ -336,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/apps/__tests__/app-card.spec.tsx

@@ -730,6 +730,22 @@ describe('AppCard', () => {
       })
     })
 
+    it('should call deleteApp API when pressing Enter in the delete confirmation input', async () => {
+      render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
+      expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
+
+      const deleteInput = screen.getByRole('textbox')
+      fireEvent.change(deleteInput, { target: { value: mockApp.name } })
+      fireEvent.keyDown(deleteInput, { key: 'Enter', code: 'Enter' })
+
+      await waitFor(() => {
+        expect(mockDeleteAppMutation).toHaveBeenCalled()
+      })
+    })
+
     it('should not call onRefresh after successful delete', async () => {
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 

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

@@ -250,14 +250,26 @@ const AppCard = ({ app, onlineUsers = [], onRefresh, onOpenTagManagement = () =>
 
   const isDeleteConfirmDisabled = isDeleting || confirmDeleteInput !== app.name
 
-  const onDeleteDialogSubmit: React.FormEventHandler<HTMLFormElement> = useCallback((e) => {
-    e.preventDefault()
+  const submitDeleteConfirmation = useCallback(() => {
     if (isDeleteConfirmDisabled)
       return
 
     void onConfirmDelete()
   }, [isDeleteConfirmDisabled, onConfirmDelete])
 
+  const onDeleteDialogSubmit: React.FormEventHandler<HTMLFormElement> = useCallback((e) => {
+    e.preventDefault()
+    submitDeleteConfirmation()
+  }, [submitDeleteConfirmation])
+
+  const onDeleteConfirmInputKeyDown: React.KeyboardEventHandler<HTMLInputElement> = useCallback((e) => {
+    if (e.key !== 'Enter' || e.nativeEvent.isComposing)
+      return
+
+    e.preventDefault()
+    submitDeleteConfirmation()
+  }, [submitDeleteConfirmation])
+
   const handleShowEditModal = useCallback(() => {
     setIsOperationsMenuOpen(false)
     queueMicrotask(() => {
@@ -652,6 +664,7 @@ const AppCard = ({ app, onlineUsers = [], onRefresh, onOpenTagManagement = () =>
                   placeholder={t('deleteAppConfirmInputPlaceholder', { ns: 'app' })}
                   value={confirmDeleteInput}
                   onChange={e => setConfirmDeleteInput(e.target.value)}
+                  onKeyDown={onDeleteConfirmInputKeyDown}
                   className="border-components-input-border-hover bg-components-input-bg-normal focus:border-components-input-border-active focus:bg-components-input-bg-active"
                 />
               </div>

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/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/plugins/plugin-auth/authorize/__tests__/api-key-modal.spec.tsx

@@ -55,6 +55,10 @@ vi.mock('../../../readme-panel/entrance', () => ({
   ReadmeEntrance: () => <div data-testid="readme-entrance" />,
 }))
 
+vi.mock('../../../readme-panel/store', () => ({
+  ReadmeShowType: { modal: 'modal' },
+}))
+
 vi.mock('@/app/components/base/encrypted-bottom', () => ({
   EncryptedBottom: () => <div data-testid="encrypted-bottom" />,
 }))

web/app/components/plugins/plugin-auth/authorize/__tests__/oauth-client-settings.spec.tsx

@@ -41,6 +41,10 @@ vi.mock('../../../readme-panel/entrance', () => ({
   ReadmeEntrance: () => <div data-testid="readme-entrance" />,
 }))
 
+vi.mock('../../../readme-panel/store', () => ({
+  ReadmeShowType: { modal: 'modal' },
+}))
+
 vi.mock('@/app/components/base/form/form-scenarios/auth', () => {
   const MockAuthForm = ({ ref, ...props }: { ref?: React.Ref<unknown> } & Record<string, unknown>) => {
     mockAuthFormProps = props

web/app/components/plugins/plugin-auth/authorize/api-key-modal.tsx

@@ -19,6 +19,7 @@ import AuthForm from '@/app/components/base/form/form-scenarios/auth'
 import { FormTypeEnum } from '@/app/components/base/form/types'
 import Loading from '@/app/components/base/loading'
 import { ReadmeEntrance } from '../../readme-panel/entrance'
+import { ReadmeShowType } from '../../readme-panel/store'
 import {
   useAddPluginCredentialHook,
   useGetPluginCredentialSchemaHook,
@@ -158,7 +159,7 @@ const ApiKeyModal = ({
           </div>
           <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
             {pluginPayload.detail && (
-              <ReadmeEntrance pluginDetail={pluginPayload.detail} presentation="dialog" />
+              <ReadmeEntrance pluginDetail={pluginPayload.detail} showType={ReadmeShowType.modal} />
             )}
             {
               isLoading && (

web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx

@@ -19,6 +19,7 @@ import {
 import { useTranslation } from 'react-i18next'
 import AuthForm from '@/app/components/base/form/form-scenarios/auth'
 import { ReadmeEntrance } from '../../readme-panel/entrance'
+import { ReadmeShowType } from '../../readme-panel/store'
 import {
   useDeletePluginOAuthCustomClientHook,
   useInvalidPluginOAuthClientSchemaHook,
@@ -156,7 +157,7 @@ const OAuthClientSettings = ({
           </div>
           <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3 pt-0">
             {pluginPayload.detail && (
-              <ReadmeEntrance pluginDetail={pluginPayload.detail} presentation="dialog" />
+              <ReadmeEntrance pluginDetail={pluginPayload.detail} showType={ReadmeShowType.modal} />
             )}
             <AuthForm
               formFromProps={form}

web/app/components/plugins/plugin-detail-panel/subscription-list/edit/apikey-edit-modal.tsx

@@ -14,6 +14,7 @@ import { FormTypeEnum } from '@/app/components/base/form/types'
 import { ReadmeEntrance } from '@/app/components/plugins/readme-panel/entrance'
 import { useUpdateTriggerSubscription, useVerifyTriggerSubscription } from '@/service/use-triggers'
 import { parsePluginErrorMessage } from '@/utils/error-parser'
+import { ReadmeShowType } from '../../../readme-panel/store'
 import { usePluginStore } from '../../store'
 import { useSubscriptionList } from '../use-subscription-list'
 
@@ -317,7 +318,7 @@ export const ApiKeyEditModal = ({ onClose, subscription, pluginDetail }: Props)
           </div>
           <div data-testid="modal-content" className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
             {pluginDetail && (
-              <ReadmeEntrance pluginDetail={pluginDetail} presentation="dialog" />
+              <ReadmeEntrance pluginDetail={pluginDetail} showType={ReadmeShowType.modal} />
             )}
 
             <MultiSteps currentStep={currentStep} onStepClick={handleBack} />

web/app/components/plugins/plugin-detail-panel/subscription-list/edit/manual-edit-modal.tsx

@@ -12,6 +12,7 @@ import { BaseForm } from '@/app/components/base/form/components/base'
 import { FormTypeEnum } from '@/app/components/base/form/types'
 import { ReadmeEntrance } from '@/app/components/plugins/readme-panel/entrance'
 import { useUpdateTriggerSubscription } from '@/service/use-triggers'
+import { ReadmeShowType } from '../../../readme-panel/store'
 import { usePluginStore } from '../../store'
 import { useSubscriptionList } from '../use-subscription-list'
 
@@ -158,7 +159,7 @@ export const ManualEditModal = ({ onClose, subscription, pluginDetail }: Props)
           </div>
           <div data-testid="modal-content" className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
             {pluginDetail && (
-              <ReadmeEntrance pluginDetail={pluginDetail} presentation="dialog" />
+              <ReadmeEntrance pluginDetail={pluginDetail} showType={ReadmeShowType.modal} />
             )}
             <BaseForm
               formSchemas={formSchemas}

web/app/components/plugins/plugin-detail-panel/subscription-list/edit/oauth-edit-modal.tsx

@@ -12,6 +12,7 @@ import { BaseForm } from '@/app/components/base/form/components/base'
 import { FormTypeEnum } from '@/app/components/base/form/types'
 import { ReadmeEntrance } from '@/app/components/plugins/readme-panel/entrance'
 import { useUpdateTriggerSubscription } from '@/service/use-triggers'
+import { ReadmeShowType } from '../../../readme-panel/store'
 import { usePluginStore } from '../../store'
 import { useSubscriptionList } from '../use-subscription-list'
 
@@ -172,7 +173,7 @@ export const OAuthEditModal = ({ onClose, subscription, pluginDetail }: Props) =
           </div>
           <div data-testid="modal-content" className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
             {pluginDetail && (
-              <ReadmeEntrance pluginDetail={pluginDetail} presentation="dialog" />
+              <ReadmeEntrance pluginDetail={pluginDetail} showType={ReadmeShowType.modal} />
             )}
             <BaseForm
               formSchemas={formSchemas}

web/app/components/plugins/readme-panel/__tests__/entrance.spec.tsx

@@ -1,11 +1,31 @@
 import { fireEvent, render, screen } from '@testing-library/react'
-import { beforeEach, describe, expect, it } from 'vitest'
-import { ReadmeEntrance } from '../entrance'
-import { useReadmePanelStore } from '../store'
+import * as React from 'react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('@langgenius/dify-ui/cn', () => ({
+  cn: (...args: unknown[]) => args.filter(Boolean).join(' '),
+}))
+
+const mockSetCurrentPluginDetail = vi.fn()
+
+vi.mock('../store', () => ({
+  ReadmeShowType: { drawer: 'drawer', side: 'side', modal: 'modal' },
+  useReadmePanelStore: () => ({
+    setCurrentPluginDetail: mockSetCurrentPluginDetail,
+  }),
+}))
+
+vi.mock('../constants', () => ({
+  BUILTIN_TOOLS_ARRAY: ['google_search', 'bing_search'],
+}))
 
 describe('ReadmeEntrance', () => {
-  beforeEach(() => {
-    useReadmePanelStore.setState({ currentPanel: undefined })
+  let ReadmeEntrance: (typeof import('../entrance'))['ReadmeEntrance']
+
+  beforeEach(async () => {
+    vi.clearAllMocks()
+    const mod = await import('../entrance')
+    ReadmeEntrance = mod.ReadmeEntrance
   })
 
   it('should render readme button for non-builtin plugin with unique identifier', () => {
@@ -15,31 +35,18 @@ describe('ReadmeEntrance', () => {
     expect(screen.getByRole('button')).toBeInTheDocument()
   })
 
-  it('should open drawer presentation by default', () => {
+  it('should call setCurrentPluginDetail on button click', () => {
     const pluginDetail = { id: 'custom-plugin', name: 'custom-plugin', plugin_unique_identifier: 'org/custom-plugin' } as never
     render(<ReadmeEntrance pluginDetail={pluginDetail} />)
 
     const button = screen.getByRole('button')
     fireEvent.click(button)
 
-    expect(useReadmePanelStore.getState().currentPanel).toEqual({
-      detail: pluginDetail,
-      presentation: 'drawer',
-      triggerId: button.id,
-    })
-  })
-
-  it('should open dialog presentation when requested', () => {
-    const pluginDetail = { id: 'custom-plugin', name: 'custom-plugin', plugin_unique_identifier: 'org/custom-plugin' } as never
-    render(<ReadmeEntrance pluginDetail={pluginDetail} presentation="dialog" />)
-
-    fireEvent.click(screen.getByRole('button'))
-
-    expect(useReadmePanelStore.getState().currentPanel?.presentation).toBe('dialog')
+    expect(mockSetCurrentPluginDetail).toHaveBeenCalledWith(pluginDetail, 'drawer')
   })
 
   it('should return null for builtin tools', () => {
-    const pluginDetail = { id: 'code', name: 'Code', plugin_unique_identifier: 'org/code' } as never
+    const pluginDetail = { id: 'google_search', name: 'Google Search', plugin_unique_identifier: 'org/google' } as never
     const { container } = render(<ReadmeEntrance pluginDetail={pluginDetail} />)
 
     expect(container.innerHTML).toBe('')

web/app/components/plugins/readme-panel/__tests__/index.spec.tsx

@@ -1,29 +1,29 @@
-import type { ReactElement } from 'react'
 import type { PluginDetail } from '../../types'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { PluginCategoryEnum, PluginSource } from '../../types'
 import { ReadmeEntrance } from '../entrance'
 import ReadmePanel from '../index'
-import { useReadmePanelStore } from '../store'
+import { ReadmeShowType, useReadmePanelStore } from '../store'
 
-(
-  globalThis as typeof globalThis & {
-    BASE_UI_ANIMATIONS_DISABLED: boolean
-  }
-).BASE_UI_ANIMATIONS_DISABLED = true
+// ================================
+// Mock external dependencies only
+// ================================
 
+// Mock usePluginReadme hook
 const mockUsePluginReadme = vi.fn()
 vi.mock('@/service/use-plugins', () => ({
   usePluginReadme: (params: { plugin_unique_identifier: string, language?: string }) => mockUsePluginReadme(params),
 }))
 
+// Mock useLanguage hook
 let mockLanguage = 'en-US'
 vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', () => ({
   useLanguage: () => mockLanguage,
 }))
 
+// Mock DetailHeader component (complex component with many dependencies)
 vi.mock('../../plugin-detail-panel/detail-header', () => ({
   default: ({ detail, isReadmeView }: { detail: PluginDetail, isReadmeView: boolean }) => (
     <div data-testid="detail-header" data-is-readme-view={isReadmeView}>
@@ -32,6 +32,10 @@ vi.mock('../../plugin-detail-panel/detail-header', () => ({
   ),
 }))
 
+// ================================
+// Test Data Factories
+// ================================
+
 const createMockPluginDetail = (overrides: Partial<PluginDetail> = {}): PluginDetail => ({
   id: 'test-plugin-id',
   created_at: '2024-01-01T00:00:00Z',
@@ -89,6 +93,10 @@ const createMockPluginDetail = (overrides: Partial<PluginDetail> = {}): PluginDe
   ...overrides,
 })
 
+// ================================
+// Test Utilities
+// ================================
+
 const createQueryClient = () => new QueryClient({
   defaultOptions: {
     queries: {
@@ -97,7 +105,7 @@ const createQueryClient = () => new QueryClient({
   },
 })
 
-const renderWithQueryClient = (ui: ReactElement) => {
+const renderWithQueryClient = (ui: React.ReactElement) => {
   const queryClient = createQueryClient()
   return render(
     <QueryClientProvider client={queryClient}>
@@ -106,23 +114,15 @@ const renderWithQueryClient = (ui: ReactElement) => {
   )
 }
 
-const openReadmePanel = (
-  detail = createMockPluginDetail(),
-  presentation: 'drawer' | 'dialog' = 'drawer',
-) => {
-  useReadmePanelStore.getState().openReadmePanel({
-    detail,
-    presentation,
-    triggerId: 'readme-trigger',
-  })
-  return detail
-}
+// Constants (BUILTIN_TOOLS_ARRAY) tests moved to constants.spec.ts
+// Store (useReadmePanelStore) tests moved to store.spec.ts
+// Entrance (ReadmeEntrance) tests moved to entrance.spec.tsx
 
+// ================================
+// ReadmePanel Component Tests
+// ================================
 describe('ReadmePanel', () => {
   beforeEach(() => {
-    vi.clearAllMocks()
-    mockLanguage = 'en-US'
-    useReadmePanelStore.setState({ currentPanel: undefined })
     mockUsePluginReadme.mockReturnValue({
       data: null,
       isLoading: false,
@@ -130,114 +130,487 @@ describe('ReadmePanel', () => {
     })
   })
 
-  it('should return null when no readme panel is open', () => {
-    const { container } = renderWithQueryClient(<ReadmePanel />)
+  // ================================
+  // Rendering Tests
+  // ================================
+  describe('Rendering', () => {
+    it('should return null when no plugin detail is set', () => {
+      const { container } = renderWithQueryClient(<ReadmePanel />)
 
-    expect(container.firstChild).toBeNull()
-  })
-
-  it('should render drawer presentation with plugin header content', () => {
-    openReadmePanel()
-
-    renderWithQueryClient(<ReadmePanel />)
-
-    expect(screen.getByRole('dialog')).toBeInTheDocument()
-    expect(screen.getByText('plugin.readmeInfo.title')).toBeInTheDocument()
-    expect(screen.getByTestId('detail-header')).toHaveAttribute('data-is-readme-view', 'true')
-    expect(screen.getByRole('dialog')).toHaveClass('data-[swipe-direction=left]:w-150')
-  })
-
-  it('should render dialog presentation when requested', () => {
-    openReadmePanel(createMockPluginDetail(), 'dialog')
-
-    renderWithQueryClient(<ReadmePanel />)
-
-    expect(screen.getByRole('dialog')).toHaveClass('max-w-200')
-  })
-
-  it('should close the active panel when close button is clicked', () => {
-    openReadmePanel()
-
-    renderWithQueryClient(<ReadmePanel />)
-    fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
-
-    expect(useReadmePanelStore.getState().currentPanel).toBeUndefined()
-  })
-
-  it('should render loading, error, empty, and readme states from the readme query', () => {
-    openReadmePanel()
-    mockUsePluginReadme.mockReturnValue({
-      data: null,
-      isLoading: true,
-      error: null,
+      expect(container.firstChild).toBeNull()
     })
-    const { rerender } = renderWithQueryClient(<ReadmePanel />)
-    expect(screen.getByRole('status')).toBeInTheDocument()
 
-    mockUsePluginReadme.mockReturnValue({
-      data: null,
-      isLoading: false,
-      error: new Error('Failed to fetch'),
+    it('should render portal content when plugin detail is set', () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      expect(screen.getByText('plugin.readmeInfo.title')).toBeInTheDocument()
     })
-    rerender(<ReadmePanel />)
-    expect(screen.getByText('plugin.readmeInfo.failedToFetch')).toBeInTheDocument()
 
-    mockUsePluginReadme.mockReturnValue({
-      data: { readme: '' },
-      isLoading: false,
-      error: null,
+    it('should render DetailHeader component', () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      expect(screen.getByTestId('detail-header')).toBeInTheDocument()
+      expect(screen.getByTestId('detail-header')).toHaveAttribute('data-is-readme-view', 'true')
     })
-    rerender(<ReadmePanel />)
-    expect(screen.getByText('plugin.readmeInfo.noReadmeAvailable')).toBeInTheDocument()
 
-    mockUsePluginReadme.mockReturnValue({
-      data: { readme: '# Test Readme Content' },
-      isLoading: false,
-      error: null,
-    })
-    rerender(<ReadmePanel />)
-    expect(screen.getByTestId('markdown-body')).toBeInTheDocument()
-  })
+    it('should render close button', () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
 
-  it('should call usePluginReadme with the plugin identifier and selected language', () => {
-    openReadmePanel(createMockPluginDetail({
-      plugin_unique_identifier: 'custom-plugin@2.0.0',
-    }))
+      renderWithQueryClient(<ReadmePanel />)
 
-    renderWithQueryClient(<ReadmePanel />)
-
-    expect(mockUsePluginReadme).toHaveBeenCalledWith({
-      plugin_unique_identifier: 'custom-plugin@2.0.0',
-      language: 'en-US',
+      // ActionButton wraps the close icon
+      expect(screen.getByRole('button')).toBeInTheDocument()
     })
   })
 
-  it('should pass undefined language for zh-Hans locale', () => {
-    mockLanguage = 'zh-Hans'
-    openReadmePanel(createMockPluginDetail({
-      plugin_unique_identifier: 'zh-plugin@1.0.0',
-    }))
+  // ================================
+  // Loading State Tests
+  // ================================
+  describe('Loading State', () => {
+    it('should show loading indicator when isLoading is true', () => {
+      mockUsePluginReadme.mockReturnValue({
+        data: null,
+        isLoading: true,
+        error: null,
+      })
 
-    renderWithQueryClient(<ReadmePanel />)
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
 
-    expect(mockUsePluginReadme).toHaveBeenCalledWith({
-      plugin_unique_identifier: 'zh-plugin@1.0.0',
-      language: undefined,
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Loading component should be rendered with role="status"
+      expect(screen.getByRole('status')).toBeInTheDocument()
     })
   })
 
-  it('should open correctly from ReadmeEntrance through the global host', () => {
-    const detail = createMockPluginDetail()
+  // ================================
+  // Error State Tests
+  // ================================
+  describe('Error State', () => {
+    it('should show error message when error occurs', () => {
+      mockUsePluginReadme.mockReturnValue({
+        data: null,
+        isLoading: false,
+        error: new Error('Failed to fetch'),
+      })
 
-    renderWithQueryClient(
-      <>
-        <ReadmeEntrance pluginDetail={detail} />
-        <ReadmePanel />
-      </>,
-    )
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
 
-    fireEvent.click(screen.getByRole('button', { name: /plugin\.readmeInfo\.needHelpCheckReadme/ }))
+      renderWithQueryClient(<ReadmePanel />)
 
-    expect(screen.getByRole('dialog')).toBeInTheDocument()
+      expect(screen.getByText('plugin.readmeInfo.failedToFetch')).toBeInTheDocument()
+    })
+  })
+
+  // ================================
+  // No Readme Available State Tests
+  // ================================
+  describe('No Readme Available', () => {
+    it('should show no readme message when readme is empty', () => {
+      mockUsePluginReadme.mockReturnValue({
+        data: { readme: '' },
+        isLoading: false,
+        error: null,
+      })
+
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      expect(screen.getByText('plugin.readmeInfo.noReadmeAvailable')).toBeInTheDocument()
+    })
+
+    it('should show no readme message when data is null', () => {
+      mockUsePluginReadme.mockReturnValue({
+        data: null,
+        isLoading: false,
+        error: null,
+      })
+
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      expect(screen.getByText('plugin.readmeInfo.noReadmeAvailable')).toBeInTheDocument()
+    })
+  })
+
+  // ================================
+  // Markdown Content Tests
+  // ================================
+  describe('Markdown Content', () => {
+    it('should render markdown container when readme is available', () => {
+      mockUsePluginReadme.mockReturnValue({
+        data: { readme: '# Test Readme Content' },
+        isLoading: false,
+        error: null,
+      })
+
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Markdown component container should be rendered
+      // Note: The Markdown component uses dynamic import, so content may load asynchronously
+      const markdownContainer = document.querySelector('.markdown-body')
+      expect(markdownContainer).toBeInTheDocument()
+    })
+
+    it('should not show error or no-readme message when readme is available', () => {
+      mockUsePluginReadme.mockReturnValue({
+        data: { readme: '# Test Readme Content' },
+        isLoading: false,
+        error: null,
+      })
+
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Should not show error or no-readme message
+      expect(screen.queryByText('plugin.readmeInfo.failedToFetch')).not.toBeInTheDocument()
+      expect(screen.queryByText('plugin.readmeInfo.noReadmeAvailable')).not.toBeInTheDocument()
+    })
+  })
+
+  // ================================
+  // Portal Rendering Tests (Drawer Mode)
+  // ================================
+  describe('Portal Rendering - Drawer Mode', () => {
+    it('should render drawer styled container in drawer mode', () => {
+      mockUsePluginReadme.mockReturnValue({
+        data: { readme: '# Test' },
+        isLoading: false,
+        error: null,
+      })
+
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Drawer mode has specific max-width
+      const drawerContainer = document.querySelector('.max-w-\\[600px\\]')
+      expect(drawerContainer).toBeInTheDocument()
+    })
+
+    it('should have correct drawer positioning classes', () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Check for drawer-specific classes
+      const backdrop = document.querySelector('.justify-start')
+      expect(backdrop).toBeInTheDocument()
+    })
+  })
+
+  // ================================
+  // Portal Rendering Tests (Modal Mode)
+  // ================================
+  describe('Portal Rendering - Modal Mode', () => {
+    it('should render modal styled container in modal mode', () => {
+      mockUsePluginReadme.mockReturnValue({
+        data: { readme: '# Test' },
+        isLoading: false,
+        error: null,
+      })
+
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Modal mode has different max-width
+      const modalContainer = document.querySelector('.max-w-\\[800px\\]')
+      expect(modalContainer).toBeInTheDocument()
+    })
+
+    it('should have correct modal positioning classes', () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Check for modal-specific classes
+      const backdrop = document.querySelector('.items-center.justify-center')
+      expect(backdrop).toBeInTheDocument()
+    })
+  })
+
+  // ================================
+  // User Interactions / Event Handlers
+  // ================================
+  describe('User Interactions', () => {
+    it('should close panel when close button is clicked', () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      fireEvent.click(screen.getByRole('button'))
+
+      const { currentPluginDetail } = useReadmePanelStore.getState()
+      expect(currentPluginDetail).toBeUndefined()
+    })
+
+    it('should close panel when backdrop is clicked', () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Click on the backdrop (outer div)
+      const backdrop = document.querySelector('.fixed.inset-0')
+      fireEvent.click(backdrop!)
+
+      const { currentPluginDetail } = useReadmePanelStore.getState()
+      expect(currentPluginDetail).toBeUndefined()
+    })
+
+    it('should not close panel when content area is clicked', async () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Click on the content container (should stop propagation)
+      const contentContainer = document.querySelector('.pointer-events-auto')
+      fireEvent.click(contentContainer!)
+
+      await waitFor(() => {
+        const { currentPluginDetail } = useReadmePanelStore.getState()
+        expect(currentPluginDetail).toBeDefined()
+      })
+    })
+
+    it('should not close panel when content area is clicked in modal mode', async () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // Click on the content container in modal mode (should stop propagation)
+      const contentContainer = document.querySelector('.pointer-events-auto')
+      fireEvent.click(contentContainer!)
+
+      await waitFor(() => {
+        const { currentPluginDetail } = useReadmePanelStore.getState()
+        expect(currentPluginDetail).toBeDefined()
+      })
+    })
+  })
+
+  // ================================
+  // API Call Tests
+  // ================================
+  describe('API Calls', () => {
+    it('should call usePluginReadme with correct parameters', () => {
+      const mockDetail = createMockPluginDetail({
+        plugin_unique_identifier: 'custom-plugin@2.0.0',
+      })
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      expect(mockUsePluginReadme).toHaveBeenCalledWith({
+        plugin_unique_identifier: 'custom-plugin@2.0.0',
+        language: 'en-US',
+      })
+    })
+
+    it('should pass undefined language for zh-Hans locale', () => {
+      // Set language to zh-Hans
+      mockLanguage = 'zh-Hans'
+
+      const mockDetail = createMockPluginDetail({
+        plugin_unique_identifier: 'zh-plugin@1.0.0',
+      })
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      // The component should pass undefined for language when zh-Hans
+      expect(mockUsePluginReadme).toHaveBeenCalledWith({
+        plugin_unique_identifier: 'zh-plugin@1.0.0',
+        language: undefined,
+      })
+
+      // Reset language
+      mockLanguage = 'en-US'
+    })
+
+    it('should handle empty plugin_unique_identifier', () => {
+      mockUsePluginReadme.mockReturnValue({
+        data: null,
+        isLoading: false,
+        error: null,
+      })
+
+      const mockDetail = createMockPluginDetail({
+        plugin_unique_identifier: '',
+      })
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      expect(mockUsePluginReadme).toHaveBeenCalledWith({
+        plugin_unique_identifier: '',
+        language: 'en-US',
+      })
+    })
+  })
+
+  // ================================
+  // Edge Cases
+  // ================================
+  describe('Edge Cases', () => {
+    it('should handle detail with missing declaration', () => {
+      const mockDetail = createMockPluginDetail()
+      // Simulate missing fields
+      delete (mockDetail as Partial<PluginDetail>).declaration
+
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+
+      // This should not throw
+      expect(() => setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)).not.toThrow()
+    })
+
+    it('should handle rapid open/close operations', async () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+
+      // Rapidly toggle the panel
+      act(() => {
+        setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+        setCurrentPluginDetail()
+        setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
+      })
+
+      const { currentPluginDetail } = useReadmePanelStore.getState()
+      expect(currentPluginDetail?.showType).toBe(ReadmeShowType.modal)
+    })
+
+    it('should handle switching between drawer and modal modes', () => {
+      const mockDetail = createMockPluginDetail()
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+
+      // Start with drawer
+      act(() => {
+        setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+      })
+
+      let state = useReadmePanelStore.getState()
+      expect(state.currentPluginDetail?.showType).toBe(ReadmeShowType.drawer)
+
+      // Switch to modal
+      act(() => {
+        setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
+      })
+
+      state = useReadmePanelStore.getState()
+      expect(state.currentPluginDetail?.showType).toBe(ReadmeShowType.modal)
+    })
+
+    it('should handle undefined detail gracefully', () => {
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+
+      // Set to undefined explicitly
+      act(() => {
+        setCurrentPluginDetail(undefined, ReadmeShowType.drawer)
+      })
+
+      const { currentPluginDetail } = useReadmePanelStore.getState()
+      expect(currentPluginDetail).toBeUndefined()
+    })
+  })
+
+  // ================================
+  // Integration Tests
+  // ================================
+  describe('Integration', () => {
+    it('should work correctly when opened from ReadmeEntrance', () => {
+      const mockDetail = createMockPluginDetail()
+
+      mockUsePluginReadme.mockReturnValue({
+        data: { readme: '# Integration Test' },
+        isLoading: false,
+        error: null,
+      })
+
+      // Render both components
+      const { rerender } = renderWithQueryClient(
+        <>
+          <ReadmeEntrance pluginDetail={mockDetail} />
+          <ReadmePanel />
+        </>,
+      )
+
+      // Initially panel should not show content
+      expect(screen.queryByTestId('detail-header')).not.toBeInTheDocument()
+
+      // Click the entrance button
+      fireEvent.click(screen.getByRole('button'))
+
+      // Re-render to pick up store changes
+      rerender(
+        <QueryClientProvider client={createQueryClient()}>
+          <ReadmeEntrance pluginDetail={mockDetail} />
+          <ReadmePanel />
+        </QueryClientProvider>,
+      )
+
+      // Panel should now show content
+      expect(screen.getByTestId('detail-header')).toBeInTheDocument()
+      // Markdown content renders in a container (dynamic import may not render content synchronously)
+      expect(document.querySelector('.markdown-body')).toBeInTheDocument()
+    })
+
+    it('should display correct plugin information in header', () => {
+      const mockDetail = createMockPluginDetail({
+        name: 'my-awesome-plugin',
+      })
+
+      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
+      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+
+      renderWithQueryClient(<ReadmePanel />)
+
+      expect(screen.getByText('my-awesome-plugin')).toBeInTheDocument()
+    })
   })
 })

web/app/components/plugins/readme-panel/__tests__/store.spec.ts

@@ -1,52 +1,54 @@
 import type { PluginDetail } from '@/app/components/plugins/types'
 import { beforeEach, describe, expect, it } from 'vitest'
-import { useReadmePanelStore } from '../store'
+import { ReadmeShowType, useReadmePanelStore } from '../store'
 
 describe('readme-panel/store', () => {
   beforeEach(() => {
-    useReadmePanelStore.setState({ currentPanel: undefined })
+    useReadmePanelStore.setState({ currentPluginDetail: undefined })
   })
 
-  it('initializes without an active panel', () => {
+  it('initializes with undefined currentPluginDetail', () => {
     const state = useReadmePanelStore.getState()
-    expect(state.currentPanel).toBeUndefined()
+    expect(state.currentPluginDetail).toBeUndefined()
   })
 
-  it('opens drawer presentation by default', () => {
-    const detail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
-    useReadmePanelStore.getState().openReadmePanel({ detail, triggerId: 'readme-trigger' })
+  it('sets current plugin detail with drawer showType by default', () => {
+    const mockDetail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
+    useReadmePanelStore.getState().setCurrentPluginDetail(mockDetail)
 
-    expect(useReadmePanelStore.getState().currentPanel).toEqual({
-      detail,
-      presentation: 'drawer',
-      triggerId: 'readme-trigger',
+    const state = useReadmePanelStore.getState()
+    expect(state.currentPluginDetail).toEqual({
+      detail: mockDetail,
+      showType: ReadmeShowType.drawer,
     })
   })
 
-  it('opens dialog presentation when requested', () => {
-    const detail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
-    useReadmePanelStore.getState().openReadmePanel({ detail, presentation: 'dialog' })
+  it('sets current plugin detail with modal showType', () => {
+    const mockDetail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
+    useReadmePanelStore.getState().setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
 
-    expect(useReadmePanelStore.getState().currentPanel?.presentation).toBe('dialog')
+    const state = useReadmePanelStore.getState()
+    expect(state.currentPluginDetail?.showType).toBe(ReadmeShowType.modal)
   })
 
-  it('closes the active panel', () => {
-    const detail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
-    useReadmePanelStore.getState().openReadmePanel({ detail })
-    expect(useReadmePanelStore.getState().currentPanel).toBeDefined()
+  it('clears current plugin detail when called with undefined', () => {
+    const mockDetail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
+    useReadmePanelStore.getState().setCurrentPluginDetail(mockDetail)
+    expect(useReadmePanelStore.getState().currentPluginDetail).toBeDefined()
 
-    useReadmePanelStore.getState().closeReadmePanel()
-    expect(useReadmePanelStore.getState().currentPanel).toBeUndefined()
+    useReadmePanelStore.getState().setCurrentPluginDetail(undefined)
+    expect(useReadmePanelStore.getState().currentPluginDetail).toBeUndefined()
   })
 
-  it('replaces the active panel with the latest request', () => {
+  it('replaces previous detail with new one', () => {
     const detail1 = { id: 'plugin-1', plugin_unique_identifier: 'uid-1' } as PluginDetail
     const detail2 = { id: 'plugin-2', plugin_unique_identifier: 'uid-2' } as PluginDetail
 
-    useReadmePanelStore.getState().openReadmePanel({ detail: detail1 })
-    useReadmePanelStore.getState().openReadmePanel({ detail: detail2, presentation: 'dialog' })
+    useReadmePanelStore.getState().setCurrentPluginDetail(detail1)
+    expect(useReadmePanelStore.getState().currentPluginDetail?.detail.id).toBe('plugin-1')
 
-    expect(useReadmePanelStore.getState().currentPanel?.detail.id).toBe('plugin-2')
-    expect(useReadmePanelStore.getState().currentPanel?.presentation).toBe('dialog')
+    useReadmePanelStore.getState().setCurrentPluginDetail(detail2, ReadmeShowType.modal)
+    expect(useReadmePanelStore.getState().currentPluginDetail?.detail.id).toBe('plugin-2')
+    expect(useReadmePanelStore.getState().currentPluginDetail?.showType).toBe(ReadmeShowType.modal)
   })
 })

web/app/components/plugins/readme-panel/content.tsx

@@ -1,81 +0,0 @@
-'use client'
-
-import type { ReactNode } from 'react'
-import type { PluginDetail } from '../types'
-import { useTranslation } from 'react-i18next'
-import Loading from '@/app/components/base/loading'
-import { Markdown } from '@/app/components/base/markdown'
-import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
-import { usePluginReadme } from '@/service/use-plugins'
-import DetailHeader from '../plugin-detail-panel/detail-header'
-
-type ReadmePanelContentProps = {
-  detail: PluginDetail
-  title: ReactNode
-  closeButton: ReactNode
-}
-
-export function ReadmePanelContent({
-  detail,
-  title,
-  closeButton,
-}: ReadmePanelContentProps) {
-  const { t } = useTranslation()
-  const language = useLanguage()
-  const pluginUniqueIdentifier = detail.plugin_unique_identifier || ''
-
-  const { data: readmeData, isLoading, error } = usePluginReadme({
-    plugin_unique_identifier: pluginUniqueIdentifier,
-    language: language === 'zh-Hans' ? undefined : language,
-  })
-
-  let readmeContent: ReactNode
-  if (isLoading) {
-    readmeContent = (
-      <div className="flex h-40 items-center justify-center">
-        <Loading type="area" />
-      </div>
-    )
-  }
-  else if (error) {
-    readmeContent = (
-      <div className="py-8 text-center text-text-tertiary">
-        <p>{t('readmeInfo.failedToFetch', { ns: 'plugin' })}</p>
-      </div>
-    )
-  }
-  else if (readmeData?.readme) {
-    readmeContent = (
-      <Markdown
-        content={readmeData.readme}
-        pluginInfo={{ pluginUniqueIdentifier, pluginId: detail.plugin_id }}
-      />
-    )
-  }
-  else {
-    readmeContent = (
-      <div className="py-8 text-center text-text-tertiary">
-        <p>{t('readmeInfo.noReadmeAvailable', { ns: 'plugin' })}</p>
-      </div>
-    )
-  }
-
-  return (
-    <div className="flex h-full min-h-0 w-full flex-col overflow-hidden">
-      <div className="shrink-0 rounded-t-xl bg-background-body px-4 py-4">
-        <div className="mb-3 flex items-center justify-between gap-3">
-          <div className="flex min-w-0 items-center gap-1">
-            <span aria-hidden="true" className="i-ri-book-read-line h-3 w-3 shrink-0 text-text-tertiary" />
-            {title}
-          </div>
-          {closeButton}
-        </div>
-        <DetailHeader detail={detail} isReadmeView={true} />
-      </div>
-
-      <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain px-4 py-3">
-        {readmeContent}
-      </div>
-    </div>
-  )
-}

web/app/components/plugins/readme-panel/dialog.tsx

@@ -1,52 +0,0 @@
-'use client'
-
-import type { PluginDetail } from '../types'
-import {
-  Dialog,
-  DialogCloseButton,
-  DialogContent,
-  DialogTitle,
-} from '@langgenius/dify-ui/dialog'
-import { useTranslation } from 'react-i18next'
-import { ReadmePanelContent } from './content'
-
-type ReadmeDialogProps = {
-  detail: PluginDetail
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  triggerId?: string
-}
-
-export function ReadmeDialog({
-  detail,
-  open,
-  onOpenChange,
-  triggerId,
-}: ReadmeDialogProps) {
-  const { t } = useTranslation()
-
-  return (
-    <Dialog
-      open={open}
-      onOpenChange={onOpenChange}
-      triggerId={triggerId}
-    >
-      <DialogContent className="h-[calc(100dvh-16px)] w-full max-w-200 overflow-hidden p-0">
-        <ReadmePanelContent
-          detail={detail}
-          title={(
-            <DialogTitle className="truncate text-xs font-medium text-text-tertiary uppercase">
-              {t('readmeInfo.title', { ns: 'plugin' })}
-            </DialogTitle>
-          )}
-          closeButton={(
-            <DialogCloseButton
-              aria-label={t('operation.close', { ns: 'common' })}
-              className="static h-8 w-8 rounded-lg"
-            />
-          )}
-        />
-      </DialogContent>
-    </Dialog>
-  )
-}

web/app/components/plugins/readme-panel/drawer.tsx

@@ -1,62 +0,0 @@
-'use client'
-
-import type { PluginDetail } from '../types'
-import {
-  Drawer,
-  DrawerBackdrop,
-  DrawerCloseButton,
-  DrawerContent,
-  DrawerPopup,
-  DrawerPortal,
-  DrawerTitle,
-  DrawerViewport,
-} from '@langgenius/dify-ui/drawer'
-import { useTranslation } from 'react-i18next'
-import { ReadmePanelContent } from './content'
-
-type ReadmeDrawerProps = {
-  detail: PluginDetail
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  triggerId?: string
-}
-
-export function ReadmeDrawer({
-  detail,
-  open,
-  onOpenChange,
-  triggerId,
-}: ReadmeDrawerProps) {
-  const { t } = useTranslation()
-
-  return (
-    <Drawer
-      open={open}
-      onOpenChange={onOpenChange}
-      triggerId={triggerId}
-      modal
-      swipeDirection="left"
-    >
-      <DrawerPortal>
-        <DrawerBackdrop className="bg-transparent" />
-        <DrawerViewport>
-          <DrawerPopup className="data-[swipe-direction=left]:top-16 data-[swipe-direction=left]:bottom-2 data-[swipe-direction=left]:left-2 data-[swipe-direction=left]:h-auto data-[swipe-direction=left]:w-150 data-[swipe-direction=left]:max-w-[calc(100vw-1rem)] data-[swipe-direction=left]:rounded-2xl data-[swipe-direction=left]:border-l-[0.5px]">
-            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0">
-              <ReadmePanelContent
-                detail={detail}
-                title={(
-                  <DrawerTitle className="truncate text-xs font-medium text-text-tertiary uppercase">
-                    {t('readmeInfo.title', { ns: 'plugin' })}
-                  </DrawerTitle>
-                )}
-                closeButton={(
-                  <DrawerCloseButton aria-label={t('operation.close', { ns: 'common' })} />
-                )}
-              />
-            </DrawerContent>
-          </DrawerPopup>
-        </DrawerViewport>
-      </DrawerPortal>
-    </Drawer>
-  )
-}

web/app/components/plugins/readme-panel/entrance.tsx

@@ -1,40 +1,34 @@
 import type { PluginDetail } from '../types'
-import type { ReadmePanelPresentation } from './store'
 import { cn } from '@langgenius/dify-ui/cn'
-import { useId } from 'react'
+import { RiBookReadLine } from '@remixicon/react'
+import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { BUILTIN_TOOLS_ARRAY } from './constants'
-import { useReadmePanelStore } from './store'
+import { ReadmeShowType, useReadmePanelStore } from './store'
 
 export const ReadmeEntrance = ({
   pluginDetail,
-  presentation = 'drawer',
+  showType = ReadmeShowType.drawer,
   className,
   showShortTip = false,
 }: {
   pluginDetail: PluginDetail
-  presentation?: ReadmePanelPresentation
+  showType?: ReadmeShowType
   className?: string
   showShortTip?: boolean
 }) => {
   const { t } = useTranslation()
-  const triggerId = useId()
-  const openReadmePanel = useReadmePanelStore(s => s.openReadmePanel)
+  const { setCurrentPluginDetail } = useReadmePanelStore()
 
   const handleReadmeClick = () => {
-    if (pluginDetail) {
-      openReadmePanel({
-        detail: pluginDetail,
-        presentation,
-        triggerId,
-      })
-    }
+    if (pluginDetail)
+      setCurrentPluginDetail(pluginDetail, showType)
   }
   if (!pluginDetail || !pluginDetail?.plugin_unique_identifier || BUILTIN_TOOLS_ARRAY.includes(pluginDetail.id))
     return null
 
   return (
-    <div className={cn('flex flex-col items-start justify-center gap-2 pt-0 pb-4', presentation === 'drawer' && 'px-4', className)}>
+    <div className={cn('flex flex-col items-start justify-center gap-2 pt-0 pb-4', showType === ReadmeShowType.drawer && 'px-4', className)}>
       {!showShortTip && (
         <div className="relative h-1 w-8 shrink-0">
           <div className="h-px w-full bg-divider-regular"></div>
@@ -42,13 +36,11 @@ export const ReadmeEntrance = ({
       )}
 
       <button
-        id={triggerId}
-        type="button"
         onClick={handleReadmeClick}
-        className="flex w-full items-center justify-start gap-1 rounded-sm text-text-tertiary transition-opacity hover:text-text-accent-light-mode-only focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:outline-hidden"
+        className="flex w-full items-center justify-start gap-1 text-text-tertiary transition-opacity hover:text-text-accent-light-mode-only"
       >
         <div className="relative flex h-3 w-3 items-center justify-center overflow-hidden">
-          <span aria-hidden="true" className="i-ri-book-read-line h-3 w-3" />
+          <RiBookReadLine className="h-3 w-3" />
         </div>
         <span className="text-xs leading-4 font-normal">
           {!showShortTip ? t('readmeInfo.needHelpCheckReadme', { ns: 'plugin' }) : t('readmeInfo.title', { ns: 'plugin' })}

web/app/components/plugins/readme-panel/index.tsx

@@ -1,38 +1,124 @@
 'use client'
+import type { FC } from 'react'
+import { cn } from '@langgenius/dify-ui/cn'
+import { RiBookReadLine, RiCloseLine } from '@remixicon/react'
+import { createPortal } from 'react-dom'
+import { useTranslation } from 'react-i18next'
+import ActionButton from '@/app/components/base/action-button'
+import Loading from '@/app/components/base/loading'
+import { Markdown } from '@/app/components/base/markdown'
+import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
+import { usePluginReadme } from '@/service/use-plugins'
+import DetailHeader from '../plugin-detail-panel/detail-header'
+import { ReadmeShowType, useReadmePanelStore } from './store'
 
-import { ReadmeDialog } from './dialog'
-import { ReadmeDrawer } from './drawer'
-import { useReadmePanelStore } from './store'
+const ReadmePanel: FC = () => {
+  const { currentPluginDetail, setCurrentPluginDetail } = useReadmePanelStore()
+  const { detail, showType } = currentPluginDetail || {}
+  const { t } = useTranslation()
+  const language = useLanguage()
 
-export default function ReadmePanel() {
-  const currentPanel = useReadmePanelStore(s => s.currentPanel)
-  const closeReadmePanel = useReadmePanelStore(s => s.closeReadmePanel)
+  const pluginUniqueIdentifier = detail?.plugin_unique_identifier || ''
 
-  if (!currentPanel)
+  const { data: readmeData, isLoading, error } = usePluginReadme(
+    { plugin_unique_identifier: pluginUniqueIdentifier, language: language === 'zh-Hans' ? undefined : language },
+  )
+
+  const onClose = () => {
+    setCurrentPluginDetail()
+  }
+
+  if (!detail)
     return null
 
-  const onOpenChange = (open: boolean) => {
-    if (!open)
-      closeReadmePanel()
-  }
+  const children = (
+    <div className="flex h-full w-full flex-col overflow-hidden">
+      <div className="rounded-t-xl bg-background-body px-4 py-4">
+        <div className="mb-3 flex items-center justify-between">
+          <div className="flex items-center gap-1">
+            <RiBookReadLine className="h-3 w-3 text-text-tertiary" />
+            <span className="text-xs font-medium text-text-tertiary uppercase">
+              {t('readmeInfo.title', { ns: 'plugin' })}
+            </span>
+          </div>
+          <ActionButton onClick={onClose}>
+            <RiCloseLine className="h-4 w-4" />
+          </ActionButton>
+        </div>
+        <DetailHeader detail={detail} isReadmeView={true} />
+      </div>
 
-  if (currentPanel.presentation === 'dialog') {
-    return (
-      <ReadmeDialog
-        detail={currentPanel.detail}
-        open
-        onOpenChange={onOpenChange}
-        triggerId={currentPanel.triggerId}
-      />
-    )
-  }
+      <div className="flex-1 overflow-y-auto px-4 py-3">
+        {(() => {
+          if (isLoading) {
+            return (
+              <div className="flex h-40 items-center justify-center">
+                <Loading type="area" />
+              </div>
+            )
+          }
 
-  return (
-    <ReadmeDrawer
-      detail={currentPanel.detail}
-      open
-      onOpenChange={onOpenChange}
-      triggerId={currentPanel.triggerId}
-    />
+          if (error) {
+            return (
+              <div className="py-8 text-center text-text-tertiary">
+                <p>{t('readmeInfo.failedToFetch', { ns: 'plugin' })}</p>
+              </div>
+            )
+          }
+
+          if (readmeData?.readme) {
+            return (
+              <Markdown
+                content={readmeData.readme}
+                pluginInfo={{ pluginUniqueIdentifier, pluginId: detail.plugin_id }}
+              />
+            )
+          }
+
+          return (
+            <div className="py-8 text-center text-text-tertiary">
+              <p>{t('readmeInfo.noReadmeAvailable', { ns: 'plugin' })}</p>
+            </div>
+          )
+        })()}
+      </div>
+    </div>
+  )
+
+  const portalContent = showType === ReadmeShowType.drawer
+    ? (
+        <div className="fixed inset-0 z-1002 flex justify-start" onClick={onClose}>
+          <div
+            className={cn(
+              'pointer-events-auto mt-16 mr-2 mb-2 ml-2 w-[600px] max-w-[600px] justify-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0 shadow-xl',
+            )}
+            onClick={(event) => {
+              event.stopPropagation()
+            }}
+          >
+            {children}
+          </div>
+        </div>
+      )
+    : (
+        <div className="fixed inset-0 z-1002 flex items-center justify-center p-2" onClick={onClose}>
+          <div
+            className={cn(
+              'pointer-events-auto relative h-[calc(100vh-16px)] w-full max-w-[800px] rounded-2xl bg-components-panel-bg p-0 shadow-xl',
+            )}
+            onClick={(event) => {
+              event.stopPropagation()
+            }}
+          >
+            {children}
+          </div>
+        </div>
+      )
+
+  return createPortal(
+    portalContent,
+    document.body,
   )
 }
+
+export default ReadmePanel

web/app/components/plugins/readme-panel/store.ts

@@ -1,34 +1,27 @@
 import type { PluginDetail } from '@/app/components/plugins/types'
 import { create } from 'zustand'
 
-export type ReadmePanelPresentation = 'drawer' | 'dialog'
-
-type ReadmePanelState = {
-  detail: PluginDetail
-  presentation: ReadmePanelPresentation
-  triggerId?: string
-}
-
-type OpenReadmePanelPayload = {
-  detail: PluginDetail
-  presentation?: ReadmePanelPresentation
-  triggerId?: string
+export enum ReadmeShowType {
+  drawer = 'drawer',
+  modal = 'modal',
 }
 
 type Shape = {
-  currentPanel?: ReadmePanelState
-  openReadmePanel: (payload: OpenReadmePanelPayload) => void
-  closeReadmePanel: () => void
+  currentPluginDetail?: {
+    detail: PluginDetail
+    showType: ReadmeShowType
+  }
+  setCurrentPluginDetail: (detail?: PluginDetail, showType?: ReadmeShowType) => void
 }
 
 export const useReadmePanelStore = create<Shape>(set => ({
-  currentPanel: undefined,
-  openReadmePanel: ({ detail, presentation = 'drawer', triggerId }) => set({
-    currentPanel: {
-      detail,
-      presentation,
-      triggerId,
-    },
+  currentPluginDetail: undefined,
+  setCurrentPluginDetail: (detail?: PluginDetail, showType?: ReadmeShowType) => set({
+    currentPluginDetail: !detail
+      ? undefined
+      : {
+          detail,
+          showType: showType ?? ReadmeShowType.drawer,
+        },
   }),
-  closeReadmePanel: () => set({ currentPanel: undefined }),
 }))

web/app/components/share/text-generation/menu-dropdown.tsx

@@ -68,13 +68,13 @@ const MenuDropdown: FC<Props> = ({
         onOpenChange={setOpen}
       >
         <DropdownMenuTrigger
-          render={(
-            <ActionButton size="l" className={cn(open && 'bg-state-base-hover')}>
-              <span aria-hidden className="i-ri-equalizer-2-line h-[18px] w-[18px]" />
-            </ActionButton>
-          )}
+          render={<div />}
           aria-label={t('operation.more', { ns: 'common' })}
-        />
+        >
+          <ActionButton size="l" className={cn(open && 'bg-state-base-hover')}>
+            <span aria-hidden className="i-ri-equalizer-2-line h-[18px] w-[18px]" />
+          </ActionButton>
+        </DropdownMenuTrigger>
         <DropdownMenuContent
           placement={placement || 'bottom-end'}
           sideOffset={4}

web/app/components/tools/labels/__tests__/selector.spec.tsx

@@ -34,28 +34,12 @@ vi.mock('@langgenius/dify-ui/popover', async () => {
     )
   }
 
-  const PopoverTrigger = ({
-    children,
-    className,
-    render,
-  }: {
-    children?: React.ReactNode
-    className?: string
-    render?: React.ReactNode
-  }) => {
+  const PopoverTrigger = ({ render }: { render: React.ReactNode }) => {
     const { open, setOpen } = React.useContext(PopoverContext)
-    if (render) {
-      return (
-        <div onClick={() => setOpen(!open)}>
-          {render}
-        </div>
-      )
-    }
-
     return (
-      <button type="button" className={className} onClick={() => setOpen(!open)}>
-        {children}
-      </button>
+      <div onClick={() => setOpen(!open)}>
+        {render}
+      </div>
     )
   }
 
@@ -135,12 +119,6 @@ describe('LabelSelector', () => {
       expect(screen.getByText('tools.createTool.toolInput.labelPlaceholder')).toBeInTheDocument()
     })
 
-    it('should render the trigger as a native button', () => {
-      render(<LabelSelector value={[]} onChange={mockOnChange} />)
-
-      expect(screen.getByRole('button', { name: 'tools.createTool.toolInput.labelPlaceholder' })).toHaveAttribute('type', 'button')
-    })
-
     it('should display selected labels as comma-separated list', () => {
       render(<LabelSelector value={['agent', 'rag']} onChange={mockOnChange} />)
 

web/app/components/tools/labels/selector.tsx

@@ -6,6 +6,7 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from '@langgenius/dify-ui/popover'
+import { RiArrowDownSLine } from '@remixicon/react'
 import { useDebounceFn } from 'ahooks'
 import { noop } from 'es-toolkit/function'
 import { useMemo, useState } from 'react'
@@ -59,19 +60,22 @@ const LabelSelector: FC<LabelSelectorProps> = ({
     <Popover open={open} onOpenChange={setOpen}>
       <div className="relative">
         <PopoverTrigger
-          className={cn(
-            'flex h-10 cursor-pointer items-center gap-1 rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal px-3 text-left hover:bg-components-input-bg-hover',
-            open && 'bg-components-input-bg-hover hover:bg-components-input-bg-hover',
+          render={(
+            <div className={cn(
+              'flex h-10 cursor-pointer items-center gap-1 rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal px-3 hover:bg-components-input-bg-hover',
+              open && '!hover:bg-components-input-bg-hover hover:bg-components-input-bg-hover',
+            )}
+            >
+              <div title={value.length > 0 ? selectedLabels : ''} className={cn('grow truncate text-[13px] leading-[18px] text-text-secondary', !value.length && 'text-text-quaternary!')}>
+                {!value.length && t('createTool.toolInput.labelPlaceholder', { ns: 'tools' })}
+                {!!value.length && selectedLabels}
+              </div>
+              <div className="ml-1 shrink-0 text-text-secondary opacity-60">
+                <RiArrowDownSLine className="h-4 w-4" />
+              </div>
+            </div>
           )}
-        >
-          <div title={value.length > 0 ? selectedLabels : ''} className={cn('grow truncate text-[13px] leading-4.5 text-text-secondary', !value.length && 'text-text-quaternary!')}>
-            {!value.length && t('createTool.toolInput.labelPlaceholder', { ns: 'tools' })}
-            {!!value.length && selectedLabels}
-          </div>
-          <div className="ml-1 shrink-0 text-text-secondary opacity-60">
-            <span className="i-ri-arrow-down-s-line h-4 w-4" />
-          </div>
-        </PopoverTrigger>
+        />
         <PopoverContent
           placement="bottom-start"
           sideOffset={4}

web/app/components/tools/provider/__tests__/detail.spec.tsx

@@ -133,8 +133,8 @@ vi.mock('@/app/components/tools/setting/build-in/config-credentials', () => ({
 }))
 
 vi.mock('@/app/components/tools/workflow-tool', () => ({
-  WorkflowToolDrawer: ({ onHide, onSave, onRemove }: { onHide: () => void, onSave: (data: unknown) => void, onRemove: () => void }) => (
-    <div data-testid="workflow-tool-drawer">
+  default: ({ onHide, onSave, onRemove }: { onHide: () => void, onSave: (data: unknown) => void, onRemove: () => void }) => (
+    <div data-testid="workflow-tool-modal">
       <button data-testid="wf-save" onClick={() => onSave({ name: 'test' })}>Save</button>
       <button data-testid="wf-remove" onClick={onRemove}>Remove</button>
       <button data-testid="wf-close" onClick={onHide}>Close</button>
@@ -581,7 +581,7 @@ describe('ProviderDetail', () => {
       })
     })
 
-    it('saves workflow tool via workflow drawer', async () => {
+    it('saves workflow tool via workflow modal', async () => {
       render(
         <ProviderDetail
           collection={createMockCollection({ type: CollectionType.workflow })}
@@ -593,7 +593,7 @@ describe('ProviderDetail', () => {
         expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
-      expect(screen.getByTestId('workflow-tool-drawer'))!.toBeInTheDocument()
+      expect(screen.getByTestId('workflow-tool-modal'))!.toBeInTheDocument()
       await act(async () => {
         fireEvent.click(screen.getByTestId('wf-save'))
       })
@@ -627,7 +627,7 @@ describe('ProviderDetail', () => {
     })
   })
 
-  describe('Overlay Close Actions', () => {
+  describe('Modal Close Actions', () => {
     it('closes ConfigCredential when cancel is clicked', async () => {
       render(
         <ProviderDetail
@@ -665,7 +665,7 @@ describe('ProviderDetail', () => {
       expect(screen.queryByTestId('edit-custom-modal')).not.toBeInTheDocument()
     })
 
-    it('closes WorkflowToolDrawer via onHide', async () => {
+    it('closes WorkflowToolModal via onHide', async () => {
       render(
         <ProviderDetail
           collection={createMockCollection({ type: CollectionType.workflow })}
@@ -677,9 +677,9 @@ describe('ProviderDetail', () => {
         expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
-      expect(screen.getByTestId('workflow-tool-drawer'))!.toBeInTheDocument()
+      expect(screen.getByTestId('workflow-tool-modal'))!.toBeInTheDocument()
       fireEvent.click(screen.getByTestId('wf-close'))
-      expect(screen.queryByTestId('workflow-tool-drawer')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('workflow-tool-modal')).not.toBeInTheDocument()
     })
   })
 

web/app/components/tools/provider/detail.tsx

@@ -1,6 +1,6 @@
 'use client'
 import type { Collection, CustomCollectionBackend, Tool, WorkflowToolProviderRequest, WorkflowToolProviderResponse } from '../types'
-import type { WorkflowToolDrawerPayload } from '@/app/components/tools/workflow-tool'
+import type { WorkflowToolModalPayload } from '@/app/components/tools/workflow-tool'
 import {
   AlertDialog,
   AlertDialogActions,
@@ -31,7 +31,7 @@ import OrgInfo from '@/app/components/plugins/card/base/org-info'
 import Title from '@/app/components/plugins/card/base/title'
 import EditCustomToolModal from '@/app/components/tools/edit-custom-collection-modal'
 import ConfigCredential from '@/app/components/tools/setting/build-in/config-credentials'
-import { WorkflowToolDrawer } from '@/app/components/tools/workflow-tool'
+import WorkflowToolModal from '@/app/components/tools/workflow-tool'
 import { useAppContext } from '@/context/app-context'
 import { useLocale } from '@/context/i18n'
 import { useModalContext } from '@/context/modal-context'
@@ -140,7 +140,7 @@ const ProviderDetail = ({
     setIsShowEditCustomCollectionModal(false)
   }
   // workflow provider
-  const [workflowToolDrawerOpen, setWorkflowToolDrawerOpen] = useState(false)
+  const [isShowEditWorkflowToolModal, setIsShowEditWorkflowToolModal] = useState(false)
   const getWorkflowToolProvider = useCallback(async () => {
     setIsDetailLoading(true)
     const res = await fetchWorkflowToolDetail(collection.id)
@@ -164,7 +164,7 @@ const ProviderDetail = ({
     await deleteWorkflowTool(collection.id)
     onRefreshData()
     toast.success(t('api.actionSuccess', { ns: 'common' }))
-    setWorkflowToolDrawerOpen(false)
+    setIsShowEditWorkflowToolModal(false)
   }
   const updateWorkflowToolProvider = async (data: WorkflowToolProviderRequest & Partial<{
     workflow_app_id: string
@@ -175,7 +175,7 @@ const ProviderDetail = ({
     onRefreshData()
     getWorkflowToolProvider()
     toast.success(t('api.actionSuccess', { ns: 'common' }))
-    setWorkflowToolDrawerOpen(false)
+    setIsShowEditWorkflowToolModal(false)
   }
   const onClickCustomToolDelete = () => {
     setDeleteAction('customTool')
@@ -287,7 +287,7 @@ const ProviderDetail = ({
               </Button>
               <Button
                 className={cn('my-3 w-[183px] shrink-0')}
-                onClick={() => setWorkflowToolDrawerOpen(true)}
+                onClick={() => setIsShowEditWorkflowToolModal(true)}
                 disabled={!isCurrentWorkspaceManager}
               >
                 <div className="system-sm-medium text-text-secondary">{t('createTool.editAction', { ns: 'tools' })}</div>
@@ -401,10 +401,10 @@ const ProviderDetail = ({
             onRemove={onClickCustomToolDelete}
           />
         )}
-        {workflowToolDrawerOpen && (
-          <WorkflowToolDrawer
-            payload={customCollection as unknown as WorkflowToolDrawerPayload}
-            onHide={() => setWorkflowToolDrawerOpen(false)}
+        {isShowEditWorkflowToolModal && (
+          <WorkflowToolModal
+            payload={customCollection as unknown as WorkflowToolModalPayload}
+            onHide={() => setIsShowEditWorkflowToolModal(false)}
             onRemove={onClickWorkflowToolDelete}
             onSave={updateWorkflowToolProvider}
           />

web/app/components/tools/workflow-tool/__tests__/index.spec.tsx

@@ -1,9 +1,22 @@
-import type { ReactNode } from 'react'
-import type { WorkflowToolDrawerPayload } from '../index'
+import type { WorkflowToolModalPayload } from '../index'
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { WorkflowToolDrawer } from '../index'
+import WorkflowToolAsModal from '../index'
+
+vi.mock('@/app/components/base/drawer-plus', () => ({
+  default: ({ isShow, onHide, title, body }: { isShow: boolean, onHide: () => void, title: string, body: React.ReactNode }) => (
+    isShow
+      ? (
+          <div data-testid="drawer" role="dialog">
+            <span>{title}</span>
+            <button data-testid="drawer-close" onClick={onHide}>Close</button>
+            {body}
+          </div>
+        )
+      : null
+  ),
+}))
 
 vi.mock('@/app/components/base/emoji-picker/Inner', () => ({
   default: ({ onSelect }: { onSelect: (icon: string, background: string) => void }) => (
@@ -33,8 +46,8 @@ vi.mock('@/app/components/base/tooltip', () => ({
     children,
     popupContent,
   }: {
-    children?: ReactNode
-    popupContent?: ReactNode
+    children?: React.ReactNode
+    popupContent?: React.ReactNode
   }) => (
     <div>
       {children}
@@ -73,7 +86,7 @@ vi.mock('@/app/components/plugins/hooks', () => ({
   }),
 }))
 
-const createPayload = (overrides: Partial<WorkflowToolDrawerPayload> = {}): WorkflowToolDrawerPayload => ({
+const createPayload = (overrides: Partial<WorkflowToolModalPayload> = {}): WorkflowToolModalPayload => ({
   icon: { content: '🔧', background: '#ffffff' },
   label: 'My Tool',
   name: 'my_tool',
@@ -92,7 +105,7 @@ const createPayload = (overrides: Partial<WorkflowToolDrawerPayload> = {}): Work
   ...overrides,
 })
 
-describe('WorkflowToolDrawer', () => {
+describe('WorkflowToolAsModal', () => {
   beforeEach(() => {
     vi.clearAllMocks()
   })
@@ -102,7 +115,7 @@ describe('WorkflowToolDrawer', () => {
     const onCreate = vi.fn()
 
     render(
-      <WorkflowToolDrawer
+      <WorkflowToolAsModal
         isAdd
         payload={createPayload()}
         onHide={vi.fn()}
@@ -131,7 +144,7 @@ describe('WorkflowToolDrawer', () => {
     const onCreate = vi.fn()
 
     render(
-      <WorkflowToolDrawer
+      <WorkflowToolAsModal
         isAdd
         payload={createPayload({ name: 'bad-name' })}
         onHide={vi.fn()}
@@ -152,7 +165,7 @@ describe('WorkflowToolDrawer', () => {
     const onSave = vi.fn()
 
     render(
-      <WorkflowToolDrawer
+      <WorkflowToolAsModal
         payload={createPayload()}
         onHide={vi.fn()}
         onSave={onSave}
@@ -174,7 +187,7 @@ describe('WorkflowToolDrawer', () => {
 
   it('should show duplicate reserved output warnings', () => {
     render(
-      <WorkflowToolDrawer
+      <WorkflowToolAsModal
         isAdd
         payload={createPayload()}
         onHide={vi.fn()}

web/app/components/tools/workflow-tool/configure-button.tsx

@@ -1,33 +1,70 @@
 'use client'
+import type { Emoji } from '@/app/components/tools/types'
+import type { InputVar, Variable } from '@/app/components/workflow/types'
+import type { PublishWorkflowParams } from '@/types/workflow'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { RiArrowRightUpLine, RiHammerLine } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import Loading from '@/app/components/base/loading'
 import Indicator from '@/app/components/header/indicator'
-import { useRouter } from '@/next/navigation'
+import WorkflowToolModal from '@/app/components/tools/workflow-tool'
 import Divider from '../../base/divider'
+import { useConfigureButton } from './hooks/use-configure-button'
 
 type Props = {
   disabled: boolean
   published: boolean
-  isLoading: boolean
-  outdated: boolean
-  isCurrentWorkspaceManager: boolean
-  onConfigure: () => void
+  detailNeedUpdate: boolean
+  workflowAppId: string
+  icon: Emoji
+  name: string
+  description: string
+  inputs?: InputVar[]
+  outputs?: Variable[]
+  handlePublish: (params?: PublishWorkflowParams) => Promise<void>
+  onRefreshData?: () => void
   disabledReason?: string
 }
 
 const WorkflowToolConfigureButton = ({
   disabled,
   published,
-  isLoading,
-  outdated,
-  isCurrentWorkspaceManager,
-  onConfigure,
+  detailNeedUpdate,
+  workflowAppId,
+  icon,
+  name,
+  description,
+  inputs,
+  outputs,
+  handlePublish,
+  onRefreshData,
   disabledReason,
 }: Props) => {
   const { t } = useTranslation()
-  const router = useRouter()
+  const {
+    showModal,
+    isLoading,
+    outdated,
+    payload,
+    isCurrentWorkspaceManager,
+    openModal,
+    closeModal,
+    handleCreate,
+    handleUpdate,
+    navigateToTools,
+  } = useConfigureButton({
+    published,
+    detailNeedUpdate,
+    workflowAppId,
+    icon,
+    name,
+    description,
+    inputs,
+    outputs,
+    handlePublish,
+    onRefreshData,
+  })
 
   return (
     <>
@@ -43,12 +80,9 @@ const WorkflowToolConfigureButton = ({
             ? (
                 <div
                   className="flex items-center justify-start gap-2 p-2 pl-2.5"
-                  onClick={() => {
-                    if (!disabled && !published)
-                      onConfigure()
-                  }}
+                  onClick={() => !disabled && !published && openModal()}
                 >
-                  <span className={cn('relative i-ri-hammer-line h-4 w-4 text-text-secondary', !disabled && !published && 'group-hover:text-text-accent')} />
+                  <RiHammerLine className={cn('relative h-4 w-4 text-text-secondary', !disabled && !published && 'group-hover:text-text-accent')} />
                   <div
                     title={t('common.workflowAsTool', { ns: 'workflow' }) || ''}
                     className={cn('shrink grow basis-0 truncate system-sm-medium text-text-secondary', !disabled && !published && 'group-hover:text-text-accent')}
@@ -66,7 +100,7 @@ const WorkflowToolConfigureButton = ({
                 <div
                   className="flex items-center justify-start gap-2 p-2 pl-2.5"
                 >
-                  <span className="i-ri-hammer-line h-4 w-4 text-text-tertiary" />
+                  <RiHammerLine className="h-4 w-4 text-text-tertiary" />
                   <div
                     title={t('common.workflowAsTool', { ns: 'workflow' }) || ''}
                     className="shrink grow basis-0 truncate system-sm-medium text-text-tertiary"
@@ -86,7 +120,7 @@ const WorkflowToolConfigureButton = ({
                 <Button
                   size="small"
                   className="w-[140px]"
-                  onClick={onConfigure}
+                  onClick={openModal}
                   disabled={!isCurrentWorkspaceManager || disabled}
                 >
                   {t('common.configure', { ns: 'workflow' })}
@@ -95,11 +129,11 @@ const WorkflowToolConfigureButton = ({
                 <Button
                   size="small"
                   className="w-[140px]"
-                  onClick={() => router.push('/tools?category=workflow')}
+                  onClick={navigateToTools}
                   disabled={disabled}
                 >
                   {t('common.manageInTools', { ns: 'workflow' })}
-                  <span className="ml-1 i-ri-arrow-right-up-line h-4 w-4" />
+                  <RiArrowRightUpLine className="ml-1 h-4 w-4" />
                 </Button>
               </div>
               {outdated && (
@@ -112,6 +146,15 @@ const WorkflowToolConfigureButton = ({
         </div>
       )}
       {published && isLoading && <div className="pt-2"><Loading type="app" /></div>}
+      {showModal && (
+        <WorkflowToolModal
+          isAdd={!published}
+          payload={payload}
+          onHide={closeModal}
+          onCreate={handleCreate}
+          onSave={handleUpdate}
+        />
+      )}
     </>
   )
 }

web/app/components/tools/workflow-tool/hooks/__tests__/use-configure-button.spec.ts

@@ -4,6 +4,11 @@ import { act, renderHook } from '@testing-library/react'
 import { InputVarType } from '@/app/components/workflow/types'
 import { isParametersOutdated, useConfigureButton } from '../use-configure-button'
 
+const mockPush = vi.fn()
+vi.mock('@/next/navigation', () => ({
+  useRouter: () => ({ push: mockPush }),
+}))
+
 const mockIsCurrentWorkspaceManager = vi.fn(() => true)
 vi.mock('@/context/app-context', () => ({
   useAppContext: () => ({
@@ -93,7 +98,6 @@ const createMockDetail = (overrides: Partial<WorkflowToolProviderResponse> = {})
 })
 
 const createDefaultOptions = (overrides = {}) => ({
-  enabled: true,
   published: false,
   detailNeedUpdate: false,
   workflowAppId: 'app-123',
@@ -209,9 +213,9 @@ describe('useConfigureButton', () => {
   })
 
   describe('Initialization', () => {
-    it('should return workflow tool state without owning drawer visibility', () => {
+    it('should return showModal as false by default', () => {
       const { result } = renderHook(() => useConfigureButton(createDefaultOptions()))
-      expect(result.current.payload).toMatchObject({ workflow_app_id: 'app-123' })
+      expect(result.current.showModal).toBe(false)
     })
 
     it('should forward isCurrentWorkspaceManager from context', () => {
@@ -235,11 +239,6 @@ describe('useConfigureButton', () => {
       renderHook(() => useConfigureButton(createDefaultOptions({ published: false })))
       expect(mockUseWorkflowToolDetailByAppID).toHaveBeenCalledWith('app-123', false)
     })
-
-    it('should call query hook with enabled=false when controller is disabled', () => {
-      renderHook(() => useConfigureButton(createDefaultOptions({ enabled: false, published: true })))
-      expect(mockUseWorkflowToolDetailByAppID).toHaveBeenCalledWith('app-123', false)
-    })
   })
 
   // Computed values
@@ -349,13 +348,46 @@ describe('useConfigureButton', () => {
     })
   })
 
+  // Modal controls
+  describe('Modal Controls', () => {
+    it('should open modal via openModal', () => {
+      const { result } = renderHook(() => useConfigureButton(createDefaultOptions()))
+      act(() => {
+        result.current.openModal()
+      })
+      expect(result.current.showModal).toBe(true)
+    })
+
+    it('should close modal via closeModal', () => {
+      const { result } = renderHook(() => useConfigureButton(createDefaultOptions()))
+      act(() => {
+        result.current.openModal()
+      })
+      act(() => {
+        result.current.closeModal()
+      })
+      expect(result.current.showModal).toBe(false)
+    })
+
+    it('should navigate to tools page', () => {
+      const { result } = renderHook(() => useConfigureButton(createDefaultOptions()))
+      act(() => {
+        result.current.navigateToTools()
+      })
+      expect(mockPush).toHaveBeenCalledWith('/tools?category=workflow')
+    })
+  })
+
   // Mutation handlers
   describe('handleCreate', () => {
-    it('should create provider, invalidate caches, refresh, and notify configured', async () => {
+    it('should create provider, invalidate caches, refresh, and close modal', async () => {
       mockCreateWorkflowToolProvider.mockResolvedValue({})
       const onRefreshData = vi.fn()
-      const onConfigured = vi.fn()
-      const { result } = renderHook(() => useConfigureButton(createDefaultOptions({ onRefreshData, onConfigured })))
+      const { result } = renderHook(() => useConfigureButton(createDefaultOptions({ onRefreshData })))
+
+      act(() => {
+        result.current.openModal()
+      })
 
       await act(async () => {
         await result.current.handleCreate(createMockRequest({ workflow_app_id: 'app-123' }) as WorkflowToolProviderRequest & { workflow_app_id: string })
@@ -366,7 +398,7 @@ describe('useConfigureButton', () => {
       expect(onRefreshData).toHaveBeenCalled()
       expect(mockInvalidateWorkflowToolDetailByAppID).toHaveBeenCalledWith('app-123')
       expect(mockToastNotify).toHaveBeenCalledWith({ type: 'success', message: expect.any(String) })
-      expect(onConfigured).toHaveBeenCalled()
+      expect(result.current.showModal).toBe(false)
     })
 
     it('should show error toast on failure', async () => {
@@ -382,18 +414,20 @@ describe('useConfigureButton', () => {
   })
 
   describe('handleUpdate', () => {
-    it('should publish, save, invalidate caches, and notify configured', async () => {
+    it('should publish, save, invalidate caches, and close modal', async () => {
       mockSaveWorkflowToolProvider.mockResolvedValue({})
       const handlePublish = vi.fn().mockResolvedValue(undefined)
       const onRefreshData = vi.fn()
-      const onConfigured = vi.fn()
       const { result } = renderHook(() => useConfigureButton(createDefaultOptions({
         published: true,
         handlePublish,
         onRefreshData,
-        onConfigured,
       })))
 
+      act(() => {
+        result.current.openModal()
+      })
+
       await act(async () => {
         await result.current.handleUpdate(createMockRequest({ workflow_tool_id: 'tool-456' }) as WorkflowToolProviderRequest & Partial<{ workflow_app_id: string, workflow_tool_id: string }>)
       })
@@ -403,7 +437,7 @@ describe('useConfigureButton', () => {
       expect(onRefreshData).toHaveBeenCalled()
       expect(mockInvalidateAllWorkflowTools).toHaveBeenCalled()
       expect(mockInvalidateWorkflowToolDetailByAppID).toHaveBeenCalledWith('app-123')
-      expect(onConfigured).toHaveBeenCalled()
+      expect(result.current.showModal).toBe(false)
     })
 
     it('should show error toast when publish fails', async () => {
@@ -457,16 +491,6 @@ describe('useConfigureButton', () => {
 
       expect(mockInvalidateWorkflowToolDetailByAppID).not.toHaveBeenCalled()
     })
-
-    it('should not invalidate detail while disabled', () => {
-      renderHook(() => useConfigureButton(createDefaultOptions({
-        enabled: false,
-        published: true,
-        detailNeedUpdate: true,
-      })))
-
-      expect(mockInvalidateWorkflowToolDetailByAppID).not.toHaveBeenCalled()
-    })
   })
 
   // Edge cases

web/app/components/tools/workflow-tool/hooks/use-configure-button.ts

@@ -2,9 +2,10 @@ import type { Emoji, WorkflowToolProviderOutputParameter, WorkflowToolProviderPa
 import type { InputVar, Variable } from '@/app/components/workflow/types'
 import type { PublishWorkflowParams } from '@/types/workflow'
 import { toast } from '@langgenius/dify-ui/toast'
-import { useEffect, useMemo, useRef } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAppContext } from '@/context/app-context'
+import { useRouter } from '@/next/navigation'
 import { createWorkflowToolProvider, saveWorkflowToolProvider } from '@/service/tools'
 import { useInvalidateAllWorkflowTools, useInvalidateWorkflowToolDetailByAppID, useWorkflowToolDetailByAppID } from '@/service/use-tools'
 
@@ -88,7 +89,6 @@ function buildExistingOutputParameters(
 // endregion
 
 type UseConfigureButtonOptions = {
-  enabled: boolean
   published: boolean
   detailNeedUpdate: boolean
   workflowAppId: string
@@ -99,12 +99,10 @@ type UseConfigureButtonOptions = {
   outputs?: Variable[]
   handlePublish: (params?: PublishWorkflowParams) => Promise<void>
   onRefreshData?: () => void
-  onConfigured?: () => void
 }
 
 export function useConfigureButton(options: UseConfigureButtonOptions) {
   const {
-    enabled,
     published,
     detailNeedUpdate,
     workflowAppId,
@@ -115,14 +113,16 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
     outputs,
     handlePublish,
     onRefreshData,
-    onConfigured,
   } = options
 
   const { t } = useTranslation()
+  const router = useRouter()
   const { isCurrentWorkspaceManager } = useAppContext()
 
+  const [showModal, setShowModal] = useState(false)
+
   // Data fetching via React Query
-  const { data: detail, isLoading } = useWorkflowToolDetailByAppID(workflowAppId, enabled && published)
+  const { data: detail, isLoading } = useWorkflowToolDetailByAppID(workflowAppId, published)
 
   // Invalidation functions (store in ref for stable effect dependency)
   const invalidateDetail = useInvalidateWorkflowToolDetailByAppID()
@@ -133,9 +133,9 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
 
   // Refetch when detailNeedUpdate becomes true
   useEffect(() => {
-    if (enabled && detailNeedUpdate)
+    if (detailNeedUpdate)
       invalidateDetailRef.current(workflowAppId)
-  }, [detailNeedUpdate, enabled, workflowAppId])
+  }, [detailNeedUpdate, workflowAppId])
 
   // Computed values
   const outdated = useMemo(
@@ -173,6 +173,14 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
     }
   }, [detail, published, workflowAppId, icon, name, description, inputs, outputs])
 
+  // Modal controls (stable callbacks)
+  const openModal = useCallback(() => setShowModal(true), [])
+  const closeModal = useCallback(() => setShowModal(false), [])
+  const navigateToTools = useCallback(
+    () => router.push('/tools?category=workflow'),
+    [router],
+  )
+
   // Mutation handlers (not memoized — only used in conditionally-rendered modal)
   const handleCreate = async (data: WorkflowToolProviderRequest & { workflow_app_id: string }) => {
     try {
@@ -181,7 +189,7 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
       onRefreshData?.()
       invalidateDetail(workflowAppId)
       toast.success(t('api.actionSuccess', { ns: 'common' }))
-      onConfigured?.()
+      setShowModal(false)
     }
     catch (e) {
       toast.error((e as Error).message)
@@ -198,7 +206,7 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
       onRefreshData?.()
       invalidateAllWorkflowTools()
       invalidateDetail(workflowAppId)
-      onConfigured?.()
+      setShowModal(false)
     }
     catch (e) {
       toast.error((e as Error).message)
@@ -206,11 +214,15 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
   }
 
   return {
+    showModal,
     isLoading,
     outdated,
     payload,
     isCurrentWorkspaceManager,
+    openModal,
+    closeModal,
     handleCreate,
     handleUpdate,
+    navigateToTools,
   }
 }

web/app/components/tools/workflow-tool/index.tsx

@@ -1,19 +1,9 @@
 'use client'
-import type { DrawerRootProps } from '@langgenius/dify-ui/drawer'
+import type { FC } from 'react'
 import type { Emoji, WorkflowToolProviderOutputParameter, WorkflowToolProviderOutputSchema, WorkflowToolProviderParameter, WorkflowToolProviderRequest } from '../types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
-import {
-  Drawer,
-  DrawerBackdrop,
-  DrawerCloseButton,
-  DrawerContent,
-  DrawerPopup,
-  DrawerPortal,
-  DrawerTitle,
-  DrawerViewport,
-} from '@langgenius/dify-ui/drawer'
 import { toast } from '@langgenius/dify-ui/toast'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { produce } from 'immer'
@@ -36,7 +26,7 @@ import {
   isWorkflowToolNameValid,
 } from './helpers'
 
-export type WorkflowToolDrawerPayload = {
+export type WorkflowToolModalPayload = {
   icon: Emoji
   label: string
   name: string
@@ -52,9 +42,9 @@ export type WorkflowToolDrawerPayload = {
   workflow_app_id?: string
 }
 
-export type WorkflowToolDrawerProps = {
+type Props = {
   isAdd?: boolean
-  payload: WorkflowToolDrawerPayload
+  payload: WorkflowToolModalPayload
   onHide: () => void
   onRemove?: () => void
   onCreate?: (payload: WorkflowToolProviderRequest & { workflow_app_id: string }) => void
@@ -64,9 +54,8 @@ export type WorkflowToolDrawerProps = {
   }>) => void
 }
 
-type WorkflowToolDrawerFrameProps = {
+type WorkflowToolDrawerProps = {
   title: string
-  closeLabel: string
   onHide: () => void
   children: React.ReactNode
 }
@@ -88,45 +77,39 @@ const InfoTooltip = ({ children }: { children: React.ReactNode }) => {
   )
 }
 
-const WorkflowToolDrawerFrame = ({ title, closeLabel, onHide, children }: WorkflowToolDrawerFrameProps) => {
-  const handleOpenChange = React.useCallback<NonNullable<DrawerRootProps['onOpenChange']>>((open) => {
-    if (!open)
-      onHide()
-  }, [onHide])
-
+const WorkflowToolDrawer = ({ title, onHide, children }: WorkflowToolDrawerProps) => {
   return (
-    <Drawer open modal disablePointerDismissal swipeDirection="right" onOpenChange={handleOpenChange}>
-      <DrawerPortal>
-        <DrawerBackdrop />
-        <DrawerViewport>
-          <DrawerPopup
-            data-testid="drawer"
-            className={cn(
-              'data-[swipe-direction=right]:top-2 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-[calc(100dvh-16px)] data-[swipe-direction=right]:w-160 data-[swipe-direction=right]:max-w-[calc(100vw-16px)]',
-              'data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border-r-[0.5px] data-[swipe-direction=right]:border-divider-subtle',
-            )}
-          >
-            <DrawerContent className="flex min-h-0 flex-1 flex-col overflow-hidden p-0 pb-0">
-              <div className="shrink-0 border-b border-divider-subtle py-4">
-                <div className="flex h-6 items-center justify-between pr-5 pl-6">
-                  <DrawerTitle data-testid="drawer-title" className="min-w-0 truncate system-xl-semibold text-text-primary">
-                    {title}
-                  </DrawerTitle>
-                  <DrawerCloseButton
-                    data-testid="drawer-close"
-                    className="h-6 w-6 rounded-md"
-                    aria-label={closeLabel}
-                  />
-                </div>
-              </div>
-              <div className="grow overflow-hidden">
-                {children}
-              </div>
-            </DrawerContent>
-          </DrawerPopup>
-        </DrawerViewport>
-      </DrawerPortal>
-    </Drawer>
+    <Dialog open disablePointerDismissal>
+      <DialogContent
+        className={cn(
+          'top-2 right-2 bottom-2 left-auto h-[calc(100dvh-16px)] max-h-[calc(100dvh-16px)] w-[640px]! max-w-[calc(100vw-16px)]! translate-x-0! translate-y-0! overflow-hidden rounded-xl border-none bg-transparent p-0 shadow-none',
+          'data-ending-style:translate-x-4 data-ending-style:scale-100 data-starting-style:translate-x-4 data-starting-style:scale-100',
+        )}
+        backdropClassName="bg-background-overlay"
+      >
+        <div data-testid="drawer" className="flex h-full w-full flex-col rounded-xl border-[0.5px] border-divider-subtle bg-components-panel-bg shadow-xl">
+          <div className="shrink-0 border-b border-divider-subtle py-4">
+            <div className="flex h-6 items-center justify-between pr-5 pl-6">
+              <DialogTitle data-testid="drawer-title" className="system-xl-semibold text-text-primary">
+                {title}
+              </DialogTitle>
+              <button
+                type="button"
+                data-testid="drawer-close"
+                className="flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-state-base-hover"
+                aria-label="Close"
+                onClick={onHide}
+              >
+                <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
+              </button>
+            </div>
+          </div>
+          <div className="grow overflow-hidden">
+            {children}
+          </div>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 
@@ -175,14 +158,15 @@ const WorkflowToolEmojiPicker = ({ onSelect, onClose }: WorkflowToolEmojiPickerP
   )
 }
 
-export function WorkflowToolDrawer({
+// Add and Edit
+const WorkflowToolAsModal: FC<Props> = ({
   isAdd,
   payload,
   onHide,
   onRemove,
   onSave,
   onCreate,
-}: WorkflowToolDrawerProps) {
+}) => {
   const { t } = useTranslation()
 
   const [showEmojiPicker, setShowEmojiPicker] = useState<boolean>(false)
@@ -216,7 +200,7 @@ export function WorkflowToolDrawer({
     setLabels(value)
   }
   const [privacyPolicy, setPrivacyPolicy] = useState(payload.privacy_policy)
-  const [confirmModalOpen, setConfirmModalOpen] = useState(false)
+  const [showModal, setShowModal] = useState(false)
 
   const onConfirm = () => {
     let errorMessage = ''
@@ -259,10 +243,9 @@ export function WorkflowToolDrawer({
 
   return (
     <>
-      <WorkflowToolDrawerFrame
+      <WorkflowToolDrawer
         onHide={onHide}
         title={t('common.workflowAsTool', { ns: 'workflow' })!}
-        closeLabel={t('operation.close', { ns: 'common' })!}
       >
         <div className="flex h-full flex-col">
           <div className="h-0 grow space-y-4 overflow-y-auto px-6 py-3">
@@ -444,7 +427,7 @@ export function WorkflowToolDrawer({
                   if (isAdd)
                     onConfirm()
                   else
-                    setConfirmModalOpen(true)
+                    setShowModal(true)
                 }}
               >
                 {t('operation.save', { ns: 'common' })}
@@ -452,7 +435,7 @@ export function WorkflowToolDrawer({
             </div>
           </div>
         </div>
-      </WorkflowToolDrawerFrame>
+      </WorkflowToolDrawer>
       {showEmojiPicker && (
         <WorkflowToolEmojiPicker
           onSelect={(icon, icon_background) => {
@@ -464,10 +447,10 @@ export function WorkflowToolDrawer({
           }}
         />
       )}
-      {confirmModalOpen && (
+      {showModal && (
         <ConfirmModal
-          show={confirmModalOpen}
-          onClose={() => setConfirmModalOpen(false)}
+          show={showModal}
+          onClose={() => setShowModal(false)}
           onConfirm={onConfirm}
         />
       )}
@@ -475,3 +458,4 @@ export function WorkflowToolDrawer({
 
   )
 }
+export default React.memo(WorkflowToolAsModal)

web/app/components/workflow-app/components/workflow-header/__tests__/features-trigger.spec.tsx

@@ -124,7 +124,7 @@ vi.mock('@/app/components/app/app-publisher', () => ({
         <button type="button" onClick={() => { Promise.resolve(props.onPublish?.()).catch(() => undefined) }}>
           publisher-publish
         </button>
-        <button type="button" onClick={() => { Promise.resolve(props.onPublish?.({ url: '/apps/app-1/workflows/publish', title: 'Test title', releaseNotes: 'Test notes' })).catch(() => undefined) }}>
+        <button type="button" onClick={() => { Promise.resolve(props.onPublish?.({ title: 'Test title', releaseNotes: 'Test notes' })).catch(() => undefined) }}>
           publisher-publish-with-params
         </button>
       </div>

web/app/components/workflow/run/node.tsx

@@ -271,7 +271,6 @@ const NodePanel: FC<Props> = ({
               <div className={cn('mb-1')}>
                 <CodeEditor
                   readOnly
-                  showFileList
                   title={<div>{processDataTitle}</div>}
                   language={CodeLanguage.json}
                   value={nodeInfo.process_data}
@@ -283,7 +282,6 @@ const NodePanel: FC<Props> = ({
               <div>
                 <CodeEditor
                   readOnly
-                  showFileList
                   title={<div>{outputTitle}</div>}
                   language={CodeLanguage.json}
                   value={nodeInfo.outputs}

web/app/components/workflow/run/result-panel.tsx

@@ -143,7 +143,6 @@ const ResultPanel: FC<ResultPanelProps> = ({
         {process_data && (
           <CodeEditor
             readOnly
-            showFileList
             title={<div>{t('common.processData', { ns: 'workflow' }).toLocaleUpperCase()}</div>}
             language={CodeLanguage.json}
             value={process_data}
@@ -154,7 +153,6 @@ const ResultPanel: FC<ResultPanelProps> = ({
         {(outputs || status === 'running') && (
           <CodeEditor
             readOnly
-            showFileList
             title={<div>{t('common.output', { ns: 'workflow' }).toLocaleUpperCase()}</div>}
             language={CodeLanguage.json}
             value={outputs}

web/docs/overlay-migration.md

@@ -10,15 +10,12 @@ This document tracks the Dify-web migration away from legacy overlay APIs.
   - `@/app/components/base/tooltip`
   - `@/app/components/base/modal`
   - `@/app/components/base/dialog`
-  - `@/app/components/base/drawer`
-  - `@/app/components/base/drawer-plus`
 - Replacement primitives:
   - `@langgenius/dify-ui/tooltip`
   - `@langgenius/dify-ui/dropdown-menu`
   - `@langgenius/dify-ui/context-menu`
   - `@langgenius/dify-ui/popover`
   - `@langgenius/dify-ui/dialog`
-  - `@langgenius/dify-ui/drawer`
   - `@langgenius/dify-ui/alert-dialog`
   - `@langgenius/dify-ui/autocomplete`
   - `@langgenius/dify-ui/combobox`
@@ -52,12 +49,12 @@ All new overlay primitives in `@langgenius/dify-ui/*` share a single z-index val
 During the migration period, legacy and new overlays coexist. Legacy overlays
 portal to `document.body` with explicit z-index values:
 
-| Layer                 | z-index      | Components                                                                               |
-| --------------------- | ------------ | ---------------------------------------------------------------------------------------- |
-| Legacy Drawer         | `z-30`       | `base/drawer`, `base/drawer-plus`                                                        |
-| Legacy Modal          | `z-60`       | `base/modal` (default)                                                                   |
-| **New UI primitives** | **`z-1002`** | `@langgenius/dify-ui/*` (Drawer, Popover, Dialog, Autocomplete, Combobox, Tooltip, etc.) |
-| Toast                 | `z-1003`     | `@langgenius/dify-ui/toast`                                                              |
+| Layer                 | z-index      | Components                                                                       |
+| --------------------- | ------------ | -------------------------------------------------------------------------------- |
+| Legacy Drawer         | `z-30`       | `base/drawer`                                                                    |
+| Legacy Modal          | `z-60`       | `base/modal` (default)                                                           |
+| **New UI primitives** | **`z-1002`** | `@langgenius/dify-ui/*` (Popover, Dialog, Autocomplete, Combobox, Tooltip, etc.) |
+| Toast                 | `z-1003`     | `@langgenius/dify-ui/toast`                                                      |
 
 `z-1002` sits above all common legacy overlays, so new primitives always
 render on top without needing per-call-site z-index hacks. Among themselves,

web/eslint.constants.mjs

@@ -66,15 +66,6 @@ export const OVERLAY_RESTRICTED_IMPORT_PATTERNS = [
     ],
     message: 'Deprecated: use @langgenius/dify-ui/dialog instead. See issue #32767.',
   },
-  {
-    group: [
-      '**/base/drawer',
-      '**/base/drawer/index',
-      '**/base/drawer-plus',
-      '**/base/drawer-plus/index',
-    ],
-    message: 'Deprecated: use @langgenius/dify-ui/drawer instead. See issue #32767.',
-  },
 ]
 
 export const HYOBAN_PREFER_TAILWIND_ICONS_OPTIONS = {

web/models/datasets.ts

@@ -5,7 +5,6 @@ import type { MetadataItemWithValue } from '@/app/components/datasets/metadata/t
 import type { MetadataFilteringVariableType } from '@/app/components/workflow/nodes/knowledge-retrieval/types'
 import type { Tag } from '@/contract/console/tags'
 import type { AppIconType, AppModeEnum, RetrievalConfig, TransferMethod } from '@/types/app'
-import type { SegmentImportStatus } from '@/types/dataset'
 import type { I18nKeysByPrefix } from '@/types/i18n'
 import { ExternalKnowledgeBase, General, ParentChild, Qa } from '@/app/components/base/icons/src/public/knowledge/dataset-card'
 
@@ -784,7 +783,7 @@ export type UpdateDocumentBatchParams = {
 
 export type BatchImportResponse = {
   job_id: string
-  job_status: SegmentImportStatus
+  job_status: string
 }
 
 export const DOC_FORM_ICON_WITH_BG: Record<ChunkingMode | 'external', React.ComponentType<{ className: string }>> = {

web/types/dataset.ts

@@ -1,8 +0,0 @@
-export const segmentImportStatus = {
-  waiting: 'waiting',
-  processing: 'processing',
-  completed: 'completed',
-  error: 'error',
-} as const
-
-export type SegmentImportStatus = typeof segmentImportStatus[keyof typeof segmentImportStatus]