From e58e5b087986dcfce872d48498c78646e9766609 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Thu, 17 Sep 2026 02:50:31 +0000
Subject: [PATCH 01/28] ci: shard API unit tests across runners (#42374)

---
 .github/workflows/api-tests.yml | 38 +++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml
index f579862eb8b..1e0d0b8f541 100644
--- a/.github/workflows/api-tests.yml
+++ b/.github/workflows/api-tests.yml
@@ -15,23 +15,30 @@ concurrency:
 
 jobs:
   api-unit:
-    name: API Unit Tests
+    name: API Unit Tests (${{ matrix.python-version }}, shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
     runs-on: depot-ubuntu-24.04
     env:
-      COVERAGE_FILE: coverage-unit
+      COVERAGE_FILE: coverage-unit-${{ matrix.python-version }}-${{ matrix.shardIndex }}
     defaults:
       run:
         shell: bash
     strategy:
+      fail-fast: false
       matrix:
         python-version:
           - '3.12'
+        shardIndex:
+          - 1
+          - 2
+          - 3
+          - 4
+        shardTotal:
+          - 4
 
     steps:
       - name: Checkout code
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
-          fetch-depth: 0
           persist-credentials: false
 
       - name: Setup UV and Python
@@ -53,6 +60,10 @@ jobs:
             -p no:benchmark \
             --timeout "${PYTEST_TIMEOUT:-20}" \
             -n auto \
+            --shard-index "${{ matrix.shardIndex }}" \
+            --shard-total "${{ matrix.shardTotal }}" \
+            -o 'addopts=--cov=./api --cov-branch --import-mode=importlib' \
+            --cov-report= \
             api/tests/unit_tests \
             api/providers/vdb/*/tests/unit_tests \
             api/providers/trace/*/tests/unit_tests \
@@ -60,14 +71,19 @@ jobs:
           # Controller tests register Flask routes at import time, so keep them out of xdist.
           uv run --project api pytest \
             --timeout "${PYTEST_TIMEOUT:-20}" \
+            --shard-index "${{ matrix.shardIndex }}" \
+            --shard-total "${{ matrix.shardTotal }}" \
+            -o 'addopts=--cov=./api --cov-branch --import-mode=importlib' \
+            --cov-report= \
             --cov-append \
             api/tests/unit_tests/controllers
 
       - name: Upload unit coverage data
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: api-coverage-unit
-          path: coverage-unit
+          name: api-coverage-unit-${{ matrix.python-version }}-${{ matrix.shardIndex }}
+          path: ${{ env.COVERAGE_FILE }}
+          if-no-files-found: error
           retention-days: 1
 
   api-integration:
@@ -98,7 +114,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
-          fetch-depth: 0
           persist-credentials: false
 
       - name: Setup UV and Python
@@ -122,6 +137,8 @@ jobs:
             -n auto \
             --shard-index "${{ matrix.shardIndex }}" \
             --shard-total "${{ matrix.shardTotal }}" \
+            -o 'addopts=--cov=./api --cov-branch --import-mode=importlib' \
+            --cov-report= \
             --timeout "${PYTEST_TIMEOUT:-180}" \
             api/tests/integration_tests/workflow \
             api/tests/integration_tests/tools \
@@ -181,16 +198,19 @@ jobs:
           echo "Merged backend coverage report generated for Codecov project status." >> "$GITHUB_STEP_SUMMARY"
           echo "" >> "$GITHUB_STEP_SUMMARY"
 
-          unit_coverage="$(find coverage-data -type f -name coverage-unit -print -quit)"
+          mapfile -t unit_coverage < <(find coverage-data -type f -name 'coverage-unit-*' -print | sort)
           mapfile -t integration_coverage < <(find coverage-data -type f -name 'coverage-integration-*' -print | sort)
-          : "${unit_coverage:?coverage-unit artifact not found}"
+          if [[ "${#unit_coverage[@]}" -ne 4 ]]; then
+            echo "expected 4 unit coverage artifacts, found ${#unit_coverage[@]}" >&2
+            exit 1
+          fi
           if [[ "${#integration_coverage[@]}" -ne 4 ]]; then
             echo "expected 4 integration coverage artifacts, found ${#integration_coverage[@]}" >&2
             exit 1
           fi
 
           report_file="$(mktemp)"
-          uv run --project api coverage combine "$unit_coverage" "${integration_coverage[@]}"
+          uv run --project api coverage combine "${unit_coverage[@]}" "${integration_coverage[@]}"
           uv run --project api coverage report --show-missing | tee "$report_file"
           echo "Summary: \`$(tail -n 1 "$report_file")\`" >> "$GITHUB_STEP_SUMMARY"
           {

From fea6b6e999395abfe611218371947f6e2453a77e Mon Sep 17 00:00:00 2001
From: coderdailyone <128658232+coderdailyone@users.noreply.github.com>
Date: Thu, 17 Sep 2026 02:56:58 +0000
Subject: [PATCH 02/28] fix(rag): derive url file suffix from content-type
 media type in load_from_url (#42364)

Co-authored-by: coderdailyone <codecookie@proton.me>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
---
 api/core/rag/extractor/extract_processor.py   |  8 +++---
 .../rag/extractor/test_extract_processor.py   | 26 +++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/api/core/rag/extractor/extract_processor.py b/api/core/rag/extractor/extract_processor.py
index 1d2f98075ef..dd73b436089 100644
--- a/api/core/rag/extractor/extract_processor.py
+++ b/api/core/rag/extractor/extract_processor.py
@@ -83,10 +83,12 @@ class ExtractProcessor:
             suffix = Path(url).suffix
             if not suffix and suffix != ".":
                 # get content-type
-                if response.headers.get("Content-Type"):
-                    suffix = "." + response.headers.get("Content-Type").split("/")[-1]
+                content_type = response.headers.get("Content-Type")
+                if content_type:
+                    # strip parameters such as "; charset=utf-8" before using the subtype as suffix
+                    suffix = "." + content_type.split(";")[0].strip().split("/")[-1]
                 else:
-                    content_disposition = response.headers.get("Content-Disposition")
+                    content_disposition = response.headers.get("Content-Disposition", "")
                     filename_match = re.search(r'filename="([^"]+)"', content_disposition)
                     if filename_match:
                         filename = unquote(filename_match.group(1))
diff --git a/api/tests/unit_tests/core/rag/extractor/test_extract_processor.py b/api/tests/unit_tests/core/rag/extractor/test_extract_processor.py
index 6b81f24fcb8..2f00fda06db 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_extract_processor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_extract_processor.py
@@ -105,6 +105,16 @@ class TestExtractProcessorLoaders:
         [
             ("https://example.com/file.txt", {"Content-Type": "text/plain"}, ".txt"),
             ("https://example.com/no_suffix", {"Content-Type": "application/pdf"}, ".pdf"),
+            (
+                "https://example.com/no_suffix",
+                {"Content-Type": "application/pdf; charset=binary"},
+                ".pdf",
+            ),
+            (
+                "https://example.com/no_suffix",
+                {"Content-Type": "text/html; charset=utf-8"},
+                ".html",
+            ),
             (
                 "https://example.com/no_suffix",
                 {"Content-Disposition": 'attachment; filename="report.md"'},
@@ -115,6 +125,7 @@ class TestExtractProcessorLoaders:
                 {"Content-Disposition": 'attachment; filename="report"'},
                 "",
             ),
+            ("https://example.com/no_suffix", {}, ""),
         ],
     )
     def test_load_from_url_builds_temp_file_with_correct_suffix(
@@ -167,6 +178,21 @@ class TestExtractProcessorLoaders:
         assert args[1] is None
         assert args[2] is None
 
+    def test_load_from_url_routes_parameterized_content_type(self, monkeypatch: pytest.MonkeyPatch):
+        # Servers commonly append parameters such as "; charset=binary" to
+        # Content-Type; the media type must be parsed before deriving the suffix.
+        response = SimpleNamespace(
+            headers={"Content-Type": "application/pdf; charset=binary"}, content=b"%PDF-1.1 body"
+        )
+        monkeypatch.setattr(processor_module.remote_fetcher, "make_request", lambda *args, **kwargs: response)
+        factory = _patch_all_extractors(monkeypatch)
+        apply_config_overrides(monkeypatch, ETL_TYPE="dify")
+
+        text = ExtractProcessor.load_from_url("https://example.com/report", return_text=True)
+
+        assert text == "extracted-by-PdfExtractor"
+        assert factory.calls[-1][0] == "PdfExtractor"
+
 
 class TestExtractProcessorFileRouting:
     @pytest.fixture(autouse=True)

From 47a28bf2622b4050f0736be88da4b04f4e4a88a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=BF=97=E8=B0=A6?=
 <89645338+simpleqt@users.noreply.github.com>
Date: Thu, 17 Sep 2026 03:13:48 +0000
Subject: [PATCH 03/28] fix(api): align the datasource docstrings with their
 signatures (#42369)

Signed-off-by: simpleqt <89645338+simpleqt@users.noreply.github.com>
---
 api/core/datasource/datasource_manager.py           | 2 +-
 api/core/datasource/entities/datasource_entities.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/core/datasource/datasource_manager.py b/api/core/datasource/datasource_manager.py
index f0dcb13b622..b96d98d3f9c 100644
--- a/api/core/datasource/datasource_manager.py
+++ b/api/core/datasource/datasource_manager.py
@@ -115,7 +115,7 @@ class DatasourceManager:
         """
         get the datasource runtime
 
-        :param provider_type: the type of the provider
+        :param datasource_type: the type of the datasource
         :param provider_id: the id of the provider
         :param datasource_name: the name of the datasource
         :param tenant_id: the tenant id
diff --git a/api/core/datasource/entities/datasource_entities.py b/api/core/datasource/entities/datasource_entities.py
index 443b503a693..af9b63ad723 100644
--- a/api/core/datasource/entities/datasource_entities.py
+++ b/api/core/datasource/entities/datasource_entities.py
@@ -93,7 +93,7 @@ class DatasourceParameter(PluginParameter):
         :param required: if the parameter is required
         :param options: the options of the parameter
         """
-        # convert options to ToolParameterOption
+        # convert options to PluginParameterOption
         # FIXME fix the type error
         if options:
             option_objs = [

From f7ed1c017617783daf237378905a8a661e058a4e Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Thu, 17 Sep 2026 03:26:13 +0000
Subject: [PATCH 04/28] fix(ci): preserve system npx in shared web setup
 (#42382)

---
 .github/actions/setup-web/action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/setup-web/action.yml b/.github/actions/setup-web/action.yml
index 01c525bf2e8..1b52e263710 100644
--- a/.github/actions/setup-web/action.yml
+++ b/.github/actions/setup-web/action.yml
@@ -14,5 +14,6 @@ runs:
         node-manager: false
         package-manager: |
           pnpm: false
+          npm: false
         cache: true
         run-install: true

From 8b3c4db9ac4d6475109d6992d8b0848d2fcdb0c7 Mon Sep 17 00:00:00 2001
From: xiaodu55 <1704788159@qq.com>
Date: Thu, 17 Sep 2026 03:38:18 +0000
Subject: [PATCH 05/28] refactor(models): pass session into recommended-app and
 trial-record accessors (#42325)

---
 api/models/model.py                           |  19 ++--
 .../unit_tests/models/test_app_models.py      |   7 +-
 .../test_recommended_app_session_accessors.py | 102 ++++++++++++++++++
 3 files changed, 112 insertions(+), 16 deletions(-)
 create mode 100644 api/tests/unit_tests/models/test_recommended_app_session_accessors.py

diff --git a/api/models/model.py b/api/models/model.py
index 1af4d50c163..79f52eab5a1 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -449,10 +449,6 @@ class App(Base):
     )
     use_icon_as_answer_icon: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.false())
 
-    @property
-    def desc_or_prompt(self) -> str:
-        return self.desc_or_prompt_with_session(session=db.session())
-
     def desc_or_prompt_with_session(self, *, session: Session) -> str:
         if self.description:
             return self.description
@@ -979,9 +975,8 @@ class RecommendedApp(TypeBase):
         init=False,
     )
 
-    @property
-    def app(self) -> App | None:
-        return db.session.scalar(select(App).where(App.id == self.app_id))
+    def app(self, *, session: Session) -> App | None:
+        return session.scalar(select(App).where(App.id == self.app_id))
 
 
 class InstalledApp(TypeBase):
@@ -1054,13 +1049,11 @@ class AccountTrialAppRecord(TypeBase):
         sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
     )
 
-    @property
-    def app(self) -> App | None:
-        return db.session.scalar(select(App).where(App.id == self.app_id))
+    def app(self, *, session: Session) -> App | None:
+        return session.scalar(select(App).where(App.id == self.app_id))
 
-    @property
-    def user(self) -> Account | None:
-        return db.session.scalar(select(Account).where(Account.id == self.account_id))
+    def user(self, *, session: Session) -> Account | None:
+        return session.scalar(select(Account).where(Account.id == self.account_id))
 
 
 class ExporleBanner(TypeBase):
diff --git a/api/tests/unit_tests/models/test_app_models.py b/api/tests/unit_tests/models/test_app_models.py
index 7485031575a..7d0a42ebcb8 100644
--- a/api/tests/unit_tests/models/test_app_models.py
+++ b/api/tests/unit_tests/models/test_app_models.py
@@ -122,8 +122,9 @@ class TestAppModelValidation:
         # Assert
         assert {t.value for t in IconType} == {"image", "emoji", "link"}
 
-    def test_app_desc_or_prompt_with_description(self):
-        """Test desc_or_prompt property when description exists."""
+    @pytest.mark.parametrize("sqlite_session", [(App, AppModelConfig)], indirect=True)
+    def test_app_desc_or_prompt_with_description(self, sqlite_session: Session):
+        """Test desc_or_prompt_with_session when description exists."""
         # Arrange
         app = App(
             tenant_id=str(uuid4()),
@@ -136,7 +137,7 @@ class TestAppModelValidation:
         )
 
         # Act
-        result = app.desc_or_prompt
+        result = app.desc_or_prompt_with_session(session=sqlite_session)
 
         # Assert
         assert result == "App description"
diff --git a/api/tests/unit_tests/models/test_recommended_app_session_accessors.py b/api/tests/unit_tests/models/test_recommended_app_session_accessors.py
new file mode 100644
index 00000000000..e560144b66f
--- /dev/null
+++ b/api/tests/unit_tests/models/test_recommended_app_session_accessors.py
@@ -0,0 +1,102 @@
+"""Regression coverage for the ``@property``→session-parameter refactor on
+``RecommendedApp`` and ``AccountTrialAppRecord``.
+
+The legacy ``@property`` accessors reached for the global ``db.session`` internally and have
+been converted to plain methods taking an explicit ``session: Session`` (per the pattern
+established in #40370/#41394/#41830/#42000, tracked in #40372).
+"""
+
+from uuid import uuid4
+
+from sqlalchemy.orm import Session
+
+from models.account import Account
+from models.model import AccountTrialAppRecord, App, AppMode, RecommendedApp
+
+
+def _persist_app(session: Session) -> App:
+    app = App(
+        tenant_id=str(uuid4()),
+        name="Test App",
+        mode=AppMode.CHAT,
+        enable_site=True,
+        enable_api=False,
+        created_by=str(uuid4()),
+        description="App description",
+    )
+    session.add(app)
+    session.flush()
+    return app
+
+
+def _persist_recommended_app(session: Session, *, app_id: str) -> RecommendedApp:
+    recommended_app = RecommendedApp(
+        app_id=app_id,
+        description={"en_US": "A recommended app"},
+        copyright="Dify",
+        privacy_policy="https://dify.ai/privacy",
+        category="Assistant",
+    )
+    session.add(recommended_app)
+    session.flush()
+    return recommended_app
+
+
+def _persist_account(session: Session) -> Account:
+    account = Account(name="Test User", email=f"user-{uuid4()}@example.com")
+    session.add(account)
+    session.flush()
+    return account
+
+
+def _persist_trial_record(session: Session, *, account_id: str, app_id: str) -> AccountTrialAppRecord:
+    record = AccountTrialAppRecord(account_id=account_id, app_id=app_id, count=1)
+    session.add(record)
+    session.flush()
+    return record
+
+
+class TestRecommendedAppApp:
+    def test_returns_the_matching_app(self, sqlite_session: Session) -> None:
+        app = _persist_app(sqlite_session)
+        recommended_app = _persist_recommended_app(sqlite_session, app_id=app.id)
+
+        result = recommended_app.app(session=sqlite_session)
+
+        assert result is not None
+        assert result.id == app.id
+
+    def test_returns_none_when_app_missing(self, sqlite_session: Session) -> None:
+        recommended_app = _persist_recommended_app(sqlite_session, app_id=str(uuid4()))
+
+        assert recommended_app.app(session=sqlite_session) is None
+
+
+class TestAccountTrialAppRecordAccessors:
+    def test_app_returns_the_matching_app(self, sqlite_session: Session) -> None:
+        app = _persist_app(sqlite_session)
+        record = _persist_trial_record(sqlite_session, account_id=str(uuid4()), app_id=app.id)
+
+        result = record.app(session=sqlite_session)
+
+        assert result is not None
+        assert result.id == app.id
+
+    def test_app_returns_none_when_app_missing(self, sqlite_session: Session) -> None:
+        record = _persist_trial_record(sqlite_session, account_id=str(uuid4()), app_id=str(uuid4()))
+
+        assert record.app(session=sqlite_session) is None
+
+    def test_user_returns_the_matching_account(self, sqlite_session: Session) -> None:
+        account = _persist_account(sqlite_session)
+        record = _persist_trial_record(sqlite_session, account_id=account.id, app_id=str(uuid4()))
+
+        result = record.user(session=sqlite_session)
+
+        assert result is not None
+        assert result.id == account.id
+
+    def test_user_returns_none_when_account_missing(self, sqlite_session: Session) -> None:
+        record = _persist_trial_record(sqlite_session, account_id=str(uuid4()), app_id=str(uuid4()))
+
+        assert record.user(session=sqlite_session) is None

From 4afc3cbd4f3d521c1972cb807c43afbd3f925a7e Mon Sep 17 00:00:00 2001
From: Keith <148296621+keith991001@users.noreply.github.com>
Date: Thu, 17 Sep 2026 03:39:04 +0000
Subject: [PATCH 06/28] refactor(models): drop dead to_dict serializers and
 remaining global-session accessors on dataset models (#42324)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 api/models/dataset.py                         | 153 ------------------
 .../models/test_dataset_models.py             |   4 +-
 .../unit_tests/models/test_dataset_models.py  |  99 +-----------
 3 files changed, 3 insertions(+), 253 deletions(-)

diff --git a/api/models/dataset.py b/api/models/dataset.py
index 28f4ce0ebe5..e0092a09d37 100644
--- a/api/models/dataset.py
+++ b/api/models/dataset.py
@@ -96,67 +96,6 @@ class DatasetBindingItem(TypedDict):
     name: str
 
 
-class ExternalKnowledgeApiDict(TypedDict):
-    id: str
-    tenant_id: str
-    name: str
-    description: str
-    settings: dict[str, Any] | None
-    dataset_bindings: list[DatasetBindingItem]
-    created_by: str
-    created_at: str
-
-
-class DocumentDict(TypedDict):
-    id: str
-    tenant_id: str
-    dataset_id: str
-    position: int
-    data_source_type: str
-    data_source_info: str | None
-    dataset_process_rule_id: str | None
-    batch: str
-    name: str
-    created_from: str
-    created_by: str
-    created_api_request_id: str | None
-    created_at: datetime
-    processing_started_at: datetime | None
-    file_id: str | None
-    word_count: int | None
-    parsing_completed_at: datetime | None
-    cleaning_completed_at: datetime | None
-    splitting_completed_at: datetime | None
-    tokens: int | None
-    indexing_latency: float | None
-    completed_at: datetime | None
-    is_paused: bool | None
-    paused_by: str | None
-    paused_at: datetime | None
-    error: str | None
-    stopped_at: datetime | None
-    indexing_status: str
-    enabled: bool
-    disabled_at: datetime | None
-    disabled_by: str | None
-    archived: bool
-    archived_reason: str | None
-    archived_by: str | None
-    archived_at: datetime | None
-    updated_at: datetime
-    doc_type: str | None
-    doc_metadata: Any
-    doc_form: IndexStructureType
-    doc_language: str | None
-    display_status: str | None
-    data_source_info_dict: dict[str, Any]
-    average_segment_length: int
-    dataset_process_rule: ProcessRuleDict | None
-    dataset: None
-    segment_count: int | None
-    hit_count: int | None
-
-
 from models.enums import PermissionEnum
 
 # Backward-compatible alias — new code should import PermissionEnum from models.enums
@@ -627,16 +566,6 @@ class Document(Base):
                 return result
         return {}
 
-    @property
-    def average_segment_length(self):
-        if self.word_count and self.word_count != 0 and self.segment_count and self.segment_count != 0:
-            return self.word_count // self.segment_count
-        return 0
-
-    @property
-    def dataset_process_rule(self):
-        return self.get_dataset_process_rule(session=db.session())
-
     def get_dataset_process_rule(self, *, session: Session) -> "DatasetProcessRule | None":
         if self.dataset_process_rule_id:
             return session.get(DatasetProcessRule, self.dataset_process_rule_id)
@@ -646,17 +575,9 @@ class Document(Base):
         """Load the owning dataset with the caller-owned database session."""
         return session.get(Dataset, self.dataset_id)
 
-    @property
-    def segment_count(self):
-        return self.get_segment_count(session=db.session())
-
     def get_segment_count(self, *, session: Session) -> int:
         return session.scalar(select(func.count(DocumentSegment.id)).where(DocumentSegment.document_id == self.id)) or 0
 
-    @property
-    def hit_count(self):
-        return self.get_hit_count(session=db.session())
-
     def get_hit_count(self, *, session: Session) -> int:
         return (
             session.scalar(
@@ -707,12 +628,6 @@ class Document(Base):
             return metadata_list
         return None
 
-    @property
-    def process_rule_dict(self) -> ProcessRuleDict | None:
-        if self.dataset_process_rule_id and self.dataset_process_rule:
-            return self.dataset_process_rule.to_dict()
-        return None
-
     def get_built_in_fields(self, *, session: Session) -> list[DocMetadataDetailItem]:
         built_in_fields: list[DocMetadataDetailItem] = []
         built_in_fields.append(
@@ -757,58 +672,6 @@ class Document(Base):
         )
         return built_in_fields
 
-    def to_dict(self) -> DocumentDict:
-        result: DocumentDict = {
-            "id": self.id,
-            "tenant_id": self.tenant_id,
-            "dataset_id": self.dataset_id,
-            "position": self.position,
-            "data_source_type": self.data_source_type,
-            "data_source_info": self.data_source_info,
-            "dataset_process_rule_id": self.dataset_process_rule_id,
-            "batch": self.batch,
-            "name": self.name,
-            "created_from": self.created_from,
-            "created_by": self.created_by,
-            "created_api_request_id": self.created_api_request_id,
-            "created_at": self.created_at,
-            "processing_started_at": self.processing_started_at,
-            "file_id": self.file_id,
-            "word_count": self.word_count,
-            "parsing_completed_at": self.parsing_completed_at,
-            "cleaning_completed_at": self.cleaning_completed_at,
-            "splitting_completed_at": self.splitting_completed_at,
-            "tokens": self.tokens,
-            "indexing_latency": self.indexing_latency,
-            "completed_at": self.completed_at,
-            "is_paused": self.is_paused,
-            "paused_by": self.paused_by,
-            "paused_at": self.paused_at,
-            "error": self.error,
-            "stopped_at": self.stopped_at,
-            "indexing_status": self.indexing_status,
-            "enabled": self.enabled,
-            "disabled_at": self.disabled_at,
-            "disabled_by": self.disabled_by,
-            "archived": self.archived,
-            "archived_reason": self.archived_reason,
-            "archived_by": self.archived_by,
-            "archived_at": self.archived_at,
-            "updated_at": self.updated_at,
-            "doc_type": self.doc_type,
-            "doc_metadata": self.doc_metadata,
-            "doc_form": self.doc_form,
-            "doc_language": self.doc_language,
-            "display_status": self.display_status,
-            "data_source_info_dict": self.data_source_info_dict,
-            "average_segment_length": self.average_segment_length,
-            "dataset_process_rule": self.dataset_process_rule.to_dict() if self.dataset_process_rule else None,
-            "dataset": None,
-            "segment_count": self.segment_count,
-            "hit_count": self.hit_count,
-        }
-        return result
-
     @classmethod
     def from_dict(cls, data: dict[str, Any]):
         return cls(
@@ -1408,18 +1271,6 @@ class ExternalKnowledgeApis(TypeBase):
         DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp(), init=False
     )
 
-    def to_dict(self) -> ExternalKnowledgeApiDict:
-        return {
-            "id": self.id,
-            "tenant_id": self.tenant_id,
-            "name": self.name,
-            "description": self.description,
-            "settings": self.settings_dict,
-            "dataset_bindings": self.dataset_bindings,
-            "created_by": self.created_by,
-            "created_at": self.created_at.isoformat(),
-        }
-
     @property
     def settings_dict(self) -> dict[str, Any] | None:
         try:
@@ -1427,10 +1278,6 @@ class ExternalKnowledgeApis(TypeBase):
         except JSONDecodeError:
             return None
 
-    @property
-    def dataset_bindings(self):
-        return self.get_dataset_bindings(session=db.session())
-
     def get_dataset_bindings(self, *, session: Session) -> list[DatasetBindingItem]:
         external_knowledge_bindings = session.scalars(
             select(ExternalKnowledgeBindings).where(ExternalKnowledgeBindings.external_knowledge_api_id == self.id)
diff --git a/api/tests/test_containers_integration_tests/models/test_dataset_models.py b/api/tests/test_containers_integration_tests/models/test_dataset_models.py
index 0f25a543c9c..73097625552 100644
--- a/api/tests/test_containers_integration_tests/models/test_dataset_models.py
+++ b/api/tests/test_containers_integration_tests/models/test_dataset_models.py
@@ -228,7 +228,7 @@ class TestDatasetDocumentProperties:
             db_session_with_containers.add(seg)
         db_session_with_containers.flush()
 
-        assert doc.segment_count == 3
+        assert doc.get_segment_count(session=db_session_with_containers) == 3
 
     def test_document_hit_count_aggregation(self, db_session_with_containers: Session) -> None:
         """Test document can aggregate hit count from segments."""
@@ -269,7 +269,7 @@ class TestDatasetDocumentProperties:
             db_session_with_containers.add(seg)
         db_session_with_containers.flush()
 
-        assert doc.hit_count == 25
+        assert doc.get_hit_count(session=db_session_with_containers) == 25
 
 
 class TestDocumentSegmentNavigationProperties:
diff --git a/api/tests/unit_tests/models/test_dataset_models.py b/api/tests/unit_tests/models/test_dataset_models.py
index 2ca01cf44f9..77e36f10f63 100644
--- a/api/tests/unit_tests/models/test_dataset_models.py
+++ b/api/tests/unit_tests/models/test_dataset_models.py
@@ -17,12 +17,11 @@ from urllib.parse import parse_qs, urlparse
 from uuid import uuid4
 
 import pytest
-from sqlalchemy.orm import Session, scoped_session, sessionmaker
+from sqlalchemy.orm import Session
 
 from core.rag.entities import ParentMode
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
 from extensions.storage.storage_type import StorageType
-from models import dataset as dataset_module
 from models.account import Account
 from models.dataset import (
     AppDatasetJoin,
@@ -821,59 +820,6 @@ class TestDocumentModelRelationships:
 
         assert document.get_dataset(session=sqlite_session) is dataset
 
-    @pytest.mark.parametrize("sqlite_session", [(Document, DocumentSegment)], indirect=True)
-    def test_document_average_segment_length(
-        self,
-        sqlite_session: Session,
-        sqlite_session_factory: sessionmaker[Session],
-        monkeypatch: pytest.MonkeyPatch,
-    ):
-        """Test average_segment_length property calculation."""
-        # Arrange
-        document = Document(
-            tenant_id=str(uuid4()),
-            dataset_id=str(uuid4()),
-            position=1,
-            data_source_type=DataSourceType.UPLOAD_FILE,
-            batch="batch_001",
-            name="test.pdf",
-            created_from=DocumentCreatedFrom.WEB,
-            created_by=str(uuid4()),
-            word_count=1000,
-        )
-        sqlite_session.add(document)
-        sqlite_session.flush()
-        sqlite_session.add_all(_make_segments(document, [0] * 10))
-        sqlite_session.commit()
-        monkeypatch.setattr(dataset_module.db, "session", scoped_session(sqlite_session_factory))
-
-        # Act
-        result = document.average_segment_length
-
-        # Assert
-        assert result == 100
-
-    def test_document_average_segment_length_zero(self):
-        """Test average_segment_length property when word_count is zero."""
-        # Arrange
-        document = Document(
-            tenant_id=str(uuid4()),
-            dataset_id=str(uuid4()),
-            position=1,
-            data_source_type=DataSourceType.UPLOAD_FILE,
-            batch="batch_001",
-            name="test.pdf",
-            created_from=DocumentCreatedFrom.WEB,
-            created_by=str(uuid4()),
-            word_count=0,
-        )
-
-        # Act
-        result = document.average_segment_length
-
-        # Assert
-        assert result == 0
-
 
 class TestDocumentSegmentIndexing:
     """Test suite for DocumentSegment model indexing and operations."""
@@ -1573,49 +1519,6 @@ class TestModelIntegration:
         assert document.word_count == 100
         assert segment.status == SegmentStatus.COMPLETED
 
-    @pytest.mark.parametrize("sqlite_session", [(Document, DocumentSegment)], indirect=True)
-    def test_document_to_dict_serialization(
-        self,
-        sqlite_session: Session,
-        sqlite_session_factory: sessionmaker[Session],
-        monkeypatch: pytest.MonkeyPatch,
-    ):
-        """Test document to_dict method for serialization."""
-        # Arrange
-        tenant_id = str(uuid4())
-        dataset_id = str(uuid4())
-        created_by = str(uuid4())
-
-        document = Document(
-            tenant_id=tenant_id,
-            dataset_id=dataset_id,
-            position=1,
-            data_source_type=DataSourceType.UPLOAD_FILE,
-            batch="batch_001",
-            name="test.pdf",
-            created_from=DocumentCreatedFrom.WEB,
-            created_by=created_by,
-            word_count=100,
-            indexing_status=IndexingStatus.COMPLETED,
-        )
-        sqlite_session.add(document)
-        sqlite_session.flush()
-        sqlite_session.add_all(_make_segments(document, [2, 2, 2, 2, 2]))
-        sqlite_session.commit()
-        monkeypatch.setattr(dataset_module.db, "session", scoped_session(sqlite_session_factory))
-
-        # Act
-        result = document.to_dict()
-
-        # Assert
-        assert result["tenant_id"] == tenant_id
-        assert result["dataset_id"] == dataset_id
-        assert result["name"] == "test.pdf"
-        assert result["word_count"] == 100
-        assert result["indexing_status"] == IndexingStatus.COMPLETED
-        assert result["segment_count"] == 5
-        assert result["hit_count"] == 10
-
 
 class TestChildChunkSessionAccessors:
     """Regression coverage for the ``ChildChunk`` accessors refactored to take a caller-provided session.

From f66773b63ce0dbe7a74cd51a05ba89a66415f3d5 Mon Sep 17 00:00:00 2001
From: Eddy ZHANG <eddy.zhang24@gmail.com>
Date: Thu, 17 Sep 2026 03:40:50 +0000
Subject: [PATCH 07/28] refactor(api): dep-inject the last three GET query
 models with @model_validate (#42318)

---
 api/controllers/console/auth/activate.py      |  5 +-
 api/controllers/files/upload_file_delivery.py | 16 ++--
 .../console/auth/test_account_activation.py   | 19 +++-
 .../files/test_upload_file_delivery.py        | 92 +++++++++++--------
 4 files changed, 83 insertions(+), 49 deletions(-)

diff --git a/api/controllers/console/auth/activate.py b/api/controllers/console/auth/activate.py
index 69ed1899f2e..685342d5a67 100644
--- a/api/controllers/console/auth/activate.py
+++ b/api/controllers/console/auth/activate.py
@@ -7,6 +7,7 @@ from controllers.common.schema import query_params_from_model, register_schema_m
 from controllers.console import console_ns
 from controllers.console.auth.error import InvitationAccountMismatchError as InvitationAccountMismatchHTTPError
 from controllers.console.error import AccountInFreezeError, AlreadyActivateError, EmailDomainSuspendedError
+from controllers.console.wraps import model_validate
 from extensions.ext_application_services import application_services
 from libs.helper import EmailStr, dump_response, timezone
 from libs.login import current_account_with_tenant
@@ -88,8 +89,8 @@ class ActivateCheckApi(Resource):
         "Success",
         console_ns.models[ActivationCheckResponse.__name__],
     )
-    def get(self):
-        args = ActivateCheckQuery.model_validate(request.args.to_dict(flat=True))
+    @model_validate(ActivateCheckQuery)
+    def get(self, args: ActivateCheckQuery):
         result = application_services().account_activation.check(
             InvitationLookup(
                 workspace_id=args.workspace_id,
diff --git a/api/controllers/files/upload_file_delivery.py b/api/controllers/files/upload_file_delivery.py
index 044e2c1a8fa..e1424d383d7 100644
--- a/api/controllers/files/upload_file_delivery.py
+++ b/api/controllers/files/upload_file_delivery.py
@@ -2,7 +2,7 @@ import os
 from urllib.parse import quote
 from uuid import UUID
 
-from flask import Response, request
+from flask import Response
 from flask_restx import Resource
 from pydantic import BaseModel, Field
 from werkzeug.exceptions import NotFound
@@ -10,6 +10,7 @@ from werkzeug.exceptions import NotFound
 from controllers.common.errors import UnsupportedFileTypeError
 from controllers.common.file_response import enforce_download_for_html
 from controllers.common.schema import query_params_from_model, register_schema_models
+from controllers.console.wraps import model_validate
 from controllers.files import files_ns
 from extensions.ext_application_services import application_services
 from services.errors.file import UnsupportedFileTypeError as UnsupportedFileTypeServiceError
@@ -74,13 +75,13 @@ class ImagePreviewApi(Resource):
     @files_ns.doc(
         responses={
             200: "Image preview returned successfully",
-            400: "Missing or invalid query parameters",
             404: "File not found or signature is invalid",
             415: "Unsupported file type",
+            422: "Missing or invalid query parameters",
         }
     )
-    def get(self, file_id: UUID) -> Response:
-        args = FileSignatureQuery.model_validate(request.args.to_dict(flat=True))
+    @model_validate(FileSignatureQuery)
+    def get(self, args: FileSignatureQuery, file_id: UUID) -> Response:
         try:
             delivery = application_services().upload_file_delivery.get_signed_image_preview(
                 file_id=str(file_id),
@@ -109,13 +110,12 @@ class FilePreviewApi(Resource):
     @files_ns.doc(
         responses={
             200: "File stream returned successfully",
-            400: "Missing or invalid query parameters",
             404: "File not found or signature is invalid",
+            422: "Missing or invalid query parameters",
         }
     )
-    def get(self, file_id: UUID) -> Response:
-        args = FilePreviewQuery.model_validate(request.args.to_dict(flat=True))
-
+    @model_validate(FilePreviewQuery)
+    def get(self, args: FilePreviewQuery, file_id: UUID) -> Response:
         try:
             delivery = application_services().upload_file_delivery.get_signed_file_preview(
                 file_id=str(file_id),
diff --git a/api/tests/unit_tests/controllers/console/auth/test_account_activation.py b/api/tests/unit_tests/controllers/console/auth/test_account_activation.py
index 6f5ba50e56a..f3ca84a309f 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_account_activation.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_account_activation.py
@@ -6,6 +6,7 @@ from unittest.mock import Mock, patch
 
 import pytest
 from flask import Flask
+from werkzeug.exceptions import UnprocessableEntity
 
 from controllers.console.auth.activate import ActivateApi, ActivateCheckApi
 from controllers.console.auth.error import InvitationAccountMismatchError as InvitationAccountMismatchHTTPError
@@ -74,7 +75,7 @@ class TestActivateCheckApi:
                 return_value=_services(activation_service),
             ),
         ):
-            response = unwrap(ActivateCheckApi.get)(ActivateCheckApi())
+            response = ActivateCheckApi().get()
 
         assert response == {
             "is_valid": True,
@@ -104,10 +105,24 @@ class TestActivateCheckApi:
                 return_value=_services(activation_service),
             ),
         ):
-            response = unwrap(ActivateCheckApi.get)(ActivateCheckApi())
+            response = ActivateCheckApi().get()
 
         assert response == {"is_valid": False}
 
+    def test_rejects_request_without_token(self, app: Flask, activation_service: Mock) -> None:
+        """`token` is required, so a tokenless query must not reach the application service."""
+        with (
+            app.test_request_context("/activate/check?workspace_id=workspace-123"),
+            patch(
+                "controllers.console.auth.activate.application_services",
+                return_value=_services(activation_service),
+            ),
+            pytest.raises(UnprocessableEntity),
+        ):
+            ActivateCheckApi().get()
+
+        activation_service.check.assert_not_called()
+
 
 class TestActivateApi:
     def test_passes_parsed_command_to_application_service(
diff --git a/api/tests/unit_tests/controllers/files/test_upload_file_delivery.py b/api/tests/unit_tests/controllers/files/test_upload_file_delivery.py
index b390c526ac4..fcb05f3f564 100644
--- a/api/tests/unit_tests/controllers/files/test_upload_file_delivery.py
+++ b/api/tests/unit_tests/controllers/files/test_upload_file_delivery.py
@@ -1,9 +1,9 @@
-import types
 from inspect import unwrap
 from unittest.mock import patch
 
 import pytest
-from werkzeug.exceptions import NotFound
+from flask import Flask
+from werkzeug.exceptions import NotFound, UnprocessableEntity
 
 import controllers.files.upload_file_delivery as module
 from services.errors.file import UnsupportedFileTypeError as UnsupportedFileTypeServiceError
@@ -34,18 +34,17 @@ def _delivery(
     )
 
 
-def _fake_request(args: dict[str, object]):
-    return types.SimpleNamespace(args=types.SimpleNamespace(to_dict=lambda **_kwargs: args))
+_SIGNED_QUERY = "/?timestamp=123&nonce=abc&sign=sig"
 
 
 class TestImagePreviewApi:
     @patch.object(module, "application_services")
-    def test_success(self, mock_application_services):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig"})
+    def test_success(self, mock_application_services, app: Flask):
         service = mock_application_services.return_value.upload_file_delivery
         service.get_signed_image_preview.return_value = _delivery(mime_type="image/png", extension="png")
 
-        response = unwrap(module.ImagePreviewApi().get)("file-id")
+        with app.test_request_context(_SIGNED_QUERY):
+            response = module.ImagePreviewApi().get("file-id")
 
         assert response.mimetype == "image/png"
         service.get_signed_image_preview.assert_called_once_with(
@@ -56,31 +55,39 @@ class TestImagePreviewApi:
         )
 
     @patch.object(module, "application_services")
-    def test_not_found(self, mock_application_services):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig"})
+    def test_not_found(self, mock_application_services, app: Flask):
         service = mock_application_services.return_value.upload_file_delivery
         service.get_signed_image_preview.side_effect = UploadFileDeliveryNotFoundError(
             "File not found or signature is invalid"
         )
 
-        with pytest.raises(NotFound, match="File not found or signature is invalid"):
-            unwrap(module.ImagePreviewApi().get)("file-id")
+        with (
+            app.test_request_context(_SIGNED_QUERY),
+            pytest.raises(NotFound, match="File not found or signature is invalid"),
+        ):
+            module.ImagePreviewApi().get("file-id")
 
     @patch.object(module, "application_services")
-    def test_unsupported_file_type(self, mock_application_services):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig"})
+    def test_unsupported_file_type(self, mock_application_services, app: Flask):
         service = mock_application_services.return_value.upload_file_delivery
         service.get_signed_image_preview.side_effect = UnsupportedFileTypeServiceError()
 
-        with pytest.raises(module.UnsupportedFileTypeError):
-            unwrap(module.ImagePreviewApi().get)("file-id")
+        with app.test_request_context(_SIGNED_QUERY), pytest.raises(module.UnsupportedFileTypeError):
+            module.ImagePreviewApi().get("file-id")
+
+    @patch.object(module, "application_services")
+    def test_missing_signature_params_are_rejected(self, mock_application_services, app: Flask):
+        """An incomplete signature must fail validation before the service is reached."""
+        with app.test_request_context("/?timestamp=123"), pytest.raises(UnprocessableEntity):
+            module.ImagePreviewApi().get("file-id")
+
+        mock_application_services.return_value.upload_file_delivery.get_signed_image_preview.assert_not_called()
 
 
 class TestFilePreviewApi:
     @patch.object(module, "enforce_download_for_html")
     @patch.object(module, "application_services")
-    def test_inline_preview_uses_file_metadata(self, mock_application_services, mock_enforce):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig", "as_attachment": False})
+    def test_inline_preview_uses_file_metadata(self, mock_application_services, mock_enforce, app: Flask):
         service = mock_application_services.return_value.upload_file_delivery
         service.get_signed_file_preview.return_value = _delivery(
             mime_type="application/pdf",
@@ -89,7 +96,8 @@ class TestFilePreviewApi:
             extension="pdf",
         )
 
-        response = unwrap(module.FilePreviewApi().get)("file-id")
+        with app.test_request_context(_SIGNED_QUERY):
+            response = module.FilePreviewApi().get("file-id")
 
         assert response.mimetype == "application/pdf"
         assert response.headers["Content-Type"] == "application/pdf"
@@ -103,25 +111,25 @@ class TestFilePreviewApi:
         )
 
     @patch.object(module, "application_services")
-    def test_audio_preview_supports_ranges(self, mock_application_services):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig", "as_attachment": False})
+    def test_audio_preview_supports_ranges(self, mock_application_services, app: Flask):
         mock_application_services.return_value.upload_file_delivery.get_signed_file_preview.return_value = _delivery(
             mime_type="audio/mpeg",
             extension="mp3",
         )
 
-        response = unwrap(module.FilePreviewApi().get)("file-id")
+        with app.test_request_context(_SIGNED_QUERY):
+            response = module.FilePreviewApi().get("file-id")
 
         assert response.headers["Accept-Ranges"] == "bytes"
 
     @patch.object(module, "application_services")
-    def test_zero_size_omits_content_length(self, mock_application_services):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig", "as_attachment": False})
+    def test_zero_size_omits_content_length(self, mock_application_services, app: Flask):
         mock_application_services.return_value.upload_file_delivery.get_signed_file_preview.return_value = _delivery(
             size=0
         )
 
-        response = unwrap(module.FilePreviewApi().get)("file-id")
+        with app.test_request_context(_SIGNED_QUERY):
+            response = module.FilePreviewApi().get("file-id")
 
         assert "Content-Length" not in response.headers
 
@@ -135,8 +143,7 @@ class TestFilePreviewApi:
         ids=("mime-type", "filename", "extension"),
     )
     @patch.object(module, "application_services")
-    def test_svg_preview_forces_download(self, mock_application_services, mime_type, name, extension):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig", "as_attachment": False})
+    def test_svg_preview_forces_download(self, mock_application_services, mime_type, name, extension, app: Flask):
         mock_application_services.return_value.upload_file_delivery.get_signed_file_preview.return_value = _delivery(
             mime_type=mime_type,
             size=11,
@@ -144,15 +151,15 @@ class TestFilePreviewApi:
             extension=extension,
         )
 
-        response = unwrap(module.FilePreviewApi().get)("file-id")
+        with app.test_request_context(_SIGNED_QUERY):
+            response = module.FilePreviewApi().get("file-id")
 
         assert response.headers["Content-Disposition"].startswith("attachment")
         assert response.headers["Content-Type"] == "application/octet-stream"
         assert response.headers["X-Content-Type-Options"] == "nosniff"
 
     @patch.object(module, "application_services")
-    def test_html_preview_still_forces_download(self, mock_application_services):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig", "as_attachment": False})
+    def test_html_preview_still_forces_download(self, mock_application_services, app: Flask):
         mock_application_services.return_value.upload_file_delivery.get_signed_file_preview.return_value = _delivery(
             mime_type="text/html",
             size=25,
@@ -160,35 +167,46 @@ class TestFilePreviewApi:
             extension="html",
         )
 
-        response = unwrap(module.FilePreviewApi().get)("file-id")
+        with app.test_request_context(_SIGNED_QUERY):
+            response = module.FilePreviewApi().get("file-id")
 
         assert response.headers["Content-Disposition"].startswith("attachment")
         assert response.headers["Content-Type"] == "application/octet-stream"
         assert response.headers["X-Content-Type-Options"] == "nosniff"
 
     @patch.object(module, "application_services")
-    def test_as_attachment_encodes_filename(self, mock_application_services):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig", "as_attachment": True})
+    def test_as_attachment_encodes_filename(self, mock_application_services, app: Flask):
         mock_application_services.return_value.upload_file_delivery.get_signed_file_preview.return_value = _delivery(
             mime_type="application/pdf",
             name="报告.pdf",
             extension="pdf",
         )
 
-        response = unwrap(module.FilePreviewApi().get)("file-id")
+        with app.test_request_context(f"{_SIGNED_QUERY}&as_attachment=true"):
+            response = module.FilePreviewApi().get("file-id")
 
         assert response.headers["Content-Disposition"] == "attachment; filename*=UTF-8''%E6%8A%A5%E5%91%8A.pdf"
         assert response.headers["Content-Type"] == "application/octet-stream"
 
     @patch.object(module, "application_services")
-    def test_not_found(self, mock_application_services):
-        module.request = _fake_request({"timestamp": "123", "nonce": "abc", "sign": "sig", "as_attachment": False})
+    def test_not_found(self, mock_application_services, app: Flask):
         mock_application_services.return_value.upload_file_delivery.get_signed_file_preview.side_effect = (
             UploadFileDeliveryNotFoundError("File not found or signature is invalid")
         )
 
-        with pytest.raises(NotFound, match="File not found or signature is invalid"):
-            unwrap(module.FilePreviewApi().get)("file-id")
+        with (
+            app.test_request_context(_SIGNED_QUERY),
+            pytest.raises(NotFound, match="File not found or signature is invalid"),
+        ):
+            module.FilePreviewApi().get("file-id")
+
+    @patch.object(module, "application_services")
+    def test_missing_signature_params_are_rejected(self, mock_application_services, app: Flask):
+        """An incomplete signature must fail validation before the service is reached."""
+        with app.test_request_context("/?nonce=abc"), pytest.raises(UnprocessableEntity):
+            module.FilePreviewApi().get("file-id")
+
+        mock_application_services.return_value.upload_file_delivery.get_signed_file_preview.assert_not_called()
 
 
 class TestWorkspaceWebappLogoApi:

From 66bf75d1d8c066d9f81b3306f58ee69a7cd62d82 Mon Sep 17 00:00:00 2001
From: "Syrinx." <1821287165@qq.com>
Date: Thu, 17 Sep 2026 03:41:45 +0000
Subject: [PATCH 08/28] refactor(models): pass session into
 AppMCPServer.generate_server_code (#42316)

---
 api/controllers/console/app/mcp_server.py     |  4 +-
 api/models/model.py                           |  4 +-
 .../console/app/test_mcp_server_response.py   | 12 +++---
 .../test_app_mcp_server_session_accessors.py  | 39 +++++++++++++++++++
 4 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 api/tests/unit_tests/models/test_app_mcp_server_session_accessors.py

diff --git a/api/controllers/console/app/mcp_server.py b/api/controllers/console/app/mcp_server.py
index 8a6ab77b3dd..d6615124cb3 100644
--- a/api/controllers/console/app/mcp_server.py
+++ b/api/controllers/console/app/mcp_server.py
@@ -123,7 +123,7 @@ class AppMCPServerController(Resource):
             status=AppMCPServerStatus.ACTIVE,
             app_id=app_model.id,
             tenant_id=current_tenant_id,
-            server_code=AppMCPServer.generate_server_code(16),
+            server_code=AppMCPServer.generate_server_code(16, session=db.session()),
         )
         db.session.add(server)
         db.session.commit()
@@ -201,6 +201,6 @@ class AppMCPServerRefreshController(Resource):
         )
         if not server:
             raise NotFound()
-        server.server_code = AppMCPServer.generate_server_code(16)
+        server.server_code = AppMCPServer.generate_server_code(16, session=db.session())
         db.session.commit()
         return dump_response(AppMCPServerResponse, server)
diff --git a/api/models/model.py b/api/models/model.py
index 79f52eab5a1..2bb8dfc35bc 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -2167,11 +2167,11 @@ class AppMCPServer(TypeBase):
     )
 
     @staticmethod
-    def generate_server_code(n: int) -> str:
+    def generate_server_code(n: int, *, session: Session) -> str:
         while True:
             result = generate_string(n)
             while (
-                db.session.scalar(select(func.count(AppMCPServer.id)).where(AppMCPServer.server_code == result)) or 0
+                session.scalar(select(func.count(AppMCPServer.id)).where(AppMCPServer.server_code == result)) or 0
             ) > 0:
                 result = generate_string(n)
 
diff --git a/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py b/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py
index 5db0cbe2a4c..0f53d0de7d8 100644
--- a/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py
+++ b/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py
@@ -5,7 +5,7 @@ from unittest.mock import patch
 import pytest
 from flask import Flask
 from sqlalchemy import select
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, scoped_session, sessionmaker
 from werkzeug.exceptions import NotFound
 
 from controllers.console import console_ns
@@ -156,7 +156,7 @@ class TestAppMCPServerController:
 
         assert response == {}
 
-    def test_post_returns_201(self, sqlite_session: Session) -> None:
+    def test_post_returns_201(self, sqlite_session: Session, sqlite_session_factory: sessionmaker[Session]) -> None:
         api = AppMCPServerController()
         method = unwrap(api.post)
         payload = {"parameters": {"timeout": 30}}
@@ -166,7 +166,7 @@ class TestAppMCPServerController:
 
         with (
             app.test_request_context("/", json=payload),
-            patch("controllers.console.app.mcp_server.db.session", sqlite_session),
+            patch("controllers.console.app.mcp_server.db.session", scoped_session(sqlite_session_factory)),
             patch("controllers.console.app.mcp_server.AppMCPServer.generate_server_code", return_value="server-code"),
         ):
             response, status_code = method(
@@ -257,7 +257,9 @@ class TestAppMCPServerController:
 
 
 class TestAppMCPServerRefreshController:
-    def test_post_refreshes_server_bound_to_app_and_tenant(self, sqlite_session: Session) -> None:
+    def test_post_refreshes_server_bound_to_app_and_tenant(
+        self, sqlite_session: Session, sqlite_session_factory: sessionmaker[Session]
+    ) -> None:
         api = AppMCPServerRefreshController()
         method = unwrap(api.post)
         server = _server(server_code="old-code")
@@ -270,7 +272,7 @@ class TestAppMCPServerRefreshController:
         sqlite_session.commit()
 
         with (
-            patch("controllers.console.app.mcp_server.db.session", sqlite_session),
+            patch("controllers.console.app.mcp_server.db.session", scoped_session(sqlite_session_factory)),
             patch("controllers.console.app.mcp_server.AppMCPServer.generate_server_code", return_value="new-code"),
         ):
             response = method(api, "tenant-1", app_model=_app())
diff --git a/api/tests/unit_tests/models/test_app_mcp_server_session_accessors.py b/api/tests/unit_tests/models/test_app_mcp_server_session_accessors.py
new file mode 100644
index 00000000000..376dea85b86
--- /dev/null
+++ b/api/tests/unit_tests/models/test_app_mcp_server_session_accessors.py
@@ -0,0 +1,39 @@
+"""Regression coverage for the ``db.session``→session-parameter refactor on
+``AppMCPServer.generate_server_code``.
+
+The static method reached for the global ``db.session`` internally and has been converted to
+take an explicit ``session: Session`` (per the pattern established in #40370/#40797/#41394,
+tracked in #40372).
+"""
+
+from unittest.mock import patch
+from uuid import uuid4
+
+from sqlalchemy.orm import Session
+
+from models.enums import AppMCPServerStatus
+from models.model import AppMCPServer
+
+
+def _persist_server(session: Session, *, server_code: str) -> AppMCPServer:
+    server = AppMCPServer(
+        tenant_id=str(uuid4()),
+        app_id=str(uuid4()),
+        name="Test MCP Server",
+        description="Test server",
+        server_code=server_code,
+        status=AppMCPServerStatus.ACTIVE,
+        parameters="{}",
+    )
+    session.add(server)
+    session.flush()
+    return server
+
+
+def test_generate_server_code_retries_a_taken_code_through_the_given_session(sqlite_session: Session) -> None:
+    _persist_server(sqlite_session, server_code="taken-code")
+
+    with patch("models.model.generate_string", side_effect=["taken-code", "fresh-code"]):
+        result = AppMCPServer.generate_server_code(16, session=sqlite_session)
+
+    assert result == "fresh-code"

From ff18b6de092178900ea4dcbeb0526147a1ec1a0e Mon Sep 17 00:00:00 2001
From: "Syrinx." <1821287165@qq.com>
Date: Thu, 17 Sep 2026 03:42:31 +0000
Subject: [PATCH 09/28] refactor(console): dep-inject the snippet
 draft-variable query with @model_validate (#42315)

---
 .../console/snippets/snippet_workflow_draft_variable.py  | 9 +++++----
 .../snippets/test_snippet_workflow_draft_variable.py     | 9 +++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/api/controllers/console/snippets/snippet_workflow_draft_variable.py b/api/controllers/console/snippets/snippet_workflow_draft_variable.py
index ebf456edf5c..7091cd24c24 100644
--- a/api/controllers/console/snippets/snippet_workflow_draft_variable.py
+++ b/api/controllers/console/snippets/snippet_workflow_draft_variable.py
@@ -14,7 +14,7 @@ from collections.abc import Callable
 from functools import wraps
 from typing import Any, Concatenate
 
-from flask import Response, request
+from flask import Response
 from flask_restx import Resource
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -106,9 +106,10 @@ class SnippetWorkflowVariableCollectionApi(Resource):
         console_ns.models[WorkflowDraftVariableListWithoutValueResponse.__name__],
     )
     @_snippet_draft_var_prerequisite
-    def get(self, current_user: Account, snippet: CustomizedSnippet) -> dict[str, Any]:
-        args = WorkflowDraftVariableListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
-
+    @model_validate(WorkflowDraftVariableListQuery)
+    def get(
+        self, args: WorkflowDraftVariableListQuery, current_user: Account, snippet: CustomizedSnippet
+    ) -> dict[str, Any]:
         snippet_service = _snippet_service()
         if snippet_service.get_draft_workflow(snippet=snippet) is None:
             raise DraftWorkflowNotExist()
diff --git a/api/tests/unit_tests/controllers/console/snippets/test_snippet_workflow_draft_variable.py b/api/tests/unit_tests/controllers/console/snippets/test_snippet_workflow_draft_variable.py
index 3d7d8900c94..fb41206f65c 100644
--- a/api/tests/unit_tests/controllers/console/snippets/test_snippet_workflow_draft_variable.py
+++ b/api/tests/unit_tests/controllers/console/snippets/test_snippet_workflow_draft_variable.py
@@ -187,9 +187,14 @@ def test_variable_collection_get_raises_when_draft_workflow_missing(
     api = module.SnippetWorkflowVariableCollectionApi()
     handler = unwrap(api.get)
 
-    with app.test_request_context("/?page=1&limit=20"):
+    with app.test_request_context("/"):
         with pytest.raises(module.DraftWorkflowNotExist):
-            handler(api, _make_account(), snippet=SimpleNamespace(id="snippet-1"))
+            handler(
+                api,
+                module.WorkflowDraftVariableListQuery(page=1, limit=20),
+                _make_account(),
+                snippet=SimpleNamespace(id="snippet-1"),
+            )
 
 
 def test_node_variable_collection_get_lists_persisted_node_variables(

From 1203aa72c1086e11a74652c283161c821cbe8cf2 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Thu, 17 Sep 2026 03:45:32 +0000
Subject: [PATCH 10/28] perf(api): avoid duplicate Redis client scans in unit
 tests (#42379)

---
 api/tests/unit_tests/conftest.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/api/tests/unit_tests/conftest.py b/api/tests/unit_tests/conftest.py
index 9ca5f9774e6..7b4dff1cf76 100644
--- a/api/tests/unit_tests/conftest.py
+++ b/api/tests/unit_tests/conftest.py
@@ -70,7 +70,7 @@ def _provide_app_context(app: Flask) -> Iterator[None]:
 
 @pytest.fixture(autouse=True)
 def _patch_redis_clients() -> Iterator[None]:
-    """Patch redis_client to MagicMock only for unit test executions."""
+    """Patch and rebind loaded Redis clients to the shared mock for each unit test."""
 
     with (
         patch.object(ext_redis, "redis_client", redis_mock),
@@ -81,8 +81,8 @@ def _patch_redis_clients() -> Iterator[None]:
 
 
 @pytest.fixture(autouse=True)
-def reset_redis_mock() -> None:
-    """reset the Redis mock before each test"""
+def reset_redis_mock(_patch_redis_clients: None) -> None:
+    """Reset the shared Redis mock after per-test client rebinding."""
     redis_mock.reset_mock()
     redis_mock.get.return_value = None
     redis_mock.setex.return_value = None
@@ -95,9 +95,6 @@ def reset_redis_mock() -> None:
     redis_mock.hdel.return_value = None
     redis_mock.incr.return_value = 1
 
-    # Keep any imported modules pointing at the mock between tests
-    _patch_redis_clients_on_loaded_modules()
-
 
 @pytest.fixture(autouse=True)
 def reset_secret_key(monkeypatch: pytest.MonkeyPatch) -> None:

From 8006e8e13ded60ce8e751b76dc63a5c038dae595 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Thu, 17 Sep 2026 04:04:25 +0000
Subject: [PATCH 11/28] ci: reduce API unit tests to three shards (#42390)

---
 .github/workflows/api-tests.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml
index 1e0d0b8f541..15c245ff4e9 100644
--- a/.github/workflows/api-tests.yml
+++ b/.github/workflows/api-tests.yml
@@ -31,9 +31,8 @@ jobs:
           - 1
           - 2
           - 3
-          - 4
         shardTotal:
-          - 4
+          - 3
 
     steps:
       - name: Checkout code
@@ -200,8 +199,8 @@ jobs:
 
           mapfile -t unit_coverage < <(find coverage-data -type f -name 'coverage-unit-*' -print | sort)
           mapfile -t integration_coverage < <(find coverage-data -type f -name 'coverage-integration-*' -print | sort)
-          if [[ "${#unit_coverage[@]}" -ne 4 ]]; then
-            echo "expected 4 unit coverage artifacts, found ${#unit_coverage[@]}" >&2
+          if [[ "${#unit_coverage[@]}" -ne 3 ]]; then
+            echo "expected 3 unit coverage artifacts, found ${#unit_coverage[@]}" >&2
             exit 1
           fi
           if [[ "${#integration_coverage[@]}" -ne 4 ]]; then

From d528dea83e4e3eca9b136c16b39b658bfcb85735 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 17 Sep 2026 04:55:31 +0000
Subject: [PATCH 12/28] fix(web): remove ineffective Tailwind classes (#42394)

---
 .../webapp-reset-password/check-code/page.tsx         |  2 +-
 .../(shareLayout)/webapp-signin/check-code/page.tsx   |  2 +-
 web/app/(shareLayout)/webapp-signin/normalForm.tsx    |  8 ++++----
 web/app/account/oauth/authorize/page.tsx              |  2 +-
 .../components/app/configuration/config-var/index.tsx |  2 +-
 .../app/configuration/configuration-view/index.tsx    |  2 +-
 .../deployment-configuration/credential-field.tsx     |  2 +-
 .../base/chat/chat-with-history/header/index.tsx      |  2 +-
 web/app/components/base/error-boundary/index.tsx      |  4 ++--
 .../base/form/components/base/base-field.tsx          |  2 +-
 .../step-two/components/indexing-mode-section.tsx     |  2 +-
 .../datasets/create/website/base/crawled-result.tsx   |  2 +-
 .../datasets/create/website/base/text-input.tsx       |  2 +-
 .../data-source-options/option-card.tsx               |  2 +-
 .../online-drive/file-list/__tests__/index.spec.tsx   | 11 ++++++++---
 .../file-list/header/breadcrumbs/index.tsx            |  4 ++--
 .../data-source/online-drive/file-list/list/index.tsx |  2 +-
 .../create-from-pipeline/preview/file-preview.tsx     |  2 +-
 .../preview/online-document-preview.tsx               |  2 +-
 .../create-from-pipeline/preview/web-preview.tsx      |  2 +-
 .../external-knowledge-api-card/index.tsx             |  2 +-
 .../hit-testing/modify-external-retrieval-modal.tsx   |  2 +-
 .../model-auth/credential-selector.tsx                |  2 +-
 .../plugins/install-plugin/install-bundle/index.tsx   |  2 +-
 .../install-plugin/install-from-github/index.tsx      |  2 +-
 .../install-from-local-package/index.tsx              |  2 +-
 .../install-plugin/install-from-marketplace/index.tsx |  2 +-
 .../preparation/data-source-options/option-card.tsx   |  2 +-
 .../panel/test-run/result/result-preview/index.tsx    |  1 -
 .../tools/edit-custom-collection-modal/test-api.tsx   |  4 ++--
 web/app/components/workflow/block-selector/tabs.tsx   |  2 +-
 .../workflow/header/view-workflow-history.tsx         |  2 +-
 .../components/delivery-method/mail-body-input.tsx    |  2 +-
 .../components/mixed-variable-text-input/index.tsx    |  1 -
 .../components/workflow/variable-inspect/right.tsx    |  4 +---
 web/app/signin/normal-form.tsx                        |  8 ++++----
 web/app/signup/check-code/page.tsx                    |  2 +-
 37 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/web/app/(shareLayout)/webapp-reset-password/check-code/page.tsx b/web/app/(shareLayout)/webapp-reset-password/check-code/page.tsx
index 1f4ead65353..0e378cd8e2e 100644
--- a/web/app/(shareLayout)/webapp-reset-password/check-code/page.tsx
+++ b/web/app/(shareLayout)/webapp-reset-password/check-code/page.tsx
@@ -107,7 +107,7 @@ export default function CheckCode() {
         onClick={() => router.back()}
         className="flex h-9 cursor-pointer appearance-none items-center justify-center text-text-tertiary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden"
       >
-        <span className="bg-background-default-dimm inline-block rounded-full p-1">
+        <span className="inline-block rounded-full p-1">
           <RiArrowLeftLine aria-hidden size={12} />
         </span>
         <span className="ml-2 system-xs-regular">{t(($) => $.back, { ns: 'login' })}</span>
diff --git a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
index 7e09f107e72..f586ae17452 100644
--- a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
+++ b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
@@ -158,7 +158,7 @@ export default function CheckCode() {
         onClick={() => router.back()}
         className="flex h-9 cursor-pointer appearance-none items-center justify-center text-text-tertiary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden"
       >
-        <span className="bg-background-default-dimm inline-block rounded-full p-1">
+        <span className="inline-block rounded-full p-1">
           <span aria-hidden className="i-ri-arrow-left-line block size-3" />
         </span>
         <span className="ml-2 system-xs-regular">{t(($) => $.back, { ns: 'login' })}</span>
diff --git a/web/app/(shareLayout)/webapp-signin/normalForm.tsx b/web/app/(shareLayout)/webapp-signin/normalForm.tsx
index 4232354bb4c..bfa8906f023 100644
--- a/web/app/(shareLayout)/webapp-signin/normalForm.tsx
+++ b/web/app/(shareLayout)/webapp-signin/normalForm.tsx
@@ -64,7 +64,7 @@ const NormalForm = () => {
       <div className="mx-auto mt-8 w-full">
         <div className="relative">
           <div className="rounded-lg bg-linear-to-r from-workflow-workflow-progress-bg-1 to-workflow-workflow-progress-bg-2 p-4">
-            <div className="shadows-shadow-lg relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
+            <div className="relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
               <RiContractLine className="size-5" />
               <RiErrorWarningFill className="absolute -top-1 -right-1 size-4 text-text-warning-secondary" />
             </div>
@@ -84,7 +84,7 @@ const NormalForm = () => {
       <div className="mx-auto mt-8 w-full">
         <div className="relative">
           <div className="rounded-lg bg-linear-to-r from-workflow-workflow-progress-bg-1 to-workflow-workflow-progress-bg-2 p-4">
-            <div className="shadows-shadow-lg relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
+            <div className="relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
               <RiContractLine className="size-5" />
               <RiErrorWarningFill className="absolute -top-1 -right-1 size-4 text-text-warning-secondary" />
             </div>
@@ -104,7 +104,7 @@ const NormalForm = () => {
       <div className="mx-auto mt-8 w-full">
         <div className="relative">
           <div className="rounded-lg bg-linear-to-r from-workflow-workflow-progress-bg-1 to-workflow-workflow-progress-bg-2 p-4">
-            <div className="shadows-shadow-lg relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
+            <div className="relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
               <RiContractLine className="size-5" />
               <RiErrorWarningFill className="absolute -top-1 -right-1 size-4 text-text-warning-secondary" />
             </div>
@@ -196,7 +196,7 @@ const NormalForm = () => {
           {allMethodsAreDisabled && (
             <>
               <div className="rounded-lg bg-linear-to-r from-workflow-workflow-progress-bg-1 to-workflow-workflow-progress-bg-2 p-4">
-                <div className="shadows-shadow-lg mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
+                <div className="mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
                   <RiDoorLockLine className="size-5" />
                 </div>
                 <p className="system-sm-medium text-text-primary">
diff --git a/web/app/account/oauth/authorize/page.tsx b/web/app/account/oauth/authorize/page.tsx
index 7853316aa0c..bbdf7f76188 100644
--- a/web/app/account/oauth/authorize/page.tsx
+++ b/web/app/account/oauth/authorize/page.tsx
@@ -198,7 +198,7 @@ export default function OAuthAuthorize() {
           <div className="flex items-center gap-2.5">
             <Avatar avatar={userProfile.avatar_url} name={userProfile.name} size="lg" />
             <div>
-              <div className="system-md-semi-bold text-text-secondary">{userProfile.name}</div>
+              <div className="text-text-secondary">{userProfile.name}</div>
               <div className="system-xs-regular text-text-tertiary">{userProfile.email}</div>
             </div>
           </div>
diff --git a/web/app/components/app/configuration/config-var/index.tsx b/web/app/components/app/configuration/config-var/index.tsx
index 5edb0c22261..654a16c50e0 100644
--- a/web/app/components/app/configuration/config-var/index.tsx
+++ b/web/app/components/app/configuration/config-var/index.tsx
@@ -338,7 +338,7 @@ const ConfigVar: FC<IConfigVarProps> = ({ promptVariables, readonly, onPromptVar
       {hasVar && (
         <div className={cn('mt-1 grid px-3 pb-3')}>
           <ReactSortable
-            className={cn('grid-col-1 grid space-y-1', readonly && 'grid-cols-2 gap-1 space-y-0')}
+            className={cn('grid space-y-1', readonly && 'grid-cols-2 gap-1 space-y-0')}
             list={promptVariablesWithIds}
             setList={handlePromptVariablesReorder}
             disabled={readonly || isSorting}
diff --git a/web/app/components/app/configuration/configuration-view/index.tsx b/web/app/components/app/configuration/configuration-view/index.tsx
index 5138469b888..2d990e7f487 100644
--- a/web/app/components/app/configuration/configuration-view/index.tsx
+++ b/web/app/components/app/configuration/configuration-view/index.tsx
@@ -112,7 +112,7 @@ const ConfigurationView: FC<ConfigurationViewModel> = ({
         <>
           <div className="flex h-full flex-col">
             <div className="relative flex h-50 grow pt-14">
-              <div className="bg-default-subtle absolute top-0 left-0 h-14 w-full">
+              <div className="absolute top-0 left-0 h-14 w-full">
                 <div className="flex h-14 items-center justify-between px-6">
                   <div className="flex items-center gap-2">
                     <div className="system-xl-semibold text-text-primary">
diff --git a/web/app/components/app/deploy/shared/deployment-configuration/credential-field.tsx b/web/app/components/app/deploy/shared/deployment-configuration/credential-field.tsx
index c5bb3d37915..c8d89dce08c 100644
--- a/web/app/components/app/deploy/shared/deployment-configuration/credential-field.tsx
+++ b/web/app/components/app/deploy/shared/deployment-configuration/credential-field.tsx
@@ -88,7 +88,7 @@ export function CredentialField({
               <div className="flex size-10 items-center justify-center rounded-[10px] border-[0.5px] border-components-card-border bg-components-card-bg shadow-lg backdrop-blur-[5px]">
                 <span aria-hidden className="i-ri-key-2-line size-5 text-text-tertiary" />
               </div>
-              <div className="wrap-break-words flex w-full flex-col items-start gap-1">
+              <div className="flex w-full flex-col items-start gap-1">
                 <p className="w-full system-sm-medium text-text-secondary">
                   {t(($) => $['studio.noCredentialsYet'])}
                 </p>
diff --git a/web/app/components/base/chat/chat-with-history/header/index.tsx b/web/app/components/base/chat/chat-with-history/header/index.tsx
index 6fdbc6f8ce0..de5123af87e 100644
--- a/web/app/components/base/chat/chat-with-history/header/index.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/index.tsx
@@ -86,7 +86,7 @@ const Header = () => {
         <div
           className={cn(
             'flex items-center gap-1 transition-all duration-200 ease-in-out',
-            !isSidebarCollapsed && 'user-select-none opacity-0',
+            !isSidebarCollapsed && 'opacity-0',
           )}
         >
           <IconButton
diff --git a/web/app/components/base/error-boundary/index.tsx b/web/app/components/base/error-boundary/index.tsx
index 9e6ac2b9b71..66adb153baa 100644
--- a/web/app/components/base/error-boundary/index.tsx
+++ b/web/app/components/base/error-boundary/index.tsx
@@ -121,13 +121,13 @@ class ErrorBoundaryInner extends React.Component<
       return (
         <div
           className={cn(
-            'border-state-critical-border bg-state-critical-hover-alt flex flex-col items-center justify-center rounded-lg border p-8',
+            'flex flex-col items-center justify-center rounded-lg border p-8',
             isolate && 'min-h-50',
             className,
           )}
         >
           <div className="mb-4 flex items-center gap-2">
-            <RiAlertLine className="text-state-critical-solid size-8" />
+            <RiAlertLine className="size-8" />
             <h2 className="text-xl font-semibold text-text-primary">{customTitle || copy.title}</h2>
           </div>
 
diff --git a/web/app/components/base/form/components/base/base-field.tsx b/web/app/components/base/form/components/base/base-field.tsx
index 7d847bfe4b4..231053e78db 100644
--- a/web/app/components/base/form/components/base/base-field.tsx
+++ b/web/app/components/base/form/components/base/base-field.tsx
@@ -401,7 +401,7 @@ const BaseField = ({
                   >
                     <FieldLabel
                       className={cn(
-                        'hover:bg-components-option-card-option-hover-bg hover:border-components-option-card-option-hover-border flex h-8 w-full cursor-pointer items-center justify-center gap-2 rounded-lg border border-components-option-card-option-border bg-components-option-card-option-bg p-2 system-sm-regular text-text-secondary has-[:focus-visible]:outline-2 has-[:focus-visible]:outline-offset-2 has-[:focus-visible]:outline-components-input-border-active',
+                        'flex h-8 w-full cursor-pointer items-center justify-center gap-2 rounded-lg border border-components-option-card-option-border bg-components-option-card-option-bg p-2 system-sm-regular text-text-secondary has-[:focus-visible]:outline-2 has-[:focus-visible]:outline-offset-2 has-[:focus-visible]:outline-components-input-border-active',
                         value === option.value &&
                           'border-components-option-card-option-selected-border bg-components-option-card-option-selected-bg text-text-primary shadow-xs',
                         disabled && 'cursor-not-allowed opacity-50',
diff --git a/web/app/components/datasets/create/step-two/components/indexing-mode-section.tsx b/web/app/components/datasets/create/step-two/components/indexing-mode-section.tsx
index bc6c1bd1676..f3d09cdf6e0 100644
--- a/web/app/components/datasets/create/step-two/components/indexing-mode-section.tsx
+++ b/web/app/components/datasets/create/step-two/components/indexing-mode-section.tsx
@@ -167,7 +167,7 @@ export const IndexingModeSection: FC<IndexingModeSectionProps> = ({
         <div className="mt-2 flex h-10 items-center gap-x-0.5 overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-2 shadow-xs backdrop-blur-[5px]">
           <div className="absolute inset-0 bg-dataset-warning-message-bg opacity-40"></div>
           <div className="p-1">
-            <span className="i-custom-vender-solid-alertsandfeedback-alert-triangle size-4 text-text-warning-secondary" />
+            <span className="size-4 text-text-warning-secondary" />
           </div>
           <span className="system-xs-medium text-text-primary">
             {t(($) => $['stepTwo.highQualityTip'], { ns: 'datasetCreation' })}
diff --git a/web/app/components/datasets/create/website/base/crawled-result.tsx b/web/app/components/datasets/create/website/base/crawled-result.tsx
index 8568d87409d..f9e1f53c274 100644
--- a/web/app/components/datasets/create/website/base/crawled-result.tsx
+++ b/web/app/components/datasets/create/website/base/crawled-result.tsx
@@ -76,7 +76,7 @@ const CrawledResult: FC<Props> = ({
               ? t(($) => $[`${I18N_PREFIX}.resetAll`], { ns: 'datasetCreation' })
               : t(($) => $[`${I18N_PREFIX}.selectAll`], { ns: 'datasetCreation' })
           }
-          labelClassName="system-[13px] leading-[16px] font-medium text-text-secondary"
+          labelClassName="leading-[16px] font-medium text-text-secondary"
         />
         <div className="text-xs text-text-tertiary">
           {t(($) => $[`${I18N_PREFIX}.scrapTimeInfo`], {
diff --git a/web/app/components/datasets/create/website/base/text-input.tsx b/web/app/components/datasets/create/website/base/text-input.tsx
index d3ab1d3b09f..0f00ab8b850 100644
--- a/web/app/components/datasets/create/website/base/text-input.tsx
+++ b/web/app/components/datasets/create/website/base/text-input.tsx
@@ -46,7 +46,7 @@ const Input: FC<Props> = ({ value, onChange, placeholder = '', isNumber = false
       {...otherOption}
       value={value}
       onChange={handleChange}
-      className="focus:bg-components-inout-border-active flex h-8 w-full rounded-lg border border-transparent bg-components-input-bg-normal p-2 system-xs-regular text-components-input-text-filled caret-[#295eff] placeholder:text-components-input-text-placeholder hover:border hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border focus:border-components-input-border-active focus:shadow-xs focus:shadow-shadow-shadow-3 focus-visible:outline-hidden"
+      className="flex h-8 w-full rounded-lg border border-transparent bg-components-input-bg-normal p-2 system-xs-regular text-components-input-text-filled caret-[#295eff] placeholder:text-components-input-text-placeholder hover:border hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border focus:border-components-input-border-active focus:shadow-xs focus:shadow-shadow-shadow-3 focus-visible:outline-hidden"
       placeholder={placeholder}
     />
   )
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source-options/option-card.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source-options/option-card.tsx
index 09a6d733fe7..93403b8625f 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source-options/option-card.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source-options/option-card.tsx
@@ -20,7 +20,7 @@ const OptionCard = ({ label, selected, nodeData, onClick }: OptionCardProps) =>
         'flex cursor-pointer items-center gap-2 rounded-xl border border-components-option-card-option-border bg-components-option-card-option-bg p-3 shadow-shadow-shadow-3',
         selected
           ? 'border-components-option-card-option-selected-border bg-components-option-card-option-selected-bg shadow-xs inset-ring-[0.5px] inset-ring-components-option-card-option-selected-border'
-          : 'hover:bg-components-option-card-bg-hover hover:border-components-option-card-option-border-hover hover:shadow-xs',
+          : 'hover:border-components-option-card-option-border-hover hover:shadow-xs',
       )}
       onClick={onClick}
     >
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/__tests__/index.spec.tsx
index ab7d83a450f..c10ec958f00 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/__tests__/index.spec.tsx
@@ -211,10 +211,15 @@ describe('FileList', () => {
         const fileList = [createMockOnlineDriveFile()]
         const props = createDefaultProps({ isLoading: true, fileList })
 
-        const { container } = render(<FileList {...props} />)
+        const { rerender } = render(<FileList {...props} />)
 
-        // Assert - Should show spinner icon at the bottom
-        expect(container.querySelector('.animation-spin')).toBeInTheDocument()
+        expect(screen.getByRole('status', { name: 'appApi.loading' })).toBeInTheDocument()
+        expect(screen.getByRole('checkbox', { name: 'test-file.txt' })).toBeInTheDocument()
+
+        rerender(<FileList {...props} isLoading={false} />)
+
+        expect(screen.queryByRole('status', { name: 'appApi.loading' })).not.toBeInTheDocument()
+        expect(screen.getByRole('checkbox', { name: 'test-file.txt' })).toBeInTheDocument()
       })
     })
 
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx
index c10cdafa2b0..051aff77cdb 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx
@@ -96,7 +96,7 @@ const Breadcrumbs = ({
   return (
     <div className="flex grow items-center overflow-hidden">
       {showSearchResult && (
-        <div className="text-test-secondary px-1.25 system-sm-medium">
+        <div className="px-1.25 system-sm-medium">
           {t(($) => $['onlineDrive.breadcrumbs.searchResult'], {
             ns: 'datasetPipeline',
             searchResultsLength,
@@ -105,7 +105,7 @@ const Breadcrumbs = ({
         </div>
       )}
       {!showSearchResult && showBucketListTitle && (
-        <div className="text-test-secondary px-1.25 system-sm-medium">
+        <div className="px-1.25 system-sm-medium">
           {t(($) => $['onlineDrive.breadcrumbs.allBuckets'], { ns: 'datasetPipeline' })}
         </div>
       )}
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/index.tsx
index ed77e0a4fb5..993f9b3fd0f 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/index.tsx
@@ -105,7 +105,7 @@ const List = ({
               aria-live="polite"
               aria-label={t(($) => $.loading, { ns: 'appApi' })}
             >
-              <RiLoader2Line className="animation-spin size-4 text-text-tertiary" />
+              <RiLoader2Line className="size-4 text-text-tertiary" />
             </div>
           )}
           <div ref={anchorRef} className="h-0" />
diff --git a/web/app/components/datasets/documents/create-from-pipeline/preview/file-preview.tsx b/web/app/components/datasets/documents/create-from-pipeline/preview/file-preview.tsx
index a1b9a2edff4..21100e0d30c 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/preview/file-preview.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/preview/file-preview.tsx
@@ -31,7 +31,7 @@ const FilePreview = ({ file, hidePreview }: FilePreviewProps) => {
           <div className="system-2xs-semibold-uppercase text-text-accent">
             {t(($) => $['addDocuments.stepOne.preview'], { ns: 'datasetPipeline' })}
           </div>
-          <div className="text-tex-primary title-md-semi-bold">{`${fileName}.${file.extension || ''}`}</div>
+          <div className="title-md-semi-bold">{`${fileName}.${file.extension || ''}`}</div>
           <div className="flex items-center gap-x-1 system-xs-medium text-text-tertiary">
             <DocumentFileIcon
               className="size-3.5 shrink-0"
diff --git a/web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx b/web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx
index 00575f72578..00a649bd5ac 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx
@@ -59,7 +59,7 @@ const OnlineDocumentPreview = ({
           <div className="system-2xs-semibold-uppercase text-text-accent">
             {t(($) => $['addDocuments.stepOne.preview'], { ns: 'datasetPipeline' })}
           </div>
-          <div className="text-tex-primary title-md-semi-bold">{currentPage?.page_name}</div>
+          <div className="title-md-semi-bold">{currentPage?.page_name}</div>
           <div className="flex items-center gap-x-1 system-xs-medium text-text-tertiary">
             <Notion className="size-3.5" />
             <span>{currentPage.type}</span>
diff --git a/web/app/components/datasets/documents/create-from-pipeline/preview/web-preview.tsx b/web/app/components/datasets/documents/create-from-pipeline/preview/web-preview.tsx
index 447a9779141..623cd257405 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/preview/web-preview.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/preview/web-preview.tsx
@@ -20,7 +20,7 @@ const WebsitePreview = ({ currentWebsite, hidePreview }: WebsitePreviewProps) =>
           <div className="system-2xs-semibold-uppercase">
             {t(($) => $['addDocuments.stepOne.preview'], { ns: 'datasetPipeline' })}
           </div>
-          <div className="text-tex-primary title-md-semi-bold">{currentWebsite.title}</div>
+          <div className="title-md-semi-bold">{currentWebsite.title}</div>
           <div className="flex gap-x-1 system-xs-medium text-text-tertiary">
             <RiGlobalLine className="size-3.5" />
             <span className="uppercase" title={currentWebsite.source_url}>
diff --git a/web/app/components/datasets/external-api/external-knowledge-api-card/index.tsx b/web/app/components/datasets/external-api/external-knowledge-api-card/index.tsx
index 56ed1f085f4..56aaa357eb0 100644
--- a/web/app/components/datasets/external-api/external-knowledge-api-card/index.tsx
+++ b/web/app/components/datasets/external-api/external-knowledge-api-card/index.tsx
@@ -121,7 +121,7 @@ const ExternalKnowledgeAPICard: React.FC<ExternalKnowledgeAPICardProps> = ({
   return (
     <>
       <div
-        className={`shadows-shadow-xs flex items-start self-stretch rounded-lg border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg p-2 pl-3 ${isHovered ? 'border-state-destructive-border bg-state-destructive-hover' : ''}`}
+        className={`flex items-start self-stretch rounded-lg border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg p-2 pl-3 ${isHovered ? 'border-state-destructive-border bg-state-destructive-hover' : ''}`}
       >
         <div className="flex grow flex-col items-start justify-center gap-1.5 py-1">
           <div className="flex items-center gap-1 self-stretch text-text-secondary">
diff --git a/web/app/components/datasets/hit-testing/modify-external-retrieval-modal.tsx b/web/app/components/datasets/hit-testing/modify-external-retrieval-modal.tsx
index 1b353ab1527..bf5793699ce 100644
--- a/web/app/components/datasets/hit-testing/modify-external-retrieval-modal.tsx
+++ b/web/app/components/datasets/hit-testing/modify-external-retrieval-modal.tsx
@@ -50,7 +50,7 @@ const ModifyExternalRetrievalModal: React.FC<ModifyExternalRetrievalModalProps>
   }
 
   return (
-    <div className="shadows-shadow-2xl absolute top-9 right-3.5 z-10 flex w-[320px] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg">
+    <div className="absolute top-9 right-3.5 z-10 flex w-[320px] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg">
       <div className="flex items-center justify-between self-stretch p-4 pb-2">
         <div className="grow system-xl-semibold text-text-primary">
           {t(($) => $.settingTitle, { ns: 'datasetHitTesting' })}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx
index d095af2710f..0cd7ac09d5a 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx
@@ -68,7 +68,7 @@ const CredentialSelector = ({
       </PopoverTrigger>
       <PopoverContent
         sideOffset={0}
-        className="border-ccomponents-panel-border w-(--anchor-width) rounded-xl border-[0.5px] bg-components-panel-bg-blur p-0"
+        className="w-(--anchor-width) rounded-xl border-[0.5px] border-current bg-components-panel-bg-blur p-0"
       >
         <div className="max-h-80 overflow-y-auto p-1">
           {credentials.map((credential) => (
diff --git a/web/app/components/plugins/install-plugin/install-bundle/index.tsx b/web/app/components/plugins/install-plugin/install-bundle/index.tsx
index 3df9f9f90ef..129205b6009 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/index.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/index.tsx
@@ -71,7 +71,7 @@ const InstallBundle: FC<Props> = ({
           'w-full max-w-120 overflow-hidden! text-left align-middle',
           cn(
             modalClassName,
-            'shadows-shadow-xl flex max-h-[calc(100dvh-48px)] min-w-140 flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0',
+            'flex max-h-[calc(100dvh-48px)] min-w-140 flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0',
           ),
         )}
       >
diff --git a/web/app/components/plugins/install-plugin/install-from-github/index.tsx b/web/app/components/plugins/install-plugin/install-from-github/index.tsx
index 3be2c3c797d..c599227ff1b 100644
--- a/web/app/components/plugins/install-plugin/install-from-github/index.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-github/index.tsx
@@ -185,7 +185,7 @@ const InstallFromGitHub: React.FC<InstallFromGitHubProps> = ({
           'w-140 overflow-hidden! text-left align-middle',
           cn(
             modalClassName,
-            'shadows-shadow-xl flex max-h-[calc(100dvh-48px)] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0',
+            'flex max-h-[calc(100dvh-48px)] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0',
           ),
         )}
       >
diff --git a/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx b/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx
index 825484b0d4b..4c48e75c7c0 100644
--- a/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx
@@ -93,7 +93,7 @@ const InstallFromLocalPackage: React.FC<InstallFromLocalPackageProps> = ({
           'w-140 overflow-hidden! text-left align-middle',
           cn(
             modalClassName,
-            'shadows-shadow-xl flex max-h-[calc(100dvh-48px)] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0',
+            'flex max-h-[calc(100dvh-48px)] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0',
           ),
         )}
       >
diff --git a/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx b/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx
index 4617eb682c0..0d9ecf84e7b 100644
--- a/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx
@@ -89,7 +89,7 @@ const InstallFromMarketplace: React.FC<InstallFromMarketplaceProps> = ({
           'w-140 overflow-hidden! text-left align-middle',
           cn(
             modalClassName,
-            'shadows-shadow-xl flex max-h-[calc(100dvh-48px)] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0',
+            'flex max-h-[calc(100dvh-48px)] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0',
           ),
         )}
       >
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/option-card.tsx b/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/option-card.tsx
index 48aecf54a94..c8f948fff02 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/option-card.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/option-card.tsx
@@ -27,7 +27,7 @@ const OptionCard = ({ label, value, selected, nodeData, onClick }: OptionCardPro
         'flex cursor-pointer flex-col gap-1 rounded-xl border border-components-option-card-option-border bg-components-option-card-option-bg p-2.5 shadow-shadow-shadow-3',
         selected
           ? 'border-components-option-card-option-selected-border bg-components-option-card-option-selected-bg shadow-xs inset-ring-[0.5px] inset-ring-components-option-card-option-selected-border'
-          : 'hover:bg-components-option-card-bg-hover hover:border-components-option-card-option-border-hover hover:shadow-xs',
+          : 'hover:border-components-option-card-option-border-hover hover:shadow-xs',
       )}
       onClick={handleClickCard}
     >
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/index.tsx b/web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/index.tsx
index 12cd59f647c..362190468f7 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/index.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/index.tsx
@@ -47,7 +47,6 @@ const ResultPreview = ({ isRunning, outputs, error, onSwitchToDetail }: ResultTe
           <div className="mt-1 flex items-center gap-x-2 system-xs-regular text-text-tertiary">
             <div className="h-px flex-1 bg-linear-to-r from-background-gradient-mask-transparent to-divider-regular" />
             <span
-              className="shrink-0truncate"
               title={t(($) => $['result.resultPreview.footerTip'], {
                 ns: 'pipeline',
                 count: RAG_PIPELINE_PREVIEW_CHUNK_NUM,
diff --git a/web/app/components/tools/edit-custom-collection-modal/test-api.tsx b/web/app/components/tools/edit-custom-collection-modal/test-api.tsx
index 2759df58f85..f5a20945aea 100644
--- a/web/app/components/tools/edit-custom-collection-modal/test-api.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/test-api.tsx
@@ -156,7 +156,7 @@ const TestApi: FC<Props> = ({ positionCenter, customCollection, tool, onHide })
                                       })
                                     }
                                     type="text"
-                                    className="!hover:border-transparent !hover:bg-transparent !focus:border-transparent !focus:bg-transparent border-transparent! bg-transparent!"
+                                    className="border-transparent! bg-transparent!"
                                   />
                                 </td>
                               </tr>
@@ -179,7 +179,7 @@ const TestApi: FC<Props> = ({ positionCenter, customCollection, tool, onHide })
                       <div className="system-xs-semibold text-text-tertiary">
                         {t(($) => $['test.testResult'], { ns: 'tools' })}
                       </div>
-                      <div className="bg-[rgb(243, 244, 246)] h-px w-0 grow"></div>
+                      <div className="h-px w-0 grow"></div>
                     </div>
                     <div className="mt-2 h-50 overflow-x-hidden overflow-y-auto rounded-lg bg-components-input-bg-normal px-3 py-2 system-xs-regular text-text-secondary">
                       {result || (
diff --git a/web/app/components/workflow/block-selector/tabs.tsx b/web/app/components/workflow/block-selector/tabs.tsx
index 885b2b24782..31d660f12fc 100644
--- a/web/app/components/workflow/block-selector/tabs.tsx
+++ b/web/app/components/workflow/block-selector/tabs.tsx
@@ -273,7 +273,7 @@ function BlockSelectorPanels({
           <TabHeaderItem key={tab.key} tab={tab} fallbackDisabledTip={fallbackDisabledTip} />
         ))}
         <TabsIndicator
-          className="sm-no-bottom pointer-events-none absolute left-0 rounded-t-lg bg-components-panel-bg transition-[translate,width] duration-150 ease-in-out motion-reduce:transition-none"
+          className="pointer-events-none absolute left-0 rounded-t-lg bg-components-panel-bg transition-[translate,width] duration-150 ease-in-out motion-reduce:transition-none"
           style={{
             top: 'var(--active-tab-top)',
             translate: 'var(--active-tab-left)',
diff --git a/web/app/components/workflow/header/view-workflow-history.tsx b/web/app/components/workflow/header/view-workflow-history.tsx
index c5f55444996..b799bddc35b 100644
--- a/web/app/components/workflow/header/view-workflow-history.tsx
+++ b/web/app/components/workflow/header/view-workflow-history.tsx
@@ -176,7 +176,7 @@ const ViewWorkflowHistory = () => {
       <PopoverContent placement="bottom-end" className="border-none bg-transparent shadow-none">
         <div className="flex max-w-90 min-w-60 flex-col overflow-y-auto rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-xl backdrop-blur-[5px]">
           <div className="sticky top-0 flex items-center justify-between px-4 pt-3">
-            <div className="system-mg-regular grow text-text-secondary">
+            <div className="grow text-text-secondary">
               {t(($) => $['changeHistory.title'], { ns: 'workflow' })}
             </div>
             <PopoverClose
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/mail-body-input.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/mail-body-input.tsx
index 80c956c5bb7..b68e5479391 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/mail-body-input.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/mail-body-input.tsx
@@ -29,7 +29,7 @@ const MailBodyInput = ({
         'hover:border-components-input-border-hover hover:bg-components-input-bg-hover',
         'focus-within:border-components-input-border-active focus-within:bg-components-input-bg-active focus-within:shadow-xs',
       )}
-      className="caret:text-text-accent min-h-32"
+      className="min-h-32"
       editable={!readOnly}
       value={value}
       requestURLBlock={{
diff --git a/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx
index 125784d8cb9..f892aa63988 100644
--- a/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx
+++ b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx
@@ -38,7 +38,6 @@ const MixedVariableTextInput = ({
         'hover:border-components-input-border-hover hover:bg-components-input-bg-hover',
         'focus-within:border-components-input-border-active focus-within:bg-components-input-bg-active focus-within:shadow-xs',
       )}
-      className="caret:text-text-accent"
       editable={!readOnly}
       value={value}
       workflowVariableBlock={{
diff --git a/web/app/components/workflow/variable-inspect/right.tsx b/web/app/components/workflow/variable-inspect/right.tsx
index 92c1efc9537..72274e26320 100644
--- a/web/app/components/workflow/variable-inspect/right.tsx
+++ b/web/app/components/workflow/variable-inspect/right.tsx
@@ -250,9 +250,7 @@ const Right = ({ nodeId, currentNodeVar, handleOpenMenu, isValueFetching }: Prop
               {!isTruncated && currentNodeVar.var.edited && (
                 <Badge>
                   <span className="mr-[4.5px] ml-[2.5px] h-0.75 w-0.75 rounded-sm bg-text-accent-secondary"></span>
-                  <span className="system-2xs-semibold-uupercase">
-                    {t(($) => $['debug.variableInspect.edited'], { ns: 'workflow' })}
-                  </span>
+                  <span>{t(($) => $['debug.variableInspect.edited'], { ns: 'workflow' })}</span>
                 </Badge>
               )}
               {!isTruncated &&
diff --git a/web/app/signin/normal-form.tsx b/web/app/signin/normal-form.tsx
index 52848170cd8..7db9b968331 100644
--- a/web/app/signin/normal-form.tsx
+++ b/web/app/signin/normal-form.tsx
@@ -125,7 +125,7 @@ function NormalForm() {
       <div className="mx-auto mt-8 w-full">
         <div className="relative">
           <div className="rounded-lg bg-linear-to-r from-workflow-workflow-progress-bg-1 to-workflow-workflow-progress-bg-2 p-4">
-            <div className="shadows-shadow-lg relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
+            <div className="relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
               <RiContractLine className="size-5" />
               <RiErrorWarningFill className="absolute -top-1 -right-1 size-4 text-text-warning-secondary" />
             </div>
@@ -145,7 +145,7 @@ function NormalForm() {
       <div className="mx-auto mt-8 w-full">
         <div className="relative">
           <div className="rounded-lg bg-linear-to-r from-workflow-workflow-progress-bg-1 to-workflow-workflow-progress-bg-2 p-4">
-            <div className="shadows-shadow-lg relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
+            <div className="relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
               <RiContractLine className="size-5" />
               <RiErrorWarningFill className="absolute -top-1 -right-1 size-4 text-text-warning-secondary" />
             </div>
@@ -165,7 +165,7 @@ function NormalForm() {
       <div className="mx-auto mt-8 w-full">
         <div className="relative">
           <div className="rounded-lg bg-linear-to-r from-workflow-workflow-progress-bg-1 to-workflow-workflow-progress-bg-2 p-4">
-            <div className="shadows-shadow-lg relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
+            <div className="relative mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
               <RiContractLine className="size-5" />
               <RiErrorWarningFill className="absolute -top-1 -right-1 size-4 text-text-warning-secondary" />
             </div>
@@ -287,7 +287,7 @@ function NormalForm() {
           {allMethodsAreDisabled && (
             <>
               <div className="rounded-lg bg-linear-to-r from-workflow-workflow-progress-bg-1 to-workflow-workflow-progress-bg-2 p-4">
-                <div className="shadows-shadow-lg mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
+                <div className="mb-2 flex size-10 items-center justify-center rounded-xl bg-components-card-bg shadow">
                   <RiDoorLockLine className="size-5" />
                 </div>
                 <p className="system-sm-medium text-text-primary">
diff --git a/web/app/signup/check-code/page.tsx b/web/app/signup/check-code/page.tsx
index 8ab5c895e77..cafddd4495b 100644
--- a/web/app/signup/check-code/page.tsx
+++ b/web/app/signup/check-code/page.tsx
@@ -122,7 +122,7 @@ export default function CheckCode() {
         onClick={() => router.back()}
         className="flex h-9 cursor-pointer appearance-none items-center justify-center text-text-tertiary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden"
       >
-        <span className="bg-background-default-dimm inline-block rounded-full p-1">
+        <span className="inline-block rounded-full p-1">
           <span className="i-ri-arrow-left-line size-3" aria-hidden="true" />
         </span>
         <span className="ml-2 system-xs-regular">{t(($) => $.back, { ns: 'login' })}</span>

From a14ebae6a4a4b65fb5861392e03adf2749085244 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 17 Sep 2026 05:20:07 +0000
Subject: [PATCH 13/28] refactor(web): use Zod validate for boolean form checks
 (#42398)

---
 web/app/forgot-password/ForgotPasswordForm.tsx | 2 +-
 web/app/install/installForm.tsx                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/app/forgot-password/ForgotPasswordForm.tsx b/web/app/forgot-password/ForgotPasswordForm.tsx
index b47ce212c47..21b128af43e 100644
--- a/web/app/forgot-password/ForgotPasswordForm.tsx
+++ b/web/app/forgot-password/ForgotPasswordForm.tsx
@@ -93,7 +93,7 @@ const ForgotPasswordForm = () => {
               <Field
                 name="email"
                 validate={(value) =>
-                  emailSchema.safeParse(value).success
+                  emailSchema.validate(value)
                     ? null
                     : t(($) => $['error.emailInValid'], { ns: 'login' })
                 }
diff --git a/web/app/install/installForm.tsx b/web/app/install/installForm.tsx
index 7066080c042..9c87efa4374 100644
--- a/web/app/install/installForm.tsx
+++ b/web/app/install/installForm.tsx
@@ -110,7 +110,7 @@ const InstallForm = () => {
             <Field
               name="email"
               validate={(value) =>
-                accountFormSchema.shape.email.safeParse(value).success
+                accountFormSchema.shape.email.validate(value)
                   ? null
                   : t(($) => $['error.emailInValid'], { ns: 'login' })
               }
@@ -130,7 +130,7 @@ const InstallForm = () => {
             <Field
               name="name"
               validate={(value) =>
-                accountFormSchema.shape.name.safeParse(value).success
+                accountFormSchema.shape.name.validate(value)
                   ? null
                   : t(($) => $['error.nameEmpty'], { ns: 'login' })
               }
@@ -149,7 +149,7 @@ const InstallForm = () => {
             <Field
               name="password"
               validate={(value) =>
-                accountFormSchema.shape.password.safeParse(value).success
+                accountFormSchema.shape.password.validate(value)
                   ? null
                   : t(($) => $['error.passwordInvalid'], { ns: 'login' })
               }

From 64deb9c4213652375dce8680ca754c29e4a9d989 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 17 Sep 2026 05:39:40 +0000
Subject: [PATCH 14/28] docs: update README agent feature description (#42399)

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c3f68564c85..9f74c251e8b 100644
--- a/README.md
+++ b/README.md
@@ -104,8 +104,7 @@ Intuitive interface for crafting prompts, comparing model performance, and addin
 **4. RAG Pipeline**:
 Extensive RAG capabilities that cover everything from document ingestion to retrieval, with out-of-box support for text extraction from PDFs, PPTs, and other common document formats.
 
-**5. Agent capabilities**:
-You can define agents based on LLM Function Calling or ReAct, and add pre-built or custom tools for the agent. Dify provides 50+ built-in tools for AI agents, such as Google Search, DALL·E, Stable Diffusion and WolframAlpha.
+**5. Agent**: Autonomous agents with a sandbox of their own: they run commands, install software, and handle files to get open-ended tasks done. Describe the agent you want and it builds itself. Give it skills, connect tools from [Dify Marketplace](https://marketplace.dify.ai/?category=tool), MCP servers, or your own APIs, and put it to work as a chat app or as a step in any workflow.
 
 **6. LLMOps**:
 Monitor and analyze application logs and performance over time. You could continuously improve prompts, datasets, and models based on production data and annotations.

From 28e2682986de27ea7c71eafac3ce086009733d6b Mon Sep 17 00:00:00 2001
From: JessYan <15711968+JessYanCoding@users.noreply.github.com>
Date: Thu, 17 Sep 2026 05:43:18 +0000
Subject: [PATCH 15/28] refactor(models): pass session into
 App.app_model_config and App.workflow (#42190)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 api/controllers/mcp/mcp.py                    |  14 ++-
 api/core/plugin/backwards_invocation/app.py   |   5 +-
 api/models/model.py                           |   8 --
 api/services/agent/dsl_service.py             |   2 +-
 api/services/app_service.py                   |   7 +-
 .../tools/workflow_tools_manage_service.py    |  20 ++--
 .../services/test_agent_service.py            |   5 +-
 .../test_workflow_tools_manage_service.py     |   9 ++
 .../workflow/test_workflow_converter.py       |   2 +-
 .../console/app/test_model_config_api.py      |  19 ++--
 .../unit_tests/models/test_app_models.py      | 105 ++++++++++++++++++
 .../unit_tests/services/test_app_service.py   |  27 +++++
 12 files changed, 183 insertions(+), 40 deletions(-)

diff --git a/api/controllers/mcp/mcp.py b/api/controllers/mcp/mcp.py
index 95aa2be8218..fb4912b0741 100644
--- a/api/controllers/mcp/mcp.py
+++ b/api/controllers/mcp/mcp.py
@@ -88,7 +88,7 @@ class MCPAppApi(Resource):
             self._validate_server_status(mcp_server)
 
             # Get user input form
-            user_input_form = self._get_user_input_form(app)
+            user_input_form = self._get_user_input_form(app, session)
 
             # Handle notification vs request differently
             return self._process_mcp_message(
@@ -180,17 +180,19 @@ class MCPAppApi(Resource):
 
         return helper.compact_generate_response(result.model_dump(by_alias=True, mode="json", exclude_none=True))
 
-    def _get_user_input_form(self, app: App) -> list[VariableEntity]:
+    def _get_user_input_form(self, app: App, session: Session) -> list[VariableEntity]:
         """Get and convert user input form"""
         # Get raw user input form based on app mode
         if app.mode in {AppMode.ADVANCED_CHAT, AppMode.WORKFLOW}:
-            if not app.workflow:
+            workflow = app.workflow_with_session(session=session)
+            if not workflow:
                 raise MCPRequestError(mcp_types.INVALID_REQUEST, "App is unavailable")
-            raw_user_input_form = app.workflow.user_input_form(to_old_structure=True)
+            raw_user_input_form = workflow.user_input_form(to_old_structure=True)
         else:
-            if not app.app_model_config:
+            app_model_config = app.app_model_config_with_session(session=session)
+            if not app_model_config:
                 raise MCPRequestError(mcp_types.INVALID_REQUEST, "App is unavailable")
-            features_dict = app.app_model_config.to_dict()
+            features_dict = app_model_config.to_dict()
             raw_user_input_form = features_dict.get("user_input_form", [])
 
         # Convert to VariableEntity objects
diff --git a/api/core/plugin/backwards_invocation/app.py b/api/core/plugin/backwards_invocation/app.py
index 2972e2be207..4165b585d1c 100644
--- a/api/core/plugin/backwards_invocation/app.py
+++ b/api/core/plugin/backwards_invocation/app.py
@@ -281,7 +281,10 @@ class PluginAppBackwardsInvocation(BaseBackwardsInvocation):
     @classmethod
     def _get_workflow(cls, app: App) -> Workflow | None:
         """
-        get workflow without relying on App.workflow's request-scoped session property
+        get workflow with an owned session, additionally scoped by tenant and app
+
+        `App.workflow_with_session` resolves by `workflow_id` alone; a plugin
+        invocation must also confirm the workflow belongs to this tenant and app.
         """
         if not app.workflow_id:
             return None
diff --git a/api/models/model.py b/api/models/model.py
index 2bb8dfc35bc..7b94b4e38c0 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -466,20 +466,12 @@ class App(Base):
     def site_with_session(self, *, session: Session) -> Site | None:
         return session.scalar(select(Site).where(Site.app_id == self.id))
 
-    @property
-    def app_model_config(self) -> AppModelConfig | None:
-        return self.app_model_config_with_session(session=db.session())
-
     def app_model_config_with_session(self, *, session: Session) -> AppModelConfig | None:
         if self.app_model_config_id:
             return session.scalar(select(AppModelConfig).where(AppModelConfig.id == self.app_model_config_id))
 
         return None
 
-    @property
-    def workflow(self) -> Workflow | None:
-        return self.workflow_with_session(session=db.session())
-
     def workflow_with_session(self, *, session: Session) -> Workflow | None:
         if self.workflow_id:
             from .workflow import Workflow
diff --git a/api/services/agent/dsl_service.py b/api/services/agent/dsl_service.py
index 3c13ee0112b..454c887f901 100644
--- a/api/services/agent/dsl_service.py
+++ b/api/services/agent/dsl_service.py
@@ -203,7 +203,7 @@ class AgentDslService:
             package=package,
             package_path="agent",
         )
-        if app.app_model_config is None:
+        if app.app_model_config_with_session(session=self.session) is None:
             model_config = AppModelConfig(app_id=app.id, created_by=account.id, updated_by=account.id)
             self.session.add(model_config)
             self.session.flush()
diff --git a/api/services/app_service.py b/api/services/app_service.py
index e90e962cf2b..4fa63c76f76 100644
--- a/api/services/app_service.py
+++ b/api/services/app_service.py
@@ -809,9 +809,12 @@ class AppService:
                 def __init__(self, app):
                     self.__dict__.update(app.__dict__)
 
-                @property
                 @override
-                def app_model_config(self):
+                def app_model_config_with_session(self, *, session: Session) -> AppModelConfig | None:
+                    # Hand back the in-memory config the masking pass above produced, and
+                    # deliberately ignore `session`: re-reading the row here would undo the
+                    # masking. Response paths resolve the config through this accessor
+                    # (`AppResponseView.app_model_config`), so the override has to sit here.
                     return model_config
 
             app = ModifiedApp(app)
diff --git a/api/services/tools/workflow_tools_manage_service.py b/api/services/tools/workflow_tools_manage_service.py
index b094d4231d1..99dda57dae8 100644
--- a/api/services/tools/workflow_tools_manage_service.py
+++ b/api/services/tools/workflow_tools_manage_service.py
@@ -61,18 +61,18 @@ class WorkflowToolManageService:
         if existing_workflow_tool_provider is not None:
             raise ValueError(f"Tool with name {name} or app_id {workflow_app_id} already exists")
 
-        # query the app
+        # query the app and its published workflow in the same session
         app: App | None = None
+        workflow: Workflow | None = None
         with sessionmaker(db.engine, expire_on_commit=False).begin() as _session:
             app = _session.scalar(select(App).where(App.id == workflow_app_id, App.tenant_id == tenant_id).limit(1))
+            if app is not None:
+                workflow = app.workflow_with_session(session=_session)
 
         # if not found raise error
         if app is None:
             raise ValueError(f"App {workflow_app_id} not found")
 
-        # query the workflow
-        workflow: Workflow | None = app.workflow
-
         # if not found raise error
         if workflow is None:
             raise ValueError(f"Workflow not found for app {workflow_app_id}")
@@ -172,20 +172,20 @@ class WorkflowToolManageService:
         if workflow_tool_provider is None:
             raise ValueError(f"Tool {workflow_tool_id} not found")
 
-        # query the app
+        # query the app and its published workflow in the same session
         app: App | None = None
+        workflow: Workflow | None = None
         with sessionmaker(db.engine, expire_on_commit=False).begin() as _session:
             app = _session.scalar(
                 select(App).where(App.id == workflow_tool_provider.app_id, App.tenant_id == tenant_id).limit(1)
             )
+            if app is not None:
+                workflow = app.workflow_with_session(session=_session)
 
         # if not found raise error
         if app is None:
             raise ValueError(f"App {workflow_tool_provider.app_id} not found")
 
-        # query the workflow
-        workflow: Workflow | None = app.workflow
-
         # if not found raise error
         if workflow is None:
             raise ValueError(f"Workflow not found for app {workflow_tool_provider.app_id}")
@@ -342,15 +342,17 @@ class WorkflowToolManageService:
             raise ValueError("Tool not found")
 
         workflow_app: App | None = None
+        workflow: Workflow | None = None
         with sessionmaker(db.engine, expire_on_commit=False).begin() as _session:
             workflow_app = _session.scalar(
                 select(App).where(App.id == db_tool.app_id, App.tenant_id == db_tool.tenant_id).limit(1)
             )
+            if workflow_app is not None:
+                workflow = workflow_app.workflow_with_session(session=_session)
 
         if workflow_app is None:
             raise ValueError(f"App {db_tool.app_id} not found")
 
-        workflow = workflow_app.workflow
         if not workflow:
             raise ValueError("Workflow not found")
 
diff --git a/api/tests/test_containers_integration_tests/services/test_agent_service.py b/api/tests/test_containers_integration_tests/services/test_agent_service.py
index d6e0ff103c1..4217e573b5a 100644
--- a/api/tests/test_containers_integration_tests/services/test_agent_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_agent_service.py
@@ -133,8 +133,9 @@ class TestAgentService:
         app = app_service.create_app(tenant.id, app_args, account, session=db_session_with_containers)
 
         # Update the app model config to set agent_mode for agent-chat mode
-        if app.mode == AppMode.AGENT_CHAT and app.app_model_config:
-            app.app_model_config.agent_mode = json.dumps({"enabled": True, "strategy": "react", "tools": []})
+        app_model_config = app.app_model_config_with_session(session=db_session_with_containers)
+        if app.mode == AppMode.AGENT_CHAT and app_model_config:
+            app_model_config.agent_mode = json.dumps({"enabled": True, "strategy": "react", "tools": []})
 
             db_session_with_containers.commit()
 
diff --git a/api/tests/test_containers_integration_tests/services/tools/test_workflow_tools_manage_service.py b/api/tests/test_containers_integration_tests/services/tools/test_workflow_tools_manage_service.py
index c2c5fe838fb..f05a0fb28da 100644
--- a/api/tests/test_containers_integration_tests/services/tools/test_workflow_tools_manage_service.py
+++ b/api/tests/test_containers_integration_tests/services/tools/test_workflow_tools_manage_service.py
@@ -537,6 +537,9 @@ class TestWorkflowToolManageService:
                 ]
             }
         )
+        # The service reads the published workflow in its own session, so the graph has
+        # to be committed — matching test_update_workflow_tool_human_input_node_error.
+        db_session_with_containers.commit()
 
         tool_parameters = self._create_test_workflow_tool_parameters()
         with pytest.raises(WorkflowToolHumanInputNotSupportedError) as exc_info:
@@ -877,6 +880,9 @@ class TestWorkflowToolManageService:
             ]
         }
         workflow.graph = json.dumps(workflow_graph)
+        # The service reads the published workflow in its own session, so the graph has
+        # to be committed for this setup to reach it.
+        db_session_with_containers.commit()
 
         # Setup workflow tool parameters with FILE type
         file_parameters = [
@@ -952,6 +958,9 @@ class TestWorkflowToolManageService:
             ]
         }
         workflow.graph = json.dumps(workflow_graph)
+        # The service reads the published workflow in its own session, so the graph has
+        # to be committed for this setup to reach it.
+        db_session_with_containers.commit()
 
         # Setup workflow tool parameters with FILES type
         files_parameters = [
diff --git a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_converter.py b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_converter.py
index 8cd9526f6a0..fa102683cdf 100644
--- a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_converter.py
+++ b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_converter.py
@@ -325,7 +325,7 @@ class TestWorkflowConverter:
         workflow_converter = WorkflowConverter()
         workflow = workflow_converter.convert_app_model_config_to_workflow(
             app_model=app,
-            app_model_config=app.app_model_config,
+            app_model_config=app.app_model_config_with_session(session=db_session_with_containers),
             account_id=account.id,
             session=db_session_with_containers,
         )
diff --git a/api/tests/unit_tests/controllers/console/app/test_model_config_api.py b/api/tests/unit_tests/controllers/console/app/test_model_config_api.py
index 43d4925e165..d9d99221dff 100644
--- a/api/tests/unit_tests/controllers/console/app/test_model_config_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_model_config_api.py
@@ -4,7 +4,6 @@ import importlib
 import json
 import os
 from inspect import unwrap
-from typing import Never
 from unittest.mock import MagicMock
 from uuid import uuid4
 
@@ -21,13 +20,13 @@ from models.model import App, AppMode, AppModelConfig
 app_wraps_module = importlib.import_module("controllers.console.app.wraps")
 
 
-def _poison_implicit_app_config_properties(monkeypatch: pytest.MonkeyPatch) -> None:
-    def fail(_app: App) -> Never:
-        raise AssertionError("implicit App model-config property was accessed")
-
-    # `App.is_agent` used to be poisoned here too. It no longer exists as an
-    # implicit property, so its absence enforces the same thing outright.
-    monkeypatch.setattr(App, "app_model_config", property(fail))
+def _assert_no_implicit_app_config_properties() -> None:
+    # `App.is_agent` and `App.app_model_config` used to be poisoned here with a
+    # raising property. Neither exists as an implicit accessor any more, so their
+    # absence enforces the same thing outright — assert it instead of
+    # monkeypatching an attribute that is gone.
+    assert not hasattr(App, "is_agent")
+    assert not hasattr(App, "app_model_config")
 
 
 @pytest.mark.parametrize("app_mode", [AppMode.CHAT, AppMode.COMPLETION])
@@ -54,7 +53,7 @@ def test_post_updates_non_agent_model_config_without_implicit_properties(
     original_config.agent_mode = None
     sqlite_session.add(original_config)
     sqlite_session.commit()
-    _poison_implicit_app_config_properties(monkeypatch)
+    _assert_no_implicit_app_config_properties()
     monkeypatch.setattr(
         model_config_module.AppModelConfigService,
         "validate_configuration",
@@ -184,7 +183,7 @@ def test_post_encrypts_agent_tool_parameters(
         updated_by=None,
         updated_at=None,
     )
-    _poison_implicit_app_config_properties(monkeypatch)
+    _assert_no_implicit_app_config_properties()
 
     original_config = AppModelConfig(app_id="app-1", created_by="u1", updated_by="u1")
     original_config.id = "config-0"
diff --git a/api/tests/unit_tests/models/test_app_models.py b/api/tests/unit_tests/models/test_app_models.py
index 7d0a42ebcb8..3ae1824a2e9 100644
--- a/api/tests/unit_tests/models/test_app_models.py
+++ b/api/tests/unit_tests/models/test_app_models.py
@@ -33,6 +33,7 @@ from models.model import (
     Site,
     load_annotation_reply_config,
 )
+from models.workflow import Workflow, WorkflowType
 
 
 class TestAppModelValidation:
@@ -268,6 +269,110 @@ class TestAppModelValidation:
         # Assert
         assert result == AppMode.AGENT_CHAT
 
+    @pytest.mark.parametrize("sqlite_session", [(App, AppModelConfig)], indirect=True)
+    def test_app_model_config_with_session_reads_through_the_caller_session(self, sqlite_session: Session):
+        """`app_model_config_with_session` resolves the linked config through the caller's session."""
+        # Arrange
+        app = App(
+            tenant_id=str(uuid4()),
+            name="Test App",
+            mode=AppMode.CHAT,
+            enable_site=True,
+            enable_api=False,
+            created_by=str(uuid4()),
+        )
+        sqlite_session.add(app)
+        sqlite_session.flush()
+        model_config = AppModelConfig(app_id=app.id, agent_mode=json.dumps({"enabled": False}))
+        sqlite_session.add(model_config)
+        sqlite_session.flush()
+        app.app_model_config_id = model_config.id
+        sqlite_session.commit()
+
+        # Act: a session the model never owns, proving the lookup does not reach for a global one
+        with Session(sqlite_session.get_bind(), expire_on_commit=False) as caller_session:
+            result = app.app_model_config_with_session(session=caller_session)
+
+            # Assert
+            assert result is not None
+            assert result.id == model_config.id
+            assert result in caller_session
+
+    @pytest.mark.parametrize("sqlite_session", [(App, AppModelConfig)], indirect=True)
+    def test_app_model_config_with_session_returns_none_when_unlinked(self, sqlite_session: Session):
+        """An app without `app_model_config_id` resolves to None without querying."""
+        # Arrange
+        app = App(
+            tenant_id=str(uuid4()),
+            name="Test App",
+            mode=AppMode.CHAT,
+            enable_site=True,
+            enable_api=False,
+            created_by=str(uuid4()),
+        )
+        sqlite_session.add(app)
+        sqlite_session.flush()
+
+        # Act / Assert: an unbound session would raise if the guard were dropped
+        with Session(expire_on_commit=False) as unbound_session:
+            assert app.app_model_config_with_session(session=unbound_session) is None
+
+    @pytest.mark.parametrize("sqlite_session", [(App, AppModelConfig)], indirect=True)
+    def test_workflow_with_session_reads_through_the_caller_session(self, sqlite_session: Session):
+        """`workflow_with_session` resolves the published workflow through the caller's session."""
+        # Arrange
+        app = App(
+            tenant_id=str(uuid4()),
+            name="Test App",
+            mode=AppMode.WORKFLOW,
+            enable_site=True,
+            enable_api=False,
+            created_by=str(uuid4()),
+        )
+        sqlite_session.add(app)
+        sqlite_session.flush()
+        workflow = Workflow(
+            tenant_id=app.tenant_id,
+            app_id=app.id,
+            type=WorkflowType.WORKFLOW,
+            version="1",
+            graph=json.dumps({"nodes": [], "edges": []}),
+            created_by=app.created_by,
+        )
+        workflow._features = "{}"
+        sqlite_session.add(workflow)
+        sqlite_session.flush()
+        app.workflow_id = workflow.id
+        sqlite_session.commit()
+
+        # Act: a session the model never owns, proving the lookup does not reach for a global one
+        with Session(sqlite_session.get_bind(), expire_on_commit=False) as caller_session:
+            result = app.workflow_with_session(session=caller_session)
+
+            # Assert
+            assert result is not None
+            assert result.id == workflow.id
+            assert result in caller_session
+
+    @pytest.mark.parametrize("sqlite_session", [(App, AppModelConfig)], indirect=True)
+    def test_workflow_with_session_returns_none_when_unpublished(self, sqlite_session: Session):
+        """An app without `workflow_id` resolves to None without querying."""
+        # Arrange
+        app = App(
+            tenant_id=str(uuid4()),
+            name="Test App",
+            mode=AppMode.WORKFLOW,
+            enable_site=True,
+            enable_api=False,
+            created_by=str(uuid4()),
+        )
+        sqlite_session.add(app)
+        sqlite_session.flush()
+
+        # Act / Assert: an unbound session would raise if the guard were dropped
+        with Session(expire_on_commit=False) as unbound_session:
+            assert app.workflow_with_session(session=unbound_session) is None
+
     @pytest.mark.parametrize("sqlite_session", [(App, AppModelConfig)], indirect=True)
     def test_deleted_tools_checks_plugin_builtin_providers_through_core_plugin_service(self, sqlite_session: Session):
         """Plugin-backed built-in tools are checked through core PluginService."""
diff --git a/api/tests/unit_tests/services/test_app_service.py b/api/tests/unit_tests/services/test_app_service.py
index 1e6f79261f3..d568fb6742c 100644
--- a/api/tests/unit_tests/services/test_app_service.py
+++ b/api/tests/unit_tests/services/test_app_service.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 from collections.abc import Callable
 from datetime import datetime
 from types import SimpleNamespace
@@ -544,6 +545,32 @@ class TestGetApp:
         is_agent.assert_not_called()
         get_model_config.assert_called_once_with(session=unbound_session)
 
+    def test_masked_agent_config_is_served_through_the_session_accessor(self, unbound_session: Session):
+        """The masked config must be reachable via `app_model_config_with_session`.
+
+        Every response path resolves an `App`'s model config through that accessor
+        (`AppResponseView.app_model_config`), never through a raw attribute, so the
+        masking `get_app` applies has to be observable there.
+        """
+        app = App(mode=AppMode.AGENT_CHAT)
+        app.id = str(uuid4())
+        masked_config = AppModelConfig(app_id=app.id, agent_mode=json.dumps({"enabled": True, "tools": []}))
+        # A second, unmasked instance: what a fresh lookup would hand back if the
+        # returned app ever fell through to the base accessor.
+        refetched_config = AppModelConfig(app_id=app.id, agent_mode=json.dumps({"enabled": True, "tools": []}))
+        account = Account(name="Test Account", email="test@example.com")
+        account._current_tenant = Tenant(name="Test Tenant")
+        account._current_tenant.id = "tenant-1"
+
+        with (
+            patch.object(App, "app_model_config_with_session", side_effect=[masked_config, refetched_config]),
+            patch("services.app_service.current_user", account),
+        ):
+            result = AppService().get_app(app, session=unbound_session)
+
+            assert result is not app
+            assert result.app_model_config_with_session(session=unbound_session) is masked_config
+
 
 class TestAgentAppType:
     """S1: new ``AppMode.AGENT`` app type wiring."""

From 153cc72f17528a823cdc52fea74039ecfe459938 Mon Sep 17 00:00:00 2001
From: Mesrop Harutyunyan <104313591+mesrop2008@users.noreply.github.com>
Date: Thu, 17 Sep 2026 05:53:04 +0000
Subject: [PATCH 16/28] fix(web): correct Slovenian display language name
 (#42361)

---
 web/i18n-config/languages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/i18n-config/languages.ts b/web/i18n-config/languages.ts
index 5eebd8777b1..77702afccdc 100644
--- a/web/i18n-config/languages.ts
+++ b/web/i18n-config/languages.ts
@@ -142,7 +142,7 @@ const data = {
     },
     {
       value: 'sl-SI',
-      name: 'Slovensko (Slovenija)',
+      name: 'Slovenščina (Slovenija)',
       prompt_name: 'Slovensko',
       example: 'Zdravo, Dify!',
       supported: true,

From 0825e6ca515e23cab260edea5239b255ab604b87 Mon Sep 17 00:00:00 2001
From: wangxiaolei <fatelei@gmail.com>
Date: Thu, 17 Sep 2026 05:54:38 +0000
Subject: [PATCH 17/28] fix: fix some skill issues (#42389)

---
 api/services/skill_management_service.py      | 48 ++++++------
 .../services/test_skill_management_service.py | 74 +++++++++++++++++++
 web/features/skills/detail/skill-metadata.tsx |  7 +-
 web/service/console/client.spec.ts            | 66 +++++++++++++++++
 web/service/console/query-policies.ts         | 14 ++++
 5 files changed, 184 insertions(+), 25 deletions(-)

diff --git a/api/services/skill_management_service.py b/api/services/skill_management_service.py
index cb2df162927..b0731b82f3f 100644
--- a/api/services/skill_management_service.py
+++ b/api/services/skill_management_service.py
@@ -60,6 +60,7 @@ from models.account import Account
 from models.agent import (
     Agent,
     AgentConfigDraft,
+    AgentConfigDraftType,
     AgentConfigSnapshot,
     AgentKind,
     AgentScope,
@@ -2638,36 +2639,35 @@ class SkillManagementService:
                 )
             )
         )
-        configured_names: set[str] = set()
-        snapshot = session.scalar(
-            select(AgentConfigSnapshot).where(
-                AgentConfigSnapshot.tenant_id == tenant_id,
-                AgentConfigSnapshot.agent_id == agent_id,
-                AgentConfigSnapshot.id
-                == select(Agent.active_config_snapshot_id)
-                .where(Agent.tenant_id == tenant_id, Agent.id == agent_id)
-                .scalar_subquery(),
-            )
-        )
-        if snapshot is not None:
-            configured_names.update(
-                skill.name
-                for skill in AgentSoulConfig.model_validate(snapshot.config_snapshot_dict).config_skills
-                if not skill.is_missing
-            )
-        drafts = session.scalars(
+        # Bindings are edited against the normal draft, including unpublished removals.
+        config: AgentConfigDraft | AgentConfigSnapshot | None = session.scalar(
             select(AgentConfigDraft).where(
                 AgentConfigDraft.tenant_id == tenant_id,
                 AgentConfigDraft.agent_id == agent_id,
+                AgentConfigDraft.draft_type == AgentConfigDraftType.DRAFT,
+                AgentConfigDraft.account_id.is_(None),
             )
         )
-        for draft in drafts:
-            configured_names.update(
-                skill.name
-                for skill in AgentSoulConfig.model_validate(draft.config_snapshot_dict).config_skills
-                if not skill.is_missing
+        if config is None:
+            config = session.scalar(
+                select(AgentConfigSnapshot).where(
+                    AgentConfigSnapshot.tenant_id == tenant_id,
+                    AgentConfigSnapshot.agent_id == agent_id,
+                    AgentConfigSnapshot.id
+                    == select(Agent.active_config_snapshot_id)
+                    .where(Agent.tenant_id == tenant_id, Agent.id == agent_id)
+                    .scalar_subquery(),
+                )
             )
-
+        configured_names = (
+            {
+                skill.name
+                for skill in AgentSoulConfig.model_validate(config.config_snapshot_dict).config_skills
+                if not skill.is_missing
+            }
+            if config is not None
+            else set()
+        )
         conflicts = sorted(set(selected_skill_names) & (configured_names - current_bound_names))
         if conflicts:
             raise SkillManagementServiceError(
diff --git a/api/tests/unit_tests/services/test_skill_management_service.py b/api/tests/unit_tests/services/test_skill_management_service.py
index 8bdb7503dcc..951c7147a36 100644
--- a/api/tests/unit_tests/services/test_skill_management_service.py
+++ b/api/tests/unit_tests/services/test_skill_management_service.py
@@ -1150,6 +1150,80 @@ def test_replace_agent_bindings_rejects_skill_name_conflict_with_agent_config_sk
     assert exc_info.value.details == {"names": ["finance-sop"]}
 
 
+@pytest.mark.parametrize(
+    ("snapshot_has_skill", "draft_has_skill", "debug_has_skill", "expect_conflict"),
+    [
+        (True, False, False, False),
+        (True, False, True, False),
+        (False, True, False, True),
+        (True, True, False, True),
+        (False, None, True, False),
+        (True, None, True, True),
+    ],
+)
+def test_replace_agent_bindings_checks_editable_config(
+    snapshot_has_skill: bool,
+    draft_has_skill: bool | None,
+    debug_has_skill: bool,
+    expect_conflict: bool,
+) -> None:
+    service = SkillManagementService(tool_file_manager=_FakeToolFileManager())
+    created = service.create_skill(tenant_id=TENANT, user_id=USER, payload=SkillCreatePayload(name="finance-sop"))
+    skill_ref = AgentConfigSkillRefConfig(name="finance-sop", description="Embedded skill.", file_id="tool-file-1")
+    with session_factory.create_session() as session:
+        snapshot = AgentConfigSnapshot(
+            tenant_id=TENANT,
+            agent_id=AGENT,
+            version=1,
+            config_snapshot=AgentSoulConfig(config_skills=[skill_ref] if snapshot_has_skill else []),
+            created_by=USER,
+        )
+        session.add(snapshot)
+        session.flush()
+        agent = session.get(Agent, AGENT)
+        assert agent is not None
+        agent.active_config_snapshot_id = snapshot.id
+        if draft_has_skill is not None:
+            session.add(
+                AgentConfigDraft(
+                    tenant_id=TENANT,
+                    agent_id=AGENT,
+                    draft_type=AgentConfigDraftType.DRAFT,
+                    account_id=None,
+                    draft_owner_key="",
+                    base_snapshot_id=snapshot.id,
+                    config_snapshot=AgentSoulConfig(config_skills=[skill_ref] if draft_has_skill else []),
+                    created_by=USER,
+                )
+            )
+        if debug_has_skill:
+            session.add(
+                AgentConfigDraft(
+                    tenant_id=TENANT,
+                    agent_id=AGENT,
+                    draft_type=AgentConfigDraftType.DEBUG_BUILD,
+                    account_id=USER,
+                    draft_owner_key=USER,
+                    base_snapshot_id=snapshot.id,
+                    config_snapshot=AgentSoulConfig(config_skills=[skill_ref]),
+                    created_by=USER,
+                )
+            )
+        session.commit()
+
+    if expect_conflict:
+        with pytest.raises(SkillManagementServiceError) as exc_info:
+            service.replace_agent_bindings(tenant_id=TENANT, user_id=USER, agent_id=AGENT, skill_ids=[created["id"]])
+        assert exc_info.value.code == "agent_skill_name_conflict"
+        assert exc_info.value.details == {"names": ["finance-sop"]}
+    else:
+        result = service.replace_agent_bindings(
+            tenant_id=TENANT, user_id=USER, agent_id=AGENT, skill_ids=[created["id"]]
+        )
+        assert result["skill_ids"] == [created["id"]]
+        assert service.list_agent_bindings(tenant_id=TENANT, agent_id=AGENT)["data"][0]["id"] == created["id"]
+
+
 def test_replace_agent_bindings_allows_existing_bound_workspace_skill_name_in_agent_config() -> None:
     service = SkillManagementService(tool_file_manager=_FakeToolFileManager())
     created = service.create_skill(tenant_id=TENANT, user_id=USER, payload=SkillCreatePayload(name="finance-sop"))
diff --git a/web/features/skills/detail/skill-metadata.tsx b/web/features/skills/detail/skill-metadata.tsx
index 16a167c9d81..461d7e895a2 100644
--- a/web/features/skills/detail/skill-metadata.tsx
+++ b/web/features/skills/detail/skill-metadata.tsx
@@ -564,7 +564,12 @@ function SkillReferenceItem({
           }
         />
       </span>
-      <span className="max-w-63 min-w-0 flex-1 truncate system-sm-regular text-text-secondary">
+      <span
+        className={cn(
+          'min-w-0 flex-1 truncate system-sm-regular text-text-secondary',
+          !compact && 'max-w-63',
+        )}
+      >
         {workflowName}
       </span>
       <span
diff --git a/web/service/console/client.spec.ts b/web/service/console/client.spec.ts
index 17b7cc7ccf8..d065ba52279 100644
--- a/web/service/console/client.spec.ts
+++ b/web/service/console/client.spec.ts
@@ -2017,3 +2017,69 @@ describe('consoleQuery apiBasedExtension mutation defaults', () => {
     expect(queryClient.getQueryData(listKey)).toEqual([remainingExtension])
   })
 })
+
+describe('workspace skill deletion cache', () => {
+  it.each([true, false])('refreshes agent bindings after deletion (active: %s)', async (active) => {
+    const consoleQuery = await loadConsoleQuery()
+    const client = new QueryClient({
+      defaultOptions: { queries: { staleTime: Infinity, retry: false } },
+    })
+    const input = { params: { agent_id: 'agent-1' } }
+    const queryKey = consoleQuery.workspaces.current.agents.byAgentId.skills.get.queryKey({ input })
+    const previousBindings = { agent_id: 'agent-1', skill_ids: ['skill-1'], data: [] }
+    const emptyBindings = { agent_id: 'agent-1', skill_ids: [], data: [] }
+    client.setQueryData(queryKey, previousBindings)
+    const queryFn = vi.fn(async () => emptyBindings)
+    const observer = new QueryObserver(client, { queryKey, queryFn })
+    let unsubscribe = active ? observer.subscribe(() => {}) : undefined
+    const onSuccess = vi.fn()
+    const mutation = new MutationObserver(
+      client,
+      consoleQuery.workspaces.current.skills.bySkillId.delete.mutationOptions({
+        mutationFn: async () => ({ id: 'skill-1', deleted: true }),
+        onSuccess,
+      }),
+    )
+
+    try {
+      await mutation.mutate({
+        params: { skill_id: 'skill-1' },
+        body: { confirmation_name: 'Skill' },
+      })
+      if (!active) unsubscribe = observer.subscribe(() => {})
+      await vi.waitFor(() => expect(observer.getCurrentResult().data).toEqual(emptyBindings))
+      expect(queryFn).toHaveBeenCalledTimes(1)
+      expect(onSuccess).toHaveBeenCalledTimes(1)
+    } finally {
+      unsubscribe?.()
+      client.clear()
+    }
+  })
+
+  it('preserves cached bindings when deletion fails', async () => {
+    const consoleQuery = await loadConsoleQuery()
+    const client = new QueryClient()
+    const queryKey = consoleQuery.workspaces.current.agents.byAgentId.skills.get.queryKey({
+      input: { params: { agent_id: 'agent-1' } },
+    })
+    const bindings = { agent_id: 'agent-1', skill_ids: ['skill-1'], data: [] }
+    client.setQueryData(queryKey, bindings)
+    const mutation = new MutationObserver(
+      client,
+      consoleQuery.workspaces.current.skills.bySkillId.delete.mutationOptions({
+        mutationFn: async () => {
+          throw new Error('Deletion failed')
+        },
+      }),
+    )
+    try {
+      await expect(mutation.mutate({ params: { skill_id: 'skill-1' }, body: {} })).rejects.toThrow(
+        'Deletion failed',
+      )
+      expect(client.getQueryData(queryKey)).toEqual(bindings)
+      expect(client.getQueryState(queryKey)?.isInvalidated).toBe(false)
+    } finally {
+      client.clear()
+    }
+  })
+})
diff --git a/web/service/console/query-policies.ts b/web/service/console/query-policies.ts
index 48f35dc0e72..4838d3e9282 100644
--- a/web/service/console/query-policies.ts
+++ b/web/service/console/query-policies.ts
@@ -15,6 +15,20 @@ export function createConsoleQuery(consoleClient: ConsoleClient) {
     experimental_defaults: {
       workspaces: {
         current: {
+          skills: {
+            bySkillId: {
+              delete: {
+                mutationOptions: {
+                  onSettled: (_data, error, _variables, _result, context) => {
+                    if (error) return
+                    return context.client.invalidateQueries({
+                      queryKey: consoleQuery.workspaces.current.agents.byAgentId.skills.get.key(),
+                    })
+                  },
+                },
+              },
+            },
+          },
           rbac: {
             accessPolicies: {
               post: {

From cddfe06a8668adb3a0edc06d355245f12f10f5a7 Mon Sep 17 00:00:00 2001
From: invalid w <wangjuesix@gmail.com>
Date: Thu, 17 Sep 2026 06:02:51 +0000
Subject: [PATCH 18/28] chore(web): add tooltips to workflow header buttons
 (#42307)

---
 .../workflow/header/chat-variable-button.tsx  | 49 ++++++++++-----
 .../workflow/header/checklist/index.tsx       | 60 +++++++++++--------
 .../components/workflow/header/env-button.tsx | 40 ++++++++-----
 .../header/global-variable-button.tsx         | 44 ++++++++------
 4 files changed, 117 insertions(+), 76 deletions(-)

diff --git a/web/app/components/workflow/header/chat-variable-button.tsx b/web/app/components/workflow/header/chat-variable-button.tsx
index a3804835505..6b532172b46 100644
--- a/web/app/components/workflow/header/chat-variable-button.tsx
+++ b/web/app/components/workflow/header/chat-variable-button.tsx
@@ -1,5 +1,6 @@
 import { cn } from '@langgenius/dify-ui/cn'
 import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useStore } from '@/app/components/workflow/store'
@@ -22,23 +23,39 @@ const ChatVariableButton = ({ disabled }: { disabled: boolean }) => {
   }
 
   return (
-    <IconButton
-      aria-label={t(($) => $['chatVariable.panelTitle'], { ns: 'workflow' })}
-      aria-expanded={showChatVariablePanel}
-      size="lg"
-      className={cn(
-        'border border-transparent',
-        theme === 'dark' && showChatVariablePanel && 'border-black/5 bg-white/10 backdrop-blur-xs',
-      )}
-      disabled={disabled}
-      onClick={handleClick}
-      variant="ghost"
-    >
-      <span
-        aria-hidden
-        className="i-custom-vender-line-others-bubble-x size-4 text-components-button-secondary-text"
+    <Tooltip>
+      <TooltipTrigger
+        render={
+          <IconButton
+            aria-label={t(($) => $['chatVariable.panelTitle'], {
+              ns: 'workflow',
+            })}
+            aria-expanded={showChatVariablePanel}
+            size="lg"
+            className={cn(
+              'border border-transparent',
+              theme === 'dark' &&
+                showChatVariablePanel &&
+                'border-black/5 bg-white/10 backdrop-blur-xs',
+            )}
+            disabled={disabled}
+            onClick={handleClick}
+            variant="ghost"
+          >
+            <span
+              aria-hidden
+              className="i-custom-vender-line-others-bubble-x size-4 text-components-button-secondary-text"
+            />
+          </IconButton>
+        }
       />
-    </IconButton>
+
+      <TooltipContent>
+        {t(($) => $['chatVariable.panelTitle'], {
+          ns: 'workflow',
+        })}
+      </TooltipContent>
+    </Tooltip>
   )
 }
 
diff --git a/web/app/components/workflow/header/checklist/index.tsx b/web/app/components/workflow/header/checklist/index.tsx
index 191c529f630..856b56f0726 100644
--- a/web/app/components/workflow/header/checklist/index.tsx
+++ b/web/app/components/workflow/header/checklist/index.tsx
@@ -9,6 +9,7 @@ import {
   PopoverTitle,
   PopoverTrigger,
 } from '@langgenius/dify-ui/popover'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { memo, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useEdges } from 'reactflow'
@@ -58,32 +59,39 @@ const WorkflowChecklist = ({ disabled, showGoTo = true, onItemClick }: WorkflowC
 
   return (
     <Popover open={open} onOpenChange={(newOpen) => !disabled && setOpen(newOpen)}>
-      <PopoverTrigger
-        disabled={disabled}
-        render={
-          <button
-            type="button"
-            className={cn(
-              'group relative ml-0.5 flex size-7 items-center justify-center rounded-md border-none bg-transparent p-0',
-              'data-disabled:cursor-not-allowed data-disabled:opacity-50',
-            )}
-            disabled={disabled || undefined}
-            aria-label={checklistLabel}
-          >
-            <span className="flex size-full items-center justify-center rounded-md group-data-popup-open:bg-state-accent-hover hover:bg-state-accent-hover">
-              <span
-                className="i-ri-list-check-3 size-4 text-components-button-ghost-text group-hover:text-components-button-secondary-accent-text group-data-popup-open:text-components-button-secondary-accent-text"
-                aria-hidden="true"
-              />
-            </span>
-            {!!needWarningNodes.length && (
-              <span className="absolute -top-1.5 -right-1.5 flex h-4.5 min-w-4.5 items-center justify-center rounded-full border border-gray-100 bg-text-warning-secondary text-[11px] font-semibold text-white">
-                {needWarningNodes.length}
-              </span>
-            )}
-          </button>
-        }
-      />
+      <Tooltip>
+        <TooltipTrigger
+          render={
+            <PopoverTrigger
+              disabled={disabled}
+              render={
+                <button
+                  type="button"
+                  className={cn(
+                    'group relative ml-0.5 flex size-7 items-center justify-center rounded-md border-none bg-transparent p-0',
+                    'data-disabled:cursor-not-allowed data-disabled:opacity-50',
+                  )}
+                  disabled={disabled || undefined}
+                  aria-label={checklistLabel}
+                >
+                  <span className="flex size-full items-center justify-center rounded-md group-data-popup-open:bg-state-accent-hover hover:bg-state-accent-hover">
+                    <span
+                      className="i-ri-list-check-3 size-4 text-components-button-ghost-text group-hover:text-components-button-secondary-accent-text group-data-popup-open:text-components-button-secondary-accent-text"
+                      aria-hidden="true"
+                    />
+                  </span>
+                  {!!needWarningNodes.length && (
+                    <span className="absolute -top-1.5 -right-1.5 flex h-4.5 min-w-4.5 items-center justify-center rounded-full border border-gray-100 bg-text-warning-secondary text-[11px] font-semibold text-white">
+                      {needWarningNodes.length}
+                    </span>
+                  )}
+                </button>
+              }
+            />
+          }
+        />
+        <TooltipContent>{checklistLabel}</TooltipContent>
+      </Tooltip>
       <PopoverContent
         placement="bottom-start"
         sideOffset={12}
diff --git a/web/app/components/workflow/header/env-button.tsx b/web/app/components/workflow/header/env-button.tsx
index def0606ece7..247a1a0ddf1 100644
--- a/web/app/components/workflow/header/env-button.tsx
+++ b/web/app/components/workflow/header/env-button.tsx
@@ -1,5 +1,6 @@
 import { cn } from '@langgenius/dify-ui/cn'
 import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useInputFieldPanel } from '@/app/components/rag-pipeline/hooks/use-input-field-panel'
@@ -25,23 +26,30 @@ const EnvButton = ({ disabled }: { disabled: boolean }) => {
   }
 
   return (
-    <IconButton
-      aria-label={t(($) => $['env.envPanelTitle'], { ns: 'workflow' })}
-      aria-expanded={showEnvPanel}
-      size="lg"
-      className={cn(
-        'border border-transparent',
-        theme === 'dark' && showEnvPanel && 'border-black/5 bg-white/10 backdrop-blur-xs',
-      )}
-      variant="ghost"
-      disabled={disabled}
-      onClick={handleClick}
-    >
-      <span
-        aria-hidden
-        className="i-custom-vender-line-others-env size-4 text-components-button-secondary-text"
+    <Tooltip>
+      <TooltipTrigger
+        render={
+          <IconButton
+            aria-label={t(($) => $['env.envPanelTitle'], { ns: 'workflow' })}
+            aria-expanded={showEnvPanel}
+            size="lg"
+            className={cn(
+              'border border-transparent',
+              theme === 'dark' && showEnvPanel && 'border-black/5 bg-white/10 backdrop-blur-xs',
+            )}
+            variant="ghost"
+            disabled={disabled}
+            onClick={handleClick}
+          >
+            <span
+              aria-hidden
+              className="i-custom-vender-line-others-env size-4 text-components-button-secondary-text"
+            />
+          </IconButton>
+        }
       />
-    </IconButton>
+      <TooltipContent>{t(($) => $['env.envPanelTitle'], { ns: 'workflow' })}</TooltipContent>
+    </Tooltip>
   )
 }
 
diff --git a/web/app/components/workflow/header/global-variable-button.tsx b/web/app/components/workflow/header/global-variable-button.tsx
index 99916c9eacb..6388d472aa0 100644
--- a/web/app/components/workflow/header/global-variable-button.tsx
+++ b/web/app/components/workflow/header/global-variable-button.tsx
@@ -1,5 +1,6 @@
 import { cn } from '@langgenius/dify-ui/cn'
 import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useInputFieldPanel } from '@/app/components/rag-pipeline/hooks/use-input-field-panel'
@@ -25,25 +26,32 @@ const GlobalVariableButton = ({ disabled }: { disabled: boolean }) => {
   }
 
   return (
-    <IconButton
-      aria-label={t(($) => $['globalVar.title'], { ns: 'workflow' })}
-      aria-expanded={showGlobalVariablePanel}
-      size="lg"
-      className={cn(
-        'border border-transparent',
-        theme === 'dark' &&
-          showGlobalVariablePanel &&
-          'border-black/5 bg-white/10 backdrop-blur-xs',
-      )}
-      disabled={disabled}
-      onClick={handleClick}
-      variant="ghost"
-    >
-      <span
-        aria-hidden
-        className="i-custom-vender-line-others-global-variable size-4 text-components-button-secondary-text"
+    <Tooltip>
+      <TooltipTrigger
+        render={
+          <IconButton
+            aria-label={t(($) => $['globalVar.title'], { ns: 'workflow' })}
+            aria-expanded={showGlobalVariablePanel}
+            size="lg"
+            className={cn(
+              'border border-transparent',
+              theme === 'dark' &&
+                showGlobalVariablePanel &&
+                'border-black/5 bg-white/10 backdrop-blur-xs',
+            )}
+            disabled={disabled}
+            onClick={handleClick}
+            variant="ghost"
+          >
+            <span
+              aria-hidden
+              className="i-custom-vender-line-others-global-variable size-4 text-components-button-secondary-text"
+            />
+          </IconButton>
+        }
       />
-    </IconButton>
+      <TooltipContent>{t(($) => $['globalVar.title'], { ns: 'workflow' })}</TooltipContent>
+    </Tooltip>
   )
 }
 

From 81a65bd75037bce6ffad8ebb47711e0cffe95742 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Thu, 17 Sep 2026 06:23:43 +0000
Subject: [PATCH 19/28] chore(deps): upgrade compatible workspace dependencies
 (#42397)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml      | 601 +++++++++++++++++++++-----------------------
 pnpm-workspace.yaml |  28 +--
 2 files changed, 294 insertions(+), 335 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a434f12a643..5d762e4b8a9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -201,8 +201,8 @@ catalogs:
       specifier: 0.27.20
       version: 0.27.20
     '@formatjs/intl-localematcher':
-      specifier: 0.8.14
-      version: 0.8.14
+      specifier: 0.9.0
+      version: 0.9.0
     '@heroicons/react':
       specifier: 2.2.0
       version: 2.2.0
@@ -264,8 +264,8 @@ catalogs:
       specifier: 4.9.0
       version: 4.9.0
     '@rgrove/parse-xml':
-      specifier: 4.2.3
-      version: 4.2.3
+      specifier: 5.0.0
+      version: 5.0.0
     '@sentry/react':
       specifier: 10.75.0
       version: 10.75.0
@@ -339,8 +339,8 @@ catalogs:
       specifier: 10.4.2
       version: 10.4.2
     '@testing-library/jest-dom':
-      specifier: 6.9.1
-      version: 6.9.1
+      specifier: 7.0.1
+      version: 7.0.1
     '@testing-library/react':
       specifier: 16.3.3
       version: 16.3.3
@@ -423,8 +423,8 @@ catalogs:
       specifier: 0.6.5
       version: 0.6.5
     cn:
-      specifier: 0.2.6
-      version: 0.2.6
+      specifier: 0.3.0
+      version: 0.3.0
     code-inspector-plugin:
       specifier: 1.6.6
       version: 1.6.6
@@ -453,8 +453,8 @@ catalogs:
       specifier: 3.0.6
       version: 3.0.6
     elkjs:
-      specifier: 0.11.1
-      version: 0.11.1
+      specifier: 0.12.0
+      version: 0.12.0
     embla-carousel-autoplay:
       specifier: 8.6.0
       version: 8.6.0
@@ -477,8 +477,8 @@ catalogs:
       specifier: 2.4.0
       version: 2.4.0
     eslint-markdown:
-      specifier: 0.12.1
-      version: 0.12.1
+      specifier: 0.17.0
+      version: 0.17.0
     eslint-plugin-antfu:
       specifier: 3.2.3
       version: 3.2.3
@@ -486,26 +486,26 @@ catalogs:
       specifier: 4.7.0
       version: 4.7.0
     eslint-plugin-command:
-      specifier: 3.5.3
-      version: 3.5.3
+      specifier: 4.0.0
+      version: 4.0.0
     eslint-plugin-erasable-syntax-only:
-      specifier: 0.4.2
-      version: 0.4.2
+      specifier: 0.7.1
+      version: 0.7.1
     eslint-plugin-jsdoc:
-      specifier: 63.3.3
-      version: 63.3.3
+      specifier: 64.5.2
+      version: 64.5.2
     eslint-plugin-jsonc:
       specifier: 3.4.2
       version: 3.4.2
     eslint-plugin-markdown-preferences:
-      specifier: 0.41.1
-      version: 0.41.1
+      specifier: 0.42.0
+      version: 0.42.0
     eslint-plugin-n:
       specifier: 18.3.0
       version: 18.3.0
     eslint-plugin-no-barrel-files:
-      specifier: 1.3.1
-      version: 1.3.1
+      specifier: 2.2.0
+      version: 2.2.0
     eslint-plugin-perfectionist:
       specifier: 5.11.1
       version: 5.11.1
@@ -522,14 +522,14 @@ catalogs:
       specifier: 1.5.0
       version: 1.5.0
     eslint-plugin-unicorn:
-      specifier: 71.1.0
-      version: 71.1.0
+      specifier: 75.0.0
+      version: 75.0.0
     eslint-plugin-yml:
       specifier: 3.8.1
       version: 3.8.1
     eventsource-parser:
-      specifier: 3.1.1
-      version: 3.1.1
+      specifier: 4.1.1
+      version: 4.1.1
     fast-deep-equal:
       specifier: 3.1.3
       version: 3.1.3
@@ -615,8 +615,8 @@ catalogs:
       specifier: 3.0.1
       version: 3.0.1
     motion:
-      specifier: 12.43.0
-      version: 12.43.0
+      specifier: 13.4.0
+      version: 13.4.0
     negotiator:
       specifier: 1.1.0
       version: 1.1.0
@@ -839,7 +839,7 @@ importers:
         version: 2.4.0(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
       eslint-markdown:
         specifier: 'catalog:'
-        version: 0.12.1(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
+        version: 0.17.0(@eslint/markdown@8.0.3(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
       eslint-plugin-antfu:
         specifier: 'catalog:'
         version: 3.2.3(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
@@ -848,25 +848,25 @@ importers:
         version: 4.7.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(oxlint@1.79.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(@vitest/browser-playwright@4.1.11)(@vitest/coverage-v8@4.1.11)(esbuild@0.28.2)(happy-dom@20.12.0)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)))(tailwindcss@4.3.3)
       eslint-plugin-command:
         specifier: 'catalog:'
-        version: 3.5.3(@typescript-eslint/typescript-estree@8.70.0(@typescript/typescript6@6.0.2)(supports-color@11.0.0))(@typescript-eslint/utils@8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
+        version: 4.0.0(@typescript-eslint/typescript-estree@8.70.0(@typescript/typescript6@6.0.2)(supports-color@11.0.0))(@typescript-eslint/utils@8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
       eslint-plugin-erasable-syntax-only:
         specifier: 'catalog:'
-        version: 0.4.2(@typescript-eslint/parser@8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0))(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
+        version: 0.7.1(@typescript-eslint/parser@8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0))(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
       eslint-plugin-jsdoc:
         specifier: 'catalog:'
-        version: 63.3.3(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
+        version: 64.5.2(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
       eslint-plugin-jsonc:
         specifier: 'catalog:'
         version: 3.4.2(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
       eslint-plugin-markdown-preferences:
         specifier: 'catalog:'
-        version: 0.41.1(@eslint/markdown@8.0.3(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
+        version: 0.42.0(@eslint/markdown@8.0.3(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
       eslint-plugin-n:
         specifier: 'catalog:'
         version: 18.3.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
       eslint-plugin-no-barrel-files:
         specifier: 'catalog:'
-        version: 1.3.1(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
+        version: 2.2.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
       eslint-plugin-perfectionist:
         specifier: 'catalog:'
         version: 5.11.1(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
@@ -884,7 +884,7 @@ importers:
         version: 1.5.0(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
       eslint-plugin-unicorn:
         specifier: 'catalog:'
-        version: 71.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
+        version: 75.0.0(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
       eslint-plugin-yml:
         specifier: 'catalog:'
         version: 3.8.1(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
@@ -926,7 +926,7 @@ importers:
         version: 0.6.5
       eventsource-parser:
         specifier: 'catalog:'
-        version: 3.1.1
+        version: 4.1.1
       js-yaml:
         specifier: 'catalog:'
         version: 5.4.2
@@ -1023,7 +1023,7 @@ importers:
         version: typescript@7.0.2
       eventsource-parser:
         specifier: 'catalog:'
-        version: 3.1.1
+        version: 4.1.1
       tsx:
         specifier: 'catalog:'
         version: 4.23.13
@@ -1118,7 +1118,7 @@ importers:
     dependencies:
       cn:
         specifier: 'catalog:'
-        version: 0.2.6
+        version: 0.3.0
     devDependencies:
       '@base-ui/react':
         specifier: 'catalog:'
@@ -1368,7 +1368,7 @@ importers:
         version: 0.27.20(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       '@formatjs/intl-localematcher':
         specifier: 'catalog:'
-        version: 0.8.14
+        version: 0.9.0
       '@heroicons/react':
         specifier: 'catalog:'
         version: 2.2.0(react@19.3.0)
@@ -1476,7 +1476,7 @@ importers:
         version: 3.0.6(echarts@6.1.0)(react@19.3.0)
       elkjs:
         specifier: 'catalog:'
-        version: 0.11.1
+        version: 0.12.0
       embla-carousel-autoplay:
         specifier: 'catalog:'
         version: 8.6.0(embla-carousel@8.6.0)
@@ -1563,7 +1563,7 @@ importers:
         version: 3.0.1
       motion:
         specifier: 'catalog:'
-        version: 12.43.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
+        version: 13.4.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       negotiator:
         specifier: 'catalog:'
         version: 1.1.0
@@ -1693,7 +1693,7 @@ importers:
         version: link:../packages/dify-ui
       '@rgrove/parse-xml':
         specifier: 'catalog:'
-        version: 4.2.3
+        version: 5.0.0
       '@storybook/addon-docs':
         specifier: 'catalog:'
         version: 10.6.0(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(storybook@10.6.0(@types/react@19.3.0)(react@19.3.0)(vite-plus@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(@vitest/browser-playwright@4.1.11)(@vitest/coverage-v8@4.1.11)(esbuild@0.28.2)(happy-dom@20.14.5)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)))
@@ -1723,7 +1723,7 @@ importers:
         version: 10.4.2
       '@testing-library/jest-dom':
         specifier: 'catalog:'
-        version: 6.9.1
+        version: 7.0.1(@testing-library/dom@10.4.2)(vitest@4.1.11)
       '@testing-library/react':
         specifier: 'catalog:'
         version: 16.3.3(@testing-library/dom@10.4.2)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
@@ -2180,13 +2180,13 @@ packages:
   '@emoji-mart/data@1.2.1':
     resolution: {integrity: sha512-no2pQMWiBy6gpBEiqGeU77/bFejDqUTRY7KX+0+iur13op3bqUsXdnwoZs6Xb1zbv0gAj5VvS1PWoUUckSr5Dw==}
 
-  '@es-joy/jsdoccomment@0.88.0':
-    resolution: {integrity: sha512-GK/HL/claLLNo5KG705auIlZMwEtmn88ofSGuLsmVZwKBqMPJhW9DiznYNq07QEqz9BPtA3LBfYImtZmhVvRAw==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+  '@es-joy/jsdoccomment@0.92.0':
+    resolution: {integrity: sha512-WivZqV5jPTYDQJgIMp0hTsyQESKYNY6yCJr4b0l84tYtQntkAMkc6zARh2vlRQyeg4aYHPUkCUDpvr2IWAiGpQ==}
+    engines: {node: ^22.22.2 || >=24.15.0}
 
-  '@es-joy/jsdoccomment@0.91.0':
-    resolution: {integrity: sha512-vgqlMGNNhZxwDYbUNIHj3Hskb4R28iqdXx90ufHyt/NeuTQkeqjTDslAs9I0/GCAfbxP5BpH5WsL1R1fht5Lxg==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+  '@es-joy/jsdoccomment@0.97.0':
+    resolution: {integrity: sha512-EP8uoFfh6+GsdGCduYtmWAW0h7AO+Ayik9Vh5YbA2r/3N6lmJKkCNZX+q3QBXC1K6ixjQ/9igF2b7WVvLm063g==}
+    engines: {node: ^22.22.2 || >=24.15.0}
 
   '@es-joy/resolve.exports@1.2.0':
     resolution: {integrity: sha512-Q9hjxWI5xBM+qW2enxfe8wDKdFWMfd0Z29k5ZJnuBqD/CasY5Zryj09aCA6owbGATWz+39p5uIdaHXpopOcG8g==}
@@ -2354,6 +2354,12 @@ packages:
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0
 
+  '@eslint-community/eslint-utils@4.10.1':
+    resolution: {integrity: sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
   '@eslint-community/eslint-utils@4.9.1':
     resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -2430,10 +2436,6 @@ packages:
     resolution: {integrity: sha512-DObd/KKUsU+FaFv4PLxSRenpXfQWmPXXP3pPZ6/K1PCrMu2vQpMDMuQe/BqYeoLcz8ro0bVDF1RxOJgfVEdhUw==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@eslint/core@0.17.0':
-    resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@eslint/core@1.2.1':
     resolution: {integrity: sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
@@ -2442,10 +2444,6 @@ packages:
     resolution: {integrity: sha512-iPmijIAq4hlIJB86PYmY/fcZORHtjphSqICDbwuw32A/JmkhZQ/K/6TjHE03zqf3n5yABpVcbRAMG8Mi9ojy8g==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@eslint/markdown@7.5.1':
-    resolution: {integrity: sha512-R8uZemG9dKTbru/DQRPblbJyXpObwKzo8rv1KYGGuPUPtjM4LXBYM9q5CIZAComzZupws3tWbDwam5AFpPLyJQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@eslint/markdown@8.0.3':
     resolution: {integrity: sha512-rBTSSShrq7e4O+PWfeE4azH4/CWPNrC+VGxBXiW00o3vYVJnznsZiDayj3KC9JztIMVRZxZHn2nrDIUau/4j7A==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
@@ -2454,10 +2452,6 @@ packages:
     resolution: {integrity: sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@eslint/plugin-kit@0.4.1':
-    resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@eslint/plugin-kit@0.7.2':
     resolution: {integrity: sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
@@ -2490,8 +2484,8 @@ packages:
   '@formatjs/fast-memoize@3.1.7':
     resolution: {integrity: sha512-zXfhLpvA6T7+efdt9JLbBwZ00tT7NsBMDVnDu8rpHeNNv8KfRZAMo2gkG0k9lK/Nzc//3kJ9pImsfuJxk3KhUA==}
 
-  '@formatjs/intl-localematcher@0.8.14':
-    resolution: {integrity: sha512-8O7V38QmbB11+ryJ3KM/znrzXtiqgpXzqNoqDsndHZZ5/zDKTTL+cf5F0mzXkQEwhx8IlWnqYvEovf2S5EwLTw==}
+  '@formatjs/intl-localematcher@0.9.0':
+    resolution: {integrity: sha512-Z7TD3ssNry1Av1dVDoq/mzpxGyxqWwU0ClWEo+BB3k0JQTeQvUGmeK9WZGYvlqStS0UqkaKXk3dfjsb6NaHAxw==}
 
   '@heroicons/react@2.2.0':
     resolution: {integrity: sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==}
@@ -4186,9 +4180,9 @@ packages:
     resolution: {integrity: sha512-C7c51Nn4yTxXFKvgh2txJFNweaVcfUPQxwEUFw4aWsCmfiBDJsTSwviIF8EcwjQ6k8bPyMWCl1vw4BdxE569Cg==}
     engines: {node: '>= 10'}
 
-  '@rgrove/parse-xml@4.2.3':
-    resolution: {integrity: sha512-Jhlb+0zYez1T1yXUQs3F1qAtFuJljBVNdy9TKmLDauAXkxsOXopKYOyQ5Wm6SvP3fycav0GviX4Y15WWhGetMw==}
-    engines: {node: '>=14.0.0'}
+  '@rgrove/parse-xml@5.0.0':
+    resolution: {integrity: sha512-SgHFyisNAkS2ZbM8SCriUm1N0bxLiz0POKvpDeAtrnLrXaYG1PawNwu1rSjmE/vcVHbZzYWNgVP6xkep6R4uXg==}
+    engines: {node: '>=22.12.0'}
 
   '@rolldown/pluginutils@1.0.1':
     resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==}
@@ -4637,6 +4631,16 @@ packages:
     resolution: {integrity: sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==}
     engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
 
+  '@testing-library/jest-dom@7.0.1':
+    resolution: {integrity: sha512-oMDTC3oA+6CXSO2JZnvOI7CA6oVub6kij5ggk9ohwye5slmkwxYDXcPOVxgMw/RQlticjtO0C1RZkR97HgrWMw==}
+    engines: {node: '>=22', npm: '>=6', yarn: '>=1'}
+    peerDependencies:
+      '@testing-library/dom': '>=10 <11'
+      vitest: 4.1.11
+    peerDependenciesMeta:
+      vitest:
+        optional: true
+
   '@testing-library/react@16.3.3':
     resolution: {integrity: sha512-Uo193NgQbPMz6lrrhtRQQFcMC6Re/ELLFbbuVL30WDlZxlpZf9/lMHTAVxPRLw1q1iu9OJmR1c2BLiENRstdBg==}
     engines: {node: '>=18'}
@@ -5600,9 +5604,9 @@ packages:
     resolution: {integrity: sha512-BJ8/l4R5LRE7hW9WdSuGYrLSHi2ynxeFpDFbH0K/CgNeY/tyhk+vO6TYxXC5r5CpUhNVX310xzPsN/H9lCdfOA==}
     engines: {node: '>=14'}
 
-  are-docs-informative@0.0.2:
-    resolution: {integrity: sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==}
-    engines: {node: '>=14'}
+  are-docs-informative@0.1.1:
+    resolution: {integrity: sha512-sqRsNQBwbKLRX0jV5Cu5uzmtflf892n4Vukz7T659ebL4pz3mpOqCMU7lxMoBTFwnp10E3YB5ZcyHM41W5bcDA==}
+    engines: {node: '>=18'}
 
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
@@ -5625,8 +5629,8 @@ packages:
     resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
     engines: {node: '>=4'}
 
-  ast-v8-to-istanbul@1.0.4:
-    resolution: {integrity: sha512-0bC0/4bTSrnwdhU3IsZDwEdojvuPrSg59OYZfKsLRtJZ0u8VBx9DebfqqG8bRdCC0I7vjgxmPi41P0lpkhJHtA==}
+  ast-v8-to-istanbul@1.0.6:
+    resolution: {integrity: sha512-fvpl29helSO2w/z7utIbrkNXILdrLwDwAMH2I/zPKlGf5244+gf+B4cyS1sANcrPY2h+hWCGSgC8N61s/+AF9A==}
 
   async@3.2.6:
     resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
@@ -5673,6 +5677,10 @@ packages:
   bowser@2.14.1:
     resolution: {integrity: sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==}
 
+  brace-expansion@5.0.12:
+    resolution: {integrity: sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==}
+    engines: {node: 20 || >=22}
+
   brace-expansion@5.0.6:
     resolution: {integrity: sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==}
     engines: {node: 18 || 20 || >=22}
@@ -5868,8 +5876,8 @@ packages:
     resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
     engines: {node: '>=6'}
 
-  cn@0.2.6:
-    resolution: {integrity: sha512-+i4L0zUGgRcEnhsxueVrP7iBGxBx5iD0WOTYg1MwFEu2ZyCmH5Ov2V1cul2Ht5UchRQQgftCf4be/RxspuW6QQ==}
+  cn@0.3.0:
+    resolution: {integrity: sha512-qRoU0ARrZD3Bbj1wKFftEKxPjSnzTEdFkf22NVhW+zU9D/wajhoP+qUZ5DChhhSOBCH1onV12hrmGqfu1+5Z2Q==}
     engines: {node: '>=20'}
     hasBin: true
 
@@ -5931,10 +5939,6 @@ packages:
     resolution: {integrity: sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==}
     engines: {node: '>=18'}
 
-  convert-hrtime@5.0.0:
-    resolution: {integrity: sha512-lOETlkIeYSJWcbbcvjRKGxVMXJR+8+OQb/mTPbA4ObPMytYIsUbuOE0Jzy60hjARYszq1id0j8KgVhC+WGZVTg==}
-    engines: {node: '>=12'}
-
   convert-source-map@2.0.0:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
 
@@ -6316,8 +6320,8 @@ packages:
   electron-to-chromium@1.5.417:
     resolution: {integrity: sha512-4T+DTDWuMPM4aHlHwWdAVCVWwp7LDilnhzkj+c/Lbj91XSQrLuOmZSLtS9Q4iIqjlPUbPOnC624zDVVHCHaolQ==}
 
-  elkjs@0.11.1:
-    resolution: {integrity: sha512-zxxR9k+rx5ktMwT/FwyLdPCrq7xN6e4VGGHH8hA01vVYKjTFik7nHOxBnAYtrgYUB1RpAiLvA1/U2YraWxyKKg==}
+  elkjs@0.12.0:
+    resolution: {integrity: sha512-YZcKynxVxYoKIOEpywEPwCFdg+BTbxQRNf3pbwdDCvc8O3kQD8bmIwSxKU1eOTVc4Xo+VG9Te+575mlfvOrhEQ==}
 
   embla-carousel-autoplay@8.6.0:
     resolution: {integrity: sha512-OBu5G3nwaSXkZCo1A6LTaFMZ8EpkYbwIaH+bPqdBnDGQ2fh4+NbzjXjs2SktoPNKCtflfVMc75njaDHOYXcrsA==}
@@ -6403,9 +6407,6 @@ packages:
   es-module-lexer@1.7.0:
     resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}
 
-  es-module-lexer@2.3.1:
-    resolution: {integrity: sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==}
-
   es-module-lexer@2.3.2:
     resolution: {integrity: sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==}
 
@@ -6454,11 +6455,12 @@ packages:
       '@eslint/json':
         optional: true
 
-  eslint-markdown@0.12.1:
-    resolution: {integrity: sha512-zQ2pnYdZtLLDW2QeeJ0szqYy7yD+ntwBe1mAibeWSo5tZaUrhPpfXqsSf6q09K9OArl9OP4/sxgSlDgZ5cQliA==}
+  eslint-markdown@0.17.0:
+    resolution: {integrity: sha512-WG5uqP9dH3Dg01hUt/LyYZcpCG9IdnZuMmiKtxEKFaF0g32GTneI2nGbnOf8uDlg9vaJC3AMAETDwz4VjYgyqg==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
     peerDependencies:
-      eslint: ^9.31.0 || ^10.0.0-rc.0
+      '@eslint/markdown': ^8.0.3
+      eslint: ^9.39.0 || ^10.0.0
     peerDependenciesMeta:
       eslint:
         optional: true
@@ -6481,15 +6483,16 @@ packages:
       oxlint:
         optional: true
 
-  eslint-plugin-command@3.5.3:
-    resolution: {integrity: sha512-JIhmUOW2K2Dw1K+p4mtj5potkqTZ4ZaicrTkgCygPZCWErP2+O2F46n7ZwGKapeEjiwcVqoY8u01SxNUUXWPeQ==}
+  eslint-plugin-command@4.0.0:
+    resolution: {integrity: sha512-mM1UdKu39YF5nUBVbA+PaVvpB3R3Niwjes8CQ8rJTTbgIThgrfQILgDqmtpAAQL1xGaolCoES1SfiwzwPVGkXQ==}
+    engines: {node: ^22.22.2 || >=24.15.0}
     peerDependencies:
       '@typescript-eslint/typescript-estree': '*'
       '@typescript-eslint/utils': '*'
       eslint: '*'
 
-  eslint-plugin-erasable-syntax-only@0.4.2:
-    resolution: {integrity: sha512-eLeg6CgNVY6LYPiPZnDn2JLh1HQVGoqjq1OD2GKGo70EcwbTwpWcqgi1zJJ/PJIKRO87cejCp9lwv5psrdxuKA==}
+  eslint-plugin-erasable-syntax-only@0.7.1:
+    resolution: {integrity: sha512-2zpgLgFq/HmIVQU2KNOsuuQdJQAiRdq23xpCamhatbH4ZlzinqXdDmbxGALj7VSiC9GMBHqmu4Cu7KaSqQfNhw==}
     engines: {node: '>=20.18.0'}
     peerDependencies:
       '@typescript-eslint/parser': '>=8'
@@ -6502,11 +6505,15 @@ packages:
     peerDependencies:
       eslint: '>=8'
 
-  eslint-plugin-jsdoc@63.3.3:
-    resolution: {integrity: sha512-xI4IeVRzRFA2DGHrPLIxF3U+oJHU3FE+P9Zb27fVs5dPHgfcpoAs0PyCbznVhK7pwR+9BPUztFeXSgpw/CL4Yg==}
-    engines: {node: ^22.13.0 || >=24}
+  eslint-plugin-jsdoc@64.5.2:
+    resolution: {integrity: sha512-GirLf/jpVQ/HSLVT98ztIrJ8GUlWWrrwExkofqzeIjjOxlqFtyqnpkRs30FLwEKh0xHEpgy35CU0qFn0I/Mh9w==}
+    engines: {node: ^22.22.2 || >=24.15.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
 
   eslint-plugin-jsonc@3.4.2:
     resolution: {integrity: sha512-q5xzjCYFQuhFomTbctXzd3STfDJ8XduvaigjQmMEbP2gzSKrc58y3Fv6D775/cIK1/sRUn+4kpljiU2iW8k0zw==}
@@ -6514,8 +6521,8 @@ packages:
     peerDependencies:
       eslint: '>=9.38.0'
 
-  eslint-plugin-markdown-preferences@0.41.1:
-    resolution: {integrity: sha512-Xi4rlT7oBZ8PMGDl7J9khgO2vF9X0F/6ag05/25Vyq7r3llaK95x9D6DpzXidxC2Gagl/e8bp2Hw47r4I3wWSA==}
+  eslint-plugin-markdown-preferences@0.42.0:
+    resolution: {integrity: sha512-LVoGwsRDeLFooaj9OndJrof5OslnQQnZKStP+GX0DMnAt6Nt2tgJzP+URRNXqS54lYnIa0m6pBo7CO1n/utTsw==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
     peerDependencies:
       '@eslint/markdown': ^7.4.0 || ^8.0.0
@@ -6534,10 +6541,14 @@ packages:
       typescript:
         optional: true
 
-  eslint-plugin-no-barrel-files@1.3.1:
-    resolution: {integrity: sha512-y7OX5kyH7PMNRFhLF6SmM4JapxvaxExrgWPndPNTzilpO5uBqybuN480g3E8TTxT3OLOOhQDynmcJ0dnipIyNA==}
+  eslint-plugin-no-barrel-files@2.2.0:
+    resolution: {integrity: sha512-bksrf75UqNXwKnTdK6lCAZI+Ci0b2Mvt9VOY2wBq8Tqu4yxH36bPePaT6Cn4jOdBiY2eWzM6rxXVjOscwiUE4g==}
     peerDependencies:
       eslint: ^8.0.0 || ^9.0.0 || ^10.0.0
+      typescript: ^5.6.3 || ^6.0.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
 
   eslint-plugin-perfectionist@5.11.1:
     resolution: {integrity: sha512-xloHScnOpin9Jy3CegfzoBeY33ASk0spLyM2sJs0LyNHQjv9m0osUD2PYNT7NrJieZbUR2Ebn4A5Q0+0dOcv+A==}
@@ -6609,8 +6620,8 @@ packages:
     peerDependencies:
       eslint: '>=9.38.0'
 
-  eslint-plugin-unicorn@71.1.0:
-    resolution: {integrity: sha512-dn3YmR3qLLUeYyo/os3ubZ7UHQJ1WbBAgC9cIhnLTyMj9J6kivuc2U1fCmYetLexUlTDVYtBqhjSj/VaebTe6Q==}
+  eslint-plugin-unicorn@75.0.0:
+    resolution: {integrity: sha512-72I7eSn+/z5CpgValFBl9mp2JE5UPD+nUUyB/VIGUMF1rCP1i37mA05zfIAVIU312A+qCZ38T8tSZr3oaMv4Mw==}
     engines: {node: '>=22'}
     peerDependencies:
       eslint: '>=10.4'
@@ -6680,9 +6691,9 @@ packages:
   event-target-bus@1.1.0:
     resolution: {integrity: sha512-24JX34nM0qRcsj7KvtLbVpMcX8ZQYmb0+0a6viaV2GJtVFg5UGyJyDLITkBipJIG0fSscNskI2PxdhTBIMeg8g==}
 
-  eventsource-parser@3.1.1:
-    resolution: {integrity: sha512-EKN1vKAMcZ8MlYMpaNuxN6R9yakzH6uajHcHVTqWJzvu5pWw9DyhbP35HH8MVBQ+dZjAfDxk+A8NiR9KWaXiyQ==}
-    engines: {node: '>=18.0.0'}
+  eventsource-parser@4.1.1:
+    resolution: {integrity: sha512-zaWNqeSLeyzEAAt2Q6aDBRDRk/VnPmsKqvToyGvv6aahvLv71A4Jw7jG93Hckf11zXurbqgsffvpSgKPoeU1Qw==}
+    engines: {node: '>=22.12'}
 
   expand-template@2.0.3:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
@@ -6788,15 +6799,12 @@ packages:
       react-dom:
         optional: true
 
-  framer-motion@12.43.0:
-    resolution: {integrity: sha512-1eaL3RvR/kAlbG7UYcpMptEyzPoENO0c6w7ZnB3/hh2vSAz/6uGAFn6fdoqTBguNstf3MsFhJHsD/0DHiclG+g==}
+  framer-motion@13.4.0:
+    resolution: {integrity: sha512-HCpqKM9BTu6UYKtj0u6J1QNxojnnirNcghcSDZ+SkpiL3myxvtsgXPS3ZGEELC2eSma7YiA937rAEXtRyydSXQ==}
     peerDependencies:
-      '@emotion/is-prop-valid': '*'
       react: ^18.0.0 || ^19.0.0
       react-dom: ^18.0.0 || ^19.0.0
     peerDependenciesMeta:
-      '@emotion/is-prop-valid':
-        optional: true
       react:
         optional: true
       react-dom:
@@ -6815,10 +6823,6 @@ packages:
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
-  function-timeout@1.0.2:
-    resolution: {integrity: sha512-939eZS4gJ3htTHAldmyyuzlrD58P03fHG49v2JfFXbV6OhvZKRC9j2yAtdHw/zrp2zXHuv05zMIy40F0ge7spA==}
-    engines: {node: '>=18'}
-
   fuse.js@7.5.0:
     resolution: {integrity: sha512-sQtrEfA+ez/3G0cCZecF70oqpCRttCexYUG4mUrtWL49ULUzUyxokt5kyqwtKzj1270RaKih+hcP3qLcumccow==}
     engines: {node: '>=10'}
@@ -7114,10 +7118,6 @@ packages:
   is-hexadecimal@2.0.1:
     resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==}
 
-  is-identifier@1.1.0:
-    resolution: {integrity: sha512-NhOds0mDx9lJu+1lBRO0xbwFo5nobA7GCk/0e5xjr6+6XugX985+0OyGX35BNrTkPAsdLcIKg02HUQJOK8D8kw==}
-    engines: {node: '>=18'}
-
   is-in-ssh@1.0.0:
     resolution: {integrity: sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==}
     engines: {node: '>=20'}
@@ -7218,21 +7218,17 @@ packages:
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  js-yaml@4.3.0:
-    resolution: {integrity: sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==}
+  js-yaml@4.2.0:
+    resolution: {integrity: sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==}
     hasBin: true
 
   js-yaml@5.4.2:
     resolution: {integrity: sha512-m+aqu+LwO1O6sIopafj8HUVl5aawITwZQe/yHpMCKjaWBaA/d07B/QdMb3529REftiU+RMMHL3Vlsw3hON7vWg==}
     hasBin: true
 
-  jsdoc-type-pratt-parser@7.2.0:
-    resolution: {integrity: sha512-dh140MMgjyg3JhJZY/+iEzW+NO5xR2gpbDFKHqotCmexElVntw7GjWjt511+C/Ef02RU5TKYrJo/Xlzk+OLaTw==}
-    engines: {node: '>=20.0.0'}
-
-  jsdoc-type-pratt-parser@8.0.0:
-    resolution: {integrity: sha512-uQu/fXVqVaMg6gM8/E5G5+eygVcZ1NV0Z51CvqhNa2bDWxvHMl484ETr6vph4oPyC+KUcbP/w2W2pewfCiR9aQ==}
-    engines: {node: '>=20.0.0'}
+  jsdoc-type-pratt-parser@9.0.1:
+    resolution: {integrity: sha512-1LJ/negRKJxH0+ulOsJYEpUgzIs1DAOz9QctuS4In2LW/Ro3l8C4ej5al+5FU2hBGEOAY3R3SCnP6x8226JMIw==}
+    engines: {node: ^22.22.2 || >=24.15.0}
 
   jsdoc-type-pratt-parser@9.2.1:
     resolution: {integrity: sha512-V4Ww4EHnTcTLSOMoB0FsF72JhQvcAsriCm/LWnxJeGWoxIjEL2l9na11abQok5SYShq8m0Gl02el/xAbTCulvQ==}
@@ -7541,9 +7537,8 @@ packages:
   magicast@0.5.3:
     resolution: {integrity: sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==}
 
-  make-asynchronous@1.1.0:
-    resolution: {integrity: sha512-ayF7iT+44LXdxJLTrTd3TLQpFDDvPCBxXxbv+pMUSuHA5Q8zyAfwkRP6aHHwNVFBUFWtxAHqwNJxF8vMZLAbVg==}
-    engines: {node: '>=18'}
+  magicast@0.5.5:
+    resolution: {integrity: sha512-UicdXN8zQ3JHlxVq+28afMXPr1z7WNY6+7EJnzTdQWkTAlMLF5fNCCKxJHBQwGaNGR11581EiQmQzx73+MvszA==}
 
   make-dir@4.0.0:
     resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
@@ -7756,6 +7751,10 @@ packages:
     resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
     engines: {node: 18 || 20 || >=22}
 
+  minimatch@10.2.6:
+    resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==}
+    engines: {node: 18 || 20 || >=22}
+
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
@@ -7782,21 +7781,18 @@ packages:
   moo-color@1.0.3:
     resolution: {integrity: sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==}
 
-  motion-dom@12.43.0:
-    resolution: {integrity: sha512-azKON4d9S65PEoFUiQTMTgPheEmzf2QngdRc50AKfJp9Q9mmcBVw22c8eMq9k8kxOFHdL7+WZY7N/5F/lwiDag==}
+  motion-dom@13.3.0:
+    resolution: {integrity: sha512-AmAnB6pHdZ1vHGzWzuzteG6Q3j1lHKeX/lbST6jGlgm0cjvLUgaCk1xhOuPMOy5SgovN6wnnUdwFrkcsus7Ftg==}
 
-  motion-utils@12.39.0:
-    resolution: {integrity: sha512-8nadJAJjTtqRkmRF36FoJTrywK9nnFmnPwnSMyxaOCU7GDjN9RTMJIxx9De8ErM+vpPhMccr/6fo5WciyQLnMQ==}
+  motion-utils@13.3.0:
+    resolution: {integrity: sha512-sgSschQp7EseHInIlR7hBbMuvet3RA0bs28KPZAXJcGKGdxHGvh1ogpYDilY3bOMtl73EqPNmp75sAKHYPU5sg==}
 
-  motion@12.43.0:
-    resolution: {integrity: sha512-BQgQbSa9Hn3/mtbib0MK53y6JSANa+YKUKlaYnWzAVDH424RYQ5LVpV3pNiWH00BA2z4ojsSdMzqT7g2FQwjuQ==}
+  motion@13.4.0:
+    resolution: {integrity: sha512-aiNSA29N+vgV5p5cJSB5cFzx8KTuuxB99z8zGtxsaqlwKtBK6sq8YgPRpkVQLkbJMOcLDU0q/ShdT95qpBy/0g==}
     peerDependencies:
-      '@emotion/is-prop-valid': '*'
       react: ^18.0.0 || ^19.0.0
       react-dom: ^18.0.0 || ^19.0.0
     peerDependenciesMeta:
-      '@emotion/is-prop-valid':
-        optional: true
       react:
         optional: true
       react-dom:
@@ -8075,6 +8071,10 @@ packages:
     resolution: {integrity: sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==}
     engines: {node: '>=12.20.0'}
 
+  obug@2.2.1:
+    resolution: {integrity: sha512-XrsrhT5sybtKI6wakr2SPOlGZWWYbUXZ7a0jT8/QOeAPau+1X/bSegNe5YR75oJmEZQbKningirmGOEJCIk61Q==}
+    engines: {node: '>=12.20.0'}
+
   obug@3.0.0:
     resolution: {integrity: sha512-5vvB5+W7ePv+p3uqxi+RcW1XAzLW0/hxt3/4X4Lc4qHudzOhmBiBwOY6DRob4WnanAEGvNcLjF+KNOufrUoEQw==}
     engines: {node: '>=12.20.0'}
@@ -8179,10 +8179,6 @@ packages:
       vite-plus:
         optional: true
 
-  p-event@6.0.1:
-    resolution: {integrity: sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w==}
-    engines: {node: '>=16.17'}
-
   p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
@@ -8191,10 +8187,6 @@ packages:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
 
-  p-timeout@6.1.4:
-    resolution: {integrity: sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==}
-    engines: {node: '>=14.16'}
-
   package-manager-detector@1.8.0:
     resolution: {integrity: sha512-yQA4H19AmPEoMUeavPMDIe1higySl/gH/yaQrkT/s07Qp+7pp2hYz30N3z2l5BkjVkF9Ow6o0wjJamm2y7Sn0A==}
 
@@ -8349,10 +8341,6 @@ packages:
     resolution: {integrity: sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==}
     engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.5.26:
-    resolution: {integrity: sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==}
-    engines: {node: ^10 || ^12 || >=14}
-
   postcss@8.5.28:
     resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==}
     engines: {node: ^10 || ^12 || >=14}
@@ -8425,9 +8413,6 @@ packages:
     resolution: {integrity: sha512-h36JMxKRqrAxVD8201FrCpyeNuUY9Y5zZwujr20fFO77tpUtGa6EZzfKw/3WaiBX95fq7+MpsuMLNdSnORAwSA==}
     engines: {node: '>=14.18.0'}
 
-  rc9@3.0.1:
-    resolution: {integrity: sha512-gMDyleLWVE+i6Sgtc0QbbY6pEKqYs97NGi6isHQPqYlLemPoO8dxQ3uGi0f4NiP98c+jMW6cG1Kx9dDwfvqARQ==}
-
   rc9@3.1.0:
     resolution: {integrity: sha512-ufjkNVzbRHKcCOmTahZkmVsyc3W+MSk3jY03m+a7tGHkIsdVMG9l10/3HvFbWkkKzY5VFp3pkRsIo/UYgmFL7Q==}
 
@@ -8841,8 +8826,8 @@ packages:
   state-local@1.0.7:
     resolution: {integrity: sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==}
 
-  std-env@4.1.0:
-    resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==}
+  std-env@4.2.0:
+    resolution: {integrity: sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==}
 
   std-semver@1.0.8:
     resolution: {integrity: sha512-9SN0XIjBBXCT6ZXXVnScJN4KP2RyFg6B8sEoFlugVHMANysfaEni4LTWlvUQQ/R0wgZl1Ovt9KBQbzn21kHoZA==}
@@ -8948,10 +8933,6 @@ packages:
   stylis@4.4.0:
     resolution: {integrity: sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==}
 
-  super-regex@1.1.0:
-    resolution: {integrity: sha512-WHkws2ZflZe41zj6AolvvmaTrWds/VuyeYr9iPVv/oQeaIoVxMKaushfFWpOGDT+GuBrM/sVqF8KUCYQlSSTdQ==}
-    engines: {node: '>=18'}
-
   supports-color@10.2.2:
     resolution: {integrity: sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==}
     engines: {node: '>=18'}
@@ -9014,10 +8995,6 @@ packages:
     resolution: {integrity: sha512-4LeEWl96twnS2Q7Bz4MGqgazLqO+hJN63GZxXoIqh1T3VweYD997gbU1ItNsQafqqXTXd5WFyFdReLtwvRBNiw==}
     engines: {node: '>=18'}
 
-  time-span@5.1.0:
-    resolution: {integrity: sha512-75voc/9G4rDIJleOo4jPvN4/YC4GRZrY8yy1uU4lwrB3XEQbWve8zXoO5No4eFrGcTAMYyoY67p8jRQdtA1HbA==}
-    engines: {node: '>=12'}
-
   tiny-case@1.0.3:
     resolution: {integrity: sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==}
 
@@ -9037,6 +9014,10 @@ packages:
     resolution: {integrity: sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==}
     engines: {node: '>=18'}
 
+  tinyexec@1.3.0:
+    resolution: {integrity: sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==}
+    engines: {node: '>=18'}
+
   tinyglobby@0.2.17:
     resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
     engines: {node: '>=12.0.0'}
@@ -9053,6 +9034,10 @@ packages:
     resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==}
     engines: {node: '>=14.0.0'}
 
+  tinyrainbow@3.1.1:
+    resolution: {integrity: sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==}
+    engines: {node: '>=14.0.0'}
+
   tinyspy@4.0.4:
     resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
     engines: {node: '>=14.0.0'}
@@ -9475,9 +9460,6 @@ packages:
   web-vitals@5.1.0:
     resolution: {integrity: sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==}
 
-  web-worker@1.5.0:
-    resolution: {integrity: sha512-RiMReJrTAiA+mBjGONMnjVDP2u3p9R1vkcGz6gDIrOMT3oGuYwX2WRMYI9ipkphSuE5XKEhydbhNEJh4NY9mlw==}
-
   webpack-sources@3.5.0:
     resolution: {integrity: sha512-HPuy+uuoTCaaoEoI1LQ3JN9+vrPBvEesnnX1jADHy728cHSMlq4wUc4afYqahq2B1mhQVZxCXOkNTnXltr+2vQ==}
     engines: {node: '>=10.13.0'}
@@ -9776,7 +9758,7 @@ snapshots:
 
   '@amplitude/rrweb-snapshot@2.1.0':
     dependencies:
-      postcss: 8.5.26
+      postcss: 8.5.28
 
   '@amplitude/rrweb-types@2.0.0-alpha.40': {}
 
@@ -10213,21 +10195,21 @@ snapshots:
 
   '@emoji-mart/data@1.2.1': {}
 
-  '@es-joy/jsdoccomment@0.88.0':
+  '@es-joy/jsdoccomment@0.92.0':
     dependencies:
       '@types/estree': 1.0.9
-      '@typescript-eslint/types': 8.69.0
+      '@typescript-eslint/types': 8.70.0
       comment-parser: 1.4.7
       esquery: 1.7.0
-      jsdoc-type-pratt-parser: 7.2.0
+      jsdoc-type-pratt-parser: 9.0.1
 
-  '@es-joy/jsdoccomment@0.91.0':
+  '@es-joy/jsdoccomment@0.97.0':
     dependencies:
       '@types/estree': 1.0.9
-      '@typescript-eslint/types': 8.69.0
-      comment-parser: 1.4.7
+      '@typescript-eslint/types': 8.70.0
+      comment-parser: 1.4.8
       esquery: 1.7.0
-      jsdoc-type-pratt-parser: 8.0.0
+      jsdoc-type-pratt-parser: 9.2.1
 
   '@es-joy/resolve.exports@1.2.0': {}
 
@@ -10315,6 +10297,11 @@ snapshots:
       eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
       ignore: 7.0.8
 
+  '@eslint-community/eslint-utils@4.10.1(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))':
+    dependencies:
+      eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
+      eslint-visitor-keys: 3.4.3
+
   '@eslint-community/eslint-utils@4.9.1(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))':
     dependencies:
       eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
@@ -10426,10 +10413,6 @@ snapshots:
     dependencies:
       '@eslint/core': 1.2.1
 
-  '@eslint/core@0.17.0':
-    dependencies:
-      '@types/json-schema': 7.0.15
-
   '@eslint/core@1.2.1':
     dependencies:
       '@types/json-schema': 7.0.15
@@ -10439,20 +10422,6 @@ snapshots:
       mdn-data: 2.29.0
       source-map-js: 1.2.1
 
-  '@eslint/markdown@7.5.1(supports-color@11.0.0)':
-    dependencies:
-      '@eslint/core': 0.17.0
-      '@eslint/plugin-kit': 0.4.1
-      github-slugger: 2.0.0
-      mdast-util-from-markdown: 2.0.3(supports-color@11.0.0)
-      mdast-util-frontmatter: 2.0.1(supports-color@11.0.0)
-      mdast-util-gfm: 3.1.0(supports-color@11.0.0)
-      micromark-extension-frontmatter: 2.0.0
-      micromark-extension-gfm: 3.0.0
-      micromark-util-normalize-identifier: 2.0.1
-    transitivePeerDependencies:
-      - supports-color
-
   '@eslint/markdown@8.0.3(supports-color@11.0.0)':
     dependencies:
       '@eslint/core': 1.2.1
@@ -10471,11 +10440,6 @@ snapshots:
 
   '@eslint/object-schema@3.0.5': {}
 
-  '@eslint/plugin-kit@0.4.1':
-    dependencies:
-      '@eslint/core': 0.17.0
-      levn: 0.4.1
-
   '@eslint/plugin-kit@0.7.2':
     dependencies:
       '@eslint/core': 1.2.1
@@ -10513,7 +10477,7 @@ snapshots:
 
   '@formatjs/fast-memoize@3.1.7': {}
 
-  '@formatjs/intl-localematcher@0.8.14':
+  '@formatjs/intl-localematcher@0.9.0':
     dependencies:
       '@formatjs/fast-memoize': 3.1.7
 
@@ -10534,7 +10498,7 @@ snapshots:
     dependencies:
       '@jsdevtools/ono': 7.1.3
       '@types/json-schema': 7.0.15
-      js-yaml: 4.3.0
+      js-yaml: 4.2.0
 
   '@hey-api/openapi-ts@0.98.2(@typescript/typescript6@6.0.2)(magicast@0.5.3)':
     dependencies:
@@ -10772,7 +10736,7 @@ snapshots:
   '@jridgewell/trace-mapping@0.3.31':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.2
-      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/sourcemap-codec': 1.6.0
 
   '@jsdevtools/ono@7.1.3': {}
 
@@ -11785,7 +11749,7 @@ snapshots:
 
   '@resvg/resvg-wasm@2.4.0': {}
 
-  '@rgrove/parse-xml@4.2.3': {}
+  '@rgrove/parse-xml@5.0.0': {}
 
   '@rolldown/pluginutils@1.0.1': {}
 
@@ -12302,6 +12266,18 @@ snapshots:
       picocolors: 1.1.1
       redent: 3.0.0
 
+  '@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.2)(vitest@4.1.11)':
+    dependencies:
+      '@adobe/css-tools': 4.5.0
+      '@testing-library/dom': 10.4.2
+      aria-query: 5.3.2
+      css.escape: 1.5.1
+      dom-accessibility-api: 0.6.3
+      picocolors: 1.1.1
+      redent: 3.0.0
+    optionalDependencies:
+      vitest: 4.1.11(@types/node@25.9.7)(@vitest/browser-playwright@4.1.11)(@vitest/browser-preview@4.1.11)(@vitest/coverage-v8@4.1.11)(@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(happy-dom@20.14.5)
+
   '@testing-library/react@16.3.3(@testing-library/dom@10.4.2)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
     dependencies:
       '@babel/runtime': 7.29.7
@@ -12858,7 +12834,7 @@ snapshots:
       '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(vitest@4.1.11)
       '@vitest/mocker': 4.1.11(@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))
       playwright: 1.63.0
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
       vitest: 4.1.11(@types/node@25.9.7)(@vitest/browser-playwright@4.1.11)(@vitest/browser-preview@4.1.11)(@vitest/coverage-v8@4.1.11)(@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(happy-dom@20.12.0)
     transitivePeerDependencies:
       - bufferutil
@@ -12871,7 +12847,7 @@ snapshots:
       '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(typescript@7.0.2)(yaml@2.9.1))(vitest@4.1.11)
       '@vitest/mocker': 4.1.11(@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(typescript@7.0.2)(yaml@2.9.1))
       playwright: 1.63.0
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
       vitest: 4.1.11(@types/node@25.9.7)(@vitest/browser-playwright@4.1.11)(@vitest/browser-preview@4.1.11)(@vitest/coverage-v8@4.1.11)(@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(typescript@7.0.2)(yaml@2.9.1))(happy-dom@20.12.0)
     transitivePeerDependencies:
       - bufferutil
@@ -12942,14 +12918,14 @@ snapshots:
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
       '@vitest/utils': 4.1.11
-      ast-v8-to-istanbul: 1.0.4
+      ast-v8-to-istanbul: 1.0.6
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-reports: 3.2.0
-      magicast: 0.5.3
-      obug: 2.1.3
-      std-env: 4.1.0
-      tinyrainbow: 3.1.0
+      magicast: 0.5.5
+      obug: 2.2.1
+      std-env: 4.2.0
+      tinyrainbow: 3.1.1
       vitest: 4.1.11(@types/node@25.9.7)(@vitest/browser-playwright@4.1.11)(@vitest/browser-preview@4.1.11)(@vitest/coverage-v8@4.1.11)(@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(happy-dom@20.12.0)
     optionalDependencies:
       '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(vitest@4.1.11)
@@ -13030,7 +13006,7 @@ snapshots:
       '@oxc-project/runtime': 0.149.0
       '@oxc-project/types': 0.149.0
       lightningcss: 1.33.0
-      postcss: 8.5.26
+      postcss: 8.5.28
       yuku-codegen: 0.9.5
       yuku-parser: 0.9.5
     optionalDependencies:
@@ -13055,7 +13031,7 @@ snapshots:
       '@oxc-project/runtime': 0.149.0
       '@oxc-project/types': 0.149.0
       lightningcss: 1.33.0
-      postcss: 8.5.26
+      postcss: 8.5.28
       yuku-codegen: 0.9.5
       yuku-parser: 0.9.5
     optionalDependencies:
@@ -13261,7 +13237,7 @@ snapshots:
 
   ansis@4.3.1: {}
 
-  are-docs-informative@0.0.2: {}
+  are-docs-informative@0.1.1: {}
 
   argparse@2.0.1: {}
 
@@ -13283,7 +13259,7 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  ast-v8-to-istanbul@1.0.4:
+  ast-v8-to-istanbul@1.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       estree-walker: 3.0.3
@@ -13321,6 +13297,10 @@ snapshots:
 
   bowser@2.14.1: {}
 
+  brace-expansion@5.0.12:
+    dependencies:
+      balanced-match: 4.0.4
+
   brace-expansion@5.0.6:
     dependencies:
       balanced-match: 4.0.4
@@ -13363,14 +13343,14 @@ snapshots:
       confbox: 0.2.4
       defu: 6.1.7
       dotenv: 17.4.2
-      exsolve: 1.1.0
+      exsolve: 1.1.1
       giget: 3.3.0
       jiti: 2.7.0
       ohash: 2.0.11
       pathe: 2.0.3
       perfect-debounce: 2.1.0
-      pkg-types: 2.3.1
-      rc9: 3.0.1
+      pkg-types: 2.3.3
+      rc9: 3.1.0
     optionalDependencies:
       magicast: 0.5.3
 
@@ -13515,7 +13495,7 @@ snapshots:
 
   clsx@2.1.1: {}
 
-  cn@0.2.6: {}
+  cn@0.3.0: {}
 
   code-inspector-plugin@1.6.6(supports-color@11.0.0):
     dependencies:
@@ -13568,8 +13548,6 @@ snapshots:
 
   content-type@2.1.0: {}
 
-  convert-hrtime@5.0.0: {}
-
   convert-source-map@2.0.0: {}
 
   copy-to-clipboard@4.0.2: {}
@@ -13962,7 +13940,7 @@ snapshots:
 
   electron-to-chromium@1.5.417: {}
 
-  elkjs@0.11.1: {}
+  elkjs@0.12.0: {}
 
   embla-carousel-autoplay@8.6.0(embla-carousel@8.6.0):
     dependencies:
@@ -14038,8 +14016,6 @@ snapshots:
 
   es-module-lexer@1.7.0: {}
 
-  es-module-lexer@2.3.1: {}
-
   es-module-lexer@2.3.2: {}
 
   es-toolkit@1.52.0: {}
@@ -14097,15 +14073,13 @@ snapshots:
       esquery: 1.7.0
       jsonc-eslint-parser: 3.3.0
 
-  eslint-markdown@0.12.1(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
+  eslint-markdown@0.17.0(@eslint/markdown@8.0.3(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0)):
     dependencies:
-      '@eslint/markdown': 7.5.1(supports-color@11.0.0)
+      '@eslint/markdown': 8.0.3(supports-color@11.0.0)
       micromark-util-normalize-identifier: 2.0.1
       parse5: 8.0.1
     optionalDependencies:
       eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
-    transitivePeerDependencies:
-      - supports-color
 
   eslint-plugin-antfu@3.2.3(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0)):
     dependencies:
@@ -14129,17 +14103,17 @@ snapshots:
       - '@eslint/css'
       - typescript
 
-  eslint-plugin-command@3.5.3(@typescript-eslint/typescript-estree@8.70.0(@typescript/typescript6@6.0.2)(supports-color@11.0.0))(@typescript-eslint/utils@8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0)):
+  eslint-plugin-command@4.0.0(@typescript-eslint/typescript-estree@8.70.0(@typescript/typescript6@6.0.2)(supports-color@11.0.0))(@typescript-eslint/utils@8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0)):
     dependencies:
-      '@es-joy/jsdoccomment': 0.88.0
+      '@es-joy/jsdoccomment': 0.92.0
       '@typescript-eslint/typescript-estree': 8.70.0(@typescript/typescript6@6.0.2)(supports-color@11.0.0)
       '@typescript-eslint/utils': 8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
       eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
 
-  eslint-plugin-erasable-syntax-only@0.4.2(@typescript-eslint/parser@8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0))(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
+  eslint-plugin-erasable-syntax-only@0.7.1(@typescript-eslint/parser@8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0))(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
     dependencies:
       '@typescript-eslint/parser': 8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
-      '@typescript-eslint/utils': 8.69.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
+      '@typescript-eslint/utils': 8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
       cached-factory: 0.3.0
       eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
       typescript: '@typescript/typescript6@6.0.2'
@@ -14153,14 +14127,15 @@ snapshots:
       eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
       eslint-compat-utils: 0.5.1(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
 
-  eslint-plugin-jsdoc@63.3.3(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
+  eslint-plugin-jsdoc@64.5.2(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
     dependencies:
-      '@es-joy/jsdoccomment': 0.91.0
+      '@es-joy/jsdoccomment': 0.97.0
       '@es-joy/resolve.exports': 1.2.0
-      are-docs-informative: 0.0.2
-      comment-parser: 1.4.7
+      '@typescript-eslint/utils': 8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
+      are-docs-informative: 0.1.1
+      comment-parser: 1.4.8
       debug: 4.4.3(supports-color@11.0.0)
-      escape-string-regexp: 4.0.0
+      escape-string-regexp: 5.0.0
       eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
       espree: 11.2.0
       esquery: 1.7.0
@@ -14170,6 +14145,8 @@ snapshots:
       semver: 7.8.5
       spdx-expression-parse: 5.0.0
       to-valid-identifier: 1.0.0
+    optionalDependencies:
+      typescript: '@typescript/typescript6@6.0.2'
     transitivePeerDependencies:
       - supports-color
 
@@ -14188,7 +14165,7 @@ snapshots:
     transitivePeerDependencies:
       - '@eslint/json'
 
-  eslint-plugin-markdown-preferences@0.41.1(@eslint/markdown@8.0.3(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
+  eslint-plugin-markdown-preferences@0.42.0(@eslint/markdown@8.0.3(supports-color@11.0.0))(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
     dependencies:
       '@eslint/markdown': 8.0.3(supports-color@11.0.0)
       diff-sequences: 29.6.3
@@ -14203,6 +14180,7 @@ snapshots:
       micromark-extension-math: 3.1.0
       micromark-factory-space: 2.0.1
       micromark-util-character: 2.1.1
+      micromark-util-normalize-identifier: 2.0.1
       micromark-util-symbol: 2.0.1
       string-width: 8.2.2
     transitivePeerDependencies:
@@ -14222,13 +14200,16 @@ snapshots:
     optionalDependencies:
       typescript: '@typescript/typescript6@6.0.2'
 
-  eslint-plugin-no-barrel-files@1.3.1(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
+  eslint-plugin-no-barrel-files@2.2.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
     dependencies:
-      '@typescript-eslint/utils': 8.69.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
+      '@typescript-eslint/parser': 8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
+      '@typescript-eslint/utils': 8.70.0(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0)
       eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
+      minimatch: 10.2.6
+    optionalDependencies:
+      typescript: '@typescript/typescript6@6.0.2'
     transitivePeerDependencies:
       - supports-color
-      - typescript
 
   eslint-plugin-perfectionist@5.11.1(@typescript/typescript6@6.0.2)(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))(supports-color@11.0.0):
     dependencies:
@@ -14379,26 +14360,29 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-unicorn@71.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0)):
+  eslint-plugin-unicorn@75.0.0(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0)):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
+      '@eslint-community/eslint-utils': 4.10.1(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0))
+      '@eslint/css-tree': 4.0.5
       browserslist: 4.28.8
       change-case: 5.4.4
       ci-info: 4.4.0
       core-js-compat: 3.50.0
       detect-indent: 7.0.2
+      entities: 8.0.0
       eslint: 10.10.0(jiti@2.7.0)(supports-color@11.0.0)
       find-up-simple: 1.0.1
       globals: 17.11.0
+      identifier-regex: 1.1.0
       indent-string: 5.0.0
       is-builtin-module: 5.0.0
-      is-identifier: 1.1.0
       pluralize: 8.0.0
       quote-js-string: 0.1.0
       regjsparser: 0.13.2
       reserved-identifiers: 1.2.0
       semver: 7.8.5
       strip-indent: 4.1.1
+      yaml: 2.9.1
 
   eslint-plugin-yml@3.8.1(eslint@10.10.0(jiti@2.7.0)(supports-color@11.0.0)):
     dependencies:
@@ -14489,7 +14473,7 @@ snapshots:
 
   event-target-bus@1.1.0: {}
 
-  eventsource-parser@3.1.1: {}
+  eventsource-parser@4.1.1: {}
 
   expand-template@2.0.3:
     optional: true
@@ -14591,10 +14575,10 @@ snapshots:
       react: 19.3.0
       react-dom: 19.3.0(react@19.3.0)
 
-  framer-motion@12.43.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0):
+  framer-motion@13.4.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0):
     dependencies:
-      motion-dom: 12.43.0
-      motion-utils: 12.39.0
+      motion-dom: 13.3.0
+      motion-utils: 13.3.0
       tslib: 2.8.1
     optionalDependencies:
       react: 19.3.0
@@ -14609,8 +14593,6 @@ snapshots:
   fsevents@2.3.3:
     optional: true
 
-  function-timeout@1.0.2: {}
-
   fuse.js@7.5.0: {}
 
   gensync@1.0.0-beta.2: {}
@@ -14955,11 +14937,6 @@ snapshots:
 
   is-hexadecimal@2.0.1: {}
 
-  is-identifier@1.1.0:
-    dependencies:
-      identifier-regex: 1.1.0
-      super-regex: 1.1.0
-
   is-in-ssh@1.0.0: {}
 
   is-inside-container@1.0.0:
@@ -15028,7 +15005,7 @@ snapshots:
 
   js-tokens@4.0.0: {}
 
-  js-yaml@4.3.0:
+  js-yaml@4.2.0:
     dependencies:
       argparse: 2.0.1
 
@@ -15036,9 +15013,9 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
-  jsdoc-type-pratt-parser@7.2.0: {}
-
-  jsdoc-type-pratt-parser@8.0.0: {}
+  jsdoc-type-pratt-parser@9.0.1:
+    dependencies:
+      '@types/estree': 1.0.9
 
   jsdoc-type-pratt-parser@9.2.1:
     dependencies:
@@ -15297,12 +15274,13 @@ snapshots:
       '@babel/parser': 7.29.7
       '@babel/types': 7.29.7
       source-map-js: 1.2.1
+    optional: true
 
-  make-asynchronous@1.1.0:
+  magicast@0.5.5:
     dependencies:
-      p-event: 6.0.1
-      type-fest: 4.41.0
-      web-worker: 1.5.0
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+      source-map-js: 1.2.1
 
   make-dir@4.0.0:
     dependencies:
@@ -15783,6 +15761,10 @@ snapshots:
     dependencies:
       brace-expansion: 5.0.6
 
+  minimatch@10.2.6:
+    dependencies:
+      brace-expansion: 5.0.12
+
   minimist@1.2.8: {}
 
   minipass@7.1.3: {}
@@ -15809,15 +15791,15 @@ snapshots:
     dependencies:
       color-name: 1.1.4
 
-  motion-dom@12.43.0:
+  motion-dom@13.3.0:
     dependencies:
-      motion-utils: 12.39.0
+      motion-utils: 13.3.0
 
-  motion-utils@12.39.0: {}
+  motion-utils@13.3.0: {}
 
-  motion@12.43.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0):
+  motion@13.4.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0):
     dependencies:
-      framer-motion: 12.43.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
+      framer-motion: 13.4.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       tslib: 2.8.1
     optionalDependencies:
       react: 19.3.0
@@ -15956,6 +15938,8 @@ snapshots:
 
   obug@2.1.3: {}
 
+  obug@2.2.1: {}
+
   obug@3.0.0: {}
 
   ohash@2.0.11: {}
@@ -16306,10 +16290,6 @@ snapshots:
       oxlint-tsgolint: 7.0.2001
       vite-plus: 0.3.2(@types/node@25.9.7)(@vitest/browser-playwright@4.1.11)(@vitest/coverage-v8@4.1.11)(esbuild@0.28.2)(happy-dom@20.12.0)(jiti@2.7.0)(tsx@4.23.13)(typescript@7.0.2)(yaml@2.9.1)
 
-  p-event@6.0.1:
-    dependencies:
-      p-timeout: 6.1.4
-
   p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
@@ -16318,8 +16298,6 @@ snapshots:
     dependencies:
       p-limit: 3.1.0
 
-  p-timeout@6.1.4: {}
-
   package-manager-detector@1.8.0: {}
 
   pad-right@0.2.2:
@@ -16477,12 +16455,6 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  postcss@8.5.26:
-    dependencies:
-      nanoid: 3.3.18
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
   postcss@8.5.28:
     dependencies:
       nanoid: 3.3.18
@@ -16563,11 +16535,6 @@ snapshots:
 
   radash@12.1.1: {}
 
-  rc9@3.0.1:
-    dependencies:
-      defu: 6.1.7
-      destr: 2.0.5
-
   rc9@3.1.0:
     dependencies:
       defu: 6.1.7
@@ -17083,7 +17050,7 @@ snapshots:
 
   state-local@1.0.7: {}
 
-  std-env@4.1.0: {}
+  std-env@4.2.0: {}
 
   std-semver@1.0.8: {}
 
@@ -17232,12 +17199,6 @@ snapshots:
 
   stylis@4.4.0: {}
 
-  super-regex@1.1.0:
-    dependencies:
-      function-timeout: 1.0.2
-      make-asynchronous: 1.1.0
-      time-span: 5.1.0
-
   supports-color@10.2.2: {}
 
   supports-color@11.0.0: {}
@@ -17299,10 +17260,6 @@ snapshots:
       minizlib: 3.1.0
       yallist: 5.0.0
 
-  time-span@5.1.0:
-    dependencies:
-      convert-hrtime: 5.0.0
-
   tiny-case@1.0.3: {}
 
   tiny-inflate@1.0.3: {}
@@ -17315,6 +17272,8 @@ snapshots:
 
   tinyexec@1.2.4: {}
 
+  tinyexec@1.3.0: {}
+
   tinyglobby@0.2.17:
     dependencies:
       fdir: 6.5.0(picomatch@4.0.7)
@@ -17326,6 +17285,8 @@ snapshots:
 
   tinyrainbow@3.1.0: {}
 
+  tinyrainbow@3.1.1: {}
+
   tinyspy@4.0.4: {}
 
   tldts-core@7.4.13: {}
@@ -17872,17 +17833,17 @@ snapshots:
       '@vitest/snapshot': 4.1.11
       '@vitest/spy': 4.1.11
       '@vitest/utils': 4.1.11
-      es-module-lexer: 2.3.1
+      es-module-lexer: 2.3.2
       expect-type: 1.4.0
       magic-string: 0.30.21
-      obug: 2.1.3
+      obug: 2.2.1
       pathe: 2.0.3
       picomatch: 4.0.7
-      std-env: 4.1.0
+      std-env: 4.2.0
       tinybench: 2.9.0
-      tinyexec: 1.2.4
+      tinyexec: 1.3.0
       tinyglobby: 0.2.17
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
       vite: '@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)'
       why-is-node-running: 2.3.0
     optionalDependencies:
@@ -17903,17 +17864,17 @@ snapshots:
       '@vitest/snapshot': 4.1.11
       '@vitest/spy': 4.1.11
       '@vitest/utils': 4.1.11
-      es-module-lexer: 2.3.1
+      es-module-lexer: 2.3.2
       expect-type: 1.4.0
       magic-string: 0.30.21
-      obug: 2.1.3
+      obug: 2.2.1
       pathe: 2.0.3
       picomatch: 4.0.7
-      std-env: 4.1.0
+      std-env: 4.2.0
       tinybench: 2.9.0
-      tinyexec: 1.2.4
+      tinyexec: 1.3.0
       tinyglobby: 0.2.17
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
       vite: '@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(@typescript/typescript6@6.0.2)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)'
       why-is-node-running: 2.3.0
     optionalDependencies:
@@ -17934,17 +17895,17 @@ snapshots:
       '@vitest/snapshot': 4.1.11
       '@vitest/spy': 4.1.11
       '@vitest/utils': 4.1.11
-      es-module-lexer: 2.3.1
+      es-module-lexer: 2.3.2
       expect-type: 1.4.0
       magic-string: 0.30.21
-      obug: 2.1.3
+      obug: 2.2.1
       pathe: 2.0.3
       picomatch: 4.0.7
-      std-env: 4.1.0
+      std-env: 4.2.0
       tinybench: 2.9.0
-      tinyexec: 1.2.4
+      tinyexec: 1.3.0
       tinyglobby: 0.2.17
-      tinyrainbow: 3.1.0
+      tinyrainbow: 3.1.1
       vite: '@voidzero-dev/vite-plus-core@0.3.2(@types/node@25.9.7)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(typescript@7.0.2)(yaml@2.9.1)'
       why-is-node-running: 2.3.0
     optionalDependencies:
@@ -17966,8 +17927,6 @@ snapshots:
 
   web-vitals@5.1.0: {}
 
-  web-worker@1.5.0: {}
-
   webpack-sources@3.5.0: {}
 
   webpack-virtual-modules@0.6.2: {}
@@ -18148,7 +18107,7 @@ time:
   '@eslint-react/eslint-plugin@5.19.1': '2026-09-14T17:56:33.726Z'
   '@eslint/markdown@8.0.3': '2026-07-01T13:28:44.339Z'
   '@floating-ui/react@0.27.20': '2026-07-11T08:41:33.223Z'
-  '@formatjs/intl-localematcher@0.8.14': '2026-09-12T10:54:55.218Z'
+  '@formatjs/intl-localematcher@0.9.0': '2026-09-12T16:07:12.757Z'
   '@heroicons/react@2.2.0': '2024-11-18T15:33:27.317Z'
   '@hey-api/openapi-ts@0.98.2': '2026-06-08T05:37:17.524Z'
   '@hono/node-server@2.1.1': '2026-08-14T01:14:02.732Z'
@@ -18169,7 +18128,7 @@ time:
   '@orpc/tanstack-query@1.15.1': '2026-09-15T07:09:56.725Z'
   '@playwright/test@1.63.0': '2026-09-04T22:44:00.304Z'
   '@remixicon/react@4.9.0': '2026-01-29T10:53:18.993Z'
-  '@rgrove/parse-xml@4.2.3': '2026-07-26T23:12:17.833Z'
+  '@rgrove/parse-xml@5.0.0': '2026-08-30T03:19:42.049Z'
   '@sentry/react@10.75.0': '2026-09-16T14:58:08.681Z'
   '@storybook/addon-a11y@10.6.0': '2026-09-02T13:57:15.272Z'
   '@storybook/addon-docs@10.6.0': '2026-09-02T13:56:43.113Z'
@@ -18194,7 +18153,7 @@ time:
   '@tanstack/react-query@5.103.1': '2026-09-16T15:01:15.056Z'
   '@tanstack/react-virtual@3.14.13': '2026-09-14T10:22:44.535Z'
   '@testing-library/dom@10.4.2': '2026-09-13T18:08:36.116Z'
-  '@testing-library/jest-dom@6.9.1': '2025-10-01T20:04:22.720Z'
+  '@testing-library/jest-dom@7.0.1': '2026-08-09T23:44:33.598Z'
   '@testing-library/react@16.3.3': '2026-08-27T17:41:18.735Z'
   '@testing-library/user-event@14.6.7': '2026-09-02T01:56:32.109Z'
   '@tsslint/cli@3.1.4': '2026-06-16T18:21:29.075Z'
@@ -18223,7 +18182,7 @@ time:
   chokidar@5.0.0: '2025-11-25T23:28:06.854Z'
   class-variance-authority@0.7.1: '2024-11-26T08:20:34.604Z'
   cli-table3@0.6.5: '2024-05-12T16:36:50.079Z'
-  cn@0.2.6: '2026-09-06T12:13:35.681Z'
+  cn@0.3.0: '2026-09-12T11:11:13.029Z'
   code-inspector-plugin@1.6.6: '2026-07-07T04:00:26.523Z'
   concurrently@10.0.5: '2026-08-15T03:33:20.323Z'
   copy-to-clipboard@4.0.2: '2026-04-24T22:15:18.933Z'
@@ -18233,32 +18192,32 @@ time:
   dompurify@3.4.15: '2026-09-06T11:39:57.312Z'
   echarts-for-react@3.0.6: '2026-01-21T04:38:21.243Z'
   echarts@6.1.0: '2026-05-19T17:52:11.076Z'
-  elkjs@0.11.1: '2026-03-03T12:21:48.463Z'
+  elkjs@0.12.0: '2026-07-17T08:07:54.693Z'
   embla-carousel-autoplay@8.6.0: '2025-04-04T17:37:46.303Z'
   embla-carousel-fade@8.6.0: '2025-04-04T17:37:50.278Z'
   embla-carousel-react@8.6.0: '2025-04-04T17:37:53.976Z'
   emoji-mart@5.6.0: '2024-04-25T14:22:21.440Z'
   es-toolkit@1.52.0: '2026-08-28T07:22:17.687Z'
   eslint-config-flat-gitignore@2.4.0: '2026-08-27T07:24:43.063Z'
-  eslint-markdown@0.12.1: '2026-07-10T23:35:26.055Z'
+  eslint-markdown@0.17.0: '2026-09-16T06:20:36.564Z'
   eslint-plugin-antfu@3.2.3: '2026-05-11T02:24:38.348Z'
   eslint-plugin-better-tailwindcss@4.7.0: '2026-07-19T13:26:01.366Z'
-  eslint-plugin-command@3.5.3: '2026-07-14T04:59:31.991Z'
-  eslint-plugin-erasable-syntax-only@0.4.2: '2026-06-18T00:56:01.038Z'
-  eslint-plugin-jsdoc@63.3.3: '2026-08-02T18:02:10.488Z'
+  eslint-plugin-command@4.0.0: '2026-07-31T04:38:09.766Z'
+  eslint-plugin-erasable-syntax-only@0.7.1: '2026-08-19T04:46:35.017Z'
+  eslint-plugin-jsdoc@64.5.2: '2026-09-16T13:00:55.286Z'
   eslint-plugin-jsonc@3.4.2: '2026-08-22T12:13:35.450Z'
-  eslint-plugin-markdown-preferences@0.41.1: '2026-04-09T23:28:41.552Z'
+  eslint-plugin-markdown-preferences@0.42.0: '2026-07-14T00:58:47.572Z'
   eslint-plugin-n@18.3.0: '2026-08-08T14:03:55.663Z'
-  eslint-plugin-no-barrel-files@1.3.1: '2026-04-12T18:28:18.653Z'
+  eslint-plugin-no-barrel-files@2.2.0: '2026-07-28T19:13:34.360Z'
   eslint-plugin-perfectionist@5.11.1: '2026-09-15T11:18:22.662Z'
   eslint-plugin-pnpm@1.9.1: '2026-09-02T01:31:47.410Z'
   eslint-plugin-regexp@3.3.0: '2026-09-04T01:16:25.907Z'
   eslint-plugin-storybook@10.6.0: '2026-09-02T14:01:21.299Z'
   eslint-plugin-toml@1.5.0: '2026-07-25T01:46:13.957Z'
-  eslint-plugin-unicorn@71.1.0: '2026-07-06T22:07:48.695Z'
+  eslint-plugin-unicorn@75.0.0: '2026-09-16T06:50:59.617Z'
   eslint-plugin-yml@3.8.1: '2026-08-05T03:50:22.441Z'
   eslint@10.10.0: '2026-09-04T14:34:21.799Z'
-  eventsource-parser@3.1.1: '2026-08-10T15:55:29.938Z'
+  eventsource-parser@4.1.1: '2026-09-15T18:30:29.195Z'
   fast-deep-equal@3.1.3: '2020-06-08T07:27:28.474Z'
   foxact@0.3.11: '2026-09-05T12:25:54.102Z'
   fuse.js@7.5.0: '2026-07-13T17:23:36.705Z'
@@ -18288,7 +18247,7 @@ time:
   mermaid@11.17.2: '2026-08-25T11:52:39.930Z'
   mime@4.1.0: '2025-09-12T17:53:01.376Z'
   mitt@3.0.1: '2023-07-04T17:31:47.638Z'
-  motion@12.43.0: '2026-07-28T14:29:31.291Z'
+  motion@13.4.0: '2026-09-16T13:10:18.420Z'
   negotiator@1.1.0: '2026-08-20T16:45:05.235Z'
   next-themes@0.4.6: '2025-03-11T21:02:05.882Z'
   next@16.3.5: '2026-09-11T17:26:46.049Z'
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 2b2e2a51380..e6160a92379 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -73,7 +73,7 @@ catalog:
   '@eslint-react/eslint-plugin': 5.19.1
   '@eslint/markdown': 8.0.3
   '@floating-ui/react': 0.27.20
-  '@formatjs/intl-localematcher': 0.8.14
+  '@formatjs/intl-localematcher': 0.9.0
   '@heroicons/react': 2.2.0
   '@hey-api/openapi-ts': 0.98.2
   '@hono/node-server': 2.1.1
@@ -95,7 +95,7 @@ catalog:
   '@orpc/tanstack-query': 1.15.1
   '@playwright/test': 1.63.0
   '@remixicon/react': 4.9.0
-  '@rgrove/parse-xml': 4.2.3
+  '@rgrove/parse-xml': 5.0.0
   '@sentry/react': 10.75.0
   '@storybook/addon-a11y': 10.6.0
   '@storybook/addon-docs': 10.6.0
@@ -120,7 +120,7 @@ catalog:
   '@tanstack/react-query': 5.103.1
   '@tanstack/react-virtual': 3.14.13
   '@testing-library/dom': 10.4.2
-  '@testing-library/jest-dom': 6.9.1
+  '@testing-library/jest-dom': 7.0.1
   '@testing-library/react': 16.3.3
   '@testing-library/user-event': 14.6.7
   '@tsslint/cli': 3.1.4
@@ -148,7 +148,7 @@ catalog:
   chokidar: 5.0.0
   class-variance-authority: 0.7.1
   cli-table3: 0.6.5
-  cn: 0.2.6
+  cn: 0.3.0
   code-inspector-plugin: 1.6.6
   concurrently: 10.0.5
   copy-to-clipboard: 4.0.2
@@ -158,7 +158,7 @@ catalog:
   dompurify: 3.4.15
   echarts: 6.1.0
   echarts-for-react: 3.0.6
-  elkjs: 0.11.1
+  elkjs: 0.12.0
   embla-carousel-autoplay: 8.6.0
   embla-carousel-fade: 8.6.0
   embla-carousel-react: 8.6.0
@@ -166,24 +166,24 @@ catalog:
   es-toolkit: 1.52.0
   eslint: 10.10.0
   eslint-config-flat-gitignore: 2.4.0
-  eslint-markdown: 0.12.1
+  eslint-markdown: 0.17.0
   eslint-plugin-antfu: 3.2.3
   eslint-plugin-better-tailwindcss: 4.7.0
-  eslint-plugin-command: 3.5.3
-  eslint-plugin-erasable-syntax-only: 0.4.2
-  eslint-plugin-jsdoc: 63.3.3
+  eslint-plugin-command: 4.0.0
+  eslint-plugin-erasable-syntax-only: 0.7.1
+  eslint-plugin-jsdoc: 64.5.2
   eslint-plugin-jsonc: 3.4.2
-  eslint-plugin-markdown-preferences: 0.41.1
+  eslint-plugin-markdown-preferences: 0.42.0
   eslint-plugin-n: 18.3.0
-  eslint-plugin-no-barrel-files: 1.3.1
+  eslint-plugin-no-barrel-files: 2.2.0
   eslint-plugin-perfectionist: 5.11.1
   eslint-plugin-pnpm: 1.9.1
   eslint-plugin-regexp: 3.3.0
   eslint-plugin-storybook: 10.6.0
   eslint-plugin-toml: 1.5.0
-  eslint-plugin-unicorn: 71.1.0
+  eslint-plugin-unicorn: 75.0.0
   eslint-plugin-yml: 3.8.1
-  eventsource-parser: 3.1.1
+  eventsource-parser: 4.1.1
   fast-deep-equal: 3.1.3
   foxact: 0.3.11
   fuse.js: 7.5.0
@@ -212,7 +212,7 @@ catalog:
   mermaid: 11.17.2
   mime: 4.1.0
   mitt: 3.0.1
-  motion: 12.43.0
+  motion: 13.4.0
   negotiator: 1.1.0
   next: 16.3.5
   next-themes: 0.4.6

From 81aa065608859971ce82a50161f6b58bca4ef53f Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 17 Sep 2026 06:55:55 +0000
Subject: [PATCH 20/28] chore: assign frontend tooling code owners and remove
 invalid owner (#42409)

---
 .github/CODEOWNERS | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e1b9e97dbb6..249c2932f65 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -51,7 +51,7 @@
 /api/tests/*/controllers/trigger/ @CourTeous33
 /api/tests/*/core/trigger/ @CourTeous33
 /api/tests/*/trigger/ @CourTeous33
-/api/tests/*/controllers/console/billing/ @hj24 @zyssyz123
+/api/tests/*/controllers/console/billing/ @zyssyz123
 /api/tests/*/services/enterprise/ @GareArc
 /api/tests/*/migrations/ @snakevash @laipz8200 @MRZHUH
 
@@ -128,8 +128,8 @@
 /api/tasks/async_workflow_tasks.py @Mairuis
 
 # Backend - Billing
-/api/services/billing_service.py @hj24 @zyssyz123
-/api/controllers/console/billing/ @hj24 @zyssyz123
+/api/services/billing_service.py @zyssyz123
+/api/controllers/console/billing/ @zyssyz123
 
 # Backend - Enterprise
 /api/configs/enterprise/ @GareArc
@@ -147,6 +147,12 @@
 # Frontend
 /web/ @iamjoel
 
+# Frontend - Tooling
+/lint.config.ts @hyoban @lyzno1
+/eslint.config.mjs @hyoban @lyzno1
+/knip.config.ts @hyoban @lyzno1
+/vite.config.ts @hyoban @lyzno1
+
 # Frontend - Platform and Features
 /web/config/ @lyzno1
 /web/env.ts @lyzno1

From 5e9017dbb8347d76f49d421aff7acbcebe632adc Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 17 Sep 2026 07:04:27 +0000
Subject: [PATCH 21/28] refactor(web): finish legacy input migration (#42405)

---
 lint.config.ts                                |  10 -
 oxlint-suppressions.json                      |  77 +---
 .../__tests__/email-change-modal.spec.tsx     | 105 +++++
 .../account-page/email-change-modal.tsx       | 415 +++++++++--------
 .../components/base/emoji-picker/Inner.tsx    |  26 +-
 .../base/form/__tests__/index.spec.tsx        |  22 +-
 .../base/__tests__/base-field.spec.tsx        |  19 +-
 .../base/form/components/base/base-field.tsx  | 108 +++--
 .../components/field/__tests__/text.spec.tsx  |  33 --
 .../base/form/components/field/text.tsx       |  12 +-
 .../__tests__/use-get-validators.spec.ts      |  15 +
 .../base/form/hooks/use-get-validators.ts     |   6 +-
 .../input-with-copy/__tests__/index.spec.tsx  | 222 ----------
 .../components/base/input-with-copy/index.tsx |  90 ----
 .../base/input/__tests__/index.spec.tsx       |  47 --
 .../components/base/input/index.stories.tsx   | 419 ------------------
 web/app/components/base/input/index.tsx       | 168 -------
 .../markdown-blocks/__tests__/form.spec.tsx   |  31 +-
 .../components/base/markdown-blocks/form.tsx  |  71 ++-
 .../components/__tests__/inputs.spec.tsx      | 176 +-------
 .../components/general-chunking-options.tsx   |   5 +-
 .../create/step-two/components/inputs.tsx     |  27 +-
 .../components/parent-child-options.tsx       |   4 +-
 .../get-schema.tsx                            |  69 +--
 .../edit-custom-collection-modal/test-api.tsx |  44 +-
 .../components/tools/workflow-tool/index.tsx  |  86 ++--
 .../__tests__/form-input-item.helpers.spec.ts |   7 +-
 .../__tests__/form-input-item.spec.tsx        |  27 +-
 .../components/before-run-form/form-item.tsx  |  35 +-
 .../components/form-input-item.helpers.ts     |   8 -
 .../_base/components/form-input-item.tsx      |  30 +-
 .../assigner/__tests__/integration.spec.tsx   |  28 +-
 .../var-list/__tests__/branches.spec.tsx      |  29 +-
 .../assigner/components/var-list/index.tsx    |  43 +-
 .../http/components/authorization/index.tsx   |  40 +-
 .../key-value/key-value-edit/item.tsx         |   1 -
 .../nodes/tool/components/tool-form/item.tsx  |   9 +-
 .../components/trigger-form/item.tsx          |   6 +-
 .../trigger-webhook/__tests__/panel.spec.tsx  |  90 ++--
 .../workflow/nodes/trigger-webhook/panel.tsx  | 102 +++--
 .../panel/__tests__/inputs-panel.spec.tsx     |   2 +-
 .../panel/env-panel/variable-modal.tsx        | 142 +++---
 42 files changed, 1046 insertions(+), 1860 deletions(-)
 create mode 100644 web/app/account/(commonLayout)/account-page/__tests__/email-change-modal.spec.tsx
 delete mode 100644 web/app/components/base/form/components/field/__tests__/text.spec.tsx
 delete mode 100644 web/app/components/base/input-with-copy/__tests__/index.spec.tsx
 delete mode 100644 web/app/components/base/input-with-copy/index.tsx
 delete mode 100644 web/app/components/base/input/__tests__/index.spec.tsx
 delete mode 100644 web/app/components/base/input/index.stories.tsx
 delete mode 100644 web/app/components/base/input/index.tsx

diff --git a/lint.config.ts b/lint.config.ts
index a8aa394ac57..bf84dec886b 100644
--- a/lint.config.ts
+++ b/lint.config.ts
@@ -912,11 +912,6 @@ export const lintConfig = {
                 message:
                   'Do not import Floating UI directly in web. Use @langgenius/dify-ui/* primitives instead.',
               },
-              {
-                group: ['**/base/input', '**/base/input/*'],
-                message:
-                  'Do not import the deprecated web base Input. Use @langgenius/dify-ui/input for standalone inputs, and @langgenius/dify-ui/field for labelled or validated form composition.',
-              },
               {
                 group: [
                   '@/service/base',
@@ -984,11 +979,6 @@ export const lintConfig = {
                 message:
                   'Do not import Floating UI directly in web. Use @langgenius/dify-ui/* primitives instead.',
               },
-              {
-                group: ['**/base/input', '**/base/input/*'],
-                message:
-                  'Do not import the deprecated web base Input. Use @langgenius/dify-ui/input for standalone inputs, and @langgenius/dify-ui/field for labelled or validated form composition.',
-              },
               {
                 group: [
                   '@/service/base',
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index a1d36a661e9..a8e19639158 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -100,14 +100,8 @@
     }
   },
   "web/app/account/(commonLayout)/account-page/email-change-modal.tsx": {
-    "jsx-a11y/click-events-have-key-events": {
-      "count": 3
-    },
-    "jsx-a11y/no-static-element-interactions": {
-      "count": 3
-    },
     "no-restricted-imports": {
-      "count": 2
+      "count": 1
     }
   },
   "web/app/components/app/annotation/__tests__/index.spec.tsx": {
@@ -965,11 +959,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/emoji-picker/Inner.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/base/error-boundary/index.tsx": {
     "eslint-react/jsx-no-key-after-spread": {
       "count": 1
@@ -1140,11 +1129,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/form/components/base/base-field.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/base/form/components/base/base-form.tsx": {
     "typescript/no-explicit-any": {
       "count": 6
@@ -1478,17 +1462,6 @@
       "count": 2
     }
   },
-  "web/app/components/base/input/index.stories.tsx": {
-    "jsx-a11y/label-has-associated-control": {
-      "count": 9
-    },
-    "no-console": {
-      "count": 2
-    },
-    "typescript/no-explicit-any": {
-      "count": 1
-    }
-  },
   "web/app/components/base/markdown-blocks/__tests__/paragraph.spec.tsx": {
     "jsx-a11y/anchor-is-valid": {
       "count": 1
@@ -1505,9 +1478,6 @@
     }
   },
   "web/app/components/base/markdown-blocks/form.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "prefer-regex-literals": {
       "count": 1
     }
@@ -2048,11 +2018,6 @@
       "count": 5
     }
   },
-  "web/app/components/datasets/create/step-two/components/inputs.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
   "web/app/components/datasets/create/step-two/components/option-card.tsx": {
     "jsx-a11y/click-events-have-key-events": {
       "count": 1
@@ -3248,11 +3213,6 @@
       "count": 2
     }
   },
-  "web/app/components/tools/edit-custom-collection-modal/get-schema.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/edit-custom-collection-modal/index.tsx": {
     "eslint-react/set-state-in-effect": {
       "count": 4
@@ -3262,15 +3222,6 @@
     }
   },
   "web/app/components/tools/edit-custom-collection-modal/test-api.tsx": {
-    "jsx-a11y/click-events-have-key-events": {
-      "count": 1
-    },
-    "jsx-a11y/no-static-element-interactions": {
-      "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "typescript/no-explicit-any": {
       "count": 1
     }
@@ -3293,11 +3244,6 @@
       "count": 4
     }
   },
-  "web/app/components/tools/workflow-tool/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow-app/components/__tests__/workflow-children.spec.tsx": {
     "eslint-react/static-components": {
       "count": 2
@@ -3517,9 +3463,6 @@
     "jsx-a11y/no-autofocus": {
       "count": 3
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "typescript/no-explicit-any": {
       "count": 11
     }
@@ -3598,11 +3541,6 @@
       "count": 2
     }
   },
-  "web/app/components/workflow/nodes/_base/components/form-input-item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/input-support-select-var.tsx": {
     "typescript/no-explicit-any": {
       "count": 1
@@ -3875,11 +3813,6 @@
       "count": 15
     }
   },
-  "web/app/components/workflow/nodes/assigner/components/var-list/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/assigner/hooks.ts": {
     "typescript/no-explicit-any": {
       "count": 1
@@ -3972,11 +3905,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/http/components/authorization/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx": {
     "typescript/no-explicit-any": {
       "count": 2
@@ -4765,9 +4693,6 @@
   "web/app/components/workflow/panel/env-panel/variable-modal.tsx": {
     "eslint-react/set-state-in-effect": {
       "count": 4
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "web/app/components/workflow/panel/global-variable-panel/index.tsx": {
diff --git a/web/app/account/(commonLayout)/account-page/__tests__/email-change-modal.spec.tsx b/web/app/account/(commonLayout)/account-page/__tests__/email-change-modal.spec.tsx
new file mode 100644
index 00000000000..dacc69eaf32
--- /dev/null
+++ b/web/app/account/(commonLayout)/account-page/__tests__/email-change-modal.spec.tsx
@@ -0,0 +1,105 @@
+import { render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { checkEmailExisted, resetEmail, sendVerifyCode, verifyEmail } from '@/service/common'
+import EmailChangeModal from '../email-change-modal'
+
+vi.mock('@/service/common', () => ({
+  checkEmailExisted: vi.fn(),
+  resetEmail: vi.fn(),
+  sendVerifyCode: vi.fn(),
+  verifyEmail: vi.fn(),
+}))
+
+vi.mock('@/service/use-common', () => ({
+  useLogout: () => ({ mutateAsync: vi.fn() }),
+}))
+
+vi.mock('@/next/navigation', () => ({ useRouter: () => ({ push: vi.fn() }) }))
+
+describe('EmailChangeModal', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.mocked(sendVerifyCode).mockResolvedValue({ result: 'success', data: 'email-token' })
+    vi.mocked(verifyEmail).mockResolvedValue({
+      result: 'success',
+      email: 'old@example.com',
+      is_valid: true,
+      token: 'verified-token',
+    })
+    vi.mocked(checkEmailExisted).mockResolvedValue({ result: 'success' })
+  })
+
+  it('submits the labeled verification fields with Enter through both email phases', async () => {
+    const user = userEvent.setup()
+    render(<EmailChangeModal email="old@example.com" onClose={vi.fn()} />)
+
+    await user.click(
+      screen.getByRole('button', { name: 'common.account.changeEmail.sendVerifyCode' }),
+    )
+    const originCode = await screen.findByRole('textbox', {
+      name: 'common.account.changeEmail.codeLabel',
+    })
+    await user.type(originCode, '123456{Enter}')
+    expect(verifyEmail).toHaveBeenCalledWith({
+      email: 'old@example.com',
+      code: '123456',
+      token: 'email-token',
+    })
+
+    const email = await screen.findByRole('textbox', {
+      name: 'common.account.changeEmail.emailLabel',
+    })
+    await user.type(email, 'new@example.com')
+    await waitFor(() =>
+      expect(
+        screen.getByRole('button', { name: 'common.account.changeEmail.sendVerifyCode' }),
+      ).toBeEnabled(),
+    )
+    await user.type(email, '{Enter}')
+    expect(sendVerifyCode).toHaveBeenLastCalledWith({
+      email: 'new@example.com',
+      phase: 'new_email',
+      token: 'verified-token',
+    })
+
+    const newCode = await screen.findByRole('textbox', {
+      name: 'common.account.changeEmail.codeLabel',
+    })
+    expect(newCode).toHaveValue('')
+    await user.type(newCode, '654321{Enter}')
+    await waitFor(() =>
+      expect(resetEmail).toHaveBeenCalledWith({
+        new_email: 'new@example.com',
+        token: 'verified-token',
+      }),
+    )
+  })
+
+  it('associates an unavailable-email error and clears it when the user edits the address', async () => {
+    vi.mocked(checkEmailExisted).mockRejectedValue({
+      status: 400,
+      json: async () => ({ code: 'email_already_in_use' }),
+    })
+    const user = userEvent.setup()
+    render(<EmailChangeModal email="old@example.com" onClose={vi.fn()} />)
+
+    await user.click(
+      screen.getByRole('button', { name: 'common.account.changeEmail.sendVerifyCode' }),
+    )
+    await user.type(
+      await screen.findByRole('textbox', { name: 'common.account.changeEmail.codeLabel' }),
+      '123456{Enter}',
+    )
+    const email = await screen.findByRole('textbox', {
+      name: 'common.account.changeEmail.emailLabel',
+    })
+    await user.type(email, 'used@example.com')
+
+    await screen.findByText('common.account.changeEmail.existingEmail')
+    expect(email).toBeInvalid()
+    expect(email).toHaveAccessibleDescription('common.account.changeEmail.existingEmail')
+    await user.clear(email)
+    expect(email).not.toBeInvalid()
+    expect(screen.queryByText('common.account.changeEmail.existingEmail')).not.toBeInTheDocument()
+  })
+})
diff --git a/web/app/account/(commonLayout)/account-page/email-change-modal.tsx b/web/app/account/(commonLayout)/account-page/email-change-modal.tsx
index 968d76a36e5..391a8d36281 100644
--- a/web/app/account/(commonLayout)/account-page/email-change-modal.tsx
+++ b/web/app/account/(commonLayout)/account-page/email-change-modal.tsx
@@ -1,12 +1,14 @@
 import type { ResponseError } from '@/service/fetch'
 import { Button } from '@langgenius/dify-ui/button'
-import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
+import { Field, FieldError, FieldLabel } from '@langgenius/dify-ui/field'
+import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Input } from '@langgenius/dify-ui/input'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiCloseLine } from '@remixicon/react'
 import { useDebounceFn } from 'ahooks'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
-import Input from '@/app/components/base/input'
 import { useRouter } from '@/next/navigation'
 import { checkEmailExisted, resetEmail, sendVerifyCode, verifyEmail } from '@/service/common'
 import { useLogout } from '@/service/use-common'
@@ -224,201 +226,228 @@ const EmailChangeModal = ({ onClose, email }: Props) => {
   return (
     <Dialog open onOpenChange={(open) => !open && onClose()}>
       <DialogContent className="w-105! p-6!">
-        <div className="absolute top-5 right-5 cursor-pointer p-1.5" onClick={onClose}>
-          <RiCloseLine className="size-5 text-text-tertiary" />
-        </div>
-        {step === STEP.start && (
-          <>
-            <div className="pb-3 title-2xl-semi-bold text-text-primary">
-              {t(($) => $['account.changeEmail.title'], { ns: 'common' })}
-            </div>
-            <div className="space-y-0.5 pt-1 pb-2">
-              <div className="body-md-medium text-text-warning">
-                {t(($) => $['account.changeEmail.authTip'], { ns: 'common' })}
-              </div>
-              <div className="body-md-regular text-text-secondary">
-                <Trans
-                  i18nKey={($) => $['account.changeEmail.content1']}
-                  ns="common"
-                  components={{ email: <span className="body-md-medium text-text-primary"></span> }}
-                  values={{ email }}
-                />
-              </div>
-            </div>
-            <div className="pt-3"></div>
-            <div className="space-y-2">
-              <Button className="w-full!" variant="primary" onClick={sendCodeToOriginEmail}>
-                {t(($) => $['account.changeEmail.sendVerifyCode'], { ns: 'common' })}
-              </Button>
-              <Button className="w-full!" onClick={onClose}>
-                {t(($) => $['operation.cancel'], { ns: 'common' })}
-              </Button>
-            </div>
-          </>
-        )}
-        {step === STEP.verifyOrigin && (
-          <>
-            <div className="pb-3 title-2xl-semi-bold text-text-primary">
-              {t(($) => $['account.changeEmail.verifyEmail'], { ns: 'common' })}
-            </div>
-            <div className="space-y-0.5 pt-1 pb-2">
-              <div className="body-md-regular text-text-secondary">
-                <Trans
-                  i18nKey={($) => $['account.changeEmail.content2']}
-                  ns="common"
-                  components={{ email: <span className="body-md-medium text-text-primary"></span> }}
-                  values={{ email }}
-                />
-              </div>
-            </div>
-            <div className="pt-3">
-              <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">
-                {t(($) => $['account.changeEmail.codeLabel'], { ns: 'common' })}
-              </div>
-              <Input
-                className="w-full!"
-                placeholder={t(($) => $['account.changeEmail.codePlaceholder'], { ns: 'common' })}
-                value={code}
-                onChange={(e) => setCode(e.target.value)}
-                maxLength={6}
-              />
-            </div>
-            <div className="mt-3 space-y-2">
-              <Button
-                disabled={code.length !== 6}
-                className="w-full!"
-                variant="primary"
-                onClick={handleVerifyOriginEmail}
-              >
-                {t(($) => $['account.changeEmail.continue'], { ns: 'common' })}
-              </Button>
-              <Button className="w-full!" onClick={onClose}>
-                {t(($) => $['operation.cancel'], { ns: 'common' })}
-              </Button>
-            </div>
-            <div className="mt-3 flex items-center gap-1 system-xs-regular text-text-tertiary">
-              <span>{t(($) => $['account.changeEmail.resendTip'], { ns: 'common' })}</span>
-              {time > 0 && (
-                <span>
-                  {t(($) => $['account.changeEmail.resendCount'], { ns: 'common', count: time })}
-                </span>
-              )}
-              {!time && (
-                <span
-                  onClick={sendCodeToOriginEmail}
-                  className="cursor-pointer system-xs-medium text-text-accent-secondary"
-                >
-                  {t(($) => $['account.changeEmail.resend'], { ns: 'common' })}
-                </span>
-              )}
-            </div>
-          </>
-        )}
-        {step === STEP.newEmail && (
-          <>
-            <div className="pb-3 title-2xl-semi-bold text-text-primary">
-              {t(($) => $['account.changeEmail.newEmail'], { ns: 'common' })}
-            </div>
-            <div className="space-y-0.5 pt-1 pb-2">
-              <div className="body-md-regular text-text-secondary">
-                {t(($) => $['account.changeEmail.content3'], { ns: 'common' })}
-              </div>
-            </div>
-            <div className="pt-3">
-              <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">
-                {t(($) => $['account.changeEmail.emailLabel'], { ns: 'common' })}
-              </div>
-              <Input
-                className="w-full!"
-                placeholder={t(($) => $['account.changeEmail.emailPlaceholder'], { ns: 'common' })}
-                value={mail}
-                onChange={(e) => handleNewEmailValueChange(e.target.value)}
-                destructive={newEmailExited || unAvailableEmail}
-              />
-              {newEmailExited && (
-                <div className="mt-1 py-0.5 body-xs-regular text-text-destructive">
-                  {t(($) => $['account.changeEmail.existingEmail'], { ns: 'common' })}
+        <form
+          onSubmit={(event) => {
+            event.preventDefault()
+            if (step === STEP.start) void sendCodeToOriginEmail()
+            else if (step === STEP.verifyOrigin) void handleVerifyOriginEmail()
+            else if (step === STEP.newEmail) void sendCodeToNewEmail()
+            else void submitNewEmail()
+          }}
+        >
+          <IconButton
+            aria-label={t(($) => $['operation.close'], { ns: 'common' })}
+            className="absolute top-5 right-5 size-8"
+            onClick={onClose}
+          >
+            <RiCloseLine aria-hidden className="size-5 text-text-tertiary" />
+          </IconButton>
+          {step === STEP.start && (
+            <>
+              <DialogTitle className="pb-3 title-2xl-semi-bold text-text-primary">
+                {t(($) => $['account.changeEmail.title'], { ns: 'common' })}
+              </DialogTitle>
+              <div className="space-y-0.5 pt-1 pb-2">
+                <div className="body-md-medium text-text-warning">
+                  {t(($) => $['account.changeEmail.authTip'], { ns: 'common' })}
                 </div>
-              )}
-              {unAvailableEmail && (
-                <div className="mt-1 py-0.5 body-xs-regular text-text-destructive">
-                  {t(($) => $['account.changeEmail.unAvailableEmail'], { ns: 'common' })}
+                <div className="body-md-regular text-text-secondary">
+                  <Trans
+                    i18nKey={($) => $['account.changeEmail.content1']}
+                    ns="common"
+                    components={{
+                      email: <span className="body-md-medium text-text-primary"></span>,
+                    }}
+                    values={{ email }}
+                  />
                 </div>
-              )}
-            </div>
-            <div className="mt-3 space-y-2">
-              <Button
-                disabled={isSendCodeDisabled}
-                className="w-full!"
-                variant="primary"
-                onClick={sendCodeToNewEmail}
-              >
-                {t(($) => $['account.changeEmail.sendVerifyCode'], { ns: 'common' })}
-              </Button>
-              <Button className="w-full!" onClick={onClose}>
-                {t(($) => $['operation.cancel'], { ns: 'common' })}
-              </Button>
-            </div>
-          </>
-        )}
-        {step === STEP.verifyNew && (
-          <>
-            <div className="pb-3 title-2xl-semi-bold text-text-primary">
-              {t(($) => $['account.changeEmail.verifyNew'], { ns: 'common' })}
-            </div>
-            <div className="space-y-0.5 pt-1 pb-2">
-              <div className="body-md-regular text-text-secondary">
-                <Trans
-                  i18nKey={($) => $['account.changeEmail.content4']}
-                  ns="common"
-                  components={{ email: <span className="body-md-medium text-text-primary"></span> }}
-                  values={{ email: mail }}
+              </div>
+              <div className="pt-3"></div>
+              <div className="space-y-2">
+                <Button className="w-full!" variant="primary" type="submit">
+                  {t(($) => $['account.changeEmail.sendVerifyCode'], { ns: 'common' })}
+                </Button>
+                <Button className="w-full!" onClick={onClose}>
+                  {t(($) => $['operation.cancel'], { ns: 'common' })}
+                </Button>
+              </div>
+            </>
+          )}
+          {step === STEP.verifyOrigin && (
+            <>
+              <DialogTitle className="pb-3 title-2xl-semi-bold text-text-primary">
+                {t(($) => $['account.changeEmail.verifyEmail'], { ns: 'common' })}
+              </DialogTitle>
+              <div className="space-y-0.5 pt-1 pb-2">
+                <div className="body-md-regular text-text-secondary">
+                  <Trans
+                    i18nKey={($) => $['account.changeEmail.content2']}
+                    ns="common"
+                    components={{
+                      email: <span className="body-md-medium text-text-primary"></span>,
+                    }}
+                    values={{ email }}
+                  />
+                </div>
+              </div>
+              <Field name="code" className="pt-3">
+                <FieldLabel>
+                  {t(($) => $['account.changeEmail.codeLabel'], { ns: 'common' })}
+                </FieldLabel>
+                <Input
+                  className="w-full!"
+                  placeholder={t(($) => $['account.changeEmail.codePlaceholder'], { ns: 'common' })}
+                  value={code}
+                  onValueChange={(value) => setCode(value)}
+                  autoComplete="one-time-code"
+                  maxLength={6}
                 />
-              </div>
-            </div>
-            <div className="pt-3">
-              <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">
-                {t(($) => $['account.changeEmail.codeLabel'], { ns: 'common' })}
-              </div>
-              <Input
-                className="w-full!"
-                placeholder={t(($) => $['account.changeEmail.codePlaceholder'], { ns: 'common' })}
-                value={code}
-                onChange={(e) => setCode(e.target.value)}
-                maxLength={6}
-              />
-            </div>
-            <div className="mt-3 space-y-2">
-              <Button
-                disabled={code.length !== 6}
-                className="w-full!"
-                variant="primary"
-                onClick={submitNewEmail}
-              >
-                {t(($) => $['account.changeEmail.changeTo'], { ns: 'common', email: mail })}
-              </Button>
-              <Button className="w-full!" onClick={onClose}>
-                {t(($) => $['operation.cancel'], { ns: 'common' })}
-              </Button>
-            </div>
-            <div className="mt-3 flex items-center gap-1 system-xs-regular text-text-tertiary">
-              <span>{t(($) => $['account.changeEmail.resendTip'], { ns: 'common' })}</span>
-              {time > 0 && (
-                <span>
-                  {t(($) => $['account.changeEmail.resendCount'], { ns: 'common', count: time })}
-                </span>
-              )}
-              {!time && (
-                <span
-                  onClick={sendCodeToNewEmail}
-                  className="cursor-pointer system-xs-medium text-text-accent-secondary"
+              </Field>
+              <div className="mt-3 space-y-2">
+                <Button
+                  disabled={code.length !== 6}
+                  className="w-full!"
+                  variant="primary"
+                  type="submit"
                 >
-                  {t(($) => $['account.changeEmail.resend'], { ns: 'common' })}
-                </span>
-              )}
-            </div>
-          </>
-        )}
+                  {t(($) => $['account.changeEmail.continue'], { ns: 'common' })}
+                </Button>
+                <Button className="w-full!" onClick={onClose}>
+                  {t(($) => $['operation.cancel'], { ns: 'common' })}
+                </Button>
+              </div>
+              <div className="mt-3 flex items-center gap-1 system-xs-regular text-text-tertiary">
+                <span>{t(($) => $['account.changeEmail.resendTip'], { ns: 'common' })}</span>
+                {time > 0 && (
+                  <span>
+                    {t(($) => $['account.changeEmail.resendCount'], { ns: 'common', count: time })}
+                  </span>
+                )}
+                {!time && (
+                  <button
+                    type="button"
+                    onClick={sendCodeToOriginEmail}
+                    className="cursor-pointer rounded-sm system-xs-medium text-text-accent-secondary outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+                  >
+                    {t(($) => $['account.changeEmail.resend'], { ns: 'common' })}
+                  </button>
+                )}
+              </div>
+            </>
+          )}
+          {step === STEP.newEmail && (
+            <>
+              <DialogTitle className="pb-3 title-2xl-semi-bold text-text-primary">
+                {t(($) => $['account.changeEmail.newEmail'], { ns: 'common' })}
+              </DialogTitle>
+              <div className="space-y-0.5 pt-1 pb-2">
+                <div className="body-md-regular text-text-secondary">
+                  {t(($) => $['account.changeEmail.content3'], { ns: 'common' })}
+                </div>
+              </div>
+              <Field name="email" invalid={newEmailExited || unAvailableEmail} className="pt-3">
+                <FieldLabel>
+                  {t(($) => $['account.changeEmail.emailLabel'], { ns: 'common' })}
+                </FieldLabel>
+                <Input
+                  className="w-full!"
+                  placeholder={t(($) => $['account.changeEmail.emailPlaceholder'], {
+                    ns: 'common',
+                  })}
+                  value={mail}
+                  onValueChange={(value) => handleNewEmailValueChange(value)}
+                  type="email"
+                  autoComplete="email"
+                />
+                {newEmailExited && (
+                  <FieldError match>
+                    {t(($) => $['account.changeEmail.existingEmail'], { ns: 'common' })}
+                  </FieldError>
+                )}
+                {unAvailableEmail && (
+                  <FieldError match>
+                    {t(($) => $['account.changeEmail.unAvailableEmail'], { ns: 'common' })}
+                  </FieldError>
+                )}
+              </Field>
+              <div className="mt-3 space-y-2">
+                <Button
+                  disabled={isSendCodeDisabled}
+                  className="w-full!"
+                  variant="primary"
+                  type="submit"
+                >
+                  {t(($) => $['account.changeEmail.sendVerifyCode'], { ns: 'common' })}
+                </Button>
+                <Button className="w-full!" onClick={onClose}>
+                  {t(($) => $['operation.cancel'], { ns: 'common' })}
+                </Button>
+              </div>
+            </>
+          )}
+          {step === STEP.verifyNew && (
+            <>
+              <DialogTitle className="pb-3 title-2xl-semi-bold text-text-primary">
+                {t(($) => $['account.changeEmail.verifyNew'], { ns: 'common' })}
+              </DialogTitle>
+              <div className="space-y-0.5 pt-1 pb-2">
+                <div className="body-md-regular text-text-secondary">
+                  <Trans
+                    i18nKey={($) => $['account.changeEmail.content4']}
+                    ns="common"
+                    components={{
+                      email: <span className="body-md-medium text-text-primary"></span>,
+                    }}
+                    values={{ email: mail }}
+                  />
+                </div>
+              </div>
+              <Field name="code" className="pt-3">
+                <FieldLabel>
+                  {t(($) => $['account.changeEmail.codeLabel'], { ns: 'common' })}
+                </FieldLabel>
+                <Input
+                  className="w-full!"
+                  placeholder={t(($) => $['account.changeEmail.codePlaceholder'], { ns: 'common' })}
+                  value={code}
+                  onValueChange={(value) => setCode(value)}
+                  autoComplete="one-time-code"
+                  maxLength={6}
+                />
+              </Field>
+              <div className="mt-3 space-y-2">
+                <Button
+                  disabled={code.length !== 6}
+                  className="w-full!"
+                  variant="primary"
+                  type="submit"
+                >
+                  {t(($) => $['account.changeEmail.changeTo'], { ns: 'common', email: mail })}
+                </Button>
+                <Button className="w-full!" onClick={onClose}>
+                  {t(($) => $['operation.cancel'], { ns: 'common' })}
+                </Button>
+              </div>
+              <div className="mt-3 flex items-center gap-1 system-xs-regular text-text-tertiary">
+                <span>{t(($) => $['account.changeEmail.resendTip'], { ns: 'common' })}</span>
+                {time > 0 && (
+                  <span>
+                    {t(($) => $['account.changeEmail.resendCount'], { ns: 'common', count: time })}
+                  </span>
+                )}
+                {!time && (
+                  <button
+                    type="button"
+                    onClick={sendCodeToNewEmail}
+                    className="cursor-pointer rounded-sm system-xs-medium text-text-accent-secondary outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+                  >
+                    {t(($) => $['account.changeEmail.resend'], { ns: 'common' })}
+                  </button>
+                )}
+              </div>
+            </>
+          )}
+        </form>
       </DialogContent>
     </Dialog>
   )
diff --git a/web/app/components/base/emoji-picker/Inner.tsx b/web/app/components/base/emoji-picker/Inner.tsx
index f30319045e7..c23c93ded0f 100644
--- a/web/app/components/base/emoji-picker/Inner.tsx
+++ b/web/app/components/base/emoji-picker/Inner.tsx
@@ -1,14 +1,14 @@
 'use client'
 import type { EmojiMartData } from '@emoji-mart/data'
-import type { ChangeEvent } from 'react'
 import data from '@emoji-mart/data'
 import { MagnifyingGlassIcon } from '@heroicons/react/24/outline'
 import { cn } from '@langgenius/dify-ui/cn'
+import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group'
 import { init } from 'emoji-mart'
 import * as React from 'react'
 import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
-import Input from '@/app/components/base/input'
 import { searchEmoji } from '@/utils/emoji'
 import { backgroundColors, defaultEmojiBackground } from './constants'
 
@@ -22,6 +22,7 @@ type IEmojiPickerInnerProps = {
 }
 
 function EmojiPickerInner({ emoji, background, onSelect, className }: IEmojiPickerInnerProps) {
+  const { t } = useTranslation()
   const { categories } = data as EmojiMartData
   const [selectedEmoji, setSelectedEmoji] = useState(emoji || '')
   const [selectedBackground, setSelectedBackground] = useState(background || defaultEmojiBackground)
@@ -45,26 +46,25 @@ function EmojiPickerInner({ emoji, background, onSelect, className }: IEmojiPick
   return (
     <div className={cn(className, 'flex flex-col')}>
       <div className="flex w-full flex-col items-center px-3 pb-2">
-        <div className="relative w-full">
-          <div className="pointer-events-none absolute inset-y-0 left-0 z-10 flex items-center pl-3">
-            <MagnifyingGlassIcon className="size-5 text-text-quaternary" aria-hidden="true" />
-          </div>
-          <Input
-            className="pl-10"
+        <InputGroup>
+          <InputGroupInput
             type="search"
-            id="search"
+            aria-label={t(($) => $['operation.search'], { ns: 'common' })}
             placeholder="Search emojis..."
-            onChange={async (e: ChangeEvent<HTMLInputElement>) => {
-              if (e.target.value === '') {
+            onValueChange={async (value) => {
+              if (value === '') {
                 setIsSearching(false)
               } else {
                 setIsSearching(true)
-                const emojis = await searchEmoji(e.target.value)
+                const emojis = await searchEmoji(value)
                 setSearchedEmojis(emojis)
               }
             }}
           />
-        </div>
+          <InputGroupAddon className="ps-3 pe-2">
+            <MagnifyingGlassIcon className="size-5 text-text-quaternary" aria-hidden="true" />
+          </InputGroupAddon>
+        </InputGroup>
       </div>
       <Divider className="my-3" />
 
diff --git a/web/app/components/base/form/__tests__/index.spec.tsx b/web/app/components/base/form/__tests__/index.spec.tsx
index 11283fdb979..57c3a9d747c 100644
--- a/web/app/components/base/form/__tests__/index.spec.tsx
+++ b/web/app/components/base/form/__tests__/index.spec.tsx
@@ -1,4 +1,5 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { useAppForm, withForm } from '../index'
 
 const FormHarness = ({ onSubmit }: { onSubmit: (value: Record<string, unknown>) => void }) => {
@@ -8,12 +9,15 @@ const FormHarness = ({ onSubmit }: { onSubmit: (value: Record<string, unknown>)
   })
 
   return (
-    <form>
+    <form
+      onSubmit={(event) => {
+        event.preventDefault()
+        void form.handleSubmit()
+      }}
+    >
       <form.AppField name="title" children={(field) => <field.TextField label="Title" />} />
       <form.AppForm>
-        <button type="button" onClick={() => form.handleSubmit()}>
-          Submit
-        </button>
+        <button type="submit">Submit</button>
       </form.AppForm>
     </form>
   )
@@ -40,12 +44,16 @@ const WithFormHarness = () => {
 describe('form index exports', () => {
   it('should submit values through the generated app form', async () => {
     const onSubmit = vi.fn()
+    const user = userEvent.setup()
     render(<FormHarness onSubmit={onSubmit} />)
 
-    fireEvent.click(screen.getByRole('button', { name: /submit/i }))
+    const input = screen.getByRole('textbox', { name: 'Title' })
+    await user.clear(input)
+    await user.type(input, 'Updated title')
+    await user.click(screen.getByRole('button', { name: /submit/i }))
 
     await waitFor(() => {
-      expect(onSubmit).toHaveBeenCalledWith({ title: 'Initial title' })
+      expect(onSubmit).toHaveBeenCalledWith({ title: 'Updated title' })
     })
   })
 
diff --git a/web/app/components/base/form/components/base/__tests__/base-field.spec.tsx b/web/app/components/base/form/components/base/__tests__/base-field.spec.tsx
index 169fb6f6d56..d448a797b65 100644
--- a/web/app/components/base/form/components/base/__tests__/base-field.spec.tsx
+++ b/web/app/components/base/form/components/base/__tests__/base-field.spec.tsx
@@ -344,7 +344,9 @@ describe('BaseField', () => {
     expect(screen.getByDisplayValue('abc')).toHaveAttribute('type', 'password')
   })
 
-  it('should render number input with number type', () => {
+  it('keeps numeric edits, zero and an empty value distinct at the form boundary', async () => {
+    const user = userEvent.setup()
+    const onChange = vi.fn()
     renderBaseField({
       formSchema: {
         type: FormTypeEnum.textNumber,
@@ -353,9 +355,22 @@ describe('BaseField', () => {
         required: false,
       },
       defaultValues: { count: 7 },
+      onChange,
     })
 
-    expect(screen.getByDisplayValue('7')).toHaveAttribute('type', 'number')
+    const input = screen.getByRole('textbox', { name: 'Count' })
+    expect(input).toHaveValue('7')
+    await user.clear(input)
+    await user.type(input, '3.5')
+    await user.tab()
+    expect(onChange).toHaveBeenLastCalledWith('count', 3.5)
+    await user.clear(input)
+    await user.type(input, '0')
+    await user.tab()
+    expect(onChange).toHaveBeenLastCalledWith('count', 0)
+    await user.clear(input)
+    await user.tab()
+    expect(onChange).toHaveBeenLastCalledWith('count', null)
   })
 
   it('should render translated object label content', () => {
diff --git a/web/app/components/base/form/components/base/base-field.tsx b/web/app/components/base/form/components/base/base-field.tsx
index 231053e78db..7e7c2383d90 100644
--- a/web/app/components/base/form/components/base/base-field.tsx
+++ b/web/app/components/base/form/components/base/base-field.tsx
@@ -3,6 +3,9 @@ import type { FieldState, FormSchema, TypeWithI18N } from '@/app/components/base
 import { cn } from '@langgenius/dify-ui/cn'
 import { Field, FieldItem, FieldLabel } from '@langgenius/dify-ui/field'
 import { Fieldset, FieldsetLegend } from '@langgenius/dify-ui/fieldset'
+import { Input } from '@langgenius/dify-ui/input'
+import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group'
+import { NumberField, NumberFieldGroup, NumberFieldInput } from '@langgenius/dify-ui/number-field'
 import { Radio, RadioGroup } from '@langgenius/dify-ui/radio-group'
 import {
   Select,
@@ -18,9 +21,9 @@ import { useStore } from '@tanstack/react-form'
 import { isValidElement, memo, useCallback, useId, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { CheckboxList } from '@/app/components/base/checkbox-list'
+import { CopyFeedback } from '@/app/components/base/copy-feedback'
 import { FormItemValidateStatusEnum, FormTypeEnum } from '@/app/components/base/form/types'
 import { Infotip } from '@/app/components/base/infotip'
-import Input from '@/app/components/base/input'
 import { useRenderI18nObject } from '@/hooks/use-i18n'
 import { useTriggerPluginDynamicOptions } from '@/service/use-triggers'
 
@@ -28,8 +31,6 @@ const getExtraProps = (type: FormTypeEnum) => {
   switch (type) {
     case FormTypeEnum.secretInput:
       return { type: 'password', autoComplete: 'new-password' }
-    case FormTypeEnum.textNumber:
-      return { type: 'number' }
     default:
       return { type: 'text' }
   }
@@ -85,7 +86,7 @@ const VALIDATE_STATUS_STYLE_MAP: Record<
   },
   [FormItemValidateStatusEnum.Warning]: {
     componentClassName:
-      'border-components-input-border-warning focus:border-components-input-border-warning',
+      'border-components-input-border-warning focus:border-components-input-border-warning has-[input:focus]:border-components-input-border-warning',
     textClassName: 'text-text-warning',
     infoFieldName: 'warnings',
   },
@@ -273,6 +274,17 @@ const BaseField = ({
   const selectPlaceholder = isDynamicSelect ? dynamicPlaceholder : translatedPlaceholder
   const handleSelectChange = isDynamicSelect ? field.handleChange : handleChange
   const selectDisabled = disabled || (isDynamicSelect && isDynamicOptionsLoading)
+  const textInputProps = {
+    id: controlId,
+    name: field.name,
+    ...controlProps,
+    value: stringValue ?? '',
+    onValueChange: handleChange,
+    onBlur: field.handleBlur,
+    disabled,
+    placeholder: translatedPlaceholder,
+    ...getExtraProps(formItemType),
+  }
 
   const content = (
     <>
@@ -301,28 +313,74 @@ const BaseField = ({
           )}
         </div>
         <div className={cn(inputContainerClassName)} data-form-field={field.name}>
-          {[FormTypeEnum.textInput, FormTypeEnum.secretInput, FormTypeEnum.textNumber].includes(
-            formItemType,
-          ) && (
-            <Input
-              id={controlId}
-              name={field.name}
-              {...controlProps}
-              className={cn(
-                inputClassName,
-                VALIDATE_STATUS_STYLE_MAP[validateStatus as FormItemValidateStatusEnum]
-                  ?.componentClassName,
+          {[FormTypeEnum.textInput, FormTypeEnum.secretInput].includes(formItemType) && (
+            <Field
+              className="contents"
+              invalid={validateStatus === FormItemValidateStatusEnum.Error}
+            >
+              {showCopy ? (
+                <InputGroup
+                  className={cn(
+                    inputClassName,
+                    VALIDATE_STATUS_STYLE_MAP[validateStatus as FormItemValidateStatusEnum]
+                      ?.componentClassName,
+                  )}
+                >
+                  <InputGroupInput {...textInputProps} />
+                  <InputGroupAddon align="inline-end" className="pe-0">
+                    <CopyFeedback
+                      content={stringValue ?? ''}
+                      className="size-7 hover:bg-transparent"
+                    />
+                  </InputGroupAddon>
+                </InputGroup>
+              ) : (
+                <Input
+                  {...textInputProps}
+                  className={cn(
+                    inputClassName,
+                    VALIDATE_STATUS_STYLE_MAP[validateStatus as FormItemValidateStatusEnum]
+                      ?.componentClassName,
+                  )}
+                />
               )}
-              value={value || ''}
-              onChange={(e) => {
-                handleChange(e.target.value)
-              }}
-              onBlur={field.handleBlur}
-              disabled={disabled}
-              placeholder={translatedPlaceholder}
-              {...getExtraProps(formItemType)}
-              showCopyIcon={showCopy}
-            />
+            </Field>
+          )}
+          {formItemType === FormTypeEnum.textNumber && (
+            <Field
+              className="contents"
+              invalid={validateStatus === FormItemValidateStatusEnum.Error}
+            >
+              <NumberField
+                name={field.name}
+                step="any"
+                value={value == null || value === '' ? null : Number(value)}
+                disabled={disabled}
+                onValueChange={(value) => handleChange(value)}
+              >
+                <NumberFieldGroup
+                  className={cn(
+                    inputClassName,
+                    validateStatus === FormItemValidateStatusEnum.Warning &&
+                      VALIDATE_STATUS_STYLE_MAP[FormItemValidateStatusEnum.Warning]
+                        .componentClassName,
+                  )}
+                >
+                  <NumberFieldInput
+                    id={controlId}
+                    {...controlProps}
+                    onBlur={field.handleBlur}
+                    placeholder={translatedPlaceholder}
+                  />
+                  {showCopy && (
+                    <CopyFeedback
+                      content={value == null ? '' : String(value)}
+                      className="size-7 shrink-0 hover:bg-transparent"
+                    />
+                  )}
+                </NumberFieldGroup>
+              </NumberField>
+            </Field>
           )}
           {isSelect && (
             <>
diff --git a/web/app/components/base/form/components/field/__tests__/text.spec.tsx b/web/app/components/base/form/components/field/__tests__/text.spec.tsx
deleted file mode 100644
index 5ebc82e8586..00000000000
--- a/web/app/components/base/form/components/field/__tests__/text.spec.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import TextField from '../text'
-
-const mockField = {
-  name: 'text-field',
-  state: {
-    value: 'Initial text',
-  },
-  handleChange: vi.fn(),
-  handleBlur: vi.fn(),
-}
-
-vi.mock('../../..', () => ({
-  useFieldContext: () => mockField,
-}))
-
-describe('TextField', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockField.state.value = 'Initial text'
-  })
-
-  it('should render current value', () => {
-    render(<TextField label="Name" />)
-    expect(screen.getByLabelText('Name')).toHaveValue('Initial text')
-  })
-
-  it('should update value when users type', () => {
-    render(<TextField label="Name" />)
-    fireEvent.change(screen.getByLabelText('Name'), { target: { value: 'Updated text' } })
-    expect(mockField.handleChange).toHaveBeenCalledWith('Updated text')
-  })
-})
diff --git a/web/app/components/base/form/components/field/text.tsx b/web/app/components/base/form/components/field/text.tsx
index 28a4919cee6..6ec2592cb88 100644
--- a/web/app/components/base/form/components/field/text.tsx
+++ b/web/app/components/base/form/components/field/text.tsx
@@ -1,16 +1,19 @@
-import type { InputProps } from '../../../input'
+import type { InputProps } from '@langgenius/dify-ui/input'
 import type { LabelProps } from '../label'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Input } from '@langgenius/dify-ui/input'
 import * as React from 'react'
 import { useFieldContext } from '../..'
-import Input from '../../../input'
 import Label from '../label'
 
 type TextFieldProps = {
   label: string
   labelOptions?: Omit<LabelProps, 'htmlFor' | 'label'>
   className?: string
-} & Omit<InputProps, 'className' | 'onChange' | 'onBlur' | 'value' | 'id'>
+} & Omit<
+  InputProps,
+  'className' | 'onChange' | 'onValueChange' | 'onBlur' | 'value' | 'defaultValue' | 'id' | 'name'
+>
 
 const TextField = ({ label, labelOptions, className, ...inputProps }: TextFieldProps) => {
   const field = useFieldContext<string>()
@@ -20,8 +23,9 @@ const TextField = ({ label, labelOptions, className, ...inputProps }: TextFieldP
       <Label htmlFor={field.name} label={label} {...(labelOptions ?? {})} />
       <Input
         id={field.name}
+        name={field.name}
         value={field.state.value}
-        onChange={(e) => field.handleChange(e.target.value)}
+        onValueChange={(value) => field.handleChange(value)}
         onBlur={field.handleBlur}
         {...inputProps}
       />
diff --git a/web/app/components/base/form/hooks/__tests__/use-get-validators.spec.ts b/web/app/components/base/form/hooks/__tests__/use-get-validators.spec.ts
index c997011ce8e..3300fbbfdb8 100644
--- a/web/app/components/base/form/hooks/__tests__/use-get-validators.spec.ts
+++ b/web/app/components/base/form/hooks/__tests__/use-get-validators.spec.ts
@@ -8,6 +8,21 @@ vi.mock('@/hooks/use-i18n', () => ({
 }))
 
 describe('useGetValidators', () => {
+  it('accepts numeric zero but rejects a cleared required number field', () => {
+    const { result } = renderHook(() => useGetValidators())
+    const validators = result.current.getValidators({
+      name: 'amount',
+      label: 'Amount',
+      required: true,
+      type: FormTypeEnum.textNumber,
+    })
+
+    for (const validate of [validators?.onMount, validators?.onChange, validators?.onBlur]) {
+      expect(validate?.({ value: 0 })).toBeUndefined()
+      expect(validate?.({ value: null })).toContain('common.errorMsg.fieldRequired')
+    }
+  })
+
   it('should create required validators when field is required without custom validators', () => {
     const { result } = renderHook(() => useGetValidators())
     const validators = result.current.getValidators({
diff --git a/web/app/components/base/form/hooks/use-get-validators.ts b/web/app/components/base/form/hooks/use-get-validators.ts
index 3d1fa230546..0145dc50e30 100644
--- a/web/app/components/base/form/hooks/use-get-validators.ts
+++ b/web/app/components/base/form/hooks/use-get-validators.ts
@@ -23,21 +23,21 @@ export const useGetValidators = () => {
       if (required && !validators) {
         mergedValidators = {
           onMount: ({ value }: any) => {
-            if (!value)
+            if (!value && value !== 0)
               return t(($) => $['errorMsg.fieldRequired'], {
                 ns: 'common',
                 field: memorizedLabel || name,
               })
           },
           onChange: ({ value }: any) => {
-            if (!value)
+            if (!value && value !== 0)
               return t(($) => $['errorMsg.fieldRequired'], {
                 ns: 'common',
                 field: memorizedLabel || name,
               })
           },
           onBlur: ({ value }: any) => {
-            if (!value)
+            if (!value && value !== 0)
               return t(($) => $['errorMsg.fieldRequired'], { ns: 'common', field: memorizedLabel })
           },
         }
diff --git a/web/app/components/base/input-with-copy/__tests__/index.spec.tsx b/web/app/components/base/input-with-copy/__tests__/index.spec.tsx
deleted file mode 100644
index e87d309e98a..00000000000
--- a/web/app/components/base/input-with-copy/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,222 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import InputWithCopy from '../index'
-
-// Create a controllable mock for useClipboard
-const mockCopy = vi.fn()
-let mockCopied = false
-const mockReset = vi.fn()
-
-vi.mock('foxact/use-clipboard', () => ({
-  useClipboard: () => ({
-    copy: mockCopy,
-    copied: mockCopied,
-    reset: mockReset,
-  }),
-}))
-
-describe('InputWithCopy component', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockCopy.mockClear()
-    mockReset.mockClear()
-    mockCopied = false
-  })
-
-  it('renders correctly with default props', () => {
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="test value" onChange={mockOnChange} />)
-    const input = screen.getByDisplayValue('test value')
-    const copyButton = screen.getByRole('button')
-    expect(input).toBeInTheDocument()
-    expect(copyButton).toBeInTheDocument()
-  })
-
-  it('hides copy button when showCopyButton is false', () => {
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="test value" onChange={mockOnChange} showCopyButton={false} />)
-    const input = screen.getByDisplayValue('test value')
-    const copyButton = screen.queryByRole('button')
-    expect(input).toBeInTheDocument()
-    expect(copyButton).not.toBeInTheDocument()
-  })
-
-  it('calls copy function with input value when copy button is clicked', () => {
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="test value" onChange={mockOnChange} />)
-
-    const copyButton = screen.getByRole('button')
-    fireEvent.click(copyButton)
-
-    expect(mockCopy).toHaveBeenCalledWith('test value')
-  })
-
-  it('calls copy function with custom value when copyValue prop is provided', () => {
-    const mockOnChange = vi.fn()
-    render(
-      <InputWithCopy value="display value" onChange={mockOnChange} copyValue="custom copy value" />,
-    )
-
-    const copyButton = screen.getByRole('button')
-    fireEvent.click(copyButton)
-
-    expect(mockCopy).toHaveBeenCalledWith('custom copy value')
-  })
-
-  it('calls onCopy callback when copy button is clicked', () => {
-    const onCopyMock = vi.fn()
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="test value" onChange={mockOnChange} onCopy={onCopyMock} />)
-
-    const copyButton = screen.getByRole('button')
-    fireEvent.click(copyButton)
-
-    expect(onCopyMock).toHaveBeenCalledWith('test value')
-  })
-
-  it('shows copied state when copied is true', () => {
-    mockCopied = true
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="test value" onChange={mockOnChange} />)
-
-    const copyButton = screen.getByRole('button')
-    // Hover over the button to trigger tooltip
-    fireEvent.mouseEnter(copyButton)
-
-    // The icon should change to filled version when copied
-    // We verify the component renders without error in copied state
-    expect(copyButton).toBeInTheDocument()
-  })
-
-  it('passes through all input props correctly', () => {
-    const mockOnChange = vi.fn()
-    render(
-      <InputWithCopy
-        value="test value"
-        onChange={mockOnChange}
-        placeholder="Custom placeholder"
-        disabled
-        readOnly
-        className="custom-class"
-      />,
-    )
-
-    const input = screen.getByDisplayValue('test value')
-    expect(input).toHaveAttribute('placeholder', 'Custom placeholder')
-    expect(input).toBeDisabled()
-    expect(input).toHaveAttribute('readonly')
-    expect(input).toHaveClass('custom-class')
-  })
-
-  it('handles empty value correctly', () => {
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="" onChange={mockOnChange} />)
-    const input = screen.getByRole('textbox')
-    const copyButton = screen.getByRole('button')
-
-    expect(input).toBeInTheDocument()
-    expect(input).toHaveValue('')
-    expect(copyButton).toBeInTheDocument()
-
-    // Clicking copy button with empty value should call copy with empty string
-    fireEvent.click(copyButton)
-    expect(mockCopy).toHaveBeenCalledWith('')
-  })
-
-  it('maintains focus on input after copy', () => {
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="test value" onChange={mockOnChange} />)
-
-    const input = screen.getByDisplayValue('test value')
-    const copyButton = screen.getByRole('button')
-
-    input.focus()
-    expect(input).toHaveFocus()
-
-    fireEvent.click(copyButton)
-
-    // Input should maintain focus after copy
-    expect(input).toHaveFocus()
-  })
-
-  it('converts non-string value to string for copying', () => {
-    const mockOnChange = vi.fn()
-    // number value triggers String(value || '') branch where typeof value !== 'string'
-    render(<InputWithCopy value={12345} onChange={mockOnChange} />)
-
-    const copyButton = screen.getByRole('button')
-    fireEvent.click(copyButton)
-
-    expect(mockCopy).toHaveBeenCalledWith('12345')
-  })
-
-  it('handles undefined value by converting to empty string', () => {
-    const mockOnChange = vi.fn()
-    // undefined value triggers String(value || '') where value is falsy
-    render(<InputWithCopy value={undefined} onChange={mockOnChange} />)
-
-    const copyButton = screen.getByRole('button')
-    fireEvent.click(copyButton)
-
-    expect(mockCopy).toHaveBeenCalledWith('')
-  })
-
-  it('shows copied tooltip text when copied state is true', () => {
-    mockCopied = true
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="test value" onChange={mockOnChange} />)
-
-    const copyButton = screen.getByRole('button', {
-      name: 'appOverview.overview.appInfo.embedded.copied',
-    })
-    expect(copyButton).toBeInTheDocument()
-  })
-
-  it('shows copy tooltip text when copied state is false', () => {
-    mockCopied = false
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="test value" onChange={mockOnChange} />)
-
-    const copyButton = screen.getByRole('button', {
-      name: 'appOverview.overview.appInfo.embedded.copy',
-    })
-    expect(copyButton).toBeInTheDocument()
-  })
-
-  it('calls reset on mouse leave from copy button wrapper', () => {
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value="test value" onChange={mockOnChange} />)
-
-    const copyButton = screen.getByRole('button')
-    fireEvent.mouseLeave(copyButton)
-
-    expect(mockReset).toHaveBeenCalled()
-  })
-
-  it('copies copyValue over non-string input value when both provided', () => {
-    const mockOnChange = vi.fn()
-    render(<InputWithCopy value={42} onChange={mockOnChange} copyValue="override-copy" />)
-
-    const copyButton = screen.getByRole('button')
-    fireEvent.click(copyButton)
-
-    expect(mockCopy).toHaveBeenCalledWith('override-copy')
-  })
-
-  it('invokes onCopy with copyValue when copyValue is provided', () => {
-    const onCopyMock = vi.fn()
-    const mockOnChange = vi.fn()
-    render(
-      <InputWithCopy
-        value="display"
-        onChange={mockOnChange}
-        copyValue="custom"
-        onCopy={onCopyMock}
-      />,
-    )
-
-    const copyButton = screen.getByRole('button')
-    fireEvent.click(copyButton)
-
-    expect(onCopyMock).toHaveBeenCalledWith('custom')
-  })
-})
diff --git a/web/app/components/base/input-with-copy/index.tsx b/web/app/components/base/input-with-copy/index.tsx
deleted file mode 100644
index e35ed323ccd..00000000000
--- a/web/app/components/base/input-with-copy/index.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-'use client'
-import type { InputProps } from '../input'
-import { cn } from '@langgenius/dify-ui/cn'
-import { IconButton } from '@langgenius/dify-ui/icon-button'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
-import { useClipboard } from 'foxact/use-clipboard'
-import * as React from 'react'
-import { useTranslation } from 'react-i18next'
-
-type InputWithCopyProps = {
-  showCopyButton?: boolean
-  copyValue?: string // Value to copy, defaults to input value
-  onCopy?: (value: string) => void // Callback when copy is triggered
-} & Omit<InputProps, 'showClearIcon' | 'onCopy'> // Remove conflicting props
-
-const prefixEmbedded = 'overview.appInfo.embedded'
-
-const InputWithCopy = React.forwardRef<HTMLInputElement, InputWithCopyProps>(
-  ({ showCopyButton = true, copyValue, onCopy, value, wrapperClassName, ...inputProps }, ref) => {
-    const { t } = useTranslation()
-    // Determine what value to copy
-    const valueToString = typeof value === 'string' ? value : String(value || '')
-    const finalCopyValue = copyValue || valueToString
-
-    const { copied, copy, reset } = useClipboard()
-
-    const handleCopy = () => {
-      copy(finalCopyValue)
-      onCopy?.(finalCopyValue)
-    }
-
-    const tooltipText = copied
-      ? t(($) => $[`${prefixEmbedded}.copied`], { ns: 'appOverview' })
-      : t(($) => $[`${prefixEmbedded}.copy`], { ns: 'appOverview' })
-    /* v8 ignore next -- i18n test mock always returns a non-empty string; runtime fallback is defensive. -- @preserve */
-    const safeTooltipText = tooltipText || ''
-
-    return (
-      <div className={cn('relative w-full', wrapperClassName)}>
-        <input
-          ref={ref}
-          className={cn(
-            'w-full appearance-none border border-transparent bg-components-input-bg-normal py-1.75 text-components-input-text-filled caret-primary-600 outline-hidden placeholder:text-components-input-text-placeholder hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active focus:bg-components-input-bg-active focus:shadow-xs',
-            'rounded-lg px-3 system-sm-regular',
-            showCopyButton && 'pr-8',
-            inputProps.disabled &&
-              'cursor-not-allowed border-transparent bg-components-input-bg-disabled text-components-input-text-filled-disabled hover:border-transparent hover:bg-components-input-bg-disabled',
-            inputProps.className,
-          )}
-          value={value}
-          {...(({ size: _size, ...rest }) => rest)(inputProps)}
-        />
-        {showCopyButton && (
-          <div className="absolute top-1/2 right-2 -translate-y-1/2">
-            <Tooltip>
-              <TooltipTrigger
-                render={
-                  <IconButton
-                    size="xs"
-                    variant="ghost"
-                    aria-label={safeTooltipText}
-                    onClick={handleCopy}
-                    onMouseLeave={reset}
-                  >
-                    {copied ? (
-                      <span
-                        className="i-ri-clipboard-fill size-3.5 text-text-tertiary"
-                        aria-hidden="true"
-                      />
-                    ) : (
-                      <span
-                        className="i-ri-clipboard-line size-3.5 text-text-tertiary"
-                        aria-hidden="true"
-                      />
-                    )}
-                  </IconButton>
-                }
-              />
-              <TooltipContent>{safeTooltipText}</TooltipContent>
-            </Tooltip>
-          </div>
-        )}
-      </div>
-    )
-  },
-)
-
-InputWithCopy.displayName = 'InputWithCopy'
-
-export default InputWithCopy
diff --git a/web/app/components/base/input/__tests__/index.spec.tsx b/web/app/components/base/input/__tests__/index.spec.tsx
deleted file mode 100644
index 3e45949bb90..00000000000
--- a/web/app/components/base/input/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { ChangeEvent } from 'react'
-import { fireEvent, render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import Input from '../index'
-
-describe('Input', () => {
-  it('disables the input and hides its clear action', () => {
-    render(<Input showClearIcon value="test" disabled />)
-
-    expect(screen.getByRole('textbox')).toBeDisabled()
-    expect(screen.queryByRole('button', { name: 'common.operation.clear' })).not.toBeInTheDocument()
-  })
-
-  it('clears an editable value', async () => {
-    const user = userEvent.setup()
-    const onClear = vi.fn()
-    render(<Input showClearIcon value="test" onClear={onClear} />)
-
-    await user.click(screen.getByRole('button', { name: 'common.operation.clear' }))
-
-    expect(onClear).toHaveBeenCalledOnce()
-  })
-
-  it('normalizes leading zeros while changing an initial numeric zero', () => {
-    let changedValue = ''
-    const onChange = vi.fn((event: ChangeEvent<HTMLInputElement>) => {
-      changedValue = event.target.value
-    })
-    render(<Input type="number" value={0} onChange={onChange} />)
-
-    fireEvent.change(screen.getByRole('spinbutton'), { target: { value: '00042' } })
-
-    expect(onChange).toHaveBeenCalledOnce()
-    expect(changedValue).toBe('42')
-  })
-
-  it('normalizes leading zeros before forwarding blur', () => {
-    const onChange = vi.fn()
-    const onBlur = vi.fn()
-    render(<Input type="number" defaultValue="0012" onChange={onChange} onBlur={onBlur} />)
-
-    fireEvent.blur(screen.getByRole('spinbutton'))
-
-    expect(onChange.mock.calls[0]![0].target.value).toBe('12')
-    expect(onBlur.mock.calls[0]![0].target.value).toBe('12')
-  })
-})
diff --git a/web/app/components/base/input/index.stories.tsx b/web/app/components/base/input/index.stories.tsx
deleted file mode 100644
index eb1b64d0fbd..00000000000
--- a/web/app/components/base/input/index.stories.tsx
+++ /dev/null
@@ -1,419 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useState } from 'react'
-import Input from '.'
-
-const meta = {
-  title: 'Base/Data Entry/Input',
-  component: Input,
-  parameters: {
-    layout: 'centered',
-    docs: {
-      description: {
-        component:
-          'Input component with support for icons, clear button, validation states, and units. Includes automatic leading zero removal for number inputs.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-  argTypes: {
-    size: {
-      control: 'select',
-      options: ['regular', 'large'],
-      description: 'Input size',
-    },
-    type: {
-      control: 'select',
-      options: ['text', 'number', 'email', 'password', 'url', 'tel'],
-      description: 'Input type',
-    },
-    placeholder: {
-      control: 'text',
-      description: 'Placeholder text',
-    },
-    disabled: {
-      control: 'boolean',
-      description: 'Disabled state',
-    },
-    destructive: {
-      control: 'boolean',
-      description: 'Error/destructive state',
-    },
-    showLeftIcon: {
-      control: 'boolean',
-      description: 'Show search icon on left',
-    },
-    showClearIcon: {
-      control: 'boolean',
-      description: 'Show clear button when input has value',
-    },
-    unit: {
-      control: 'text',
-      description: 'Unit text displayed on right (e.g., "px", "ms")',
-    },
-  },
-} satisfies Meta<typeof Input>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-// Interactive demo wrapper
-const InputDemo = (args: any) => {
-  const [value, setValue] = useState(args.value || '')
-
-  return (
-    <div style={{ width: '400px' }}>
-      <Input
-        {...args}
-        value={value}
-        onChange={(e) => {
-          setValue(e.target.value)
-          console.log('Input changed:', e.target.value)
-        }}
-        onClear={() => {
-          setValue('')
-          console.log('Input cleared')
-        }}
-      />
-    </div>
-  )
-}
-
-// Default state
-export const Default: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    placeholder: 'Enter text...',
-    type: 'text',
-  },
-}
-
-// Large size
-export const LargeSize: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'large',
-    placeholder: 'Enter text...',
-    type: 'text',
-  },
-}
-
-// With search icon
-export const WithSearchIcon: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    showLeftIcon: true,
-    placeholder: 'Search...',
-    type: 'text',
-  },
-}
-
-// With clear button
-export const WithClearButton: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    showClearIcon: true,
-    value: 'Some text to clear',
-    placeholder: 'Type something...',
-    type: 'text',
-  },
-}
-
-// Search input (icon + clear)
-export const SearchInput: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    showLeftIcon: true,
-    showClearIcon: true,
-    value: '',
-    placeholder: 'Search...',
-    type: 'text',
-  },
-}
-
-// Disabled state
-export const Disabled: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    value: 'Disabled input',
-    disabled: true,
-    type: 'text',
-  },
-}
-
-// Destructive/error state
-export const DestructiveState: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    value: 'invalid@email',
-    destructive: true,
-    placeholder: 'Enter email...',
-    type: 'email',
-  },
-}
-
-// Number input
-export const NumberInput: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    type: 'number',
-    placeholder: 'Enter a number...',
-    value: '0',
-  },
-}
-
-// With unit
-export const WithUnit: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    type: 'number',
-    value: '100',
-    unit: 'px',
-    placeholder: 'Enter value...',
-  },
-}
-
-// Email input
-export const EmailInput: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    type: 'email',
-    placeholder: 'Enter your email...',
-    showClearIcon: true,
-  },
-}
-
-// Password input
-export const PasswordInput: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    type: 'password',
-    placeholder: 'Enter password...',
-    value: 'secret123',
-  },
-}
-
-// Size comparison
-const SizeComparisonDemo = () => {
-  const [regularValue, setRegularValue] = useState('')
-  const [largeValue, setLargeValue] = useState('')
-
-  return (
-    <div className="flex flex-col gap-6" style={{ width: '400px' }}>
-      <div className="flex flex-col gap-2">
-        <label className="text-sm font-medium text-gray-700">Regular Size</label>
-        <Input
-          size="regular"
-          value={regularValue}
-          onChange={(e) => setRegularValue(e.target.value)}
-          placeholder="Regular input..."
-          showClearIcon
-          onClear={() => setRegularValue('')}
-        />
-      </div>
-      <div className="flex flex-col gap-2">
-        <label className="text-sm font-medium text-gray-700">Large Size</label>
-        <Input
-          size="large"
-          value={largeValue}
-          onChange={(e) => setLargeValue(e.target.value)}
-          placeholder="Large input..."
-          showClearIcon
-          onClear={() => setLargeValue('')}
-        />
-      </div>
-    </div>
-  )
-}
-
-export const SizeComparison: Story = {
-  render: () => <SizeComparisonDemo />,
-}
-
-// State comparison
-const StateComparisonDemo = () => {
-  const [normalValue, setNormalValue] = useState('Normal state')
-  const [errorValue, setErrorValue] = useState('Error state')
-
-  return (
-    <div className="flex flex-col gap-6" style={{ width: '400px' }}>
-      <div className="flex flex-col gap-2">
-        <label className="text-sm font-medium text-gray-700">Normal</label>
-        <Input
-          value={normalValue}
-          onChange={(e) => setNormalValue(e.target.value)}
-          showClearIcon
-          onClear={() => setNormalValue('')}
-        />
-      </div>
-      <div className="flex flex-col gap-2">
-        <label className="text-sm font-medium text-gray-700">Destructive</label>
-        <Input value={errorValue} onChange={(e) => setErrorValue(e.target.value)} destructive />
-      </div>
-      <div className="flex flex-col gap-2">
-        <label className="text-sm font-medium text-gray-700">Disabled</label>
-        <Input value="Disabled input" onChange={() => undefined} disabled />
-      </div>
-    </div>
-  )
-}
-
-export const StateComparison: Story = {
-  render: () => <StateComparisonDemo />,
-}
-
-// Form example
-const FormExampleDemo = () => {
-  const [formData, setFormData] = useState({
-    name: '',
-    email: '',
-    age: '',
-    website: '',
-  })
-  const [errors, setErrors] = useState({
-    email: false,
-    age: false,
-  })
-
-  const validateEmail = (email: string) => {
-    return /^[^\s@]+@[^\s@][^\s.@]*\.[^\s@]+$/.test(email)
-  }
-
-  return (
-    <div style={{ width: '500px' }} className="rounded-lg border border-gray-200 bg-white p-6">
-      <h3 className="mb-4 text-lg font-semibold">User Profile</h3>
-      <div className="flex flex-col gap-4">
-        <div className="flex flex-col gap-2">
-          <label className="text-sm font-medium text-gray-700">Name</label>
-          <Input
-            value={formData.name}
-            onChange={(e) => setFormData({ ...formData, name: e.target.value })}
-            placeholder="Enter your name..."
-            showClearIcon
-            onClear={() => setFormData({ ...formData, name: '' })}
-          />
-        </div>
-        <div className="flex flex-col gap-2">
-          <label className="text-sm font-medium text-gray-700">Email</label>
-          <Input
-            type="email"
-            value={formData.email}
-            onChange={(e) => {
-              setFormData({ ...formData, email: e.target.value })
-              setErrors({
-                ...errors,
-                email: e.target.value ? !validateEmail(e.target.value) : false,
-              })
-            }}
-            placeholder="Enter your email..."
-            destructive={errors.email}
-            showClearIcon
-            onClear={() => {
-              setFormData({ ...formData, email: '' })
-              setErrors({ ...errors, email: false })
-            }}
-          />
-          {errors.email && (
-            <span className="text-xs text-red-600">Please enter a valid email address</span>
-          )}
-        </div>
-        <div className="flex flex-col gap-2">
-          <label className="text-sm font-medium text-gray-700">Age</label>
-          <Input
-            type="number"
-            value={formData.age}
-            onChange={(e) => {
-              setFormData({ ...formData, age: e.target.value })
-              setErrors({ ...errors, age: e.target.value ? Number(e.target.value) < 18 : false })
-            }}
-            placeholder="Enter your age..."
-            destructive={errors.age}
-            unit="years"
-          />
-          {errors.age && <span className="text-xs text-red-600">Must be 18 or older</span>}
-        </div>
-        <div className="flex flex-col gap-2">
-          <label className="text-sm font-medium text-gray-700">Website</label>
-          <Input
-            type="url"
-            value={formData.website}
-            onChange={(e) => setFormData({ ...formData, website: e.target.value })}
-            placeholder="https://example.com"
-            showClearIcon
-            onClear={() => setFormData({ ...formData, website: '' })}
-          />
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export const FormExample: Story = {
-  render: () => <FormExampleDemo />,
-}
-
-// Search example
-const SearchExampleDemo = () => {
-  const [searchQuery, setSearchQuery] = useState('')
-  const items = ['Apple', 'Banana', 'Cherry', 'Date', 'Elderberry', 'Fig', 'Grape']
-  const filteredItems = items.filter((item) =>
-    item.toLowerCase().includes(searchQuery.toLowerCase()),
-  )
-
-  return (
-    <div style={{ width: '400px' }} className="flex flex-col gap-4">
-      <Input
-        size="large"
-        showLeftIcon
-        showClearIcon
-        value={searchQuery}
-        onChange={(e) => setSearchQuery(e.target.value)}
-        onClear={() => setSearchQuery('')}
-        placeholder="Search fruits..."
-      />
-      {searchQuery && (
-        <div className="rounded-lg bg-gray-50 p-4">
-          <div className="mb-2 text-xs text-gray-500">
-            {filteredItems.length} result
-            {filteredItems.length !== 1 ? 's' : ''}
-          </div>
-          <div className="flex flex-col gap-1">
-            {filteredItems.map((item) => (
-              <div key={item} className="text-sm text-gray-700">
-                {item}
-              </div>
-            ))}
-          </div>
-        </div>
-      )}
-    </div>
-  )
-}
-
-export const SearchExample: Story = {
-  render: () => <SearchExampleDemo />,
-}
-
-// Interactive playground
-export const Playground: Story = {
-  render: (args) => <InputDemo {...args} />,
-  args: {
-    size: 'regular',
-    type: 'text',
-    placeholder: 'Type something...',
-    disabled: false,
-    destructive: false,
-    showLeftIcon: false,
-    showClearIcon: true,
-    unit: '',
-  },
-}
diff --git a/web/app/components/base/input/index.tsx b/web/app/components/base/input/index.tsx
deleted file mode 100644
index 2db9fdee345..00000000000
--- a/web/app/components/base/input/index.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import type { VariantProps } from 'class-variance-authority'
-import type { ChangeEventHandler, CSSProperties, FocusEventHandler } from 'react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { cva } from 'class-variance-authority'
-import { noop } from 'es-toolkit/function'
-import * as React from 'react'
-import { useTranslation } from 'react-i18next'
-import { CopyFeedback } from '../copy-feedback'
-
-const inputVariants = cva('', {
-  variants: {
-    size: {
-      regular: 'rounded-lg px-3 system-sm-regular',
-      large: 'rounded-[10px] px-4 system-md-regular',
-    },
-  },
-  defaultVariants: {
-    size: 'regular',
-  },
-})
-
-/**
- * @deprecated Use `@langgenius/dify-ui/input` for primitive inputs and
- * `@langgenius/dify-ui/field` for form composition. Search inputs should use
- * a dedicated composition built on the primitive input.
- */
-export type InputProps = {
-  showLeftIcon?: boolean
-  showClearIcon?: boolean
-  showCopyIcon?: boolean
-  onClear?: () => void
-  disabled?: boolean
-  destructive?: boolean
-  wrapperClassName?: string
-  styleCss?: CSSProperties
-  unit?: string
-} & Omit<React.InputHTMLAttributes<HTMLInputElement>, 'size'> &
-  VariantProps<typeof inputVariants>
-
-const removeLeadingZeros = (value: string) => value.replace(/^(-?)0+(?=\d)/, '$1')
-
-/**
- * @deprecated Use `@langgenius/dify-ui/input` for primitive inputs and
- * `@langgenius/dify-ui/field` for form composition. Search inputs should use
- * a dedicated composition built on the primitive input.
- */
-const Input = React.forwardRef<HTMLInputElement, InputProps>(
-  (
-    {
-      size,
-      disabled,
-      destructive,
-      showLeftIcon,
-      showClearIcon,
-      showCopyIcon,
-      onClear,
-      wrapperClassName,
-      className,
-      styleCss,
-      value,
-      placeholder,
-      onChange = noop,
-      onBlur = noop,
-      unit,
-      ...props
-    },
-    ref,
-  ) => {
-    const { t } = useTranslation()
-    const handleNumberChange: ChangeEventHandler<HTMLInputElement> = (e) => {
-      if (value === 0) {
-        // remove leading zeros
-        const formattedValue = removeLeadingZeros(e.target.value)
-        if (e.target.value !== formattedValue) e.target.value = formattedValue
-      }
-      onChange(e)
-    }
-    const handleNumberBlur: FocusEventHandler<HTMLInputElement> = (e) => {
-      // remove leading zeros
-      const formattedValue = removeLeadingZeros(e.target.value)
-      if (e.target.value !== formattedValue) {
-        e.target.value = formattedValue
-        onChange({
-          ...e,
-          type: 'change',
-          target: {
-            ...e.target,
-            value: formattedValue,
-          },
-        })
-      }
-      onBlur(e)
-    }
-    return (
-      <div className={cn('relative w-full', wrapperClassName)}>
-        {showLeftIcon && (
-          <span
-            className={cn(
-              'absolute top-1/2 left-2 i-ri-search-line size-4 -translate-y-1/2 text-components-input-text-placeholder',
-            )}
-          />
-        )}
-        <input
-          ref={ref}
-          style={styleCss}
-          className={cn(
-            'w-full appearance-none border border-transparent bg-components-input-bg-normal py-1.75 text-components-input-text-filled caret-primary-600 outline-hidden placeholder:text-components-input-text-placeholder hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active focus:bg-components-input-bg-active focus:shadow-xs',
-            inputVariants({ size }),
-            showLeftIcon && 'pl-6.5',
-            showLeftIcon && size === 'large' && 'pl-7',
-            showClearIcon && value && 'pr-6.5',
-            showClearIcon && value && size === 'large' && 'pr-7',
-            (destructive || showCopyIcon) && 'pr-6.5',
-            (destructive || showCopyIcon) && size === 'large' && 'pr-7',
-            disabled &&
-              'cursor-not-allowed border-transparent bg-components-input-bg-disabled text-components-input-text-filled-disabled hover:border-transparent hover:bg-components-input-bg-disabled',
-            destructive &&
-              'border-components-input-border-destructive bg-components-input-bg-destructive text-components-input-text-filled hover:border-components-input-border-destructive hover:bg-components-input-bg-destructive focus:border-components-input-border-destructive focus:bg-components-input-bg-destructive',
-            className,
-          )}
-          placeholder={
-            placeholder ??
-            (showLeftIcon
-              ? t(($) => $['operation.search'], { ns: 'common' }) || ''
-              : t(($) => $['placeholder.input'], { ns: 'common' }) || '')
-          }
-          value={value}
-          onChange={props.type === 'number' ? handleNumberChange : onChange}
-          onBlur={props.type === 'number' ? handleNumberBlur : onBlur}
-          disabled={disabled}
-          {...props}
-        />
-        {!!(showClearIcon && value && !disabled && !destructive) && (
-          <button
-            type="button"
-            aria-label={t(($) => $['operation.clear'], { ns: 'common' })}
-            className={cn(
-              'group absolute top-1/2 right-2 -translate-y-1/2 cursor-pointer border-none bg-transparent p-px',
-            )}
-            onClick={onClear}
-          >
-            <span
-              className="i-ri-close-circle-fill size-3.5 cursor-pointer text-text-quaternary group-hover:text-text-tertiary"
-              aria-hidden="true"
-            />
-          </button>
-        )}
-        {destructive && (
-          <span className="absolute top-1/2 right-2 i-ri-error-warning-line size-4 -translate-y-1/2 text-text-destructive-secondary" />
-        )}
-        {showCopyIcon && (
-          <div className={cn('group absolute top-1/2 right-0 -translate-y-1/2 cursor-pointer')}>
-            <CopyFeedback content={String(value ?? '')} className="size-7! hover:bg-transparent" />
-          </div>
-        )}
-        {unit && (
-          <div className="absolute top-1/2 right-2 -translate-y-1/2 system-sm-regular text-text-tertiary">
-            {unit}
-          </div>
-        )}
-      </div>
-    )
-  },
-)
-
-Input.displayName = 'Input'
-
-export default Input
diff --git a/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx b/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
index 103f5d4d942..9eeecf99ae2 100644
--- a/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
+++ b/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import dayjs from '@/app/components/base/date-and-time-picker/utils/dayjs'
 import MarkdownForm from '../form'
@@ -369,27 +369,23 @@ describe('MarkdownForm', () => {
     })
   })
 
-  // Native submit event is intentionally blocked at form level.
   describe('Form submit behavior', () => {
-    it('should prevent native submit propagation from form onSubmit', () => {
+    it('should submit with Enter without submitting the surrounding chat', async () => {
+      const user = userEvent.setup()
       const parentOnSubmit = vi.fn()
       const node = createRootNode([
         createElementNode('input', { type: 'text', name: 'name', value: 'Alice' }),
         createElementNode('button', {}, [createTextNode('Submit')]),
       ])
-      const { container } = render(
+      render(
         <div onSubmit={parentOnSubmit}>
           <MarkdownForm node={node} />
         </div>,
       )
 
-      const form = container.querySelector('form')
-      expect(form).not.toBeNull()
-      if (!form) throw new Error('Form element not found')
-
-      fireEvent.submit(form)
+      await user.type(screen.getByRole('textbox', { name: 'name' }), '{Enter}')
       expect(parentOnSubmit).not.toHaveBeenCalled()
-      expect(mockOnSend).not.toHaveBeenCalled()
+      expect(mockOnSend).toHaveBeenCalledExactlyOnceWith('name: Alice')
     })
   })
 
@@ -820,7 +816,6 @@ describe('MarkdownForm', () => {
     })
   })
 
-  // Standard input types (password, email, number) use the generic Input branch.
   describe('Standard input types', () => {
     it('should render password input with masked value', () => {
       const node = createRootNode([
@@ -843,14 +838,22 @@ describe('MarkdownForm', () => {
       expect(screen.getByPlaceholderText('Email'))!.toHaveAttribute('type', 'email')
     })
 
-    it('should render number input', () => {
+    it('should submit an edited decimal without changing the string output contract', async () => {
+      const user = userEvent.setup()
       const node = createRootNode([
-        createElementNode('input', { type: 'number', name: 'age', placeholder: 'Age' }),
+        createElementNode('label', { for: 'amount' }, [createTextNode('Amount')]),
+        createElementNode('input', { type: 'number', name: 'amount', value: '0' }),
+        createElementNode('button', {}, [createTextNode('Submit')]),
       ])
 
       render(<MarkdownForm node={node} />)
 
-      expect(screen.getByPlaceholderText('Age'))!.toHaveAttribute('type', 'number')
+      const input = screen.getByRole('textbox', { name: 'Amount' })
+      expect(input).toHaveValue('0')
+      await user.clear(input)
+      await user.type(input, '3.5')
+      await user.click(screen.getByRole('button', { name: 'Submit' }))
+      expect(mockOnSend).toHaveBeenCalledExactlyOnceWith('amount: 3.5')
     })
 
     it('should submit typed value from password input', async () => {
diff --git a/web/app/components/base/markdown-blocks/form.tsx b/web/app/components/base/markdown-blocks/form.tsx
index eab848e9203..079d6b19186 100644
--- a/web/app/components/base/markdown-blocks/form.tsx
+++ b/web/app/components/base/markdown-blocks/form.tsx
@@ -1,6 +1,8 @@
 import type { Dayjs } from 'dayjs'
 import { Button } from '@langgenius/dify-ui/button'
 import { Checkbox } from '@langgenius/dify-ui/checkbox'
+import { Input } from '@langgenius/dify-ui/input'
+import { NumberField, NumberFieldGroup, NumberFieldInput } from '@langgenius/dify-ui/number-field'
 import {
   Select,
   SelectContent,
@@ -12,7 +14,7 @@ import {
 } from '@langgenius/dify-ui/select'
 import { Textarea } from '@langgenius/dify-ui/textarea'
 import * as React from 'react'
-import { useCallback, useMemo, useState } from 'react'
+import { useCallback, useId, useMemo, useState } from 'react'
 import { useChatContext } from '@/app/components/base/chat/chat/context'
 import DatePicker from '@/app/components/base/date-and-time-picker/date-picker'
 import TimePicker from '@/app/components/base/date-and-time-picker/time-picker'
@@ -20,7 +22,6 @@ import {
   formatDateForOutput,
   toDayjs,
 } from '@/app/components/base/date-and-time-picker/utils/dayjs'
-import Input from '@/app/components/base/input'
 import { MARKDOWN_FORM_FIELD_NAME_EXTRA_CHARS, MARKDOWN_FORM_FIELD_NAME_MAX_LENGTH } from '@/config'
 import { getMarkdownButtonAppearance } from './button-appearance'
 
@@ -96,7 +97,7 @@ type HastElement = {
   children: Array<HastElement | HastText>
 }
 
-type FormValue = string | boolean | Dayjs | undefined
+type FormValue = string | number | boolean | Dayjs | undefined
 type FormValues = Record<string, FormValue>
 type EditState = {
   source: HastElement[]
@@ -161,6 +162,7 @@ function getElementKey(child: HastElement, index: number): string {
 }
 
 const MarkdownForm = ({ node }: { node: HastElement }) => {
+  const formId = useId()
   const typedNode = node
   const { onSend } = useChatContext()
   const [isSubmitting, setIsSubmitting] = useState(false)
@@ -223,8 +225,9 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
   }, [elementChildren, formValues])
 
   const onSubmit = useCallback(
-    (e: React.MouseEvent) => {
+    (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault()
+      e.stopPropagation()
       if (isSubmitting) return
       setIsSubmitting(true)
       try {
@@ -246,21 +249,14 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
   )
 
   return (
-    <form
-      autoComplete="off"
-      className="flex flex-col self-stretch"
-      onSubmit={(e) => {
-        e.preventDefault()
-        e.stopPropagation()
-      }}
-    >
+    <form autoComplete="off" className="flex flex-col self-stretch" onSubmit={onSubmit}>
       {elementChildren.map((child, index) => {
         const key = getElementKey(child, index)
         if (child.tagName === SUPPORTED_TAGS.LABEL) {
           return (
             <label
               key={key}
-              htmlFor={getLabelTarget(child)}
+              htmlFor={`${formId}-${getLabelTarget(child)}`}
               className="my-2 system-md-semibold text-text-secondary"
             >
               {getTextContent(child)}
@@ -276,6 +272,12 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
           if (!isSafeName(name)) return null
 
           const type = str(child.properties.type) as SupportedType
+          const controlId = `${formId}-${str(child.properties.id) || name}`
+          const hasExternalLabel = elementChildren.some(
+            (node) =>
+              node.tagName === SUPPORTED_TAGS.LABEL &&
+              getLabelTarget(node) === (str(child.properties.id) || name),
+          )
 
           if (type === SUPPORTED_TYPES.DATE || type === SUPPORTED_TYPES.DATETIME) {
             return (
@@ -300,14 +302,11 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
           }
           if (type === SUPPORTED_TYPES.CHECKBOX) {
             const label = str(child.properties.dataTip || child.properties['data-tip'])
-            const hasExternalLabel = elementChildren.some(
-              (node) => node.tagName === SUPPORTED_TAGS.LABEL && getLabelTarget(node) === name,
-            )
             const checkboxAriaLabel = label || (hasExternalLabel ? undefined : name)
             return (
               <div className="mt-2 flex h-6 items-center space-x-2" key={key}>
                 <Checkbox
-                  id={name}
+                  id={controlId}
                   checked={!!formValues[name]}
                   aria-label={checkboxAriaLabel}
                   onCheckedChange={(checked) => updateValue(name, checked)}
@@ -340,7 +339,7 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
                   if (val != null) updateValue(name, val)
                 }}
               >
-                <SelectTrigger className="w-full">
+                <SelectTrigger id={controlId} aria-label={hasExternalLabel ? undefined : name}>
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>
@@ -366,14 +365,37 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
             )
           }
 
+          if (type === SUPPORTED_TYPES.NUMBER) {
+            const value = formValues[name]
+            return (
+              <NumberField
+                key={key}
+                name={name}
+                step="any"
+                value={value == null || value === '' ? null : Number(value)}
+                onValueChange={(value) => updateValue(name, value ?? '')}
+              >
+                <NumberFieldGroup>
+                  <NumberFieldInput
+                    id={controlId}
+                    aria-label={hasExternalLabel ? undefined : name}
+                    placeholder={str(child.properties.placeholder)}
+                  />
+                </NumberFieldGroup>
+              </NumberField>
+            )
+          }
+
           return (
             <Input
               key={key}
+              id={controlId}
+              aria-label={hasExternalLabel ? undefined : name}
               type={type}
               name={name}
               placeholder={str(child.properties.placeholder)}
               value={str(formValues[name])}
-              onChange={(e) => updateValue(name, e.target.value)}
+              onValueChange={(value) => updateValue(name, value)}
             />
           )
         }
@@ -381,9 +403,16 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
         if (child.tagName === SUPPORTED_TAGS.TEXTAREA) {
           const name = str(child.properties.name)
           if (!isSafeName(name)) return null
+          const controlId = `${formId}-${str(child.properties.id) || name}`
+          const hasExternalLabel = elementChildren.some(
+            (node) =>
+              node.tagName === SUPPORTED_TAGS.LABEL &&
+              getLabelTarget(node) === (str(child.properties.id) || name),
+          )
           return (
             <Textarea
-              aria-label={name}
+              id={controlId}
+              aria-label={hasExternalLabel ? undefined : name}
               key={key}
               name={name}
               placeholder={str(child.properties.placeholder)}
@@ -405,7 +434,7 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
               {...appearance}
               className="mt-4"
               disabled={isSubmitting}
-              onClick={onSubmit}
+              type="submit"
             >
               <span className="text-[13px]">{getTextContent(child)}</span>
             </Button>
diff --git a/web/app/components/datasets/create/step-two/components/__tests__/inputs.spec.tsx b/web/app/components/datasets/create/step-two/components/__tests__/inputs.spec.tsx
index de21bafd052..91b54eeba2c 100644
--- a/web/app/components/datasets/create/step-two/components/__tests__/inputs.spec.tsx
+++ b/web/app/components/datasets/create/step-two/components/__tests__/inputs.spec.tsx
@@ -1,173 +1,43 @@
 import { fireEvent, render, screen } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test'
+import userEvent from '@testing-library/user-event'
 import { DelimiterInput, MaxLengthInput, OverlapInput } from '../inputs'
 
-// i18n mock returns namespaced keys like "datasetCreation.stepTwo.separator"
-const ns = 'datasetCreation'
-
 describe('DelimiterInput', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('should associate the separator label with its input', () => {
-    render(<DelimiterInput />)
-    expect(screen.getByRole('textbox', { name: `${ns}.stepTwo.separator` })).toBeInTheDocument()
-  })
-
-  it('should render text input with placeholder', () => {
-    render(<DelimiterInput />)
-    const input = screen.getByPlaceholderText(`${ns}.stepTwo.separatorPlaceholder`)
-    expect(input)!.toBeInTheDocument()
-    expect(input)!.toHaveAttribute('type', 'text')
-  })
-
-  it('should pass through value and onChange props', () => {
-    const onChange = vi.fn()
-    render(<DelimiterInput value="test-val" onChange={onChange} />)
-    expect(screen.getByDisplayValue('test-val'))!.toBeInTheDocument()
-  })
-
-  it('should render tooltip content', () => {
-    render(<DelimiterInput />)
-    expect(screen.getByLabelText(`${ns}.stepTwo.separatorTip`))!.toBeInTheDocument()
-  })
-
-  it('should suppress onChange during IME composition', () => {
-    const onChange = vi.fn()
-    const finalValue = 'wu'
-    render(<DelimiterInput value="" onChange={onChange} />)
-    const input = screen.getByPlaceholderText(`${ns}.stepTwo.separatorPlaceholder`)
+  it('commits the delimiter only after IME composition ends', () => {
+    const onValueChange = vi.fn()
+    render(<DelimiterInput value="" onValueChange={onValueChange} />)
+    const input = screen.getByRole('textbox', { name: 'datasetCreation.stepTwo.separator' })
 
     fireEvent.compositionStart(input)
     fireEvent.change(input, { target: { value: 'w' } })
-    fireEvent.change(input, { target: { value: finalValue } })
-    expect(onChange).not.toHaveBeenCalled()
+    fireEvent.change(input, { target: { value: '文' } })
+    expect(onValueChange).not.toHaveBeenCalled()
 
     fireEvent.compositionEnd(input)
-    expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0]![0].target.value).toBe(finalValue)
+    expect(onValueChange).toHaveBeenCalledExactlyOnceWith('文')
   })
 })
 
-describe('MaxLengthInput', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('should render max length label', () => {
-    render(<MaxLengthInput onChange={vi.fn()} />)
-    expect(screen.getByText(`${ns}.stepTwo.maxLength`))!.toBeInTheDocument()
-  })
-
-  it('should render number input', () => {
-    render(<MaxLengthInput onChange={vi.fn()} />)
-    const input = screen.getByRole('textbox')
-    expect(input)!.toBeInTheDocument()
-  })
-
-  it('should accept value prop', () => {
-    render(<MaxLengthInput value={500} onChange={vi.fn()} />)
-    expect(screen.getByRole('textbox'))!.toHaveValue('500')
-  })
-
-  it('should have min of 1', () => {
-    render(<MaxLengthInput onChange={vi.fn()} />)
-    const input = screen.getByRole('textbox')
-    expect(input)!.toBeInTheDocument()
-  })
-
-  it('should reset to the minimum when users clear the value', () => {
+describe.each([
+  { Component: MaxLengthInput, label: 'datasetCreation.stepTwo.maxLength' },
+  { Component: OverlapInput, label: 'datasetCreation.stepTwo.overlap' },
+])('$label', ({ Component, label }) => {
+  it('resets to the minimum when users clear the value', async () => {
+    const user = userEvent.setup()
     const onChange = vi.fn()
-    render(<MaxLengthInput value={500} onChange={onChange} />)
-    fireEvent.change(screen.getByRole('textbox'), { target: { value: '' } })
-    expect(onChange).toHaveBeenCalledWith(1)
+    render(<Component value={50} onChange={onChange} />)
+
+    await user.clear(screen.getByRole('textbox', { name: label }))
+    expect(onChange).toHaveBeenLastCalledWith(1)
   })
 
-  it('should clamp out-of-range text edits before updating state', () => {
+  it('clamps out-of-range edits before updating chunk settings', async () => {
+    const user = userEvent.setup()
     const onChange = vi.fn()
-    render(<MaxLengthInput value={500} max={1000} onChange={onChange} />)
+    render(<Component value={50} max={100} onChange={onChange} />)
 
-    fireEvent.change(screen.getByRole('textbox'), { target: { value: '1200' } })
-    expect(onChange).toHaveBeenLastCalledWith(1000)
-  })
-})
-
-describe('OverlapInput', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('should render overlap label', () => {
-    render(<OverlapInput onChange={vi.fn()} />)
-    expect(screen.getAllByText(new RegExp(`${ns}.stepTwo.overlap`)).length).toBeGreaterThan(0)
-    expect(screen.getByLabelText(`${ns}.stepTwo.overlapTip`))!.toBeInTheDocument()
-  })
-
-  it('should render number input', () => {
-    render(<OverlapInput onChange={vi.fn()} />)
-    const input = screen.getByRole('textbox')
-    expect(input)!.toBeInTheDocument()
-  })
-
-  it('should accept value prop', () => {
-    render(<OverlapInput value={50} onChange={vi.fn()} />)
-    expect(screen.getByRole('textbox'))!.toHaveValue('50')
-  })
-
-  it('should have min of 1', () => {
-    render(<OverlapInput onChange={vi.fn()} />)
-    const input = screen.getByRole('textbox')
-    expect(input)!.toBeInTheDocument()
-  })
-
-  it('should reset to the minimum when users clear the value', () => {
-    const onChange = vi.fn()
-    render(<OverlapInput value={50} onChange={onChange} />)
-    fireEvent.change(screen.getByRole('textbox'), { target: { value: '' } })
-    expect(onChange).toHaveBeenCalledWith(1)
-  })
-
-  it('should clamp out-of-range text edits before updating state', () => {
-    const onChange = vi.fn()
-    render(<OverlapInput value={50} max={100} onChange={onChange} />)
-
-    fireEvent.change(screen.getByRole('textbox'), { target: { value: '150' } })
+    await user.tripleClick(screen.getByRole('textbox', { name: label }))
+    await user.paste('150')
     expect(onChange).toHaveBeenLastCalledWith(100)
   })
 })
-
-// Regression: dify issue 39592 — in a narrow card the number inputs collapsed
-// to a 32px, unusable sliver. The fix reflows on the container (a
-// @container/chunkfields ancestor, see general-chunking-options): below 552px
-// each field stacks and is capped at max-w-[288px] so the input reads as a form
-// field; at/above 552px it restores flex-1 (three across, pixel-identical to
-// stock). The input keeps a min-width floor as the belt against re-collapse.
-// jsdom has no layout engine, so we cannot assert pixel widths — we assert the
-// structural classes. These fail before this change and pass after.
-describe('#39592 narrow-container regression (structural)', () => {
-  it('gives the MaxLength input a min-width floor so it can never collapse to a sliver', () => {
-    render(<MaxLengthInput onChange={vi.fn()} />)
-    const input = screen.getByRole('textbox')
-    expect(input.className).toContain('min-w-16')
-  })
-
-  it('gives the OverlapInput input a min-width floor too', () => {
-    render(<OverlapInput onChange={vi.fn()} />)
-    const input = screen.getByRole('textbox')
-    expect(input.className).toContain('min-w-16')
-  })
-
-  it('caps each field width when stacked and restores flex-1 across the 552px container query', () => {
-    render(<MaxLengthInput onChange={vi.fn()} />)
-    const field = screen.getByRole('textbox').closest('.space-y-2')
-    expect(field).not.toBeNull()
-    // stacked (default / below threshold): constrained width, no stretch
-    expect(field!.className).toContain('max-w-[288px]')
-    // three-across (at/above threshold): restore flex-1 and drop the cap
-    expect(field!.className).toContain('@min-[552px]/chunkfields:flex-1')
-    expect(field!.className).toContain('@min-[552px]/chunkfields:max-w-none')
-    // the previous flex-wrap approach is gone
-    expect(field!.className).not.toContain('basis-[176px]')
-  })
-})
diff --git a/web/app/components/datasets/create/step-two/components/general-chunking-options.tsx b/web/app/components/datasets/create/step-two/components/general-chunking-options.tsx
index e8f53abb61f..0a2a44a96ee 100644
--- a/web/app/components/datasets/create/step-two/components/general-chunking-options.tsx
+++ b/web/app/components/datasets/create/step-two/components/general-chunking-options.tsx
@@ -131,10 +131,7 @@ export const GeneralChunkingOptions: FC<GeneralChunkingOptionsProps> = ({
         {/* Container query, not a viewport breakpoint: three across at/above a
             552px container, stacked one-per-row below (see inputs.tsx FormField). */}
         <div className="flex flex-col gap-3 @min-[552px]/chunkfields:flex-row">
-          <DelimiterInput
-            value={segmentIdentifier}
-            onChange={(e) => onSegmentIdentifierChange(e.target.value)}
-          />
+          <DelimiterInput value={segmentIdentifier} onValueChange={onSegmentIdentifierChange} />
           <MaxLengthInput
             unit="characters"
             value={maxChunkLength}
diff --git a/web/app/components/datasets/create/step-two/components/inputs.tsx b/web/app/components/datasets/create/step-two/components/inputs.tsx
index dc092db1954..2f6cfc3595b 100644
--- a/web/app/components/datasets/create/step-two/components/inputs.tsx
+++ b/web/app/components/datasets/create/step-two/components/inputs.tsx
@@ -1,11 +1,12 @@
+import type { InputProps } from '@langgenius/dify-ui/input'
 import type {
   NumberFieldInputProps,
   NumberFieldProps,
   NumberFieldSize,
 } from '@langgenius/dify-ui/number-field'
 import type { FC, PropsWithChildren, ReactNode } from 'react'
-import type { InputProps } from '@/app/components/base/input'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Input } from '@langgenius/dify-ui/input'
 import {
   NumberField,
   NumberFieldControls,
@@ -18,7 +19,6 @@ import {
 import { useId, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Infotip } from '@/app/components/base/infotip'
-import Input from '@/app/components/base/input'
 import { env } from '@/env'
 
 const FormField: FC<PropsWithChildren<{ label: ReactNode }>> = (props) => {
@@ -35,12 +35,12 @@ const FormField: FC<PropsWithChildren<{ label: ReactNode }>> = (props) => {
   )
 }
 
-export const DelimiterInput: FC<InputProps & { tooltip?: string }> = ({
-  tooltip,
-  onChange,
-  value,
-  ...rest
-}) => {
+export const DelimiterInput: FC<
+  Omit<InputProps, 'onChange' | 'onValueChange'> & {
+    tooltip?: string
+    onValueChange?: (value: string) => void
+  }
+> = ({ tooltip, onValueChange, value, ...rest }) => {
   const { t } = useTranslation()
   const generatedInputId = useId()
   const inputId = rest.id ?? generatedInputId
@@ -69,9 +69,9 @@ export const DelimiterInput: FC<InputProps & { tooltip?: string }> = ({
         className="h-9"
         placeholder={t(($) => $['stepTwo.separatorPlaceholder'], { ns: 'datasetCreation' })!}
         value={isComposing.current ? compositionValue : value}
-        onChange={(e) => {
-          if (isComposing.current) setCompositionValue(e.target.value)
-          else onChange?.(e)
+        onValueChange={(value) => {
+          if (isComposing.current) setCompositionValue(value)
+          else onValueChange?.(value)
         }}
         onCompositionStart={() => {
           isComposing.current = true
@@ -81,10 +81,7 @@ export const DelimiterInput: FC<InputProps & { tooltip?: string }> = ({
           const committed = e.currentTarget.value
           isComposing.current = false
           setCompositionValue('')
-          onChange?.({
-            ...e,
-            target: { ...e.target, value: committed },
-          } as unknown as React.ChangeEvent<HTMLInputElement>)
+          onValueChange?.(committed)
         }}
         {...rest}
       />
diff --git a/web/app/components/datasets/create/step-two/components/parent-child-options.tsx b/web/app/components/datasets/create/step-two/components/parent-child-options.tsx
index 1448e430394..8709e91708c 100644
--- a/web/app/components/datasets/create/step-two/components/parent-child-options.tsx
+++ b/web/app/components/datasets/create/step-two/components/parent-child-options.tsx
@@ -146,7 +146,7 @@ export const ParentChildOptions: FC<ParentChildOptionsProps> = ({
                     tooltip={t(($) => $['stepTwo.parentChildDelimiterTip'], {
                       ns: 'datasetCreation',
                     })!}
-                    onChange={(e) => onParentDelimiterChange(e.target.value)}
+                    onValueChange={onParentDelimiterChange}
                   />
                   <MaxLengthInput
                     unit="characters"
@@ -181,7 +181,7 @@ export const ParentChildOptions: FC<ParentChildOptionsProps> = ({
               tooltip={t(($) => $['stepTwo.parentChildChunkDelimiterTip'], {
                 ns: 'datasetCreation',
               })!}
-              onChange={(e) => onChildDelimiterChange(e.target.value)}
+              onValueChange={onChildDelimiterChange}
             />
             <MaxLengthInput
               unit="characters"
diff --git a/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx b/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx
index c8a3e84298d..979afbb3e8e 100644
--- a/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx
@@ -7,11 +7,12 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@langgenius/dify-ui/dropdown-menu'
+import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Input from '@/app/components/base/input'
 import { importSchemaFromURL } from '@/service/tools'
 import examples from './examples'
 
@@ -25,6 +26,7 @@ const GetSchema: FC<Props> = ({ onChange }) => {
   const [importUrl, setImportUrl] = useState('')
   const [isParsing, setIsParsing] = useState(false)
   const handleImportFromUrl = async () => {
+    if (isParsing) return
     if (!importUrl.startsWith('http://') && !importUrl.startsWith('https://')) {
       toast.error(t(($) => $['createTool.urlError'], { ns: 'tools' }))
       return
@@ -44,35 +46,50 @@ const GetSchema: FC<Props> = ({ onChange }) => {
 
   return (
     <div className="flex w-56 justify-end gap-1">
-      <DropdownMenu open={showImportFromUrl} onOpenChange={setShowImportFromUrl}>
-        <DropdownMenuTrigger render={<Button size="small" />}>
+      <Popover open={showImportFromUrl} onOpenChange={setShowImportFromUrl}>
+        <PopoverTrigger render={<Button size="small" />}>
           <span className="i-ri-add-line size-3" aria-hidden />
           <span className="system-xs-medium text-text-secondary">
             {t(($) => $['createTool.importFromUrl'], { ns: 'tools' })}
           </span>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent placement="bottom-start" sideOffset={2} className="w-75 p-2">
-          <div className="relative">
-            <Input
-              type="text"
-              className="w-full"
-              placeholder={t(($) => $['createTool.importFromUrlPlaceHolder'], { ns: 'tools' })!}
-              value={importUrl}
-              onChange={(e) => setImportUrl(e.target.value)}
-            />
-            <Button
-              className="absolute top-1 right-1"
-              size="small"
-              variant="primary"
-              disabled={!importUrl}
-              onClick={handleImportFromUrl}
-              loading={isParsing}
-            >
-              {t(($) => $['operation.ok'], { ns: 'common' })}
-            </Button>
-          </div>
-        </DropdownMenuContent>
-      </DropdownMenu>
+        </PopoverTrigger>
+        <PopoverContent
+          placement="bottom-start"
+          sideOffset={2}
+          className="w-75 p-2"
+          aria-label={t(($) => $['createTool.importFromUrl'], { ns: 'tools' })}
+        >
+          <form
+            onSubmit={(event) => {
+              event.preventDefault()
+              void handleImportFromUrl()
+            }}
+          >
+            <InputGroup>
+              <InputGroupInput
+                type="text"
+                name="schemaUrl"
+                inputMode="url"
+                aria-label={t(($) => $['createTool.importFromUrl'], { ns: 'tools' })}
+                placeholder={t(($) => $['createTool.importFromUrlPlaceHolder'], { ns: 'tools' })!}
+                value={importUrl}
+                onValueChange={(value) => setImportUrl(value)}
+              />
+              <InputGroupAddon align="inline-end" className="pe-1">
+                <Button
+                  type="submit"
+                  size="small"
+                  variant="primary"
+                  disabled={!importUrl}
+                  loading={isParsing}
+                >
+                  {t(($) => $['operation.ok'], { ns: 'common' })}
+                </Button>
+              </InputGroupAddon>
+            </InputGroup>
+          </form>
+        </PopoverContent>
+      </Popover>
       <DropdownMenu open={showExamples} onOpenChange={setShowExamples}>
         <DropdownMenuTrigger render={<Button size="small" />}>
           <span className="system-xs-medium text-text-secondary">
diff --git a/web/app/components/tools/edit-custom-collection-modal/test-api.tsx b/web/app/components/tools/edit-custom-collection-modal/test-api.tsx
index f5a20945aea..bcf0f5148ca 100644
--- a/web/app/components/tools/edit-custom-collection-modal/test-api.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/test-api.tsx
@@ -17,11 +17,11 @@ import {
   DrawerTitle,
   DrawerViewport,
 } from '@langgenius/dify-ui/drawer'
+import { Input } from '@langgenius/dify-ui/input'
 import { RiSettings2Line } from '@remixicon/react'
 import * as React from 'react'
-import { useState } from 'react'
+import { useId, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Input from '@/app/components/base/input'
 import { AuthType } from '@/app/components/tools/types'
 import { useLocale } from '@/context/i18n'
 import { getLanguage } from '@/i18n-config/language'
@@ -37,6 +37,7 @@ type Props = Readonly<{
 
 const TestApi: FC<Props> = ({ positionCenter, customCollection, tool, onHide }) => {
   const { t } = useTranslation()
+  const parameterId = useId()
   const locale = useLocale()
   const language = getLanguage(locale)
   const [credentialsModalShow, setCredentialsModalShow] = useState(false)
@@ -104,23 +105,30 @@ const TestApi: FC<Props> = ({ positionCenter, customCollection, tool, onHide })
                     />
                   </div>
                 </div>
-                <div className="min-h-0 flex-1 overflow-y-auto px-6 pt-2">
+                <form
+                  className="min-h-0 flex-1 overflow-y-auto px-6 pt-2"
+                  onSubmit={(event) => {
+                    event.preventDefault()
+                    void handleTest()
+                  }}
+                >
                   <div className="space-y-4">
                     <div>
                       <div className="py-2 system-sm-medium text-text-primary">
                         {t(($) => $['createTool.authMethod.title'], { ns: 'tools' })}
                       </div>
-                      <div
-                        className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2.5"
+                      <button
+                        type="button"
+                        className="flex h-9 w-full cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2.5 outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid"
                         onClick={() => setCredentialsModalShow(true)}
                       >
-                        <div className="system-xs-regular text-text-primary">
+                        <span className="system-xs-regular text-text-primary">
                           {t(($) => $[`createTool.authMethod.types.${tempCredential.auth_type}`], {
                             ns: 'tools',
                           })}
-                        </div>
-                        <RiSettings2Line className="size-4 text-text-secondary" />
-                      </div>
+                        </span>
+                        <RiSettings2Line aria-hidden className="size-4 text-text-secondary" />
+                      </button>
                     </div>
 
                     <div>
@@ -145,18 +153,24 @@ const TestApi: FC<Props> = ({ positionCenter, customCollection, tool, onHide })
                                 key={index}
                                 className="border-b border-divider-regular last:border-0"
                               >
-                                <td className="py-2 pr-2.5 pl-3">{item.label[language]}</td>
+                                <td className="py-2 pr-2.5 pl-3">
+                                  <label htmlFor={`${parameterId}-${item.name}`}>
+                                    {item.label[language]}
+                                  </label>
+                                </td>
                                 <td className="">
                                   <Input
+                                    id={`${parameterId}-${item.name}`}
+                                    name={item.name}
                                     value={parametersValue[item.name] || ''}
-                                    onChange={(e) =>
+                                    onValueChange={(value) =>
                                       setParametersValue({
                                         ...parametersValue,
-                                        [item.name]: e.target.value,
+                                        [item.name]: value,
                                       })
                                     }
                                     type="text"
-                                    className="border-transparent! bg-transparent!"
+                                    className="bg-transparent"
                                   />
                                 </td>
                               </tr>
@@ -170,7 +184,7 @@ const TestApi: FC<Props> = ({ positionCenter, customCollection, tool, onHide })
                     variant="primary"
                     className="mt-4 h-10 w-full"
                     loading={testing}
-                    onClick={handleTest}
+                    type="submit"
                   >
                     {t(($) => $['test.title'], { ns: 'tools' })}
                   </Button>
@@ -189,7 +203,7 @@ const TestApi: FC<Props> = ({ positionCenter, customCollection, tool, onHide })
                       )}
                     </div>
                   </div>
-                </div>
+                </form>
               </DrawerContent>
             </DrawerPopup>
           </DrawerViewport>
diff --git a/web/app/components/tools/workflow-tool/index.tsx b/web/app/components/tools/workflow-tool/index.tsx
index 3272dcf28c3..b09d1659f95 100644
--- a/web/app/components/tools/workflow-tool/index.tsx
+++ b/web/app/components/tools/workflow-tool/index.tsx
@@ -20,6 +20,8 @@ import {
   DrawerTitle,
   DrawerViewport,
 } from '@langgenius/dify-ui/drawer'
+import { Field, FieldError, FieldLabel } from '@langgenius/dify-ui/field'
+import { Input } from '@langgenius/dify-ui/input'
 import { Textarea } from '@langgenius/dify-ui/textarea'
 import { toast } from '@langgenius/dify-ui/toast'
 import { produce } from 'immer'
@@ -29,7 +31,6 @@ import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
 import AppIconPicker from '@/app/components/base/app-icon-picker'
 import { Infotip } from '@/app/components/base/infotip'
-import Input from '@/app/components/base/input'
 import LabelSelector from '@/app/components/tools/labels/selector'
 import ConfirmModal from '@/app/components/tools/workflow-tool/confirm-modal'
 import MethodSelector from '@/app/components/tools/workflow-tool/method-selector'
@@ -232,6 +233,7 @@ export function WorkflowToolDrawer({
   onCreate,
 }: WorkflowToolDrawerProps) {
   const { t } = useTranslation()
+  const parameterId = React.useId()
 
   const [showEmojiPicker, setShowEmojiPicker] = useState<boolean>(false)
   const [emoji, setEmoji] = useState<Emoji>(payload.icon)
@@ -323,14 +325,23 @@ export function WorkflowToolDrawer({
         title={t(($) => $['common.workflowAsTool'], { ns: 'workflow' })!}
         closeLabel={t(($) => $['operation.close'], { ns: 'common' })!}
       >
-        <div className="flex h-full flex-col">
+        <form
+          className="flex h-full flex-col"
+          onSubmit={(event) => {
+            event.preventDefault()
+            if (isAdd) onConfirm()
+            else setConfirmModalOpen(true)
+          }}
+        >
           <div className="h-0 grow space-y-4 overflow-y-auto px-6 py-3">
             {/* name & icon */}
-            <div>
-              <div className="py-2 system-sm-medium text-text-primary">
+            <Field name="label" className="gap-0">
+              <FieldLabel className="py-2 text-text-primary">
                 {t(($) => $['createTool.name'], { ns: 'tools' })}{' '}
-                <span className="ml-1 text-red-500">*</span>
-              </div>
+                <span aria-hidden className="ml-1 text-text-destructive">
+                  *
+                </span>
+              </FieldLabel>
               <div className="flex items-center justify-between gap-3">
                 <AppIcon
                   size="large"
@@ -343,18 +354,22 @@ export function WorkflowToolDrawer({
                   background={emoji.background}
                 />
                 <Input
-                  className="h-10 grow"
+                  className="h-10 min-w-0 flex-1"
                   placeholder={t(($) => $['createTool.toolNamePlaceHolder'], { ns: 'tools' })!}
                   value={label}
-                  onChange={(e) => setLabel(e.target.value)}
+                  onValueChange={(value) => setLabel(value)}
                 />
               </div>
-            </div>
+            </Field>
             {/* name for tool call */}
-            <div>
+            <Field name="name" className="gap-0" invalid={!isWorkflowToolNameValid(name)}>
               <div className="flex items-center py-2 system-sm-medium text-text-primary">
-                {t(($) => $['createTool.nameForToolCall'], { ns: 'tools' })}{' '}
-                <span className="ml-1 text-red-500">*</span>
+                <FieldLabel className="py-0 text-text-primary">
+                  {t(($) => $['createTool.nameForToolCall'], { ns: 'tools' })}
+                </FieldLabel>
+                <span aria-hidden className="ml-1 text-text-destructive">
+                  *
+                </span>
                 <InfoTooltip>
                   {t(($) => $['createTool.nameForToolCallPlaceHolder'], { ns: 'tools' })}
                 </InfoTooltip>
@@ -363,28 +378,27 @@ export function WorkflowToolDrawer({
                 className="h-10"
                 placeholder={t(($) => $['createTool.nameForToolCallPlaceHolder'], { ns: 'tools' })!}
                 value={name}
-                onChange={(e) => setName(e.target.value)}
+                onValueChange={(value) => setName(value)}
               />
               {!isWorkflowToolNameValid(name) && (
-                <div className="text-xs leading-4.5 text-red-500">
+                <FieldError match className="py-0 text-xs leading-4.5">
                   {t(($) => $['createTool.nameForToolCallTip'], { ns: 'tools' })}
-                </div>
+                </FieldError>
               )}
-            </div>
+            </Field>
             {/* description */}
-            <div>
-              <div className="py-2 system-sm-medium text-text-primary">
+            <Field name="description" className="gap-0">
+              <FieldLabel className="py-2 text-text-primary">
                 {t(($) => $['createTool.description'], { ns: 'tools' })}
-              </div>
+              </FieldLabel>
               <Textarea
-                aria-label={t(($) => $['createTool.description'], { ns: 'tools' })}
                 placeholder={
                   t(($) => $['createTool.descriptionPlaceholder'], { ns: 'tools' }) || ''
                 }
                 value={description}
                 onValueChange={(value) => setDescription(value)}
               />
-            </div>
+            </Field>
             {/* Tool Input  */}
             <div>
               <div className="py-2 system-sm-medium text-text-primary">
@@ -400,7 +414,7 @@ export function WorkflowToolDrawer({
                       <th className="w-25.5 p-2 pl-3 font-medium">
                         {t(($) => $['createTool.toolInput.method'], { ns: 'tools' })}
                       </th>
-                      <th className="p-2 pl-3 font-medium">
+                      <th id={`${parameterId}-description`} className="p-2 pl-3 font-medium">
                         {t(($) => $['createTool.toolInput.description'], { ns: 'tools' })}
                       </th>
                     </tr>
@@ -411,7 +425,10 @@ export function WorkflowToolDrawer({
                         <td className="max-w-39 p-2 pl-3">
                           <div className="text-[13px] leading-4.5">
                             <div className="flex">
-                              <span className="truncate font-medium text-text-primary">
+                              <span
+                                id={`${parameterId}-${index}-name`}
+                                className="truncate font-medium text-text-primary"
+                              >
                                 {item.name}
                               </span>
                               <span className="shrink-0 pl-1 text-xs leading-4.5 text-[#ec4a0a]">
@@ -451,7 +468,8 @@ export function WorkflowToolDrawer({
                         <td className="w-59 p-2 pl-3 text-text-tertiary">
                           <input
                             type="text"
-                            className="w-full appearance-none bg-transparent text-[13px] leading-4.5 font-normal text-text-secondary caret-primary-600 outline-hidden placeholder:text-text-quaternary"
+                            aria-labelledby={`${parameterId}-${index}-name ${parameterId}-description`}
+                            className="w-full appearance-none rounded-sm bg-transparent text-[13px] leading-4.5 font-normal text-text-secondary caret-primary-600 outline-hidden placeholder:text-text-quaternary focus-visible:ring-2 focus-visible:ring-state-accent-solid"
                             placeholder={t(
                               ($) => $['createTool.toolInput.descriptionPlaceholder'],
                               {
@@ -527,19 +545,19 @@ export function WorkflowToolDrawer({
               <LabelSelector value={labels} onChange={handleLabelSelect} />
             </div>
             {/* Privacy Policy */}
-            <div>
-              <div className="py-2 system-sm-medium text-text-primary">
+            <Field name="privacy_policy" className="gap-0">
+              <FieldLabel className="py-2 text-text-primary">
                 {t(($) => $['createTool.privacyPolicy'], { ns: 'tools' })}
-              </div>
+              </FieldLabel>
               <Input
                 className="h-10"
                 value={privacyPolicy}
-                onChange={(e) => setPrivacyPolicy(e.target.value)}
+                onValueChange={(value) => setPrivacyPolicy(value)}
                 placeholder={
                   t(($) => $['createTool.privacyPolicyPlaceholder'], { ns: 'tools' }) || ''
                 }
               />
-            </div>
+            </Field>
           </div>
           <div
             className={cn(
@@ -554,18 +572,12 @@ export function WorkflowToolDrawer({
             )}
             <div className="flex space-x-2">
               <Button onClick={onHide}>{t(($) => $['operation.cancel'], { ns: 'common' })}</Button>
-              <Button
-                variant="primary"
-                onClick={() => {
-                  if (isAdd) onConfirm()
-                  else setConfirmModalOpen(true)
-                }}
-              >
+              <Button variant="primary" type="submit">
                 {t(($) => $['operation.save'], { ns: 'common' })}
               </Button>
             </div>
           </div>
-        </div>
+        </form>
       </WorkflowToolDrawerFrame>
       <AppIconPicker
         open={showEmojiPicker}
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.helpers.spec.ts b/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.helpers.spec.ts
index eeec24ec204..2b2ff79af17 100644
--- a/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.helpers.spec.ts
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.helpers.spec.ts
@@ -12,7 +12,6 @@ import {
   getCheckboxListValue,
   getFilterVar,
   getFormInputState,
-  getNumberInputValue,
   getSelectedLabels,
   getTargetVarType,
   getVarKindType,
@@ -178,11 +177,7 @@ describe('form-input-item helpers', () => {
     expect(getCheckboxListValue(['alpha', 'missing'], ['beta'], options)).toEqual(['alpha'])
   })
 
-  it('should normalize number and variable selector values', () => {
-    expect(getNumberInputValue(Number.NaN)).toBe('')
-    expect(getNumberInputValue(2)).toBe(2)
-    expect(getNumberInputValue('3')).toBe('3')
-    expect(getNumberInputValue(undefined)).toBe('')
+  it('should normalize variable selector values', () => {
     expect(normalizeVariableSelectorValue([])).toEqual([])
     expect(normalizeVariableSelectorValue(['node', 'answer'])).toEqual(['node', 'answer'])
     expect(normalizeVariableSelectorValue('')).toBe('')
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.spec.tsx
index 167d396ef25..f758681b541 100644
--- a/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.spec.tsx
@@ -4,6 +4,7 @@ import type {
   FormOption,
 } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { fireEvent, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { renderWorkflowFlowComponent } from '@/app/components/workflow/__tests__/workflow-test-env'
 import { VarKindType } from '../../types'
@@ -91,7 +92,23 @@ const renderFormInputItem = (props: Partial<ComponentProps<typeof FormInputItem>
 }
 
 describe('FormInputItem', () => {
-  it('should parse number inputs as numbers', () => {
+  it('shows a schema-provided numeric string and prevents edits in readonly mode', async () => {
+    const user = userEvent.setup()
+    const { onChange } = renderFormInputItem({
+      readOnly: true,
+      schema: createSchema({ type: FormTypeEnum.textNumber }),
+      value: { field: { type: VarKindType.constant, value: '3.5' } },
+    })
+    const input = screen.getByRole('textbox')
+    expect(input).toHaveValue('3.5')
+    expect(input).toHaveAttribute('readonly')
+    await user.type(input, '9{ArrowUp}')
+    expect(onChange).not.toHaveBeenCalled()
+    expect(input).toHaveValue('3.5')
+  })
+
+  it('should store a numeric constant and clear it without producing NaN', async () => {
+    const user = userEvent.setup()
     const { onChange } = renderFormInputItem({
       schema: createSchema({ type: FormTypeEnum.textNumber }),
       value: {
@@ -102,7 +119,9 @@ describe('FormInputItem', () => {
       },
     })
 
-    fireEvent.change(screen.getByRole('spinbutton'), { target: { value: '3.5' } })
+    const input = screen.getByRole('textbox')
+    await user.clear(input)
+    await user.type(input, '3.5')
 
     expect(onChange).toHaveBeenCalledWith({
       field: {
@@ -110,6 +129,10 @@ describe('FormInputItem', () => {
         value: 3.5,
       },
     })
+    await user.clear(input)
+    expect(onChange).toHaveBeenLastCalledWith({
+      field: { type: VarKindType.constant, value: null },
+    })
   })
 
   it('should toggle boolean fields using the shared boolean input', () => {
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
index 3e53916b6e4..129b3c3a3c9 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
@@ -3,6 +3,8 @@ import type { FC } from 'react'
 import type { InputVar } from '../../../../types'
 import type { FileEntity } from '@/app/components/base/file-uploader/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Input } from '@langgenius/dify-ui/input'
+import { NumberField, NumberFieldGroup, NumberFieldInput } from '@langgenius/dify-ui/number-field'
 import {
   Select,
   SelectContent,
@@ -23,7 +25,6 @@ import { Line3 } from '@/app/components/base/icons/src/public/common'
 import { BubbleX } from '@/app/components/base/icons/src/vender/line/others'
 import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
 import TextGenerationImageUploader from '@/app/components/base/image-uploader/text-generation-image-uploader'
-import Input from '@/app/components/base/input'
 import { FILE_EXTS } from '@/app/components/base/prompt-editor/constants'
 import { VarBlockIcon } from '@/app/components/workflow/block-icon'
 import { useHooksStore } from '@/app/components/workflow/hooks-store'
@@ -52,6 +53,7 @@ const FormItem: FC<Props> = ({
   inStepRun = false,
 }) => {
   const { t } = useTranslation()
+  const labelId = React.useId()
   const { type } = payload
   const fileSettings = useHooksStore((s) => s.configsMap?.fileSettings)
   const jsonSchemaPlaceholder = React.useMemo(() => {
@@ -144,7 +146,7 @@ const FormItem: FC<Props> = ({
     <div className={cn(className)}>
       {!isArrayLikeType && !isBooleanType && (
         <div className="mb-1 flex h-6 items-center gap-1 system-sm-semibold text-text-secondary">
-          <div className="truncate">
+          <div id={labelId} className="truncate">
             {typeof payload.label === 'object' ? nodeKey : payload.label}
           </div>
           {payload.hide === true ? (
@@ -163,26 +165,37 @@ const FormItem: FC<Props> = ({
       <div className="grow">
         {type === InputVarType.textInput && (
           <Input
+            name={payload.variable}
+            aria-labelledby={labelId}
             value={value || ''}
-            onChange={(e) => onChange(e.target.value)}
+            onValueChange={(value) => onChange(value)}
             placeholder={typeof payload.label === 'object' ? payload.label.variable : payload.label}
             autoFocus={autoFocus}
           />
         )}
 
         {type === InputVarType.number && (
-          <Input
-            type="number"
-            value={value || ''}
-            onChange={(e) => onChange(e.target.value)}
-            placeholder={typeof payload.label === 'object' ? payload.label.variable : payload.label}
-            autoFocus={autoFocus}
-          />
+          <NumberField
+            step="any"
+            name={payload.variable}
+            value={value == null || value === '' ? null : Number(value)}
+            onValueChange={(value) => onChange(value)}
+          >
+            <NumberFieldGroup>
+              <NumberFieldInput
+                aria-labelledby={labelId}
+                placeholder={
+                  typeof payload.label === 'object' ? payload.label.variable : payload.label
+                }
+                autoFocus={autoFocus}
+              />
+            </NumberFieldGroup>
+          </NumberField>
         )}
 
         {type === InputVarType.paragraph && (
           <Textarea
-            aria-label={typeof payload.label === 'object' ? payload.label.variable : payload.label}
+            aria-labelledby={labelId}
             value={value || ''}
             onValueChange={(value) => onChange(value)}
             placeholder={typeof payload.label === 'object' ? payload.label.variable : payload.label}
diff --git a/web/app/components/workflow/nodes/_base/components/form-input-item.helpers.ts b/web/app/components/workflow/nodes/_base/components/form-input-item.helpers.ts
index 9d5e7f7c61a..3d1f0955d0e 100644
--- a/web/app/components/workflow/nodes/_base/components/form-input-item.helpers.ts
+++ b/web/app/components/workflow/nodes/_base/components/form-input-item.helpers.ts
@@ -239,12 +239,4 @@ export const getCheckboxListValue = (
   return current.filter((item) => allowedValues.has(item))
 }
 
-export const getNumberInputValue = (currentValue: unknown): number | string => {
-  if (typeof currentValue === 'number') return Number.isNaN(currentValue) ? '' : currentValue
-
-  if (typeof currentValue === 'string') return currentValue
-
-  return ''
-}
-
 export const normalizeVariableSelectorValue = (value: ValueSelector | string) => value || ''
diff --git a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
index 56dff0cf320..4e8a1235f84 100644
--- a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
@@ -11,6 +11,7 @@ import type { Event, Tool } from '@/app/components/tools/types'
 import type { TriggerWithProvider } from '@/app/components/workflow/block-selector/types'
 import type { ToolWithProvider, ValueSelector, Var } from '@/app/components/workflow/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { NumberField, NumberFieldGroup, NumberFieldInput } from '@langgenius/dify-ui/number-field'
 import {
   Select,
   SelectContent,
@@ -22,7 +23,6 @@ import {
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useEffect, useMemo, useState } from 'react'
 import { CheckboxList } from '@/app/components/base/checkbox-list'
-import Input from '@/app/components/base/input'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import { AppSelector } from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import ModelParameterModal from '@/app/components/plugins/plugin-detail-panel/model-selector'
@@ -44,7 +44,6 @@ import {
   getCheckboxListValue,
   getFilterVar,
   getFormInputState,
-  getNumberInputValue,
   getSelectedLabels,
   getTargetVarType,
   getVarKindType,
@@ -56,6 +55,7 @@ import FormInputTypeSwitch from './form-input-type-switch'
 
 type Props = Readonly<{
   readOnly: boolean
+  labelId?: string
   nodeId: string
   schema: CredentialFormSchema
   value: ResourceVarInputs
@@ -81,6 +81,7 @@ type FormInputValue =
 
 const FormInputItem: FC<Props> = ({
   readOnly,
+  labelId,
   nodeId,
   schema,
   value,
@@ -237,14 +238,12 @@ const FormInputItem: FC<Props> = ({
 
   const handleValueChange = (newValue: FormInputValue) => {
     const nextType = getVarKindType(formState) ?? varInput?.type ?? VarKindType.constant
-    let nextValue: FormInputValue = newValue
-    if (isNumber) nextValue = Number.parseFloat(String(newValue ?? ''))
     onChange({
       ...value,
       [variable]: {
         ...varInput,
         type: nextType,
-        value: nextValue,
+        value: newValue,
       },
     })
   }
@@ -345,13 +344,20 @@ const FormInputItem: FC<Props> = ({
         />
       )}
       {isNumber && isConstant && (
-        <Input
-          className="h-8 grow"
-          type="number"
-          value={getNumberInputValue(varInput?.value)}
-          onChange={(e) => handleValueChange(e.target.value)}
-          placeholder={placeholder?.[language] || placeholder?.en_US}
-        />
+        <NumberField
+          step="any"
+          className="min-w-0 grow"
+          value={varInput?.value == null || varInput.value === '' ? null : Number(varInput.value)}
+          readOnly={readOnly}
+          onValueChange={(value) => handleValueChange(value)}
+        >
+          <NumberFieldGroup>
+            <NumberFieldInput
+              aria-labelledby={labelId}
+              placeholder={placeholder?.[language] || placeholder?.en_US}
+            />
+          </NumberFieldGroup>
+        </NumberField>
       )}
       {isDate && isConstant && (
         <div className="min-w-0 grow">
diff --git a/web/app/components/workflow/nodes/assigner/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/assigner/__tests__/integration.spec.tsx
index 817149ecf2f..e6c3ca7cac6 100644
--- a/web/app/components/workflow/nodes/assigner/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/assigner/__tests__/integration.spec.tsx
@@ -1,6 +1,6 @@
 import type { AssignerNodeOperation, AssignerNodeType } from '../types'
 import type { PanelProps } from '@/types/workflow'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { renderWorkflowFlowComponent } from '@/app/components/workflow/__tests__/workflow-test-env'
 import { BlockEnum, VarType } from '@/app/components/workflow/types'
@@ -288,10 +288,12 @@ describe('assigner path', () => {
         />,
       )
 
-      fireEvent.change(screen.getByDisplayValue('hello'), { target: { value: 'updated text' } })
+      await user.click(screen.getByRole('textbox', { name: 'node-1.count' }))
+      await user.keyboard('{Control>}a{/Control}')
+      await user.paste('updated text')
       expect(onChange).toHaveBeenLastCalledWith(
         [createOperation({ operation: WriteMode.set, value: 'updated text' })],
-        'updated text',
+        undefined,
       )
 
       onChange.mockClear()
@@ -311,10 +313,12 @@ describe('assigner path', () => {
         />,
       )
 
-      fireEvent.change(screen.getByDisplayValue('3'), { target: { value: '5' } })
+      await user.click(screen.getByRole('textbox', { name: 'node-1.count' }))
+      await user.keyboard('{Control>}a{/Control}')
+      await user.paste('5')
       expect(onChange).toHaveBeenLastCalledWith(
         [createOperation({ operation: WriteMode.set, value: 5 })],
-        5,
+        undefined,
       )
 
       onChange.mockClear()
@@ -337,7 +341,7 @@ describe('assigner path', () => {
       await user.click(screen.getByRole('button', { name: 'bool:false' }))
       expect(onChange).toHaveBeenLastCalledWith(
         [createOperation({ operation: WriteMode.set, value: true })],
-        true,
+        undefined,
       )
 
       onChange.mockClear()
@@ -357,10 +361,12 @@ describe('assigner path', () => {
         />,
       )
 
-      fireEvent.change(screen.getByLabelText('code-editor'), { target: { value: '{"a":2}' } })
+      await user.click(screen.getByRole('textbox', { name: 'code-editor' }))
+      await user.keyboard('{Control>}a{/Control}')
+      await user.paste('{"a":2}')
       expect(onChange).toHaveBeenLastCalledWith(
         [createOperation({ operation: WriteMode.set, value: '{"a":2}' })],
-        '{"a":2}',
+        undefined,
       )
 
       onChange.mockClear()
@@ -380,10 +386,12 @@ describe('assigner path', () => {
         />,
       )
 
-      fireEvent.change(screen.getByDisplayValue('2'), { target: { value: '4' } })
+      await user.click(screen.getByRole('textbox', { name: 'node-1.count' }))
+      await user.keyboard('{Control>}a{/Control}')
+      await user.paste('4')
       expect(onChange).toHaveBeenLastCalledWith(
         [createOperation({ operation: WriteMode.increment, value: 4 })],
-        4,
+        undefined,
       )
 
       const buttons = screen.getAllByRole('button')
diff --git a/web/app/components/workflow/nodes/assigner/components/var-list/__tests__/branches.spec.tsx b/web/app/components/workflow/nodes/assigner/components/var-list/__tests__/branches.spec.tsx
index 60313505d70..b0562de18c1 100644
--- a/web/app/components/workflow/nodes/assigner/components/var-list/__tests__/branches.spec.tsx
+++ b/web/app/components/workflow/nodes/assigner/components/var-list/__tests__/branches.spec.tsx
@@ -1,5 +1,5 @@
 import type { ComponentProps } from 'react'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { VarType } from '@/app/components/workflow/types'
 import { AssignerNodeInputType, WriteMode } from '../../../types'
@@ -142,7 +142,8 @@ describe('assigner/var-list branches', () => {
     ])
   })
 
-  it('updates string and number constant inputs through the inline editors', () => {
+  it('updates string and number constant inputs through the inline editors', async () => {
+    const user = userEvent.setup()
     const { handleChange, rerender } = renderVarList({
       list: [
         createOperation({
@@ -155,9 +156,8 @@ describe('assigner/var-list branches', () => {
       getToAssignedVarType: () => VarType.number,
     })
 
-    fireEvent.change(screen.getByRole('spinbutton'), {
-      target: { value: '2' },
-    })
+    await user.clear(screen.getByRole('textbox', { name: 'node-a.flag' }))
+    await user.type(screen.getByRole('textbox', { name: 'node-a.flag' }), '2')
 
     expect(handleChange).toHaveBeenLastCalledWith(
       [
@@ -167,7 +167,7 @@ describe('assigner/var-list branches', () => {
           value: 2,
         }),
       ],
-      2,
+      undefined,
     )
 
     rerender(
@@ -191,9 +191,8 @@ describe('assigner/var-list branches', () => {
       />,
     )
 
-    fireEvent.change(screen.getByRole('textbox'), {
-      target: { value: 'updated' },
-    })
+    await user.tripleClick(screen.getByRole('textbox'))
+    await user.paste('updated')
 
     expect(handleChange).toHaveBeenLastCalledWith(
       [
@@ -203,11 +202,12 @@ describe('assigner/var-list branches', () => {
           value: 'updated',
         }),
       ],
-      'updated',
+      undefined,
     )
   })
 
-  it('updates numeric write-mode inputs through the dedicated number field', () => {
+  it('updates numeric write-mode inputs through the dedicated number field', async () => {
+    const user = userEvent.setup()
     const { handleChange } = renderVarList({
       list: [
         createOperation({
@@ -220,9 +220,8 @@ describe('assigner/var-list branches', () => {
       writeModeTypesNum: [WriteMode.increment],
     })
 
-    fireEvent.change(screen.getByRole('spinbutton'), {
-      target: { value: '5' },
-    })
+    await user.clear(screen.getByRole('textbox', { name: 'node-a.flag' }))
+    await user.type(screen.getByRole('textbox', { name: 'node-a.flag' }), '5')
 
     expect(handleChange).toHaveBeenLastCalledWith(
       [
@@ -231,7 +230,7 @@ describe('assigner/var-list branches', () => {
           value: 5,
         }),
       ],
-      5,
+      undefined,
     )
   })
 })
diff --git a/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx b/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx
index 35eafdb3573..d73e4d836c2 100644
--- a/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx
+++ b/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx
@@ -3,13 +3,13 @@ import type { FC } from 'react'
 import type { AssignerNodeOperation } from '../../types'
 import type { ValueSelector, Var } from '@/app/components/workflow/types'
 import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { NumberField, NumberFieldGroup, NumberFieldInput } from '@langgenius/dify-ui/number-field'
 import { Textarea } from '@langgenius/dify-ui/textarea'
 import { noop } from 'es-toolkit/function'
 import { produce } from 'immer'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import Input from '@/app/components/base/input'
 import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
 import ListNoDataPlaceholder from '@/app/components/workflow/nodes/_base/components/list-no-data-placeholder'
 import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
@@ -93,9 +93,9 @@ const VarList: FC<Props> = ({
     (index: number) => {
       return (value: ValueSelector | string | number | boolean) => {
         const newList = produce(list, (draft) => {
-          draft[index]!.value = value as ValueSelector
+          draft[index]!.value = value
         })
-        onChange(newList, value as ValueSelector)
+        onChange(newList, Array.isArray(value) ? value : undefined)
       }
     },
     [list, onChange],
@@ -214,14 +214,6 @@ const VarList: FC<Props> = ({
                 )}
               {!!(item.operation === WriteMode.set && assignedVarType) && (
                 <>
-                  {assignedVarType === 'number' && (
-                    <Input
-                      type="number"
-                      value={item.value as number}
-                      onChange={(e) => handleToAssignedVarChange(index)(Number(e.target.value))}
-                      className="w-full"
-                    />
-                  )}
                   {assignedVarType === 'string' && (
                     <Textarea
                       aria-label={
@@ -250,14 +242,29 @@ const VarList: FC<Props> = ({
                   )}
                 </>
               )}
-              {writeModeTypesNum?.includes(item.operation) && (
-                <Input
-                  type="number"
-                  value={item.value as number}
-                  onChange={(e) => handleToAssignedVarChange(index)(Number(e.target.value))}
-                  placeholder="Enter number value..."
+              {((item.operation === WriteMode.set && assignedVarType === VarType.number) ||
+                writeModeTypesNum?.includes(item.operation)) && (
+                <NumberField
+                  step="any"
+                  value={typeof item.value === 'number' ? item.value : null}
+                  readOnly={readonly}
+                  onValueChange={(value) => handleToAssignedVarChange(index)(value ?? '')}
                   className="w-full"
-                />
+                >
+                  <NumberFieldGroup>
+                    <NumberFieldInput
+                      aria-label={
+                        item.variable_selector.join('.') ||
+                        t(($) => $['nodes.assigner.setParameter'], { ns: 'workflow' })
+                      }
+                      placeholder={
+                        writeModeTypesNum?.includes(item.operation)
+                          ? 'Enter number value...'
+                          : undefined
+                      }
+                    />
+                  </NumberFieldGroup>
+                </NumberField>
               )}
             </div>
             <IconButton
diff --git a/web/app/components/workflow/nodes/http/components/authorization/index.tsx b/web/app/components/workflow/nodes/http/components/authorization/index.tsx
index 5d8cc329677..aa8aae946da 100644
--- a/web/app/components/workflow/nodes/http/components/authorization/index.tsx
+++ b/web/app/components/workflow/nodes/http/components/authorization/index.tsx
@@ -5,12 +5,12 @@ import type { Var } from '@/app/components/workflow/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 { Input } from '@langgenius/dify-ui/input'
 import { produce } from 'immer'
 import * as React from 'react'
-import { useCallback, useState } from 'react'
+import { useCallback, useId, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import BaseInput from '@/app/components/base/input'
-import Input from '@/app/components/workflow/nodes/_base/components/input-support-select-var'
+import InputSupportSelectVar from '@/app/components/workflow/nodes/_base/components/input-support-select-var'
 import useAvailableVarList from '@/app/components/workflow/nodes/_base/hooks/use-available-var-list'
 import { VarType } from '@/app/components/workflow/types'
 import { APIType, AuthorizationType } from '../../types'
@@ -30,15 +30,17 @@ const Field = ({
   title,
   isRequired,
   children,
+  htmlFor,
 }: {
   title: string
   isRequired?: boolean
   children: React.JSX.Element
+  htmlFor?: string
 }) => {
   return (
     <div>
       <div className="text-[13px] leading-8 font-medium text-text-secondary">
-        {title}
+        {htmlFor ? <label htmlFor={htmlFor}>{title}</label> : title}
         {isRequired && <span className="ml-0.5 text-text-destructive">*</span>}
       </div>
       <div>{children}</div>
@@ -48,6 +50,7 @@ const Field = ({
 
 const Authorization: FC<Props> = ({ nodeId, payload, onChange, isShow, onHide }) => {
   const { t } = useTranslation()
+  const headerId = useId()
 
   const [isFocus, setIsFocus] = useState(false)
   const { availableVars, availableNodesWithParent } = useAvailableVarList(nodeId, {
@@ -92,7 +95,7 @@ const Authorization: FC<Props> = ({ nodeId, payload, onChange, isShow, onHide })
 
   const handleAPIKeyOrHeaderChange = useCallback(
     (type: 'api_key' | 'header') => {
-      return (e: React.ChangeEvent<HTMLInputElement>) => {
+      return (value: string) => {
         const newPayload = produce(tempPayload, (draft: AuthorizationPayloadType) => {
           if (!draft.config) {
             draft.config = {
@@ -100,7 +103,7 @@ const Authorization: FC<Props> = ({ nodeId, payload, onChange, isShow, onHide })
               api_key: '',
             }
           }
-          draft.config[type] = e.target.value
+          draft.config[type] = value
         })
         setTempPayload(newPayload)
       }
@@ -140,7 +143,12 @@ const Authorization: FC<Props> = ({ nodeId, payload, onChange, isShow, onHide })
           {t(($) => $[`${i18nPrefix}.authorization`], { ns: 'workflow' })}
         </DialogTitle>
 
-        <div>
+        <form
+          onSubmit={(event) => {
+            event.preventDefault()
+            handleConfirm()
+          }}
+        >
           <div className="space-y-2">
             <Field title={t(($) => $[`${i18nPrefix}.authorizationType`], { ns: 'workflow' })}>
               <RadioGroup
@@ -182,10 +190,16 @@ const Authorization: FC<Props> = ({ nodeId, payload, onChange, isShow, onHide })
                   />
                 </Field>
                 {tempPayload.config?.type === APIType.custom && (
-                  <Field title={t(($) => $[`${i18nPrefix}.header`], { ns: 'workflow' })} isRequired>
-                    <BaseInput
+                  <Field
+                    htmlFor={headerId}
+                    title={t(($) => $[`${i18nPrefix}.header`], { ns: 'workflow' })}
+                    isRequired
+                  >
+                    <Input
+                      id={headerId}
+                      name="header"
                       value={tempPayload.config?.header || ''}
-                      onChange={handleAPIKeyOrHeaderChange('header')}
+                      onValueChange={handleAPIKeyOrHeaderChange('header')}
                     />
                   </Field>
                 )}
@@ -195,7 +209,7 @@ const Authorization: FC<Props> = ({ nodeId, payload, onChange, isShow, onHide })
                   isRequired
                 >
                   <div className="flex">
-                    <Input
+                    <InputSupportSelectVar
                       instanceId="http-api-key"
                       className={cn(
                         isFocus
@@ -218,11 +232,11 @@ const Authorization: FC<Props> = ({ nodeId, payload, onChange, isShow, onHide })
           </div>
           <div className="mt-6 flex justify-end space-x-2">
             <Button onClick={onHide}>{t(($) => $['operation.cancel'], { ns: 'common' })}</Button>
-            <Button variant="primary" onClick={handleConfirm}>
+            <Button variant="primary" type="submit">
               {t(($) => $['operation.save'], { ns: 'common' })}
             </Button>
           </div>
-        </div>
+        </form>
       </DialogContent>
     </Dialog>
   )
diff --git a/web/app/components/workflow/nodes/http/components/key-value/key-value-edit/item.tsx b/web/app/components/workflow/nodes/http/components/key-value/key-value-edit/item.tsx
index e58188654bd..fc59b229bb6 100644
--- a/web/app/components/workflow/nodes/http/components/key-value/key-value-edit/item.tsx
+++ b/web/app/components/workflow/nodes/http/components/key-value/key-value-edit/item.tsx
@@ -22,7 +22,6 @@ import { useTranslation } from 'react-i18next'
 import { VarType } from '@/app/components/workflow/types'
 import VarReferencePicker from '../../../../_base/components/variable/var-reference-picker'
 import InputItem from './input-item'
-// import Input from '@/app/components/base/input'
 
 const i18nPrefix = 'nodes.http'
 
diff --git a/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx b/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
index f0c704111b2..e8c4544f1c5 100644
--- a/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
+++ b/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
@@ -5,7 +5,7 @@ import type { CredentialFormSchema } from '@/app/components/header/account-setti
 import type { Tool } from '@/app/components/tools/types'
 import type { ToolWithProvider } from '@/app/components/workflow/types'
 import { Button } from '@langgenius/dify-ui/button'
-import { useState } from 'react'
+import { useId, useState } from 'react'
 import { Infotip } from '@/app/components/base/infotip'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
@@ -78,6 +78,7 @@ const ToolFormItem: FC<Props> = ({
   providerType = 'tool',
 }) => {
   const language = useLanguage()
+  const labelId = useId()
   const { name, label, type, required, tooltip, input_schema } = schema
   const showSchemaButton = type === FormTypeEnum.object || type === FormTypeEnum.array
   const showDescription =
@@ -91,7 +92,10 @@ const ToolFormItem: FC<Props> = ({
     <div className="space-y-0.5 py-1">
       <div>
         <div className="flex min-h-6 min-w-0 items-center">
-          <div className="min-w-0 system-sm-medium wrap-break-word text-text-secondary">
+          <div
+            id={labelId}
+            className="min-w-0 system-sm-medium wrap-break-word text-text-secondary"
+          >
             {label[language] || label.en_US}
           </div>
           {required && (
@@ -128,6 +132,7 @@ const ToolFormItem: FC<Props> = ({
         )}
       </div>
       <FormInputItem
+        labelId={labelId}
         readOnly={readOnly}
         nodeId={nodeId}
         schema={schema}
diff --git a/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx b/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx
index 8a5f83ab396..683b8efc14e 100644
--- a/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx
+++ b/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx
@@ -5,7 +5,7 @@ import type { Event } from '@/app/components/tools/types'
 import type { TriggerWithProvider } from '@/app/components/workflow/block-selector/types'
 import type { PluginTriggerVarInputs } from '@/app/components/workflow/nodes/trigger-plugin/types'
 import { Button } from '@langgenius/dify-ui/button'
-import { useState } from 'react'
+import { useId, useState } from 'react'
 import { Infotip } from '@/app/components/base/infotip'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
@@ -38,6 +38,7 @@ const TriggerFormItem: FC<Props> = ({
   disableVariableInsertion = false,
 }) => {
   const language = useLanguage()
+  const labelId = useId()
   const { name, label, type, required, tooltip, input_schema } = schema
   const showSchemaButton = type === FormTypeEnum.object || type === FormTypeEnum.array
   const showDescription =
@@ -51,7 +52,7 @@ const TriggerFormItem: FC<Props> = ({
     <div className="space-y-0.5 py-1">
       <div>
         <div className="flex h-6 items-center">
-          <div className="system-sm-medium text-text-secondary">
+          <div id={labelId} className="system-sm-medium text-text-secondary">
             {label[language] || label.en_US}
           </div>
           {required && (
@@ -88,6 +89,7 @@ const TriggerFormItem: FC<Props> = ({
         )}
       </div>
       <FormInputItem
+        labelId={labelId}
         readOnly={readOnly}
         nodeId={nodeId}
         schema={schema}
diff --git a/web/app/components/workflow/nodes/trigger-webhook/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/trigger-webhook/__tests__/panel.spec.tsx
index 685bdf3a1b0..cde13c7d47e 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/__tests__/panel.spec.tsx
@@ -15,8 +15,6 @@ const {
   mockHandleParamsChange,
   mockHandleBodyChange,
   mockHandleResponseBodyChange,
-  mockToastSuccess,
-  mockCopy,
   mockIsPrivateOrLocalAddress,
 } = vi.hoisted(() => ({
   mockHandleStatusCodeChange: vi.fn(),
@@ -27,40 +25,9 @@ const {
   mockHandleParamsChange: vi.fn(),
   mockHandleBodyChange: vi.fn(),
   mockHandleResponseBodyChange: vi.fn(),
-  mockToastSuccess: vi.fn(),
-  mockCopy: vi.fn(),
   mockIsPrivateOrLocalAddress: vi.fn((_url: string) => false),
 }))
 
-vi.mock('@langgenius/dify-ui/toast', () => ({
-  toast: {
-    success: mockToastSuccess,
-  },
-}))
-
-vi.mock('copy-to-clipboard', () => ({
-  default: mockCopy,
-}))
-
-vi.mock('@/app/components/base/input-with-copy', () => ({
-  default: ({
-    value,
-    placeholder,
-    onCopy,
-  }: {
-    value: string
-    placeholder: string
-    onCopy: () => void
-  }) => (
-    <div>
-      <input value={value} placeholder={placeholder} readOnly />
-      <button data-testid="copy-input" type="button" onClick={onCopy}>
-        Copy
-      </button>
-    </div>
-  ),
-}))
-
 vi.mock('@/app/components/workflow/nodes/_base/components/field', () => ({
   default: ({ title, children }: { title: string; children: React.ReactNode }) => (
     <div>
@@ -241,14 +208,6 @@ describe('WebhookTriggerPanel', () => {
       expect(mockGenerateWebhookUrl).not.toHaveBeenCalled()
     })
 
-    it('should keep the content type selector aligned with the webhook url row width', () => {
-      render(<Panel {...panelProps} />)
-
-      const contentTypeTrigger = screen.getAllByRole('combobox')[1]
-
-      expect(contentTypeTrigger).toHaveClass('w-full')
-    })
-
     it('should request a webhook url when the node is writable and missing one', async () => {
       mockConfigState.inputs = {
         ...mockConfigState.inputs,
@@ -287,11 +246,28 @@ describe('WebhookTriggerPanel', () => {
   })
 
   describe('Interactions', () => {
-    it('should handle method, content type, table, response, and copy actions', async () => {
+    it('copies the labeled readonly webhook URL without editing it', async () => {
+      const user = userEvent.setup()
+      render(<Panel {...panelProps} />)
+      const input = screen.getByRole('textbox', {
+        name: 'workflow.nodes.triggerWebhook.webhookUrl',
+      })
+      expect(input).toHaveAttribute('readonly')
+      await user.click(screen.getByText('workflow.nodes.triggerWebhook.webhookUrl'))
+      expect(input).toHaveFocus()
+      await user.click(
+        screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' }),
+      )
+      expect(await navigator.clipboard.readText()).toBe('https://example.com/webhook')
+      expect(
+        await screen.findByRole('button', { name: 'workflow.nodes.triggerWebhook.urlCopied' }),
+      ).toHaveFocus()
+    })
+
+    it('should handle method, content type, table, and response actions', async () => {
       const user = userEvent.setup()
       render(<Panel {...panelProps} />)
 
-      fireEvent.click(screen.getByTestId('copy-input'))
       await user.click(screen.getAllByRole('combobox')[0]!)
       await user.click(await screen.findByRole('option', { name: 'GET' }))
       await user.click(screen.getAllByRole('combobox')[1]!)
@@ -302,7 +278,6 @@ describe('WebhookTriggerPanel', () => {
       fireEvent.change(screen.getByDisplayValue('ok'), { target: { value: 'updated body' } })
       fireEvent.click(screen.getByTestId('toggle-output-vars'))
 
-      expect(mockToastSuccess).toHaveBeenCalledWith('workflow.nodes.triggerWebhook.urlCopied')
       expect(mockHandleMethodChange).toHaveBeenCalledWith('GET')
       expect(mockHandleContentTypeChange).toHaveBeenCalledWith('text/plain')
       expect(mockHandleParamsChange).toHaveBeenCalledWith([
@@ -317,8 +292,8 @@ describe('WebhookTriggerPanel', () => {
       expect(mockHandleResponseBodyChange).toHaveBeenCalledWith('updated body')
     })
 
-    it('should render the debug url card, copy it, and show the private-address warning', () => {
-      vi.useFakeTimers()
+    it('copies the debug URL from the keyboard and announces success while keeping its visible name', async () => {
+      const user = userEvent.setup()
       mockIsPrivateOrLocalAddress.mockReturnValue(true)
       mockConfigState.inputs = {
         ...mockConfigState.inputs,
@@ -327,15 +302,26 @@ describe('WebhookTriggerPanel', () => {
 
       render(<Panel {...panelProps} />)
 
-      fireEvent.click(screen.getByText('http://127.0.0.1:8000/debug'))
-
-      expect(mockCopy).toHaveBeenCalledWith('http://127.0.0.1:8000/debug')
+      const button = screen.getByRole('button', {
+        name: 'workflow.nodes.triggerWebhook.debugUrlTitle http://127.0.0.1:8000/debug workflow.nodes.triggerWebhook.debugUrlCopy',
+      })
+      await user.click(
+        screen.getByRole('textbox', { name: 'workflow.nodes.triggerWebhook.webhookUrl' }),
+      )
+      await user.tab()
+      await user.tab()
+      expect(button).toHaveFocus()
+      await user.keyboard('{Enter}')
+      expect(await navigator.clipboard.readText()).toBe('http://127.0.0.1:8000/debug')
+      await waitFor(() =>
+        expect(screen.getByRole('status')).toHaveTextContent(
+          'workflow.nodes.triggerWebhook.debugUrlCopied',
+        ),
+      )
+      expect(button).toHaveFocus()
       expect(
         screen.getByText('workflow.nodes.triggerWebhook.debugUrlPrivateAddressWarning'),
       ).toBeInTheDocument()
-
-      vi.runAllTimers()
-      vi.useRealTimers()
     })
   })
 })
diff --git a/web/app/components/workflow/nodes/trigger-webhook/panel.tsx b/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
index c4c0b52bd5a..96f8b3d3971 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
@@ -1,6 +1,7 @@
 import type { FC } from 'react'
 import type { HttpMethod, WebhookTriggerNodeType } from './types'
 import type { NodePanelProps } from '@/app/components/workflow/types'
+import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group'
 import {
   NumberField,
   NumberFieldControls,
@@ -17,14 +18,14 @@ import {
   SelectItemText,
   SelectLabel,
   SelectTrigger,
+  SelectValue,
 } from '@langgenius/dify-ui/select'
-import { toast } from '@langgenius/dify-ui/toast'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
-import copy from 'copy-to-clipboard'
+import { useClipboard } from 'foxact/use-clipboard'
 import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useId, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import InputWithCopy from '@/app/components/base/input-with-copy'
+import { CopyFeedback } from '@/app/components/base/copy-feedback'
 import Field from '@/app/components/workflow/nodes/_base/components/field'
 import OutputVars from '@/app/components/workflow/nodes/_base/components/output-vars'
 import Split from '@/app/components/workflow/nodes/_base/components/split'
@@ -83,8 +84,8 @@ const WebhookMethodSelector = ({
       disabled={disabled}
       onValueChange={handleMethodChange}
     >
-      <SelectTrigger aria-label={label} className="h-8 pr-8 text-sm">
-        {selectedMethod?.name}
+      <SelectTrigger aria-label={label}>
+        <SelectValue>{selectedMethod?.name}</SelectValue>
       </SelectTrigger>
       <SelectContent className="w-26 min-w-26">
         {HTTP_METHODS.map((item) => (
@@ -100,7 +101,8 @@ const WebhookMethodSelector = ({
 
 const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({ id, data }) => {
   const { t } = useTranslation()
-  const [debugUrlCopied, setDebugUrlCopied] = React.useState(false)
+  const webhookUrlId = useId()
+  const { copied: debugUrlCopied, copy: copyDebugUrl } = useClipboard({ timeout: 2000 })
   const [outputVarsCollapsed, setOutputVarsCollapsed] = useState(false)
   const {
     readOnly,
@@ -129,9 +131,18 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({ id, data }) => {
 
   return (
     <div className="mt-2">
+      <span role="status" className="sr-only">
+        {debugUrlCopied ? t(($) => $[`${i18nPrefix}.debugUrlCopied`], { ns: 'workflow' }) : ''}
+      </span>
       <div className="space-y-4 px-4 pt-2 pb-3">
         {/* Webhook URL Section */}
-        <Field title={t(($) => $[`${i18nPrefix}.webhookUrl`], { ns: 'workflow' })}>
+        <Field
+          title={
+            <label htmlFor={webhookUrlId}>
+              {t(($) => $[`${i18nPrefix}.webhookUrl`], { ns: 'workflow' })}
+            </label>
+          }
+        >
           <div className="space-y-1">
             <div className="flex gap-1" style={{ height: '32px' }}>
               <div className="w-26 shrink-0">
@@ -143,18 +154,23 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({ id, data }) => {
                   onChange={handleMethodChange}
                 />
               </div>
-              <div className="flex-1" style={{ width: '284px' }}>
-                <InputWithCopy
+              <InputGroup className="min-w-0 flex-1">
+                <InputGroupInput
+                  id={webhookUrlId}
                   value={inputs.webhook_url || ''}
                   placeholder={t(($) => $[`${i18nPrefix}.webhookUrlPlaceholder`], {
                     ns: 'workflow',
                   })}
                   readOnly
-                  onCopy={() => {
-                    toast.success(t(($) => $[`${i18nPrefix}.urlCopied`], { ns: 'workflow' }))
-                  }}
                 />
-              </div>
+                <InputGroupAddon align="inline-end" className="pe-2">
+                  <CopyFeedback
+                    content={inputs.webhook_url || ''}
+                    copiedLabel={t(($) => $[`${i18nPrefix}.urlCopied`], { ns: 'workflow' })}
+                    className="size-4 rounded-sm p-0 [&>span]:size-3.5"
+                  />
+                </InputGroupAddon>
+              </InputGroup>
             </div>
             {inputs.webhook_debug_url && (
               <div className="space-y-2">
@@ -163,16 +179,14 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({ id, data }) => {
                     render={
                       <button
                         type="button"
-                        aria-label={t(($) => $[`${i18nPrefix}.debugUrlCopy`], { ns: 'workflow' })}
-                        className="flex cursor-pointer gap-1.5 rounded-lg px-1 py-1.5 text-left transition-colors"
+                        className="flex cursor-pointer gap-1.5 rounded-lg px-1 py-1.5 text-left outline-hidden transition-colors focus-visible:ring-2 focus-visible:ring-state-accent-solid"
                         style={{ width: '368px', height: '38px' }}
                         onClick={() => {
-                          copy(inputs.webhook_debug_url || '')
-                          setDebugUrlCopied(true)
-                          setTimeout(() => setDebugUrlCopied(false), 2000)
+                          copyDebugUrl(inputs.webhook_debug_url || '')
                         }}
                       >
                         <span
+                          aria-hidden="true"
                           className="mt-0.5 w-0.5 bg-divider-regular"
                           style={{ height: '28px' }}
                         />
@@ -184,11 +198,15 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({ id, data }) => {
                             {inputs.webhook_debug_url}
                           </span>
                         </span>
+                        <span className="sr-only">
+                          {t(($) => $[`${i18nPrefix}.debugUrlCopy`], { ns: 'workflow' })}
+                        </span>
                       </button>
                     }
                   />
                   <TooltipContent
-                    placement="top"
+                    placement="bottom"
+                    sideOffset={4}
                     className="rounded-md border border-components-panel-border bg-components-tooltip-bg px-1.5 py-1 system-xs-regular text-text-primary shadow-lg backdrop-blur-xs"
                   >
                     {debugUrlCopied
@@ -208,29 +226,27 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({ id, data }) => {
 
         {/* Content Type */}
         <Field title={t(($) => $[`${i18nPrefix}.contentType`], { ns: 'workflow' })}>
-          <div className="w-full max-w-98">
-            <Select
-              key={`${id}-content-type-${inputs.content_type}`}
-              value={selectedContentType?.value ?? null}
-              disabled={readOnly}
-              onValueChange={(value) => value && handleContentTypeChange(value)}
-            >
-              <SelectLabel className="sr-only">
-                {t(($) => $[`${i18nPrefix}.contentType`], { ns: 'workflow' })}
-              </SelectLabel>
-              <SelectTrigger className="h-8 w-full text-sm">
-                {selectedContentType?.name}
-              </SelectTrigger>
-              <SelectContent>
-                {CONTENT_TYPES.map((item) => (
-                  <SelectItem key={item.value} value={item.value}>
-                    <SelectItemText>{item.name}</SelectItemText>
-                    <SelectItemIndicator />
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
+          <Select
+            key={`${id}-content-type-${inputs.content_type}`}
+            value={selectedContentType?.value ?? null}
+            disabled={readOnly}
+            onValueChange={(value) => value && handleContentTypeChange(value)}
+          >
+            <SelectLabel className="sr-only">
+              {t(($) => $[`${i18nPrefix}.contentType`], { ns: 'workflow' })}
+            </SelectLabel>
+            <SelectTrigger>
+              <SelectValue>{selectedContentType?.name}</SelectValue>
+            </SelectTrigger>
+            <SelectContent>
+              {CONTENT_TYPES.map((item) => (
+                <SelectItem key={item.value} value={item.value}>
+                  <SelectItemText>{item.name}</SelectItemText>
+                  <SelectItemIndicator />
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
         </Field>
 
         {/* Query Parameters */}
diff --git a/web/app/components/workflow/panel/__tests__/inputs-panel.spec.tsx b/web/app/components/workflow/panel/__tests__/inputs-panel.spec.tsx
index 65fdabf5e06..e2e43322165 100644
--- a/web/app/components/workflow/panel/__tests__/inputs-panel.spec.tsx
+++ b/web/app/components/workflow/panel/__tests__/inputs-panel.spec.tsx
@@ -115,7 +115,7 @@ describe('InputsPanel', () => {
       )
 
       expect(screen.getByDisplayValue('overridden question')).toHaveFocus()
-      expect(screen.getByRole('spinbutton')).toHaveValue(2)
+      expect(screen.getByRole('textbox', { name: 'Count' })).toHaveValue('2')
       expect(screen.getByText('common.imageUploader.pasteImageLink')).toBeInTheDocument()
     })
   })
diff --git a/web/app/components/workflow/panel/env-panel/variable-modal.tsx b/web/app/components/workflow/panel/env-panel/variable-modal.tsx
index 3f0672806cb..ca843b1868e 100644
--- a/web/app/components/workflow/panel/env-panel/variable-modal.tsx
+++ b/web/app/components/workflow/panel/env-panel/variable-modal.tsx
@@ -1,14 +1,17 @@
 import type { EnvironmentVariable, EnvironmentVariableValue } from '@/app/components/workflow/types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Field, FieldLabel } from '@langgenius/dify-ui/field'
 import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Input } from '@langgenius/dify-ui/input'
+import { NumberField, NumberFieldGroup, NumberFieldInput } from '@langgenius/dify-ui/number-field'
+import { Textarea } from '@langgenius/dify-ui/textarea'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { v4 as uuid4 } from 'uuid'
 import { Infotip } from '@/app/components/base/infotip'
-import Input from '@/app/components/base/input'
 import { isLLMEnvironmentVariableValue } from '@/app/components/workflow/llm-environment-variable'
 import { LLMEnvironmentVariableValueField } from '@/app/components/workflow/llm-environment-variable-value-field'
 import { useWorkflowStore } from '@/app/components/workflow/store'
@@ -69,7 +72,11 @@ const VariableModal = ({ env, onClose, onSave }: ModalPropsType) => {
     }
 
     if (nextType === 'number') {
-      if (value === undefined || value === '' || Number.isNaN(Number(value))) setValue('')
+      setValue(
+        value === undefined || value === '' || !Number.isFinite(Number(value))
+          ? undefined
+          : Number(value),
+      )
       return
     }
 
@@ -107,7 +114,7 @@ const VariableModal = ({ env, onClose, onSave }: ModalPropsType) => {
       id: env ? env.id : uuid4(),
       value_type: type,
       name,
-      value: type === 'number' ? Number(value) : value,
+      value,
       description,
     })
     onClose()
@@ -124,7 +131,11 @@ const VariableModal = ({ env, onClose, onSave }: ModalPropsType) => {
   }, [env, workflowStore])
 
   return (
-    <div
+    <form
+      onSubmit={(event) => {
+        event.preventDefault()
+        handleSave()
+      }}
       className={cn(
         'flex h-full w-90 flex-col rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-2xl',
       )}
@@ -212,78 +223,79 @@ const VariableModal = ({ env, onClose, onSave }: ModalPropsType) => {
           </div>
         </div>
         {/* name */}
-        <div className="mb-4">
-          <div className="mb-1 flex h-6 items-center system-sm-semibold text-text-secondary">
+        <Field name="name" className="mb-4">
+          <FieldLabel className="system-sm-semibold">
             {t(($) => $['env.modal.name'], { ns: 'workflow' })}
-          </div>
-          <div className="flex">
-            <Input
-              placeholder={t(($) => $['env.modal.namePlaceholder'], { ns: 'workflow' }) || ''}
-              value={name}
-              onChange={handleVarNameChange}
-              onBlur={(e) => checkVariableName(e.target.value)}
-              type="text"
-            />
-          </div>
-        </div>
+          </FieldLabel>
+          <Input
+            placeholder={t(($) => $['env.modal.namePlaceholder'], { ns: 'workflow' }) || ''}
+            value={name}
+            onChange={handleVarNameChange}
+            onBlur={(e) => checkVariableName(e.target.value)}
+            type="text"
+          />
+        </Field>
         {/* value */}
-        <div className="mb-4">
-          <div className="mb-1 flex h-6 items-center system-sm-semibold text-text-secondary">
-            {type === 'llm'
-              ? t(($) => $['modelProvider.model'], { ns: 'common' })
-              : t(($) => $['env.modal.value'], { ns: 'workflow' })}
-          </div>
-          <div className="flex">
-            {type === 'llm' ? (
-              <LLMEnvironmentVariableValueField
-                value={isLLMEnvironmentVariableValue(value) ? value : undefined}
-                requiredMode={originalLLMMode}
-                popupClassName="w-[328px]! max-w-[328px]!"
-                onChange={setValue}
-              />
-            ) : type !== 'number' ? (
-              <textarea
-                className="block h-20 w-full resize-none appearance-none rounded-lg border border-transparent bg-components-input-bg-normal p-2 system-sm-regular text-components-input-text-filled caret-primary-600 outline-hidden placeholder:system-sm-regular placeholder:text-components-input-text-placeholder hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active focus:bg-components-input-bg-active focus:shadow-xs"
-                value={typeof value === 'string' || typeof value === 'number' ? value : ''}
-                placeholder={t(($) => $['env.modal.valuePlaceholder'], { ns: 'workflow' }) || ''}
-                onChange={(e) => setValue(e.target.value)}
-              />
-            ) : (
-              <Input
-                placeholder={t(($) => $['env.modal.valuePlaceholder'], { ns: 'workflow' }) || ''}
-                value={typeof value === 'string' || typeof value === 'number' ? value : ''}
-                onChange={(e) => setValue(e.target.value)}
-                type="number"
-              />
-            )}
-          </div>
-        </div>
-        {/* description */}
-        <div className="">
-          <div className="mb-1 flex h-6 items-center system-sm-semibold text-text-secondary">
-            {t(($) => $['env.modal.description'], { ns: 'workflow' })}
-          </div>
-          <div className="flex">
-            <textarea
-              className="block h-20 w-full resize-none appearance-none rounded-lg border border-transparent bg-components-input-bg-normal p-2 system-sm-regular text-components-input-text-filled caret-primary-600 outline-hidden placeholder:system-sm-regular placeholder:text-components-input-text-placeholder hover:border-components-input-border-hover hover:bg-components-input-bg-hover focus:border-components-input-border-active focus:bg-components-input-bg-active focus:shadow-xs"
-              value={description}
-              placeholder={
-                t(($) => $['env.modal.descriptionPlaceholder'], { ns: 'workflow' }) || ''
-              }
-              onChange={(e) => setDescription(e.target.value)}
+        <Field name="value" className="mb-4">
+          {type === 'llm' ? (
+            <div className="py-1 system-sm-semibold text-text-secondary">
+              {t(($) => $['modelProvider.model'], { ns: 'common' })}
+            </div>
+          ) : (
+            <FieldLabel className="system-sm-semibold">
+              {t(($) => $['env.modal.value'], { ns: 'workflow' })}
+            </FieldLabel>
+          )}
+          {type === 'llm' ? (
+            <LLMEnvironmentVariableValueField
+              value={isLLMEnvironmentVariableValue(value) ? value : undefined}
+              requiredMode={originalLLMMode}
+              popupClassName="w-[328px]! max-w-[328px]!"
+              onChange={setValue}
             />
-          </div>
-        </div>
+          ) : type !== 'number' ? (
+            <Textarea
+              className="h-20 p-2"
+              value={typeof value === 'string' || typeof value === 'number' ? value : ''}
+              placeholder={t(($) => $['env.modal.valuePlaceholder'], { ns: 'workflow' }) || ''}
+              onValueChange={(value) => setValue(value)}
+            />
+          ) : (
+            <NumberField
+              step="any"
+              value={typeof value === 'number' ? value : null}
+              onValueChange={(value) => setValue(value ?? undefined)}
+            >
+              <NumberFieldGroup>
+                <NumberFieldInput
+                  placeholder={t(($) => $['env.modal.valuePlaceholder'], { ns: 'workflow' })}
+                />
+              </NumberFieldGroup>
+            </NumberField>
+          )}
+        </Field>
+        {/* description */}
+        <Field name="description">
+          <FieldLabel className="system-sm-semibold">
+            {t(($) => $['env.modal.description'], { ns: 'workflow' })}
+          </FieldLabel>
+          <Textarea
+            className="h-20 p-2"
+            value={description}
+            placeholder={t(($) => $['env.modal.descriptionPlaceholder'], { ns: 'workflow' }) || ''}
+            onValueChange={(value) => setDescription(value)}
+          />
+        </Field>
       </div>
       <div className="flex flex-row-reverse rounded-b-2xl p-4 pt-2">
         <div className="flex gap-2">
           <Button onClick={onClose}>{t(($) => $['operation.cancel'], { ns: 'common' })}</Button>
-          <Button variant="primary" onClick={handleSave}>
+          <Button variant="primary" type="submit">
             {t(($) => $['operation.save'], { ns: 'common' })}
           </Button>
         </div>
       </div>
-    </div>
+    </form>
   )
 }
 

From 93895fa7fb4ab3547532734ba54d4461e9971ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E7=8E=AE=20=28Jade=20Lin=29?=
 <linw1995@icloud.com>
Date: Thu, 17 Sep 2026 07:05:02 +0000
Subject: [PATCH 22/28] feat(agent): add roster package export foundation
 (#42066)

---
 api/.env.example                              |    6 +
 api/configs/feature/__init__.py               |   30 +
 api/libs/zip_filename_recovery.py             |  158 ++
 .../agent/config_skill_normalize_service.py   |   21 +-
 api/services/agent/dependency_service.py      |   65 +
 api/services/agent/dsl_entities.py            |  142 +-
 api/services/agent/dsl_service.py             |   26 +-
 api/services/agent/errors.py                  |   18 +
 api/services/agent/roster_package_entities.py |  202 +++
 api/services/agent/roster_package_exporter.py |  468 ++++++
 api/services/agent/roster_package_reader.py   |  346 ++++
 api/services/agent/skill_package_service.py   |  146 +-
 api/services/agent_config_service.py          |    4 +-
 api/services/app_dsl_service.py               |   59 +-
 api/services/entities/dsl_entities.py         |   19 +
 api/services/skill_management_service.py      |  123 +-
 .../unit_tests/configs/test_dify_config.py    |    7 +-
 .../libs/test_zip_filename_recovery.py        |   94 ++
 .../services/agent/test_agent_dsl_service.py  |  152 +-
 .../services/agent/test_agent_services.py     |   13 +-
 .../agent/test_roster_package_service.py      | 1387 +++++++++++++++++
 .../agent/test_skill_package_service.py       |  319 ++--
 .../services/test_agent_config_service.py     |    2 +-
 .../services/test_app_dsl_service.py          |   55 +
 .../services/test_skill_management_service.py |   51 +-
 docker/envs/core-services/shared.env.example  |    6 +
 26 files changed, 3549 insertions(+), 370 deletions(-)
 create mode 100644 api/libs/zip_filename_recovery.py
 create mode 100644 api/services/agent/dependency_service.py
 create mode 100644 api/services/agent/roster_package_entities.py
 create mode 100644 api/services/agent/roster_package_exporter.py
 create mode 100644 api/services/agent/roster_package_reader.py
 create mode 100644 api/tests/unit_tests/libs/test_zip_filename_recovery.py
 create mode 100644 api/tests/unit_tests/services/agent/test_roster_package_service.py

diff --git a/api/.env.example b/api/.env.example
index 0bf7b9493ac..7d3ff606049 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -460,6 +460,12 @@ UPLOAD_IMAGE_FILE_SIZE_LIMIT=10
 UPLOAD_VIDEO_FILE_SIZE_LIMIT=100
 UPLOAD_AUDIO_FILE_SIZE_LIMIT=50
 UPLOAD_SKILL_FILE_SIZE_LIMIT=50
+SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES=209715200
+SKILL_PACKAGE_MAX_ENTRIES=5000
+SKILL_PACKAGE_MAX_SKILL_MD_BYTES=1048576
+AGENT_PACKAGE_MAX_BYTES=536870912
+AGENT_PACKAGE_MAX_MANIFEST_BYTES=5242880
+AGENT_PACKAGE_MAX_ENTRIES=5000
 
 # Comma-separated list of file extensions blocked from upload for security reasons.
 # Extensions should be lowercase without dots (e.g., exe,bat,sh,dll).
diff --git a/api/configs/feature/__init__.py b/api/configs/feature/__init__.py
index facc092575e..f3eabbafcb9 100644
--- a/api/configs/feature/__init__.py
+++ b/api/configs/feature/__init__.py
@@ -481,6 +481,36 @@ class FileUploadConfig(BaseSettings):
         default=50,
     )
 
+    SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES: PositiveInt = Field(
+        description="Maximum total uncompressed size of a Skill package in bytes",
+        default=200 * 1024 * 1024,
+    )
+
+    SKILL_PACKAGE_MAX_ENTRIES: PositiveInt = Field(
+        description="Maximum number of entries in a Skill package",
+        default=5000,
+    )
+
+    SKILL_PACKAGE_MAX_SKILL_MD_BYTES: PositiveInt = Field(
+        description="Maximum allowed SKILL.md size in bytes",
+        default=1 * 1024 * 1024,
+    )
+
+    AGENT_PACKAGE_MAX_BYTES: PositiveInt = Field(
+        description="Maximum allowed Agent package size in bytes",
+        default=512 * 1024 * 1024,
+    )
+
+    AGENT_PACKAGE_MAX_MANIFEST_BYTES: PositiveInt = Field(
+        description="Maximum allowed size of each Agent package YAML document in bytes",
+        default=5 * 1024 * 1024,
+    )
+
+    AGENT_PACKAGE_MAX_ENTRIES: PositiveInt = Field(
+        description="Maximum number of entries in an Agent package",
+        default=5000,
+    )
+
     BATCH_UPLOAD_LIMIT: NonNegativeInt = Field(
         description="Maximum number of files allowed in a batch upload operation",
         default=20,
diff --git a/api/libs/zip_filename_recovery.py b/api/libs/zip_filename_recovery.py
new file mode 100644
index 00000000000..9b813e7b1a9
--- /dev/null
+++ b/api/libs/zip_filename_recovery.py
@@ -0,0 +1,158 @@
+"""Read malformed UTF-8 ZIP names without weakening payload integrity checks."""
+
+from __future__ import annotations
+
+import io
+import struct
+import zipfile
+from dataclasses import dataclass
+
+_UTF8_FLAG = 1 << 11
+_END_RECORD = struct.Struct("<4s4H2IH")
+_CENTRAL_HEADER = struct.Struct("<4s6H3I5H2I")
+_LOCAL_HEADER = struct.Struct("<4s5H3I2H")
+_ZIP64_LOCATOR = struct.Struct("<4sIQI")
+_ZIP64_END_RECORD = struct.Struct("<4sQ2H2I4Q")
+
+
+@dataclass(frozen=True)
+class _Directory:
+    start: int
+    end: int
+    entries: int
+    prefix_size: int
+
+
+def _locate_directory(content: bytes) -> _Directory:
+    end = content.rfind(b"PK\x05\x06", max(0, len(content) - 65535 - _END_RECORD.size))
+    if end < 0 or end + _END_RECORD.size > len(content):
+        raise zipfile.BadZipFile("Missing ZIP end record")
+    _, disk, directory_disk, disk_entries, entries, size, offset, comment_size = _END_RECORD.unpack_from(content, end)
+    if end + _END_RECORD.size + comment_size != len(content):
+        raise zipfile.BadZipFile("Invalid ZIP comment length")
+
+    locator_position = end - _ZIP64_LOCATOR.size
+    if locator_position >= 0 and content[locator_position : locator_position + 4] == b"PK\x06\x07":
+        _, record_disk, record_offset, disks = _ZIP64_LOCATOR.unpack_from(content, locator_position)
+        if record_disk != 0 or disks != 1:
+            raise zipfile.BadZipFile("Multi-disk ZIP64 archives are not supported")
+        record_position = record_offset
+        if record_position + _ZIP64_END_RECORD.size > locator_position:
+            raise zipfile.BadZipFile("Invalid ZIP64 end record offset")
+        if content[record_position : record_position + 4] != b"PK\x06\x06":
+            # Match zipfile's handling of prepended data: in this case it
+            # locates the fixed-size ZIP64 record immediately before the locator.
+            record_position = locator_position - _ZIP64_END_RECORD.size
+        if record_position < 0:
+            raise zipfile.BadZipFile("Missing ZIP64 end record")
+        signature, record_size, _, _, disk, directory_disk, disk_entries, entries, size, offset = (
+            _ZIP64_END_RECORD.unpack_from(content, record_position)
+        )
+        if (
+            signature != b"PK\x06\x06"
+            or record_size + 12 != locator_position - record_position
+            or offset + size != record_offset
+        ):
+            raise zipfile.BadZipFile("Invalid ZIP64 end record")
+        end = record_position
+    elif entries == 0xFFFF or size == 0xFFFFFFFF or offset == 0xFFFFFFFF:
+        raise zipfile.BadZipFile("Missing ZIP64 directory information")
+
+    start = end - size
+    prefix_size = start - offset
+    if disk != 0 or directory_disk != 0 or disk_entries != entries:
+        raise zipfile.BadZipFile("Multi-disk ZIP archives are not supported")
+    if start < 0 or prefix_size < 0 or entries > size // _CENTRAL_HEADER.size:
+        raise zipfile.BadZipFile("Invalid ZIP directory bounds")
+    return _Directory(start=start, end=end, entries=entries, prefix_size=prefix_size)
+
+
+def _local_header_offset(*, offset: int, file_size: int, compressed_size: int, extra: bytes) -> int:
+    if offset != 0xFFFFFFFF:
+        return offset
+    cursor = 0
+    while cursor + 4 <= len(extra):
+        tag, size = struct.unpack_from("<HH", extra, cursor)
+        cursor += 4
+        if cursor + size > len(extra):
+            raise zipfile.BadZipFile("Truncated ZIP extra field")
+        if tag == 1:
+            # ZIP64 includes only values whose corresponding 32-bit field
+            # contains the sentinel, in size/compressed-size/offset order.
+            skipped = 8 * (int(file_size == 0xFFFFFFFF) + int(compressed_size == 0xFFFFFFFF))
+            if skipped + 8 > size:
+                raise zipfile.BadZipFile("Missing ZIP64 local header offset")
+            return struct.unpack_from("<Q", extra, cursor + skipped)[0]
+        cursor += size
+    raise zipfile.BadZipFile("Missing ZIP64 extra field")
+
+
+def open_zip_with_replacement_names(content: bytes) -> zipfile.ZipFile:
+    """Open a bounded ZIP, replacing invalid UTF-8 name bytes with U+FFFD.
+
+    The normal path delegates entirely to zipfile. For a damaged directory,
+    temporarily read affected names as CP437 (a reversible byte mapping), and
+    expose their lossy UTF-8 form through ZipInfo.filename. orig_filename stays
+    byte-preserving so zipfile still checks local/central name consistency.
+    Callers must reject collisions and unsafe paths in the recovered names.
+    """
+    try:
+        return zipfile.ZipFile(io.BytesIO(content))
+    except UnicodeDecodeError:
+        pass
+
+    directory = _locate_directory(content)
+
+    patched = bytearray(content)
+    recovered: dict[int, str] = {}
+    cursor = directory.start
+    for index in range(directory.entries):
+        if cursor + _CENTRAL_HEADER.size > directory.end:
+            raise zipfile.BadZipFile("Truncated ZIP directory")
+        header = _CENTRAL_HEADER.unpack_from(content, cursor)
+        if header[0] != b"PK\x01\x02":
+            raise zipfile.BadZipFile("Invalid ZIP directory header")
+        flags, name_size, extra_size, entry_comment_size = header[3], header[10], header[11], header[12]
+        name_start = cursor + _CENTRAL_HEADER.size
+        next_cursor = name_start + name_size + extra_size + entry_comment_size
+        if next_cursor > directory.end:
+            raise zipfile.BadZipFile("Truncated ZIP directory name")
+        raw_name = content[name_start : name_start + name_size]
+        if flags & _UTF8_FLAG:
+            try:
+                raw_name.decode("utf-8")
+            except UnicodeDecodeError:
+                extra_start = name_start + name_size
+                local_offset = (
+                    _local_header_offset(
+                        offset=header[16],
+                        file_size=header[9],
+                        compressed_size=header[8],
+                        extra=content[extra_start : extra_start + extra_size],
+                    )
+                    + directory.prefix_size
+                )
+                if local_offset < 0 or local_offset + _LOCAL_HEADER.size > directory.start:
+                    raise zipfile.BadZipFile("Invalid ZIP local header offset")
+                local = _LOCAL_HEADER.unpack_from(content, local_offset)
+                local_name_start = local_offset + _LOCAL_HEADER.size
+                if (
+                    local[0] != b"PK\x03\x04"
+                    or local[9] != name_size
+                    or content[local_name_start : local_name_start + local[9]] != raw_name
+                    or not local[2] & _UTF8_FLAG
+                ):
+                    raise zipfile.BadZipFile("ZIP local and directory names differ")
+                struct.pack_into("<H", patched, cursor + 8, flags & ~_UTF8_FLAG)
+                struct.pack_into("<H", patched, local_offset + 6, local[2] & ~_UTF8_FLAG)
+                recovered[index] = raw_name.decode("utf-8", errors="replace")
+        cursor = next_cursor
+    if cursor != directory.end:
+        raise zipfile.BadZipFile("ZIP directory length mismatch")
+
+    archive = zipfile.ZipFile(io.BytesIO(patched))
+    for index, info in enumerate(archive.infolist()):
+        if index in recovered:
+            info.filename = recovered[index]
+    archive.NameToInfo = {info.filename: info for info in archive.infolist()}
+    return archive
diff --git a/api/services/agent/config_skill_normalize_service.py b/api/services/agent/config_skill_normalize_service.py
index 7093b49ce1c..51aee675137 100644
--- a/api/services/agent/config_skill_normalize_service.py
+++ b/api/services/agent/config_skill_normalize_service.py
@@ -9,7 +9,7 @@ from __future__ import annotations
 
 from core.tools.tool_file_manager import ToolFileManager
 from models.agent_config_entities import AgentConfigSkillRefConfig, validate_config_skill_name
-from services.agent.skill_package_service import NormalizedSkillPackage, SkillPackageError, SkillPackageService
+from services.agent.skill_package_service import SkillPackageError, SkillPackageService
 
 
 class ConfigSkillNormalizeService:
@@ -32,7 +32,7 @@ class ConfigSkillNormalizeService:
         requested_name: str | None,
         tenant_id: str,
         user_id: str,
-    ) -> tuple[AgentConfigSkillRefConfig, NormalizedSkillPackage]:
+    ) -> AgentConfigSkillRefConfig:
         package = self._package.validate_and_normalize(content=content, filename=filename)
         normalized_name = validate_config_skill_name(requested_name or package.manifest.name)
         if package.manifest.name != normalized_name:
@@ -50,16 +50,13 @@ class ConfigSkillNormalizeService:
             mimetype="application/zip",
             filename=f"{normalized_name}.zip",
         )
-        return (
-            AgentConfigSkillRefConfig(
-                name=normalized_name,
-                description=package.manifest.description,
-                file_id=tool_file.id,
-                size=tool_file.size,
-                hash=package.manifest.hash,
-                mime_type=tool_file.mimetype,
-            ),
-            package,
+        return AgentConfigSkillRefConfig(
+            name=normalized_name,
+            description=package.manifest.description,
+            file_id=tool_file.id,
+            size=tool_file.size,
+            hash=package.manifest.hash,
+            mime_type=tool_file.mimetype,
         )
 
 
diff --git a/api/services/agent/dependency_service.py b/api/services/agent/dependency_service.py
new file mode 100644
index 00000000000..b523cb3d039
--- /dev/null
+++ b/api/services/agent/dependency_service.py
@@ -0,0 +1,65 @@
+"""Plugin dependency discovery shared by portable Agent formats."""
+
+from models.agent_config_entities import (
+    AgentKnowledgeMetadataFilteringConfig,
+    AgentKnowledgeRetrievalConfig,
+    AgentSoulConfig,
+)
+from services.plugin.dependencies_analysis import DependenciesAnalysisService
+
+
+def _extract_knowledge_retrieval_dependencies(retrieval: AgentKnowledgeRetrievalConfig) -> list[str]:
+    if retrieval.mode == "single":
+        if retrieval.model is None:
+            return []
+        return [DependenciesAnalysisService.analyze_model_provider_dependency(retrieval.model.provider)]
+
+    if not retrieval.reranking_enable:
+        return []
+
+    if retrieval.reranking_mode == "reranking_model":
+        if retrieval.reranking_model is None:
+            return []
+        return [DependenciesAnalysisService.analyze_model_provider_dependency(retrieval.reranking_model.provider)]
+
+    if retrieval.reranking_mode == "weighted_score" and retrieval.weights is not None:
+        vector_setting = retrieval.weights.vector_setting
+        embedding_provider = vector_setting.get("embedding_provider_name") if vector_setting is not None else None
+        if embedding_provider:
+            return [DependenciesAnalysisService.analyze_model_provider_dependency(embedding_provider)]
+
+    return []
+
+
+def _extract_metadata_filtering_dependencies(
+    metadata_filtering: AgentKnowledgeMetadataFilteringConfig,
+) -> list[str]:
+    if metadata_filtering.mode != "automatic" or metadata_filtering.metadata_model_config is None:
+        return []
+    return [
+        DependenciesAnalysisService.analyze_model_provider_dependency(metadata_filtering.metadata_model_config.provider)
+    ]
+
+
+def extract_agent_soul_dependencies(soul: AgentSoulConfig) -> list[str]:
+    dependencies: list[str] = []
+    if soul.model is not None:
+        dependencies.append(DependenciesAnalysisService.analyze_model_provider_dependency(soul.model.model_provider))
+    suggested_questions = soul.app_features.suggested_questions_after_answer
+    if suggested_questions is not None and suggested_questions.model is not None:
+        dependencies.append(
+            DependenciesAnalysisService.analyze_model_provider_dependency(suggested_questions.model.provider)
+        )
+    for tool in soul.tools.dify_tools:
+        provider_id = tool.provider_id or (
+            f"{tool.plugin_id}/{tool.provider}" if tool.plugin_id and tool.provider else None
+        )
+        if provider_id:
+            dependencies.append(DependenciesAnalysisService.analyze_tool_dependency(provider_id))
+    for knowledge_set in soul.knowledge.sets:
+        dependencies.extend(_extract_knowledge_retrieval_dependencies(knowledge_set.retrieval))
+        dependencies.extend(_extract_metadata_filtering_dependencies(knowledge_set.metadata_filtering))
+    return dependencies
+
+
+__all__ = ["extract_agent_soul_dependencies"]
diff --git a/api/services/agent/dsl_entities.py b/api/services/agent/dsl_entities.py
index 5fda1cfd92b..4231e6c4033 100644
--- a/api/services/agent/dsl_entities.py
+++ b/api/services/agent/dsl_entities.py
@@ -3,12 +3,15 @@
 from __future__ import annotations
 
 import hashlib
-from typing import Any, Literal
+from typing import Any, Literal, Self
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, model_validator
 
+from core.plugin.entities.plugin import PluginDependency
 from models.agent import Agent
 from models.agent_config_entities import AgentSoulConfig
+from models.model import App
+from services.entities.dsl_entities import make_app_dsl
 
 AGENT_PACKAGE_SCHEMA_VERSION = 1
 AGENT_PACKAGE_REF_KEY = "package_ref"
@@ -59,6 +62,54 @@ class AgentPackage(BaseModel):
     workspace_skills: list[AgentPackageWorkspaceSkill] = Field(default_factory=list)
 
 
+class AgentAppReference(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    package_ref: str = Field(min_length=1)
+
+
+class AgentAppDsl(BaseModel):
+    """The existing standalone Agent App DSL, also stored as archive app.yaml."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    version: str = Field(min_length=1)
+    kind: Literal["app"]
+    app: dict[str, Any]
+    agent: AgentAppReference
+    agent_packages: dict[str, AgentPackage]
+    dependencies: list[PluginDependency] = Field(default_factory=list)
+
+    @model_validator(mode="after")
+    def validate_agent_app(self) -> Self:
+        if self.app.get("mode") != "agent":
+            raise ValueError("Agent App DSL requires app.mode=agent")
+        if not isinstance(self.app.get("name"), str) or not self.app["name"]:
+            raise ValueError("Agent App DSL requires an app name")
+        if set(self.agent_packages) != {self.agent.package_ref}:
+            raise ValueError("Agent App DSL must contain exactly the referenced Agent package")
+        return self
+
+    @property
+    def package(self) -> AgentPackage:
+        return self.agent_packages[self.agent.package_ref]
+
+
+def make_agent_app_dsl(
+    app: App,
+    *,
+    package_ref: str,
+    packages: dict[str, AgentPackage],
+    dependencies: list[PluginDependency],
+) -> AgentAppDsl:
+    return AgentAppDsl(
+        **make_app_dsl(app),
+        agent=AgentAppReference(package_ref=package_ref),
+        agent_packages=packages,
+        dependencies=dependencies,
+    )
+
+
 def portable_ref(prefix: str, value: str) -> str:
     digest = hashlib.sha256(value.encode()).hexdigest()[:16]
     return f"{prefix}-{digest}"
@@ -87,40 +138,15 @@ def _strip_sensitive_values(value: Any) -> Any:
     return result
 
 
-def make_portable_agent_package(
-    agent: Agent,
-    agent_soul: AgentSoulConfig,
-    workspace_skills: list[AgentPackageWorkspaceSkill] | None = None,
-) -> AgentPackage:
-    """Return a package safe to place in YAML or the system clipboard."""
+def make_portable_agent_soul(agent_soul: AgentSoulConfig) -> AgentSoulConfig:
+    """Return an Agent Soul without workspace-local credentials or identities.
+
+    Resource references are intentionally preserved. Container formats decide
+    whether to omit their payloads, as YAML DSL does, or remap them to
+    package-local identifiers, as Roster packages do.
+    """
 
     soul_data = agent_soul.model_dump(mode="json")
-    omitted_assets = [
-        AgentPackageOmittedAsset(
-            kind="skill",
-            name=item.name,
-            size=item.size,
-            hash=item.hash,
-            mime_type=item.mime_type,
-        )
-        for item in agent_soul.config_skills
-    ]
-    omitted_assets.extend(
-        AgentPackageOmittedAsset(
-            kind="file",
-            name=item.name,
-            size=item.size,
-            hash=item.hash,
-            mime_type=item.mime_type,
-        )
-        for item in agent_soul.config_files
-    )
-    for item in soul_data.get("config_skills", []):
-        item["file_id"] = ""
-        item["is_missing"] = True
-    for item in soul_data.get("config_files", []):
-        item["file_id"] = ""
-        item["is_missing"] = True
 
     if soul_data.get("model"):
         soul_data["model"]["credential_ref"] = None
@@ -155,7 +181,53 @@ def make_portable_agent_package(
         for key in ("id", "contact_id", "human_id", "tenant_id"):
             contact[key] = None
 
-    portable_soul = AgentSoulConfig.model_validate(soul_data)
+    return AgentSoulConfig.model_validate(soul_data)
+
+
+def make_portable_agent_package(
+    agent: Agent,
+    agent_soul: AgentSoulConfig,
+    workspace_skills: list[AgentPackageWorkspaceSkill] | None = None,
+    *,
+    include_assets: bool = False,
+) -> AgentPackage:
+    """Return a portable package for YAML, clipboard, or an asset-bearing archive.
+
+    Archives preserve package-local references to included assets; standalone
+    YAML and clipboard exports mark resources missing because they omit payloads.
+    """
+
+    portable_soul = make_portable_agent_soul(agent_soul)
+    omitted_assets = [
+        AgentPackageOmittedAsset(
+            kind="skill",
+            name=item.name,
+            size=item.size,
+            hash=item.hash,
+            mime_type=item.mime_type,
+        )
+        for item in agent_soul.config_skills
+        if not include_assets or item.is_missing
+    ]
+    omitted_assets.extend(
+        AgentPackageOmittedAsset(
+            kind="file",
+            name=item.name,
+            size=item.size,
+            hash=item.hash,
+            mime_type=item.mime_type,
+        )
+        for item in agent_soul.config_files
+        if not include_assets or item.is_missing
+    )
+    for skill_ref in portable_soul.config_skills:
+        if not include_assets or skill_ref.is_missing:
+            skill_ref.file_id = ""
+            skill_ref.is_missing = True
+    for file_ref in portable_soul.config_files:
+        if not include_assets or file_ref.is_missing:
+            file_ref.file_id = ""
+            file_ref.is_missing = True
     icon_type = agent.icon_type.value if agent.icon_type is not None else None
     return AgentPackage(
         metadata=AgentPackageMetadata(
diff --git a/api/services/agent/dsl_service.py b/api/services/agent/dsl_service.py
index 454c887f901..4d56783296c 100644
--- a/api/services/agent/dsl_service.py
+++ b/api/services/agent/dsl_service.py
@@ -41,6 +41,7 @@ from models.model import App, AppModelConfig
 from models.skill import AgentSkillBinding, AgentSkillBindingSnapshot, Skill
 from models.workflow import Workflow
 from services.agent.agent_soul_state import agent_soul_has_model
+from services.agent.dependency_service import extract_agent_soul_dependencies
 from services.agent.dsl_entities import (
     AGENT_NODE_JOB_DSL_KEY,
     AGENT_PACKAGE_REF_KEY,
@@ -53,7 +54,6 @@ from services.agent.dsl_entities import (
 from services.agent.knowledge_datasets import get_tenant_knowledge_dataset_rows
 from services.agent.roster_service import AgentRosterService
 from services.entities.dsl_entities import DslImportWarning
-from services.plugin.dependencies_analysis import DependenciesAnalysisService
 
 
 class AgentPackageImportResult(BaseModel):
@@ -375,29 +375,7 @@ class AgentDslService:
     def extract_package_dependencies(self, packages: Mapping[str, AgentPackage]) -> list[str]:
         dependencies: list[str] = []
         for package in packages.values():
-            soul = package.soul
-            if soul.model is not None:
-                dependencies.append(
-                    DependenciesAnalysisService.analyze_model_provider_dependency(soul.model.model_provider)
-                )
-            for tool in soul.tools.dify_tools:
-                provider_id = tool.provider_id or (
-                    f"{tool.plugin_id}/{tool.provider}" if tool.plugin_id and tool.provider else None
-                )
-                if provider_id:
-                    dependencies.append(DependenciesAnalysisService.analyze_tool_dependency(provider_id))
-            for knowledge_set in soul.knowledge.sets:
-                retrieval = knowledge_set.retrieval
-                if retrieval.model is not None:
-                    dependencies.append(
-                        DependenciesAnalysisService.analyze_model_provider_dependency(retrieval.model.provider)
-                    )
-                if retrieval.reranking_model is not None:
-                    dependencies.append(
-                        DependenciesAnalysisService.analyze_model_provider_dependency(
-                            retrieval.reranking_model.provider
-                        )
-                    )
+            dependencies.extend(extract_agent_soul_dependencies(package.soul))
         return dependencies
 
     def _workspace_skills_for_export(
diff --git a/api/services/agent/errors.py b/api/services/agent/errors.py
index 89875e4dc74..cda2656c197 100644
--- a/api/services/agent/errors.py
+++ b/api/services/agent/errors.py
@@ -53,6 +53,24 @@ class AgentHomeSnapshotTooLargeError(BaseHTTPException):
     code = 413
 
 
+class InvalidRosterAgentPackageError(BaseHTTPException):
+    error_code = "invalid_roster_agent_package"
+    description = "The Roster Agent package is invalid."
+    code = 400
+
+
+class RosterAgentPackageTooLargeError(BaseHTTPException):
+    error_code = "roster_agent_package_too_large"
+    description = "The Roster Agent package exceeds the size limit."
+    code = 413
+
+
+class RosterAgentPackageExportFailedError(BaseHTTPException):
+    error_code = "roster_agent_package_export_failed"
+    description = "The Roster Agent package could not be exported."
+    code = 500
+
+
 class AgentSoulLockedError(BadRequest):
     description = "Agent Soul is locked for this workflow node."
 
diff --git a/api/services/agent/roster_package_entities.py b/api/services/agent/roster_package_entities.py
new file mode 100644
index 00000000000..232a08e9675
--- /dev/null
+++ b/api/services/agent/roster_package_entities.py
@@ -0,0 +1,202 @@
+"""Strict data contract for portable Roster Agent archives."""
+
+from __future__ import annotations
+
+import re
+from collections.abc import Mapping
+from dataclasses import dataclass, field
+from typing import BinaryIO, Final, Literal, Self
+
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
+
+from services.agent.dsl_entities import AgentAppDsl
+
+ROSTER_AGENT_PACKAGE_FORMAT: Final[Literal["dify.roster-agent"]] = "dify.roster-agent"
+ROSTER_AGENT_PACKAGE_FORMAT_VERSION: Final[Literal[1]] = 1
+ROSTER_AGENT_PACKAGE_MAX_SIGNATURE_BYTES = 64 * 1024
+
+_SHA256_PATTERN = re.compile(r"^[0-9a-f]{64}$")
+
+
+@dataclass(frozen=True)
+class RosterAgentPackageMember:
+    size: int
+    sha256: str
+
+
+class RosterAgentPackageAudit(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    ref: str = Field(min_length=1, max_length=255)
+
+
+class _RosterAgentPackageResource(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    path: str = Field(min_length=1, max_length=255)
+    size: int = Field(ge=0)
+    sha256: str
+    audit: RosterAgentPackageAudit | None = None
+
+    @field_validator("sha256")
+    @classmethod
+    def validate_sha256(cls, value: str) -> str:
+        if _SHA256_PATTERN.fullmatch(value) is None:
+            raise ValueError("sha256 must be a lowercase hexadecimal SHA-256 digest")
+        return value
+
+
+class RosterAgentPackageApp(_RosterAgentPackageResource):
+    @field_validator("path")
+    @classmethod
+    def validate_app_path(cls, value: str) -> str:
+        if "/" in value or "\\" in value or not value.endswith((".yaml", ".yml")):
+            raise ValueError("app path must be a root-level YAML member")
+        if value.casefold() == "manifest.yaml":
+            raise ValueError("app path must not use the package manifest name")
+        return value
+
+
+class RosterAgentPackageSkill(_RosterAgentPackageResource):
+    id: str = Field(pattern=r"^s_[0-9]{6}$")
+    scope: Literal["agent_config", "workspace"]
+    name: str = Field(min_length=1, max_length=64)
+
+    @model_validator(mode="after")
+    def validate_skill_path(self) -> Self:
+        if self.path != f"{self.id}.zip":
+            raise ValueError("skill path must be the resource id with a .zip extension")
+        return self
+
+
+class RosterAgentPackageFile(_RosterAgentPackageResource):
+    id: str = Field(pattern=r"^f_[0-9]{6}$")
+
+    @model_validator(mode="after")
+    def validate_file_metadata(self) -> Self:
+        if self.path == self.id or not self.path.startswith(f"{self.id}."):
+            raise ValueError("file path must start with the resource id and include an extension")
+        if "/" in self.path or "\\" in self.path:
+            raise ValueError("file path must be a root-level archive member")
+        return self
+
+
+class RosterAgentPackageManifest(BaseModel):
+    """Package metadata and resource index stored in ``manifest.yaml``."""
+
+    model_config = ConfigDict(extra="forbid")
+
+    format: Literal["dify.roster-agent"]
+    format_version: Literal[1]
+    audit: RosterAgentPackageAudit | None = None
+    apps: list[RosterAgentPackageApp] = Field(min_length=1)
+    skills: list[RosterAgentPackageSkill] = Field(default_factory=list)
+    files: list[RosterAgentPackageFile] = Field(default_factory=list)
+
+    @model_validator(mode="after")
+    def validate_resource_index(self) -> Self:
+        ids = [item.id for item in self.skills] + [item.id for item in self.files]
+        if len(ids) != len(set(ids)):
+            raise ValueError("resource ids must be unique")
+        paths = [item.path.casefold() for item in [*self.apps, *self.skills, *self.files]]
+        if len(paths) != len(set(paths)):
+            raise ValueError("resource paths must be unique")
+        skill_names = [item.name for item in self.skills]
+        if len(skill_names) != len(set(skill_names)):
+            raise ValueError("skill names must be unique after workspace Skills are localized")
+
+        return self
+
+    def validate_apps(self, apps: Mapping[str, AgentAppDsl]) -> None:
+        """Resolve all application references against the shared resource index."""
+        if set(apps) != {item.path for item in self.apps}:
+            raise ValueError("app members must match the package app index")
+        skill_by_id = {item.id: item for item in self.skills}
+        file_by_id = {item.id: item for item in self.files}
+        workspace_names = {item.name for item in self.skills if item.scope == "workspace"}
+        referenced_skill_ids: set[str] = set()
+        referenced_file_ids: set[str] = set()
+        referenced_workspace_names: set[str] = set()
+        for app in apps.values():
+            if app.package.soul.schema_version != 1:
+                raise ValueError("unsupported Agent Soul schema version")
+            for skill_ref in app.package.soul.config_skills:
+                if skill_ref.is_missing:
+                    continue
+                skill_resource = skill_by_id.get(skill_ref.file_id)
+                if skill_resource is None or skill_resource.scope != "agent_config":
+                    raise ValueError("config skill reference must resolve to an agent_config skill")
+                if skill_resource.name != skill_ref.name:
+                    raise ValueError("config skill name must match its resource metadata")
+                referenced_skill_ids.add(skill_resource.id)
+            app_workspace_names = [item.name for item in app.package.workspace_skills]
+            if len(app_workspace_names) != len(set(app_workspace_names)):
+                raise ValueError("workspace skill names must be unique in the Agent DSL")
+            if set(app_workspace_names) - workspace_names:
+                raise ValueError("workspace skill references must match the package resource index")
+            referenced_workspace_names.update(app_workspace_names)
+            for file_ref in app.package.soul.config_files:
+                if file_ref.is_missing:
+                    continue
+                if file_ref.file_id not in file_by_id:
+                    raise ValueError("config file reference must resolve to a package file")
+                referenced_file_ids.add(file_ref.file_id)
+        if {item.id for item in self.skills if item.scope == "agent_config"} - referenced_skill_ids:
+            raise ValueError("agent_config skill resources must be referenced by the Agent Soul")
+        if workspace_names != referenced_workspace_names:
+            raise ValueError("workspace skill references must match the package resource index")
+        if set(file_by_id) - referenced_file_ids:
+            raise ValueError("file resources must be referenced by the Agent Soul")
+
+
+@dataclass
+class PreparedRosterAgentPackage:
+    """Validated archive retained in a bounded spool for later materialization."""
+
+    archive: BinaryIO
+    manifest: RosterAgentPackageManifest
+    apps: dict[str, AgentAppDsl]
+    members: dict[str, RosterAgentPackageMember]
+    invalid_skills: dict[str, str] = field(default_factory=dict)
+
+    def close(self) -> None:
+        self.archive.close()
+
+    def __enter__(self) -> PreparedRosterAgentPackage:
+        return self
+
+    def __exit__(self, *_args: object) -> None:
+        self.close()
+
+
+@dataclass
+class RosterAgentPackageExport:
+    """Download artifact owning its archive until the response closes."""
+
+    archive: BinaryIO
+    filename: str
+    size: int
+
+    def close(self) -> None:
+        self.archive.close()
+
+    def __enter__(self) -> RosterAgentPackageExport:
+        return self
+
+    def __exit__(self, *_args: object) -> None:
+        self.close()
+
+
+__all__ = [
+    "ROSTER_AGENT_PACKAGE_FORMAT",
+    "ROSTER_AGENT_PACKAGE_FORMAT_VERSION",
+    "ROSTER_AGENT_PACKAGE_MAX_SIGNATURE_BYTES",
+    "PreparedRosterAgentPackage",
+    "RosterAgentPackageApp",
+    "RosterAgentPackageAudit",
+    "RosterAgentPackageExport",
+    "RosterAgentPackageFile",
+    "RosterAgentPackageManifest",
+    "RosterAgentPackageMember",
+    "RosterAgentPackageSkill",
+]
diff --git a/api/services/agent/roster_package_exporter.py b/api/services/agent/roster_package_exporter.py
new file mode 100644
index 00000000000..05d4f93e447
--- /dev/null
+++ b/api/services/agent/roster_package_exporter.py
@@ -0,0 +1,468 @@
+"""Export active Roster Agents as portable ``.ifpkg`` archives."""
+
+from __future__ import annotations
+
+import hashlib
+import os
+import re
+import tempfile
+import zipfile
+from collections.abc import Callable, Generator, Sequence
+from dataclasses import dataclass
+from typing import BinaryIO, Literal, Protocol, cast
+
+import yaml
+from sqlalchemy import or_, select
+from sqlalchemy.orm import Session
+
+from configs import dify_config
+from core.db.session_factory import session_factory
+from core.plugin.entities.plugin import PluginDependency
+from extensions.ext_storage import storage
+from models.agent import (
+    APP_BACKED_AGENT_SOURCES,
+    Agent,
+    AgentConfigDraft,
+    AgentConfigDraftType,
+    AgentConfigSnapshot,
+    AgentScope,
+    AgentStatus,
+)
+from models.agent_config_entities import AgentSoulConfig
+from models.enums import AppStatus
+from models.model import App, AppMode, UploadFile
+from models.tools import ToolFile
+from services.agent.dependency_service import extract_agent_soul_dependencies
+from services.agent.dsl_entities import (
+    AgentAppDsl,
+    AgentPackageWorkspaceSkill,
+    make_agent_app_dsl,
+    make_portable_agent_package,
+)
+from services.agent.errors import (
+    AgentNotFoundError,
+    AgentVersionNotFoundError,
+    RosterAgentPackageExportFailedError,
+    RosterAgentPackageTooLargeError,
+)
+from services.agent.roster_package_entities import (
+    ROSTER_AGENT_PACKAGE_FORMAT,
+    ROSTER_AGENT_PACKAGE_FORMAT_VERSION,
+    RosterAgentPackageApp,
+    RosterAgentPackageAudit,
+    RosterAgentPackageExport,
+    RosterAgentPackageFile,
+    RosterAgentPackageManifest,
+    RosterAgentPackageSkill,
+)
+from services.agent.skill_package_service import SkillPackageError, SkillPackageService
+from services.plugin.dependencies_analysis import DependenciesAnalysisService
+from services.skill_management_service import RuntimeAgentSkillArchive, SkillManagementService
+
+
+class _Storage(Protocol):
+    def load_stream(self, filename: str) -> Generator[bytes, None, None]: ...
+
+
+@dataclass(frozen=True)
+class _SkillSource:
+    path: str
+    storage_key: str
+    id: str
+    scope: Literal["agent_config", "workspace"]
+    name: str
+    display_name: str | None
+    description: str
+    priority: int | None
+    audit_ref: str
+
+
+@dataclass(frozen=True)
+class _FileSource:
+    path: str
+    storage_key: str
+    id: str
+    audit_ref: str
+
+
+class RosterAgentPackageExporter:
+    """Collect a Roster Agent through a dedicated read Session and build its archive."""
+
+    def __init__(
+        self,
+        *,
+        storage_backend: _Storage = storage,
+        dependency_provider: Callable[[str, list[str]], list[PluginDependency]] | None = None,
+    ) -> None:
+        self._storage = storage_backend
+        self._dependency_provider = dependency_provider or DependenciesAnalysisService.generate_dependencies
+
+    def export(self, *, tenant_id: str, agent_id: str) -> RosterAgentPackageExport:
+        with session_factory.create_session() as session:
+            row = session.execute(
+                select(Agent, App)
+                .join(
+                    App,
+                    (App.id == Agent.app_id) & (App.tenant_id == Agent.tenant_id),
+                )
+                .where(
+                    Agent.id == agent_id,
+                    Agent.tenant_id == tenant_id,
+                    Agent.scope == AgentScope.ROSTER,
+                    Agent.source.in_(APP_BACKED_AGENT_SOURCES),
+                    Agent.status == AgentStatus.ACTIVE,
+                    Agent.app_id.is_not(None),
+                    or_(Agent.backing_app_id == Agent.app_id, Agent.backing_app_id.is_(None)),
+                    App.mode == AppMode.AGENT,
+                    App.status == AppStatus.NORMAL,
+                )
+                .limit(1)
+            ).one_or_none()
+            if row is None:
+                raise AgentNotFoundError()
+            agent, app_model = row
+
+            draft = session.scalar(
+                select(AgentConfigDraft)
+                .where(
+                    AgentConfigDraft.tenant_id == tenant_id,
+                    AgentConfigDraft.agent_id == agent.id,
+                    AgentConfigDraft.draft_type == AgentConfigDraftType.DRAFT,
+                    AgentConfigDraft.draft_owner_key == "",
+                )
+                .limit(1)
+            )
+            if draft is not None:
+                soul = AgentSoulConfig.model_validate(draft.config_snapshot_dict)
+            else:
+                snapshot = session.scalar(
+                    select(AgentConfigSnapshot)
+                    .where(
+                        AgentConfigSnapshot.id == agent.active_config_snapshot_id,
+                        AgentConfigSnapshot.tenant_id == tenant_id,
+                        AgentConfigSnapshot.agent_id == agent.id,
+                    )
+                    .limit(1)
+                )
+                if snapshot is None:
+                    raise AgentVersionNotFoundError()
+                soul = AgentSoulConfig.model_validate(snapshot.config_snapshot_dict)
+
+            resource_soul, skill_sources, file_sources = self._collect_payloads(
+                session=session,
+                tenant_id=tenant_id,
+                soul=soul,
+            )
+            package = make_portable_agent_package(agent, resource_soul, include_assets=True)
+            app = make_agent_app_dsl(app_model, package_ref="agent_1", packages={"agent_1": package}, dependencies=[])
+            audit = RosterAgentPackageAudit(ref=agent.id)
+            dependency_ids = extract_agent_soul_dependencies(package.soul)
+
+        workspace_skills = SkillManagementService().list_runtime_agent_skill_archives(
+            tenant_id=tenant_id,
+            agent_id=agent_id,
+            include_draft=draft is not None,
+        )
+        skill_sources.extend(
+            self._workspace_skill_sources(
+                soul=package.soul,
+                archives=workspace_skills,
+                start_index=len(skill_sources),
+            )
+        )
+        package.workspace_skills = [
+            AgentPackageWorkspaceSkill(
+                name=item.name,
+                display_name=item.display_name or "",
+                description=item.description,
+                priority=item.priority,
+            )
+            for item in skill_sources
+            if item.scope == "workspace" and item.priority is not None
+        ]
+        app.dependencies = self._dependency_provider(tenant_id, dependency_ids)
+        return self._build_archive(
+            app=app,
+            audit=audit,
+            skill_sources=skill_sources,
+            file_sources=file_sources,
+        )
+
+    def _build_archive(
+        self,
+        *,
+        app: AgentAppDsl,
+        skill_sources: Sequence[_SkillSource],
+        file_sources: Sequence[_FileSource],
+        audit: RosterAgentPackageAudit | None = None,
+    ) -> RosterAgentPackageExport:
+        required_entries = len(skill_sources) + len(file_sources) + 2
+        if required_entries > dify_config.AGENT_PACKAGE_MAX_ENTRIES:
+            raise RosterAgentPackageTooLargeError("Roster Agent package has too many members")
+
+        # Ownership is transferred to RosterAgentPackageExport.
+        output = cast(
+            BinaryIO,
+            tempfile.SpooledTemporaryFile(max_size=16 * 1024 * 1024, mode="w+b"),  # noqa: SIM115
+        )
+        try:
+            skills: list[RosterAgentPackageSkill] = []
+            files: list[RosterAgentPackageFile] = []
+            with zipfile.ZipFile(output, "w", compression=zipfile.ZIP_STORED, allowZip64=True) as archive:
+                total_size = 0
+                nested_uncompressed_size = 0
+                skill_packages = SkillPackageService()
+                sources: list[_SkillSource | _FileSource] = [*skill_sources, *file_sources]
+                for source in sources:
+                    remaining_bytes = dify_config.AGENT_PACKAGE_MAX_BYTES - total_size
+                    if isinstance(source, _SkillSource):
+                        remaining_bytes = min(remaining_bytes, dify_config.UPLOAD_SKILL_FILE_SIZE_LIMIT * 1024 * 1024)
+                    member_size, member_digest = self._write_storage_member(
+                        archive, path=source.path, storage_key=source.storage_key, max_bytes=remaining_bytes
+                    )
+                    total_size += member_size
+                    if isinstance(source, _SkillSource):
+                        # Inspect only the embedded Skill; our writer already owns
+                        # the outer container, resource sizes, and digests.
+                        try:
+                            inspection = skill_packages.inspect(content=archive.read(source.path), filename=source.path)
+                        except SkillPackageError as exc:
+                            raise RosterAgentPackageExportFailedError(
+                                f"Roster Agent package contains unusable Skill {source.name!r}"
+                            ) from exc
+                        if inspection.name != source.name:
+                            raise RosterAgentPackageExportFailedError(
+                                f"Roster Agent package contains unusable Skill {source.name!r}: name mismatch"
+                            )
+                        nested_uncompressed_size += inspection.uncompressed_size
+                        if nested_uncompressed_size > dify_config.AGENT_PACKAGE_MAX_BYTES:
+                            raise RosterAgentPackageTooLargeError(
+                                "Roster Agent package nested Skill contents exceed the size limit"
+                            )
+
+                        skills.append(
+                            RosterAgentPackageSkill(
+                                id=source.id,
+                                scope=source.scope,
+                                name=source.name,
+                                path=source.path,
+                                size=member_size,
+                                sha256=member_digest,
+                                audit=RosterAgentPackageAudit(ref=source.audit_ref),
+                            )
+                        )
+                    else:
+                        files.append(
+                            RosterAgentPackageFile(
+                                id=source.id,
+                                path=source.path,
+                                size=member_size,
+                                sha256=member_digest,
+                                audit=RosterAgentPackageAudit(ref=source.audit_ref),
+                            )
+                        )
+
+                app_bytes = yaml.safe_dump(
+                    app.model_dump(mode="json", exclude_none=True), allow_unicode=True, sort_keys=False
+                ).encode("utf-8")
+                manifest = RosterAgentPackageManifest(
+                    format=ROSTER_AGENT_PACKAGE_FORMAT,
+                    format_version=ROSTER_AGENT_PACKAGE_FORMAT_VERSION,
+                    audit=audit,
+                    apps=[
+                        RosterAgentPackageApp(
+                            path="app.yaml", size=len(app_bytes), sha256=hashlib.sha256(app_bytes).hexdigest()
+                        )
+                    ],
+                    skills=skills,
+                    files=files,
+                )
+                manifest.validate_apps({"app.yaml": app})
+                manifest_bytes = yaml.safe_dump(
+                    manifest.model_dump(mode="json", exclude_none=True), allow_unicode=True, sort_keys=False
+                ).encode("utf-8")
+                for path, document_bytes in (("app.yaml", app_bytes), ("manifest.yaml", manifest_bytes)):
+                    if len(document_bytes) > dify_config.AGENT_PACKAGE_MAX_MANIFEST_BYTES:
+                        raise RosterAgentPackageTooLargeError(f"Roster Agent package {path} exceeds the size limit")
+                    total_size += len(document_bytes)
+                    if total_size > dify_config.AGENT_PACKAGE_MAX_BYTES:
+                        raise RosterAgentPackageTooLargeError("Roster Agent package exceeds the size limit")
+                    archive.writestr(path, document_bytes)
+
+            size = output.tell()
+            if size > dify_config.AGENT_PACKAGE_MAX_BYTES:
+                raise RosterAgentPackageTooLargeError("Roster Agent package exceeds the archive size limit")
+            output.seek(0)
+            return RosterAgentPackageExport(
+                archive=output,
+                filename=f"{self._safe_slug(app.package.metadata.name)}.ifpkg",
+                size=size,
+            )
+        except Exception:
+            output.close()
+            raise
+
+    def _collect_payloads(
+        self,
+        *,
+        session: Session,
+        tenant_id: str,
+        soul: AgentSoulConfig,
+    ) -> tuple[AgentSoulConfig, list[_SkillSource], list[_FileSource]]:
+        resource_data = soul.model_dump(mode="json")
+        skill_sources: list[_SkillSource] = []
+        file_sources: list[_FileSource] = []
+
+        skill_file_ids = [item.file_id for item in soul.config_skills if not item.is_missing]
+        tool_files = self._tool_files(session=session, tenant_id=tenant_id, file_ids=skill_file_ids)
+        for skill_ref, portable_skill_ref in zip(soul.config_skills, resource_data["config_skills"]):
+            if skill_ref.is_missing:
+                continue
+            resource_id = f"s_{len(skill_sources) + 1:06d}"
+            tool_file = tool_files.get(skill_ref.file_id)
+            if tool_file is None:
+                raise RosterAgentPackageExportFailedError(f"Config skill {skill_ref.name!r} payload is unavailable")
+            path = f"{resource_id}.zip"
+            portable_skill_ref["file_id"] = resource_id
+            portable_skill_ref["is_missing"] = False
+            skill_sources.append(
+                _SkillSource(
+                    path=path,
+                    storage_key=tool_file.file_key,
+                    id=resource_id,
+                    scope="agent_config",
+                    name=skill_ref.name,
+                    display_name=None,
+                    description=skill_ref.description,
+                    priority=None,
+                    audit_ref=tool_file.id,
+                )
+            )
+
+        tool_file_refs = [
+            item.file_id for item in soul.config_files if not item.is_missing and item.file_kind == "tool_file"
+        ]
+        upload_file_refs = [
+            item.file_id for item in soul.config_files if not item.is_missing and item.file_kind == "upload_file"
+        ]
+        file_tool_files = self._tool_files(session=session, tenant_id=tenant_id, file_ids=tool_file_refs)
+        upload_files = self._upload_files(session=session, tenant_id=tenant_id, file_ids=upload_file_refs)
+        for file_ref, portable_file_ref in zip(soul.config_files, resource_data["config_files"]):
+            if file_ref.is_missing:
+                continue
+            resource_id = f"f_{len(file_sources) + 1:06d}"
+            extension = self._safe_extension(file_ref.name)
+            path = f"{resource_id}{extension}"
+            if file_ref.file_kind == "tool_file":
+                tool_file = file_tool_files.get(file_ref.file_id)
+                if tool_file is None:
+                    raise RosterAgentPackageExportFailedError(f"Config file {file_ref.name!r} payload is unavailable")
+                storage_key = tool_file.file_key
+                mime_type = file_ref.mime_type or tool_file.mimetype
+                audit_ref = tool_file.id
+            else:
+                upload_file = upload_files.get(file_ref.file_id)
+                if upload_file is None:
+                    raise RosterAgentPackageExportFailedError(f"Config file {file_ref.name!r} payload is unavailable")
+                storage_key = upload_file.key
+                mime_type = file_ref.mime_type or upload_file.mime_type
+                audit_ref = upload_file.id
+            portable_file_ref["file_id"] = resource_id
+            portable_file_ref["is_missing"] = False
+            portable_file_ref["mime_type"] = mime_type or "application/octet-stream"
+            file_sources.append(
+                _FileSource(
+                    path=path,
+                    storage_key=storage_key,
+                    id=resource_id,
+                    audit_ref=audit_ref,
+                )
+            )
+
+        return AgentSoulConfig.model_validate(resource_data), skill_sources, file_sources
+
+    @staticmethod
+    def _workspace_skill_sources(
+        *, soul: AgentSoulConfig, archives: Sequence[RuntimeAgentSkillArchive], start_index: int
+    ) -> list[_SkillSource]:
+        sources: list[_SkillSource] = []
+        effective_skill_names = {item.name for item in soul.config_skills if not item.is_missing}
+        for archive in sorted(archives, key=lambda item: item.priority):
+            if archive.name in effective_skill_names:
+                continue
+            effective_skill_names.add(archive.name)
+            resource_id = f"s_{start_index + len(sources) + 1:06d}"
+            path = f"{resource_id}.zip"
+            sources.append(
+                _SkillSource(
+                    path=path,
+                    storage_key=archive.storage_key,
+                    id=resource_id,
+                    scope="workspace",
+                    name=archive.name,
+                    display_name=archive.display_name,
+                    description=archive.description,
+                    priority=archive.priority,
+                    audit_ref=archive.version_id,
+                )
+            )
+        return sources
+
+    @staticmethod
+    def _tool_files(*, session: Session, tenant_id: str, file_ids: Sequence[str]) -> dict[str, ToolFile]:
+        if not file_ids:
+            return {}
+        rows = session.scalars(
+            select(ToolFile).where(ToolFile.tenant_id == tenant_id, ToolFile.id.in_(set(file_ids)))
+        ).all()
+        return {item.id: item for item in rows}
+
+    @staticmethod
+    def _upload_files(*, session: Session, tenant_id: str, file_ids: Sequence[str]) -> dict[str, UploadFile]:
+        if not file_ids:
+            return {}
+        rows = session.scalars(
+            select(UploadFile).where(UploadFile.tenant_id == tenant_id, UploadFile.id.in_(set(file_ids)))
+        ).all()
+        return {item.id: item for item in rows}
+
+    def _write_storage_member(
+        self,
+        archive: zipfile.ZipFile,
+        *,
+        path: str,
+        storage_key: str,
+        max_bytes: int,
+    ) -> tuple[int, str]:
+        digest = hashlib.sha256()
+        size = 0
+        try:
+            with archive.open(path, "w", force_zip64=True) as target:
+                for chunk in self._storage.load_stream(storage_key):
+                    if not isinstance(chunk, bytes):
+                        raise TypeError("storage stream returned a non-bytes chunk")
+                    if size + len(chunk) > max_bytes:
+                        raise RosterAgentPackageTooLargeError("Roster Agent package payload exceeds the size limit")
+                    size += len(chunk)
+                    digest.update(chunk)
+                    target.write(chunk)
+        except RosterAgentPackageTooLargeError:
+            raise
+        except Exception as exc:
+            raise RosterAgentPackageExportFailedError(f"Unable to read package resource {path!r}") from exc
+        return size, digest.hexdigest()
+
+    @staticmethod
+    def _safe_extension(filename: str) -> str:
+        extension = os.path.splitext(filename)[1].lower()
+        if not extension or not re.fullmatch(r"\.[a-z0-9]{1,16}", extension):
+            return ".bin"
+        return extension
+
+    @staticmethod
+    def _safe_slug(name: str) -> str:
+        slug = re.sub(r"[^a-z0-9]+", "-", name.lower()).strip("-")
+        return slug[:80] or "agent"
+
+
+__all__ = ["RosterAgentPackageExporter"]
diff --git a/api/services/agent/roster_package_reader.py b/api/services/agent/roster_package_reader.py
new file mode 100644
index 00000000000..2ef00ce3572
--- /dev/null
+++ b/api/services/agent/roster_package_reader.py
@@ -0,0 +1,346 @@
+"""Read and validate portable Roster Agent ``.ifpkg`` archives."""
+
+from __future__ import annotations
+
+import hashlib
+import io
+import posixpath
+import stat
+import tempfile
+import zipfile
+import zlib
+from collections.abc import Hashable
+from typing import Any, BinaryIO, cast, override
+
+import yaml
+from pydantic import ValidationError
+
+from configs import dify_config
+from constants.dsl_version import CURRENT_APP_DSL_VERSION
+from services.agent.dsl_entities import AgentAppDsl
+from services.agent.errors import InvalidRosterAgentPackageError, RosterAgentPackageTooLargeError
+from services.agent.roster_package_entities import (
+    ROSTER_AGENT_PACKAGE_MAX_SIGNATURE_BYTES,
+    PreparedRosterAgentPackage,
+    RosterAgentPackageApp,
+    RosterAgentPackageManifest,
+    RosterAgentPackageMember,
+    RosterAgentPackageSkill,
+)
+from services.agent.skill_package_service import SkillPackageError, SkillPackageService
+from services.dsl_version import check_version_compatibility
+from services.entities.dsl_entities import ImportStatus
+
+_COPY_CHUNK_SIZE = 1024 * 1024
+_ALLOWED_COMPRESSIONS = {zipfile.ZIP_STORED, zipfile.ZIP_DEFLATED}
+
+
+class RosterAgentPackageReader:
+    """Produce a validated, bounded package without external side effects."""
+
+    def __init__(self) -> None:
+        self._skill_packages = SkillPackageService()
+
+    def read(self, source: BinaryIO) -> PreparedRosterAgentPackage:
+        """Validate the container and record unusable Skill payloads for import warnings."""
+        # Ownership is transferred to PreparedRosterAgentPackage.
+        spool = cast(
+            BinaryIO,
+            tempfile.SpooledTemporaryFile(max_size=16 * 1024 * 1024, mode="w+b"),  # noqa: SIM115
+        )
+        try:
+            self._copy_bounded(source, spool)
+            spool.seek(0)
+            invalid_skills: dict[str, str] = {}
+            manifest, apps, members = self._validate_archive(spool, invalid_skills=invalid_skills)
+            spool.seek(0)
+            return PreparedRosterAgentPackage(
+                archive=spool, manifest=manifest, apps=apps, members=members, invalid_skills=invalid_skills
+            )
+        except Exception:
+            spool.close()
+            raise
+
+    def read_member_bytes(self, package: PreparedRosterAgentPackage, path: str, *, max_bytes: int) -> bytes:
+        """Read one already-validated member while rechecking its size and digest."""
+
+        member = package.members.get(path)
+        if member is None:
+            raise InvalidRosterAgentPackageError("Roster Agent package member is unavailable")
+        try:
+            package.archive.seek(0)
+            with zipfile.ZipFile(package.archive) as archive:
+                info = archive.getinfo(path)
+                payload, digest, _ = self._read_member(
+                    archive,
+                    info,
+                    collect=True,
+                    max_bytes=max_bytes,
+                    expected_size=member.size,
+                )
+        except (KeyError, OSError, zipfile.BadZipFile, EOFError, RuntimeError, ValueError, zlib.error) as exc:
+            raise InvalidRosterAgentPackageError("Roster Agent package member is unavailable") from exc
+        if digest != member.sha256:
+            raise InvalidRosterAgentPackageError("Roster Agent package member failed integrity checks")
+        return payload
+
+    def _validate_archive(
+        self, archive_file: BinaryIO, *, invalid_skills: dict[str, str]
+    ) -> tuple[RosterAgentPackageManifest, dict[str, AgentAppDsl], dict[str, RosterAgentPackageMember]]:
+        try:
+            with zipfile.ZipFile(archive_file) as archive:
+                infos = archive.infolist()
+                if not infos:
+                    raise InvalidRosterAgentPackageError("Roster Agent package is empty")
+                if len(infos) > dify_config.AGENT_PACKAGE_MAX_ENTRIES:
+                    raise InvalidRosterAgentPackageError("Roster Agent package has too many members")
+
+                info_by_path: dict[str, zipfile.ZipInfo] = {}
+                casefold_paths: set[str] = set()
+                total_uncompressed = 0
+                for info in infos:
+                    path = self._validate_member_info(info)
+                    if path in info_by_path or path.casefold() in casefold_paths:
+                        raise InvalidRosterAgentPackageError("Roster Agent package contains duplicate member paths")
+                    info_by_path[path] = info
+                    casefold_paths.add(path.casefold())
+                    total_uncompressed += info.file_size
+                if total_uncompressed > dify_config.AGENT_PACKAGE_MAX_BYTES:
+                    raise RosterAgentPackageTooLargeError("Roster Agent package uncompressed size exceeds the limit")
+
+                manifest_data, manifest_size = self._read_yaml_document(archive, info_by_path, "manifest.yaml")
+                try:
+                    manifest = RosterAgentPackageManifest.model_validate(manifest_data)
+                except ValidationError as exc:
+                    raise InvalidRosterAgentPackageError("Roster Agent package manifest is invalid") from exc
+                apps: dict[str, AgentAppDsl] = {}
+                members: dict[str, RosterAgentPackageMember] = {}
+                streamed_size = manifest_size
+                for app_resource in manifest.apps:
+                    app_data, app_size = self._read_yaml_document(
+                        archive, info_by_path, app_resource.path, resource=app_resource
+                    )
+                    streamed_size += app_size
+                    if streamed_size > dify_config.AGENT_PACKAGE_MAX_BYTES:
+                        raise RosterAgentPackageTooLargeError(
+                            "Roster Agent package uncompressed size exceeds the limit"
+                        )
+                    try:
+                        app = AgentAppDsl.model_validate(app_data)
+                        if check_version_compatibility(app.version, CURRENT_APP_DSL_VERSION) in {
+                            ImportStatus.FAILED,
+                            ImportStatus.PENDING,
+                        }:
+                            raise ValueError("unsupported App DSL version")
+                    except ValueError as exc:
+                        raise InvalidRosterAgentPackageError("Roster Agent package app is invalid") from exc
+                    apps[app_resource.path] = app
+                    members[app_resource.path] = RosterAgentPackageMember(size=app_size, sha256=app_resource.sha256)
+                try:
+                    manifest.validate_apps(apps)
+                except ValueError as exc:
+                    raise InvalidRosterAgentPackageError("Roster Agent package app is invalid") from exc
+
+                expected_paths = {
+                    "manifest.yaml",
+                    *(item.path for item in manifest.apps),
+                    *(item.path for item in manifest.skills),
+                    *(item.path for item in manifest.files),
+                }
+                actual_paths = set(info_by_path)
+                if "signature.sig" in actual_paths:
+                    if info_by_path["signature.sig"].file_size > ROSTER_AGENT_PACKAGE_MAX_SIGNATURE_BYTES:
+                        raise RosterAgentPackageTooLargeError("Roster Agent package signature is too large")
+                    actual_paths.remove("signature.sig")
+                if actual_paths != expected_paths:
+                    raise InvalidRosterAgentPackageError("Roster Agent package members do not match the manifest")
+
+                nested_uncompressed_size = 0
+                signature_info = info_by_path.get("signature.sig")
+                if signature_info is not None:
+                    _, _, signature_size = self._read_member(
+                        archive,
+                        signature_info,
+                        collect=False,
+                        max_bytes=min(
+                            ROSTER_AGENT_PACKAGE_MAX_SIGNATURE_BYTES,
+                            dify_config.AGENT_PACKAGE_MAX_BYTES - streamed_size,
+                        ),
+                        expected_size=signature_info.file_size,
+                    )
+                    streamed_size += signature_size
+                for resource in [*manifest.skills, *manifest.files]:
+                    info = info_by_path[resource.path]
+                    payload = b""
+                    remaining_package_bytes = dify_config.AGENT_PACKAGE_MAX_BYTES - streamed_size
+                    if isinstance(resource, RosterAgentPackageSkill):
+                        max_skill_bytes = dify_config.UPLOAD_SKILL_FILE_SIZE_LIMIT * 1024 * 1024
+                        if info.file_size > max_skill_bytes:
+                            raise RosterAgentPackageTooLargeError(
+                                f"Roster Agent package Skill {resource.name!r} exceeds the size limit"
+                            )
+                        try:
+                            payload, digest, actual_size = self._read_member(
+                                archive,
+                                info,
+                                collect=True,
+                                max_bytes=min(max_skill_bytes, remaining_package_bytes),
+                                expected_size=resource.size,
+                            )
+                        except (InvalidRosterAgentPackageError, zipfile.BadZipFile, EOFError, zlib.error):
+                            invalid_skills[resource.id] = "archive_integrity_failed"
+                            streamed_size += info.file_size
+                            continue
+                    else:
+                        _, digest, actual_size = self._read_member(
+                            archive,
+                            info,
+                            collect=False,
+                            max_bytes=remaining_package_bytes,
+                            expected_size=resource.size,
+                        )
+                    streamed_size += actual_size
+                    if digest != resource.sha256:
+                        if isinstance(resource, RosterAgentPackageSkill):
+                            invalid_skills[resource.id] = "checksum_mismatch"
+                            continue
+                        raise InvalidRosterAgentPackageError(
+                            f"Roster Agent package resource {resource.path!r} failed integrity checks",
+                        )
+                    members[resource.path] = RosterAgentPackageMember(
+                        size=resource.size,
+                        sha256=digest,
+                    )
+                    if isinstance(resource, RosterAgentPackageSkill):
+                        try:
+                            inspection = self._skill_packages.inspect(content=payload, filename=resource.path)
+                        except SkillPackageError as exc:
+                            invalid_skills[resource.id] = exc.code
+                            continue
+                        nested_uncompressed_size += inspection.uncompressed_size
+                        if nested_uncompressed_size > dify_config.AGENT_PACKAGE_MAX_BYTES:
+                            raise RosterAgentPackageTooLargeError(
+                                "Roster Agent package nested Skill contents exceed the size limit"
+                            )
+                        if inspection.name != resource.name:
+                            invalid_skills[resource.id] = "skill_name_mismatch"
+                return manifest, apps, members
+        except (InvalidRosterAgentPackageError, RosterAgentPackageTooLargeError):
+            raise
+        except (OSError, zipfile.BadZipFile, EOFError, RuntimeError, ValueError, zlib.error) as exc:
+            raise InvalidRosterAgentPackageError("Roster Agent package is not a valid ZIP") from exc
+
+    @staticmethod
+    def _copy_bounded(source: BinaryIO, target: BinaryIO) -> None:
+        size = 0
+        while True:
+            chunk = source.read(_COPY_CHUNK_SIZE)
+            if not chunk:
+                break
+            if not isinstance(chunk, bytes):
+                raise InvalidRosterAgentPackageError("Roster Agent package must be binary")
+            size += len(chunk)
+            if size > dify_config.AGENT_PACKAGE_MAX_BYTES:
+                raise RosterAgentPackageTooLargeError("Roster Agent package exceeds the archive size limit")
+            target.write(chunk)
+
+    @staticmethod
+    def _validate_member_info(info: zipfile.ZipInfo) -> str:
+        name = info.filename
+        if info.is_dir():
+            raise InvalidRosterAgentPackageError("Roster Agent package must use root-level files")
+        if "\x00" in name or "\\" in name or any(ord(char) < 0x20 for char in name):
+            raise InvalidRosterAgentPackageError("Roster Agent package contains an unsafe path")
+        normalized = posixpath.normpath(name)
+        if normalized != name or normalized in {"", ".", ".."} or normalized.startswith("/") or "/" in normalized:
+            raise InvalidRosterAgentPackageError("Roster Agent package contains an unsafe path")
+        if stat.S_ISLNK(info.external_attr >> 16):
+            raise InvalidRosterAgentPackageError("Roster Agent package must not contain symbolic links")
+        if info.flag_bits & 0x1:
+            raise InvalidRosterAgentPackageError("Roster Agent package must not contain encrypted members")
+        if info.compress_type not in _ALLOWED_COMPRESSIONS:
+            raise InvalidRosterAgentPackageError("Roster Agent package uses unsupported compression")
+        if info.file_size and info.compress_size == 0:
+            raise InvalidRosterAgentPackageError("Roster Agent package contains invalid ZIP metadata")
+        return normalized
+
+    @staticmethod
+    def _read_member(
+        archive: zipfile.ZipFile,
+        info: zipfile.ZipInfo,
+        *,
+        collect: bool,
+        max_bytes: int,
+        expected_size: int,
+    ) -> tuple[bytes, str, int]:
+        digest = hashlib.sha256()
+        output = io.BytesIO() if collect else None
+        size = 0
+        with archive.open(info) as member:
+            while chunk := member.read(_COPY_CHUNK_SIZE):
+                size += len(chunk)
+                if size > max_bytes:
+                    raise RosterAgentPackageTooLargeError("Roster Agent package member exceeds the size limit")
+                if size > expected_size:
+                    raise InvalidRosterAgentPackageError("Roster Agent package member failed integrity checks")
+                digest.update(chunk)
+                if output is not None:
+                    output.write(chunk)
+        if size != expected_size:
+            raise InvalidRosterAgentPackageError("Roster Agent package member failed integrity checks")
+        return output.getvalue() if output is not None else b"", digest.hexdigest(), size
+
+    def _read_yaml_document(
+        self,
+        archive: zipfile.ZipFile,
+        infos: dict[str, zipfile.ZipInfo],
+        path: str,
+        *,
+        resource: RosterAgentPackageApp | None = None,
+    ) -> tuple[Any, int]:
+        info = infos.get(path)
+        if info is None:
+            raise InvalidRosterAgentPackageError(f"Roster Agent package is missing {path}")
+        if info.file_size > dify_config.AGENT_PACKAGE_MAX_MANIFEST_BYTES:
+            raise RosterAgentPackageTooLargeError(f"Roster Agent package {path} exceeds the size limit")
+        payload, digest, size = self._read_member(
+            archive,
+            info,
+            collect=True,
+            max_bytes=dify_config.AGENT_PACKAGE_MAX_MANIFEST_BYTES,
+            expected_size=resource.size if resource is not None else info.file_size,
+        )
+        if resource is not None and digest != resource.sha256:
+            raise InvalidRosterAgentPackageError(f"Roster Agent package {path} failed integrity checks")
+        try:
+            # The custom SafeLoader also rejects duplicate keys and aliases.
+            return yaml.load(payload, Loader=_PackageYamlLoader), size  # noqa: S506
+        except (UnicodeDecodeError, yaml.YAMLError, ValueError, RecursionError) as exc:
+            raise InvalidRosterAgentPackageError(
+                f"Roster Agent package {path.removesuffix('.yaml')} is invalid"
+            ) from exc
+
+
+class _PackageYamlLoader(yaml.SafeLoader):
+    """Reject ambiguous mappings and aliases in untrusted package documents."""
+
+    @override
+    def compose_node(self, parent: yaml.Node | None, index: Any) -> yaml.Node | None:
+        if self.check_event(yaml.AliasEvent):
+            raise ValueError("YAML aliases are not supported")
+        return super().compose_node(parent, index)
+
+    @override
+    def construct_mapping(self, node: yaml.MappingNode, deep: bool = False) -> dict[Hashable, Any]:
+        result: dict[Hashable, Any] = {}
+        for key_node, value_node in node.value:
+            key = self.construct_object(key_node, deep=deep)
+            if not isinstance(key, str):
+                raise ValueError("YAML mapping keys must be strings")
+            if key in result:
+                raise ValueError(f"duplicate YAML key: {key}")
+            result[key] = self.construct_object(value_node, deep=deep)
+        return result
+
+
+__all__ = ["RosterAgentPackageReader"]
diff --git a/api/services/agent/skill_package_service.py b/api/services/agent/skill_package_service.py
index 42c48d2f26d..c275b2a169d 100644
--- a/api/services/agent/skill_package_service.py
+++ b/api/services/agent/skill_package_service.py
@@ -20,16 +20,14 @@ import io
 import posixpath
 import zipfile
 import zlib
+from dataclasses import dataclass
 
 import yaml
 from pydantic import BaseModel, Field, ValidationError, field_validator
 
 from configs import dify_config
+from libs.zip_filename_recovery import open_zip_with_replacement_names
 
-# Bounds — generous but finite so a hostile upload can't exhaust memory/disk.
-_MAX_UNCOMPRESSED_BYTES = 200 * 1024 * 1024
-_MAX_SKILL_MD_BYTES = 1 * 1024 * 1024
-_MAX_ENTRIES = 5000
 _ALLOWED_EXTENSIONS = (".zip", ".skill")
 _SKILL_MD_NAME = "SKILL.md"
 _SKILL_NAME_PATTERN = r"^[a-z0-9]+(?:-[a-z0-9]+)*$"
@@ -50,15 +48,9 @@ class SkillPackageError(Exception):
         self.status_code = status_code
 
 
-class SkillManifest(BaseModel):
-    """Validated metadata extracted from a Skill package."""
-
+class _SkillMetadata(BaseModel):
     name: str = Field(min_length=1, max_length=64, pattern=_SKILL_NAME_PATTERN)
     description: str = Field(min_length=1, max_length=_MAX_SKILL_DESCRIPTION_LENGTH)
-    entry_path: str  # path of SKILL.md inside the archive
-    files: list[str]  # all (safe) file paths inside the archive
-    size: int  # total uncompressed bytes
-    hash: str  # sha256 of the archive bytes
 
     @field_validator("name", "description", mode="before")
     @classmethod
@@ -66,18 +58,44 @@ class SkillManifest(BaseModel):
         return value.strip() if isinstance(value, str) else value
 
 
+class SkillPackageInspection(_SkillMetadata):
+    """Metadata read without rebuilding or fully extracting a Skill archive."""
+
+    uncompressed_size: int = Field(ge=0)
+
+
+class SkillManifest(_SkillMetadata):
+    """Validated metadata extracted from a Skill package."""
+
+    entry_path: str  # path of SKILL.md inside the archive
+    files: list[str]  # all (safe) file paths inside the archive
+    size: int  # total uncompressed bytes
+    hash: str  # sha256 of the archive bytes
+
+
 class NormalizedSkillPackage(BaseModel):
     """Canonical skill package bytes and metadata ready to store as Agent config."""
 
     manifest: SkillManifest
     archive_bytes: bytes
+
+
+@dataclass(frozen=True)
+class _InspectedSkillArchive:
+    metadata: SkillPackageInspection
+    normalized_members: dict[str, zipfile.ZipInfo]
     skill_md_bytes: bytes
-    strip_prefix: str | None
 
 
 class SkillPackageService:
     """Validate Skill archives and produce a normalized package."""
 
+    def inspect(self, *, content: bytes, filename: str) -> SkillPackageInspection:
+        """Validate archive metadata and SKILL.md without rebuilding the archive."""
+        archive = self._open_archive(content=content, filename=filename)
+        with archive:
+            return self._inspect_archive(archive).metadata
+
     def validate_and_normalize(self, *, content: bytes, filename: str) -> NormalizedSkillPackage:
         """Return the canonical package for an uploaded skill archive.
 
@@ -89,43 +107,30 @@ class SkillPackageService:
         The returned manifest is normalized to archive-root ``SKILL.md`` and its
         hash describes the rebuilt archive bytes. Member read/decompression
         failures while consuming the archive are mapped to ``invalid_archive``.
+        Malformed UTF-8 member names are decoded with replacement characters;
+        recovered path collisions still fail the normal duplicate-path check.
         """
         archive = self._open_archive(content=content, filename=filename)
         with archive:
-            members = self._collect_file_members(archive)
-            member_paths = [safe_path for _, safe_path in members]
-            entry_path = self._find_skill_md(member_paths)
-            strip_prefix = self._skill_root_prefix(entry_path)
-            normalized_members = self._normalize_members(
-                members=members,
-                skill_root_prefix=strip_prefix,
-                ignore_outside_selected_root=self._can_strip_single_top_level_folder(
-                    paths=member_paths, entry_path=entry_path
-                ),
-            )
-            skill_md_member = normalized_members[_SKILL_MD_NAME]
-            self._validate_skill_md_size(skill_md_member)
-            raw_skill_md_bytes = self._read_member_bytes_from_archive(archive, member_info=skill_md_member)
-            skill_md = self._decode_skill_md(raw_skill_md_bytes)
-            skill_md_bytes = skill_md.encode("utf-8")
+            inspection = self._inspect_archive(archive)
             normalized_archive_bytes = self._build_normalized_archive(
                 archive=archive,
-                normalized_members=normalized_members,
-                skill_md_bytes=skill_md_bytes,
-            )
-            normalized_size = sum(
-                len(skill_md_bytes) if path == _SKILL_MD_NAME else max(info.file_size, 0)
-                for path, info in normalized_members.items()
+                normalized_members=inspection.normalized_members,
+                skill_md_bytes=inspection.skill_md_bytes,
             )
 
-        name, description = self._parse_skill_md(skill_md)
+        if len(normalized_archive_bytes) > dify_config.UPLOAD_SKILL_FILE_SIZE_LIMIT * 1024 * 1024:
+            raise SkillPackageError("archive_too_large", "normalized skill archive exceeds size limit", status_code=400)
         try:
             manifest = SkillManifest(
-                name=name,
-                description=description,
+                name=inspection.metadata.name,
+                description=inspection.metadata.description,
                 entry_path=_SKILL_MD_NAME,
-                files=sorted(normalized_members),
-                size=normalized_size,
+                files=sorted(inspection.normalized_members),
+                size=sum(
+                    len(inspection.skill_md_bytes) if path == _SKILL_MD_NAME else info.file_size
+                    for path, info in inspection.normalized_members.items()
+                ),
                 hash=hashlib.sha256(normalized_archive_bytes).hexdigest(),
             )
         except ValidationError as exc:
@@ -133,8 +138,38 @@ class SkillPackageService:
         return NormalizedSkillPackage(
             manifest=manifest,
             archive_bytes=normalized_archive_bytes,
+        )
+
+    def _inspect_archive(self, archive: zipfile.ZipFile) -> _InspectedSkillArchive:
+        members = self._collect_file_members(archive)
+        member_paths = [safe_path for _, safe_path in members]
+        entry_path = self._find_skill_md(member_paths)
+        strip_prefix = self._skill_root_prefix(entry_path)
+        normalized_members = self._normalize_members(
+            members=members,
+            skill_root_prefix=strip_prefix,
+            ignore_outside_selected_root=self._can_strip_single_top_level_folder(
+                paths=member_paths, entry_path=entry_path
+            ),
+        )
+        skill_md_member = normalized_members[_SKILL_MD_NAME]
+        self._validate_skill_md_size(skill_md_member)
+        raw_skill_md_bytes = self._read_member_bytes_from_archive(archive, member_info=skill_md_member)
+        skill_md = self._decode_skill_md(raw_skill_md_bytes)
+        skill_md_bytes = skill_md.encode("utf-8")
+        name, description = self._parse_skill_md(skill_md)
+        try:
+            metadata = SkillPackageInspection(
+                name=name,
+                description=description,
+                uncompressed_size=sum(info.file_size for info, _ in members),
+            )
+        except ValidationError as exc:
+            raise self._manifest_validation_error(exc) from exc
+        return _InspectedSkillArchive(
+            metadata=metadata,
+            normalized_members=normalized_members,
             skill_md_bytes=skill_md_bytes,
-            strip_prefix=strip_prefix,
         )
 
     @staticmethod
@@ -171,21 +206,24 @@ class SkillPackageService:
             raise SkillPackageError("archive_too_large", "skill archive exceeds size limit", status_code=400)
 
         try:
-            return zipfile.ZipFile(io.BytesIO(content))
+            return open_zip_with_replacement_names(content)
         except zipfile.BadZipFile as exc:
             raise SkillPackageError("invalid_archive", "skill archive is not a valid zip", status_code=400) from exc
 
     def _collect_file_members(self, archive: zipfile.ZipFile) -> list[tuple[zipfile.ZipInfo, str]]:
-        infos = [info for info in archive.infolist() if not info.is_dir()]
-        if len(infos) > _MAX_ENTRIES:
+        archive_infos = archive.infolist()
+        if len(archive_infos) > dify_config.SKILL_PACKAGE_MAX_ENTRIES:
             raise SkillPackageError("too_many_entries", "skill archive has too many files", status_code=400)
+        infos = [info for info in archive_infos if not info.is_dir()]
 
         members: list[tuple[zipfile.ZipInfo, str]] = []
         total_uncompressed = 0
         for info in infos:
             members.append((info, self._safe_member_path(info.filename)))
-            total_uncompressed += max(info.file_size, 0)
-        if total_uncompressed > _MAX_UNCOMPRESSED_BYTES:
+            total_uncompressed += info.file_size
+            if info.file_size and info.compress_size == 0:
+                raise SkillPackageError("invalid_archive", "skill package has invalid ZIP metadata", status_code=400)
+        if total_uncompressed > dify_config.SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES:
             raise SkillPackageError(
                 "archive_too_large",
                 "skill archive uncompressed size exceeds limit",
@@ -225,12 +263,8 @@ class SkillPackageService:
             else:
                 normalized_path = safe_path
 
-            if (
-                not normalized_path
-                or normalized_path in {".", ".."}
-                or normalized_path.startswith("/")
-                or "\\" in normalized_path
-            ):
+            # Paths are already normalized and safe; "." is not a file.
+            if normalized_path == ".":
                 raise SkillPackageError("unsafe_path", "skill archive contains an unsafe path", status_code=400)
             if normalized_path in normalized_members:
                 raise SkillPackageError(
@@ -306,7 +340,7 @@ class SkillPackageService:
 
     @staticmethod
     def _validate_skill_md_size(member_info: zipfile.ZipInfo) -> None:
-        if member_info.file_size > _MAX_SKILL_MD_BYTES:
+        if member_info.file_size > dify_config.SKILL_PACKAGE_MAX_SKILL_MD_BYTES:
             raise SkillPackageError("skill_md_too_large", "SKILL.md exceeds size limit", status_code=400)
 
     @staticmethod
@@ -343,4 +377,10 @@ class SkillPackageService:
         return loaded if isinstance(loaded, dict) else {}
 
 
-__all__ = ["NormalizedSkillPackage", "SkillManifest", "SkillPackageError", "SkillPackageService"]
+__all__ = [
+    "NormalizedSkillPackage",
+    "SkillManifest",
+    "SkillPackageError",
+    "SkillPackageInspection",
+    "SkillPackageService",
+]
diff --git a/api/services/agent_config_service.py b/api/services/agent_config_service.py
index e4bfe2a0b9e..56a1ecb342b 100644
--- a/api/services/agent_config_service.py
+++ b/api/services/agent_config_service.py
@@ -609,7 +609,7 @@ class AgentConfigService:
             )
             self._require_writable(target, surface=surface)
             try:
-                skill_ref, _package = self._skill_normalizer.normalize(
+                skill_ref = self._skill_normalizer.normalize(
                     content=content,
                     filename=filename,
                     requested_name=None,
@@ -1064,7 +1064,7 @@ class AgentConfigService:
             )
             archive_bytes = storage.load_once(tool_file.file_key)
             try:
-                skill_ref, _package = self._skill_normalizer.normalize(
+                skill_ref = self._skill_normalizer.normalize(
                     content=archive_bytes,
                     filename=tool_file.name,
                     requested_name=name,
diff --git a/api/services/app_dsl_service.py b/api/services/app_dsl_service.py
index 4c9f10729a0..75b74b9a42e 100644
--- a/api/services/app_dsl_service.py
+++ b/api/services/app_dsl_service.py
@@ -47,7 +47,8 @@ from models import Account, App, AppMode
 from models.agent import AgentScope
 from models.model import AppModelConfig, AppModelConfigDict, IconType, load_annotation_reply_config
 from models.workflow import Workflow
-from services.agent.dsl_service import AgentDslService, AgentPackage
+from services.agent.dsl_entities import AgentPackage, make_agent_app_dsl
+from services.agent.dsl_service import AgentDslService
 from services.agent.retirement_service import WorkflowAgentRetirementService
 from services.agent.workflow_publish_service import WorkflowAgentPublishService
 from services.dsl_content import DSL_MAX_SIZE, dsl_content_size
@@ -60,6 +61,7 @@ from services.entities.dsl_entities import (
     ImportMode,
     ImportStatus,
     PendingImportOwner,
+    make_app_dsl,
 )
 from services.errors.account import NoPermissionError
 from services.errors.app import WorkflowNotFoundError
@@ -762,44 +764,29 @@ class AppDslService:
         """
         app_mode = AppMode.value_of(app_model.mode)
 
-        export_data: dict[str, Any] = {
-            "version": CURRENT_DSL_VERSION,
-            "kind": "app",
-            "app": {
-                "name": app_model.name,
-                "mode": app_model.mode.value if isinstance(app_model.mode, AppMode) else app_model.mode,
-                "icon": app_model.icon,
-                "icon_type": (
-                    app_model.icon_type.value if isinstance(app_model.icon_type, IconType) else app_model.icon_type
-                ),
-                "icon_background": app_model.icon_background,
-                "description": app_model.description,
-                "use_icon_as_answer_icon": app_model.use_icon_as_answer_icon,
-            },
-        }
-
-        if app_mode in {AppMode.ADVANCED_CHAT, AppMode.WORKFLOW}:
-            cls._append_workflow_export_data(
-                export_data=export_data,
-                app_model=app_model,
-                include_secret=include_secret,
-                workflow_id=workflow_id,
-                session=session,
-            )
-        elif app_mode == AppMode.AGENT:
+        if app_mode == AppMode.AGENT:
             package_ref, packages = AgentDslService(session).export_agent_app(app=app_model)
-            export_data["agent"] = {"package_ref": package_ref}
-            export_data["agent_packages"] = {key: package.model_dump(mode="json") for key, package in packages.items()}
             dependencies = AgentDslService(session).extract_package_dependencies(packages)
-            export_data["dependencies"] = [
-                jsonable_encoder(item.model_dump())
-                for item in DependenciesAnalysisService.generate_dependencies(
-                    tenant_id=app_model.tenant_id,
-                    dependencies=dependencies,
-                )
-            ]
+            export_data = make_agent_app_dsl(
+                app_model,
+                package_ref=package_ref,
+                packages=packages,
+                dependencies=DependenciesAnalysisService.generate_dependencies(
+                    tenant_id=app_model.tenant_id, dependencies=dependencies
+                ),
+            ).model_dump(mode="json")
         else:
-            cls._append_model_config_export_data(export_data, app_model, session=session)
+            export_data = make_app_dsl(app_model)
+            if app_mode in {AppMode.ADVANCED_CHAT, AppMode.WORKFLOW}:
+                cls._append_workflow_export_data(
+                    export_data=export_data,
+                    app_model=app_model,
+                    include_secret=include_secret,
+                    workflow_id=workflow_id,
+                    session=session,
+                )
+            else:
+                cls._append_model_config_export_data(export_data, app_model, session=session)
 
         return yaml.dump(export_data, allow_unicode=True)
 
diff --git a/api/services/entities/dsl_entities.py b/api/services/entities/dsl_entities.py
index 67bada2207e..3cdb0d5c42e 100644
--- a/api/services/entities/dsl_entities.py
+++ b/api/services/entities/dsl_entities.py
@@ -3,7 +3,9 @@ from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
 
+from constants.dsl_version import CURRENT_APP_DSL_VERSION
 from core.plugin.entities.plugin import PluginDependency
+from models.model import App, AppMode, IconType
 
 
 class ImportMode(StrEnum):
@@ -39,3 +41,20 @@ class DslImportWarning(BaseModel):
 
 class CheckDependenciesResult(BaseModel):
     leaked_dependencies: list[PluginDependency] = Field(default_factory=list)
+
+
+def make_app_dsl(app: App) -> dict[str, Any]:
+    """Build the shared App DSL envelope for standalone and archive exports."""
+    return {
+        "version": CURRENT_APP_DSL_VERSION,
+        "kind": "app",
+        "app": {
+            "name": app.name,
+            "mode": app.mode.value if isinstance(app.mode, AppMode) else app.mode,
+            "icon": app.icon,
+            "icon_type": app.icon_type.value if isinstance(app.icon_type, IconType) else app.icon_type,
+            "icon_background": app.icon_background,
+            "description": app.description,
+            "use_icon_as_answer_icon": app.use_icon_as_answer_icon,
+        },
+    }
diff --git a/api/services/skill_management_service.py b/api/services/skill_management_service.py
index b0731b82f3f..2c4bbe28060 100644
--- a/api/services/skill_management_service.py
+++ b/api/services/skill_management_service.py
@@ -98,9 +98,6 @@ from services.file_service import FileService
 logger = logging.getLogger(__name__)
 
 _SKILL_MD = "SKILL.md"
-_MAX_SKILL_BYTES = 200 * 1024 * 1024
-_MAX_FILES_PER_SKILL = 5000
-_MAX_ZIP_COMPRESSION_RATIO = 1000
 _MAX_FILE_CHECK_ITEMS = 100
 _MAX_SKILLS_PER_WORKSPACE = 500
 _MAX_AGENT_SKILLS = 20
@@ -509,6 +506,20 @@ class PublishedSkillArchive:
     payload: bytes
 
 
+@dataclass(frozen=True, slots=True)
+class RuntimeAgentSkillArchive:
+    skill_id: str
+    version_id: str
+    tool_file_id: str
+    storage_key: str
+    name: str
+    display_name: str
+    description: str
+    priority: int
+    size: int
+    hash: str
+
+
 @dataclass(frozen=True, slots=True)
 class SkillFileContent:
     filename: str
@@ -2269,6 +2280,34 @@ class SkillManagementService:
         config_snapshot_id: str | None = None,
     ) -> list[dict[str, Any]]:
         """Return workspace Skills from the Agent draft or a published snapshot."""
+        return [
+            {
+                "id": item.skill_id,
+                "name": item.name,
+                "file_id": item.tool_file_id,
+                "description": item.description,
+                "size": item.size,
+                "hash": item.hash,
+                "mime_type": "application/zip",
+            }
+            for item in self.list_runtime_agent_skill_archives(
+                tenant_id=tenant_id,
+                agent_id=agent_id,
+                include_draft=include_draft,
+                config_snapshot_id=config_snapshot_id,
+            )
+        ]
+
+    def list_runtime_agent_skill_archives(
+        self,
+        *,
+        tenant_id: str,
+        agent_id: str,
+        include_draft: bool = False,
+        config_snapshot_id: str | None = None,
+    ) -> list[RuntimeAgentSkillArchive]:
+        """Return export-ready workspace Skill archives with published identity compatibility."""
+
         with self._session_scope() as session:
             binding_model = AgentSkillBinding if include_draft else AgentSkillBindingSnapshot
             conditions = [
@@ -2284,29 +2323,37 @@ class SkillManagementService:
                     conditions.append(AgentSkillBindingSnapshot.config_snapshot_id == config_snapshot_id)
             rows = list(
                 session.execute(
-                    select(binding_model, Skill, SkillVersion)
+                    select(binding_model, Skill, SkillVersion, ToolFile)
                     .join(Skill, Skill.id == binding_model.skill_id)
                     .join(SkillVersion, SkillVersion.id == Skill.latest_published_version_id)
                     .join(Agent, Agent.id == binding_model.agent_id)
+                    .join(
+                        ToolFile,
+                        (ToolFile.id == SkillVersion.archive_tool_file_id) & (ToolFile.tenant_id == tenant_id),
+                    )
                     .where(*conditions)
                     .order_by(Skill.name)
                 )
             )
-            return [
-                {
-                    "id": skill.id,
-                    "name": published_name,
-                    "file_id": version.archive_tool_file_id,
-                    "description": published_description,
-                    "size": version.archive_size,
-                    "hash": version.hash_code,
-                    "mime_type": "application/zip",
-                }
-                for _binding, skill, version in rows
-                for published_name, _published_display_name, published_description in [
-                    self._published_skill_identity(skill, version)
-                ]
+
+        return [
+            RuntimeAgentSkillArchive(
+                skill_id=skill.id,
+                version_id=version.id,
+                tool_file_id=version.archive_tool_file_id,
+                storage_key=tool_file.file_key,
+                name=published_name,
+                display_name=published_display_name,
+                description=published_description,
+                priority=binding.priority,
+                size=version.archive_size,
+                hash=version.hash_code,
+            )
+            for binding, skill, version, tool_file in rows
+            for published_name, published_display_name, published_description in [
+                self._published_skill_identity(skill, version)
             ]
+        ]
 
     def pull_runtime_agent_skill(
         self,
@@ -3899,7 +3946,7 @@ class SkillManagementService:
     def _validate_archive_limits(archive: zipfile.ZipFile) -> list[zipfile.ZipInfo]:
         """Validate ZIP metadata before any member is decompressed or persisted."""
         infos = archive.infolist()
-        if len(infos) > _MAX_FILES_PER_SKILL:
+        if len(infos) > dify_config.SKILL_PACKAGE_MAX_ENTRIES:
             raise SkillManagementServiceError("too_many_files", "skill file count limit exceeded")
 
         total_uncompressed = 0
@@ -3908,16 +3955,13 @@ class SkillManagementService:
                 raise SkillManagementServiceError("invalid_skill_package", "skill package has invalid ZIP metadata")
 
             total_uncompressed += info.file_size
-            if total_uncompressed > _MAX_SKILL_BYTES:
-                raise SkillManagementServiceError("skill_too_large", "skill exceeds 200MB limit")
+            if total_uncompressed > dify_config.SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES:
+                raise SkillManagementServiceError("skill_too_large", "skill exceeds uncompressed size limit")
 
             if info.is_dir() or info.file_size == 0:
                 continue
-            if info.compress_size == 0 or info.file_size / info.compress_size > _MAX_ZIP_COMPRESSION_RATIO:
-                raise SkillManagementServiceError(
-                    "invalid_skill_package",
-                    "skill package compression ratio exceeds the allowed limit",
-                )
+            if info.compress_size == 0:
+                raise SkillManagementServiceError("invalid_skill_package", "skill package has invalid ZIP metadata")
         return infos
 
     def _draft_rows_from_archive_bytes(
@@ -4107,7 +4151,7 @@ class SkillManagementService:
                     )
                 parent = posixpath.dirname(parent)
 
-        if len(entries_by_path) > _MAX_FILES_PER_SKILL:
+        if len(entries_by_path) > dify_config.SKILL_PACKAGE_MAX_ENTRIES:
             raise SkillManagementServiceError("too_many_files", "skill file count limit exceeded")
 
         rows: list[SkillDraftFile] = []
@@ -4140,8 +4184,8 @@ class SkillManagementService:
                 )
             )
 
-        if total_size > _MAX_SKILL_BYTES:
-            raise SkillManagementServiceError("skill_too_large", "skill exceeds 200MB limit")
+        if total_size > dify_config.SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES:
+            raise SkillManagementServiceError("skill_too_large", "skill exceeds uncompressed size limit")
         return rows
 
     def _sync_skill_metadata_from_draft_skill_md(self, *, skill: Skill, content: str) -> None:
@@ -4401,8 +4445,8 @@ class SkillManagementService:
     @staticmethod
     def _enforce_total_size(files: list[SkillDraftFile]) -> None:
         total = sum(file.size or 0 for file in {file.path: file for file in files}.values())
-        if total > _MAX_SKILL_BYTES:
-            raise SkillManagementServiceError("skill_too_large", "skill exceeds 200MB limit")
+        if total > dify_config.SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES:
+            raise SkillManagementServiceError("skill_too_large", "skill exceeds uncompressed size limit")
 
     @staticmethod
     def _load_tool_file_bytes(*, tenant_id: str, file_id: str) -> bytes:
@@ -4410,14 +4454,15 @@ class SkillManagementService:
             tool_file = session.scalar(select(ToolFile).where(ToolFile.tenant_id == tenant_id, ToolFile.id == file_id))
             if tool_file is None:
                 raise SkillManagementServiceError("skill_archive_missing", "skill archive is missing", status_code=404)
-            try:
-                return storage.load_once(tool_file.file_key)
-            except (OSError, SQLAlchemyError) as exc:
-                raise SkillManagementServiceError(
-                    "skill_archive_missing",
-                    "skill archive is missing",
-                    status_code=404,
-                ) from exc
+            file_key = tool_file.file_key
+        try:
+            return storage.load_once(file_key)
+        except (OSError, SQLAlchemyError) as exc:
+            raise SkillManagementServiceError(
+                "skill_archive_missing",
+                "skill archive is missing",
+                status_code=404,
+            ) from exc
 
     @staticmethod
     def _load_assistant_tool_file_bytes(*, tenant_id: str, file_id: str) -> bytes:
diff --git a/api/tests/unit_tests/configs/test_dify_config.py b/api/tests/unit_tests/configs/test_dify_config.py
index 8e9547ad68f..dd9f3313534 100644
--- a/api/tests/unit_tests/configs/test_dify_config.py
+++ b/api/tests/unit_tests/configs/test_dify_config.py
@@ -64,7 +64,12 @@ class _IsolatedDifyConfig(DifyConfig):
 
 
 def _make_config(**values: object) -> DifyConfig:
-    return _IsolatedDifyConfig(**values)
+    # Pydantic exposes a generated field-wise signature, while this helper intentionally forwards heterogeneous input.
+    return _IsolatedDifyConfig(**values)  # pyrefly: ignore[bad-argument-type]
+
+
+def test_skill_package_default_limit_matches_documentation() -> None:
+    assert _make_config().UPLOAD_SKILL_FILE_SIZE_LIMIT == 50
 
 
 def test_dify_config_keeps_secret_key_empty_when_missing(tmp_path) -> None:
diff --git a/api/tests/unit_tests/libs/test_zip_filename_recovery.py b/api/tests/unit_tests/libs/test_zip_filename_recovery.py
new file mode 100644
index 00000000000..c06581434c0
--- /dev/null
+++ b/api/tests/unit_tests/libs/test_zip_filename_recovery.py
@@ -0,0 +1,94 @@
+import io
+import struct
+import zipfile
+
+import pytest
+
+from libs.zip_filename_recovery import open_zip_with_replacement_names
+
+
+def _zip64(monkeypatch: pytest.MonkeyPatch, limit: int) -> bytes:
+    output = io.BytesIO()
+    with monkeypatch.context() as scoped:
+        scoped.setattr(zipfile, "ZIP64_LIMIT", limit)
+        with zipfile.ZipFile(output, "w", allowZip64=True) as archive:
+            archive.writestr("padding.txt", b"p" * 200)
+            archive.writestr("scripts/\u00e9.py", b"print('ok')\n")
+    content = output.getvalue()
+    assert len(content) < 2048
+    assert b"PK\x06\x06" in content
+    return content
+
+
+@pytest.mark.parametrize("limit", [0, 100])
+@pytest.mark.parametrize("prefix", [b"", b"self-extracting-prefix"])
+def test_zip64_replaces_names_and_preserves_payload(monkeypatch: pytest.MonkeyPatch, limit: int, prefix: bytes) -> None:
+    original = prefix + _zip64(monkeypatch, limit)
+    with zipfile.ZipFile(io.BytesIO(original)) as archive:
+        assert archive.read("scripts/\u00e9.py") == b"print('ok')\n"
+    damaged = original.replace(b"\xc3\xa9.py", b"\xffa.py")
+    with open_zip_with_replacement_names(damaged) as archive:
+        assert archive.read("scripts/\ufffda.py") == b"print('ok')\n"
+        assert archive.testzip() is None
+
+
+def test_zip64_uses_extended_values_when_legacy_fields_are_sentinels(monkeypatch: pytest.MonkeyPatch) -> None:
+    content = bytearray(_zip64(monkeypatch, 0))
+    end = content.rfind(b"PK\x05\x06")
+    struct.pack_into("<HHII", content, end + 8, 0xFFFF, 0xFFFF, 0xFFFFFFFF, 0xFFFFFFFF)
+    damaged = bytes(content).replace(b"\xc3\xa9.py", b"\xffa.py")
+    with open_zip_with_replacement_names(damaged) as archive:
+        assert archive.read("scripts/\ufffda.py") == b"print('ok')\n"
+
+
+def test_zip64_extensible_data_is_not_part_of_central_directory(monkeypatch: pytest.MonkeyPatch) -> None:
+    content = bytearray(_zip64(monkeypatch, 0))
+    record = content.rfind(b"PK\x06\x06")
+    locator = content.rfind(b"PK\x06\x07")
+    extension = b"extension"
+    struct.pack_into("<Q", content, record + 4, 44 + len(extension))
+    content[locator:locator] = extension
+    damaged = bytes(content).replace(b"\xc3\xa9.py", b"\xffa.py")
+    with open_zip_with_replacement_names(damaged) as archive:
+        assert archive.read("scripts/\ufffda.py") == b"print('ok')\n"
+
+
+def test_zip64_recovery_preserves_crc_checks(monkeypatch: pytest.MonkeyPatch) -> None:
+    content = _zip64(monkeypatch, 0)
+    damaged = content.replace(b"\xc3\xa9.py", b"\xffa.py").replace(b"print('ok')", b"print('NO')")
+    with open_zip_with_replacement_names(damaged) as archive:
+        with pytest.raises(zipfile.BadZipFile, match="CRC"):
+            archive.read("scripts/\ufffda.py")
+
+
+def test_zip64_recovery_rejects_mismatched_local_name(monkeypatch: pytest.MonkeyPatch) -> None:
+    original = _zip64(monkeypatch, 0)
+    directory = original.index(b"PK\x01\x02")
+    damaged = original[:directory] + original[directory:].replace(b"\xc3\xa9.py", b"\xffa.py")
+    with pytest.raises(zipfile.BadZipFile, match="names differ"):
+        open_zip_with_replacement_names(damaged)
+
+
+def _damaged_utf8_zip() -> bytearray:
+    output = io.BytesIO()
+    with zipfile.ZipFile(output, "w") as archive:
+        archive.writestr("scripts/\u00e9.py", b"print('ok')\n")
+    return bytearray(output.getvalue().replace(b"\xc3\xa9.py", b"\xffa.py"))
+
+
+@pytest.mark.parametrize("offset", [0xFFFFFFFF, 0xFFFFFFFE])
+def test_recovery_rejects_unresolvable_local_header_offsets(offset: int) -> None:
+    content = _damaged_utf8_zip()
+    directory = content.index(b"PK\x01\x02")
+    struct.pack_into("<I", content, directory + 42, offset)
+    with pytest.raises(zipfile.BadZipFile, match="ZIP64 extra field|local header offset"):
+        open_zip_with_replacement_names(bytes(content))
+
+
+@pytest.mark.parametrize("entries", [0, 2])
+def test_recovery_rejects_inconsistent_directory_entry_counts(entries: int) -> None:
+    content = _damaged_utf8_zip()
+    end = content.rfind(b"PK\x05\x06")
+    struct.pack_into("<HH", content, end + 8, entries, entries)
+    with pytest.raises(zipfile.BadZipFile, match="directory bounds|directory length mismatch"):
+        open_zip_with_replacement_names(bytes(content))
diff --git a/api/tests/unit_tests/services/agent/test_agent_dsl_service.py b/api/tests/unit_tests/services/agent/test_agent_dsl_service.py
index c3a069f15d3..76f0f93e497 100644
--- a/api/tests/unit_tests/services/agent/test_agent_dsl_service.py
+++ b/api/tests/unit_tests/services/agent/test_agent_dsl_service.py
@@ -124,7 +124,8 @@ def _agent_node(node_id: str, binding: object | None = None) -> dict:
     return {"id": node_id, "data": data}
 
 
-def test_make_portable_agent_package_strips_workspace_credentials_and_assets() -> None:
+@pytest.mark.parametrize("include_assets", [False, True])
+def test_make_portable_agent_package_strips_workspace_credentials_and_assets(include_assets: bool) -> None:
     soul = AgentSoulConfig.model_validate(
         {
             "model": {
@@ -164,8 +165,10 @@ def test_make_portable_agent_package_strips_workspace_credentials_and_assets() -
                 ],
             },
             "env": {"secret_refs": [{"name": "GLOBAL_TOKEN", "value": "plain-secret", "id": "secret-1"}]},
-            "config_skills": [{"name": "research", "file_kind": "tool_file", "file_id": "skill-file"}],
-            "config_files": [{"name": "guide.md", "file_kind": "upload_file", "file_id": "config-file"}],
+            "config_skills": [{"name": "research", "file_id": "skill-file"}, {"name": "missing", "is_missing": True}],
+            "config_files": [
+                {"name": "guide.md", "file_kind": "upload_file", "file_id": "config-file", "mime_type": "text/markdown"}
+            ],
             "human": {
                 "contacts": [
                     {
@@ -179,7 +182,9 @@ def test_make_portable_agent_package_strips_workspace_credentials_and_assets() -
         }
     )
 
-    package = make_portable_agent_package(_agent(), soul)
+    original = soul.model_dump(mode="json")
+    package = make_portable_agent_package(_agent(), soul, include_assets=include_assets)
+    assert soul.model_dump(mode="json") == original
     serialized = package.model_dump(mode="json")
 
     assert package.soul.model is not None
@@ -189,20 +194,32 @@ def test_make_portable_agent_package_strips_workspace_credentials_and_assets() -
     assert package.soul.tools.dify_tools[0].runtime_parameters["upload_file_id"] is None
     assert package.soul.tools.dify_tools[0].runtime_parameters["api_key"] is None
     assert package.soul.config_skills[0].name == "research"
-    assert package.soul.config_skills[0].file_id == ""
-    assert package.soul.config_skills[0].is_missing is True
+    assert package.soul.config_skills[0].file_id == ("skill-file" if include_assets else "")
+    assert package.soul.config_skills[0].is_missing is (not include_assets)
     assert package.soul.config_files[0].name == "guide.md"
-    assert package.soul.config_files[0].file_id == ""
-    assert package.soul.config_files[0].is_missing is True
-    assert [asset.kind for asset in package.omitted_assets] == ["skill", "file"]
+    assert package.soul.config_files[0].file_id == ("config-file" if include_assets else "")
+    assert package.soul.config_files[0].is_missing is (not include_assets)
+    assert package.soul.config_skills[1].is_missing
+    assert package.soul.config_files[0].mime_type == "text/markdown"
+    assert [asset.kind for asset in package.omitted_assets] == (
+        ["skill"] if include_assets else ["skill", "skill", "file"]
+    )
+    assert [asset.name for asset in package.omitted_assets] == (
+        ["missing"] if include_assets else ["research", "missing", "guide.md"]
+    )
     assert "plain-secret" not in str(serialized)
     assert "model-secret" not in str(serialized)
     assert "tool-secret" not in str(serialized)
-    assert "skill-file" not in str(serialized)
-    assert "config-file" not in str(serialized)
+    assert ("skill-file" in str(serialized)) is include_assets
+    assert ("config-file" in str(serialized)) is include_assets
     assert package.soul.human.contacts[0].id is None
     assert package.soul.human.contacts[0].name == "Reviewer"
 
+    package.soul.config_skills[0].description = "Changed"
+    package.soul.config_files[0].name = "changed.md"
+    package.soul.tools.cli_tools[0].env.secret_refs[0].name = "CHANGED"
+    assert soul.model_dump(mode="json") == original
+
 
 def test_agent_package_round_trips_as_strict_dsl_dto() -> None:
     package = make_portable_agent_package(_agent(), AgentSoulConfig())
@@ -590,22 +607,28 @@ def test_clone_inline_binding_copies_soul(unbound_session: Session) -> None:
     assert create_kwargs["source"] == AgentSource.WORKFLOW
 
 
-def test_extract_package_dependencies_covers_model_tools_and_knowledge(
+def test_extract_package_dependencies_covers_models_features_tools_and_knowledge(
     monkeypatch: pytest.MonkeyPatch, unbound_session: Session
 ) -> None:
     model_dependency = Mock(side_effect=lambda provider: f"model:{provider}")
     tool_dependency = Mock(side_effect=lambda provider: f"tool:{provider}")
     monkeypatch.setattr(
-        "services.agent.dsl_service.DependenciesAnalysisService.analyze_model_provider_dependency",
+        "services.agent.dependency_service.DependenciesAnalysisService.analyze_model_provider_dependency",
         model_dependency,
     )
     monkeypatch.setattr(
-        "services.agent.dsl_service.DependenciesAnalysisService.analyze_tool_dependency",
+        "services.agent.dependency_service.DependenciesAnalysisService.analyze_tool_dependency",
         tool_dependency,
     )
     soul = AgentSoulConfig.model_validate(
         {
             "model": {"plugin_id": "model-plugin", "model_provider": "provider/model", "model": "model"},
+            "app_features": {
+                "suggested_questions_after_answer": {
+                    "enabled": True,
+                    "model": {"provider": "provider/follow-up", "name": "follow-up-model"},
+                }
+            },
             "tools": {
                 "dify_tools": [
                     {
@@ -631,9 +654,49 @@ def test_extract_package_dependencies_covers_model_tools_and_knowledge(
                         "retrieval": {
                             "mode": "single",
                             "model": {"provider": "provider/retrieval", "name": "embed", "mode": "embedding"},
+                        },
+                        "metadata_filtering": {
+                            "mode": "automatic",
+                            "model_config": {
+                                "provider": "provider/metadata",
+                                "name": "metadata-model",
+                                "mode": "chat",
+                            },
+                        },
+                    },
+                    {
+                        "id": "set-2",
+                        "name": "Reranked Set",
+                        "datasets": [{"id": "dataset-2", "name": "Reranked Docs"}],
+                        "query": {"mode": "user_query", "value": "query"},
+                        "retrieval": {
+                            "mode": "multiple",
+                            "top_k": 5,
+                            "reranking_enable": True,
+                            "reranking_mode": "reranking_model",
                             "reranking_model": {"provider": "provider/rerank", "model": "rerank"},
                         },
-                    }
+                    },
+                    {
+                        "id": "set-3",
+                        "name": "Weighted Set",
+                        "datasets": [{"id": "dataset-3", "name": "Weighted Docs"}],
+                        "query": {"mode": "user_query", "value": "query"},
+                        "retrieval": {
+                            "mode": "multiple",
+                            "top_k": 5,
+                            "reranking_enable": True,
+                            "reranking_mode": "weighted_score",
+                            "weights": {
+                                "vector_setting": {
+                                    "embedding_provider_name": "provider/embedding",
+                                    "embedding_model_name": "embedding-model",
+                                    "vector_weight": 0.7,
+                                },
+                                "keyword_setting": {"keyword_weight": 0.3},
+                            },
+                        },
+                    },
                 ]
             },
         }
@@ -645,13 +708,72 @@ def test_extract_package_dependencies_covers_model_tools_and_knowledge(
 
     assert dependencies == [
         "model:provider/model",
+        "model:provider/follow-up",
         "tool:provider/tool",
         "tool:plugin-id/fallback-provider",
         "model:provider/retrieval",
+        "model:provider/metadata",
         "model:provider/rerank",
+        "model:provider/embedding",
     ]
 
 
+def test_extract_package_dependencies_ignores_inactive_knowledge_models(
+    monkeypatch: pytest.MonkeyPatch, unbound_session: Session
+) -> None:
+    model_dependency = Mock(side_effect=lambda provider: f"model:{provider}")
+    monkeypatch.setattr(
+        "services.agent.dependency_service.DependenciesAnalysisService.analyze_model_provider_dependency",
+        model_dependency,
+    )
+    soul = AgentSoulConfig.model_validate(
+        {
+            "knowledge": {
+                "sets": [
+                    {
+                        "id": "set-1",
+                        "name": "Set",
+                        "datasets": [{"id": "dataset-1", "name": "Docs"}],
+                        "query": {"mode": "user_query", "value": "query"},
+                        "retrieval": {
+                            "mode": "multiple",
+                            "top_k": 5,
+                            "reranking_enable": False,
+                            "reranking_mode": "weighted_score",
+                            "reranking_model": {"provider": "provider/inactive-rerank", "model": "rerank"},
+                            "weights": {
+                                "vector_setting": {
+                                    "embedding_provider_name": "provider/inactive-embedding",
+                                }
+                            },
+                            "model": {
+                                "provider": "provider/inactive-retrieval",
+                                "name": "retrieval-model",
+                                "mode": "chat",
+                            },
+                        },
+                        "metadata_filtering": {
+                            "mode": "disabled",
+                            "model_config": {
+                                "provider": "provider/inactive-metadata",
+                                "name": "metadata-model",
+                                "mode": "chat",
+                            },
+                        },
+                    }
+                ]
+            }
+        }
+    )
+
+    dependencies = AgentDslService(unbound_session).extract_package_dependencies(
+        {"agent_1": make_portable_agent_package(_agent(), soul)}
+    )
+
+    assert dependencies == []
+    model_dependency.assert_not_called()
+
+
 def test_create_imported_inline_agent_uses_import_provenance(unbound_session: Session) -> None:
     service = AgentDslService(unbound_session)
     soul = AgentSoulConfig(config_note="inline")
diff --git a/api/tests/unit_tests/services/agent/test_agent_services.py b/api/tests/unit_tests/services/agent/test_agent_services.py
index 90435a5ef12..43ed0043d64 100644
--- a/api/tests/unit_tests/services/agent/test_agent_services.py
+++ b/api/tests/unit_tests/services/agent/test_agent_services.py
@@ -40,6 +40,7 @@ from models.agent_config_entities import (
 from models.enums import AppStatus, ConversationFromSource, ConversationStatus
 from models.model import App, AppMode, AppModelConfig, Conversation, IconType, Message
 from models.skill import AgentSkillBindingSnapshot, Skill, SkillVersion, SkillVersionManifest
+from models.tools import ToolFile
 from models.workflow import Workflow, WorkflowType
 from services.agent import composer_service, roster_service
 from services.agent.agent_soul_state import agent_soul_has_model
@@ -5603,7 +5604,17 @@ class TestWorkflowAgentDraftBindingSync:
             skill_id="skill-1",
             priority=0,
         )
-        session.add_all([binding, agent, snapshot, skill, skill_version, skill_binding])
+        archive_file = ToolFile(
+            user_id="account-1",
+            tenant_id="tenant-1",
+            conversation_id=None,
+            file_key="tools/research.zip",
+            mimetype="application/zip",
+            name="research.zip",
+            size=1,
+        )
+        archive_file.id = "archive-1"
+        session.add_all([binding, agent, snapshot, skill, skill_version, skill_binding, archive_file])
         session.commit()
 
         WorkflowAgentPublishService.validate_agent_nodes_for_publish(
diff --git a/api/tests/unit_tests/services/agent/test_roster_package_service.py b/api/tests/unit_tests/services/agent/test_roster_package_service.py
new file mode 100644
index 00000000000..19c0f2ccec4
--- /dev/null
+++ b/api/tests/unit_tests/services/agent/test_roster_package_service.py
@@ -0,0 +1,1387 @@
+from __future__ import annotations
+
+import hashlib
+import io
+import zipfile
+from collections.abc import Callable, Generator
+
+import pytest
+import yaml
+from flask import Flask, send_file
+from pydantic import ValidationError
+from sqlalchemy.orm import Session, sessionmaker
+
+from configs import dify_config
+from models.agent import (
+    Agent,
+    AgentConfigDraft,
+    AgentConfigDraftType,
+    AgentConfigSnapshot,
+    AgentKind,
+    AgentScope,
+    AgentSource,
+    AgentStatus,
+)
+from models.agent_config_entities import AgentSoulConfig
+from models.enums import AppStatus
+from models.model import App, AppMode, IconType
+from models.skill import AgentSkillBindingSnapshot, Skill, SkillVersion, SkillVersionManifest
+from models.tools import ToolFile
+from services.agent import roster_package_exporter as roster_package_exporter_module
+from services.agent.dsl_entities import AgentAppDsl, AgentPackage, AgentPackageMetadata, make_agent_app_dsl
+from services.agent.errors import (
+    InvalidRosterAgentPackageError,
+    RosterAgentPackageExportFailedError,
+    RosterAgentPackageTooLargeError,
+)
+from services.agent.roster_package_entities import (
+    ROSTER_AGENT_PACKAGE_FORMAT,
+    ROSTER_AGENT_PACKAGE_FORMAT_VERSION,
+    RosterAgentPackageApp,
+    RosterAgentPackageFile,
+    RosterAgentPackageManifest,
+    RosterAgentPackageSkill,
+)
+from services.agent.roster_package_exporter import RosterAgentPackageExporter
+from services.agent.roster_package_reader import RosterAgentPackageReader
+from services.app_dsl_service import AppDslService
+from services.plugin.dependencies_analysis import DependenciesAnalysisService
+from tests.unit_tests.config_override import apply_config_overrides
+
+
+class _MemoryStorage:
+    def __init__(self, files: dict[str, bytes], *, before_read: Callable[[], None] | None = None) -> None:
+        self.files = files
+        self.before_read = before_read
+        self.read_count = 0
+        self.bytes_yielded: dict[str, int] = {}
+
+    def load_stream(self, filename: str) -> Generator[bytes, None, None]:
+        self.read_count += 1
+        if self.before_read is not None:
+            self.before_read()
+        content = self.files[filename]
+        for offset in range(0, len(content), 7):
+            chunk = content[offset : offset + 7]
+            self.bytes_yielded[filename] = self.bytes_yielded.get(filename, 0) + len(chunk)
+            yield chunk
+
+
+def _zip(members: dict[str, bytes]) -> bytes:
+    output = io.BytesIO()
+    with zipfile.ZipFile(output, "w", compression=zipfile.ZIP_DEFLATED) as archive:
+        for path, payload in members.items():
+            archive.writestr(path, payload)
+    return output.getvalue()
+
+
+def _skill_archive(name: str = "research") -> bytes:
+    return _zip(
+        {
+            "SKILL.md": (f"---\nname: {name}\ndescription: Research skill.\n---\n\n# Research\n").encode(),
+            "scripts/run.py": b"print('ok')\n",
+        }
+    )
+
+
+def _package_app(soul: AgentSoulConfig | None = None) -> AgentAppDsl:
+    soul = soul or AgentSoulConfig.model_validate(
+        {
+            "config_skills": [{"name": "research", "file_id": "s_000001"}],
+            "config_files": [
+                {
+                    "name": "guide.pdf",
+                    "file_kind": "tool_file",
+                    "file_id": "f_000001",
+                }
+            ],
+        }
+    )
+    return make_agent_app_dsl(
+        _app("app-1"),
+        package_ref="agent_1",
+        packages={"agent_1": AgentPackage(metadata=AgentPackageMetadata(name="Research Agent"), soul=soul)},
+        dependencies=[],
+    )
+
+
+def _yaml_bytes(document: RosterAgentPackageManifest | AgentAppDsl) -> bytes:
+    return yaml.safe_dump(document.model_dump(mode="json", exclude_none=True)).encode()
+
+
+def _app_member(payload: bytes, path: str = "app.yaml") -> RosterAgentPackageApp:
+    return RosterAgentPackageApp(path=path, size=len(payload), sha256=hashlib.sha256(payload).hexdigest())
+
+
+def _manifest(*, skill_payload: bytes, file_payload: bytes) -> RosterAgentPackageManifest:
+    return RosterAgentPackageManifest(
+        format=ROSTER_AGENT_PACKAGE_FORMAT,
+        format_version=ROSTER_AGENT_PACKAGE_FORMAT_VERSION,
+        apps=[_app_member(_yaml_bytes(_package_app()))],
+        skills=[
+            RosterAgentPackageSkill(
+                id="s_000001",
+                scope="agent_config",
+                name="research",
+                path="s_000001.zip",
+                size=len(skill_payload),
+                sha256=hashlib.sha256(skill_payload).hexdigest(),
+            )
+        ],
+        files=[
+            RosterAgentPackageFile(
+                id="f_000001",
+                path="f_000001.pdf",
+                size=len(file_payload),
+                sha256=hashlib.sha256(file_payload).hexdigest(),
+            )
+        ],
+    )
+
+
+def _app(app_id: str) -> App:
+    return App(
+        id=app_id,
+        tenant_id="tenant-1",
+        name="Research Agent",
+        description="",
+        mode=AppMode.AGENT,
+        icon_type=IconType.EMOJI,
+        icon="R",
+        icon_background="#FFFFFF",
+        status=AppStatus.NORMAL,
+        enable_site=False,
+        enable_api=False,
+        max_active_requests=None,
+        created_by="account-1",
+    )
+
+
+def _package_bytes(
+    manifest: RosterAgentPackageManifest,
+    *,
+    skill_payload: bytes,
+    file_payload: bytes,
+    extra_members: dict[str, bytes] | None = None,
+    app: AgentAppDsl | None = None,
+) -> bytes:
+    app_payload = (extra_members or {}).get("app.yaml", _yaml_bytes(app or _package_app()))
+    manifest = manifest.model_copy(update={"apps": [_app_member(app_payload)]})
+    return _zip(
+        {
+            "manifest.yaml": _yaml_bytes(manifest),
+            "app.yaml": app_payload,
+            "s_000001.zip": skill_payload,
+            "f_000001.pdf": file_payload,
+            **(extra_members or {}),
+        }
+    )
+
+
+def test_manifest_rejects_dangling_resource_references() -> None:
+    manifest = RosterAgentPackageManifest(
+        format=ROSTER_AGENT_PACKAGE_FORMAT,
+        format_version=ROSTER_AGENT_PACKAGE_FORMAT_VERSION,
+        apps=[_app_member(_yaml_bytes(_package_app()))],
+    )
+    with pytest.raises(ValueError, match="config skill reference must resolve"):
+        manifest.validate_apps({"app.yaml": _package_app()})
+
+
+@pytest.mark.parametrize(
+    ("overrides", "message"),
+    [
+        ({"path": "wrong.zip"}, "skill path must be"),
+        ({"sha256": "not-a-digest"}, "sha256 must be"),
+    ],
+)
+def test_skill_resource_rejects_invalid_metadata(overrides: dict[str, object], message: str) -> None:
+    values: dict[str, object] = {
+        "id": "s_000001",
+        "scope": "agent_config",
+        "name": "research",
+        "path": "s_000001.zip",
+        "size": 1,
+        "sha256": "0" * 64,
+    }
+    values.update(overrides)
+
+    with pytest.raises(ValidationError, match=message):
+        RosterAgentPackageSkill.model_validate(values)
+
+
+@pytest.mark.parametrize(
+    ("overrides", "message"),
+    [
+        ({"path": "f_000001"}, "file path must start"),
+        ({"path": "f_000001.dir/file"}, "root-level archive member"),
+    ],
+)
+def test_file_resource_rejects_invalid_metadata(overrides: dict[str, object], message: str) -> None:
+    values: dict[str, object] = {
+        "id": "f_000001",
+        "path": "f_000001.pdf",
+        "size": 1,
+        "sha256": "0" * 64,
+    }
+    values.update(overrides)
+
+    with pytest.raises(ValidationError, match=message):
+        RosterAgentPackageFile.model_validate(values)
+
+
+def test_manifest_rejects_unsupported_soul_version() -> None:
+    manifest = _manifest(skill_payload=_skill_archive(), file_payload=b"pdf-content")
+    with pytest.raises(ValueError, match="unsupported Agent Soul schema version"):
+        manifest.validate_apps({"app.yaml": _package_app(AgentSoulConfig(schema_version=2))})
+
+
+@pytest.mark.parametrize(
+    ("overrides", "message"),
+    [
+        pytest.param({"name": "duplicate"}, "resource ids must be unique", id="duplicate-id"),
+        pytest.param(
+            {"id": "s_000002", "path": "s_000002.zip", "scope": "workspace"},
+            "skill names must be unique",
+            id="duplicate-localized-name",
+        ),
+    ],
+)
+def test_manifest_rejects_duplicate_resources(overrides: dict[str, str], message: str) -> None:
+    values = _manifest(skill_payload=_skill_archive(), file_payload=b"pdf-content").model_dump(mode="json")
+    values["skills"].append({**values["skills"][0], **overrides})
+
+    with pytest.raises(ValidationError, match=message):
+        RosterAgentPackageManifest.model_validate(values)
+
+
+@pytest.mark.parametrize(
+    ("mutation", "message"),
+    [
+        ("skill_name", "config skill name must match"),
+        ("unreferenced_skill", "agent_config skill resources must be referenced"),
+        ("missing_file", "config file reference must resolve"),
+        ("unreferenced_file", "file resources must be referenced"),
+    ],
+)
+def test_manifest_rejects_inconsistent_resource_index(mutation: str, message: str) -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    values = _manifest(skill_payload=skill_payload, file_payload=file_payload).model_dump(mode="json")
+    app = _package_app()
+    if mutation == "skill_name":
+        values["skills"][0]["name"] = "renamed"
+    elif mutation == "unreferenced_skill":
+        app.package.soul.config_skills = []
+    elif mutation == "missing_file":
+        values["files"] = list[dict[str, object]]()
+    else:
+        app.package.soul.config_files = []
+
+    with pytest.raises(ValueError, match=message):
+        RosterAgentPackageManifest.model_validate(values).validate_apps({"app.yaml": app})
+
+
+@pytest.mark.parametrize("missing_field", ["format", "format_version", "apps"])
+def test_reader_rejects_manifest_without_format_discriminator(missing_field: str) -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload).model_dump(mode="json")
+    manifest.pop(missing_field)
+    package = _zip(
+        {
+            "manifest.yaml": yaml.safe_dump(manifest).encode(),
+            "app.yaml": _yaml_bytes(_package_app()),
+            "s_000001.zip": skill_payload,
+            "f_000001.pdf": file_payload,
+        }
+    )
+
+    with pytest.raises(InvalidRosterAgentPackageError, match="manifest is invalid"):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+
+@pytest.mark.parametrize("file_kind", ["upload_file", "tool_file"])
+def test_package_files_reuse_existing_dsl_file_kinds(file_kind: str) -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    app_data = _package_app().model_dump(mode="json")
+    app_data["agent_packages"]["agent_1"]["soul"]["config_files"][0]["file_kind"] = file_kind
+    app = AgentAppDsl.model_validate(app_data)
+    content = _package_bytes(manifest, app=app, skill_payload=skill_payload, file_payload=file_payload)
+    reader = RosterAgentPackageReader()
+    with reader.read(io.BytesIO(content)) as prepared:
+        assert prepared.apps["app.yaml"].package.soul.config_files[0].file_kind == file_kind
+        assert reader.read_member_bytes(prepared, "f_000001.pdf", max_bytes=len(file_payload)) == file_payload
+
+
+@pytest.mark.parametrize(
+    ("error", "error_code", "status"),
+    [
+        (InvalidRosterAgentPackageError(), "invalid_roster_agent_package", 400),
+        (RosterAgentPackageTooLargeError(), "roster_agent_package_too_large", 413),
+        (RosterAgentPackageExportFailedError(), "roster_agent_package_export_failed", 500),
+    ],
+)
+def test_roster_package_errors_use_standard_http_payload(
+    error: InvalidRosterAgentPackageError | RosterAgentPackageTooLargeError | RosterAgentPackageExportFailedError,
+    error_code: str,
+    status: int,
+) -> None:
+    assert error.error_code == error_code
+    assert error.code == status
+    assert error.data == {"code": error_code, "message": error.description, "status": status}
+
+
+def test_preflight_validates_resources_and_accepts_ignored_signature() -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    package = _package_bytes(
+        manifest,
+        skill_payload=skill_payload,
+        file_payload=file_payload,
+        extra_members={"signature.sig": b"not-verified-in-v1"},
+    )
+
+    with RosterAgentPackageReader().read(io.BytesIO(package)) as prepared:
+        assert prepared.manifest == manifest
+        assert prepared.members["s_000001.zip"].sha256 == hashlib.sha256(skill_payload).hexdigest()
+        assert prepared.members["f_000001.pdf"].size == len(file_payload)
+
+
+def test_reader_accepts_app_larger_than_legacy_limit() -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    app = _package_app()
+    app.package.soul.prompt.system_prompt = "x" * (1024 * 1024)
+    package = _package_bytes(manifest, app=app, skill_payload=skill_payload, file_payload=file_payload)
+
+    assert len(_yaml_bytes(app)) > 1024 * 1024
+    with RosterAgentPackageReader().read(io.BytesIO(package)) as prepared:
+        assert prepared.apps["app.yaml"] == app
+
+
+@pytest.mark.parametrize("path", ["manifest.yaml", "app.yaml"])
+def test_reader_rejects_oversized_documents(path: str, monkeypatch: pytest.MonkeyPatch) -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    limit = 4096
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_MANIFEST_BYTES=limit)
+    package = _package_bytes(
+        manifest,
+        skill_payload=skill_payload,
+        file_payload=file_payload,
+        extra_members={path: b"x" * (limit + 1)},
+    )
+    with pytest.raises(RosterAgentPackageTooLargeError, match=path):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+
+def test_reader_applies_the_whole_package_size_limit(monkeypatch: pytest.MonkeyPatch) -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    package = _package_bytes(manifest, skill_payload=skill_payload, file_payload=file_payload)
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_BYTES=len(package) - 1)
+
+    with pytest.raises(RosterAgentPackageTooLargeError):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+
+def test_preflight_rejects_tampered_payload() -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    package = _package_bytes(
+        manifest,
+        skill_payload=skill_payload,
+        file_payload=b"tampered",
+    )
+
+    with pytest.raises(InvalidRosterAgentPackageError, match="failed integrity checks"):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+
+def test_preflight_rejects_members_not_declared_by_manifest() -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    package = _package_bytes(
+        manifest,
+        skill_payload=skill_payload,
+        file_payload=file_payload,
+        extra_members={"undeclared.txt": b"unexpected"},
+    )
+
+    with pytest.raises(InvalidRosterAgentPackageError, match="members do not match"):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+
+def test_preflight_rejects_unsafe_member_path() -> None:
+    package = _zip({"../manifest.yaml": b"{}"})
+
+    with pytest.raises(InvalidRosterAgentPackageError, match="unsafe path"):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+
+def test_high_compression_ratio_uses_absolute_package_limit(monkeypatch: pytest.MonkeyPatch) -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"x" * (1024 * 1024)
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    package = _package_bytes(manifest, skill_payload=skill_payload, file_payload=file_payload)
+    reader = RosterAgentPackageReader()
+    with reader.read(io.BytesIO(package)) as prepared:
+        assert prepared.members["f_000001.pdf"].size == len(file_payload)
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_BYTES=128 * 1024)
+    with pytest.raises(RosterAgentPackageTooLargeError, match="uncompressed size"):
+        reader.read(io.BytesIO(package))
+
+
+@pytest.mark.parametrize("path", ["manifest.yaml", "app.yaml"])
+@pytest.mark.parametrize(
+    "payload",
+    [
+        b"format: dify.roster-agent\nformat: dify.roster-agent\n",
+        b"metadata:\n  name: first\n  name: second\n",
+        b"value: &value [1]\ncopy: *value\n",
+        b"value: !!python/object/apply:os.system ['false']\n",
+        b"[invalid",
+        b"\xff",
+        b"null",
+        b"[]",
+        b"1: value",
+        b"---\n{}\n---\n{}",
+    ],
+)
+def test_preflight_rejects_invalid_yaml_documents(path: str, payload: bytes) -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    package = _package_bytes(
+        _manifest(skill_payload=skill_payload, file_payload=file_payload),
+        skill_payload=skill_payload,
+        file_payload=file_payload,
+        extra_members={path: payload},
+    )
+    with pytest.raises(InvalidRosterAgentPackageError, match=f"{path.removesuffix('.yaml')} is invalid"):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+
+@pytest.mark.parametrize("missing_path", ["manifest.yaml", "app.yaml"])
+def test_reader_requires_both_yaml_documents(missing_path: str) -> None:
+    documents = {
+        "manifest.yaml": _yaml_bytes(_manifest(skill_payload=_skill_archive(), file_payload=b"pdf-content")),
+        "app.yaml": _yaml_bytes(_package_app()),
+    }
+    del documents[missing_path]
+    with pytest.raises(InvalidRosterAgentPackageError, match=f"missing {missing_path}"):
+        RosterAgentPackageReader().read(io.BytesIO(_zip(documents)))
+
+
+@pytest.mark.parametrize(
+    "mutation",
+    [
+        "legacy_app",
+        "wrong_kind",
+        "wrong_mode",
+        "missing_ref",
+        "dangling_ref",
+        "extra_package",
+        "invalid_version",
+        "future_version",
+    ],
+)
+def test_reader_rejects_invalid_agent_app_dsl(mutation: str) -> None:
+    app = _package_app().model_dump(mode="json")
+    if mutation == "legacy_app":
+        app = {
+            "metadata": app["agent_packages"]["agent_1"]["metadata"],
+            "soul": app["agent_packages"]["agent_1"]["soul"],
+        }
+    elif mutation == "wrong_kind":
+        app["kind"] = "workflow"
+    elif mutation == "wrong_mode":
+        app["app"]["mode"] = "workflow"
+    elif mutation == "missing_ref":
+        app["agent"] = dict[str, str]()
+    elif mutation == "dangling_ref":
+        app["agent"]["package_ref"] = "agent_2"
+    elif mutation == "extra_package":
+        app["agent_packages"]["agent_2"] = app["agent_packages"]["agent_1"]
+    else:
+        app["version"] = "invalid" if mutation == "invalid_version" else "999.0.0"
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    package = _package_bytes(
+        _manifest(skill_payload=skill_payload, file_payload=file_payload),
+        skill_payload=skill_payload,
+        file_payload=file_payload,
+        extra_members={"app.yaml": yaml.safe_dump(app).encode()},
+    )
+    with pytest.raises(InvalidRosterAgentPackageError, match="app is invalid"):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+
+def test_reader_rejects_cross_document_reference_mismatch() -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    app = _package_app()
+    app.package.soul.config_skills[0].file_id = "s_000002"
+    package = _package_bytes(
+        _manifest(skill_payload=skill_payload, file_payload=file_payload),
+        app=app,
+        skill_payload=skill_payload,
+        file_payload=file_payload,
+    )
+    with pytest.raises(InvalidRosterAgentPackageError, match="app is invalid"):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+
+def test_preflight_records_invalid_skill_payload() -> None:
+    skill_payload = _zip({"README.md": b"missing skill manifest"})
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    package = _package_bytes(manifest, skill_payload=skill_payload, file_payload=file_payload)
+
+    with RosterAgentPackageReader().read(io.BytesIO(package)) as prepared:
+        assert prepared.invalid_skills == {"s_000001": "missing_skill_md"}
+
+
+def test_preflight_rejects_oversized_skill_before_materializing(monkeypatch: pytest.MonkeyPatch) -> None:
+    apply_config_overrides(monkeypatch, UPLOAD_SKILL_FILE_SIZE_LIMIT=0)
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    package = _package_bytes(manifest, skill_payload=skill_payload, file_payload=file_payload)
+
+    with pytest.raises(RosterAgentPackageTooLargeError) as exc_info:
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+    assert exc_info.value.error_code == "roster_agent_package_too_large"
+    assert exc_info.value.code == 413
+
+
+def test_preflight_rejects_aggregate_nested_skill_expansion(monkeypatch: pytest.MonkeyPatch) -> None:
+    skill_payloads = {
+        "s_000001.zip": _zip(
+            {
+                "SKILL.md": b"---\nname: research-one\ndescription: Research skill.\n---\n",
+                "data.bin": b"x" * 8192,
+            }
+        ),
+        "s_000002.zip": _zip(
+            {
+                "SKILL.md": b"---\nname: research-two\ndescription: Research skill.\n---\n",
+                "data.bin": b"x" * 8192,
+            }
+        ),
+    }
+    soul = AgentSoulConfig.model_validate(
+        {
+            "config_skills": [
+                {"name": "research-one", "file_id": "s_000001"},
+                {"name": "research-two", "file_id": "s_000002"},
+            ]
+        }
+    )
+    manifest = RosterAgentPackageManifest(
+        format=ROSTER_AGENT_PACKAGE_FORMAT,
+        format_version=ROSTER_AGENT_PACKAGE_FORMAT_VERSION,
+        apps=[_app_member(_yaml_bytes(_package_app(soul)))],
+        skills=[
+            RosterAgentPackageSkill(
+                id=path.removesuffix(".zip"),
+                scope="agent_config",
+                name=f"research-{index}",
+                path=path,
+                size=len(payload),
+                sha256=hashlib.sha256(payload).hexdigest(),
+            )
+            for index, (path, payload) in zip(("one", "two"), skill_payloads.items())
+        ],
+    )
+    package = _zip(
+        {
+            "manifest.yaml": _yaml_bytes(manifest),
+            "app.yaml": _yaml_bytes(_package_app(soul)),
+            **skill_payloads,
+        }
+    )
+    nested_limit = 12 * 1024
+    assert len(package) < nested_limit
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_BYTES=nested_limit)
+
+    with pytest.raises(RosterAgentPackageTooLargeError, match="nested Skill contents"):
+        RosterAgentPackageReader().read(io.BytesIO(package))
+
+    exporter = RosterAgentPackageExporter(storage_backend=_MemoryStorage(skill_payloads))
+    sources = [
+        roster_package_exporter_module._SkillSource(
+            path=item.path,
+            storage_key=item.path,
+            id=item.id,
+            scope=item.scope,
+            name=item.name,
+            display_name=None,
+            description="Research skill.",
+            priority=None,
+            audit_ref="source",
+        )
+        for item in manifest.skills
+    ]
+    with pytest.raises(RosterAgentPackageTooLargeError, match="nested Skill contents"):
+        exporter._build_archive(app=_package_app(soul), skill_sources=sources, file_sources=[])
+
+
+@pytest.mark.parametrize("failure", ["checksum", "size", "name", "crc"])
+def test_reader_records_unusable_skills_and_preserves_other_members(failure: str) -> None:
+    skill_payload = _skill_archive("different" if failure == "name" else "research")
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    if failure == "checksum":
+        manifest.skills[0].sha256 = "0" * 64
+    elif failure == "size":
+        manifest.skills[0].size += 1
+    package = _package_bytes(manifest, skill_payload=skill_payload, file_payload=file_payload)
+    if failure == "crc":
+        output = io.BytesIO()
+        with zipfile.ZipFile(output, "w", compression=zipfile.ZIP_STORED) as archive:
+            archive.writestr("manifest.yaml", _yaml_bytes(manifest))
+            archive.writestr("app.yaml", _yaml_bytes(_package_app()))
+            archive.writestr("s_000001.zip", skill_payload)
+            archive.writestr("f_000001.pdf", file_payload)
+        package = output.getvalue().replace(skill_payload, b"X" + skill_payload[1:])
+    reader = RosterAgentPackageReader()
+    with reader.read(io.BytesIO(package)) as prepared:
+        expected = {
+            "checksum": "checksum_mismatch",
+            "size": "archive_integrity_failed",
+            "name": "skill_name_mismatch",
+            "crc": "archive_integrity_failed",
+        }
+        assert prepared.invalid_skills == {"s_000001": expected[failure]}
+        assert reader.read_member_bytes(prepared, "f_000001.pdf", max_bytes=len(file_payload)) == file_payload
+
+
+@pytest.mark.parametrize("rewrite_manifest", [False, True])
+def test_member_read_rechecks_limit_and_integrity_after_preflight(rewrite_manifest: bool) -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload)
+    package = _package_bytes(manifest, skill_payload=skill_payload, file_payload=file_payload)
+    reader = RosterAgentPackageReader()
+    with reader.read(io.BytesIO(package)) as prepared:
+        assert reader.read_member_bytes(prepared, "s_000001.zip", max_bytes=len(skill_payload)) == skill_payload
+        with pytest.raises(RosterAgentPackageTooLargeError):
+            reader.read_member_bytes(prepared, "f_000001.pdf", max_bytes=len(file_payload) - 1)
+        with pytest.raises(InvalidRosterAgentPackageError, match="unavailable"):
+            reader.read_member_bytes(prepared, "unknown", max_bytes=100)
+        modified = _package_bytes(manifest, skill_payload=skill_payload, file_payload=b"bad-content")
+        prepared.archive.seek(0)
+        prepared.archive.truncate()
+        prepared.archive.write(modified)
+        if rewrite_manifest:
+            prepared.manifest.files[0].sha256 = hashlib.sha256(b"bad-content").hexdigest()
+        with pytest.raises(InvalidRosterAgentPackageError, match="integrity checks"):
+            reader.read_member_bytes(prepared, "f_000001.pdf", max_bytes=len(file_payload))
+
+
+@pytest.mark.parametrize(
+    ("case", "error_type", "message"),
+    [
+        ("missing_manifest", RosterAgentPackageExportFailedError, "unusable Skill"),
+        ("name_mismatch", RosterAgentPackageExportFailedError, "unusable Skill"),
+        ("size_limit", RosterAgentPackageTooLargeError, "exceeds the size limit"),
+    ],
+)
+def test_export_rejects_unusable_or_oversized_skill_payload(
+    case: str,
+    error_type: type[RosterAgentPackageExportFailedError | RosterAgentPackageTooLargeError],
+    message: str,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    payload = _zip({"README.md": b"missing skill manifest"}) if case == "missing_manifest" else _skill_archive("other")
+    if case == "size_limit":
+        apply_config_overrides(monkeypatch, UPLOAD_SKILL_FILE_SIZE_LIMIT=0)
+    source = roster_package_exporter_module._SkillSource(
+        path="s_000001.zip",
+        storage_key="skill",
+        id="s_000001",
+        scope="agent_config",
+        name="research",
+        display_name=None,
+        description="Research skill.",
+        priority=None,
+        audit_ref="source",
+    )
+    app = _package_app()
+    app.package.soul.config_files = []
+    exporter = RosterAgentPackageExporter(storage_backend=_MemoryStorage({"skill": payload}))
+    with pytest.raises(error_type, match=message):
+        exporter._build_archive(app=app, skill_sources=[source], file_sources=[])
+
+
+@pytest.mark.parametrize("max_bytes", [0, 8])
+def test_read_member_enforces_actual_output_limit(max_bytes: int) -> None:
+    package = _zip({"payload.bin": b"x" * 32})
+
+    with zipfile.ZipFile(io.BytesIO(package)) as archive:
+        with pytest.raises(RosterAgentPackageTooLargeError) as exc_info:
+            RosterAgentPackageReader._read_member(
+                archive,
+                archive.getinfo("payload.bin"),
+                collect=True,
+                max_bytes=max_bytes,
+                expected_size=32,
+            )
+
+    assert exc_info.value.error_code == "roster_agent_package_too_large"
+
+
+@pytest.mark.parametrize("expected_size", [8, 64])
+def test_read_member_validates_actual_size_while_streaming(expected_size: int) -> None:
+    package = _zip({"payload.bin": b"x" * 32})
+
+    with zipfile.ZipFile(io.BytesIO(package)) as archive:
+        with pytest.raises(InvalidRosterAgentPackageError, match="failed integrity checks"):
+            RosterAgentPackageReader._read_member(
+                archive,
+                archive.getinfo("payload.bin"),
+                collect=False,
+                max_bytes=32,
+                expected_size=expected_size,
+            )
+
+
+@pytest.mark.parametrize("collect", [False, True])
+def test_read_empty_member_with_zero_budget(collect: bool) -> None:
+    with zipfile.ZipFile(io.BytesIO(_zip({"empty.bin": b""}))) as archive:
+        payload, digest, size = RosterAgentPackageReader._read_member(
+            archive, archive.getinfo("empty.bin"), collect=collect, max_bytes=0, expected_size=0
+        )
+    assert payload == b""
+    assert digest == hashlib.sha256(b"").hexdigest()
+    assert size == 0
+
+
+def test_export_accepts_legacy_agent_and_preserves_caller_transaction(
+    monkeypatch: pytest.MonkeyPatch,
+    sqlite_session: Session,
+    sqlite_session_factory: sessionmaker[Session],
+) -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"0" * (1024 * 1024)
+    read_sessions: list[Session] = []
+
+    def create_read_session() -> Session:
+        session = sqlite_session_factory()
+        read_sessions.append(session)
+        return session
+
+    def assert_read_session_closed() -> None:
+        assert read_sessions
+        assert not read_sessions[-1].in_transaction()
+
+    monkeypatch.setattr(roster_package_exporter_module.session_factory, "create_session", create_read_session)
+
+    storage = _MemoryStorage(
+        {"tools/skill.zip": skill_payload, "tools/guide.pdf": file_payload},
+        before_read=assert_read_session_closed,
+    )
+    skill_file = ToolFile(
+        user_id="account-1",
+        tenant_id="tenant-1",
+        conversation_id=None,
+        file_key="tools/skill.zip",
+        mimetype="application/zip",
+        name="research.zip",
+        size=len(skill_payload),
+        original_url=None,
+    )
+    skill_file.id = "11111111-1111-4111-8111-111111111111"
+    config_file = ToolFile(
+        user_id="account-1",
+        tenant_id="tenant-1",
+        conversation_id=None,
+        file_key="tools/guide.pdf",
+        mimetype="application/pdf",
+        name="guide.pdf",
+        size=len(file_payload),
+        original_url=None,
+    )
+    config_file.id = "22222222-2222-4222-8222-222222222222"
+    published_soul = AgentSoulConfig.model_validate({"prompt": {"system_prompt": "published"}})
+    draft_soul = AgentSoulConfig.model_validate(
+        {
+            "model": {
+                "plugin_id": "langgenius/openai",
+                "model_provider": "langgenius/openai/openai",
+                "model": "gpt-test",
+                "credential_ref": {"type": "provider", "id": "private-model"},
+            },
+            "tools": {
+                "dify_tools": [
+                    {
+                        "provider_id": "langgenius/google/google",
+                        "provider_type": "plugin",
+                        "tool_name": "search",
+                        "credential_type": "api-key",
+                        "credential_ref": {"type": "tool", "id": "private-tool"},
+                        "runtime_parameters": {"query": "retain", "api_key": "private-value"},
+                    }
+                ],
+            },
+            "prompt": {"system_prompt": "draft"},
+            "config_skills": [
+                {"name": "research", "file_id": skill_file.id},
+                {"name": "missing-skill", "file_id": "", "is_missing": True},
+            ],
+            "config_files": [
+                {"name": "guide.pdf", "file_kind": "tool_file", "file_id": config_file.id},
+                {"name": "missing.txt", "file_kind": "upload_file", "file_id": "", "is_missing": True},
+            ],
+        }
+    )
+    agent = Agent(
+        tenant_id="tenant-1",
+        name="Research Agent",
+        description="description",
+        role="researcher",
+        agent_kind=AgentKind.DIFY_AGENT,
+        scope=AgentScope.ROSTER,
+        source=AgentSource.AGENT_APP,
+        app_id="33333333-3333-4333-8333-333333333333",
+        backing_app_id=None,
+        status=AgentStatus.ACTIVE,
+        created_by="account-1",
+        updated_by="account-1",
+    )
+    agent.id = "44444444-4444-4444-8444-444444444444"
+    snapshot = AgentConfigSnapshot(
+        tenant_id="tenant-1",
+        agent_id=agent.id,
+        version=1,
+        config_snapshot=published_soul,
+        created_by="account-1",
+    )
+    snapshot.id = "55555555-5555-4555-8555-555555555555"
+    agent.active_config_snapshot_id = snapshot.id
+    draft = AgentConfigDraft(
+        tenant_id="tenant-1",
+        agent_id=agent.id,
+        draft_type=AgentConfigDraftType.DRAFT,
+        account_id=None,
+        draft_owner_key="",
+        base_snapshot_id=snapshot.id,
+        config_snapshot=draft_soul,
+        created_by="account-1",
+        updated_by="account-1",
+    )
+    sqlite_session.add_all(
+        [_app("33333333-3333-4333-8333-333333333333"), skill_file, config_file, agent, snapshot, draft]
+    )
+    sqlite_session.commit()
+
+    caller_owned_file = ToolFile(
+        user_id="account-1",
+        tenant_id="tenant-1",
+        conversation_id=None,
+        file_key="tools/caller-owned.txt",
+        mimetype="text/plain",
+        name="caller-owned.txt",
+        size=1,
+        original_url=None,
+    )
+    caller_owned_file.id = "77777777-7777-4777-8777-777777777777"
+    sqlite_session.add(caller_owned_file)
+    sqlite_session.flush()
+    assert caller_owned_file not in sqlite_session.new
+
+    exporter = RosterAgentPackageExporter(
+        storage_backend=storage,
+        dependency_provider=lambda _tenant_id, _dependencies: [],
+    )
+    monkeypatch.setattr(DependenciesAnalysisService, "generate_dependencies", lambda **_kwargs: [])
+    app_model = sqlite_session.get(App, agent.app_id)
+    assert app_model is not None
+    standalone_dsl = yaml.safe_load(AppDslService.export_dsl(app_model, session=sqlite_session))
+    with exporter.export(tenant_id="tenant-1", agent_id=agent.id) as exported:
+        archive_bytes = exported.archive.read()
+        assert exported.filename == "research-agent.ifpkg"
+        with zipfile.ZipFile(io.BytesIO(archive_bytes)) as archive:
+            assert set(archive.namelist()) == {"manifest.yaml", "app.yaml", "s_000001.zip", "f_000001.pdf"}
+            manifest_data = yaml.safe_load(archive.read("manifest.yaml"))
+            app_data = yaml.safe_load(archive.read("app.yaml"))
+            exported_app = AgentAppDsl.model_validate(app_data)
+            exported_soul = exported_app.package.soul
+            assert exported_soul.model is not None
+            assert exported_soul.model.credential_ref is None
+            assert exported_soul.tools.dify_tools[0].credential_ref is None
+            assert exported_soul.tools.dify_tools[0].runtime_parameters == {"query": "retain", "api_key": None}
+            assert "private-" not in exported_app.model_dump_json()
+            assert draft_soul.model is not None
+            assert draft_soul.model.credential_ref is not None
+            assert draft_soul.tools.dify_tools[0].runtime_parameters["api_key"] == "private-value"
+            assert exported_app.package.soul.prompt.system_prompt == "draft"
+            assert exported_app.package.soul.config_skills[0].file_id == "s_000001"
+            assert exported_app.package.soul.config_files[0].file_id == "f_000001"
+            assert exported_app.package.soul.config_files[0].mime_type == "application/pdf"
+            assert exported_app.package.soul.config_skills[1].is_missing is True
+            assert exported_app.package.soul.config_skills[1].file_id == ""
+            assert exported_app.package.soul.config_files[1].is_missing is True
+            assert exported_app.package.soul.config_files[1].file_id == ""
+            assert set(manifest_data) == {"format", "format_version", "audit", "apps", "skills", "files"}
+            assert set(manifest_data["files"][0]) == {
+                "id",
+                "path",
+                "size",
+                "sha256",
+                "audit",
+            }
+            assert manifest_data["apps"] == [
+                {
+                    "path": "app.yaml",
+                    "size": len(archive.read("app.yaml")),
+                    "sha256": hashlib.sha256(archive.read("app.yaml")).hexdigest(),
+                }
+            ]
+            assert set(app_data) == {"version", "kind", "app", "agent", "agent_packages", "dependencies"}
+            assert app_data["kind"] == "app"
+            assert app_data["app"]["mode"] == "agent"
+            assert app_data["app"]["icon"] == "R"
+            assert app_data["agent"]["package_ref"] == "agent_1"
+            assert "audit" not in app_data["agent_packages"]["agent_1"]["metadata"]
+            for key in ("version", "kind", "app", "agent", "dependencies"):
+                assert app_data[key] == standalone_dsl[key]
+            standalone_package = AgentPackage.model_validate(standalone_dsl["agent_packages"]["agent_1"])
+            assert exported_app.package.metadata == standalone_package.metadata
+            assert standalone_package.soul.config_skills[0].is_missing is True
+            assert standalone_package.soul.config_skills[0].file_id == ""
+            assert standalone_package.soul.config_files[0].is_missing is True
+            assert {item.name for item in exported_app.package.omitted_assets} == {"missing-skill", "missing.txt"}
+            assert {item.name for item in standalone_package.omitted_assets} == {
+                "research",
+                "guide.pdf",
+                "missing-skill",
+                "missing.txt",
+            }
+            assert archive.read("s_000001.zip") == skill_payload
+            assert all(info.compress_type == zipfile.ZIP_STORED for info in archive.infolist())
+            assert "signature.sig" not in archive.namelist()
+
+        with RosterAgentPackageReader().read(io.BytesIO(archive_bytes)) as prepared:
+            assert prepared.apps["app.yaml"].package.soul.prompt.system_prompt == "draft"
+
+    assert sqlite_session.in_transaction()
+    assert sqlite_session.get(ToolFile, caller_owned_file.id) is caller_owned_file
+
+    max_entries = dify_config.AGENT_PACKAGE_MAX_ENTRIES
+    max_manifest_bytes = dify_config.AGENT_PACKAGE_MAX_MANIFEST_BYTES
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_ENTRIES=4)
+    with exporter.export(tenant_id="tenant-1", agent_id=agent.id) as exported:
+        with zipfile.ZipFile(exported.archive) as archive:
+            assert len(archive.infolist()) == 4
+
+    reads_before_limit_check = storage.read_count
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_ENTRIES=3)
+    with pytest.raises(RosterAgentPackageTooLargeError):
+        exporter.export(tenant_id="tenant-1", agent_id=agent.id)
+    assert storage.read_count == reads_before_limit_check
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_ENTRIES=max_entries)
+
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_MANIFEST_BYTES=1)
+    with pytest.raises(RosterAgentPackageTooLargeError):
+        exporter.export(tenant_id="tenant-1", agent_id=agent.id)
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_MANIFEST_BYTES=max_manifest_bytes)
+
+    file_bytes_before_limit_check = storage.bytes_yielded["tools/guide.pdf"]
+    apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_BYTES=len(skill_payload) + 1)
+    with pytest.raises(RosterAgentPackageTooLargeError):
+        exporter.export(tenant_id="tenant-1", agent_id=agent.id)
+    assert storage.bytes_yielded["tools/guide.pdf"] - file_bytes_before_limit_check == 7
+
+
+def test_export_uses_current_workspace_skill_bindings(
+    monkeypatch: pytest.MonkeyPatch,
+    sqlite_session: Session,
+) -> None:
+    workspace_payload = _skill_archive("legacy-published")
+    storage = _MemoryStorage({"tools/workspace.zip": workspace_payload})
+    monkeypatch.setattr(
+        "services.skill_management_service.SkillManagementService._load_tool_file_bytes",
+        staticmethod(lambda **_kwargs: workspace_payload),
+    )
+    archive_file = ToolFile(
+        user_id="account-1",
+        tenant_id="tenant-1",
+        conversation_id=None,
+        file_key="tools/workspace.zip",
+        mimetype="application/zip",
+        name="workspace-research.zip",
+        size=len(workspace_payload),
+        original_url=None,
+    )
+    archive_file.id = "11111111-1111-4111-8111-111111111111"
+    skill = Skill(
+        tenant_id="tenant-1",
+        name="renamed-workspace",
+        display_name="Renamed Workspace",
+        description="Renamed description.",
+        created_by="account-1",
+        updated_by="account-1",
+    )
+    skill.id = "22222222-2222-4222-8222-222222222222"
+    version = SkillVersion(
+        skill_id=skill.id,
+        version_number=1,
+        version_name="1.0",
+        publish_note="",
+        manifest=SkillVersionManifest(
+            name=None,
+            display_name=None,
+            description=None,
+            files=[],
+        ),
+        archive_tool_file_id=archive_file.id,
+        hash_code="hash-code",
+        archive_size=len(workspace_payload),
+        published_by="account-1",
+    )
+    version.id = "33333333-3333-4333-8333-333333333333"
+    skill.latest_published_version_id = version.id
+    agent = Agent(
+        tenant_id="tenant-1",
+        name="Research Agent",
+        description="",
+        role="",
+        agent_kind=AgentKind.DIFY_AGENT,
+        scope=AgentScope.ROSTER,
+        source=AgentSource.AGENT_APP,
+        app_id="44444444-4444-4444-8444-444444444444",
+        backing_app_id="44444444-4444-4444-8444-444444444444",
+        status=AgentStatus.ACTIVE,
+        created_by="account-1",
+        updated_by="account-1",
+    )
+    agent.id = "55555555-5555-4555-8555-555555555555"
+    snapshot = AgentConfigSnapshot(
+        tenant_id="tenant-1",
+        agent_id=agent.id,
+        version=1,
+        config_snapshot=AgentSoulConfig.model_validate(
+            {"config_skills": [{"name": "legacy-published", "file_id": "", "is_missing": True}]}
+        ),
+        created_by="account-1",
+    )
+    snapshot.id = "66666666-6666-4666-8666-666666666666"
+    agent.active_config_snapshot_id = snapshot.id
+    binding = AgentSkillBindingSnapshot(
+        tenant_id="tenant-1",
+        agent_id=agent.id,
+        config_snapshot_id=snapshot.id,
+        skill_id=skill.id,
+        priority=0,
+        created_by="account-1",
+    )
+    sqlite_session.add_all(
+        [_app("44444444-4444-4444-8444-444444444444"), archive_file, skill, version, agent, snapshot, binding]
+    )
+    sqlite_session.commit()
+
+    exporter = RosterAgentPackageExporter(
+        storage_backend=storage,
+        dependency_provider=lambda _tenant_id, _dependencies: [],
+    )
+    with exporter.export(tenant_id="tenant-1", agent_id=agent.id) as exported:
+        with RosterAgentPackageReader().read(exported.archive) as prepared:
+            assert len(prepared.manifest.skills) == 1
+            assert prepared.manifest.skills[0].scope == "workspace"
+            assert set(prepared.manifest.skills[0].model_dump()) == {
+                "id",
+                "path",
+                "size",
+                "sha256",
+                "audit",
+                "scope",
+                "name",
+            }
+            assert prepared.apps["app.yaml"].package.workspace_skills[0].priority == 0
+            assert prepared.manifest.skills[0].name == "legacy-published"
+            assert prepared.apps["app.yaml"].package.workspace_skills[0].display_name == "Legacy Published"
+            assert prepared.apps["app.yaml"].package.workspace_skills[0].description == "Research skill."
+            assert prepared.apps["app.yaml"].package.soul.config_skills[0].is_missing is True
+            assert prepared.manifest.skills[0].sha256 == hashlib.sha256(workspace_payload).hexdigest()
+
+    draft = AgentConfigDraft(
+        tenant_id="tenant-1",
+        agent_id=agent.id,
+        draft_type=AgentConfigDraftType.DRAFT,
+        account_id=None,
+        draft_owner_key="",
+        base_snapshot_id=snapshot.id,
+        config_snapshot=AgentSoulConfig.model_validate({"prompt": {"system_prompt": "current draft"}}),
+        created_by="account-1",
+        updated_by="account-1",
+    )
+    sqlite_session.add(draft)
+    sqlite_session.commit()
+
+    with exporter.export(tenant_id="tenant-1", agent_id=agent.id) as exported:
+        with RosterAgentPackageReader().read(exported.archive) as prepared:
+            assert prepared.apps["app.yaml"].package.soul.prompt.system_prompt == "current draft"
+            assert prepared.manifest.skills == []
+
+
+def test_manifest_yaml_is_strict() -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    manifest = _manifest(skill_payload=skill_payload, file_payload=file_payload).model_dump(mode="json")
+    manifest["unexpected"] = True
+
+    with pytest.raises(ValidationError, match="Extra inputs are not permitted"):
+        RosterAgentPackageManifest.model_validate(yaml.safe_load(yaml.safe_dump(manifest)))
+
+
+@pytest.mark.parametrize(
+    ("case", "message"),
+    [
+        ("empty", "package is empty"),
+        ("entries", "too many members"),
+        ("duplicate", "duplicate member paths"),
+        ("directory", "root-level files"),
+        ("control_character", "unsafe path"),
+        ("symlink", "symbolic links"),
+        ("encrypted", "encrypted members"),
+        ("compression", "unsupported compression"),
+    ],
+)
+def test_reader_rejects_invalid_container_before_parsing_manifest(
+    case: str, message: str, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    if case == "empty":
+        content = _zip({})
+    elif case == "entries":
+        apply_config_overrides(monkeypatch, AGENT_PACKAGE_MAX_ENTRIES=1)
+        content = _zip({"manifest.yaml": b"", "app.yaml": b""})
+    elif case == "duplicate":
+        content = _zip({"manifest.yaml": b"", "MANIFEST.YAML": b""})
+    elif case == "directory":
+        content = _zip({"directory/": b""})
+    elif case == "control_character":
+        content = _zip({"bad\nname": b""})
+    elif case == "symlink":
+        output = io.BytesIO()
+        info = zipfile.ZipInfo("manifest.yaml")
+        info.create_system = 3
+        info.external_attr = 0o120777 << 16
+        with zipfile.ZipFile(output, "w") as archive:
+            archive.writestr(info, b"target.yaml")
+        content = output.getvalue()
+    elif case == "encrypted":
+        data = bytearray(_zip({"manifest.yaml": b"manifest"}))
+        directory = data.index(b"PK\x01\x02")
+        data[directory + 8] |= 1
+        content = bytes(data)
+    else:
+        output = io.BytesIO()
+        with zipfile.ZipFile(output, "w", compression=zipfile.ZIP_BZIP2) as archive:
+            archive.writestr("manifest.yaml", b"manifest")
+        content = output.getvalue()
+    with pytest.raises(InvalidRosterAgentPackageError, match=message):
+        RosterAgentPackageReader().read(io.BytesIO(content))
+
+
+def test_member_read_reports_closed_prepared_archive() -> None:
+    skill_payload = _skill_archive()
+    file_payload = b"pdf-content"
+    content = _package_bytes(
+        _manifest(skill_payload=skill_payload, file_payload=file_payload),
+        skill_payload=skill_payload,
+        file_payload=file_payload,
+    )
+    reader = RosterAgentPackageReader()
+    prepared = reader.read(io.BytesIO(content))
+    prepared.close()
+    with pytest.raises(InvalidRosterAgentPackageError, match="member is unavailable"):
+        reader.read_member_bytes(prepared, "f_000001.pdf", max_bytes=len(file_payload))
+
+
+def test_export_download_closes_owned_archive(app: Flask) -> None:
+    exported = RosterAgentPackageExporter()._build_archive(
+        app=_package_app(AgentSoulConfig()), skill_sources=[], file_sources=[]
+    )
+    with app.test_request_context("/"):
+        response = send_file(
+            exported.archive, mimetype="application/zip", as_attachment=True, download_name=exported.filename
+        )
+        response.call_on_close(exported.close)
+        try:
+            content = b"".join(response.iter_encoded())
+            assert len(content) == exported.size
+            assert exported.filename in response.headers["Content-Disposition"]
+            with zipfile.ZipFile(io.BytesIO(content)) as archive:
+                assert set(archive.namelist()) == {"manifest.yaml", "app.yaml"}
+        finally:
+            response.close()
+    assert exported.archive.closed
+
+
+@pytest.mark.parametrize("file_kind", ["upload_file", "tool_file"])
+@pytest.mark.parametrize(
+    ("declared_mime", "stored_mime", "expected_mime"),
+    [
+        ("text/plain", "application/pdf", "text/plain"),
+        (None, "application/pdf", "application/pdf"),
+        (None, "", "application/octet-stream"),
+    ],
+)
+def test_export_preserves_file_metadata_in_dsl(
+    monkeypatch: pytest.MonkeyPatch, file_kind: str, declared_mime: str | None, stored_mime: str, expected_mime: str
+) -> None:
+    from unittest.mock import Mock
+
+    from models.model import UploadFile
+
+    exporter = RosterAgentPackageExporter(storage_backend=_MemoryStorage({}))
+    tool_file = ToolFile(
+        user_id="account-1",
+        tenant_id="tenant-1",
+        conversation_id=None,
+        file_key="payload",
+        mimetype=stored_mime,
+        name="original.pdf",
+        size=1,
+        original_url=None,
+    )
+    tool_file.id = "source-id"
+    upload_file = Mock(spec=UploadFile, id="source-id", key="payload", mime_type=stored_mime)
+    monkeypatch.setattr(exporter, "_tool_files", Mock(return_value={"source-id": tool_file}))
+    monkeypatch.setattr(exporter, "_upload_files", Mock(return_value={"source-id": upload_file}))
+    soul = AgentSoulConfig.model_validate(
+        {
+            "config_files": [
+                {"name": "original.pdf", "file_kind": file_kind, "file_id": "source-id", "mime_type": declared_mime}
+            ]
+        }
+    )
+
+    portable_soul, _, sources = exporter._collect_payloads(session=Mock(spec=Session), tenant_id="tenant-1", soul=soul)
+
+    ref = portable_soul.config_files[0]
+    assert (ref.name, ref.file_kind, ref.mime_type, ref.file_id) == (
+        "original.pdf",
+        file_kind,
+        expected_mime,
+        sources[0].id,
+    )
+    assert sources[0].storage_key == "payload"
+    assert soul.config_files[0].mime_type == declared_mime
+    assert soul.config_files[0].file_id == "source-id"
+
+
+@pytest.mark.parametrize("mutation", ["missing", "extra", "duplicate"])
+def test_manifest_requires_workspace_skill_dsl_metadata(mutation: str) -> None:
+    from services.agent.dsl_entities import AgentPackageWorkspaceSkill
+
+    manifest = _manifest(skill_payload=_skill_archive(), file_payload=b"pdf-content")
+    app = _package_app()
+    manifest.skills[0].scope = "workspace"
+    app.package.soul.config_skills = []
+    descriptor = AgentPackageWorkspaceSkill(
+        name="research", display_name="Research", description="Research skill.", priority=3
+    )
+    app.package.workspace_skills = [descriptor]
+    manifest.validate_apps({"app.yaml": app})
+    if mutation == "missing":
+        app.package.workspace_skills = []
+    elif mutation == "extra":
+        app.package.workspace_skills.append(descriptor.model_copy(update={"name": "extra"}))
+    else:
+        app.package.workspace_skills.append(descriptor)
+    with pytest.raises(ValueError, match="workspace skill"):
+        manifest.validate_apps({"app.yaml": app})
+
+
+@pytest.mark.parametrize(
+    ("mutation", "message"),
+    [
+        (None, None),
+        ("shared", None),
+        ("size", "integrity checks"),
+        ("checksum", "integrity checks"),
+        ("missing", "missing assistant.yml"),
+        ("schema", "app is invalid"),
+        ("extra", "members do not match"),
+        ("unreferenced", "app is invalid"),
+    ],
+)
+def test_reader_resolves_multiple_indexed_apps(mutation: str | None, message: str | None) -> None:
+    from services.agent.dsl_entities import AgentPackageWorkspaceSkill
+
+    skill = _skill_archive()
+    workspace_skill = _skill_archive("workspace")
+    manifest = _manifest(skill_payload=skill, file_payload=b"pdf")
+    first, second = _package_app(), _package_app()
+    first.package.soul.config_files = []
+    second.package.soul.config_skills = []
+    second.package.workspace_skills = [AgentPackageWorkspaceSkill(name="workspace", priority=0)]
+    manifest.skills.append(
+        RosterAgentPackageSkill(
+            id="s_000002",
+            path="s_000002.zip",
+            scope="workspace",
+            name="workspace",
+            size=len(workspace_skill),
+            sha256=hashlib.sha256(workspace_skill).hexdigest(),
+        )
+    )
+    if mutation == "shared":
+        first.package.soul.config_files = second.package.soul.config_files
+        second.package.soul.config_skills = first.package.soul.config_skills
+        first.package.workspace_skills = second.package.workspace_skills
+    elif mutation == "unreferenced":
+        second.package.soul.config_files = []
+    app_payloads = {"research.yaml": _yaml_bytes(first), "assistant.yml": _yaml_bytes(second)}
+    if mutation == "schema":
+        app_payloads["assistant.yml"] = b"kind: workflow\n"
+    manifest.apps = [_app_member(payload, path) for path, payload in app_payloads.items()]
+    if mutation == "size":
+        manifest.apps[1].size += 1
+    elif mutation == "checksum":
+        manifest.apps[1].sha256 = "0" * 64
+    elif mutation == "missing":
+        del app_payloads["assistant.yml"]
+    elif mutation == "extra":
+        app_payloads["undeclared.yaml"] = b"{}"
+    content = _zip(
+        {
+            "manifest.yaml": _yaml_bytes(manifest),
+            **app_payloads,
+            "s_000001.zip": skill,
+            "s_000002.zip": workspace_skill,
+            "f_000001.pdf": b"pdf",
+        }
+    )
+    reader = RosterAgentPackageReader()
+    if message is not None:
+        with pytest.raises(InvalidRosterAgentPackageError, match=message):
+            reader.read(io.BytesIO(content))
+    else:
+        with reader.read(io.BytesIO(content)) as prepared:
+            assert prepared.apps == {"research.yaml": first, "assistant.yml": second}
+            for path, payload in app_payloads.items():
+                assert reader.read_member_bytes(prepared, path, max_bytes=len(payload)) == payload
+
+
+@pytest.mark.parametrize(
+    "paths",
+    [[], ["app.yaml", "app.yaml"], ["app.yaml", "APP.yaml"], ["manifest.yaml"], ["nested/app.yaml"], ["app.json"]],
+)
+def test_manifest_rejects_invalid_app_index(paths: list[str]) -> None:
+    values = _manifest(skill_payload=_skill_archive(), file_payload=b"pdf").model_dump(mode="json")
+    values["apps"] = [{"path": path, "size": 0, "sha256": "0" * 64} for path in paths]
+    with pytest.raises(ValidationError):
+        RosterAgentPackageManifest.model_validate(values)
diff --git a/api/tests/unit_tests/services/agent/test_skill_package_service.py b/api/tests/unit_tests/services/agent/test_skill_package_service.py
index 94aef19e514..d62318434ca 100644
--- a/api/tests/unit_tests/services/agent/test_skill_package_service.py
+++ b/api/tests/unit_tests/services/agent/test_skill_package_service.py
@@ -9,8 +9,8 @@ import zlib
 
 import pytest
 
-from services.agent import skill_package_service as skill_package_service_module
 from services.agent.skill_package_service import NormalizedSkillPackage, SkillPackageError, SkillPackageService
+from tests.unit_tests.config_override import apply_config_overrides
 
 _SKILL_MD = """---
 name: pdf-toolkit
@@ -35,36 +35,110 @@ def _normalize(members: dict[str, bytes], *, filename: str = "skill.zip") -> Nor
     return SkillPackageService().validate_and_normalize(content=_zip(members), filename=filename)
 
 
-def _archive_members(content: bytes) -> list[str]:
-    with zipfile.ZipFile(io.BytesIO(content)) as archive:
-        return sorted(info.filename for info in archive.infolist() if not info.is_dir())
+def test_normalize_replaces_invalid_utf8_member_names() -> None:
+    original = _zip(
+        {
+            "SKILL.md": _SKILL_MD.encode(),
+            "scripts/\u00e9.py": b"print('keep payload')\n",
+            "assets/\u00f6.txt": b"valid unicode name",
+            "assets/X.txt": b"legacy encoded name",
+        }
+    )
+    damaged = original.replace(b"\xc3\xa9.py", b"\xffa.py").replace(b"assets/X.txt", b"assets/\x82.txt")
+    service = SkillPackageService()
+    assert service.inspect(content=damaged, filename="skill.zip").name == "pdf-toolkit"
+    normalized = service.validate_and_normalize(content=damaged, filename="skill.zip")
+    with zipfile.ZipFile(io.BytesIO(normalized.archive_bytes)) as archive:
+        assert archive.read("scripts/\ufffda.py") == b"print('keep payload')\n"
+        assert archive.read("assets/\u00f6.txt") == b"valid unicode name"
+        assert archive.read("assets/\u00e9.txt") == b"legacy encoded name"
+        assert archive.testzip() is None
 
 
-def test_valid_skill_normalizes_manifest():
-    manifest = _normalize({"SKILL.md": _SKILL_MD.encode(), "scripts/run.py": b"print('hi')\n"}).manifest
-
-    assert manifest.name == "pdf-toolkit"
-    assert manifest.description == "Tools for working with PDF files."
-    assert manifest.entry_path == "SKILL.md"
-    assert set(manifest.files) == {"SKILL.md", "scripts/run.py"}
-    assert manifest.size > 0
-    assert len(manifest.hash) == 64
+def test_normalize_recovers_zip64_skill_names(monkeypatch: pytest.MonkeyPatch) -> None:
+    with monkeypatch.context() as scoped:
+        scoped.setattr(zipfile, "ZIP64_LIMIT", 0)
+        original = _zip({"SKILL.md": _SKILL_MD.encode(), "scripts/\u00e9.py": b"print('ok')\n"})
+    damaged = original.replace(b"\xc3\xa9.py", b"\xffa.py")
+    service = SkillPackageService()
+    assert service.inspect(content=damaged, filename="skill.zip").name == "pdf-toolkit"
+    normalized = service.validate_and_normalize(content=damaged, filename="skill.zip")
+    with zipfile.ZipFile(io.BytesIO(normalized.archive_bytes)) as archive:
+        assert archive.read("scripts/\ufffda.py") == b"print('ok')\n"
 
 
-def test_validate_and_normalize_accepts_crlf_skill_md():
-    crlf_skill_md = _SKILL_MD.replace("\n", "\r\n")
-    package = _normalize({"SKILL.md": crlf_skill_md.encode()})
-
-    assert package.manifest.name == "pdf-toolkit"
-    assert package.manifest.description == "Tools for working with PDF files."
-    assert b"\r" not in package.skill_md_bytes
-    assert package.skill_md_bytes.decode() == _SKILL_MD
+def test_replacement_member_names_must_remain_unique() -> None:
+    original = _zip(
+        {
+            "SKILL.md": _SKILL_MD.encode(),
+            "scripts/\u00e9.py": b"one",
+            "scripts/\u00f6.py": b"two",
+        }
+    )
+    damaged = original.replace(b"\xc3\xa9.py", b"\xffa.py").replace(b"\xc3\xb6.py", b"\xfea.py")
+    with pytest.raises(SkillPackageError) as error:
+        SkillPackageService().validate_and_normalize(content=damaged, filename="skill.zip")
+    assert error.value.code == "duplicate_member_path"
 
 
-def test_name_and_description_are_required_in_frontmatter():
-    with pytest.raises(SkillPackageError) as exc_info:
-        _normalize({"SKILL.md": b"# heading-name\n\nbody"})
-    assert exc_info.value.code == "missing_skill_name"
+def test_replacement_names_do_not_hide_local_header_mismatch() -> None:
+    original = _zip({"SKILL.md": _SKILL_MD.encode(), "\u00e9.py": b"payload"})
+    # Damage only the central name, leaving the local header unchanged.
+    central = original.index(b"PK\x01\x02")
+    damaged = original[:central] + original[central:].replace(b"\xc3\xa9.py", b"\xffa.py")
+    with pytest.raises(SkillPackageError) as error:
+        SkillPackageService().validate_and_normalize(content=damaged, filename="skill.zip")
+    assert error.value.code == "invalid_archive"
+
+
+def test_normalized_highly_compressible_skill_passes_reinspection() -> None:
+    payload = b"x" * (1024 * 1024)
+    content = _zip({"SKILL.md": _SKILL_MD.encode(), "data.bin": payload}, compression=zipfile.ZIP_STORED)
+    service = SkillPackageService()
+    normalized = service.validate_and_normalize(content=content, filename="skill.zip")
+    inspection = service.inspect(content=normalized.archive_bytes, filename="skill.zip")
+    assert inspection.name == normalized.manifest.name
+    with zipfile.ZipFile(io.BytesIO(normalized.archive_bytes)) as archive:
+        assert archive.getinfo("data.bin").compress_type == zipfile.ZIP_DEFLATED
+        assert archive.read("data.bin") == payload
+
+
+def test_inspect_reports_uncompressed_size_without_rebuilding(monkeypatch: pytest.MonkeyPatch):
+    members = {"SKILL.md": _SKILL_MD.encode(), "scripts/run.py": b"print('hi')\n"}
+
+    def fail_if_called(*_args: object, **_kwargs: object) -> bytes:
+        raise AssertionError("inspection must not rebuild the archive")
+
+    monkeypatch.setattr(SkillPackageService, "_build_normalized_archive", fail_if_called)
+
+    inspection = SkillPackageService().inspect(content=_zip(members), filename="skill.zip")
+
+    assert inspection.name == "pdf-toolkit"
+    assert inspection.uncompressed_size == sum(len(content) for content in members.values())
+
+
+@pytest.mark.parametrize("prefix", ["", "pdf-toolkit/"])
+@pytest.mark.parametrize("crlf", [False, True])
+def test_inspection_and_normalization_keep_distinct_size_meanings(prefix: str, crlf: bool) -> None:
+    skill_md = _SKILL_MD.replace("\n", "\r\n") if crlf else _SKILL_MD
+    script = b"print('hi')\n"
+    members = {f"{prefix}SKILL.md": skill_md.encode(), f"{prefix}scripts/run.py": script}
+    if prefix:
+        members["README.md"] = b"ignored outside the selected root"
+    content = _zip(members)
+    service = SkillPackageService()
+    inspection = service.inspect(content=content, filename="skill.zip")
+    normalized = service.validate_and_normalize(content=content, filename="skill.zip")
+    assert inspection.uncompressed_size == sum(len(value) for value in members.values())
+    expected_size = len(_SKILL_MD.encode()) + len(script)
+    assert normalized.manifest.size == expected_size
+    assert normalized.manifest.name == "pdf-toolkit"
+    assert normalized.manifest.description == "Tools for working with PDF files."
+    with zipfile.ZipFile(io.BytesIO(normalized.archive_bytes)) as archive:
+        assert sum(info.file_size for info in archive.infolist()) == expected_size
+        assert archive.read("SKILL.md") == _SKILL_MD.encode()
+    if prefix or crlf:
+        assert inspection.uncompressed_size > normalized.manifest.size
 
 
 def test_shallowest_skill_md_preferred_during_normalization():
@@ -73,96 +147,40 @@ def test_shallowest_skill_md_preferred_during_normalization():
     assert manifest.files == ["SKILL.md", "nested/SKILL.md"]
 
 
-def test_validate_and_normalize_keeps_root_skill_unchanged():
-    package = _normalize({"SKILL.md": _SKILL_MD.encode(), "scripts/run.py": b"print('hi')\n"})
+@pytest.mark.parametrize(
+    ("prefix", "extra_members"),
+    [
+        pytest.param("", {}, id="root"),
+        pytest.param("pdf-toolkit/", {}, id="single-folder"),
+        pytest.param("pdf-toolkit/", {"README.md": b"bundle notes\n"}, id="root-outsider"),
+        pytest.param("pdf-toolkit/", {".": b"x"}, id="dot-outsider"),
+        pytest.param("pdf-toolkit/", {"bundle/other.txt": b"x"}, id="nested-outsider"),
+        pytest.param("bundle/pdf-toolkit/", {}, id="deep-root"),
+    ],
+)
+def test_normalization_preserves_selected_skill_contents(prefix: str, extra_members: dict[str, bytes]) -> None:
+    expected = {"SKILL.md": _SKILL_MD.encode(), "scripts/run.py": b"print('hi')\n"}
+    original = _zip({**{prefix + path: content for path, content in expected.items()}, **extra_members})
+    package = SkillPackageService().validate_and_normalize(content=original, filename="skill.zip")
 
+    assert package.manifest.name == "pdf-toolkit"
+    assert package.manifest.description == "Tools for working with PDF files."
+    assert package.manifest.size == sum(len(content) for content in expected.values())
     assert package.manifest.entry_path == "SKILL.md"
-    assert package.manifest.files == ["SKILL.md", "scripts/run.py"]
-    assert package.skill_md_bytes == _SKILL_MD.encode()
-    assert package.strip_prefix is None
-    assert _archive_members(package.archive_bytes) == ["SKILL.md", "scripts/run.py"]
-    assert len(package.manifest.hash) == 64
-
-
-def test_validate_and_normalize_strips_single_top_level_folder():
-    package = _normalize(
-        {
-            "pdf-toolkit/SKILL.md": _SKILL_MD.encode(),
-            "pdf-toolkit/scripts/run.py": b"print('hi')\n",
-        }
-    )
-
-    assert package.manifest.entry_path == "SKILL.md"
-    assert package.manifest.files == ["SKILL.md", "scripts/run.py"]
-    assert package.skill_md_bytes == _SKILL_MD.encode()
-    assert package.strip_prefix == "pdf-toolkit/"
-    assert _archive_members(package.archive_bytes) == ["SKILL.md", "scripts/run.py"]
-
-
-def test_validate_and_normalize_strips_single_top_level_folder_ignoring_other_root_entries():
-    package = _normalize(
-        {
-            "pdf-toolkit/SKILL.md": _SKILL_MD.encode(),
-            "pdf-toolkit/scripts/run.py": b"print('hi')\n",
-            "README.md": b"bundle notes\n",
-        }
-    )
-
-    assert package.manifest.entry_path == "SKILL.md"
-    assert package.manifest.files == ["SKILL.md", "scripts/run.py"]
-    assert package.skill_md_bytes == _SKILL_MD.encode()
-    assert package.strip_prefix == "pdf-toolkit/"
-    assert _archive_members(package.archive_bytes) == ["SKILL.md", "scripts/run.py"]
-
-
-def test_validate_and_normalize_strips_single_top_level_folder_dropping_nested_foreign_paths():
-    package = _normalize(
-        {
-            "pdf-toolkit/SKILL.md": _SKILL_MD.encode(),
-            "pdf-toolkit/scripts/run.py": b"print('hi')\n",
-            "bundle/other.txt": b"x",
-        }
-    )
-
-    assert package.manifest.entry_path == "SKILL.md"
-    assert package.manifest.files == ["SKILL.md", "scripts/run.py"]
-    assert package.skill_md_bytes == _SKILL_MD.encode()
-    assert package.strip_prefix == "pdf-toolkit/"
-    assert _archive_members(package.archive_bytes) == ["SKILL.md", "scripts/run.py"]
-
-
-def test_validate_and_normalize_rejects_multiple_depth_2_skill_roots_with_sibling_skill_tree():
-    with pytest.raises(SkillPackageError) as exc_info:
-        _normalize(
-            {
-                "pdf-toolkit/SKILL.md": _SKILL_MD.encode(),
-                "pdf-toolkit/scripts/run.py": b"print('hi')\n",
-                "other-tool/SKILL.md": _SKILL_MD.encode(),
-            }
-        )
-    assert exc_info.value.code == "files_outside_skill_root"
-
-
-def test_validate_and_normalize_strips_deeper_selected_skill_root():
-    members = {
-        "bundle/pdf-toolkit/SKILL.md": _SKILL_MD.encode(),
-        "bundle/pdf-toolkit/scripts/run.py": b"print('hi')\n",
-    }
-    original_upload_bytes = _zip(members)
-    package = SkillPackageService().validate_and_normalize(content=original_upload_bytes, filename="skill.zip")
-
-    assert package.manifest.entry_path == "SKILL.md"
-    assert package.manifest.files == ["SKILL.md", "scripts/run.py"]
-    assert package.strip_prefix == "bundle/pdf-toolkit/"
-    assert _archive_members(package.archive_bytes) == ["SKILL.md", "scripts/run.py"]
+    assert package.manifest.files == sorted(expected)
+    with zipfile.ZipFile(io.BytesIO(package.archive_bytes)) as archive:
+        assert archive.namelist() == sorted(expected)
+        assert {path: archive.read(path) for path in archive.namelist()} == expected
     assert package.manifest.hash == hashlib.sha256(package.archive_bytes).hexdigest()
-    assert package.manifest.hash != hashlib.sha256(original_upload_bytes).hexdigest()
+    if prefix:
+        assert package.manifest.hash != hashlib.sha256(original).hexdigest()
 
 
 @pytest.mark.parametrize(
     ("members", "filename", "code"),
     [
         ({"README.md": b"x"}, "skill.zip", "missing_skill_md"),
+        ({"SKILL.md": _SKILL_MD.encode(), ".": b"x"}, "skill.zip", "unsafe_path"),
         ({"SKILL.md": _SKILL_MD.encode()}, "skill.tar", "unsupported_extension"),
         ({"SKILL.md": b""}, "skill.zip", "empty_skill_md"),
         ({"SKILL.md": b"---\ndescription: valid\n---\n# no name here"}, "skill.zip", "missing_skill_name"),
@@ -178,6 +196,43 @@ def test_validate_and_normalize_strips_deeper_selected_skill_root():
             "invalid_skill_description",
         ),
         ({"SKILL.md": b"\xff\xfenot utf8"}, "skill.zip", "skill_md_not_utf8"),
+        pytest.param({"SKILL.md": b"# heading-name\n\nbody"}, "skill.zip", "missing_skill_name", id="no-frontmatter"),
+        pytest.param(
+            {
+                "pdf-toolkit/SKILL.md": _SKILL_MD.encode(),
+                "pdf-toolkit/scripts/run.py": b"print('hi')\n",
+                "other-tool/SKILL.md": _SKILL_MD.encode(),
+            },
+            "skill.zip",
+            "files_outside_skill_root",
+            id="multiple-skill-roots",
+        ),
+        pytest.param({"../evil.txt": b"x", "SKILL.md": _SKILL_MD.encode()}, "skill.zip", "unsafe_path", id="zip-slip"),
+        pytest.param(
+            {"SKILL.md": b"---\n: : : not yaml\n---\n# x\n"},
+            "skill.zip",
+            "invalid_frontmatter",
+            id="invalid-frontmatter",
+        ),
+        pytest.param(
+            {"SKILL.md": b"---\n# heading-wins\nbody"}, "skill.zip", "missing_skill_name", id="unterminated-frontmatter"
+        ),
+        pytest.param(
+            {"bundle/pdf-toolkit/SKILL.md": _SKILL_MD.encode(), "README.md": b"x"},
+            "skill.zip",
+            "files_outside_skill_root",
+            id="outside-deep-root",
+        ),
+        pytest.param(
+            {
+                "pdf-toolkit/SKILL.md": _SKILL_MD.encode(),
+                "pdf-toolkit/scripts/run.py": b"print('x')\n",
+                "pdf-toolkit/scripts/./run.py": b"print('y')\n",
+            },
+            "skill.zip",
+            "duplicate_member_path",
+            id="duplicate-normalized-path",
+        ),
     ],
 )
 def test_invalid_packages_rejected(members: dict[str, bytes], filename: str, code: str):
@@ -193,13 +248,6 @@ def test_non_zip_content_rejected():
     assert exc_info.value.code == "invalid_archive"
 
 
-def test_zip_slip_member_rejected():
-    payload = _zip({"../evil.txt": b"x", "SKILL.md": _SKILL_MD.encode()})
-    with pytest.raises(SkillPackageError) as exc_info:
-        SkillPackageService().validate_and_normalize(content=payload, filename="skill.zip")
-    assert exc_info.value.code == "unsafe_path"
-
-
 def test_empty_archive_rejected():
     with pytest.raises(SkillPackageError) as exc_info:
         SkillPackageService().validate_and_normalize(content=b"", filename="skill.zip")
@@ -207,7 +255,7 @@ def test_empty_archive_rejected():
 
 
 def test_validate_and_normalize_rejects_skill_md_too_large(monkeypatch: pytest.MonkeyPatch):
-    monkeypatch.setattr(skill_package_service_module, "_MAX_SKILL_MD_BYTES", 8)
+    apply_config_overrides(monkeypatch, SKILL_PACKAGE_MAX_SKILL_MD_BYTES=8)
 
     with pytest.raises(SkillPackageError) as exc_info:
         _normalize({"SKILL.md": _SKILL_MD.encode()})
@@ -215,15 +263,15 @@ def test_validate_and_normalize_rejects_skill_md_too_large(monkeypatch: pytest.M
 
 
 def test_validate_and_normalize_rejects_too_many_entries(monkeypatch: pytest.MonkeyPatch):
-    monkeypatch.setattr(skill_package_service_module, "_MAX_ENTRIES", 1)
+    apply_config_overrides(monkeypatch, SKILL_PACKAGE_MAX_ENTRIES=1)
 
     with pytest.raises(SkillPackageError) as exc_info:
-        _normalize({"SKILL.md": _SKILL_MD.encode(), "scripts/run.py": b"print('x')\n"})
+        _normalize({"SKILL.md": _SKILL_MD.encode(), "assets/": b""})
     assert exc_info.value.code == "too_many_entries"
 
 
 def test_validate_and_normalize_rejects_archive_too_large_uncompressed(monkeypatch: pytest.MonkeyPatch):
-    monkeypatch.setattr(skill_package_service_module, "_MAX_UNCOMPRESSED_BYTES", 32)
+    apply_config_overrides(monkeypatch, SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES=32)
 
     with pytest.raises(SkillPackageError) as exc_info:
         _normalize({"SKILL.md": _SKILL_MD.encode(), "scripts/run.py": b"x" * 33})
@@ -231,8 +279,6 @@ def test_validate_and_normalize_rejects_archive_too_large_uncompressed(monkeypat
 
 
 def test_validate_and_normalize_rejects_archive_too_large_uploaded_bytes(monkeypatch: pytest.MonkeyPatch):
-    from tests.unit_tests.config_override import apply_config_overrides
-
     apply_config_overrides(monkeypatch, UPLOAD_SKILL_FILE_SIZE_LIMIT=1)
 
     with pytest.raises(SkillPackageError) as exc_info:
@@ -240,35 +286,14 @@ def test_validate_and_normalize_rejects_archive_too_large_uploaded_bytes(monkeyp
     assert exc_info.value.code == "archive_too_large"
 
 
-def test_bad_frontmatter_yaml_rejected():
-    bad = b"---\n: : : not yaml\n---\n# x\n"
+def test_high_compression_ratio_uses_absolute_expansion_limit(monkeypatch: pytest.MonkeyPatch) -> None:
+    content = _zip({"SKILL.md": _SKILL_MD.encode(), "data.bin": b"x" * (1024 * 1024)})
+    service = SkillPackageService()
+    assert service.inspect(content=content, filename="skill.zip").name == "pdf-toolkit"
+    apply_config_overrides(monkeypatch, SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES=1024)
     with pytest.raises(SkillPackageError) as exc_info:
-        _normalize({"SKILL.md": bad})
-    assert exc_info.value.code == "invalid_frontmatter"
-
-
-def test_unterminated_frontmatter_rejected():
-    with pytest.raises(SkillPackageError) as exc_info:
-        _normalize({"SKILL.md": b"---\n# heading-wins\nbody"})
-    assert exc_info.value.code == "missing_skill_name"
-
-
-def test_validate_and_normalize_rejects_files_outside_selected_skill_root():
-    with pytest.raises(SkillPackageError) as exc_info:
-        _normalize({"bundle/pdf-toolkit/SKILL.md": _SKILL_MD.encode(), "README.md": b"x"})
-    assert exc_info.value.code == "files_outside_skill_root"
-
-
-def test_validate_and_normalize_rejects_duplicate_normalized_paths():
-    with pytest.raises(SkillPackageError) as exc_info:
-        _normalize(
-            {
-                "pdf-toolkit/SKILL.md": _SKILL_MD.encode(),
-                "pdf-toolkit/scripts/run.py": b"print('x')\n",
-                "pdf-toolkit/scripts/./run.py": b"print('y')\n",
-            }
-        )
-    assert exc_info.value.code == "duplicate_member_path"
+        service.inspect(content=content, filename="skill.zip")
+    assert exc_info.value.code == "archive_too_large"
 
 
 def test_validate_and_normalize_maps_member_decompression_failures_to_invalid_archive(monkeypatch: pytest.MonkeyPatch):
diff --git a/api/tests/unit_tests/services/test_agent_config_service.py b/api/tests/unit_tests/services/test_agent_config_service.py
index f69def8bd7c..dcd6af670c4 100644
--- a/api/tests/unit_tests/services/test_agent_config_service.py
+++ b/api/tests/unit_tests/services/test_agent_config_service.py
@@ -366,7 +366,7 @@ def test_push_accepts_tenant_scoped_tool_file_sources_from_different_upload_owne
         patch.object(
             service._skill_normalizer,
             "normalize",
-            return_value=(skill_ref, object()),
+            return_value=skill_ref,
         ),
     ):
         manifest = service.push(
diff --git a/api/tests/unit_tests/services/test_app_dsl_service.py b/api/tests/unit_tests/services/test_app_dsl_service.py
index 86a410c665e..b7d84895d04 100644
--- a/api/tests/unit_tests/services/test_app_dsl_service.py
+++ b/api/tests/unit_tests/services/test_app_dsl_service.py
@@ -9,11 +9,13 @@ import yaml
 from sqlalchemy import event, select
 from sqlalchemy.orm import Session, sessionmaker
 
+from constants.dsl_version import CURRENT_APP_DSL_VERSION
 from core.rbac import RBACPermission, RBACResourceScope
 from core.workflow.llm_environment_variable import LLMEnvironmentVariable
 from models import Account, App, AppMode, Tenant
 from models.model import AppModelConfig, AppModelConfigDict, IconType
 from models.workflow import Workflow, WorkflowType
+from services.agent.dsl_entities import AgentPackage
 from services.app_dsl_service import AppDslService, Import, PendingData
 from services.enterprise.enterprise_service import EnterpriseService
 from services.entities.dsl_entities import ImportStatus
@@ -795,3 +797,56 @@ def test_append_workflow_export_data_reports_missing_selected_workflow(
             session=unbound_session,
             workflow_id=workflow_id,
         )
+
+
+@pytest.mark.parametrize(
+    "mode",
+    [AppMode.AGENT, AppMode.WORKFLOW, AppMode.ADVANCED_CHAT, AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.COMPLETION],
+)
+def test_export_dsl_preserves_envelope_and_mode_specific_content(
+    mode: AppMode, monkeypatch: pytest.MonkeyPatch, unbound_session: Session
+) -> None:
+    app = _app(mode=mode)
+    package = AgentPackage.model_validate({"metadata": {"name": app.name}, "soul": {}})
+    monkeypatch.setattr(
+        "services.app_dsl_service.AgentDslService.export_agent_app",
+        Mock(return_value=("agent_1", {"agent_1": package})),
+    )
+    monkeypatch.setattr(
+        "services.app_dsl_service.DependenciesAnalysisService.generate_dependencies", Mock(return_value=[])
+    )
+
+    def append_workflow(*, export_data: dict[str, object], **_kwargs: object) -> None:
+        export_data["workflow"] = {"fixture": "workflow"}
+
+    def append_model(export_data: dict[str, object], *_args: object, **_kwargs: object) -> None:
+        export_data["model_config"] = {"fixture": "model"}
+
+    monkeypatch.setattr(AppDslService, "_append_workflow_export_data", Mock(side_effect=append_workflow))
+    monkeypatch.setattr(AppDslService, "_append_model_config_export_data", Mock(side_effect=append_model))
+    data = yaml.safe_load(AppDslService.export_dsl(app, session=unbound_session))
+    assert data["version"] == CURRENT_APP_DSL_VERSION
+    assert data["kind"] == "app"
+    assert data["app"] == {
+        "name": "Existing app",
+        "description": "",
+        "mode": mode.value,
+        "icon_type": "emoji",
+        "icon": "robot",
+        "icon_background": "#FFFFFF",
+        "use_icon_as_answer_icon": False,
+    }
+    if mode == AppMode.AGENT:
+        assert data["agent"] == {"package_ref": "agent_1"}
+        assert AgentPackage.model_validate(data["agent_packages"]["agent_1"]) == package
+        assert data["dependencies"] == []
+        assert "workflow" not in data
+        assert "model_config" not in data
+    elif mode in {AppMode.WORKFLOW, AppMode.ADVANCED_CHAT}:
+        assert data["workflow"] == {"fixture": "workflow"}
+        assert "agent" not in data
+        assert "model_config" not in data
+    else:
+        assert data["model_config"] == {"fixture": "model"}
+        assert "agent" not in data
+        assert "workflow" not in data
diff --git a/api/tests/unit_tests/services/test_skill_management_service.py b/api/tests/unit_tests/services/test_skill_management_service.py
index 951c7147a36..7e83f39e82e 100644
--- a/api/tests/unit_tests/services/test_skill_management_service.py
+++ b/api/tests/unit_tests/services/test_skill_management_service.py
@@ -2829,21 +2829,27 @@ def test_import_skill_package_rejects_archive_larger_than_upload_skill_limit(mon
     assert exc_info.value.code == "archive_too_large"
 
 
-def test_import_skill_package_rejects_zip_bomb_before_reading_members() -> None:
+def test_import_skill_package_rejects_excessive_expansion_before_reading_members(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    apply_config_overrides(monkeypatch, SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES=1024 * 1024)
     package = io.BytesIO()
     with zipfile.ZipFile(package, "w", compression=zipfile.ZIP_DEFLATED) as archive:
         archive.writestr("payload.bin", b"\x00" * (8 * 1024 * 1024))
 
     service = SkillManagementService(tool_file_manager=_FakeToolFileManager())
 
-    with pytest.raises(SkillManagementServiceError) as exc_info:
+    with (
+        patch.object(zipfile.ZipFile, "read", side_effect=AssertionError("member read before size validation")),
+        pytest.raises(SkillManagementServiceError) as exc_info,
+    ):
         service._draft_payload_from_zip(
             tenant_id=TENANT,
             user_id=USER,
             archive_bytes=package.getvalue(),
         )
 
-    assert exc_info.value.code == "invalid_skill_package"
+    assert exc_info.value.code == "skill_too_large"
 
 
 def test_publish_and_export_include_binary_tool_files() -> None:
@@ -3273,6 +3279,7 @@ def test_runtime_agent_skills_use_published_identity_when_draft_metadata_changed
         description="draft description",
     )
     version = SimpleNamespace(
+        id="version-1",
         archive_tool_file_id="archive-1",
         archive_size=10,
         hash_code="hash-1",
@@ -3283,8 +3290,10 @@ def test_runtime_agent_skills_use_published_identity_when_draft_metadata_changed
             description="published description",
         ),
     )
+    binding = SimpleNamespace(priority=0)
+    tool_file = SimpleNamespace(file_key="tools/archive-1.zip")
     session = MagicMock()
-    session.execute.return_value = [(SimpleNamespace(), skill, version)]
+    session.execute.return_value = [(binding, skill, version, tool_file)]
 
     with patch("services.skill_management_service.session_factory.create_session") as create_session:
         create_session.return_value.__enter__.return_value = session
@@ -3358,6 +3367,29 @@ def test_agent_skill_binding_changes_require_agent_publish_before_runtime_load()
 
     assert service.list_runtime_agent_skills(tenant_id=TENANT, agent_id=AGENT)[0]["name"] == "finance-sop"
 
+    with session_factory.create_session() as session:
+        agent = session.get(Agent, AGENT)
+        assert agent is not None
+        next_snapshot = AgentConfigSnapshot(
+            tenant_id=TENANT,
+            agent_id=AGENT,
+            version=2,
+            config_snapshot=AgentSoulConfig(),
+            created_by=USER,
+        )
+        session.add(next_snapshot)
+        session.flush()
+        agent.active_config_snapshot_id = next_snapshot.id
+        session.commit()
+
+    assert service.list_runtime_agent_skills(tenant_id=TENANT, agent_id=AGENT) == []
+    historical_skills = service.list_runtime_agent_skills(
+        tenant_id=TENANT, agent_id=AGENT, config_snapshot_id=snapshot_id
+    )
+    assert [skill["name"] for skill in historical_skills] == ["finance-sop"]
+    draft_skills = service.list_runtime_agent_skills(tenant_id=TENANT, agent_id=AGENT, include_draft=True)
+    assert [skill["name"] for skill in draft_skills] == ["finance-sop"]
+
 
 def test_runtime_agent_skill_pull_normalizes_archive_identity_to_published_metadata() -> None:
     archive_buffer = io.BytesIO()
@@ -3378,3 +3410,14 @@ def test_runtime_agent_skill_pull_normalizes_archive_identity_to_published_metad
         assert "description: Published description" in skill_md
         assert "display-name: Published Name" in skill_md
         assert archive.read("references/example.md") == b"Example"
+
+
+def test_archive_limits_accept_high_compression_ratio_within_size_budget(monkeypatch: pytest.MonkeyPatch) -> None:
+    output = io.BytesIO()
+    with zipfile.ZipFile(output, "w", compression=zipfile.ZIP_DEFLATED) as archive:
+        archive.writestr("data.bin", b"x" * (1024 * 1024))
+    with zipfile.ZipFile(io.BytesIO(output.getvalue())) as archive:
+        assert SkillManagementService._validate_archive_limits(archive)[0].file_size == 1024 * 1024
+        apply_config_overrides(monkeypatch, SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES=1024)
+        with pytest.raises(SkillManagementServiceError, match="uncompressed size limit"):
+            SkillManagementService._validate_archive_limits(archive)
diff --git a/docker/envs/core-services/shared.env.example b/docker/envs/core-services/shared.env.example
index f5ae7604d0c..fbb960b742c 100644
--- a/docker/envs/core-services/shared.env.example
+++ b/docker/envs/core-services/shared.env.example
@@ -66,6 +66,12 @@ UPLOAD_IMAGE_FILE_SIZE_LIMIT=10
 UPLOAD_VIDEO_FILE_SIZE_LIMIT=100
 UPLOAD_AUDIO_FILE_SIZE_LIMIT=50
 UPLOAD_SKILL_FILE_SIZE_LIMIT=50
+SKILL_PACKAGE_MAX_UNCOMPRESSED_BYTES=209715200
+SKILL_PACKAGE_MAX_ENTRIES=5000
+SKILL_PACKAGE_MAX_SKILL_MD_BYTES=1048576
+AGENT_PACKAGE_MAX_BYTES=536870912
+AGENT_PACKAGE_MAX_MANIFEST_BYTES=5242880
+AGENT_PACKAGE_MAX_ENTRIES=5000
 API_SENTRY_DSN=
 API_SENTRY_TRACES_SAMPLE_RATE=1.0
 API_SENTRY_PROFILES_SAMPLE_RATE=1.0

From 7dad80b1f9259feff12f27e7c212c4e3a4530eb2 Mon Sep 17 00:00:00 2001
From: wangxiaolei <fatelei@gmail.com>
Date: Thu, 17 Sep 2026 07:17:45 +0000
Subject: [PATCH 23/28] fix: fix upload skill zip has an empty directory
 (#42407)

---
 api/services/skill_management_service.py      |  3 ++-
 .../services/test_skill_management_service.py | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/api/services/skill_management_service.py b/api/services/skill_management_service.py
index 2c4bbe28060..d89be84067c 100644
--- a/api/services/skill_management_service.py
+++ b/api/services/skill_management_service.py
@@ -3819,7 +3819,8 @@ class SkillManagementService:
             return {path: path for path in paths}
         root = next(iter(skill_md_roots))
         prefix = f"{root}/"
-        return {path: path.removeprefix(prefix) for path in paths if path == root or path.startswith(prefix)}
+        # The explicit wrapper directory represents the new root, not a draft item.
+        return {path: path.removeprefix(prefix) for path in paths if path.startswith(prefix)}
 
     def _draft_payload_from_zip(
         self,
diff --git a/api/tests/unit_tests/services/test_skill_management_service.py b/api/tests/unit_tests/services/test_skill_management_service.py
index 7e83f39e82e..315e3b6b3b5 100644
--- a/api/tests/unit_tests/services/test_skill_management_service.py
+++ b/api/tests/unit_tests/services/test_skill_management_service.py
@@ -2770,6 +2770,31 @@ def test_import_skill_package_accepts_crlf_skill_md() -> None:
     assert skill_md_file["content"].startswith("---\nname: expense-sop\n")
 
 
+@pytest.mark.parametrize("include_empty_directory", [False, True])
+def test_import_skill_package_drops_explicit_wrapper_directory(include_empty_directory: bool) -> None:
+    package = io.BytesIO()
+    with zipfile.ZipFile(package, "w") as archive:
+        archive.writestr("critical-thinking/", "")
+        archive.writestr("__MACOSX/._critical-thinking", b"\x00")
+        archive.writestr(
+            "critical-thinking/SKILL.md",
+            "---\nname: critical-thinking\ndescription: Critical thinking\n---\n# Critical thinking",
+        )
+        archive.writestr("__MACOSX/critical-thinking/._SKILL.md", b"\x00")
+        if include_empty_directory:
+            archive.writestr("critical-thinking/references/", "")
+
+    service = SkillManagementService(tool_file_manager=_FakeToolFileManager())
+    imported = service.import_skill(
+        tenant_id=TENANT,
+        user_id=USER,
+        payload=SkillImportPayload(content=package.getvalue(), filename="critical-thinking.zip"),
+    )
+
+    expected_paths = ["SKILL.md", "references"] if include_empty_directory else ["SKILL.md"]
+    assert [item["path"] for item in imported["files"]] == expected_paths
+
+
 def test_import_skill_package_strips_root_alongside_macos_metadata_folder() -> None:
     package = io.BytesIO()
     with zipfile.ZipFile(package, "w") as archive:

From 5e76fc45b70d541413ce8ec2fab400f70f2fee4f Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Thu, 17 Sep 2026 07:21:44 +0000
Subject: [PATCH 24/28] chore: improve workflow editor accessibility (#42403)

---
 oxlint-suppressions.json                      |   8 -
 .../__tests__/control-scale.browser.spec.tsx  |  96 ++++++
 .../workflow/__tests__/custom-edge.spec.tsx   |   2 +
 .../edge-insert-focus.browser.spec.tsx        |  89 +++++
 .../workflow/block-selector/index.tsx         |   2 +-
 web/app/components/workflow/custom-edge.tsx   |  33 +-
 .../header/checklist/__tests__/index.spec.tsx |  19 +-
 .../workflow/header/checklist/index.tsx       |   2 +-
 .../use-edge-accessible-label.spec.tsx        | 162 ++++++++++
 .../hooks/use-edge-accessible-label.ts        |  65 ++++
 .../hooks/use-workflow-control-scale.ts       |  32 ++
 web/app/components/workflow/index.tsx         |   2 +
 .../workflow/node-actions-menu/index.tsx      |  13 +-
 .../__tests__/node-handle.browser.spec.tsx    | 305 ++++++++++++++++++
 .../title-description-input.spec.tsx          |  42 +++
 .../next-step/__tests__/item.browser.spec.tsx |  53 +++
 .../next-step/__tests__/operator.spec.tsx     |  42 ++-
 .../nodes/_base/components/next-step/item.tsx |   9 +-
 .../_base/components/next-step/operator.tsx   |  29 +-
 .../nodes/_base/components/node-control.tsx   |  12 +-
 .../nodes/_base/components/node-handle.tsx    |  31 +-
 .../components/title-description-input.tsx    |  56 ++--
 .../note-editor/__tests__/editor.spec.tsx     |   7 +-
 .../workflow/note-node/note-editor/editor.tsx |  12 +-
 .../operator/__tests__/zoom-in-out.spec.tsx   |  37 +++
 .../workflow/operator/zoom-in-out.tsx         | 115 ++++---
 web/i18n/ar-TN/workflow.json                  |   4 +
 web/i18n/de-DE/workflow.json                  |   4 +
 web/i18n/en-US/workflow.json                  |   4 +
 web/i18n/es-ES/workflow.json                  |   4 +
 web/i18n/fa-IR/workflow.json                  |   4 +
 web/i18n/fr-FR/workflow.json                  |   4 +
 web/i18n/hi-IN/workflow.json                  |   4 +
 web/i18n/id-ID/workflow.json                  |   4 +
 web/i18n/it-IT/workflow.json                  |   4 +
 web/i18n/ja-JP/workflow.json                  |   4 +
 web/i18n/ko-KR/workflow.json                  |   4 +
 web/i18n/lo-LA/workflow.json                  |   4 +
 web/i18n/nl-NL/workflow.json                  |   4 +
 web/i18n/pl-PL/workflow.json                  |   4 +
 web/i18n/pt-BR/workflow.json                  |   4 +
 web/i18n/ro-RO/workflow.json                  |   4 +
 web/i18n/ru-RU/workflow.json                  |   4 +
 web/i18n/sl-SI/workflow.json                  |   4 +
 web/i18n/th-TH/workflow.json                  |   4 +
 web/i18n/tr-TR/workflow.json                  |   4 +
 web/i18n/uk-UA/workflow.json                  |   4 +
 web/i18n/vi-VN/workflow.json                  |   4 +
 web/i18n/zh-Hans/workflow.json                |   4 +
 web/i18n/zh-Hant/workflow.json                |   4 +
 50 files changed, 1226 insertions(+), 145 deletions(-)
 create mode 100644 web/app/components/workflow/__tests__/control-scale.browser.spec.tsx
 create mode 100644 web/app/components/workflow/__tests__/edge-insert-focus.browser.spec.tsx
 create mode 100644 web/app/components/workflow/hooks/__tests__/use-edge-accessible-label.spec.tsx
 create mode 100644 web/app/components/workflow/hooks/use-edge-accessible-label.ts
 create mode 100644 web/app/components/workflow/hooks/use-workflow-control-scale.ts
 create mode 100644 web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx
 create mode 100644 web/app/components/workflow/nodes/_base/components/__tests__/title-description-input.spec.tsx
 create mode 100644 web/app/components/workflow/nodes/_base/components/next-step/__tests__/item.browser.spec.tsx

diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index a8e19639158..e9734a65754 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -3575,14 +3575,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/_base/components/next-step/operator.tsx": {
-    "jsx-a11y/click-events-have-key-events": {
-      "count": 2
-    },
-    "jsx-a11y/no-static-element-interactions": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/node-control.tsx": {
     "jsx-a11y/click-events-have-key-events": {
       "count": 1
diff --git a/web/app/components/workflow/__tests__/control-scale.browser.spec.tsx b/web/app/components/workflow/__tests__/control-scale.browser.spec.tsx
new file mode 100644
index 00000000000..49e6134e895
--- /dev/null
+++ b/web/app/components/workflow/__tests__/control-scale.browser.spec.tsx
@@ -0,0 +1,96 @@
+import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { useRef, useState } from 'react'
+import ReactFlow, { ReactFlowProvider, useReactFlow } from 'reactflow'
+import { page } from 'vite-plus/test/browser'
+import { render } from 'vitest-browser-react'
+import { useWorkflowControlScale } from '../hooks/use-workflow-control-scale'
+import 'reactflow/dist/style.css'
+
+function ControlNode() {
+  const [activations, setActivations] = useState(0)
+
+  return (
+    <div
+      role="group"
+      aria-label="Canvas node"
+      style={{ width: 200, height: 100, display: 'grid', placeItems: 'center' }}
+    >
+      <IconButton
+        aria-label="Canvas action"
+        className="nodrag nopan"
+        size="md"
+        style={{ scale: 'var(--workflow-control-scale, 1)' }}
+        onClick={() => setActivations((count) => count + 1)}
+      >
+        <span aria-hidden className="i-ri-add-line size-4" />
+      </IconButton>
+      <output aria-label="Action count" style={{ position: 'absolute', top: 0, left: 0 }}>
+        {activations}
+      </output>
+    </div>
+  )
+}
+
+const nodeTypes = { control: ControlNode }
+const nodes = [{ id: 'control', type: 'control', position: { x: 200, y: 200 }, data: {} }]
+
+function Canvas() {
+  const containerRef = useRef<HTMLDivElement>(null)
+  const { zoomTo, setViewport, getViewport } = useReactFlow()
+  useWorkflowControlScale(containerRef)
+
+  return (
+    <>
+      {[0.25, 0.5, 1].map((zoom) => (
+        <button type="button" key={zoom} onClick={() => zoomTo(zoom)}>
+          Zoom {zoom * 100}%
+        </button>
+      ))}
+      <button
+        type="button"
+        onClick={() => {
+          const viewport = getViewport()
+          setViewport({ ...viewport, x: viewport.x + 20, y: viewport.y + 20 })
+        }}
+      >
+        Pan canvas
+      </button>
+      <div ref={containerRef} style={{ width: 800, height: 600 }}>
+        <ReactFlow defaultNodes={nodes} nodeTypes={nodeTypes} minZoom={0.25} />
+      </div>
+    </>
+  )
+}
+
+it('keeps a 24 CSS pixel canvas action reachable while zooming out and panning', async () => {
+  // Browser-owned: nested CSS transforms determine the actual pointer target, not its layout size.
+  await page.viewport(1000, 800)
+  const screen = await render(
+    <ReactFlowProvider>
+      <Canvas />
+    </ReactFlowProvider>,
+  )
+  const action = screen.getByRole('button', { name: 'Canvas action' })
+
+  for (const [index, zoom] of [1, 0.5, 0.25, 1].entries()) {
+    await screen.getByRole('button', { name: `Zoom ${zoom * 100}%` }).click()
+    await expect.poll(() => action.element().getBoundingClientRect().width).toBeCloseTo(24)
+    const target = action.element().getBoundingClientRect()
+    const node = screen
+      .getByRole('group', { name: 'Canvas node' })
+      .element()
+      .getBoundingClientRect()
+    expect(target.height).toBeCloseTo(24)
+    expect(target.x + target.width / 2).toBeCloseTo(node.x + node.width / 2)
+    expect(target.y + target.height / 2).toBeCloseTo(node.y + node.height / 2)
+    await action.click({ position: { x: 2, y: 2 } })
+    await expect.element(screen.getByLabelText('Action count')).toHaveTextContent(String(index + 1))
+  }
+
+  const beforePan = action.element().getBoundingClientRect()
+  await screen.getByRole('button', { name: 'Pan canvas' }).click()
+  await expect.poll(() => action.element().getBoundingClientRect().x).toBeCloseTo(beforePan.x + 20)
+  expect(action.element().getBoundingClientRect().width).toBeCloseTo(24)
+  await action.click({ position: { x: 22, y: 22 } })
+  await expect.element(screen.getByLabelText('Action count')).toHaveTextContent('5')
+})
diff --git a/web/app/components/workflow/__tests__/custom-edge.spec.tsx b/web/app/components/workflow/__tests__/custom-edge.spec.tsx
index 77bd5373d67..434bcd60912 100644
--- a/web/app/components/workflow/__tests__/custom-edge.spec.tsx
+++ b/web/app/components/workflow/__tests__/custom-edge.spec.tsx
@@ -43,6 +43,8 @@ vi.mock('reactflow', () => ({
   useStoreApi: () => ({
     getState: () => ({ getNodes: () => [] }),
   }),
+  useStore: (selector: (state: { nodeInternals: Map<string, unknown> }) => unknown) =>
+    selector({ nodeInternals: new Map() }),
 }))
 
 vi.mock('../hooks/use-available-blocks', async (importOriginal) => {
diff --git a/web/app/components/workflow/__tests__/edge-insert-focus.browser.spec.tsx b/web/app/components/workflow/__tests__/edge-insert-focus.browser.spec.tsx
new file mode 100644
index 00000000000..6dfddd9018c
--- /dev/null
+++ b/web/app/components/workflow/__tests__/edge-insert-focus.browser.spec.tsx
@@ -0,0 +1,89 @@
+import type { RefObject } from 'react'
+import { useState } from 'react'
+import ReactFlow, { ReactFlowProvider } from 'reactflow'
+import { page, userEvent } from 'vite-plus/test/browser'
+import { render } from 'vitest-browser-react'
+import { WorkflowContext } from '../context'
+import CustomEdge from '../custom-edge'
+import { createWorkflowStore } from '../store/workflow'
+import { BlockEnum } from '../types'
+import 'reactflow/dist/style.css'
+import '../style.css'
+
+vi.mock('../hooks/use-available-blocks', () => ({
+  useAvailableBlocks: () => ({
+    availablePrevBlocks: [BlockEnum.Code],
+    availableNextBlocks: [BlockEnum.Code],
+  }),
+}))
+vi.mock('../hooks/use-nodes-interactions', () => ({
+  useNodesInteractions: () => ({ handleNodeAdd: vi.fn() }),
+}))
+vi.mock('../hooks-store', () => ({
+  useHooksStore: (selector: (state: object) => unknown) => selector({}),
+}))
+// Picker results are unrelated to focus entering and returning from its real Popover.
+vi.mock('../block-selector/tabs', () => ({
+  BlockSelectorPanels: ({ searchInputRef }: { searchInputRef: RefObject<HTMLInputElement> }) => (
+    <input ref={searchInputRef} aria-label="Find a node" />
+  ),
+}))
+const edgeTypes = { custom: CustomEdge }
+const nodes = [
+  {
+    id: 'input',
+    position: { x: 50, y: 100 },
+    data: { label: 'Input', title: 'Input', type: BlockEnum.Start },
+  },
+  {
+    id: 'output',
+    position: { x: 400, y: 200 },
+    data: { label: 'Output', title: 'Output', type: BlockEnum.Code },
+  },
+]
+const edges = [
+  {
+    id: 'edge',
+    source: 'input',
+    target: 'output',
+    type: 'custom',
+    data: { sourceType: BlockEnum.Start, targetType: BlockEnum.Code },
+  },
+]
+function Fixture() {
+  const [store] = useState(() => createWorkflowStore({}))
+  return (
+    <WorkflowContext value={store}>
+      <ReactFlowProvider>
+        <button type="button">Before canvas</button>
+        <div style={{ width: 800, height: 500 }}>
+          <ReactFlow
+            nodes={nodes}
+            edges={edges}
+            edgeTypes={edgeTypes}
+            nodesFocusable={false}
+            edgesFocusable={false}
+          />
+        </div>
+      </ReactFlowProvider>
+    </WorkflowContext>
+  )
+}
+
+it('reveals the edge insertion control on Tab and keeps it visible after Escape returns focus', async () => {
+  // Browser owns focus restoration, ancestor opacity, and actual painted focus ring.
+  await page.viewport(1000, 700)
+  const screen = await render(<Fixture />)
+  await screen.getByRole('button', { name: 'Before canvas' }).click()
+  await userEvent.tab()
+  const trigger = screen.getByRole('button', { name: 'workflow.common.addBlock' })
+  await expect.element(trigger).toHaveFocus()
+  await expect.poll(() => getComputedStyle(trigger.element().parentElement!).opacity).toBe('1')
+  expect(getComputedStyle(trigger.element()).boxShadow).not.toBe('none')
+  await userEvent.keyboard('{Enter}')
+  await expect.element(screen.getByRole('textbox', { name: 'Find a node' })).toHaveFocus()
+  await userEvent.keyboard('{Escape}')
+  await expect.element(trigger).toHaveFocus()
+  await expect.poll(() => getComputedStyle(trigger.element().parentElement!).opacity).toBe('1')
+  await expect.element(screen.getByRole('textbox', { name: 'Find a node' })).not.toBeInTheDocument()
+})
diff --git a/web/app/components/workflow/block-selector/index.tsx b/web/app/components/workflow/block-selector/index.tsx
index feb7313045d..286f5882b72 100644
--- a/web/app/components/workflow/block-selector/index.tsx
+++ b/web/app/components/workflow/block-selector/index.tsx
@@ -137,7 +137,7 @@ function BlockSelector({
         <IconButton
           aria-label={t(($) => $['common.addBlock'], { ns: 'workflow' })}
           variant="primary"
-          size="xs"
+          size="md"
           className={cn('z-10 rounded-full', triggerClassName)}
           style={triggerStyle}
         >
diff --git a/web/app/components/workflow/custom-edge.tsx b/web/app/components/workflow/custom-edge.tsx
index 27028ee918d..2dbcb9a7bcf 100644
--- a/web/app/components/workflow/custom-edge.tsx
+++ b/web/app/components/workflow/custom-edge.tsx
@@ -8,6 +8,7 @@ import BlockSelector from './block-selector'
 import { NESTED_ELEMENT_Z_INDEX } from './constants'
 import CustomEdgeLinearGradientRender from './custom-edge-linear-gradient-render'
 import { useAvailableBlocks } from './hooks/use-available-blocks'
+import { useEdgeAccessibleLabel } from './hooks/use-edge-accessible-label'
 import { useNodesInteractions } from './hooks/use-nodes-interactions'
 import { NodeRunningStatus } from './types'
 import { getEdgeColor } from './utils'
@@ -25,6 +26,7 @@ const CustomEdge = ({
   targetY,
   selected,
 }: EdgeProps) => {
+  const edgeAccessibleLabelRef = useEdgeAccessibleLabel(source, target, sourceHandleId)
   const [edgePath, labelX, labelY] = getBezierPath({
     sourceX: sourceX - 8,
     sourceY,
@@ -36,6 +38,7 @@ const CustomEdge = ({
   })
   const [open, setOpen] = useState(false)
   const [isTriggerHovered, setIsTriggerHovered] = useState(false)
+  const [isTriggerFocused, setIsTriggerFocused] = useState(false)
   const { handleNodeAdd } = useNodesInteractions()
   const { availablePrevBlocks } = useAvailableBlocks(
     (data as Edge['data'])!.targetType,
@@ -46,7 +49,7 @@ const CustomEdge = ({
     (data as Edge['data'])?.isInIteration || (data as Edge['data'])?.isInLoop,
   )
   const { _sourceRunningStatus, _targetRunningStatus } = data
-  const isTriggerVisible = !!(data?._hovering || isTriggerHovered || open)
+  const isTriggerVisible = !!(data?._hovering || isTriggerHovered || isTriggerFocused || open)
 
   const linearGradientId = useMemo(() => {
     if (
@@ -113,16 +116,18 @@ const CustomEdge = ({
           }}
         />
       )}
-      <BaseEdge
-        id={id}
-        path={edgePath}
-        style={{
-          stroke,
-          strokeWidth: 2,
-          opacity: data._dimmed ? 0.3 : data._waitingRun ? 0.7 : 1,
-          strokeDasharray: data._isTemp ? '8 8' : undefined,
-        }}
-      />
+      <g ref={edgeAccessibleLabelRef}>
+        <BaseEdge
+          id={id}
+          path={edgePath}
+          style={{
+            stroke,
+            strokeWidth: 2,
+            opacity: data._dimmed ? 0.3 : data._waitingRun ? 0.7 : 1,
+            strokeDasharray: data._isTemp ? '8 8' : undefined,
+          }}
+        />
+      </g>
       <EdgeLabelRenderer>
         <div
           className="nopan nodrag transition-opacity duration-150"
@@ -135,6 +140,10 @@ const CustomEdge = ({
           }}
           onMouseEnter={() => setIsTriggerHovered(true)}
           onMouseLeave={() => setIsTriggerHovered(false)}
+          onFocusCapture={() => setIsTriggerFocused(true)}
+          onBlurCapture={(event) => {
+            if (!event.currentTarget.contains(event.relatedTarget)) setIsTriggerFocused(false)
+          }}
         >
           <BlockSelector
             open={open}
@@ -147,7 +156,7 @@ const CustomEdge = ({
               nextNodeTargetHandle: targetHandleId || 'target',
             }}
             availableBlocksTypes={intersection(availablePrevBlocks, availableNextBlocks)}
-            triggerClassName="transition-transform hover:scale-150"
+            triggerStyle={{ scale: 'var(--workflow-control-scale, 1)' }}
           />
         </div>
       </EdgeLabelRenderer>
diff --git a/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx b/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx
index 0bc22b8c819..4cdef83f1a1 100644
--- a/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx
@@ -112,7 +112,7 @@ describe('WorkflowChecklist', () => {
     render(<WorkflowChecklist disabled={false} />)
 
     expect(screen.getByText('2')).toBeInTheDocument()
-    await user.click(screen.getByRole('button', { name: 'workflow.panel.checklist' }))
+    await user.click(screen.getByRole('button', { name: 'workflow.panel.checklist 2' }))
     expect(screen.getByTestId('plugin-group')).toHaveTextContent('Missing Plugin')
     await user.click(screen.getByTestId('node-group-Broken Node'))
 
@@ -125,13 +125,26 @@ describe('WorkflowChecklist', () => {
     const onItemClick = vi.fn()
     render(<WorkflowChecklist disabled={false} onItemClick={onItemClick} />)
 
-    await user.click(screen.getByRole('button', { name: 'workflow.panel.checklist' }))
+    await user.click(screen.getByRole('button', { name: 'workflow.panel.checklist 2' }))
     await user.click(screen.getByTestId('node-group-Broken Node'))
 
     expect(onItemClick).toHaveBeenCalledWith(expect.objectContaining({ id: 'node-1' }))
     expect(mockHandleNodeSelect).not.toHaveBeenCalled()
   })
 
+  it('should show the tooltip without replacing the warning count in the accessible name', async () => {
+    const user = userEvent.setup()
+    render(<WorkflowChecklist disabled={false} />)
+
+    const trigger = screen.getByRole('button', { name: 'workflow.panel.checklist 2' })
+    await user.hover(trigger)
+
+    expect(await screen.findByText('workflow.panel.checklist', { selector: 'div' })).toBeVisible()
+    expect(trigger).toHaveAccessibleName('workflow.panel.checklist 2')
+    await user.click(trigger)
+    expect(screen.getByTestId('plugin-group')).toBeInTheDocument()
+  })
+
   it('should open the inline agent editor after selecting an inline agent reference warning', async () => {
     const user = userEvent.setup()
     mockChecklistItems[1] = {
@@ -142,7 +155,7 @@ describe('WorkflowChecklist', () => {
     }
     render(<WorkflowChecklist disabled={false} />)
 
-    await user.click(screen.getByRole('button', { name: 'workflow.panel.checklist' }))
+    await user.click(screen.getByRole('button', { name: 'workflow.panel.checklist 2' }))
     await user.click(screen.getByTestId('node-group-Inline Agent'))
 
     expect(mockHandleNodeSelect).toHaveBeenCalledWith('node-1')
diff --git a/web/app/components/workflow/header/checklist/index.tsx b/web/app/components/workflow/header/checklist/index.tsx
index 856b56f0726..6981e8562a0 100644
--- a/web/app/components/workflow/header/checklist/index.tsx
+++ b/web/app/components/workflow/header/checklist/index.tsx
@@ -72,8 +72,8 @@ const WorkflowChecklist = ({ disabled, showGoTo = true, onItemClick }: WorkflowC
                     'data-disabled:cursor-not-allowed data-disabled:opacity-50',
                   )}
                   disabled={disabled || undefined}
-                  aria-label={checklistLabel}
                 >
+                  <span className="sr-only">{checklistLabel}</span>
                   <span className="flex size-full items-center justify-center rounded-md group-data-popup-open:bg-state-accent-hover hover:bg-state-accent-hover">
                     <span
                       className="i-ri-list-check-3 size-4 text-components-button-ghost-text group-hover:text-components-button-secondary-accent-text group-data-popup-open:text-components-button-secondary-accent-text"
diff --git a/web/app/components/workflow/hooks/__tests__/use-edge-accessible-label.spec.tsx b/web/app/components/workflow/hooks/__tests__/use-edge-accessible-label.spec.tsx
new file mode 100644
index 00000000000..bc4ecc80db5
--- /dev/null
+++ b/web/app/components/workflow/hooks/__tests__/use-edge-accessible-label.spec.tsx
@@ -0,0 +1,162 @@
+import type { Edge, Node } from '../../types'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useLayoutEffect } from 'react'
+import { ReactFlowProvider, useStoreApi } from 'reactflow'
+import { createReactI18nextMock } from '@/test/i18n-mock'
+import { BlockEnum } from '../../types'
+import { useEdgeAccessibleLabel } from '../use-edge-accessible-label'
+
+vi.mock('react-i18next', () =>
+  createReactI18nextMock({
+    'workflow.common.edgeLabel': 'Connection from {{source}} to {{target}}',
+    'workflow.common.onFailure': 'On failure',
+    'workflow.nodes.questionClassifiers.class': 'Class',
+    'workflow.nodes.humanInput.timeout.title': 'Timeout',
+  }),
+)
+
+const makeNode = (id: string, title: string, data: Partial<Node['data']> = {}): Node => ({
+  id,
+  position: { x: 0, y: 0 },
+  data: { title, desc: '', type: BlockEnum.LLM, ...data },
+})
+
+// Exercise the hook's DOM integration with the wrapper owned by React Flow 11.
+const EdgeLabel = ({ sourceHandleId }: { sourceHandleId?: string }) => {
+  const ref = useEdgeAccessibleLabel('source', 'target', sourceHandleId)
+  return (
+    <svg>
+      <g className="react-flow__edge" role="button" aria-label="Edge from source to target">
+        <g ref={ref} />
+      </g>
+    </svg>
+  )
+}
+
+const EdgeLabelHarness = ({
+  sourceNode = makeNode('source', 'Research'),
+  sourceHandleId,
+  onReadEdges,
+}: {
+  sourceNode?: Node
+  sourceHandleId?: string
+  onReadEdges?: (edges: Edge[]) => void
+}) => {
+  const store = useStoreApi()
+  const { setNodes, setEdges } = store.getState()
+  const updateNodes = (update: (nodes: Node[]) => Node[]) =>
+    setNodes(update(Array.from(store.getState().nodeInternals.values()) as Node[]))
+  useLayoutEffect(() => {
+    setNodes([sourceNode, makeNode('target', 'Answer')])
+    setEdges([
+      { id: 'connection', source: 'source', target: 'target', sourceHandle: sourceHandleId },
+    ])
+  }, [setEdges, setNodes, sourceHandleId, sourceNode])
+  return (
+    <>
+      <EdgeLabel sourceHandleId={sourceHandleId} />
+      <button
+        type="button"
+        onClick={() =>
+          updateNodes((nodes) =>
+            nodes.map((node) =>
+              node.id === 'source'
+                ? { ...node, data: { ...node.data, title: 'Retrieve documents' } }
+                : node,
+            ),
+          )
+        }
+      >
+        Rename source
+      </button>
+      <button
+        type="button"
+        onClick={() =>
+          updateNodes((nodes) =>
+            nodes.map((node) =>
+              node.id === 'target'
+                ? { ...node, data: { ...node.data, title: 'Final response' } }
+                : node,
+            ),
+          )
+        }
+      >
+        Rename target
+      </button>
+      <button
+        type="button"
+        onClick={() => {
+          onReadEdges?.(store.getState().edges)
+        }}
+      >
+        Verify graph data
+      </button>
+    </>
+  )
+}
+
+const renderEdge = (props: Parameters<typeof EdgeLabelHarness>[0] = {}) =>
+  render(
+    <ReactFlowProvider>
+      <EdgeLabelHarness {...props} />
+    </ReactFlowProvider>,
+  )
+
+describe('edge accessible labels', () => {
+  it('uses current node titles after either endpoint is renamed without storing presentation metadata', async () => {
+    const user = userEvent.setup()
+    const onReadEdges = vi.fn()
+    renderEdge({ onReadEdges })
+    expect(
+      screen.getByRole('button', { name: 'Connection from Research to Answer' }),
+    ).toBeInTheDocument()
+
+    await user.click(screen.getByRole('button', { name: 'Rename source' }))
+    expect(
+      screen.getByRole('button', { name: 'Connection from Retrieve documents to Answer' }),
+    ).toBeInTheDocument()
+    await user.click(screen.getByRole('button', { name: 'Rename target' }))
+    expect(
+      screen.getByRole('button', { name: 'Connection from Retrieve documents to Final response' }),
+    ).toBeInTheDocument()
+    await user.click(screen.getByRole('button', { name: 'Verify graph data' }))
+    expect(onReadEdges).toHaveBeenCalledWith([
+      { id: 'connection', source: 'source', target: 'target', sourceHandle: undefined },
+    ])
+  })
+
+  it.each([
+    [
+      BlockEnum.IfElse,
+      'false',
+      [
+        { id: 'true', name: 'IF' },
+        { id: 'false', name: 'ELSE' },
+      ],
+      'ELSE',
+    ],
+    [
+      BlockEnum.QuestionClassifier,
+      'support',
+      [
+        { id: 'sales', name: 'Sales' },
+        { id: 'support', name: 'Support' },
+      ],
+      'Class 2: Support',
+    ],
+    [BlockEnum.LLM, 'fail-branch', undefined, 'On failure'],
+    [BlockEnum.HumanInput, '__timeout', undefined, 'Timeout'],
+  ])(
+    'identifies the %s output branch by its meaning',
+    (type, sourceHandleId, branches, branchLabel) => {
+      renderEdge({
+        sourceNode: makeNode('source', 'Decision', { type, _targetBranches: branches }),
+        sourceHandleId,
+      })
+      expect(
+        screen.getByRole('button', { name: `Connection from Decision (${branchLabel}) to Answer` }),
+      ).toBeInTheDocument()
+    },
+  )
+})
diff --git a/web/app/components/workflow/hooks/use-edge-accessible-label.ts b/web/app/components/workflow/hooks/use-edge-accessible-label.ts
new file mode 100644
index 00000000000..547317175db
--- /dev/null
+++ b/web/app/components/workflow/hooks/use-edge-accessible-label.ts
@@ -0,0 +1,65 @@
+import type { HumanInputNodeType } from '../nodes/human-input/types'
+import type { CommonNodeType } from '../types'
+import { useLayoutEffect, useRef } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useStore } from 'reactflow'
+import { ErrorHandleTypeEnum } from '../nodes/_base/components/error-handle/types'
+import { BlockEnum } from '../types'
+
+export const useEdgeAccessibleLabel = (
+  source: string,
+  target: string,
+  sourceHandleId?: string | null,
+) => {
+  const { t } = useTranslation()
+  const edgeRef = useRef<SVGGElement>(null)
+  const label = useStore((state) => {
+    // React Flow's node map keeps this subscription local to the two endpoints.
+    const sourceData = state.nodeInternals.get(source)?.data as CommonNodeType | undefined
+    const targetData = state.nodeInternals.get(target)?.data as CommonNodeType | undefined
+    if (!sourceData || !targetData) return undefined
+
+    let branchName = sourceData._targetBranches?.find(
+      (branch) => branch.id === sourceHandleId,
+    )?.name
+    if (sourceData.type === BlockEnum.QuestionClassifier) {
+      const branchIndex =
+        sourceData._targetBranches?.findIndex((branch) => branch.id === sourceHandleId) ?? -1
+      if (branchIndex >= 0) {
+        const classLabel = `${t(($) => $['nodes.questionClassifiers.class'], { ns: 'workflow' })} ${branchIndex + 1}`
+        branchName = branchName ? `${classLabel}: ${branchName}` : classLabel
+      }
+    }
+    if (sourceData.type === BlockEnum.HumanInput) {
+      branchName =
+        sourceHandleId === '__timeout'
+          ? t(($) => $['nodes.humanInput.timeout.title'], { ns: 'workflow' })
+          : (sourceData as HumanInputNodeType).user_actions?.find(
+              (action) => action.id === sourceHandleId,
+            )?.title ||
+            sourceHandleId ||
+            undefined
+    }
+    if (sourceHandleId === ErrorHandleTypeEnum.failBranch)
+      branchName = t(($) => $['common.onFailure'], { ns: 'workflow' })
+
+    const sourceTitle =
+      sourceData.title || t(($) => $[`blocks.${sourceData.type}`], { ns: 'workflow' })
+    const targetTitle =
+      targetData.title || t(($) => $[`blocks.${targetData.type}`], { ns: 'workflow' })
+    return t(($) => $['common.edgeLabel'], {
+      ns: 'workflow',
+      source: branchName ? `${sourceTitle} (${branchName})` : sourceTitle,
+      target: targetTitle,
+    })
+  })
+
+  useLayoutEffect(() => {
+    // React Flow 11 owns the focusable wrapper and has no wrapper slot. Keep its
+    // accessible name in the rendered SVG, out of persisted graph edge data.
+    const edgeWrapper = edgeRef.current?.closest('.react-flow__edge')
+    if (edgeWrapper && label) edgeWrapper.setAttribute('aria-label', label)
+  }, [label, source, target])
+
+  return edgeRef
+}
diff --git a/web/app/components/workflow/hooks/use-workflow-control-scale.ts b/web/app/components/workflow/hooks/use-workflow-control-scale.ts
new file mode 100644
index 00000000000..2666f29a46e
--- /dev/null
+++ b/web/app/components/workflow/hooks/use-workflow-control-scale.ts
@@ -0,0 +1,32 @@
+import type { RefObject } from 'react'
+import { useLayoutEffect } from 'react'
+import { useStoreApi } from 'reactflow'
+
+// Keep canvas controls usable when zoomed out without subscribing every node to viewport changes.
+export function useWorkflowControlScale(containerRef: RefObject<HTMLDivElement | null>) {
+  const store = useStoreApi()
+
+  useLayoutEffect(() => {
+    const container = containerRef.current
+    if (!container) return
+
+    let currentScale: number | undefined
+    const updateScale = (zoom: number) => {
+      const scale = Math.max(1, 1 / zoom)
+      if (scale === currentScale) return
+
+      currentScale = scale
+      container.style.setProperty('--workflow-control-scale', String(scale))
+    }
+
+    updateScale(store.getState().transform[2])
+    const unsubscribe = store.subscribe((state, previousState) => {
+      if (state.transform[2] !== previousState.transform[2]) updateScale(state.transform[2])
+    })
+
+    return () => {
+      unsubscribe()
+      container.style.removeProperty('--workflow-control-scale')
+    }
+  }, [containerRef, store])
+}
diff --git a/web/app/components/workflow/index.tsx b/web/app/components/workflow/index.tsx
index 3d99f3db45f..dfe147756b0 100644
--- a/web/app/components/workflow/index.tsx
+++ b/web/app/components/workflow/index.tsx
@@ -80,6 +80,7 @@ import { useSelectionInteractions } from './hooks/use-selection-interactions'
 import { useSetWorkflowVarsWithValue } from './hooks/use-set-workflow-vars-with-value'
 import { useNodesReadOnly, useWorkflow, useWorkflowReadOnly } from './hooks/use-workflow'
 import { useWorkflowComment } from './hooks/use-workflow-comment'
+import { useWorkflowControlScale } from './hooks/use-workflow-control-scale'
 import { useWorkflowRefreshDraft } from './hooks/use-workflow-refresh-draft'
 import { useWorkflowSearch } from './hooks/use-workflow-search'
 import { shouldPreventWorkflowBrowserDefault } from './hotkeys'
@@ -186,6 +187,7 @@ export const Workflow: FC<WorkflowProps> = memo(
   }) => {
     const { t } = useTranslation()
     const workflowContainerRef = useRef<HTMLDivElement>(null)
+    useWorkflowControlScale(workflowContainerRef)
     const workflowStore = useWorkflowStore()
     const reactflow = useReactFlow()
     const store = useStoreApi()
diff --git a/web/app/components/workflow/node-actions-menu/index.tsx b/web/app/components/workflow/node-actions-menu/index.tsx
index 3f99d61e156..2d6791e35db 100644
--- a/web/app/components/workflow/node-actions-menu/index.tsx
+++ b/web/app/components/workflow/node-actions-menu/index.tsx
@@ -5,6 +5,7 @@ import {
   DropdownMenuContent,
   DropdownMenuTrigger,
 } from '@langgenius/dify-ui/dropdown-menu'
+import { IconButton } from '@langgenius/dify-ui/icon-button'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { NodeActionsDropdownContent } from './dropdown-content'
@@ -45,17 +46,13 @@ export function NodeActionsDropdown({
     <DropdownMenu modal={false} open={open} onOpenChange={handleOpenChange}>
       <DropdownMenuTrigger
         render={
-          <button
-            type="button"
+          <IconButton
+            size="md"
             aria-label={t(($) => $['operation.more'], { ns: 'common' })}
-            className={cn(
-              'flex size-6 cursor-pointer items-center justify-center rounded-md border-0 bg-transparent p-0 text-text-tertiary hover:bg-state-base-hover',
-              'focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:outline-hidden data-popup-open:bg-state-base-hover',
-              triggerClassName,
-            )}
+            className={cn('data-popup-open:bg-state-base-hover', triggerClassName)}
           >
             <span aria-hidden className="i-ri-more-fill size-4" />
-          </button>
+          </IconButton>
         }
       />
       <DropdownMenuContent placement="bottom-end" className={NODE_ACTIONS_MENU_WIDTH_CLASS_NAME}>
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx
new file mode 100644
index 00000000000..4f08d3b2c6d
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx
@@ -0,0 +1,305 @@
+import type { RefObject } from 'react'
+import type { Connection, NodeProps } from 'reactflow'
+import type { CommonNodeType, OnSelectBlock } from '../../../../types'
+import type { HumanInputNodeType } from '../../../human-input/types'
+import { useRef, useState } from 'react'
+import ReactFlow, { ReactFlowProvider, useReactFlow } from 'reactflow'
+import { page, userEvent } from 'vite-plus/test/browser'
+import { render } from 'vitest-browser-react'
+import { WorkflowContext } from '../../../../context'
+import CustomEdge from '../../../../custom-edge'
+import { useWorkflowControlScale } from '../../../../hooks/use-workflow-control-scale'
+import { createWorkflowStore } from '../../../../store/workflow'
+import { BlockEnum } from '../../../../types'
+import HumanInputNode from '../../../human-input/node'
+import { UserActionButtonType } from '../../../human-input/types'
+import { NodeSourceHandle, NodeTargetHandle } from '../node-handle'
+import 'reactflow/dist/style.css'
+import '../../../../style.css'
+
+const { handleNodeAdd } = vi.hoisted(() => ({ handleNodeAdd: vi.fn() }))
+
+vi.mock('../../../../hooks/use-available-blocks', () => ({
+  useAvailableBlocks: () => ({
+    availablePrevBlocks: [BlockEnum.Code],
+    availableNextBlocks: [BlockEnum.Code],
+  }),
+}))
+vi.mock('../../../../hooks/use-nodes-interactions', () => ({
+  useNodesInteractions: () => ({ handleNodeAdd }),
+}))
+vi.mock('../../../../hooks/use-workflow', () => ({
+  useIsChatMode: () => false,
+  useNodesReadOnly: () => ({ getNodesReadOnly: () => false }),
+}))
+vi.mock('../../../../hooks-store', () => ({
+  useHooksStore: (selector: (state: object) => unknown) => selector({}),
+}))
+// Search results are outside the handle's hit testing and connection contract.
+vi.mock('../../../../block-selector/tabs', () => ({
+  BlockSelectorPanels: ({
+    searchInputRef,
+    onSelect,
+  }: {
+    searchInputRef: RefObject<HTMLInputElement>
+    onSelect: OnSelectBlock
+  }) => (
+    <>
+      <input ref={searchInputRef} aria-label="Find a node" />
+      <button type="button" onClick={() => onSelect(BlockEnum.Code)}>
+        Add code node
+      </button>
+    </>
+  ),
+}))
+
+beforeEach(() => {
+  vi.clearAllMocks()
+})
+
+function HandleNode({ id, data }: NodeProps<CommonNodeType>) {
+  return (
+    <div role="group" aria-label={data.title} className="group" style={{ width: 160, height: 80 }}>
+      {data.title}
+      {id === 'source' ? (
+        <NodeSourceHandle id={id} data={data} handleId="out" />
+      ) : (
+        <NodeTargetHandle id={id} data={data} handleId="in" />
+      )}
+    </div>
+  )
+}
+
+function HumanInputHandleNode({ id, data }: NodeProps<HumanInputNodeType>) {
+  return (
+    <div role="group" aria-label={data.title} className="group" style={{ width: 240 }}>
+      <HumanInputNode id={id} data={data} />
+    </div>
+  )
+}
+
+const nodeTypes = { handles: HandleNode, humanInput: HumanInputHandleNode }
+const edgeTypes = { custom: CustomEdge }
+const nodes = [
+  {
+    id: 'source',
+    type: 'handles',
+    position: { x: 100, y: 160 },
+    data: { title: 'Source node', desc: '', type: BlockEnum.Code },
+  },
+  {
+    id: 'target',
+    type: 'handles',
+    position: { x: 600, y: 160 },
+    data: { title: 'Target node', desc: '', type: BlockEnum.Code },
+  },
+]
+
+const humanInputData: HumanInputNodeType = {
+  title: 'Human input node',
+  desc: '',
+  type: BlockEnum.HumanInput,
+  delivery_methods: [],
+  form_content: 'Please review this request',
+  inputs: [],
+  user_actions: [
+    { id: 'approve', title: 'Approve', button_style: UserActionButtonType.Primary },
+    { id: 'reject', title: 'Reject', button_style: UserActionButtonType.Default },
+  ],
+  timeout: 3,
+  timeout_unit: 'day',
+}
+
+function Canvas({
+  initialZoom = 1,
+  showEdge = false,
+  humanInput = false,
+}: {
+  initialZoom?: number
+  showEdge?: boolean
+  humanInput?: boolean
+}) {
+  const containerRef = useRef<HTMLDivElement>(null)
+  const { setViewport } = useReactFlow()
+  const [connection, setConnection] = useState<Connection | null>(null)
+  useWorkflowControlScale(containerRef)
+  return (
+    <>
+      {[1, 0.5, 0.25].map((zoom) => (
+        <button key={zoom} type="button" onClick={() => setViewport({ x: 0, y: 0, zoom })}>
+          Zoom {zoom * 100}%
+        </button>
+      ))}
+      <output aria-label="Connection">
+        {connection &&
+          `${connection.source}:${connection.sourceHandle} → ${connection.target}:${connection.targetHandle}`}
+      </output>
+      <div ref={containerRef} style={{ width: 900, height: 400 }}>
+        <ReactFlow
+          defaultNodes={
+            humanInput
+              ? nodes.map((node) =>
+                  node.id === 'source'
+                    ? { ...node, type: 'humanInput', data: humanInputData }
+                    : node,
+                )
+              : nodes
+          }
+          defaultViewport={{ x: 0, y: 0, zoom: initialZoom }}
+          defaultEdges={
+            showEdge
+              ? [
+                  {
+                    id: 'connection',
+                    source: 'source',
+                    sourceHandle: 'out',
+                    target: 'target',
+                    targetHandle: 'in',
+                    type: 'custom',
+                    data: { sourceType: BlockEnum.Code, targetType: BlockEnum.Code },
+                  },
+                ]
+              : []
+          }
+          nodeTypes={nodeTypes}
+          edgeTypes={edgeTypes}
+          minZoom={0.25}
+          nodesFocusable={false}
+          onConnect={setConnection}
+        />
+      </div>
+    </>
+  )
+}
+
+function Fixture(props: { initialZoom?: number; showEdge?: boolean; humanInput?: boolean }) {
+  const [store] = useState(() => createWorkflowStore({}))
+  return (
+    <WorkflowContext value={store}>
+      <ReactFlowProvider>
+        <Canvas {...props} />
+      </ReactFlowProvider>
+    </WorkflowContext>
+  )
+}
+
+it.each([1, 0.5, 0.25])(
+  'keeps real handles clickable at their edges and draggable at zoom %s',
+  async (zoom) => {
+    // Native hit testing under both ReactFlow and control transforms is not represented by DOM unit tests.
+    await page.viewport(1100, 700)
+    const screen = await render(<Fixture />)
+    await screen.getByRole('button', { name: `Zoom ${zoom * 100}%` }).click()
+    // ReactFlow handle elements are a canvas boundary without a semantic locator.
+    const source = page.elementLocator(
+      screen
+        .getByRole('group', { name: 'Source node' })
+        .element()
+        .querySelector('[data-handleid="out"]')!,
+    )
+    const target = page.elementLocator(
+      screen
+        .getByRole('group', { name: 'Target node' })
+        .element()
+        .querySelector('[data-handleid="in"]')!,
+    )
+
+    for (const handle of [source, target]) {
+      const button = page
+        .elementLocator(handle.element())
+        .getByRole('button', { name: 'workflow.common.addBlock' })
+      await expect.poll(() => button.element().getBoundingClientRect().width).toBeCloseTo(24)
+      expect(button.element().getBoundingClientRect().height).toBeCloseTo(24)
+      const handleBounds = handle.element().getBoundingClientRect()
+      const buttonBounds = button.element().getBoundingClientRect()
+      await handle.click({
+        position: {
+          x: buttonBounds.left + 1 - handleBounds.left,
+          y: buttonBounds.top + 1 - handleBounds.top,
+        },
+      })
+      await expect.element(screen.getByRole('textbox', { name: 'Find a node' })).toHaveFocus()
+      await userEvent.keyboard('{Escape}')
+      await expect
+        .element(screen.getByRole('textbox', { name: 'Find a node' }))
+        .not.toBeInTheDocument()
+    }
+
+    await userEvent.dragAndDrop(source, target)
+    await expect
+      .element(screen.getByLabelText('Connection'))
+      .toHaveTextContent('source:out → target:in')
+  },
+)
+
+it('keeps a saved connection anchored to the port centers when initialized at 25% zoom', async () => {
+  await page.viewport(1100, 700)
+  const screen = await render(<Fixture initialZoom={0.25} showEdge />)
+  const source = screen
+    .getByRole('group', { name: 'Source node' })
+    .element()
+    .querySelector('[data-handleid="out"]')!
+  const target = screen
+    .getByRole('group', { name: 'Target node' })
+    .element()
+    .querySelector('[data-handleid="in"]')!
+  const path = () => document.querySelector<SVGPathElement>('.react-flow__edge-path')!
+  await expect.poll(() => path()).not.toBeNull()
+
+  const endpoint = (atEnd: boolean) => {
+    const edge = path()
+    return edge
+      .getPointAtLength(atEnd ? edge.getTotalLength() : 0)
+      .matrixTransform(edge.getScreenCTM()!)
+  }
+  for (const [port, atEnd] of [
+    [source, false],
+    [target, true],
+  ] as const) {
+    await expect
+      .poll(() => {
+        const bounds = port.getBoundingClientRect()
+        const point = endpoint(atEnd)
+        return Math.hypot(
+          point.x - (bounds.left + bounds.width / 2),
+          point.y - (bounds.top + bounds.height / 2),
+        )
+      })
+      .toBeLessThan(0.5)
+  }
+})
+
+it('adds and connects the intended human input branch at 25% zoom', async () => {
+  // The production branch rows are closer than 24 screen pixels at this zoom.
+  // Native hit testing must route clicks and drags to the selected branch, not its neighbor.
+  await page.viewport(1100, 700)
+  const screen = await render(<Fixture initialZoom={0.25} humanInput />)
+  const sourceNode = screen.getByRole('group', { name: 'Human input node' })
+  const target = page.elementLocator(
+    screen
+      .getByRole('group', { name: 'Target node' })
+      .element()
+      .querySelector('[data-handleid="in"]')!,
+  )
+
+  for (const handleId of ['approve', 'reject', '__timeout']) {
+    // ReactFlow exposes handle IDs at the canvas boundary, without semantic roles.
+    const source = page.elementLocator(
+      sourceNode.element().querySelector(`[data-handleid="${handleId}"]`)!,
+    )
+    await source.click()
+    await screen.getByRole('button', { name: 'Add code node' }).click()
+    expect(handleNodeAdd).toHaveBeenLastCalledWith(
+      { nodeType: BlockEnum.Code, pluginDefaultValue: undefined },
+      { prevNodeId: 'source', prevNodeSourceHandle: handleId },
+    )
+    await expect
+      .element(screen.getByRole('textbox', { name: 'Find a node' }))
+      .not.toBeInTheDocument()
+
+    await userEvent.dragAndDrop(source, target)
+    await expect
+      .element(screen.getByLabelText('Connection'))
+      .toHaveTextContent(`source:${handleId} → target:in`)
+  }
+})
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/title-description-input.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/title-description-input.spec.tsx
new file mode 100644
index 00000000000..3a8b7ab6491
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/title-description-input.spec.tsx
@@ -0,0 +1,42 @@
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { DescriptionInput, TitleInput } from '../title-description-input'
+
+describe('Node title and description fields', () => {
+  it('keeps labels associated with populated fields and activates the named control', async () => {
+    const user = userEvent.setup()
+    render(
+      <>
+        <TitleInput value="Summarize" onBlur={vi.fn()} />
+        <DescriptionInput value="Summarize the document" onChange={vi.fn()} />
+      </>,
+    )
+
+    const title = screen.getByRole('textbox', { name: 'workflow.common.nodeTitle' })
+    const description = screen.getByRole('textbox', { name: 'workflow.common.nodeDescription' })
+    expect(title).toHaveValue('Summarize')
+    expect(description).toHaveValue('Summarize the document')
+
+    await user.click(screen.getByText('workflow.common.nodeTitle'))
+    expect(title).toHaveFocus()
+    await user.click(screen.getByText('workflow.common.nodeDescription'))
+    expect(description).toHaveFocus()
+  })
+
+  it('commits a title with Enter and restores its previous value when cleared', async () => {
+    const user = userEvent.setup()
+    const onBlur = vi.fn()
+    render(<TitleInput value="Summarize" onBlur={onBlur} />)
+    const title = screen.getByRole('textbox', { name: 'workflow.common.nodeTitle' })
+
+    await user.click(title)
+    await user.clear(title)
+    await user.type(title, 'Translate{Enter}')
+    expect(onBlur).toHaveBeenLastCalledWith('Translate')
+
+    await user.clear(title)
+    await user.tab()
+    expect(title).toHaveValue('Summarize')
+    expect(onBlur).toHaveBeenLastCalledWith('Summarize')
+  })
+})
diff --git a/web/app/components/workflow/nodes/_base/components/next-step/__tests__/item.browser.spec.tsx b/web/app/components/workflow/nodes/_base/components/next-step/__tests__/item.browser.spec.tsx
new file mode 100644
index 00000000000..a1b8eaf7c83
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/next-step/__tests__/item.browser.spec.tsx
@@ -0,0 +1,53 @@
+import type { CommonNodeType } from '@/app/components/workflow/types'
+import { page, userEvent } from 'vite-plus/test/browser'
+import { render } from 'vitest-browser-react'
+import { BlockEnum } from '@/app/components/workflow/types'
+import Item from '../item'
+
+const { handleNodeSelect } = vi.hoisted(() => ({ handleNodeSelect: vi.fn() }))
+
+vi.mock('../../../../../hooks/use-nodes-interactions', () => ({
+  useNodesInteractions: () => ({ handleNodeSelect }),
+}))
+vi.mock('../../../../../hooks/use-tool-icon', () => ({ useToolIcon: () => '' }))
+vi.mock('../../../../../hooks/use-workflow', () => ({
+  useNodesReadOnly: () => ({ nodesReadOnly: false }),
+}))
+vi.mock('../../../../../hooks/use-available-blocks', () => ({
+  useAvailableBlocks: () => ({ availablePrevBlocks: [], availableNextBlocks: [] }),
+}))
+
+// Real CSS and sequential focus catch controls skipped by Tab or hidden when menu focus returns.
+it('reveals next-step actions to keyboard users and keeps restored focus visible', async () => {
+  await render(
+    <>
+      <button type="button">Before next step</button>
+      <div style={{ width: 400, marginTop: 80 }}>
+        <Item
+          nodeId="next-node"
+          sourceHandle="source"
+          data={{ type: BlockEnum.Code, title: 'Transform', desc: '' } as CommonNodeType}
+        />
+      </div>
+    </>,
+  )
+  await page.getByRole('button', { name: 'Before next step' }).click()
+  await userEvent.keyboard('{Tab}')
+  const jump = page.getByRole('button', { name: 'workflow.common.jumpToNode' })
+  await expect.element(jump).toHaveFocus()
+  expect(jump.element().checkVisibility({ opacityProperty: true })).toBe(true)
+  await userEvent.keyboard('{Enter}')
+  expect(handleNodeSelect).toHaveBeenCalledWith('next-node')
+
+  await userEvent.keyboard('{Tab}')
+  const more = page.getByRole('button', { name: 'workflow.common.moreActions' })
+  await expect.element(more).toHaveFocus()
+  expect(more.element().checkVisibility({ opacityProperty: true })).toBe(true)
+  await userEvent.keyboard('{Enter}')
+  await expect.element(page.getByRole('menuitem', { name: 'workflow.panel.change' })).toHaveFocus()
+  await userEvent.keyboard('{Escape}')
+
+  await expect.element(page.getByRole('menu')).not.toBeInTheDocument()
+  await expect.element(more).toHaveFocus()
+  expect(more.element().checkVisibility({ opacityProperty: true })).toBe(true)
+})
diff --git a/web/app/components/workflow/nodes/_base/components/next-step/__tests__/operator.spec.tsx b/web/app/components/workflow/nodes/_base/components/next-step/__tests__/operator.spec.tsx
index eae00f53d9d..131f44ea0d1 100644
--- a/web/app/components/workflow/nodes/_base/components/next-step/__tests__/operator.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/next-step/__tests__/operator.spec.tsx
@@ -2,6 +2,8 @@ import type { CommonNodeType } from '@/app/components/workflow/types'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { useState } from 'react'
+import { ReactFlowProvider } from 'reactflow'
+import { renderWorkflowComponent } from '@/app/components/workflow/__tests__/workflow-test-env'
 import { BlockEnum } from '@/app/components/workflow/types'
 import { useAvailableBlocks } from '../../../../../hooks/use-available-blocks'
 import { useNodesInteractions } from '../../../../../hooks/use-nodes-interactions'
@@ -70,7 +72,7 @@ describe('NextStep operator', () => {
     const user = userEvent.setup()
     render(<TestHarness />)
 
-    await user.click(screen.getAllByRole('button')[0]!)
+    await user.click(screen.getByRole('button', { name: 'workflow.common.moreActions' }))
 
     expect(screen.getByText('workflow.panel.change')).toBeInTheDocument()
     expect(screen.getByText('workflow.common.disconnect')).toBeInTheDocument()
@@ -81,13 +83,47 @@ describe('NextStep operator', () => {
     const user = userEvent.setup()
     render(<TestHarness />)
 
-    await user.click(screen.getAllByRole('button')[0]!)
+    await user.click(screen.getByRole('button', { name: 'workflow.common.moreActions' }))
     await user.click(screen.getByText('workflow.common.disconnect'))
     expect(mockHandleNodeDisconnect).toHaveBeenCalledWith('node-1')
     expect(screen.queryByText('workflow.common.disconnect')).not.toBeInTheDocument()
 
-    await user.click(screen.getAllByRole('button')[0]!)
+    await user.click(screen.getByRole('button', { name: 'workflow.common.moreActions' }))
     await user.click(screen.getByText('common.operation.delete'))
     expect(mockHandleNodeDelete).toHaveBeenCalledWith('node-1')
   })
+
+  it.each([
+    ['workflow.common.disconnect', '{ArrowDown}', mockHandleNodeDisconnect],
+    ['common.operation.delete', '{End}', mockHandleNodeDelete],
+  ])('activates %s with the keyboard', async (name, navigation, handler) => {
+    const user = userEvent.setup()
+    render(<TestHarness />)
+
+    await user.tab()
+    await user.keyboard('{ArrowDown}')
+    expect(await screen.findByRole('menuitem', { name: 'workflow.panel.change' })).toHaveFocus()
+    await user.keyboard(navigation)
+    expect(screen.getByRole('menuitem', { name })).toHaveFocus()
+    await user.keyboard('{Enter}')
+
+    expect(handler).toHaveBeenCalledWith('node-1')
+    expect(screen.queryByRole('menu')).not.toBeInTheDocument()
+  })
+
+  it('opens the node selector from the change menu item with the keyboard', async () => {
+    const user = userEvent.setup()
+    renderWorkflowComponent(
+      <ReactFlowProvider>
+        <TestHarness />
+      </ReactFlowProvider>,
+    )
+
+    await user.tab()
+    await user.keyboard('{ArrowDown}{Enter}')
+
+    expect(
+      await screen.findByRole('dialog', { name: 'workflow.common.addBlock' }),
+    ).toBeInTheDocument()
+  })
 })
diff --git a/web/app/components/workflow/nodes/_base/components/next-step/item.tsx b/web/app/components/workflow/nodes/_base/components/next-step/item.tsx
index dd2a9739edb..ea3975da27a 100644
--- a/web/app/components/workflow/nodes/_base/components/next-step/item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/next-step/item.tsx
@@ -34,13 +34,18 @@ const Item = ({ nodeId, sourceHandle, data }: ItemProps) => {
       {!nodesReadOnly && (
         <>
           <Button
-            className="mr-1 hidden shrink-0 group-hover:flex"
+            className="mr-1 shrink-0 opacity-0 group-focus-within:opacity-100 group-hover:opacity-100"
             size="small"
             onClick={() => handleNodeSelect(nodeId)}
           >
             {t(($) => $['common.jumpToNode'], { ns: 'workflow' })}
           </Button>
-          <div className={cn('hidden shrink-0 items-center group-hover:flex', open && 'flex')}>
+          <div
+            className={cn(
+              'flex shrink-0 items-center opacity-0 group-focus-within:opacity-100 group-hover:opacity-100',
+              open && 'opacity-100',
+            )}
+          >
             <Operator
               data={data}
               nodeId={nodeId}
diff --git a/web/app/components/workflow/nodes/_base/components/next-step/operator.tsx b/web/app/components/workflow/nodes/_base/components/next-step/operator.tsx
index c4041980f85..69a124f3d11 100644
--- a/web/app/components/workflow/nodes/_base/components/next-step/operator.tsx
+++ b/web/app/components/workflow/nodes/_base/components/next-step/operator.tsx
@@ -1,7 +1,8 @@
 import type { CommonNodeType, OnSelectBlock } from '@/app/components/workflow/types'
-import { Button } from '@langgenius/dify-ui/button'
+import { buttonVariants } from '@langgenius/dify-ui/button'
 import {
   DropdownMenu,
+  DropdownMenuItem,
   DropdownMenuPopup,
   DropdownMenuPortal,
   DropdownMenuPositioner,
@@ -39,9 +40,19 @@ const ChangeItem = ({ data, nodeId, sourceHandle }: ChangeItemProps) => {
   )
 
   const triggerElement = (
-    <Button variant="ghost" size="medium" className="w-full justify-start px-2">
+    <DropdownMenuItem
+      nativeButton
+      render={<button type="button" />}
+      closeOnClick={false}
+      className={buttonVariants({
+        variant: 'ghost',
+        size: 'medium',
+        className:
+          'mx-0 w-full justify-start px-2 data-highlighted:bg-components-button-ghost-bg-hover',
+      })}
+    >
       {t(($) => $['panel.change'], { ns: 'workflow' })}
-    </Button>
+    </DropdownMenuItem>
   )
 
   return (
@@ -90,26 +101,26 @@ const Operator = ({ open, onOpenChange, data, nodeId, sourceHandle }: OperatorPr
             <div className="min-w-30 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur system-md-regular text-text-secondary shadow-lg">
               <div className="p-1">
                 <ChangeItem data={data} nodeId={nodeId} sourceHandle={sourceHandle} />
-                <div
-                  className="flex h-8 cursor-pointer items-center rounded-lg px-2 hover:bg-state-base-hover"
+                <DropdownMenuItem
+                  className="mx-0"
                   onClick={() => {
                     onOpenChange(false)
                     handleNodeDisconnect(nodeId)
                   }}
                 >
                   {t(($) => $['common.disconnect'], { ns: 'workflow' })}
-                </div>
+                </DropdownMenuItem>
               </div>
               <div className="p-1">
-                <div
-                  className="flex h-8 cursor-pointer items-center rounded-lg px-2 hover:bg-state-base-hover"
+                <DropdownMenuItem
+                  className="mx-0"
                   onClick={() => {
                     onOpenChange(false)
                     handleNodeDelete(nodeId)
                   }}
                 >
                   {t(($) => $['operation.delete'], { ns: 'common' })}
-                </div>
+                </DropdownMenuItem>
               </div>
             </div>
           </DropdownMenuPopup>
diff --git a/web/app/components/workflow/nodes/_base/components/node-control.tsx b/web/app/components/workflow/nodes/_base/components/node-control.tsx
index 13699a140c5..882c6286e16 100644
--- a/web/app/components/workflow/nodes/_base/components/node-control.tsx
+++ b/web/app/components/workflow/nodes/_base/components/node-control.tsx
@@ -4,7 +4,6 @@ import { cn } from '@langgenius/dify-ui/cn'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Stop } from '@/app/components/base/icons/src/vender/line/mediaAndDevices'
 import { useHooksStore } from '@/app/components/workflow/hooks-store'
 import { NodeActionsDropdown } from '@/app/components/workflow/node-actions-menu'
 import { useWorkflowStore } from '@/app/components/workflow/store'
@@ -28,14 +27,15 @@ const NodeControl: FC<NodeControlProps> = ({ id, data, pluginInstallLocked }) =>
   return (
     <div
       className={cn(
-        'invisible absolute -top-7 right-0 flex h-7 pb-1',
+        'invisible absolute -top-8 right-0 flex h-8 origin-bottom-right pb-1',
         !pluginInstallLocked && 'group-hover:visible',
         data.selected && 'visible',
         'has-data-popup-open:visible',
       )}
+      style={{ scale: 'var(--workflow-control-scale, 1)' }}
     >
       <div
-        className="nodrag nopan nowheel flex h-6 items-center rounded-lg border-[0.5px] border-components-actionbar-border bg-components-actionbar-bg px-0.5 text-text-tertiary shadow-md backdrop-blur-[5px]"
+        className="nodrag nopan nowheel flex h-7 items-center rounded-lg border-[0.5px] border-components-actionbar-border bg-components-actionbar-bg px-0.5 text-text-tertiary shadow-md backdrop-blur-[5px]"
         onMouseDown={(e) => e.stopPropagation()}
         onClick={(e) => e.stopPropagation()}
       >
@@ -47,7 +47,7 @@ const NodeControl: FC<NodeControlProps> = ({ id, data, pluginInstallLocked }) =>
                 ? t(($) => $['debug.variableInspect.trigger.stop'], { ns: 'workflow' })
                 : t(($) => $['panel.runThisStep'], { ns: 'workflow' })
             }
-            className={`flex size-5 items-center justify-center rounded-md ${isSingleRunning && 'cursor-pointer hover:bg-state-base-hover'}`}
+            className={`flex size-6 items-center justify-center rounded-md ${isSingleRunning && 'cursor-pointer hover:bg-state-base-hover'}`}
             onClick={() => {
               const action = isSingleRunning ? 'stop' : 'run'
 
@@ -61,7 +61,7 @@ const NodeControl: FC<NodeControlProps> = ({ id, data, pluginInstallLocked }) =>
             }}
           >
             {isSingleRunning ? (
-              <Stop className="size-3" />
+              <span aria-hidden className="i-custom-vender-line-mediaanddevices-stop size-3" />
             ) : (
               <Tooltip>
                 <TooltipTrigger render={<span className="i-ri-play-large-line size-3" />} />
@@ -72,7 +72,7 @@ const NodeControl: FC<NodeControlProps> = ({ id, data, pluginInstallLocked }) =>
             )}
           </button>
         )}
-        <NodeActionsDropdown id={id} data={data} triggerClassName="w-5! h-5!" />
+        <NodeActionsDropdown id={id} data={data} />
       </div>
     </div>
   )
diff --git a/web/app/components/workflow/nodes/_base/components/node-handle.tsx b/web/app/components/workflow/nodes/_base/components/node-handle.tsx
index 30a22ab512c..9cd0842d5ec 100644
--- a/web/app/components/workflow/nodes/_base/components/node-handle.tsx
+++ b/web/app/components/workflow/nodes/_base/components/node-handle.tsx
@@ -12,6 +12,7 @@ import { useIsChatMode, useNodesReadOnly } from '../../../hooks/use-workflow'
 import { useStore, useWorkflowStore } from '../../../store'
 import { BlockEnum, NodeRunningStatus } from '../../../types'
 import { getNodeCatalogType } from '../../../utils'
+import { ErrorHandleTypeEnum } from './error-handle/types'
 
 type NodeHandleProps = {
   handleId: string
@@ -20,6 +21,9 @@ type NodeHandleProps = {
   showExceptionStatus?: boolean
 } & Pick<Node, 'id' | 'data'>
 
+// React Flow measures the 16px handle box. Enlarge its hit area with ::before
+// and scale the button independently so zoom compensation cannot move edge endpoints.
+
 const canAutoOpenStartNodeSelector = (nodeType: BlockEnum, isChatMode: boolean) => {
   if (isChatMode) return false
 
@@ -77,9 +81,8 @@ export const NodeTargetHandle = memo(
           position={Position.Left}
           className={cn(
             'z-1 size-4! rounded-none! border-none! bg-transparent! outline-hidden!',
+            'before:absolute before:-inset-1 before:scale-[var(--workflow-control-scale,1)]',
             'after:absolute after:top-1 after:left-1.5 after:h-2 after:w-0.5 after:bg-workflow-link-line-handle',
-            'transition-all hover:scale-125',
-            open && 'scale-125',
             data._runningStatus === NodeRunningStatus.Succeeded &&
               'after:bg-workflow-link-line-success-handle',
             data._runningStatus === NodeRunningStatus.Failed &&
@@ -106,12 +109,13 @@ export const NodeTargetHandle = memo(
                 nextNodeId: id,
                 nextNodeTargetHandle: handleId,
               }}
+              triggerStyle={{ scale: 'var(--workflow-control-scale, 1)' }}
               placement="left"
               showStartTab
               triggerClassName={`
-                absolute left-0 top-0 opacity-0 pointer-events-none transition-opacity duration-150
+                absolute -left-1 -top-1 opacity-0 pointer-events-none transition-opacity duration-150
                 ${nodeSelectorClassName}
-                group-hover:opacity-100
+                group-hover:opacity-100 focus-visible:opacity-100
                 ${data.selected && 'opacity-100'}
                 data-popup-open:opacity-100
               `}
@@ -152,6 +156,14 @@ export const NodeSourceHandle = memo(
     const [open, setOpen] = useState(() => shouldAutoOpen)
 
     const connected = data._connectedSourceHandleIds?.includes(handleId)
+    // Branch ports can be only 24px apart in canvas coordinates. Keep their
+    // buttons and hit areas in that coordinate space so zooming out cannot make
+    // one branch intercept another's click or connection drag.
+    const hasMultipleSourceHandles =
+      data.type === BlockEnum.IfElse ||
+      data.type === BlockEnum.QuestionClassifier ||
+      data.type === BlockEnum.HumanInput ||
+      data.error_strategy === ErrorHandleTypeEnum.failBranch
     const handleOpenChange = useCallback((v: boolean) => {
       setOpen(v)
     }, [])
@@ -206,9 +218,9 @@ export const NodeSourceHandle = memo(
         position={Position.Right}
         className={cn(
           'group/handle z-1 size-4! rounded-none! border-none! bg-transparent! outline-hidden!',
+          'before:absolute before:-inset-1',
+          !hasMultipleSourceHandles && 'before:scale-[var(--workflow-control-scale,1)]',
           'after:absolute after:top-1 after:right-1.5 after:h-2 after:w-0.5 after:bg-workflow-link-line-handle',
-          'transition-all hover:scale-125',
-          open && 'scale-125',
           data._runningStatus === NodeRunningStatus.Succeeded &&
             'after:bg-workflow-link-line-success-handle',
           data._runningStatus === NodeRunningStatus.Failed &&
@@ -248,13 +260,16 @@ export const NodeSourceHandle = memo(
               prevNodeSourceHandle: handleId,
             }}
             triggerClassName={`
-              absolute top-0 left-0 opacity-0 pointer-events-none transition-opacity duration-150
+              absolute -top-1 -left-1 opacity-0 pointer-events-none transition-opacity duration-150
               ${nodeSelectorClassName}
-              group-hover:opacity-100
+              group-hover:opacity-100 focus-visible:opacity-100
               ${data.selected && 'opacity-100'}
               data-popup-open:opacity-100
             `}
             availableBlocksTypes={availableNextBlocks}
+            triggerStyle={{
+              scale: hasMultipleSourceHandles ? '1' : 'var(--workflow-control-scale, 1)',
+            }}
             showStartTab
           />
         )}
diff --git a/web/app/components/workflow/nodes/_base/components/title-description-input.tsx b/web/app/components/workflow/nodes/_base/components/title-description-input.tsx
index 6dba43c4c86..e82118927ff 100644
--- a/web/app/components/workflow/nodes/_base/components/title-description-input.tsx
+++ b/web/app/components/workflow/nodes/_base/components/title-description-input.tsx
@@ -1,4 +1,4 @@
-import { memo, useCallback, useEffect, useState } from 'react'
+import { memo, useCallback, useEffect, useId, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Textarea from 'react-textarea-autosize'
 
@@ -9,6 +9,7 @@ type TitleInputProps = {
 
 export const TitleInput = memo(({ value, onBlur }: TitleInputProps) => {
   const { t } = useTranslation()
+  const inputId = useId()
   const [localValue, setLocalValue] = useState(value)
 
   const handleBlur = () => {
@@ -40,14 +41,20 @@ export const TitleInput = memo(({ value, onBlur }: TitleInputProps) => {
   }, [value])
 
   return (
-    <input
-      value={localValue}
-      onChange={handleChange}
-      onKeyDown={handleKeyDown}
-      className={`mr-2 h-7 min-w-0 grow appearance-none rounded-md border border-transparent bg-transparent px-1 system-xl-semibold text-text-primary outline-hidden focus:shadow-xs`}
-      placeholder={t(($) => $['common.addTitle'], { ns: 'workflow' }) || ''}
-      onBlur={handleBlur}
-    />
+    <div className="mr-2 min-w-0 grow">
+      <label htmlFor={inputId} className="block px-1 system-xs-medium text-text-secondary">
+        {t(($) => $['common.nodeTitle'], { ns: 'workflow' })}
+      </label>
+      <input
+        id={inputId}
+        value={localValue}
+        onChange={handleChange}
+        onKeyDown={handleKeyDown}
+        className={`h-7 w-full min-w-0 appearance-none rounded-md border border-transparent bg-transparent px-1 system-xl-semibold text-text-primary outline-hidden focus:shadow-xs focus-visible:ring-1 focus-visible:ring-components-input-border-hover`}
+        placeholder={t(($) => $['common.addTitle'], { ns: 'workflow' }) || ''}
+        onBlur={handleBlur}
+      />
+    </div>
   )
 })
 TitleInput.displayName = 'TitleInput'
@@ -58,6 +65,7 @@ type DescriptionInputProps = {
 }
 export const DescriptionInput = memo(({ value, onChange }: DescriptionInputProps) => {
   const { t } = useTranslation()
+  const inputId = useId()
   const [focus, setFocus] = useState(false)
   const handleFocus = useCallback(() => {
     setFocus(true)
@@ -67,18 +75,24 @@ export const DescriptionInput = memo(({ value, onChange }: DescriptionInputProps
   }, [])
 
   return (
-    <div
-      className={`group flex max-h-15 overflow-y-auto rounded-lg bg-components-panel-bg px-2 py-1.25 leading-0 ${focus && 'shadow-xs!'} `}
-    >
-      <Textarea
-        value={value}
-        onChange={(e) => onChange(e.target.value)}
-        minRows={1}
-        onFocus={handleFocus}
-        onBlur={handleBlur}
-        className={`w-full resize-none appearance-none bg-transparent text-xs leading-4.5 text-text-primary caret-[#295EFF] outline-hidden placeholder:text-text-quaternary`}
-        placeholder={t(($) => $['common.addDescription'], { ns: 'workflow' }) || ''}
-      />
+    <div>
+      <label htmlFor={inputId} className="mb-1 block system-xs-medium text-text-secondary">
+        {t(($) => $['common.nodeDescription'], { ns: 'workflow' })}
+      </label>
+      <div
+        className={`group flex max-h-15 overflow-y-auto rounded-lg bg-components-panel-bg px-2 py-1.25 leading-0 ${focus && 'shadow-xs!'} `}
+      >
+        <Textarea
+          id={inputId}
+          value={value}
+          onChange={(e) => onChange(e.target.value)}
+          minRows={1}
+          onFocus={handleFocus}
+          onBlur={handleBlur}
+          className={`w-full resize-none appearance-none bg-transparent text-xs leading-4.5 text-text-primary caret-[#295EFF] outline-hidden placeholder:text-text-quaternary focus-visible:ring-1 focus-visible:ring-components-input-border-hover`}
+          placeholder={t(($) => $['common.addDescription'], { ns: 'workflow' }) || ''}
+        />
+      </div>
     </div>
   )
 })
diff --git a/web/app/components/workflow/note-node/note-editor/__tests__/editor.spec.tsx b/web/app/components/workflow/note-node/note-editor/__tests__/editor.spec.tsx
index 60a01970019..145dc14b724 100644
--- a/web/app/components/workflow/note-node/note-editor/__tests__/editor.spec.tsx
+++ b/web/app/components/workflow/note-node/note-editor/__tests__/editor.spec.tsx
@@ -50,7 +50,9 @@ describe('Editor', () => {
       renderEditor({ placeholder: 'Type note' })
 
       expect(screen.getByText('Type note')).toBeInTheDocument()
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(
+        screen.getByRole('textbox', { name: 'workflow.nodes.note.editor.label' }),
+      ).toBeInTheDocument()
     })
 
     it('should render linked text with distinct link styling', async () => {
@@ -152,6 +154,9 @@ describe('Editor', () => {
 
       await waitFor(() => {
         expect(changes).toContain('hello world')
+        expect(
+          screen.getByRole('textbox', { name: 'workflow.nodes.note.editor.label' }),
+        ).toHaveTextContent('hello world')
       })
     })
   })
diff --git a/web/app/components/workflow/note-node/note-editor/editor.tsx b/web/app/components/workflow/note-node/note-editor/editor.tsx
index d91759d5f64..451e1baf234 100644
--- a/web/app/components/workflow/note-node/note-editor/editor.tsx
+++ b/web/app/components/workflow/note-node/note-editor/editor.tsx
@@ -10,6 +10,7 @@ import { ListPlugin } from '@lexical/react/LexicalListPlugin'
 import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin'
 import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin'
 import { memo, useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
 // import TreeView from '@/app/components/base/prompt-editor/plugins/tree-view'
 import Placeholder from '@/app/components/base/prompt-editor/plugins/placeholder'
 import FormatDetectorPlugin from './plugins/format-detector-plugin'
@@ -22,11 +23,12 @@ type EditorProps = {
   setHistoryShortcutsEnabled?: (v: boolean) => void
 }
 const Editor = ({
-  placeholder = 'write you note...',
+  placeholder,
   onChange,
   containerElement,
   setHistoryShortcutsEnabled,
 }: EditorProps) => {
+  const { t } = useTranslation()
   const handleEditorChange = useCallback(
     (editorState: EditorState) => {
       onChange?.(editorState)
@@ -40,6 +42,7 @@ const Editor = ({
         contentEditable={
           <div>
             <ContentEditable
+              aria-label={t(($) => $['nodes.note.editor.label'], { ns: 'workflow' })}
               onFocus={() => setHistoryShortcutsEnabled?.(false)}
               onBlur={() => setHistoryShortcutsEnabled?.(true)}
               spellCheck={false}
@@ -47,7 +50,12 @@ const Editor = ({
             />
           </div>
         }
-        placeholder={<Placeholder value={placeholder} compact />}
+        placeholder={
+          <Placeholder
+            value={placeholder ?? t(($) => $['nodes.note.editor.placeholder'], { ns: 'workflow' })}
+            compact
+          />
+        }
         ErrorBoundary={LexicalErrorBoundary}
       />
       <ClickableLinkPlugin disabled />
diff --git a/web/app/components/workflow/operator/__tests__/zoom-in-out.spec.tsx b/web/app/components/workflow/operator/__tests__/zoom-in-out.spec.tsx
index 25a70d32c10..d3f1599dba7 100644
--- a/web/app/components/workflow/operator/__tests__/zoom-in-out.spec.tsx
+++ b/web/app/components/workflow/operator/__tests__/zoom-in-out.spec.tsx
@@ -1,4 +1,6 @@
 import { fireEvent, screen, within } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useState } from 'react'
 import { renderWithConsoleQuery } from '@/test/console/query-data'
 import ZoomInOut from '../zoom-in-out'
 
@@ -156,6 +158,41 @@ describe('workflow zoom controls', () => {
     expect(mockToggleUserCursors).toHaveBeenCalledTimes(1)
   })
 
+  it('exposes display settings as checked menu items and updates them with the keyboard', async () => {
+    const user = userEvent.setup()
+    const DisplaySettings = () => {
+      const [showMiniMap, setShowMiniMap] = useState(true)
+      return (
+        <ZoomInOut
+          showMiniMap={showMiniMap}
+          onToggleMiniMap={() => setShowMiniMap((value) => !value)}
+          showUserCursors={false}
+          showUserComments
+        />
+      )
+    }
+    renderZoomInOut(<DisplaySettings />)
+
+    await user.click(screen.getByRole('button', { name: '100%' }))
+    const miniMap = screen.getByRole('menuitemcheckbox', { name: 'workflow.operator.showMiniMap' })
+    expect(miniMap).toBeChecked()
+    expect(
+      screen.getByRole('menuitemcheckbox', { name: 'workflow.operator.showUserCursors' }),
+    ).not.toBeChecked()
+    expect(
+      screen.getByRole('menuitemcheckbox', { name: 'workflow.operator.showUserComments' }),
+    ).toBeChecked()
+    expect(screen.getByRole('menuitem', { name: '200%' })).toBeInTheDocument()
+
+    miniMap.focus()
+    await user.keyboard('{Enter}')
+    await user.click(screen.getByRole('button', { name: '100%' }))
+    expect(
+      screen.getByRole('menuitemcheckbox', { name: 'workflow.operator.showMiniMap' }),
+    ).not.toBeChecked()
+    expect(mockHandleSyncWorkflowDraft).not.toHaveBeenCalled()
+  })
+
   it('keeps the show-user-comments action disabled in comment mode', () => {
     renderZoomInOut(<ZoomInOut isCommentMode onToggleUserComments={mockToggleUserComments} />)
 
diff --git a/web/app/components/workflow/operator/zoom-in-out.tsx b/web/app/components/workflow/operator/zoom-in-out.tsx
index 69d7dd0672b..a7affb6eccd 100644
--- a/web/app/components/workflow/operator/zoom-in-out.tsx
+++ b/web/app/components/workflow/operator/zoom-in-out.tsx
@@ -1,6 +1,7 @@
 import type { FC } from 'react'
 import {
   DropdownMenu,
+  DropdownMenuCheckboxItem,
   DropdownMenuItem,
   DropdownMenuPopup,
   DropdownMenuPortal,
@@ -93,20 +94,24 @@ const ZoomInOut: FC<ZoomInOutProps> = ({
           {
             key: ZoomType.toggleUserComments,
             text: t(($) => $['operator.showUserComments'], { ns: 'workflow' }),
+            checked: showUserComments,
           },
           {
             key: ZoomType.toggleUserCursors,
             text: t(($) => $['operator.showUserCursors'], { ns: 'workflow' }),
+            checked: showUserCursors,
           },
           {
             key: ZoomType.toggleMiniMap,
             text: t(($) => $['operator.showMiniMap'], { ns: 'workflow' }),
+            checked: showMiniMap,
           },
         ]
       : [
           {
             key: ZoomType.toggleMiniMap,
             text: t(($) => $['operator.showMiniMap'], { ns: 'workflow' }),
+            checked: showMiniMap,
           },
         ],
   ]
@@ -187,68 +192,58 @@ const ZoomInOut: FC<ZoomInOutProps> = ({
                     <Fragment key={options[0]!.key}>
                       {groupIndex !== 0 && <DropdownMenuSeparator className="my-0" />}
                       <div className="p-1">
-                        {options.map((option) => (
-                          <DropdownMenuItem
-                            key={option.key}
-                            className="justify-between px-3 py-1.5 system-md-regular text-text-secondary"
-                            disabled={option.key === ZoomType.toggleUserComments && isCommentMode}
-                            onClick={() => handleZoom(option.key)}
-                          >
-                            <div className="flex items-center gap-2">
-                              {option.key === ZoomType.toggleUserComments && showUserComments && (
-                                <span
-                                  aria-hidden
-                                  className="i-ri-check-line size-4 text-text-accent"
-                                />
-                              )}
-                              {option.key === ZoomType.toggleUserComments && !showUserComments && (
-                                <span aria-hidden className="size-4" />
-                              )}
-                              {option.key === ZoomType.toggleUserCursors && showUserCursors && (
-                                <span
-                                  aria-hidden
-                                  className="i-ri-check-line size-4 text-text-accent"
-                                />
-                              )}
-                              {option.key === ZoomType.toggleUserCursors && !showUserCursors && (
-                                <span aria-hidden className="size-4" />
-                              )}
-                              {option.key === ZoomType.toggleMiniMap && showMiniMap && (
-                                <span
-                                  aria-hidden
-                                  className="i-ri-check-line size-4 text-text-accent"
-                                />
-                              )}
-                              {option.key === ZoomType.toggleMiniMap && !showMiniMap && (
-                                <span aria-hidden className="size-4" />
-                              )}
-                              {option.key === ZoomType.zoomToFit && (
-                                <span
-                                  aria-hidden
-                                  className="i-ri-fullscreen-line size-4 text-text-tertiary"
-                                />
-                              )}
-                              {option.key !== ZoomType.toggleUserComments &&
-                                option.key !== ZoomType.toggleUserCursors &&
-                                option.key !== ZoomType.toggleMiniMap &&
-                                option.key !== ZoomType.zoomToFit && (
+                        {options.map((option) =>
+                          'checked' in option ? (
+                            <DropdownMenuCheckboxItem
+                              key={option.key}
+                              className="gap-2 px-3 py-1.5 system-md-regular text-text-secondary"
+                              checked={option.checked}
+                              disabled={option.key === ZoomType.toggleUserComments && isCommentMode}
+                              closeOnClick
+                              onCheckedChange={() => handleZoom(option.key)}
+                            >
+                              <span
+                                aria-hidden
+                                className={
+                                  option.checked
+                                    ? 'i-ri-check-line size-4 text-text-accent'
+                                    : 'size-4'
+                                }
+                              />
+                              <span>{option.text}</span>
+                            </DropdownMenuCheckboxItem>
+                          ) : (
+                            <DropdownMenuItem
+                              key={option.key}
+                              className="justify-between px-3 py-1.5 system-md-regular text-text-secondary"
+                              onClick={() => handleZoom(option.key)}
+                            >
+                              <div className="flex items-center gap-2">
+                                {option.key === ZoomType.zoomToFit && (
+                                  <span
+                                    aria-hidden
+                                    className="i-ri-fullscreen-line size-4 text-text-tertiary"
+                                  />
+                                )}
+                                {option.key !== ZoomType.zoomToFit && (
                                   <span aria-hidden className="size-4" />
                                 )}
-                              <span>{option.text}</span>
-                            </div>
-                            <div className="flex items-center space-x-0.5">
-                              {option.key === ZoomType.zoomToFit && (
-                                <ShortcutKbd shortcut="workflow.zoom-to-fit" />
-                              )}
-                              {option.key === ZoomType.zoomTo50 && (
-                                <ShortcutKbd shortcut="workflow.zoom-to-50" />
-                              )}
-                              {option.key === ZoomType.zoomTo100 && (
-                                <ShortcutKbd shortcut="workflow.zoom-to-100" />
-                              )}
-                            </div>
-                          </DropdownMenuItem>
-                        ))}
+                                <span>{option.text}</span>
+                              </div>
+                              <div className="flex items-center space-x-0.5">
+                                {option.key === ZoomType.zoomToFit && (
+                                  <ShortcutKbd shortcut="workflow.zoom-to-fit" />
+                                )}
+                                {option.key === ZoomType.zoomTo50 && (
+                                  <ShortcutKbd shortcut="workflow.zoom-to-50" />
+                                )}
+                                {option.key === ZoomType.zoomTo100 && (
+                                  <ShortcutKbd shortcut="workflow.zoom-to-100" />
+                                )}
+                              </div>
+                            </DropdownMenuItem>
+                          ),
+                        )}
                       </div>
                     </Fragment>
                   ))}
diff --git a/web/i18n/ar-TN/workflow.json b/web/i18n/ar-TN/workflow.json
index 02b046b3737..3f5aec204a5 100644
--- a/web/i18n/ar-TN/workflow.json
+++ b/web/i18n/ar-TN/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "قطع الاتصال",
   "common.draftSaveFailed": "فشل حفظ المسودة",
   "common.duplicate": "تكرار",
+  "common.edgeLabel": "اتصال من {{source}} إلى {{target}}",
   "common.effectVarConfirm.content": "يتم استخدام المتغير في عقد أخرى. هل ما زلت تريد إزالته؟",
   "common.effectVarConfirm.title": "إزالة المتغير",
   "common.enableJinja": "تمكين دعم قالب Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "هذه الخطوة غير متصلة بأي شيء",
   "common.needStartNode": "يجب إضافة عقدة بدء واحدة على الأقل",
   "common.noVar": "لا يوجد متغير",
+  "common.nodeDescription": "الوصف",
+  "common.nodeTitle": "اسم العقدة",
   "common.notPublishedYet": "لم يتم النشر بعد",
   "common.notRunning": "لم يتم التشغيل بعد",
   "common.onFailure": "عند الفشل",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "أدخل URL...",
   "nodes.note.editor.invalidUrl": "URL غير صالح",
   "nodes.note.editor.italic": "مائل",
+  "nodes.note.editor.label": "محتوى الملاحظة",
   "nodes.note.editor.large": "كبير",
   "nodes.note.editor.link": "رابط",
   "nodes.note.editor.medium": "متوسط",
diff --git a/web/i18n/de-DE/workflow.json b/web/i18n/de-DE/workflow.json
index 899ac5f2a17..fbe2d6ae0ae 100644
--- a/web/i18n/de-DE/workflow.json
+++ b/web/i18n/de-DE/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Trennen",
   "common.draftSaveFailed": "Entwurf konnte nicht gespeichert werden",
   "common.duplicate": "Duplizieren",
+  "common.edgeLabel": "Verbindung von {{source}} zu {{target}}",
   "common.effectVarConfirm.content": "Die Variable wird in anderen Knoten verwendet. Möchten Sie sie trotzdem entfernen?",
   "common.effectVarConfirm.title": "Variable entfernen",
   "common.enableJinja": "Jinja-Vorlagenunterstützung aktivieren",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Dieser Schritt ist mit nichts verbunden",
   "common.needStartNode": "Es muss mindestens ein Startknoten hinzugefügt werden",
   "common.noVar": "Keine Variable",
+  "common.nodeDescription": "Beschreibung",
+  "common.nodeTitle": "Knotenname",
   "common.notPublishedYet": "Noch nicht veröffentlicht",
   "common.notRunning": "Noch nicht ausgeführt",
   "common.onFailure": "Bei Ausfall",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "URL eingeben...",
   "nodes.note.editor.invalidUrl": "Ungültige URL",
   "nodes.note.editor.italic": "Kursiv",
+  "nodes.note.editor.label": "Notizinhalt",
   "nodes.note.editor.large": "Groß",
   "nodes.note.editor.link": "Verbinden",
   "nodes.note.editor.medium": "Mittel",
diff --git a/web/i18n/en-US/workflow.json b/web/i18n/en-US/workflow.json
index 327936e2ef4..8d35645314d 100644
--- a/web/i18n/en-US/workflow.json
+++ b/web/i18n/en-US/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Disconnect",
   "common.draftSaveFailed": "Draft save failed",
   "common.duplicate": "Duplicate",
+  "common.edgeLabel": "Connection from {{source}} to {{target}}",
   "common.effectVarConfirm.content": "The variable is used in other nodes. Do you still want to remove it?",
   "common.effectVarConfirm.title": "Remove Variable",
   "common.enableJinja": "Enable Jinja template support",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "This step is not connected to anything",
   "common.needStartNode": "At least one start node must be added",
   "common.noVar": "No variable",
+  "common.nodeDescription": "Description",
+  "common.nodeTitle": "Node name",
   "common.notPublishedYet": "Not published yet",
   "common.notRunning": "Not running yet",
   "common.onFailure": "On Failure",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Enter URL...",
   "nodes.note.editor.invalidUrl": "Invalid URL",
   "nodes.note.editor.italic": "Italic",
+  "nodes.note.editor.label": "Note content",
   "nodes.note.editor.large": "Large",
   "nodes.note.editor.link": "Link",
   "nodes.note.editor.medium": "Medium",
diff --git a/web/i18n/es-ES/workflow.json b/web/i18n/es-ES/workflow.json
index 8e5368d794b..1fc5d25d8fe 100644
--- a/web/i18n/es-ES/workflow.json
+++ b/web/i18n/es-ES/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Desconectar",
   "common.draftSaveFailed": "Error al guardar el borrador",
   "common.duplicate": "Duplicar",
+  "common.edgeLabel": "Conexión de {{source}} a {{target}}",
   "common.effectVarConfirm.content": "La variable se utiliza en otros nodos. ¿Aún quieres eliminarla?",
   "common.effectVarConfirm.title": "Eliminar variable",
   "common.enableJinja": "Habilitar soporte de plantillas Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Este paso no está conectado a nada",
   "common.needStartNode": "Se debe añadir al menos un nodo de inicio",
   "common.noVar": "Sin variable",
+  "common.nodeDescription": "Descripción",
+  "common.nodeTitle": "Nombre del nodo",
   "common.notPublishedYet": "Aún no publicado",
   "common.notRunning": "Aún no se está ejecutando",
   "common.onFailure": "Sobre el fracaso",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Introducir URL...",
   "nodes.note.editor.invalidUrl": "URL inválida",
   "nodes.note.editor.italic": "Itálica",
+  "nodes.note.editor.label": "Contenido de la nota",
   "nodes.note.editor.large": "Grande",
   "nodes.note.editor.link": "Enlace",
   "nodes.note.editor.medium": "Mediano",
diff --git a/web/i18n/fa-IR/workflow.json b/web/i18n/fa-IR/workflow.json
index 2224f6f6799..89d51e4cc73 100644
--- a/web/i18n/fa-IR/workflow.json
+++ b/web/i18n/fa-IR/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "قطع اتصال",
   "common.draftSaveFailed": "ذخیره پیش‌نویس ناموفق بود",
   "common.duplicate": "تکثیر",
+  "common.edgeLabel": "اتصال از {{source}} به {{target}}",
   "common.effectVarConfirm.content": "این متغیر در گره‌های دیگر استفاده شده است. آیا مطمئنید می‌خواهید آن را حذف کنید؟",
   "common.effectVarConfirm.title": "حذف متغیر",
   "common.enableJinja": "فعال‌سازی پشتیبانی از الگوی Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "این مرحله به هیچ گره‌ای متصل نیست",
   "common.needStartNode": "حداقل یک گره شروع باید اضافه شود",
   "common.noVar": "بدون متغیر",
+  "common.nodeDescription": "توضیحات",
+  "common.nodeTitle": "نام گره",
   "common.notPublishedYet": "هنوز منتشر نشده",
   "common.notRunning": "هنوز اجرا نشده",
   "common.onFailure": "در صورت شکست",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "URL را وارد کنید...",
   "nodes.note.editor.invalidUrl": "URL نامعتبر",
   "nodes.note.editor.italic": "ایتالیک",
+  "nodes.note.editor.label": "محتوای یادداشت",
   "nodes.note.editor.large": "بزرگ",
   "nodes.note.editor.link": "لینک",
   "nodes.note.editor.medium": "متوسط",
diff --git a/web/i18n/fr-FR/workflow.json b/web/i18n/fr-FR/workflow.json
index 8fa8bc29232..70d7d07f3b9 100644
--- a/web/i18n/fr-FR/workflow.json
+++ b/web/i18n/fr-FR/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Déconnecter",
   "common.draftSaveFailed": "Échec de l’enregistrement du brouillon",
   "common.duplicate": "Dupliquer",
+  "common.edgeLabel": "Connexion de {{source}} à {{target}}",
   "common.effectVarConfirm.content": "La variable est utilisée dans d'autres nœuds. Voulez-vous toujours la supprimer?",
   "common.effectVarConfirm.title": "Supprimer la variable",
   "common.enableJinja": "Activer le support des templates Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Cette étape n'est connectée à rien",
   "common.needStartNode": "Au moins un nœud de départ doit être ajouté",
   "common.noVar": "Pas de variable",
+  "common.nodeDescription": "Description",
+  "common.nodeTitle": "Nom du nœud",
   "common.notPublishedYet": "Pas encore publié",
   "common.notRunning": "Pas encore en cours d'exécution",
   "common.onFailure": "Sur l’échec",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Entrer l'URL...",
   "nodes.note.editor.invalidUrl": "URL invalide",
   "nodes.note.editor.italic": "Italique",
+  "nodes.note.editor.label": "Contenu de la note",
   "nodes.note.editor.large": "Grand",
   "nodes.note.editor.link": "Lien",
   "nodes.note.editor.medium": "Moyen",
diff --git a/web/i18n/hi-IN/workflow.json b/web/i18n/hi-IN/workflow.json
index cdc80bbb94e..9f96f4568c0 100644
--- a/web/i18n/hi-IN/workflow.json
+++ b/web/i18n/hi-IN/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "अलग करना",
   "common.draftSaveFailed": "ड्राफ़्ट सहेजना विफल रहा",
   "common.duplicate": "डुप्लिकेट करें",
+  "common.edgeLabel": "{{source}} से {{target}} तक कनेक्शन",
   "common.effectVarConfirm.content": "वेरिएबल अन्य नोड्स में उपयोग किया जाता है। क्या आप अभी भी इसे हटाना चाहते हैं?",
   "common.effectVarConfirm.title": "वेरिएबल हटाएं",
   "common.enableJinja": "Jinja टेम्पलेट समर्थन सक्षम करें",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "यह चरण किसी से जुड़ा नहीं है",
   "common.needStartNode": "कम से कम एक प्रारंभ नोड जोड़ा जाना चाहिए",
   "common.noVar": "कोई वेरिएबल नहीं",
+  "common.nodeDescription": "विवरण",
+  "common.nodeTitle": "नोड का नाम",
   "common.notPublishedYet": "अभी तक प्रकाशित नहीं",
   "common.notRunning": "अभी तक नहीं चल रहा",
   "common.onFailure": "असफलता पर",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "URL दर्ज करें...",
   "nodes.note.editor.invalidUrl": "अवैध URL",
   "nodes.note.editor.italic": "इटैलिक",
+  "nodes.note.editor.label": "नोट की सामग्री",
   "nodes.note.editor.large": "बड़ा",
   "nodes.note.editor.link": "लिंक",
   "nodes.note.editor.medium": "मध्यम",
diff --git a/web/i18n/id-ID/workflow.json b/web/i18n/id-ID/workflow.json
index 8870e6d7162..56f02e2ad58 100644
--- a/web/i18n/id-ID/workflow.json
+++ b/web/i18n/id-ID/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Lepaskan",
   "common.draftSaveFailed": "Gagal menyimpan draf",
   "common.duplicate": "Duplikat",
+  "common.edgeLabel": "Koneksi dari {{source}} ke {{target}}",
   "common.effectVarConfirm.content": "Variabel ini digunakan di node lain. Apakah Anda masih ingin menghapusnya?",
   "common.effectVarConfirm.title": "Hapus Variabel",
   "common.enableJinja": "Aktifkan dukungan template Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Langkah ini tidak terhubung ke apa pun",
   "common.needStartNode": "Setidaknya satu node awal harus ditambahkan",
   "common.noVar": "Tidak ada variabel",
+  "common.nodeDescription": "Deskripsi",
+  "common.nodeTitle": "Nama node",
   "common.notPublishedYet": "Belum diterbitkan",
   "common.notRunning": "Belum berjalan",
   "common.onFailure": "Pada Kegagalan",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Masukkan URL...",
   "nodes.note.editor.invalidUrl": "URL tidak valid",
   "nodes.note.editor.italic": "Miring",
+  "nodes.note.editor.label": "Isi catatan",
   "nodes.note.editor.large": "Besar",
   "nodes.note.editor.link": "Tautan",
   "nodes.note.editor.medium": "Sedang",
diff --git a/web/i18n/it-IT/workflow.json b/web/i18n/it-IT/workflow.json
index c3235f18a29..0aef12b4d99 100644
--- a/web/i18n/it-IT/workflow.json
+++ b/web/i18n/it-IT/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Disconnettere",
   "common.draftSaveFailed": "Salvataggio della bozza non riuscito",
   "common.duplicate": "Duplica",
+  "common.edgeLabel": "Collegamento da {{source}} a {{target}}",
   "common.effectVarConfirm.content": "La variabile è utilizzata in altri nodi. Vuoi comunque rimuoverla?",
   "common.effectVarConfirm.title": "Rimuovi Variabile",
   "common.enableJinja": "Abilita supporto template Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Questo passaggio non è collegato a nulla",
   "common.needStartNode": "Deve essere aggiunto almeno un nodo iniziale",
   "common.noVar": "Nessuna variabile",
+  "common.nodeDescription": "Descrizione",
+  "common.nodeTitle": "Nome del nodo",
   "common.notPublishedYet": "Non ancora pubblicato",
   "common.notRunning": "Non ancora in esecuzione",
   "common.onFailure": "In caso di guasto",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Inserisci URL...",
   "nodes.note.editor.invalidUrl": "URL non valido",
   "nodes.note.editor.italic": "Corsivo",
+  "nodes.note.editor.label": "Contenuto della nota",
   "nodes.note.editor.large": "Grande",
   "nodes.note.editor.link": "Link",
   "nodes.note.editor.medium": "Medio",
diff --git a/web/i18n/ja-JP/workflow.json b/web/i18n/ja-JP/workflow.json
index da448174661..a67b5a84cb0 100644
--- a/web/i18n/ja-JP/workflow.json
+++ b/web/i18n/ja-JP/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "接続解除",
   "common.draftSaveFailed": "下書きの保存に失敗しました",
   "common.duplicate": "複製",
+  "common.edgeLabel": "{{source}} から {{target}} への接続",
   "common.effectVarConfirm.content": "他のノードで変数が使用されています。それでも削除しますか？",
   "common.effectVarConfirm.title": "変数の削除",
   "common.enableJinja": "Jinja テンプレートを有効化",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "接続されていないステップがあります",
   "common.needStartNode": "少なくとも1つのスタートノードを追加する必要があります",
   "common.noVar": "変数がありません",
+  "common.nodeDescription": "説明",
+  "common.nodeTitle": "ノード名",
   "common.notPublishedYet": "まだ公開されていません",
   "common.notRunning": "まだ実行されていません",
   "common.onFailure": "失敗時",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "リンク入力中...",
   "nodes.note.editor.invalidUrl": "リンク無効",
   "nodes.note.editor.italic": "斜体",
+  "nodes.note.editor.label": "メモの内容",
   "nodes.note.editor.large": "大",
   "nodes.note.editor.link": "リンク",
   "nodes.note.editor.medium": "中",
diff --git a/web/i18n/ko-KR/workflow.json b/web/i18n/ko-KR/workflow.json
index 876c8a06395..4339883ea33 100644
--- a/web/i18n/ko-KR/workflow.json
+++ b/web/i18n/ko-KR/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "연결 해제",
   "common.draftSaveFailed": "초안 저장에 실패했습니다",
   "common.duplicate": "복제",
+  "common.edgeLabel": "{{source}}에서 {{target}}으로의 연결",
   "common.effectVarConfirm.content": "변수가 다른 노드에서 사용되고 있습니다. 그래도 제거하시겠습니까?",
   "common.effectVarConfirm.title": "변수 제거",
   "common.enableJinja": "Jinja 템플릿 지원 활성화",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "이 단계는 아무것도 연결되어 있지 않습니다",
   "common.needStartNode": "적어도 하나의 시작 노드를 추가해야 합니다",
   "common.noVar": "변수 없음",
+  "common.nodeDescription": "설명",
+  "common.nodeTitle": "노드 이름",
   "common.notPublishedYet": "아직 게시되지 않음",
   "common.notRunning": "아직 실행되지 않음",
   "common.onFailure": "실패 시",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "URL 입력...",
   "nodes.note.editor.invalidUrl": "잘못된 URL",
   "nodes.note.editor.italic": "이탤릭체",
+  "nodes.note.editor.label": "메모 내용",
   "nodes.note.editor.large": "큰",
   "nodes.note.editor.link": "링크",
   "nodes.note.editor.medium": "보통",
diff --git a/web/i18n/lo-LA/workflow.json b/web/i18n/lo-LA/workflow.json
index 3410d052d90..98f3eb281eb 100644
--- a/web/i18n/lo-LA/workflow.json
+++ b/web/i18n/lo-LA/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "ຕັດການເຊື່ອມຕໍ່",
   "common.draftSaveFailed": "ບັນທຶກສະບັບຮ່າງບໍ່ສຳເລັດ",
   "common.duplicate": "ເຮັດຊ້ຳ",
+  "common.edgeLabel": "ການເຊື່ອມຕໍ່ຈາກ {{source}} ໄປຫາ {{target}}",
   "common.effectVarConfirm.content": "ຕົວປ່ຽນນີ້ຖືກໃຊ້ໃນໂນດອື່ນ. ທ່ານຍັງຕ້ອງການລຶບມັນຢູ່ບໍ?",
   "common.effectVarConfirm.title": "ລຶບຕົວປ່ຽນ",
   "common.enableJinja": "ເປີດໃຊ້ການຮອງຮັບ Jinja template",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "ຂັ້ນຕອນນີ້ຍັງບໍ່ໄດ້ເຊື່ອມຕໍ່ກັບຫຍັງເລີຍ",
   "common.needStartNode": "ຕ້ອງເພີ່ມຢ່າງໜ້ອຍໜຶ່ງໂນດເລີ່ມຕົ້ນ",
   "common.noVar": "ບໍ່ມີຕົວປ່ຽນ",
+  "common.nodeDescription": "ຄຳອະທິບາຍ",
+  "common.nodeTitle": "ຊື່ໂນດ",
   "common.notPublishedYet": "ຍັງບໍ່ໄດ້ເຜີຍແຜ່",
   "common.notRunning": "ຍັງບໍ່ໄດ້ລັນ",
   "common.onFailure": "ເມື່ອລົ້ມເຫຼວ",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "ປ້ອນ URL...",
   "nodes.note.editor.invalidUrl": "URL ບໍ່ຖືກຕ້ອງ",
   "nodes.note.editor.italic": "ຕົວອຽງ",
+  "nodes.note.editor.label": "ເນື້ອຫາບັນທຶກ",
   "nodes.note.editor.large": "ໃຫຍ່",
   "nodes.note.editor.link": "ລິ້ງ",
   "nodes.note.editor.medium": "ກາງ",
diff --git a/web/i18n/nl-NL/workflow.json b/web/i18n/nl-NL/workflow.json
index b1d4a153ee1..38c2374ad91 100644
--- a/web/i18n/nl-NL/workflow.json
+++ b/web/i18n/nl-NL/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Disconnect",
   "common.draftSaveFailed": "Opslaan van concept mislukt",
   "common.duplicate": "Duplicate",
+  "common.edgeLabel": "Verbinding van {{source}} naar {{target}}",
   "common.effectVarConfirm.content": "The variable is used in other nodes. Do you still want to remove it?",
   "common.effectVarConfirm.title": "Remove Variable",
   "common.enableJinja": "Enable Jinja template support",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "This step is not connected to anything",
   "common.needStartNode": "At least one start node must be added",
   "common.noVar": "No variable",
+  "common.nodeDescription": "Beschrijving",
+  "common.nodeTitle": "Naam van knooppunt",
   "common.notPublishedYet": "Nog niet gepubliceerd",
   "common.notRunning": "Not running yet",
   "common.onFailure": "On Failure",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Enter URL...",
   "nodes.note.editor.invalidUrl": "Invalid URL",
   "nodes.note.editor.italic": "Italic",
+  "nodes.note.editor.label": "Notitie-inhoud",
   "nodes.note.editor.large": "Large",
   "nodes.note.editor.link": "Link",
   "nodes.note.editor.medium": "Medium",
diff --git a/web/i18n/pl-PL/workflow.json b/web/i18n/pl-PL/workflow.json
index 279f5a30b20..904970b84b8 100644
--- a/web/i18n/pl-PL/workflow.json
+++ b/web/i18n/pl-PL/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Odłączyć",
   "common.draftSaveFailed": "Nie udało się zapisać wersji roboczej",
   "common.duplicate": "Duplikuj",
+  "common.edgeLabel": "Połączenie z {{source}} do {{target}}",
   "common.effectVarConfirm.content": "Zmienna jest używana w innych węzłach. Czy na pewno chcesz ją usunąć?",
   "common.effectVarConfirm.title": "Usuń zmienną",
   "common.enableJinja": "Włącz obsługę szablonów Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Ten krok nie jest połączony z niczym",
   "common.needStartNode": "Należy dodać co najmniej jeden węzeł początkowy",
   "common.noVar": "Brak zmiennej",
+  "common.nodeDescription": "Opis",
+  "common.nodeTitle": "Nazwa węzła",
   "common.notPublishedYet": "Jeszcze nie opublikowano",
   "common.notRunning": "Jeszcze nie uruchomiono",
   "common.onFailure": "W przypadku niepowodzenia",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Wpisz adres URL...",
   "nodes.note.editor.invalidUrl": "Nieprawidłowy adres URL",
   "nodes.note.editor.italic": "Kursywa",
+  "nodes.note.editor.label": "Treść notatki",
   "nodes.note.editor.large": "Duży",
   "nodes.note.editor.link": "Łącze",
   "nodes.note.editor.medium": "Średni",
diff --git a/web/i18n/pt-BR/workflow.json b/web/i18n/pt-BR/workflow.json
index c1c1f8c555c..f7e6b53a9ce 100644
--- a/web/i18n/pt-BR/workflow.json
+++ b/web/i18n/pt-BR/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Desligar",
   "common.draftSaveFailed": "Falha ao salvar o rascunho",
   "common.duplicate": "Duplicar",
+  "common.edgeLabel": "Conexão de {{source}} para {{target}}",
   "common.effectVarConfirm.content": "A variável é usada em outros nós. Você ainda deseja removê-la?",
   "common.effectVarConfirm.title": "Remover variável",
   "common.enableJinja": "Ativar suporte ao template Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Este passo não está conectado a nada",
   "common.needStartNode": "Pelo menos um nó inicial deve ser adicionado",
   "common.noVar": "Sem variável",
+  "common.nodeDescription": "Descrição",
+  "common.nodeTitle": "Nome do nó",
   "common.notPublishedYet": "Ainda não publicado",
   "common.notRunning": "Ainda não está em execução",
   "common.onFailure": "Em caso de falha",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Digite o URL...",
   "nodes.note.editor.invalidUrl": "URL inválido",
   "nodes.note.editor.italic": "Itálico",
+  "nodes.note.editor.label": "Conteúdo da nota",
   "nodes.note.editor.large": "Grande",
   "nodes.note.editor.link": "Link",
   "nodes.note.editor.medium": "Média",
diff --git a/web/i18n/ro-RO/workflow.json b/web/i18n/ro-RO/workflow.json
index 23ce473b147..98c365b5f00 100644
--- a/web/i18n/ro-RO/workflow.json
+++ b/web/i18n/ro-RO/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Deconecta",
   "common.draftSaveFailed": "Salvarea schiței a eșuat",
   "common.duplicate": "Duplică",
+  "common.edgeLabel": "Conexiune de la {{source}} la {{target}}",
   "common.effectVarConfirm.content": "Variabila este utilizată în alte noduri. Doriți să o eliminați oricum?",
   "common.effectVarConfirm.title": "Elimină variabila",
   "common.enableJinja": "Activează suportul pentru șabloane Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Acest pas nu este conectat la nimic",
   "common.needStartNode": "Trebuie adăugat cel puțin un nod de start",
   "common.noVar": "Fără variabilă",
+  "common.nodeDescription": "Descriere",
+  "common.nodeTitle": "Numele nodului",
   "common.notPublishedYet": "Nu a fost publicat încă",
   "common.notRunning": "Încă nu rulează",
   "common.onFailure": "În caz de eșec",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Introduceți adresa URL...",
   "nodes.note.editor.invalidUrl": "URL nevalidă",
   "nodes.note.editor.italic": "Cursiv",
+  "nodes.note.editor.label": "Conținutul notei",
   "nodes.note.editor.large": "Mare",
   "nodes.note.editor.link": "Legătură",
   "nodes.note.editor.medium": "Medie",
diff --git a/web/i18n/ru-RU/workflow.json b/web/i18n/ru-RU/workflow.json
index a6f67c8aa71..61f5b811898 100644
--- a/web/i18n/ru-RU/workflow.json
+++ b/web/i18n/ru-RU/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Разъединять",
   "common.draftSaveFailed": "Не удалось сохранить черновик",
   "common.duplicate": "Дублировать",
+  "common.edgeLabel": "Соединение от {{source}} к {{target}}",
   "common.effectVarConfirm.content": "Переменная используется в других узлах. Вы все еще хотите удалить ее?",
   "common.effectVarConfirm.title": "Удалить переменную",
   "common.enableJinja": "Включить поддержку шаблонов Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Этот шаг ни к чему не подключен",
   "common.needStartNode": "Необходимо добавить хотя бы один начальный узел",
   "common.noVar": "Нет переменной",
+  "common.nodeDescription": "Описание",
+  "common.nodeTitle": "Название узла",
   "common.notPublishedYet": "Ещё не опубликовано",
   "common.notRunning": "Еще не запущено",
   "common.onFailure": "О неудаче",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Введите URL...",
   "nodes.note.editor.invalidUrl": "Неверный URL",
   "nodes.note.editor.italic": "Курсив",
+  "nodes.note.editor.label": "Содержимое заметки",
   "nodes.note.editor.large": "Большой",
   "nodes.note.editor.link": "Ссылка",
   "nodes.note.editor.medium": "Средний",
diff --git a/web/i18n/sl-SI/workflow.json b/web/i18n/sl-SI/workflow.json
index deb8a2d289b..32b19157697 100644
--- a/web/i18n/sl-SI/workflow.json
+++ b/web/i18n/sl-SI/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Odklop",
   "common.draftSaveFailed": "Shranjevanje osnutka ni uspelo",
   "common.duplicate": "Podvojiti",
+  "common.edgeLabel": "Povezava od {{source}} do {{target}}",
   "common.effectVarConfirm.content": "Spremenljivka se uporablja v drugih vozliščih. Ali jo še vedno želite odstraniti?",
   "common.effectVarConfirm.title": "Odstrani spremenljivko",
   "common.enableJinja": "Omogoči podporo za Jinja predloge",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Ta korak ni povezan z ničemer.",
   "common.needStartNode": "Dodati je treba vsaj eno začetno vozlišče",
   "common.noVar": "Brez spremenljivke",
+  "common.nodeDescription": "Opis",
+  "common.nodeTitle": "Ime vozlišča",
   "common.notPublishedYet": "Še ni objavljeno",
   "common.notRunning": "Še ne teče",
   "common.onFailure": "O neuspehu",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Vnesite URL...",
   "nodes.note.editor.invalidUrl": "Nesprejemljiv URL",
   "nodes.note.editor.italic": "Italika",
+  "nodes.note.editor.label": "Vsebina opombe",
   "nodes.note.editor.large": "Velik",
   "nodes.note.editor.link": "Povezava",
   "nodes.note.editor.medium": "Srednje",
diff --git a/web/i18n/th-TH/workflow.json b/web/i18n/th-TH/workflow.json
index c918cbe062c..9c088fce9af 100644
--- a/web/i18n/th-TH/workflow.json
+++ b/web/i18n/th-TH/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "ยก เลิก",
   "common.draftSaveFailed": "บันทึกฉบับร่างไม่สำเร็จ",
   "common.duplicate": "สำเนา",
+  "common.edgeLabel": "การเชื่อมต่อจาก {{source}} ไปยัง {{target}}",
   "common.effectVarConfirm.content": "ตัวแปรนี้ใช้ในโหนดอื่น คุณยังต้องการลบออกหรือไม่?",
   "common.effectVarConfirm.title": "ลบตัวแปร",
   "common.enableJinja": "เปิดใช้งานการสนับสนุนเทมเพลต Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "ขั้นตอนนี้ไม่ได้เชื่อมต่อกับสิ่งใด",
   "common.needStartNode": "ต้องเพิ่มโหนดเริ่มต้นอย่างน้อยหนึ่งโหนด",
   "common.noVar": "ไม่มีตัวแปร",
+  "common.nodeDescription": "คำอธิบาย",
+  "common.nodeTitle": "ชื่อโหนด",
   "common.notPublishedYet": "ยังไม่ได้เผยแพร่",
   "common.notRunning": "ยังไม่ได้ทํางาน",
   "common.onFailure": "เมื่อล้มเหลว",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "ป้อน URL...",
   "nodes.note.editor.invalidUrl": "URL ไม่ถูกต้อง",
   "nodes.note.editor.italic": "ตัวเอียง",
+  "nodes.note.editor.label": "เนื้อหาบันทึก",
   "nodes.note.editor.large": "ใหญ่",
   "nodes.note.editor.link": "ลิงก์",
   "nodes.note.editor.medium": "ปานกลาง",
diff --git a/web/i18n/tr-TR/workflow.json b/web/i18n/tr-TR/workflow.json
index fb990afbee4..8a4a8611e7b 100644
--- a/web/i18n/tr-TR/workflow.json
+++ b/web/i18n/tr-TR/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Bağlantıyı Kes",
   "common.draftSaveFailed": "Taslak kaydedilemedi",
   "common.duplicate": "Çoğalt",
+  "common.edgeLabel": "{{source}} düğümünden {{target}} düğümüne bağlantı",
   "common.effectVarConfirm.content": "Değişken diğer düğümlerde kullanılıyor. Yine de kaldırmak istiyor musunuz?",
   "common.effectVarConfirm.title": "Değişkeni Kaldır",
   "common.enableJinja": "Jinja şablon desteğini etkinleştir",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Bu adım hiçbir şeye bağlı değil",
   "common.needStartNode": "En az bir başlangıç düğümü eklenmelidir",
   "common.noVar": "Değişken yok",
+  "common.nodeDescription": "Açıklama",
+  "common.nodeTitle": "Düğüm adı",
   "common.notPublishedYet": "Henüz yayınlanmadı",
   "common.notRunning": "Henüz çalıştırılmadı",
   "common.onFailure": "Başarısızlık Üzerine",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "URL girin...",
   "nodes.note.editor.invalidUrl": "Geçersiz URL",
   "nodes.note.editor.italic": "İtalik",
+  "nodes.note.editor.label": "Not içeriği",
   "nodes.note.editor.large": "Büyük",
   "nodes.note.editor.link": "Bağlantı",
   "nodes.note.editor.medium": "Orta",
diff --git a/web/i18n/uk-UA/workflow.json b/web/i18n/uk-UA/workflow.json
index 7e35bc37696..daa116b7e00 100644
--- a/web/i18n/uk-UA/workflow.json
+++ b/web/i18n/uk-UA/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Відключити",
   "common.draftSaveFailed": "Не вдалося зберегти чернетку",
   "common.duplicate": "Дублювати",
+  "common.edgeLabel": "З’єднання від {{source}} до {{target}}",
   "common.effectVarConfirm.content": "Змінна використовується в інших вузлах. Ви все ще хочете її видалити?",
   "common.effectVarConfirm.title": "Видалити змінну",
   "common.enableJinja": "Увімкнути підтримку шаблонів Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Цей крок ні до чого не підключений",
   "common.needStartNode": "Потрібно додати щонайменше один початковий вузол",
   "common.noVar": "Без змінної",
+  "common.nodeDescription": "Опис",
+  "common.nodeTitle": "Назва вузла",
   "common.notPublishedYet": "Ще не опубліковано",
   "common.notRunning": "Ще не запущено",
   "common.onFailure": "Про невдачу",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Введіть URL-адресу...",
   "nodes.note.editor.invalidUrl": "Невірна URL-адреса",
   "nodes.note.editor.italic": "Курсив",
+  "nodes.note.editor.label": "Вміст нотатки",
   "nodes.note.editor.large": "Великий",
   "nodes.note.editor.link": "Посилання",
   "nodes.note.editor.medium": "Середнє",
diff --git a/web/i18n/vi-VN/workflow.json b/web/i18n/vi-VN/workflow.json
index 1402de0633e..5aceab1d3c0 100644
--- a/web/i18n/vi-VN/workflow.json
+++ b/web/i18n/vi-VN/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "Ngắt kết nối",
   "common.draftSaveFailed": "Lưu bản nháp thất bại",
   "common.duplicate": "Nhân bản",
+  "common.edgeLabel": "Kết nối từ {{source}} đến {{target}}",
   "common.effectVarConfirm.content": "Biến được sử dụng trong các nút khác. Bạn có chắc chắn muốn xóa nó không?",
   "common.effectVarConfirm.title": "Xóa biến",
   "common.enableJinja": "Bật hỗ trợ mẫu Jinja",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "Bước này không được kết nối với bất kỳ điều gì",
   "common.needStartNode": "Phải thêm ít nhất một nút bắt đầu",
   "common.noVar": "Không có biến",
+  "common.nodeDescription": "Mô tả",
+  "common.nodeTitle": "Tên nút",
   "common.notPublishedYet": "Chưa xuất bản",
   "common.notRunning": "Chưa chạy",
   "common.onFailure": "Khi thất bại",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "Nhập URL...",
   "nodes.note.editor.invalidUrl": "URL không hợp lệ",
   "nodes.note.editor.italic": "Nghiêng",
+  "nodes.note.editor.label": "Nội dung ghi chú",
   "nodes.note.editor.large": "Lớn",
   "nodes.note.editor.link": "Liên kết",
   "nodes.note.editor.medium": "Đau vừa",
diff --git a/web/i18n/zh-Hans/workflow.json b/web/i18n/zh-Hans/workflow.json
index baf5976a9fc..d952292f1f4 100644
--- a/web/i18n/zh-Hans/workflow.json
+++ b/web/i18n/zh-Hans/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "断开连接",
   "common.draftSaveFailed": "草稿保存失败",
   "common.duplicate": "复制",
+  "common.edgeLabel": "从 {{source}} 到 {{target}} 的连线",
   "common.effectVarConfirm.content": "该变量在其他节点中使用。您是否仍要删除它？",
   "common.effectVarConfirm.title": "移除变量",
   "common.enableJinja": "开启支持 Jinja 模板",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "此节点尚未连接到其他节点",
   "common.needStartNode": "必须添加至少一个开始节点",
   "common.noVar": "没有变量",
+  "common.nodeDescription": "描述",
+  "common.nodeTitle": "节点名称",
   "common.notPublishedYet": "尚未发布",
   "common.notRunning": "尚未运行",
   "common.onFailure": "异常时",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "输入链接...",
   "nodes.note.editor.invalidUrl": "无效的链接",
   "nodes.note.editor.italic": "斜体",
+  "nodes.note.editor.label": "便签内容",
   "nodes.note.editor.large": "大",
   "nodes.note.editor.link": "链接",
   "nodes.note.editor.medium": "中",
diff --git a/web/i18n/zh-Hant/workflow.json b/web/i18n/zh-Hant/workflow.json
index 7723e5e23a6..dbf76924d45 100644
--- a/web/i18n/zh-Hant/workflow.json
+++ b/web/i18n/zh-Hant/workflow.json
@@ -170,6 +170,7 @@
   "common.disconnect": "斷開",
   "common.draftSaveFailed": "草稿儲存失敗",
   "common.duplicate": "複製",
+  "common.edgeLabel": "從 {{source}} 到 {{target}} 的連線",
   "common.effectVarConfirm.content": "該變數在其他節點中使用。您是否仍要刪除它？",
   "common.effectVarConfirm.title": "移除變數",
   "common.enableJinja": "開啟支持 Jinja 模板",
@@ -207,6 +208,8 @@
   "common.needConnectTip": "此節點尚未連接到其他節點",
   "common.needStartNode": "至少必須新增一個起始節點",
   "common.noVar": "沒有變數",
+  "common.nodeDescription": "描述",
+  "common.nodeTitle": "節點名稱",
   "common.notPublishedYet": "尚未發佈",
   "common.notRunning": "尚未運行",
   "common.onFailure": "失敗時",
@@ -827,6 +830,7 @@
   "nodes.note.editor.enterUrl": "輸入網址...",
   "nodes.note.editor.invalidUrl": "URL 無效",
   "nodes.note.editor.italic": "斜體的",
+  "nodes.note.editor.label": "便箋內容",
   "nodes.note.editor.large": "大",
   "nodes.note.editor.link": "連結",
   "nodes.note.editor.medium": "中等",

From 3d7f6f449683c68ab521040a42853a2372917588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E7=8E=AE=20=28Jade=20Lin=29?=
 <linw1995@icloud.com>
Date: Thu, 17 Sep 2026 07:28:18 +0000
Subject: [PATCH 25/28] feat(agent): import roster packages through App routes
 (#42189)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 api/controllers/console/app/app.py            |  29 +-
 api/controllers/console/app/app_import.py     |  87 +-
 .../create_installed_app_when_app_created.py  |  21 +-
 .../create_site_record_when_app_created.py    |  20 +-
 api/openapi/markdown/console-openapi.md       |  20 +-
 api/services/agent/composer_validator.py      |   8 +
 api/services/agent/dsl_service.py             |   6 +-
 api/services/agent/errors.py                  |  18 +
 .../agent/roster_package_dependencies.py      |  40 +
 api/services/agent/roster_package_importer.py | 434 ++++++++++
 api/services/app_creation_records.py          |  45 +
 api/services/app_service.py                   |  33 +-
 .../commands/test_generate_swagger_specs.py   |  18 +
 .../console/app/test_app_import_api.py        |  10 +-
 .../console/app/test_roster_package_routes.py | 157 ++++
 .../events/test_app_event_signals.py          |  25 +-
 .../services/agent/test_agent_dsl_service.py  |   8 +-
 .../agent/test_roster_package_importer.py     | 817 ++++++++++++++++++
 .../agent/test_roster_package_service.py      |  16 +-
 packages/contracts/binary-zod.test.ts         |  20 +
 .../generated/api/console/apps/types.gen.ts   |  19 +-
 .../generated/api/console/apps/zod.gen.ts     |  23 +-
 packages/contracts/openapi-ts.api.config.ts   |  50 +-
 .../app/__tests__/use-export-app-dsl.spec.tsx |  27 +
 .../__tests__/index.spec.tsx                  |  57 ++
 .../app/create-from-dsl-modal/index.tsx       |  15 +-
 web/app/components/app/use-export-app-dsl.ts  |  13 +-
 .../hooks/__tests__/use-dsl-drag-drop.spec.ts |  33 +-
 .../apps/hooks/use-dsl-drag-drop.ts           |   3 +-
 web/service/console/client.spec.ts            |  55 ++
 web/service/console/query-policies.ts         |   2 +-
 31 files changed, 2029 insertions(+), 100 deletions(-)
 create mode 100644 api/services/agent/roster_package_dependencies.py
 create mode 100644 api/services/agent/roster_package_importer.py
 create mode 100644 api/services/app_creation_records.py
 create mode 100644 api/tests/unit_tests/controllers/console/app/test_roster_package_routes.py
 create mode 100644 api/tests/unit_tests/services/agent/test_roster_package_importer.py

diff --git a/api/controllers/console/app/app.py b/api/controllers/console/app/app.py
index ad6961ef074..28baa5b01a5 100644
--- a/api/controllers/console/app/app.py
+++ b/api/controllers/console/app/app.py
@@ -4,6 +4,7 @@ from collections.abc import Sequence
 from datetime import datetime
 from typing import Any, Literal
 
+from flask import send_file
 from flask_restx import Resource
 from pydantic import AliasChoices, BaseModel, Field, ValidationInfo, computed_field, field_validator, model_validator
 from sqlalchemy import select
@@ -47,10 +48,12 @@ from extensions.ext_application_services import application_services
 from extensions.ext_database import db
 from fields.base import ResponseModel
 from graphon.enums import WorkflowExecutionStatus
+from libs.flask_restx_compat import BINARY_RESPONSE_MEDIA_TYPES_VENDOR_KEY
 from libs.helper import build_icon_url, dump_response, to_timestamp
 from libs.login import login_required
 from models import Account, App, DatasetPermissionEnum, Workflow
-from models.model import IconType
+from models.model import AppMode, IconType
+from services.agent.roster_package_exporter import RosterAgentPackageExporter
 from services.app_dsl_service import AppDslService
 from services.app_service import (
     AppListParams,
@@ -180,6 +183,9 @@ class CopyAppPayload(BaseModel):
 
 
 class AppExportQuery(BaseModel):
+    format: Literal["yaml", "ifpkg"] | None = Field(
+        default=None, description="Export format; defaults to ifpkg for Agent Apps and yaml for other Apps"
+    )
     include_secret: bool = Field(default=False, description="Include secrets in export")
     workflow_id: str | None = Field(default=None, description="Specific workflow ID to export")
 
@@ -1027,6 +1033,10 @@ class AppExportApi(Resource):
     @console_ns.doc(description="Export application configuration as DSL")
     @console_ns.doc(params={"app_id": "Application ID to export"})
     @console_ns.doc(params=query_params_from_model(AppExportQuery))
+    @console_ns.doc(
+        produces=["application/json", "application/zip"],
+        vendor={BINARY_RESPONSE_MEDIA_TYPES_VENDOR_KEY: ["application/zip"]},
+    )
     @console_ns.response(200, "App exported successfully", console_ns.models[AppExportResponse.__name__])
     @console_ns.response(403, "Insufficient permissions")
     @setup_required
@@ -1042,6 +1052,23 @@ class AppExportApi(Resource):
     def get(self, req_data: AppExportQuery, app_model: App):
         """Export app"""
 
+        if req_data.format == "ifpkg" or (req_data.format is None and app_model.mode == AppMode.AGENT):
+            if app_model.mode != AppMode.AGENT:
+                raise BadRequest("The ifpkg format is only available for Agent Apps")
+            agent_id = app_model.bound_agent_id_with_session(session=db.session())
+            if agent_id is None:
+                raise NotFound("Agent not found")
+            exported = RosterAgentPackageExporter().export(tenant_id=app_model.tenant_id, agent_id=agent_id)
+            try:
+                archive_response = send_file(
+                    exported.archive, mimetype="application/zip", as_attachment=True, download_name=exported.filename
+                )
+            except Exception:
+                exported.close()
+                raise
+            archive_response.call_on_close(exported.close)
+            return archive_response
+
         response = AppExportResponse(
             data=AppDslService.export_dsl(
                 app_model=app_model,
diff --git a/api/controllers/console/app/app_import.py b/api/controllers/console/app/app_import.py
index 18de98f8d9a..4872947b4dd 100644
--- a/api/controllers/console/app/app_import.py
+++ b/api/controllers/console/app/app_import.py
@@ -1,3 +1,7 @@
+from typing import BinaryIO, Literal, cast
+from uuid import uuid4
+
+from flask import request
 from flask_restx import Resource
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import Session
@@ -5,23 +9,27 @@ from werkzeug.exceptions import Forbidden
 
 from configs import dify_config
 from controllers.common.rbac import PlainApp, RBACCheck, Workspace
-from controllers.common.schema import register_enum_models, register_schema_models
+from controllers.common.schema import register_enum_models, register_response_schema_models, register_schema_models
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import (
     RBACPermission,
     account_initialization_required,
     cloud_edition_billing_resource_check,
     edit_permission_required,
-    model_validate,
     rbac_permission_required,
     setup_required,
+    validate_request,
     with_current_user,
 )
+from core.plugin.entities.plugin import PluginDependency
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
+from fields.base import ResponseModel
 from libs.login import current_account_with_tenant, login_required
 from models.account import Account
-from models.model import App
+from models.model import App, AppMode
+from services.agent.errors import InvalidRosterAgentPackageError
+from services.agent.roster_package_importer import RosterAgentPackageImporter
 from services.app_dsl_service import (
     IMPORT_INFO_REDIS_KEY_PREFIX,
     AppDslService,
@@ -49,8 +57,16 @@ class AppImportPayload(BaseModel):
     app_id: str | None = Field(None)
 
 
+class RosterAgentPackageConflictResponse(ResponseModel):
+    code: str
+    message: str
+    status: Literal[409] = 409
+    leaked_dependencies: list[PluginDependency] = Field(default_factory=list)
+
+
 register_enum_models(console_ns, ImportStatus)
 register_schema_models(console_ns, AppImportPayload, Import, CheckDependenciesResult)
+register_response_schema_models(console_ns, RosterAgentPackageConflictResponse)
 
 
 def _current_user_and_tenant_id(current_user: Account | None) -> tuple[Account, str | None]:
@@ -73,19 +89,74 @@ def _current_user_and_tenant_id(current_user: Account | None) -> tuple[Account,
 
 @console_ns.route("/apps/imports")
 class AppImportApi(Resource):
-    @console_ns.expect(console_ns.models[AppImportPayload.__name__])
+    @console_ns.doc(
+        params={
+            "payload": {
+                "required": True,
+                "content": {
+                    "application/json": {"schema": {"$ref": "#/definitions/AppImportPayload"}},
+                    "multipart/form-data": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "file": {
+                                    "type": "string",
+                                    "format": "binary",
+                                    "description": "Roster Agent .ifpkg archive",
+                                }
+                            },
+                            "required": ["file"],
+                        }
+                    },
+                },
+            }
+        },
+    )
     @console_ns.response(200, "Import completed", console_ns.models[Import.__name__])
     @console_ns.response(202, "Import pending confirmation", console_ns.models[Import.__name__])
     @console_ns.response(400, "Import failed", console_ns.models[Import.__name__])
+    @console_ns.response(403, "Insufficient import or plugin installation permissions")
+    @console_ns.response(
+        409, "Agent name conflict or missing plugins", console_ns.models[RosterAgentPackageConflictResponse.__name__]
+    )
+    @console_ns.response(413, "Roster Agent package exceeds the size limit")
     @setup_required
     @login_required
     @account_initialization_required
-    @cloud_edition_billing_resource_check("apps")
     @edit_permission_required
-    @rbac_permission_required(RBACCheck(RBACPermission.APP_IMPORT_EXPORT_DSL, Workspace()))
     @with_current_user
-    @model_validate(AppImportPayload)
-    def post(self, req_data: AppImportPayload, current_user: Account | None = None):
+    def post(self, current_user: Account):
+        if request.mimetype == "multipart/form-data":
+            return self._import_package(current_user)
+        return self._import_dsl(validate_request(AppImportPayload), current_user)
+
+    @rbac_permission_required(RBACCheck(RBACPermission.AGENT_CREATE, Workspace()))
+    @rbac_permission_required(RBACCheck(RBACPermission.AGENT_IMPORT_EXPORT_DSL, Workspace()))
+    def _import_package(self, current_user: Account):
+        uploaded = request.files.get("file")
+        if uploaded is None or not uploaded.filename:
+            raise InvalidRosterAgentPackageError("Roster Agent package file is required")
+        if not uploaded.filename.lower().endswith(".ifpkg"):
+            raise InvalidRosterAgentPackageError("Roster Agent package file must use the .ifpkg extension")
+        if request.form.get("app_id"):
+            raise InvalidRosterAgentPackageError("Roster Agent package import does not support overwriting an App")
+        account, tenant_id = _current_user_and_tenant_id(current_user)
+        if tenant_id is None:
+            raise Forbidden("Current workspace is required")
+        result = RosterAgentPackageImporter().import_package(
+            source=cast(BinaryIO, uploaded.stream), tenant_id=tenant_id, account=account
+        )
+        return Import(
+            id=str(uuid4()),
+            status=ImportStatus.COMPLETED_WITH_WARNINGS if result.warnings else ImportStatus.COMPLETED,
+            app_id=result.app_id,
+            app_mode=AppMode.AGENT,
+            warnings=result.warnings,
+        ).model_dump(mode="json"), 200
+
+    @cloud_edition_billing_resource_check("apps")
+    @rbac_permission_required(RBACCheck(RBACPermission.APP_IMPORT_EXPORT_DSL, Workspace()))
+    def _import_dsl(self, req_data: AppImportPayload, current_user: Account | None = None):
         current_user = current_user if current_user is not None else _current_user_and_tenant_id(None)[0]
 
         # AppDslService performs internal commits for some creation paths, so use a plain
diff --git a/api/events/event_handlers/create_installed_app_when_app_created.py b/api/events/event_handlers/create_installed_app_when_app_created.py
index 2e49c81e415..672ce6b7956 100644
--- a/api/events/event_handlers/create_installed_app_when_app_created.py
+++ b/api/events/event_handlers/create_installed_app_when_app_created.py
@@ -1,24 +1,13 @@
-from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from events.app_event import app_was_created
-from models.model import InstalledApp
+from services.app_creation_records import create_installed_app_record
 
 
 @app_was_created.connect
-def handle(sender, *, session: Session, **_kwargs) -> None:
+def handle(sender, *, session: Session, **kwargs) -> None:
     """Create an installed app when an app is created."""
-    app = sender
-    installed_app_id = session.scalar(
-        select(InstalledApp.id).where(InstalledApp.tenant_id == app.tenant_id, InstalledApp.app_id == app.id).limit(1)
-    )
-    if installed_app_id:
+    if kwargs.get("created_records_initialized"):
         return
-
-    installed_app = InstalledApp(
-        tenant_id=app.tenant_id,
-        app_id=app.id,
-        app_owner_tenant_id=app.tenant_id,
-    )
-    session.add(installed_app)
-    session.flush()
+    app = sender
+    create_installed_app_record(app=app, session=session)
diff --git a/api/events/event_handlers/create_site_record_when_app_created.py b/api/events/event_handlers/create_site_record_when_app_created.py
index 69149543fd7..9b9b0450adf 100644
--- a/api/events/event_handlers/create_site_record_when_app_created.py
+++ b/api/events/event_handlers/create_site_record_when_app_created.py
@@ -1,27 +1,15 @@
 from sqlalchemy.orm import Session
 
 from events.app_event import app_was_created
-from models.enums import CustomizeTokenStrategy
-from models.model import Site
+from services.app_creation_records import create_site_record
 
 
 @app_was_created.connect
 def handle(sender, *, session: Session, **kwargs) -> None:
     """Create site record when an app is created."""
+    if kwargs.get("created_records_initialized"):
+        return
     app = sender
     account = kwargs.get("account")
     if account is not None:
-        site = Site(
-            app_id=app.id,
-            title=app.name,
-            icon_type=app.icon_type,
-            icon=app.icon,
-            icon_background=app.icon_background,
-            default_language=account.interface_language,
-            customize_token_strategy=CustomizeTokenStrategy.NOT_ALLOW,
-            code=Site.generate_code(16, session=session),
-            created_by=app.created_by,
-            updated_by=app.updated_by,
-        )
-        session.add(site)
-        session.flush()
+        create_site_record(app=app, account=account, session=session)
diff --git a/api/openapi/markdown/console-openapi.md b/api/openapi/markdown/console-openapi.md
index 4fcfd3383e4..3cda6c6e435 100644
--- a/api/openapi/markdown/console-openapi.md
+++ b/api/openapi/markdown/console-openapi.md
@@ -1502,7 +1502,7 @@ Create a new application
 
 | Required | Schema |
 | -------- | ------ |
-|  Yes | **application/json**: [AppImportPayload](#appimportpayload)<br> |
+|  Yes | **application/json**: [AppImportPayload](#appimportpayload)<br>**multipart/form-data**: { **"file"**: binary }<br> | **application/json**: [AppImportPayload](#appimportpayload)<br>**multipart/form-data**: { **"file"**: binary }<br> |
 
 #### Responses
 
@@ -1511,6 +1511,9 @@ Create a new application
 | 200 | Import completed | **application/json**: [Import](#import)<br> |
 | 202 | Import pending confirmation | **application/json**: [Import](#import)<br> |
 | 400 | Import failed | **application/json**: [Import](#import)<br> |
+| 403 | Insufficient import or plugin installation permissions |  |
+| 409 | Agent name conflict or missing plugins | **application/json**: [RosterAgentPackageConflictResponse](#rosteragentpackageconflictresponse)<br> |
+| 413 | Roster Agent package exceeds the size limit |  |
 
 ### [GET] /apps/imports/{app_id}/check-dependencies
 #### Parameters
@@ -2670,6 +2673,7 @@ Export application configuration as DSL
 | Name | Located in | Description | Required | Schema |
 | ---- | ---------- | ----------- | -------- | ------ |
 | app_id | path | Application ID to export | Yes | string (uuid) |
+| format | query | Export format; defaults to ifpkg for Agent Apps and yaml for other Apps | No | string, <br>**Available values:** "ifpkg", "yaml" |
 | include_secret | query | Include secrets in export | No | boolean |
 | workflow_id | query | Specific workflow ID to export | No | string |
 
@@ -2677,8 +2681,8 @@ Export application configuration as DSL
 
 | Code | Description | Schema |
 | ---- | ----------- | ------ |
-| 200 | App exported successfully | **application/json**: [AppExportResponse](#appexportresponse)<br> |
-| 403 | Insufficient permissions |  |
+| 200 | App exported successfully | **application/json**: [AppExportResponse](#appexportresponse)<br>**application/zip**: binary<br> |
+| 403 | Insufficient permissions | **application/zip**: binary<br> |
 
 ### [POST] /apps/{app_id}/feedbacks
 Create or update message feedback (like/dislike)
@@ -15774,6 +15778,7 @@ This class is used to store the schema information of an api based tool.
 
 | Name | Type | Description | Required |
 | ---- | ---- | ----------- | -------- |
+| format | string, <br>**Available values:** "ifpkg", "yaml" | Export format; defaults to ifpkg for Agent Apps and yaml for other Apps | No |
 | include_secret | boolean | Include secrets in export | No |
 | workflow_id | string | Specific workflow ID to export | No |
 
@@ -21724,6 +21729,15 @@ Resource types understood by access policies.
 | ---- | ---- | ----------- | -------- |
 | data | [ [AccessPolicyRoleBinding](#accesspolicyrolebinding) ] |  | No |
 
+#### RosterAgentPackageConflictResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string |  | Yes |
+| leaked_dependencies | [ [PluginDependency](#plugindependency) ] |  | No |
+| message | string |  | Yes |
+| status | integer, <br>**Default:** 409 |  | No |
+
 #### RosterListQuery
 
 | Name | Type | Description | Required |
diff --git a/api/services/agent/composer_validator.py b/api/services/agent/composer_validator.py
index ea1ae673b81..5ce4c44db3f 100644
--- a/api/services/agent/composer_validator.py
+++ b/api/services/agent/composer_validator.py
@@ -234,6 +234,14 @@ class ComposerConfigValidator:
         cls._reject_plaintext_secrets(dumped, path="agent_soul")
         cls._validate_shell_config(dumped)
 
+    @classmethod
+    def validate_importable_agent_soul(cls, agent_soul: AgentSoulConfig) -> None:
+        """Validate persisted draft safety without requiring all assets to be publishable."""
+
+        dumped = agent_soul.model_dump(mode="json")
+        cls._reject_plaintext_secrets(dumped, path="agent_soul")
+        cls._validate_shell_config(dumped)
+
     @staticmethod
     def _reject_missing_config_assets(agent_soul: AgentSoulConfig) -> None:
         missing = [f"skill:{item.name}" for item in agent_soul.config_skills if item.is_missing]
diff --git a/api/services/agent/dsl_service.py b/api/services/agent/dsl_service.py
index 4d56783296c..a03f25ef14d 100644
--- a/api/services/agent/dsl_service.py
+++ b/api/services/agent/dsl_service.py
@@ -198,7 +198,7 @@ class AgentDslService:
     ) -> AgentPackageImportResult:
         """Create the imported backing Agent and its editable unpublished draft."""
 
-        soul, warnings = self._resolve_package_soul(
+        soul, warnings = self.resolve_package_soul(
             tenant_id=app.tenant_id,
             package=package,
             package_path="agent",
@@ -483,7 +483,7 @@ class AgentDslService:
         package: AgentPackage,
         package_path: str,
     ) -> AgentPackageImportResult:
-        soul, warnings = self._resolve_package_soul(
+        soul, warnings = self.resolve_package_soul(
             tenant_id=workflow.tenant_id,
             package=package,
             package_path=package_path,
@@ -561,7 +561,7 @@ class AgentDslService:
         self.session.flush()
         return agent, snapshot
 
-    def _resolve_package_soul(
+    def resolve_package_soul(
         self,
         *,
         tenant_id: str,
diff --git a/api/services/agent/errors.py b/api/services/agent/errors.py
index cda2656c197..9534930b223 100644
--- a/api/services/agent/errors.py
+++ b/api/services/agent/errors.py
@@ -71,6 +71,24 @@ class RosterAgentPackageExportFailedError(BaseHTTPException):
     code = 500
 
 
+class RosterAgentPackageImportFailedError(BaseHTTPException):
+    error_code = "roster_agent_package_import_failed"
+    description = "The Roster Agent package could not be imported."
+    code = 500
+
+
+class RosterAgentPackageDependenciesMissingError(BaseHTTPException):
+    error_code = "roster_agent_package_dependencies_missing"
+    description = "Install the missing plugins before importing the Roster Agent package."
+    code = 409
+
+
+class RosterAgentPackageResourceUnavailableError(BaseHTTPException):
+    error_code = "roster_agent_package_resource_unavailable"
+    description = "The Roster Agent package resources could not be stored."
+    code = 503
+
+
 class AgentSoulLockedError(BadRequest):
     description = "Agent Soul is locked for this workflow node."
 
diff --git a/api/services/agent/roster_package_dependencies.py b/api/services/agent/roster_package_dependencies.py
new file mode 100644
index 00000000000..a571d224e4b
--- /dev/null
+++ b/api/services/agent/roster_package_dependencies.py
@@ -0,0 +1,40 @@
+"""Preflight plugin availability and installation permission for package imports."""
+
+from werkzeug.exceptions import Forbidden
+
+from configs import dify_config
+from core.db.session_factory import session_factory
+from core.plugin.entities.plugin import PluginDependency
+from core.rbac import RBACPermission
+from models import Account
+from models.account import TenantPluginInstallPermission
+from services.agent.errors import RosterAgentPackageDependenciesMissingError
+from services.enterprise.rbac_service import RBACService
+from services.plugin.dependencies_analysis import DependenciesAnalysisService
+from services.plugin.plugin_permission_service import PluginPermissionService
+
+
+def check_package_dependencies(*, tenant_id: str, account: Account, dependencies: list[PluginDependency]) -> None:
+    if not dependencies:
+        return
+    missing = DependenciesAnalysisService.get_leaked_dependencies(tenant_id=tenant_id, dependencies=dependencies)
+    if not missing:
+        return
+    if dify_config.RBAC_ENABLED:
+        allowed = RBACService.CheckAccess.check(
+            tenant_id, account.id, scene=RBACPermission.PLUGIN_INSTALL, resource_type=None, resource_id=None
+        )
+        if not allowed:
+            raise Forbidden("Plugin installation permission is required to import this Agent package")
+    else:
+        with session_factory.create_session() as session:
+            permission = PluginPermissionService.get_permission(tenant_id, session=session)
+            install_permission = permission.install_permission if permission is not None else None
+        if install_permission == TenantPluginInstallPermission.NOBODY or (
+            install_permission == TenantPluginInstallPermission.ADMINS and not account.is_admin_or_owner
+        ):
+            raise Forbidden("Plugin installation permission is required to import this Agent package")
+    error = RosterAgentPackageDependenciesMissingError()
+    assert error.data is not None
+    error.data["leaked_dependencies"] = [item.model_dump(mode="json") for item in missing]
+    raise error
diff --git a/api/services/agent/roster_package_importer.py b/api/services/agent/roster_package_importer.py
new file mode 100644
index 00000000000..bdc9bfe7b5b
--- /dev/null
+++ b/api/services/agent/roster_package_importer.py
@@ -0,0 +1,434 @@
+"""Materialize validated Roster Agent packages into a new Agent App."""
+
+from __future__ import annotations
+
+import hashlib
+import logging
+import os
+from dataclasses import dataclass
+from typing import BinaryIO, Protocol
+from uuid import uuid4
+
+from sqlalchemy import select, update
+from sqlalchemy.exc import IntegrityError
+
+from configs import dify_config
+from constants.model_template import default_app_templates
+from core.db.session_factory import session_factory
+from extensions.ext_storage import storage
+from extensions.storage.storage_type import StorageType
+from libs.datetime_utils import naive_utc_now
+from models import Account
+from models.agent import (
+    Agent,
+    AgentConfigDraft,
+    AgentConfigDraftType,
+    AgentConfigRevisionOperation,
+    AgentConfigSnapshot,
+    AgentScope,
+    AgentSource,
+    AgentStatus,
+)
+from models.agent_config_entities import AgentSoulConfig
+from models.enums import CreatorUserRole
+from models.model import App, AppMode, AppModelConfig, UploadFile
+from models.tools import ToolFile
+from services.agent.composer_validator import ComposerConfigValidator
+from services.agent.dsl_entities import AgentPackage, AgentPackageMetadata, make_portable_agent_soul
+from services.agent.dsl_service import AgentDslService
+from services.agent.errors import (
+    AgentNameConflictError,
+    InvalidComposerConfigError,
+    InvalidRosterAgentPackageError,
+    PlaintextSecretNotAllowedError,
+    RosterAgentPackageImportFailedError,
+    RosterAgentPackageResourceUnavailableError,
+    RosterAgentPackageTooLargeError,
+)
+from services.agent.roster_package_dependencies import check_package_dependencies
+from services.agent.roster_package_entities import PreparedRosterAgentPackage
+from services.agent.roster_package_reader import RosterAgentPackageReader
+from services.agent.roster_service import AgentRosterService
+from services.agent.skill_package_service import SkillPackageError, SkillPackageService
+from services.app_creation_records import create_installed_app_record, create_site_record
+from services.app_service import AppService
+from services.entities.dsl_entities import DslImportWarning
+from services.file_service import FileService
+from services.icon_configuration import DEFAULT_ICON, DEFAULT_ICON_BACKGROUND, DEFAULT_ICON_TYPE
+
+logger = logging.getLogger(__name__)
+
+
+class _Storage(Protocol):
+    def save(self, filename: str, data: bytes) -> None: ...
+
+
+@dataclass(frozen=True)
+class RosterAgentPackageImportResult:
+    app_id: str
+    agent_id: str
+    warnings: list[DslImportWarning]
+
+
+class RosterAgentPackageImporter:
+    """Commit uploaded file records before creating the Agent in a separate transaction."""
+
+    def __init__(
+        self,
+        *,
+        storage_backend: _Storage = storage,
+    ) -> None:
+        self._reader = RosterAgentPackageReader()
+        self._skill_packages = SkillPackageService()
+        self._storage = storage_backend
+
+    def import_package(
+        self,
+        *,
+        source: BinaryIO,
+        tenant_id: str,
+        account: Account,
+    ) -> RosterAgentPackageImportResult:
+        with self._reader.read(source) as package:
+            if len(package.apps) != 1:
+                raise InvalidRosterAgentPackageError("Import requires exactly one Agent App")
+            app_dsl = next(iter(package.apps.values()))
+            agent_package = app_dsl.package
+            agent_package.soul = make_portable_agent_soul(agent_package.soul)
+            self._validate_supported_resources(package, soul=agent_package.soul)
+            try:
+                ComposerConfigValidator.validate_importable_agent_soul(agent_package.soul)
+            except (InvalidComposerConfigError, PlaintextSecretNotAllowedError) as exc:
+                raise InvalidRosterAgentPackageError("Roster Agent package Soul is invalid") from exc
+
+            check_package_dependencies(tenant_id=tenant_id, account=account, dependencies=app_dsl.dependencies)
+            try:
+                self._ensure_name_available(tenant_id=tenant_id, name=agent_package.metadata.name)
+                soul, skill_warnings = self._upload_resources(
+                    package=package,
+                    agent_package=agent_package,
+                    tenant_id=tenant_id,
+                    account_id=account.id,
+                )
+                with session_factory.create_session() as session:
+                    resolved_soul, warnings = AgentDslService(session).resolve_package_soul(
+                        tenant_id=tenant_id,
+                        package=AgentPackage(metadata=agent_package.metadata, soul=soul),
+                        package_path="agent",
+                    )
+                warnings = [*skill_warnings, *warnings]
+                app_id, agent_id = self._persist_import(
+                    tenant_id=tenant_id,
+                    account=account,
+                    metadata=agent_package.metadata,
+                    soul=resolved_soul,
+                )
+            except Exception as exc:
+                if isinstance(exc, IntegrityError) and "roster_unique_name" in str(exc):
+                    raise AgentNameConflictError() from exc
+                if isinstance(
+                    exc,
+                    (
+                        AgentNameConflictError,
+                        InvalidRosterAgentPackageError,
+                        RosterAgentPackageTooLargeError,
+                        RosterAgentPackageResourceUnavailableError,
+                    ),
+                ):
+                    raise
+                raise RosterAgentPackageImportFailedError() from exc
+
+            try:
+                self._finalize_app(app_id=app_id, agent_id=agent_id, tenant_id=tenant_id, account=account)
+            except Exception:
+                logger.warning(
+                    "Imported Agent App post-commit initialization failed: tenant_id=%s app_id=%s",
+                    tenant_id,
+                    app_id,
+                    exc_info=True,
+                )
+            return RosterAgentPackageImportResult(app_id=app_id, agent_id=agent_id, warnings=warnings)
+
+    @classmethod
+    def _validate_supported_resources(cls, package: PreparedRosterAgentPackage, *, soul: AgentSoulConfig) -> None:
+        skill_names = [item.name for item in soul.config_skills]
+        skill_names.extend(item.name for item in package.manifest.skills if item.scope == "workspace")
+        if len(skill_names) != len(set(skill_names)):
+            raise InvalidRosterAgentPackageError("Roster Agent package contains duplicate effective Skill names")
+        file_names = [item.name for item in soul.config_files]
+        if len(file_names) != len(set(file_names)):
+            raise InvalidRosterAgentPackageError("Roster Agent package contains duplicate config file names")
+        file_refs = {item.file_id: item for item in soul.config_files if not item.is_missing}
+        for resource in package.manifest.files:
+            filename = file_refs[resource.id].name
+            extension = cls._extension(filename)
+            limit = FileService.file_size_limit(extension=extension)
+            if resource.size > limit:
+                raise InvalidRosterAgentPackageError(
+                    f"Roster Agent package file {filename!r} exceeds its file size limit"
+                )
+            if extension and extension in dify_config.UPLOAD_FILE_EXTENSION_BLACKLIST:
+                raise InvalidRosterAgentPackageError(
+                    f"Roster Agent package file extension '.{extension}' is not allowed"
+                )
+
+    @staticmethod
+    def _ensure_name_available(*, tenant_id: str, name: str) -> None:
+        with session_factory.create_session() as session:
+            exists = session.scalar(
+                select(Agent.id)
+                .where(
+                    Agent.tenant_id == tenant_id,
+                    Agent.scope == AgentScope.ROSTER,
+                    Agent.status == AgentStatus.ACTIVE,
+                    Agent.name == name,
+                )
+                .limit(1)
+            )
+        if exists is not None:
+            raise AgentNameConflictError()
+
+    def _upload_resources(
+        self,
+        *,
+        package: PreparedRosterAgentPackage,
+        agent_package: AgentPackage,
+        tenant_id: str,
+        account_id: str,
+    ) -> tuple[AgentSoulConfig, list[DslImportWarning]]:
+        """Upload outside database transactions, then commit all file records together."""
+        files: list[ToolFile | UploadFile] = []
+        warnings: list[DslImportWarning] = []
+        soul_data = agent_package.soul.model_dump(mode="json")
+        skill_refs_by_package_id = {
+            item["file_id"]: item for item in soul_data["config_skills"] if not item["is_missing"]
+        }
+        file_refs_by_package_id = {
+            item["file_id"]: item for item in soul_data["config_files"] if not item["is_missing"]
+        }
+
+        skill_descriptions = {item.name: item.description for item in agent_package.workspace_skills}
+        skill_descriptions.update({item.name: item.description for item in agent_package.soul.config_skills})
+        for skill_resource in package.manifest.skills:
+            target_ref = skill_refs_by_package_id.get(skill_resource.id)
+            if target_ref is None:
+                target_ref = {}
+                soul_data["config_skills"].append(target_ref)
+            target_ref.update(
+                {
+                    "name": skill_resource.name,
+                    "description": skill_descriptions.get(skill_resource.name, ""),
+                    "file_kind": "tool_file",
+                    "file_id": "",
+                    "is_missing": True,
+                    "size": skill_resource.size,
+                    "hash": skill_resource.sha256,
+                    "mime_type": "application/zip",
+                }
+            )
+            reason = package.invalid_skills.get(skill_resource.id)
+            normalized = None
+            try:
+                if reason is None:
+                    payload = self._reader.read_member_bytes(
+                        package,
+                        skill_resource.path,
+                        max_bytes=dify_config.UPLOAD_SKILL_FILE_SIZE_LIMIT * 1024 * 1024,
+                    )
+                    normalized = self._skill_packages.validate_and_normalize(
+                        content=payload, filename=skill_resource.path
+                    )
+            except SkillPackageError as exc:
+                reason = exc.code
+            except InvalidRosterAgentPackageError:
+                reason = "archive_integrity_failed"
+            if normalized is None:
+                warnings.append(
+                    DslImportWarning(
+                        code="agent_skill_missing",
+                        path=f"skills.{skill_resource.id}",
+                        message=f"Skill {skill_resource.name!r} is damaged and must be uploaded again.",
+                        details={"name": skill_resource.name, "reason": reason, "path": skill_resource.path},
+                    )
+                )
+                continue
+            storage_key = f"tools/{tenant_id}/{uuid4().hex}.zip"
+            tool_file = ToolFile(
+                user_id=account_id,
+                tenant_id=tenant_id,
+                conversation_id=None,
+                file_key=storage_key,
+                mimetype="application/zip",
+                name=f"{skill_resource.name}.zip",
+                size=len(normalized.archive_bytes),
+                original_url=None,
+            )
+            self._save_resource(storage_key=storage_key, payload=normalized.archive_bytes, files=files, row=tool_file)
+            target_ref.update(
+                {
+                    "description": normalized.manifest.description,
+                    "file_id": tool_file.id,
+                    "is_missing": False,
+                    "size": tool_file.size,
+                    "hash": normalized.manifest.hash,
+                }
+            )
+
+        for file_resource in package.manifest.files:
+            package_ref = file_refs_by_package_id[file_resource.id]
+            file_kind = package_ref["file_kind"]
+            mime_type = package_ref["mime_type"] or "application/octet-stream"
+            extension = self._extension(package_ref["name"])
+            payload = self._reader.read_member_bytes(package, file_resource.path, max_bytes=file_resource.size)
+            if file_kind == "tool_file":
+                storage_key = f"tools/{tenant_id}/{uuid4().hex}.{extension or 'bin'}"
+                row: ToolFile | UploadFile = ToolFile(
+                    user_id=account_id,
+                    tenant_id=tenant_id,
+                    conversation_id=None,
+                    file_key=storage_key,
+                    mimetype=mime_type,
+                    name=package_ref["name"],
+                    size=len(payload),
+                    original_url=None,
+                )
+                hash_value = None
+            else:
+                storage_key = f"upload_files/{tenant_id}/{uuid4()}.{extension or 'bin'}"
+                now = naive_utc_now()
+                row = UploadFile(
+                    tenant_id=tenant_id,
+                    storage_type=StorageType(dify_config.STORAGE_TYPE),
+                    key=storage_key,
+                    name=package_ref["name"],
+                    size=len(payload),
+                    extension=extension,
+                    mime_type=mime_type,
+                    created_by_role=CreatorUserRole.ACCOUNT,
+                    created_by=account_id,
+                    created_at=now,
+                    used=False,
+                    hash=hashlib.sha3_256(payload).hexdigest(),
+                )
+                hash_value = row.hash
+            self._save_resource(storage_key=storage_key, payload=payload, files=files, row=row)
+            package_ref.update(
+                {
+                    "file_id": row.id,
+                    "is_missing": False,
+                    "size": row.size,
+                    "hash": hash_value,
+                    "mime_type": mime_type,
+                }
+            )
+
+        soul = AgentSoulConfig.model_validate(soul_data)
+        with session_factory.create_session() as session, session.begin():
+            session.add_all(files)
+        return soul, warnings
+
+    def _save_resource(
+        self,
+        *,
+        storage_key: str,
+        payload: bytes,
+        files: list[ToolFile | UploadFile],
+        row: ToolFile | UploadFile,
+    ) -> None:
+        try:
+            self._storage.save(storage_key, payload)
+        except Exception as exc:
+            raise RosterAgentPackageResourceUnavailableError() from exc
+        files.append(row)
+
+    @staticmethod
+    def _persist_import(
+        *,
+        tenant_id: str,
+        account: Account,
+        metadata: AgentPackageMetadata,
+        soul: AgentSoulConfig,
+    ) -> tuple[str, str]:
+        with session_factory.create_session() as session, session.begin():
+            app = App(**default_app_templates[AppMode.AGENT]["app"])
+            app.id = str(uuid4())
+            app.tenant_id = tenant_id
+            app.name = metadata.name
+            app.description = metadata.description
+            app.icon_type = DEFAULT_ICON_TYPE
+            app.icon = DEFAULT_ICON
+            app.icon_background = DEFAULT_ICON_BACKGROUND
+            app.api_rph = 0
+            app.api_rpm = 0
+            app.max_active_requests = None
+            app.created_by = account.id
+            app.maintainer = account.id
+            app.updated_by = account.id
+            session.add(app)
+
+            app_model_config = AppModelConfig(app_id=app.id, created_by=account.id, updated_by=account.id)
+            session.add(app_model_config)
+            app.app_model_config_id = app_model_config.id
+
+            agent = AgentRosterService(session).create_backing_agent_for_app(
+                tenant_id=tenant_id,
+                account_id=account.id,
+                app_id=app.id,
+                name=metadata.name,
+                description=metadata.description,
+                role=metadata.role,
+                source=AgentSource.IMPORTED,
+                initial_soul=soul,
+                revision_operation=AgentConfigRevisionOperation.IMPORT_PACKAGE,
+            )
+            snapshot = session.get(AgentConfigSnapshot, agent.active_config_snapshot_id)
+            if snapshot is None:
+                raise RuntimeError("Imported Agent snapshot was not created")
+            session.add(
+                AgentConfigDraft(
+                    tenant_id=tenant_id,
+                    agent_id=agent.id,
+                    draft_type=AgentConfigDraftType.DRAFT,
+                    account_id=None,
+                    draft_owner_key="",
+                    base_snapshot_id=snapshot.id,
+                    home_snapshot_id=snapshot.home_snapshot_id,
+                    config_snapshot=soul,
+                    created_by=account.id,
+                    updated_by=account.id,
+                )
+            )
+            agent.active_config_is_published = False
+            upload_file_ids = [
+                item.file_id for item in soul.config_files if item.file_kind == "upload_file" and not item.is_missing
+            ]
+            if upload_file_ids:
+                session.execute(
+                    update(UploadFile)
+                    .where(UploadFile.tenant_id == tenant_id, UploadFile.id.in_(upload_file_ids))
+                    .values(used=True, used_by=account.id, used_at=naive_utc_now())
+                )
+            create_site_record(app=app, account=account, session=session)
+            create_installed_app_record(app=app, session=session)
+            return app.id, agent.id
+
+    @staticmethod
+    def _finalize_app(*, app_id: str, agent_id: str, tenant_id: str, account: Account) -> None:
+        with session_factory.create_session() as session:
+            app = session.scalar(select(App).where(App.id == app_id, App.tenant_id == tenant_id).limit(1))
+            if app is None:
+                raise RuntimeError("Imported Agent App is unavailable after commit")
+            AppService().finalize_created_app(
+                app=app,
+                backing_agent_id=agent_id,
+                account=account,
+                session=session,
+                created_records_initialized=True,
+            )
+
+    @staticmethod
+    def _extension(filename: str) -> str:
+        return os.path.splitext(filename)[1].lstrip(".").lower()
+
+
+__all__ = ["RosterAgentPackageImportResult", "RosterAgentPackageImporter"]
diff --git a/api/services/app_creation_records.py b/api/services/app_creation_records.py
new file mode 100644
index 00000000000..f79d42d3d6f
--- /dev/null
+++ b/api/services/app_creation_records.py
@@ -0,0 +1,45 @@
+"""Database records required for a newly created App."""
+
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from models import Account
+from models.enums import CustomizeTokenStrategy
+from models.model import App, InstalledApp, Site
+
+
+def create_site_record(*, app: App, account: Account, session: Session) -> None:
+    site = Site(
+        app_id=app.id,
+        title=app.name,
+        icon_type=app.icon_type,
+        icon=app.icon,
+        icon_background=app.icon_background,
+        default_language=account.interface_language or "en-US",
+        customize_token_strategy=CustomizeTokenStrategy.NOT_ALLOW,
+        code=Site.generate_code(16, session=session),
+        created_by=app.created_by,
+        updated_by=app.updated_by,
+    )
+    session.add(site)
+    session.flush()
+
+
+def create_installed_app_record(*, app: App, session: Session) -> None:
+    installed_app_id = session.scalar(
+        select(InstalledApp.id).where(InstalledApp.tenant_id == app.tenant_id, InstalledApp.app_id == app.id).limit(1)
+    )
+    if installed_app_id:
+        return
+
+    session.add(
+        InstalledApp(
+            tenant_id=app.tenant_id,
+            app_id=app.id,
+            app_owner_tenant_id=app.tenant_id,
+        )
+    )
+    session.flush()
+
+
+__all__ = ["create_installed_app_record", "create_site_record"]
diff --git a/api/services/app_service.py b/api/services/app_service.py
index 4fa63c76f76..859f87c09a7 100644
--- a/api/services/app_service.py
+++ b/api/services/app_service.py
@@ -728,15 +728,40 @@ class AppService:
 
         # Preserve the original commit-before-signal ordering for telemetry.
         session.commit()
-        app_was_created.send(app, account=account, session=session)
+        self.finalize_created_app(
+            app=app,
+            backing_agent_id=backing_agent.id if backing_agent else None,
+            account=account,
+            session=session,
+        )
+        return app
+
+    def finalize_created_app(
+        self,
+        *,
+        app: App,
+        backing_agent_id: str | None,
+        account: Account,
+        session: Session,
+        created_records_initialized: bool = False,
+    ) -> None:
+        """Run post-commit App creation hooks and external access initialization."""
+
+        app_was_created.send(
+            app,
+            account=account,
+            session=session,
+            created_records_initialized=created_records_initialized,
+        )
         session.commit()
+        app_mode = app.mode
         initialize_access = _CREATED_APP_ACCESS_INITIALIZERS.get(app_mode, _initialize_created_app_access)
         initialize_access(
             _CreatedApp(
-                tenant_id=tenant_id,
+                tenant_id=app.tenant_id,
                 creator_account_id=account.id,
                 app_id=app.id,
-                backing_agent_id=backing_agent.id if backing_agent else None,
+                backing_agent_id=backing_agent_id,
             )
         )
 
@@ -747,8 +772,6 @@ class AppService:
         if dify_config.DEPLOYMENT_EDITION == DeploymentEdition.CLOUD:
             BillingService.clean_billing_info_cache(app.tenant_id)
 
-        return app
-
     def get_app(self, app: App, *, session: Session) -> App:
         """
         Get App
diff --git a/api/tests/unit_tests/commands/test_generate_swagger_specs.py b/api/tests/unit_tests/commands/test_generate_swagger_specs.py
index 855397b7c45..04c94a468f5 100644
--- a/api/tests/unit_tests/commands/test_generate_swagger_specs.py
+++ b/api/tests/unit_tests/commands/test_generate_swagger_specs.py
@@ -687,6 +687,24 @@ def test_generate_specs_include_console_contract_shapes_for_schema_migration(tmp
     assert file_upload_schema["properties"]["file"]["type"] == "string"
     assert file_upload_schema["properties"]["source"]["enum"] == ["datasets"]
 
+    package_import = paths["/apps/imports"]["post"]
+    assert _request_schema(package_import, "multipart/form-data")["required"] == ["file"]
+    assert _request_schema(package_import, "application/json")["$ref"] == "#/components/schemas/AppImportPayload"
+    assert "mode" in schemas["AppImportPayload"]["required"]
+    conflict = package_import["responses"]["409"]["content"]["application/json"]["schema"]
+    assert conflict["$ref"] == "#/components/schemas/RosterAgentPackageConflictResponse"
+    assert "leaked_dependencies" in schemas["RosterAgentPackageConflictResponse"]["properties"]
+    assert "403" in package_import["responses"]
+    export = paths["/apps/{app_id}/export"]["get"]
+    assert export["responses"]["200"]["content"]["application/zip"]["schema"] == {"type": "string", "format": "binary"}
+    assert export["responses"]["200"]["content"]["application/json"]["schema"]["$ref"] == (
+        "#/components/schemas/AppExportResponse"
+    )
+    export_format = next(param for param in export["parameters"] if param["name"] == "format")
+    assert set(export_format["schema"]["enum"]) == {"yaml", "ifpkg"}
+    assert export_format["schema"].get("default") is None
+    assert "defaults to ifpkg for Agent Apps and yaml for other Apps" in export_format["description"]
+
     api_key_auth_binding_schema = _request_schema(paths["/api-key-auth/data-source/binding"]["post"])
     assert api_key_auth_binding_schema["$ref"] == "#/components/schemas/ApiKeyAuthBindingPayload"
     assert schemas["ApiKeyAuthBindingPayload"]["properties"]["credentials"]["$ref"] == (
diff --git a/api/tests/unit_tests/controllers/console/app/test_app_import_api.py b/api/tests/unit_tests/controllers/console/app/test_app_import_api.py
index 96739b27060..c09d24cffcc 100644
--- a/api/tests/unit_tests/controllers/console/app/test_app_import_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_app_import_api.py
@@ -146,7 +146,7 @@ class TestAppImportApi:
         sqlite_app_engine: Engine,
         transaction_events: TransactionEvents,
     ) -> None:
-        method = unwrap(api.post)
+        method = unwrap(api._import_dsl)
 
         _install_features(monkeypatch, enabled=False)
         app_id = _install_persisting_service_result(
@@ -172,7 +172,7 @@ class TestAppImportApi:
         sqlite_app_engine: Engine,
         transaction_events: TransactionEvents,
     ) -> None:
-        method = unwrap(api.post)
+        method = unwrap(api._import_dsl)
 
         _install_features(monkeypatch, enabled=False)
         app_id = _install_persisting_service_result(
@@ -198,7 +198,7 @@ class TestAppImportApi:
         sqlite_app_engine: Engine,
         transaction_events: TransactionEvents,
     ) -> None:
-        method = unwrap(api.post)
+        method = unwrap(api._import_dsl)
 
         _install_features(monkeypatch, enabled=True)
         app_id = _install_persisting_service_result(
@@ -227,7 +227,7 @@ class TestAppImportApi:
         sqlite_app_engine: Engine,
         transaction_events: TransactionEvents,
     ) -> None:
-        method = _unwrap(api.post)
+        method = _unwrap(api._import_dsl)
 
         _install_features(monkeypatch, enabled=False)
         monkeypatch.setattr(
@@ -263,7 +263,7 @@ class TestAppImportApi:
         sqlite_app_engine: Engine,
         transaction_events: TransactionEvents,
     ) -> None:
-        method = _unwrap(api.post)
+        method = _unwrap(api._import_dsl)
 
         _install_features(monkeypatch, enabled=False)
         monkeypatch.setattr(
diff --git a/api/tests/unit_tests/controllers/console/app/test_roster_package_routes.py b/api/tests/unit_tests/controllers/console/app/test_roster_package_routes.py
new file mode 100644
index 00000000000..bb8b9c8ab06
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/app/test_roster_package_routes.py
@@ -0,0 +1,157 @@
+import io
+from collections.abc import Callable
+from inspect import unwrap
+from types import SimpleNamespace
+from unittest.mock import Mock
+
+import pytest
+from flask import Flask
+from werkzeug.exceptions import BadRequest, Forbidden
+
+from controllers.console.app import app as app_module
+from controllers.console.app import app_import as import_module
+from core.rbac import RBACPermission
+from models.account import Account, Tenant
+from models.model import App, AppMode
+from services.agent.errors import InvalidRosterAgentPackageError
+from services.agent.roster_package_importer import RosterAgentPackageImportResult
+from services.entities.dsl_entities import DslImportWarning
+
+
+def _account() -> Account:
+    account = Account(name="Importer", email="importer@example.com")
+    account._current_tenant = Tenant(name="Workspace")
+    account._current_tenant.id = "tenant-1"
+    return account
+
+
+def test_existing_import_route_dispatches_json_without_changing_payload(
+    app: Flask, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    api = import_module.AppImportApi()
+    import_dsl = Mock(return_value=({"status": "completed"}, 200))
+    monkeypatch.setattr(api, "_import_dsl", import_dsl)
+    account = _account()
+    with app.test_request_context(
+        "/console/api/apps/imports", method="POST", json={"mode": "yaml-content", "yaml_content": "app: {}"}
+    ):
+        result = unwrap(api.post)(api, account)
+    assert result == ({"status": "completed"}, 200)
+    assert import_dsl.call_args.args == (
+        import_module.AppImportPayload(mode="yaml-content", yaml_content="app: {}"),
+        account,
+    )
+
+
+@pytest.mark.parametrize("has_warning", [False, True])
+def test_existing_import_route_accepts_package_and_preserves_import_response(
+    app: Flask, monkeypatch: pytest.MonkeyPatch, config_overrides: Callable[..., None], has_warning: bool
+) -> None:
+    config_overrides(RBAC_ENABLED=False)
+    account = _account()
+    warnings = (
+        [DslImportWarning(code="agent_skill_missing", path="skills.s_000001", message="Missing Skill")]
+        if has_warning
+        else []
+    )
+    import_package = Mock(
+        return_value=RosterAgentPackageImportResult(app_id="app-1", agent_id="agent-1", warnings=warnings)
+    )
+    monkeypatch.setattr(
+        import_module, "RosterAgentPackageImporter", lambda: SimpleNamespace(import_package=import_package)
+    )
+    api = import_module.AppImportApi()
+    with app.test_request_context(
+        "/console/api/apps/imports", method="POST", data={"file": (io.BytesIO(b"package"), "agent.ifpkg")}
+    ):
+        data, status = unwrap(api.post)(api, account)
+        assert import_package.call_args.kwargs["source"].read() == b"package"
+    assert status == 200
+    assert data["app_id"] == "app-1"
+    assert data["app_mode"] == "agent"
+    assert data["status"] == ("completed-with-warnings" if has_warning else "completed")
+    assert data["warnings"] == [warning.model_dump(mode="json") for warning in warnings]
+    assert data["id"]
+    assert import_package.call_args.kwargs["tenant_id"] == "tenant-1"
+
+
+@pytest.mark.parametrize("denied", [RBACPermission.AGENT_CREATE, RBACPermission.AGENT_IMPORT_EXPORT_DSL])
+def test_package_import_checks_agent_permissions_before_reading_payload(
+    app: Flask, monkeypatch: pytest.MonkeyPatch, config_overrides: Callable[..., None], denied: RBACPermission
+) -> None:
+    config_overrides(RBAC_ENABLED=True)
+    account = _account()
+    monkeypatch.setattr("controllers.common.wraps.current_account_with_tenant", lambda: (account, "tenant-1"))
+    scenes = []
+
+    def check(*_args, **kwargs: object) -> bool:
+        scenes.append(kwargs["scene"])
+        return kwargs["scene"] != denied
+
+    monkeypatch.setattr("controllers.common.rbac.checks.RBACService.CheckAccess.check", check)
+    importer = Mock()
+    monkeypatch.setattr(import_module, "RosterAgentPackageImporter", importer)
+    api = import_module.AppImportApi()
+    with app.test_request_context(
+        "/console/api/apps/imports", method="POST", data={"file": (io.BytesIO(b"package"), "agent.ifpkg")}
+    ):
+        with pytest.raises(Forbidden):
+            unwrap(api.post)(api, account)
+    assert denied in scenes
+    assert RBACPermission.APP_IMPORT_EXPORT_DSL not in scenes
+    importer.assert_not_called()
+
+
+def test_package_import_rejects_overwrite(app: Flask, config_overrides: Callable[..., None]) -> None:
+    config_overrides(RBAC_ENABLED=False)
+    api = import_module.AppImportApi()
+    with app.test_request_context(
+        "/console/api/apps/imports",
+        method="POST",
+        data={"app_id": "existing", "file": (io.BytesIO(b"package"), "agent.ifpkg")},
+    ):
+        with pytest.raises(InvalidRosterAgentPackageError, match="overwriting"):
+            unwrap(api.post)(api, _account())
+
+
+@pytest.mark.parametrize("query", [{}, {"format": "ifpkg"}])
+def test_existing_export_route_returns_ifpkg_for_agent(
+    app: Flask, monkeypatch: pytest.MonkeyPatch, query: dict[str, str]
+) -> None:
+    model = App(id="app-1", tenant_id="tenant-1", mode=AppMode.AGENT)
+    monkeypatch.setattr(App, "bound_agent_id_with_session", lambda _self, **_kwargs: "agent-1")
+    monkeypatch.setattr(app_module, "db", SimpleNamespace(session=lambda: object()))
+    archive = io.BytesIO(b"package")
+    close = Mock()
+    export = Mock(return_value=SimpleNamespace(archive=archive, filename="agent.ifpkg", close=close))
+    monkeypatch.setattr(app_module, "RosterAgentPackageExporter", lambda: SimpleNamespace(export=export))
+    with app.test_request_context("/console/api/apps/app-1/export", query_string=query):
+        response = unwrap(app_module.AppExportApi.get)(
+            app_module.AppExportApi(), app_module.AppExportQuery.model_validate(query), model
+        )
+        response.direct_passthrough = False
+        assert response.get_data() == b"package"
+        assert response.mimetype == "application/zip"
+        assert "agent.ifpkg" in response.headers["Content-Disposition"]
+        response.close()
+    export.assert_called_once_with(tenant_id="tenant-1", agent_id="agent-1")
+    close.assert_called_once_with()
+
+
+def test_ifpkg_export_rejects_non_agent_apps() -> None:
+    model = App(id="app-1", tenant_id="tenant-1", mode=AppMode.WORKFLOW)
+    with pytest.raises(BadRequest):
+        unwrap(app_module.AppExportApi.get)(app_module.AppExportApi(), app_module.AppExportQuery(format="ifpkg"), model)
+
+
+@pytest.mark.parametrize(
+    ("mode", "query"),
+    [(AppMode.AGENT, {"format": "yaml"}), (AppMode.WORKFLOW, {}), (AppMode.WORKFLOW, {"format": "yaml"})],
+)
+def test_yaml_export_remains_available(monkeypatch: pytest.MonkeyPatch, mode: AppMode, query: dict[str, str]) -> None:
+    model = App(id="app-1", tenant_id="tenant-1", mode=mode)
+    monkeypatch.setattr(app_module, "db", SimpleNamespace(session=lambda: object()))
+    monkeypatch.setattr(app_module.AppDslService, "export_dsl", lambda **_kwargs: "app: {}")
+    assert unwrap(app_module.AppExportApi.get)(
+        app_module.AppExportApi(), app_module.AppExportQuery.model_validate(query), model
+    ) == {"data": "app: {}"}
diff --git a/api/tests/unit_tests/events/test_app_event_signals.py b/api/tests/unit_tests/events/test_app_event_signals.py
index cde404407a2..f0ce7014b50 100644
--- a/api/tests/unit_tests/events/test_app_event_signals.py
+++ b/api/tests/unit_tests/events/test_app_event_signals.py
@@ -11,7 +11,7 @@ from events.app_event import app_was_deleted, app_was_updated
 from models.account import Account
 from models.agent import Agent, AgentWorkspace
 from models.dataset import AppDatasetJoin
-from models.model import App, AppMode, AppModelConfig, IconType, InstalledApp
+from models.model import App, AppMode, AppModelConfig, IconType, InstalledApp, Site
 from services.app_service import AppService
 
 
@@ -270,6 +270,13 @@ class TestAppModelConfigWasUpdatedSignal:
 
 @pytest.mark.parametrize("sqlite_session", [(App, Account, InstalledApp)], indirect=True)
 class TestCreateInstalledAppWhenAppCreated:
+    def test_skips_when_records_were_initialized_transactionally(self, app_model: App, sqlite_session: Session) -> None:
+        from events.event_handlers.create_installed_app_when_app_created import handle
+
+        handle(app_model, session=sqlite_session, created_records_initialized=True)
+
+        assert sqlite_session.scalar(select(InstalledApp.id).where(InstalledApp.app_id == app_model.id)) is None
+
     def test_skips_existing_installation(self, app_model: App, sqlite_session: Session) -> None:
         from events.event_handlers.create_installed_app_when_app_created import handle
 
@@ -324,3 +331,19 @@ class TestCreateInstalledAppWhenAppCreated:
         assert installed_app.app_id == app_model.id
         assert installed_app.tenant_id == app_model.tenant_id
         assert commits == []
+
+
+@pytest.mark.parametrize("sqlite_session", [(App, Account, Site)], indirect=True)
+def test_create_site_handler_skips_transactionally_initialized_records(
+    app_model: App, account: Account, sqlite_session: Session
+) -> None:
+    from events.event_handlers.create_site_record_when_app_created import handle
+
+    handle(
+        app_model,
+        account=account,
+        session=sqlite_session,
+        created_records_initialized=True,
+    )
+
+    assert sqlite_session.scalar(select(Site.id).where(Site.app_id == app_model.id)) is None
diff --git a/api/tests/unit_tests/services/agent/test_agent_dsl_service.py b/api/tests/unit_tests/services/agent/test_agent_dsl_service.py
index 76f0f93e497..085221a2f9a 100644
--- a/api/tests/unit_tests/services/agent/test_agent_dsl_service.py
+++ b/api/tests/unit_tests/services/agent/test_agent_dsl_service.py
@@ -288,7 +288,7 @@ def test_import_warnings_cover_runtime_setup_removed_from_package(
     )
     monkeypatch.setattr("services.agent.dsl_service.get_tenant_knowledge_dataset_rows", Mock(return_value={}))
 
-    _, warnings = AgentDslService(unbound_session)._resolve_package_soul(
+    _, warnings = AgentDslService(unbound_session).resolve_package_soul(
         tenant_id="tenant-1",
         package=make_portable_agent_package(_agent(), soul),
         package_path="agent_packages.agent_1",
@@ -414,7 +414,7 @@ def test_import_agent_app_package_creates_config_and_unpublished_draft(
     service = AgentDslService(sqlite_session)
     soul = AgentSoulConfig(config_note="portable")
     warning = DslImportWarning(code="setup", path="agent.soul", message="setup required")
-    service._resolve_package_soul = Mock(return_value=(soul, [warning]))
+    service.resolve_package_soul = Mock(return_value=(soul, [warning]))
     service._unique_roster_name = Mock(return_value="Portable Agent import")
     agent = _agent()
     agent.active_config_snapshot_id = "snapshot-1"
@@ -778,7 +778,7 @@ def test_create_imported_inline_agent_uses_import_provenance(unbound_session: Se
     service = AgentDslService(unbound_session)
     soul = AgentSoulConfig(config_note="inline")
     warning = DslImportWarning(code="setup", path="agent", message="setup")
-    service._resolve_package_soul = Mock(return_value=(soul, [warning]))
+    service.resolve_package_soul = Mock(return_value=(soul, [warning]))
     service._create_workflow_only_agent = Mock(return_value=(_agent(), _snapshot(soul=soul)))
     workflow = _workflow()
 
@@ -865,7 +865,7 @@ def test_resolve_package_soul_preserves_existing_and_marks_missing_knowledge(
     get_dataset_rows = Mock(return_value={"existing": existing_dataset})
     monkeypatch.setattr("services.agent.dsl_service.get_tenant_knowledge_dataset_rows", get_dataset_rows)
 
-    resolved, warnings = AgentDslService(sqlite_session)._resolve_package_soul(
+    resolved, warnings = AgentDslService(sqlite_session).resolve_package_soul(
         tenant_id="tenant-1",
         package=make_portable_agent_package(_agent(), soul),
         package_path="agent_packages.agent_1",
diff --git a/api/tests/unit_tests/services/agent/test_roster_package_importer.py b/api/tests/unit_tests/services/agent/test_roster_package_importer.py
new file mode 100644
index 00000000000..2e8ee8f4324
--- /dev/null
+++ b/api/tests/unit_tests/services/agent/test_roster_package_importer.py
@@ -0,0 +1,817 @@
+from __future__ import annotations
+
+import hashlib
+import io
+import json
+import zipfile
+from collections.abc import Callable, Generator
+
+import pytest
+import yaml
+from sqlalchemy import event, func, select
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import Session, sessionmaker
+from werkzeug.exceptions import Forbidden
+
+from core.db.session_factory import session_factory
+from core.plugin.entities.plugin import PluginDependency, PluginDependencyType
+from models import Account
+from models.account import TenantPluginDebugPermission, TenantPluginInstallPermission, TenantPluginPermission
+from models.agent import (
+    Agent,
+    AgentConfigDraft,
+    AgentConfigRevision,
+    AgentConfigRevisionOperation,
+    AgentConfigSnapshot,
+    AgentDebugConversation,
+    AgentKind,
+    AgentScope,
+    AgentSource,
+    AgentStatus,
+)
+from models.agent_config_entities import AgentSoulConfig
+from models.base import Base, TypeBase
+from models.model import App, AppModelConfig, InstalledApp, Site, UploadFile
+from models.tools import ToolFile
+from services.agent.dsl_entities import (
+    AgentPackage,
+    AgentPackageMetadata,
+    AgentPackageWorkspaceSkill,
+    make_agent_app_dsl,
+)
+from services.agent.errors import (
+    AgentNameConflictError,
+    InvalidRosterAgentPackageError,
+    RosterAgentPackageDependenciesMissingError,
+    RosterAgentPackageImportFailedError,
+    RosterAgentPackageResourceUnavailableError,
+    RosterAgentPackageTooLargeError,
+)
+from services.agent.roster_package_entities import (
+    ROSTER_AGENT_PACKAGE_FORMAT,
+    ROSTER_AGENT_PACKAGE_FORMAT_VERSION,
+    RosterAgentPackageApp,
+    RosterAgentPackageFile,
+    RosterAgentPackageManifest,
+    RosterAgentPackageSkill,
+)
+from services.agent.roster_package_importer import RosterAgentPackageImporter
+from services.app_service import AppService
+from services.file_service import FileService
+from services.plugin.dependencies_analysis import DependenciesAnalysisService
+
+
+class _MemoryStorage:
+    def __init__(self, *, fail_save_at: int | None = None) -> None:
+        self.files: dict[str, bytes] = {}
+        self.deleted: list[str] = []
+        self.save_count = 0
+        self.fail_save_at = fail_save_at
+
+    def save(self, filename: str, data: bytes) -> None:
+        self.save_count += 1
+        if self.fail_save_at == self.save_count:
+            raise OSError("storage unavailable")
+        self.files[filename] = data
+
+    def delete(self, filename: str) -> None:
+        self.deleted.append(filename)
+        self.files.pop(filename, None)
+
+    def load_stream(self, filename: str) -> Generator[bytes, None, None]:
+        yield self.files[filename]
+
+
+@pytest.fixture(autouse=True)
+def _installed_plugins(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(DependenciesAnalysisService, "get_leaked_dependencies", lambda **_kwargs: [])
+
+
+def _account() -> Account:
+    account = Account(
+        name="Agent Importer",
+        email="agent-importer@example.com",
+        interface_language="en-US",
+    )
+    account.id = "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa"
+    return account
+
+
+def _zip(members: dict[str, bytes]) -> bytes:
+    output = io.BytesIO()
+    with zipfile.ZipFile(output, "w", compression=zipfile.ZIP_STORED) as archive:
+        for path, payload in members.items():
+            archive.writestr(path, payload)
+    return output.getvalue()
+
+
+def _skill_archive(name: str) -> bytes:
+    return _zip(
+        {
+            "SKILL.md": f"---\nname: {name}\ndescription: {name} description.\n---\n\n# Skill\n".encode(),
+            "scripts/run.py": b"print('ok')\n",
+        }
+    )
+
+
+def _package(
+    *,
+    name: str = "Imported Agent",
+    binary_dependency: bool = False,
+    missing_knowledge: bool = False,
+) -> bytes:
+    config_skill = _skill_archive("config-skill")
+    workspace_skill = _skill_archive("workspace-skill")
+    guide = b"guide-content"
+    notes = b"notes-content"
+    soul_data: dict[str, object] = {
+        "prompt": {"system_prompt": "Imported prompt"},
+        "config_skills": [{"name": "config-skill", "file_id": "s_000001"}],
+        "config_files": [
+            {"name": "guide.pdf", "file_kind": "upload_file", "file_id": "f_000001"},
+            {"name": "notes.txt", "file_kind": "tool_file", "file_id": "f_000002"},
+        ],
+    }
+    if missing_knowledge:
+        soul_data["knowledge"] = {
+            "sets": [
+                {
+                    "id": "set-1",
+                    "name": "Documents",
+                    "datasets": [{"id": "missing-dataset-id", "name": "Missing Docs"}],
+                    "query": {"mode": "user_query", "value": "query"},
+                    "retrieval": {
+                        "mode": "single",
+                        "model": {"provider": "provider/embedding", "name": "embed", "mode": "embedding"},
+                    },
+                }
+            ]
+        }
+    soul = AgentSoulConfig.model_validate(soul_data)
+    files = [
+        RosterAgentPackageFile(
+            id="f_000001",
+            path="f_000001.pdf",
+            size=len(guide),
+            sha256=hashlib.sha256(guide).hexdigest(),
+        ),
+        RosterAgentPackageFile(
+            id="f_000002",
+            path="f_000002.txt",
+            size=len(notes),
+            sha256=hashlib.sha256(notes).hexdigest(),
+        ),
+    ]
+    members = {
+        "s_000001.zip": config_skill,
+        "s_000002.zip": workspace_skill,
+        "f_000001.pdf": guide,
+        "f_000002.txt": notes,
+    }
+    dependency = PluginDependency(
+        type=PluginDependencyType.Marketplace,
+        value=PluginDependency.Marketplace(marketplace_plugin_unique_identifier="langgenius/example:1.0.0@digest"),
+    )
+    app = make_agent_app_dsl(
+        App(name=name, mode="agent"),
+        package_ref="agent_1",
+        packages={
+            "agent_1": AgentPackage(
+                metadata=AgentPackageMetadata(name=name, description="Imported description", role="researcher"),
+                soul=soul,
+                workspace_skills=[
+                    AgentPackageWorkspaceSkill(
+                        name="workspace-skill",
+                        display_name="Workspace Skill",
+                        description="workspace-skill description.",
+                        priority=0,
+                    )
+                ],
+            )
+        },
+        dependencies=[dependency],
+    )
+    app_bytes = yaml.safe_dump(app.model_dump(mode="json")).encode()
+    manifest = RosterAgentPackageManifest(
+        format=ROSTER_AGENT_PACKAGE_FORMAT,
+        format_version=ROSTER_AGENT_PACKAGE_FORMAT_VERSION,
+        apps=[
+            RosterAgentPackageApp(path="app.yaml", size=len(app_bytes), sha256=hashlib.sha256(app_bytes).hexdigest())
+        ],
+        skills=[
+            RosterAgentPackageSkill(
+                id="s_000001",
+                scope="agent_config",
+                name="config-skill",
+                path="s_000001.zip",
+                size=len(config_skill),
+                sha256=hashlib.sha256(config_skill).hexdigest(),
+            ),
+            RosterAgentPackageSkill(
+                id="s_000002",
+                scope="workspace",
+                name="workspace-skill",
+                path="s_000002.zip",
+                size=len(workspace_skill),
+                sha256=hashlib.sha256(workspace_skill).hexdigest(),
+            ),
+        ],
+        files=files,
+    )
+    manifest_data = manifest.model_dump(mode="json", exclude_none=True)
+    if binary_dependency:
+        manifest_data["files"][0]["role"] = "binary_dependency"
+    return _zip({"manifest.yaml": yaml.safe_dump(manifest_data).encode(), "app.yaml": app_bytes, **members})
+
+
+def _count(session: Session, model: type[Base | TypeBase]) -> int:
+    return session.scalar(select(func.count()).select_from(model)) or 0
+
+
+@pytest.mark.parametrize("skill_index", [0, 1], ids=["uploaded", "workspace"])
+@pytest.mark.parametrize(
+    "damage", ["invalid_zip", "missing_skill_md", "member_crc", "checksum", "size", "name_mismatch"]
+)
+def test_damaged_skill_becomes_missing_with_warning(
+    monkeypatch: pytest.MonkeyPatch, sqlite_session_factory: sessionmaker[Session], skill_index: int, damage: str
+) -> None:
+    with zipfile.ZipFile(io.BytesIO(_package())) as archive:
+        members = {name: archive.read(name) for name in archive.namelist()}
+    manifest = yaml.safe_load(members["manifest.yaml"])
+    skill = manifest["skills"][skill_index]
+    path = skill["path"]
+    if damage == "invalid_zip":
+        members[path] = b"not a zip archive"
+    elif damage == "missing_skill_md":
+        members[path] = _zip({"README.md": b"no entrypoint"})
+    elif damage == "member_crc":
+        members[path] = members[path].replace(b"print('ok')", b"print('NO')", 1)
+    elif damage == "name_mismatch":
+        members[path] = _skill_archive("different-name")
+    skill["size"] = len(members[path]) + (1 if damage == "size" else 0)
+    skill["sha256"] = "0" * 64 if damage == "checksum" else hashlib.sha256(members[path]).hexdigest()
+    members["manifest.yaml"] = yaml.safe_dump(manifest).encode()
+    storage = _MemoryStorage()
+    monkeypatch.setattr(AppService, "finalize_created_app", lambda *_args, **_kwargs: None)
+    result = RosterAgentPackageImporter(storage_backend=storage).import_package(
+        source=io.BytesIO(_zip(members)), tenant_id="tenant-1", account=_account()
+    )
+    assert len(result.warnings) == 1
+    warning = result.warnings[0]
+    assert warning.code == "agent_skill_missing"
+    assert warning.details["name"] == skill["name"]
+    assert warning.details["path"] == path
+    assert warning.details["reason"]
+    assert storage.save_count == 3
+    with sqlite_session_factory() as session:
+        draft = session.scalar(select(AgentConfigDraft).where(AgentConfigDraft.agent_id == result.agent_id))
+        assert draft is not None
+        soul = AgentSoulConfig.model_validate(draft.config_snapshot_dict)
+        damaged = soul.config_skills[skill_index]
+        assert damaged.name == skill["name"]
+        assert damaged.is_missing is True
+        assert damaged.file_id == ""
+        assert soul.config_skills[1 - skill_index].is_missing is False
+        assert all(not ref.is_missing for ref in soul.config_files)
+        assert _count(session, ToolFile) == 2
+
+
+def test_damaged_ordinary_file_still_rejects_package() -> None:
+    with zipfile.ZipFile(io.BytesIO(_package())) as archive:
+        members = {name: archive.read(name) for name in archive.namelist()}
+    members["f_000001.pdf"] = b"damaged"
+    storage = _MemoryStorage()
+    with pytest.raises(InvalidRosterAgentPackageError):
+        RosterAgentPackageImporter(storage_backend=storage).import_package(
+            source=io.BytesIO(_zip(members)), tenant_id="tenant-1", account=_account()
+        )
+    assert storage.save_count == 0
+
+
+def test_import_rejects_multiple_apps_before_writes() -> None:
+    with zipfile.ZipFile(io.BytesIO(_package())) as archive:
+        members = {name: archive.read(name) for name in archive.namelist()}
+    manifest = yaml.safe_load(members["manifest.yaml"])
+    members["second.yaml"] = members["app.yaml"]
+    manifest["apps"].append({**manifest["apps"][0], "path": "second.yaml"})
+    members["manifest.yaml"] = yaml.safe_dump(manifest).encode()
+    storage = _MemoryStorage()
+    with pytest.raises(InvalidRosterAgentPackageError, match="exactly one Agent App"):
+        RosterAgentPackageImporter(storage_backend=storage).import_package(
+            source=io.BytesIO(_zip(members)), tenant_id="tenant-1", account=_account()
+        )
+    assert storage.save_count == 0
+
+
+def test_import_uses_indexed_app_path(
+    monkeypatch: pytest.MonkeyPatch, sqlite_session_factory: sessionmaker[Session]
+) -> None:
+    with zipfile.ZipFile(io.BytesIO(_package())) as archive:
+        members = {name: archive.read(name) for name in archive.namelist()}
+    manifest = yaml.safe_load(members["manifest.yaml"])
+    members["custom.yml"] = members.pop("app.yaml")
+    manifest["apps"][0]["path"] = "custom.yml"
+    members["manifest.yaml"] = yaml.safe_dump(manifest).encode()
+    monkeypatch.setattr(AppService, "finalize_created_app", lambda *_args, **_kwargs: None)
+    result = RosterAgentPackageImporter(storage_backend=_MemoryStorage()).import_package(
+        source=io.BytesIO(_zip(members)), tenant_id="tenant-1", account=_account()
+    )
+    with sqlite_session_factory() as session:
+        app = session.get(App, result.app_id)
+        assert app is not None
+        assert app.name == "Imported Agent"
+
+
+@pytest.mark.parametrize("use_zip64", [False, True])
+def test_invalid_utf8_skill_filename_is_recovered(
+    monkeypatch: pytest.MonkeyPatch, sqlite_session_factory: sessionmaker[Session], use_zip64: bool
+) -> None:
+    with zipfile.ZipFile(io.BytesIO(_package())) as archive:
+        members = {name: archive.read(name) for name in archive.namelist()}
+    with monkeypatch.context() as scoped:
+        if use_zip64:
+            scoped.setattr(zipfile, "ZIP64_LIMIT", 0)
+        skill = _zip(
+            {
+                "SKILL.md": b"---\nname: config-skill\ndescription: Recoverable skill.\n---\n",
+                "scripts/\u00e9.py": b"print('ok')\n",
+            }
+        ).replace(b"\xc3\xa9.py", b"\xffa.py")
+    members["s_000001.zip"] = skill
+    manifest = yaml.safe_load(members["manifest.yaml"])
+    manifest["skills"][0]["size"] = len(skill)
+    manifest["skills"][0]["sha256"] = hashlib.sha256(skill).hexdigest()
+    members["manifest.yaml"] = yaml.safe_dump(manifest).encode()
+    storage = _MemoryStorage()
+    monkeypatch.setattr(AppService, "finalize_created_app", lambda *_args, **_kwargs: None)
+    result = RosterAgentPackageImporter(storage_backend=storage).import_package(
+        source=io.BytesIO(_zip(members)), tenant_id="tenant-1", account=_account()
+    )
+    assert result.warnings == []
+    with sqlite_session_factory() as session:
+        draft = session.scalar(select(AgentConfigDraft).where(AgentConfigDraft.agent_id == result.agent_id))
+        assert draft is not None
+        soul = AgentSoulConfig.model_validate(draft.config_snapshot_dict)
+        assert soul.config_skills[0].is_missing is False
+        tool_file = session.get(ToolFile, soul.config_skills[0].file_id)
+        assert tool_file is not None
+        with zipfile.ZipFile(io.BytesIO(storage.files[tool_file.file_key])) as archive:
+            assert archive.read("scripts/\ufffda.py") == b"print('ok')\n"
+
+
+@pytest.mark.parametrize("names", [["INVALID-NAME"], ["TOKEN", "TOKEN"]])
+def test_import_rejects_invalid_shell_environment_before_writes(
+    monkeypatch: pytest.MonkeyPatch, sqlite_session_factory: sessionmaker[Session], names: list[str]
+) -> None:
+    with zipfile.ZipFile(io.BytesIO(_package())) as archive:
+        members = {name: archive.read(name) for name in archive.namelist()}
+    app = yaml.safe_load(members["app.yaml"])
+    app["agent_packages"]["agent_1"]["soul"]["env"]["variables"] = [{"name": name, "value": "value"} for name in names]
+    members["app.yaml"] = yaml.safe_dump(app).encode()
+    manifest = yaml.safe_load(members["manifest.yaml"])
+    manifest["apps"][0].update(size=len(members["app.yaml"]), sha256=hashlib.sha256(members["app.yaml"]).hexdigest())
+    members["manifest.yaml"] = yaml.safe_dump(manifest).encode()
+    monkeypatch.setattr(AppService, "finalize_created_app", lambda *_args, **_kwargs: None)
+    storage = _MemoryStorage()
+    with pytest.raises(InvalidRosterAgentPackageError, match="Soul is invalid"):
+        RosterAgentPackageImporter(storage_backend=storage).import_package(
+            source=io.BytesIO(_zip(members)), tenant_id="tenant-1", account=_account()
+        )
+    assert storage.save_count == 0
+    with sqlite_session_factory() as session:
+        assert _count(session, App) == 0
+
+
+def test_import_clears_source_credentials(
+    monkeypatch: pytest.MonkeyPatch, sqlite_session_factory: sessionmaker[Session]
+) -> None:
+    with zipfile.ZipFile(io.BytesIO(_package())) as archive:
+        members = {name: archive.read(name) for name in archive.namelist()}
+    app = yaml.safe_load(members["app.yaml"])
+    soul = app["agent_packages"]["agent_1"]["soul"]
+    soul["tools"]["dify_tools"] = [
+        {
+            "provider_id": "langgenius/example/example",
+            "provider_type": "plugin",
+            "credential_type": "api-key",
+            "credential_ref": {"type": "tool", "id": "source-credential"},
+            "runtime_parameters": {"api_key": "source-secret", "query": "keep"},
+        }
+    ]
+    soul["model"] = {
+        "plugin_id": "langgenius/example",
+        "model_provider": "langgenius/example/example",
+        "model": "example",
+        "credential_ref": {"type": "provider", "id": "source-model"},
+    }
+    soul["env"]["secret_refs"] = [{"name": "TOKEN", "value": "source-secret", "id": "source-id"}]
+    members["app.yaml"] = yaml.safe_dump(app).encode()
+    manifest = yaml.safe_load(members["manifest.yaml"])
+    manifest["apps"][0].update(size=len(members["app.yaml"]), sha256=hashlib.sha256(members["app.yaml"]).hexdigest())
+    members["manifest.yaml"] = yaml.safe_dump(manifest).encode()
+    monkeypatch.setattr(AppService, "finalize_created_app", lambda *_a, **_k: None)
+    result = RosterAgentPackageImporter(storage_backend=_MemoryStorage()).import_package(
+        source=io.BytesIO(_zip(members)), tenant_id="tenant-1", account=_account()
+    )
+    with sqlite_session_factory() as session:
+        draft = session.scalar(select(AgentConfigDraft).where(AgentConfigDraft.agent_id == result.agent_id))
+        assert draft is not None
+        data = draft.config_snapshot_dict
+        tool = data["tools"]["dify_tools"][0]
+        assert tool["credential_type"] == "unauthorized"
+        assert tool["credential_ref"] is None
+        assert tool["runtime_parameters"] == {"api_key": None, "query": "keep"}
+        assert data["model"]["credential_ref"] is None
+        assert "source-secret" not in json.dumps(data)
+        assert "source-id" not in json.dumps(data)
+
+
+@pytest.mark.parametrize("allowed", [False, True])
+def test_missing_plugins_are_checked_before_writes(
+    monkeypatch: pytest.MonkeyPatch, config_overrides: Callable[..., None], allowed: bool
+) -> None:
+    config_overrides(RBAC_ENABLED=True)
+    monkeypatch.setattr(DependenciesAnalysisService, "get_leaked_dependencies", lambda **kwargs: kwargs["dependencies"])
+    monkeypatch.setattr(
+        "services.agent.roster_package_dependencies.RBACService.CheckAccess.check", lambda *_args, **_kwargs: allowed
+    )
+    storage = _MemoryStorage()
+    with pytest.raises(RosterAgentPackageDependenciesMissingError if allowed else Forbidden) as failure:
+        RosterAgentPackageImporter(storage_backend=storage).import_package(
+            source=io.BytesIO(_package()), tenant_id="tenant-1", account=_account()
+        )
+    assert storage.save_count == 0
+    if allowed:
+        assert isinstance(failure.value, RosterAgentPackageDependenciesMissingError)
+        assert failure.value.data is not None
+        assert len(failure.value.data["leaked_dependencies"]) == 1
+
+
+def test_empty_dependencies_do_not_require_plugin_service(monkeypatch: pytest.MonkeyPatch) -> None:
+    from services.agent.roster_package_dependencies import check_package_dependencies
+
+    def unavailable(**_kwargs) -> None:
+        raise OSError("plugin service unavailable")
+
+    monkeypatch.setattr(DependenciesAnalysisService, "get_leaked_dependencies", unavailable)
+    check_package_dependencies(tenant_id="tenant-1", account=_account(), dependencies=[])
+
+
+@pytest.mark.parametrize("policy", [TenantPluginInstallPermission.NOBODY, TenantPluginInstallPermission.ADMINS])
+def test_missing_plugins_respect_workspace_install_policy(
+    monkeypatch: pytest.MonkeyPatch,
+    config_overrides: Callable[..., None],
+    sqlite_session_factory: sessionmaker[Session],
+    policy: TenantPluginInstallPermission,
+) -> None:
+    config_overrides(RBAC_ENABLED=False)
+    with sqlite_session_factory() as session, session.begin():
+        session.add(
+            TenantPluginPermission(
+                tenant_id="tenant-1", install_permission=policy, debug_permission=TenantPluginDebugPermission.NOBODY
+            )
+        )
+    monkeypatch.setattr(DependenciesAnalysisService, "get_leaked_dependencies", lambda **kwargs: kwargs["dependencies"])
+    storage = _MemoryStorage()
+    with pytest.raises(Forbidden):
+        RosterAgentPackageImporter(storage_backend=storage).import_package(
+            source=io.BytesIO(_package()), tenant_id="tenant-1", account=_account()
+        )
+    assert storage.save_count == 0
+
+
+def test_import_materializes_agent_resources_and_unpublished_draft(
+    monkeypatch: pytest.MonkeyPatch,
+    sqlite_session_factory: sessionmaker[Session],
+) -> None:
+    storage = _MemoryStorage()
+    monkeypatch.setattr("services.app_service.initialize_agent_rbac_access", lambda **_kwargs: None)
+    monkeypatch.setattr("services.app_service.SystemFeatureService.is_webapp_auth_enabled", lambda: False)
+
+    result = RosterAgentPackageImporter(
+        storage_backend=storage,
+    ).import_package(
+        source=io.BytesIO(_package()),
+        tenant_id="tenant-1",
+        account=_account(),
+    )
+
+    assert result.warnings == []
+    assert len(storage.files) == 4
+    with sqlite_session_factory() as session:
+        app = session.get(App, result.app_id)
+        agent = session.get(Agent, result.agent_id)
+        assert app is not None
+        assert app.name == "Imported Agent"
+        assert app.mode == "agent"
+        assert app.enable_site is False
+        assert app.enable_api is False
+        model_config = session.get(AppModelConfig, app.app_model_config_id)
+        assert model_config is not None
+        assert model_config.app_id == app.id
+        assert agent is not None
+        assert agent.source == AgentSource.IMPORTED
+        assert agent.scope == AgentScope.ROSTER
+        assert agent.active_config_is_published is False
+        draft = session.scalar(select(AgentConfigDraft).where(AgentConfigDraft.agent_id == agent.id))
+        assert draft is not None
+        soul = AgentSoulConfig.model_validate(draft.config_snapshot_dict)
+        assert [item.name for item in soul.config_skills] == ["config-skill", "workspace-skill"]
+        assert all(item.file_id and not item.is_missing for item in soul.config_skills)
+        assert [(item.name, item.file_kind) for item in soul.config_files] == [
+            ("guide.pdf", "upload_file"),
+            ("notes.txt", "tool_file"),
+        ]
+        assert all(item.file_id and not item.is_missing for item in soul.config_files)
+        revision = session.scalar(select(AgentConfigRevision).where(AgentConfigRevision.agent_id == agent.id))
+        assert revision is not None
+        assert revision.operation == AgentConfigRevisionOperation.IMPORT_PACKAGE
+        assert _count(session, ToolFile) == 3
+        assert _count(session, UploadFile) == 1
+        assert _count(session, Site) == 1
+        assert _count(session, InstalledApp) == 1
+        assert _count(session, AgentDebugConversation) == 1
+
+
+def test_import_rejects_binary_dependencies_before_side_effects(
+    sqlite_session_factory: sessionmaker[Session],
+) -> None:
+    storage = _MemoryStorage()
+    importer = RosterAgentPackageImporter(storage_backend=storage)
+
+    with pytest.raises(InvalidRosterAgentPackageError, match="manifest is invalid"):
+        importer.import_package(
+            source=io.BytesIO(_package(binary_dependency=True)),
+            tenant_id="tenant-1",
+            account=_account(),
+        )
+
+    assert storage.files == {}
+    with sqlite_session_factory() as session:
+        assert _count(session, App) == 0
+
+
+def test_import_marks_unavailable_knowledge_for_rebinding(
+    monkeypatch: pytest.MonkeyPatch,
+    sqlite_session_factory: sessionmaker[Session],
+) -> None:
+    storage = _MemoryStorage()
+    monkeypatch.setattr(AppService, "finalize_created_app", lambda *_args, **_kwargs: None)
+
+    result = RosterAgentPackageImporter(storage_backend=storage).import_package(
+        source=io.BytesIO(_package(missing_knowledge=True)),
+        tenant_id="tenant-1",
+        account=_account(),
+    )
+
+    assert [warning.code for warning in result.warnings] == ["agent_knowledge_unresolved"]
+    with sqlite_session_factory() as session:
+        draft = session.scalar(select(AgentConfigDraft).where(AgentConfigDraft.agent_id == result.agent_id))
+        assert draft is not None
+        soul = AgentSoulConfig.model_validate(draft.config_snapshot_dict)
+        dataset_id = soul.knowledge.sets[0].datasets[0].id
+        assert dataset_id is not None
+        assert dataset_id.startswith("missing-dataset-")
+        assert dataset_id != "missing-dataset-id"
+
+
+def test_import_validates_all_file_limits_before_staging(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    storage = _MemoryStorage()
+    monkeypatch.setattr(FileService, "file_size_limit", lambda **_kwargs: 1)
+
+    with pytest.raises(InvalidRosterAgentPackageError, match="file size limit"):
+        RosterAgentPackageImporter(storage_backend=storage).import_package(
+            source=io.BytesIO(_package()),
+            tenant_id="tenant-1",
+            account=_account(),
+        )
+
+    assert storage.files == {}
+
+
+def test_import_rejects_duplicate_agent_name_before_staging(
+    sqlite_session_factory: sessionmaker[Session],
+) -> None:
+    with sqlite_session_factory() as session, session.begin():
+        session.add(
+            Agent(
+                tenant_id="tenant-1",
+                name="Imported Agent",
+                description="",
+                role="",
+                agent_kind=AgentKind.DIFY_AGENT,
+                scope=AgentScope.ROSTER,
+                source=AgentSource.AGENT_APP,
+                status=AgentStatus.ACTIVE,
+                created_by=_account().id,
+                updated_by=_account().id,
+            )
+        )
+    storage = _MemoryStorage()
+
+    with pytest.raises(AgentNameConflictError):
+        RosterAgentPackageImporter(storage_backend=storage).import_package(
+            source=io.BytesIO(_package()),
+            tenant_id="tenant-1",
+            account=_account(),
+        )
+
+    assert storage.files == {}
+
+
+@pytest.mark.parametrize("fail_after_write", [False, True])
+def test_import_does_not_create_records_when_storage_fails(
+    sqlite_session_factory: sessionmaker[Session],
+    monkeypatch: pytest.MonkeyPatch,
+    fail_after_write: bool,
+) -> None:
+    storage = _MemoryStorage(fail_save_at=None if fail_after_write else 2)
+    if fail_after_write:
+        save = storage.save
+
+        def save_then_fail(filename: str, data: bytes) -> None:
+            save(filename, data)
+            if storage.save_count == 2:
+                raise OSError("storage write completed but acknowledgement failed")
+
+        monkeypatch.setattr(storage, "save", save_then_fail)
+
+    with pytest.raises(RosterAgentPackageResourceUnavailableError):
+        RosterAgentPackageImporter(storage_backend=storage).import_package(
+            source=io.BytesIO(_package()),
+            tenant_id="tenant-1",
+            account=_account(),
+        )
+
+    assert len(storage.files) == (2 if fail_after_write else 1)
+    assert storage.deleted == []
+    with sqlite_session_factory() as session:
+        assert _count(session, App) == 0
+        assert _count(session, ToolFile) == 0
+
+
+@pytest.mark.parametrize(
+    ("failure", "expected"),
+    [
+        (AgentNameConflictError(), AgentNameConflictError),
+        (InvalidRosterAgentPackageError(), InvalidRosterAgentPackageError),
+        (RosterAgentPackageTooLargeError(), RosterAgentPackageTooLargeError),
+        (RosterAgentPackageResourceUnavailableError(), RosterAgentPackageResourceUnavailableError),
+        (IntegrityError("insert", {}, RuntimeError("roster_unique_name")), AgentNameConflictError),
+        (IntegrityError("insert", {}, RuntimeError("other constraint")), RosterAgentPackageImportFailedError),
+        (RuntimeError("unexpected failure"), RosterAgentPackageImportFailedError),
+    ],
+)
+def test_import_preserves_error_mapping(
+    monkeypatch: pytest.MonkeyPatch, failure: Exception, expected: type[Exception]
+) -> None:
+    importer = RosterAgentPackageImporter(storage_backend=_MemoryStorage())
+
+    def fail(**_kwargs) -> None:
+        raise failure
+
+    monkeypatch.setattr(importer, "_ensure_name_available", fail)
+    with pytest.raises(expected) as caught:
+        importer.import_package(source=io.BytesIO(_package()), tenant_id="tenant-1", account=_account())
+    if isinstance(failure, expected):
+        assert caught.value is failure
+    else:
+        assert caught.value.__cause__ is failure
+
+
+def test_import_preserves_file_records_when_agent_creation_fails(
+    monkeypatch: pytest.MonkeyPatch,
+    sqlite_session_factory: sessionmaker[Session],
+) -> None:
+    storage = _MemoryStorage()
+    monkeypatch.setattr(
+        RosterAgentPackageImporter,
+        "_persist_import",
+        lambda **_kwargs: (_ for _ in ()).throw(RuntimeError("database unavailable")),
+    )
+
+    with pytest.raises(RosterAgentPackageImportFailedError):
+        RosterAgentPackageImporter(storage_backend=storage).import_package(
+            source=io.BytesIO(_package()),
+            tenant_id="tenant-1",
+            account=_account(),
+        )
+
+    assert len(storage.files) == 4
+    assert storage.deleted == []
+    with sqlite_session_factory() as session:
+        assert _count(session, App) == 0
+        assert _count(session, ToolFile) == 3
+        assert _count(session, UploadFile) == 1
+        uploaded = session.scalar(select(UploadFile))
+        assert uploaded is not None
+        assert uploaded.used is False
+
+
+@pytest.mark.parametrize("failed_phase", ["files", "agent"])
+def test_import_rolls_back_only_the_failed_transaction(
+    sqlite_session_factory: sessionmaker[Session], failed_phase: str
+) -> None:
+    storage = _MemoryStorage()
+
+    def fail_after_flush(session: Session, _flush_context) -> None:
+        target = ToolFile if failed_phase == "files" else Site
+        if any(isinstance(row, target) for row in session.new):
+            raise RuntimeError("database write failed after flush")
+
+    event.listen(sqlite_session_factory.class_, "after_flush", fail_after_flush)
+    try:
+        with pytest.raises(RosterAgentPackageImportFailedError):
+            RosterAgentPackageImporter(storage_backend=storage).import_package(
+                source=io.BytesIO(_package()), tenant_id="tenant-1", account=_account()
+            )
+    finally:
+        event.remove(sqlite_session_factory.class_, "after_flush", fail_after_flush)
+
+    assert len(storage.files) == 4
+    assert storage.deleted == []
+    with sqlite_session_factory() as session:
+        for model in (
+            App,
+            AppModelConfig,
+            Agent,
+            AgentConfigSnapshot,
+            AgentConfigRevision,
+            AgentConfigDraft,
+            AgentDebugConversation,
+            Site,
+            InstalledApp,
+        ):
+            assert _count(session, model) == 0
+        assert _count(session, ToolFile) == (0 if failed_phase == "files" else 3)
+        assert _count(session, UploadFile) == (0 if failed_phase == "files" else 1)
+        if failed_phase == "agent":
+            uploaded = session.scalar(select(UploadFile))
+            assert uploaded is not None
+            assert uploaded.used is False
+
+
+@pytest.mark.usefixtures("sqlite_session_factory")
+def test_uploads_do_not_hold_database_transactions(monkeypatch: pytest.MonkeyPatch) -> None:
+    sessions: list[Session] = []
+    create_session = session_factory.create_session
+
+    def track_session() -> Session:
+        session = create_session()
+        sessions.append(session)
+        return session
+
+    storage = _MemoryStorage()
+    save = storage.save
+
+    def save_outside_transaction(filename: str, data: bytes) -> None:
+        assert not any(session.in_transaction() for session in sessions)
+        save(filename, data)
+
+    monkeypatch.setattr(session_factory, "create_session", track_session)
+    monkeypatch.setattr(storage, "save", save_outside_transaction)
+    monkeypatch.setattr(AppService, "finalize_created_app", lambda *_args, **_kwargs: None)
+    RosterAgentPackageImporter(storage_backend=storage).import_package(
+        source=io.BytesIO(_package()), tenant_id="tenant-1", account=_account()
+    )
+    assert storage.save_count == 4
+
+
+def test_import_succeeds_when_post_commit_initialization_fails(
+    monkeypatch: pytest.MonkeyPatch,
+    sqlite_session_factory: sessionmaker[Session],
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    storage = _MemoryStorage()
+    monkeypatch.setattr(
+        AppService,
+        "finalize_created_app",
+        lambda *_args, **_kwargs: (_ for _ in ()).throw(RuntimeError("finalization failed")),
+    )
+    result = RosterAgentPackageImporter(storage_backend=storage).import_package(
+        source=io.BytesIO(_package()), tenant_id="tenant-1", account=_account()
+    )
+    assert len(storage.files) == 4
+    assert storage.deleted == []
+    assert result.warnings == []
+    assert "post-commit initialization failed" in caplog.text
+    with sqlite_session_factory() as session:
+        assert session.get(App, result.app_id) is not None
+        assert session.get(Agent, result.agent_id) is not None
+        for model in (
+            AppModelConfig,
+            AgentConfigSnapshot,
+            AgentConfigRevision,
+            AgentConfigDraft,
+            AgentDebugConversation,
+            Site,
+            InstalledApp,
+            UploadFile,
+        ):
+            assert _count(session, model) == 1
+        assert _count(session, ToolFile) == 3
+        uploaded = session.scalar(select(UploadFile))
+        assert uploaded is not None
+        assert uploaded.used is True
diff --git a/api/tests/unit_tests/services/agent/test_roster_package_service.py b/api/tests/unit_tests/services/agent/test_roster_package_service.py
index 19c0f2ccec4..eb07f2b8874 100644
--- a/api/tests/unit_tests/services/agent/test_roster_package_service.py
+++ b/api/tests/unit_tests/services/agent/test_roster_package_service.py
@@ -32,6 +32,8 @@ from services.agent.dsl_entities import AgentAppDsl, AgentPackage, AgentPackageM
 from services.agent.errors import (
     InvalidRosterAgentPackageError,
     RosterAgentPackageExportFailedError,
+    RosterAgentPackageImportFailedError,
+    RosterAgentPackageResourceUnavailableError,
     RosterAgentPackageTooLargeError,
 )
 from services.agent.roster_package_entities import (
@@ -322,10 +324,22 @@ def test_package_files_reuse_existing_dsl_file_kinds(file_kind: str) -> None:
         (InvalidRosterAgentPackageError(), "invalid_roster_agent_package", 400),
         (RosterAgentPackageTooLargeError(), "roster_agent_package_too_large", 413),
         (RosterAgentPackageExportFailedError(), "roster_agent_package_export_failed", 500),
+        (RosterAgentPackageImportFailedError(), "roster_agent_package_import_failed", 500),
+        (
+            RosterAgentPackageResourceUnavailableError(),
+            "roster_agent_package_resource_unavailable",
+            503,
+        ),
     ],
 )
 def test_roster_package_errors_use_standard_http_payload(
-    error: InvalidRosterAgentPackageError | RosterAgentPackageTooLargeError | RosterAgentPackageExportFailedError,
+    error: (
+        InvalidRosterAgentPackageError
+        | RosterAgentPackageTooLargeError
+        | RosterAgentPackageExportFailedError
+        | RosterAgentPackageImportFailedError
+        | RosterAgentPackageResourceUnavailableError
+    ),
     error_code: str,
     status: int,
 ) -> None:
diff --git a/packages/contracts/binary-zod.test.ts b/packages/contracts/binary-zod.test.ts
index dab37626fae..2aee0ffcdec 100644
--- a/packages/contracts/binary-zod.test.ts
+++ b/packages/contracts/binary-zod.test.ts
@@ -1,8 +1,28 @@
 import { describe, expect, it } from 'vite-plus/test'
+import {
+  zGetAppsByAppIdExportResponse,
+  zPostAppsImportsBody,
+} from './generated/api/console/apps/zod.gen'
 import { zPostFilesUploadBody } from './generated/api/console/files/zod.gen'
 import { zPostWorkspacesCurrentPluginUploadPkgBody } from './generated/api/console/workspaces/zod.gen'
 
 describe('generated binary schemas', () => {
+  it('accepts binary package imports alongside YAML import requests', () => {
+    const file = new File(['PK'], 'agent.ifpkg', { type: 'application/zip' })
+    expect(zPostAppsImportsBody.safeParse({ file }).success).toBe(true)
+    expect(
+      zPostAppsImportsBody.safeParse({ mode: 'yaml-content', yaml_content: 'kind: app' }).success,
+    ).toBe(true)
+    expect(zPostAppsImportsBody.safeParse({ file: 'not a binary file' }).success).toBe(false)
+  })
+
+  it('accepts both Agent archives and YAML JSON export responses', () => {
+    const archive = new File(['PK'], 'agent.ifpkg', { type: 'application/zip' })
+    expect(zGetAppsByAppIdExportResponse.safeParse(archive).success).toBe(true)
+    expect(zGetAppsByAppIdExportResponse.safeParse({ data: 'kind: app' }).success).toBe(true)
+    expect(zGetAppsByAppIdExportResponse.safeParse('kind: app').success).toBe(false)
+  })
+
   it.each([
     ['file upload', zPostFilesUploadBody, 'file'],
     ['plugin package upload', zPostWorkspacesCurrentPluginUploadPkgBody, 'pkg'],
diff --git a/packages/contracts/generated/api/console/apps/types.gen.ts b/packages/contracts/generated/api/console/apps/types.gen.ts
index fa685709fe4..bfd59c89666 100644
--- a/packages/contracts/generated/api/console/apps/types.gen.ts
+++ b/packages/contracts/generated/api/console/apps/types.gen.ts
@@ -76,6 +76,13 @@ export type Import = {
   warnings?: Array<DslImportWarning>
 }
 
+export type RosterAgentPackageConflictResponse = {
+  code: string
+  leaked_dependencies?: Array<PluginDependency>
+  message: string
+  status?: 409
+}
+
 export type CheckDependenciesResult = {
   leaked_dependencies?: Array<PluginDependency>
 }
@@ -3147,7 +3154,11 @@ export type PostAppsResponses = {
 export type PostAppsResponse = PostAppsResponses[keyof PostAppsResponses]
 
 export type PostAppsImportsData = {
-  body: AppImportPayload
+  body:
+    | AppImportPayload
+    | {
+        file: Blob | File
+      }
   path?: never
   query?: never
   url: '/apps/imports'
@@ -3155,6 +3166,9 @@ export type PostAppsImportsData = {
 
 export type PostAppsImportsErrors = {
   400: Import
+  403: unknown
+  409: RosterAgentPackageConflictResponse
+  413: unknown
 }
 
 export type PostAppsImportsError = PostAppsImportsErrors[keyof PostAppsImportsErrors]
@@ -4417,6 +4431,7 @@ export type GetAppsByAppIdExportData = {
     app_id: string
   }
   query?: {
+    format?: 'ifpkg' | 'yaml'
     include_secret?: boolean
     workflow_id?: string
   }
@@ -4428,7 +4443,7 @@ export type GetAppsByAppIdExportErrors = {
 }
 
 export type GetAppsByAppIdExportResponses = {
-  200: AppExportResponse
+  200: AppExportResponse | Blob | File
 }
 
 export type GetAppsByAppIdExportResponse =
diff --git a/packages/contracts/generated/api/console/apps/zod.gen.ts b/packages/contracts/generated/api/console/apps/zod.gen.ts
index a29b6c275de..7b20baca4ea 100644
--- a/packages/contracts/generated/api/console/apps/zod.gen.ts
+++ b/packages/contracts/generated/api/console/apps/zod.gen.ts
@@ -2258,6 +2258,16 @@ export const zPluginDependency = z.object({
   value: z.union([zGithub, zMarketplace, zPackage]),
 })
 
+/**
+ * RosterAgentPackageConflictResponse
+ */
+export const zRosterAgentPackageConflictResponse = z.object({
+  code: z.string(),
+  leaked_dependencies: z.array(zPluginDependency).optional(),
+  message: z.string(),
+  status: z.literal(409).optional().default(409),
+})
+
 /**
  * CheckDependenciesResult
  */
@@ -4244,7 +4254,12 @@ export const zPostAppsBody = zCreateAppPayload
  */
 export const zPostAppsResponse = zAppDetailWithSite
 
-export const zPostAppsImportsBody = zAppImportPayload
+export const zPostAppsImportsBody = z.union([
+  zAppImportPayload,
+  z.object({
+    file: z.custom<Blob | File>((value) => value instanceof Blob || value instanceof File),
+  }),
+])
 
 /**
  * Import completed
@@ -5041,6 +5056,7 @@ export const zGetAppsByAppIdExportPath = z.object({
 })
 
 export const zGetAppsByAppIdExportQuery = z.object({
+  format: z.enum(['ifpkg', 'yaml']).optional(),
   include_secret: z.boolean().optional().default(false),
   workflow_id: z.string().optional(),
 })
@@ -5048,7 +5064,10 @@ export const zGetAppsByAppIdExportQuery = z.object({
 /**
  * App exported successfully
  */
-export const zGetAppsByAppIdExportResponse = zAppExportResponse
+export const zGetAppsByAppIdExportResponse = z.union([
+  zAppExportResponse,
+  z.custom<Blob | File>((value) => value instanceof Blob || value instanceof File),
+])
 
 export const zPostAppsByAppIdFeedbacksBody = zMessageFeedbackPayload
 
diff --git a/packages/contracts/openapi-ts.api.config.ts b/packages/contracts/openapi-ts.api.config.ts
index a2b272336cb..05d91cd0852 100644
--- a/packages/contracts/openapi-ts.api.config.ts
+++ b/packages/contracts/openapi-ts.api.config.ts
@@ -261,7 +261,31 @@ const filterContractOperations = (document: SwaggerDocument) => {
   }
 }
 
-const includeEventStreamInJsonResponseSchemas = (document: SwaggerDocument) => {
+const includeMultipartRequestSchemas = (document: SwaggerDocument) => {
+  for (const pathItem of Object.values(document.paths ?? {})) {
+    for (const [method, operation] of Object.entries(pathItem)) {
+      if (!operationMethods.has(method) || !isObject(operation) || !isObject(operation.requestBody))
+        continue
+      const content = operation.requestBody.content
+      if (!isObject(content)) continue
+      const json = content['application/json']
+      const multipart = content['multipart/form-data']
+      if (
+        !isObject(json) ||
+        !isObject(json.schema) ||
+        !isObject(multipart) ||
+        !isObject(multipart.schema)
+      )
+        continue
+
+      // hey-api selects JSON for mixed request media; retain the multipart shape
+      // so the generated client can serialize File values as FormData.
+      json.schema = { anyOf: [json.schema, multipart.schema] }
+    }
+  }
+}
+
+const includeNonJsonResponseSchemas = (document: SwaggerDocument) => {
   for (const pathItem of Object.values(document.paths ?? {})) {
     for (const [method, operation] of Object.entries(pathItem)) {
       if (!operationMethods.has(method) || !isObject(operation)) continue
@@ -272,21 +296,22 @@ const includeEventStreamInJsonResponseSchemas = (document: SwaggerDocument) => {
         if (!/^2\d\d$/.test(status) || !isObject(response) || !isObject(response.content)) continue
 
         const jsonMedia = response.content['application/json']
-        const eventStreamMedia = response.content['text/event-stream']
-        if (
-          !isObject(jsonMedia) ||
-          !isObject(jsonMedia.schema) ||
-          !isObject(eventStreamMedia) ||
-          !isObject(eventStreamMedia.schema)
-        ) {
-          continue
+        if (!isObject(jsonMedia) || !isObject(jsonMedia.schema)) continue
+
+        const alternatives: SwaggerSchema[] = []
+        for (const [mediaType, media] of Object.entries(response.content)) {
+          if (mediaType === 'application/json' || !isObject(media) || !isObject(media.schema))
+            continue
+          if (mediaType === 'text/event-stream' || media.schema.format === 'binary')
+            alternatives.push(media.schema)
         }
+        if (alternatives.length === 0) continue
 
         // hey-api selects the JSON schema when one status advertises multiple
-        // response media types. Preserve the SSE transport in the generated
+        // response media types. Preserve SSE and binary transports in the generated
         // TypeScript and Zod contracts by making that selected schema a union.
         jsonMedia.schema = {
-          anyOf: [jsonMedia.schema, eventStreamMedia.schema],
+          anyOf: [jsonMedia.schema, ...alternatives],
         }
       }
     }
@@ -369,7 +394,8 @@ const normalizeApiSwagger = (document: SwaggerDocument) => {
   normalizeOpaqueContractResponses(document)
   filterContractOperations(document)
   addOperationIds(document)
-  includeEventStreamInJsonResponseSchemas(document)
+  includeMultipartRequestSchemas(document)
+  includeNonJsonResponseSchemas(document)
   // OpenAPI defaults describe server behavior. Keep them in the exported specs,
   // but do not let Zod synthesize omitted transport fields during client-side
   // request or response validation. Non-null defaults remain useful for query
diff --git a/web/app/components/app/__tests__/use-export-app-dsl.spec.tsx b/web/app/components/app/__tests__/use-export-app-dsl.spec.tsx
index 315b6adb42c..cd54f987bc9 100644
--- a/web/app/components/app/__tests__/use-export-app-dsl.spec.tsx
+++ b/web/app/components/app/__tests__/use-export-app-dsl.spec.tsx
@@ -59,6 +59,33 @@ describe('useExportAppDsl', () => {
     mocks.getEnvironmentVariables.mockResolvedValue({ items: [] })
   })
 
+  it.each([
+    ['download.ifpkg', 'download.ifpkg'],
+    ['blob', 'Support Agent.ifpkg'],
+  ])('downloads binary exports using %s without rebuilding their bytes', async (name, fileName) => {
+    const archive = new File([new Uint8Array([0x50, 0x4b, 0x03, 0x04, 0x00, 0xff])], name, {
+      type: 'application/zip',
+    })
+    mocks.exportAppDsl.mockResolvedValue(archive)
+    const { result } = renderHook(() => useExportAppDsl(), { wrapper: createWrapper() })
+
+    await act(async () => {
+      await expect(
+        result.current.exportAppDsl({
+          appId: 'agent-app-id',
+          appName: 'Support Agent',
+        }),
+      ).resolves.toEqual({ status: 'downloaded' })
+    })
+
+    expect(mocks.downloadBlob).toHaveBeenCalledWith({ data: archive, fileName })
+    const [{ data }] = mocks.downloadBlob.mock.calls[0] as [{ data: Blob }]
+    expect(new Uint8Array(await data.arrayBuffer())).toEqual(
+      new Uint8Array([0x50, 0x4b, 0x03, 0x04, 0x00, 0xff]),
+    )
+    expect(mocks.getEnvironmentVariables).not.toHaveBeenCalled()
+  })
+
   it('exports through the generated client and hands the YAML file to the browser', async () => {
     mocks.exportAppDsl.mockResolvedValue({ data: 'kind: app\nversion: 0.1.5\n' })
     const { result } = renderHook(() => useExportAppDsl(), { wrapper: createWrapper() })
diff --git a/web/app/components/app/create-from-dsl-modal/__tests__/index.spec.tsx b/web/app/components/app/create-from-dsl-modal/__tests__/index.spec.tsx
index 0707531b0b7..fc0af74cfae 100644
--- a/web/app/components/app/create-from-dsl-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/create-from-dsl-modal/__tests__/index.spec.tsx
@@ -166,6 +166,63 @@ describe('CreateFromDSLModal', () => {
 
   const getCreateButton = () => screen.getByRole('button', { name: /newApp\.Create/i })
 
+  it.each(['agent.ifpkg', 'agent.IFPKG'])(
+    'imports %s as a binary file and handles Agent warnings',
+    async (filename) => {
+      const user = userEvent.setup()
+      const file = new File([new Uint8Array([0x50, 0x4b, 0x00, 0xff])], filename)
+      const readText = vi.spyOn(file, 'text')
+      const onClose = vi.fn()
+      mockImportDSL.mockResolvedValue({
+        id: 'package-import',
+        status: 'completed-with-warnings',
+        app_id: 'agent-app',
+        app_mode: AppModeEnum.AGENT,
+        warnings: [
+          { code: 'agent_skill_missing', path: 'skills.s_000001', message: 'Missing Skill' },
+        ],
+      })
+      render(<CreateFromDSLModal show onClose={onClose} droppedFile={file} />)
+      await user.click(getCreateButton())
+
+      await waitFor(() => expect(mockImportDSL).toHaveBeenCalledWith({ file }))
+      expect(readText).not.toHaveBeenCalled()
+      expect(onClose).toHaveBeenCalledTimes(1)
+      expect(toastMocks.call).toHaveBeenCalledWith(expect.any(String), {
+        type: 'warning',
+        description: expect.anything(),
+      })
+      expect(mockResolveImportedAppRedirectionTarget).toHaveBeenCalledWith({
+        id: 'agent-app',
+        mode: AppModeEnum.AGENT,
+        permission_keys: undefined,
+      })
+    },
+  )
+
+  it('accepts an ifpkg from the file picker even when the ordinary App quota is full', async () => {
+    const user = userEvent.setup()
+    appCount = 10
+    appLimit = 10
+    mockImportDSL.mockResolvedValue({
+      id: 'import',
+      status: 'completed',
+      app_mode: AppModeEnum.AGENT,
+    })
+    render(<CreateFromDSLModal show onClose={vi.fn()} />)
+    const input = document.querySelector<HTMLInputElement>('input[type="file"]')
+    expect(input).not.toBeNull()
+    if (!input) throw new Error('Missing file picker')
+    const file = new File(['PK'], 'agent.ifpkg')
+    await user.upload(input, file)
+
+    expect(await screen.findByText('agent.ifpkg')).toBeInTheDocument()
+    expect(screen.getByText('IFPKG')).toBeInTheDocument()
+    expect(screen.queryByText('apps-full')).not.toBeInTheDocument()
+    await user.click(getCreateButton())
+    await waitFor(() => expect(mockImportDSL).toHaveBeenCalledWith({ file }))
+  })
+
   it('should render the file tab and show the dropped file', async () => {
     render(
       <CreateFromDSLModal
diff --git a/web/app/components/app/create-from-dsl-modal/index.tsx b/web/app/components/app/create-from-dsl-modal/index.tsx
index 5959ac3f7d6..95a0cdf0ba1 100644
--- a/web/app/components/app/create-from-dsl-modal/index.tsx
+++ b/web/app/components/app/create-from-dsl-modal/index.tsx
@@ -103,6 +103,12 @@ function CreateFromDSLModal({
   )
   const importMutation = useMutation({
     mutationFn: async (source: ImportSource) => {
+      if (
+        source.type === CreateFromDSLModalTab.FROM_FILE &&
+        source.file.name.toLowerCase().endsWith('.ifpkg')
+      )
+        return requestImport({ body: { file: source.file } })
+
       const body =
         source.type === CreateFromDSLModalTab.FROM_FILE
           ? ({
@@ -134,9 +140,14 @@ function CreateFromDSLModal({
       select: (data) => data.apps,
     }),
   )
-  const isAppQuotaUnavailable = deploymentEdition === 'CLOUD' && appQuota === undefined
+  const isPackageImport =
+    currentTab === CreateFromDSLModalTab.FROM_FILE &&
+    currentFile?.name.toLowerCase().endsWith('.ifpkg') === true
+  const isAppQuotaUnavailable =
+    !isPackageImport && deploymentEdition === 'CLOUD' && appQuota === undefined
   // A limit of 0 means unlimited.
   const isAppsFull =
+    !isPackageImport &&
     deploymentEdition === 'CLOUD' &&
     appQuota !== undefined &&
     appQuota.limit > 0 &&
@@ -309,6 +320,8 @@ function CreateFromDSLModal({
                   className="px-6 py-4"
                 >
                   <Uploader
+                    accept=".yaml,.yml,.ifpkg"
+                    displayName={isPackageImport ? 'IFPKG' : 'YAML'}
                     browseButtonRef={browseButtonRef}
                     className="mt-0"
                     file={currentFile}
diff --git a/web/app/components/app/use-export-app-dsl.ts b/web/app/components/app/use-export-app-dsl.ts
index 5d1975d2c18..32533de40d4 100644
--- a/web/app/components/app/use-export-app-dsl.ts
+++ b/web/app/components/app/use-export-app-dsl.ts
@@ -40,7 +40,7 @@ async function getSecretEnvironmentVariables(appId: string) {
 }
 
 async function exportAppDslFile({ appId, appName, includeSecret = false }: ExportAppDslInput) {
-  const { data } = await consoleClient.apps.byAppId.export.get(
+  const response = await consoleClient.apps.byAppId.export.get(
     {
       params: { app_id: appId },
       query: { include_secret: includeSecret },
@@ -48,8 +48,17 @@ async function exportAppDslFile({ appId, appName, includeSecret = false }: Expor
     { context: { silent: true } },
   )
 
+  if (response instanceof Blob) {
+    const name = response instanceof File ? response.name : undefined
+    downloadBlob({
+      data: response,
+      fileName: name && name !== 'blob' ? name : `${appName}.ifpkg`,
+    })
+    return
+  }
+
   downloadBlob({
-    data: new Blob([data], { type: 'application/yaml' }),
+    data: new Blob([response.data], { type: 'application/yaml' }),
     fileName: `${appName}.yml`,
   })
 }
diff --git a/web/app/components/apps/hooks/__tests__/use-dsl-drag-drop.spec.ts b/web/app/components/apps/hooks/__tests__/use-dsl-drag-drop.spec.ts
index 8a8a534fceb..36312a31572 100644
--- a/web/app/components/apps/hooks/__tests__/use-dsl-drag-drop.spec.ts
+++ b/web/app/components/apps/hooks/__tests__/use-dsl-drag-drop.spec.ts
@@ -188,24 +188,27 @@ describe('useDSLDragDrop', () => {
   })
 
   describe('Drop functionality', () => {
-    it('should call onDSLFileDropped for .yaml file', () => {
-      const dropZoneRef = { current: container }
-      renderHook(() =>
-        useDSLDragDrop({
-          onDSLFileDropped: mockOnDSLFileDropped,
-          dropZoneRef,
-        }),
-      )
+    it.each(['test.yaml', 'agent.ifpkg', 'agent.IFPKG'])(
+      'should call onDSLFileDropped for %s',
+      (filename) => {
+        const dropZoneRef = { current: container }
+        renderHook(() =>
+          useDSLDragDrop({
+            onDSLFileDropped: mockOnDSLFileDropped,
+            dropZoneRef,
+          }),
+        )
 
-      const file = createMockFile('test.yaml')
-      const dropEvent = createDragEvent('drop', [file])
+        const file = createMockFile(filename)
+        const dropEvent = createDragEvent('drop', [file])
 
-      act(() => {
-        container.dispatchEvent(dropEvent)
-      })
+        act(() => {
+          container.dispatchEvent(dropEvent)
+        })
 
-      expect(mockOnDSLFileDropped).toHaveBeenCalledWith(file)
-    })
+        expect(mockOnDSLFileDropped).toHaveBeenCalledWith(file)
+      },
+    )
 
     it('should call onDSLFileDropped for .yml file', () => {
       const dropZoneRef = { current: container }
diff --git a/web/app/components/apps/hooks/use-dsl-drag-drop.ts b/web/app/components/apps/hooks/use-dsl-drag-drop.ts
index 53198fc4eba..dd33c84cfae 100644
--- a/web/app/components/apps/hooks/use-dsl-drag-drop.ts
+++ b/web/app/components/apps/hooks/use-dsl-drag-drop.ts
@@ -42,8 +42,7 @@ export const useDSLDragDrop = ({
     if (files.length === 0) return
 
     const file = files[0]
-    if (file!.name.toLowerCase().endsWith('.yaml') || file!.name.toLowerCase().endsWith('.yml'))
-      onDSLFileDropped(file!)
+    if (/\.(?:yaml|yml|ifpkg)$/i.test(file!.name)) onDSLFileDropped(file!)
   })
 
   useEffect(() => {
diff --git a/web/service/console/client.spec.ts b/web/service/console/client.spec.ts
index d065ba52279..e954aaf1751 100644
--- a/web/service/console/client.spec.ts
+++ b/web/service/console/client.spec.ts
@@ -199,6 +199,61 @@ describe('consoleQuery transport context', () => {
     vi.restoreAllMocks()
   })
 
+  it('uploads ifpkg imports as multipart files without decoding their bytes as YAML', async () => {
+    const bytes = new Uint8Array([0x50, 0x4b, 0x03, 0x04, 0x00, 0xff])
+    const file = new File([bytes], 'agent.ifpkg', { type: 'application/zip' })
+    const request = vi.fn().mockResolvedValue(
+      new Response(JSON.stringify({ id: 'import-1', status: 'completed' }), {
+        status: 200,
+        headers: { 'content-type': 'application/json' },
+      }),
+    )
+    const consoleQuery = await loadConsoleQueryWithRequest(request)
+    const mutation = new MutationObserver(
+      new QueryClient(),
+      consoleQuery.apps.imports.post.mutationOptions(),
+    )
+    await mutation.mutate({ body: { file } })
+
+    const outgoing = request.mock.calls[0]?.[2]?.request as Request
+    expect(outgoing.url).toContain('/apps/imports')
+    expect(outgoing.headers.get('content-type')).toContain('multipart/form-data; boundary=')
+    const form = await outgoing.formData()
+    expect(Array.from(form.keys())).toEqual(['file'])
+    const uploaded = form.get('file')
+    expect(uploaded).toBeInstanceOf(File)
+    if (!(uploaded instanceof File)) throw new TypeError('Expected an uploaded archive')
+    expect(uploaded.name).toBe('agent.ifpkg')
+    expect(new Uint8Array(await uploaded.arrayBuffer())).toEqual(bytes)
+  })
+
+  it('preserves archive bytes and the download filename for App exports', async () => {
+    const bytes = new Uint8Array([0x50, 0x4b, 0x03, 0x04, 0x00, 0xff])
+    const request = vi.fn().mockResolvedValue(
+      new Response(bytes, {
+        status: 200,
+        headers: {
+          'content-type': 'application/zip',
+          'content-disposition': 'attachment; filename="agent.ifpkg"',
+        },
+      }),
+    )
+    const consoleQuery = await loadConsoleQueryWithRequest(request)
+    const options = consoleQuery.apps.byAppId.export.get.queryOptions({
+      input: { params: { app_id: 'app-1' } },
+      context: { silent: true },
+    })
+    const result = await options.queryFn({
+      signal: new AbortController().signal,
+    } as QueryFunctionContext)
+
+    expect(result).toBeInstanceOf(File)
+    if (!(result instanceof File)) throw new TypeError('Expected an archive download')
+    expect(result.name).toBe('agent.ifpkg')
+    expect(result.type).toBe('application/zip')
+    expect(new Uint8Array(await result.arrayBuffer())).toEqual(bytes)
+  })
+
   it('should forward silent context to the base request transport', async () => {
     const request = vi.fn().mockResolvedValue(
       new Response(JSON.stringify({}), {
diff --git a/web/service/console/query-policies.ts b/web/service/console/query-policies.ts
index 4838d3e9282..2a6f97db8a7 100644
--- a/web/service/console/query-policies.ts
+++ b/web/service/console/query-policies.ts
@@ -179,7 +179,7 @@ export function createConsoleQuery(consoleClient: ConsoleClient) {
               onSuccess: (data, variables, _onMutateResult, context) => {
                 if (data.status !== 'completed' && data.status !== 'completed-with-warnings') return
 
-                if (!variables.body.app_id) {
+                if (!('app_id' in variables.body) || !variables.body.app_id) {
                   void context.client.invalidateQueries({
                     queryKey: consoleQuery.features.get.key(),
                   })

From bba566540d7b8eb05de30453d1798756217eb785 Mon Sep 17 00:00:00 2001
From: Keith <148296621+keith991001@users.noreply.github.com>
Date: Thu, 17 Sep 2026 07:59:00 +0000
Subject: [PATCH 26/28] refactor(models): drop implicit-session getters on
 Conversation/Message inputs and model_config (#42335)

---
 api/core/memory/token_buffer_memory.py        |  4 ++-
 api/core/ops/ops_trace_manager.py             |  2 +-
 api/models/model.py                           | 28 +++++++------------
 .../test_conversation_message_inputs.py       |  6 ++--
 .../unit_tests/models/test_app_models.py      | 26 +++++++++++++----
 api/tests/unit_tests/models/test_model.py     |  6 ++--
 6 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/api/core/memory/token_buffer_memory.py b/api/core/memory/token_buffer_memory.py
index b83f3b84274..8b050d92c1c 100644
--- a/api/core/memory/token_buffer_memory.py
+++ b/api/core/memory/token_buffer_memory.py
@@ -64,7 +64,9 @@ class TokenBufferMemory:
         """
         match self.conversation.mode:
             case AppMode.AGENT_CHAT | AppMode.COMPLETION | AppMode.CHAT:
-                file_extra_config = FileUploadConfigManager.convert(self.conversation.model_config)
+                file_extra_config = FileUploadConfigManager.convert(
+                    self.conversation.model_config_with_session(session=db.session())
+                )
             case AppMode.ADVANCED_CHAT | AppMode.WORKFLOW:
                 app = self.conversation.app
                 if not app:
diff --git a/api/core/ops/ops_trace_manager.py b/api/core/ops/ops_trace_manager.py
index 34679afc139..c7a1fcfb512 100644
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@@ -1188,7 +1188,7 @@ class TraceTask:
         dataset_retrieval_trace_info = DatasetRetrievalTraceInfo(
             trace_id=self.trace_id,
             message_id=message_id,
-            inputs=message_data.query or message_data.inputs,
+            inputs=message_data.query or message_data.inputs_with_session(session=db.session()),
             documents=doc_list,
             start_time=timer.get("start"),
             end_time=timer.get("end"),
diff --git a/api/models/model.py b/api/models/model.py
index 7b94b4e38c0..0cd3c2e16eb 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -1183,12 +1183,7 @@ class Conversation(Base):
 
     is_deleted: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.false())
 
-    @property
-    def inputs(self) -> dict[str, Any]:
-        return self.inputs_with_session(session=db.session())
-
-    @inputs.setter
-    def inputs(self, value: Mapping[str, Any]):
+    def _set_inputs(self, value: Mapping[str, Any]):
         inputs = dict(value)
         for k, v in inputs.items():
             match v:
@@ -1199,6 +1194,9 @@ class Conversation(Base):
                         inputs[k] = [item.model_dump() for item in v if isinstance(item, File)]
         self._inputs = inputs
 
+    # Write-only: reading requires a session, use inputs_with_session instead.
+    inputs = property(fset=_set_inputs)
+
     def inputs_with_session(self, *, session: Session) -> dict[str, Any]:
         inputs = self._inputs.copy()
         # Compatibility bridge: stored input payloads may come from before or after the
@@ -1242,10 +1240,6 @@ class Conversation(Base):
 
         return inputs
 
-    @property
-    def model_config(self) -> AppModelConfigDict:
-        return self.model_config_with_session(session=db.session())
-
     def model_config_with_session(self, *, session: Session) -> AppModelConfigDict:
         model_config = cast(AppModelConfigDict, {})
         app_model_config: AppModelConfig | None = None
@@ -1428,7 +1422,7 @@ class Conversation(Base):
             "mode": self.mode,
             "name": self.name,
             "summary": self.summary,
-            "inputs": self.inputs,
+            "inputs": self.inputs_with_session(session=db.session()),
             "introduction": self.introduction,
             "system_instruction": self.system_instruction,
             "system_instruction_tokens": self.system_instruction_tokens,
@@ -1504,12 +1498,7 @@ class Message(Base):
     workflow_run_id: Mapped[str | None] = mapped_column(StringUUID)
     app_mode: Mapped[AppMode | None] = mapped_column(EnumText(AppMode, length=255), nullable=True)
 
-    @property
-    def inputs(self) -> dict[str, Any]:
-        return self.inputs_with_session(session=db.session())
-
-    @inputs.setter
-    def inputs(self, value: Mapping[str, Any]):
+    def _set_inputs(self, value: Mapping[str, Any]):
         inputs = dict(value)
         for k, v in inputs.items():
             match v:
@@ -1521,6 +1510,9 @@ class Message(Base):
                         inputs[k] = [item.model_dump() for item in v_list if isinstance(item, File)]
         self._inputs = inputs
 
+    # Write-only: reading requires a session, use inputs_with_session instead.
+    inputs = property(fset=_set_inputs)
+
     def inputs_with_session(self, *, session: Session) -> dict[str, Any]:
         inputs = self._inputs.copy()
         # Compatibility bridge: message inputs are persisted as JSON and must remain
@@ -1799,7 +1791,7 @@ class Message(Base):
             "app_id": self.app_id,
             "conversation_id": self.conversation_id,
             "model_id": self.model_id,
-            "inputs": self.inputs,
+            "inputs": self.inputs_with_session(session=db.session()),
             "query": self.query,
             "total_price": self.total_price,
             "message": self.message,
diff --git a/api/tests/test_containers_integration_tests/models/test_conversation_message_inputs.py b/api/tests/test_containers_integration_tests/models/test_conversation_message_inputs.py
index f10f519e250..45cb28cd169 100644
--- a/api/tests/test_containers_integration_tests/models/test_conversation_message_inputs.py
+++ b/api/tests/test_containers_integration_tests/models/test_conversation_message_inputs.py
@@ -80,7 +80,7 @@ class TestConversationMessageInputsTenantResolution:
             owner = owner_cls(app_id=app.id)
             owner.inputs = {"file": _build_local_file_mapping("upload-1")}
 
-            restored_inputs = owner.inputs
+            restored_inputs = owner.inputs_with_session(session=db_session_with_containers)
 
         # The tenant_id should come from the real App row in the DB
         assert restored_inputs["file"] == {"tenant_id": app.tenant_id, "upload_file_id": "upload-1"}
@@ -108,7 +108,7 @@ class TestConversationMessageInputsTenantResolution:
             owner = owner_cls(app_id=app.id)
             owner.inputs = {"file": _build_local_file_mapping("upload-1", tenant_id=payload_tenant_id)}
 
-            restored_inputs = owner.inputs
+            restored_inputs = owner.inputs_with_session(session=db_session_with_containers)
 
         assert restored_inputs["file"] == {"tenant_id": payload_tenant_id, "upload_file_id": "upload-1"}
         assert len(build_calls) == 1
@@ -139,7 +139,7 @@ class TestConversationMessageInputsTenantResolution:
                 ]
             }
 
-            restored_inputs = owner.inputs
+            restored_inputs = owner.inputs_with_session(session=db_session_with_containers)
 
         assert len(build_calls) == 2
         assert all(call[1] == app.tenant_id for call in build_calls)
diff --git a/api/tests/unit_tests/models/test_app_models.py b/api/tests/unit_tests/models/test_app_models.py
index 3ae1824a2e9..50e439fb7d0 100644
--- a/api/tests/unit_tests/models/test_app_models.py
+++ b/api/tests/unit_tests/models/test_app_models.py
@@ -634,8 +634,8 @@ class TestConversationModel:
         assert conversation.from_source == "api"
         assert conversation.from_end_user_id == from_end_user_id
 
-    def test_conversation_with_inputs(self):
-        """Test conversation inputs property."""
+    def test_conversation_with_inputs(self, sqlite_session: Session):
+        """Test conversation inputs round-trip through the session-aware accessor."""
         # Arrange
         inputs = {"query": "Hello", "context": "test"}
         conversation = Conversation(
@@ -649,11 +649,18 @@ class TestConversationModel:
         conversation._inputs = inputs
 
         # Act
-        result = conversation.inputs
+        result = conversation.inputs_with_session(session=sqlite_session)
 
         # Assert
         assert result == inputs
 
+    def test_conversation_inputs_is_write_only(self):
+        """Reading conversation.inputs must fail loudly; reads go through inputs_with_session."""
+        conversation = Conversation(app_id=str(uuid4()), _inputs={})
+
+        with pytest.raises(AttributeError, match="no getter"):
+            _ = conversation.inputs
+
     def test_conversation_inputs_setter(self):
         """Test conversation inputs setter."""
         # Arrange
@@ -878,8 +885,8 @@ class TestMessageModel:
         assert message.currency == "USD"
         assert message.from_source == "api"
 
-    def test_message_with_inputs(self):
-        """Test message inputs property."""
+    def test_message_with_inputs(self, sqlite_session: Session):
+        """Test message inputs round-trip through the session-aware accessor."""
         # Arrange
         inputs = {"query": "Hello", "context": "test"}
         message = Message(
@@ -896,11 +903,18 @@ class TestMessageModel:
         )
 
         # Act
-        result = message.inputs
+        result = message.inputs_with_session(session=sqlite_session)
 
         # Assert
         assert result == inputs
 
+    def test_message_inputs_is_write_only(self):
+        """Reading message.inputs must fail loudly; reads go through inputs_with_session."""
+        message = Message(app_id=str(uuid4()), _inputs={})
+
+        with pytest.raises(AttributeError, match="no getter"):
+            _ = message.inputs
+
     def test_message_inputs_setter(self):
         """Test message inputs setter."""
         # Arrange
diff --git a/api/tests/unit_tests/models/test_model.py b/api/tests/unit_tests/models/test_model.py
index 39a84d64d7e..47b9aeb9074 100644
--- a/api/tests/unit_tests/models/test_model.py
+++ b/api/tests/unit_tests/models/test_model.py
@@ -104,7 +104,9 @@ def _build_local_file_mapping(record_id: str, *, tenant_id: str | None = None) -
 
 
 @pytest.mark.parametrize("owner_cls", [Conversation, Message])
-def test_inputs_restore_external_remote_url_file_mappings(owner_cls: type[Conversation] | type[Message]) -> None:
+def test_inputs_restore_external_remote_url_file_mappings(
+    owner_cls: type[Conversation] | type[Message], sqlite_session: Session
+) -> None:
     owner = owner_cls(app_id="app-1")
     owner.inputs = {
         "file": {
@@ -119,7 +121,7 @@ def test_inputs_restore_external_remote_url_file_mappings(owner_cls: type[Conver
         }
     }
 
-    restored_file = owner.inputs["file"]
+    restored_file = owner.inputs_with_session(session=sqlite_session)["file"]
 
     assert restored_file.transfer_method == FileTransferMethod.REMOTE_URL
     assert restored_file.remote_url == "https://example.com/report.pdf"

From b107d5abd479810d2b6aefeca4b0c803a496bb47 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 17 Sep 2026 08:01:15 +0000
Subject: [PATCH 27/28] fix(workflow): restore node focus and standardize panel
 controls (#42410)

---
 .../keyboard-node-movement.browser.spec.tsx   |  24 +--
 .../block-selector/__tests__/index.spec.tsx   |   5 +-
 .../workflow/block-selector/index.tsx         |  25 ++-
 .../use-node-keyboard-interactions.spec.tsx   |  34 ++--
 .../hooks/use-node-keyboard-interactions.ts   |  14 +-
 .../nodes/_base/__tests__/node.spec.tsx       |  44 ++---
 .../__tests__/node-focus.browser.spec.tsx     | 181 ++++++++++++++++++
 .../__tests__/node-handle.browser.spec.tsx    |   1 +
 .../components/__tests__/node-handle.spec.tsx |  16 +-
 .../nodes/_base/components/help-link.tsx      |   9 +-
 .../nodes/_base/components/node-control.tsx   |   9 +-
 .../nodes/_base/components/node-handle.tsx    |  45 ++++-
 .../components/title-description-input.tsx    |   2 +-
 .../_base/components/workflow-panel/index.tsx |  20 +-
 .../components/workflow/nodes/_base/node.tsx  |  23 +--
 15 files changed, 330 insertions(+), 122 deletions(-)
 create mode 100644 web/app/components/workflow/nodes/_base/components/__tests__/node-focus.browser.spec.tsx

diff --git a/web/app/components/workflow/__tests__/keyboard-node-movement.browser.spec.tsx b/web/app/components/workflow/__tests__/keyboard-node-movement.browser.spec.tsx
index 92f1284f4ab..3ece71d143b 100644
--- a/web/app/components/workflow/__tests__/keyboard-node-movement.browser.spec.tsx
+++ b/web/app/components/workflow/__tests__/keyboard-node-movement.browser.spec.tsx
@@ -44,22 +44,11 @@ const nodes = [
   },
 ]
 const edges = [{ id: 'connection', source: 'node', target: 'output', type: 'straight' }]
-function TestNode({ id, data }: NodeProps) {
-  const store = useStoreApi()
+function TestNode({ data }: NodeProps) {
   return (
     <div style={{ width: 200, height: 100 }}>
       <Handle type="target" position={Position.Left} />
-      <button
-        type="button"
-        aria-label={`Select ${data.title}`}
-        data-node-keyboard-target
-        onClick={() => {
-          const { getNodes, setNodes } = store.getState()
-          setNodes(getNodes().map((node) => ({ ...node, selected: node.id === id })))
-        }}
-      >
-        {data.title}
-      </button>
+      <span>{data.title}</span>
       <textarea className="nodrag" aria-label={`${data.title} editor`} />
       <Handle type="source" position={Position.Right} />
     </div>
@@ -126,12 +115,10 @@ it('moves a Tab-focused node without selecting it first, at canvas scale without
   expect(edge.element().getBoundingClientRect().y).toBe(initialEdge.y + 10)
   await expect.element(node).toHaveFocus()
   await userEvent.tab()
-  await userEvent.tab()
   await expect.element(screen.getByRole('textbox', { name: 'Code editor' })).toHaveFocus()
   await userEvent.keyboard('{ArrowRight}')
   expect(node.element().getBoundingClientRect().x).toBe(initial.x + 2.5)
   await userEvent.tab({ shift: true })
-  await userEvent.tab({ shift: true })
   await userEvent.keyboard('{Escape}{ArrowRight}')
   await expect.poll(() => node.element().getBoundingClientRect().x).toBe(initial.x + 5)
 })
@@ -143,9 +130,8 @@ it('keeps a connected edge attached when a click-selected node moves with the ke
   const node = screen.getByRole('button', { name: 'Code', exact: true })
   const edge = screen.getByRole('img', { name: 'Edge from node to output' })
   await expect.element(edge).toBeVisible()
-  const header = screen.getByRole('button', { name: 'Select Code' })
-  await header.click()
-  await expect.element(header).toHaveFocus()
+  await screen.getByText('Code', { exact: true }).click()
+  await expect.element(node).toHaveFocus()
   const initialNode = node.element().getBoundingClientRect()
   const initialEdge = edge.element().getBoundingClientRect()
 
@@ -158,5 +144,5 @@ it('keeps a connected edge attached when a click-selected node moves with the ke
   await expect.poll(() => node.element().getBoundingClientRect().x).toBe(initialNode.x - 7.5)
   expect(edge.element().getBoundingClientRect().x).toBe(initialEdge.x - 7.5)
   expect(edge.element().getBoundingClientRect().right).toBe(initialEdge.right)
-  await expect.element(header).toHaveFocus()
+  await expect.element(node).toHaveFocus()
 })
diff --git a/web/app/components/workflow/block-selector/__tests__/index.spec.tsx b/web/app/components/workflow/block-selector/__tests__/index.spec.tsx
index 8c3fea6a174..65673beaebf 100644
--- a/web/app/components/workflow/block-selector/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/index.spec.tsx
@@ -205,7 +205,10 @@ describe('BlockSelector', () => {
     await user.type(searchInput, 'webhook')
     await user.click(screen.getByRole('button', { name: 'selector-open' }))
 
-    expect(onOpenChange).toHaveBeenCalledWith(false)
+    expect(onOpenChange).toHaveBeenCalledWith(
+      false,
+      expect.objectContaining({ reason: 'trigger-press' }),
+    )
     expect(screen.getByRole('tab', { name: 'workflow.tabs.start' })).toHaveAttribute(
       'aria-selected',
       'true',
diff --git a/web/app/components/workflow/block-selector/index.tsx b/web/app/components/workflow/block-selector/index.tsx
index 286f5882b72..3a91e2926ac 100644
--- a/web/app/components/workflow/block-selector/index.tsx
+++ b/web/app/components/workflow/block-selector/index.tsx
@@ -1,5 +1,10 @@
-import type { PopoverPositionerProps, PopoverTriggerProps } from '@langgenius/dify-ui/popover'
-import type { CSSProperties, KeyboardEvent, MouseEventHandler } from 'react'
+import type {
+  PopoverPopupProps,
+  PopoverPositionerProps,
+  PopoverProps,
+  PopoverTriggerProps,
+} from '@langgenius/dify-ui/popover'
+import type { CSSProperties, KeyboardEvent, MouseEventHandler, Ref } from 'react'
 import type {
   CommonNodeType,
   NodeDefault,
@@ -34,8 +39,13 @@ export type BlockSelectorProps = Pick<
   PopoverPositionerProps,
   'alignOffset' | 'placement' | 'sideOffset'
 > & {
+  finalFocus?: PopoverPopupProps['finalFocus']
+  triggerRef?: Ref<HTMLButtonElement>
   open?: boolean
-  onOpenChange?: (open: boolean) => void
+  onOpenChange?: (
+    open: boolean,
+    details?: Parameters<NonNullable<PopoverProps['onOpenChange']>>[1],
+  ) => void
   onSelect: OnSelectBlock
   trigger?: NonNullable<PopoverTriggerProps['render']>
   triggerTooltip?: string
@@ -64,6 +74,8 @@ function BlockSelector({
   onSelect,
   trigger,
   triggerTooltip,
+  triggerRef,
+  finalFocus,
   placement = 'right',
   sideOffset,
   alignOffset,
@@ -91,11 +103,11 @@ function BlockSelector({
   const searchInputRef = useRef<HTMLInputElement>(null)
   const open = openFromProps === undefined ? localOpen : openFromProps
   const handleOpenChange = useCallback(
-    (newOpen: boolean) => {
+    (newOpen: boolean, details?: Parameters<NonNullable<PopoverProps['onOpenChange']>>[1]) => {
       if (newOpen && disabled) return
 
       setLocalOpen(newOpen)
-      if (onOpenChange) onOpenChange(newOpen)
+      if (onOpenChange) onOpenChange(newOpen, details)
     },
     [disabled, onOpenChange],
   )
@@ -125,6 +137,7 @@ function BlockSelector({
 
   const triggerControl = trigger ? (
     <PopoverTrigger
+      ref={triggerRef}
       aria-label={triggerAriaLabel}
       disabled={disabled}
       render={trigger}
@@ -132,6 +145,7 @@ function BlockSelector({
     />
   ) : (
     <PopoverTrigger
+      ref={triggerRef}
       disabled={disabled}
       render={
         <IconButton
@@ -165,6 +179,7 @@ function BlockSelector({
         >
           <PopoverPopup
             initialFocus={searchInputRef}
+            finalFocus={finalFocus}
             className="border-none bg-transparent shadow-none"
             onClick={handlePopupClick}
             onKeyDown={isolateKeyboardEvents ? handlePopupKeyDown : undefined}
diff --git a/web/app/components/workflow/hooks/__tests__/use-node-keyboard-interactions.spec.tsx b/web/app/components/workflow/hooks/__tests__/use-node-keyboard-interactions.spec.tsx
index 0fb4073eefb..b4f4afed772 100644
--- a/web/app/components/workflow/hooks/__tests__/use-node-keyboard-interactions.spec.tsx
+++ b/web/app/components/workflow/hooks/__tests__/use-node-keyboard-interactions.spec.tsx
@@ -34,7 +34,7 @@ function Canvas() {
     <div onKeyDownCapture={onKeyDownCapture}>
       <div role="button" tabIndex={0} className="react-flow__node" data-id="node">
         Node
-        <button type="button" data-node-keyboard-target onClick={() => state.select('node')}>
+        <button type="button" onClick={() => state.select('node')}>
           Select node
         </button>
       </div>
@@ -83,16 +83,32 @@ describe('node keyboard interactions', () => {
     const user = userEvent.setup()
     renderWorkflowComponent(<Canvas />)
     await user.tab()
-    await user.keyboard('{Enter}{Escape}')
+    await user.keyboard('{Enter}{Escape} ')
     expect(state.select.mock.calls).toEqual([
       ['node', false],
       ['node', true],
+      ['node', false],
     ])
     await user.click(screen.getByRole('textbox', { name: 'Node title' }))
     await user.keyboard('{ArrowDown}')
     expect(state.sync).not.toHaveBeenCalled()
   })
 
+  it('allows readonly nodes to be selected and inspected without allowing movement', async () => {
+    state.readonly = true
+    const user = userEvent.setup()
+    renderWorkflowComponent(<Canvas />)
+    await user.tab()
+    await user.keyboard('{Enter}{Escape} {ArrowRight}')
+    expect(state.select.mock.calls).toEqual([
+      ['node', false],
+      ['node', true],
+      ['node', false],
+    ])
+    expect(rfState.nodes[0]!.position).toEqual({ x: 0, y: 0 })
+    expect(state.sync).not.toHaveBeenCalled()
+  })
+
   it('moves a Tab-focused unselected node without moving a separate selection', async () => {
     rfState.nodes = [
       createNode({ id: 'node', selected: false, position: { x: 0, y: 0 } }),
@@ -110,20 +126,14 @@ describe('node keyboard interactions', () => {
     expect(state.history).toHaveBeenCalledWith('NodeDragStop', { nodeId: 'node' })
   })
 
-  it('moves from the title button through collaboration and keeps its native activation', async () => {
+  it('leaves independent node button keys to that button', async () => {
     const user = userEvent.setup()
     renderWorkflowComponent(<Canvas />)
     await user.click(screen.getByRole('button', { name: 'Select node' }))
-    await user.keyboard('{ArrowRight}')
-    expect(rfState.nodes[0]!.position).toEqual({ x: 5, y: 0 })
-    expect(collaborationManager.setNodes).toHaveBeenCalledWith(
-      expect.arrayContaining([expect.objectContaining({ position: { x: 0, y: 0 } })]),
-      expect.arrayContaining([expect.objectContaining({ position: { x: 5, y: 0 } })]),
-      'keyboard-node-movement',
-    )
-    expect(state.sync).toHaveBeenCalledOnce()
     state.select.mockClear()
-    await user.keyboard('{Enter} ')
+    await user.keyboard('{ArrowRight}{Enter} ')
+    expect(rfState.nodes[0]!.position).toEqual({ x: 0, y: 0 })
+    expect(state.sync).not.toHaveBeenCalled()
     expect(state.select.mock.calls).toEqual([['node'], ['node']])
   })
 
diff --git a/web/app/components/workflow/hooks/use-node-keyboard-interactions.ts b/web/app/components/workflow/hooks/use-node-keyboard-interactions.ts
index cd09cb11b07..e7cd5815688 100644
--- a/web/app/components/workflow/hooks/use-node-keyboard-interactions.ts
+++ b/web/app/components/workflow/hooks/use-node-keyboard-interactions.ts
@@ -26,13 +26,9 @@ export function useNodeKeyboardInteractions(onSelect: (id: string, cancel?: bool
   return (event: KeyboardEvent<HTMLDivElement>) => {
     const target = event.target
     if (!(target instanceof HTMLElement)) return
-    const isNodeTitle = target.hasAttribute('data-node-keyboard-target')
-    const nodeTarget = isNodeTitle ? target.closest<HTMLElement>('.react-flow__node') : target
-    const isNode = nodeTarget?.classList.contains('react-flow__node')
+    const isNode = target.classList.contains('react-flow__node')
     const isSelection = target.classList.contains('react-flow__nodesselection-rect')
     if (!isNode && !isSelection) return
-    // The title button owns its normal click activation.
-    if (isNodeTitle && (event.key === 'Enter' || event.key === ' ')) return
     const movement = getKeyboardMovement(event)
     const isMovementKey = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(event.key)
     const isSelectionKey = ['Enter', ' ', 'Escape'].includes(event.key)
@@ -43,11 +39,9 @@ export function useNodeKeyboardInteractions(onSelect: (id: string, cancel?: bool
     event.preventDefault()
     event.stopPropagation()
     if (event.altKey || event.ctrlKey || event.metaKey) return
-    if (getNodesReadOnly() || workflowStore.getState().controlMode === ControlMode.Comment) return
+    if (workflowStore.getState().controlMode === ControlMode.Comment) return
     const { nodes, setNodes } = workflow.getState()
-    const focusedNode = isNode
-      ? nodes.find((node) => node.id === nodeTarget?.dataset.id)
-      : undefined
+    const focusedNode = isNode ? nodes.find((node) => node.id === target.dataset.id) : undefined
     if (isNode && !focusedNode) return
     if (
       focusedNode &&
@@ -61,7 +55,7 @@ export function useNodeKeyboardInteractions(onSelect: (id: string, cancel?: bool
       if (focusedNode) onSelect(focusedNode.id, event.key === 'Escape')
       return
     }
-    if (!movement) return
+    if (getNodesReadOnly() || !movement) return
     if (!collaborationManager.canApplyLocalGraphMutation()) return
 
     const movingIds = new Set(
diff --git a/web/app/components/workflow/nodes/_base/__tests__/node.spec.tsx b/web/app/components/workflow/nodes/_base/__tests__/node.spec.tsx
index b046d0f078e..64518067cf4 100644
--- a/web/app/components/workflow/nodes/_base/__tests__/node.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/__tests__/node.spec.tsx
@@ -1,8 +1,8 @@
 import type { PropsWithChildren } from 'react'
 import type { CommonNodeType } from '@/app/components/workflow/types'
-import { fireEvent, screen } from '@testing-library/react'
+import { screen } from '@testing-library/react'
 import { renderWorkflowComponent } from '@/app/components/workflow/__tests__/workflow-test-env'
-import { BlockEnum, ControlMode, NodeRunningStatus } from '@/app/components/workflow/types'
+import { BlockEnum, NodeRunningStatus } from '@/app/components/workflow/types'
 import BaseNode from '../node'
 
 const mockHasNodeInspectVars = vi.fn()
@@ -95,10 +95,6 @@ vi.mock('@/app/components/workflow/block-icon', () => ({
 vi.mock('@/app/components/workflow/nodes/tool/components/copy-id', () => ({
   default: ({ content }: { content: string }) => <div>{content}</div>,
 }))
-vi.mock('@/app/components/workflow/utils/node-navigation', () => ({
-  selectWorkflowNode: vi.fn(),
-}))
-
 const createData = (overrides: Record<string, unknown> = {}) => ({
   type: BlockEnum.Tool,
   title: 'Node title',
@@ -144,40 +140,32 @@ describe('BaseNode', () => {
     expect(screen.getByTestId('node-target-handle')).toBeInTheDocument()
   })
 
-  it('should expose the node title area as a selectable button', async () => {
-    const { selectWorkflowNode } = await import('@/app/components/workflow/utils/node-navigation')
-
+  it('places node actions before both add-node handles in DOM order', () => {
     renderWorkflowComponent(
       <BaseNode id="node-1" data={toNodeData(createData())}>
         <div>Body</div>
       </BaseNode>,
     )
-
-    const node = screen.getByRole('button', { name: 'Node title' })
-
-    fireEvent.click(node)
-
-    expect(selectWorkflowNode).toHaveBeenCalledWith('node-1')
+    const actions = screen.getByTestId('node-control')
+    for (const handle of ['node-target-handle', 'node-source-handle']) {
+      expect(
+        actions.compareDocumentPosition(screen.getByTestId(handle)) &
+          Node.DOCUMENT_POSITION_FOLLOWING,
+      ).toBeTruthy()
+    }
   })
 
-  it('should not select the node from the title button while in comment mode', async () => {
-    const { selectWorkflowNode } = await import('@/app/components/workflow/utils/node-navigation')
-
+  it('renders the title as text without an additional button', () => {
     renderWorkflowComponent(
       <BaseNode id="node-1" data={toNodeData(createData())}>
         <div>Body</div>
       </BaseNode>,
-      { initialStoreState: { controlMode: ControlMode.Comment } },
     )
-
-    const node = screen.getByRole('button', { name: 'Node title' })
-
-    fireEvent.click(node)
-
-    expect(selectWorkflowNode).not.toHaveBeenCalled()
+    expect(screen.getByText('Node title')).toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'Node title' })).not.toBeInTheDocument()
   })
 
-  it('should keep header metadata outside the selectable button', () => {
+  it('should retain the independent header metadata control', () => {
     renderWorkflowComponent(
       <BaseNode
         id="node-1"
@@ -192,13 +180,11 @@ describe('BaseNode', () => {
       </BaseNode>,
     )
 
-    const titleButton = screen.getByRole('button', { name: 'Node title' })
     const parallelButton = screen.getByRole('button', {
       name: /workflow\.nodes\.iteration\.parallelModeUpper/,
     })
 
-    expect(titleButton).not.toContainElement(parallelButton)
-    expect(titleButton.querySelector('button')).toBeNull()
+    expect(parallelButton).toBeInTheDocument()
   })
 
   it('should render entry nodes inside the entry container', () => {
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/node-focus.browser.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/node-focus.browser.spec.tsx
new file mode 100644
index 00000000000..d3e7516b461
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/node-focus.browser.spec.tsx
@@ -0,0 +1,181 @@
+import type { NodeProps } from 'reactflow'
+import type { CommonNodeType } from '../../../../types'
+import ReactFlow from 'reactflow'
+import { page, userEvent } from 'vite-plus/test/browser'
+import { render } from 'vitest-browser-react'
+import { BlockEnum } from '../../../../types'
+import NodeControl from '../node-control'
+import { NodeSourceHandle, NodeTargetHandle } from '../node-handle'
+import 'reactflow/dist/style.css'
+
+// Plugin installation is outside node trigger and popup focus ownership.
+vi.mock('@/app/components/plugins/install-plugin/install-from-marketplace', () => ({
+  default: () => null,
+}))
+
+vi.mock('../../../../hooks/use-available-blocks', () => ({
+  useAvailableBlocks: () => ({
+    availablePrevBlocks: [BlockEnum.Code],
+    availableNextBlocks: [BlockEnum.Code],
+  }),
+}))
+vi.mock('../../../../hooks/use-nodes-interactions', () => ({
+  useNodesInteractions: () => ({ handleNodeAdd: vi.fn(), handleNodeSelect: vi.fn() }),
+}))
+vi.mock('../../../../hooks/use-workflow', () => ({
+  useIsChatMode: () => false,
+  useNodesReadOnly: () => ({ nodesReadOnly: false, getNodesReadOnly: () => false }),
+}))
+vi.mock('../../../../hooks/use-nodes-meta-data', () => ({
+  useNodeMetaData: () => ({
+    isTypeFixed: true,
+    isUndeletable: false,
+    isSingleton: false,
+    description: 'Code',
+    author: 'Dify',
+  }),
+}))
+vi.mock('@/app/components/workflow/store', () => ({
+  useStore: (selector: (state: Record<string, unknown>) => unknown) =>
+    selector({ nodes: [], dataSourceList: [], shouldAutoOpenStartNodeSelector: false }),
+  useWorkflowStore: () => ({ getState: () => ({}) }),
+}))
+vi.mock('@/app/components/workflow/hooks-store', () => ({
+  useHooksStore: (selector: (state: Record<string, unknown>) => unknown) =>
+    selector({
+      configsMap: { flowType: 'app-flow' },
+      availableNodesMetaData: { nodes: [] },
+      accessControl: { canRun: false },
+    }),
+}))
+vi.mock('@/service/use-plugins', () => ({
+  useInvalidateCheckInstalled: () => vi.fn(),
+  useFeaturedToolsRecommendations: () => ({ plugins: [], isLoading: false }),
+  useFeaturedTriggersRecommendations: () => ({ plugins: [], isLoading: false }),
+}))
+
+vi.mock('@/service/use-triggers', () => ({
+  useAllTriggerPlugins: () => ({ data: [] }),
+  useInvalidateAllTriggerPlugins: () => vi.fn(),
+}))
+
+vi.mock('@/service/use-tools', () => ({
+  useRAGRecommendedPlugins: () => ({ data: [] }),
+  useInvalidateAllToolProviders: () => vi.fn(),
+  useAllBuiltInTools: () => ({ data: [] }),
+  useAllCustomTools: () => ({ data: [] }),
+  useAllWorkflowTools: () => ({ data: [] }),
+  useAllMCPTools: () => ({ data: [] }),
+  useInvalidateAllBuiltInTools: () => vi.fn(),
+}))
+
+vi.mock('@/app/components/plugins/marketplace/query', () => ({
+  useMarketplacePlugins: () => ({ data: undefined }),
+}))
+
+function FocusNode({ id, data }: NodeProps<CommonNodeType>) {
+  return (
+    <div className="group relative h-24 w-60 bg-components-panel-bg">
+      <NodeControl id={id} data={data} />
+      <NodeSourceHandle id={id} data={data} handleId="source" />
+      <NodeTargetHandle id={id} data={data} handleId="target" />
+      <span>Code node</span>
+    </div>
+  )
+}
+const nodeTypes = { focus: FocusNode }
+async function renderCanvas() {
+  await page.viewport(1000, 800)
+  return render(
+    <>
+      <button type="button">Before canvas</button>
+
+      <div style={{ width: 800, height: 600 }}>
+        <ReactFlow
+          defaultNodes={[
+            {
+              id: 'node',
+              type: 'focus',
+              ariaLabel: 'Code node',
+              position: { x: 150, y: 150 },
+              data: { type: BlockEnum.Code, title: 'Code', desc: '', selected: false },
+            },
+          ]}
+          nodeTypes={nodeTypes}
+        />
+      </div>
+      <input aria-label="Outside editor" />
+    </>,
+  )
+}
+
+it.each([0, 1])(
+  'restores focus to the visible handle button after a pointer-opened popup closes (%s)',
+  async (index) => {
+    const screen = await renderCanvas()
+    const before = screen.getByRole('button', { name: 'Before canvas' })
+    const node = screen.getByRole('button', { name: 'Code node', exact: true })
+    const trigger = screen.getByRole('button', { name: 'workflow.common.addBlock' }).nth(index)
+    await before.click()
+    await userEvent.tab()
+    await expect.element(node).toHaveFocus()
+    // Click the real React Flow handle: its transparent button intentionally does not receive pointer events.
+    await userEvent.click(trigger.element().parentElement!)
+    await expect.element(screen.getByRole('dialog')).toBeVisible()
+    await screen.getByRole('dialog').hover()
+    await userEvent.keyboard('{Escape}')
+    await expect.element(trigger).toHaveFocus()
+    await expect.poll(() => trigger.element().checkVisibility({ checkOpacity: true })).toBe(true)
+    await userEvent.keyboard('{Enter}')
+    await expect.element(screen.getByRole('dialog')).toBeVisible()
+    await userEvent.keyboard('{Escape}')
+    await expect.element(trigger).toHaveFocus()
+  },
+)
+
+it('reveals an unselected node handle when reached by Tab', async () => {
+  const screen = await renderCanvas()
+  const trigger = screen.getByRole('button', { name: 'workflow.common.addBlock' }).first()
+  await screen.getByRole('button', { name: 'Before canvas' }).click()
+  expect(trigger.element().checkVisibility({ checkOpacity: true })).toBe(false)
+  await userEvent.tab()
+  await userEvent.tab()
+  await expect.element(screen.getByRole('button', { name: 'common.operation.more' })).toHaveFocus()
+  await userEvent.tab()
+  await expect.element(trigger).toHaveFocus()
+  await expect.poll(() => trigger.element().checkVisibility({ checkOpacity: true })).toBe(true)
+})
+
+it('keeps More visible and focused after closing an unselected node menu away from hover', async () => {
+  const screen = await renderCanvas()
+  const before = screen.getByRole('button', { name: 'Before canvas' })
+  const more = screen.getByRole('button', { name: 'common.operation.more' })
+  await before.click()
+  expect(more.element().checkVisibility({ checkOpacity: true })).toBe(false)
+  await screen.getByRole('button', { name: 'Code node', exact: true }).hover()
+  await more.click()
+  await expect.element(screen.getByRole('menu')).toBeVisible()
+  await before.hover()
+  await userEvent.keyboard('{Escape}')
+  await expect.element(more).toHaveFocus()
+  expect(more.element().checkVisibility({ checkOpacity: true })).toBe(true)
+  await userEvent.keyboard('{Enter}')
+  await expect.element(screen.getByRole('menu')).toBeVisible()
+})
+
+it.each([0, 1])(
+  'preserves an outside input focus after dismissing handle popup (%s)',
+  async (index) => {
+    const screen = await renderCanvas()
+    const trigger = screen.getByRole('button', { name: 'workflow.common.addBlock' }).nth(index)
+    const editor = screen.getByRole('textbox', { name: 'Outside editor' })
+    const input = editor.element()
+    await userEvent.click(trigger.element().parentElement!)
+    await expect.element(screen.getByRole('dialog')).toBeVisible()
+    await userEvent.click(input)
+    await expect.element(screen.getByRole('dialog')).not.toBeInTheDocument()
+    await expect.element(editor).toHaveFocus()
+    await userEvent.keyboard('Node title')
+    await expect.element(editor).toHaveValue('Node title')
+  },
+)
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx
index 4f08d3b2c6d..22d2ce4a055 100644
--- a/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx
@@ -229,6 +229,7 @@ it.each([1, 0.5, 0.25])(
     await expect
       .element(screen.getByLabelText('Connection'))
       .toHaveTextContent('source:out → target:in')
+    await expect.element(screen.getByRole('dialog')).not.toBeInTheDocument()
   },
 )
 
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.spec.tsx
index b659664ddfb..57c7ff0c34b 100644
--- a/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.spec.tsx
@@ -1,6 +1,6 @@
 import type { ReactNode } from 'react'
 import type { CommonNodeType } from '@/app/components/workflow/types'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { BlockEnum } from '@/app/components/workflow/types'
 import { NodeSourceHandle, NodeTargetHandle } from '../node-handle'
@@ -314,6 +314,20 @@ describe('node-handle', () => {
 
   // Auto-open tests cover workflow start-trigger variants, chat-mode bypass, and store fallback paths.
   describe('NodeSourceHandle auto-open', () => {
+    it('restores the previous focus when the start selector opens automatically', async () => {
+      const user = userEvent.setup()
+      render(<button type="button">Previous action</button>)
+      const previousAction = screen.getByRole('button', { name: 'Previous action' })
+      await user.click(previousAction)
+      mockStoreState.shouldAutoOpenStartNodeSelector = true
+
+      renderSourceHandle({ type: BlockEnum.Start })
+      await screen.findByRole('dialog')
+      await user.keyboard('{Escape}')
+
+      await waitFor(() => expect(previousAction).toHaveFocus())
+    })
+
     it.each([
       BlockEnum.Start,
       BlockEnum.TriggerSchedule,
diff --git a/web/app/components/workflow/nodes/_base/components/help-link.tsx b/web/app/components/workflow/nodes/_base/components/help-link.tsx
index 55c8b45e628..429cc078544 100644
--- a/web/app/components/workflow/nodes/_base/components/help-link.tsx
+++ b/web/app/components/workflow/nodes/_base/components/help-link.tsx
@@ -1,4 +1,6 @@
 import type { BlockEnum } from '@/app/components/workflow/types'
+import { buttonVariants } from '@langgenius/dify-ui/button'
+import { cn } from '@langgenius/dify-ui/cn'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -24,9 +26,12 @@ const HelpLink = ({ nodeType }: HelpLinkProps) => {
             href={link}
             target="_blank"
             rel="noopener noreferrer"
-            className="mr-1 flex size-6 items-center justify-center rounded-md hover:bg-state-base-hover"
+            className={cn(
+              buttonVariants({ variant: 'ghost', size: 'small' }),
+              'mr-1 w-6 p-0 text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary',
+            )}
           >
-            <span aria-hidden className="i-ri-book-open-line size-4 text-gray-500" />
+            <span aria-hidden className="i-ri-book-open-line size-4" />
           </a>
         }
       />
diff --git a/web/app/components/workflow/nodes/_base/components/node-control.tsx b/web/app/components/workflow/nodes/_base/components/node-control.tsx
index 882c6286e16..856d9c11c4b 100644
--- a/web/app/components/workflow/nodes/_base/components/node-control.tsx
+++ b/web/app/components/workflow/nodes/_base/components/node-control.tsx
@@ -27,10 +27,11 @@ const NodeControl: FC<NodeControlProps> = ({ id, data, pluginInstallLocked }) =>
   return (
     <div
       className={cn(
-        'invisible absolute -top-8 right-0 flex h-8 origin-bottom-right pb-1',
-        !pluginInstallLocked && 'group-hover:visible',
-        data.selected && 'visible',
-        'has-data-popup-open:visible',
+        'pointer-events-none absolute -top-8 right-0 flex h-8 origin-bottom-right pb-1 opacity-0',
+        'focus-within:pointer-events-auto focus-within:opacity-100',
+        !pluginInstallLocked && 'group-hover:pointer-events-auto group-hover:opacity-100',
+        data.selected && 'pointer-events-auto opacity-100',
+        'has-data-popup-open:pointer-events-auto has-data-popup-open:opacity-100',
       )}
       style={{ scale: 'var(--workflow-control-scale, 1)' }}
     >
diff --git a/web/app/components/workflow/nodes/_base/components/node-handle.tsx b/web/app/components/workflow/nodes/_base/components/node-handle.tsx
index 9cd0842d5ec..aa0c5a3348f 100644
--- a/web/app/components/workflow/nodes/_base/components/node-handle.tsx
+++ b/web/app/components/workflow/nodes/_base/components/node-handle.tsx
@@ -1,8 +1,9 @@
 import type { MouseEvent } from 'react'
+import type { BlockSelectorProps } from '../../../block-selector'
 import type { BlockDefaultValue } from '../../../block-selector/types'
 import type { Node } from '../../../types'
 import { cn } from '@langgenius/dify-ui/cn'
-import { memo, useCallback, useEffect, useState } from 'react'
+import { memo, useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Handle, Position } from 'reactflow'
 import BlockSelector from '../../../block-selector'
@@ -38,6 +39,8 @@ const canAutoOpenStartNodeSelector = (nodeType: BlockEnum, isChatMode: boolean)
 export const NodeTargetHandle = memo(
   ({ id, data, handleId, handleClassName, nodeSelectorClassName }: NodeHandleProps) => {
     const [open, setOpen] = useState(false)
+    const triggerRef = useRef<HTMLButtonElement>(null)
+    const preserveOutsideFocusRef = useRef(false)
     const { handleNodeAdd } = useNodesInteractions()
     const { getNodesReadOnly } = useNodesReadOnly()
     const connected = data._connectedTargetHandleIds?.includes(handleId)
@@ -47,12 +50,18 @@ export const NodeTargetHandle = memo(
     )
     const isConnectable = !!availablePrevBlocks.length
 
-    const handleOpenChange = useCallback((v: boolean) => {
-      setOpen(v)
-    }, [])
+    const handleOpenChange = useCallback<NonNullable<BlockSelectorProps['onOpenChange']>>(
+      (v, details) => {
+        preserveOutsideFocusRef.current =
+          details?.reason === 'outside-press' || details?.reason === 'focus-out'
+        setOpen(v)
+      },
+      [],
+    )
     const handleHandleClick = useCallback(
       (e: MouseEvent) => {
         e.stopPropagation()
+        preserveOutsideFocusRef.current = false
         if (!connected) setOpen((v) => !v)
       },
       [connected],
@@ -102,6 +111,8 @@ export const NodeTargetHandle = memo(
         >
           {!connected && isConnectable && !getNodesReadOnly() && (
             <BlockSelector
+              triggerRef={triggerRef}
+              finalFocus={() => (preserveOutsideFocusRef.current ? false : triggerRef.current)}
               open={open}
               onOpenChange={handleOpenChange}
               onSelect={handleSelect}
@@ -115,7 +126,7 @@ export const NodeTargetHandle = memo(
               triggerClassName={`
                 absolute -left-1 -top-1 opacity-0 pointer-events-none transition-opacity duration-150
                 ${nodeSelectorClassName}
-                group-hover:opacity-100 focus-visible:opacity-100
+                group-hover:opacity-100 focus:opacity-100
                 ${data.selected && 'opacity-100'}
                 data-popup-open:opacity-100
               `}
@@ -154,6 +165,10 @@ export const NodeSourceHandle = memo(
     const shouldAutoOpen =
       shouldAutoOpenStartNodeSelector && canAutoOpenStartNodeSelector(data.type, isChatMode)
     const [open, setOpen] = useState(() => shouldAutoOpen)
+    const triggerRef = useRef<HTMLButtonElement>(null)
+    const preserveOutsideFocusRef = useRef(false)
+    // Auto-open keeps the previous focus; a pointer click on the handle returns to its button.
+    const openedFromHandleRef = useRef(false)
 
     const connected = data._connectedSourceHandleIds?.includes(handleId)
     // Branch ports can be only 24px apart in canvas coordinates. Keep their
@@ -164,11 +179,18 @@ export const NodeSourceHandle = memo(
       data.type === BlockEnum.QuestionClassifier ||
       data.type === BlockEnum.HumanInput ||
       data.error_strategy === ErrorHandleTypeEnum.failBranch
-    const handleOpenChange = useCallback((v: boolean) => {
-      setOpen(v)
-    }, [])
+    const handleOpenChange = useCallback<NonNullable<BlockSelectorProps['onOpenChange']>>(
+      (v, details) => {
+        preserveOutsideFocusRef.current =
+          details?.reason === 'outside-press' || details?.reason === 'focus-out'
+        setOpen(v)
+      },
+      [],
+    )
     const handleHandleClick = useCallback((e: MouseEvent) => {
       e.stopPropagation()
+      preserveOutsideFocusRef.current = false
+      openedFromHandleRef.current = true
       setOpen((v) => !v)
     }, [])
     const handleSelect = useCallback(
@@ -252,6 +274,11 @@ export const NodeSourceHandle = memo(
         </div>
         {isConnectable && !getNodesReadOnly() && (
           <BlockSelector
+            triggerRef={triggerRef}
+            finalFocus={() => {
+              if (preserveOutsideFocusRef.current) return false
+              return openedFromHandleRef.current ? triggerRef.current : true
+            }}
             open={open}
             onOpenChange={handleOpenChange}
             onSelect={handleSelect}
@@ -262,7 +289,7 @@ export const NodeSourceHandle = memo(
             triggerClassName={`
               absolute -top-1 -left-1 opacity-0 pointer-events-none transition-opacity duration-150
               ${nodeSelectorClassName}
-              group-hover:opacity-100 focus-visible:opacity-100
+              group-hover:opacity-100 focus:opacity-100
               ${data.selected && 'opacity-100'}
               data-popup-open:opacity-100
             `}
diff --git a/web/app/components/workflow/nodes/_base/components/title-description-input.tsx b/web/app/components/workflow/nodes/_base/components/title-description-input.tsx
index e82118927ff..33c58c99138 100644
--- a/web/app/components/workflow/nodes/_base/components/title-description-input.tsx
+++ b/web/app/components/workflow/nodes/_base/components/title-description-input.tsx
@@ -76,7 +76,7 @@ export const DescriptionInput = memo(({ value, onChange }: DescriptionInputProps
 
   return (
     <div>
-      <label htmlFor={inputId} className="mb-1 block system-xs-medium text-text-secondary">
+      <label htmlFor={inputId} className="mx-2 mb-1 block system-xs-medium text-text-secondary">
         {t(($) => $['common.nodeDescription'], { ns: 'workflow' })}
       </label>
       <div
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
index 0364408ebba..ae643ed35a0 100644
--- a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
@@ -2,6 +2,7 @@ import type { CSSProperties, FC, ReactNode } from 'react'
 import type { SimpleSubscription } from '@/app/components/plugins/plugin-detail-panel/subscription-list'
 import type { Node } from '@/app/components/workflow/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { IconButton } from '@langgenius/dify-ui/icon-button'
 import { Tabs, TabsList, TabsPanel, TabsTab } from '@langgenius/dify-ui/tabs'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiCloseLine, RiPlayLargeLine } from '@remixicon/react'
@@ -604,21 +605,20 @@ const BasePanel: FC<BasePanelProps> = ({ id, data, children }) => {
                 <Tooltip disabled={isSingleRunning}>
                   <TooltipTrigger
                     render={
-                      <button
-                        type="button"
+                      <IconButton
                         aria-label={singleRunActionLabel}
-                        className="mr-1 flex size-6 cursor-pointer items-center justify-center rounded-md border-0 bg-transparent p-0 hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:outline-hidden"
+                        className="mr-1"
                         onClick={() => {
                           if (isSingleRunning) handleStop()
                           else handleSingleRun()
                         }}
                       >
                         {isSingleRunning ? (
-                          <Stop aria-hidden className="size-4 text-text-tertiary" />
+                          <Stop aria-hidden className="size-4" />
                         ) : (
-                          <RiPlayLargeLine aria-hidden className="size-4 text-text-tertiary" />
+                          <RiPlayLargeLine aria-hidden className="size-4" />
                         )}
-                      </button>
+                      </IconButton>
                     }
                   />
                   <TooltipContent className="mr-1">{runThisStepLabel}</TooltipContent>
@@ -627,14 +627,12 @@ const BasePanel: FC<BasePanelProps> = ({ id, data, children }) => {
               <HelpLink nodeType={nodeMetaType} />
               <NodeActionsDropdown id={id} data={data} showHelpLink={false} />
               <div className="mx-3 h-3.5 w-px bg-divider-regular" />
-              <button
-                type="button"
+              <IconButton
                 aria-label={t(($) => $['operation.close'], { ns: 'common' })}
-                className="flex size-6 cursor-pointer items-center justify-center rounded-md hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:outline-hidden"
                 onClick={() => handleNodeSelect(id, true)}
               >
-                <RiCloseLine aria-hidden className="size-4 text-text-tertiary" />
-              </button>
+                <RiCloseLine aria-hidden className="size-4" />
+              </IconButton>
             </div>
           </div>
           {isStartPlaceholderPanel ? (
diff --git a/web/app/components/workflow/nodes/_base/node.tsx b/web/app/components/workflow/nodes/_base/node.tsx
index c5d23dfdaba..c73f3a5453d 100644
--- a/web/app/components/workflow/nodes/_base/node.tsx
+++ b/web/app/components/workflow/nodes/_base/node.tsx
@@ -21,7 +21,6 @@ import useInspectVarsCrud from '../../hooks/use-inspect-vars-crud'
 import { useNodePluginInstallation } from '../../hooks/use-node-plugin-installation'
 import { useToolIcon } from '../../hooks/use-tool-icon'
 import { useNodesReadOnly } from '../../hooks/use-workflow'
-import { selectWorkflowNode } from '../../utils/node-navigation'
 import AddVariablePopupWithPosition from './components/add-variable-popup-with-position'
 import EntryNodeContainer, { StartNodeTypeEnum } from './components/entry-node-container'
 import ErrorHandleOnNode from './components/error-handle/error-handle-on-node'
@@ -213,6 +212,9 @@ const BaseNode: FC<BaseNodeProps> = ({ id, data, children }) => {
         {data._showAddVariablePopup && <AddVariablePopupWithPosition nodeId={id} nodeData={data} />}
         {data.type === BlockEnum.Iteration && <NodeResizer nodeId={id} nodeData={data} />}
         {data.type === BlockEnum.Loop && <NodeResizer nodeId={id} nodeData={data} />}
+        {!data._runningStatus && !nodesReadOnly && !data._isCandidate && (
+          <NodeControl id={id} data={data} pluginInstallLocked={pluginInstallLocked} />
+        )}
         {data.type !== BlockEnum.StartPlaceholder && !data._isCandidate && (
           <NodeTargetHandle
             id={id}
@@ -233,28 +235,13 @@ const BaseNode: FC<BaseNodeProps> = ({ id, data, children }) => {
               handleId="source"
             />
           )}
-        {!data._runningStatus && !nodesReadOnly && !data._isCandidate && (
-          <NodeControl id={id} data={data} pluginInstallLocked={pluginInstallLocked} />
-        )}
         <div
           className={cn(
             'flex items-center rounded-t-2xl px-3 pt-3 pb-2',
             isContainerNode(data.type) && 'bg-transparent',
           )}
         >
-          <button
-            type="button"
-            data-node-keyboard-target
-            aria-label={data.title}
-            className="mr-1 flex min-w-0 grow appearance-none items-center rounded-md border-0 bg-transparent p-0 text-left focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden"
-            onClick={() => {
-              // In comment mode, clicking a node should not open the node settings panel:
-              // the right-hand panel covers the canvas region where the comment is anchored.
-              // Mirrors the comment-mode guard in use-nodes-interactions' handleNodeClick.
-              if (controlMode === ControlMode.Comment) return
-              selectWorkflowNode(id)
-            }}
-          >
+          <div className="mr-1 flex min-w-0 grow items-center">
             <BlockIcon className="mr-2 shrink-0" type={data.type} size="md" toolIcon={toolIcon} />
             <div className="flex min-w-0 grow items-center system-sm-semibold-uppercase text-text-primary">
               <div title={data.title} className="min-w-0 grow truncate">
@@ -266,7 +253,7 @@ const BaseNode: FC<BaseNodeProps> = ({ id, data, children }) => {
                 </div>
               )}
             </div>
-          </button>
+          </div>
           <div className="flex shrink-0 items-center">
             <NodeHeaderMeta
               data={data}

From e18c171f74c1eb07d15ac4746b435a91145dffed Mon Sep 17 00:00:00 2001
From: Coding On Star <447357187@qq.com>
Date: Thu, 17 Sep 2026 08:35:49 +0000
Subject: [PATCH 28/28] fix(marketplace): fix preview overlay and image
 clipboard actions (#42411)

Co-authored-by: CodingOnStar <hanxujiang@dify.com>
---
 knip.config.ts                                |   1 +
 oxlint-suppressions.json                      |   3 -
 .../image-gallery/__tests__/index.spec.tsx    |  48 +++++
 .../components/base/image-gallery/index.tsx   |  23 ++-
 .../__tests__/image-preview.spec.tsx          | 178 ++++++++++++++----
 .../base/image-uploader/image-preview.tsx     |  62 +++---
 .../detail-dialog/__tests__/frame.spec.tsx    | 160 ++++++++++++++++
 .../marketplace/detail-dialog/frame.tsx       |  49 +++--
 .../detail-dialog/image-preview-message.ts    |  19 ++
 web/i18n/ar-TN/common.json                    |   1 +
 web/i18n/de-DE/common.json                    |   1 +
 web/i18n/en-US/common.json                    |   1 +
 web/i18n/es-ES/common.json                    |   1 +
 web/i18n/fa-IR/common.json                    |   1 +
 web/i18n/fr-FR/common.json                    |   1 +
 web/i18n/hi-IN/common.json                    |   1 +
 web/i18n/id-ID/common.json                    |   1 +
 web/i18n/it-IT/common.json                    |   1 +
 web/i18n/ja-JP/common.json                    |   1 +
 web/i18n/ko-KR/common.json                    |   1 +
 web/i18n/lo-LA/common.json                    |   1 +
 web/i18n/nl-NL/common.json                    |   1 +
 web/i18n/pl-PL/common.json                    |   1 +
 web/i18n/pt-BR/common.json                    |   1 +
 web/i18n/ro-RO/common.json                    |   1 +
 web/i18n/ru-RU/common.json                    |   1 +
 web/i18n/sl-SI/common.json                    |   1 +
 web/i18n/th-TH/common.json                    |   1 +
 web/i18n/tr-TR/common.json                    |   1 +
 web/i18n/uk-UA/common.json                    |   1 +
 web/i18n/vi-VN/common.json                    |   1 +
 web/i18n/zh-Hans/common.json                  |   1 +
 web/i18n/zh-Hant/common.json                  |   1 +
 33 files changed, 481 insertions(+), 86 deletions(-)
 create mode 100644 web/app/components/plugins/marketplace/detail-dialog/__tests__/frame.spec.tsx
 create mode 100644 web/app/components/plugins/marketplace/detail-dialog/image-preview-message.ts

diff --git a/knip.config.ts b/knip.config.ts
index 939a3143ac2..4cf2444d674 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -17,6 +17,7 @@ const config: KnipConfig = {
         'plugins/eslint/index.js',
         // Public surface consumed by the standalone Marketplace host.
         // The `!` suffix keeps these entries in `knip --production`.
+        'app/components/plugins/marketplace/detail-dialog/image-preview-message.ts!',
         'app/components/plugins/marketplace/standalone/server.ts!',
         'app/components/plugins/marketplace/standalone/client.ts!',
       ],
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index e9734a65754..2ffecd2e868 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -1444,9 +1444,6 @@
   "web/app/components/base/image-uploader/image-preview.tsx": {
     "jsx-a11y/no-static-element-interactions": {
       "count": 1
-    },
-    "typescript/no-explicit-any": {
-      "count": 1
     }
   },
   "web/app/components/base/image-uploader/utils.ts": {
diff --git a/web/app/components/base/image-gallery/__tests__/index.spec.tsx b/web/app/components/base/image-gallery/__tests__/index.spec.tsx
index 873a1a8dd39..7ce23a2df00 100644
--- a/web/app/components/base/image-gallery/__tests__/index.spec.tsx
+++ b/web/app/components/base/image-gallery/__tests__/index.spec.tsx
@@ -10,6 +10,30 @@ vi.mock('react-i18next', () =>
 )
 
 describe('ImageGallery', () => {
+  it('notifies the embedding owner while a preview is open, including unmount cleanup', async () => {
+    const user = userEvent.setup()
+    const onPreviewOpenChange = vi.fn()
+    const { unmount } = render(
+      <ImageGallery
+        srcs={['https://example.com/image.png']}
+        onPreviewOpenChange={onPreviewOpenChange}
+      />,
+    )
+
+    expect(onPreviewOpenChange).not.toHaveBeenCalled()
+    await user.click(screen.getByRole('button', { name: 'Preview image 1 of 1' }))
+    expect(onPreviewOpenChange).toHaveBeenLastCalledWith(true)
+
+    fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+    await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+    expect(onPreviewOpenChange).toHaveBeenLastCalledWith(false)
+
+    await user.click(screen.getByRole('button', { name: 'Preview image 1 of 1' }))
+    expect(onPreviewOpenChange).toHaveBeenLastCalledWith(true)
+    unmount()
+    expect(onPreviewOpenChange).toHaveBeenLastCalledWith(false)
+  })
+
   it('previews the selected image and closes on Escape', async () => {
     const user = userEvent.setup()
     render(
@@ -29,6 +53,30 @@ describe('ImageGallery', () => {
     })
   })
 
+  it('releases and restores the embedding owner across page navigation', async () => {
+    const user = userEvent.setup()
+    const onPreviewOpenChange = vi.fn()
+    render(
+      <ImageGallery
+        srcs={['https://example.com/image.png']}
+        onPreviewOpenChange={onPreviewOpenChange}
+      />,
+    )
+    await user.click(screen.getByRole('button', { name: 'Preview image 1 of 1' }))
+
+    fireEvent(window, new Event('pagehide'))
+    expect(onPreviewOpenChange).toHaveBeenLastCalledWith(false)
+
+    fireEvent(window, new Event('pageshow'))
+    expect(onPreviewOpenChange).toHaveBeenLastCalledWith(true)
+
+    fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+    await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+    onPreviewOpenChange.mockClear()
+    fireEvent(window, new Event('pageshow'))
+    expect(onPreviewOpenChange).not.toHaveBeenCalled()
+  })
+
   it('removes an image that fails to load', () => {
     render(<ImageGallery srcs={['https://example.com/broken.png']} />)
 
diff --git a/web/app/components/base/image-gallery/index.tsx b/web/app/components/base/image-gallery/index.tsx
index 62147bbf087..c713ae05f07 100644
--- a/web/app/components/base/image-gallery/index.tsx
+++ b/web/app/components/base/image-gallery/index.tsx
@@ -2,13 +2,14 @@
 import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import ImagePreview from '@/app/components/base/image-uploader/image-preview'
 import s from './style.module.css'
 
 type Props = Readonly<{
   srcs: string[]
+  onPreviewOpenChange?: (open: boolean) => void
 }>
 
 const getWidthStyle = (imgNum: number) => {
@@ -29,9 +30,27 @@ const getWidthStyle = (imgNum: number) => {
   }
 }
 
-const ImageGallery: FC<Props> = ({ srcs }) => {
+const ImageGallery: FC<Props> = ({ srcs, onPreviewOpenChange }) => {
   const { t } = useTranslation('common')
   const [imagePreviewUrl, setImagePreviewUrl] = useState('')
+  const isPreviewOpen = Boolean(imagePreviewUrl)
+
+  // Synchronize embedding surfaces with the preview's lifetime, including
+  // navigation that unmounts the gallery before the preview is dismissed.
+  useEffect(() => {
+    if (!isPreviewOpen || !onPreviewOpenChange) return
+
+    onPreviewOpenChange(true)
+    const handlePageHide = () => onPreviewOpenChange(false)
+    const handlePageShow = () => onPreviewOpenChange(true)
+    window.addEventListener('pagehide', handlePageHide)
+    window.addEventListener('pageshow', handlePageShow)
+    return () => {
+      window.removeEventListener('pagehide', handlePageHide)
+      window.removeEventListener('pageshow', handlePageShow)
+      onPreviewOpenChange(false)
+    }
+  }, [isPreviewOpen, onPreviewOpenChange])
 
   const imgNum = srcs.length
   const imgStyle = getWidthStyle(imgNum)
diff --git a/web/app/components/base/image-uploader/__tests__/image-preview.spec.tsx b/web/app/components/base/image-uploader/__tests__/image-preview.spec.tsx
index 19441eef57b..66a7cf69f8a 100644
--- a/web/app/components/base/image-uploader/__tests__/image-preview.spec.tsx
+++ b/web/app/components/base/image-uploader/__tests__/image-preview.spec.tsx
@@ -49,6 +49,12 @@ describe('ImagePreview', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
+    vi.stubGlobal(
+      'fetch',
+      vi
+        .fn()
+        .mockImplementation(async () => new Response(new Blob(['image'], { type: 'image/png' }))),
+    )
 
     if (!navigator.clipboard) {
       Object.defineProperty(globalThis.navigator, 'clipboard', {
@@ -75,7 +81,7 @@ describe('ImagePreview', () => {
     })
 
     globalThis.ClipboardItem = class {
-      constructor(public readonly data: Record<string, Blob>) {}
+      constructor(public readonly data: Record<string, Blob | Promise<Blob>>) {}
     } as unknown as typeof ClipboardItem
     vi.spyOn(window, 'open').mockImplementation((...args: Parameters<Window['open']>) => {
       return mocks.windowOpen(...args)
@@ -85,6 +91,7 @@ describe('ImagePreview', () => {
   afterEach(() => {
     globalThis.ClipboardItem = originalClipboardItem
     vi.restoreAllMocks()
+    vi.unstubAllGlobals()
   })
 
   describe('Rendering', () => {
@@ -289,21 +296,18 @@ describe('ImagePreview', () => {
   })
 
   describe('Action Buttons', () => {
-    it('should open valid url in new tab', async () => {
-      const user = userEvent.setup()
-      render(
-        <ImagePreview
-          url="https://example.com/image.png"
-          title="Preview Image"
-          onCancel={vi.fn()}
-        />,
-      )
+    it.each(['https://example.com/image.png', '/image-proxy/github/example'])(
+      'should open valid url %s in new tab',
+      async (url) => {
+        const user = userEvent.setup()
+        render(<ImagePreview url={url} title="Preview Image" onCancel={vi.fn()} />)
 
-      const openInTabButton = getOpenInTabButton()
-      await user.click(openInTabButton)
+        const openInTabButton = getOpenInTabButton()
+        await user.click(openInTabButton)
 
-      expect(mocks.windowOpen).toHaveBeenCalledWith('https://example.com/image.png', '_blank')
-    })
+        expect(mocks.windowOpen).toHaveBeenCalledWith(url, '_blank')
+      },
+    )
 
     it('should open data image by writing to popup window document', async () => {
       const user = userEvent.setup()
@@ -336,7 +340,7 @@ describe('ImagePreview', () => {
       })
     })
 
-    it('should fall back to download and show info toast when clipboard copy fails', async () => {
+    it('keeps the preview open and reports clipboard denial without downloading or navigating', async () => {
       const user = userEvent.setup()
       const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
       mocks.clipboardWrite.mockRejectedValue(new Error('copy failed'))
@@ -346,21 +350,116 @@ describe('ImagePreview', () => {
       const copyButton = getCopyButton()
       await user.click(copyButton)
 
-      await waitFor(() => {
-        expect(mocks.downloadUrl).toHaveBeenCalledWith({
-          url: dataImage,
-          fileName: 'Preview Image.png',
-        })
-      })
-      expect(mocks.notify).toHaveBeenCalledWith(
-        expect.objectContaining({
-          type: 'info',
+      await waitFor(() =>
+        expect(mocks.notify).toHaveBeenCalledWith({
+          type: 'error',
+          message: 'common.operation.imageCopyFailed',
         }),
       )
+      expect(mocks.downloadUrl).not.toHaveBeenCalled()
+      expect(mocks.windowOpen).not.toHaveBeenCalled()
+      expect(getOverlay()).toBeInTheDocument()
       expect(consoleErrorSpy).toHaveBeenCalled()
       consoleErrorSpy.mockRestore()
     })
 
+    it('copies a remote PNG and starts the clipboard write before the image fetch resolves', async () => {
+      const user = userEvent.setup()
+      const png = new Blob(['png bytes'], { type: 'image/png' })
+      let resolveFetch!: (response: Response) => void
+      const fetchMock = vi.fn(
+        () =>
+          new Promise<Response>((resolve) => {
+            resolveFetch = resolve
+          }),
+      )
+      vi.stubGlobal('fetch', fetchMock)
+      let copiedBlob: Blob | undefined
+      mocks.clipboardWrite.mockImplementation(async ([item]) => {
+        copiedBlob = await (item as unknown as { data: Record<string, Promise<Blob>> }).data[
+          'image/png'
+        ]
+      })
+      render(
+        <ImagePreview
+          url="https://example.com/image.png"
+          title="Preview Image"
+          onCancel={vi.fn()}
+        />,
+      )
+
+      await user.click(getCopyButton())
+
+      expect(mocks.clipboardWrite).toHaveBeenCalledTimes(1)
+      expect(copiedBlob).toBeUndefined()
+      resolveFetch(new Response(png))
+      await waitFor(() =>
+        expect(mocks.notify).toHaveBeenCalledWith(expect.objectContaining({ type: 'success' })),
+      )
+      expect(copiedBlob?.type).toBe('image/png')
+      expect(await copiedBlob?.text()).toBe('png bytes')
+      expect(mocks.downloadUrl).not.toHaveBeenCalled()
+    })
+
+    it('converts a JPEG to PNG instead of labelling JPEG bytes as PNG', async () => {
+      const user = userEvent.setup()
+      const jpeg = new Blob(['jpeg bytes'], { type: 'image/jpeg' })
+      const png = new Blob(['encoded png'], { type: 'image/png' })
+      vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(jpeg)))
+      const bitmap = { width: 12, height: 8, close: vi.fn() }
+      vi.stubGlobal('createImageBitmap', vi.fn().mockResolvedValue(bitmap))
+      vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue({
+        drawImage: vi.fn(),
+      } as unknown as CanvasRenderingContext2D)
+      vi.spyOn(HTMLCanvasElement.prototype, 'toBlob').mockImplementation((callback) =>
+        callback(png),
+      )
+      let copiedBlob: Blob | undefined
+      mocks.clipboardWrite.mockImplementation(async ([item]) => {
+        copiedBlob = await (item as unknown as { data: Record<string, Promise<Blob>> }).data[
+          'image/png'
+        ]
+      })
+      render(
+        <ImagePreview
+          url="https://example.com/image.jpg"
+          title="Preview Image"
+          onCancel={vi.fn()}
+        />,
+      )
+
+      await user.click(getCopyButton())
+
+      await waitFor(() => expect(copiedBlob).toBe(png))
+      expect(bitmap.close).toHaveBeenCalled()
+      expect(mocks.downloadUrl).not.toHaveBeenCalled()
+    })
+
+    it('reports an image fetch failure without leaving the preview', async () => {
+      const user = userEvent.setup()
+      vi.spyOn(console, 'error').mockImplementation(() => {})
+      vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new TypeError('Failed to fetch')))
+      mocks.clipboardWrite.mockImplementation(async ([item]) => {
+        await (item as unknown as { data: Record<string, Promise<Blob>> }).data['image/png']
+      })
+      render(
+        <ImagePreview
+          url="https://example.com/image.png"
+          title="Preview Image"
+          onCancel={vi.fn()}
+        />,
+      )
+
+      await user.click(getCopyButton())
+
+      await waitFor(() =>
+        expect(mocks.notify).toHaveBeenCalledWith(expect.objectContaining({ type: 'error' })),
+      )
+      expect(mocks.downloadUrl).not.toHaveBeenCalled()
+      expect(mocks.windowOpen).not.toHaveBeenCalled()
+      expect(getOverlay()).toBeInTheDocument()
+    })
+
     it('should copy image and show success toast', async () => {
       const user = userEvent.setup()
       mocks.clipboardWrite.mockResolvedValue()
@@ -379,24 +478,21 @@ describe('ImagePreview', () => {
       )
     })
 
-    it('should call download action for valid url', async () => {
-      const user = userEvent.setup()
-      render(
-        <ImagePreview
-          url="https://example.com/image.png"
-          title="Preview Image"
-          onCancel={vi.fn()}
-        />,
-      )
-      const downloadButton = getDownloadButton()
-      await user.click(downloadButton)
+    it.each(['https://example.com/image.png', '/image-proxy/github/example'])(
+      'should download valid url %s',
+      async (url) => {
+        const user = userEvent.setup()
+        render(<ImagePreview url={url} title="Preview Image" onCancel={vi.fn()} />)
+        const downloadButton = getDownloadButton()
+        await user.click(downloadButton)
 
-      expect(mocks.downloadUrl).toHaveBeenCalledWith({
-        url: 'https://example.com/image.png',
-        fileName: 'Preview Image',
-        target: '_blank',
-      })
-    })
+        expect(mocks.downloadUrl).toHaveBeenCalledWith({
+          url,
+          fileName: 'Preview Image',
+          target: '_blank',
+        })
+      },
+    )
 
     it('should show error toast for invalid download url', async () => {
       const user = userEvent.setup()
diff --git a/web/app/components/base/image-uploader/image-preview.tsx b/web/app/components/base/image-uploader/image-preview.tsx
index 80593605269..97328610afa 100644
--- a/web/app/components/base/image-uploader/image-preview.tsx
+++ b/web/app/components/base/image-uploader/image-preview.tsx
@@ -25,6 +25,31 @@ const isBase64 = (str: string): boolean => {
   }
 }
 
+const fetchImageAsPng = async (url: string): Promise<Blob> => {
+  const response = await fetch(url)
+  if (!response.ok) throw new Error('Unable to load image')
+  const blob = await response.blob()
+  if (blob.type === 'image/png') return blob
+
+  const bitmap = await createImageBitmap(blob)
+  try {
+    const canvas = document.createElement('canvas')
+    canvas.width = bitmap.width
+    canvas.height = bitmap.height
+    const context = canvas.getContext('2d')
+    if (!context) throw new Error('Unable to convert image')
+    context.drawImage(bitmap, 0, 0)
+    return await new Promise<Blob>((resolve, reject) => {
+      canvas.toBlob((png) => {
+        if (png) resolve(png)
+        else reject(new Error('Unable to encode image'))
+      }, 'image/png')
+    })
+  } finally {
+    bitmap.close()
+  }
+}
+
 const ImagePreview: FC<ImagePreviewProps> = ({ url, title, onCancel, onPrev, onNext }) => {
   const { t } = useTranslation()
   const [scale, setScale] = useState(1)
@@ -36,7 +61,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({ url, title, onCancel, onPrev, onN
 
   const openInNewTab = () => {
     // Open in a new window, considering the case when the page is inside an iframe
-    if (url.startsWith('http') || url.startsWith('https')) {
+    if (url.startsWith('http') || url.startsWith('/')) {
       window.open(url, '_blank')
     } else if (url.startsWith('data:image')) {
       // Base64 image
@@ -49,7 +74,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({ url, title, onCancel, onPrev, onN
 
   const downloadImage = () => {
     // Open in a new window, considering the case when the page is inside an iframe
-    if (url.startsWith('http') || url.startsWith('https') || url.startsWith('data:image')) {
+    if (url.startsWith('http') || url.startsWith('/') || url.startsWith('data:image')) {
       downloadUrl({ url, fileName: title, target: '_blank' })
       return
     }
@@ -69,31 +94,19 @@ const ImagePreview: FC<ImagePreviewProps> = ({ url, title, onCancel, onPrev, onN
     })
   }
 
-  const imageBase64ToBlob = (base64: string, type = 'image/png'): Blob => {
-    const byteCharacters = atob(base64)
-    const byteArrays = []
-
-    for (let offset = 0; offset < byteCharacters.length; offset += 512) {
-      const slice = byteCharacters.slice(offset, offset + 512)
-      const byteNumbers = Array.from({ length: slice.length })
-      for (let i = 0; i < slice.length; i++) byteNumbers[i] = slice.charCodeAt(i)
-
-      const byteArray = new Uint8Array(byteNumbers as any)
-      byteArrays.push(byteArray)
-    }
-
-    return new Blob(byteArrays, { type })
-  }
-
   const imageCopy = useCallback(() => {
     const shareImage = async () => {
       try {
-        const base64Data = url.split(',')[1]
-        const blob = imageBase64ToBlob(base64Data!, 'image/png')
+        if (!navigator.clipboard?.write || typeof ClipboardItem === 'undefined')
+          throw new Error('Image clipboard is unavailable')
 
+        const png = fetchImageAsPng(isBase64(url) ? `data:image/png;base64,${url}` : url)
+        // Handle a rejected fetch even if clipboard permission is denied before
+        // the browser consumes the item. Keep write in the click gesture for Safari.
+        void png.catch(noop)
         await navigator.clipboard.write([
           new ClipboardItem({
-            [blob.type]: blob,
+            'image/png': png,
           }),
         ])
         setIsCopied(true)
@@ -102,13 +115,12 @@ const ImagePreview: FC<ImagePreviewProps> = ({ url, title, onCancel, onPrev, onN
       } catch (err) {
         console.error('Failed to copy image:', err)
 
-        downloadUrl({ url, fileName: `${title}.png` })
-
-        toast.info(t(($) => $['operation.imageDownloaded'], { ns: 'common' }))
+        setIsCopied(false)
+        toast.error(t(($) => $['operation.imageCopyFailed'], { ns: 'common' }))
       }
     }
     shareImage()
-  }, [t, title, url])
+  }, [t, url])
 
   const handleWheel = useCallback((e: React.WheelEvent<HTMLDivElement>) => {
     if (e.deltaY < 0) zoomIn()
diff --git a/web/app/components/plugins/marketplace/detail-dialog/__tests__/frame.spec.tsx b/web/app/components/plugins/marketplace/detail-dialog/__tests__/frame.spec.tsx
new file mode 100644
index 00000000000..5d9635ae555
--- /dev/null
+++ b/web/app/components/plugins/marketplace/detail-dialog/__tests__/frame.spec.tsx
@@ -0,0 +1,160 @@
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { describe, expect, it, vi } from 'vitest'
+import MarketplaceDetailDialogFrame from '../frame'
+
+const title = 'Plugin details'
+const src = 'about:blank?plugin=first'
+const closeName = 'common.operation.close'
+const previewMessage = { type: 'dify-marketplace:image-preview', open: true }
+
+const getFrame = () => screen.getByTitle(title) as HTMLIFrameElement
+
+function sendMessage(data: unknown, options?: MessageEventInit) {
+  fireEvent(
+    window,
+    new MessageEvent('message', {
+      data,
+      origin: 'null',
+      source: getFrame().contentWindow,
+      ...options,
+    }),
+  )
+}
+
+describe('MarketplaceDetailDialogFrame image preview', () => {
+  it('lets the preview own closing until it closes, even without another message handler', async () => {
+    const user = userEvent.setup()
+    const onOpenChange = vi.fn()
+    render(
+      <MarketplaceDetailDialogFrame open src={src} title={title} onOpenChange={onOpenChange} />,
+    )
+
+    fireEvent.load(getFrame())
+    sendMessage(previewMessage)
+
+    expect(screen.queryByRole('button', { name: closeName })).not.toBeInTheDocument()
+    expect(screen.getByRole('dialog', { name: title })).toBeInTheDocument()
+    expect(onOpenChange).not.toHaveBeenCalled()
+
+    sendMessage({ ...previewMessage, open: false })
+    await user.click(screen.getByRole('button', { name: closeName }))
+    expect(onOpenChange).toHaveBeenCalledWith(false)
+  })
+
+  it('accepts preview updates only from this iframe and its expected origin', () => {
+    render(<MarketplaceDetailDialogFrame open src={src} title={title} onOpenChange={vi.fn()} />)
+
+    sendMessage(previewMessage, { origin: 'https://another-marketplace.example' })
+    expect(screen.getByRole('button', { name: closeName })).toBeInTheDocument()
+
+    sendMessage(previewMessage, { source: window })
+    expect(screen.getByRole('button', { name: closeName })).toBeInTheDocument()
+
+    sendMessage(previewMessage)
+    expect(screen.queryByRole('button', { name: closeName })).not.toBeInTheDocument()
+
+    sendMessage({ ...previewMessage, open: false }, { source: window })
+    expect(screen.queryByRole('button', { name: closeName })).not.toBeInTheDocument()
+  })
+
+  it.each([
+    null,
+    'dify-marketplace:image-preview',
+    { type: 'dify-marketplace:image-preview' },
+    { type: 'dify-marketplace:image-preview', open: 'true' },
+    { type: 'dify-marketplace:image-preview', open: 1 },
+    { type: 'dify-marketplace:another-message', open: true },
+  ])('ignores malformed or unrelated preview data: %j', (data) => {
+    render(<MarketplaceDetailDialogFrame open src={src} title={title} onOpenChange={vi.fn()} />)
+
+    sendMessage(data)
+    expect(screen.getByRole('button', { name: closeName })).toBeInTheDocument()
+  })
+
+  it('continues forwarding other trusted marketplace messages and replies', () => {
+    const request = {
+      type: 'dify-marketplace:install-plugin',
+      pluginUniqueIdentifier: 'test/plugin:1',
+    }
+    const response = { type: 'dify-marketplace:install-plugin-status', status: 'success' }
+    const onMessage = vi.fn((_data, reply) => reply(response))
+    render(
+      <MarketplaceDetailDialogFrame
+        open
+        src={src}
+        title={title}
+        onMessage={onMessage}
+        onOpenChange={vi.fn()}
+      />,
+    )
+    const postMessage = vi.spyOn(getFrame().contentWindow!, 'postMessage')
+
+    sendMessage(request)
+
+    expect(onMessage).toHaveBeenCalledWith(request, expect.any(Function))
+    expect(postMessage).toHaveBeenCalledWith(response, 'null')
+  })
+
+  it('keeps an active preview above the close button when the iframe load arrives after fallback reveal', async () => {
+    vi.useFakeTimers()
+    try {
+      render(<MarketplaceDetailDialogFrame open src={src} title={title} onOpenChange={vi.fn()} />)
+      await act(() => vi.advanceTimersByTimeAsync(15_000))
+      expect(getFrame()).not.toHaveAttribute('inert')
+
+      sendMessage(previewMessage)
+      expect(screen.queryByRole('button', { name: closeName })).not.toBeInTheDocument()
+
+      fireEvent.load(getFrame())
+
+      expect(screen.queryByRole('button', { name: closeName })).not.toBeInTheDocument()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('starts another detail URL with its own close button', () => {
+    const onOpenChange = vi.fn()
+    const { rerender } = render(
+      <MarketplaceDetailDialogFrame open src={src} title={title} onOpenChange={onOpenChange} />,
+    )
+    sendMessage(previewMessage)
+    expect(screen.queryByRole('button', { name: closeName })).not.toBeInTheDocument()
+
+    rerender(
+      <MarketplaceDetailDialogFrame
+        open
+        src="about:blank?plugin=second"
+        title={title}
+        onOpenChange={onOpenChange}
+      />,
+    )
+
+    expect(screen.getByRole('button', { name: closeName })).toBeInTheDocument()
+  })
+
+  it('restores the close button after the controlled details dialog closes and reopens', async () => {
+    const onOpenChange = vi.fn()
+    const { rerender } = render(
+      <MarketplaceDetailDialogFrame open src={src} title={title} onOpenChange={onOpenChange} />,
+    )
+    sendMessage(previewMessage)
+    expect(screen.queryByRole('button', { name: closeName })).not.toBeInTheDocument()
+
+    rerender(
+      <MarketplaceDetailDialogFrame
+        open={false}
+        src={src}
+        title={title}
+        onOpenChange={onOpenChange}
+      />,
+    )
+    await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+    rerender(
+      <MarketplaceDetailDialogFrame open src={src} title={title} onOpenChange={onOpenChange} />,
+    )
+
+    expect(screen.getByRole('button', { name: closeName })).toBeInTheDocument()
+  })
+})
diff --git a/web/app/components/plugins/marketplace/detail-dialog/frame.tsx b/web/app/components/plugins/marketplace/detail-dialog/frame.tsx
index ab31dcc31af..dd7a68f92da 100644
--- a/web/app/components/plugins/marketplace/detail-dialog/frame.tsx
+++ b/web/app/components/plugins/marketplace/detail-dialog/frame.tsx
@@ -12,6 +12,7 @@ import {
 import { IconButton } from '@langgenius/dify-ui/icon-button'
 import { useEffect, useRef, useState } from 'react'
 import { useTranslation } from '#i18n'
+import { isMarketplaceImagePreviewMessage } from './image-preview-message'
 
 type ReplyToMarketplaceFrame = (data: unknown) => void
 
@@ -39,6 +40,12 @@ export default function MarketplaceDetailDialogFrame({
   const iframeRef = useRef<HTMLIFrameElement>(null)
   const closeButtonRef = useRef<HTMLButtonElement>(null)
   const [isLoading, setIsLoading] = useState(true)
+  const [imagePreview, setImagePreview] = useState({ src, dialogOpen: open, open: false })
+
+  // A controlled close/reopen or another detail URL starts a fresh frame
+  // session, including when a close transition has not finished unmounting.
+  if (imagePreview.src !== src || imagePreview.dialogOpen !== open)
+    setImagePreview({ src, dialogOpen: open, open: false })
 
   useEffect(() => {
     if (!open) return
@@ -48,14 +55,19 @@ export default function MarketplaceDetailDialogFrame({
   }, [open, src])
 
   useEffect(() => {
-    if (!open || !onMessage) return
+    if (!open) return
 
     const marketplaceOrigin = new URL(src, window.location.href).origin
     const handleMessage = (event: MessageEvent) => {
       if (event.source !== iframeRef.current?.contentWindow || event.origin !== marketplaceOrigin)
         return
 
-      onMessage(event.data, (payload) => {
+      if (isMarketplaceImagePreviewMessage(event.data)) {
+        setImagePreview({ src, dialogOpen: open, open: event.data.open })
+        return
+      }
+
+      onMessage?.(event.data, (payload) => {
         iframeRef.current?.contentWindow?.postMessage(payload, marketplaceOrigin)
       })
     }
@@ -65,7 +77,10 @@ export default function MarketplaceDetailDialogFrame({
   }, [onMessage, open, src])
 
   const handleOpenChange = (nextOpen: boolean) => {
-    if (!nextOpen) setIsLoading(true)
+    if (!nextOpen) {
+      setIsLoading(true)
+      setImagePreview({ src, dialogOpen: open, open: false })
+    }
     onOpenChange(nextOpen)
   }
 
@@ -119,18 +134,22 @@ export default function MarketplaceDetailDialogFrame({
             src={src}
             title={title}
           />
-          <DialogClose
-            render={
-              <IconButton
-                ref={closeButtonRef}
-                aria-label={t(($) => $['operation.close'], { ns: 'common' })}
-                size="sm"
-                className="absolute top-5 right-5 z-10 size-8 rounded-lg"
-              >
-                <span aria-hidden className="i-ri-close-line size-4" />
-              </IconButton>
-            }
-          />
+          {/* The image preview lives inside a different document, so its
+              backdrop cannot cover this host control through z-index. */}
+          {!imagePreview.open && (
+            <DialogClose
+              render={
+                <IconButton
+                  ref={closeButtonRef}
+                  aria-label={t(($) => $['operation.close'], { ns: 'common' })}
+                  size="sm"
+                  className="absolute top-5 right-5 z-10 size-8 rounded-lg"
+                >
+                  <span aria-hidden className="i-ri-close-line size-4" />
+                </IconButton>
+              }
+            />
+          )}
         </DialogPopup>
       </DialogPortal>
     </Dialog>
diff --git a/web/app/components/plugins/marketplace/detail-dialog/image-preview-message.ts b/web/app/components/plugins/marketplace/detail-dialog/image-preview-message.ts
new file mode 100644
index 00000000000..eab1a778d8c
--- /dev/null
+++ b/web/app/components/plugins/marketplace/detail-dialog/image-preview-message.ts
@@ -0,0 +1,19 @@
+export const MARKETPLACE_IMAGE_PREVIEW_MESSAGE = 'dify-marketplace:image-preview'
+
+export type MarketplaceImagePreviewMessage = {
+  type: typeof MARKETPLACE_IMAGE_PREVIEW_MESSAGE
+  open: boolean
+}
+
+export function isMarketplaceImagePreviewMessage(
+  data: unknown,
+): data is MarketplaceImagePreviewMessage {
+  return (
+    typeof data === 'object' &&
+    data !== null &&
+    'type' in data &&
+    data.type === MARKETPLACE_IMAGE_PREVIEW_MESSAGE &&
+    'open' in data &&
+    typeof data.open === 'boolean'
+  )
+}
diff --git a/web/i18n/ar-TN/common.json b/web/i18n/ar-TN/common.json
index e6243a6c028..a6455c71a31 100644
--- a/web/i18n/ar-TN/common.json
+++ b/web/i18n/ar-TN/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "ملء تلقائي",
   "operation.format": "تنسيق",
   "operation.imageCopied": "تم نسخ الصورة",
+  "operation.imageCopyFailed": "تعذّر نسخ الصورة. يرجى تنزيلها بدلاً من ذلك.",
   "operation.imageDownloaded": "تم تنزيل الصورة",
   "operation.in": "في",
   "operation.learnMore": "تعرف على المزيد",
diff --git a/web/i18n/de-DE/common.json b/web/i18n/de-DE/common.json
index 0a5d56112fa..25907e54b99 100644
--- a/web/i18n/de-DE/common.json
+++ b/web/i18n/de-DE/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Automatisch ausfüllen",
   "operation.format": "Format",
   "operation.imageCopied": "Kopiertes Bild",
+  "operation.imageCopyFailed": "Das Bild konnte nicht kopiert werden. Bitte laden Sie es stattdessen herunter.",
   "operation.imageDownloaded": "Bild heruntergeladen",
   "operation.in": "in",
   "operation.learnMore": "Mehr erfahren",
diff --git a/web/i18n/en-US/common.json b/web/i18n/en-US/common.json
index cc3e1373db8..27418cea05d 100644
--- a/web/i18n/en-US/common.json
+++ b/web/i18n/en-US/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Autofill",
   "operation.format": "Format",
   "operation.imageCopied": "Image copied",
+  "operation.imageCopyFailed": "Could not copy the image. Please download it instead.",
   "operation.imageDownloaded": "Image downloaded",
   "operation.in": "in",
   "operation.learnMore": "Learn more",
diff --git a/web/i18n/es-ES/common.json b/web/i18n/es-ES/common.json
index 47c37b1d093..8000423afb7 100644
--- a/web/i18n/es-ES/common.json
+++ b/web/i18n/es-ES/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Autocompletar",
   "operation.format": "Formato",
   "operation.imageCopied": "Imagen copiada",
+  "operation.imageCopyFailed": "No se pudo copiar la imagen. Descárgala en su lugar.",
   "operation.imageDownloaded": "Imagen descargada",
   "operation.in": "en",
   "operation.learnMore": "Aprender más",
diff --git a/web/i18n/fa-IR/common.json b/web/i18n/fa-IR/common.json
index a22d747cffc..d3b439caf99 100644
--- a/web/i18n/fa-IR/common.json
+++ b/web/i18n/fa-IR/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "پر کردن خودکار",
   "operation.format": "قالب",
   "operation.imageCopied": "تصویر کپی شده",
+  "operation.imageCopyFailed": "تصویر کپی نشد. لطفاً به‌جای آن تصویر را دانلود کنید.",
   "operation.imageDownloaded": "تصویر دانلود شد",
   "operation.in": "در",
   "operation.learnMore": "اطلاعات بیشتر",
diff --git a/web/i18n/fr-FR/common.json b/web/i18n/fr-FR/common.json
index e1a261b03fb..1115008f6fd 100644
--- a/web/i18n/fr-FR/common.json
+++ b/web/i18n/fr-FR/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Remplissage auto",
   "operation.format": "Format",
   "operation.imageCopied": "Image copied",
+  "operation.imageCopyFailed": "Impossible de copier l’image. Veuillez la télécharger à la place.",
   "operation.imageDownloaded": "Image téléchargée",
   "operation.in": "dans",
   "operation.learnMore": "En savoir plus",
diff --git a/web/i18n/hi-IN/common.json b/web/i18n/hi-IN/common.json
index c8787e35bdc..e282692a184 100644
--- a/web/i18n/hi-IN/common.json
+++ b/web/i18n/hi-IN/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "ऑटोफिल",
   "operation.format": "फॉर्मेट",
   "operation.imageCopied": "कॉपी की गई छवि",
+  "operation.imageCopyFailed": "इमेज कॉपी नहीं हो सकी। कृपया इसे डाउनलोड करें।",
   "operation.imageDownloaded": "छवि डाउनलोड की गई",
   "operation.in": "में",
   "operation.learnMore": "अधिक जानें",
diff --git a/web/i18n/id-ID/common.json b/web/i18n/id-ID/common.json
index fc00999beb7..805ffd9168c 100644
--- a/web/i18n/id-ID/common.json
+++ b/web/i18n/id-ID/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Isi otomatis",
   "operation.format": "Format",
   "operation.imageCopied": "Gambar yang disalin",
+  "operation.imageCopyFailed": "Gambar tidak dapat disalin. Silakan unduh sebagai gantinya.",
   "operation.imageDownloaded": "Gambar diunduh",
   "operation.in": "di",
   "operation.learnMore": "Pelajari lebih lanjut",
diff --git a/web/i18n/it-IT/common.json b/web/i18n/it-IT/common.json
index 37bbb62203f..1d92c4abf83 100644
--- a/web/i18n/it-IT/common.json
+++ b/web/i18n/it-IT/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Compilazione automatica",
   "operation.format": "Formato",
   "operation.imageCopied": "Immagine copiata",
+  "operation.imageCopyFailed": "Impossibile copiare l’immagine. Scaricala invece.",
   "operation.imageDownloaded": "Immagine scaricata",
   "operation.in": "in",
   "operation.learnMore": "Scopri di più",
diff --git a/web/i18n/ja-JP/common.json b/web/i18n/ja-JP/common.json
index 8b8ac21597b..ac269c6421c 100644
--- a/web/i18n/ja-JP/common.json
+++ b/web/i18n/ja-JP/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "自動入力",
   "operation.format": "フォーマット",
   "operation.imageCopied": "コピーした画像",
+  "operation.imageCopyFailed": "画像をコピーできませんでした。代わりにダウンロードしてください。",
   "operation.imageDownloaded": "画像がダウンロードされました",
   "operation.in": "中",
   "operation.learnMore": "詳細はこちら",
diff --git a/web/i18n/ko-KR/common.json b/web/i18n/ko-KR/common.json
index 2bc8745564d..cea78dacec9 100644
--- a/web/i18n/ko-KR/common.json
+++ b/web/i18n/ko-KR/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "자동 입력",
   "operation.format": "형식",
   "operation.imageCopied": "복사된 이미지",
+  "operation.imageCopyFailed": "이미지를 복사할 수 없습니다. 대신 다운로드해 주세요.",
   "operation.imageDownloaded": "이미지 다운로드됨",
   "operation.in": "안으로",
   "operation.learnMore": "자세히 알아보기",
diff --git a/web/i18n/lo-LA/common.json b/web/i18n/lo-LA/common.json
index 1cf54041176..ae8482d0221 100644
--- a/web/i18n/lo-LA/common.json
+++ b/web/i18n/lo-LA/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "ຕື່ມຂໍ້ມູນອັດຕະໂນມັດ",
   "operation.format": "ຈັດຮູບແບບ",
   "operation.imageCopied": "ຄັດລອກຮູບແລ້ວ",
+  "operation.imageCopyFailed": "ບໍ່ສາມາດສຳເນົາຮູບພາບໄດ້. ກະລຸນາດາວໂຫຼດຮູບພາບແທນ.",
   "operation.imageDownloaded": "ດາວໂຫຼດຮູບແລ້ວ",
   "operation.in": "ໃນ",
   "operation.learnMore": "ຮຽນຮູ້ເພີ່ມເຕີມ",
diff --git a/web/i18n/nl-NL/common.json b/web/i18n/nl-NL/common.json
index 401e64aa3a6..94140469646 100644
--- a/web/i18n/nl-NL/common.json
+++ b/web/i18n/nl-NL/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Automatisch invullen",
   "operation.format": "Format",
   "operation.imageCopied": "Image copied",
+  "operation.imageCopyFailed": "De afbeelding kon niet worden gekopieerd. Download deze in plaats daarvan.",
   "operation.imageDownloaded": "Image downloaded",
   "operation.in": "in",
   "operation.learnMore": "Meer informatie",
diff --git a/web/i18n/pl-PL/common.json b/web/i18n/pl-PL/common.json
index 0b373763e03..1736e5eb631 100644
--- a/web/i18n/pl-PL/common.json
+++ b/web/i18n/pl-PL/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Autouzupełnianie",
   "operation.format": "Format",
   "operation.imageCopied": "Skopiowany obraz",
+  "operation.imageCopyFailed": "Nie można skopiować obrazu. Zamiast tego pobierz go.",
   "operation.imageDownloaded": "Obraz pobrany",
   "operation.in": "w",
   "operation.learnMore": "Dowiedz się więcej",
diff --git a/web/i18n/pt-BR/common.json b/web/i18n/pt-BR/common.json
index e300285b72e..f3bd441e5d1 100644
--- a/web/i18n/pt-BR/common.json
+++ b/web/i18n/pt-BR/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Preenchimento automático",
   "operation.format": "Formato",
   "operation.imageCopied": "Imagem copiada",
+  "operation.imageCopyFailed": "Não foi possível copiar a imagem. Baixe-a em vez disso.",
   "operation.imageDownloaded": "Imagem baixada",
   "operation.in": "em",
   "operation.learnMore": "Saiba mais",
diff --git a/web/i18n/ro-RO/common.json b/web/i18n/ro-RO/common.json
index 88b9d6f491a..92f3d7c821e 100644
--- a/web/i18n/ro-RO/common.json
+++ b/web/i18n/ro-RO/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Completare automată",
   "operation.format": "Format",
   "operation.imageCopied": "Imagine copiată",
+  "operation.imageCopyFailed": "Imaginea nu a putut fi copiată. Descărcați-o în schimb.",
   "operation.imageDownloaded": "Imagine descărcată",
   "operation.in": "în",
   "operation.learnMore": "Află mai multe",
diff --git a/web/i18n/ru-RU/common.json b/web/i18n/ru-RU/common.json
index 6a40dc22040..0be7d670a74 100644
--- a/web/i18n/ru-RU/common.json
+++ b/web/i18n/ru-RU/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Автозаполнение",
   "operation.format": "Формат",
   "operation.imageCopied": "Скопированное изображение",
+  "operation.imageCopyFailed": "Не удалось скопировать изображение. Попробуйте скачать его.",
   "operation.imageDownloaded": "Изображение загружено",
   "operation.in": "в",
   "operation.learnMore": "Узнать больше",
diff --git a/web/i18n/sl-SI/common.json b/web/i18n/sl-SI/common.json
index c1bf276b01d..62feb5826a0 100644
--- a/web/i18n/sl-SI/common.json
+++ b/web/i18n/sl-SI/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Samodejno izpolni",
   "operation.format": "Format",
   "operation.imageCopied": "Kopirana slika",
+  "operation.imageCopyFailed": "Slike ni bilo mogoče kopirati. Namesto tega jo prenesite.",
   "operation.imageDownloaded": "Slika prenesena",
   "operation.in": "v",
   "operation.learnMore": "Izvedi več",
diff --git a/web/i18n/th-TH/common.json b/web/i18n/th-TH/common.json
index a417db74dea..f5818f03845 100644
--- a/web/i18n/th-TH/common.json
+++ b/web/i18n/th-TH/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "กรอกอัตโนมัติ",
   "operation.format": "รูปแบบ",
   "operation.imageCopied": "ภาพที่คัดลอก",
+  "operation.imageCopyFailed": "ไม่สามารถคัดลอกรูปภาพได้ โปรดดาวน์โหลดรูปภาพแทน",
   "operation.imageDownloaded": "ดาวน์โหลดรูปภาพแล้ว",
   "operation.in": "ใน",
   "operation.learnMore": "ศึกษาเพิ่มเติม",
diff --git a/web/i18n/tr-TR/common.json b/web/i18n/tr-TR/common.json
index 6ac2294a338..b48035b0e71 100644
--- a/web/i18n/tr-TR/common.json
+++ b/web/i18n/tr-TR/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Otomatik doldur",
   "operation.format": "Format",
   "operation.imageCopied": "Kopyalanan görüntü",
+  "operation.imageCopyFailed": "Görüntü kopyalanamadı. Lütfen bunun yerine indirin.",
   "operation.imageDownloaded": "Resim indirildi",
   "operation.in": "içinde",
   "operation.learnMore": "Daha fazla bilgi",
diff --git a/web/i18n/uk-UA/common.json b/web/i18n/uk-UA/common.json
index 1df899ae444..b85bba18130 100644
--- a/web/i18n/uk-UA/common.json
+++ b/web/i18n/uk-UA/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Автозаповнення",
   "operation.format": "Формат",
   "operation.imageCopied": "Скопійоване зображення",
+  "operation.imageCopyFailed": "Не вдалося скопіювати зображення. Спробуйте завантажити його.",
   "operation.imageDownloaded": "Зображення завантажено",
   "operation.in": "В",
   "operation.learnMore": "Дізнатися більше",
diff --git a/web/i18n/vi-VN/common.json b/web/i18n/vi-VN/common.json
index 0416f8c1ac4..3bf169e1089 100644
--- a/web/i18n/vi-VN/common.json
+++ b/web/i18n/vi-VN/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "Tự động điền",
   "operation.format": "Định dạng",
   "operation.imageCopied": "Hình ảnh sao chép",
+  "operation.imageCopyFailed": "Không thể sao chép hình ảnh. Vui lòng tải ảnh xuống.",
   "operation.imageDownloaded": "Hình ảnh đã được tải xuống",
   "operation.in": "trong",
   "operation.learnMore": "Tìm hiểu thêm",
diff --git a/web/i18n/zh-Hans/common.json b/web/i18n/zh-Hans/common.json
index ce86a05b3cd..41929210309 100644
--- a/web/i18n/zh-Hans/common.json
+++ b/web/i18n/zh-Hans/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "一键填入",
   "operation.format": "格式化",
   "operation.imageCopied": "图片已复制",
+  "operation.imageCopyFailed": "无法复制图片，请尝试下载图片。",
   "operation.imageDownloaded": "图片已下载",
   "operation.in": "在",
   "operation.learnMore": "了解更多",
diff --git a/web/i18n/zh-Hant/common.json b/web/i18n/zh-Hant/common.json
index d28f1066dac..9ffedb2a0fc 100644
--- a/web/i18n/zh-Hant/common.json
+++ b/web/i18n/zh-Hant/common.json
@@ -474,6 +474,7 @@
   "operation.fill": "一鍵填入",
   "operation.format": "格式",
   "operation.imageCopied": "複製的圖片",
+  "operation.imageCopyFailed": "無法複製圖片，請嘗試下載圖片。",
   "operation.imageDownloaded": "圖片已下載",
   "operation.in": "在",
   "operation.learnMore": "瞭解更多",