From 987b5f4bf4c1b048f6660360b06ad79d0bb37a87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Apr 2026 13:35:21 +0900
Subject: [PATCH 01/36] chore(deps): bump langsmith from 0.7.30 to 0.7.31 in
 /api (#35288)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 api/pyproject.toml | 2 +-
 api/uv.lock        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/pyproject.toml b/api/pyproject.toml
index 80f1b42a73..a1ceea181e 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -33,7 +33,7 @@ dependencies = [
     "google-cloud-aiplatform>=1.147.0,<2.0.0",
     "httpx[socks]>=0.28.1,<1.0.0",
     "langfuse>=4.2.0,<5.0.0",
-    "langsmith>=0.7.30,<1.0.0",
+    "langsmith>=0.7.31,<1.0.0",
     "mlflow-skinny>=3.11.1,<4.0.0",
     "opentelemetry-distro>=0.62b0,<1.0.0",
     "opentelemetry-instrumentation-celery>=0.62b0,<1.0.0",
diff --git a/api/uv.lock b/api/uv.lock
index 87588493ee..a650e46f9b 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -1563,7 +1563,7 @@ requires-dist = [
     { name = "httpx-sse", specifier = "~=0.4.0" },
     { name = "json-repair", specifier = "~=0.59.2" },
     { name = "langfuse", specifier = ">=4.2.0,<5.0.0" },
-    { name = "langsmith", specifier = ">=0.7.30,<1.0.0" },
+    { name = "langsmith", specifier = ">=0.7.31,<1.0.0" },
     { name = "mlflow-skinny", specifier = ">=3.11.1,<4.0.0" },
     { name = "opentelemetry-distro", specifier = ">=0.62b0,<1.0.0" },
     { name = "opentelemetry-instrumentation-celery", specifier = ">=0.62b0,<1.0.0" },
@@ -3450,7 +3450,7 @@ wheels = [
 
 [[package]]
 name = "langsmith"
-version = "0.7.30"
+version = "0.7.31"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "httpx" },
@@ -3463,9 +3463,9 @@ dependencies = [
     { name = "xxhash" },
     { name = "zstandard" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/46/e7/d27d952ce9824d684a3bb500a06541a2d55734bc4d849cdfcca2dfd4d93a/langsmith-0.7.30.tar.gz", hash = "sha256:d9df7ba5e42f818b63bda78776c8f2fc853388be3ae77b117e5d183a149321a2", size = 1106040, upload-time = "2026-04-09T21:12:01.892Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e6/11/696019490992db5c87774dc20515529ef42a01e1d770fb754ed6d9b12fb0/langsmith-0.7.31.tar.gz", hash = "sha256:331ee4f7c26bb5be4022b9859b7d7b122cbf8c9d01d9f530114c1914b0349ffb", size = 1178480, upload-time = "2026-04-14T17:55:41.242Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/37/19/96250cf58070c5563446651b03bb76c2eb5afbf08e754840ab639532d8c6/langsmith-0.7.30-py3-none-any.whl", hash = "sha256:43dd9f8d290e4d406606d6cc0bd62f5d1050963f05fe0ab6ffe50acf41f2f55a", size = 372682, upload-time = "2026-04-09T21:12:00.481Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/a1/a013cf458c301cda86a213dd153ce0a01c93f1ab5833f951e6a44c9763ce/langsmith-0.7.31-py3-none-any.whl", hash = "sha256:0291d49203f6e80dda011af1afda61eb0595a4d697adb684590a8805e1d61fb6", size = 373276, upload-time = "2026-04-14T17:55:39.677Z" },
 ]
 
 [[package]]

From d42d08aa572ce4e41a13ba6c459d8ac4194d5579 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Apr 2026 13:35:49 +0900
Subject: [PATCH 02/36] chore(deps): bump hono from 4.12.12 to 4.12.14 (#35287)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml      | 20 ++++++++++----------
 pnpm-workspace.yaml |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8d6dfa8b2f..79fcec0e8d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -334,8 +334,8 @@ catalogs:
       specifier: 2.3.6
       version: 2.3.6
     hono:
-      specifier: 4.12.12
-      version: 4.12.12
+      specifier: 4.12.14
+      version: 4.12.14
     html-entities:
       specifier: 2.6.0
       version: 2.6.0
@@ -551,8 +551,8 @@ overrides:
   flatted@<=3.4.1: 3.4.2
   glob@>=10.2.0 <10.5.0: 11.1.0
   is-core-module: npm:@nolyfill/is-core-module@^1.0.39
-  lodash@>=4.0.0 <= 4.17.23: 4.18.0
   lodash-es@>=4.0.0 <= 4.17.23: 4.18.0
+  lodash@>=4.0.0 <= 4.17.23: 4.18.0
   picomatch@<2.3.2: 2.3.2
   picomatch@>=4.0.0 <4.0.4: 4.0.4
   rollup@>=4.0.0 <4.59.0: 4.59.0
@@ -983,7 +983,7 @@ importers:
         version: 3.0.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
       '@hono/node-server':
         specifier: 'catalog:'
-        version: 1.19.14(hono@4.12.12)
+        version: 1.19.14(hono@4.12.14)
       '@iconify-json/heroicons':
         specifier: 'catalog:'
         version: 1.2.3
@@ -1145,7 +1145,7 @@ importers:
         version: 20.9.0
       hono:
         specifier: 'catalog:'
-        version: 4.12.12
+        version: 4.12.14
       knip:
         specifier: 'catalog:'
         version: 6.4.1(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
@@ -6179,8 +6179,8 @@ packages:
     resolution: {integrity: sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw==}
     engines: {node: '>=6'}
 
-  hono@4.12.12:
-    resolution: {integrity: sha512-p1JfQMKaceuCbpJKAPKVqyqviZdS0eUxH9v82oWo1kb9xjQ5wA6iP3FNVAPDFlz5/p7d45lO+BpSk1tuSZMF4Q==}
+  hono@4.12.14:
+    resolution: {integrity: sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==}
     engines: {node: '>=16.9.0'}
 
   hosted-git-info@9.0.2:
@@ -9598,9 +9598,9 @@ snapshots:
     dependencies:
       react: 19.2.5
 
-  '@hono/node-server@1.19.14(hono@4.12.12)':
+  '@hono/node-server@1.19.14(hono@4.12.14)':
     dependencies:
-      hono: 4.12.12
+      hono: 4.12.14
 
   '@humanfs/core@0.19.1': {}
 
@@ -13993,7 +13993,7 @@ snapshots:
 
   hex-rgb@4.3.0: {}
 
-  hono@4.12.12: {}
+  hono@4.12.14: {}
 
   hosted-git-info@9.0.2:
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 1e142fc3b5..9bd4b9a2a7 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -125,7 +125,7 @@ catalog:
   fast-deep-equal: 3.1.3
   happy-dom: 20.9.0
   hast-util-to-jsx-runtime: 2.3.6
-  hono: 4.12.12
+  hono: 4.12.14
   html-entities: 2.6.0
   html-to-image: 1.11.13
   i18next: 26.0.4

From 731414a44fa96dc93cfd638f725e874046834f39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Apr 2026 13:36:03 +0900
Subject: [PATCH 03/36] chore(deps): bump pypdf from 6.10.0 to 6.10.1 in /api
 (#35273)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 api/uv.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/uv.lock b/api/uv.lock
index a650e46f9b..854c82d747 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -5113,11 +5113,11 @@ wheels = [
 
 [[package]]
 name = "pypdf"
-version = "6.10.0"
+version = "6.10.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/b8/9f/ca96abf18683ca12602065e4ed2bec9050b672c87d317f1079abc7b6d993/pypdf-6.10.0.tar.gz", hash = "sha256:4c5a48ba258c37024ec2505f7e8fd858525f5502784a2e1c8d415604af29f6ef", size = 5314833, upload-time = "2026-04-10T09:34:57.102Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/66/79/f2730c42ec7891a75a2fcea2eb4f356872bcbc671b711418060424796612/pypdf-6.10.1.tar.gz", hash = "sha256:62e6ca7f65aaa28b3d192addb44f97296e4be1748f57ed0f4efb2d4915841880", size = 5315704, upload-time = "2026-04-14T12:55:20.996Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/55/f2/7ebe366f633f30a6ad105f650f44f24f98cb1335c4157d21ae47138b3482/pypdf-6.10.0-py3-none-any.whl", hash = "sha256:90005e959e1596c6e6c84c8b0ad383285b3e17011751cedd17f2ce8fcdfc86de", size = 334459, upload-time = "2026-04-10T09:34:54.966Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/04/e3aa7f1f14dbc53429cae34666261eb935d99bd61d24756ab94d7e0309da/pypdf-6.10.1-py3-none-any.whl", hash = "sha256:6331940d3bfe75b7e6601d35db7adabab5fc1d716efaeb384e3c0c3957d033de", size = 335606, upload-time = "2026-04-14T12:55:18.941Z" },
 ]
 
 [[package]]

From 9fa50774b431fb6e6837532ea53fbf7228170f44 Mon Sep 17 00:00:00 2001
From: bohdansolovie <153934212+bohdansolovie@users.noreply.github.com>
Date: Thu, 16 Apr 2026 00:36:33 -0400
Subject: [PATCH 04/36] test: migrate duplicate and vector index task
 integration tests to SQLAlchemy 2.0 APIs (#35292)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 .../test_deal_dataset_vector_index_task.py    | 57 +++++++++++++------
 .../test_duplicate_document_indexing_task.py  | 25 ++++----
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py
index d457b59d58..48fec441c5 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py
@@ -11,6 +11,7 @@ from unittest.mock import ANY, Mock, patch
 
 import pytest
 from faker import Faker
+from sqlalchemy import select
 
 from core.rag.index_processor.constant.index_type import IndexStructureType
 from models.dataset import Dataset, Document, DocumentSegment
@@ -221,7 +222,9 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "add")
 
         # Verify document status was updated to indexing then completed
-        updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+        updated_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == document.id).limit(1)
+        )
         assert updated_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify index processor load method was called
@@ -322,7 +325,9 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "update")
 
         # Verify document status was updated to indexing then completed
-        updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+        updated_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == document.id).limit(1)
+        )
         assert updated_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify index processor clean and load methods were called
@@ -431,7 +436,9 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "add")
 
         # Verify document status was updated to indexing then completed
-        updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+        updated_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == document.id).limit(1)
+        )
         assert updated_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify that no index processor load was called since no segments exist
@@ -564,7 +571,9 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "add")
 
         # Verify document status was updated to error
-        updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+        updated_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == document.id).limit(1)
+        )
         assert updated_document.indexing_status == IndexingStatus.ERROR
         assert "Test exception during indexing" in updated_document.error
 
@@ -635,7 +644,9 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "add")
 
         # Verify document status was updated to indexing then completed
-        updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+        updated_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == document.id).limit(1)
+        )
         assert updated_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify index processor was initialized with custom index type
@@ -711,7 +722,9 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "add")
 
         # Verify document status was updated to indexing then completed
-        updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+        updated_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == document.id).limit(1)
+        )
         assert updated_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify index processor was initialized with the document's index type
@@ -815,7 +828,9 @@ class TestDealDatasetVectorIndexTask:
 
         # Verify all documents were processed
         for document in documents:
-            updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+            updated_document = db_session_with_containers.scalar(
+                select(Document).where(Document.id == document.id).limit(1)
+            )
             assert updated_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify index processor load was called multiple times
@@ -917,7 +932,9 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "add")
 
         # Verify final document status
-        updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+        updated_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == document.id).limit(1)
+        )
         assert updated_document.indexing_status == IndexingStatus.COMPLETED
 
     def test_deal_dataset_vector_index_task_with_disabled_documents(
@@ -1027,12 +1044,14 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "add")
 
         # Verify only enabled document was processed
-        updated_enabled_document = db_session_with_containers.query(Document).filter_by(id=enabled_document.id).first()
+        updated_enabled_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == enabled_document.id).limit(1)
+        )
         assert updated_enabled_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify disabled document status remains unchanged
-        updated_disabled_document = (
-            db_session_with_containers.query(Document).filter_by(id=disabled_document.id).first()
+        updated_disabled_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == disabled_document.id).limit(1)
         )
         assert updated_disabled_document.indexing_status == IndexingStatus.COMPLETED  # Should not change
 
@@ -1148,12 +1167,14 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "add")
 
         # Verify only active document was processed
-        updated_active_document = db_session_with_containers.query(Document).filter_by(id=active_document.id).first()
+        updated_active_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == active_document.id).limit(1)
+        )
         assert updated_active_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify archived document status remains unchanged
-        updated_archived_document = (
-            db_session_with_containers.query(Document).filter_by(id=archived_document.id).first()
+        updated_archived_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == archived_document.id).limit(1)
         )
         assert updated_archived_document.indexing_status == IndexingStatus.COMPLETED  # Should not change
 
@@ -1269,14 +1290,14 @@ class TestDealDatasetVectorIndexTask:
         deal_dataset_vector_index_task(dataset.id, "add")
 
         # Verify only completed document was processed
-        updated_completed_document = (
-            db_session_with_containers.query(Document).filter_by(id=completed_document.id).first()
+        updated_completed_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == completed_document.id).limit(1)
         )
         assert updated_completed_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify incomplete document status remains unchanged
-        updated_incomplete_document = (
-            db_session_with_containers.query(Document).filter_by(id=incomplete_document.id).first()
+        updated_incomplete_document = db_session_with_containers.scalar(
+            select(Document).where(Document.id == incomplete_document.id).limit(1)
         )
         assert updated_incomplete_document.indexing_status == IndexingStatus.INDEXING  # Should not change
 
diff --git a/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py b/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py
index 6a8e186958..39c58987fd 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py
@@ -2,6 +2,7 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from faker import Faker
+from sqlalchemy import select
 
 from core.indexing_runner import DocumentIsPausedError
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
@@ -317,7 +318,7 @@ class TestDuplicateDocumentIndexingTasks:
         # Verify documents were updated to parsing status
         # Re-query documents from database since _duplicate_document_indexing_task uses a different session
         for doc_id in document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.indexing_status == IndexingStatus.PARSING
             assert updated_document.processing_started_at is not None
 
@@ -362,14 +363,14 @@ class TestDuplicateDocumentIndexingTasks:
         # Verify segments were deleted from database
         # Re-query segments from database using captured IDs to avoid stale ORM instances
         for seg_id in segment_ids:
-            deleted_segment = (
-                db_session_with_containers.query(DocumentSegment).where(DocumentSegment.id == seg_id).first()
+            deleted_segment = db_session_with_containers.scalar(
+                select(DocumentSegment).where(DocumentSegment.id == seg_id).limit(1)
             )
             assert deleted_segment is None
 
         # Verify documents were updated to parsing status
         for doc_id in document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.indexing_status == IndexingStatus.PARSING
             assert updated_document.processing_started_at is not None
 
@@ -438,7 +439,7 @@ class TestDuplicateDocumentIndexingTasks:
         # Verify only existing documents were updated
         # Re-query documents from database since _duplicate_document_indexing_task uses a different session
         for doc_id in existing_document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.indexing_status == IndexingStatus.PARSING
             assert updated_document.processing_started_at is not None
 
@@ -485,7 +486,7 @@ class TestDuplicateDocumentIndexingTasks:
         # Verify documents were still updated to parsing status before the exception
         # Re-query documents from database since _duplicate_document_indexing_task close the session
         for doc_id in document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.indexing_status == IndexingStatus.PARSING
             assert updated_document.processing_started_at is not None
 
@@ -543,7 +544,7 @@ class TestDuplicateDocumentIndexingTasks:
         # Assert: Verify error handling
         # Re-query documents from database since _duplicate_document_indexing_task uses a different session
         for doc_id in document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.indexing_status == IndexingStatus.ERROR
             assert updated_document.error is not None
             assert "batch upload" in updated_document.error.lower()
@@ -585,7 +586,7 @@ class TestDuplicateDocumentIndexingTasks:
         # Assert: Verify error handling
         # Re-query documents from database since _duplicate_document_indexing_task uses a different session
         for doc_id in document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.indexing_status == IndexingStatus.ERROR
             assert updated_document.error is not None
             assert "limit" in updated_document.error.lower()
@@ -649,7 +650,7 @@ class TestDuplicateDocumentIndexingTasks:
 
         # Verify documents were processed
         for doc_id in document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.indexing_status == IndexingStatus.PARSING
 
     @patch("tasks.duplicate_document_indexing_task.TenantIsolatedTaskQueue", autospec=True)
@@ -692,7 +693,7 @@ class TestDuplicateDocumentIndexingTasks:
 
         # Verify documents were processed
         for doc_id in document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.indexing_status == IndexingStatus.PARSING
 
     @patch("tasks.duplicate_document_indexing_task.TenantIsolatedTaskQueue", autospec=True)
@@ -736,7 +737,7 @@ class TestDuplicateDocumentIndexingTasks:
 
         # Verify documents were processed
         for doc_id in document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.indexing_status == IndexingStatus.PARSING
 
     @patch("tasks.duplicate_document_indexing_task.TenantIsolatedTaskQueue", autospec=True)
@@ -851,7 +852,7 @@ class TestDuplicateDocumentIndexingTasks:
 
         # Assert
         for doc_id in document_ids:
-            updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+            updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
             assert updated_document.is_paused is True
             assert updated_document.indexing_status == IndexingStatus.PARSING
             assert updated_document.display_status == "paused"

From 70556d9386c06f3231af0c616a7b99deceeb9749 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 16 Apr 2026 12:37:05 +0800
Subject: [PATCH 05/36] chore(deps): upgrade vite-plus to 0.1.18 (#35300)

---
 pnpm-lock.yaml      | 660 ++++++++++++++++++++++----------------------
 pnpm-workspace.yaml |  10 +-
 2 files changed, 341 insertions(+), 329 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 79fcec0e8d..da1110504d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -526,8 +526,8 @@ catalogs:
       specifier: 12.0.0-beta.1
       version: 12.0.0-beta.1
     vite-plus:
-      specifier: 0.1.16
-      version: 0.1.16
+      specifier: 0.1.18
+      version: 0.1.18
     vitest-canvas-mock:
       specifier: 1.1.4
       version: 1.1.4
@@ -565,8 +565,8 @@ overrides:
   svgo@>=3.0.0 <3.3.3: 3.3.3
   tar@<=7.5.10: 7.5.11
   undici@>=7.0.0 <7.24.0: 7.24.0
-  vite: npm:@voidzero-dev/vite-plus-core@0.1.16
-  vitest: npm:@voidzero-dev/vite-plus-test@0.1.16
+  vite: npm:@voidzero-dev/vite-plus-core@0.1.18
+  vitest: npm:@voidzero-dev/vite-plus-test@0.1.18
   yaml@>=2.0.0 <2.8.3: 2.8.3
   yauzl@<3.2.1: 3.2.1
 
@@ -575,11 +575,11 @@ importers:
   .:
     devDependencies:
       vite:
-        specifier: npm:@voidzero-dev/vite-plus-core@0.1.16
-        version: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+        specifier: npm:@voidzero-dev/vite-plus-core@0.1.18
+        version: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
+        version: 0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
 
   e2e:
     devDependencies:
@@ -599,11 +599,11 @@ importers:
         specifier: 'catalog:'
         version: 6.0.2
       vite:
-        specifier: npm:@voidzero-dev/vite-plus-core@0.1.16
-        version: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+        specifier: npm:@voidzero-dev/vite-plus-core@0.1.18
+        version: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
+        version: 0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
 
   packages/dify-ui:
     dependencies:
@@ -640,7 +640,7 @@ importers:
         version: 8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
       '@vitest/coverage-v8':
         specifier: 'catalog:'
-        version: 4.1.4(@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
+        version: 4.1.4(@voidzero-dev/vite-plus-test@0.1.18)
       eslint:
         specifier: 'catalog:'
         version: 10.2.0(jiti@2.6.1)
@@ -648,14 +648,14 @@ importers:
         specifier: 'catalog:'
         version: 6.0.2
       vite:
-        specifier: npm:@voidzero-dev/vite-plus-core@0.1.16
-        version: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+        specifier: npm:@voidzero-dev/vite-plus-core@0.1.18
+        version: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
+        version: 0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
       vitest:
-        specifier: npm:@voidzero-dev/vite-plus-test@0.1.16
-        version: '@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+        specifier: npm:@voidzero-dev/vite-plus-test@0.1.18
+        version: '@voidzero-dev/vite-plus-test@0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
 
   web:
     dependencies:
@@ -968,7 +968,7 @@ importers:
     devDependencies:
       '@antfu/eslint-config':
         specifier: 'catalog:'
-        version: 8.2.0(@eslint-react/eslint-plugin@3.0.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@next/eslint-plugin-next@16.2.3)(@typescript-eslint/rule-tester@8.57.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.2))(@typescript-eslint/utils@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(@vue/compiler-sfc@3.5.31)(eslint-plugin-react-refresh@0.5.2(eslint@10.2.0(jiti@2.6.1)))(eslint@10.2.0(jiti@2.6.1))(oxlint@1.58.0(oxlint-tsgolint@0.20.0))(typescript@6.0.2)
+        version: 8.2.0(@eslint-react/eslint-plugin@3.0.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@next/eslint-plugin-next@16.2.3)(@typescript-eslint/rule-tester@8.57.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.2))(@typescript-eslint/utils@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@voidzero-dev/vite-plus-test@0.1.18)(@vue/compiler-sfc@3.5.31)(eslint-plugin-react-refresh@0.5.2(eslint@10.2.0(jiti@2.6.1)))(eslint@10.2.0(jiti@2.6.1))(oxlint@1.60.0(oxlint-tsgolint@0.20.0))(typescript@6.0.2)
       '@chromatic-com/storybook':
         specifier: 'catalog:'
         version: 5.1.2(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
@@ -995,7 +995,7 @@ importers:
         version: link:../packages/dify-ui
       '@mdx-js/loader':
         specifier: 'catalog:'
-        version: 3.1.1(webpack@5.105.4(uglify-js@3.19.3))
+        version: 3.1.1(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       '@mdx-js/react':
         specifier: 'catalog:'
         version: 3.1.1(@types/react@19.2.14)(react@19.2.5)
@@ -1007,13 +1007,13 @@ importers:
         version: 16.2.3
       '@next/mdx':
         specifier: 'catalog:'
-        version: 16.2.3(@mdx-js/loader@3.1.1(webpack@5.105.4(uglify-js@3.19.3)))(@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.5))
+        version: 16.2.3(@mdx-js/loader@3.1.1(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.5))
       '@rgrove/parse-xml':
         specifier: 'catalog:'
         version: 4.2.0
       '@storybook/addon-docs':
         specifier: 'catalog:'
-        version: 10.3.5(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(uglify-js@3.19.3))
+        version: 10.3.5(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       '@storybook/addon-links':
         specifier: 'catalog:'
         version: 10.3.5(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
@@ -1025,7 +1025,7 @@ importers:
         version: 10.3.5(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
       '@storybook/nextjs-vite':
         specifier: 'catalog:'
-        version: 10.3.5(@babel/core@7.29.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)(webpack@5.105.4(uglify-js@3.19.3))
+        version: 10.3.5(@babel/core@7.29.0)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       '@storybook/react':
         specifier: 'catalog:'
         version: 10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)
@@ -1034,7 +1034,7 @@ importers:
         version: 4.2.2
       '@tailwindcss/vite':
         specifier: 'catalog:'
-        version: 4.2.2(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
+        version: 4.2.2(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
       '@tanstack/eslint-plugin-query':
         specifier: 'catalog:'
         version: 5.99.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
@@ -1100,13 +1100,13 @@ importers:
         version: 7.0.0-dev.20260413.1
       '@vitejs/plugin-react':
         specifier: 'catalog:'
-        version: 6.0.1(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
+        version: 6.0.1(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
       '@vitejs/plugin-rsc':
         specifier: 'catalog:'
-        version: 0.5.24(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3)))(react@19.2.5)
+        version: 0.5.24(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.5)
       '@vitest/coverage-v8':
         specifier: 'catalog:'
-        version: 4.1.4(@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
+        version: 4.1.4(@voidzero-dev/vite-plus-test@0.1.18)
       agentation:
         specifier: 'catalog:'
         version: 3.0.2(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
@@ -1121,7 +1121,7 @@ importers:
         version: 0.6.1(eslint@10.2.0(jiti@2.6.1))
       eslint-plugin-better-tailwindcss:
         specifier: 'catalog:'
-        version: 4.4.1(eslint@10.2.0(jiti@2.6.1))(oxlint@1.58.0(oxlint-tsgolint@0.20.0))(tailwindcss@4.2.2)(typescript@6.0.2)
+        version: 4.4.1(eslint@10.2.0(jiti@2.6.1))(oxlint@1.60.0(oxlint-tsgolint@0.20.0))(tailwindcss@4.2.2)(typescript@6.0.2)
       eslint-plugin-hyoban:
         specifier: 'catalog:'
         version: 0.14.1(eslint@10.2.0(jiti@2.6.1))
@@ -1154,7 +1154,7 @@ importers:
         version: 8.5.9
       react-server-dom-webpack:
         specifier: 'catalog:'
-        version: 19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3))
+        version: 19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       storybook:
         specifier: 'catalog:'
         version: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
@@ -1172,22 +1172,22 @@ importers:
         version: 3.19.3
       vinext:
         specifier: 'catalog:'
-        version: 0.0.41(@mdx-js/rollup@3.1.1(rollup@4.59.0))(@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)))(@vitejs/plugin-rsc@0.5.24(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3)))(react@19.2.5))(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3)))(react@19.2.5)(typescript@6.0.2)
+        version: 0.0.41(453b4e184a832f83060410b31544dc36)
       vite:
-        specifier: npm:@voidzero-dev/vite-plus-core@0.1.16
-        version: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+        specifier: npm:@voidzero-dev/vite-plus-core@0.1.18
+        version: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
       vite-plugin-inspect:
         specifier: 'catalog:'
-        version: 12.0.0-beta.1(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)(ws@8.20.0)
+        version: 12.0.0-beta.1(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)(ws@8.20.0)
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
+        version: 0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
       vitest:
-        specifier: npm:@voidzero-dev/vite-plus-test@0.1.16
-        version: '@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+        specifier: npm:@voidzero-dev/vite-plus-test@0.1.18
+        version: '@voidzero-dev/vite-plus-test@0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
       vitest-canvas-mock:
         specifier: 'catalog:'
-        version: 1.1.4(@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
+        version: 1.1.4(@voidzero-dev/vite-plus-test@0.1.18)
 
 packages:
 
@@ -2550,15 +2550,15 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@oxc-project/runtime@0.123.0':
-    resolution: {integrity: sha512-wRf0z8saz9tHLcK3YeTeBmwISrpy4bBimvKxUmryiIhbt+ZJb0nwwJNL3D8xpeWbNfZlGSlzRBZbfcbApIGZJw==}
+  '@oxc-project/runtime@0.124.0':
+    resolution: {integrity: sha512-sSg6n37J3w3mM4odFvRqzQENf6+qxKnvStr/gU0FgRRg1VE/4MqryLd9PJmE0a7K5xlDfbrctBtSagaFH6ij9Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
   '@oxc-project/types@0.121.0':
     resolution: {integrity: sha512-CGtOARQb9tyv7ECgdAlFxi0Fv7lmzvmlm2rpD/RdijOO9rfk/JvB1CjT8EnoD+tjna/IYgKKw3IV7objRb+aYw==}
 
-  '@oxc-project/types@0.123.0':
-    resolution: {integrity: sha512-YtECP/y8Mj1lSHiUWGSRzy/C6teUKlS87dEfuVKT09LgQbUsBW1rNg+MiJ4buGu3yuADV60gbIvo9/HplA56Ew==}
+  '@oxc-project/types@0.124.0':
+    resolution: {integrity: sha512-VBFWMTBvHxS11Z5Lvlr3IWgrwhMTXV+Md+EQF0Xf60+wAdsGFTBx7X7K/hP4pi8N7dcm1RvcHwDxZ16Qx8keUg==}
 
   '@oxc-resolver/binding-android-arm-eabi@11.19.1':
     resolution: {integrity: sha512-aUs47y+xyXHUKlbhqHUjBABjvycq6YSD7bpxSW7vplUmdzAlJ93yXY6ZR0c1o1x5A/QKbENCvs3+NlY8IpIVzg==}
@@ -2668,124 +2668,124 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@oxfmt/binding-android-arm-eabi@0.43.0':
-    resolution: {integrity: sha512-CgU2s+/9hHZgo0IxVxrbMPrMj+tJ6VM3mD7Mr/4oiz4FNTISLoCvRmB5nk4wAAle045RtRjd86m673jwPyb1OQ==}
+  '@oxfmt/binding-android-arm-eabi@0.45.0':
+    resolution: {integrity: sha512-A/UMxFob1fefCuMeGxQBulGfFE38g2Gm23ynr3u6b+b7fY7/ajGbNsa3ikMIkGMLJW/TRoQaMoP1kME7S+815w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxfmt/binding-android-arm64@0.43.0':
-    resolution: {integrity: sha512-T9OfRwjA/EdYxAqbvR7TtqLv5nIrwPXuCtTwOHtS7aR9uXyn74ZYgzgTo6/ZwvTq9DY4W+DsV09hB2EXgn9EbA==}
+  '@oxfmt/binding-android-arm64@0.45.0':
+    resolution: {integrity: sha512-L63z4uZmHjgvvqvMJD7mwff8aSBkM0+X4uFr6l6U5t6+Qc9DCLVZWIunJ7Gm4fn4zHPdSq6FFQnhu9yqqobxIg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxfmt/binding-darwin-arm64@0.43.0':
-    resolution: {integrity: sha512-o3i49ZUSJWANzXMAAVY1wnqb65hn4JVzwlRQ5qfcwhRzIA8lGVaud31Q3by5ALHPrksp5QEaKCQF9aAS3TXpZA==}
+  '@oxfmt/binding-darwin-arm64@0.45.0':
+    resolution: {integrity: sha512-UV34dd623FzqT+outIGndsCA/RBB+qgB3XVQhgmmJ9PJwa37NzPC9qzgKeOhPKxVk2HW+JKldQrVL54zs4Noww==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxfmt/binding-darwin-x64@0.43.0':
-    resolution: {integrity: sha512-vWECzzCFkb0kK6jaHjbtC5sC3adiNWtqawFCxhpvsWlzVeKmv5bNvkB4nux+o4JKWTpHCM57NDK/MeXt44txmA==}
+  '@oxfmt/binding-darwin-x64@0.45.0':
+    resolution: {integrity: sha512-pMNJv0CMa1pDefVPeNbuQxibh8ITpWDFEhMC/IBB9Zlu76EbgzYwrzI4Cb11mqX2+rIYN70UTrh3z06TM59ptQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxfmt/binding-freebsd-x64@0.43.0':
-    resolution: {integrity: sha512-rgz8JpkKiI/umOf7fl9gwKyQasC8bs5SYHy6g7e4SunfLBY3+8ATcD5caIg8KLGEtKFm5ujKaH8EfjcmnhzTLg==}
+  '@oxfmt/binding-freebsd-x64@0.45.0':
+    resolution: {integrity: sha512-xTcRoxbbo61sW2+ZRPeH+vp/o9G8gkdhiVumFU+TpneiPm14c79l6GFlxPXlCE9bNWikigbsrvJw46zCVAQFfg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.43.0':
-    resolution: {integrity: sha512-nWYnF3vIFzT4OM1qL/HSf1Yuj96aBuKWSaObXHSWliwAk2rcj7AWd6Lf7jowEBQMo4wCZVnueIGw/7C4u0KTBQ==}
+  '@oxfmt/binding-linux-arm-gnueabihf@0.45.0':
+    resolution: {integrity: sha512-hWL8Hdni+3U1mPFx1UtWeGp3tNb6EhBAUHRMbKUxVkOp3WwoJbpVO2bfUVbS4PfpledviXXNHSTl1veTa6FhkQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.43.0':
-    resolution: {integrity: sha512-sFg+NWJbLfupYTF4WELHAPSnLPOn1jiDZ33Z1jfDnTaA+cC3iB35x0FMMZTFdFOz3icRIArncwCcemJFGXu6TQ==}
+  '@oxfmt/binding-linux-arm-musleabihf@0.45.0':
+    resolution: {integrity: sha512-6Blt/0OBT7vvfQpqYuYbpbFLPqSiaYpEJzUUWhinPEuADypDbtV1+LdjM0vYBNGPvnj85ex7lTerEX6JGcPt9w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm64-gnu@0.43.0':
-    resolution: {integrity: sha512-MelWqv68tX6wZEILDrTc9yewiGXe7im62+5x0bNXlCYFOZdA+VnYiJfAihbROsZ5fm90p9C3haFrqjj43XnlAA==}
+  '@oxfmt/binding-linux-arm64-gnu@0.45.0':
+    resolution: {integrity: sha512-jLjoLfe+hGfjhA8hNBSdw85yCA8ePKq7ME4T+g6P9caQXvmt6IhE2X7iVjnVdkmYUWEzZrxlh4p6RkDmAMJY/A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-arm64-musl@0.43.0':
-    resolution: {integrity: sha512-ROaWfYh+6BSJ1Arwy5ujijTlwnZetxDxzBpDc1oBR4d7rfrPBqzeyjd5WOudowzQUgyavl2wEpzn1hw3jWcqLA==}
+  '@oxfmt/binding-linux-arm64-musl@0.45.0':
+    resolution: {integrity: sha512-XQKXZIKYJC3GQJ8FnD3iMntpw69Wd9kDDK/Xt79p6xnFYlGGxSNv2vIBvRTDg5CKByWFWWZLCRDOXoP/m6YN4g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.43.0':
-    resolution: {integrity: sha512-PJRs/uNxmFipJJ8+SyKHh7Y7VZIKQicqrrBzvfyM5CtKi8D7yZKTwUOZV3ffxmiC2e7l1SDJpkBEOyue5NAFsg==}
+  '@oxfmt/binding-linux-ppc64-gnu@0.45.0':
+    resolution: {integrity: sha512-+g5RiG+xOkdrCWkKodv407nTvMq4vYM18Uox2MhZBm/YoqFxxJpWKsloskFFG5NU13HGPw1wzYjjOVcyd9moCA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.43.0':
-    resolution: {integrity: sha512-j6biGAgzIhj+EtHXlbNumvwG7XqOIdiU4KgIWRXAEj/iUbHKukKW8eXa4MIwpQwW1YkxovduKtzEAPnjlnAhVQ==}
+  '@oxfmt/binding-linux-riscv64-gnu@0.45.0':
+    resolution: {integrity: sha512-V7dXKoSyEbWAkkSF4JJNtF+NJZDmJoSarSoP30WCsB3X636Rehd3CvxBj49FIJxEBFWhvcUjGSHVeU8Erck1bQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-riscv64-musl@0.43.0':
-    resolution: {integrity: sha512-RYWxAcslKxvy7yri24Xm9cmD0RiANaiEPs007EFG6l9h1ChM69Q5SOzACaCoz4Z9dEplnhhneeBaTWMEdpgIbA==}
+  '@oxfmt/binding-linux-riscv64-musl@0.45.0':
+    resolution: {integrity: sha512-Vdelft1sAEYojVGgcODEFXSWYQYlIvoyIGWebKCuUibd1tvS1TjTx413xG2ZLuHpYj45CkN/ztMLMX6jrgqpgg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-linux-s390x-gnu@0.43.0':
-    resolution: {integrity: sha512-DT6Q8zfQQy3jxpezAsBACEHNUUixKSYTwdXeXojNHe4DQOoxjPdjr3Szu6BRNjxLykZM/xMNmp9ElOIyDppwtw==}
+  '@oxfmt/binding-linux-s390x-gnu@0.45.0':
+    resolution: {integrity: sha512-RR7xKgNpqwENnK0aYCGYg0JycY2n93J0reNjHyes+I9Gq52dH95x+CBlnlAQHCPfz6FGnKA9HirgUl14WO6o7w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-x64-gnu@0.43.0':
-    resolution: {integrity: sha512-R8Yk7iYcuZORXmCfFZClqbDxRZgZ9/HEidUuBNdoX8Ptx07cMePnMVJ/woB84lFIDjh2ROHVaOP40Ds3rBXFqg==}
+  '@oxfmt/binding-linux-x64-gnu@0.45.0':
+    resolution: {integrity: sha512-U/QQ0+BQNSHxjuXR/utvXnQ50Vu5kUuqEomZvQ1/3mhgbBiMc2WU9q5kZ5WwLp3gnFIx9ibkveoRSe2EZubkqg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-x64-musl@0.43.0':
-    resolution: {integrity: sha512-F2YYqyvnQNvi320RWZNAvsaWEHwmW3k4OwNJ1hZxRKXupY63expbBaNp6jAgvYs7y/g546vuQnGHQuCBhslhLQ==}
+  '@oxfmt/binding-linux-x64-musl@0.45.0':
+    resolution: {integrity: sha512-o5TLOUCF0RWQjsIS06yVC+kFgp092/yLe6qBGSUvtnmTVw9gxjpdQSXc3VN5Cnive4K11HNstEZF8ROKHfDFSw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-openharmony-arm64@0.43.0':
-    resolution: {integrity: sha512-OE6TdietLXV3F6c7pNIhx/9YC1/2YFwjU9DPc/fbjxIX19hNIaP1rS0cFjCGJlGX+cVJwIKWe8Mos+LdQ1yAJw==}
+  '@oxfmt/binding-openharmony-arm64@0.45.0':
+    resolution: {integrity: sha512-RnGcV3HgPuOjsGx/k9oyRNKmOp+NBLGzZTdPDYbc19r7NGeYPplnUU/BfU35bX2Y/O4ejvHxcfkvW2WoYL/gsg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxfmt/binding-win32-arm64-msvc@0.43.0':
-    resolution: {integrity: sha512-0nWK6a7pGkbdoypfVicmV9k/N1FwjPZENoqhlTU+5HhZnAhpIO3za30nEE33u6l6tuy9OVfpdXUqxUgZ+4lbZw==}
+  '@oxfmt/binding-win32-arm64-msvc@0.45.0':
+    resolution: {integrity: sha512-v3Vj7iKKsUFwt9w5hsqIIoErKVoENC6LoqfDlteOQ5QMDCXihlqLoxpmviUhXnNncg4zV6U9BPwlBbwa+qm4wg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxfmt/binding-win32-ia32-msvc@0.43.0':
-    resolution: {integrity: sha512-9aokTR4Ft+tRdvgN/pKzSkVy2ksc4/dCpDm9L/xFrbIw0yhLtASLbvoG/5WOTUh/BRPPnfGTsWznEqv0dlOmhA==}
+  '@oxfmt/binding-win32-ia32-msvc@0.45.0':
+    resolution: {integrity: sha512-N8yotPBX6ph0H3toF4AEpdCeVPrdcSetj+8eGiZGsrLsng3bs/Q5HPu4bbSxip5GBPx5hGbGHrZwH4+rcrjhHA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxfmt/binding-win32-x64-msvc@0.43.0':
-    resolution: {integrity: sha512-4bPgdQux2ZLWn3bf2TTXXMHcJB4lenmuxrLqygPmvCJ104Yqzj1UctxSRzR31TiJ4MLaG22RK8dUsVpJtrCz5g==}
+  '@oxfmt/binding-win32-x64-msvc@0.45.0':
+    resolution: {integrity: sha512-w5MMTRCK1dpQeRA+HHqXQXyN33DlG/N2LOYxJmaT4fJjcmZrbNnqw7SmIk7I2/a2493PPLZ+2E/Ar6t2iKVMug==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -2820,124 +2820,124 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@oxlint/binding-android-arm-eabi@1.58.0':
-    resolution: {integrity: sha512-1T7UN3SsWWxpWyWGn1cT3ASNJOo+pI3eUkmEl7HgtowapcV8kslYpFQcYn431VuxghXakPNlbjRwhqmR37PFOg==}
+  '@oxlint/binding-android-arm-eabi@1.60.0':
+    resolution: {integrity: sha512-YdeJKaZckDQL1qa62a1aKq/goyq48aX3yOxaaWqWb4sau4Ee4IiLbamftNLU3zbePky6QsDj6thnSSzHRBjDfA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxlint/binding-android-arm64@1.58.0':
-    resolution: {integrity: sha512-GryzujxuiRv2YFF7bRy8mKcxlbuAN+euVUtGJt9KKbLT8JBUIosamVhcthLh+VEr6KE6cjeVMAQxKAzJcoN7dg==}
+  '@oxlint/binding-android-arm64@1.60.0':
+    resolution: {integrity: sha512-7ANS7PpXCfq84xZQ8E5WPs14gwcuPcl+/8TFNXfpSu0CQBXz3cUo2fDpHT8v8HJN+Ut02eacvMAzTnc9s6X4tw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxlint/binding-darwin-arm64@1.58.0':
-    resolution: {integrity: sha512-7/bRSJIwl4GxeZL9rPZ11anNTyUO9epZrfEJH/ZMla3+/gbQ6xZixh9nOhsZ0QwsTW7/5J2A/fHbD1udC5DQQA==}
+  '@oxlint/binding-darwin-arm64@1.60.0':
+    resolution: {integrity: sha512-pJsgd9AfplLGBm1fIr25V6V14vMrayhx4uIQvlfH7jWs2SZwSrvi3TfgfJySB8T+hvyEH8K2zXljQiUnkgUnfQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint/binding-darwin-x64@1.58.0':
-    resolution: {integrity: sha512-EqdtJSiHweS2vfILNrpyJ6HUwpEq2g7+4Zx1FPi4hu3Hu7tC3znF6ufbXO8Ub2LD4mGgznjI7kSdku9NDD1Mkg==}
+  '@oxlint/binding-darwin-x64@1.60.0':
+    resolution: {integrity: sha512-Ue1aXHX49ivwflKqGJc7zcd/LeLgbhaTcDCQStgx5x06AXgjEAZmvrlMuIkWd4AL4FHQe6QJ9f33z04Cg448VQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint/binding-freebsd-x64@1.58.0':
-    resolution: {integrity: sha512-VQt5TH4M42mY20F545G637RKxV/yjwVtKk2vfXuazfReSIiuvWBnv+FVSvIV5fKVTJNjt3GSJibh6JecbhGdBw==}
+  '@oxlint/binding-freebsd-x64@1.60.0':
+    resolution: {integrity: sha512-YCyQzsQtusQw+gNRW9rRTifSO+Dt/+dtCl2NHoDMZqJlRTEZ/Oht9YnuporI9yiTx7+cB+eqzX3MtHHVHGIWhg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.58.0':
-    resolution: {integrity: sha512-fBYcj4ucwpAtjJT3oeBdFBYKvNyjRSK+cyuvBOTQjh0jvKp4yeA4S/D0IsCHus/VPaNG5L48qQkh+Vjy3HL2/Q==}
+  '@oxlint/binding-linux-arm-gnueabihf@1.60.0':
+    resolution: {integrity: sha512-c7dxM2Zksa45Qw16i2iGY3Fti2NirJ38FrsBsKw+qcJ0OtqTsBgKJLF0xV+yLG56UH01Z8WRPgsw31e0MoRoGQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm-musleabihf@1.58.0':
-    resolution: {integrity: sha512-0BeuFfwlUHlJ1xpEdSD1YO3vByEFGPg36uLjK1JgFaxFb4W6w17F8ET8sz5cheZ4+x5f2xzdnRrrWv83E3Yd8g==}
+  '@oxlint/binding-linux-arm-musleabihf@1.60.0':
+    resolution: {integrity: sha512-ZWALoA42UYqBEP1Tbw9OWURgFGS1nWj2AAvLdY6ZcGx/Gj93qVCBKjcvwXMupZibYwFbi9s/rzqkZseb/6gVtQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm64-gnu@1.58.0':
-    resolution: {integrity: sha512-TXlZgnPTlxrQzxG9ZXU7BNwx1Ilrr17P3GwZY0If2EzrinqRH3zXPc3HrRcBJgcsoZNMuNL5YivtkJYgp467UQ==}
+  '@oxlint/binding-linux-arm64-gnu@1.60.0':
+    resolution: {integrity: sha512-tpy+1w4p9hN5CicMCxqNy6ymfRtV5ayE573vFNjp1k1TN/qhLFgflveZoE/0++RlkHikBz2vY545NWm/hp7big==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-arm64-musl@1.58.0':
-    resolution: {integrity: sha512-zSoYRo5dxHLcUx93Stl2hW3hSNjPt99O70eRVWt5A1zwJ+FPjeCCANCD2a9R4JbHsdcl11TIQOjyigcRVOH2mw==}
+  '@oxlint/binding-linux-arm64-musl@1.60.0':
+    resolution: {integrity: sha512-eDYDXZGhQAXyn6GwtwiX/qcLS0HlOLPJ/+iiIY8RYr+3P8oKBmgKxADLlniL6FtWfE7pPk7IGN9/xvDEvDvFeg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-ppc64-gnu@1.58.0':
-    resolution: {integrity: sha512-NQ0U/lqxH2/VxBYeAIvMNUK1y0a1bJ3ZicqkF2c6wfakbEciP9jvIE4yNzCFpZaqeIeRYaV7AVGqEO1yrfVPjA==}
+  '@oxlint/binding-linux-ppc64-gnu@1.60.0':
+    resolution: {integrity: sha512-nxehly5XYBHUWI9VJX1bqCf9j/B43DaK/aS/T1fcxCpX3PA4Rm9BB54nPD1CKayT8xg6REN1ao+01hSRNgy8OA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-gnu@1.58.0':
-    resolution: {integrity: sha512-X9J+kr3gIC9FT8GuZt0ekzpNUtkBVzMVU4KiKDSlocyQuEgi3gBbXYN8UkQiV77FTusLDPsovjo95YedHr+3yg==}
+  '@oxlint/binding-linux-riscv64-gnu@1.60.0':
+    resolution: {integrity: sha512-j1qf/NaUfOWQutjeoooNG1Q0zsK0XGmSu1uDLq3cctquRF3j7t9Hxqf/76ehCc5GEUAanth2W4Fa+XT1RFg/nw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-musl@1.58.0':
-    resolution: {integrity: sha512-CDze3pi1OO3Wvb/QsXjmLEY4XPKGM6kIo82ssNOgmcl1IdndF9VSGAE38YLhADWmOac7fjqhBw82LozuUVxD0Q==}
+  '@oxlint/binding-linux-riscv64-musl@1.60.0':
+    resolution: {integrity: sha512-YELKPRefQ/q/h3RUmeRfPCUhh2wBvgV1RyZ/F9M9u8cDyXsQW2ojv1DeWQTt466yczDITjZnIOg/s05pk7Ve2A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-s390x-gnu@1.58.0':
-    resolution: {integrity: sha512-b/89glbxFaEAcA6Uf1FvCNecBJEgcUTsV1quzrqXM/o4R1M4u+2KCVuyGCayN2UpsRWtGGLb+Ver0tBBpxaPog==}
+  '@oxlint/binding-linux-s390x-gnu@1.60.0':
+    resolution: {integrity: sha512-JkO3C6Gki7Y6h/MiIkFKvHFOz98/YWvQ4WYbK9DLXACMP2rjULzkeGyAzorJE5S1dzLQGFgeqvN779kSFwoV1g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-gnu@1.58.0':
-    resolution: {integrity: sha512-0/yYpkq9VJFCEcuRlrViGj8pJUFFvNS4EkEREaN7CB1EcLXJIaVSSa5eCihwBGXtOZxhnblWgxks9juRdNQI7w==}
+  '@oxlint/binding-linux-x64-gnu@1.60.0':
+    resolution: {integrity: sha512-XjKHdFVCpZZZSWBCKyyqCq65s2AKXykMXkjLoKYODrD+f5toLhlwsMESscu8FbgnJQ4Y/dpR/zdazsahmgBJIA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-musl@1.58.0':
-    resolution: {integrity: sha512-hr6FNvmcAXiH+JxSvaJ4SJ1HofkdqEElXICW9sm3/Rd5eC3t7kzvmLyRAB3NngKO2wzXRCAm4Z/mGWfrsS4X8w==}
+  '@oxlint/binding-linux-x64-musl@1.60.0':
+    resolution: {integrity: sha512-js29ZWIuPhNWzY8NC7KoffEMEeWG105vbmm+8EOJsC+T/jHBiKIJEUF78+F/IrgEWMMP9N0kRND4Pp75+xAhKg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-openharmony-arm64@1.58.0':
-    resolution: {integrity: sha512-R+O368VXgRql1K6Xar+FEo7NEwfo13EibPMoTv3sesYQedRXd6m30Dh/7lZMxnrQVFfeo4EOfYIP4FpcgWQNHg==}
+  '@oxlint/binding-openharmony-arm64@1.60.0':
+    resolution: {integrity: sha512-H+PUITKHk04stFpWj3x3Kg08Afp/bcXSBi0EhasR5a0Vw7StXHTzdl655PUI0fB4qdh2Wsu6Dsi+3ACxPoyQnA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxlint/binding-win32-arm64-msvc@1.58.0':
-    resolution: {integrity: sha512-Q0FZiAY/3c4YRj4z3h9K1PgaByrifrfbBoODSeX7gy97UtB7pySPUQfC2B/GbxWU6k7CzQrRy5gME10PltLAFQ==}
+  '@oxlint/binding-win32-arm64-msvc@1.60.0':
+    resolution: {integrity: sha512-WA/yc7f7ZfCefBXVzNHn1Ztulb1EFwNBb4jMZ6pjML0zz6pHujlF3Q3jySluz3XHl/GNeMTntG1seUBWVMlMag==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint/binding-win32-ia32-msvc@1.58.0':
-    resolution: {integrity: sha512-Y8FKBABrSPp9H0QkRLHDHOSUgM/309a3IvOVgPcVxYcX70wxJrk608CuTg7w+C6vEd724X5wJoNkBcGYfH7nNQ==}
+  '@oxlint/binding-win32-ia32-msvc@1.60.0':
+    resolution: {integrity: sha512-33YxL1sqwYNZXtn3MD/4dno6s0xeedXOJlT1WohkVD565WvohClZUr7vwKdAk954n4xiEWJkewiCr+zLeq7AeA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxlint/binding-win32-x64-msvc@1.58.0':
-    resolution: {integrity: sha512-bCn5rbiz5My+Bj7M09sDcnqW0QJyINRVxdZ65x1/Y2tGrMwherwK/lpk+HRQCKvXa8pcaQdF5KY5j54VGZLwNg==}
+  '@oxlint/binding-win32-x64-msvc@1.60.0':
+    resolution: {integrity: sha512-JOro4ZcfBLamJCyfURQmOQByoorgOdx3ZjAkSqnb/CyG/i+lN3KoV5LAgk5ZAW6DPq7/Cx7n23f8DuTWXTWgyQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -4511,16 +4511,16 @@ packages:
   '@vitest/utils@4.1.4':
     resolution: {integrity: sha512-13QMT+eysM5uVGa1rG4kegGYNp6cnQcsTc67ELFbhNLQO+vgsygtYJx2khvdt4gVQqSSpC/KT5FZZxUpP3Oatw==}
 
-  '@voidzero-dev/vite-plus-core@0.1.16':
-    resolution: {integrity: sha512-fOyf14CXjcXqANFs2fCXEX+0Tn9ZjmqfFV+qTnARwIF1Kzl8WquO4XtvlDgs/fTQ91H4AyoNUgkvWdKS+C4xYA==}
+  '@voidzero-dev/vite-plus-core@0.1.18':
+    resolution: {integrity: sha512-3PmXOL26yHzlw8ET9SwXCmglGzUYq2fOTYf2t0mxvVIs7ua3bnf6tOnmR+6YX5k1Ez26B0ooYzx+znc8k+CAMw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     peerDependencies:
       '@arethetypeswrong/core': ^0.18.1
-      '@tsdown/css': 0.21.7
-      '@tsdown/exe': 0.21.7
+      '@tsdown/css': 0.21.8
+      '@tsdown/exe': 0.21.8
       '@types/node': ^20.19.0 || >=22.12.0
       '@vitejs/devtools': ^0.1.0
-      esbuild: ^0.28.0
+      esbuild: 0.27.2
       jiti: '>=1.21.0'
       less: ^4.0.0
       publint: ^0.3.0
@@ -4571,54 +4571,56 @@ packages:
       yaml:
         optional: true
 
-  '@voidzero-dev/vite-plus-darwin-arm64@0.1.16':
-    resolution: {integrity: sha512-InG0ZmuGh7DTrn7zWQ0UvKapElphKI6G1oYfys+jraedG70EhIIee9gtO+mTE1T0bF67SgAcLXwNyaiNda0XwA==}
+  '@voidzero-dev/vite-plus-darwin-arm64@0.1.18':
+    resolution: {integrity: sha512-bw2pWWE8RZRELWjXcdxdmRaOaYjmGmsxEm23TxvGxQXFb7k9l51W8tpjxariPGLxrEl+Cw5u601IL5LASaPJ5w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@voidzero-dev/vite-plus-darwin-x64@0.1.16':
-    resolution: {integrity: sha512-LGNrECstuhkCRKRj/dE98Xcprw8HU3VMIMJnZsnDR2C5RB2HADNIu21at/a/G3giA9eWm7uhtPp9FvUtTCK9TA==}
+  '@voidzero-dev/vite-plus-darwin-x64@0.1.18':
+    resolution: {integrity: sha512-8TFj6yJNsumoH+yFc+6zf3g2UuzvrPHq2FAAVORffaVZ29PWnDSsXjegaIBmoAtGO5Xb4lcilQx7NoF9hONrZg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@voidzero-dev/vite-plus-linux-arm64-gnu@0.1.16':
-    resolution: {integrity: sha512-AoFKu6dIOtlkp/mwmtU8ES2uzoaxCHhIym1Tk7qMxyvke4IXnye6VDc4kPMRQwD8mwR3T3bO0HuaEEHxrIWDxw==}
+  '@voidzero-dev/vite-plus-linux-arm64-gnu@0.1.18':
+    resolution: {integrity: sha512-xHRqncKanOZ0zNnZSufL4Yx/gWrIFkCjU6jFzCukBOOCrcemq3SrALPHrNf+Nw1RLwNptGUZn2Vx/IjRLzUQDw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@voidzero-dev/vite-plus-linux-arm64-musl@0.1.16':
-    resolution: {integrity: sha512-PloCsGTRIhcXIpUOJ6PqVG8gYNpq+ooJNyqy5sQ82BRnJuo8oV7uBLFvg0X9B3Bzh+vO1F8/+92+o5TiL35JMg==}
+  '@voidzero-dev/vite-plus-linux-arm64-musl@0.1.18':
+    resolution: {integrity: sha512-CA6XxZbkT8lYwWzS2yAj6exr7nHl3R8Sz+ZdOhYCU4yR2qvzGatdVgFr7oPnrkHLF426cHJ172rmNNj8NKie/w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@voidzero-dev/vite-plus-linux-x64-gnu@0.1.16':
-    resolution: {integrity: sha512-nY9/2g+qjhwsW5U3MrFLlx+bOBsdOJiO2HzbxQy7jo/S3jPTnXhFlrRegQuAmqrHAXrSdNwgblgRpICKhx1xZg==}
+  '@voidzero-dev/vite-plus-linux-x64-gnu@0.1.18':
+    resolution: {integrity: sha512-xBO3MtLGVASPjH/GDRxexfLCT0othVpiFMdEQ83Y+woVNbrrzcdQTGFUuFG4cAiMhtmjytyFwPBtZ76BWsDO3w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@voidzero-dev/vite-plus-linux-x64-musl@0.1.16':
-    resolution: {integrity: sha512-JGKEAMoXqzdr9lHT/13uRNV9uzrSYXAFhjAfIC8WEQMG2VUFksvq5/TOc26hzmzbqu+bxRmfN8h1aVTDL8KwFg==}
+  '@voidzero-dev/vite-plus-linux-x64-musl@0.1.18':
+    resolution: {integrity: sha512-ADNis6SMarY7i8+b2ynUJ1PiqCHqnVwY7EQ+fSGug5zZ+W/cZq14+VWPxOvGR9LJk+iol8XuqsHy4BaV2+gjzw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@voidzero-dev/vite-plus-test@0.1.16':
-    resolution: {integrity: sha512-d/rJPX/heMzoAFdnpZsp04MAa6nw1yH1tA4mVCV4m8goVcE9nAvt69mjLMzE8N/rYIQOSgenf3hDXuQRuD6OKQ==}
+  '@voidzero-dev/vite-plus-test@0.1.18':
+    resolution: {integrity: sha512-dovC2kJgiwMI8ay0i+3NvQGCDWPj8HQB2ONP/HbdJ5/XQVPq13+BihnCq8/ztz6uGhiDD8Nu4OZ3RgB14uvTfA==}
     engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@opentelemetry/api': ^1.9.0
       '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
-      '@vitest/ui': 4.1.2
+      '@vitest/coverage-istanbul': 4.1.4
+      '@vitest/coverage-v8': 4.1.4
+      '@vitest/ui': 4.1.4
       happy-dom: '*'
       jsdom: '*'
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -4629,6 +4631,10 @@ packages:
         optional: true
       '@types/node':
         optional: true
+      '@vitest/coverage-istanbul':
+        optional: true
+      '@vitest/coverage-v8':
+        optional: true
       '@vitest/ui':
         optional: true
       happy-dom:
@@ -4636,14 +4642,14 @@ packages:
       jsdom:
         optional: true
 
-  '@voidzero-dev/vite-plus-win32-arm64-msvc@0.1.16':
-    resolution: {integrity: sha512-IugPUCLY7HmiPcCeuHKUqO1+G2vxHnYzAGhS02AixD0sJLTAIKCUANDOiVUFf/HMw+jh/UkugW7MWek8lf/JrQ==}
+  '@voidzero-dev/vite-plus-win32-arm64-msvc@0.1.18':
+    resolution: {integrity: sha512-EcDETMHG8xgjIlMizIu/wf0UtRZLGz+lHFvYFZVCkz4vLLz93a06vZ+3Oi9xY2Kc8aOHsCf8Gj5/dox/03cscw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@voidzero-dev/vite-plus-win32-x64-msvc@0.1.16':
-    resolution: {integrity: sha512-tq93CIeMs92HF7rdylJknRiyzMOWMKCmpw+g8nl5Q5nmUDNLUsrL3CGfbyqjgbruuPnIr761r9MfydPqZU/cYg==}
+  '@voidzero-dev/vite-plus-win32-x64-msvc@0.1.18':
+    resolution: {integrity: sha512-jBgL4ZjSJJu3FDcrqj4muzbr0WKlU6Ym1ilHQnq8R+2TRvE0AtvAMMuphICDslZGi6EK3fwJ+r2Lv7GU1AipQA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -7116,8 +7122,8 @@ packages:
   oxc-resolver@11.19.1:
     resolution: {integrity: sha512-qE/CIg/spwrTBFt5aKmwe3ifeDdLfA2NESN30E42X/lII5ClF8V7Wt6WIJhcGZjp0/Q+nQ+9vgxGk//xZNX2hg==}
 
-  oxfmt@0.43.0:
-    resolution: {integrity: sha512-KTYNG5ISfHSdmeZ25Xzb3qgz9EmQvkaGAxgBY/p38+ZiAet3uZeu7FnMwcSQJg152Qwl0wnYAxDc+Z/H6cvrwA==}
+  oxfmt@0.45.0:
+    resolution: {integrity: sha512-0o/COoN9fY50bjVeM7PQsNgbhndKurBIeTIcspW033OumksjJJmIVDKjAk5HMwU/GHTxSOdGDdhJ6BRzGPmsHg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -7125,8 +7131,8 @@ packages:
     resolution: {integrity: sha512-/Uc9TQyN1l8w9QNvXtVHYtz+SzDJHKpb5X0UnHodl0BVzijUPk0LPlDOHAvogd1UI+iy9ZSF6gQxEqfzUxCULQ==}
     hasBin: true
 
-  oxlint@1.58.0:
-    resolution: {integrity: sha512-t4s9leczDMqlvOSjnbCQe7gtoLkWgBGZ7sBdCJ9EOj5IXFSG/X7OAzK4yuH4iW+4cAYe8kLFbC8tuYMwWZm+Cg==}
+  oxlint@1.60.0:
+    resolution: {integrity: sha512-tnRzTWiWJ9pg3ftRWnD0+Oqh78L6ZSwcEudvCZaER0PIqiAnNyXj5N1dPwjmNpDalkKS9m/WMLN1CTPUBPmsgw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -8406,8 +8412,8 @@ packages:
       storybook: ^0.0.0-0 || ^9.0.0 || ^10.0.0 || ^10.0.0-0 || ^10.1.0-0 || ^10.2.0-0 || ^10.3.0-0 || ^10.4.0-0
       vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  vite-plus@0.1.16:
-    resolution: {integrity: sha512-sgYHc5zWLSDInaHb/abvEA7UOwh7sUWuyNt+Slphj55jPvzodT8Dqw115xyKwDARTuRFSpm1eo/t58qZ8/NylQ==}
+  vite-plus@0.1.18:
+    resolution: {integrity: sha512-RiWUoOmQiJMtd4Dfm6WD0v0Selqh/nQzmaGVIrkfnr+2s5UxGVZy7n2TCO5ZnR7w9noMIgtUAQN8GtKhwHEiOQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -8809,17 +8815,17 @@ snapshots:
       idb: 8.0.0
       tslib: 2.8.1
 
-  '@antfu/eslint-config@8.2.0(@eslint-react/eslint-plugin@3.0.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@next/eslint-plugin-next@16.2.3)(@typescript-eslint/rule-tester@8.57.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.2))(@typescript-eslint/utils@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(@vue/compiler-sfc@3.5.31)(eslint-plugin-react-refresh@0.5.2(eslint@10.2.0(jiti@2.6.1)))(eslint@10.2.0(jiti@2.6.1))(oxlint@1.58.0(oxlint-tsgolint@0.20.0))(typescript@6.0.2)':
+  '@antfu/eslint-config@8.2.0(@eslint-react/eslint-plugin@3.0.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@next/eslint-plugin-next@16.2.3)(@typescript-eslint/rule-tester@8.57.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.2))(@typescript-eslint/utils@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@voidzero-dev/vite-plus-test@0.1.18)(@vue/compiler-sfc@3.5.31)(eslint-plugin-react-refresh@0.5.2(eslint@10.2.0(jiti@2.6.1)))(eslint@10.2.0(jiti@2.6.1))(oxlint@1.60.0(oxlint-tsgolint@0.20.0))(typescript@6.0.2)':
     dependencies:
       '@antfu/install-pkg': 1.1.0
       '@clack/prompts': 1.2.0
-      '@e18e/eslint-plugin': 0.3.0(eslint@10.2.0(jiti@2.6.1))(oxlint@1.58.0(oxlint-tsgolint@0.20.0))
+      '@e18e/eslint-plugin': 0.3.0(eslint@10.2.0(jiti@2.6.1))(oxlint@1.60.0(oxlint-tsgolint@0.20.0))
       '@eslint-community/eslint-plugin-eslint-comments': 4.7.1(eslint@10.2.0(jiti@2.6.1))
       '@eslint/markdown': 8.0.1
       '@stylistic/eslint-plugin': 5.10.0(eslint@10.2.0(jiti@2.6.1))
       '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
       '@typescript-eslint/parser': 8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
-      '@vitest/eslint-plugin': 1.6.15(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
+      '@vitest/eslint-plugin': 1.6.15(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@voidzero-dev/vite-plus-test@0.1.18)(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
       ansis: 4.2.0
       cac: 7.0.0
       eslint: 10.2.0(jiti@2.6.1)
@@ -9207,12 +9213,12 @@ snapshots:
 
   '@date-fns/tz@1.4.1': {}
 
-  '@e18e/eslint-plugin@0.3.0(eslint@10.2.0(jiti@2.6.1))(oxlint@1.58.0(oxlint-tsgolint@0.20.0))':
+  '@e18e/eslint-plugin@0.3.0(eslint@10.2.0(jiti@2.6.1))(oxlint@1.60.0(oxlint-tsgolint@0.20.0))':
     dependencies:
       eslint-plugin-depend: 1.5.0(eslint@10.2.0(jiti@2.6.1))
     optionalDependencies:
       eslint: 10.2.0(jiti@2.6.1)
-      oxlint: 1.58.0(oxlint-tsgolint@0.20.0)
+      oxlint: 1.60.0(oxlint-tsgolint@0.20.0)
 
   '@egoist/tailwindcss-icons@1.9.2(tailwindcss@4.2.2)':
     dependencies:
@@ -9756,11 +9762,11 @@ snapshots:
     dependencies:
       minipass: 7.1.3
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)':
     dependencies:
       glob: 13.0.6
       react-docgen-typescript: 2.4.0(typescript@6.0.2)
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
     optionalDependencies:
       typescript: 6.0.2
 
@@ -9945,12 +9951,12 @@ snapshots:
       lexical: 0.43.0
       yjs: 13.6.30
 
-  '@mdx-js/loader@3.1.1(webpack@5.105.4(uglify-js@3.19.3))':
+  '@mdx-js/loader@3.1.1(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))':
     dependencies:
       '@mdx-js/mdx': 3.1.1
       source-map: 0.7.6
     optionalDependencies:
-      webpack: 5.105.4(uglify-js@3.19.3)
+      webpack: 5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -10032,11 +10038,11 @@ snapshots:
     dependencies:
       fast-glob: 3.3.1
 
-  '@next/mdx@16.2.3(@mdx-js/loader@3.1.1(webpack@5.105.4(uglify-js@3.19.3)))(@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.5))':
+  '@next/mdx@16.2.3(@mdx-js/loader@3.1.1(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.5))':
     dependencies:
       source-map: 0.7.6
     optionalDependencies:
-      '@mdx-js/loader': 3.1.1(webpack@5.105.4(uglify-js@3.19.3))
+      '@mdx-js/loader': 3.1.1(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       '@mdx-js/react': 3.1.1(@types/react@19.2.14)(react@19.2.5)
 
   '@next/swc-darwin-arm64@16.2.3':
@@ -10208,11 +10214,11 @@ snapshots:
   '@oxc-parser/binding-win32-x64-msvc@0.121.0':
     optional: true
 
-  '@oxc-project/runtime@0.123.0': {}
+  '@oxc-project/runtime@0.124.0': {}
 
   '@oxc-project/types@0.121.0': {}
 
-  '@oxc-project/types@0.123.0': {}
+  '@oxc-project/types@0.124.0': {}
 
   '@oxc-resolver/binding-android-arm-eabi@11.19.1':
     optional: true
@@ -10279,61 +10285,61 @@ snapshots:
   '@oxc-resolver/binding-win32-x64-msvc@11.19.1':
     optional: true
 
-  '@oxfmt/binding-android-arm-eabi@0.43.0':
+  '@oxfmt/binding-android-arm-eabi@0.45.0':
     optional: true
 
-  '@oxfmt/binding-android-arm64@0.43.0':
+  '@oxfmt/binding-android-arm64@0.45.0':
     optional: true
 
-  '@oxfmt/binding-darwin-arm64@0.43.0':
+  '@oxfmt/binding-darwin-arm64@0.45.0':
     optional: true
 
-  '@oxfmt/binding-darwin-x64@0.43.0':
+  '@oxfmt/binding-darwin-x64@0.45.0':
     optional: true
 
-  '@oxfmt/binding-freebsd-x64@0.43.0':
+  '@oxfmt/binding-freebsd-x64@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.43.0':
+  '@oxfmt/binding-linux-arm-gnueabihf@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.43.0':
+  '@oxfmt/binding-linux-arm-musleabihf@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-gnu@0.43.0':
+  '@oxfmt/binding-linux-arm64-gnu@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-musl@0.43.0':
+  '@oxfmt/binding-linux-arm64-musl@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.43.0':
+  '@oxfmt/binding-linux-ppc64-gnu@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.43.0':
+  '@oxfmt/binding-linux-riscv64-gnu@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-musl@0.43.0':
+  '@oxfmt/binding-linux-riscv64-musl@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-s390x-gnu@0.43.0':
+  '@oxfmt/binding-linux-s390x-gnu@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-gnu@0.43.0':
+  '@oxfmt/binding-linux-x64-gnu@0.45.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-musl@0.43.0':
+  '@oxfmt/binding-linux-x64-musl@0.45.0':
     optional: true
 
-  '@oxfmt/binding-openharmony-arm64@0.43.0':
+  '@oxfmt/binding-openharmony-arm64@0.45.0':
     optional: true
 
-  '@oxfmt/binding-win32-arm64-msvc@0.43.0':
+  '@oxfmt/binding-win32-arm64-msvc@0.45.0':
     optional: true
 
-  '@oxfmt/binding-win32-ia32-msvc@0.43.0':
+  '@oxfmt/binding-win32-ia32-msvc@0.45.0':
     optional: true
 
-  '@oxfmt/binding-win32-x64-msvc@0.43.0':
+  '@oxfmt/binding-win32-x64-msvc@0.45.0':
     optional: true
 
   '@oxlint-tsgolint/darwin-arm64@0.20.0':
@@ -10354,61 +10360,61 @@ snapshots:
   '@oxlint-tsgolint/win32-x64@0.20.0':
     optional: true
 
-  '@oxlint/binding-android-arm-eabi@1.58.0':
+  '@oxlint/binding-android-arm-eabi@1.60.0':
     optional: true
 
-  '@oxlint/binding-android-arm64@1.58.0':
+  '@oxlint/binding-android-arm64@1.60.0':
     optional: true
 
-  '@oxlint/binding-darwin-arm64@1.58.0':
+  '@oxlint/binding-darwin-arm64@1.60.0':
     optional: true
 
-  '@oxlint/binding-darwin-x64@1.58.0':
+  '@oxlint/binding-darwin-x64@1.60.0':
     optional: true
 
-  '@oxlint/binding-freebsd-x64@1.58.0':
+  '@oxlint/binding-freebsd-x64@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.58.0':
+  '@oxlint/binding-linux-arm-gnueabihf@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-musleabihf@1.58.0':
+  '@oxlint/binding-linux-arm-musleabihf@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-gnu@1.58.0':
+  '@oxlint/binding-linux-arm64-gnu@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-musl@1.58.0':
+  '@oxlint/binding-linux-arm64-musl@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-ppc64-gnu@1.58.0':
+  '@oxlint/binding-linux-ppc64-gnu@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-gnu@1.58.0':
+  '@oxlint/binding-linux-riscv64-gnu@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-musl@1.58.0':
+  '@oxlint/binding-linux-riscv64-musl@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-s390x-gnu@1.58.0':
+  '@oxlint/binding-linux-s390x-gnu@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-gnu@1.58.0':
+  '@oxlint/binding-linux-x64-gnu@1.60.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-musl@1.58.0':
+  '@oxlint/binding-linux-x64-musl@1.60.0':
     optional: true
 
-  '@oxlint/binding-openharmony-arm64@1.58.0':
+  '@oxlint/binding-openharmony-arm64@1.60.0':
     optional: true
 
-  '@oxlint/binding-win32-arm64-msvc@1.58.0':
+  '@oxlint/binding-win32-arm64-msvc@1.60.0':
     optional: true
 
-  '@oxlint/binding-win32-ia32-msvc@1.58.0':
+  '@oxlint/binding-win32-ia32-msvc@1.60.0':
     optional: true
 
-  '@oxlint/binding-win32-x64-msvc@1.58.0':
+  '@oxlint/binding-win32-x64-msvc@1.60.0':
     optional: true
 
   '@parcel/watcher-android-arm64@2.5.6':
@@ -10991,10 +10997,10 @@ snapshots:
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@storybook/addon-docs@10.3.5(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(uglify-js@3.19.3))':
+  '@storybook/addon-docs@10.3.5(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))':
     dependencies:
       '@mdx-js/react': 3.1.1(@types/react@19.2.14)(react@19.2.5)
-      '@storybook/csf-plugin': 10.3.5(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(uglify-js@3.19.3))
+      '@storybook/csf-plugin': 10.3.5(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       '@storybook/icons': 2.0.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       '@storybook/react-dom-shim': 10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
       react: 19.2.5
@@ -11024,25 +11030,26 @@ snapshots:
       storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       ts-dedent: 2.2.0
 
-  '@storybook/builder-vite@10.3.5(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(uglify-js@3.19.3))':
+  '@storybook/builder-vite@10.3.5(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))':
     dependencies:
-      '@storybook/csf-plugin': 10.3.5(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(uglify-js@3.19.3))
+      '@storybook/csf-plugin': 10.3.5(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       ts-dedent: 2.2.0
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
     transitivePeerDependencies:
       - esbuild
       - rollup
       - webpack
 
-  '@storybook/csf-plugin@10.3.5(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(uglify-js@3.19.3))':
+  '@storybook/csf-plugin@10.3.5(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))':
     dependencies:
       storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       unplugin: 2.3.11
     optionalDependencies:
+      esbuild: 0.27.2
       rollup: 4.59.0
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
-      webpack: 5.105.4(uglify-js@3.19.3)
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      webpack: 5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)
 
   '@storybook/global@5.0.0': {}
 
@@ -11051,18 +11058,18 @@ snapshots:
       react: 19.2.5
       react-dom: 19.2.5(react@19.2.5)
 
-  '@storybook/nextjs-vite@10.3.5(@babel/core@7.29.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)(webpack@5.105.4(uglify-js@3.19.3))':
+  '@storybook/nextjs-vite@10.3.5(@babel/core@7.29.0)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))':
     dependencies:
-      '@storybook/builder-vite': 10.3.5(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(uglify-js@3.19.3))
+      '@storybook/builder-vite': 10.3.5(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       '@storybook/react': 10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)
-      '@storybook/react-vite': 10.3.5(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)(webpack@5.105.4(uglify-js@3.19.3))
+      '@storybook/react-vite': 10.3.5(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       next: 16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0)
       react: 19.2.5
       react-dom: 19.2.5(react@19.2.5)
       storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       styled-jsx: 5.1.6(@babel/core@7.29.0)(react@19.2.5)
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
-      vite-plugin-storybook-nextjs: 3.2.4(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite-plugin-storybook-nextjs: 3.2.4(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)
     optionalDependencies:
       typescript: 6.0.2
     transitivePeerDependencies:
@@ -11079,11 +11086,11 @@ snapshots:
       react-dom: 19.2.5(react@19.2.5)
       storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
 
-  '@storybook/react-vite@10.3.5(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)(webpack@5.105.4(uglify-js@3.19.3))':
+  '@storybook/react-vite@10.3.5(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.7.0(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.7.0(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)
       '@rollup/pluginutils': 5.3.0(rollup@4.59.0)
-      '@storybook/builder-vite': 10.3.5(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(uglify-js@3.19.3))
+      '@storybook/builder-vite': 10.3.5(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(rollup@4.59.0)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       '@storybook/react': 10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2)
       empathic: 2.0.0
       magic-string: 0.30.21
@@ -11093,7 +11100,7 @@ snapshots:
       resolve: 1.22.11
       storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       tsconfig-paths: 4.2.0
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
     transitivePeerDependencies:
       - esbuild
       - rollup
@@ -11232,12 +11239,12 @@ snapshots:
       postcss-selector-parser: 6.0.10
       tailwindcss: 4.2.2
 
-  '@tailwindcss/vite@4.2.2(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))':
+  '@tailwindcss/vite@4.2.2(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))':
     dependencies:
       '@tailwindcss/node': 4.2.2
       '@tailwindcss/oxide': 4.2.2
       tailwindcss: 4.2.2
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
 
   '@tanstack/devtools-client@0.0.6':
     dependencies:
@@ -11943,12 +11950,12 @@ snapshots:
       '@resvg/resvg-wasm': 2.4.0
       satori: 0.16.0
 
-  '@vitejs/devtools-kit@0.1.11(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)(ws@8.20.0)':
+  '@vitejs/devtools-kit@0.1.11(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)(ws@8.20.0)':
     dependencies:
       '@vitejs/devtools-rpc': 0.1.11(typescript@6.0.2)(ws@8.20.0)
       birpc: 4.0.0
       ohash: 2.0.11
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
     transitivePeerDependencies:
       - typescript
       - ws
@@ -11965,12 +11972,12 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))':
+  '@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-rc.7
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
 
-  '@vitejs/plugin-rsc@0.5.24(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3)))(react@19.2.5)':
+  '@vitejs/plugin-rsc@0.5.24(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.5)':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-rc.15
       es-module-lexer: 2.0.0
@@ -11981,12 +11988,12 @@ snapshots:
       srvx: 0.11.15
       strip-literal: 3.1.0
       turbo-stream: 3.2.0
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
-      vitefu: 1.1.3(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vitefu: 1.1.3(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
     optionalDependencies:
-      react-server-dom-webpack: 19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3))
+      react-server-dom-webpack: 19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
 
-  '@vitest/coverage-v8@4.1.4(@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))':
+  '@vitest/coverage-v8@4.1.4(@voidzero-dev/vite-plus-test@0.1.18)':
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
       '@vitest/utils': 4.1.4
@@ -11998,9 +12005,9 @@ snapshots:
       obug: 2.1.1
       std-env: 4.0.0
       tinyrainbow: 3.1.0
-      vitest: '@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vitest: '@voidzero-dev/vite-plus-test@0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
 
-  '@vitest/eslint-plugin@1.6.15(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)':
+  '@vitest/eslint-plugin@1.6.15(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@voidzero-dev/vite-plus-test@0.1.18)(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.58.2
       '@typescript-eslint/utils': 8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
@@ -12008,7 +12015,7 @@ snapshots:
     optionalDependencies:
       '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
       typescript: 6.0.2
-      vitest: '@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vitest: '@voidzero-dev/vite-plus-test@0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
     transitivePeerDependencies:
       - supports-color
 
@@ -12044,14 +12051,15 @@ snapshots:
       convert-source-map: 2.0.0
       tinyrainbow: 3.1.0
 
-  '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)':
+  '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)':
     dependencies:
-      '@oxc-project/runtime': 0.123.0
-      '@oxc-project/types': 0.123.0
+      '@oxc-project/runtime': 0.124.0
+      '@oxc-project/types': 0.124.0
       lightningcss: 1.32.0
       postcss: 8.5.9
     optionalDependencies:
       '@types/node': 25.6.0
+      esbuild: 0.27.2
       fsevents: 2.3.3
       jiti: 2.6.1
       sass: 1.98.0
@@ -12060,29 +12068,29 @@ snapshots:
       typescript: 6.0.2
       yaml: 2.8.3
 
-  '@voidzero-dev/vite-plus-darwin-arm64@0.1.16':
+  '@voidzero-dev/vite-plus-darwin-arm64@0.1.18':
     optional: true
 
-  '@voidzero-dev/vite-plus-darwin-x64@0.1.16':
+  '@voidzero-dev/vite-plus-darwin-x64@0.1.18':
     optional: true
 
-  '@voidzero-dev/vite-plus-linux-arm64-gnu@0.1.16':
+  '@voidzero-dev/vite-plus-linux-arm64-gnu@0.1.18':
     optional: true
 
-  '@voidzero-dev/vite-plus-linux-arm64-musl@0.1.16':
+  '@voidzero-dev/vite-plus-linux-arm64-musl@0.1.18':
     optional: true
 
-  '@voidzero-dev/vite-plus-linux-x64-gnu@0.1.16':
+  '@voidzero-dev/vite-plus-linux-x64-gnu@0.1.18':
     optional: true
 
-  '@voidzero-dev/vite-plus-linux-x64-musl@0.1.16':
+  '@voidzero-dev/vite-plus-linux-x64-musl@0.1.18':
     optional: true
 
-  '@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)':
+  '@voidzero-dev/vite-plus-test@0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)':
     dependencies:
       '@standard-schema/spec': 1.1.0
       '@types/chai': 5.2.3
-      '@voidzero-dev/vite-plus-core': 0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
+      '@voidzero-dev/vite-plus-core': 0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
       es-module-lexer: 1.7.0
       obug: 2.1.1
       pixelmatch: 7.1.0
@@ -12091,11 +12099,12 @@ snapshots:
       std-env: 4.0.0
       tinybench: 2.9.0
       tinyexec: 1.0.4
-      tinyglobby: 0.2.15
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      tinyglobby: 0.2.16
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
       ws: 8.20.0
     optionalDependencies:
       '@types/node': 25.6.0
+      '@vitest/coverage-v8': 4.1.4(@voidzero-dev/vite-plus-test@0.1.18)
       happy-dom: 20.9.0
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
@@ -12118,10 +12127,10 @@ snapshots:
       - utf-8-validate
       - yaml
 
-  '@voidzero-dev/vite-plus-win32-arm64-msvc@0.1.16':
+  '@voidzero-dev/vite-plus-win32-arm64-msvc@0.1.18':
     optional: true
 
-  '@voidzero-dev/vite-plus-win32-x64-msvc@0.1.16':
+  '@voidzero-dev/vite-plus-win32-x64-msvc@0.1.18':
     optional: true
 
   '@volar/language-core@2.4.28':
@@ -13146,7 +13155,7 @@ snapshots:
     dependencies:
       eslint: 10.2.0(jiti@2.6.1)
 
-  eslint-plugin-better-tailwindcss@4.4.1(eslint@10.2.0(jiti@2.6.1))(oxlint@1.58.0(oxlint-tsgolint@0.20.0))(tailwindcss@4.2.2)(typescript@6.0.2):
+  eslint-plugin-better-tailwindcss@4.4.1(eslint@10.2.0(jiti@2.6.1))(oxlint@1.60.0(oxlint-tsgolint@0.20.0))(tailwindcss@4.2.2)(typescript@6.0.2):
     dependencies:
       '@eslint/css-tree': 4.0.1
       '@valibot/to-json-schema': 1.6.0(valibot@1.3.1(typescript@6.0.2))
@@ -13159,7 +13168,7 @@ snapshots:
       valibot: 1.3.1(typescript@6.0.2)
     optionalDependencies:
       eslint: 10.2.0(jiti@2.6.1)
-      oxlint: 1.58.0(oxlint-tsgolint@0.20.0)
+      oxlint: 1.60.0(oxlint-tsgolint@0.20.0)
     transitivePeerDependencies:
       - '@eslint/css'
       - typescript
@@ -15199,29 +15208,29 @@ snapshots:
       - '@emnapi/core'
       - '@emnapi/runtime'
 
-  oxfmt@0.43.0:
+  oxfmt@0.45.0:
     dependencies:
       tinypool: 2.1.0
     optionalDependencies:
-      '@oxfmt/binding-android-arm-eabi': 0.43.0
-      '@oxfmt/binding-android-arm64': 0.43.0
-      '@oxfmt/binding-darwin-arm64': 0.43.0
-      '@oxfmt/binding-darwin-x64': 0.43.0
-      '@oxfmt/binding-freebsd-x64': 0.43.0
-      '@oxfmt/binding-linux-arm-gnueabihf': 0.43.0
-      '@oxfmt/binding-linux-arm-musleabihf': 0.43.0
-      '@oxfmt/binding-linux-arm64-gnu': 0.43.0
-      '@oxfmt/binding-linux-arm64-musl': 0.43.0
-      '@oxfmt/binding-linux-ppc64-gnu': 0.43.0
-      '@oxfmt/binding-linux-riscv64-gnu': 0.43.0
-      '@oxfmt/binding-linux-riscv64-musl': 0.43.0
-      '@oxfmt/binding-linux-s390x-gnu': 0.43.0
-      '@oxfmt/binding-linux-x64-gnu': 0.43.0
-      '@oxfmt/binding-linux-x64-musl': 0.43.0
-      '@oxfmt/binding-openharmony-arm64': 0.43.0
-      '@oxfmt/binding-win32-arm64-msvc': 0.43.0
-      '@oxfmt/binding-win32-ia32-msvc': 0.43.0
-      '@oxfmt/binding-win32-x64-msvc': 0.43.0
+      '@oxfmt/binding-android-arm-eabi': 0.45.0
+      '@oxfmt/binding-android-arm64': 0.45.0
+      '@oxfmt/binding-darwin-arm64': 0.45.0
+      '@oxfmt/binding-darwin-x64': 0.45.0
+      '@oxfmt/binding-freebsd-x64': 0.45.0
+      '@oxfmt/binding-linux-arm-gnueabihf': 0.45.0
+      '@oxfmt/binding-linux-arm-musleabihf': 0.45.0
+      '@oxfmt/binding-linux-arm64-gnu': 0.45.0
+      '@oxfmt/binding-linux-arm64-musl': 0.45.0
+      '@oxfmt/binding-linux-ppc64-gnu': 0.45.0
+      '@oxfmt/binding-linux-riscv64-gnu': 0.45.0
+      '@oxfmt/binding-linux-riscv64-musl': 0.45.0
+      '@oxfmt/binding-linux-s390x-gnu': 0.45.0
+      '@oxfmt/binding-linux-x64-gnu': 0.45.0
+      '@oxfmt/binding-linux-x64-musl': 0.45.0
+      '@oxfmt/binding-openharmony-arm64': 0.45.0
+      '@oxfmt/binding-win32-arm64-msvc': 0.45.0
+      '@oxfmt/binding-win32-ia32-msvc': 0.45.0
+      '@oxfmt/binding-win32-x64-msvc': 0.45.0
 
   oxlint-tsgolint@0.20.0:
     optionalDependencies:
@@ -15232,27 +15241,27 @@ snapshots:
       '@oxlint-tsgolint/win32-arm64': 0.20.0
       '@oxlint-tsgolint/win32-x64': 0.20.0
 
-  oxlint@1.58.0(oxlint-tsgolint@0.20.0):
+  oxlint@1.60.0(oxlint-tsgolint@0.20.0):
     optionalDependencies:
-      '@oxlint/binding-android-arm-eabi': 1.58.0
-      '@oxlint/binding-android-arm64': 1.58.0
-      '@oxlint/binding-darwin-arm64': 1.58.0
-      '@oxlint/binding-darwin-x64': 1.58.0
-      '@oxlint/binding-freebsd-x64': 1.58.0
-      '@oxlint/binding-linux-arm-gnueabihf': 1.58.0
-      '@oxlint/binding-linux-arm-musleabihf': 1.58.0
-      '@oxlint/binding-linux-arm64-gnu': 1.58.0
-      '@oxlint/binding-linux-arm64-musl': 1.58.0
-      '@oxlint/binding-linux-ppc64-gnu': 1.58.0
-      '@oxlint/binding-linux-riscv64-gnu': 1.58.0
-      '@oxlint/binding-linux-riscv64-musl': 1.58.0
-      '@oxlint/binding-linux-s390x-gnu': 1.58.0
-      '@oxlint/binding-linux-x64-gnu': 1.58.0
-      '@oxlint/binding-linux-x64-musl': 1.58.0
-      '@oxlint/binding-openharmony-arm64': 1.58.0
-      '@oxlint/binding-win32-arm64-msvc': 1.58.0
-      '@oxlint/binding-win32-ia32-msvc': 1.58.0
-      '@oxlint/binding-win32-x64-msvc': 1.58.0
+      '@oxlint/binding-android-arm-eabi': 1.60.0
+      '@oxlint/binding-android-arm64': 1.60.0
+      '@oxlint/binding-darwin-arm64': 1.60.0
+      '@oxlint/binding-darwin-x64': 1.60.0
+      '@oxlint/binding-freebsd-x64': 1.60.0
+      '@oxlint/binding-linux-arm-gnueabihf': 1.60.0
+      '@oxlint/binding-linux-arm-musleabihf': 1.60.0
+      '@oxlint/binding-linux-arm64-gnu': 1.60.0
+      '@oxlint/binding-linux-arm64-musl': 1.60.0
+      '@oxlint/binding-linux-ppc64-gnu': 1.60.0
+      '@oxlint/binding-linux-riscv64-gnu': 1.60.0
+      '@oxlint/binding-linux-riscv64-musl': 1.60.0
+      '@oxlint/binding-linux-s390x-gnu': 1.60.0
+      '@oxlint/binding-linux-x64-gnu': 1.60.0
+      '@oxlint/binding-linux-x64-musl': 1.60.0
+      '@oxlint/binding-openharmony-arm64': 1.60.0
+      '@oxlint/binding-win32-arm64-msvc': 1.60.0
+      '@oxlint/binding-win32-ia32-msvc': 1.60.0
+      '@oxlint/binding-win32-x64-msvc': 1.60.0
       oxlint-tsgolint: 0.20.0
 
   p-limit@3.1.0:
@@ -15622,13 +15631,13 @@ snapshots:
       react-draggable: 4.5.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       tslib: 2.6.2
 
-  react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3)):
+  react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)):
     dependencies:
       acorn-loose: 8.5.2
       neo-async: 2.6.2
       react: 19.2.5
       react-dom: 19.2.5(react@19.2.5)
-      webpack: 5.105.4(uglify-js@3.19.3)
+      webpack: 5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)
       webpack-sources: 3.3.4
 
   react-sortablejs@6.1.4(@types/sortablejs@1.15.9)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sortablejs@1.15.7):
@@ -16306,14 +16315,15 @@ snapshots:
       minizlib: 3.1.0
       yallist: 5.0.0
 
-  terser-webpack-plugin@5.4.0(uglify-js@3.19.3)(webpack@5.105.4(uglify-js@3.19.3)):
+  terser-webpack-plugin@5.4.0(esbuild@0.27.2)(uglify-js@3.19.3)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       jest-worker: 27.5.1
       schema-utils: 4.3.3
       terser: 5.46.1
-      webpack: 5.105.4(uglify-js@3.19.3)
+      webpack: 5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)
     optionalDependencies:
+      esbuild: 0.27.2
       uglify-js: 3.19.3
 
   terser@5.46.1:
@@ -16627,21 +16637,21 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vinext@0.0.41(@mdx-js/rollup@3.1.1(rollup@4.59.0))(@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)))(@vitejs/plugin-rsc@0.5.24(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3)))(react@19.2.5))(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3)))(react@19.2.5)(typescript@6.0.2):
+  vinext@0.0.41(453b4e184a832f83060410b31544dc36):
     dependencies:
       '@unpic/react': 1.0.2(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       '@vercel/og': 0.8.6
-      '@vitejs/plugin-react': 6.0.1(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
+      '@vitejs/plugin-react': 6.0.1(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
       magic-string: 0.30.21
       react: 19.2.5
       react-dom: 19.2.5(react@19.2.5)
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
       vite-plugin-commonjs: 0.10.4
-      vite-tsconfig-paths: 6.1.1(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)
+      vite-tsconfig-paths: 6.1.1(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)
     optionalDependencies:
       '@mdx-js/rollup': 3.1.1(rollup@4.59.0)
-      '@vitejs/plugin-rsc': 0.5.24(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3)))(react@19.2.5)
-      react-server-dom-webpack: 19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(uglify-js@3.19.3))
+      '@vitejs/plugin-rsc': 0.5.24(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.5)
+      react-server-dom-webpack: 19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
     transitivePeerDependencies:
       - next
       - supports-color
@@ -16660,9 +16670,9 @@ snapshots:
       fast-glob: 3.3.3
       magic-string: 0.30.21
 
-  vite-plugin-inspect@12.0.0-beta.1(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)(ws@8.20.0):
+  vite-plugin-inspect@12.0.0-beta.1(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)(ws@8.20.0):
     dependencies:
-      '@vitejs/devtools-kit': 0.1.11(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)(ws@8.20.0)
+      '@vitejs/devtools-kit': 0.1.11(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)(ws@8.20.0)
       ansis: 4.2.0
       error-stack-parser-es: 1.0.5
       obug: 2.1.1
@@ -16671,12 +16681,12 @@ snapshots:
       perfect-debounce: 2.1.0
       sirv: 3.0.2
       unplugin-utils: 0.3.1
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
     transitivePeerDependencies:
       - typescript
       - ws
 
-  vite-plugin-storybook-nextjs@3.2.4(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2):
+  vite-plugin-storybook-nextjs@3.2.4(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(next@16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0))(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.2):
     dependencies:
       '@next/env': 16.0.0
       image-size: 2.0.2
@@ -16685,29 +16695,29 @@ snapshots:
       next: 16.2.3(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sass@1.98.0)
       storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       ts-dedent: 2.2.0
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
-      vite-tsconfig-paths: 5.1.4(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite-tsconfig-paths: 5.1.4(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vite-plus@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3):
+  vite-plus@0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3):
     dependencies:
-      '@oxc-project/types': 0.123.0
-      '@voidzero-dev/vite-plus-core': 0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
-      '@voidzero-dev/vite-plus-test': 0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
-      oxfmt: 0.43.0
-      oxlint: 1.58.0(oxlint-tsgolint@0.20.0)
+      '@oxc-project/types': 0.124.0
+      '@voidzero-dev/vite-plus-core': 0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
+      '@voidzero-dev/vite-plus-test': 0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
+      oxfmt: 0.45.0
+      oxlint: 1.60.0(oxlint-tsgolint@0.20.0)
       oxlint-tsgolint: 0.20.0
     optionalDependencies:
-      '@voidzero-dev/vite-plus-darwin-arm64': 0.1.16
-      '@voidzero-dev/vite-plus-darwin-x64': 0.1.16
-      '@voidzero-dev/vite-plus-linux-arm64-gnu': 0.1.16
-      '@voidzero-dev/vite-plus-linux-arm64-musl': 0.1.16
-      '@voidzero-dev/vite-plus-linux-x64-gnu': 0.1.16
-      '@voidzero-dev/vite-plus-linux-x64-musl': 0.1.16
-      '@voidzero-dev/vite-plus-win32-arm64-msvc': 0.1.16
-      '@voidzero-dev/vite-plus-win32-x64-msvc': 0.1.16
+      '@voidzero-dev/vite-plus-darwin-arm64': 0.1.18
+      '@voidzero-dev/vite-plus-darwin-x64': 0.1.18
+      '@voidzero-dev/vite-plus-linux-arm64-gnu': 0.1.18
+      '@voidzero-dev/vite-plus-linux-arm64-musl': 0.1.18
+      '@voidzero-dev/vite-plus-linux-x64-gnu': 0.1.18
+      '@voidzero-dev/vite-plus-linux-x64-musl': 0.1.18
+      '@voidzero-dev/vite-plus-win32-arm64-msvc': 0.1.18
+      '@voidzero-dev/vite-plus-win32-x64-msvc': 0.1.18
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
       - '@edge-runtime/vm'
@@ -16716,6 +16726,8 @@ snapshots:
       - '@tsdown/exe'
       - '@types/node'
       - '@vitejs/devtools'
+      - '@vitest/coverage-istanbul'
+      - '@vitest/coverage-v8'
       - '@vitest/ui'
       - bufferutil
       - esbuild
@@ -16736,36 +16748,36 @@ snapshots:
       - vite
       - yaml
 
-  vite-tsconfig-paths@5.1.4(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2):
+  vite-tsconfig-paths@5.1.4(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2):
     dependencies:
       debug: 4.4.3(supports-color@8.1.1)
       globrex: 0.1.2
       tsconfck: 3.1.6(typescript@6.0.2)
     optionalDependencies:
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vite-tsconfig-paths@6.1.1(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2):
+  vite-tsconfig-paths@6.1.1(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(typescript@6.0.2):
     dependencies:
       debug: 4.4.3(supports-color@8.1.1)
       globrex: 0.1.2
       tsconfck: 3.1.6(typescript@6.0.2)
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vitefu@1.1.3(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)):
+  vitefu@1.1.3(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)):
     optionalDependencies:
-      vite: '@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
 
-  vitest-canvas-mock@1.1.4(@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)):
+  vitest-canvas-mock@1.1.4(@voidzero-dev/vite-plus-test@0.1.18):
     dependencies:
       cssfontparser: 1.2.1
       moo-color: 1.0.3
-      vitest: '@voidzero-dev/vite-plus-test@0.1.16(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.16(@types/node@25.6.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vitest: '@voidzero-dev/vite-plus-test@0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
 
   void-elements@3.1.0: {}
 
@@ -16813,7 +16825,7 @@ snapshots:
 
   webpack-virtual-modules@0.6.2: {}
 
-  webpack@5.105.4(uglify-js@3.19.3):
+  webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3):
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.8
@@ -16837,7 +16849,7 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 4.3.3
       tapable: 2.3.2
-      terser-webpack-plugin: 5.4.0(uglify-js@3.19.3)(webpack@5.105.4(uglify-js@3.19.3))
+      terser-webpack-plugin: 5.4.0(esbuild@0.27.2)(uglify-js@3.19.3)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3))
       watchpack: 2.5.1
       webpack-sources: 3.3.4
     transitivePeerDependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 9bd4b9a2a7..6099d03ee4 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -190,10 +190,10 @@ catalog:
   use-context-selector: 2.0.0
   uuid: 13.0.0
   vinext: 0.0.41
-  vite: npm:@voidzero-dev/vite-plus-core@0.1.16
+  vite: npm:@voidzero-dev/vite-plus-core@0.1.18
   vite-plugin-inspect: 12.0.0-beta.1
-  vite-plus: 0.1.16
-  vitest: npm:@voidzero-dev/vite-plus-test@0.1.16
+  vite-plus: 0.1.18
+  vitest: npm:@voidzero-dev/vite-plus-test@0.1.18
   vitest-canvas-mock: 1.1.4
   zod: 4.3.6
   zundo: 2.3.0
@@ -223,8 +223,8 @@ overrides:
   svgo@>=3.0.0 <3.3.3: 3.3.3
   tar@<=7.5.10: 7.5.11
   undici@>=7.0.0 <7.24.0: 7.24.0
-  vite: npm:@voidzero-dev/vite-plus-core@0.1.16
-  vitest: npm:@voidzero-dev/vite-plus-test@0.1.16
+  vite: npm:@voidzero-dev/vite-plus-core@0.1.18
+  vitest: npm:@voidzero-dev/vite-plus-test@0.1.18
   yaml@>=2.0.0 <2.8.3: 2.8.3
   yauzl@<3.2.1: 3.2.1
 strictDepBuilds: true

From 5956dd79df4e1ca0320fa77748b12ec0d24c551c Mon Sep 17 00:00:00 2001
From: NVIDIAN <speedy.hpc@hotmail.com>
Date: Wed, 15 Apr 2026 21:39:30 -0700
Subject: [PATCH 06/36] refactor(api): add BaseModel conversation variable
 schemas (#35296)

Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
---
 api/fields/conversation_variable_fields.py | 78 +++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/api/fields/conversation_variable_fields.py b/api/fields/conversation_variable_fields.py
index c55014a368..cb6cdb309a 100644
--- a/api/fields/conversation_variable_fields.py
+++ b/api/fields/conversation_variable_fields.py
@@ -1,5 +1,13 @@
-from flask_restx import Namespace, fields
+from __future__ import annotations
 
+from datetime import datetime
+from typing import Any
+
+from flask_restx import Namespace, fields
+from graphon.variables.types import SegmentType
+from pydantic import field_validator
+
+from fields.base import ResponseModel
 from libs.helper import TimestampField
 
 from ._value_type_serializer import serialize_value_type
@@ -29,6 +37,74 @@ conversation_variable_infinite_scroll_pagination_fields = {
 }
 
 
+def _to_timestamp(value: datetime | int | None) -> int | None:
+    if isinstance(value, datetime):
+        return int(value.timestamp())
+    return value
+
+
+class ConversationVariableResponse(ResponseModel):
+    id: str
+    name: str
+    value_type: str
+    value: str | None = None
+    description: str | None = None
+    created_at: int | None = None
+    updated_at: int | None = None
+
+    @field_validator("value_type", mode="before")
+    @classmethod
+    def _normalize_value_type(cls, value: Any) -> str:
+        exposed_type = getattr(value, "exposed_type", None)
+        if callable(exposed_type):
+            return str(exposed_type().value)
+        if isinstance(value, str):
+            try:
+                return str(SegmentType(value).exposed_type().value)
+            except ValueError:
+                return value
+        try:
+            return serialize_value_type(value)
+        except (AttributeError, TypeError, ValueError):
+            pass
+
+        try:
+            return serialize_value_type({"value_type": value})
+        except (AttributeError, TypeError, ValueError):
+            value_attr = getattr(value, "value", None)
+            if value_attr is not None:
+                return str(value_attr)
+            return str(value)
+
+    @field_validator("value", mode="before")
+    @classmethod
+    def _normalize_value(cls, value: Any | None) -> str | None:
+        if value is None:
+            return None
+        if isinstance(value, str):
+            return value
+        return str(value)
+
+    @field_validator("created_at", "updated_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return _to_timestamp(value)
+
+
+class PaginatedConversationVariableResponse(ResponseModel):
+    page: int
+    limit: int
+    total: int
+    has_more: bool
+    data: list[ConversationVariableResponse]
+
+
+class ConversationVariableInfiniteScrollPaginationResponse(ResponseModel):
+    limit: int
+    has_more: bool
+    data: list[ConversationVariableResponse]
+
+
 def build_conversation_variable_model(api_or_ns: Namespace):
     """Build the conversation variable model for the API or Namespace."""
     return api_or_ns.model("ConversationVariable", conversation_variable_fields)

From 25df902ec4ca0440028070478d961617d6438221 Mon Sep 17 00:00:00 2001
From: NVIDIAN <speedy.hpc@hotmail.com>
Date: Wed, 15 Apr 2026 21:39:59 -0700
Subject: [PATCH 07/36] refactor(api): add BaseModel workflow field schemas
 (#35297)

Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
---
 api/fields/workflow_app_log_fields.py |  67 +++++++++-
 api/fields/workflow_run_fields.py     | 184 +++++++++++++++++++++++++-
 2 files changed, 245 insertions(+), 6 deletions(-)

diff --git a/api/fields/workflow_app_log_fields.py b/api/fields/workflow_app_log_fields.py
index d0e762f62b..1b2c71255d 100644
--- a/api/fields/workflow_app_log_fields.py
+++ b/api/fields/workflow_app_log_fields.py
@@ -1,8 +1,17 @@
-from flask_restx import Namespace, fields
+from __future__ import annotations
 
-from fields.end_user_fields import simple_end_user_fields
-from fields.member_fields import simple_account_fields
+from datetime import datetime
+from typing import Any
+
+from flask_restx import Namespace, fields
+from pydantic import field_validator
+
+from fields.base import ResponseModel
+from fields.end_user_fields import SimpleEndUser, simple_end_user_fields
+from fields.member_fields import SimpleAccount, simple_account_fields
 from fields.workflow_run_fields import (
+    WorkflowRunForArchivedLogResponse,
+    WorkflowRunForLogResponse,
     build_workflow_run_for_archived_log_model,
     build_workflow_run_for_log_model,
     workflow_run_for_archived_log_fields,
@@ -85,3 +94,55 @@ def build_workflow_archived_log_pagination_model(api_or_ns: Namespace):
     copied_fields = workflow_archived_log_pagination_fields.copy()
     copied_fields["data"] = fields.List(fields.Nested(workflow_archived_log_partial_model))
     return api_or_ns.model("WorkflowArchivedLogPagination", copied_fields)
+
+
+def _to_timestamp(value: datetime | int | None) -> int | None:
+    if isinstance(value, datetime):
+        return int(value.timestamp())
+    return value
+
+
+class WorkflowAppLogPartialResponse(ResponseModel):
+    id: str
+    workflow_run: WorkflowRunForLogResponse | None = None
+    details: Any = None
+    created_from: str | None = None
+    created_by_role: str | None = None
+    created_by_account: SimpleAccount | None = None
+    created_by_end_user: SimpleEndUser | None = None
+    created_at: int | None = None
+
+    @field_validator("created_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return _to_timestamp(value)
+
+
+class WorkflowArchivedLogPartialResponse(ResponseModel):
+    id: str
+    workflow_run: WorkflowRunForArchivedLogResponse | None = None
+    trigger_metadata: Any = None
+    created_by_account: SimpleAccount | None = None
+    created_by_end_user: SimpleEndUser | None = None
+    created_at: int | None = None
+
+    @field_validator("created_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return _to_timestamp(value)
+
+
+class WorkflowAppLogPaginationResponse(ResponseModel):
+    page: int
+    limit: int
+    total: int
+    has_more: bool
+    data: list[WorkflowAppLogPartialResponse]
+
+
+class WorkflowArchivedLogPaginationResponse(ResponseModel):
+    page: int
+    limit: int
+    total: int
+    has_more: bool
+    data: list[WorkflowArchivedLogPartialResponse]
diff --git a/api/fields/workflow_run_fields.py b/api/fields/workflow_run_fields.py
index 35bb442c59..8c659086ed 100644
--- a/api/fields/workflow_run_fields.py
+++ b/api/fields/workflow_run_fields.py
@@ -1,7 +1,14 @@
-from flask_restx import Namespace, fields
+from __future__ import annotations
 
-from fields.end_user_fields import simple_end_user_fields
-from fields.member_fields import simple_account_fields
+from datetime import datetime
+from typing import Any
+
+from flask_restx import Namespace, fields
+from pydantic import Field, field_validator
+
+from fields.base import ResponseModel
+from fields.end_user_fields import SimpleEndUser, simple_end_user_fields
+from fields.member_fields import SimpleAccount, simple_account_fields
 from libs.helper import TimestampField
 
 workflow_run_for_log_fields = {
@@ -147,3 +154,174 @@ workflow_run_node_execution_fields = {
 workflow_run_node_execution_list_fields = {
     "data": fields.List(fields.Nested(workflow_run_node_execution_fields)),
 }
+
+
+def _to_timestamp(value: datetime | int | None) -> int | None:
+    if isinstance(value, datetime):
+        return int(value.timestamp())
+    return value
+
+
+class WorkflowRunForLogResponse(ResponseModel):
+    id: str
+    version: str | None = None
+    status: str | None = None
+    triggered_from: str | None = None
+    error: str | None = None
+    elapsed_time: float | None = None
+    total_tokens: int | None = None
+    total_steps: int | None = None
+    created_at: int | None = None
+    finished_at: int | None = None
+    exceptions_count: int | None = None
+
+    @field_validator("status", mode="before")
+    @classmethod
+    def _normalize_status(cls, value: Any) -> str | None:
+        if value is None or isinstance(value, str):
+            return value
+        return str(getattr(value, "value", value))
+
+    @field_validator("created_at", "finished_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return _to_timestamp(value)
+
+
+class WorkflowRunForArchivedLogResponse(ResponseModel):
+    id: str
+    status: str | None = None
+    triggered_from: str | None = None
+    elapsed_time: float | None = None
+    total_tokens: int | None = None
+
+    @field_validator("status", mode="before")
+    @classmethod
+    def _normalize_status(cls, value: Any) -> str | None:
+        if value is None or isinstance(value, str):
+            return value
+        return str(getattr(value, "value", value))
+
+
+class WorkflowRunForListResponse(ResponseModel):
+    id: str
+    version: str | None = None
+    status: str | None = None
+    elapsed_time: float | None = None
+    total_tokens: int | None = None
+    total_steps: int | None = None
+    created_by_account: SimpleAccount | None = None
+    created_at: int | None = None
+    finished_at: int | None = None
+    exceptions_count: int | None = None
+    retry_index: int | None = None
+
+    @field_validator("status", mode="before")
+    @classmethod
+    def _normalize_status(cls, value: Any) -> str | None:
+        if value is None or isinstance(value, str):
+            return value
+        return str(getattr(value, "value", value))
+
+    @field_validator("created_at", "finished_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return _to_timestamp(value)
+
+
+class AdvancedChatWorkflowRunForListResponse(WorkflowRunForListResponse):
+    conversation_id: str | None = None
+    message_id: str | None = None
+
+
+class AdvancedChatWorkflowRunPaginationResponse(ResponseModel):
+    limit: int
+    has_more: bool
+    data: list[AdvancedChatWorkflowRunForListResponse]
+
+
+class WorkflowRunPaginationResponse(ResponseModel):
+    limit: int
+    has_more: bool
+    data: list[WorkflowRunForListResponse]
+
+
+class WorkflowRunCountResponse(ResponseModel):
+    total: int
+    running: int
+    succeeded: int
+    failed: int
+    stopped: int
+    partial_succeeded: int = Field(validation_alias="partial-succeeded")
+
+
+class WorkflowRunDetailResponse(ResponseModel):
+    id: str
+    version: str | None = None
+    graph: Any = Field(validation_alias="graph_dict")
+    inputs: Any = Field(validation_alias="inputs_dict")
+    status: str | None = None
+    outputs: Any = Field(validation_alias="outputs_dict")
+    error: str | None = None
+    elapsed_time: float | None = None
+    total_tokens: int | None = None
+    total_steps: int | None = None
+    created_by_role: str | None = None
+    created_by_account: SimpleAccount | None = None
+    created_by_end_user: SimpleEndUser | None = None
+    created_at: int | None = None
+    finished_at: int | None = None
+    exceptions_count: int | None = None
+
+    @field_validator("status", mode="before")
+    @classmethod
+    def _normalize_status(cls, value: Any) -> str | None:
+        if value is None or isinstance(value, str):
+            return value
+        return str(getattr(value, "value", value))
+
+    @field_validator("created_at", "finished_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return _to_timestamp(value)
+
+
+class WorkflowRunNodeExecutionResponse(ResponseModel):
+    id: str
+    index: int | None = None
+    predecessor_node_id: str | None = None
+    node_id: str | None = None
+    node_type: str | None = None
+    title: str | None = None
+    inputs: Any = Field(default=None, validation_alias="inputs_dict")
+    process_data: Any = Field(default=None, validation_alias="process_data_dict")
+    outputs: Any = Field(default=None, validation_alias="outputs_dict")
+    status: str | None = None
+    error: str | None = None
+    elapsed_time: float | None = None
+    execution_metadata: Any = Field(default=None, validation_alias="execution_metadata_dict")
+    extras: Any = None
+    created_at: int | None = None
+    created_by_role: str | None = None
+    created_by_account: SimpleAccount | None = None
+    created_by_end_user: SimpleEndUser | None = None
+    finished_at: int | None = None
+    inputs_truncated: bool | None = None
+    outputs_truncated: bool | None = None
+    process_data_truncated: bool | None = None
+
+    @field_validator("status", mode="before")
+    @classmethod
+    def _normalize_status(cls, value: Any) -> str | None:
+        if value is None or isinstance(value, str):
+            return value
+        return str(getattr(value, "value", value))
+
+    @field_validator("created_at", "finished_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return _to_timestamp(value)
+
+
+class WorkflowRunNodeExecutionListResponse(ResponseModel):
+    data: list[WorkflowRunNodeExecutionResponse]

From 883d7573923da63a89654f119d3767f3a4eb623c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Apr 2026 04:40:43 +0000
Subject: [PATCH 08/36] chore(deps): bump dompurify from 3.3.3 to 3.4.0
 (#35286)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml      | 12 ++++++------
 pnpm-workspace.yaml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index da1110504d..d37f6b7977 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -274,8 +274,8 @@ catalogs:
       specifier: 10.6.0
       version: 10.6.0
     dompurify:
-      specifier: 3.3.3
-      version: 3.3.3
+      specifier: 3.4.0
+      version: 3.4.0
     echarts:
       specifier: 6.0.0
       version: 6.0.0
@@ -775,7 +775,7 @@ importers:
         version: 10.6.0
       dompurify:
         specifier: 'catalog:'
-        version: 3.3.3
+        version: 3.4.0
       echarts:
         specifier: 'catalog:'
         version: 6.0.0
@@ -5461,8 +5461,8 @@ packages:
     resolution: {integrity: sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==}
     engines: {node: '>=20'}
 
-  dompurify@3.3.3:
-    resolution: {integrity: sha512-Oj6pzI2+RqBfFG+qOaOLbFXLQ90ARpcGG6UePL82bJLtdsa6CYJD7nmiU8MW9nQNOtCHV3lZ/Bzq1X0QYbBZCA==}
+  dompurify@3.4.0:
+    resolution: {integrity: sha512-nolgK9JcaUXMSmW+j1yaSvaEaoXYHwWyGJlkoCTghc97KgGDDSnpoU/PlEnw63Ah+TGKFOyY+X5LnxaWbCSfXg==}
 
   domutils@3.2.2:
     resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
@@ -12967,7 +12967,7 @@ snapshots:
     optionalDependencies:
       '@types/trusted-types': 2.0.7
 
-  dompurify@3.3.3:
+  dompurify@3.4.0:
     optionalDependencies:
       '@types/trusted-types': 2.0.7
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 6099d03ee4..433bb467c8 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -105,7 +105,7 @@ catalog:
   date-fns: 4.1.0
   dayjs: 1.11.20
   decimal.js: 10.6.0
-  dompurify: 3.3.3
+  dompurify: 3.4.0
   echarts: 6.0.0
   echarts-for-react: 3.0.6
   elkjs: 0.11.1

From b08665e598dae27ed70e1e7c79ff9b1cae1144c2 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 16 Apr 2026 12:53:21 +0800
Subject: [PATCH 09/36] refactor(web): redesign Select component and migrate
 WorkplaceSelector (#35293)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 .../__tests__/form-fields.spec.tsx            |  31 ++--
 .../config-var/config-modal/form-fields.tsx   |  22 ++-
 .../tools/external-data-tool-modal.tsx        |   5 +-
 .../components/base/markdown-blocks/form.tsx  |   7 +-
 .../components/base/ui/context-menu/index.tsx |  40 ++---
 .../base/ui/dropdown-menu/index.tsx           |  36 ++--
 web/app/components/base/ui/menu-shared.ts     |   7 -
 web/app/components/base/ui/overlay-shared.ts  |   7 +
 .../base/ui/select/__tests__/index.spec.tsx   | 138 ++++++---------
 web/app/components/base/ui/select/index.tsx   | 167 ++++++++----------
 .../__tests__/index.spec.tsx                  | 144 ++++++++-------
 .../workplace-selector/index.tsx              |  96 +++++-----
 .../__tests__/parameter-item.select.spec.tsx  |  33 ++--
 .../model-parameter-modal/parameter-item.tsx  |   7 +-
 .../__tests__/tts-params-panel.spec.tsx       | 133 ++++++++------
 .../model-selector/tts-params-panel.tsx       |  12 +-
 web/eslint-suppressions.json                  |   3 -
 17 files changed, 447 insertions(+), 441 deletions(-)
 delete mode 100644 web/app/components/base/ui/menu-shared.ts
 create mode 100644 web/app/components/base/ui/overlay-shared.ts

diff --git a/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx b/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx
index 0740f0cde3..101cbab8fb 100644
--- a/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx
@@ -44,18 +44,25 @@ vi.mock('@/app/components/base/select', () => ({
   ),
 }))
 
-vi.mock('@/app/components/base/ui/select', () => ({
-  Select: ({ value, onValueChange, children }: { value: string, onValueChange: (value: string) => void, children: ReactNode }) => (
-    <div>
-      <button type="button" onClick={() => onValueChange(value === 'true' ? 'false' : 'beta')}>{`ui-select:${value}`}</button>
-      {children}
-    </div>
-  ),
-  SelectTrigger: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-  SelectValue: () => <span>select-value</span>,
-  SelectContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-  SelectItem: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-}))
+vi.mock('@/app/components/base/ui/select', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/app/components/base/ui/select')>()
+
+  return {
+    ...actual,
+    Select: ({ value, onValueChange, children }: { value: string, onValueChange: (value: string) => void, children: ReactNode }) => (
+      <div>
+        <button type="button" onClick={() => onValueChange(value === 'true' ? 'false' : 'beta')}>{`ui-select:${value}`}</button>
+        {children}
+      </div>
+    ),
+    SelectTrigger: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+    SelectValue: () => <span>select-value</span>,
+    SelectContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+    SelectItem: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+    SelectItemText: ({ children }: { children: ReactNode }) => <span>{children}</span>,
+    SelectItemIndicator: () => <span data-testid="select-item-indicator" />,
+  }
+})
 
 vi.mock('../field', () => ({
   default: ({ children, title }: { children: ReactNode, title: string }) => (
diff --git a/web/app/components/app/configuration/config-var/config-modal/form-fields.tsx b/web/app/components/app/configuration/config-var/config-modal/form-fields.tsx
index fa318ae35d..279a9279cf 100644
--- a/web/app/components/app/configuration/config-var/config-modal/form-fields.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/form-fields.tsx
@@ -12,6 +12,8 @@ import {
   Select,
   SelectContent,
   SelectItem,
+  SelectItemIndicator,
+  SelectItemText,
   SelectTrigger,
   SelectValue,
 } from '@/app/components/base/ui/select'
@@ -138,8 +140,14 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
               <SelectValue placeholder={t('variableConfig.selectDefaultValue', { ns: 'appDebug' })} />
             </SelectTrigger>
             <SelectContent listClassName="max-h-[140px] overflow-y-auto">
-              <SelectItem value={CHECKBOX_DEFAULT_TRUE_VALUE}>{t('variableConfig.startChecked', { ns: 'appDebug' })}</SelectItem>
-              <SelectItem value={CHECKBOX_DEFAULT_FALSE_VALUE}>{t('variableConfig.noDefaultSelected', { ns: 'appDebug' })}</SelectItem>
+              <SelectItem value={CHECKBOX_DEFAULT_TRUE_VALUE}>
+                <SelectItemText>{t('variableConfig.startChecked', { ns: 'appDebug' })}</SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
+              <SelectItem value={CHECKBOX_DEFAULT_FALSE_VALUE}>
+                <SelectItemText>{t('variableConfig.noDefaultSelected', { ns: 'appDebug' })}</SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
             </SelectContent>
           </Select>
         </Field>
@@ -161,9 +169,15 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
                   <SelectValue placeholder={t('variableConfig.selectDefaultValue', { ns: 'appDebug' })} />
                 </SelectTrigger>
                 <SelectContent listClassName="max-h-[140px] overflow-y-auto">
-                  <SelectItem value={EMPTY_SELECT_VALUE}>{t('variableConfig.noDefaultValue', { ns: 'appDebug' })}</SelectItem>
+                  <SelectItem value={EMPTY_SELECT_VALUE}>
+                    <SelectItemText>{t('variableConfig.noDefaultValue', { ns: 'appDebug' })}</SelectItemText>
+                    <SelectItemIndicator />
+                  </SelectItem>
                   {options.filter(option => option.trim() !== '').map(option => (
-                    <SelectItem key={option} value={option}>{option}</SelectItem>
+                    <SelectItem key={option} value={option}>
+                      <SelectItemText>{option}</SelectItemText>
+                      <SelectItemIndicator />
+                    </SelectItem>
                   ))}
                 </SelectContent>
               </Select>
diff --git a/web/app/components/app/configuration/tools/external-data-tool-modal.tsx b/web/app/components/app/configuration/tools/external-data-tool-modal.tsx
index 93d3cf4d24..68a1ee875d 100644
--- a/web/app/components/app/configuration/tools/external-data-tool-modal.tsx
+++ b/web/app/components/app/configuration/tools/external-data-tool-modal.tsx
@@ -11,7 +11,7 @@ import FormGeneration from '@/app/components/base/features/new-feature-panel/mod
 import { BookOpen01 } from '@/app/components/base/icons/src/vender/line/education'
 import { Button } from '@/app/components/base/ui/button'
 import { Dialog, DialogContent } from '@/app/components/base/ui/dialog'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/app/components/base/ui/select'
+import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger, SelectValue } from '@/app/components/base/ui/select'
 import { toast } from '@/app/components/base/ui/toast'
 import ApiBasedExtensionSelector from '@/app/components/header/account-setting/api-based-extension-page/selector'
 import { useDocLink, useLocale } from '@/context/i18n'
@@ -129,7 +129,8 @@ const ExternalDataToolModal: FC<ExternalDataToolModalProps> = ({
             <SelectContent popupClassName="w-[354px]">
               {providers.map(option => (
                 <SelectItem key={option.key} value={option.key}>
-                  {option.name}
+                  <SelectItemText>{option.name}</SelectItemText>
+                  <SelectItemIndicator />
                 </SelectItem>
               ))}
             </SelectContent>
diff --git a/web/app/components/base/markdown-blocks/form.tsx b/web/app/components/base/markdown-blocks/form.tsx
index 7e8dcac0b2..b7643c5cd5 100644
--- a/web/app/components/base/markdown-blocks/form.tsx
+++ b/web/app/components/base/markdown-blocks/form.tsx
@@ -10,7 +10,7 @@ import { formatDateForOutput, toDayjs } from '@/app/components/base/date-and-tim
 import Input from '@/app/components/base/input'
 import Textarea from '@/app/components/base/textarea'
 import { Button } from '@/app/components/base/ui/button'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/app/components/base/ui/select'
+import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger, SelectValue } from '@/app/components/base/ui/select'
 
 enum DATA_FORMAT {
   TEXT = 'text',
@@ -316,7 +316,10 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
                 </SelectTrigger>
                 <SelectContent>
                   {options.map(option => (
-                    <SelectItem key={option} value={option}>{option}</SelectItem>
+                    <SelectItem key={option} value={option}>
+                      <SelectItemText>{option}</SelectItemText>
+                      <SelectItemIndicator />
+                    </SelectItem>
                   ))}
                 </SelectContent>
               </Select>
diff --git a/web/app/components/base/ui/context-menu/index.tsx b/web/app/components/base/ui/context-menu/index.tsx
index 663f09e96e..4331f095b3 100644
--- a/web/app/components/base/ui/context-menu/index.tsx
+++ b/web/app/components/base/ui/context-menu/index.tsx
@@ -5,14 +5,14 @@ import { ContextMenu as BaseContextMenu } from '@base-ui/react/context-menu'
 import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
 import {
-  menuBackdropClassName,
-  menuGroupLabelClassName,
-  menuIndicatorClassName,
-  menuPopupAnimationClassName,
-  menuPopupBaseClassName,
-  menuRowClassName,
-  menuSeparatorClassName,
-} from '@/app/components/base/ui/menu-shared'
+  overlayBackdropClassName,
+  overlayGroupLabelClassName,
+  overlayIndicatorClassName,
+  overlayPopupAnimationClassName,
+  overlayPopupBaseClassName,
+  overlayRowClassName,
+  overlaySeparatorClassName,
+} from '@/app/components/base/ui/overlay-shared'
 import { parsePlacement } from '@/app/components/base/ui/placement'
 
 export const ContextMenu = BaseContextMenu.Root
@@ -65,7 +65,7 @@ function renderContextMenuPopup({
   return (
     <BaseContextMenu.Portal>
       {withBackdrop && (
-        <BaseContextMenu.Backdrop className={menuBackdropClassName} />
+        <BaseContextMenu.Backdrop className={overlayBackdropClassName} />
       )}
       <BaseContextMenu.Positioner
         side={side}
@@ -77,8 +77,8 @@ function renderContextMenuPopup({
       >
         <BaseContextMenu.Popup
           className={cn(
-            menuPopupBaseClassName,
-            menuPopupAnimationClassName,
+            overlayPopupBaseClassName,
+            overlayPopupAnimationClassName,
             popupClassName,
           )}
           {...popupProps}
@@ -124,7 +124,7 @@ export function ContextMenuItem({
 }: ContextMenuItemProps) {
   return (
     <BaseContextMenu.Item
-      className={cn(menuRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
       {...props}
     />
   )
@@ -142,7 +142,7 @@ export function ContextMenuLinkItem({
 }: ContextMenuLinkItemProps) {
   return (
     <BaseContextMenu.LinkItem
-      className={cn(menuRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
       closeOnClick={closeOnClick}
       {...props}
     />
@@ -155,7 +155,7 @@ export function ContextMenuRadioItem({
 }: React.ComponentPropsWithoutRef<typeof BaseContextMenu.RadioItem>) {
   return (
     <BaseContextMenu.RadioItem
-      className={cn(menuRowClassName, className)}
+      className={cn(overlayRowClassName, className)}
       {...props}
     />
   )
@@ -167,7 +167,7 @@ export function ContextMenuCheckboxItem({
 }: React.ComponentPropsWithoutRef<typeof BaseContextMenu.CheckboxItem>) {
   return (
     <BaseContextMenu.CheckboxItem
-      className={cn(menuRowClassName, className)}
+      className={cn(overlayRowClassName, className)}
       {...props}
     />
   )
@@ -179,7 +179,7 @@ export function ContextMenuCheckboxItemIndicator({
 }: Omit<React.ComponentPropsWithoutRef<typeof BaseContextMenu.CheckboxItemIndicator>, 'children'>) {
   return (
     <BaseContextMenu.CheckboxItemIndicator
-      className={cn(menuIndicatorClassName, className)}
+      className={cn(overlayIndicatorClassName, className)}
       {...props}
     >
       <span aria-hidden className="i-ri-check-line h-4 w-4" />
@@ -193,7 +193,7 @@ export function ContextMenuRadioItemIndicator({
 }: Omit<React.ComponentPropsWithoutRef<typeof BaseContextMenu.RadioItemIndicator>, 'children'>) {
   return (
     <BaseContextMenu.RadioItemIndicator
-      className={cn(menuIndicatorClassName, className)}
+      className={cn(overlayIndicatorClassName, className)}
       {...props}
     >
       <span aria-hidden className="i-ri-check-line h-4 w-4" />
@@ -213,7 +213,7 @@ export function ContextMenuSubTrigger({
 }: ContextMenuSubTriggerProps) {
   return (
     <BaseContextMenu.SubmenuTrigger
-      className={cn(menuRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
       {...props}
     >
       {children}
@@ -261,7 +261,7 @@ export function ContextMenuGroupLabel({
 }: React.ComponentPropsWithoutRef<typeof BaseContextMenu.GroupLabel>) {
   return (
     <BaseContextMenu.GroupLabel
-      className={cn(menuGroupLabelClassName, className)}
+      className={cn(overlayGroupLabelClassName, className)}
       {...props}
     />
   )
@@ -273,7 +273,7 @@ export function ContextMenuSeparator({
 }: React.ComponentPropsWithoutRef<typeof BaseContextMenu.Separator>) {
   return (
     <BaseContextMenu.Separator
-      className={cn(menuSeparatorClassName, className)}
+      className={cn(overlaySeparatorClassName, className)}
       {...props}
     />
   )
diff --git a/web/app/components/base/ui/dropdown-menu/index.tsx b/web/app/components/base/ui/dropdown-menu/index.tsx
index 83c34ecf27..ca73e8b003 100644
--- a/web/app/components/base/ui/dropdown-menu/index.tsx
+++ b/web/app/components/base/ui/dropdown-menu/index.tsx
@@ -5,13 +5,13 @@ import { Menu } from '@base-ui/react/menu'
 import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
 import {
-  menuGroupLabelClassName,
-  menuIndicatorClassName,
-  menuPopupAnimationClassName,
-  menuPopupBaseClassName,
-  menuRowClassName,
-  menuSeparatorClassName,
-} from '@/app/components/base/ui/menu-shared'
+  overlayGroupLabelClassName,
+  overlayIndicatorClassName,
+  overlayPopupAnimationClassName,
+  overlayPopupBaseClassName,
+  overlayRowClassName,
+  overlaySeparatorClassName,
+} from '@/app/components/base/ui/overlay-shared'
 import { parsePlacement } from '@/app/components/base/ui/placement'
 
 export const DropdownMenu = Menu.Root
@@ -26,7 +26,7 @@ export function DropdownMenuRadioItem({
 }: React.ComponentPropsWithoutRef<typeof Menu.RadioItem>) {
   return (
     <Menu.RadioItem
-      className={cn(menuRowClassName, className)}
+      className={cn(overlayRowClassName, className)}
       {...props}
     />
   )
@@ -38,7 +38,7 @@ export function DropdownMenuRadioItemIndicator({
 }: Omit<React.ComponentPropsWithoutRef<typeof Menu.RadioItemIndicator>, 'children'>) {
   return (
     <Menu.RadioItemIndicator
-      className={cn(menuIndicatorClassName, className)}
+      className={cn(overlayIndicatorClassName, className)}
       {...props}
     >
       <span aria-hidden className="i-ri-check-line h-4 w-4" />
@@ -52,7 +52,7 @@ export function DropdownMenuCheckboxItem({
 }: React.ComponentPropsWithoutRef<typeof Menu.CheckboxItem>) {
   return (
     <Menu.CheckboxItem
-      className={cn(menuRowClassName, className)}
+      className={cn(overlayRowClassName, className)}
       {...props}
     />
   )
@@ -64,7 +64,7 @@ export function DropdownMenuCheckboxItemIndicator({
 }: Omit<React.ComponentPropsWithoutRef<typeof Menu.CheckboxItemIndicator>, 'children'>) {
   return (
     <Menu.CheckboxItemIndicator
-      className={cn(menuIndicatorClassName, className)}
+      className={cn(overlayIndicatorClassName, className)}
       {...props}
     >
       <span aria-hidden className="i-ri-check-line h-4 w-4" />
@@ -78,7 +78,7 @@ export function DropdownMenuGroupLabel({
 }: React.ComponentPropsWithoutRef<typeof Menu.GroupLabel>) {
   return (
     <Menu.GroupLabel
-      className={cn(menuGroupLabelClassName, className)}
+      className={cn(overlayGroupLabelClassName, className)}
       {...props}
     />
   )
@@ -135,8 +135,8 @@ function renderDropdownMenuPopup({
       >
         <Menu.Popup
           className={cn(
-            menuPopupBaseClassName,
-            menuPopupAnimationClassName,
+            overlayPopupBaseClassName,
+            overlayPopupAnimationClassName,
             popupClassName,
           )}
           {...popupProps}
@@ -182,7 +182,7 @@ export function DropdownMenuSubTrigger({
 }: DropdownMenuSubTriggerProps) {
   return (
     <Menu.SubmenuTrigger
-      className={cn(menuRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
       {...props}
     >
       {children}
@@ -235,7 +235,7 @@ export function DropdownMenuItem({
 }: DropdownMenuItemProps) {
   return (
     <Menu.Item
-      className={cn(menuRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
       {...props}
     />
   )
@@ -253,7 +253,7 @@ export function DropdownMenuLinkItem({
 }: DropdownMenuLinkItemProps) {
   return (
     <Menu.LinkItem
-      className={cn(menuRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
       closeOnClick={closeOnClick}
       {...props}
     />
@@ -266,7 +266,7 @@ export function DropdownMenuSeparator({
 }: React.ComponentPropsWithoutRef<typeof Menu.Separator>) {
   return (
     <Menu.Separator
-      className={cn(menuSeparatorClassName, className)}
+      className={cn(overlaySeparatorClassName, className)}
       {...props}
     />
   )
diff --git a/web/app/components/base/ui/menu-shared.ts b/web/app/components/base/ui/menu-shared.ts
deleted file mode 100644
index b0c379dae2..0000000000
--- a/web/app/components/base/ui/menu-shared.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const menuRowClassName = 'mx-1 flex h-8 cursor-pointer select-none items-center gap-1 rounded-lg px-2 outline-hidden data-highlighted:bg-state-base-hover data-disabled:cursor-not-allowed data-disabled:opacity-30'
-export const menuIndicatorClassName = 'ml-auto flex shrink-0 items-center text-text-accent'
-export const menuGroupLabelClassName = 'px-3 pb-0.5 pt-1 text-text-tertiary system-xs-medium-uppercase'
-export const menuSeparatorClassName = 'my-1 h-px bg-divider-subtle'
-export const menuPopupBaseClassName = 'max-h-(--available-height) overflow-y-auto overflow-x-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-1 text-sm text-text-secondary shadow-lg outline-hidden focus:outline-hidden focus-visible:outline-hidden backdrop-blur-[5px]'
-export const menuPopupAnimationClassName = 'origin-(--transform-origin) transition-[transform,scale,opacity] data-ending-style:scale-95 data-starting-style:scale-95 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none'
-export const menuBackdropClassName = 'fixed inset-0 z-1002 bg-transparent transition-opacity duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none'
diff --git a/web/app/components/base/ui/overlay-shared.ts b/web/app/components/base/ui/overlay-shared.ts
new file mode 100644
index 0000000000..f21eab44ca
--- /dev/null
+++ b/web/app/components/base/ui/overlay-shared.ts
@@ -0,0 +1,7 @@
+export const overlayRowClassName = 'mx-1 flex h-8 cursor-pointer select-none items-center gap-1 rounded-lg px-2 outline-hidden data-highlighted:bg-state-base-hover data-disabled:cursor-not-allowed data-disabled:opacity-30'
+export const overlayIndicatorClassName = 'ml-auto flex shrink-0 items-center text-text-accent'
+export const overlayGroupLabelClassName = 'px-3 pb-0.5 pt-1 text-text-tertiary system-xs-medium-uppercase'
+export const overlaySeparatorClassName = 'my-1 h-px bg-divider-subtle'
+export const overlayPopupBaseClassName = 'max-h-(--available-height) overflow-y-auto overflow-x-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-1 text-sm text-text-secondary shadow-lg outline-hidden focus:outline-hidden focus-visible:outline-hidden backdrop-blur-[5px]'
+export const overlayPopupAnimationClassName = 'origin-(--transform-origin) transition-[transform,scale,opacity] data-ending-style:scale-95 data-starting-style:scale-95 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none'
+export const overlayBackdropClassName = 'fixed inset-0 z-1002 bg-transparent transition-opacity duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none'
diff --git a/web/app/components/base/ui/select/__tests__/index.spec.tsx b/web/app/components/base/ui/select/__tests__/index.spec.tsx
index 124eb4d60e..e8083f04b2 100644
--- a/web/app/components/base/ui/select/__tests__/index.spec.tsx
+++ b/web/app/components/base/ui/select/__tests__/index.spec.tsx
@@ -1,6 +1,6 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import { describe, expect, it, vi } from 'vitest'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../index'
+import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger, SelectValue } from '../index'
 
 const renderOpenSelect = ({
   rootProps = {},
@@ -33,8 +33,14 @@ const renderOpenSelect = ({
         }}
         {...contentProps}
       >
-        <SelectItem value="seattle">Seattle</SelectItem>
-        <SelectItem value="new-york">New York</SelectItem>
+        <SelectItem value="seattle">
+          <SelectItemText>Seattle</SelectItemText>
+          <SelectItemIndicator />
+        </SelectItem>
+        <SelectItem value="new-york">
+          <SelectItemText>New York</SelectItemText>
+          <SelectItemIndicator />
+        </SelectItem>
       </SelectContent>
     </Select>,
   )
@@ -50,8 +56,14 @@ describe('Select wrappers', () => {
               <SelectValue />
             </SelectTrigger>
             <SelectContent listProps={{ 'role': 'listbox', 'aria-label': 'select list' }}>
-              <SelectItem value="seattle">Seattle</SelectItem>
-              <SelectItem value="new-york">New York</SelectItem>
+              <SelectItem value="seattle">
+                <SelectItemText>Seattle</SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
+              <SelectItem value="new-york">
+                <SelectItemText>New York</SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
             </SelectContent>
           </Select>
         </form>,
@@ -66,22 +78,6 @@ describe('Select wrappers', () => {
   })
 
   describe('SelectTrigger', () => {
-    it('should render clear button when clearable is true and loading is false', () => {
-      renderOpenSelect({
-        triggerProps: { clearable: true },
-      })
-
-      expect(screen.getByRole('button', { name: /clear selection/i })).toBeInTheDocument()
-    })
-
-    it('should hide clear button when loading is true', () => {
-      renderOpenSelect({
-        triggerProps: { clearable: true, loading: true },
-      })
-
-      expect(screen.queryByRole('button', { name: /clear selection/i })).not.toBeInTheDocument()
-    })
-
     it('should forward native trigger props when trigger props are provided', () => {
       renderOpenSelect({
         triggerProps: {
@@ -94,48 +90,6 @@ describe('Select wrappers', () => {
       expect(trigger).toBeDisabled()
     })
 
-    it('should call onClear and stop click propagation when clear button is clicked', () => {
-      const onClear = vi.fn()
-      const onTriggerClick = vi.fn()
-
-      renderOpenSelect({
-        triggerProps: {
-          clearable: true,
-          onClear,
-          onClick: onTriggerClick,
-        },
-      })
-
-      fireEvent.click(screen.getByRole('button', { name: /clear selection/i }))
-
-      expect(onClear).toHaveBeenCalledTimes(1)
-      expect(onTriggerClick).not.toHaveBeenCalled()
-    })
-
-    it('should stop mouse down propagation when clear button receives mouse down', () => {
-      const onTriggerMouseDown = vi.fn()
-
-      renderOpenSelect({
-        triggerProps: {
-          clearable: true,
-          onMouseDown: onTriggerMouseDown,
-        },
-      })
-
-      fireEvent.mouseDown(screen.getByRole('button', { name: /clear selection/i }))
-
-      expect(onTriggerMouseDown).not.toHaveBeenCalled()
-    })
-
-    it('should not throw when clear button is clicked without onClear handler', () => {
-      renderOpenSelect({
-        triggerProps: { clearable: true },
-      })
-
-      const clearButton = screen.getByRole('button', { name: /clear selection/i })
-      expect(() => fireEvent.click(clearButton)).not.toThrow()
-    })
-
     it('should apply regular size variant classes by default', () => {
       renderOpenSelect()
 
@@ -182,26 +136,6 @@ describe('Select wrappers', () => {
       expect(trigger.className).toContain('data-disabled:data-placeholder:text-components-input-text-disabled')
     })
 
-    it('should show error icon and apply destructive styling when variant is destructive', () => {
-      renderOpenSelect({
-        triggerProps: { variant: 'destructive' },
-      })
-
-      const trigger = screen.getByRole('combobox', { name: 'city select' })
-      expect(trigger.className).toContain('border-components-input-border-destructive')
-      expect(trigger.className).toContain('bg-components-input-bg-destructive')
-      const errorIcon = trigger.querySelector('.i-ri-error-warning-line')
-      expect(errorIcon).toBeInTheDocument()
-    })
-
-    it('should hide clear button when variant is destructive even if clearable', () => {
-      renderOpenSelect({
-        triggerProps: { clearable: true, variant: 'destructive' },
-      })
-
-      expect(screen.queryByRole('button', { name: /clear selection/i })).not.toBeInTheDocument()
-    })
-
     it('should apply readonly styling via data attributes when Root is readOnly', () => {
       renderOpenSelect({
         rootProps: { readOnly: true },
@@ -236,6 +170,14 @@ describe('Select wrappers', () => {
       const trigger = screen.getByRole('combobox', { name: 'city select' })
       expect(trigger.className).toContain('data-placeholder:text-components-input-text-placeholder')
     })
+
+    it('should render built-in chevron icon', () => {
+      renderOpenSelect()
+
+      const trigger = screen.getByRole('combobox', { name: 'city select' })
+      const chevron = trigger.querySelector('.i-ri-arrow-down-s-line')
+      expect(chevron).toBeInTheDocument()
+    })
   })
 
   describe('SelectContent', () => {
@@ -291,7 +233,10 @@ describe('Select wrappers', () => {
               'onFocus': onListFocus,
             }}
           >
-            <SelectItem value="seattle">Seattle</SelectItem>
+            <SelectItem value="seattle">
+              <SelectItemText>Seattle</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
           </SelectContent>
         </Select>,
       )
@@ -330,9 +275,13 @@ describe('Select wrappers', () => {
             <SelectValue />
           </SelectTrigger>
           <SelectContent listProps={{ 'role': 'listbox', 'aria-label': 'select list' }}>
-            <SelectItem value="seattle">Seattle</SelectItem>
+            <SelectItem value="seattle">
+              <SelectItemText>Seattle</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
             <SelectItem value="new-york" disabled aria-label="Disabled New York">
-              New York
+              <SelectItemText>New York</SelectItemText>
+              <SelectItemIndicator />
             </SelectItem>
           </SelectContent>
         </Select>,
@@ -342,5 +291,22 @@ describe('Select wrappers', () => {
 
       expect(onValueChange).not.toHaveBeenCalled()
     })
+
+    it('should support custom composition with SelectItemText without indicator', () => {
+      render(
+        <Select open defaultValue="a">
+          <SelectTrigger aria-label="custom select">
+            <SelectValue />
+          </SelectTrigger>
+          <SelectContent listProps={{ 'role': 'listbox', 'aria-label': 'select list' }}>
+            <SelectItem value="a" className="gap-2">
+              <SelectItemText>Custom Item</SelectItemText>
+            </SelectItem>
+          </SelectContent>
+        </Select>,
+      )
+
+      expect(screen.getByRole('option', { name: 'Custom Item' })).toBeInTheDocument()
+    })
   })
 })
diff --git a/web/app/components/base/ui/select/index.tsx b/web/app/components/base/ui/select/index.tsx
index 1d50c36a0a..81514a9ad5 100644
--- a/web/app/components/base/ui/select/index.tsx
+++ b/web/app/components/base/ui/select/index.tsx
@@ -1,115 +1,43 @@
 'use client'
 
-import type { VariantProps } from 'class-variance-authority'
 import type { Placement } from '@/app/components/base/ui/placement'
 import { Select as BaseSelect } from '@base-ui/react/select'
 import { cn } from '@langgenius/dify-ui/cn'
-import { cva } from 'class-variance-authority'
 import * as React from 'react'
+import {
+  overlayGroupLabelClassName,
+  overlaySeparatorClassName,
+} from '@/app/components/base/ui/overlay-shared'
 import { parsePlacement } from '@/app/components/base/ui/placement'
 
 export const Select = BaseSelect.Root
 export const SelectValue = BaseSelect.Value
 /** @public */
 export const SelectGroup = BaseSelect.Group
-/** @public */
-export const SelectGroupLabel = BaseSelect.GroupLabel
-/** @public */
-export const SelectSeparator = BaseSelect.Separator
 
-const selectTriggerVariants = cva(
-  '',
-  {
-    variants: {
-      size: {
-        small: 'h-6 gap-px rounded-md px-[5px] py-0 system-xs-regular',
-        regular: 'h-8 gap-0.5 rounded-lg px-2 py-1 system-sm-regular',
-        large: 'h-9 gap-0.5 rounded-[10px] px-2.5 py-1 system-md-regular',
-      },
-      variant: {
-        default: '',
-        destructive: 'border border-components-input-border-destructive bg-components-input-bg-destructive shadow-xs hover:border-components-input-border-destructive hover:bg-components-input-bg-destructive',
-      },
-    },
-    defaultVariants: {
-      size: 'regular',
-      variant: 'default',
-    },
-  },
-)
-
-const contentPadding: Record<string, string> = {
-  small: 'px-[3px] py-1',
-  regular: 'p-1',
-  large: 'px-1.5 py-1',
+const selectSizeClassName: Record<string, string> = {
+  small: 'h-6 gap-px rounded-md px-2 py-1 system-xs-regular',
+  regular: 'h-8 gap-0.5 rounded-lg px-3 py-2 system-sm-regular',
+  large: 'h-9 gap-0.5 rounded-[10px] px-4 py-2 system-md-regular',
 }
 
 type SelectTriggerProps = React.ComponentPropsWithoutRef<typeof BaseSelect.Trigger> & {
-  clearable?: boolean
-  onClear?: () => void
-  loading?: boolean
-} & VariantProps<typeof selectTriggerVariants>
+  size?: 'small' | 'regular' | 'large'
+}
 
 export function SelectTrigger({
   className,
   children,
   size = 'regular',
-  variant = 'default',
-  clearable = false,
-  onClear,
-  loading = false,
   ...props
 }: SelectTriggerProps) {
-  const paddingClass = contentPadding[size ?? 'regular']
-  const isDestructive = variant === 'destructive'
-
-  let trailingIcon: React.ReactNode = null
-  if (loading) {
-    trailingIcon = (
-      <span className="shrink-0 text-text-quaternary" aria-hidden="true">
-        <span className="i-ri-loader-4-line h-3.5 w-3.5 animate-spin" />
-      </span>
-    )
-  }
-  else if (isDestructive) {
-    trailingIcon = (
-      <span className="shrink-0 text-text-destructive-secondary" aria-hidden="true">
-        <span className="i-ri-error-warning-line h-4 w-4" />
-      </span>
-    )
-  }
-  else if (clearable) {
-    trailingIcon = (
-      <span
-        role="button"
-        aria-label="Clear selection"
-        tabIndex={-1}
-        className="shrink-0 cursor-pointer text-text-quaternary group-data-disabled:hidden group-data-readonly:hidden hover:text-text-secondary"
-        onClick={(e) => {
-          e.stopPropagation()
-          onClear?.()
-        }}
-        onMouseDown={e => e.stopPropagation()}
-      >
-        <span className="i-ri-close-circle-fill h-3.5 w-3.5" aria-hidden="true" />
-      </span>
-    )
-  }
-  else {
-    trailingIcon = (
-      <BaseSelect.Icon className="shrink-0 text-text-quaternary transition-colors group-hover:text-text-secondary group-data-readonly:hidden data-open:text-text-secondary">
-        <span className="i-ri-arrow-down-s-line h-4 w-4" aria-hidden="true" />
-      </BaseSelect.Icon>
-    )
-  }
-
   return (
     <BaseSelect.Trigger
       className={cn(
-        'group relative flex w-full items-center border-0 bg-components-input-bg-normal text-left text-components-input-text-filled outline-hidden',
+        'group flex w-full items-center border-0 bg-components-input-bg-normal text-left text-components-input-text-filled outline-hidden',
         'hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt',
         'data-placeholder:text-components-input-text-placeholder',
-        selectTriggerVariants({ size, variant }),
+        selectSizeClassName[size],
         'data-readonly:cursor-default data-readonly:bg-transparent data-readonly:hover:bg-transparent',
         'data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled data-disabled:hover:bg-components-input-bg-disabled',
         'data-disabled:data-placeholder:text-components-input-text-disabled',
@@ -117,14 +45,41 @@ export function SelectTrigger({
       )}
       {...props}
     >
-      <span className={cn('min-w-0 grow truncate', paddingClass)}>
+      <span className="min-w-0 grow truncate">
         {children}
       </span>
-      {trailingIcon}
+      <BaseSelect.Icon className="shrink-0 text-text-quaternary transition-colors group-hover:text-text-secondary group-data-readonly:hidden data-open:text-text-secondary">
+        <span className="i-ri-arrow-down-s-line h-4 w-4" aria-hidden="true" />
+      </BaseSelect.Icon>
     </BaseSelect.Trigger>
   )
 }
 
+export function SelectGroupLabel({
+  className,
+  ...props
+}: React.ComponentPropsWithoutRef<typeof BaseSelect.GroupLabel>) {
+  return (
+    <BaseSelect.GroupLabel
+      className={cn(overlayGroupLabelClassName, className)}
+      {...props}
+    />
+  )
+}
+
+/** @public */
+export function SelectSeparator({
+  className,
+  ...props
+}: React.ComponentPropsWithoutRef<typeof BaseSelect.Separator>) {
+  return (
+    <BaseSelect.Separator
+      className={cn(overlaySeparatorClassName, className)}
+      {...props}
+    />
+  )
+}
+
 type SelectContentProps = {
   children: React.ReactNode
   placement?: Placement
@@ -174,14 +129,14 @@ export function SelectContent({
       >
         <BaseSelect.Popup
           className={cn(
-            'rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg',
+            'min-w-(--anchor-width) rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg',
             'origin-(--transform-origin) transition-[transform,scale,opacity] data-ending-style:scale-95 data-ending-style:opacity-0 data-starting-style:scale-95 data-starting-style:opacity-0 motion-reduce:transition-none',
             popupClassName,
           )}
           {...popupProps}
         >
           <BaseSelect.List
-            className={cn('max-h-80 min-w-40 overflow-auto p-1 outline-hidden', listClassName)}
+            className={cn('max-h-80 overflow-auto p-1 outline-hidden', listClassName)}
             {...listProps}
           >
             {children}
@@ -194,7 +149,6 @@ export function SelectContent({
 
 export function SelectItem({
   className,
-  children,
   ...props
 }: React.ComponentPropsWithoutRef<typeof BaseSelect.Item>) {
   return (
@@ -205,13 +159,32 @@ export function SelectItem({
         className,
       )}
       {...props}
-    >
-      <BaseSelect.ItemText className="mr-1 min-w-0 grow truncate px-1">
-        {children}
-      </BaseSelect.ItemText>
-      <BaseSelect.ItemIndicator className="flex shrink-0 items-center text-text-accent">
-        <span className="i-ri-check-line h-4 w-4" aria-hidden="true" />
-      </BaseSelect.ItemIndicator>
-    </BaseSelect.Item>
+    />
+  )
+}
+
+export function SelectItemText({
+  className,
+  ...props
+}: React.ComponentPropsWithoutRef<typeof BaseSelect.ItemText>) {
+  return (
+    <BaseSelect.ItemText
+      className={cn('mr-1 min-w-0 grow truncate px-1', className)}
+      {...props}
+    />
+  )
+}
+
+export function SelectItemIndicator({
+  className,
+  ...props
+}: Omit<React.ComponentPropsWithoutRef<typeof BaseSelect.ItemIndicator>, 'children'>) {
+  return (
+    <BaseSelect.ItemIndicator
+      className={cn('ml-auto flex shrink-0 items-center text-text-accent', className)}
+      {...props}
+    >
+      <span className="i-ri-check-line h-4 w-4" aria-hidden />
+    </BaseSelect.ItemIndicator>
   )
 }
diff --git a/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx b/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
index 797c984a26..c8224bf10d 100644
--- a/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
@@ -1,7 +1,6 @@
-import type { ProviderContextState } from '@/context/provider-context'
+import type { ReactNode } from 'react'
 import type { IWorkspace } from '@/models/common'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { baseProviderContextValue, useProviderContext } from '@/context/provider-context'
 import { useWorkspacesContext } from '@/context/workspace-context'
 import { switchWorkspace } from '@/service/common'
 import WorkplaceSelector from '../index'
@@ -10,21 +9,30 @@ const toastMocks = vi.hoisted(() => ({
   mockNotify: vi.fn(),
 }))
 
+type MockSelectState = {
+  value: string
+  onValueChange: (value: string | null) => void
+}
+
+const selectMocks = vi.hoisted(() => ({
+  state: {
+    value: '',
+    onValueChange: () => {},
+  } as MockSelectState,
+  reset: (): MockSelectState => ({
+    value: '',
+    onValueChange: () => {},
+  }),
+}))
+
 vi.mock('@/context/workspace-context', () => ({
   useWorkspacesContext: vi.fn(),
 }))
 
-vi.mock('@/context/provider-context', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@/context/provider-context')>()
-  return {
-    ...actual,
-    useProviderContext: vi.fn(),
-  }
-})
-
 vi.mock('@/service/common', () => ({
   switchWorkspace: vi.fn(),
 }))
+
 vi.mock('@/app/components/base/ui/toast', () => ({
   default: {
     notify: (args: unknown) => toastMocks.mockNotify(args),
@@ -37,6 +45,52 @@ vi.mock('@/app/components/base/ui/toast', () => ({
   },
 }))
 
+vi.mock('@/app/components/base/ui/select', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/app/components/base/ui/select')>()
+
+  return {
+    ...actual,
+    Select: ({
+      value,
+      onValueChange,
+      children,
+    }: {
+      value: string
+      onValueChange: (value: string | null) => void
+      children: ReactNode
+    }) => {
+      selectMocks.state = { value, onValueChange }
+      return <div data-testid="workplace-selector-root">{children}</div>
+    },
+    SelectTrigger: ({ children }: { children: ReactNode }) => (
+      <button data-testid="workplace-selector-trigger" type="button">
+        {children}
+      </button>
+    ),
+    SelectContent: ({ children }: { children: ReactNode }) => (
+      <div data-testid="workplace-selector-content">{children}</div>
+    ),
+    SelectGroup: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+    SelectGroupLabel: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+    SelectItem: ({
+      children,
+      value,
+    }: {
+      children: ReactNode
+      value: string
+    }) => (
+      <button
+        data-testid={`workspace-option-${value}`}
+        type="button"
+        onClick={() => selectMocks.state.onValueChange(value)}
+      >
+        {children}
+      </button>
+    ),
+    SelectItemText: ({ children }: { children: ReactNode }) => <span>{children}</span>,
+  }
+})
+
 describe('WorkplaceSelector', () => {
   const mockWorkspaces: IWorkspace[] = [
     { id: '1', name: 'Workspace 1', current: true, plan: 'professional', status: 'normal', created_at: Date.now() },
@@ -48,68 +102,41 @@ describe('WorkplaceSelector', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
+    selectMocks.state = selectMocks.reset()
     vi.mocked(useWorkspacesContext).mockReturnValue({
       workspaces: mockWorkspaces,
     })
-    vi.mocked(useProviderContext).mockReturnValue({
-      ...baseProviderContextValue,
-      isFetchedPlan: true,
-      isEducationWorkspace: false,
-    } as ProviderContextState)
     vi.stubGlobal('location', { ...window.location, assign: mockAssign })
   })
 
-  const renderComponent = () => {
-    return render(
-      <>
-        <WorkplaceSelector />
-      </>,
-    )
-  }
+  const renderComponent = () => render(<WorkplaceSelector />)
 
   describe('Rendering', () => {
-    it('should render current workspace correctly', () => {
-      // Act
+    it('should render current workspace and available workspace options', () => {
       renderComponent()
 
-      // Assert
-      expect(screen.getByText('Workspace 1')).toBeInTheDocument()
-      expect(screen.getByText('W')).toBeInTheDocument() // First letter icon
-    })
-
-    it('should open menu and display all workspaces when clicked', () => {
-      // Act
-      renderComponent()
-      fireEvent.click(screen.getByRole('button'))
-
-      // Assert
-      expect(screen.getAllByText('Workspace 1').length).toBeGreaterThan(0)
-      expect(screen.getByText('Workspace 2')).toBeInTheDocument()
-      // The real PlanBadge renders uppercase plan name or "pro"
-      expect(screen.getByText('pro')).toBeInTheDocument()
-      expect(screen.getByText('sandbox')).toBeInTheDocument()
+      expect(screen.getByTestId('workplace-selector-trigger')).toHaveTextContent('Workspace 1')
+      expect(screen.getByTestId('workspace-option-1')).toBeInTheDocument()
+      expect(screen.getByTestId('workspace-option-2')).toBeInTheDocument()
+      expect(screen.getByTestId('workspace-option-1')).toHaveTextContent('Workspace 1')
+      expect(screen.getByTestId('workspace-option-2')).toHaveTextContent('Workspace 2')
     })
   })
 
   describe('Workspace Switching', () => {
     it('should switch workspace successfully', async () => {
-      // Arrange
       vi.mocked(switchWorkspace).mockResolvedValue({
         result: 'success',
         new_tenant: mockWorkspaces[1],
       })
 
-      // Act
       renderComponent()
-      fireEvent.click(screen.getByRole('button'))
-      const workspace2 = screen.getByText('Workspace 2')
-      fireEvent.click(workspace2)
+      fireEvent.click(screen.getByTestId('workspace-option-2'))
 
-      // Assert
-      expect(switchWorkspace).toHaveBeenCalledWith({
+      await waitFor(() => expect(switchWorkspace).toHaveBeenCalledWith({
         url: '/workspaces/switch',
         body: { tenant_id: '2' },
-      })
+      }))
 
       await waitFor(() => {
         expect(mockNotify).toHaveBeenCalledWith({
@@ -121,27 +148,18 @@ describe('WorkplaceSelector', () => {
     })
 
     it('should not switch to the already current workspace', () => {
-      // Act
       renderComponent()
-      fireEvent.click(screen.getByRole('button'))
-      const workspacesInMenu = screen.getAllByText('Workspace 1')
-      fireEvent.click(workspacesInMenu[workspacesInMenu.length - 1])
+      fireEvent.click(screen.getByTestId('workspace-option-1'))
 
-      // Assert
       expect(switchWorkspace).not.toHaveBeenCalled()
     })
 
     it('should handle switching error correctly', async () => {
-      // Arrange
       vi.mocked(switchWorkspace).mockRejectedValue(new Error('Failed'))
 
-      // Act
       renderComponent()
-      fireEvent.click(screen.getByRole('button'))
-      const workspace2 = screen.getByText('Workspace 2')
-      fireEvent.click(workspace2)
+      fireEvent.click(screen.getByTestId('workspace-option-2'))
 
-      // Assert
       await waitFor(() => {
         expect(mockNotify).toHaveBeenCalledWith({
           type: 'error',
@@ -152,29 +170,23 @@ describe('WorkplaceSelector', () => {
   })
 
   describe('Edge Cases', () => {
-    // find() returns undefined: no workspace with current: true
-    it('should not crash when no workspace has current: true', () => {
-      // Arrange
+    it('should not crash when no workspace has current value', () => {
       vi.mocked(useWorkspacesContext).mockReturnValue({
         workspaces: [
           { id: '1', name: 'Workspace 1', current: false, plan: 'professional', status: 'normal', created_at: Date.now() },
         ],
       })
 
-      // Act & Assert - should not throw
       expect(() => renderComponent()).not.toThrow()
     })
 
-    // name[0]?.toLocaleUpperCase() undefined: workspace with empty name
     it('should not crash when workspace name is empty string', () => {
-      // Arrange
       vi.mocked(useWorkspacesContext).mockReturnValue({
         workspaces: [
           { id: '1', name: '', current: true, plan: 'sandbox', status: 'normal', created_at: Date.now() },
         ],
       })
 
-      // Act & Assert - should not throw
       expect(() => renderComponent()).not.toThrow()
     })
   })
diff --git a/web/app/components/header/account-dropdown/workplace-selector/index.tsx b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
index 70d4384c45..aa49075621 100644
--- a/web/app/components/header/account-dropdown/workplace-selector/index.tsx
+++ b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
@@ -1,9 +1,14 @@
 import type { Plan } from '@/app/components/billing/type'
-import { Menu, MenuButton, MenuItems, Transition } from '@headlessui/react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { RiArrowDownSLine } from '@remixicon/react'
-import { Fragment } from 'react'
 import { useTranslation } from 'react-i18next'
+import {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectGroupLabel,
+  SelectItem,
+  SelectItemText,
+  SelectTrigger,
+} from '@/app/components/base/ui/select'
 import { toast } from '@/app/components/base/ui/toast'
 import PlanBadge from '@/app/components/header/plan-badge'
 import { useWorkspacesContext } from '@/context/workspace-context'
@@ -14,6 +19,7 @@ const WorkplaceSelector = () => {
   const { t } = useTranslation()
   const { workspaces } = useWorkspacesContext()
   const currentWorkspace = workspaces.find(v => v.current)
+
   const handleSwitchWorkspace = async (tenant_id: string) => {
     try {
       if (currentWorkspace?.id === tenant_id)
@@ -26,50 +32,48 @@ const WorkplaceSelector = () => {
       toast.error(t('provider.saveFailed', { ns: 'common' }))
     }
   }
+
   return (
-    <Menu as="div" className="min-w-0">
-      {({ open }) => (
-        <>
-          <MenuButton className={cn(`
-                group flex w-full cursor-pointer items-center
-                p-0.5 hover:bg-state-base-hover ${open && 'bg-state-base-hover'} rounded-[10px]
-              `)}
-          >
-            <div className="mr-1.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-components-icon-bg-blue-solid text-[13px] max-[800px]:mr-0">
-              <span className="h-6 bg-gradient-to-r from-components-avatar-shape-fill-stop-0 to-components-avatar-shape-fill-stop-100 bg-clip-text align-middle leading-6 font-semibold text-shadow-shadow-1 uppercase opacity-90">{currentWorkspace?.name[0]?.toLocaleUpperCase()}</span>
-            </div>
-            <div className="flex min-w-0 items-center">
-              <div className="max-w-[149px] min-w-0 truncate system-sm-medium text-text-secondary max-[800px]:hidden">{currentWorkspace?.name}</div>
-              <RiArrowDownSLine className="h-4 w-4 shrink-0 text-text-secondary" />
-            </div>
-          </MenuButton>
-          <Transition as={Fragment} enter="transition ease-out duration-100" enterFrom="transform opacity-0 scale-95" enterTo="transform opacity-100 scale-100" leave="transition ease-in duration-75" leaveFrom="transform opacity-100 scale-100" leaveTo="transform opacity-0 scale-95">
-            <MenuItems
-              anchor="bottom start"
-              className={cn(`
-                    shadows-shadow-lg absolute left-[-15px] z-[1000] mt-1 flex max-h-[400px] w-[280px] flex-col items-start overflow-y-auto
-                    rounded-xl bg-components-panel-bg-blur backdrop-blur-[5px]
-                  `)}
-            >
-              <div className="flex w-full flex-col items-start self-stretch rounded-xl border-[0.5px] border-components-panel-border p-1 pb-2 shadow-lg">
-                <div className="flex items-start self-stretch px-3 pt-1 pb-0.5">
-                  <span className="flex-1 system-xs-medium-uppercase text-text-tertiary">{t('userProfile.workspace', { ns: 'common' })}</span>
-                </div>
-                {workspaces.map(workspace => (
-                  <div className="flex items-center gap-2 self-stretch rounded-lg py-1 pr-2 pl-3 hover:bg-state-base-hover" key={workspace.id} onClick={() => handleSwitchWorkspace(workspace.id)}>
-                    <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-components-icon-bg-blue-solid text-[13px]">
-                      <span className="h-6 bg-gradient-to-r from-components-avatar-shape-fill-stop-0 to-components-avatar-shape-fill-stop-100 bg-clip-text align-middle leading-6 font-semibold text-shadow-shadow-1 uppercase opacity-90">{workspace?.name[0]?.toLocaleUpperCase()}</span>
-                    </div>
-                    <div className="line-clamp-1 grow cursor-pointer overflow-hidden system-md-regular text-ellipsis text-text-secondary">{workspace.name}</div>
-                    <PlanBadge plan={workspace.plan as Plan} />
-                  </div>
-                ))}
+    <Select
+      value={currentWorkspace?.id ?? ''}
+      onValueChange={(value) => {
+        if (value)
+          void handleSwitchWorkspace(value)
+      }}
+    >
+      <SelectTrigger
+        className="w-auto cursor-pointer rounded-[10px] border-0 bg-transparent p-0.5 hover:bg-state-base-hover data-popup-open:bg-state-base-hover"
+      >
+        <div className="flex items-center">
+          <div className="mr-1.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-components-icon-bg-blue-solid text-[13px] max-[800px]:mr-0">
+            <span className="h-6 bg-gradient-to-r from-components-avatar-shape-fill-stop-0 to-components-avatar-shape-fill-stop-100 bg-clip-text align-middle leading-6 font-semibold text-shadow-shadow-1 uppercase opacity-90">
+              {currentWorkspace?.name[0]?.toLocaleUpperCase()}
+            </span>
+          </div>
+          <div className="max-w-[149px] min-w-0 truncate system-sm-medium text-text-secondary max-[800px]:hidden">
+            {currentWorkspace?.name}
+          </div>
+        </div>
+      </SelectTrigger>
+      <SelectContent popupClassName="w-[280px]">
+        <SelectGroup>
+          <SelectGroupLabel>
+            {t('userProfile.workspace', { ns: 'common' })}
+          </SelectGroupLabel>
+          {workspaces.map(workspace => (
+            <SelectItem key={workspace.id} value={workspace.id} className="gap-2 py-1 pr-2 pl-3">
+              <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-components-icon-bg-blue-solid text-[13px]">
+                <span className="h-6 bg-gradient-to-r from-components-avatar-shape-fill-stop-0 to-components-avatar-shape-fill-stop-100 bg-clip-text align-middle leading-6 font-semibold text-shadow-shadow-1 uppercase opacity-90">
+                  {workspace.name[0]?.toLocaleUpperCase()}
+                </span>
               </div>
-            </MenuItems>
-          </Transition>
-        </>
-      )}
-    </Menu>
+              <SelectItemText className="system-md-regular">{workspace.name}</SelectItemText>
+              <PlanBadge plan={workspace.plan as Plan} />
+            </SelectItem>
+          ))}
+        </SelectGroup>
+      </SelectContent>
+    </Select>
   )
 }
 export default WorkplaceSelector
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/parameter-item.select.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/parameter-item.select.spec.tsx
index ff30f69a84..ae4a68bad7 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/parameter-item.select.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/parameter-item.select.spec.tsx
@@ -6,19 +6,26 @@ vi.mock('../../hooks', () => ({
   useLanguage: () => 'en_US',
 }))
 
-vi.mock('@/app/components/base/ui/select', () => ({
-  Select: ({ children, onValueChange }: { children: ReactNode, onValueChange: (value: string | undefined) => void }) => (
-    <div>
-      <button type="button" onClick={() => onValueChange('updated')}>select-updated</button>
-      <button type="button" onClick={() => onValueChange(undefined)}>select-empty</button>
-      {children}
-    </div>
-  ),
-  SelectContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-  SelectItem: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-  SelectTrigger: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-  SelectValue: () => <div>SelectValue</div>,
-}))
+vi.mock('@/app/components/base/ui/select', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/app/components/base/ui/select')>()
+
+  return {
+    ...actual,
+    Select: ({ children, onValueChange }: { children: ReactNode, onValueChange: (value: string | undefined) => void }) => (
+      <div>
+        <button type="button" onClick={() => onValueChange('updated')}>select-updated</button>
+        <button type="button" onClick={() => onValueChange(undefined)}>select-empty</button>
+        {children}
+      </div>
+    ),
+    SelectContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+    SelectItem: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+    SelectTrigger: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+    SelectValue: () => <div>SelectValue</div>,
+    SelectItemText: ({ children }: { children: ReactNode }) => <span>{children}</span>,
+    SelectItemIndicator: () => <span data-testid="select-item-indicator" />,
+  }
+})
 
 describe('ParameterItem select mode', () => {
   it('should propagate both explicit and empty select values', () => {
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/parameter-item.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/parameter-item.tsx
index 7732ba5a8c..4cda97031f 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/parameter-item.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/parameter-item.tsx
@@ -10,7 +10,7 @@ import PromptEditor from '@/app/components/base/prompt-editor'
 import Radio from '@/app/components/base/radio'
 import Switch from '@/app/components/base/switch'
 import TagInput from '@/app/components/base/tag-input'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/app/components/base/ui/select'
+import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger, SelectValue } from '@/app/components/base/ui/select'
 import { Slider } from '@/app/components/base/ui/slider'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/app/components/base/ui/tooltip'
 import { BlockEnum } from '@/app/components/workflow/types'
@@ -299,7 +299,10 @@ function ParameterItem({
           </SelectTrigger>
           <SelectContent>
             {parameterRule.options!.map(option => (
-              <SelectItem key={option} value={option}>{option}</SelectItem>
+              <SelectItem key={option} value={option}>
+                <SelectItemText>{option}</SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
             ))}
           </SelectContent>
         </Select>
diff --git a/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/tts-params-panel.spec.tsx b/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/tts-params-panel.spec.tsx
index 94ac5ab05a..c3f7f221b5 100644
--- a/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/tts-params-panel.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/tts-params-panel.spec.tsx
@@ -26,66 +26,83 @@ const MockSelectContext = React.createContext<{
   onValueChange: () => {},
 })
 
-vi.mock('@/app/components/base/ui/select', () => ({
-  Select: ({
-    value,
-    onValueChange,
-    children,
-  }: {
-    value: string
-    onValueChange: (value: string) => void
-    children: React.ReactNode
-  }) => (
-    <MockSelectContext.Provider value={{ value, onValueChange }}>
-      <div data-testid="select-root">{children}</div>
-    </MockSelectContext.Provider>
-  ),
-  SelectTrigger: ({
-    children,
-    className,
-    'data-testid': testId,
-  }: {
-    'children': React.ReactNode
-    'className'?: string
-    'data-testid'?: string
-  }) => (
-    <button data-testid={testId ?? 'select-trigger'} data-class={className}>
-      {children}
-    </button>
-  ),
-  SelectValue: () => {
-    const { value } = React.useContext(MockSelectContext)
-    return <span data-testid="selected-value">{value}</span>
-  },
-  SelectContent: ({
-    children,
-    popupClassName,
-  }: {
-    children: React.ReactNode
-    popupClassName?: string
-  }) => (
-    <div data-testid="select-content" data-popup-class={popupClassName}>
-      {children}
-    </div>
-  ),
-  SelectItem: ({
-    children,
-    value,
-  }: {
-    children: React.ReactNode
-    value: string
-  }) => {
-    const { onValueChange } = React.useContext(MockSelectContext)
-    return (
-      <button
-        data-testid={`select-item-${value}`}
-        onClick={() => onValueChange(value)}
-      >
+vi.mock('@/app/components/base/ui/select', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/app/components/base/ui/select')>()
+
+  return {
+    ...actual,
+    Select: ({
+      value,
+      onValueChange,
+      children,
+    }: {
+      value: string
+      onValueChange: (value: string) => void
+      children: React.ReactNode
+    }) => (
+      <MockSelectContext.Provider value={{ value, onValueChange }}>
+        <div data-testid="select-root">{children}</div>
+      </MockSelectContext.Provider>
+    ),
+    SelectTrigger: ({
+      children,
+      className,
+      'data-testid': testId,
+    }: {
+      'children': React.ReactNode
+      'className'?: string
+      'data-testid'?: string
+    }) => (
+      <button data-testid={testId ?? 'select-trigger'} data-class={className}>
         {children}
       </button>
-    )
-  },
-}))
+    ),
+    SelectValue: () => {
+      const { value } = React.useContext(MockSelectContext)
+      return <span data-testid="selected-value">{value}</span>
+    },
+    SelectContent: ({
+      children,
+      popupClassName,
+    }: {
+      children: React.ReactNode
+      popupClassName?: string
+    }) => (
+      <div data-testid="select-content" data-popup-class={popupClassName}>
+        {children}
+      </div>
+    ),
+    SelectItem: ({
+      children,
+      value,
+    }: {
+      children: React.ReactNode
+      value: string
+    }) => {
+      const { onValueChange } = React.useContext(MockSelectContext)
+      return (
+        <button
+          data-testid={`select-item-${value}`}
+          onClick={() => onValueChange(value)}
+        >
+          {children}
+        </button>
+      )
+    },
+    SelectItemText: ({
+      children,
+      className,
+    }: {
+      children: React.ReactNode
+      className?: string
+    }) => <span data-class={className}>{children}</span>,
+    SelectItemIndicator: ({
+      className,
+    }: {
+      className?: string
+    }) => <span data-testid="select-item-indicator" data-class={className} />,
+  }
+})
 
 // ==================== Test Utilities ====================
 
diff --git a/web/app/components/plugins/plugin-detail-panel/model-selector/tts-params-panel.tsx b/web/app/components/plugins/plugin-detail-panel/model-selector/tts-params-panel.tsx
index 461b229602..1ab7ea2f11 100644
--- a/web/app/components/plugins/plugin-detail-panel/model-selector/tts-params-panel.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/model-selector/tts-params-panel.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/app/components/base/ui/select'
+import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger, SelectValue } from '@/app/components/base/ui/select'
 import { languages } from '@/i18n-config/language'
 
 type Props = {
@@ -37,7 +37,7 @@ const TTSParamsPanel = ({
   return (
     <>
       <div className="mb-3">
-        <div className="system-sm-semibold mb-1 flex items-center py-1 text-text-secondary">
+        <div className="mb-1 flex items-center py-1 system-sm-semibold text-text-secondary">
           {t('voice.voiceSettings.language', { ns: 'appDebug' })}
         </div>
         <Select
@@ -58,14 +58,15 @@ const TTSParamsPanel = ({
           <SelectContent popupClassName="w-[354px]">
             {supportedLanguages.map(item => (
               <SelectItem key={item.value} value={item.value}>
-                {item.name}
+                <SelectItemText>{item.name}</SelectItemText>
+                <SelectItemIndicator />
               </SelectItem>
             ))}
           </SelectContent>
         </Select>
       </div>
       <div className="mb-3">
-        <div className="system-sm-semibold mb-1 flex items-center py-1 text-text-secondary">
+        <div className="mb-1 flex items-center py-1 system-sm-semibold text-text-secondary">
           {t('voice.voiceSettings.voice', { ns: 'appDebug' })}
         </div>
         <Select
@@ -86,7 +87,8 @@ const TTSParamsPanel = ({
           <SelectContent popupClassName="w-[354px]">
             {voiceList.map(item => (
               <SelectItem key={item.value} value={item.value}>
-                {item.label}
+                <SelectItemText>{item.label}</SelectItemText>
+                <SelectItemIndicator />
               </SelectItem>
             ))}
           </SelectContent>
diff --git a/web/eslint-suppressions.json b/web/eslint-suppressions.json
index a5fdb872f9..2124d7f936 100644
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json
@@ -4523,9 +4523,6 @@
     }
   },
   "app/components/plugins/plugin-detail-panel/model-selector/tts-params-panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }

From b665eaa01587db11773ac12f29c3652cc4cd064f Mon Sep 17 00:00:00 2001
From: NVIDIAN <speedy.hpc@hotmail.com>
Date: Wed, 15 Apr 2026 22:11:21 -0700
Subject: [PATCH 10/36] refactor(api): migrate console conversation responses
 to BaseModel (#35294)

Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
---
 api/controllers/console/app/conversation.py   | 328 +++---------------
 api/fields/conversation_fields.py             |  59 +++-
 .../console/app/test_conversation_api.py      |  14 +-
 3 files changed, 106 insertions(+), 295 deletions(-)

diff --git a/api/controllers/console/app/conversation.py b/api/controllers/console/app/conversation.py
index d329d22309..b2b1049f0c 100644
--- a/api/controllers/console/app/conversation.py
+++ b/api/controllers/console/app/conversation.py
@@ -2,20 +2,37 @@ from typing import Literal
 
 import sqlalchemy as sa
 from flask import abort, request
-from flask_restx import Resource, fields, marshal_with
+from flask_restx import Resource
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy import func, or_
 from sqlalchemy.orm import selectinload
 from werkzeug.exceptions import NotFound
 
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
 from core.app.entities.app_invoke_entities import InvokeFrom
 from extensions.ext_database import db
-from fields.raws import FilesContainedField
+from fields.conversation_fields import (
+    Conversation as ConversationResponse,
+)
+from fields.conversation_fields import (
+    ConversationDetail as ConversationDetailResponse,
+)
+from fields.conversation_fields import (
+    ConversationMessageDetail as ConversationMessageDetailResponse,
+)
+from fields.conversation_fields import (
+    ConversationPagination as ConversationPaginationResponse,
+)
+from fields.conversation_fields import (
+    ConversationWithSummaryPagination as ConversationWithSummaryPaginationResponse,
+)
+from fields.conversation_fields import (
+    ResultResponse,
+)
 from libs.datetime_utils import naive_utc_now, parse_time_range
-from libs.helper import TimestampField
 from libs.login import current_account_with_tenant, login_required
 from models import Conversation, EndUser, Message, MessageAnnotation
 from models.model import AppMode
@@ -62,267 +79,16 @@ console_ns.schema_model(
     ChatConversationQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
 )
 
-# Register models for flask_restx to avoid dict type issues in Swagger
-# Register in dependency order: base models first, then dependent models
-
-# Base models
-simple_account_model = console_ns.model(
-    "SimpleAccount",
-    {
-        "id": fields.String,
-        "name": fields.String,
-        "email": fields.String,
-    },
-)
-
-feedback_stat_model = console_ns.model(
-    "FeedbackStat",
-    {
-        "like": fields.Integer,
-        "dislike": fields.Integer,
-    },
-)
-
-status_count_model = console_ns.model(
-    "StatusCount",
-    {
-        "success": fields.Integer,
-        "failed": fields.Integer,
-        "partial_success": fields.Integer,
-        "paused": fields.Integer,
-    },
-)
-
-message_file_model = console_ns.model(
-    "MessageFile",
-    {
-        "id": fields.String,
-        "filename": fields.String,
-        "type": fields.String,
-        "url": fields.String,
-        "mime_type": fields.String,
-        "size": fields.Integer,
-        "transfer_method": fields.String,
-        "belongs_to": fields.String(default="user"),
-        "upload_file_id": fields.String(default=None),
-    },
-)
-
-agent_thought_model = console_ns.model(
-    "AgentThought",
-    {
-        "id": fields.String,
-        "chain_id": fields.String,
-        "message_id": fields.String,
-        "position": fields.Integer,
-        "thought": fields.String,
-        "tool": fields.String,
-        "tool_labels": fields.Raw,
-        "tool_input": fields.String,
-        "created_at": TimestampField,
-        "observation": fields.String,
-        "files": fields.List(fields.String),
-    },
-)
-
-simple_model_config_model = console_ns.model(
-    "SimpleModelConfig",
-    {
-        "model": fields.Raw(attribute="model_dict"),
-        "pre_prompt": fields.String,
-    },
-)
-
-model_config_model = console_ns.model(
-    "ModelConfig",
-    {
-        "opening_statement": fields.String,
-        "suggested_questions": fields.Raw,
-        "model": fields.Raw,
-        "user_input_form": fields.Raw,
-        "pre_prompt": fields.String,
-        "agent_mode": fields.Raw,
-    },
-)
-
-# Models that depend on simple_account_model
-feedback_model = console_ns.model(
-    "Feedback",
-    {
-        "rating": fields.String,
-        "content": fields.String,
-        "from_source": fields.String,
-        "from_end_user_id": fields.String,
-        "from_account": fields.Nested(simple_account_model, allow_null=True),
-    },
-)
-
-annotation_model = console_ns.model(
-    "Annotation",
-    {
-        "id": fields.String,
-        "question": fields.String,
-        "content": fields.String,
-        "account": fields.Nested(simple_account_model, allow_null=True),
-        "created_at": TimestampField,
-    },
-)
-
-annotation_hit_history_model = console_ns.model(
-    "AnnotationHitHistory",
-    {
-        "annotation_id": fields.String(attribute="id"),
-        "annotation_create_account": fields.Nested(simple_account_model, allow_null=True),
-        "created_at": TimestampField,
-    },
-)
-
-
-class MessageTextField(fields.Raw):
-    def format(self, value):
-        return value[0]["text"] if value else ""
-
-
-# Simple message detail model
-simple_message_detail_model = console_ns.model(
-    "SimpleMessageDetail",
-    {
-        "inputs": FilesContainedField,
-        "query": fields.String,
-        "message": MessageTextField,
-        "answer": fields.String,
-    },
-)
-
-# Message detail model that depends on multiple models
-message_detail_model = console_ns.model(
-    "MessageDetail",
-    {
-        "id": fields.String,
-        "conversation_id": fields.String,
-        "inputs": FilesContainedField,
-        "query": fields.String,
-        "message": fields.Raw,
-        "message_tokens": fields.Integer,
-        "answer": fields.String(attribute="re_sign_file_url_answer"),
-        "answer_tokens": fields.Integer,
-        "provider_response_latency": fields.Float,
-        "from_source": fields.String,
-        "from_end_user_id": fields.String,
-        "from_account_id": fields.String,
-        "feedbacks": fields.List(fields.Nested(feedback_model)),
-        "workflow_run_id": fields.String,
-        "annotation": fields.Nested(annotation_model, allow_null=True),
-        "annotation_hit_history": fields.Nested(annotation_hit_history_model, allow_null=True),
-        "created_at": TimestampField,
-        "agent_thoughts": fields.List(fields.Nested(agent_thought_model)),
-        "message_files": fields.List(fields.Nested(message_file_model)),
-        "metadata": fields.Raw(attribute="message_metadata_dict"),
-        "status": fields.String,
-        "error": fields.String,
-        "parent_message_id": fields.String,
-    },
-)
-
-# Conversation models
-conversation_fields_model = console_ns.model(
-    "Conversation",
-    {
-        "id": fields.String,
-        "status": fields.String,
-        "from_source": fields.String,
-        "from_end_user_id": fields.String,
-        "from_end_user_session_id": fields.String(),
-        "from_account_id": fields.String,
-        "from_account_name": fields.String,
-        "read_at": TimestampField,
-        "created_at": TimestampField,
-        "updated_at": TimestampField,
-        "annotation": fields.Nested(annotation_model, allow_null=True),
-        "model_config": fields.Nested(simple_model_config_model),
-        "user_feedback_stats": fields.Nested(feedback_stat_model),
-        "admin_feedback_stats": fields.Nested(feedback_stat_model),
-        "message": fields.Nested(simple_message_detail_model, attribute="first_message"),
-    },
-)
-
-conversation_pagination_model = console_ns.model(
-    "ConversationPagination",
-    {
-        "page": fields.Integer,
-        "limit": fields.Integer(attribute="per_page"),
-        "total": fields.Integer,
-        "has_more": fields.Boolean(attribute="has_next"),
-        "data": fields.List(fields.Nested(conversation_fields_model), attribute="items"),
-    },
-)
-
-conversation_message_detail_model = console_ns.model(
-    "ConversationMessageDetail",
-    {
-        "id": fields.String,
-        "status": fields.String,
-        "from_source": fields.String,
-        "from_end_user_id": fields.String,
-        "from_account_id": fields.String,
-        "created_at": TimestampField,
-        "model_config": fields.Nested(model_config_model),
-        "message": fields.Nested(message_detail_model, attribute="first_message"),
-    },
-)
-
-conversation_with_summary_model = console_ns.model(
-    "ConversationWithSummary",
-    {
-        "id": fields.String,
-        "status": fields.String,
-        "from_source": fields.String,
-        "from_end_user_id": fields.String,
-        "from_end_user_session_id": fields.String,
-        "from_account_id": fields.String,
-        "from_account_name": fields.String,
-        "name": fields.String,
-        "summary": fields.String(attribute="summary_or_query"),
-        "read_at": TimestampField,
-        "created_at": TimestampField,
-        "updated_at": TimestampField,
-        "annotated": fields.Boolean,
-        "model_config": fields.Nested(simple_model_config_model),
-        "message_count": fields.Integer,
-        "user_feedback_stats": fields.Nested(feedback_stat_model),
-        "admin_feedback_stats": fields.Nested(feedback_stat_model),
-        "status_count": fields.Nested(status_count_model),
-    },
-)
-
-conversation_with_summary_pagination_model = console_ns.model(
-    "ConversationWithSummaryPagination",
-    {
-        "page": fields.Integer,
-        "limit": fields.Integer(attribute="per_page"),
-        "total": fields.Integer,
-        "has_more": fields.Boolean(attribute="has_next"),
-        "data": fields.List(fields.Nested(conversation_with_summary_model), attribute="items"),
-    },
-)
-
-conversation_detail_model = console_ns.model(
-    "ConversationDetail",
-    {
-        "id": fields.String,
-        "status": fields.String,
-        "from_source": fields.String,
-        "from_end_user_id": fields.String,
-        "from_account_id": fields.String,
-        "created_at": TimestampField,
-        "updated_at": TimestampField,
-        "annotated": fields.Boolean,
-        "introduction": fields.String,
-        "model_config": fields.Nested(model_config_model),
-        "message_count": fields.Integer,
-        "user_feedback_stats": fields.Nested(feedback_stat_model),
-        "admin_feedback_stats": fields.Nested(feedback_stat_model),
-    },
+register_schema_models(
+    console_ns,
+    CompletionConversationQuery,
+    ChatConversationQuery,
+    ConversationResponse,
+    ConversationPaginationResponse,
+    ConversationMessageDetailResponse,
+    ConversationWithSummaryPaginationResponse,
+    ConversationDetailResponse,
+    ResultResponse,
 )
 
 
@@ -332,13 +98,12 @@ class CompletionConversationApi(Resource):
     @console_ns.doc(description="Get completion conversations with pagination and filtering")
     @console_ns.doc(params={"app_id": "Application ID"})
     @console_ns.expect(console_ns.models[CompletionConversationQuery.__name__])
-    @console_ns.response(200, "Success", conversation_pagination_model)
+    @console_ns.response(200, "Success", console_ns.models[ConversationPaginationResponse.__name__])
     @console_ns.response(403, "Insufficient permissions")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=AppMode.COMPLETION)
-    @marshal_with(conversation_pagination_model)
     @edit_permission_required
     def get(self, app_model):
         current_user, _ = current_account_with_tenant()
@@ -394,7 +159,9 @@ class CompletionConversationApi(Resource):
 
         conversations = db.paginate(query, page=args.page, per_page=args.limit, error_out=False)
 
-        return conversations
+        return ConversationPaginationResponse.model_validate(conversations, from_attributes=True).model_dump(
+            mode="json"
+        )
 
 
 @console_ns.route("/apps/<uuid:app_id>/completion-conversations/<uuid:conversation_id>")
@@ -402,19 +169,19 @@ class CompletionConversationDetailApi(Resource):
     @console_ns.doc("get_completion_conversation")
     @console_ns.doc(description="Get completion conversation details with messages")
     @console_ns.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
-    @console_ns.response(200, "Success", conversation_message_detail_model)
+    @console_ns.response(200, "Success", console_ns.models[ConversationMessageDetailResponse.__name__])
     @console_ns.response(403, "Insufficient permissions")
     @console_ns.response(404, "Conversation not found")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=AppMode.COMPLETION)
-    @marshal_with(conversation_message_detail_model)
     @edit_permission_required
     def get(self, app_model, conversation_id):
         conversation_id = str(conversation_id)
-
-        return _get_conversation(app_model, conversation_id)
+        return ConversationMessageDetailResponse.model_validate(
+            _get_conversation(app_model, conversation_id), from_attributes=True
+        ).model_dump(mode="json")
 
     @console_ns.doc("delete_completion_conversation")
     @console_ns.doc(description="Delete a completion conversation")
@@ -436,7 +203,7 @@ class CompletionConversationDetailApi(Resource):
         except ConversationNotExistsError:
             raise NotFound("Conversation Not Exists.")
 
-        return {"result": "success"}, 204
+        return ResultResponse(result="success").model_dump(mode="json"), 204
 
 
 @console_ns.route("/apps/<uuid:app_id>/chat-conversations")
@@ -445,13 +212,12 @@ class ChatConversationApi(Resource):
     @console_ns.doc(description="Get chat conversations with pagination, filtering and summary")
     @console_ns.doc(params={"app_id": "Application ID"})
     @console_ns.expect(console_ns.models[ChatConversationQuery.__name__])
-    @console_ns.response(200, "Success", conversation_with_summary_pagination_model)
+    @console_ns.response(200, "Success", console_ns.models[ConversationWithSummaryPaginationResponse.__name__])
     @console_ns.response(403, "Insufficient permissions")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
-    @marshal_with(conversation_with_summary_pagination_model)
     @edit_permission_required
     def get(self, app_model):
         current_user, _ = current_account_with_tenant()
@@ -546,7 +312,9 @@ class ChatConversationApi(Resource):
 
         conversations = db.paginate(query, page=args.page, per_page=args.limit, error_out=False)
 
-        return conversations
+        return ConversationWithSummaryPaginationResponse.model_validate(conversations, from_attributes=True).model_dump(
+            mode="json"
+        )
 
 
 @console_ns.route("/apps/<uuid:app_id>/chat-conversations/<uuid:conversation_id>")
@@ -554,19 +322,19 @@ class ChatConversationDetailApi(Resource):
     @console_ns.doc("get_chat_conversation")
     @console_ns.doc(description="Get chat conversation details")
     @console_ns.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
-    @console_ns.response(200, "Success", conversation_detail_model)
+    @console_ns.response(200, "Success", console_ns.models[ConversationDetailResponse.__name__])
     @console_ns.response(403, "Insufficient permissions")
     @console_ns.response(404, "Conversation not found")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
-    @marshal_with(conversation_detail_model)
     @edit_permission_required
     def get(self, app_model, conversation_id):
         conversation_id = str(conversation_id)
-
-        return _get_conversation(app_model, conversation_id)
+        return ConversationDetailResponse.model_validate(
+            _get_conversation(app_model, conversation_id), from_attributes=True
+        ).model_dump(mode="json")
 
     @console_ns.doc("delete_chat_conversation")
     @console_ns.doc(description="Delete a chat conversation")
@@ -588,7 +356,7 @@ class ChatConversationDetailApi(Resource):
         except ConversationNotExistsError:
             raise NotFound("Conversation Not Exists.")
 
-        return {"result": "success"}, 204
+        return ResultResponse(result="success").model_dump(mode="json"), 204
 
 
 def _get_conversation(app_model, conversation_id):
diff --git a/api/fields/conversation_fields.py b/api/fields/conversation_fields.py
index 1afcbdb5b9..5cb1e9087c 100644
--- a/api/fields/conversation_fields.py
+++ b/api/fields/conversation_fields.py
@@ -96,7 +96,7 @@ class ConversationAnnotation(ResponseModel):
 
 
 class ConversationAnnotationHitHistory(ResponseModel):
-    annotation_id: str
+    annotation_id: str = Field(validation_alias="id")
     annotation_create_account: SimpleAccount | None = None
     created_at: int | None = None
 
@@ -143,7 +143,7 @@ class MessageDetail(ResponseModel):
     query: str
     message: JSONValue
     message_tokens: int
-    answer: str
+    answer: str = Field(validation_alias="re_sign_file_url_answer")
     answer_tokens: int
     provider_response_latency: float
     from_source: str
@@ -156,7 +156,7 @@ class MessageDetail(ResponseModel):
     created_at: int | None = None
     agent_thoughts: list[AgentThought]
     message_files: list[MessageFile]
-    metadata: JSONValue
+    metadata: JSONValue = Field(validation_alias="message_metadata_dict")
     status: str
     error: str | None = None
     parent_message_id: str | None = None
@@ -196,7 +196,7 @@ class ModelConfig(ResponseModel):
 
 
 class SimpleModelConfig(ResponseModel):
-    model: JSONValue | None = None
+    model: JSONValue | None = Field(default=None, validation_alias="model_dict")
     pre_prompt: str | None = None
 
 
@@ -211,6 +211,11 @@ class SimpleMessageDetail(ResponseModel):
     def _normalize_inputs(cls, value: JSONValue) -> JSONValue:
         return format_files_contained(value)
 
+    @field_validator("message", mode="before")
+    @classmethod
+    def _normalize_message(cls, value: JSONValue) -> str:
+        return message_text(value)
+
 
 class Conversation(ResponseModel):
     id: str
@@ -227,15 +232,22 @@ class Conversation(ResponseModel):
     model_config_: SimpleModelConfig | None = Field(default=None, alias="model_config")
     user_feedback_stats: FeedbackStat | None = None
     admin_feedback_stats: FeedbackStat | None = None
-    message: SimpleMessageDetail | None = None
+    message: SimpleMessageDetail | None = Field(default=None, validation_alias="first_message")
+
+    @field_validator("read_at", "created_at", "updated_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        if isinstance(value, datetime):
+            return to_timestamp(value)
+        return value
 
 
 class ConversationPagination(ResponseModel):
     page: int
-    limit: int
+    limit: int = Field(validation_alias="per_page")
     total: int
-    has_more: bool
-    data: list[Conversation]
+    has_more: bool = Field(validation_alias="has_next")
+    data: list[Conversation] = Field(validation_alias="items")
 
 
 class ConversationMessageDetail(ResponseModel):
@@ -246,7 +258,14 @@ class ConversationMessageDetail(ResponseModel):
     from_account_id: str | None = None
     created_at: int | None = None
     model_config_: ModelConfig | None = Field(default=None, alias="model_config")
-    message: MessageDetail | None = None
+    message: MessageDetail | None = Field(default=None, validation_alias="first_message")
+
+    @field_validator("created_at", mode="before")
+    @classmethod
+    def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
+        if isinstance(value, datetime):
+            return to_timestamp(value)
+        return value
 
 
 class ConversationWithSummary(ResponseModel):
@@ -258,7 +277,7 @@ class ConversationWithSummary(ResponseModel):
     from_account_id: str | None = None
     from_account_name: str | None = None
     name: str
-    summary: str
+    summary: str = Field(validation_alias="summary_or_query")
     read_at: int | None = None
     created_at: int | None = None
     updated_at: int | None = None
@@ -269,13 +288,20 @@ class ConversationWithSummary(ResponseModel):
     admin_feedback_stats: FeedbackStat | None = None
     status_count: StatusCount | None = None
 
+    @field_validator("read_at", "created_at", "updated_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        if isinstance(value, datetime):
+            return to_timestamp(value)
+        return value
+
 
 class ConversationWithSummaryPagination(ResponseModel):
     page: int
-    limit: int
+    limit: int = Field(validation_alias="per_page")
     total: int
-    has_more: bool
-    data: list[ConversationWithSummary]
+    has_more: bool = Field(validation_alias="has_next")
+    data: list[ConversationWithSummary] = Field(validation_alias="items")
 
 
 class ConversationDetail(ResponseModel):
@@ -293,6 +319,13 @@ class ConversationDetail(ResponseModel):
     user_feedback_stats: FeedbackStat | None = None
     admin_feedback_stats: FeedbackStat | None = None
 
+    @field_validator("created_at", "updated_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        if isinstance(value, datetime):
+            return to_timestamp(value)
+        return value
+
 
 def to_timestamp(value: datetime | None) -> int | None:
     if value is None:
diff --git a/api/tests/unit_tests/controllers/console/app/test_conversation_api.py b/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
index 11b3b3470d..24b7e39f73 100644
--- a/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
@@ -33,12 +33,17 @@ def test_completion_conversation_list_returns_paginated_result(app, monkeypatch:
     monkeypatch.setattr(conversation_module, "parse_time_range", lambda *_args, **_kwargs: (None, None))
 
     paginate_result = MagicMock()
+    paginate_result.page = 1
+    paginate_result.per_page = 20
+    paginate_result.total = 0
+    paginate_result.has_next = False
+    paginate_result.items = []
     monkeypatch.setattr(conversation_module.db, "paginate", lambda *_args, **_kwargs: paginate_result)
 
     with app.test_request_context("/console/api/apps/app-1/completion-conversations", method="GET"):
         response = method(app_model=SimpleNamespace(id="app-1"))
 
-    assert response is paginate_result
+    assert response == {"page": 1, "limit": 20, "total": 0, "has_more": False, "data": []}
 
 
 def test_completion_conversation_list_invalid_time_range(app, monkeypatch: pytest.MonkeyPatch) -> None:
@@ -71,12 +76,17 @@ def test_chat_conversation_list_advanced_chat_calls_paginate(app, monkeypatch: p
     monkeypatch.setattr(conversation_module, "parse_time_range", lambda *_args, **_kwargs: (None, None))
 
     paginate_result = MagicMock()
+    paginate_result.page = 1
+    paginate_result.per_page = 20
+    paginate_result.total = 0
+    paginate_result.has_next = False
+    paginate_result.items = []
     monkeypatch.setattr(conversation_module.db, "paginate", lambda *_args, **_kwargs: paginate_result)
 
     with app.test_request_context("/console/api/apps/app-1/chat-conversations", method="GET"):
         response = method(app_model=SimpleNamespace(id="app-1", mode=AppMode.ADVANCED_CHAT))
 
-    assert response is paginate_result
+    assert response == {"page": 1, "limit": 20, "total": 0, "has_more": False, "data": []}
 
 
 def test_get_conversation_updates_read_at(monkeypatch: pytest.MonkeyPatch) -> None:

From c661d5c43a8105d964616175368f2387d75f21cf Mon Sep 17 00:00:00 2001
From: Coding On Star <447357187@qq.com>
Date: Thu, 16 Apr 2026 13:13:17 +0800
Subject: [PATCH 11/36] refactor(web): migrate base/popoversto ui/dropdown-menu
 and ui/select (#35278)

Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
---
 .../apps/app-card-operations-flow.test.tsx    | 131 ++--
 .../header-opts/__tests__/index.spec.tsx      |   3 +-
 .../app/annotation/header-opts/index.tsx      | 253 ++++----
 .../add-member-or-group-pop.tsx               |  28 +-
 .../components/app/app-publisher/index.tsx    |  72 +--
 .../config-vision/param-config.tsx            |  36 +-
 .../app/log/__tests__/model-info.spec.tsx     |  69 ++-
 web/app/components/app/log/model-info.tsx     |  43 +-
 .../apps/__tests__/app-card.spec.tsx          | 575 ++++++++++++++----
 web/app/components/apps/app-card.tsx          | 409 ++++++++-----
 .../base/icons/src/vender/line/files/index.ts |   1 -
 .../base/popover/__tests__/index.spec.tsx     | 272 ---------
 .../components/base/popover/index.stories.tsx | 120 ----
 web/app/components/base/popover/index.tsx     | 127 ----
 .../__tests__/selector.spec.tsx               |  63 +-
 .../components/base/tag-management/panel.tsx  |   3 +-
 .../base/tag-management/selector.tsx          |  98 ++-
 .../template-card/__tests__/actions.spec.tsx  |  16 +-
 .../list/template-card/actions.tsx            |  51 +-
 .../list/template-card/operations.tsx         |  11 +-
 .../language-select/__tests__/index.spec.tsx  | 551 ++++-------------
 .../create/step-two/language-select/index.tsx |  77 ++-
 .../document-list/__tests__/index.spec.tsx    |   3 +-
 .../documents/components/operations.tsx       | 163 +++--
 .../segment-add/__tests__/index.spec.tsx      |  32 +-
 .../documents/detail/segment-add/index.tsx    |  92 +--
 .../datasets/extra-info/api-access/index.tsx  |  59 +-
 .../datasets/extra-info/service-api/index.tsx |  59 +-
 .../dataset-card/__tests__/index.spec.tsx     |   6 +-
 .../__tests__/operation-item.spec.tsx         |   5 +-
 .../__tests__/operations-dropdown.spec.tsx    |   2 +-
 .../list/dataset-card/operation-item.tsx      |   8 +-
 .../datasets/list/dataset-card/operations.tsx |  23 +-
 .../__tests__/create-metadata-modal.spec.tsx  |  65 +-
 .../__tests__/select-metadata-modal.spec.tsx  |  76 ++-
 .../create-metadata-modal.tsx                 |  28 +-
 .../select-metadata-modal.tsx                 |  40 +-
 .../__tests__/json-importer.spec.tsx          | 276 +++++++++
 .../json-importer.tsx                         |  56 +-
 .../components/add-variable/index.tsx         |  60 +-
 .../components/variable-modal-trigger.tsx     |  52 +-
 .../panel/env-panel/variable-trigger.tsx      |  52 +-
 web/docs/overlay-migration.md                 |   1 -
 web/eslint-suppressions.json                  | 100 +--
 web/eslint.constants.mjs                      |   7 -
 45 files changed, 2088 insertions(+), 2186 deletions(-)
 delete mode 100644 web/app/components/base/popover/__tests__/index.spec.tsx
 delete mode 100644 web/app/components/base/popover/index.stories.tsx
 delete mode 100644 web/app/components/base/popover/index.tsx
 create mode 100644 web/app/components/workflow/nodes/llm/components/json-schema-config-modal/__tests__/json-importer.spec.tsx

diff --git a/web/__tests__/apps/app-card-operations-flow.test.tsx b/web/__tests__/apps/app-card-operations-flow.test.tsx
index 8e45367db4..4b1c05e7ae 100644
--- a/web/__tests__/apps/app-card-operations-flow.test.tsx
+++ b/web/__tests__/apps/app-card-operations-flow.test.tsx
@@ -258,6 +258,10 @@ const renderAppCard = (app?: Partial<App>) => {
   return render(<AppCard app={createMockApp(app)} onRefresh={mockOnRefresh} />)
 }
 
+const openOperationsMenu = () => {
+  fireEvent.click(screen.getByRole('button', { name: 'common.operation.more' }))
+}
+
 describe('App Card Operations Flow', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -313,32 +317,19 @@ describe('App Card Operations Flow', () => {
     it('should show delete confirmation and call API on confirm', async () => {
       renderAppCard({ id: 'app-to-delete', name: 'Deletable App' })
 
-      // Find and click the more button (popover trigger)
-      const moreIcons = document.querySelectorAll('svg')
-      const moreFill = Array.from(moreIcons).find(svg => svg.closest('[class*="cursor-pointer"]'))
+      openOperationsMenu()
+      fireEvent.click(await screen.findByText('common.operation.delete'))
 
-      if (moreFill) {
-        const btn = moreFill.closest('[class*="cursor-pointer"]')
-        if (btn)
-          fireEvent.click(btn)
+      await waitFor(() => {
+        expect(screen.getByText('app.deleteAppConfirmTitle')).toBeInTheDocument()
+      })
 
-        await waitFor(() => {
-          const deleteBtn = screen.queryByText('common.operation.delete')
-          if (deleteBtn)
-            fireEvent.click(deleteBtn)
-        })
+      fireEvent.change(screen.getByRole('textbox'), { target: { value: 'Deletable App' } })
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
 
-        await waitFor(() => {
-          expect(screen.getByText('app.deleteAppConfirmTitle')).toBeInTheDocument()
-        })
-
-        fireEvent.change(screen.getByRole('textbox'), { target: { value: 'Deletable App' } })
-        fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
-
-        await waitFor(() => {
-          expect(mockDeleteAppMutation).toHaveBeenCalledWith('app-to-delete')
-        })
-      }
+      await waitFor(() => {
+        expect(mockDeleteAppMutation).toHaveBeenCalledWith('app-to-delete')
+      })
     })
   })
 
@@ -347,34 +338,18 @@ describe('App Card Operations Flow', () => {
     it('should open edit modal and call updateAppInfo on confirm', async () => {
       renderAppCard({ id: 'app-edit', name: 'Editable App' })
 
-      const moreIcons = document.querySelectorAll('svg')
-      const moreFill = Array.from(moreIcons).find(svg => svg.closest('[class*="cursor-pointer"]'))
+      openOperationsMenu()
+      fireEvent.click(await screen.findByText('app.editApp'))
+      fireEvent.click(await screen.findByTestId('confirm-edit'))
 
-      if (moreFill) {
-        const btn = moreFill.closest('[class*="cursor-pointer"]')
-        if (btn)
-          fireEvent.click(btn)
-
-        await waitFor(() => {
-          const editBtn = screen.queryByText('app.editApp')
-          if (editBtn)
-            fireEvent.click(editBtn)
-        })
-
-        const confirmEdit = screen.queryByTestId('confirm-edit')
-        if (confirmEdit) {
-          fireEvent.click(confirmEdit)
-
-          await waitFor(() => {
-            expect(updateAppInfo).toHaveBeenCalledWith(
-              expect.objectContaining({
-                appID: 'app-edit',
-                name: 'Updated App Name',
-              }),
-            )
-          })
-        }
-      }
+      await waitFor(() => {
+        expect(updateAppInfo).toHaveBeenCalledWith(
+          expect.objectContaining({
+            appID: 'app-edit',
+            name: 'Updated App Name',
+          }),
+        )
+      })
     })
   })
 
@@ -383,26 +358,14 @@ describe('App Card Operations Flow', () => {
     it('should call exportAppConfig for completion apps', async () => {
       renderAppCard({ id: 'app-export', mode: AppModeEnum.COMPLETION, name: 'Export App' })
 
-      const moreIcons = document.querySelectorAll('svg')
-      const moreFill = Array.from(moreIcons).find(svg => svg.closest('[class*="cursor-pointer"]'))
+      openOperationsMenu()
+      fireEvent.click(await screen.findByText('app.export'))
 
-      if (moreFill) {
-        const btn = moreFill.closest('[class*="cursor-pointer"]')
-        if (btn)
-          fireEvent.click(btn)
-
-        await waitFor(() => {
-          const exportBtn = screen.queryByText('app.export')
-          if (exportBtn)
-            fireEvent.click(exportBtn)
-        })
-
-        await waitFor(() => {
-          expect(exportAppConfig).toHaveBeenCalledWith(
-            expect.objectContaining({ appID: 'app-export' }),
-          )
-        })
-      }
+      await waitFor(() => {
+        expect(exportAppConfig).toHaveBeenCalledWith(
+          expect.objectContaining({ appID: 'app-export' }),
+        )
+      })
     })
   })
 
@@ -422,35 +385,21 @@ describe('App Card Operations Flow', () => {
     it('should show switch option for chat mode apps', async () => {
       renderAppCard({ id: 'app-switch', mode: AppModeEnum.CHAT })
 
-      const moreIcons = document.querySelectorAll('svg')
-      const moreFill = Array.from(moreIcons).find(svg => svg.closest('[class*="cursor-pointer"]'))
+      openOperationsMenu()
 
-      if (moreFill) {
-        const btn = moreFill.closest('[class*="cursor-pointer"]')
-        if (btn)
-          fireEvent.click(btn)
-
-        await waitFor(() => {
-          expect(screen.queryByText('app.switch')).toBeInTheDocument()
-        })
-      }
+      await waitFor(() => {
+        expect(screen.queryByText('app.switch')).toBeInTheDocument()
+      })
     })
 
     it('should not show switch option for workflow apps', async () => {
       renderAppCard({ id: 'app-wf', mode: AppModeEnum.WORKFLOW, name: 'WF App' })
 
-      const moreIcons = document.querySelectorAll('svg')
-      const moreFill = Array.from(moreIcons).find(svg => svg.closest('[class*="cursor-pointer"]'))
+      openOperationsMenu()
 
-      if (moreFill) {
-        const btn = moreFill.closest('[class*="cursor-pointer"]')
-        if (btn)
-          fireEvent.click(btn)
-
-        await waitFor(() => {
-          expect(screen.queryByText('app.switch')).not.toBeInTheDocument()
-        })
-      }
+      await waitFor(() => {
+        expect(screen.queryByText('app.switch')).not.toBeInTheDocument()
+      })
     })
   })
 })
diff --git a/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx b/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx
index 41e757d6d0..a4e2d98917 100644
--- a/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx
+++ b/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx
@@ -188,8 +188,7 @@ const renderComponent = (
 }
 
 const openOperationsPopover = async (user: ReturnType<typeof userEvent.setup>) => {
-  const trigger = document.querySelector('button.btn.btn-secondary') as HTMLButtonElement
-  expect(trigger).toBeTruthy()
+  const trigger = screen.getByRole('button', { name: 'common.operation.more' }) as HTMLButtonElement
   await user.click(trigger)
 }
 
diff --git a/web/app/components/app/annotation/header-opts/index.tsx b/web/app/components/app/annotation/header-opts/index.tsx
index 101898b87e..0871a722f8 100644
--- a/web/app/components/app/annotation/header-opts/index.tsx
+++ b/web/app/components/app/annotation/header-opts/index.tsx
@@ -3,21 +3,18 @@ import type { FC } from 'react'
 import type { AnnotationItemBasic } from '../type'
 import { Menu, MenuButton, MenuItems, Transition } from '@headlessui/react'
 import { cn } from '@langgenius/dify-ui/cn'
-import {
-  RiAddLine,
-  RiDeleteBinLine,
-  RiMoreFill,
-} from '@remixicon/react'
 import * as React from 'react'
 import { Fragment, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import {
   useCSVDownloader,
 } from 'react-papaparse'
-import { ChevronRight } from '@/app/components/base/icons/src/vender/line/arrows'
-import { FileDownload02, FilePlus02 } from '@/app/components/base/icons/src/vender/line/files'
-import CustomPopover from '@/app/components/base/popover'
 import { Button } from '@/app/components/base/ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger,
+} from '@/app/components/base/ui/dropdown-menu'
 import { useLocale } from '@/context/i18n'
 
 import { LanguagesSupported } from '@/i18n-config/language'
@@ -37,6 +34,120 @@ type Props = {
   controlUpdateList: number
 }
 
+type OperationsMenuProps = {
+  list: AnnotationItemBasic[]
+  onClose: () => void
+  onBulkImport: () => void
+  onClearAll: () => void
+  onExportJsonl: () => void
+}
+
+const buildAnnotationJsonlRecords = (list: AnnotationItemBasic[]) => list.map(
+  (item: AnnotationItemBasic) => {
+    return `{"messages": [{"role": "system", "content": ""}, {"role": "user", "content": ${JSON.stringify(item.question)}}, {"role": "assistant", "content": ${JSON.stringify(item.answer)}}]}`
+  },
+)
+
+const downloadAnnotationJsonl = (list: AnnotationItemBasic[], locale: string) => {
+  const content = buildAnnotationJsonlRecords(list).join('\n')
+  const file = new Blob([content], { type: 'application/jsonl' })
+  downloadBlob({ data: file, fileName: `annotations-${locale}.jsonl` })
+}
+
+const OperationsMenu: FC<OperationsMenuProps> = ({
+  list,
+  onClose,
+  onBulkImport,
+  onClearAll,
+  onExportJsonl,
+}) => {
+  const { t } = useTranslation()
+  const locale = useLocale()
+  const { CSVDownloader, Type } = useCSVDownloader()
+  const annotationUnavailable = list.length === 0
+
+  return (
+    <div className="w-full py-1">
+      <button
+        type="button"
+        className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50"
+        onClick={() => {
+          onClose()
+          onBulkImport()
+        }}
+      >
+        <span aria-hidden className="i-custom-vender-line-files-file-plus-02 h-4 w-4 text-text-tertiary" />
+        <span className="grow text-left system-sm-regular text-text-secondary">{t('table.header.bulkImport', { ns: 'appAnnotation' })}</span>
+      </button>
+      <Menu as="div" className="relative h-full w-full">
+        <MenuButton className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50">
+          <span aria-hidden className="i-custom-vender-line-files-file-download-02 h-4 w-4 text-text-tertiary" />
+          <span className="grow text-left system-sm-regular text-text-secondary">{t('table.header.bulkExport', { ns: 'appAnnotation' })}</span>
+          <span aria-hidden className="i-custom-vender-line-arrows-chevron-right h-[14px] w-[14px] shrink-0 text-text-tertiary" />
+        </MenuButton>
+        <Transition
+          as={Fragment}
+          enter="transition ease-out duration-100"
+          enterFrom="transform opacity-0 scale-95"
+          enterTo="transform opacity-100 scale-100"
+          leave="transition ease-in duration-75"
+          leaveFrom="transform opacity-100 scale-100"
+          leaveTo="transform opacity-0 scale-95"
+        >
+          <MenuItems
+            className={cn(
+              'absolute top-px left-1 z-10 min-w-[100px] origin-top-right -translate-x-full rounded-xl border-[0.5px] border-components-panel-on-panel-item-bg bg-components-panel-bg py-1 shadow-xs',
+            )}
+          >
+            <CSVDownloader
+              type={Type.Link}
+              filename={`annotations-${locale}`}
+              bom={true}
+              data={[
+                locale !== LanguagesSupported[1] ? CSV_HEADER_QA_EN : CSV_HEADER_QA_CN,
+                ...list.map(item => [item.question, item.answer]),
+              ]}
+            >
+              <button
+                type="button"
+                disabled={annotationUnavailable}
+                className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50"
+                onClick={onClose}
+              >
+                <span className="grow text-left system-sm-regular text-text-secondary">CSV</span>
+              </button>
+            </CSVDownloader>
+            <button
+              type="button"
+              disabled={annotationUnavailable}
+              className={cn('mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50', 'border-0!')}
+              onClick={() => {
+                onClose()
+                onExportJsonl()
+              }}
+            >
+              <span className="grow text-left system-sm-regular text-text-secondary">JSONL</span>
+            </button>
+          </MenuItems>
+        </Transition>
+      </Menu>
+      <button
+        type="button"
+        onClick={() => {
+          onClose()
+          onClearAll()
+        }}
+        className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 text-red-600 hover:bg-red-50 disabled:opacity-50"
+      >
+        <span aria-hidden className="i-ri-delete-bin-line h-4 w-4" />
+        <span className="grow text-left system-sm-regular">
+          {t('table.header.clearAll', { ns: 'appAnnotation' })}
+        </span>
+      </button>
+    </div>
+  )
+}
+
 const HeaderOptions: FC<Props> = ({
   appId,
   onAdd,
@@ -45,22 +156,7 @@ const HeaderOptions: FC<Props> = ({
 }) => {
   const { t } = useTranslation()
   const locale = useLocale()
-  const { CSVDownloader, Type } = useCSVDownloader()
   const [list, setList] = useState<AnnotationItemBasic[]>([])
-  const annotationUnavailable = list.length === 0
-
-  const listTransformer = (list: AnnotationItemBasic[]) => list.map(
-    (item: AnnotationItemBasic) => {
-      const dataString = `{"messages": [{"role": "system", "content": ""}, {"role": "user", "content": ${JSON.stringify(item.question)}}, {"role": "assistant", "content": ${JSON.stringify(item.answer)}}]}`
-      return dataString
-    },
-  )
-
-  const JSONLOutput = () => {
-    const content = listTransformer(list).join('\n')
-    const file = new Blob([content], { type: 'application/jsonl' })
-    downloadBlob({ data: file, fileName: `annotations-${locale}.jsonl` })
-  }
 
   const fetchList = React.useCallback(async () => {
     const { data }: any = await fetchExportAnnotationList(appId)
@@ -77,9 +173,16 @@ const HeaderOptions: FC<Props> = ({
 
   const [showBulkImportModal, setShowBulkImportModal] = useState(false)
   const [showClearConfirm, setShowClearConfirm] = useState(false)
-  const handleClearAll = () => {
+  const [isOperationsMenuOpen, setIsOperationsMenuOpen] = useState(false)
+  const handleShowBulkImportModal = React.useCallback(() => {
+    setShowBulkImportModal(true)
+  }, [])
+  const handleClearAll = React.useCallback(() => {
     setShowClearConfirm(true)
-  }
+  }, [])
+  const handleExportJsonl = React.useCallback(() => {
+    downloadAnnotationJsonl(list, locale)
+  }, [list, locale])
   const handleConfirmed = async () => {
     try {
       await clearAllAnnotations(appId)
@@ -92,92 +195,36 @@ const HeaderOptions: FC<Props> = ({
       setShowClearConfirm(false)
     }
   }
-  const Operations = () => {
-    return (
-      <div className="w-full py-1">
-        <button
-          type="button"
-          className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50"
-          onClick={() => {
-            setShowBulkImportModal(true)
-          }}
-        >
-          <FilePlus02 className="h-4 w-4 text-text-tertiary" />
-          <span className="grow text-left system-sm-regular text-text-secondary">{t('table.header.bulkImport', { ns: 'appAnnotation' })}</span>
-        </button>
-        <Menu as="div" className="relative h-full w-full">
-          <MenuButton className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50">
-            <FileDownload02 className="h-4 w-4 text-text-tertiary" />
-            <span className="grow text-left system-sm-regular text-text-secondary">{t('table.header.bulkExport', { ns: 'appAnnotation' })}</span>
-            <ChevronRight className="h-[14px] w-[14px] shrink-0 text-text-tertiary" />
-          </MenuButton>
-          <Transition
-            as={Fragment}
-            enter="transition ease-out duration-100"
-            enterFrom="transform opacity-0 scale-95"
-            enterTo="transform opacity-100 scale-100"
-            leave="transition ease-in duration-75"
-            leaveFrom="transform opacity-100 scale-100"
-            leaveTo="transform opacity-0 scale-95"
-          >
-            <MenuItems
-              className={cn(
-                'absolute top-px left-1 z-10 min-w-[100px] origin-top-right -translate-x-full rounded-xl border-[0.5px] border-components-panel-on-panel-item-bg bg-components-panel-bg py-1 shadow-xs',
-              )}
-            >
-              <CSVDownloader
-                type={Type.Link}
-                filename={`annotations-${locale}`}
-                bom={true}
-                data={[
-                  locale !== LanguagesSupported[1] ? CSV_HEADER_QA_EN : CSV_HEADER_QA_CN,
-                  ...list.map(item => [item.question, item.answer]),
-                ]}
-              >
-                <button type="button" disabled={annotationUnavailable} className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50">
-                  <span className="grow text-left system-sm-regular text-text-secondary">CSV</span>
-                </button>
-              </CSVDownloader>
-              <button type="button" disabled={annotationUnavailable} className={cn('mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50', 'border-0!')} onClick={JSONLOutput}>
-                <span className="grow text-left system-sm-regular text-text-secondary">JSONL</span>
-              </button>
-            </MenuItems>
-          </Transition>
-        </Menu>
-        <button
-          type="button"
-          onClick={handleClearAll}
-          className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 text-red-600 hover:bg-red-50 disabled:opacity-50"
-        >
-          <RiDeleteBinLine className="h-4 w-4" />
-          <span className="grow text-left system-sm-regular">
-            {t('table.header.clearAll', { ns: 'appAnnotation' })}
-          </span>
-        </button>
-      </div>
-    )
-  }
 
   const [showAddModal, setShowAddModal] = React.useState(false)
 
   return (
     <div className="flex space-x-2">
       <Button variant="primary" onClick={() => setShowAddModal(true)}>
-        <RiAddLine className="mr-0.5 h-4 w-4" />
+        <span aria-hidden className="mr-0.5 i-ri-add-line h-4 w-4" />
         <div>{t('table.header.addAnnotation', { ns: 'appAnnotation' })}</div>
       </Button>
-      <CustomPopover
-        htmlContent={<Operations />}
-        position="br"
-        trigger="click"
-        btnElement={
-          <RiMoreFill className="h-4 w-4" />
-        }
-        btnClassName="btn btn-secondary btn-medium w-8 p-0"
-        className="z-20! h-fit w-[155px]!"
-        popupClassName="w-full! overflow-visible!"
-        manualClose
-      />
+      <DropdownMenu open={isOperationsMenuOpen} onOpenChange={setIsOperationsMenuOpen}>
+        <DropdownMenuTrigger
+          aria-label={t('operation.more', { ns: 'common' })}
+          className="mr-0 box-border inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg p-0 text-components-button-secondary-text shadow-xs backdrop-blur-[5px] hover:border-components-button-secondary-border-hover hover:bg-components-button-secondary-bg-hover data-popup-open:border-components-button-secondary-border-hover data-popup-open:bg-components-button-secondary-bg-hover"
+        >
+          <span aria-hidden className="i-ri-more-fill h-4 w-4" />
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          placement="bottom-end"
+          sideOffset={4}
+          popupClassName="w-[155px] overflow-visible py-0"
+        >
+          <OperationsMenu
+            list={list}
+            onClose={() => setIsOperationsMenuOpen(false)}
+            onBulkImport={handleShowBulkImportModal}
+            onClearAll={handleClearAll}
+            onExportJsonl={handleExportJsonl}
+          />
+        </DropdownMenuContent>
+      </DropdownMenu>
       {showAddModal && (
         <AddAnnotationModal
           isShow={showAddModal}
diff --git a/web/app/components/app/app-access-control/add-member-or-group-pop.tsx b/web/app/components/app/app-access-control/add-member-or-group-pop.tsx
index f457e3a2c4..125a4865a7 100644
--- a/web/app/components/app/app-access-control/add-member-or-group-pop.tsx
+++ b/web/app/components/app/app-access-control/add-member-or-group-pop.tsx
@@ -8,6 +8,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Avatar } from '@/app/components/base/ui/avatar'
 import { Button } from '@/app/components/base/ui/button'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import { useSelector } from '@/context/app-context'
 import { SubjectType } from '@/models/access-control'
 import { useSearchForWhiteListCandidates } from '@/service/access-control'
@@ -15,7 +16,6 @@ import useAccessControlStore from '../../../../context/access-control-store'
 import Checkbox from '../../base/checkbox'
 import Input from '../../base/input'
 import Loading from '../../base/loading'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '../../base/portal-to-follow-elem'
 
 export default function AddMemberOrGroupDialog() {
   const { t } = useTranslation()
@@ -45,15 +45,21 @@ export default function AddMemberOrGroupDialog() {
   }, [isLoading, fetchNextPage, anchorRef, data])
 
   return (
-    <PortalToFollowElem open={open} onOpenChange={setOpen} offset={{ crossAxis: 300 }} placement="bottom-end">
-      <PortalToFollowElemTrigger asChild>
-        <Button variant="ghost-accent" size="small" className="flex shrink-0 items-center gap-x-0.5" onClick={() => setOpen(!open)}>
-          <RiAddCircleFill className="h-4 w-4" />
-          <span>{t('operation.add', { ns: 'common' })}</span>
-        </Button>
-      </PortalToFollowElemTrigger>
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger
+        render={(
+          <Button variant="ghost-accent" size="small" className="flex shrink-0 items-center gap-x-0.5">
+            <RiAddCircleFill className="h-4 w-4" />
+            <span>{t('operation.add', { ns: 'common' })}</span>
+          </Button>
+        )}
+      />
       {open && <FloatingOverlay />}
-      <PortalToFollowElemContent className="z-100">
+      <PopoverContent
+        placement="bottom-end"
+        alignOffset={300}
+        popupClassName="border-none bg-transparent shadow-none"
+      >
         <div className="relative flex max-h-[400px] w-[400px] flex-col overflow-y-auto rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[5px]">
           <div className="sticky top-0 z-10 bg-components-panel-bg-blur p-2 pb-0.5 backdrop-blur-[5px]">
             <Input value={keyword} onChange={handleKeywordChange} showLeftIcon placeholder={t('accessControlDialog.operateGroupAndMember.searchPlaceholder', { ns: 'app' }) as string} />
@@ -81,8 +87,8 @@ export default function AddMemberOrGroupDialog() {
                     )
           }
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/app/app-publisher/index.tsx b/web/app/components/app/app-publisher/index.tsx
index 07bd04b954..6738860298 100644
--- a/web/app/components/app/app-publisher/index.tsx
+++ b/web/app/components/app/app-publisher/index.tsx
@@ -15,12 +15,8 @@ import { useTranslation } from 'react-i18next'
 import EmbeddedModal from '@/app/components/app/overview/embedded'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import { trackEvent } from '@/app/components/base/amplitude'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { Button } from '@/app/components/base/ui/button'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import { collaborationManager } from '@/app/components/workflow/collaboration/core/collaboration-manager'
 import { webSocketClient } from '@/app/components/workflow/collaboration/core/websocket-manager'
 import { WorkflowContext } from '@/app/components/workflow/context'
@@ -182,20 +178,18 @@ const AppPublisher = ({
     catch { }
   }, [onRestore])
 
-  const handleTrigger = useCallback(() => {
-    const state = !open
-
+  const handleOpenChange = useCallback((nextOpen: boolean) => {
     if (disabled) {
       setOpen(false)
       return
     }
 
-    onToggle?.(state)
-    setOpen(state)
+    onToggle?.(nextOpen)
+    setOpen(nextOpen)
 
-    if (state)
+    if (nextOpen)
       setPublished(false)
-  }, [disabled, onToggle, open])
+  }, [disabled, onToggle])
 
   const handleOpenInExplore = useCallback(async () => {
     await openAsyncWindow(async () => {
@@ -267,26 +261,28 @@ const AppPublisher = ({
 
   return (
     <>
-      <PortalToFollowElem
+      <Popover
         open={open}
-        onOpenChange={setOpen}
-        placement="bottom-end"
-        offset={{
-          mainAxis: 4,
-          crossAxis: crossAxisOffset,
-        }}
+        onOpenChange={handleOpenChange}
       >
-        <PortalToFollowElemTrigger onClick={handleTrigger}>
-          <Button
-            variant="primary"
-            className="py-2 pr-2 pl-3"
-            disabled={disabled}
-          >
-            {t('common.publish', { ns: 'workflow' })}
-            <span className="i-ri-arrow-down-s-line h-4 w-4 text-components-button-primary-text" />
-          </Button>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent className="z-11">
+        <PopoverTrigger
+          render={(
+            <Button
+              variant="primary"
+              className="py-2 pr-2 pl-3"
+              disabled={disabled}
+            >
+              {t('common.publish', { ns: 'workflow' })}
+              <span className="i-ri-arrow-down-s-line h-4 w-4 text-components-button-primary-text" />
+            </Button>
+          )}
+        />
+        <PopoverContent
+          placement="bottom-end"
+          sideOffset={4}
+          alignOffset={crossAxisOffset}
+          popupClassName="border-none bg-transparent shadow-none"
+        >
           <div className="w-[320px] rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xl shadow-shadow-shadow-5">
             <PublisherSummarySection
               debugWithMultipleModel={debugWithMultipleModel}
@@ -308,7 +304,10 @@ const AppPublisher = ({
               isAppAccessSet={isAppAccessSet}
               isLoading={Boolean(systemFeatures.webapp_auth.enabled && (isGettingUserCanAccessApp || isGettingAppWhiteListSubjects))}
               accessMode={appDetail?.access_mode}
-              onClick={() => setShowAppAccessControl(true)}
+              onClick={() => {
+                handleOpenChange(false)
+                setShowAppAccessControl(true)
+              }}
             />
             <PublisherActionsSection
               appDetail={appDetail}
@@ -317,9 +316,12 @@ const AppPublisher = ({
               disabledFunctionTooltip={disabledFunctionTooltip}
               handleEmbed={() => {
                 setEmbeddingModalOpen(true)
-                handleTrigger()
+                handleOpenChange(false)
+              }}
+              handleOpenInExplore={() => {
+                handleOpenChange(false)
+                handleOpenInExplore()
               }}
-              handleOpenInExplore={handleOpenInExplore}
               handlePublish={handlePublish}
               hasHumanInputNode={hasHumanInputNode}
               hasTriggerNode={hasTriggerNode}
@@ -334,7 +336,7 @@ const AppPublisher = ({
               workflowToolMessage={workflowToolMessage}
             />
           </div>
-        </PortalToFollowElemContent>
+        </PopoverContent>
         <EmbeddedModal
           siteInfo={appDetail?.site}
           isShow={embeddingModalOpen}
@@ -343,7 +345,7 @@ const AppPublisher = ({
           accessToken={accessToken}
         />
         {showAppAccessControl && <AccessControl app={appDetail!} onConfirm={handleAccessControlUpdate} onClose={() => { setShowAppAccessControl(false) }} />}
-      </PortalToFollowElem>
+      </Popover>
     </>
   )
 }
diff --git a/web/app/components/app/configuration/config-vision/param-config.tsx b/web/app/components/app/configuration/config-vision/param-config.tsx
index ded130ba7a..3be4c60aa9 100644
--- a/web/app/components/app/configuration/config-vision/param-config.tsx
+++ b/web/app/components/app/configuration/config-vision/param-config.tsx
@@ -4,12 +4,8 @@ import { cn } from '@langgenius/dify-ui/cn'
 import { RiSettings2Line } from '@remixicon/react'
 import { memo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { Button } from '@/app/components/base/ui/button'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import ParamConfigContent from './param-config-content'
 
 const ParamsConfig: FC = () => {
@@ -17,26 +13,28 @@ const ParamsConfig: FC = () => {
   const [open, setOpen] = useState(false)
 
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
       onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={{
-        mainAxis: 4,
-      }}
     >
-      <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
-        <Button variant="ghost" size="small" className={cn('')}>
-          <RiSettings2Line className="h-3.5 w-3.5" />
-          <div className="ml-1">{t('voice.settings', { ns: 'appDebug' })}</div>
-        </Button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent style={{ zIndex: 50 }}>
+      <PopoverTrigger
+        render={(
+          <Button variant="ghost" size="small" className={cn('')}>
+            <RiSettings2Line className="h-3.5 w-3.5" />
+            <div className="ml-1">{t('voice.settings', { ns: 'appDebug' })}</div>
+          </Button>
+        )}
+      />
+      <PopoverContent
+        placement="bottom-end"
+        sideOffset={4}
+        popupClassName="border-none bg-transparent shadow-none"
+      >
         <div className="w-80 space-y-3 rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg p-4 shadow-lg sm:w-[412px]">
           <ParamConfigContent />
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 export default memo(ParamsConfig)
diff --git a/web/app/components/app/log/__tests__/model-info.spec.tsx b/web/app/components/app/log/__tests__/model-info.spec.tsx
index 3b62406758..f41aaf4c00 100644
--- a/web/app/components/app/log/__tests__/model-info.spec.tsx
+++ b/web/app/components/app/log/__tests__/model-info.spec.tsx
@@ -34,17 +34,41 @@ vi.mock('@/app/components/header/account-setting/model-provider-page/model-name'
   ),
 }))
 
-vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
-  PortalToFollowElem: ({ children, open }: { children: React.ReactNode, open: boolean }) => (
-    <div data-testid="portal-elem" data-open={open ? 'true' : 'false'}>{children}</div>
-  ),
-  PortalToFollowElemTrigger: ({ children, onClick }: { children: React.ReactNode, onClick: () => void }) => (
-    <div data-testid="portal-trigger" onClick={onClick}>{children}</div>
-  ),
-  PortalToFollowElemContent: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="portal-content">{children}</div>
-  ),
-}))
+vi.mock('@/app/components/base/ui/popover', async () => {
+  const React = await import('react')
+  const PopoverContext = React.createContext<{ open: boolean, onOpenChange?: (open: boolean) => void } | null>(null)
+
+  return {
+    Popover: ({ children, open, onOpenChange }: { children: React.ReactNode, open: boolean, onOpenChange?: (open: boolean) => void }) => (
+      <PopoverContext.Provider value={{ open, onOpenChange }}>
+        <div data-testid="popover-root" data-open={open ? 'true' : 'false'}>
+          {children}
+        </div>
+      </PopoverContext.Provider>
+    ),
+    PopoverTrigger: ({ children, render }: { children?: React.ReactNode, render?: React.ReactNode }) => {
+      const context = React.useContext(PopoverContext)
+      const content = render ?? children
+      const handleClick = () => {
+        context?.onOpenChange?.(!context.open)
+      }
+
+      if (React.isValidElement(content)) {
+        const element = content as React.ReactElement<{ onClick?: () => void }>
+        return React.cloneElement(element, { onClick: handleClick })
+      }
+
+      return <button type="button" data-testid="popover-trigger" onClick={handleClick}>{content}</button>
+    },
+    PopoverContent: ({ children }: { children: React.ReactNode }) => {
+      const context = React.useContext(PopoverContext)
+      if (!context?.open)
+        return null
+
+      return <div data-testid="popover-content">{children}</div>
+    },
+  }
+})
 
 describe('ModelInfo', () => {
   const defaultModel = {
@@ -92,42 +116,46 @@ describe('ModelInfo', () => {
     it('should be closed by default', () => {
       render(<ModelInfo model={defaultModel} />)
 
-      expect(screen.getByTestId('portal-elem')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'false')
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
     })
 
     it('should open when info button is clicked', () => {
       render(<ModelInfo model={defaultModel} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByRole('button')
       fireEvent.click(trigger)
 
-      expect(screen.getByTestId('portal-elem')).toHaveAttribute('data-open', 'true')
+      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'true')
+      expect(screen.getByTestId('popover-content')).toBeInTheDocument()
     })
 
     it('should close when info button is clicked again', () => {
       render(<ModelInfo model={defaultModel} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByRole('button')
 
       // Open
       fireEvent.click(trigger)
-      expect(screen.getByTestId('portal-elem')).toHaveAttribute('data-open', 'true')
+      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'true')
 
       // Close
       fireEvent.click(trigger)
-      expect(screen.getByTestId('portal-elem')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'false')
     })
   })
 
   describe('Model Parameters Display', () => {
     it('should render model params header', () => {
       render(<ModelInfo model={defaultModel} />)
+      fireEvent.click(screen.getByRole('button'))
 
       expect(screen.getByText('detail.modelParams')).toBeInTheDocument()
     })
 
     it('should render temperature parameter', () => {
       render(<ModelInfo model={defaultModel} />)
+      fireEvent.click(screen.getByRole('button'))
 
       expect(screen.getByText('Temperature')).toBeInTheDocument()
       expect(screen.getByText('0.7')).toBeInTheDocument()
@@ -135,6 +163,7 @@ describe('ModelInfo', () => {
 
     it('should render top_p parameter', () => {
       render(<ModelInfo model={defaultModel} />)
+      fireEvent.click(screen.getByRole('button'))
 
       expect(screen.getByText('Top P')).toBeInTheDocument()
       expect(screen.getByText('0.9')).toBeInTheDocument()
@@ -142,6 +171,7 @@ describe('ModelInfo', () => {
 
     it('should render presence_penalty parameter', () => {
       render(<ModelInfo model={defaultModel} />)
+      fireEvent.click(screen.getByRole('button'))
 
       expect(screen.getByText('Presence Penalty')).toBeInTheDocument()
       expect(screen.getByText('0.1')).toBeInTheDocument()
@@ -149,6 +179,7 @@ describe('ModelInfo', () => {
 
     it('should render max_tokens parameter', () => {
       render(<ModelInfo model={defaultModel} />)
+      fireEvent.click(screen.getByRole('button'))
 
       expect(screen.getByText('Max Token')).toBeInTheDocument()
       expect(screen.getByText('2048')).toBeInTheDocument()
@@ -156,6 +187,7 @@ describe('ModelInfo', () => {
 
     it('should render stop parameter as comma-separated values', () => {
       render(<ModelInfo model={defaultModel} />)
+      fireEvent.click(screen.getByRole('button'))
 
       expect(screen.getByText('Stop')).toBeInTheDocument()
       expect(screen.getByText('END')).toBeInTheDocument()
@@ -171,6 +203,7 @@ describe('ModelInfo', () => {
       }
 
       render(<ModelInfo model={modelWithNoParams} />)
+      fireEvent.click(screen.getByRole('button'))
 
       const dashes = screen.getAllByText('-')
       expect(dashes.length).toBeGreaterThan(0)
@@ -186,6 +219,7 @@ describe('ModelInfo', () => {
       }
 
       render(<ModelInfo model={modelWithInvalidStop} />)
+      fireEvent.click(screen.getByRole('button'))
 
       const stopValues = screen.getAllByText('-')
       expect(stopValues.length).toBeGreaterThan(0)
@@ -201,6 +235,7 @@ describe('ModelInfo', () => {
       }
 
       render(<ModelInfo model={modelWithMultipleStops} />)
+      fireEvent.click(screen.getByRole('button'))
 
       expect(screen.getByText('END,STOP,DONE')).toBeInTheDocument()
     })
diff --git a/web/app/components/app/log/model-info.tsx b/web/app/components/app/log/model-info.tsx
index 5fe0eb590b..e768f30a50 100644
--- a/web/app/components/app/log/model-info.tsx
+++ b/web/app/components/app/log/model-info.tsx
@@ -6,11 +6,7 @@ import {
 } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import { useTextGenerationCurrentProviderAndModelAndModelList } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import ModelIcon from '@/app/components/header/account-setting/model-provider-page/model-icon'
 import ModelName from '@/app/components/header/account-setting/model-provider-page/model-name'
@@ -68,26 +64,29 @@ const ModelInfo: FC<Props> = ({
           showMode
         />
       </div>
-      <PortalToFollowElem
+      <Popover
         open={open}
         onOpenChange={setOpen}
-        placement="bottom-end"
-        offset={4}
       >
         <div className="relative">
-          <PortalToFollowElemTrigger
-            onClick={() => setOpen(v => !v)}
-            className="block"
-          >
-            <div className={cn(
-              'cursor-pointer rounded-r-lg bg-components-button-tertiary-bg p-2 hover:bg-components-button-tertiary-bg-hover',
-              open && 'bg-components-button-tertiary-bg-hover',
+          <PopoverTrigger
+            render={(
+              <button type="button" className="block border-none bg-transparent p-0">
+                <div className={cn(
+                  'cursor-pointer rounded-r-lg bg-components-button-tertiary-bg p-2 hover:bg-components-button-tertiary-bg-hover',
+                  open && 'bg-components-button-tertiary-bg-hover',
+                )}
+                >
+                  <RiInformation2Line className="h-4 w-4 text-text-tertiary" />
+                </div>
+              </button>
             )}
-            >
-              <RiInformation2Line className="h-4 w-4 text-text-tertiary" />
-            </div>
-          </PortalToFollowElemTrigger>
-          <PortalToFollowElemContent className="z-1002">
+          />
+          <PopoverContent
+            placement="bottom-end"
+            sideOffset={4}
+            popupClassName="border-none bg-transparent shadow-none"
+          >
             <div className="relative w-[280px] overflow-hidden rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg px-4 pt-3 pb-2 shadow-xl">
               <div className="mb-1 h-6 system-sm-semibold-uppercase text-text-secondary">{t('detail.modelParams', { ns: 'appLog' })}</div>
               <div className="py-1">
@@ -101,9 +100,9 @@ const ModelInfo: FC<Props> = ({
                 })}
               </div>
             </div>
-          </PortalToFollowElemContent>
+          </PopoverContent>
         </div>
-      </PortalToFollowElem>
+      </Popover>
     </div>
   )
 }
diff --git a/web/app/components/apps/__tests__/app-card.spec.tsx b/web/app/components/apps/__tests__/app-card.spec.tsx
index f3ae07eb79..2d01dfb320 100644
--- a/web/app/components/apps/__tests__/app-card.spec.tsx
+++ b/web/app/components/apps/__tests__/app-card.spec.tsx
@@ -133,6 +133,7 @@ vi.mock('@/utils/time', () => ({
 // Mock dynamic imports
 vi.mock('@/next/dynamic', () => ({
   default: (importFn: () => Promise<unknown>) => {
+    void importFn().catch(() => {})
     const fnString = importFn.toString()
 
     if (fnString.includes('create-app-modal') || fnString.includes('explore/create-app-modal')) {
@@ -189,22 +190,107 @@ vi.mock('@/next/dynamic', () => ({
   },
 }))
 
-// Popover uses @headlessui/react portals - mock for controlled interaction testing
-vi.mock('@/app/components/base/popover', () => {
-  type PopoverHtmlContent = React.ReactNode | ((state: { open: boolean, onClose: () => void, onClick: () => void }) => React.ReactNode)
-  type MockPopoverProps = { htmlContent: PopoverHtmlContent, btnElement: React.ReactNode, btnClassName?: string | ((open: boolean) => string) }
-  const MockPopover = ({ htmlContent, btnElement, btnClassName }: MockPopoverProps) => {
-    const [isOpen, setIsOpen] = React.useState(false)
-    const computedClassName = typeof btnClassName === 'function' ? btnClassName(isOpen) : ''
-    return React.createElement('div', { 'data-testid': 'custom-popover', 'className': computedClassName }, React.createElement('div', {
-      'onClick': () => setIsOpen(!isOpen),
-      'data-testid': 'popover-trigger',
-    }, btnElement), isOpen && React.createElement('div', {
-      'data-testid': 'popover-content',
-      'onMouseLeave': () => setIsOpen(false),
-    }, typeof htmlContent === 'function' ? htmlContent({ open: isOpen, onClose: () => setIsOpen(false), onClick: () => setIsOpen(false) }) : htmlContent))
+vi.mock('@/app/components/base/ui/dropdown-menu', () => {
+  type DropdownMenuContextValue = {
+    isOpen: boolean
+    setOpen: (open: boolean) => void
+  }
+  const DropdownMenuContext = React.createContext<DropdownMenuContextValue | null>(null)
+
+  const useDropdownMenuContext = () => {
+    const context = React.use(DropdownMenuContext)
+    if (!context)
+      throw new Error('DropdownMenu components must be wrapped in DropdownMenu')
+    return context
+  }
+
+  return {
+    DropdownMenu: ({
+      children,
+      open = false,
+      onOpenChange,
+    }: {
+      children: React.ReactNode
+      open?: boolean
+      onOpenChange?: (open: boolean) => void
+    }) => (
+      <DropdownMenuContext value={{ isOpen: open, setOpen: onOpenChange ?? vi.fn() }}>
+        <div data-testid="dropdown-menu" data-open={open}>
+          {children}
+        </div>
+      </DropdownMenuContext>
+    ),
+    DropdownMenuTrigger: ({
+      children,
+      className,
+      onClick,
+      ...props
+    }: React.ButtonHTMLAttributes<HTMLButtonElement>) => {
+      const { isOpen, setOpen } = useDropdownMenuContext()
+      return (
+        <button
+          data-testid="dropdown-menu-trigger"
+          type="button"
+          className={className}
+          onClick={(e) => {
+            onClick?.(e)
+            setOpen(!isOpen)
+          }}
+          {...props}
+        >
+          {children}
+        </button>
+      )
+    },
+    DropdownMenuContent: ({
+      children,
+      className,
+      popupClassName,
+    }: {
+      children: React.ReactNode
+      className?: string
+      popupClassName?: string
+    }) => {
+      const { isOpen } = useDropdownMenuContext()
+      if (!isOpen)
+        return null
+
+      return (
+        <div data-testid="dropdown-menu-content" role="menu" className={[className, popupClassName].filter(Boolean).join(' ')}>
+          {children}
+        </div>
+      )
+    },
+    DropdownMenuItem: ({
+      children,
+      className,
+      onClick,
+      destructive,
+    }: {
+      children: React.ReactNode
+      className?: string
+      onClick?: React.MouseEventHandler<HTMLButtonElement>
+      destructive?: boolean
+    }) => {
+      const { setOpen } = useDropdownMenuContext()
+      return (
+        <button
+          data-testid="dropdown-menu-item"
+          role="menuitem"
+          type="button"
+          className={className}
+          data-destructive={destructive}
+          onClick={(e) => {
+            onClick?.(e)
+            setOpen(false)
+          }}
+        >
+          {children}
+        </button>
+      )
+    },
+    DropdownMenuSeparator: () => <hr data-testid="dropdown-menu-separator" />,
   }
-  return { __esModule: true, default: MockPopover }
 })
 
 // Tooltip uses portals - minimal mock preserving popup content as title attribute
@@ -285,9 +371,9 @@ describe('AppCard', () => {
     it('should render app icon', () => {
       // AppIcon component renders the emoji icon from app data
       const { container } = render(<AppCard app={mockApp} />)
-      // Check that the icon container is rendered (AppIcon renders within the card)
-      const iconElement = container.querySelector('[class*="icon"]') || container.querySelector('img')
-      expect(iconElement || screen.getByText(mockApp.icon)).toBeTruthy()
+      const emojiIcon = container.querySelector(`em-emoji[id="${mockApp.icon}"]`)
+      const imageIcon = container.querySelector('img')
+      expect(emojiIcon || imageIcon).toBeTruthy()
     })
 
     it('should render app type icon', () => {
@@ -370,45 +456,45 @@ describe('AppCard', () => {
   })
 
   describe('Operations Menu', () => {
-    it('should render operations popover', () => {
+    it('should render operations dropdown menu', () => {
       render(<AppCard app={mockApp} />)
-      expect(screen.getByTestId('custom-popover')).toBeInTheDocument()
+      expect(screen.getByTestId('dropdown-menu')).toBeInTheDocument()
     })
 
-    it('should show edit option when popover is opened', async () => {
+    it('should show edit option when dropdown menu is opened', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         expect(screen.getByText('app.editApp')).toBeInTheDocument()
       })
     })
 
-    it('should show duplicate option when popover is opened', async () => {
+    it('should show duplicate option when dropdown menu is opened', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         expect(screen.getByText('app.duplicate')).toBeInTheDocument()
       })
     })
 
-    it('should show export option when popover is opened', async () => {
+    it('should show export option when dropdown menu is opened', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         expect(screen.getByText('app.export')).toBeInTheDocument()
       })
     })
 
-    it('should show delete option when popover is opened', async () => {
+    it('should show delete option when dropdown menu is opened', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         expect(screen.getByText('common.operation.delete')).toBeInTheDocument()
@@ -419,7 +505,7 @@ describe('AppCard', () => {
       const chatApp = { ...mockApp, mode: AppModeEnum.CHAT }
       render(<AppCard app={chatApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         expect(screen.getByText(/switch/i)).toBeInTheDocument()
@@ -430,7 +516,7 @@ describe('AppCard', () => {
       const completionApp = { ...mockApp, mode: AppModeEnum.COMPLETION }
       render(<AppCard app={completionApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         expect(screen.getByText(/switch/i)).toBeInTheDocument()
@@ -441,7 +527,7 @@ describe('AppCard', () => {
       const workflowApp = { ...mockApp, mode: AppModeEnum.WORKFLOW }
       render(<AppCard app={workflowApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         expect(screen.queryByText(/switch/i)).not.toBeInTheDocument()
@@ -453,7 +539,7 @@ describe('AppCard', () => {
     it('should open edit modal when edit button is clicked', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         const editButton = screen.getByText('app.editApp')
@@ -468,7 +554,7 @@ describe('AppCard', () => {
     it('should open duplicate modal when duplicate button is clicked', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         const duplicateButton = screen.getByText('app.duplicate')
@@ -483,16 +569,16 @@ describe('AppCard', () => {
     it('should open confirm dialog when delete button is clicked', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
-      fireEvent.click(await screen.findByRole('button', { name: 'common.operation.delete' }))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
       expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
     })
 
     it('should close confirm dialog when cancel is clicked', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
-      fireEvent.click(await screen.findByRole('button', { name: 'common.operation.delete' }))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
       expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
       await waitFor(() => {
@@ -500,10 +586,23 @@ describe('AppCard', () => {
       })
     })
 
+    it('should not submit delete when confirmation text does not match', async () => {
+      render(<AppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
+
+      const form = (await screen.findByRole('alertdialog')).querySelector('form')
+      expect(form).toBeTruthy()
+      fireEvent.submit(form!)
+
+      expect(mockDeleteAppMutation).not.toHaveBeenCalled()
+    })
+
     it('should close edit modal when onHide is called', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.editApp'))
       })
@@ -523,7 +622,7 @@ describe('AppCard', () => {
     it('should close duplicate modal when onHide is called', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.duplicate'))
       })
@@ -539,6 +638,28 @@ describe('AppCard', () => {
         expect(screen.queryByTestId('duplicate-modal')).not.toBeInTheDocument()
       })
     })
+
+    it('should clear delete confirmation input after closing the dialog', async () => {
+      render(<AppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
+
+      const deleteInput = await screen.findByRole('textbox')
+      fireEvent.change(deleteInput, { target: { value: 'partial name' } })
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
+
+      await waitFor(() => {
+        expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()
+      })
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
+
+      await waitFor(() => {
+        expect(screen.getByRole('textbox')).toHaveValue('')
+      })
+    })
   })
 
   describe('Styling', () => {
@@ -559,9 +680,9 @@ describe('AppCard', () => {
     it('should call deleteApp API when confirming delete', async () => {
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      // Open popover and click delete
-      fireEvent.click(screen.getByTestId('popover-trigger'))
-      fireEvent.click(await screen.findByRole('button', { name: 'common.operation.delete' }))
+      // Open dropdown menu and click delete
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
       expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
 
       // Fill in the confirmation input with app name
@@ -578,8 +699,8 @@ describe('AppCard', () => {
     it('should not call onRefresh after successful delete', async () => {
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
-      fireEvent.click(await screen.findByRole('button', { name: 'common.operation.delete' }))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
       expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
 
       // Fill in the confirmation input with app name
@@ -599,8 +720,8 @@ describe('AppCard', () => {
 
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
-      fireEvent.click(await screen.findByRole('button', { name: 'common.operation.delete' }))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
       expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
 
       // Fill in the confirmation input with app name
@@ -615,10 +736,28 @@ describe('AppCard', () => {
       })
     })
 
+    it('should handle delete failure without an error message', async () => {
+      ;(mockDeleteAppMutation as Mock).mockRejectedValueOnce({})
+
+      render(<AppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
+      expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
+
+      fireEvent.change(screen.getByRole('textbox'), { target: { value: mockApp.name } })
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
+
+      await waitFor(() => {
+        expect(mockDeleteAppMutation).toHaveBeenCalled()
+        expect(toastMocks.record).toHaveBeenCalledWith({ type: 'error', message: 'app.appDeleteFailed' })
+      })
+    })
+
     it('should call updateAppInfo API when editing app', async () => {
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.editApp'))
       })
@@ -634,10 +773,30 @@ describe('AppCard', () => {
       })
     })
 
+    it('should edit successfully without onRefresh callback', async () => {
+      render(<AppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('app.editApp'))
+      })
+
+      await waitFor(() => {
+        expect(screen.getByTestId('edit-app-modal')).toBeInTheDocument()
+      })
+
+      fireEvent.click(screen.getByTestId('confirm-edit-modal'))
+
+      await waitFor(() => {
+        expect(appsService.updateAppInfo).toHaveBeenCalled()
+        expect(screen.queryByTestId('edit-app-modal')).not.toBeInTheDocument()
+      })
+    })
+
     it('should call copyApp API when duplicating app', async () => {
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.duplicate'))
       })
@@ -656,7 +815,7 @@ describe('AppCard', () => {
     it('should call onPlanInfoChanged after successful duplication', async () => {
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.duplicate'))
       })
@@ -672,12 +831,33 @@ describe('AppCard', () => {
       })
     })
 
+    it('should duplicate successfully without onRefresh callback', async () => {
+      render(<AppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('app.duplicate'))
+      })
+
+      await waitFor(() => {
+        expect(screen.getByTestId('duplicate-modal')).toBeInTheDocument()
+      })
+
+      fireEvent.click(screen.getByTestId('confirm-duplicate-modal'))
+
+      await waitFor(() => {
+        expect(appsService.copyApp).toHaveBeenCalled()
+        expect(mockOnPlanInfoChanged).toHaveBeenCalled()
+        expect(screen.queryByTestId('duplicate-modal')).not.toBeInTheDocument()
+      })
+    })
+
     it('should handle copy failure', async () => {
       (appsService.copyApp as Mock).mockRejectedValueOnce(new Error('Copy failed'))
 
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.duplicate'))
       })
@@ -697,7 +877,7 @@ describe('AppCard', () => {
     it('should call exportAppConfig API when exporting', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.export'))
       })
@@ -712,7 +892,7 @@ describe('AppCard', () => {
 
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.export'))
       })
@@ -729,7 +909,7 @@ describe('AppCard', () => {
       const chatApp = { ...mockApp, mode: AppModeEnum.CHAT }
       render(<AppCard app={chatApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.switch'))
       })
@@ -743,7 +923,7 @@ describe('AppCard', () => {
       const chatApp = { ...mockApp, mode: AppModeEnum.CHAT }
       render(<AppCard app={chatApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.switch'))
       })
@@ -763,7 +943,7 @@ describe('AppCard', () => {
       const chatApp = { ...mockApp, mode: AppModeEnum.CHAT }
       render(<AppCard app={chatApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.switch'))
       })
@@ -779,11 +959,31 @@ describe('AppCard', () => {
       })
     })
 
+    it('should close switch modal after success without onRefresh callback', async () => {
+      const chatApp = { ...mockApp, mode: AppModeEnum.CHAT }
+      render(<AppCard app={chatApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('app.switch'))
+      })
+
+      await waitFor(() => {
+        expect(screen.getByTestId('switch-modal')).toBeInTheDocument()
+      })
+
+      fireEvent.click(screen.getByTestId('confirm-switch-modal'))
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('switch-modal')).not.toBeInTheDocument()
+      })
+    })
+
     it('should open switch modal for completion mode apps', async () => {
       const completionApp = { ...mockApp, mode: AppModeEnum.COMPLETION }
       render(<AppCard app={completionApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.switch'))
       })
@@ -795,10 +995,10 @@ describe('AppCard', () => {
   })
 
   describe('Open in Explore', () => {
-    it('should show open in explore option when popover is opened', async () => {
+    it('should show open in explore option when dropdown menu is opened', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
 
       await waitFor(() => {
         expect(screen.getByText('app.openInExplore')).toBeInTheDocument()
@@ -811,7 +1011,7 @@ describe('AppCard', () => {
       const workflowApp = { ...mockApp, mode: AppModeEnum.WORKFLOW }
       render(<AppCard app={workflowApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.export'))
       })
@@ -829,7 +1029,7 @@ describe('AppCard', () => {
       const workflowApp = { ...mockApp, mode: AppModeEnum.WORKFLOW }
       render(<AppCard app={workflowApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.export'))
       })
@@ -839,11 +1039,33 @@ describe('AppCard', () => {
       })
     })
 
+    it('should export workflow directly when environment_variables is undefined', async () => {
+      (workflowService.fetchWorkflowDraft as Mock).mockResolvedValueOnce({})
+
+      const workflowApp = { ...mockApp, mode: AppModeEnum.WORKFLOW }
+      render(<AppCard app={workflowApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('app.export'))
+      })
+
+      await waitFor(() => {
+        expect(workflowService.fetchWorkflowDraft).toHaveBeenCalledWith(`/apps/${workflowApp.id}/workflows/draft`)
+        expect(appsService.exportAppConfig).toHaveBeenCalledWith({
+          appID: workflowApp.id,
+          include: false,
+        })
+      })
+
+      expect(screen.queryByTestId('dsl-export-modal')).not.toBeInTheDocument()
+    })
+
     it('should check for secret environment variables in advanced chat apps', async () => {
       const advancedChatApp = { ...mockApp, mode: AppModeEnum.ADVANCED_CHAT }
       render(<AppCard app={advancedChatApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.export'))
       })
@@ -861,7 +1083,7 @@ describe('AppCard', () => {
       const workflowApp = { ...mockApp, mode: AppModeEnum.WORKFLOW }
       render(<AppCard app={workflowApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.export'))
       })
@@ -952,7 +1174,7 @@ describe('AppCard', () => {
 
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.editApp'))
       })
@@ -969,10 +1191,32 @@ describe('AppCard', () => {
       })
     })
 
+    it('should fall back to the default edit failure message', async () => {
+      (appsService.updateAppInfo as Mock).mockRejectedValueOnce({ message: '' })
+
+      render(<AppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('app.editApp'))
+      })
+
+      await waitFor(() => {
+        expect(screen.getByTestId('edit-app-modal')).toBeInTheDocument()
+      })
+
+      fireEvent.click(screen.getByTestId('confirm-edit-modal'))
+
+      await waitFor(() => {
+        expect(appsService.updateAppInfo).toHaveBeenCalled()
+        expect(toastMocks.record).toHaveBeenCalledWith({ type: 'error', message: 'app.editFailed' })
+      })
+    })
+
     it('should close edit modal after successful edit', async () => {
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.editApp'))
       })
@@ -1011,7 +1255,7 @@ describe('AppCard', () => {
       const workflowApp = { ...mockApp, mode: AppModeEnum.WORKFLOW }
       render(<AppCard app={workflowApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.export'))
       })
@@ -1031,7 +1275,7 @@ describe('AppCard', () => {
       const chatApp = createMockApp({ mode: AppModeEnum.CHAT })
       render(<AppCard app={chatApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.switch'))
       })
@@ -1048,12 +1292,12 @@ describe('AppCard', () => {
       })
     })
 
-    it('should render popover menu with correct styling for different app modes', async () => {
+    it('should render dropdown menu with correct styling for different app modes', async () => {
       // Test completion mode styling
       const completionApp = createMockApp({ mode: AppModeEnum.COMPLETION })
       const { unmount } = render(<AppCard app={completionApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         expect(screen.getByText('app.editApp')).toBeInTheDocument()
       })
@@ -1064,7 +1308,7 @@ describe('AppCard', () => {
       const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
       render(<AppCard app={workflowApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         expect(screen.getByText('app.editApp')).toBeInTheDocument()
       })
@@ -1086,45 +1330,26 @@ describe('AppCard', () => {
         fireEvent.click(tagSelectorWrapper)
     })
 
-    it('should handle popover mouse leave', async () => {
+    it('should close operations menu after selecting an item', async () => {
       render(<AppCard app={mockApp} />)
 
-      // Open popover
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
-        expect(screen.getByTestId('popover-content')).toBeInTheDocument()
+        expect(screen.getByTestId('dropdown-menu-content')).toBeInTheDocument()
       })
 
-      // Trigger mouse leave on the outer popover-content
-      fireEvent.mouseLeave(screen.getByTestId('popover-content'))
+      fireEvent.click(screen.getByText('app.editApp'))
 
       await waitFor(() => {
-        expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
+        expect(screen.queryByTestId('dropdown-menu-content')).not.toBeInTheDocument()
+        expect(screen.getByTestId('edit-app-modal')).toBeInTheDocument()
       })
     })
 
-    it('should handle operations menu mouse leave', async () => {
-      render(<AppCard app={mockApp} />)
-
-      // Open popover
-      fireEvent.click(screen.getByTestId('popover-trigger'))
-      await waitFor(() => {
-        expect(screen.getByText('app.editApp')).toBeInTheDocument()
-      })
-
-      // Find the Operations wrapper div (contains the menu items)
-      const editButton = screen.getByText('app.editApp')
-      const operationsWrapper = editButton.closest('div.relative')
-
-      // Trigger mouse leave on the Operations wrapper to call onMouseLeave
-      if (operationsWrapper)
-        fireEvent.mouseLeave(operationsWrapper)
-    })
-
     it('should click open in explore button', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         const openInExploreBtn = screen.getByText('app.openInExplore')
         fireEvent.click(openInExploreBtn)
@@ -1147,7 +1372,7 @@ describe('AppCard', () => {
 
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         const openInExploreBtn = screen.getByText('app.openInExplore')
         fireEvent.click(openInExploreBtn)
@@ -1173,7 +1398,7 @@ describe('AppCard', () => {
 
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         const openInExploreBtn = screen.getByText('app.openInExplore')
         fireEvent.click(openInExploreBtn)
@@ -1183,13 +1408,49 @@ describe('AppCard', () => {
         expect(exploreService.fetchInstalledAppList).toHaveBeenCalled()
       })
     })
+
+    it('should show string errors from open in explore onError callback', async () => {
+      mockOpenAsyncWindow.mockImplementationOnce(async (_callback: () => Promise<string>, options?: { onError?: (err: unknown) => void }) => {
+        options?.onError?.('Window failed')
+      })
+
+      render(<AppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('app.openInExplore'))
+      })
+
+      await waitFor(() => {
+        expect(toastMocks.record).toHaveBeenCalledWith({ type: 'error', message: 'Window failed' })
+      })
+    })
+
+    it('should handle non-Error rejections from open in explore', async () => {
+      const nonErrorRejection = { toString: () => 'Window rejected' }
+
+      mockOpenAsyncWindow.mockImplementationOnce(async () => {
+        return Promise.reject(nonErrorRejection)
+      })
+
+      render(<AppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('app.openInExplore'))
+      })
+
+      await waitFor(() => {
+        expect(toastMocks.record).toHaveBeenCalledWith({ type: 'error', message: 'Window rejected' })
+      })
+    })
   })
 
   describe('Access Control', () => {
     it('should render operations menu correctly', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         expect(screen.getByText('app.editApp')).toBeInTheDocument()
         expect(screen.getByText('app.duplicate')).toBeInTheDocument()
@@ -1215,7 +1476,7 @@ describe('AppCard', () => {
 
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         const openInExploreBtn = screen.getByText('app.openInExplore')
         fireEvent.click(openInExploreBtn)
@@ -1236,7 +1497,7 @@ describe('AppCard', () => {
 
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         const openInExploreBtn = screen.getByText('app.openInExplore')
         fireEvent.click(openInExploreBtn)
@@ -1253,7 +1514,7 @@ describe('AppCard', () => {
       const draftTriggerApp = createMockApp({ has_draft_trigger: true })
       render(<AppCard app={draftTriggerApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         expect(screen.getByText('app.editApp')).toBeInTheDocument()
         // openInExplore should not be shown for draft trigger apps
@@ -1278,7 +1539,7 @@ describe('AppCard', () => {
     it('should show access control option when webapp_auth is enabled', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         expect(screen.getByText('app.accessControl')).toBeInTheDocument()
       })
@@ -1287,7 +1548,7 @@ describe('AppCard', () => {
     it('should click access control button', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         const accessControlBtn = screen.getByText('app.accessControl')
         fireEvent.click(accessControlBtn)
@@ -1301,7 +1562,7 @@ describe('AppCard', () => {
     it('should close access control modal and call onRefresh', async () => {
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.accessControl'))
       })
@@ -1318,10 +1579,29 @@ describe('AppCard', () => {
       })
     })
 
+    it('should close access control modal after confirm without onRefresh callback', async () => {
+      render(<AppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      await waitFor(() => {
+        fireEvent.click(screen.getByText('app.accessControl'))
+      })
+
+      await waitFor(() => {
+        expect(screen.getByTestId('access-control-modal')).toBeInTheDocument()
+      })
+
+      fireEvent.click(screen.getByTestId('confirm-access-control'))
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('access-control-modal')).not.toBeInTheDocument()
+      })
+    })
+
     it('should show open in explore when userCanAccessApp is true', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         expect(screen.getByText('app.openInExplore')).toBeInTheDocument()
       })
@@ -1330,7 +1610,7 @@ describe('AppCard', () => {
     it('should close access control modal when onClose is called', async () => {
       render(<AppCard app={mockApp} />)
 
-      fireEvent.click(screen.getByTestId('popover-trigger'))
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
       await waitFor(() => {
         fireEvent.click(screen.getByText('app.accessControl'))
       })
@@ -1347,4 +1627,87 @@ describe('AppCard', () => {
       })
     })
   })
+
+  describe('Delete dialog guards', () => {
+    const createMockAlertDialogModule = () => ({
+      AlertDialog: ({ open, onOpenChange, children }: { open: boolean, onOpenChange?: (open: boolean) => void, children: React.ReactNode }) => (
+        open
+          ? (
+              <div role="alertdialog">
+                <button type="button" data-testid="keep-open-dialog" onClick={() => onOpenChange?.(true)}>Keep open</button>
+                <button type="button" data-testid="force-close-dialog" onClick={() => onOpenChange?.(false)}>Force close</button>
+                {children}
+              </div>
+            )
+          : null
+      ),
+      AlertDialogContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+      AlertDialogTitle: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+      AlertDialogDescription: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+      AlertDialogActions: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+      AlertDialogCancelButton: ({ children, ...props }: React.ButtonHTMLAttributes<HTMLButtonElement>) => <button type="button" {...props}>{children}</button>,
+      AlertDialogConfirmButton: ({ children, ...props }: React.ButtonHTMLAttributes<HTMLButtonElement> & { loading?: boolean }) => <button type="button" {...props}>{children}</button>,
+    })
+
+    it('should reset delete input when dialog closes', async () => {
+      vi.resetModules()
+      vi.doMock('@/app/components/base/ui/alert-dialog', createMockAlertDialogModule)
+
+      const { default: IsolatedAppCard } = await import('../app-card')
+      render(<IsolatedAppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
+      fireEvent.change(await screen.findByRole('textbox'), { target: { value: 'partial name' } })
+
+      fireEvent.click(screen.getByTestId('force-close-dialog'))
+      expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
+
+      expect(await screen.findByRole('textbox')).toHaveValue('')
+
+      vi.doUnmock('@/app/components/base/ui/alert-dialog')
+    })
+
+    it('should keep delete input when dialog remains open', async () => {
+      vi.resetModules()
+      vi.doMock('@/app/components/base/ui/alert-dialog', createMockAlertDialogModule)
+
+      const { default: IsolatedAppCard } = await import('../app-card')
+      render(<IsolatedAppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
+      fireEvent.change(await screen.findByRole('textbox'), { target: { value: 'partial name' } })
+
+      fireEvent.click(screen.getByTestId('keep-open-dialog'))
+
+      expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
+      expect(await screen.findByRole('textbox')).toHaveValue('partial name')
+
+      vi.doUnmock('@/app/components/base/ui/alert-dialog')
+    })
+
+    it('should keep delete dialog open when close is requested during deletion', async () => {
+      vi.resetModules()
+      mockDeleteMutationPending = true
+      vi.doMock('@/app/components/base/ui/alert-dialog', createMockAlertDialogModule)
+
+      const { default: IsolatedAppCard } = await import('../app-card')
+      render(<IsolatedAppCard app={mockApp} />)
+
+      fireEvent.click(screen.getByTestId('dropdown-menu-trigger'))
+      fireEvent.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))
+      expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
+
+      fireEvent.click(screen.getByTestId('force-close-dialog'))
+
+      expect(await screen.findByRole('alertdialog')).toBeInTheDocument()
+
+      vi.doUnmock('@/app/components/base/ui/alert-dialog')
+      mockDeleteMutationPending = false
+    })
+  })
 })
diff --git a/web/app/components/apps/app-card.tsx b/web/app/components/apps/app-card.tsx
index d48372bdf0..fe3e67b577 100644
--- a/web/app/components/apps/app-card.tsx
+++ b/web/app/components/apps/app-card.tsx
@@ -1,22 +1,18 @@
 'use client'
 
 import type { DuplicateAppModalProps } from '@/app/components/app/duplicate-modal'
-import type { HtmlContentProps } from '@/app/components/base/popover'
 import type { Tag } from '@/app/components/base/tag-management/constant'
 import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
 import type { EnvironmentVariable } from '@/app/components/workflow/types'
 import type { WorkflowOnlineUser } from '@/models/app'
 import type { App } from '@/types/app'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiBuildingLine, RiGlobalLine, RiLockLine, RiMoreFill, RiVerifiedBadgeLine } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback, useEffect, useId, useMemo, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { AppTypeIcon } from '@/app/components/app/type-selector'
 import AppIcon from '@/app/components/base/app-icon'
-import Divider from '@/app/components/base/divider'
 import Input from '@/app/components/base/input'
-import CustomPopover from '@/app/components/base/popover'
 import TagSelector from '@/app/components/base/tag-management/selector'
 import Tooltip from '@/app/components/base/tooltip'
 import {
@@ -28,6 +24,13 @@ import {
   AlertDialogDescription,
   AlertDialogTitle,
 } from '@/app/components/base/ui/alert-dialog'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/app/components/base/ui/dropdown-menu'
 import { toast } from '@/app/components/base/ui/toast'
 import { UserAvatarList } from '@/app/components/base/user-avatar-list'
 import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
@@ -71,6 +74,134 @@ type AppCardProps = {
   onRefresh?: () => void
 }
 
+type AppCardOperationsMenuProps = {
+  app: App
+  shouldShowSwitchOption: boolean
+  shouldShowOpenInExploreOption: boolean
+  shouldShowAccessControlOption: boolean
+  onEdit: () => void
+  onDuplicate: () => void
+  onExport: () => void
+  onSwitch: () => void
+  onDelete: () => void
+  onAccessControl: () => void
+}
+
+const AppCardOperationsMenu: React.FC<AppCardOperationsMenuProps> = ({
+  app,
+  shouldShowSwitchOption,
+  shouldShowOpenInExploreOption,
+  shouldShowAccessControlOption,
+  onEdit,
+  onDuplicate,
+  onExport,
+  onSwitch,
+  onDelete,
+  onAccessControl,
+}) => {
+  const { t } = useTranslation()
+  const openAsyncWindow = useAsyncWindowOpen()
+
+  const handleMenuAction = useCallback((e: React.MouseEvent<HTMLElement>, action: () => void) => {
+    e.stopPropagation()
+    e.preventDefault()
+    action()
+  }, [])
+
+  const handleOpenInstalledApp = useCallback(async (e: React.MouseEvent<HTMLElement>) => {
+    e.stopPropagation()
+    e.preventDefault()
+    try {
+      await openAsyncWindow(async () => {
+        const { installed_apps } = await fetchInstalledAppList(app.id)
+        if (installed_apps?.length > 0)
+          return `${basePath}/explore/installed/${installed_apps[0].id}`
+        throw new Error('No app found in Explore')
+      }, {
+        onError: (err) => {
+          toast.error(`${err.message || err}`)
+        },
+      })
+    }
+    catch (e: unknown) {
+      const message = e instanceof Error ? e.message : `${e}`
+      toast.error(message)
+    }
+  }, [app.id, openAsyncWindow])
+
+  return (
+    <>
+      <DropdownMenuItem className="gap-2 px-3" onClick={e => handleMenuAction(e, onEdit)}>
+        <span className="system-sm-regular text-text-secondary">{t('editApp', { ns: 'app' })}</span>
+      </DropdownMenuItem>
+      <DropdownMenuSeparator />
+      <DropdownMenuItem className="gap-2 px-3" onClick={e => handleMenuAction(e, onDuplicate)}>
+        <span className="system-sm-regular text-text-secondary">{t('duplicate', { ns: 'app' })}</span>
+      </DropdownMenuItem>
+      <DropdownMenuItem className="gap-2 px-3" onClick={e => handleMenuAction(e, onExport)}>
+        <span className="system-sm-regular text-text-secondary">{t('export', { ns: 'app' })}</span>
+      </DropdownMenuItem>
+      {shouldShowSwitchOption && (
+        <>
+          <DropdownMenuSeparator />
+          <DropdownMenuItem className="gap-2 px-3" onClick={e => handleMenuAction(e, onSwitch)}>
+            <span className="text-sm leading-5 text-text-secondary">{t('switch', { ns: 'app' })}</span>
+          </DropdownMenuItem>
+        </>
+      )}
+      {shouldShowOpenInExploreOption && (
+        <>
+          <DropdownMenuSeparator />
+          <DropdownMenuItem className="gap-2 px-3" onClick={handleOpenInstalledApp}>
+            <span className="system-sm-regular text-text-secondary">{t('openInExplore', { ns: 'app' })}</span>
+          </DropdownMenuItem>
+        </>
+      )}
+      <DropdownMenuSeparator />
+      {shouldShowAccessControlOption && (
+        <>
+          <DropdownMenuItem className="gap-2 px-3" onClick={e => handleMenuAction(e, onAccessControl)}>
+            <span className="text-sm leading-5 text-text-secondary">{t('accessControl', { ns: 'app' })}</span>
+          </DropdownMenuItem>
+          <DropdownMenuSeparator />
+        </>
+      )}
+      <DropdownMenuItem
+        destructive
+        className="gap-2 px-3"
+        onClick={e => handleMenuAction(e, onDelete)}
+      >
+        <span className="system-sm-regular">
+          {t('operation.delete', { ns: 'common' })}
+        </span>
+      </DropdownMenuItem>
+    </>
+  )
+}
+
+type AppCardOperationsMenuContentProps = Omit<AppCardOperationsMenuProps, 'shouldShowOpenInExploreOption'>
+
+const AppCardOperationsMenuContent: React.FC<AppCardOperationsMenuContentProps> = (props) => {
+  const systemFeatures = useGlobalPublicStore(s => s.systemFeatures)
+  const { data: userCanAccessApp, isLoading: isGettingUserCanAccessApp } = useGetUserCanAccessApp({
+    appId: props.app.id,
+    enabled: systemFeatures.webapp_auth.enabled,
+  })
+
+  const shouldShowOpenInExploreOption = !props.app.has_draft_trigger
+    && (
+      !systemFeatures.webapp_auth.enabled
+      || (!isGettingUserCanAccessApp && Boolean(userCanAccessApp?.result))
+    )
+
+  return (
+    <AppCardOperationsMenu
+      {...props}
+      shouldShowOpenInExploreOption={shouldShowOpenInExploreOption}
+    />
+  )
+}
+
 const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
   const { t } = useTranslation()
   const deleteAppNameInputId = useId()
@@ -78,7 +209,6 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
   const { isCurrentWorkspaceEditor } = useAppContext()
   const { onPlanInfoChanged } = useProviderContext()
   const { push } = useRouter()
-  const openAsyncWindow = useAsyncWindowOpen()
 
   const [showEditModal, setShowEditModal] = useState(false)
   const [showDuplicateModal, setShowDuplicateModal] = useState(false)
@@ -86,6 +216,7 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
   const [showConfirmDelete, setShowConfirmDelete] = useState(false)
   const [confirmDeleteInput, setConfirmDeleteInput] = useState('')
   const [showAccessControl, setShowAccessControl] = useState(false)
+  const [isOperationsMenuOpen, setIsOperationsMenuOpen] = useState(false)
   const [secretEnvList, setSecretEnvList] = useState<EnvironmentVariable[]>([])
   const { mutateAsync: mutateDeleteApp, isPending: isDeleting } = useDeleteAppMutation()
 
@@ -121,6 +252,41 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
     void onConfirmDelete()
   }, [isDeleteConfirmDisabled, onConfirmDelete])
 
+  const handleShowEditModal = useCallback(() => {
+    setIsOperationsMenuOpen(false)
+    queueMicrotask(() => {
+      setShowEditModal(true)
+    })
+  }, [])
+
+  const handleShowDuplicateModal = useCallback(() => {
+    setIsOperationsMenuOpen(false)
+    queueMicrotask(() => {
+      setShowDuplicateModal(true)
+    })
+  }, [])
+
+  const handleShowSwitchModal = useCallback(() => {
+    setIsOperationsMenuOpen(false)
+    queueMicrotask(() => {
+      setShowSwitchModal(true)
+    })
+  }, [])
+
+  const handleShowDeleteConfirm = useCallback(() => {
+    setIsOperationsMenuOpen(false)
+    queueMicrotask(() => {
+      setShowConfirmDelete(true)
+    })
+  }, [])
+
+  const handleShowAccessControl = useCallback(() => {
+    setIsOperationsMenuOpen(false)
+    queueMicrotask(() => {
+      setShowAccessControl(true)
+    })
+  }, [])
+
   const onEdit: CreateAppModalProps['onConfirm'] = useCallback(async ({
     name,
     icon_type,
@@ -189,6 +355,7 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
   }
 
   const exportCheck = async () => {
+    setIsOperationsMenuOpen(false)
     if (app.mode !== AppModeEnum.WORKFLOW && app.mode !== AppModeEnum.ADVANCED_CHAT) {
       onExport()
       return
@@ -219,136 +386,9 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
     setShowAccessControl(false)
   }, [onRefresh, setShowAccessControl])
 
-  const Operations = (props: HtmlContentProps) => {
-    const { data: userCanAccessApp, isLoading: isGettingUserCanAccessApp } = useGetUserCanAccessApp({ appId: app?.id, enabled: (!!props?.open && systemFeatures.webapp_auth.enabled) })
-    const onMouseLeave = async () => {
-      props.onClose?.()
-    }
-    const onClickSettings = async (e: React.MouseEvent<HTMLButtonElement>) => {
-      e.stopPropagation()
-      props.onClick?.()
-      e.preventDefault()
-      setShowEditModal(true)
-    }
-    const onClickDuplicate = async (e: React.MouseEvent<HTMLButtonElement>) => {
-      e.stopPropagation()
-      props.onClick?.()
-      e.preventDefault()
-      setShowDuplicateModal(true)
-    }
-    const onClickExport = async (e: React.MouseEvent<HTMLButtonElement>) => {
-      e.stopPropagation()
-      props.onClick?.()
-      e.preventDefault()
-      exportCheck()
-    }
-    const onClickSwitch = async (e: React.MouseEvent<HTMLButtonElement>) => {
-      e.stopPropagation()
-      props.onClick?.()
-      e.preventDefault()
-      setShowSwitchModal(true)
-    }
-    const onClickDelete = async (e: React.MouseEvent<HTMLButtonElement>) => {
-      e.stopPropagation()
-      props.onClick?.()
-      e.preventDefault()
-      setShowConfirmDelete(true)
-    }
-    const onClickAccessControl = async (e: React.MouseEvent<HTMLButtonElement>) => {
-      e.stopPropagation()
-      props.onClick?.()
-      e.preventDefault()
-      setShowAccessControl(true)
-    }
-    const onClickInstalledApp = async (e: React.MouseEvent<HTMLButtonElement>) => {
-      e.stopPropagation()
-      props.onClick?.()
-      e.preventDefault()
-      try {
-        await openAsyncWindow(async () => {
-          const { installed_apps } = await fetchInstalledAppList(app.id)
-          if (installed_apps?.length > 0)
-            return `${basePath}/explore/installed/${installed_apps[0].id}`
-          throw new Error('No app found in Explore')
-        }, {
-          onError: (err) => {
-            toast.error(`${err.message || err}`)
-          },
-        })
-      }
-      catch (e: unknown) {
-        const message = e instanceof Error ? e.message : `${e}`
-        toast.error(message)
-      }
-    }
-    return (
-      <div className="relative flex w-full flex-col py-1" onMouseLeave={onMouseLeave}>
-        <button type="button" className="mx-1 flex h-8 cursor-pointer items-center gap-2 rounded-lg px-3 hover:bg-state-base-hover" onClick={onClickSettings}>
-          <span className="system-sm-regular text-text-secondary">{t('editApp', { ns: 'app' })}</span>
-        </button>
-        <Divider className="my-1" />
-        <button type="button" className="mx-1 flex h-8 cursor-pointer items-center gap-2 rounded-lg px-3 hover:bg-state-base-hover" onClick={onClickDuplicate}>
-          <span className="system-sm-regular text-text-secondary">{t('duplicate', { ns: 'app' })}</span>
-        </button>
-        <button type="button" className="mx-1 flex h-8 cursor-pointer items-center gap-2 rounded-lg px-3 hover:bg-state-base-hover" onClick={onClickExport}>
-          <span className="system-sm-regular text-text-secondary">{t('export', { ns: 'app' })}</span>
-        </button>
-        {(app.mode === AppModeEnum.COMPLETION || app.mode === AppModeEnum.CHAT) && (
-          <>
-            <Divider className="my-1" />
-            <button
-              type="button"
-              className="mx-1 flex h-8 cursor-pointer items-center rounded-lg px-3 hover:bg-state-base-hover"
-              onClick={onClickSwitch}
-            >
-              <span className="text-sm leading-5 text-text-secondary">{t('switch', { ns: 'app' })}</span>
-            </button>
-          </>
-        )}
-        {
-          !app.has_draft_trigger && (
-            (!systemFeatures.webapp_auth.enabled)
-              ? (
-                  <>
-                    <Divider className="my-1" />
-                    <button type="button" className="mx-1 flex h-8 cursor-pointer items-center gap-2 rounded-lg px-3 hover:bg-state-base-hover" onClick={onClickInstalledApp}>
-                      <span className="system-sm-regular text-text-secondary">{t('openInExplore', { ns: 'app' })}</span>
-                    </button>
-                  </>
-                )
-              : !(isGettingUserCanAccessApp || !userCanAccessApp?.result) && (
-                  <>
-                    <Divider className="my-1" />
-                    <button type="button" className="mx-1 flex h-8 cursor-pointer items-center gap-2 rounded-lg px-3 hover:bg-state-base-hover" onClick={onClickInstalledApp}>
-                      <span className="system-sm-regular text-text-secondary">{t('openInExplore', { ns: 'app' })}</span>
-                    </button>
-                  </>
-                )
-          )
-        }
-        <Divider className="my-1" />
-        {
-          systemFeatures.webapp_auth.enabled && isCurrentWorkspaceEditor && (
-            <>
-              <button type="button" className="mx-1 flex h-8 cursor-pointer items-center rounded-lg px-3 hover:bg-state-base-hover" onClick={onClickAccessControl}>
-                <span className="text-sm leading-5 text-text-secondary">{t('accessControl', { ns: 'app' })}</span>
-              </button>
-              <Divider className="my-1" />
-            </>
-          )
-        }
-        <button
-          type="button"
-          className="group mx-1 flex h-8 cursor-pointer items-center gap-2 rounded-lg px-3 py-[6px] hover:bg-state-destructive-hover"
-          onClick={onClickDelete}
-        >
-          <span className="system-sm-regular text-text-secondary group-hover:text-text-destructive">
-            {t('operation.delete', { ns: 'common' })}
-          </span>
-        </button>
-      </div>
-    )
-  }
+  const shouldShowSwitchOption = app.mode === AppModeEnum.COMPLETION || app.mode === AppModeEnum.CHAT
+  const shouldShowAccessControlOption = systemFeatures.webapp_auth.enabled && isCurrentWorkspaceEditor
+  const operationsMenuWidthClassName = shouldShowSwitchOption ? 'w-[256px]' : 'w-[216px]'
 
   const [tags, setTags] = useState<Tag[]>(app.tags)
   useEffect(() => {
@@ -414,28 +454,28 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
             <div className="flex h-5 w-5 items-center justify-center">
               {app.access_mode === AccessMode.PUBLIC && (
                 <Tooltip asChild={false} popupContent={t('accessItemsDescription.anyone', { ns: 'app' })}>
-                  <RiGlobalLine className="h-4 w-4 text-text-quaternary" />
+                  <span aria-hidden className="i-ri-global-line h-4 w-4 text-text-quaternary" />
                 </Tooltip>
               )}
               {app.access_mode === AccessMode.SPECIFIC_GROUPS_MEMBERS && (
                 <Tooltip asChild={false} popupContent={t('accessItemsDescription.specific', { ns: 'app' })}>
-                  <RiLockLine className="h-4 w-4 text-text-quaternary" />
+                  <span aria-hidden className="i-ri-lock-line h-4 w-4 text-text-quaternary" />
                 </Tooltip>
               )}
               {app.access_mode === AccessMode.ORGANIZATION && (
                 <Tooltip asChild={false} popupContent={t('accessItemsDescription.organization', { ns: 'app' })}>
-                  <RiBuildingLine className="h-4 w-4 text-text-quaternary" />
+                  <span aria-hidden className="i-ri-building-line h-4 w-4 text-text-quaternary" />
                 </Tooltip>
               )}
               {app.access_mode === AccessMode.EXTERNAL_MEMBERS && (
                 <Tooltip asChild={false} popupContent={t('accessItemsDescription.external', { ns: 'app' })}>
-                  <RiVerifiedBadgeLine className="h-4 w-4 text-text-quaternary" />
+                  <span aria-hidden className="i-ri-verified-badge-line h-4 w-4 text-text-quaternary" />
                 </Tooltip>
               )}
             </div>
           </div>
         </div>
-        <div className="title-wrapper h-[90px] px-[14px] text-xs leading-normal text-text-tertiary">
+        <div className="h-[90px] px-[14px] text-xs leading-normal text-text-tertiary">
           <div
             className="line-clamp-2"
             title={app.description}
@@ -453,7 +493,7 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
                   e.preventDefault()
                 }}
               >
-                <div className="mr-[41px] w-full grow group-hover:mr-0!">
+                <div className="mr-[41px] w-full grow">
                   <TagSelector
                     position="bl"
                     type="app"
@@ -465,32 +505,69 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
                   />
                 </div>
               </div>
-              <div className="mx-1 hidden! h-[14px] w-px shrink-0 bg-divider-regular group-hover:flex!" />
-              <div className="hidden! shrink-0 group-hover:flex!">
-                <CustomPopover
-                  htmlContent={<Operations />}
-                  position="br"
-                  trigger="click"
-                  btnElement={(
-                    <div
-                      className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-md"
-                    >
-                      <span className="sr-only">{t('operation.more', { ns: 'common' })}</span>
-                      <RiMoreFill aria-hidden className="h-4 w-4 text-text-tertiary" />
-                    </div>
-                  )}
-                  btnClassName={open =>
-                    cn(
-                      open ? 'bg-state-base-hover! shadow-none!' : 'bg-transparent!',
-                      'h-8 w-8 rounded-md border-none p-2! hover:bg-state-base-hover!',
+              <div
+                className={cn(
+                  'absolute top-1/2 right-[6px] flex -translate-y-1/2 items-center transition-opacity',
+                  isOperationsMenuOpen
+                    ? 'pointer-events-auto opacity-100'
+                    : 'pointer-events-none opacity-0 group-hover:pointer-events-auto group-hover:opacity-100',
+                )}
+              >
+                <div className="mx-1 h-[14px] w-px shrink-0 bg-divider-regular" />
+                <DropdownMenu open={isOperationsMenuOpen} onOpenChange={setIsOperationsMenuOpen}>
+                  <DropdownMenuTrigger
+                    aria-label={t('operation.more', { ns: 'common' })}
+                    className={cn(
+                      isOperationsMenuOpen ? 'bg-state-base-hover shadow-none' : 'bg-transparent',
+                      'flex h-8 w-8 items-center justify-center rounded-md border-none p-2 hover:bg-state-base-hover',
                     )}
-                  popupClassName={
-                    (app.mode === AppModeEnum.COMPLETION || app.mode === AppModeEnum.CHAT)
-                      ? 'w-[256px]! translate-x-[-224px]'
-                      : 'w-[216px]! translate-x-[-128px]'
-                  }
-                  className="z-20! h-fit"
-                />
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      e.preventDefault()
+                    }}
+                  >
+                    <div className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-md">
+                      <span className="sr-only">{t('operation.more', { ns: 'common' })}</span>
+                      <span aria-hidden className="i-ri-more-fill h-4 w-4 text-text-tertiary" />
+                    </div>
+                  </DropdownMenuTrigger>
+                  {isOperationsMenuOpen && (
+                    <DropdownMenuContent
+                      placement="bottom-end"
+                      sideOffset={4}
+                      popupClassName={operationsMenuWidthClassName}
+                    >
+                      {systemFeatures.webapp_auth.enabled
+                        ? (
+                            <AppCardOperationsMenuContent
+                              app={app}
+                              shouldShowSwitchOption={shouldShowSwitchOption}
+                              shouldShowAccessControlOption={shouldShowAccessControlOption}
+                              onEdit={handleShowEditModal}
+                              onDuplicate={handleShowDuplicateModal}
+                              onExport={exportCheck}
+                              onSwitch={handleShowSwitchModal}
+                              onDelete={handleShowDeleteConfirm}
+                              onAccessControl={handleShowAccessControl}
+                            />
+                          )
+                        : (
+                            <AppCardOperationsMenu
+                              app={app}
+                              shouldShowSwitchOption={shouldShowSwitchOption}
+                              shouldShowOpenInExploreOption={!app.has_draft_trigger}
+                              shouldShowAccessControlOption={shouldShowAccessControlOption}
+                              onEdit={handleShowEditModal}
+                              onDuplicate={handleShowDuplicateModal}
+                              onExport={exportCheck}
+                              onSwitch={handleShowSwitchModal}
+                              onDelete={handleShowDeleteConfirm}
+                              onAccessControl={handleShowAccessControl}
+                            />
+                          )}
+                    </DropdownMenuContent>
+                  )}
+                </DropdownMenu>
               </div>
             </>
           )}
diff --git a/web/app/components/base/icons/src/vender/line/files/index.ts b/web/app/components/base/icons/src/vender/line/files/index.ts
index afdc65cb24..cbeb3d0181 100644
--- a/web/app/components/base/icons/src/vender/line/files/index.ts
+++ b/web/app/components/base/icons/src/vender/line/files/index.ts
@@ -3,7 +3,6 @@ export { default as CopyCheck } from './CopyCheck'
 
 export { default as FileArrow01 } from './FileArrow01'
 
-export { default as FileDownload02 } from './FileDownload02'
 export { default as FilePlus01 } from './FilePlus01'
 export { default as FilePlus02 } from './FilePlus02'
 
diff --git a/web/app/components/base/popover/__tests__/index.spec.tsx b/web/app/components/base/popover/__tests__/index.spec.tsx
deleted file mode 100644
index 13c846edd5..0000000000
--- a/web/app/components/base/popover/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,272 +0,0 @@
-import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import CustomPopover from '..'
-
-const CloseButtonContent = ({ onClick }: { onClick?: () => void }) => (
-  <button data-testid="content" onClick={onClick}>Close Me</button>
-)
-
-describe('CustomPopover', () => {
-  const defaultProps = {
-    btnElement: <span data-testid="trigger">Trigger</span>,
-    htmlContent: <div data-testid="content">Popover Content</div>,
-  }
-
-  beforeEach(() => {
-    vi.useFakeTimers()
-  })
-
-  afterEach(() => {
-    if (vi.isFakeTimers?.())
-      vi.clearAllTimers()
-    vi.restoreAllMocks()
-    vi.useRealTimers()
-  })
-
-  describe('Rendering', () => {
-    it('should render the trigger element', () => {
-      render(<CustomPopover {...defaultProps} />)
-      expect(screen.getByTestId('trigger')).toBeInTheDocument()
-    })
-
-    it('should render string as htmlContent', async () => {
-      render(<CustomPopover {...defaultProps} htmlContent="String Content" trigger="click" />)
-      await act(async () => {
-        fireEvent.click(screen.getByTestId('trigger'))
-      })
-      expect(screen.getByText('String Content')).toBeInTheDocument()
-    })
-  })
-
-  describe('Interactions', () => {
-    it('should toggle when clicking the button', async () => {
-      vi.useRealTimers()
-      const user = userEvent.setup()
-      render(<CustomPopover {...defaultProps} trigger="click" />)
-      const trigger = screen.getByTestId('trigger')
-
-      await user.click(trigger)
-      expect(screen.getByTestId('content')).toBeInTheDocument()
-
-      await user.click(trigger)
-
-      await waitFor(() => {
-        expect(screen.queryByTestId('content')).not.toBeInTheDocument()
-      })
-    })
-
-    it('should open on hover when trigger is "hover" (default)', async () => {
-      render(<CustomPopover {...defaultProps} />)
-
-      expect(screen.queryByTestId('content')).not.toBeInTheDocument()
-
-      const triggerContainer = screen.getByTestId('trigger').closest('div')
-      if (!triggerContainer)
-        throw new Error('Trigger container not found')
-
-      await act(async () => {
-        fireEvent.mouseEnter(triggerContainer)
-      })
-
-      expect(screen.getByTestId('content')).toBeInTheDocument()
-    })
-
-    it('should close after delay on mouse leave when trigger is "hover"', async () => {
-      vi.useRealTimers()
-      const user = userEvent.setup()
-      render(<CustomPopover {...defaultProps} />)
-
-      const trigger = screen.getByTestId('trigger')
-
-      await user.hover(trigger)
-      expect(screen.getByTestId('content')).toBeInTheDocument()
-
-      await user.unhover(trigger)
-
-      await waitFor(() => {
-        expect(screen.queryByTestId('content')).not.toBeInTheDocument()
-      }, { timeout: 2000 })
-    })
-
-    it('should stay open when hovering over the popover content', async () => {
-      vi.useRealTimers()
-      const user = userEvent.setup()
-      render(<CustomPopover {...defaultProps} />)
-
-      const trigger = screen.getByTestId('trigger')
-      await user.hover(trigger)
-      expect(screen.getByTestId('content')).toBeInTheDocument()
-
-      // Leave trigger but enter content
-      await user.unhover(trigger)
-      const content = screen.getByTestId('content')
-      await user.hover(content)
-
-      // Wait for the timeout duration
-      await act(async () => {
-        await new Promise(resolve => setTimeout(resolve, 200))
-      })
-
-      // Should still be open because we are hovering the content
-      expect(screen.getByTestId('content')).toBeInTheDocument()
-
-      // Now leave content
-      await user.unhover(content)
-
-      await waitFor(() => {
-        expect(screen.queryByTestId('content')).not.toBeInTheDocument()
-      }, { timeout: 2000 })
-    })
-
-    it('should cancel close timeout when re-entering during hover delay', async () => {
-      render(<CustomPopover {...defaultProps} />)
-
-      const triggerContainer = screen.getByTestId('trigger').closest('div')
-      if (!triggerContainer)
-        throw new Error('Trigger container not found')
-
-      await act(async () => {
-        fireEvent.mouseEnter(triggerContainer)
-      })
-
-      await act(async () => {
-        fireEvent.mouseLeave(triggerContainer!)
-      })
-
-      await act(async () => {
-        vi.advanceTimersByTime(50) // Halfway through timeout
-        fireEvent.mouseEnter(triggerContainer!)
-      })
-
-      await act(async () => {
-        vi.advanceTimersByTime(1000) // Much longer than the original timeout
-      })
-
-      expect(screen.getByTestId('content')).toBeInTheDocument()
-    })
-
-    it('should not open when disabled', async () => {
-      render(<CustomPopover {...defaultProps} disabled={true} trigger="click" />)
-
-      await act(async () => {
-        fireEvent.click(screen.getByTestId('trigger'))
-      })
-
-      expect(screen.queryByTestId('content')).not.toBeInTheDocument()
-    })
-
-    it('should pass close function to htmlContent when manualClose is true', async () => {
-      vi.useRealTimers()
-
-      render(
-        <CustomPopover
-          {...defaultProps}
-          htmlContent={<CloseButtonContent />}
-          trigger="click"
-          manualClose={true}
-        />,
-      )
-
-      await act(async () => {
-        fireEvent.click(screen.getByTestId('trigger'))
-      })
-
-      expect(screen.getByTestId('content')).toBeInTheDocument()
-
-      await act(async () => {
-        fireEvent.click(screen.getByTestId('content'))
-      })
-
-      await waitFor(() => {
-        expect(screen.queryByTestId('content')).not.toBeInTheDocument()
-      })
-    })
-
-    it('should not close when mouse leaves while already closed', async () => {
-      render(<CustomPopover {...defaultProps} />)
-      const triggerContainer = screen.getByTestId('trigger').closest('div')
-      if (!triggerContainer)
-        throw new Error('Trigger container not found')
-
-      await act(async () => {
-        fireEvent.mouseLeave(triggerContainer)
-      })
-
-      await act(async () => {
-        vi.runAllTimers()
-      })
-
-      expect(screen.queryByTestId('content')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('Props', () => {
-    it('should apply custom class names', async () => {
-      render(
-        <CustomPopover
-          {...defaultProps}
-          trigger="click"
-          className="wrapper-class"
-          popupClassName="popup-inner-class"
-          btnClassName="btn-class"
-        />,
-      )
-
-      await act(async () => {
-        fireEvent.click(screen.getByTestId('trigger'))
-      })
-
-      expect(document.querySelector('.wrapper-class')).toBeInTheDocument()
-      expect(document.querySelector('.popup-inner-class')).toBeInTheDocument()
-
-      const button = screen.getByTestId('trigger').parentElement
-      expect(button).toHaveClass('btn-class')
-    })
-
-    it('should handle btnClassName as a function', () => {
-      render(
-        <CustomPopover
-          {...defaultProps}
-          btnClassName={(open: boolean) => open ? 'btn-open' : 'btn-closed'}
-        />,
-      )
-
-      const button = screen.getByTestId('trigger').parentElement
-      expect(button).toHaveClass('btn-closed')
-    })
-
-    it('should align popover panel to left when position is bl', async () => {
-      render(
-        <CustomPopover
-          {...defaultProps}
-          trigger="click"
-          position="bl"
-        />,
-      )
-
-      await act(async () => {
-        fireEvent.click(screen.getByTestId('trigger'))
-      })
-
-      const panel = screen.getByTestId('content').closest('.absolute')
-      expect(panel).toHaveClass('left-0')
-    })
-
-    it('should align popover panel to right when position is br', async () => {
-      render(
-        <CustomPopover
-          {...defaultProps}
-          trigger="click"
-          position="br"
-        />,
-      )
-
-      await act(async () => {
-        fireEvent.click(screen.getByTestId('trigger'))
-      })
-
-      const panel = screen.getByTestId('content').closest('.absolute')
-      expect(panel).toHaveClass('right-0')
-    })
-  })
-})
diff --git a/web/app/components/base/popover/index.stories.tsx b/web/app/components/base/popover/index.stories.tsx
deleted file mode 100644
index 0076c1852b..0000000000
--- a/web/app/components/base/popover/index.stories.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useState } from 'react'
-import CustomPopover from '.'
-
-type PopoverContentProps = {
-  open?: boolean
-  onClose?: () => void
-  onClick?: () => void
-  title: string
-  description: string
-}
-
-const PopoverContent = ({ title, description, onClose }: PopoverContentProps) => {
-  return (
-    <div className="flex min-w-[220px] flex-col gap-2 p-3">
-      <div className="text-xs font-semibold uppercase tracking-[0.12em] text-text-tertiary">
-        {title}
-      </div>
-      <p className="text-sm leading-5 text-text-secondary">{description}</p>
-      <button
-        type="button"
-        className="self-start rounded-md border border-divider-subtle px-2 py-1 text-xs font-medium text-text-tertiary hover:bg-state-base-hover"
-        onClick={onClose}
-      >
-        Dismiss
-      </button>
-    </div>
-  )
-}
-
-const Template = ({
-  trigger = 'hover',
-  position = 'bottom',
-  manualClose,
-  disabled,
-}: {
-  trigger?: 'click' | 'hover'
-  position?: 'bottom' | 'bl' | 'br'
-  manualClose?: boolean
-  disabled?: boolean
-}) => {
-  const [hoverHint] = useState(
-    trigger === 'hover'
-      ? 'Hover over the badge to reveal quick tips.'
-      : 'Click the badge to open the contextual menu.',
-  )
-
-  return (
-    <div className="flex w-full max-w-lg flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <p className="text-sm text-text-secondary">{hoverHint}</p>
-      <div className="flex flex-wrap items-center gap-6">
-        <CustomPopover
-          trigger={trigger}
-          position={position}
-          manualClose={manualClose}
-          disabled={disabled}
-          btnElement={<span className="text-xs font-medium text-text-secondary">Popover trigger</span>}
-          htmlContent={(
-            <PopoverContent
-              title={trigger === 'hover' ? 'Quick help' : 'More actions'}
-              description={trigger === 'hover'
-                ? 'Use hover-triggered popovers for light contextual hints and inline docs.'
-                : 'Click-triggered popovers are ideal for menus that require user decisions.'}
-            />
-          )}
-        />
-      </div>
-    </div>
-  )
-}
-
-const meta = {
-  title: 'Base/Feedback/Popover',
-  component: Template,
-  parameters: {
-    layout: 'centered',
-    docs: {
-      description: {
-        component: 'Headless UI popover wrapper supporting hover and click triggers. These examples highlight alignment controls and manual closing.',
-      },
-    },
-  },
-  argTypes: {
-    trigger: {
-      control: 'radio',
-      options: ['hover', 'click'],
-    },
-    position: {
-      control: 'radio',
-      options: ['bottom', 'bl', 'br'],
-    },
-    manualClose: { control: 'boolean' },
-    disabled: { control: 'boolean' },
-  },
-  args: {
-    trigger: 'hover',
-    position: 'bottom',
-    manualClose: false,
-    disabled: false,
-  },
-  tags: ['autodocs'],
-} satisfies Meta<typeof Template>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const HoverPopover: Story = {}
-
-export const ClickPopover: Story = {
-  args: {
-    trigger: 'click',
-    position: 'br',
-  },
-}
-
-export const DisabledState: Story = {
-  args: {
-    disabled: true,
-  },
-}
diff --git a/web/app/components/base/popover/index.tsx b/web/app/components/base/popover/index.tsx
deleted file mode 100644
index d07f8c9a41..0000000000
--- a/web/app/components/base/popover/index.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import { Popover, PopoverButton, PopoverPanel, Transition } from '@headlessui/react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { cloneElement, Fragment, isValidElement, useRef } from 'react'
-
-export type HtmlContentProps = {
-  open?: boolean
-  onClose?: () => void
-  onClick?: () => void
-}
-
-type IPopover = {
-  className?: string
-  htmlContent: React.ReactNode
-  popupClassName?: string
-  trigger?: 'click' | 'hover'
-  position?: 'bottom' | 'br' | 'bl'
-  btnElement?: string | React.ReactNode
-  btnClassName?: string | ((open: boolean) => string)
-  manualClose?: boolean
-  disabled?: boolean
-}
-
-const timeoutDuration = 100
-
-export default function CustomPopover({
-  trigger = 'hover',
-  position = 'bottom',
-  htmlContent,
-  popupClassName,
-  btnElement,
-  className,
-  btnClassName,
-  manualClose,
-  disabled = false,
-}: IPopover) {
-  const buttonRef = useRef<HTMLButtonElement>(null)
-  const timeOutRef = useRef<number | null>(null)
-
-  const onMouseEnter = (isOpen: boolean) => {
-    if (timeOutRef.current != null)
-      window.clearTimeout(timeOutRef.current)
-    if (!isOpen)
-      buttonRef.current?.click()
-  }
-
-  const onMouseLeave = (isOpen: boolean) => {
-    timeOutRef.current = window.setTimeout(() => {
-      if (isOpen)
-        buttonRef.current?.click()
-    }, timeoutDuration)
-  }
-
-  return (
-    <Popover className="relative">
-      {({ open }: { open: boolean }) => {
-        return (
-          <>
-            <div
-              {...(trigger !== 'hover'
-                ? {}
-                : {
-                    onMouseLeave: () => onMouseLeave(open),
-                    onMouseEnter: () => onMouseEnter(open),
-                  })}
-            >
-              <PopoverButton
-                ref={buttonRef}
-                disabled={disabled}
-                className={cn(
-                  'group inline-flex items-center rounded-lg border border-components-button-secondary-border bg-components-button-secondary-bg px-3 py-2 text-base font-medium hover:border-components-button-secondary-border-hover hover:bg-components-button-secondary-bg-hover focus:outline-hidden',
-                  open && 'border-components-button-secondary-border bg-components-button-secondary-bg-hover',
-                  (btnClassName && typeof btnClassName === 'string') && btnClassName,
-                  (btnClassName && typeof btnClassName !== 'string') && btnClassName?.(open),
-                )}
-              >
-                {btnElement}
-              </PopoverButton>
-              <Transition as={Fragment}>
-                <PopoverPanel
-                  className={cn(
-                    'absolute z-10 mt-1 w-full max-w-sm px-4 sm:px-0 lg:max-w-3xl',
-                    position === 'bottom' && 'left-1/2 -translate-x-1/2',
-                    position === 'bl' && 'left-0',
-                    position === 'br' && 'right-0',
-                    className,
-                  )}
-                  {...(trigger !== 'hover'
-                    ? {}
-                    : {
-                        onMouseLeave: () => onMouseLeave(open),
-                        onMouseEnter: () => onMouseEnter(open),
-                      })
-                  }
-                >
-                  {({ close }) => (
-                    <div
-                      className={cn('w-fit min-w-[130px] overflow-hidden rounded-lg bg-components-panel-bg shadow-lg ring-1 ring-black/5', popupClassName)}
-                      {...(trigger !== 'hover'
-                        ? {}
-                        : {
-                            onMouseLeave: () => onMouseLeave(open),
-                            onMouseEnter: () => onMouseEnter(open),
-                          })
-                      }
-                    >
-                      {isValidElement(htmlContent)
-                        ? cloneElement(htmlContent as React.ReactElement<HtmlContentProps>, {
-                            open,
-                            onClose: close,
-                            ...(manualClose
-                              ? {
-                                  onClick: close,
-                                }
-                              : {}),
-                          })
-                        : htmlContent}
-                    </div>
-                  )}
-                </PopoverPanel>
-              </Transition>
-            </div>
-          </>
-        )
-      }}
-    </Popover>
-  )
-}
diff --git a/web/app/components/base/tag-management/__tests__/selector.spec.tsx b/web/app/components/base/tag-management/__tests__/selector.spec.tsx
index 3c74ac9fe6..6285164193 100644
--- a/web/app/components/base/tag-management/__tests__/selector.spec.tsx
+++ b/web/app/components/base/tag-management/__tests__/selector.spec.tsx
@@ -1,7 +1,6 @@
 import type { Tag } from '@/app/components/base/tag-management/constant'
 import { render, screen, waitFor, within } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import * as React from 'react'
 import { act } from 'react'
 import TagSelector from '../selector'
 import { useStore as useTagStore } from '../store'
@@ -38,54 +37,6 @@ vi.mock('@/service/tag', () => ({
   unBindTag,
 }))
 
-// Mock popover for deterministic open/close behavior in unit tests.
-vi.mock('@/app/components/base/popover', () => {
-  type PopoverContentProps = {
-    open?: boolean
-    onClose?: () => void
-  }
-  type MockPopoverProps = {
-    htmlContent: React.ReactNode
-    btnElement?: React.ReactNode
-    btnClassName?: string | ((open: boolean) => string)
-  }
-
-  const MockPopover = ({ htmlContent, btnElement, btnClassName }: MockPopoverProps) => {
-    const [isOpen, setIsOpen] = React.useState(false)
-    const computedClassName = typeof btnClassName === 'function'
-      ? btnClassName(isOpen)
-      : btnClassName
-
-    const content = React.isValidElement(htmlContent)
-      // eslint-disable-next-line react/no-clone-element
-      ? React.cloneElement(htmlContent as React.ReactElement<PopoverContentProps>, {
-          open: isOpen,
-          onClose: () => setIsOpen(false),
-        })
-      : htmlContent
-
-    return (
-      <div data-testid="custom-popover">
-        <button
-          type="button"
-          aria-expanded={isOpen}
-          className={computedClassName}
-          onClick={() => setIsOpen(prev => !prev)}
-        >
-          {btnElement}
-        </button>
-        {isOpen && (
-          <div data-testid="popover-content">
-            {content}
-          </div>
-        )}
-      </div>
-    )
-  }
-
-  return { __esModule: true, default: MockPopover }
-})
-
 // i18n keys rendered in "ns.key" format
 const i18n = {
   addTag: 'common.tag.addTag',
@@ -109,6 +60,12 @@ const defaultProps = {
 }
 
 describe('TagSelector', () => {
+  const getPanelTagRow = (tagName: string) => {
+    const row = screen.getAllByTestId('tag-row').find(tagRow => within(tagRow).queryByText(tagName))
+    expect(row).toBeDefined()
+    return row as HTMLElement
+  }
+
   beforeEach(() => {
     vi.clearAllMocks()
     vi.mocked(fetchTagList).mockResolvedValue(appTags)
@@ -223,8 +180,8 @@ describe('TagSelector', () => {
       const triggerButton = screen.getByRole('button', { name: /Frontend/i })
       await user.click(triggerButton)
 
-      const popoverContent = await screen.findByTestId('popover-content')
-      await user.click(within(popoverContent).getByText('Backend'))
+      await screen.findByPlaceholderText(i18n.selectorPlaceholder)
+      await user.click(getPanelTagRow('Backend'))
 
       // Close panel to trigger unmount side effects.
       await user.click(triggerButton)
@@ -244,8 +201,8 @@ describe('TagSelector', () => {
       const triggerButton = screen.getByRole('button', { name: /Frontend/i })
       await user.click(triggerButton)
 
-      const popoverContent = await screen.findByTestId('popover-content')
-      await user.click(within(popoverContent).getByText('Frontend'))
+      await screen.findByPlaceholderText(i18n.selectorPlaceholder)
+      await user.click(getPanelTagRow('Frontend'))
 
       // Close panel to trigger unmount side effects.
       await user.click(triggerButton)
diff --git a/web/app/components/base/tag-management/panel.tsx b/web/app/components/base/tag-management/panel.tsx
index a705b70369..cceb09b4d7 100644
--- a/web/app/components/base/tag-management/panel.tsx
+++ b/web/app/components/base/tag-management/panel.tsx
@@ -1,5 +1,4 @@
 import type { TagSelectorProps } from './selector'
-import type { HtmlContentProps } from '@/app/components/base/popover'
 import type { Tag } from '@/app/components/base/tag-management/constant'
 import { useUnmount } from 'ahooks'
 import { noop } from 'es-toolkit/function'
@@ -15,7 +14,7 @@ import { useStore as useTagStore } from './store'
 
 type PanelProps = {
   onCreate: () => void
-} & HtmlContentProps & TagSelectorProps
+} & TagSelectorProps
 const Panel = (props: PanelProps) => {
   const { t } = useTranslation()
   const { targetID, type, value, selectedTags, onCacheUpdate, onChange, onCreate } = props
diff --git a/web/app/components/base/tag-management/selector.tsx b/web/app/components/base/tag-management/selector.tsx
index 9b478086ce..a6d4c04413 100644
--- a/web/app/components/base/tag-management/selector.tsx
+++ b/web/app/components/base/tag-management/selector.tsx
@@ -1,8 +1,13 @@
 import type { FC } from 'react'
 import type { Tag } from '@/app/components/base/tag-management/constant'
 import { cn } from '@langgenius/dify-ui/cn'
-import { useCallback, useMemo } from 'react'
-import CustomPopover from '@/app/components/base/popover'
+import { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@/app/components/base/ui/popover'
 import { fetchTagList } from '@/service/tag'
 import Panel from './panel'
 import { useStore as useTagStore } from './store'
@@ -17,7 +22,7 @@ export type TagSelectorProps = {
   selectedTags: Tag[]
   onCacheUpdate: (tags: Tag[]) => void
   onChange?: () => void
-  minWidth?: string
+  minWidth?: number | string
 }
 
 const TagSelector: FC<TagSelectorProps> = ({
@@ -31,8 +36,10 @@ const TagSelector: FC<TagSelectorProps> = ({
   onChange,
   minWidth,
 }) => {
+  const { t } = useTranslation()
   const tagList = useTagStore(s => s.tagList)
   const setTagList = useTagStore(s => s.setTagList)
+  const [open, setOpen] = useState(false)
 
   const getTagList = useCallback(async () => {
     const res = await fetchTagList(type)
@@ -45,35 +52,64 @@ const TagSelector: FC<TagSelectorProps> = ({
     return []
   }, [selectedTags, tagList])
 
-  return (
-    <>
-      {isPopover && (
-        <CustomPopover
-          htmlContent={(
-            <Panel
-              type={type}
-              targetID={targetID}
-              value={value}
-              selectedTags={selectedTags}
-              onCacheUpdate={onCacheUpdate}
-              onChange={onChange}
-              onCreate={getTagList}
-            />
-          )}
-          position={position}
-          trigger="click"
-          btnElement={<Trigger tags={tags} />}
-          btnClassName={open =>
-            cn(
-              open ? 'bg-state-base-hover! text-text-secondary!' : 'bg-transparent!',
-              'w-full! border-0! p-0! text-text-tertiary! hover:bg-state-base-hover! hover:text-text-secondary!',
-            )}
-          popupClassName={cn('w-full! ring-0!', minWidth && 'min-w-80!')}
-          className="z-20! h-fit w-full!"
-        />
-      )}
-    </>
+  const placement = useMemo(() => {
+    if (position === 'bl')
+      return 'bottom-start' as const
+    if (position === 'br')
+      return 'bottom-end' as const
+    return 'bottom' as const
+  }, [position])
 
+  const resolvedMinWidth = useMemo(() => {
+    if (minWidth == null)
+      return undefined
+
+    return typeof minWidth === 'number' ? `${minWidth}px` : minWidth
+  }, [minWidth])
+
+  const triggerLabel = useMemo(() => {
+    if (tags.length)
+      return tags.join(', ')
+
+    return t('tag.addTag', { ns: 'common' })
+  }, [tags, t])
+
+  if (!isPopover)
+    return null
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger
+        aria-label={triggerLabel}
+        className={cn(
+          open ? 'bg-state-base-hover' : 'bg-transparent',
+          'block w-full rounded-lg border-0 p-0 text-left focus:outline-hidden',
+        )}
+      >
+        <Trigger tags={tags} />
+      </PopoverTrigger>
+      <PopoverContent
+        placement={placement}
+        sideOffset={4}
+        popupClassName="overflow-hidden rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[5px]"
+        popupProps={{
+          style: {
+            width: 'var(--anchor-width, auto)',
+            minWidth: resolvedMinWidth,
+          },
+        }}
+      >
+        <Panel
+          type={type}
+          targetID={targetID}
+          value={value}
+          selectedTags={selectedTags}
+          onCacheUpdate={onCacheUpdate}
+          onChange={onChange}
+          onCreate={getTagList}
+        />
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/datasets/create-from-pipeline/list/template-card/__tests__/actions.spec.tsx b/web/app/components/datasets/create-from-pipeline/list/template-card/__tests__/actions.spec.tsx
index 0ac767667e..999843a138 100644
--- a/web/app/components/datasets/create-from-pipeline/list/template-card/__tests__/actions.spec.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/template-card/__tests__/actions.spec.tsx
@@ -37,14 +37,12 @@ describe('Actions', () => {
 
     it('should render add icon', () => {
       const { container } = render(<Actions {...defaultProps} />)
-      const icons = container.querySelectorAll('svg')
-      expect(icons.length).toBeGreaterThan(0)
+      expect(container.querySelector('.i-ri-add-line')).toBeInTheDocument()
     })
 
     it('should render arrow icon for details', () => {
       const { container } = render(<Actions {...defaultProps} />)
-      const icons = container.querySelectorAll('svg')
-      expect(icons.length).toBeGreaterThan(1)
+      expect(container.querySelector('.i-ri-arrow-right-up-line')).toBeInTheDocument()
     })
   })
 
@@ -83,6 +81,16 @@ describe('Actions', () => {
 
       expect(defaultProps.handleShowTemplateDetails).toHaveBeenCalledTimes(1)
     })
+
+    it('should open more operations menu and close it after selecting edit', async () => {
+      render(<Actions {...defaultProps} />)
+
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.more' }))
+      const editButton = await screen.findByText(/operations\.editInfo/i)
+      fireEvent.click(editButton)
+
+      expect(defaultProps.openEditModal).toHaveBeenCalledTimes(1)
+    })
   })
 
   describe('Layout', () => {
diff --git a/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx b/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx
index c2e9a6ba5a..af366b0188 100644
--- a/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx
@@ -1,8 +1,12 @@
-import { RiAddLine, RiArrowRightUpLine, RiMoreFill } from '@remixicon/react'
+import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import CustomPopover from '@/app/components/base/popover'
 import { Button } from '@/app/components/base/ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger,
+} from '@/app/components/base/ui/dropdown-menu'
 import Operations from './operations'
 
 type ActionsProps = {
@@ -23,15 +27,21 @@ const Actions = ({
   handleDelete,
 }: ActionsProps) => {
   const { t } = useTranslation()
+  const [isMoreOperationsOpen, setIsMoreOperationsOpen] = React.useState(false)
 
   return (
-    <div className="absolute bottom-0 left-0 z-10 hidden w-full items-center gap-x-1 bg-pipeline-template-card-hover-bg p-4 pt-8 group-hover:flex">
+    <div
+      className={cn(
+        'absolute bottom-0 left-0 z-10 w-full items-center gap-x-1 bg-pipeline-template-card-hover-bg p-4 pt-8',
+        isMoreOperationsOpen ? 'flex' : 'hidden group-hover:flex',
+      )}
+    >
       <Button
         variant="primary"
         onClick={onApplyTemplate}
         className="grow gap-x-0.5"
       >
-        <RiAddLine className="size-4" />
+        <span aria-hidden className="i-ri-add-line size-4" />
         <span className="px-0.5">{t('operations.choose', { ns: 'datasetPipeline' })}</span>
       </Button>
       <Button
@@ -39,28 +49,35 @@ const Actions = ({
         onClick={handleShowTemplateDetails}
         className="grow gap-x-0.5"
       >
-        <RiArrowRightUpLine className="size-4" />
+        <span aria-hidden className="i-ri-arrow-right-up-line size-4" />
         <span className="px-0.5">{t('operations.details', { ns: 'datasetPipeline' })}</span>
       </Button>
       {
         showMoreOperations && (
-          <CustomPopover
-            htmlContent={(
+          <DropdownMenu open={isMoreOperationsOpen} onOpenChange={setIsMoreOperationsOpen}>
+            <DropdownMenuTrigger
+              aria-label={t('operation.more', { ns: 'common' })}
+              className={cn(
+                'flex size-8 cursor-pointer items-center justify-center rounded-lg p-0 shadow-xs shadow-shadow-shadow-3',
+                isMoreOperationsOpen && 'bg-state-base-hover',
+              )}
+              onClick={e => e.stopPropagation()}
+            >
+              <span aria-hidden className="i-ri-more-fill size-4 text-text-tertiary" />
+            </DropdownMenuTrigger>
+            <DropdownMenuContent
+              placement="bottom-end"
+              sideOffset={4}
+              popupClassName="min-w-[160px] border-0 bg-transparent py-0 shadow-none backdrop-blur-none"
+            >
               <Operations
                 openEditModal={openEditModal}
                 onExport={handleExportDSL}
                 onDelete={handleDelete}
+                onClose={() => setIsMoreOperationsOpen(false)}
               />
-            )}
-            className="z-20 min-w-[160px]"
-            popupClassName="rounded-xl bg-none shadow-none ring-0 min-w-[160px]"
-            position="br"
-            trigger="click"
-            btnElement={
-              <RiMoreFill className="size-4 text-text-tertiary" />
-            }
-            btnClassName="size-8 cursor-pointer justify-center rounded-lg p-0 shadow-xs shadow-shadow-shadow-3"
-          />
+            </DropdownMenuContent>
+          </DropdownMenu>
         )
       }
     </div>
diff --git a/web/app/components/datasets/create-from-pipeline/list/template-card/operations.tsx b/web/app/components/datasets/create-from-pipeline/list/template-card/operations.tsx
index 7e4db84b52..64111565f1 100644
--- a/web/app/components/datasets/create-from-pipeline/list/template-card/operations.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/template-card/operations.tsx
@@ -6,30 +6,35 @@ type OperationsProps = {
   openEditModal: () => void
   onDelete: () => void
   onExport: () => void
+  onClose?: () => void
 }
 
 const Operations = ({
   openEditModal,
   onDelete,
   onExport,
+  onClose,
 }: OperationsProps) => {
   const { t } = useTranslation()
 
   const onClickEdit = (e: React.MouseEvent<HTMLDivElement>) => {
     e.stopPropagation()
     e.preventDefault()
+    onClose?.()
     openEditModal()
   }
 
   const onClickExport = (e: React.MouseEvent<HTMLDivElement>) => {
     e.stopPropagation()
     e.preventDefault()
+    onClose?.()
     onExport()
   }
 
   const onClickDelete = (e: React.MouseEvent<HTMLDivElement>) => {
     e.stopPropagation()
     e.preventDefault()
+    onClose?.()
     onDelete()
   }
 
@@ -40,7 +45,7 @@ const Operations = ({
           className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover"
           onClick={onClickEdit}
         >
-          <span className="system-md-regular px-1 text-text-secondary">
+          <span className="px-1 system-md-regular text-text-secondary">
             {t('operations.editInfo', { ns: 'datasetPipeline' })}
           </span>
         </div>
@@ -48,7 +53,7 @@ const Operations = ({
           className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover"
           onClick={onClickExport}
         >
-          <span className="system-md-regular px-1 text-text-secondary">
+          <span className="px-1 system-md-regular text-text-secondary">
             {t('operations.exportPipeline', { ns: 'datasetPipeline' })}
           </span>
         </div>
@@ -59,7 +64,7 @@ const Operations = ({
           className="group flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-destructive-hover"
           onClick={onClickDelete}
         >
-          <span className="system-md-regular px-1 text-text-secondary group-hover:text-text-destructive">
+          <span className="px-1 system-md-regular text-text-secondary group-hover:text-text-destructive">
             {t('operation.delete', { ns: 'common' })}
           </span>
         </div>
diff --git a/web/app/components/datasets/create/step-two/language-select/__tests__/index.spec.tsx b/web/app/components/datasets/create/step-two/language-select/__tests__/index.spec.tsx
index aa648e1df4..9c34552988 100644
--- a/web/app/components/datasets/create/step-two/language-select/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/step-two/language-select/__tests__/index.spec.tsx
@@ -1,13 +1,12 @@
 import type { ILanguageSelectProps } from '../index'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import * as React from 'react'
 import { languages } from '@/i18n-config/language'
 import LanguageSelect from '../index'
 
-// Get supported languages for test assertions
-const supportedLanguages = languages.filter(lang => lang.supported)
+const supportedLanguages = languages.filter(language => language.supported)
 
-// Test data builder for props
 const createDefaultProps = (overrides?: Partial<ILanguageSelectProps>): ILanguageSelectProps => ({
   currentLanguage: 'English',
   onSelect: vi.fn(),
@@ -15,264 +14,163 @@ const createDefaultProps = (overrides?: Partial<ILanguageSelectProps>): ILanguag
   ...overrides,
 })
 
+const openSelect = async () => {
+  await act(async () => {
+    fireEvent.click(screen.getByRole('combobox', { name: 'language' }))
+  })
+  return screen.findByRole('listbox')
+}
+
 describe('LanguageSelect', () => {
   beforeEach(() => {
     vi.clearAllMocks()
   })
 
-  // Rendering Tests - Verify component renders correctly
+  // Rendering
   describe('Rendering', () => {
-    it('should render without crashing', () => {
-      const props = createDefaultProps()
+    it('should render the current language in the trigger', () => {
+      render(<LanguageSelect {...createDefaultProps()} />)
 
-      render(<LanguageSelect {...props} />)
-
-      expect(screen.getByText('English')).toBeInTheDocument()
+      const trigger = screen.getByRole('combobox', { name: 'language' })
+      expect(trigger).toBeInTheDocument()
+      expect(trigger).toHaveTextContent('English')
     })
 
-    it('should render current language text', () => {
-      const props = createDefaultProps({ currentLanguage: 'Chinese Simplified' })
+    it('should render non-listed current language values', () => {
+      render(<LanguageSelect {...createDefaultProps({ currentLanguage: 'NonExistentLanguage' })} />)
 
-      render(<LanguageSelect {...props} />)
-
-      expect(screen.getByText('Chinese Simplified')).toBeInTheDocument()
+      expect(screen.getByRole('combobox', { name: 'language' })).toHaveTextContent('NonExistentLanguage')
     })
 
-    it('should render dropdown arrow icon', () => {
-      const props = createDefaultProps()
+    it('should render a placeholder when current language is empty', () => {
+      render(<LanguageSelect {...createDefaultProps({ currentLanguage: '' })} />)
 
-      const { container } = render(<LanguageSelect {...props} />)
-
-      // Assert - RiArrowDownSLine renders as SVG
-      const svgIcon = container.querySelector('svg')
-      expect(svgIcon).toBeInTheDocument()
-    })
-
-    it('should render all supported languages in dropdown when opened', () => {
-      const props = createDefaultProps()
-      render(<LanguageSelect {...props} />)
-
-      // Act - Click button to open dropdown
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - All supported languages should be visible
-      // Use getAllByText because current language appears both in button and dropdown
-      supportedLanguages.forEach((lang) => {
-        expect(screen.getAllByText(lang.prompt_name).length).toBeGreaterThanOrEqual(1)
-      })
-    })
-
-    it('should render check icon for selected language', () => {
-      const selectedLanguage = 'Japanese'
-      const props = createDefaultProps({ currentLanguage: selectedLanguage })
-      render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - The selected language option should have a check icon
-      const languageOptions = screen.getAllByText(selectedLanguage)
-      // One in the button, one in the dropdown list
-      expect(languageOptions.length).toBeGreaterThanOrEqual(1)
+      expect(screen.getByRole('combobox', { name: 'language' }).textContent).toBe('\u00A0')
     })
   })
 
-  // Props Testing - Verify all prop variations work correctly
-  describe('Props', () => {
-    describe('currentLanguage prop', () => {
-      it('should display English when currentLanguage is English', () => {
-        const props = createDefaultProps({ currentLanguage: 'English' })
-        render(<LanguageSelect {...props} />)
-        expect(screen.getByText('English')).toBeInTheDocument()
-      })
+  // Dropdown behavior
+  describe('Dropdown behavior', () => {
+    it('should render all supported languages when the select is opened', async () => {
+      render(<LanguageSelect {...createDefaultProps()} />)
 
-      it('should display Chinese Simplified when currentLanguage is Chinese Simplified', () => {
-        const props = createDefaultProps({ currentLanguage: 'Chinese Simplified' })
-        render(<LanguageSelect {...props} />)
-        expect(screen.getByText('Chinese Simplified')).toBeInTheDocument()
+      expect(await openSelect()).toBeInTheDocument()
+      supportedLanguages.forEach((language) => {
+        expect(screen.getByRole('option', { name: language.prompt_name })).toBeInTheDocument()
       })
+    })
 
-      it('should display Japanese when currentLanguage is Japanese', () => {
-        const props = createDefaultProps({ currentLanguage: 'Japanese' })
-        render(<LanguageSelect {...props} />)
-        expect(screen.getByText('Japanese')).toBeInTheDocument()
+    it('should only render supported languages in the dropdown', async () => {
+      render(<LanguageSelect {...createDefaultProps()} />)
+
+      await openSelect()
+
+      const unsupportedLanguages = languages.filter(language => !language.supported)
+      unsupportedLanguages.forEach((language) => {
+        expect(screen.queryByRole('option', { name: language.prompt_name })).not.toBeInTheDocument()
       })
+    })
 
-      it.each(supportedLanguages.map(l => l.prompt_name))(
-        'should display %s as current language',
-        (language) => {
-          const props = createDefaultProps({ currentLanguage: language })
-          render(<LanguageSelect {...props} />)
-          expect(screen.getByText(language)).toBeInTheDocument()
+    it('should mark the selected language inside the opened list', async () => {
+      render(<LanguageSelect {...createDefaultProps({ currentLanguage: 'Japanese' })} />)
+
+      await openSelect()
+
+      const selectedOption = await screen.findByRole('option', { name: 'Japanese' })
+      expect(selectedOption).toHaveAttribute('aria-selected', 'true')
+    })
+  })
+
+  // Interaction
+  describe('Interaction', () => {
+    it('should call onSelect when a different language is chosen', async () => {
+      const user = userEvent.setup()
+      const onSelect = vi.fn()
+      render(<LanguageSelect {...createDefaultProps({ onSelect })} />)
+
+      await user.click(screen.getByRole('combobox', { name: 'language' }))
+      const listbox = await screen.findByRole('listbox')
+      await user.click(within(listbox).getByRole('option', { name: 'French' }))
+
+      await waitFor(() => {
+        expect(onSelect).toHaveBeenCalledTimes(1)
+        expect(onSelect).toHaveBeenCalledWith('French')
+      })
+    })
+
+    it('should re-render with the new language value', () => {
+      const { rerender } = render(<LanguageSelect {...createDefaultProps()} />)
+
+      rerender(<LanguageSelect {...createDefaultProps({ currentLanguage: 'French' })} />)
+
+      expect(screen.getByRole('combobox', { name: 'language' })).toHaveTextContent('French')
+    })
+
+    it('should ignore null values emitted by the select control', async () => {
+      vi.resetModules()
+      vi.doMock('@/app/components/base/ui/select', () => ({
+        Select: ({ onValueChange, children }: { onValueChange?: (value: string | null) => void, children: React.ReactNode }) => {
+          React.useEffect(() => {
+            onValueChange?.(null)
+          }, [onValueChange])
+          return <div>{children}</div>
         },
-      )
-    })
+        SelectTrigger: ({ children, ...props }: React.ButtonHTMLAttributes<HTMLButtonElement>) => <button type="button" {...props}>{children}</button>,
+        SelectContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+        SelectItem: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+        SelectItemText: ({ children }: { children: React.ReactNode }) => <span>{children}</span>,
+        SelectItemIndicator: () => null,
+      }))
 
-    describe('disabled prop', () => {
-      it('should have disabled button when disabled is true', () => {
-        const props = createDefaultProps({ disabled: true })
+      const { default: IsolatedLanguageSelect } = await import('../index')
+      const onSelect = vi.fn()
 
-        render(<LanguageSelect {...props} />)
+      render(<IsolatedLanguageSelect currentLanguage="English" onSelect={onSelect} />)
 
-        const button = screen.getByRole('button')
-        expect(button).toBeDisabled()
+      await waitFor(() => {
+        expect(onSelect).not.toHaveBeenCalled()
       })
 
-      it('should have enabled button when disabled is false', () => {
-        const props = createDefaultProps({ disabled: false })
-
-        render(<LanguageSelect {...props} />)
-
-        const button = screen.getByRole('button')
-        expect(button).not.toBeDisabled()
-      })
-
-      it('should have enabled button when disabled is undefined', () => {
-        const props = createDefaultProps()
-        delete (props as Partial<ILanguageSelectProps>).disabled
-
-        render(<LanguageSelect {...props} />)
-
-        const button = screen.getByRole('button')
-        expect(button).not.toBeDisabled()
-      })
-
-      it('should apply disabled styling when disabled is true', () => {
-        const props = createDefaultProps({ disabled: true })
-
-        const { container } = render(<LanguageSelect {...props} />)
-
-        // Assert - Check for disabled class on text elements
-        const disabledTextElement = container.querySelector('.text-components-button-tertiary-text-disabled')
-        expect(disabledTextElement).toBeInTheDocument()
-      })
-
-      it('should apply cursor-not-allowed styling when disabled', () => {
-        const props = createDefaultProps({ disabled: true })
-
-        const { container } = render(<LanguageSelect {...props} />)
-
-        const elementWithCursor = container.querySelector('.cursor-not-allowed')
-        expect(elementWithCursor).toBeInTheDocument()
-      })
-    })
-
-    describe('onSelect prop', () => {
-      it('should be callable as a function', () => {
-        const mockOnSelect = vi.fn()
-        const props = createDefaultProps({ onSelect: mockOnSelect })
-        render(<LanguageSelect {...props} />)
-
-        // Open dropdown and click a language
-        const button = screen.getByRole('button')
-        fireEvent.click(button)
-
-        const germanOption = screen.getByText('German')
-        fireEvent.click(germanOption)
-
-        expect(mockOnSelect).toHaveBeenCalledWith('German')
-      })
+      vi.doUnmock('@/app/components/base/ui/select')
     })
   })
 
-  // User Interactions - Test event handlers
-  describe('User Interactions', () => {
-    it('should open dropdown when button is clicked', () => {
-      const props = createDefaultProps()
-      render(<LanguageSelect {...props} />)
+  // Disabled state
+  describe('Disabled state', () => {
+    it('should disable the trigger when disabled is true', () => {
+      render(<LanguageSelect {...createDefaultProps({ disabled: true })} />)
 
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - Check if dropdown content is visible
-      expect(screen.getAllByText('English').length).toBeGreaterThanOrEqual(1)
+      const trigger = screen.getByRole('combobox', { name: 'language' })
+      expect(trigger).toBeDisabled()
+      expect(trigger).toHaveClass('cursor-not-allowed')
     })
 
-    it('should call onSelect when a language option is clicked', () => {
-      const mockOnSelect = vi.fn()
-      const props = createDefaultProps({ onSelect: mockOnSelect })
-      render(<LanguageSelect {...props} />)
+    it('should not open the listbox when disabled', () => {
+      render(<LanguageSelect {...createDefaultProps({ disabled: true })} />)
 
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-      const frenchOption = screen.getByText('French')
-      fireEvent.click(frenchOption)
+      fireEvent.click(screen.getByRole('combobox', { name: 'language' }))
 
-      expect(mockOnSelect).toHaveBeenCalledTimes(1)
-      expect(mockOnSelect).toHaveBeenCalledWith('French')
-    })
-
-    it('should call onSelect with correct language when selecting different languages', () => {
-      const mockOnSelect = vi.fn()
-      const props = createDefaultProps({ onSelect: mockOnSelect })
-      render(<LanguageSelect {...props} />)
-
-      // Act & Assert - Test multiple language selections
-      const testLanguages = ['Korean', 'Spanish', 'Italian']
-
-      testLanguages.forEach((lang) => {
-        mockOnSelect.mockClear()
-        const button = screen.getByRole('button')
-        fireEvent.click(button)
-        const languageOption = screen.getByText(lang)
-        fireEvent.click(languageOption)
-        expect(mockOnSelect).toHaveBeenCalledWith(lang)
-      })
-    })
-
-    it('should not open dropdown when disabled', () => {
-      const props = createDefaultProps({ disabled: true })
-      render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - Dropdown should not open, only one instance of the current language should exist
-      const englishElements = screen.getAllByText('English')
-      expect(englishElements.length).toBe(1) // Only the button text, not dropdown
-    })
-
-    it('should not call onSelect when component is disabled', () => {
-      const mockOnSelect = vi.fn()
-      const props = createDefaultProps({ onSelect: mockOnSelect, disabled: true })
-      render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      expect(mockOnSelect).not.toHaveBeenCalled()
-    })
-
-    it('should handle rapid consecutive clicks', () => {
-      const mockOnSelect = vi.fn()
-      const props = createDefaultProps({ onSelect: mockOnSelect })
-      render(<LanguageSelect {...props} />)
-
-      // Act - Rapid clicks
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-      fireEvent.click(button)
-      fireEvent.click(button)
-
-      // Assert - Component should not crash
-      expect(button).toBeInTheDocument()
+      expect(screen.queryByRole('listbox')).not.toBeInTheDocument()
     })
   })
 
-  // Component Memoization - Test React.memo behavior
-  describe('Memoization', () => {
+  // Styling and memoization
+  describe('Styling and memoization', () => {
+    it('should apply the compact tertiary trigger styles', () => {
+      render(<LanguageSelect {...createDefaultProps()} />)
+
+      const trigger = screen.getByRole('combobox', { name: 'language' })
+      expect(trigger).toHaveClass('mx-1', 'bg-components-button-tertiary-bg', 'text-components-button-tertiary-text')
+    })
+
     it('should be wrapped with React.memo', () => {
-      // Assert - Check component has memo wrapper
       expect(LanguageSelect.$$typeof).toBe(Symbol.for('react.memo'))
     })
 
-    it('should not re-render when props remain the same', () => {
-      const mockOnSelect = vi.fn()
-      const props = createDefaultProps({ onSelect: mockOnSelect })
+    it('should avoid re-rendering when props stay the same', () => {
       const renderSpy = vi.fn()
+      const props = createDefaultProps()
 
-      // Create a wrapper component to track renders
       const TrackedLanguageSelect: React.FC<ILanguageSelectProps> = (trackedProps) => {
         renderSpy()
         return <LanguageSelect {...trackedProps} />
@@ -282,224 +180,7 @@ describe('LanguageSelect', () => {
       const { rerender } = render(<MemoizedTracked {...props} />)
       rerender(<MemoizedTracked {...props} />)
 
-      // Assert - Should only render once due to same props
       expect(renderSpy).toHaveBeenCalledTimes(1)
     })
-
-    it('should re-render when currentLanguage changes', () => {
-      const props = createDefaultProps({ currentLanguage: 'English' })
-
-      const { rerender } = render(<LanguageSelect {...props} />)
-      expect(screen.getByText('English')).toBeInTheDocument()
-
-      rerender(<LanguageSelect {...props} currentLanguage="French" />)
-
-      expect(screen.getByText('French')).toBeInTheDocument()
-    })
-
-    it('should re-render when disabled changes', () => {
-      const props = createDefaultProps({ disabled: false })
-
-      const { rerender } = render(<LanguageSelect {...props} />)
-      expect(screen.getByRole('button')).not.toBeDisabled()
-
-      rerender(<LanguageSelect {...props} disabled={true} />)
-
-      expect(screen.getByRole('button')).toBeDisabled()
-    })
-  })
-
-  // Edge Cases - Test boundary conditions and error handling
-  describe('Edge Cases', () => {
-    it('should handle empty string as currentLanguage', () => {
-      const props = createDefaultProps({ currentLanguage: '' })
-
-      render(<LanguageSelect {...props} />)
-
-      // Assert - Component should still render
-      const button = screen.getByRole('button')
-      expect(button).toBeInTheDocument()
-    })
-
-    it('should handle non-existent language as currentLanguage', () => {
-      const props = createDefaultProps({ currentLanguage: 'NonExistentLanguage' })
-
-      render(<LanguageSelect {...props} />)
-
-      // Assert - Should display the value even if not in list
-      expect(screen.getByText('NonExistentLanguage')).toBeInTheDocument()
-    })
-
-    it('should handle special characters in language names', () => {
-      // Arrange - Turkish has special character in prompt_name
-      const props = createDefaultProps({ currentLanguage: 'Türkçe' })
-
-      render(<LanguageSelect {...props} />)
-
-      expect(screen.getByText('Türkçe')).toBeInTheDocument()
-    })
-
-    it('should handle very long language names', () => {
-      const longLanguageName = 'A'.repeat(100)
-      const props = createDefaultProps({ currentLanguage: longLanguageName })
-
-      render(<LanguageSelect {...props} />)
-
-      // Assert - Should not crash and should display the text
-      expect(screen.getByText(longLanguageName)).toBeInTheDocument()
-    })
-
-    it('should render correct number of language options', () => {
-      const props = createDefaultProps()
-      render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - Should show all supported languages
-      const expectedCount = supportedLanguages.length
-      // Each language appears in the dropdown (use getAllByText because current language appears twice)
-      supportedLanguages.forEach((lang) => {
-        expect(screen.getAllByText(lang.prompt_name).length).toBeGreaterThanOrEqual(1)
-      })
-      expect(supportedLanguages.length).toBe(expectedCount)
-    })
-
-    it('should only show supported languages in dropdown', () => {
-      const props = createDefaultProps()
-      render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - All displayed languages should be supported
-      const allLanguages = languages
-      const unsupportedLanguages = allLanguages.filter(lang => !lang.supported)
-
-      unsupportedLanguages.forEach((lang) => {
-        expect(screen.queryByText(lang.prompt_name)).not.toBeInTheDocument()
-      })
-    })
-
-    it('should handle undefined onSelect gracefully when clicking', () => {
-      // Arrange - This tests TypeScript boundary, but runtime should not crash
-      const props = createDefaultProps()
-
-      render(<LanguageSelect {...props} />)
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-      const option = screen.getByText('German')
-
-      // Assert - Should not throw
-      expect(() => fireEvent.click(option)).not.toThrow()
-    })
-
-    it('should maintain selection state visually with check icon', () => {
-      const props = createDefaultProps({ currentLanguage: 'Russian' })
-      const { container } = render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - Find the check icon (RiCheckLine) in the dropdown
-      // The selected option should have a check icon next to it
-      const checkIcons = container.querySelectorAll('svg.text-text-accent')
-      expect(checkIcons.length).toBeGreaterThanOrEqual(1)
-    })
-  })
-
-  // Accessibility - Basic accessibility checks
-  describe('Accessibility', () => {
-    it('should have accessible button element', () => {
-      const props = createDefaultProps()
-
-      render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      expect(button).toBeInTheDocument()
-    })
-
-    it('should have clickable language options', () => {
-      const props = createDefaultProps()
-      render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - Options should be clickable (have cursor-pointer class)
-      const options = screen.getAllByText(/English|French|German|Japanese/i)
-      expect(options.length).toBeGreaterThan(0)
-    })
-  })
-
-  // Integration with Popover - Test Popover behavior
-  describe('Popover Integration', () => {
-    it('should use manualClose prop on Popover', () => {
-      const mockOnSelect = vi.fn()
-      const props = createDefaultProps({ onSelect: mockOnSelect })
-
-      render(<LanguageSelect {...props} />)
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - Popover should be open
-      expect(screen.getAllByText('English').length).toBeGreaterThanOrEqual(1)
-    })
-
-    it('should have correct popup z-index class', () => {
-      const props = createDefaultProps()
-      const { container } = render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - Check for z-20 class (popupClassName='z-20')
-      // This is applied to the Popover
-      expect(container.querySelector('.z-20')).toBeTruthy()
-    })
-  })
-
-  // Styling Tests - Verify correct CSS classes applied
-  describe('Styling', () => {
-    it('should apply tertiary button styling', () => {
-      const props = createDefaultProps()
-      const { container } = render(<LanguageSelect {...props} />)
-
-      // Assert - Check for tertiary button classes (Tailwind v4 uses ! suffix)
-      expect(container.querySelector('.bg-components-button-tertiary-bg\\!')).toBeInTheDocument()
-    })
-
-    it('should apply hover styling class to options', () => {
-      const props = createDefaultProps()
-      const { container } = render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - Options should have hover class
-      const optionWithHover = container.querySelector('.hover\\:bg-state-base-hover')
-      expect(optionWithHover).toBeInTheDocument()
-    })
-
-    it('should apply correct text styling to language options', () => {
-      const props = createDefaultProps()
-      const { container } = render(<LanguageSelect {...props} />)
-
-      const button = screen.getByRole('button')
-      fireEvent.click(button)
-
-      // Assert - Check for system-sm-medium class on options
-      const styledOption = container.querySelector('.system-sm-medium')
-      expect(styledOption).toBeInTheDocument()
-    })
-
-    it('should apply disabled styling to icon when disabled', () => {
-      const props = createDefaultProps({ disabled: true })
-      const { container } = render(<LanguageSelect {...props} />)
-
-      // Assert - Check for disabled text color on icon
-      const disabledIcon = container.querySelector('.text-components-button-tertiary-text-disabled')
-      expect(disabledIcon).toBeInTheDocument()
-    })
   })
 })
diff --git a/web/app/components/datasets/create/step-two/language-select/index.tsx b/web/app/components/datasets/create/step-two/language-select/index.tsx
index 4a7683576f..4f13ff2752 100644
--- a/web/app/components/datasets/create/step-two/language-select/index.tsx
+++ b/web/app/components/datasets/create/step-two/language-select/index.tsx
@@ -1,9 +1,8 @@
 'use client'
 import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiArrowDownSLine, RiCheckLine } from '@remixicon/react'
 import * as React from 'react'
-import Popover from '@/app/components/base/popover'
+import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@/app/components/base/ui/select'
 import { languages } from '@/i18n-config/language'
 
 export type ILanguageSelectProps = {
@@ -17,48 +16,42 @@ const LanguageSelect: FC<ILanguageSelectProps> = ({
   onSelect,
   disabled,
 }) => {
+  const supportedLanguages = languages.filter(language => language.supported)
+
   return (
-    <Popover
-      manualClose
-      trigger="click"
+    <Select
+      value={currentLanguage}
+      onValueChange={(value) => {
+        if (value == null)
+          return
+        onSelect(value)
+      }}
       disabled={disabled}
-      popupClassName="z-20"
-      htmlContent={(
-        <div className="w-full p-1">
-          {languages.filter(language => language.supported).map(({ prompt_name }) => (
-            <div
-              key={prompt_name}
-              className="inline-flex w-full cursor-pointer items-center justify-between rounded-lg px-3 py-2 hover:bg-state-base-hover"
-              onClick={() => onSelect(prompt_name)}
-            >
-              <span className="system-sm-medium text-text-secondary">{prompt_name}</span>
-              {(currentLanguage === prompt_name) && <RiCheckLine className="size-4 text-text-accent" />}
-            </div>
-          ))}
-        </div>
-      )}
-      btnElement={(
-        <div className={cn('inline-flex items-center gap-x-px', disabled && 'cursor-not-allowed')}>
-          <span className={cn(
-            'px-[3px] system-xs-semibold text-components-button-tertiary-text',
-            disabled ? 'text-components-button-tertiary-text-disabled' : '',
-          )}
-          >
-            {currentLanguage}
-          </span>
-          <RiArrowDownSLine className={cn(
-            'size-3.5 text-components-button-tertiary-text',
-            disabled ? 'text-components-button-tertiary-text-disabled' : '',
-          )}
-          />
-        </div>
-      )}
-      btnClassName={() => cn(
-        '!hover:bg-components-button-tertiary-bg mx-1! rounded-md border-0! bg-components-button-tertiary-bg! px-1.5! py-1!',
-        disabled ? 'bg-components-button-tertiary-bg-disabled' : '',
-      )}
-      className="left-1! z-20! h-fit w-[140px]! translate-x-0!"
-    />
+    >
+      <SelectTrigger
+        size="small"
+        aria-label="language"
+        className={cn(
+          'mx-1 w-auto shrink-0 bg-components-button-tertiary-bg text-components-button-tertiary-text hover:bg-components-button-tertiary-bg',
+          disabled && 'cursor-not-allowed bg-components-button-tertiary-bg-disabled text-components-button-tertiary-text-disabled hover:bg-components-button-tertiary-bg-disabled',
+        )}
+      >
+        {currentLanguage || <span>&nbsp;</span>}
+      </SelectTrigger>
+      <SelectContent
+        placement="bottom-start"
+        sideOffset={4}
+        popupClassName="w-max"
+        listClassName="no-scrollbar"
+      >
+        {supportedLanguages.map(({ prompt_name }) => (
+          <SelectItem key={prompt_name} value={prompt_name}>
+            <SelectItemText>{prompt_name}</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+        ))}
+      </SelectContent>
+    </Select>
   )
 }
 export default React.memo(LanguageSelect)
diff --git a/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx b/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx
index 478302d983..97ae1c92a1 100644
--- a/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx
@@ -380,8 +380,7 @@ describe('DocumentList', () => {
         })
       }
 
-      // After clicking rename, the modal should potentially be visible
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('dialog', { name: 'datasetDocuments.list.table.rename' })).toBeInTheDocument()
     })
 
     it('should call onUpdate when document is renamed', () => {
diff --git a/web/app/components/datasets/documents/components/operations.tsx b/web/app/components/datasets/documents/components/operations.tsx
index e2bd6f7c92..e7bbb03c94 100644
--- a/web/app/components/datasets/documents/components/operations.tsx
+++ b/web/app/components/datasets/documents/components/operations.tsx
@@ -2,15 +2,12 @@ import type { OperationName } from '../types'
 import type { CommonResponse } from '@/models/common'
 import type { DocumentDownloadResponse } from '@/service/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiArchive2Line, RiDeleteBinLine, RiDownload2Line, RiEditLine, RiEqualizer2Line, RiLoopLeftLine, RiMoreFill, RiPauseCircleLine, RiPlayCircleLine } from '@remixicon/react'
 import { useBoolean, useDebounceFn } from 'ahooks'
 import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
-import { SearchLinesSparkle } from '@/app/components/base/icons/src/vender/knowledge'
-import CustomPopover from '@/app/components/base/popover'
 import Switch from '@/app/components/base/switch'
 import Tooltip from '@/app/components/base/tooltip'
 import {
@@ -22,6 +19,11 @@ import {
   AlertDialogDescription,
   AlertDialogTitle,
 } from '@/app/components/base/ui/alert-dialog'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger,
+} from '@/app/components/base/ui/dropdown-menu'
 import { toast } from '@/app/components/base/ui/toast'
 import { IS_CE_EDITION } from '@/config'
 import { DataSourceType, DocumentActionType } from '@/models/datasets'
@@ -53,6 +55,7 @@ type OperationsProps = {
 const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSelectedIdChange, onUpdate, scene = 'list', className = '' }: OperationsProps) => {
   const { id, name, enabled = false, archived = false, data_source_type, display_status } = detail || {}
   const [showModal, setShowModal] = useState(false)
+  const [isOperationsMenuOpen, setIsOperationsMenuOpen] = useState(false)
   const [deleting, setDeleting] = useState(false)
   const { t } = useTranslation()
   const router = useRouter()
@@ -68,7 +71,7 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
   const { mutateAsync: pauseDocument } = useDocumentPause()
   const { mutateAsync: resumeDocument } = useDocumentResume()
   const isListScene = scene === 'list'
-  const onOperate = async (operationName: OperationName) => {
+  const onOperate = useCallback(async (operationName: OperationName) => {
     let opApi
     switch (operationName) {
       case 'archive':
@@ -116,7 +119,25 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
     }
     if (operationName === DocumentActionType.delete)
       setDeleting(false)
-  }
+  }, [
+    archiveDocument,
+    data_source_type,
+    datasetId,
+    deleteDocument,
+    disableDocument,
+    enableDocument,
+    generateSummary,
+    id,
+    onSelectedIdChange,
+    onUpdate,
+    pauseDocument,
+    resumeDocument,
+    selectedIds,
+    syncDocument,
+    syncWebsite,
+    t,
+    unArchiveDocument,
+  ])
   const { run: handleSwitch } = useDebounceFn((operationName: OperationName) => {
     if (operationName === DocumentActionType.enable && enabled)
       return
@@ -139,6 +160,9 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
   const handleRenamed = useCallback(() => {
     onUpdate()
   }, [onUpdate])
+  const closeOperationsMenu = useCallback(() => {
+    setIsOperationsMenuOpen(false)
+  }, [])
   const handleDownload = useCallback(async () => {
     // Avoid repeated clicks while the signed URL request is in-flight.
     if (isDownloading)
@@ -152,6 +176,28 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
     // Trigger download without navigating away (helps avoid duplicate downloads in some browsers).
     downloadUrl({ url: res.url, fileName: name })
   }, [datasetId, downloadDocument, id, isDownloading, name, t])
+  const handleShowRename = useCallback(() => {
+    closeOperationsMenu()
+    handleShowRenameModal({
+      id: detail.id,
+      name: detail.name,
+    })
+  }, [closeOperationsMenu, detail.id, detail.name, handleShowRenameModal])
+  const handleMenuOperation = useCallback((operationName: OperationName) => {
+    closeOperationsMenu()
+    void onOperate(operationName)
+  }, [closeOperationsMenu, onOperate])
+  const handleDeleteClick = useCallback(() => {
+    closeOperationsMenu()
+    setShowModal(true)
+  }, [closeOperationsMenu])
+  const handleDownloadClick = useCallback((evt: React.MouseEvent<HTMLDivElement>) => {
+    evt.preventDefault()
+    evt.stopPropagation()
+    evt.nativeEvent.stopImmediatePropagation?.()
+    closeOperationsMenu()
+    void handleDownload()
+  }, [closeOperationsMenu, handleDownload])
   return (
     <div className="flex items-center" onClick={e => e.stopPropagation()}>
       {isListScene && !embeddingAvailable && (<Switch checked={false} onCheckedChange={noop} disabled={true} size="md" />)}
@@ -179,49 +225,56 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
                 : 'p-0.5 hover:bg-state-base-hover')}
               onClick={() => router.push(`/datasets/${datasetId}/documents/${detail.id}/settings`)}
             >
-              <RiEqualizer2Line className="h-4 w-4 text-components-button-secondary-text" />
+              <span aria-hidden className="i-ri-equalizer-2-line h-4 w-4 text-components-button-secondary-text" />
             </button>
           </Tooltip>
-          <CustomPopover
-            htmlContent={(
+          <DropdownMenu open={isOperationsMenuOpen} onOpenChange={setIsOperationsMenuOpen}>
+            <DropdownMenuTrigger
+              aria-label={t('operation.more', { ns: 'common' })}
+              className={cn(
+                isListScene ? s.actionIconWrapperList : s.actionIconWrapperDetail,
+                'inline-flex items-center justify-center',
+                !isListScene && '!h-8 !w-8 rounded-lg backdrop-blur-[5px]',
+                isOperationsMenuOpen
+                  ? '!shadow-none hover:!bg-state-base-hover'
+                  : isListScene && '!bg-transparent',
+              )}
+              onClick={(e) => {
+                e.stopPropagation()
+                e.preventDefault()
+              }}
+            >
+              <div className={cn(s.commonIcon)}>
+                <span aria-hidden className="i-ri-more-fill h-4 w-4 text-components-button-secondary-text" />
+              </div>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent
+              placement="bottom-end"
+              sideOffset={4}
+              popupClassName={cn('w-[200px] py-0', className)}
+            >
               <div className="w-full py-1">
                 {!archived && (
                   <>
-                    <div
-                      className={s.actionItem}
-                      onClick={() => {
-                        handleShowRenameModal({
-                          id: detail.id,
-                          name: detail.name,
-                        })
-                      }}
-                    >
-                      <RiEditLine className="h-4 w-4 text-text-tertiary" />
+                    <div className={s.actionItem} onClick={handleShowRename}>
+                      <span aria-hidden className="i-ri-edit-line h-4 w-4 text-text-tertiary" />
                       <span className={s.actionName}>{t('list.table.rename', { ns: 'datasetDocuments' })}</span>
                     </div>
                     {data_source_type === DataSourceType.FILE && (
-                      <div
-                        className={s.actionItem}
-                        onClick={(evt) => {
-                          evt.preventDefault()
-                          evt.stopPropagation()
-                          evt.nativeEvent.stopImmediatePropagation?.()
-                          handleDownload()
-                        }}
-                      >
-                        <RiDownload2Line className="h-4 w-4 text-text-tertiary" />
+                      <div className={s.actionItem} onClick={handleDownloadClick}>
+                        <span aria-hidden className="i-ri-download-2-line h-4 w-4 text-text-tertiary" />
                         <span className={s.actionName}>{t('list.action.download', { ns: 'datasetDocuments' })}</span>
                       </div>
                     )}
                     {['notion_import', DataSourceType.WEB].includes(data_source_type) && (
-                      <div className={s.actionItem} onClick={() => onOperate('sync')}>
-                        <RiLoopLeftLine className="h-4 w-4 text-text-tertiary" />
+                      <div className={s.actionItem} onClick={() => handleMenuOperation('sync')}>
+                        <span aria-hidden className="i-ri-loop-left-line h-4 w-4 text-text-tertiary" />
                         <span className={s.actionName}>{t('list.action.sync', { ns: 'datasetDocuments' })}</span>
                       </div>
                     )}
                     {IS_CE_EDITION && (
-                      <div className={s.actionItem} onClick={() => onOperate('summary')}>
-                        <SearchLinesSparkle className="h-4 w-4 text-text-tertiary" />
+                      <div className={s.actionItem} onClick={() => handleMenuOperation('summary')}>
+                        <span aria-hidden className="i-custom-vender-knowledge-search-lines-sparkle h-4 w-4 text-text-tertiary" />
                         <span className={s.actionName}>{t('list.action.summary', { ns: 'datasetDocuments' })}</span>
                       </div>
                     )}
@@ -230,62 +283,44 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
                 )}
                 {archived && data_source_type === DataSourceType.FILE && (
                   <>
-                    <div
-                      className={s.actionItem}
-                      onClick={(evt) => {
-                        evt.preventDefault()
-                        evt.stopPropagation()
-                        evt.nativeEvent.stopImmediatePropagation?.()
-                        handleDownload()
-                      }}
-                    >
-                      <RiDownload2Line className="h-4 w-4 text-text-tertiary" />
+                    <div className={s.actionItem} onClick={handleDownloadClick}>
+                      <span aria-hidden className="i-ri-download-2-line h-4 w-4 text-text-tertiary" />
                       <span className={s.actionName}>{t('list.action.download', { ns: 'datasetDocuments' })}</span>
                     </div>
                     <Divider className="my-1" />
                   </>
                 )}
                 {!archived && display_status?.toLowerCase() === 'indexing' && (
-                  <div className={s.actionItem} onClick={() => onOperate('pause')}>
-                    <RiPauseCircleLine className="h-4 w-4 text-text-tertiary" />
+                  <div className={s.actionItem} onClick={() => handleMenuOperation('pause')}>
+                    <span aria-hidden className="i-ri-pause-circle-line h-4 w-4 text-text-tertiary" />
                     <span className={s.actionName}>{t('list.action.pause', { ns: 'datasetDocuments' })}</span>
                   </div>
                 )}
                 {!archived && display_status?.toLowerCase() === 'paused' && (
-                  <div className={s.actionItem} onClick={() => onOperate('resume')}>
-                    <RiPlayCircleLine className="h-4 w-4 text-text-tertiary" />
+                  <div className={s.actionItem} onClick={() => handleMenuOperation('resume')}>
+                    <span aria-hidden className="i-ri-play-circle-line h-4 w-4 text-text-tertiary" />
                     <span className={s.actionName}>{t('list.action.resume', { ns: 'datasetDocuments' })}</span>
                   </div>
                 )}
                 {!archived && (
-                  <div className={s.actionItem} onClick={() => onOperate('archive')}>
-                    <RiArchive2Line className="h-4 w-4 text-text-tertiary" />
+                  <div className={s.actionItem} onClick={() => handleMenuOperation('archive')}>
+                    <span aria-hidden className="i-ri-archive-2-line h-4 w-4 text-text-tertiary" />
                     <span className={s.actionName}>{t('list.action.archive', { ns: 'datasetDocuments' })}</span>
                   </div>
                 )}
                 {archived && (
-                  <div className={s.actionItem} onClick={() => onOperate('un_archive')}>
-                    <RiArchive2Line className="h-4 w-4 text-text-tertiary" />
+                  <div className={s.actionItem} onClick={() => handleMenuOperation('un_archive')}>
+                    <span aria-hidden className="i-ri-archive-2-line h-4 w-4 text-text-tertiary" />
                     <span className={s.actionName}>{t('list.action.unarchive', { ns: 'datasetDocuments' })}</span>
                   </div>
                 )}
-                <div className={cn(s.actionItem, s.deleteActionItem, 'group')} onClick={() => setShowModal(true)}>
-                  <RiDeleteBinLine className="h-4 w-4 text-text-tertiary group-hover:text-text-destructive" />
+                <div className={cn(s.actionItem, s.deleteActionItem, 'group')} onClick={handleDeleteClick}>
+                  <span aria-hidden className="i-ri-delete-bin-line h-4 w-4 text-text-tertiary group-hover:text-text-destructive" />
                   <span className={cn(s.actionName, 'group-hover:text-text-destructive')}>{t('list.action.delete', { ns: 'datasetDocuments' })}</span>
                 </div>
               </div>
-            )}
-            trigger="click"
-            position="br"
-            btnElement={(
-              <div className={cn(s.commonIcon)}>
-                <RiMoreFill className="h-4 w-4 text-components-button-secondary-text" />
-              </div>
-            )}
-            btnClassName={open => cn(isListScene ? s.actionIconWrapperList : s.actionIconWrapperDetail, open ? '!hover:bg-state-base-hover !shadow-none' : '!bg-transparent')}
-            popupClassName="!w-full"
-            className={`!z-20 flex h-fit !w-[200px] justify-end ${className}`}
-          />
+            </DropdownMenuContent>
+          </DropdownMenu>
         </>
       )}
       <AlertDialog open={showModal} onOpenChange={open => !open && setShowModal(false)}>
diff --git a/web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx b/web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx
index 7f95e42bb7..35b62915da 100644
--- a/web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx
@@ -1,4 +1,3 @@
-import type { ReactNode } from 'react'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { Plan } from '@/app/components/billing/type'
@@ -30,18 +29,6 @@ vi.mock('@/app/components/billing/plan-upgrade-modal', () => ({
   ),
 }))
 
-// Mock Popover
-vi.mock('@/app/components/base/popover', () => ({
-  default: ({ htmlContent, btnElement, disabled }: { htmlContent: ReactNode, btnElement: ReactNode, disabled?: boolean }) => (
-    <div data-testid="popover">
-      <button data-testid="popover-btn" disabled={disabled}>
-        {btnElement}
-      </button>
-      <div data-testid="popover-content">{htmlContent}</div>
-    </div>
-  ),
-}))
-
 describe('SegmentAdd', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -70,10 +57,10 @@ describe('SegmentAdd', () => {
       expect(screen.getByText(/list\.action\.addButton/i)).toBeInTheDocument()
     })
 
-    it('should render popover for batch add', () => {
+    it('should render dropdown trigger for batch add', () => {
       render(<SegmentAdd {...defaultProps} />)
 
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /list\.action\.batchAdd/i })).toBeInTheDocument()
     })
   })
 
@@ -152,17 +139,20 @@ describe('SegmentAdd', () => {
       expect(mockClearProcessStatus).toHaveBeenCalledTimes(1)
     })
 
-    it('should render batch add option in popover', () => {
+    it('should render batch add option in dropdown', async () => {
       render(<SegmentAdd {...defaultProps} />)
 
-      expect(screen.getByText(/list\.action\.batchAdd/i)).toBeInTheDocument()
+      fireEvent.click(screen.getByRole('button', { name: /list\.action\.batchAdd/i }))
+
+      expect(await screen.findByRole('menuitem', { name: /list\.action\.batchAdd/i })).toBeInTheDocument()
     })
 
-    it('should call showBatchModal when batch add is clicked', () => {
+    it('should call showBatchModal when batch add is clicked', async () => {
       const mockShowBatchModal = vi.fn()
       render(<SegmentAdd {...defaultProps} showBatchModal={mockShowBatchModal} />)
 
-      fireEvent.click(screen.getByText(/list\.action\.batchAdd/i))
+      fireEvent.click(screen.getByRole('button', { name: /list\.action\.batchAdd/i }))
+      fireEvent.click(await screen.findByRole('menuitem', { name: /list\.action\.batchAdd/i }))
 
       expect(mockShowBatchModal).toHaveBeenCalledTimes(1)
     })
@@ -177,10 +167,10 @@ describe('SegmentAdd', () => {
       expect(addButton).toBeDisabled()
     })
 
-    it('should disable popover button when embedding is true', () => {
+    it('should disable batch menu trigger when embedding is true', () => {
       render(<SegmentAdd {...defaultProps} embedding={true} />)
 
-      expect(screen.getByTestId('popover-btn')).toBeDisabled()
+      expect(screen.getByRole('button', { name: /list\.action\.batchAdd/i })).toBeDisabled()
     })
 
     it('should apply disabled styling when embedding is true', () => {
diff --git a/web/app/components/datasets/documents/detail/segment-add/index.tsx b/web/app/components/datasets/documents/detail/segment-add/index.tsx
index cffeaa9263..db810b1d6b 100644
--- a/web/app/components/datasets/documents/detail/segment-add/index.tsx
+++ b/web/app/components/datasets/documents/detail/segment-add/index.tsx
@@ -1,18 +1,16 @@
 'use client'
 import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
-import {
-  RiAddLine,
-  RiArrowDownSLine,
-  RiErrorWarningFill,
-  RiLoader2Line,
-} from '@remixicon/react'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
-import { useCallback, useMemo } from 'react'
+import { useCallback, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { CheckCircle } from '@/app/components/base/icons/src/vender/solid/general'
-import Popover from '@/app/components/base/popover'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/app/components/base/ui/dropdown-menu'
 import PlanUpgradeModal from '@/app/components/billing/plan-upgrade-modal'
 import { Plan } from '@/app/components/billing/type'
 import { useProviderContext } from '@/context/provider-context'
@@ -47,6 +45,8 @@ const SegmentAdd: FC<ISegmentAddProps> = ({
   const { plan, enableBilling } = useProviderContext()
   const { type } = plan
   const canAdd = enableBilling ? type !== Plan.sandbox : true
+  const [isBatchMenuOpen, setIsBatchMenuOpen] = useState(false)
+  const batchMenuAnchorRef = useRef<HTMLDivElement>(null)
 
   const withNeedUpgradeCheck = useCallback((fn: () => void) => {
     return () => {
@@ -72,14 +72,14 @@ const SegmentAdd: FC<ISegmentAddProps> = ({
             shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]"
           >
             <div className={cn('absolute top-0 left-0 z-0 h-full border-r-[1.5px] border-r-components-progress-bar-progress-highlight bg-components-progress-bar-progress', importStatus === ProcessStatus.WAITING ? 'w-3/12' : 'w-2/3')} />
-            <RiLoader2Line className="mr-1 h-4 w-4 animate-spin" />
+            <span aria-hidden className="mr-1 i-ri-loader-2-line h-4 w-4 animate-spin" />
             <span className="z-10 pr-0.5 system-sm-medium">{t('list.batchModal.processing', { ns: 'datasetDocuments' })}</span>
           </div>
         )}
         {importStatus === ProcessStatus.COMPLETED && (
           <div className="relative mr-2 inline-flex items-center overflow-hidden rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]">
             <div className="inline-flex items-center border-r border-r-divider-subtle px-2.5 py-2 text-text-success">
-              <CheckCircle className="mr-1 h-4 w-4" />
+              <span aria-hidden className="mr-1 i-custom-vender-solid-general-check-circle h-4 w-4" />
               <span className="pr-0.5 system-sm-medium">{t('list.batchModal.completed', { ns: 'datasetDocuments' })}</span>
             </div>
             <div className="m-1 inline-flex items-center">
@@ -91,7 +91,7 @@ const SegmentAdd: FC<ISegmentAddProps> = ({
         {importStatus === ProcessStatus.ERROR && (
           <div className="relative mr-2 inline-flex items-center overflow-hidden rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]">
             <div className="inline-flex items-center border-r border-r-divider-subtle px-2.5 py-2 text-text-destructive">
-              <RiErrorWarningFill className="mr-1 h-4 w-4" />
+              <span aria-hidden className="mr-1 i-ri-error-warning-fill h-4 w-4" />
               <span className="pr-0.5 system-sm-medium">{t('list.batchModal.error', { ns: 'datasetDocuments' })}</span>
             </div>
             <div className="m-1 inline-flex items-center">
@@ -105,10 +105,12 @@ const SegmentAdd: FC<ISegmentAddProps> = ({
   }
 
   return (
-    <div className={cn(
-      'relative z-20 flex items-center rounded-lg border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]',
-      embedding && 'border-components-button-secondary-border-disabled bg-components-button-secondary-bg-disabled',
-    )}
+    <div
+      ref={batchMenuAnchorRef}
+      className={cn(
+        'relative z-20 flex items-center rounded-lg border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]',
+        embedding && 'border-components-button-secondary-border-disabled bg-components-button-secondary-bg-disabled',
+      )}
     >
       <button
         type="button"
@@ -117,42 +119,44 @@ const SegmentAdd: FC<ISegmentAddProps> = ({
         onClick={withNeedUpgradeCheck(showNewSegmentModal)}
         disabled={embedding}
       >
-        <RiAddLine className={cn('h-4 w-4', textColor)} />
+        <span aria-hidden className={cn('i-ri-add-line h-4 w-4', textColor)} />
         <span className={cn('ml-0.5 px-0.5 text-[13px] leading-[16px] font-medium capitalize', textColor)}>
           {t('list.action.addButton', { ns: 'datasetDocuments' })}
         </span>
       </button>
-      <Popover
-        position="br"
-        manualClose
-        trigger="click"
-        htmlContent={(
-          // need to wrapper the button with div when manualClose is true
+      <DropdownMenu open={isBatchMenuOpen} onOpenChange={setIsBatchMenuOpen}>
+        <DropdownMenuTrigger
+          aria-label={t('list.action.batchAdd', { ns: 'datasetDocuments' })}
+          disabled={embedding}
+          className={cn(
+            `rounded-l-none rounded-r-lg border-0 p-2 backdrop-blur-[5px]
+            hover:bg-state-base-hover disabled:cursor-not-allowed disabled:bg-transparent disabled:hover:bg-transparent`,
+            isBatchMenuOpen && 'bg-state-base-hover',
+          )}
+        >
+          <div className="flex items-center justify-center">
+            <span aria-hidden className={cn('i-ri-arrow-down-s-line h-4 w-4', textColor)} />
+          </div>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          placement="bottom-start"
+          sideOffset={4}
+          positionerProps={{ anchor: batchMenuAnchorRef }}
+          popupClassName="w-[var(--anchor-width)] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-0 shadow-xl shadow-shadow-shadow-5 backdrop-blur-[5px]"
+        >
           <div className="w-full p-1">
-            <button
-              type="button"
-              className="flex w-full items-center rounded-lg px-2 py-1.5 system-md-regular text-text-secondary"
-              onClick={withNeedUpgradeCheck(showBatchModal)}
+            <DropdownMenuItem
+              className="h-auto w-full px-2 py-1.5 system-md-regular"
+              onClick={() => {
+                setIsBatchMenuOpen(false)
+                withNeedUpgradeCheck(showBatchModal)()
+              }}
             >
               {t('list.action.batchAdd', { ns: 'datasetDocuments' })}
-            </button>
+            </DropdownMenuItem>
           </div>
-        )}
-        btnElement={(
-          <div className="flex items-center justify-center">
-            <RiArrowDownSLine className={cn('h-4 w-4', textColor)} />
-          </div>
-        )}
-        btnClassName={open => cn(
-          `!hover:bg-state-base-hover rounded-l-none! rounded-r-lg! border-0! p-2! backdrop-blur-[5px]
-          disabled:cursor-not-allowed disabled:bg-transparent disabled:hover:bg-transparent`,
-          open ? 'bg-state-base-hover!' : '',
-        )}
-        popupClassName="min-w-[128px]! bg-components-panel-bg-blur! rounded-xl! border-[0.5px] ring-0!
-          border-components-panel-border shadow-xl! shadow-shadow-shadow-5! backdrop-blur-[5px]"
-        className="h-fit min-w-[128px]"
-        disabled={embedding}
-      />
+        </DropdownMenuContent>
+      </DropdownMenu>
       {isShowPlanUpgradeModal && (
         <PlanUpgradeModal
           show
diff --git a/web/app/components/datasets/extra-info/api-access/index.tsx b/web/app/components/datasets/extra-info/api-access/index.tsx
index 57db1f2e9a..ece4c0835c 100644
--- a/web/app/components/datasets/extra-info/api-access/index.tsx
+++ b/web/app/components/datasets/extra-info/api-access/index.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ApiAggregate } from '@/app/components/base/icons/src/vender/knowledge'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '@/app/components/base/portal-to-follow-elem'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import Indicator from '@/app/components/header/indicator'
 import Card from './card'
 
@@ -19,45 +19,42 @@ const ApiAccess = ({
   const { t } = useTranslation()
   const [open, setOpen] = useState(false)
 
-  const handleToggle = () => {
-    setOpen(!open)
-  }
-
   return (
     <div className="p-3 pt-2">
-      <PortalToFollowElem
+      <Popover
         open={open}
         onOpenChange={setOpen}
-        placement="top-start"
-        offset={{
-          mainAxis: 4,
-          crossAxis: -4,
-        }}
       >
-        <PortalToFollowElemTrigger
-          className="w-full"
-          onClick={handleToggle}
-        >
-          <div className={cn(
-            'relative flex h-8 cursor-pointer items-center gap-2 rounded-lg border border-components-panel-border px-3',
-            !expand && 'w-8 justify-center',
-            open ? 'bg-state-base-hover' : 'hover:bg-state-base-hover',
+        <PopoverTrigger
+          render={(
+            <button type="button" className="w-full border-none bg-transparent p-0 text-left">
+              <div className={cn(
+                'relative flex h-8 cursor-pointer items-center gap-2 rounded-lg border border-components-panel-border px-3',
+                !expand && 'w-8 justify-center',
+                open ? 'bg-state-base-hover' : 'hover:bg-state-base-hover',
+              )}
+              >
+                <ApiAggregate className="size-4 shrink-0 text-text-secondary" />
+                {expand && <div className="grow system-sm-medium text-text-secondary">{t('appMenus.apiAccess', { ns: 'common' })}</div>}
+                <Indicator
+                  className={cn('shrink-0', !expand && 'absolute -top-px -right-px')}
+                  color={apiEnabled ? 'green' : 'yellow'}
+                />
+              </div>
+            </button>
           )}
-          >
-            <ApiAggregate className="size-4 shrink-0 text-text-secondary" />
-            {expand && <div className="grow system-sm-medium text-text-secondary">{t('appMenus.apiAccess', { ns: 'common' })}</div>}
-            <Indicator
-              className={cn('shrink-0', !expand && 'absolute -top-px -right-px')}
-              color={apiEnabled ? 'green' : 'yellow'}
-            />
-          </div>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent className="z-10">
+        />
+        <PopoverContent
+          placement="top-start"
+          sideOffset={4}
+          alignOffset={-4}
+          popupClassName="border-none bg-transparent shadow-none"
+        >
           <Card
             apiEnabled={apiEnabled}
           />
-        </PortalToFollowElemContent>
-      </PortalToFollowElem>
+        </PopoverContent>
+      </Popover>
     </div>
   )
 }
diff --git a/web/app/components/datasets/extra-info/service-api/index.tsx b/web/app/components/datasets/extra-info/service-api/index.tsx
index 33a6d32251..c4494f4ed7 100644
--- a/web/app/components/datasets/extra-info/service-api/index.tsx
+++ b/web/app/components/datasets/extra-info/service-api/index.tsx
@@ -2,7 +2,7 @@ import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '@/app/components/base/portal-to-follow-elem'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import Indicator from '@/app/components/header/indicator'
 import Card from './card'
 
@@ -16,45 +16,42 @@ const ServiceApi = ({
   const { t } = useTranslation()
   const [open, setOpen] = useState(false)
 
-  const handleToggle = () => {
-    setOpen(!open)
-  }
-
   return (
     <div>
-      <PortalToFollowElem
+      <Popover
         open={open}
         onOpenChange={setOpen}
-        placement="top-start"
-        offset={{
-          mainAxis: 4,
-          crossAxis: -4,
-        }}
       >
-        <PortalToFollowElemTrigger
-          className="w-full"
-          onClick={handleToggle}
-        >
-          <div className={cn(
-            'relative flex h-8 cursor-pointer items-center gap-2 rounded-lg border-[0.5px] border-components-button-secondary-border-hover bg-components-button-secondary-bg px-3',
-            open ? 'bg-components-button-secondary-bg-hover' : 'hover:bg-components-button-secondary-bg-hover',
+        <PopoverTrigger
+          render={(
+            <button type="button" className="w-full border-none bg-transparent p-0 text-left">
+              <div className={cn(
+                'relative flex h-8 cursor-pointer items-center gap-2 rounded-lg border-[0.5px] border-components-button-secondary-border-hover bg-components-button-secondary-bg px-3',
+                open ? 'bg-components-button-secondary-bg-hover' : 'hover:bg-components-button-secondary-bg-hover',
+              )}
+              >
+                <Indicator
+                  className={cn('shrink-0')}
+                  color={
+                    apiBaseUrl ? 'green' : 'yellow'
+                  }
+                />
+                <div className="grow system-sm-medium text-text-secondary">{t('serviceApi.title', { ns: 'dataset' })}</div>
+              </div>
+            </button>
           )}
-          >
-            <Indicator
-              className={cn('shrink-0')}
-              color={
-                apiBaseUrl ? 'green' : 'yellow'
-              }
-            />
-            <div className="grow system-sm-medium text-text-secondary">{t('serviceApi.title', { ns: 'dataset' })}</div>
-          </div>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent className="z-10">
+        />
+        <PopoverContent
+          placement="top-start"
+          sideOffset={4}
+          alignOffset={-4}
+          popupClassName="border-none bg-transparent shadow-none"
+        >
           <Card
             apiBaseUrl={apiBaseUrl}
           />
-        </PortalToFollowElemContent>
-      </PortalToFollowElem>
+        </PopoverContent>
+      </Popover>
     </div>
   )
 }
diff --git a/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx b/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx
index 29139da114..f6c7e1e93d 100644
--- a/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx
@@ -56,9 +56,9 @@ vi.mock('../components/dataset-card-modals', () => ({
   default: () => <div data-testid="card-modals" />,
 }))
 vi.mock('../components/tag-area', () => ({
-  default: React.forwardRef<HTMLDivElement, { onClick: (e: React.MouseEvent) => void }>(({ onClick }, ref) => (
-    <div ref={ref} data-testid="tag-area" onClick={onClick} />
-  )),
+  default: ({ onClick }: { onClick: (e: React.MouseEvent) => void, ref?: React.Ref<HTMLDivElement> }) => (
+    <div data-testid="tag-area" onClick={onClick} />
+  ),
 }))
 vi.mock('../components/operations-dropdown', () => ({
   default: () => <div data-testid="operations-dropdown" />,
diff --git a/web/app/components/datasets/list/dataset-card/__tests__/operation-item.spec.tsx b/web/app/components/datasets/list/dataset-card/__tests__/operation-item.spec.tsx
index 335f193146..7aadbb4a41 100644
--- a/web/app/components/datasets/list/dataset-card/__tests__/operation-item.spec.tsx
+++ b/web/app/components/datasets/list/dataset-card/__tests__/operation-item.spec.tsx
@@ -1,11 +1,10 @@
-import { RiEditLine } from '@remixicon/react'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { describe, expect, it, vi } from 'vitest'
 import OperationItem from '../operation-item'
 
 describe('OperationItem', () => {
   const defaultProps = {
-    Icon: RiEditLine,
+    iconClassName: 'i-ri-edit-line',
     name: 'Edit',
   }
 
@@ -17,7 +16,7 @@ describe('OperationItem', () => {
 
     it('should render the icon', () => {
       const { container } = render(<OperationItem {...defaultProps} />)
-      const icon = container.querySelector('svg')
+      const icon = container.querySelector('.i-ri-edit-line')
       expect(icon).toBeInTheDocument()
       expect(icon).toHaveClass('size-4', 'text-text-tertiary')
     })
diff --git a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx
index 690e01113f..2bb138e6dc 100644
--- a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx
@@ -1,6 +1,6 @@
 import type { DataSet } from '@/models/datasets'
 import { fireEvent, render, screen } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { IndexingType } from '@/app/components/datasets/create/step-two'
 import { ChunkingMode, DatasetPermission, DataSourceType } from '@/models/datasets'
 import OperationsDropdown from '../operations-dropdown'
diff --git a/web/app/components/datasets/list/dataset-card/operation-item.tsx b/web/app/components/datasets/list/dataset-card/operation-item.tsx
index afa0f174e8..668c9a3c53 100644
--- a/web/app/components/datasets/list/dataset-card/operation-item.tsx
+++ b/web/app/components/datasets/list/dataset-card/operation-item.tsx
@@ -1,14 +1,14 @@
-import type { RemixiconComponentType } from '@remixicon/react'
+import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
 
 type OperationItemProps = {
-  Icon: RemixiconComponentType
+  iconClassName: string
   name: string
   handleClick?: () => void
 }
 
 const OperationItem = ({
-  Icon,
+  iconClassName,
   name,
   handleClick,
 }: OperationItemProps) => {
@@ -21,7 +21,7 @@ const OperationItem = ({
         handleClick?.()
       }}
     >
-      <Icon className="size-4 text-text-tertiary" />
+      <span aria-hidden className={cn(iconClassName, 'size-4 text-text-tertiary')} />
       <span className="system-md-regular px-1 text-text-secondary">
         {name}
       </span>
diff --git a/web/app/components/datasets/list/dataset-card/operations.tsx b/web/app/components/datasets/list/dataset-card/operations.tsx
index 0deed2c4c9..04a5b8aef7 100644
--- a/web/app/components/datasets/list/dataset-card/operations.tsx
+++ b/web/app/components/datasets/list/dataset-card/operations.tsx
@@ -11,6 +11,7 @@ type OperationsProps = {
   openRenameModal: () => void
   handleExportPipeline: () => void
   detectIsUsedByApp: () => void
+  onClose?: () => void
 }
 
 const Operations = ({
@@ -19,17 +20,33 @@ const Operations = ({
   openRenameModal,
   handleExportPipeline,
   detectIsUsedByApp,
+  onClose,
 }: OperationsProps) => {
   const { t } = useTranslation()
 
+  const handleRename = () => {
+    onClose?.()
+    openRenameModal()
+  }
+
+  const handleExport = () => {
+    onClose?.()
+    handleExportPipeline()
+  }
+
+  const handleDelete = () => {
+    onClose?.()
+    detectIsUsedByApp()
+  }
+
   return (
     <>
-      <DropdownMenuItem onClick={openRenameModal}>
+      <DropdownMenuItem onClick={handleRename}>
         <span aria-hidden className="i-ri-edit-line size-4 text-text-tertiary" />
         {t('operation.edit', { ns: 'common' })}
       </DropdownMenuItem>
       {showExportPipeline && (
-        <DropdownMenuItem onClick={handleExportPipeline}>
+        <DropdownMenuItem onClick={handleExport}>
           <span aria-hidden className="i-ri-file-download-line size-4 text-text-tertiary" />
           {t('operations.exportPipeline', { ns: 'datasetPipeline' })}
         </DropdownMenuItem>
@@ -37,7 +54,7 @@ const Operations = ({
       {showDelete && (
         <>
           <DropdownMenuSeparator />
-          <DropdownMenuItem destructive onClick={detectIsUsedByApp}>
+          <DropdownMenuItem destructive onClick={handleDelete}>
             <span aria-hidden className="i-ri-delete-bin-line size-4" />
             {t('operation.delete', { ns: 'common' })}
           </DropdownMenuItem>
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-metadata-modal.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-metadata-modal.spec.tsx
index 3a8ed6b909..1449ef8f60 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-metadata-modal.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-metadata-modal.spec.tsx
@@ -3,14 +3,15 @@ import { describe, expect, it, vi } from 'vitest'
 import { DataType } from '../../types'
 import CreateMetadataModal from '../create-metadata-modal'
 
-type PortalProps = {
+type PopoverProps = {
   children: React.ReactNode
   open: boolean
+  onOpenChange?: (open: boolean) => void
 }
 
 type TriggerProps = {
-  children: React.ReactNode
-  onClick: () => void
+  children?: React.ReactNode
+  render?: React.ReactNode
 }
 
 type ContentProps = {
@@ -25,18 +26,37 @@ type CreateContentProps = {
   hasBack?: boolean
 }
 
-// Mock PortalToFollowElem components
-vi.mock('../../../../base/portal-to-follow-elem', () => ({
-  PortalToFollowElem: ({ children, open }: PortalProps) => (
-    <div data-testid="portal-wrapper" data-open={open}>{children}</div>
-  ),
-  PortalToFollowElemTrigger: ({ children, onClick }: TriggerProps) => (
-    <div data-testid="portal-trigger" onClick={onClick}>{children}</div>
-  ),
-  PortalToFollowElemContent: ({ children, className }: ContentProps) => (
-    <div data-testid="portal-content" className={className}>{children}</div>
-  ),
-}))
+vi.mock('../../../../base/ui/popover', async () => {
+  const React = await import('react')
+  const PopoverContext = React.createContext<{ open: boolean, onOpenChange?: (open: boolean) => void } | null>(null)
+
+  return {
+    Popover: ({ children, open, onOpenChange }: PopoverProps) => (
+      <PopoverContext.Provider value={{ open, onOpenChange }}>
+        <div data-testid="popover-root" data-open={String(open)}>{children}</div>
+      </PopoverContext.Provider>
+    ),
+    PopoverTrigger: ({ children, render }: TriggerProps) => {
+      const context = React.useContext(PopoverContext)
+      const content = render ?? children
+      const handleClick = () => context?.onOpenChange?.(!context.open)
+
+      if (React.isValidElement(content)) {
+        const element = content as React.ReactElement<{ onClick?: () => void }>
+        return React.cloneElement(element, { onClick: handleClick })
+      }
+
+      return <button type="button" data-testid="popover-trigger" onClick={handleClick}>{content}</button>
+    },
+    PopoverContent: ({ children, className }: ContentProps) => {
+      const context = React.useContext(PopoverContext)
+      if (!context?.open)
+        return null
+
+      return <div data-testid="popover-content" className={className}>{children}</div>
+    },
+  }
+})
 
 // Mock CreateContent component
 vi.mock('../create-content', () => ({
@@ -63,9 +83,8 @@ describe('CreateMetadataModal', () => {
           onSave={vi.fn()}
         />,
       )
-      // Portal wrapper should exist but closed
-      expect(screen.getByTestId('portal-wrapper')).toBeInTheDocument()
-      expect(screen.getByTestId('portal-wrapper')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'false')
     })
 
     it('should render content when open', () => {
@@ -77,7 +96,7 @@ describe('CreateMetadataModal', () => {
           onSave={vi.fn()}
         />,
       )
-      expect(screen.getByTestId('portal-wrapper')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
       expect(screen.getByTestId('create-content')).toBeInTheDocument()
     })
 
@@ -130,7 +149,7 @@ describe('CreateMetadataModal', () => {
           popupLeft={50}
         />,
       )
-      expect(screen.getByTestId('portal-wrapper')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
     })
   })
 
@@ -146,7 +165,7 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      fireEvent.click(screen.getByTestId('portal-trigger'))
+      fireEvent.click(screen.getByTestId('trigger-button'))
 
       expect(setOpen).toHaveBeenCalledWith(true)
     })
@@ -215,7 +234,7 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-wrapper')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'false')
 
       rerender(
         <CreateMetadataModal
@@ -226,7 +245,7 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-wrapper')).toHaveAttribute('data-open', 'true')
+      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'true')
     })
 
     it('should handle different trigger elements', () => {
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata-modal.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata-modal.spec.tsx
index 800ffc3586..2a31169b15 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata-modal.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata-modal.spec.tsx
@@ -9,14 +9,15 @@ type MetadataItem = {
   type: DataType
 }
 
-type PortalProps = {
+type PopoverProps = {
   children: React.ReactNode
   open: boolean
+  onOpenChange?: (open: boolean) => void
 }
 
 type TriggerProps = {
-  children: React.ReactNode
-  onClick: () => void
+  children?: React.ReactNode
+  render?: React.ReactNode
 }
 
 type ContentProps = {
@@ -49,18 +50,37 @@ vi.mock('@/service/knowledge/use-metadata', () => ({
   }),
 }))
 
-// Mock PortalToFollowElem components
-vi.mock('../../../../base/portal-to-follow-elem', () => ({
-  PortalToFollowElem: ({ children, open }: PortalProps) => (
-    <div data-testid="portal-wrapper" data-open={open}>{children}</div>
-  ),
-  PortalToFollowElemTrigger: ({ children, onClick }: TriggerProps) => (
-    <div data-testid="portal-trigger" onClick={onClick}>{children}</div>
-  ),
-  PortalToFollowElemContent: ({ children }: ContentProps) => (
-    <div data-testid="portal-content">{children}</div>
-  ),
-}))
+vi.mock('../../../../base/ui/popover', async () => {
+  const React = await import('react')
+  const PopoverContext = React.createContext<{ open: boolean, onOpenChange?: (open: boolean) => void } | null>(null)
+
+  return {
+    Popover: ({ children, open, onOpenChange }: PopoverProps) => (
+      <PopoverContext.Provider value={{ open, onOpenChange }}>
+        <div data-testid="popover-root" data-open={String(open)}>{children}</div>
+      </PopoverContext.Provider>
+    ),
+    PopoverTrigger: ({ children, render }: TriggerProps) => {
+      const context = React.useContext(PopoverContext)
+      const content = render ?? children
+      const handleClick = () => context?.onOpenChange?.(!context.open)
+
+      if (React.isValidElement(content)) {
+        const element = content as React.ReactElement<{ onClick?: () => void }>
+        return React.cloneElement(element, { onClick: handleClick })
+      }
+
+      return <button type="button" data-testid="popover-trigger" onClick={handleClick}>{content}</button>
+    },
+    PopoverContent: ({ children }: ContentProps) => {
+      const context = React.useContext(PopoverContext)
+      if (!context?.open)
+        return null
+
+      return <div data-testid="popover-content">{children}</div>
+    },
+  }
+})
 
 // Mock SelectMetadata component
 vi.mock('../select-metadata', () => ({
@@ -99,7 +119,7 @@ describe('SelectMetadataModal', () => {
           onManage={vi.fn()}
         />,
       )
-      expect(screen.getByTestId('portal-wrapper')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
     })
 
     it('should render trigger element', () => {
@@ -115,7 +135,7 @@ describe('SelectMetadataModal', () => {
       expect(screen.getByTestId('trigger-button')).toBeInTheDocument()
     })
 
-    it('should render SelectMetadata by default', () => {
+    it('should not render SelectMetadata before opening', () => {
       render(
         <SelectMetadataModal
           datasetId="dataset-1"
@@ -125,7 +145,7 @@ describe('SelectMetadataModal', () => {
           onManage={vi.fn()}
         />,
       )
-      expect(screen.getByTestId('select-metadata')).toBeInTheDocument()
+      expect(screen.queryByTestId('select-metadata')).not.toBeInTheDocument()
     })
 
     it('should pass dataset metadata to SelectMetadata', () => {
@@ -138,6 +158,7 @@ describe('SelectMetadataModal', () => {
           onManage={vi.fn()}
         />,
       )
+      fireEvent.click(screen.getByTestId('trigger-button'))
       expect(screen.getByTestId('list-count')).toHaveTextContent('2')
     })
   })
@@ -154,10 +175,10 @@ describe('SelectMetadataModal', () => {
         />,
       )
 
-      fireEvent.click(screen.getByTestId('portal-trigger'))
+      fireEvent.click(screen.getByTestId('trigger-button'))
 
-      // State should toggle
-      expect(screen.getByTestId('portal-wrapper')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'true')
+      expect(screen.getByTestId('select-metadata')).toBeInTheDocument()
     })
 
     it('should call onSelect and close when item is selected', () => {
@@ -172,6 +193,7 @@ describe('SelectMetadataModal', () => {
         />,
       )
 
+      fireEvent.click(screen.getByTestId('trigger-button'))
       fireEvent.click(screen.getByTestId('select-item'))
 
       expect(handleSelect).toHaveBeenCalledWith({
@@ -192,6 +214,7 @@ describe('SelectMetadataModal', () => {
         />,
       )
 
+      fireEvent.click(screen.getByTestId('trigger-button'))
       fireEvent.click(screen.getByTestId('new-btn'))
 
       await waitFor(() => {
@@ -211,6 +234,7 @@ describe('SelectMetadataModal', () => {
         />,
       )
 
+      fireEvent.click(screen.getByTestId('trigger-button'))
       fireEvent.click(screen.getByTestId('manage-btn'))
 
       expect(handleManage).toHaveBeenCalled()
@@ -230,6 +254,7 @@ describe('SelectMetadataModal', () => {
       )
 
       // Go to create step
+      fireEvent.click(screen.getByTestId('trigger-button'))
       fireEvent.click(screen.getByTestId('new-btn'))
 
       await waitFor(() => {
@@ -257,6 +282,7 @@ describe('SelectMetadataModal', () => {
       )
 
       // Go to create step
+      fireEvent.click(screen.getByTestId('trigger-button'))
       fireEvent.click(screen.getByTestId('new-btn'))
 
       await waitFor(() => {
@@ -287,7 +313,7 @@ describe('SelectMetadataModal', () => {
           popupPlacement="bottom-start"
         />,
       )
-      expect(screen.getByTestId('portal-wrapper')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
     })
 
     it('should accept custom popupOffset', () => {
@@ -301,7 +327,7 @@ describe('SelectMetadataModal', () => {
           popupOffset={{ mainAxis: 10, crossAxis: 5 }}
         />,
       )
-      expect(screen.getByTestId('portal-wrapper')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
     })
   })
 
@@ -317,7 +343,7 @@ describe('SelectMetadataModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-wrapper')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
 
       rerender(
         <SelectMetadataModal
@@ -329,7 +355,7 @@ describe('SelectMetadataModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-wrapper')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
     })
 
     it('should handle empty trigger', () => {
diff --git a/web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx b/web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx
index cf94bc5206..1e2e8fd9e8 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx
@@ -2,7 +2,7 @@
 import type { FC } from 'react'
 import type { Props as CreateContentProps } from './create-content'
 import * as React from 'react'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '../../../base/portal-to-follow-elem'
+import { Popover, PopoverContent, PopoverTrigger } from '../../../base/ui/popover'
 import CreateContent from './create-content'
 
 type Props = {
@@ -20,25 +20,25 @@ const CreateMetadataModal: FC<Props> = ({
   popupLeft = 20,
   ...createContentProps
 }) => {
+  const triggerElement = React.isValidElement(trigger)
+    ? trigger
+    : <button type="button">{trigger}</button>
+
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
       onOpenChange={setOpen}
-      placement="left-start"
-      offset={{
-        mainAxis: popupLeft,
-        crossAxis: -38,
-      }}
     >
-      <PortalToFollowElemTrigger
-        onClick={() => setOpen(!open)}
+      <PopoverTrigger render={triggerElement as React.ReactElement} />
+      <PopoverContent
+        placement="left-start"
+        sideOffset={popupLeft}
+        alignOffset={-38}
+        popupClassName="border-none bg-transparent shadow-none"
       >
-        {trigger}
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-1000">
         <CreateContent {...createContentProps} onClose={() => setOpen(false)} onBack={() => setOpen(false)} />
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
 
   )
 }
diff --git a/web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx b/web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx
index 70c0d67856..f33a85642e 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx
@@ -1,12 +1,12 @@
 'use client'
-import type { Placement } from '@floating-ui/react'
 import type { FC } from 'react'
 import type { MetadataItem } from '../types'
 import type { Props as CreateContentProps } from './create-content'
+import type { Placement } from '@/app/components/base/ui/placement'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import { useDatasetMetaData } from '@/service/knowledge/use-metadata'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '../../../base/portal-to-follow-elem'
 import CreateContent from './create-content'
 import SelectMetadata from './select-metadata'
 
@@ -38,25 +38,31 @@ const SelectMetadataModal: FC<Props> = ({
 
   const [open, setOpen] = useState(false)
   const [step, setStep] = useState(Step.select)
+  const triggerElement = React.isValidElement(trigger)
+    ? trigger
+    : <button type="button">{trigger}</button>
+  const handleOpenChange = useCallback((nextOpen: boolean) => {
+    setOpen(nextOpen)
+    if (!nextOpen)
+      setStep(Step.select)
+  }, [])
 
   const handleSave = useCallback(async (data: MetadataItem) => {
     await onSave(data)
     setStep(Step.select)
   }, [onSave])
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
-      onOpenChange={setOpen}
-      placement={popupPlacement}
-      offset={popupOffset}
+      onOpenChange={handleOpenChange}
     >
-      <PortalToFollowElemTrigger
-        onClick={() => setOpen(!open)}
-        className="block"
+      <PopoverTrigger render={triggerElement as React.ReactElement} />
+      <PopoverContent
+        placement={popupPlacement}
+        sideOffset={popupOffset.mainAxis}
+        alignOffset={popupOffset.crossAxis}
+        popupClassName="border-none bg-transparent shadow-none"
       >
-        {trigger}
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-1000">
         {step === Step.select
           ? (
               <SelectMetadata
@@ -66,7 +72,11 @@ const SelectMetadataModal: FC<Props> = ({
                 }}
                 list={datasetMetaData?.doc_metadata || []}
                 onNew={() => setStep(Step.create)}
-                onManage={onManage}
+                onManage={() => {
+                  setOpen(false)
+                  setStep(Step.select)
+                  onManage()
+                }}
               />
             )
           : (
@@ -77,8 +87,8 @@ const SelectMetadataModal: FC<Props> = ({
                 onClose={() => setStep(Step.select)}
               />
             )}
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
 
   )
 }
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/__tests__/json-importer.spec.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/__tests__/json-importer.spec.tsx
new file mode 100644
index 0000000000..9344673a35
--- /dev/null
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/__tests__/json-importer.spec.tsx
@@ -0,0 +1,276 @@
+import { fireEvent, render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { JSON_SCHEMA_MAX_DEPTH } from '@/config'
+import JsonImporter from '../json-importer'
+
+const mockEmit = vi.fn()
+const mockCheckJsonDepth = vi.fn()
+const visualEditorState = {
+  advancedEditing: false,
+  isAddingNewField: false,
+}
+
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (key: string) => key,
+  }),
+}))
+
+vi.mock('../visual-editor/context', () => ({
+  useMittContext: () => ({
+    emit: mockEmit,
+  }),
+}))
+
+vi.mock('../visual-editor/store', () => ({
+  useVisualEditorStore: (selector: (state: typeof visualEditorState) => unknown) => selector(visualEditorState),
+}))
+
+vi.mock('../../../utils', () => ({
+  checkJsonDepth: (...args: unknown[]) => mockCheckJsonDepth(...args),
+}))
+
+vi.mock('../code-editor', () => ({
+  default: ({
+    value,
+    onUpdate,
+  }: {
+    value: string
+    onUpdate: (value: string) => void
+  }) => (
+    <textarea
+      aria-label="json-editor"
+      value={value}
+      onChange={e => onUpdate(e.target.value)}
+    />
+  ),
+}))
+
+vi.mock('../error-message', () => ({
+  default: ({ message }: { message: string }) => <div data-testid="error-message">{message}</div>,
+}))
+
+vi.mock('@/app/components/base/ui/popover', async () => {
+  const ReactModule = await vi.importActual<typeof import('react')>('react')
+
+  const PopoverContext = ReactModule.createContext<{
+    open: boolean
+    onOpenChange?: (open: boolean) => void
+  } | null>(null)
+
+  const PopoverTrigger = ReactModule.forwardRef<HTMLButtonElement, React.ButtonHTMLAttributes<HTMLButtonElement>>(
+    ({ children, onClick, ...props }, ref) => {
+      const context = ReactModule.useContext(PopoverContext)
+
+      return (
+        <button
+          ref={ref}
+          type="button"
+          {...props}
+          onClick={(event) => {
+            onClick?.(event)
+            context?.onOpenChange?.(!context.open)
+          }}
+        >
+          {children}
+        </button>
+      )
+    },
+  )
+
+  PopoverTrigger.displayName = 'PopoverTrigger'
+
+  return {
+    Popover: ({
+      children,
+      open,
+      onOpenChange,
+    }: {
+      children: React.ReactNode
+      open: boolean
+      onOpenChange?: (open: boolean) => void
+    }) => (
+      <PopoverContext.Provider value={{ open, onOpenChange }}>
+        {children}
+      </PopoverContext.Provider>
+    ),
+    PopoverTrigger,
+    PopoverContent: ({ children }: { children: React.ReactNode }) => {
+      const context = ReactModule.useContext(PopoverContext)
+      if (!context?.open)
+        return null
+
+      return <div data-testid="popover-content">{children}</div>
+    },
+  }
+})
+
+describe('JsonImporter', () => {
+  const mockOnSubmit = vi.fn()
+  const mockUpdateBtnWidth = vi.fn()
+  const throwUnknown = (error: unknown): never => {
+    throw error
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    visualEditorState.advancedEditing = false
+    visualEditorState.isAddingNewField = false
+    mockCheckJsonDepth.mockReturnValue(1)
+    vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockReturnValue({
+      width: 88,
+      height: 32,
+      top: 0,
+      right: 0,
+      bottom: 0,
+      left: 0,
+      x: 0,
+      y: 0,
+      toJSON: () => ({}),
+    } as DOMRect)
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('measures the trigger width and opens the importer without quitting editing by default', async () => {
+    const user = userEvent.setup()
+
+    render(
+      <JsonImporter
+        onSubmit={mockOnSubmit}
+        updateBtnWidth={mockUpdateBtnWidth}
+      />,
+    )
+
+    expect(mockUpdateBtnWidth).toHaveBeenCalledWith(88)
+
+    await user.click(screen.getByRole('button', { name: 'nodes.llm.jsonSchema.import' }))
+
+    expect(screen.getByTestId('popover-content')).toBeInTheDocument()
+    expect(mockEmit).not.toHaveBeenCalled()
+  })
+
+  it('emits quitEditing when opening while advanced editing is active', async () => {
+    visualEditorState.advancedEditing = true
+    const user = userEvent.setup()
+
+    render(
+      <JsonImporter
+        onSubmit={mockOnSubmit}
+        updateBtnWidth={mockUpdateBtnWidth}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'nodes.llm.jsonSchema.import' }))
+
+    expect(mockEmit).toHaveBeenCalledWith('quitEditing', {})
+  })
+
+  it('shows a parse error when the root value is not an object', async () => {
+    const user = userEvent.setup()
+
+    render(
+      <JsonImporter
+        onSubmit={mockOnSubmit}
+        updateBtnWidth={mockUpdateBtnWidth}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'nodes.llm.jsonSchema.import' }))
+    fireEvent.change(screen.getByLabelText('json-editor'), { target: { value: '[]' } })
+    await user.click(screen.getByRole('button', { name: 'operation.submit' }))
+
+    expect(screen.getByTestId('error-message')).toHaveTextContent('Root must be an object, not an array or primitive value.')
+    expect(mockOnSubmit).not.toHaveBeenCalled()
+  })
+
+  it('shows a depth error when the schema exceeds the configured maximum', async () => {
+    mockCheckJsonDepth.mockReturnValue(JSON_SCHEMA_MAX_DEPTH + 1)
+    const user = userEvent.setup()
+
+    render(
+      <JsonImporter
+        onSubmit={mockOnSubmit}
+        updateBtnWidth={mockUpdateBtnWidth}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'nodes.llm.jsonSchema.import' }))
+    fireEvent.change(screen.getByLabelText('json-editor'), { target: { value: '{"foo":{"bar":1}}' } })
+    await user.click(screen.getByRole('button', { name: 'operation.submit' }))
+
+    expect(screen.getByTestId('error-message')).toHaveTextContent(`Schema exceeds maximum depth of ${JSON_SCHEMA_MAX_DEPTH}.`)
+    expect(mockOnSubmit).not.toHaveBeenCalled()
+  })
+
+  it('shows the parser error when JSON.parse throws an Error', async () => {
+    const user = userEvent.setup()
+    const parseSpy = vi.spyOn(JSON, 'parse').mockImplementationOnce(() => {
+      throw new Error('Malformed JSON payload')
+    })
+
+    render(
+      <JsonImporter
+        onSubmit={mockOnSubmit}
+        updateBtnWidth={mockUpdateBtnWidth}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'nodes.llm.jsonSchema.import' }))
+    fireEvent.change(screen.getByLabelText('json-editor'), { target: { value: '{"foo":1}' } })
+    await user.click(screen.getByRole('button', { name: 'operation.submit' }))
+
+    expect(screen.getByTestId('error-message')).toHaveTextContent('Malformed JSON payload')
+    expect(mockOnSubmit).not.toHaveBeenCalled()
+
+    parseSpy.mockRestore()
+  })
+
+  it('falls back to the default invalid JSON message when JSON.parse throws a non-Error value', async () => {
+    const user = userEvent.setup()
+    const parseSpy = vi.spyOn(JSON, 'parse').mockImplementationOnce(() => throwUnknown(Object.create(null)))
+
+    render(
+      <JsonImporter
+        onSubmit={mockOnSubmit}
+        updateBtnWidth={mockUpdateBtnWidth}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'nodes.llm.jsonSchema.import' }))
+    fireEvent.change(screen.getByLabelText('json-editor'), { target: { value: '{"foo":1}' } })
+    await user.click(screen.getByRole('button', { name: 'operation.submit' }))
+
+    expect(screen.getByTestId('error-message')).toHaveTextContent('Invalid JSON')
+    expect(mockOnSubmit).not.toHaveBeenCalled()
+
+    parseSpy.mockRestore()
+  })
+
+  it('submits valid JSON and closes the popover from footer actions', async () => {
+    const user = userEvent.setup()
+
+    render(
+      <JsonImporter
+        onSubmit={mockOnSubmit}
+        updateBtnWidth={mockUpdateBtnWidth}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'nodes.llm.jsonSchema.import' }))
+    fireEvent.change(screen.getByLabelText('json-editor'), { target: { value: '{"foo":"bar"}' } })
+    await user.click(screen.getByRole('button', { name: 'operation.submit' }))
+
+    expect(mockOnSubmit).toHaveBeenCalledWith({ foo: 'bar' })
+    expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
+
+    await user.click(screen.getByRole('button', { name: 'nodes.llm.jsonSchema.import' }))
+    await user.click(screen.getByRole('button', { name: 'operation.cancel' }))
+
+    expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
+  })
+})
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
index 8864b52735..673fd23ef2 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
@@ -4,8 +4,8 @@ import { RiCloseLine } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '@/app/components/base/portal-to-follow-elem'
 import { Button } from '@/app/components/base/ui/button'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import { JSON_SCHEMA_MAX_DEPTH } from '@/config'
 import { checkJsonDepth } from '../../utils'
 import CodeEditor from './code-editor'
@@ -26,7 +26,7 @@ const JsonImporter: FC<JsonImporterProps> = ({
   const [open, setOpen] = useState(false)
   const [json, setJson] = useState('')
   const [parseError, setParseError] = useState<any>(null)
-  const importBtnRef = useRef<HTMLElement>(null)
+  const importBtnRef = useRef<HTMLButtonElement>(null)
   const advancedEditing = useVisualEditorStore(state => state.advancedEditing)
   const isAddingNewField = useVisualEditorStore(state => state.isAddingNewField)
   const { emit } = useMittContext()
@@ -36,14 +36,13 @@ const JsonImporter: FC<JsonImporterProps> = ({
       const rect = importBtnRef.current.getBoundingClientRect()
       updateBtnWidth(rect.width)
     }
-  }, [])
+  }, [updateBtnWidth])
 
-  const handleTrigger = useCallback((e: React.MouseEvent<HTMLElement, MouseEvent>) => {
-    e.stopPropagation()
-    if (advancedEditing || isAddingNewField)
+  const handleOpenChange = useCallback((nextOpen: boolean) => {
+    if (nextOpen && (advancedEditing || isAddingNewField))
       emit('quitEditing', {})
-    setOpen(!open)
-  }, [open, advancedEditing, isAddingNewField, emit])
+    setOpen(nextOpen)
+  }, [advancedEditing, emit, isAddingNewField])
 
   const onClose = useCallback(() => {
     setOpen(false)
@@ -77,27 +76,26 @@ const JsonImporter: FC<JsonImporterProps> = ({
   }, [onSubmit, json])
 
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
-      onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={{
-        mainAxis: 4,
-        crossAxis: 16,
-      }}
+      onOpenChange={handleOpenChange}
     >
-      <PortalToFollowElemTrigger ref={importBtnRef} onClick={handleTrigger}>
-        <button
-          type="button"
-          className={cn(
-            'flex shrink-0 rounded-md px-1.5 py-1 system-xs-medium text-text-tertiary hover:bg-components-button-ghost-bg-hover',
-            open && 'bg-components-button-ghost-bg-hover',
-          )}
-        >
-          <span className="px-0.5">{t('nodes.llm.jsonSchema.import', { ns: 'workflow' })}</span>
-        </button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-100">
+      <PopoverTrigger
+        ref={importBtnRef}
+        onClick={e => e.stopPropagation()}
+        className={cn(
+          'flex shrink-0 rounded-md px-1.5 py-1 system-xs-medium text-text-tertiary hover:bg-components-button-ghost-bg-hover',
+          open && 'bg-components-button-ghost-bg-hover',
+        )}
+      >
+        <span className="px-0.5">{t('nodes.llm.jsonSchema.import', { ns: 'workflow' })}</span>
+      </PopoverTrigger>
+      <PopoverContent
+        placement="bottom-end"
+        sideOffset={4}
+        alignOffset={16}
+        popupClassName="border-none bg-transparent shadow-none"
+      >
         <div className="flex w-[400px] flex-col rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-2xl shadow-shadow-shadow-9">
           {/* Title */}
           <div className="relative px-3 pt-3.5 pb-1">
@@ -129,8 +127,8 @@ const JsonImporter: FC<JsonImporterProps> = ({
             </Button>
           </div>
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/variable-assigner/components/add-variable/index.tsx b/web/app/components/workflow/nodes/variable-assigner/components/add-variable/index.tsx
index e674a5f169..53c3c36e04 100644
--- a/web/app/components/workflow/nodes/variable-assigner/components/add-variable/index.tsx
+++ b/web/app/components/workflow/nodes/variable-assigner/components/add-variable/index.tsx
@@ -11,11 +11,7 @@ import {
   useState,
 } from 'react'
 import { Plus02 } from '@/app/components/base/icons/src/vender/line/general'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import AddVariablePopup from '@/app/components/workflow/nodes/_base/components/add-variable-popup'
 import { useVariableAssigner } from '../../hooks'
 
@@ -50,39 +46,43 @@ const AddVariable = ({
       variableAssignerNodeData.selected && 'flex!',
     )}
     >
-      <PortalToFollowElem
-        placement="right"
-        offset={4}
+      <Popover
         open={open}
         onOpenChange={setOpen}
       >
-        <PortalToFollowElemTrigger
-          onClick={() => setOpen(!open)}
+        <PopoverTrigger
+          render={(
+            <button type="button" className="block border-none bg-transparent p-0">
+              <div
+                className={cn(
+                  'group/addvariable flex items-center justify-center',
+                  'h-4 w-4 cursor-pointer',
+                  'hover:rounded-full hover:bg-primary-600',
+                  open && 'rounded-full! bg-primary-600!',
+                )}
+              >
+                <Plus02
+                  className={cn(
+                    'h-2.5 w-2.5 text-text-tertiary',
+                    'group-hover/addvariable:text-text-primary',
+                    open && 'text-text-primary!',
+                  )}
+                />
+              </div>
+            </button>
+          )}
+        />
+        <PopoverContent
+          placement="right"
+          sideOffset={4}
+          popupClassName="border-none bg-transparent shadow-none"
         >
-          <div
-            className={cn(
-              'group/addvariable flex items-center justify-center',
-              'h-4 w-4 cursor-pointer',
-              'hover:rounded-full hover:bg-primary-600',
-              open && 'rounded-full! bg-primary-600!',
-            )}
-          >
-            <Plus02
-              className={cn(
-                'h-2.5 w-2.5 text-text-tertiary',
-                'group-hover/addvariable:text-text-primary',
-                open && 'text-text-primary!',
-              )}
-            />
-          </div>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent className="z-1000">
           <AddVariablePopup
             onSelect={handleSelectVariable}
             availableVars={availableVars}
           />
-        </PortalToFollowElemContent>
-      </PortalToFollowElem>
+        </PopoverContent>
+      </Popover>
     </div>
   )
 }
diff --git a/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal-trigger.tsx b/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal-trigger.tsx
index 0e1449e5a8..35845cd005 100644
--- a/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal-trigger.tsx
+++ b/web/app/components/workflow/panel/chat-variable-panel/components/variable-modal-trigger.tsx
@@ -3,12 +3,8 @@ import type { ConversationVariable } from '@/app/components/workflow/types'
 import { RiAddLine } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { Button } from '@/app/components/base/ui/button'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import VariableModal from '@/app/components/workflow/panel/chat-variable-panel/components/variable-modal'
 
 type Props = {
@@ -29,33 +25,31 @@ const VariableModalTrigger = ({
   onSave,
 }: Props) => {
   const { t } = useTranslation()
+  const handleOpenChange = React.useCallback((nextOpen: boolean) => {
+    setOpen(nextOpen)
+    if (!nextOpen)
+      onClose()
+  }, [onClose, setOpen])
 
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
-      onOpenChange={() => {
-        setOpen(v => !v)
-        if (open)
-          onClose()
-      }}
-      placement="left-start"
-      offset={{
-        mainAxis: 8,
-        alignmentAxis: showTip ? -278 : -48,
-      }}
+      onOpenChange={handleOpenChange}
     >
-      <PortalToFollowElemTrigger onClick={() => {
-        setOpen(v => !v)
-        if (open)
-          onClose()
-      }}
+      <PopoverTrigger
+        render={(
+          <Button variant="primary">
+            <RiAddLine className="mr-1 h-4 w-4" />
+            <span className="system-sm-medium">{t('chatVariable.button', { ns: 'workflow' })}</span>
+          </Button>
+        )}
+      />
+      <PopoverContent
+        placement="left-start"
+        sideOffset={8}
+        alignOffset={showTip ? -278 : -48}
+        popupClassName="border-none bg-transparent shadow-none"
       >
-        <Button variant="primary">
-          <RiAddLine className="mr-1 h-4 w-4" />
-          <span className="system-sm-medium">{t('chatVariable.button', { ns: 'workflow' })}</span>
-        </Button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-11">
         <VariableModal
           chatVar={chatVar}
           onSave={onSave}
@@ -64,8 +58,8 @@ const VariableModalTrigger = ({
             setOpen(false)
           }}
         />
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/workflow/panel/env-panel/variable-trigger.tsx b/web/app/components/workflow/panel/env-panel/variable-trigger.tsx
index 657d5bf043..e075238e48 100644
--- a/web/app/components/workflow/panel/env-panel/variable-trigger.tsx
+++ b/web/app/components/workflow/panel/env-panel/variable-trigger.tsx
@@ -3,12 +3,8 @@ import type { EnvironmentVariable } from '@/app/components/workflow/types'
 import { RiAddLine } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { Button } from '@/app/components/base/ui/button'
+import { Popover, PopoverContent, PopoverTrigger } from '@/app/components/base/ui/popover'
 import VariableModal from '@/app/components/workflow/panel/env-panel/variable-modal'
 
 type Props = {
@@ -27,33 +23,31 @@ const VariableTrigger = ({
   onSave,
 }: Props) => {
   const { t } = useTranslation()
+  const handleOpenChange = React.useCallback((nextOpen: boolean) => {
+    setOpen(nextOpen)
+    if (!nextOpen)
+      onClose()
+  }, [onClose, setOpen])
 
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
-      onOpenChange={() => {
-        setOpen(v => !v)
-        if (open)
-          onClose()
-      }}
-      placement="left-start"
-      offset={{
-        mainAxis: 8,
-        alignmentAxis: -104,
-      }}
+      onOpenChange={handleOpenChange}
     >
-      <PortalToFollowElemTrigger onClick={() => {
-        setOpen(v => !v)
-        if (open)
-          onClose()
-      }}
+      <PopoverTrigger
+        render={(
+          <Button variant="primary">
+            <RiAddLine className="mr-1 h-4 w-4" />
+            <span className="system-sm-medium">{t('env.envPanelButton', { ns: 'workflow' })}</span>
+          </Button>
+        )}
+      />
+      <PopoverContent
+        placement="left-start"
+        sideOffset={8}
+        alignOffset={-104}
+        popupClassName="border-none bg-transparent shadow-none"
       >
-        <Button variant="primary">
-          <RiAddLine className="mr-1 h-4 w-4" />
-          <span className="system-sm-medium">{t('env.envPanelButton', { ns: 'workflow' })}</span>
-        </Button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-11">
         <VariableModal
           env={env}
           onSave={onSave}
@@ -62,8 +56,8 @@ const VariableTrigger = ({
             setOpen(false)
           }}
         />
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/docs/overlay-migration.md b/web/docs/overlay-migration.md
index d72e86404c..6762c2bfb1 100644
--- a/web/docs/overlay-migration.md
+++ b/web/docs/overlay-migration.md
@@ -9,7 +9,6 @@ This document tracks the migration away from legacy overlay APIs.
   - `@/app/components/base/tooltip`
   - `@/app/components/base/modal`
   - `@/app/components/base/select` (including `custom` / `pure`)
-  - `@/app/components/base/popover`
   - `@/app/components/base/dropdown`
   - `@/app/components/base/dialog`
   - `@/app/components/base/toast` (including `context`)
diff --git a/web/eslint-suppressions.json b/web/eslint-suppressions.json
index 2124d7f936..db20c37db5 100644
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json
@@ -311,15 +311,6 @@
     }
   },
   "app/components/app/annotation/header-opts/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react/component-hook-factories": {
-      "count": 1
-    },
-    "react/no-nested-component-definitions": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -348,11 +339,6 @@
       "count": 1
     }
   },
-  "app/components/app/app-access-control/add-member-or-group-pop.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "app/components/app/app-access-control/specific-groups-or-members.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -367,9 +353,6 @@
     }
   },
   "app/components/app/app-publisher/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 5
     }
@@ -464,11 +447,6 @@
       "count": 1
     }
   },
-  "app/components/app/configuration/config-vision/param-config.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "app/components/app/configuration/config/agent/agent-setting/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -764,9 +742,6 @@
     }
   },
   "app/components/app/log/model-info.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -854,12 +829,6 @@
   },
   "app/components/apps/app-card.tsx": {
     "no-restricted-imports": {
-      "count": 3
-    },
-    "react/component-hook-factories": {
-      "count": 1
-    },
-    "react/no-nested-component-definitions": {
       "count": 1
     },
     "react/set-state-in-effect": {
@@ -1780,7 +1749,7 @@
   },
   "app/components/base/icons/src/vender/line/files/index.ts": {
     "no-barrel-files/no-barrel-files": {
-      "count": 7
+      "count": 6
     }
   },
   "app/components/base/icons/src/vender/line/financeAndECommerce/index.ts": {
@@ -2210,11 +2179,6 @@
       "count": 1
     }
   },
-  "app/components/base/popover/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "app/components/base/portal-to-follow-elem/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
@@ -2579,18 +2543,10 @@
     }
   },
   "app/components/base/tag-management/panel.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "tailwindcss/enforce-consistent-class-order": {
       "count": 5
     }
   },
-  "app/components/base/tag-management/selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "app/components/base/tag-management/tag-item-editor.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -2875,11 +2831,6 @@
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/list/template-card/actions.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "app/components/datasets/create-from-pipeline/list/template-card/content.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
@@ -2900,11 +2851,6 @@
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/list/template-card/operations.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "app/components/datasets/create/embedding-process/indexing-progress-item.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -2984,11 +2930,6 @@
       "count": 1
     }
   },
-  "app/components/datasets/create/step-two/language-select/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "app/components/datasets/create/step-two/preview-item/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -3104,7 +3045,7 @@
   },
   "app/components/datasets/documents/components/operations.tsx": {
     "no-restricted-imports": {
-      "count": 2
+      "count": 1
     }
   },
   "app/components/datasets/documents/components/rename-modal.tsx": {
@@ -3409,9 +3350,6 @@
     "erasable-syntax-only/enums": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-refresh/only-export-components": {
       "count": 1
     }
@@ -3460,16 +3398,6 @@
       "count": 4
     }
   },
-  "app/components/datasets/extra-info/api-access/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "app/components/datasets/extra-info/service-api/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "app/components/datasets/extra-info/statistics.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3577,9 +3505,6 @@
     }
   },
   "app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -3597,9 +3522,6 @@
   "app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "app/components/datasets/metadata/metadata-dataset/select-metadata.tsx": {
@@ -6730,9 +6652,6 @@
     }
   },
   "app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 3
     }
@@ -7258,11 +7177,6 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/variable-assigner/components/add-variable/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "app/components/workflow/nodes/variable-assigner/components/var-group-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
@@ -7400,11 +7314,6 @@
       "count": 2
     }
   },
-  "app/components/workflow/panel/chat-variable-panel/components/variable-modal-trigger.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "app/components/workflow/panel/chat-variable-panel/components/variable-type-select.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -7462,11 +7371,6 @@
       "count": 1
     }
   },
-  "app/components/workflow/panel/env-panel/variable-trigger.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "app/components/workflow/panel/human-input-form-list.tsx": {
     "ts/no-explicit-any": {
       "count": 1
diff --git a/web/eslint.constants.mjs b/web/eslint.constants.mjs
index d6b6f834a1..fb912d6524 100644
--- a/web/eslint.constants.mjs
+++ b/web/eslint.constants.mjs
@@ -52,13 +52,6 @@ export const OVERLAY_RESTRICTED_IMPORT_PATTERNS = [
     ],
     message: 'Deprecated: use @/app/components/base/ui/select instead. See issue #32767.',
   },
-  {
-    group: [
-      '**/base/popover',
-      '**/base/popover/index',
-    ],
-    message: 'Deprecated: use @/app/components/base/ui/popover instead. See issue #32767.',
-  },
   {
     group: [
       '**/base/dropdown',

From c3eff6abdcedec85cc9c7e0bb8cc8069f59bc839 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 16 Apr 2026 13:36:20 +0800
Subject: [PATCH 12/36] fix(web): set app card dropdown menu to non-modal
 (#35302)

---
 web/app/components/apps/__tests__/app-card.spec.tsx | 9 ++++++++-
 web/app/components/apps/app-card.tsx                | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/app/components/apps/__tests__/app-card.spec.tsx b/web/app/components/apps/__tests__/app-card.spec.tsx
index 2d01dfb320..84f8b87fa7 100644
--- a/web/app/components/apps/__tests__/app-card.spec.tsx
+++ b/web/app/components/apps/__tests__/app-card.spec.tsx
@@ -208,14 +208,16 @@ vi.mock('@/app/components/base/ui/dropdown-menu', () => {
     DropdownMenu: ({
       children,
       open = false,
+      modal,
       onOpenChange,
     }: {
       children: React.ReactNode
       open?: boolean
+      modal?: boolean
       onOpenChange?: (open: boolean) => void
     }) => (
       <DropdownMenuContext value={{ isOpen: open, setOpen: onOpenChange ?? vi.fn() }}>
-        <div data-testid="dropdown-menu" data-open={open}>
+        <div data-testid="dropdown-menu" data-open={open} data-modal={modal}>
           {children}
         </div>
       </DropdownMenuContext>
@@ -461,6 +463,11 @@ describe('AppCard', () => {
       expect(screen.getByTestId('dropdown-menu')).toBeInTheDocument()
     })
 
+    it('should render dropdown menu as non-modal', () => {
+      render(<AppCard app={mockApp} />)
+      expect(screen.getByTestId('dropdown-menu')).toHaveAttribute('data-modal', 'false')
+    })
+
     it('should show edit option when dropdown menu is opened', async () => {
       render(<AppCard app={mockApp} />)
 
diff --git a/web/app/components/apps/app-card.tsx b/web/app/components/apps/app-card.tsx
index fe3e67b577..ba85ce5178 100644
--- a/web/app/components/apps/app-card.tsx
+++ b/web/app/components/apps/app-card.tsx
@@ -514,7 +514,7 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
                 )}
               >
                 <div className="mx-1 h-[14px] w-px shrink-0 bg-divider-regular" />
-                <DropdownMenu open={isOperationsMenuOpen} onOpenChange={setIsOperationsMenuOpen}>
+                <DropdownMenu modal={false} open={isOperationsMenuOpen} onOpenChange={setIsOperationsMenuOpen}>
                   <DropdownMenuTrigger
                     aria-label={t('operation.more', { ns: 'common' })}
                     className={cn(

From 0fea760143eb1b78835db6c7d42c7c048eee3547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=9E=E6=B3=95=E6=93=8D=E4=BD=9C?= <hjlarry@163.com>
Date: Thu, 16 Apr 2026 14:06:57 +0800
Subject: [PATCH 13/36] fix: http node key value type dropdown (#35304)

---
 .../nodes/http/__tests__/integration.spec.tsx | 33 ++++++++++++-
 .../key-value/key-value-edit/item.tsx         | 46 +++++++++++++------
 web/eslint-suppressions.json                  |  3 --
 3 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/web/app/components/workflow/nodes/http/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/http/__tests__/integration.spec.tsx
index 99d240c6d6..93a4d08c3d 100644
--- a/web/app/components/workflow/nodes/http/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/http/__tests__/integration.spec.tsx
@@ -495,8 +495,8 @@ describe('http path', () => {
       )
 
       fireEvent.change(screen.getAllByDisplayValue('alice')[0], { target: { value: 'bob' } })
-      await user.click(screen.getByText('text'))
-      await user.click(screen.getByText('file'))
+      await user.click(screen.getAllByRole('combobox', { name: 'workflow.nodes.http.type' })[0]!)
+      await user.click(screen.getByRole('option', { name: /file/i }))
 
       expect(onChange).toHaveBeenCalled()
     })
@@ -558,6 +558,35 @@ describe('http path', () => {
       expect(onRemove).toHaveBeenCalled()
     })
 
+    it('should show the full file-type menu and update the row type selection', async () => {
+      const user = userEvent.setup()
+      const onChange = vi.fn()
+      render(
+        <KeyValueItem
+          instanceId="kv-type"
+          nodeId="node-1"
+          readonly={false}
+          canRemove
+          payload={{ id: 'kv-type', key: 'attachment', value: '', type: 'text' } as any}
+          onChange={onChange}
+          onRemove={vi.fn()}
+          isLastItem={false}
+          onAdd={vi.fn()}
+          isSupportFile
+        />,
+      )
+
+      await user.click(screen.getByRole('combobox', { name: 'workflow.nodes.http.type' }))
+
+      const fileOption = screen.getByRole('option', { name: /file/i })
+      expect(screen.getByRole('option', { name: /text/i })).toBeInTheDocument()
+      expect(fileOption.closest('.h-7')).toBeNull()
+
+      await user.click(fileOption)
+
+      expect(onChange).toHaveBeenCalledWith(expect.objectContaining({ type: 'file' }))
+    })
+
     it('should update the raw-text body payload', () => {
       const onChange = vi.fn()
       render(
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 f2fc2e9e1c..36e0fccbff 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
@@ -7,7 +7,15 @@ import { produce } from 'immer'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import { PortalSelect } from '@/app/components/base/select'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectItemIndicator,
+  SelectItemText,
+  SelectTrigger,
+  SelectValue,
+} from '@/app/components/base/ui/select'
 import { VarType } from '@/app/components/workflow/types'
 import VarReferencePicker from '../../../../_base/components/variable/var-reference-picker'
 import InputItem from './input-item'
@@ -80,7 +88,7 @@ const KeyValueItem: FC<Props> = ({
 
   return (
     // group class name is for hover row show remove button
-    <div className={cn(className, 'h-min-7 group flex border-t border-divider-regular')}>
+    <div className={cn(className, 'group flex min-h-7 border-t border-divider-regular')}>
       <div className={cn('shrink-0 border-r border-divider-regular', isSupportFile ? 'w-[140px]' : 'w-1/2')}>
         {!keyNotSupportVar
           ? (
@@ -105,18 +113,28 @@ const KeyValueItem: FC<Props> = ({
       </div>
       {isSupportFile && (
         <div className="w-[70px] shrink-0 border-r border-divider-regular">
-          <PortalSelect
-            value={payload.type!}
-            onSelect={item => handleChange('type')(item.value as string)}
-            items={[
-              { name: 'text', value: 'text' },
-              { name: 'file', value: 'file' },
-            ]}
-            readonly={readonly}
-            triggerClassName="rounded-none h-7 text-text-primary"
-            triggerClassNameFn={isOpen => isOpen ? 'bg-state-base-hover' : 'bg-transparent'}
-            popupClassName="w-[80px] h-7"
-          />
+          <Select
+            value={payload.type ?? 'text'}
+            onValueChange={value => value && handleChange('type')(value)}
+            readOnly={readonly}
+          >
+            <SelectTrigger
+              aria-label={t(`${i18nPrefix}.type`, { ns: 'workflow' })}
+              className="h-7 rounded-none bg-transparent text-text-primary hover:bg-state-base-hover focus-visible:bg-state-base-hover data-popup-open:bg-state-base-hover"
+            >
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent popupClassName="w-[80px]" listClassName="min-w-0">
+              <SelectItem value="text">
+                <SelectItemText>text</SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
+              <SelectItem value="file">
+                <SelectItemText>file</SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
+            </SelectContent>
+          </Select>
         </div>
       )}
       <div
diff --git a/web/eslint-suppressions.json b/web/eslint-suppressions.json
index db20c37db5..a53c1b4de9 100644
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json
@@ -6209,9 +6209,6 @@
     }
   },
   "app/components/workflow/nodes/http/components/key-value/key-value-edit/item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }

From 54e51be665a95b4f464d404fa745a95c8f29aa1a Mon Sep 17 00:00:00 2001
From: Ayush Baluni <73417844+aayushbaluni@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:51:11 +0530
Subject: [PATCH 14/36] fix: apply score threshold after reranking in hybrid
 search (#35263)

---
 api/core/rag/datasource/retrieval_service.py | 32 ++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/api/core/rag/datasource/retrieval_service.py b/api/core/rag/datasource/retrieval_service.py
index f978e072f3..fa242a730e 100644
--- a/api/core/rag/datasource/retrieval_service.py
+++ b/api/core/rag/datasource/retrieval_service.py
@@ -195,6 +195,23 @@ class RetrievalService:
         )
         return all_documents
 
+    @classmethod
+    def _filter_documents_by_vector_score_threshold(
+        cls, documents: list[Document], score_threshold: float | None
+    ) -> list[Document]:
+        """Keep documents whose stored retrieval score meets the threshold.
+
+        Used when hybrid search skips early vector thresholding but no rerank
+        runner applies a threshold afterward (same rule as ``calculate_vector_score``).
+        """
+        if score_threshold is None:
+            return documents
+        return [
+            document
+            for document in documents
+            if document.metadata and document.metadata.get("score", 0) >= score_threshold
+        ]
+
     @classmethod
     def _deduplicate_documents(cls, documents: list[Document]) -> list[Document]:
         """Deduplicate documents in O(n) while preserving first-seen order.
@@ -294,13 +311,20 @@ class RetrievalService:
 
                 vector = Vector(dataset=dataset)
                 documents = []
+                # Hybrid search merges keyword / full-text / vector hits and then reranks
+                # (weighted fusion or reranking model). Applying the user score threshold at
+                # vector retrieval time uses embedding similarity, which is not comparable to
+                # reranked or fused scores and incorrectly drops high-quality chunks (#35233).
+                embedding_score_threshold = (
+                    0.0 if retrieval_method == RetrievalMethod.HYBRID_SEARCH else score_threshold
+                )
                 if query_type == QueryType.TEXT_QUERY:
                     documents.extend(
                         vector.search_by_vector(
                             query,
                             search_type="similarity_score_threshold",
                             top_k=top_k,
-                            score_threshold=score_threshold,
+                            score_threshold=embedding_score_threshold,
                             filter={"group_id": [dataset.id]},
                             document_ids_filter=document_ids_filter,
                         )
@@ -312,7 +336,7 @@ class RetrievalService:
                         vector.search_by_file(
                             file_id=query,
                             top_k=top_k,
-                            score_threshold=score_threshold,
+                            score_threshold=embedding_score_threshold,
                             filter={"group_id": [dataset.id]},
                             document_ids_filter=document_ids_filter,
                         )
@@ -844,6 +868,10 @@ class RetrievalService:
                     top_n=top_k,
                     query_type=QueryType.TEXT_QUERY if query else QueryType.IMAGE_QUERY,
                 )
+                if not data_post_processor.rerank_runner and score_threshold:
+                    all_documents_item = self._filter_documents_by_vector_score_threshold(
+                        all_documents_item, score_threshold
+                    )
 
             all_documents.extend(all_documents_item)
 

From a1f990584b70c05b1b9e1da8271de5e69e0b47d4 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 16 Apr 2026 15:35:04 +0800
Subject: [PATCH 15/36] refactor(web): unify Base UI component props to
 namespace types (#35306)

---
 .../components/base/ui/alert-dialog/index.tsx | 14 +++++-----
 web/app/components/base/ui/avatar/index.tsx   |  7 ++---
 .../components/base/ui/context-menu/index.tsx | 28 +++++++++----------
 web/app/components/base/ui/dialog/index.tsx   |  8 +++---
 .../base/ui/dropdown-menu/index.tsx           | 28 +++++++++----------
 .../components/base/ui/number-field/index.tsx | 14 +++++-----
 web/app/components/base/ui/popover/index.tsx  |  8 +++---
 .../components/base/ui/scroll-area/index.tsx  | 14 +++++-----
 web/app/components/base/ui/select/index.tsx   | 22 +++++++--------
 web/app/components/base/ui/tooltip/index.tsx  |  6 ++--
 .../__tests__/index.spec.tsx                  |  2 +-
 .../workplace-selector/index.tsx              |  2 +-
 12 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/web/app/components/base/ui/alert-dialog/index.tsx b/web/app/components/base/ui/alert-dialog/index.tsx
index e591fed2a3..f277c343fc 100644
--- a/web/app/components/base/ui/alert-dialog/index.tsx
+++ b/web/app/components/base/ui/alert-dialog/index.tsx
@@ -1,9 +1,9 @@
 'use client'
 
+import type { ComponentPropsWithoutRef, ReactNode } from 'react'
 import type { ButtonProps } from '@/app/components/base/ui/button'
 import { AlertDialog as BaseAlertDialog } from '@base-ui/react/alert-dialog'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
 import { Button } from '@/app/components/base/ui/button'
 
 export const AlertDialog = BaseAlertDialog.Root
@@ -12,11 +12,11 @@ export const AlertDialogTitle = BaseAlertDialog.Title
 export const AlertDialogDescription = BaseAlertDialog.Description
 
 type AlertDialogContentProps = {
-  children: React.ReactNode
+  children: ReactNode
   className?: string
   overlayClassName?: string
-  popupProps?: Omit<React.ComponentPropsWithoutRef<typeof BaseAlertDialog.Popup>, 'children' | 'className'>
-  backdropProps?: Omit<React.ComponentPropsWithoutRef<typeof BaseAlertDialog.Backdrop>, 'className'>
+  popupProps?: Omit<BaseAlertDialog.Popup.Props, 'children' | 'className'>
+  backdropProps?: Omit<BaseAlertDialog.Backdrop.Props, 'className'>
 }
 
 export function AlertDialogContent({
@@ -50,7 +50,7 @@ export function AlertDialogContent({
   )
 }
 
-type AlertDialogActionsProps = React.ComponentPropsWithoutRef<'div'>
+type AlertDialogActionsProps = ComponentPropsWithoutRef<'div'>
 
 export function AlertDialogActions({ className, ...props }: AlertDialogActionsProps) {
   return (
@@ -62,8 +62,8 @@ export function AlertDialogActions({ className, ...props }: AlertDialogActionsPr
 }
 
 type AlertDialogCancelButtonProps = Omit<ButtonProps, 'children'> & {
-  children: React.ReactNode
-  closeProps?: Omit<React.ComponentPropsWithoutRef<typeof BaseAlertDialog.Close>, 'children' | 'render'>
+  children: ReactNode
+  closeProps?: Omit<BaseAlertDialog.Close.Props, 'children' | 'render'>
 }
 
 export function AlertDialogCancelButton({
diff --git a/web/app/components/base/ui/avatar/index.tsx b/web/app/components/base/ui/avatar/index.tsx
index 1587dd2d33..6fca2e87dc 100644
--- a/web/app/components/base/ui/avatar/index.tsx
+++ b/web/app/components/base/ui/avatar/index.tsx
@@ -1,5 +1,4 @@
 import type { ImageLoadingStatus } from '@base-ui/react/avatar'
-import type * as React from 'react'
 import { Avatar as BaseAvatar } from '@base-ui/react/avatar'
 import { cn } from '@langgenius/dify-ui/cn'
 
@@ -24,7 +23,7 @@ export type AvatarProps = {
   onLoadingStatusChange?: (status: ImageLoadingStatus) => void
 }
 
-type AvatarRootProps = React.ComponentPropsWithRef<typeof BaseAvatar.Root> & {
+type AvatarRootProps = BaseAvatar.Root.Props & {
   size?: AvatarSize
 }
 
@@ -45,7 +44,7 @@ export function AvatarRoot({
   )
 }
 
-type AvatarFallbackProps = React.ComponentPropsWithRef<typeof BaseAvatar.Fallback> & {
+type AvatarFallbackProps = BaseAvatar.Fallback.Props & {
   size?: AvatarSize
 }
 
@@ -66,7 +65,7 @@ export function AvatarFallback({
   )
 }
 
-type AvatarImageProps = React.ComponentPropsWithRef<typeof BaseAvatar.Image>
+type AvatarImageProps = BaseAvatar.Image.Props
 
 export function AvatarImage({
   className,
diff --git a/web/app/components/base/ui/context-menu/index.tsx b/web/app/components/base/ui/context-menu/index.tsx
index 4331f095b3..4ff7241b23 100644
--- a/web/app/components/base/ui/context-menu/index.tsx
+++ b/web/app/components/base/ui/context-menu/index.tsx
@@ -1,9 +1,9 @@
 'use client'
 
+import type { ReactNode } from 'react'
 import type { Placement } from '@/app/components/base/ui/placement'
 import { ContextMenu as BaseContextMenu } from '@base-ui/react/context-menu'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
 import {
   overlayBackdropClassName,
   overlayGroupLabelClassName,
@@ -22,18 +22,18 @@ export const ContextMenuGroup = BaseContextMenu.Group
 export const ContextMenuRadioGroup = BaseContextMenu.RadioGroup
 
 type ContextMenuContentProps = {
-  children: React.ReactNode
+  children: ReactNode
   placement?: Placement
   sideOffset?: number
   alignOffset?: number
   className?: string
   popupClassName?: string
   positionerProps?: Omit<
-    React.ComponentPropsWithoutRef<typeof BaseContextMenu.Positioner>,
+    BaseContextMenu.Positioner.Props,
     'children' | 'className' | 'side' | 'align' | 'sideOffset' | 'alignOffset'
   >
   popupProps?: Omit<
-    React.ComponentPropsWithoutRef<typeof BaseContextMenu.Popup>,
+    BaseContextMenu.Popup.Props,
     'children' | 'className'
   >
 }
@@ -113,7 +113,7 @@ export function ContextMenuContent({
   })
 }
 
-type ContextMenuItemProps = React.ComponentPropsWithoutRef<typeof BaseContextMenu.Item> & {
+type ContextMenuItemProps = BaseContextMenu.Item.Props & {
   destructive?: boolean
 }
 
@@ -130,7 +130,7 @@ export function ContextMenuItem({
   )
 }
 
-type ContextMenuLinkItemProps = React.ComponentPropsWithoutRef<typeof BaseContextMenu.LinkItem> & {
+type ContextMenuLinkItemProps = BaseContextMenu.LinkItem.Props & {
   destructive?: boolean
 }
 
@@ -152,7 +152,7 @@ export function ContextMenuLinkItem({
 export function ContextMenuRadioItem({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof BaseContextMenu.RadioItem>) {
+}: BaseContextMenu.RadioItem.Props) {
   return (
     <BaseContextMenu.RadioItem
       className={cn(overlayRowClassName, className)}
@@ -164,7 +164,7 @@ export function ContextMenuRadioItem({
 export function ContextMenuCheckboxItem({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof BaseContextMenu.CheckboxItem>) {
+}: BaseContextMenu.CheckboxItem.Props) {
   return (
     <BaseContextMenu.CheckboxItem
       className={cn(overlayRowClassName, className)}
@@ -176,7 +176,7 @@ export function ContextMenuCheckboxItem({
 export function ContextMenuCheckboxItemIndicator({
   className,
   ...props
-}: Omit<React.ComponentPropsWithoutRef<typeof BaseContextMenu.CheckboxItemIndicator>, 'children'>) {
+}: Omit<BaseContextMenu.CheckboxItemIndicator.Props, 'children'>) {
   return (
     <BaseContextMenu.CheckboxItemIndicator
       className={cn(overlayIndicatorClassName, className)}
@@ -190,7 +190,7 @@ export function ContextMenuCheckboxItemIndicator({
 export function ContextMenuRadioItemIndicator({
   className,
   ...props
-}: Omit<React.ComponentPropsWithoutRef<typeof BaseContextMenu.RadioItemIndicator>, 'children'>) {
+}: Omit<BaseContextMenu.RadioItemIndicator.Props, 'children'>) {
   return (
     <BaseContextMenu.RadioItemIndicator
       className={cn(overlayIndicatorClassName, className)}
@@ -201,7 +201,7 @@ export function ContextMenuRadioItemIndicator({
   )
 }
 
-type ContextMenuSubTriggerProps = React.ComponentPropsWithoutRef<typeof BaseContextMenu.SubmenuTrigger> & {
+type ContextMenuSubTriggerProps = BaseContextMenu.SubmenuTrigger.Props & {
   destructive?: boolean
 }
 
@@ -223,7 +223,7 @@ export function ContextMenuSubTrigger({
 }
 
 type ContextMenuSubContentProps = {
-  children: React.ReactNode
+  children: ReactNode
   placement?: Placement
   sideOffset?: number
   alignOffset?: number
@@ -258,7 +258,7 @@ export function ContextMenuSubContent({
 export function ContextMenuGroupLabel({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof BaseContextMenu.GroupLabel>) {
+}: BaseContextMenu.GroupLabel.Props) {
   return (
     <BaseContextMenu.GroupLabel
       className={cn(overlayGroupLabelClassName, className)}
@@ -270,7 +270,7 @@ export function ContextMenuGroupLabel({
 export function ContextMenuSeparator({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof BaseContextMenu.Separator>) {
+}: BaseContextMenu.Separator.Props) {
   return (
     <BaseContextMenu.Separator
       className={cn(overlaySeparatorClassName, className)}
diff --git a/web/app/components/base/ui/dialog/index.tsx b/web/app/components/base/ui/dialog/index.tsx
index a5ccfa1272..7ee9cffa8b 100644
--- a/web/app/components/base/ui/dialog/index.tsx
+++ b/web/app/components/base/ui/dialog/index.tsx
@@ -7,9 +7,9 @@
 //   This ensures overlays inside a Dialog (e.g. a Tooltip on a dialog button) render
 //   above the dialog backdrop instead of being clipped by it.
 
+import type { ReactNode } from 'react'
 import { Dialog as BaseDialog } from '@base-ui/react/dialog'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
 
 export const Dialog = BaseDialog.Root
 /** @public */
@@ -18,7 +18,7 @@ export const DialogTitle = BaseDialog.Title
 export const DialogDescription = BaseDialog.Description
 export const DialogPortal = BaseDialog.Portal
 
-type DialogCloseButtonProps = Omit<React.ComponentPropsWithoutRef<typeof BaseDialog.Close>, 'children'>
+type DialogCloseButtonProps = Omit<BaseDialog.Close.Props, 'children'>
 
 export function DialogCloseButton({
   className,
@@ -40,10 +40,10 @@ export function DialogCloseButton({
 }
 
 type DialogContentProps = {
-  children: React.ReactNode
+  children: ReactNode
   className?: string
   overlayClassName?: string
-  backdropProps?: React.ComponentPropsWithoutRef<typeof BaseDialog.Backdrop>
+  backdropProps?: BaseDialog.Backdrop.Props
 }
 
 export function DialogContent({
diff --git a/web/app/components/base/ui/dropdown-menu/index.tsx b/web/app/components/base/ui/dropdown-menu/index.tsx
index ca73e8b003..9046e25ca2 100644
--- a/web/app/components/base/ui/dropdown-menu/index.tsx
+++ b/web/app/components/base/ui/dropdown-menu/index.tsx
@@ -1,9 +1,9 @@
 'use client'
 
+import type { ReactNode } from 'react'
 import type { Placement } from '@/app/components/base/ui/placement'
 import { Menu } from '@base-ui/react/menu'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
 import {
   overlayGroupLabelClassName,
   overlayIndicatorClassName,
@@ -23,7 +23,7 @@ export const DropdownMenuRadioGroup = Menu.RadioGroup
 export function DropdownMenuRadioItem({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof Menu.RadioItem>) {
+}: Menu.RadioItem.Props) {
   return (
     <Menu.RadioItem
       className={cn(overlayRowClassName, className)}
@@ -35,7 +35,7 @@ export function DropdownMenuRadioItem({
 export function DropdownMenuRadioItemIndicator({
   className,
   ...props
-}: Omit<React.ComponentPropsWithoutRef<typeof Menu.RadioItemIndicator>, 'children'>) {
+}: Omit<Menu.RadioItemIndicator.Props, 'children'>) {
   return (
     <Menu.RadioItemIndicator
       className={cn(overlayIndicatorClassName, className)}
@@ -49,7 +49,7 @@ export function DropdownMenuRadioItemIndicator({
 export function DropdownMenuCheckboxItem({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof Menu.CheckboxItem>) {
+}: Menu.CheckboxItem.Props) {
   return (
     <Menu.CheckboxItem
       className={cn(overlayRowClassName, className)}
@@ -61,7 +61,7 @@ export function DropdownMenuCheckboxItem({
 export function DropdownMenuCheckboxItemIndicator({
   className,
   ...props
-}: Omit<React.ComponentPropsWithoutRef<typeof Menu.CheckboxItemIndicator>, 'children'>) {
+}: Omit<Menu.CheckboxItemIndicator.Props, 'children'>) {
   return (
     <Menu.CheckboxItemIndicator
       className={cn(overlayIndicatorClassName, className)}
@@ -75,7 +75,7 @@ export function DropdownMenuCheckboxItemIndicator({
 export function DropdownMenuGroupLabel({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof Menu.GroupLabel>) {
+}: Menu.GroupLabel.Props) {
   return (
     <Menu.GroupLabel
       className={cn(overlayGroupLabelClassName, className)}
@@ -85,18 +85,18 @@ export function DropdownMenuGroupLabel({
 }
 
 type DropdownMenuContentProps = {
-  children: React.ReactNode
+  children: ReactNode
   placement?: Placement
   sideOffset?: number
   alignOffset?: number
   className?: string
   popupClassName?: string
   positionerProps?: Omit<
-    React.ComponentPropsWithoutRef<typeof Menu.Positioner>,
+    Menu.Positioner.Props,
     'children' | 'className' | 'side' | 'align' | 'sideOffset' | 'alignOffset'
   >
   popupProps?: Omit<
-    React.ComponentPropsWithoutRef<typeof Menu.Popup>,
+    Menu.Popup.Props,
     'children' | 'className'
   >
 }
@@ -170,7 +170,7 @@ export function DropdownMenuContent({
   })
 }
 
-type DropdownMenuSubTriggerProps = React.ComponentPropsWithoutRef<typeof Menu.SubmenuTrigger> & {
+type DropdownMenuSubTriggerProps = Menu.SubmenuTrigger.Props & {
   destructive?: boolean
 }
 
@@ -192,7 +192,7 @@ export function DropdownMenuSubTrigger({
 }
 
 type DropdownMenuSubContentProps = {
-  children: React.ReactNode
+  children: ReactNode
   placement?: Placement
   sideOffset?: number
   alignOffset?: number
@@ -224,7 +224,7 @@ export function DropdownMenuSubContent({
   })
 }
 
-type DropdownMenuItemProps = React.ComponentPropsWithoutRef<typeof Menu.Item> & {
+type DropdownMenuItemProps = Menu.Item.Props & {
   destructive?: boolean
 }
 
@@ -241,7 +241,7 @@ export function DropdownMenuItem({
   )
 }
 
-type DropdownMenuLinkItemProps = React.ComponentPropsWithoutRef<typeof Menu.LinkItem> & {
+type DropdownMenuLinkItemProps = Menu.LinkItem.Props & {
   destructive?: boolean
 }
 
@@ -263,7 +263,7 @@ export function DropdownMenuLinkItem({
 export function DropdownMenuSeparator({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof Menu.Separator>) {
+}: Menu.Separator.Props) {
   return (
     <Menu.Separator
       className={cn(overlaySeparatorClassName, className)}
diff --git a/web/app/components/base/ui/number-field/index.tsx b/web/app/components/base/ui/number-field/index.tsx
index fdc4054e1f..193e7471c3 100644
--- a/web/app/components/base/ui/number-field/index.tsx
+++ b/web/app/components/base/ui/number-field/index.tsx
@@ -1,13 +1,13 @@
 'use client'
 
 import type { VariantProps } from 'class-variance-authority'
+import type { HTMLAttributes } from 'react'
 import { NumberField as BaseNumberField } from '@base-ui/react/number-field'
 import { cn } from '@langgenius/dify-ui/cn'
 import { cva } from 'class-variance-authority'
-import * as React from 'react'
 
 export const NumberField = BaseNumberField.Root
-export type NumberFieldRootProps = React.ComponentPropsWithoutRef<typeof BaseNumberField.Root>
+export type NumberFieldRootProps = BaseNumberField.Root.Props
 
 export const numberFieldGroupVariants = cva(
   [
@@ -32,7 +32,7 @@ export const numberFieldGroupVariants = cva(
 )
 export type NumberFieldSize = NonNullable<VariantProps<typeof numberFieldGroupVariants>['size']>
 
-export type NumberFieldGroupProps = React.ComponentPropsWithoutRef<typeof BaseNumberField.Group> & VariantProps<typeof numberFieldGroupVariants>
+export type NumberFieldGroupProps = BaseNumberField.Group.Props & VariantProps<typeof numberFieldGroupVariants>
 
 export function NumberFieldGroup({
   className,
@@ -67,7 +67,7 @@ export const numberFieldInputVariants = cva(
   },
 )
 
-export type NumberFieldInputProps = Omit<React.ComponentPropsWithoutRef<typeof BaseNumberField.Input>, 'size'> & VariantProps<typeof numberFieldInputVariants>
+export type NumberFieldInputProps = Omit<BaseNumberField.Input.Props, 'size'> & VariantProps<typeof numberFieldInputVariants>
 
 export function NumberFieldInput({
   className,
@@ -97,7 +97,7 @@ export const numberFieldUnitVariants = cva(
   },
 )
 
-export type NumberFieldUnitProps = React.HTMLAttributes<HTMLSpanElement> & VariantProps<typeof numberFieldUnitVariants>
+export type NumberFieldUnitProps = HTMLAttributes<HTMLSpanElement> & VariantProps<typeof numberFieldUnitVariants>
 
 export function NumberFieldUnit({
   className,
@@ -116,7 +116,7 @@ const numberFieldControlsVariants = cva(
   'flex shrink-0 flex-col items-stretch border-l border-divider-subtle bg-transparent text-text-tertiary',
 )
 
-export type NumberFieldControlsProps = React.HTMLAttributes<HTMLDivElement>
+export type NumberFieldControlsProps = HTMLAttributes<HTMLDivElement>
 
 export function NumberFieldControls({
   className,
@@ -185,7 +185,7 @@ type NumberFieldButtonVariantProps = Omit<
   'direction'
 >
 
-export type NumberFieldButtonProps = React.ComponentPropsWithoutRef<typeof BaseNumberField.Increment> & NumberFieldButtonVariantProps
+export type NumberFieldButtonProps = BaseNumberField.Increment.Props & NumberFieldButtonVariantProps
 
 const incrementAriaLabel = 'Increment value'
 const decrementAriaLabel = 'Decrement value'
diff --git a/web/app/components/base/ui/popover/index.tsx b/web/app/components/base/ui/popover/index.tsx
index 4383112a4b..dbde17ae21 100644
--- a/web/app/components/base/ui/popover/index.tsx
+++ b/web/app/components/base/ui/popover/index.tsx
@@ -1,9 +1,9 @@
 'use client'
 
+import type { ReactNode } from 'react'
 import type { Placement } from '@/app/components/base/ui/placement'
 import { Popover as BasePopover } from '@base-ui/react/popover'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
 import { parsePlacement } from '@/app/components/base/ui/placement'
 
 export const Popover = BasePopover.Root
@@ -15,18 +15,18 @@ export const PopoverTitle = BasePopover.Title
 export const PopoverDescription = BasePopover.Description
 
 type PopoverContentProps = {
-  children: React.ReactNode
+  children: ReactNode
   placement?: Placement
   sideOffset?: number
   alignOffset?: number
   className?: string
   popupClassName?: string
   positionerProps?: Omit<
-    React.ComponentPropsWithoutRef<typeof BasePopover.Positioner>,
+    BasePopover.Positioner.Props,
     'children' | 'className' | 'side' | 'align' | 'sideOffset' | 'alignOffset'
   >
   popupProps?: Omit<
-    React.ComponentPropsWithoutRef<typeof BasePopover.Popup>,
+    BasePopover.Popup.Props,
     'children' | 'className'
   >
 }
diff --git a/web/app/components/base/ui/scroll-area/index.tsx b/web/app/components/base/ui/scroll-area/index.tsx
index 242f735054..9a23145039 100644
--- a/web/app/components/base/ui/scroll-area/index.tsx
+++ b/web/app/components/base/ui/scroll-area/index.tsx
@@ -1,12 +1,12 @@
 'use client'
 
+import type { ReactNode } from 'react'
 import { ScrollArea as BaseScrollArea } from '@base-ui/react/scroll-area'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
 import './scroll-area.css'
 
 export const ScrollAreaRoot = BaseScrollArea.Root
-type ScrollAreaRootProps = React.ComponentPropsWithRef<typeof BaseScrollArea.Root>
+type ScrollAreaRootProps = BaseScrollArea.Root.Props
 
 export const ScrollAreaContent = BaseScrollArea.Content
 
@@ -17,7 +17,7 @@ type ScrollAreaSlotClassNames = {
 }
 
 type ScrollAreaProps = Omit<ScrollAreaRootProps, 'children'> & {
-  children: React.ReactNode
+  children: ReactNode
   orientation?: 'vertical' | 'horizontal'
   slotClassNames?: ScrollAreaSlotClassNames
   label?: string
@@ -45,7 +45,7 @@ const scrollAreaViewportClassName = cn(
 
 const scrollAreaCornerClassName = 'bg-transparent'
 
-type ScrollAreaViewportProps = React.ComponentPropsWithRef<typeof BaseScrollArea.Viewport>
+type ScrollAreaViewportProps = BaseScrollArea.Viewport.Props
 
 export function ScrollAreaViewport({
   className,
@@ -59,7 +59,7 @@ export function ScrollAreaViewport({
   )
 }
 
-type ScrollAreaScrollbarProps = React.ComponentPropsWithRef<typeof BaseScrollArea.Scrollbar>
+type ScrollAreaScrollbarProps = BaseScrollArea.Scrollbar.Props
 
 export function ScrollAreaScrollbar({
   className,
@@ -74,7 +74,7 @@ export function ScrollAreaScrollbar({
   )
 }
 
-type ScrollAreaThumbProps = React.ComponentPropsWithRef<typeof BaseScrollArea.Thumb>
+type ScrollAreaThumbProps = BaseScrollArea.Thumb.Props
 
 export function ScrollAreaThumb({
   className,
@@ -88,7 +88,7 @@ export function ScrollAreaThumb({
   )
 }
 
-type ScrollAreaCornerProps = React.ComponentPropsWithRef<typeof BaseScrollArea.Corner>
+type ScrollAreaCornerProps = BaseScrollArea.Corner.Props
 
 export function ScrollAreaCorner({
   className,
diff --git a/web/app/components/base/ui/select/index.tsx b/web/app/components/base/ui/select/index.tsx
index 81514a9ad5..80a32fca1e 100644
--- a/web/app/components/base/ui/select/index.tsx
+++ b/web/app/components/base/ui/select/index.tsx
@@ -1,9 +1,9 @@
 'use client'
 
+import type { ReactNode } from 'react'
 import type { Placement } from '@/app/components/base/ui/placement'
 import { Select as BaseSelect } from '@base-ui/react/select'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
 import {
   overlayGroupLabelClassName,
   overlaySeparatorClassName,
@@ -21,7 +21,7 @@ const selectSizeClassName: Record<string, string> = {
   large: 'h-9 gap-0.5 rounded-[10px] px-4 py-2 system-md-regular',
 }
 
-type SelectTriggerProps = React.ComponentPropsWithoutRef<typeof BaseSelect.Trigger> & {
+type SelectTriggerProps = BaseSelect.Trigger.Props & {
   size?: 'small' | 'regular' | 'large'
 }
 
@@ -58,7 +58,7 @@ export function SelectTrigger({
 export function SelectGroupLabel({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof BaseSelect.GroupLabel>) {
+}: BaseSelect.GroupLabel.Props) {
   return (
     <BaseSelect.GroupLabel
       className={cn(overlayGroupLabelClassName, className)}
@@ -71,7 +71,7 @@ export function SelectGroupLabel({
 export function SelectSeparator({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof BaseSelect.Separator>) {
+}: BaseSelect.Separator.Props) {
   return (
     <BaseSelect.Separator
       className={cn(overlaySeparatorClassName, className)}
@@ -81,7 +81,7 @@ export function SelectSeparator({
 }
 
 type SelectContentProps = {
-  children: React.ReactNode
+  children: ReactNode
   placement?: Placement
   sideOffset?: number
   alignOffset?: number
@@ -89,15 +89,15 @@ type SelectContentProps = {
   popupClassName?: string
   listClassName?: string
   positionerProps?: Omit<
-    React.ComponentPropsWithoutRef<typeof BaseSelect.Positioner>,
+    BaseSelect.Positioner.Props,
     'children' | 'className' | 'side' | 'align' | 'sideOffset' | 'alignOffset'
   >
   popupProps?: Omit<
-    React.ComponentPropsWithoutRef<typeof BaseSelect.Popup>,
+    BaseSelect.Popup.Props,
     'children' | 'className'
   >
   listProps?: Omit<
-    React.ComponentPropsWithoutRef<typeof BaseSelect.List>,
+    BaseSelect.List.Props,
     'children' | 'className'
   >
 }
@@ -150,7 +150,7 @@ export function SelectContent({
 export function SelectItem({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof BaseSelect.Item>) {
+}: BaseSelect.Item.Props) {
   return (
     <BaseSelect.Item
       className={cn(
@@ -166,7 +166,7 @@ export function SelectItem({
 export function SelectItemText({
   className,
   ...props
-}: React.ComponentPropsWithoutRef<typeof BaseSelect.ItemText>) {
+}: BaseSelect.ItemText.Props) {
   return (
     <BaseSelect.ItemText
       className={cn('mr-1 min-w-0 grow truncate px-1', className)}
@@ -178,7 +178,7 @@ export function SelectItemText({
 export function SelectItemIndicator({
   className,
   ...props
-}: Omit<React.ComponentPropsWithoutRef<typeof BaseSelect.ItemIndicator>, 'children'>) {
+}: Omit<BaseSelect.ItemIndicator.Props, 'children'>) {
   return (
     <BaseSelect.ItemIndicator
       className={cn('ml-auto flex shrink-0 items-center text-text-accent', className)}
diff --git a/web/app/components/base/ui/tooltip/index.tsx b/web/app/components/base/ui/tooltip/index.tsx
index 9053864eff..b84921e351 100644
--- a/web/app/components/base/ui/tooltip/index.tsx
+++ b/web/app/components/base/ui/tooltip/index.tsx
@@ -1,22 +1,22 @@
 'use client'
 
+import type { ReactNode } from 'react'
 import type { Placement } from '@/app/components/base/ui/placement'
 import { Tooltip as BaseTooltip } from '@base-ui/react/tooltip'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
 import { parsePlacement } from '@/app/components/base/ui/placement'
 
 type TooltipContentVariant = 'default' | 'plain'
 
 type TooltipContentProps = {
-  children: React.ReactNode
+  children: ReactNode
   placement?: Placement
   sideOffset?: number
   alignOffset?: number
   positionerClassName?: string
   className?: string
   variant?: TooltipContentVariant
-} & Omit<React.ComponentPropsWithoutRef<typeof BaseTooltip.Popup>, 'children' | 'className'>
+} & Omit<BaseTooltip.Popup.Props, 'children' | 'className'>
 
 export function TooltipContent({
   children,
diff --git a/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx b/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
index c8224bf10d..338096a9e1 100644
--- a/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
@@ -163,7 +163,7 @@ describe('WorkplaceSelector', () => {
       await waitFor(() => {
         expect(mockNotify).toHaveBeenCalledWith({
           type: 'error',
-          message: 'common.provider.saveFailed',
+          message: 'common.actionMsg.modifiedUnsuccessfully',
         })
       })
     })
diff --git a/web/app/components/header/account-dropdown/workplace-selector/index.tsx b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
index aa49075621..a155df48d9 100644
--- a/web/app/components/header/account-dropdown/workplace-selector/index.tsx
+++ b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
@@ -29,7 +29,7 @@ const WorkplaceSelector = () => {
       location.assign(`${location.origin}${basePath}`)
     }
     catch {
-      toast.error(t('provider.saveFailed', { ns: 'common' }))
+      toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }))
     }
   }
 

From 7f4fe4d064245392f311227ba6eb5a2bb442bd53 Mon Sep 17 00:00:00 2001
From: jimcody1995 <jjimcody@gmail.com>
Date: Thu, 16 Apr 2026 00:52:11 -0700
Subject: [PATCH 16/36] test: migrate clean notion task tests to SQLAlchemy 2.0
 APIs (#35159)

---
 .../tasks/test_clean_notion_document_task.py  | 174 ++++--------------
 1 file changed, 34 insertions(+), 140 deletions(-)

diff --git a/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py b/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py
index 2fb62e0fc0..fa3ac12cf0 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py
@@ -11,7 +11,8 @@ from unittest.mock import Mock, patch
 
 import pytest
 from faker import Faker
-from sqlalchemy import func, select
+from sqlalchemy import ColumnElement, func, select
+from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType
 from models.dataset import Dataset, Document, DocumentSegment
@@ -21,6 +22,14 @@ from tasks.clean_notion_document_task import clean_notion_document_task
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
 
+def _count_documents(session: Session, condition: ColumnElement[bool]) -> int:
+    return session.scalar(select(func.count()).select_from(Document).where(condition)) or 0
+
+
+def _count_segments(session: Session, condition: ColumnElement[bool]) -> int:
+    return session.scalar(select(func.count()).select_from(DocumentSegment).where(condition)) or 0
+
+
 class TestCleanNotionDocumentTask:
     """Integration tests for clean_notion_document_task using testcontainers."""
 
@@ -146,29 +155,14 @@ class TestCleanNotionDocumentTask:
         db_session_with_containers.commit()
 
         # Verify data exists before cleanup
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(Document).where(Document.id.in_(document_ids))
-            )
-            == 3
-        )
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id.in_(document_ids))
-            )
-            == 6
-        )
+        assert _count_documents(db_session_with_containers, Document.id.in_(document_ids)) == 3
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(document_ids)) == 6
 
         # Execute cleanup task
         clean_notion_document_task(document_ids, dataset.id)
 
         # Verify segments are deleted
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id.in_(document_ids))
-            )
-            == 0
-        )
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(document_ids)) == 0
 
         # Verify index processor was called
         mock_processor = mock_index_processor_factory.return_value.init_index_processor.return_value
@@ -328,12 +322,7 @@ class TestCleanNotionDocumentTask:
             # The task properly handles various index types and document configurations.
 
             # Verify segments are deleted
-            assert (
-                db_session_with_containers.scalar(
-                    select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
-                )
-                == 0
-            )
+            assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 0
 
             # Reset mock for next iteration
             mock_index_processor_factory.reset_mock()
@@ -416,12 +405,7 @@ class TestCleanNotionDocumentTask:
         clean_notion_document_task([document.id], dataset.id)
 
         # Verify segments are deleted
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
-            )
-            == 0
-        )
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 0
 
         # Note: This test successfully verifies that segments without index_node_ids
         # are properly deleted from the database.
@@ -507,18 +491,8 @@ class TestCleanNotionDocumentTask:
         db_session_with_containers.commit()
 
         # Verify all data exists before cleanup
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(Document).where(Document.dataset_id == dataset.id)
-            )
-            == 5
-        )
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
-            )
-            == 10
-        )
+        assert _count_documents(db_session_with_containers, Document.dataset_id == dataset.id) == 5
+        assert _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id) == 10
 
         # Clean up only first 3 documents
         documents_to_clean = [doc.id for doc in documents[:3]]
@@ -528,29 +502,12 @@ class TestCleanNotionDocumentTask:
         clean_notion_document_task(documents_to_clean, dataset.id)
 
         # Verify only specified documents' segments are deleted
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count())
-                .select_from(DocumentSegment)
-                .where(DocumentSegment.document_id.in_(documents_to_clean))
-            )
-            == 0
-        )
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(documents_to_clean)) == 0
 
         # Verify remaining documents and segments are intact
         remaining_docs = [doc.id for doc in documents[3:]]
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(Document).where(Document.id.in_(remaining_docs))
-            )
-            == 2
-        )
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id.in_(remaining_docs))
-            )
-            == 4
-        )
+        assert _count_documents(db_session_with_containers, Document.id.in_(remaining_docs)) == 2
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(remaining_docs)) == 4
 
         # Note: This test successfully verifies partial document cleanup operations.
         # The database operations work correctly, isolating only the specified documents.
@@ -634,23 +591,13 @@ class TestCleanNotionDocumentTask:
         db_session_with_containers.commit()
 
         # Verify all segments exist before cleanup
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
-            )
-            == 4
-        )
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 4
 
         # Execute cleanup task
         clean_notion_document_task([document.id], dataset.id)
 
         # Verify all segments are deleted regardless of status
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
-            )
-            == 0
-        )
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 0
 
         # Note: This test successfully verifies database operations.
         # IndexProcessor verification would require more sophisticated mocking.
@@ -820,16 +767,9 @@ class TestCleanNotionDocumentTask:
         db_session_with_containers.commit()
 
         # Verify all data exists before cleanup
+        assert _count_documents(db_session_with_containers, Document.dataset_id == dataset.id) == num_documents
         assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(Document).where(Document.dataset_id == dataset.id)
-            )
-            == num_documents
-        )
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
-            )
+            _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id)
             == num_documents * num_segments_per_doc
         )
 
@@ -838,12 +778,7 @@ class TestCleanNotionDocumentTask:
         clean_notion_document_task(all_document_ids, dataset.id)
 
         # Verify all segments are deleted
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
-            )
-            == 0
-        )
+        assert _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id) == 0
 
         # Note: This test successfully verifies bulk document cleanup operations.
         # The database efficiently handles large-scale deletions.
@@ -950,29 +885,12 @@ class TestCleanNotionDocumentTask:
         clean_notion_document_task([target_document.id], target_dataset.id)
 
         # Verify only documents' segments from target dataset are deleted
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count())
-                .select_from(DocumentSegment)
-                .where(DocumentSegment.document_id == target_document.id)
-            )
-            == 0
-        )
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id == target_document.id) == 0
 
         # Verify documents from other datasets remain intact
         remaining_docs = [doc.id for doc in all_documents[1:]]
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(Document).where(Document.id.in_(remaining_docs))
-            )
-            == 2
-        )
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id.in_(remaining_docs))
-            )
-            == 6
-        )
+        assert _count_documents(db_session_with_containers, Document.id.in_(remaining_docs)) == 2
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(remaining_docs)) == 6
 
         # Note: This test successfully verifies multi-tenant isolation.
         # Only documents from the target dataset are affected, maintaining tenant separation.
@@ -1067,13 +985,9 @@ class TestCleanNotionDocumentTask:
         db_session_with_containers.commit()
 
         # Verify all data exists before cleanup
-        assert db_session_with_containers.scalar(
-            select(func.count()).select_from(Document).where(Document.dataset_id == dataset.id)
-        ) == len(document_statuses)
+        assert _count_documents(db_session_with_containers, Document.dataset_id == dataset.id) == len(document_statuses)
         assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
-            )
+            _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id)
             == len(document_statuses) * 2
         )
 
@@ -1082,12 +996,7 @@ class TestCleanNotionDocumentTask:
         clean_notion_document_task(all_document_ids, dataset.id)
 
         # Verify all segments are deleted regardless of status
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
-            )
-            == 0
-        )
+        assert _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id) == 0
 
         # Note: This test successfully verifies cleanup of documents in various states.
         # All documents are deleted regardless of their indexing status.
@@ -1185,29 +1094,14 @@ class TestCleanNotionDocumentTask:
         db_session_with_containers.commit()
 
         # Verify data exists before cleanup
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(Document).where(Document.id == document.id)
-            )
-            == 1
-        )
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
-            )
-            == 3
-        )
+        assert _count_documents(db_session_with_containers, Document.id == document.id) == 1
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 3
 
         # Execute cleanup task
         clean_notion_document_task([document.id], dataset.id)
 
         # Verify segments are deleted
-        assert (
-            db_session_with_containers.scalar(
-                select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
-            )
-            == 0
-        )
+        assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 0
 
         # Note: This test successfully verifies cleanup of documents with rich metadata.
         # The task properly handles complex document structures and metadata fields.

From e8af6a6b3b23ad06851cfc49fdd5727a49f2a3e1 Mon Sep 17 00:00:00 2001
From: James <63717587+jamesrayammons@users.noreply.github.com>
Date: Thu, 16 Apr 2026 09:55:21 +0200
Subject: [PATCH 17/36] test: migrate conversation service mock tests to
 testcontainers (#35198)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 .../test_conversation_service_variables.py    | 524 ++++++++++++
 .../services/test_conversation_service.py     | 795 ------------------
 2 files changed, 524 insertions(+), 795 deletions(-)
 create mode 100644 api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py

diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
new file mode 100644
index 0000000000..1011db9063
--- /dev/null
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
@@ -0,0 +1,524 @@
+from __future__ import annotations
+
+from datetime import datetime, timedelta
+from unittest.mock import patch
+from uuid import uuid4
+
+import pytest
+from graphon.variables import FloatVariable, IntegerVariable, StringVariable
+from sqlalchemy.orm import sessionmaker
+
+from core.app.entities.app_invoke_entities import InvokeFrom
+from extensions.ext_database import db
+from models.account import Account, Tenant, TenantAccountJoin
+from models.enums import ConversationFromSource
+from models.model import App, Conversation, EndUser
+from models.workflow import ConversationVariable
+from services.conversation_service import ConversationService
+from services.errors.conversation import (
+    ConversationVariableNotExistsError,
+    ConversationVariableTypeMismatchError,
+    LastConversationNotExistsError,
+)
+
+
+class ConversationServiceVariableIntegrationFactory:
+    @staticmethod
+    def create_app_and_account(db_session_with_containers):
+        tenant = Tenant(name=f"Tenant {uuid4()}")
+        db_session_with_containers.add(tenant)
+        db_session_with_containers.flush()
+
+        account = Account(
+            name=f"Account {uuid4()}",
+            email=f"conversation-variable-{uuid4()}@example.com",
+            password="hashed-password",
+            password_salt="salt",
+            interface_language="en-US",
+            timezone="UTC",
+        )
+        db_session_with_containers.add(account)
+        db_session_with_containers.flush()
+
+        tenant_join = TenantAccountJoin(
+            tenant_id=tenant.id,
+            account_id=account.id,
+            role="owner",
+            current=True,
+        )
+        db_session_with_containers.add(tenant_join)
+        db_session_with_containers.flush()
+
+        app = App(
+            tenant_id=tenant.id,
+            name=f"App {uuid4()}",
+            description="",
+            mode="chat",
+            icon_type="emoji",
+            icon="bot",
+            icon_background="#FFFFFF",
+            enable_site=False,
+            enable_api=True,
+            api_rpm=100,
+            api_rph=100,
+            is_demo=False,
+            is_public=False,
+            is_universal=False,
+            created_by=account.id,
+            updated_by=account.id,
+        )
+        db_session_with_containers.add(app)
+        db_session_with_containers.commit()
+
+        return app, account
+
+    @staticmethod
+    def create_end_user(db_session_with_containers, app: App):
+        end_user = EndUser(
+            tenant_id=app.tenant_id,
+            app_id=app.id,
+            type=InvokeFrom.SERVICE_API.value,
+            external_user_id=f"external-{uuid4()}",
+            name=f"End User {uuid4()}",
+            is_anonymous=False,
+            session_id=f"session-{uuid4()}",
+        )
+        db_session_with_containers.add(end_user)
+        db_session_with_containers.commit()
+        return end_user
+
+    @staticmethod
+    def create_conversation(
+        db_session_with_containers,
+        app: App,
+        user: Account | EndUser,
+        *,
+        name: str | None = None,
+        invoke_from: InvokeFrom = InvokeFrom.WEB_APP,
+        created_at: datetime | None = None,
+        updated_at: datetime | None = None,
+    ) -> Conversation:
+        conversation = Conversation(
+            app_id=app.id,
+            app_model_config_id=None,
+            model_provider=None,
+            model_id="",
+            override_model_configs=None,
+            mode=app.mode,
+            name=name or f"Conversation {uuid4()}",
+            summary="",
+            inputs={},
+            introduction="",
+            system_instruction="",
+            system_instruction_tokens=0,
+            status="normal",
+            invoke_from=invoke_from.value,
+            from_source=ConversationFromSource.API if isinstance(user, EndUser) else ConversationFromSource.CONSOLE,
+            from_end_user_id=user.id if isinstance(user, EndUser) else None,
+            from_account_id=user.id if isinstance(user, Account) else None,
+            dialogue_count=0,
+            is_deleted=False,
+        )
+        conversation.inputs = {}
+        if created_at is not None:
+            conversation.created_at = created_at
+        if updated_at is not None:
+            conversation.updated_at = updated_at
+
+        db_session_with_containers.add(conversation)
+        db_session_with_containers.commit()
+        return conversation
+
+    @staticmethod
+    def create_variable(
+        db_session_with_containers,
+        *,
+        app: App,
+        conversation: Conversation,
+        variable: StringVariable | FloatVariable | IntegerVariable,
+        created_at: datetime | None = None,
+    ) -> ConversationVariable:
+        row = ConversationVariable.from_variable(app_id=app.id, conversation_id=conversation.id, variable=variable)
+        if created_at is not None:
+            row.created_at = created_at
+            row.updated_at = created_at
+
+        db_session_with_containers.add(row)
+        db_session_with_containers.commit()
+        return row
+
+
+@pytest.fixture
+def real_conversation_service_session_factory(flask_app_with_containers):
+    del flask_app_with_containers
+    real_session_maker = sessionmaker(bind=db.engine, expire_on_commit=False)
+
+    with (
+        patch("services.conversation_service.session_factory.create_session", side_effect=lambda: real_session_maker()),
+        patch("services.conversation_service.session_factory.get_session_maker", return_value=real_session_maker),
+    ):
+        yield
+
+
+class TestConversationServiceVariables:
+    def test_get_conversational_variable_success(
+        self, db_session_with_containers, real_conversation_service_session_factory
+    ):
+        del real_conversation_service_session_factory
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        conversation = factory.create_conversation(db_session_with_containers, app, account)
+        older_time = datetime(2024, 1, 1, 12, 0, 0)
+        newer_time = older_time + timedelta(minutes=5)
+
+        first_variable = factory.create_variable(
+            db_session_with_containers,
+            app=app,
+            conversation=conversation,
+            variable=StringVariable(id=str(uuid4()), name="topic", value="billing"),
+            created_at=older_time,
+        )
+        second_variable = factory.create_variable(
+            db_session_with_containers,
+            app=app,
+            conversation=conversation,
+            variable=StringVariable(id=str(uuid4()), name="priority", value="high"),
+            created_at=newer_time,
+        )
+
+        result = ConversationService.get_conversational_variable(
+            app_model=app,
+            conversation_id=conversation.id,
+            user=account,
+            limit=10,
+            last_id=None,
+        )
+
+        assert [item["id"] for item in result.data] == [first_variable.id, second_variable.id]
+        assert [item["name"] for item in result.data] == ["topic", "priority"]
+        assert result.limit == 10
+        assert result.has_more is False
+
+    def test_get_conversational_variable_with_last_id(
+        self, db_session_with_containers, real_conversation_service_session_factory
+    ):
+        del real_conversation_service_session_factory
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        conversation = factory.create_conversation(db_session_with_containers, app, account)
+        base_time = datetime(2024, 1, 1, 9, 0, 0)
+
+        first_variable = factory.create_variable(
+            db_session_with_containers,
+            app=app,
+            conversation=conversation,
+            variable=StringVariable(id=str(uuid4()), name="topic", value="billing"),
+            created_at=base_time,
+        )
+        second_variable = factory.create_variable(
+            db_session_with_containers,
+            app=app,
+            conversation=conversation,
+            variable=StringVariable(id=str(uuid4()), name="priority", value="high"),
+            created_at=base_time + timedelta(minutes=1),
+        )
+        third_variable = factory.create_variable(
+            db_session_with_containers,
+            app=app,
+            conversation=conversation,
+            variable=StringVariable(id=str(uuid4()), name="owner", value="alice"),
+            created_at=base_time + timedelta(minutes=2),
+        )
+
+        result = ConversationService.get_conversational_variable(
+            app_model=app,
+            conversation_id=conversation.id,
+            user=account,
+            limit=10,
+            last_id=first_variable.id,
+        )
+
+        assert [item["id"] for item in result.data] == [second_variable.id, third_variable.id]
+        assert result.has_more is False
+
+    def test_get_conversational_variable_last_id_not_found_raises_error(
+        self, db_session_with_containers, real_conversation_service_session_factory
+    ):
+        del real_conversation_service_session_factory
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        conversation = factory.create_conversation(db_session_with_containers, app, account)
+
+        with pytest.raises(ConversationVariableNotExistsError):
+            ConversationService.get_conversational_variable(
+                app_model=app,
+                conversation_id=conversation.id,
+                user=account,
+                limit=10,
+                last_id=str(uuid4()),
+            )
+
+    def test_get_conversational_variable_sets_has_more(
+        self, db_session_with_containers, real_conversation_service_session_factory
+    ):
+        del real_conversation_service_session_factory
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        conversation = factory.create_conversation(db_session_with_containers, app, account)
+
+        for index in range(3):
+            factory.create_variable(
+                db_session_with_containers,
+                app=app,
+                conversation=conversation,
+                variable=StringVariable(id=str(uuid4()), name=f"var_{index}", value=f"value_{index}"),
+                created_at=datetime(2024, 1, 1, 10, 0, index),
+            )
+
+        result = ConversationService.get_conversational_variable(
+            app_model=app,
+            conversation_id=conversation.id,
+            user=account,
+            limit=2,
+            last_id=None,
+        )
+
+        assert len(result.data) == 2
+        assert result.has_more is True
+
+    def test_update_conversation_variable_success(
+        self, db_session_with_containers, real_conversation_service_session_factory
+    ):
+        del real_conversation_service_session_factory
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        conversation = factory.create_conversation(db_session_with_containers, app, account)
+        existing = factory.create_variable(
+            db_session_with_containers,
+            app=app,
+            conversation=conversation,
+            variable=StringVariable(id=str(uuid4()), name="topic", value="billing"),
+        )
+        updated_at = datetime(2024, 1, 1, 15, 0, 0)
+
+        with patch("services.conversation_service.naive_utc_now", return_value=updated_at):
+            result = ConversationService.update_conversation_variable(
+                app_model=app,
+                conversation_id=conversation.id,
+                variable_id=existing.id,
+                user=account,
+                new_value="support",
+            )
+
+        db_session_with_containers.expire_all()
+        persisted = db_session_with_containers.get(ConversationVariable, (existing.id, conversation.id))
+
+        assert persisted is not None
+        assert persisted.to_variable().value == "support"
+        assert result["id"] == existing.id
+        assert result["value"] == "support"
+        assert result["updated_at"] == updated_at
+
+    def test_update_conversation_variable_not_found_raises_error(
+        self, db_session_with_containers, real_conversation_service_session_factory
+    ):
+        del real_conversation_service_session_factory
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        conversation = factory.create_conversation(db_session_with_containers, app, account)
+
+        with pytest.raises(ConversationVariableNotExistsError):
+            ConversationService.update_conversation_variable(
+                app_model=app,
+                conversation_id=conversation.id,
+                variable_id=str(uuid4()),
+                user=account,
+                new_value="support",
+            )
+
+    def test_update_conversation_variable_type_mismatch_raises_error(
+        self, db_session_with_containers, real_conversation_service_session_factory
+    ):
+        del real_conversation_service_session_factory
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        conversation = factory.create_conversation(db_session_with_containers, app, account)
+        existing = factory.create_variable(
+            db_session_with_containers,
+            app=app,
+            conversation=conversation,
+            variable=FloatVariable(id=str(uuid4()), name="score", value=1.5),
+        )
+
+        with pytest.raises(ConversationVariableTypeMismatchError, match="expects float"):
+            ConversationService.update_conversation_variable(
+                app_model=app,
+                conversation_id=conversation.id,
+                variable_id=existing.id,
+                user=account,
+                new_value="wrong-type",
+            )
+
+    def test_update_conversation_variable_integer_number_compatibility(
+        self, db_session_with_containers, real_conversation_service_session_factory
+    ):
+        del real_conversation_service_session_factory
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        conversation = factory.create_conversation(db_session_with_containers, app, account)
+        existing = factory.create_variable(
+            db_session_with_containers,
+            app=app,
+            conversation=conversation,
+            variable=IntegerVariable(id=str(uuid4()), name="attempts", value=1),
+        )
+
+        result = ConversationService.update_conversation_variable(
+            app_model=app,
+            conversation_id=conversation.id,
+            variable_id=existing.id,
+            user=account,
+            new_value=42,
+        )
+
+        db_session_with_containers.expire_all()
+        persisted = db_session_with_containers.get(ConversationVariable, (existing.id, conversation.id))
+
+        assert persisted is not None
+        assert persisted.to_variable().value == 42
+        assert result["value"] == 42
+
+
+class TestConversationServicePaginationWithContainers:
+    def test_pagination_by_last_id_raises_error_when_last_id_missing(self, db_session_with_containers):
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+
+        with pytest.raises(LastConversationNotExistsError):
+            ConversationService.pagination_by_last_id(
+                session=db_session_with_containers,
+                app_model=app,
+                user=account,
+                last_id=str(uuid4()),
+                limit=20,
+                invoke_from=InvokeFrom.WEB_APP,
+            )
+
+    def test_pagination_by_last_id_with_default_desc_updated_at(self, db_session_with_containers):
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        base_time = datetime(2024, 1, 1, 8, 0, 0)
+        newest = factory.create_conversation(
+            db_session_with_containers,
+            app,
+            account,
+            name="Newest",
+            updated_at=base_time + timedelta(minutes=2),
+        )
+        middle = factory.create_conversation(
+            db_session_with_containers,
+            app,
+            account,
+            name="Middle",
+            updated_at=base_time + timedelta(minutes=1),
+        )
+        oldest = factory.create_conversation(
+            db_session_with_containers,
+            app,
+            account,
+            name="Oldest",
+            updated_at=base_time,
+        )
+
+        result = ConversationService.pagination_by_last_id(
+            session=db_session_with_containers,
+            app_model=app,
+            user=account,
+            last_id=middle.id,
+            limit=10,
+            invoke_from=InvokeFrom.WEB_APP,
+        )
+
+        assert newest.id != middle.id
+        assert [conversation.id for conversation in result.data] == [oldest.id]
+
+    def test_pagination_by_last_id_with_name_sort(self, db_session_with_containers):
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        alpha = factory.create_conversation(db_session_with_containers, app, account, name="Alpha")
+        beta = factory.create_conversation(db_session_with_containers, app, account, name="Beta")
+        gamma = factory.create_conversation(db_session_with_containers, app, account, name="Gamma")
+
+        result = ConversationService.pagination_by_last_id(
+            session=db_session_with_containers,
+            app_model=app,
+            user=account,
+            last_id=beta.id,
+            limit=10,
+            invoke_from=InvokeFrom.WEB_APP,
+            sort_by="name",
+        )
+
+        assert alpha.id != beta.id
+        assert [conversation.id for conversation in result.data] == [gamma.id]
+
+    def test_pagination_filters_to_end_user_api_source(self, db_session_with_containers):
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        end_user = factory.create_end_user(db_session_with_containers, app)
+        account_conversation = factory.create_conversation(
+            db_session_with_containers,
+            app,
+            account,
+            name="Console Conversation",
+            invoke_from=InvokeFrom.WEB_APP,
+        )
+        end_user_conversation = factory.create_conversation(
+            db_session_with_containers,
+            app,
+            end_user,
+            name="API Conversation",
+            invoke_from=InvokeFrom.SERVICE_API,
+        )
+
+        result = ConversationService.pagination_by_last_id(
+            session=db_session_with_containers,
+            app_model=app,
+            user=end_user,
+            last_id=None,
+            limit=20,
+            invoke_from=InvokeFrom.SERVICE_API,
+        )
+
+        assert account_conversation.id != end_user_conversation.id
+        assert [conversation.id for conversation in result.data] == [end_user_conversation.id]
+
+    def test_pagination_filters_to_account_console_source(self, db_session_with_containers):
+        factory = ConversationServiceVariableIntegrationFactory
+        app, account = factory.create_app_and_account(db_session_with_containers)
+        end_user = factory.create_end_user(db_session_with_containers, app)
+        account_conversation = factory.create_conversation(
+            db_session_with_containers,
+            app,
+            account,
+            name="Console Conversation",
+            invoke_from=InvokeFrom.WEB_APP,
+        )
+        factory.create_conversation(
+            db_session_with_containers,
+            app,
+            end_user,
+            name="API Conversation",
+            invoke_from=InvokeFrom.SERVICE_API,
+        )
+
+        result = ConversationService.pagination_by_last_id(
+            session=db_session_with_containers,
+            app_model=app,
+            user=account,
+            last_id=None,
+            limit=20,
+            invoke_from=InvokeFrom.WEB_APP,
+        )
+
+        assert [conversation.id for conversation in result.data] == [account_conversation.id]
diff --git a/api/tests/unit_tests/services/test_conversation_service.py b/api/tests/unit_tests/services/test_conversation_service.py
index 68f4c51afe..2c7f13b79f 100644
--- a/api/tests/unit_tests/services/test_conversation_service.py
+++ b/api/tests/unit_tests/services/test_conversation_service.py
@@ -6,26 +6,15 @@ Tests are organized by functionality and include edge cases, error handling,
 and both positive and negative test scenarios.
 """
 
-from datetime import timedelta
 from unittest.mock import MagicMock, Mock, create_autospec, patch
 
-import pytest
 from sqlalchemy import asc, desc
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from libs.datetime_utils import naive_utc_now
-from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models import Account, ConversationVariable
-from models.enums import ConversationFromSource
 from models.model import App, Conversation, EndUser, Message
 from services.conversation_service import ConversationService
-from services.errors.conversation import (
-    ConversationNotExistsError,
-    ConversationVariableNotExistsError,
-    ConversationVariableTypeMismatchError,
-    LastConversationNotExistsError,
-)
-from services.errors.message import MessageNotExistsError
 
 
 class ConversationServiceTestDataFactory:
@@ -338,330 +327,9 @@ class TestConversationServiceHelpers:
         assert condition is not None
 
 
-class TestConversationServiceGetConversation:
-    """Test conversation retrieval operations."""
-
-    @patch("services.conversation_service.db.session")
-    def test_get_conversation_success_with_account(self, mock_db_session):
-        """
-        Test successful conversation retrieval with account user.
-
-        Should return conversation when found with proper filters.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock(
-            from_account_id=user.id, from_source=ConversationFromSource.CONSOLE
-        )
-
-        mock_db_session.scalar.return_value = conversation
-
-        # Act
-        result = ConversationService.get_conversation(app_model, "conv-123", user)
-
-        # Assert
-        assert result == conversation
-
-    @patch("services.conversation_service.db.session")
-    def test_get_conversation_success_with_end_user(self, mock_db_session):
-        """
-        Test successful conversation retrieval with end user.
-
-        Should return conversation when found with proper filters for API user.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_end_user_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock(
-            from_end_user_id=user.id, from_source=ConversationFromSource.API
-        )
-
-        mock_db_session.scalar.return_value = conversation
-
-        # Act
-        result = ConversationService.get_conversation(app_model, "conv-123", user)
-
-        # Assert
-        assert result == conversation
-
-    @patch("services.conversation_service.db.session")
-    def test_get_conversation_not_found_raises_error(self, mock_db_session):
-        """
-        Test that get_conversation raises error when conversation not found.
-
-        Should raise ConversationNotExistsError when no matching conversation found.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-
-        mock_db_session.scalar.return_value = None
-
-        # Act & Assert
-        with pytest.raises(ConversationNotExistsError):
-            ConversationService.get_conversation(app_model, "conv-123", user)
-
-
-class TestConversationServiceRename:
-    """Test conversation rename operations."""
-
-    @patch("services.conversation_service.db.session")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    def test_rename_with_manual_name(self, mock_get_conversation, mock_db_session):
-        """
-        Test renaming conversation with manual name.
-
-        Should update conversation name and timestamp when auto_generate is False.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-
-        # Act
-        result = ConversationService.rename(
-            app_model=app_model,
-            conversation_id="conv-123",
-            user=user,
-            name="New Name",
-            auto_generate=False,
-        )
-
-        # Assert
-        assert result == conversation
-        assert conversation.name == "New Name"
-        mock_db_session.commit.assert_called_once()
-
-
-class TestConversationServiceAutoGenerateName:
-    """Test conversation auto-name generation operations."""
-
-    @patch("services.conversation_service.db.session")
-    @patch("services.conversation_service.LLMGenerator")
-    def test_auto_generate_name_success(self, mock_llm_generator, mock_db_session):
-        """
-        Test successful auto-generation of conversation name.
-
-        Should generate name using LLMGenerator and update conversation.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-        message = ConversationServiceTestDataFactory.create_message_mock(
-            conversation_id=conversation.id, app_id=app_model.id
-        )
-
-        # Mock database query to return message
-        mock_db_session.scalar.return_value = message
-
-        # Mock LLM generator
-        mock_llm_generator.generate_conversation_name.return_value = "Generated Name"
-
-        # Act
-        result = ConversationService.auto_generate_name(app_model, conversation)
-
-        # Assert
-        assert result == conversation
-        assert conversation.name == "Generated Name"
-        mock_llm_generator.generate_conversation_name.assert_called_once_with(
-            app_model.tenant_id, message.query, conversation.id, app_model.id
-        )
-        mock_db_session.commit.assert_called_once()
-
-    @patch("services.conversation_service.db.session")
-    def test_auto_generate_name_no_message_raises_error(self, mock_db_session):
-        """
-        Test auto-generation fails when no message found.
-
-        Should raise MessageNotExistsError when conversation has no messages.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        # Mock database query to return None
-        mock_db_session.scalar.return_value = None
-
-        # Act & Assert
-        with pytest.raises(MessageNotExistsError):
-            ConversationService.auto_generate_name(app_model, conversation)
-
-    @patch("services.conversation_service.db.session")
-    @patch("services.conversation_service.LLMGenerator")
-    def test_auto_generate_name_handles_llm_exception(self, mock_llm_generator, mock_db_session):
-        """
-        Test auto-generation handles LLM generator exceptions gracefully.
-
-        Should continue without name when LLMGenerator fails.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-        message = ConversationServiceTestDataFactory.create_message_mock(
-            conversation_id=conversation.id, app_id=app_model.id
-        )
-
-        # Mock database query to return message
-        mock_db_session.scalar.return_value = message
-
-        # Mock LLM generator to raise exception
-        mock_llm_generator.generate_conversation_name.side_effect = Exception("LLM Error")
-
-        # Act
-        result = ConversationService.auto_generate_name(app_model, conversation)
-
-        # Assert
-        assert result == conversation
-        # Name should remain unchanged due to exception
-        mock_db_session.commit.assert_called_once()
-
-
-class TestConversationServiceDelete:
-    """Test conversation deletion operations."""
-
-    @patch("services.conversation_service.delete_conversation_related_data")
-    @patch("services.conversation_service.db.session")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    def test_delete_success(self, mock_get_conversation, mock_db_session, mock_delete_task):
-        """
-        Test successful conversation deletion.
-
-        Should delete conversation and schedule cleanup task.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock(name="Test App")
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-
-        # Act
-        ConversationService.delete(app_model, "conv-123", user)
-
-        # Assert
-        mock_db_session.delete.assert_called_once_with(conversation)
-        mock_db_session.commit.assert_called_once()
-        mock_delete_task.delay.assert_called_once_with(conversation.id)
-
-
 class TestConversationServiceConversationalVariable:
     """Test conversational variable operations."""
 
-    @patch("services.conversation_service.session_factory")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    def test_get_conversational_variable_success(self, mock_get_conversation, mock_session_factory):
-        """
-        Test successful retrieval of conversational variables.
-
-        Should return paginated list of variables for conversation.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-
-        # Mock session and variables
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        variable1 = ConversationServiceTestDataFactory.create_conversation_variable_mock()
-        variable2 = ConversationServiceTestDataFactory.create_conversation_variable_mock(variable_id="var-456")
-
-        mock_session.scalars.return_value.all.return_value = [variable1, variable2]
-
-        # Act
-        result = ConversationService.get_conversational_variable(
-            app_model=app_model,
-            conversation_id="conv-123",
-            user=user,
-            limit=10,
-            last_id=None,
-        )
-
-        # Assert
-        assert isinstance(result, InfiniteScrollPagination)
-        assert len(result.data) == 2
-        assert result.limit == 10
-        assert result.has_more is False
-
-    @patch("services.conversation_service.session_factory")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    def test_get_conversational_variable_with_last_id(self, mock_get_conversation, mock_session_factory):
-        """
-        Test retrieval of variables with last_id pagination.
-
-        Should filter variables created after last_id.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-
-        # Mock session and variables
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        last_variable = ConversationServiceTestDataFactory.create_conversation_variable_mock(
-            created_at=naive_utc_now() - timedelta(hours=1)
-        )
-        variable = ConversationServiceTestDataFactory.create_conversation_variable_mock(created_at=naive_utc_now())
-
-        mock_session.scalar.return_value = last_variable
-        mock_session.scalars.return_value.all.return_value = [variable]
-
-        # Act
-        result = ConversationService.get_conversational_variable(
-            app_model=app_model,
-            conversation_id="conv-123",
-            user=user,
-            limit=10,
-            last_id="var-123",
-        )
-
-        # Assert
-        assert isinstance(result, InfiniteScrollPagination)
-        assert len(result.data) == 1
-        assert result.limit == 10
-
-    @patch("services.conversation_service.session_factory")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    def test_get_conversational_variable_last_id_not_found_raises_error(
-        self, mock_get_conversation, mock_session_factory
-    ):
-        """
-        Test that invalid last_id raises ConversationVariableNotExistsError.
-
-        Should raise error when last_id doesn't exist.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-
-        # Mock session
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-        mock_session.scalar.return_value = None
-
-        # Act & Assert
-        with pytest.raises(ConversationVariableNotExistsError):
-            ConversationService.get_conversational_variable(
-                app_model=app_model,
-                conversation_id="conv-123",
-                user=user,
-                limit=10,
-                last_id="invalid-id",
-            )
-
     @patch("services.conversation_service.session_factory")
     @patch("services.conversation_service.ConversationService.get_conversation")
     @patch("services.conversation_service.dify_config")
@@ -698,466 +366,3 @@ class TestConversationServiceConversationalVariable:
 
         # Assert - JSON filter should be applied
         assert mock_session.scalars.called
-
-    @patch("services.conversation_service.session_factory")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    @patch("services.conversation_service.dify_config")
-    def test_get_conversational_variable_with_name_filter_postgresql(
-        self, mock_config, mock_get_conversation, mock_session_factory
-    ):
-        """
-        Test variable filtering by name for PostgreSQL databases.
-
-        Should apply JSON extraction filter for variable names.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-        mock_config.DB_TYPE = "postgresql"
-
-        # Mock session
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-        mock_session.scalars.return_value.all.return_value = []
-
-        # Act
-        ConversationService.get_conversational_variable(
-            app_model=app_model,
-            conversation_id="conv-123",
-            user=user,
-            limit=10,
-            last_id=None,
-            variable_name="test_var",
-        )
-
-        # Assert - JSON filter should be applied
-        assert mock_session.scalars.called
-
-
-class TestConversationServiceUpdateVariable:
-    """Test conversation variable update operations."""
-
-    @patch("services.conversation_service.variable_factory")
-    @patch("services.conversation_service.ConversationVariableUpdater")
-    @patch("services.conversation_service.session_factory")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    def test_update_conversation_variable_success(
-        self, mock_get_conversation, mock_session_factory, mock_updater_class, mock_variable_factory
-    ):
-        """
-        Test successful update of conversation variable.
-
-        Should update variable value and return updated data.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-
-        # Mock session and existing variable
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        existing_variable = ConversationServiceTestDataFactory.create_conversation_variable_mock(value_type="string")
-        mock_session.scalar.return_value = existing_variable
-
-        # Mock variable factory and updater
-        updated_variable = Mock()
-        updated_variable.model_dump.return_value = {"id": "var-123", "name": "test_var", "value": "new_value"}
-        mock_variable_factory.build_conversation_variable_from_mapping.return_value = updated_variable
-
-        mock_updater = MagicMock()
-        mock_updater_class.return_value = mock_updater
-
-        # Act
-        result = ConversationService.update_conversation_variable(
-            app_model=app_model,
-            conversation_id="conv-123",
-            variable_id="var-123",
-            user=user,
-            new_value="new_value",
-        )
-
-        # Assert
-        assert result["id"] == "var-123"
-        assert result["value"] == "new_value"
-        mock_updater.update.assert_called_once_with("conv-123", updated_variable)
-        mock_updater.flush.assert_called_once()
-
-    @patch("services.conversation_service.session_factory")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    def test_update_conversation_variable_not_found_raises_error(self, mock_get_conversation, mock_session_factory):
-        """
-        Test update fails when variable doesn't exist.
-
-        Should raise ConversationVariableNotExistsError.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-
-        # Mock session
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-        mock_session.scalar.return_value = None
-
-        # Act & Assert
-        with pytest.raises(ConversationVariableNotExistsError):
-            ConversationService.update_conversation_variable(
-                app_model=app_model,
-                conversation_id="conv-123",
-                variable_id="invalid-id",
-                user=user,
-                new_value="new_value",
-            )
-
-    @patch("services.conversation_service.session_factory")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    def test_update_conversation_variable_type_mismatch_raises_error(self, mock_get_conversation, mock_session_factory):
-        """
-        Test update fails when value type doesn't match expected type.
-
-        Should raise ConversationVariableTypeMismatchError.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-
-        # Mock session and existing variable
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        existing_variable = ConversationServiceTestDataFactory.create_conversation_variable_mock(value_type="number")
-        mock_session.scalar.return_value = existing_variable
-
-        # Act & Assert - Try to set string value for number variable
-        with pytest.raises(ConversationVariableTypeMismatchError):
-            ConversationService.update_conversation_variable(
-                app_model=app_model,
-                conversation_id="conv-123",
-                variable_id="var-123",
-                user=user,
-                new_value="string_value",  # Wrong type
-            )
-
-    @patch("services.conversation_service.session_factory")
-    @patch("services.conversation_service.ConversationService.get_conversation")
-    def test_update_conversation_variable_integer_number_compatibility(
-        self, mock_get_conversation, mock_session_factory
-    ):
-        """
-        Test that integer type accepts number values.
-
-        Should allow number values for integer type variables.
-        """
-        # Arrange
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-
-        mock_get_conversation.return_value = conversation
-
-        # Mock session and existing variable
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        existing_variable = ConversationServiceTestDataFactory.create_conversation_variable_mock(value_type="integer")
-        mock_session.scalar.return_value = existing_variable
-
-        # Mock variable factory and updater
-        updated_variable = Mock()
-        updated_variable.model_dump.return_value = {"id": "var-123", "name": "test_var", "value": 42}
-
-        with (
-            patch("services.conversation_service.variable_factory") as mock_variable_factory,
-            patch("services.conversation_service.ConversationVariableUpdater") as mock_updater_class,
-        ):
-            mock_variable_factory.build_conversation_variable_from_mapping.return_value = updated_variable
-            mock_updater = MagicMock()
-            mock_updater_class.return_value = mock_updater
-
-            # Act
-            result = ConversationService.update_conversation_variable(
-                app_model=app_model,
-                conversation_id="conv-123",
-                variable_id="var-123",
-                user=user,
-                new_value=42,  # Number value for integer type
-            )
-
-            # Assert
-            assert result["value"] == 42
-            mock_updater.update.assert_called_once()
-
-
-class TestConversationServicePaginationAdvanced:
-    """Advanced pagination tests for ConversationService."""
-
-    @patch("services.conversation_service.session_factory")
-    def test_pagination_by_last_id_with_last_id_not_found(self, mock_session_factory):
-        """
-        Test pagination with invalid last_id raises error.
-
-        Should raise LastConversationNotExistsError when last_id doesn't exist.
-        """
-        # Arrange
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-        mock_session.scalar.return_value = None
-
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-
-        # Act & Assert
-        with pytest.raises(LastConversationNotExistsError):
-            ConversationService.pagination_by_last_id(
-                session=mock_session,
-                app_model=app_model,
-                user=user,
-                last_id="invalid-id",
-                limit=20,
-                invoke_from=InvokeFrom.WEB_APP,
-            )
-
-    @patch("services.conversation_service.session_factory")
-    def test_pagination_by_last_id_with_exclude_ids(self, mock_session_factory):
-        """
-        Test pagination with exclude_ids filter.
-
-        Should exclude specified conversation IDs from results.
-        """
-        # Arrange
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-        mock_session.scalars.return_value.all.return_value = [conversation]
-        mock_session.scalar.return_value = conversation
-
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-
-        # Act
-        result = ConversationService.pagination_by_last_id(
-            session=mock_session,
-            app_model=app_model,
-            user=user,
-            last_id=None,
-            limit=20,
-            invoke_from=InvokeFrom.WEB_APP,
-            exclude_ids=["excluded-123"],
-        )
-
-        # Assert
-        assert isinstance(result, InfiniteScrollPagination)
-        assert len(result.data) == 1
-
-    @patch("services.conversation_service.session_factory")
-    def test_pagination_by_last_id_has_more_detection(self, mock_session_factory):
-        """
-        Test pagination has_more detection logic.
-
-        Should set has_more=True when there are more results beyond limit.
-        """
-        # Arrange
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        # Return exactly limit items to trigger has_more check
-        conversations = [
-            ConversationServiceTestDataFactory.create_conversation_mock(conversation_id=f"conv-{i}") for i in range(20)
-        ]
-        mock_session.scalars.return_value.all.return_value = conversations
-        mock_session.scalar.return_value = conversations[-1]
-
-        # Mock count query to return > 0
-        mock_session.scalar.return_value = 5  # Additional items exist
-
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-
-        # Act
-        result = ConversationService.pagination_by_last_id(
-            session=mock_session,
-            app_model=app_model,
-            user=user,
-            last_id=None,
-            limit=20,
-            invoke_from=InvokeFrom.WEB_APP,
-        )
-
-        # Assert
-        assert isinstance(result, InfiniteScrollPagination)
-        assert result.has_more is True
-
-    @patch("services.conversation_service.session_factory")
-    def test_pagination_by_last_id_with_different_sort_by(self, mock_session_factory):
-        """
-        Test pagination with different sort fields.
-
-        Should handle various sort_by parameters correctly.
-        """
-        # Arrange
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock()
-        mock_session.scalars.return_value.all.return_value = [conversation]
-        mock_session.scalar.return_value = conversation
-
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-
-        # Test different sort fields
-        sort_fields = ["created_at", "-updated_at", "name", "-status"]
-
-        for sort_by in sort_fields:
-            # Act
-            result = ConversationService.pagination_by_last_id(
-                session=mock_session,
-                app_model=app_model,
-                user=user,
-                last_id=None,
-                limit=20,
-                invoke_from=InvokeFrom.WEB_APP,
-                sort_by=sort_by,
-            )
-
-            # Assert
-            assert isinstance(result, InfiniteScrollPagination)
-
-
-class TestConversationServiceEdgeCases:
-    """Test edge cases and error scenarios."""
-
-    @patch("services.conversation_service.session_factory")
-    def test_pagination_with_end_user_api_source(self, mock_session_factory):
-        """
-        Test pagination correctly handles EndUser with API source.
-
-        Should use 'api' as from_source for EndUser instances.
-        """
-        # Arrange
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock(
-            from_source=ConversationFromSource.API, from_end_user_id="user-123"
-        )
-        mock_session.scalars.return_value.all.return_value = [conversation]
-
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_end_user_mock()
-
-        # Act
-        result = ConversationService.pagination_by_last_id(
-            session=mock_session,
-            app_model=app_model,
-            user=user,
-            last_id=None,
-            limit=20,
-            invoke_from=InvokeFrom.WEB_APP,
-        )
-
-        # Assert
-        assert isinstance(result, InfiniteScrollPagination)
-
-    @patch("services.conversation_service.session_factory")
-    def test_pagination_with_account_console_source(self, mock_session_factory):
-        """
-        Test pagination correctly handles Account with console source.
-
-        Should use 'console' as from_source for Account instances.
-        """
-        # Arrange
-        mock_session = MagicMock()
-        mock_session_factory.create_session.return_value.__enter__.return_value = mock_session
-
-        conversation = ConversationServiceTestDataFactory.create_conversation_mock(
-            from_source=ConversationFromSource.CONSOLE, from_account_id="account-123"
-        )
-        mock_session.scalars.return_value.all.return_value = [conversation]
-
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-
-        # Act
-        result = ConversationService.pagination_by_last_id(
-            session=mock_session,
-            app_model=app_model,
-            user=user,
-            last_id=None,
-            limit=20,
-            invoke_from=InvokeFrom.WEB_APP,
-        )
-
-        # Assert
-        assert isinstance(result, InfiniteScrollPagination)
-
-    def test_pagination_with_include_ids_filter(self):
-        """
-        Test pagination with include_ids filter.
-
-        Should only return conversations with IDs in include_ids list.
-        """
-        # Arrange
-        mock_session = MagicMock()
-        mock_session.scalars.return_value.all.return_value = []
-
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-
-        # Act
-        result = ConversationService.pagination_by_last_id(
-            session=mock_session,
-            app_model=app_model,
-            user=user,
-            last_id=None,
-            limit=20,
-            invoke_from=InvokeFrom.WEB_APP,
-            include_ids=["conv-123", "conv-456"],
-        )
-
-        # Assert
-        assert isinstance(result, InfiniteScrollPagination)
-        # Verify that include_ids filter was applied
-        assert mock_session.scalars.called
-
-    def test_pagination_with_empty_exclude_ids(self):
-        """
-        Test pagination with empty exclude_ids list.
-
-        Should handle empty exclude_ids gracefully.
-        """
-        # Arrange
-        mock_session = MagicMock()
-        mock_session.scalars.return_value.all.return_value = []
-
-        app_model = ConversationServiceTestDataFactory.create_app_mock()
-        user = ConversationServiceTestDataFactory.create_account_mock()
-
-        # Act
-        result = ConversationService.pagination_by_last_id(
-            session=mock_session,
-            app_model=app_model,
-            user=user,
-            last_id=None,
-            limit=20,
-            invoke_from=InvokeFrom.WEB_APP,
-            exclude_ids=[],
-        )
-
-        # Assert
-        assert isinstance(result, InfiniteScrollPagination)
-        assert result.has_more is False

From 3193e8a712d442e0f3dd484f8ebd61a64df4812d Mon Sep 17 00:00:00 2001
From: Yunlu Wen <yunlu.wen@dify.ai>
Date: Thu, 16 Apr 2026 16:50:02 +0800
Subject: [PATCH 18/36] chore: reorg imports (#35308)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 api/.ruff.toml                                |  3 +
 api/controllers/common/fields.py              |  2 +-
 api/controllers/console/app/app.py            |  2 +-
 api/controllers/console/app/audio.py          |  2 +-
 api/controllers/console/app/completion.py     |  2 +-
 api/controllers/console/app/generator.py      |  2 +-
 api/controllers/console/app/message.py        |  2 +-
 api/controllers/console/app/workflow.py       | 10 +--
 .../console/app/workflow_app_log.py           |  2 +-
 .../console/app/workflow_draft_variable.py    |  8 +--
 api/controllers/console/app/workflow_run.py   |  4 +-
 api/controllers/console/auth/oauth_server.py  |  2 +-
 api/controllers/console/datasets/datasets.py  |  2 +-
 .../console/datasets/datasets_document.py     |  4 +-
 .../console/datasets/datasets_segments.py     |  2 +-
 .../console/datasets/hit_testing_base.py      |  2 +-
 .../datasets/rag_pipeline/datasource_auth.py  |  4 +-
 .../rag_pipeline_draft_variable.py            |  2 +-
 .../rag_pipeline/rag_pipeline_workflow.py     |  2 +-
 api/controllers/console/explore/audio.py      |  2 +-
 api/controllers/console/explore/completion.py |  2 +-
 .../console/explore/installed_app.py          |  2 +-
 api/controllers/console/explore/message.py    |  2 +-
 api/controllers/console/explore/trial.py      |  4 +-
 api/controllers/console/explore/workflow.py   |  4 +-
 api/controllers/console/remote_files.py       |  2 +-
 api/controllers/console/workspace/account.py  |  2 +-
 .../console/workspace/agent_providers.py      |  2 +-
 api/controllers/console/workspace/endpoint.py |  2 +-
 .../workspace/load_balancing_config.py        |  4 +-
 .../console/workspace/model_providers.py      |  6 +-
 api/controllers/console/workspace/models.py   |  6 +-
 api/controllers/console/workspace/plugin.py   |  2 +-
 .../console/workspace/tool_providers.py       |  2 +-
 .../console/workspace/trigger_providers.py    |  2 +-
 api/controllers/inner_api/plugin/plugin.py    |  2 +-
 api/controllers/mcp/mcp.py                    |  2 +-
 api/controllers/service_api/app/audio.py      |  2 +-
 api/controllers/service_api/app/completion.py |  2 +-
 .../service_api/app/conversation.py           |  2 +-
 api/controllers/service_api/app/workflow.py   |  6 +-
 .../service_api/dataset/dataset.py            |  2 +-
 .../service_api/dataset/segment.py            |  2 +-
 .../service_api/workspace/models.py           |  2 +-
 api/controllers/web/audio.py                  |  2 +-
 api/controllers/web/completion.py             |  2 +-
 api/controllers/web/message.py                |  2 +-
 api/controllers/web/remote_files.py           |  2 +-
 api/controllers/web/workflow.py               |  4 +-
 api/core/agent/base_agent_runner.py           | 28 ++++----
 api/core/agent/cot_agent_runner.py            | 17 +++--
 api/core/agent/cot_chat_agent_runner.py       |  3 +-
 api/core/agent/cot_completion_agent_runner.py |  3 +-
 api/core/agent/fc_agent_runner.py             | 15 ++---
 .../agent/output_parser/cot_output_parser.py  |  3 +-
 .../model_config/converter.py                 |  7 +-
 .../easy_ui_based_app/model_config/manager.py |  3 +-
 .../prompt_template/manager.py                |  3 +-
 .../easy_ui_based_app/variables/manager.py    |  3 +-
 api/core/app/app_config/entities.py           |  8 +--
 .../features/file_upload/manager.py           |  3 +-
 .../variables/manager.py                      |  3 +-
 .../app/apps/advanced_chat/app_generator.py   |  9 ++-
 api/core/app/apps/advanced_chat/app_runner.py | 12 ++--
 .../advanced_chat/generate_task_pipeline.py   | 12 ++--
 api/core/app/apps/agent_chat/app_generator.py |  2 +-
 api/core/app/apps/agent_chat/app_runner.py    |  6 +-
 .../base_app_generate_response_converter.py   |  3 +-
 api/core/app/apps/base_app_generator.py       |  6 +-
 api/core/app/apps/base_app_queue_manager.py   |  2 +-
 api/core/app/apps/base_app_runner.py          | 21 +++---
 api/core/app/apps/chat/app_generator.py       |  2 +-
 api/core/app/apps/chat/app_runner.py          |  4 +-
 .../common/graph_runtime_state_support.py     |  3 +-
 .../common/workflow_response_converter.py     | 26 ++++----
 api/core/app/apps/completion/app_generator.py |  2 +-
 api/core/app/apps/completion/app_runner.py    |  4 +-
 .../app/apps/pipeline/pipeline_generator.py   |  4 +-
 api/core/app/apps/pipeline/pipeline_runner.py | 12 ++--
 api/core/app/apps/workflow/app_generator.py   |  8 +--
 api/core/app/apps/workflow/app_runner.py      | 11 ++--
 .../apps/workflow/generate_task_pipeline.py   |  6 +-
 api/core/app/apps/workflow_app_runner.py      | 66 +++++++++----------
 api/core/app/entities/app_invoke_entities.py  |  4 +-
 api/core/app/entities/queue_entities.py       |  8 +--
 api/core/app/entities/task_entities.py        |  8 +--
 .../hosting_moderation/hosting_moderation.py  |  3 +-
 .../conversation_variable_persist_layer.py    |  5 +-
 .../app/layers/pause_state_persist_layer.py   |  4 +-
 api/core/app/layers/timeslice_layer.py        |  2 +-
 api/core/app/layers/trigger_post_layer.py     |  4 +-
 api/core/app/llm/model_access.py              |  9 ++-
 api/core/app/llm/quota.py                     |  2 +-
 .../based_generate_task_pipeline.py           |  2 +-
 .../easy_ui_based_generate_task_pipeline.py   | 14 ++--
 .../app/task_pipeline/message_file_utils.py   |  3 +-
 api/core/app/workflow/file_runtime.py         |  7 +-
 api/core/app/workflow/layers/llm_quota.py     |  9 ++-
 api/core/app/workflow/layers/observability.py |  8 +--
 api/core/app/workflow/layers/persistence.py   | 15 ++---
 .../base/tts/app_generator_tts_publisher.py   |  5 +-
 api/core/datasource/datasource_manager.py     |  6 +-
 api/core/datasource/entities/api_entities.py  |  2 +-
 .../datasource/utils/message_transformer.py   |  3 +-
 api/core/entities/execution_extra_content.py  |  2 +-
 api/core/entities/mcp_provider.py             |  2 +-
 api/core/entities/model_entities.py           |  3 +-
 api/core/entities/provider_configuration.py   | 20 +++---
 api/core/entities/provider_entities.py        |  2 +-
 .../helper/code_executor/code_executor.py     |  2 +-
 api/core/helper/moderation.py                 |  7 +-
 api/core/hosting_configuration.py             |  2 +-
 api/core/indexing_runner.py                   |  2 +-
 api/core/llm_generator/llm_generator.py       | 10 +--
 .../output_parser/structured_output.py        | 10 +--
 api/core/mcp/server/streamable_http.py        |  3 +-
 api/core/mcp/utils.py                         |  2 +-
 api/core/memory/token_buffer_memory.py        | 18 ++---
 api/core/model_manager.py                     | 19 +++---
 .../openai_moderation/openai_moderation.py    |  3 +-
 api/core/ops/aliyun_trace/aliyun_trace.py     |  4 +-
 api/core/ops/aliyun_trace/utils.py            |  4 +-
 .../arize_phoenix_trace.py                    |  2 +-
 api/core/ops/langfuse_trace/langfuse_trace.py |  2 +-
 .../ops/langsmith_trace/langsmith_trace.py    |  2 +-
 api/core/ops/mlflow_trace/mlflow_trace.py     |  2 +-
 api/core/ops/opik_trace/opik_trace.py         |  2 +-
 api/core/ops/tencent_trace/span_builder.py    |  4 +-
 api/core/ops/tencent_trace/tencent_trace.py   |  8 +--
 api/core/ops/weave_trace/weave_trace.py       |  2 +-
 api/core/plugin/backwards_invocation/model.py | 27 ++++----
 api/core/plugin/backwards_invocation/node.py  |  3 +-
 api/core/plugin/entities/marketplace.py       |  2 +-
 api/core/plugin/entities/plugin.py            |  2 +-
 api/core/plugin/entities/plugin_daemon.py     |  4 +-
 api/core/plugin/entities/request.py           |  8 +--
 api/core/plugin/impl/base.py                  | 16 ++---
 api/core/plugin/impl/model.py                 | 13 ++--
 api/core/plugin/impl/model_runtime.py         | 14 ++--
 api/core/plugin/impl/model_runtime_factory.py |  3 +-
 api/core/plugin/utils/converter.py            |  3 +-
 api/core/prompt/advanced_prompt_transform.py  | 15 ++---
 .../prompt/agent_history_prompt_transform.py  | 13 ++--
 api/core/prompt/prompt_transform.py           |  5 +-
 api/core/prompt/simple_prompt_transform.py    | 13 ++--
 api/core/prompt/utils/prompt_message_util.py  |  3 +-
 api/core/provider_manager.py                  | 16 ++---
 .../data_post_processor.py                    |  5 +-
 api/core/rag/datasource/retrieval_service.py  |  2 +-
 api/core/rag/datasource/vdb/vector_factory.py |  2 +-
 api/core/rag/docstore/dataset_docstore.py     |  2 +-
 api/core/rag/embedding/cached_embedding.py    |  4 +-
 .../processor/paragraph_index_processor.py    | 20 +++---
 api/core/rag/models/document.py               |  3 +-
 api/core/rag/rerank/rerank_model.py           |  5 +-
 api/core/rag/rerank/weight_rerank.py          |  2 +-
 api/core/rag/retrieval/dataset_retrieval.py   | 10 +--
 .../multi_dataset_function_call_router.py     |  5 +-
 .../router/multi_dataset_react_route.py       |  7 +-
 api/core/rag/splitter/fixed_text_splitter.py  |  3 +-
 .../celery_workflow_execution_repository.py   |  2 +-
 ...lery_workflow_node_execution_repository.py |  2 +-
 api/core/repositories/factory.py              |  2 +-
 .../repositories/human_input_repository.py    |  4 +-
 ...qlalchemy_workflow_execution_repository.py |  6 +-
 ...hemy_workflow_node_execution_repository.py |  8 +--
 .../builtin_tool/providers/audio/tools/asr.py |  7 +-
 .../builtin_tool/providers/audio/tools/tts.py |  3 +-
 api/core/tools/builtin_tool/tool.py           |  5 +-
 api/core/tools/custom_tool/tool.py            |  2 +-
 api/core/tools/entities/api_entities.py       |  2 +-
 api/core/tools/mcp_tool/tool.py               |  3 +-
 api/core/tools/tool_engine.py                 |  2 +-
 api/core/tools/tool_file_manager.py           |  2 +-
 api/core/tools/tool_manager.py                |  5 +-
 .../dataset_multi_retriever_tool.py           |  2 +-
 api/core/tools/utils/message_transformer.py   |  2 +-
 .../tools/utils/model_invocation_utils.py     |  7 +-
 .../utils/workflow_configuration_sync.py      |  5 +-
 api/core/tools/workflow_as_tool/provider.py   |  2 +-
 api/core/tools/workflow_as_tool/tool.py       |  4 +-
 api/core/trigger/debug/event_selectors.py     |  2 +-
 api/core/workflow/human_input_compat.py       |  5 +-
 api/core/workflow/node_factory.py             | 32 ++++-----
 api/core/workflow/node_runtime.py             | 57 ++++++++--------
 api/core/workflow/nodes/agent/agent_node.py   |  5 +-
 api/core/workflow/nodes/agent/entities.py     |  4 +-
 .../nodes/agent/message_transformer.py        | 16 ++---
 .../workflow/nodes/agent/runtime_support.py   |  4 +-
 .../nodes/datasource/datasource_node.py       | 13 ++--
 .../workflow/nodes/datasource/entities.py     |  5 +-
 .../nodes/knowledge_index/entities.py         |  4 +-
 .../knowledge_index/knowledge_index_node.py   | 11 ++--
 .../nodes/knowledge_retrieval/entities.py     |  6 +-
 .../knowledge_retrieval_node.py               | 11 ++--
 .../nodes/knowledge_retrieval/retrieval.py    |  4 +-
 .../workflow/nodes/trigger_plugin/entities.py |  4 +-
 .../trigger_plugin/trigger_event_node.py      |  5 +-
 .../nodes/trigger_schedule/entities.py        |  4 +-
 .../trigger_schedule/trigger_schedule_node.py |  7 +-
 .../nodes/trigger_webhook/entities.py         |  6 +-
 .../workflow/nodes/trigger_webhook/node.py    |  9 ++-
 api/core/workflow/template_rendering.py       |  3 +-
 api/core/workflow/workflow_entry.py           | 27 ++++----
 api/enterprise/telemetry/draft_trace.py       |  3 +-
 ...rameters_cache_when_sync_draft_workflow.py |  5 +-
 ...oin_when_app_published_workflow_updated.py |  2 +-
 api/extensions/ext_sentry.py                  |  3 +-
 ..._api_workflow_node_execution_repository.py |  2 +-
 .../logstore_api_workflow_run_repository.py   |  2 +-
 .../logstore_workflow_execution_repository.py |  4 +-
 ...tore_workflow_node_execution_repository.py |  8 +--
 api/extensions/otel/parser/base.py            | 10 +--
 api/extensions/otel/parser/llm.py             |  4 +-
 api/extensions/otel/parser/retrieval.py       |  6 +-
 api/extensions/otel/parser/tool.py            |  8 +--
 api/factories/file_factory/builders.py        |  2 +-
 api/factories/file_factory/message_files.py   |  3 +-
 api/factories/file_factory/storage_keys.py    |  2 +-
 api/factories/variable_factory.py             | 11 ++--
 api/fields/conversation_fields.py             |  2 +-
 api/fields/conversation_variable_fields.py    |  2 +-
 api/fields/member_fields.py                   |  2 +-
 api/fields/message_fields.py                  |  2 +-
 api/fields/raws.py                            |  1 +
 api/fields/workflow_fields.py                 |  2 +-
 api/libs/helper.py                            |  4 +-
 api/models/human_input.py                     |  2 +-
 api/models/model.py                           |  6 +-
 api/models/provider.py                        |  2 +-
 api/models/utils/file_input_compat.py         |  3 +-
 api/models/workflow.py                        | 29 ++++----
 .../api_workflow_run_repository.py            |  4 +-
 ..._api_workflow_node_execution_repository.py |  2 +-
 .../sqlalchemy_api_workflow_run_repository.py |  6 +-
 ...hemy_execution_extra_content_repository.py |  6 +-
 api/services/app_dsl_service.py               | 12 ++--
 api/services/app_service.py                   |  4 +-
 api/services/app_task_service.py              |  3 +-
 api/services/audio_service.py                 |  2 +-
 .../clear_free_plan_tenant_expired_logs.py    |  2 +-
 api/services/conversation_service.py          |  2 +-
 api/services/conversation_variable_updater.py |  2 +-
 api/services/dataset_service.py               |  6 +-
 api/services/datasource_provider_service.py   |  2 +-
 .../entities/model_provider_entities.py       | 18 ++---
 api/services/external_knowledge_service.py    |  2 +-
 api/services/file_service.py                  |  2 +-
 api/services/hit_testing_service.py           |  3 +-
 .../human_input_delivery_test_service.py      |  2 +-
 api/services/human_input_service.py           | 12 ++--
 api/services/message_service.py               |  2 +-
 api/services/model_load_balancing_service.py  | 12 ++--
 api/services/model_provider_service.py        |  3 +-
 api/services/rag_pipeline/rag_pipeline.py     | 18 ++---
 .../rag_pipeline/rag_pipeline_dsl_service.py  | 12 ++--
 .../archive_paid_plan_workflow_run.py         |  2 +-
 api/services/summary_index_service.py         |  4 +-
 .../tools/api_tools_manage_service.py         |  2 +-
 .../tools/workflow_tools_manage_service.py    |  2 +-
 api/services/trigger/schedule_service.py      |  2 +-
 api/services/trigger/trigger_service.py       |  2 +-
 api/services/trigger/webhook_service.py       |  6 +-
 api/services/variable_truncator.py            |  3 +-
 api/services/vector_service.py                |  2 +-
 api/services/workflow/workflow_converter.py   | 10 +--
 api/services/workflow_app_service.py          |  2 +-
 .../workflow_draft_variable_service.py        | 26 ++++----
 .../workflow_event_snapshot_service.py        |  8 +--
 api/services/workflow_service.py              | 50 +++++++-------
 .../app_generate/workflow_execute_task.py     |  2 +-
 api/tasks/async_workflow_tasks.py             |  2 +-
 .../batch_create_segment_to_index_task.py     |  2 +-
 api/tasks/human_input_timeout_tasks.py        |  4 +-
 api/tasks/mail_human_input_delivery_task.py   |  2 +-
 api/tasks/trigger_processing_tasks.py         |  2 +-
 api/tasks/workflow_execution_tasks.py         |  4 +-
 api/tasks/workflow_node_execution_tasks.py    |  6 +-
 .../test_datasource_manager_integration.py    |  3 +-
 .../test_datasource_node_integration.py       |  5 +-
 .../model_runtime/__mock/plugin_model.py      |  6 +-
 .../test_workflow_draft_variable_service.py   |  8 +--
 .../test_remove_app_and_related_data_task.py  |  4 +-
 .../workflow/nodes/__mock/model.py            |  3 +-
 .../workflow/nodes/test_code.py               | 10 +--
 .../workflow/nodes/test_http.py               | 13 ++--
 .../workflow/nodes/test_llm.py                | 11 ++--
 .../nodes/test_parameter_extractor.py         | 11 ++--
 .../workflow/nodes/test_template_transform.py |  7 +-
 .../workflow/nodes/test_tool.py               | 13 ++--
 ...test_chat_conversation_status_count_api.py |  2 +-
 .../app/test_workflow_draft_variable.py       |  2 +-
 .../layers/test_pause_state_persist_layer.py  | 14 ++--
 .../test_human_input_form_repository_impl.py  |  2 +-
 .../test_human_input_resume_node_execution.py | 22 +++----
 .../factories/test_storage_key_loader.py      |  2 +-
 .../helpers/execution_extra_content.py        |  1 -
 .../test_conversation_message_inputs.py       |  2 +-
 .../models/test_conversation_status_count.py  |  2 +-
 .../models/test_types_enum_text.py            |  2 +-
 ..._api_workflow_node_execution_repository.py |  2 +-
 ..._sqlalchemy_api_workflow_run_repository.py |  8 +--
 ...hemy_execution_extra_content_repository.py |  4 +-
 ...hemy_workflow_node_execution_repository.py | 10 +--
 .../test_workflow_run_repository.py           |  4 +-
 .../services/test_agent_service.py            |  1 -
 .../services/test_app_dsl_service.py          |  2 +-
 .../test_conversation_service_variables.py    |  2 +-
 .../test_conversation_variable_updater.py     |  2 +-
 .../services/test_dataset_service.py          |  2 +-
 .../test_dataset_service_update_dataset.py    |  2 +-
 .../test_delete_archived_workflow_run.py      |  2 +-
 .../test_human_input_delivery_test.py         |  4 +-
 .../test_human_input_delivery_test_service.py |  2 +-
 .../services/test_messages_clean_service.py   |  2 +-
 .../services/test_model_provider_service.py   |  8 +--
 .../services/test_workflow_app_service.py     |  2 +-
 .../test_workflow_draft_variable_service.py   |  2 +-
 .../workflow/test_workflow_converter.py       |  6 +-
 ...kflow_node_execution_service_repository.py |  2 +-
 .../test_mail_human_input_delivery_task.py    |  6 +-
 .../test_remove_app_and_related_data_task.py  |  4 +-
 .../test_workflow_pause_integration.py        |  4 +-
 .../trigger/test_trigger_e2e.py               |  2 +-
 .../controllers/console/app/test_audio.py     |  2 +-
 .../app/test_conversation_variables_api.py    |  2 +-
 .../controllers/console/app/test_workflow.py  |  2 +-
 .../console/app/test_workflow_app_log_api.py  |  3 +-
 .../app/test_workflow_pause_details_api.py    |  8 +--
 .../app/workflow_draft_variables_test.py      |  2 +-
 .../rag_pipeline/test_datasource_auth.py      |  2 +-
 .../test_rag_pipeline_draft_variable.py       |  2 +-
 .../console/datasets/test_hit_testing_base.py |  2 +-
 .../controllers/console/explore/test_audio.py |  2 +-
 .../console/explore/test_message.py           |  2 +-
 .../controllers/console/explore/test_trial.py |  2 +-
 .../workspace/test_load_balancing_config.py   |  3 +-
 .../console/workspace/test_model_providers.py |  2 +-
 .../console/workspace/test_models.py          |  4 +-
 .../controllers/service_api/app/test_audio.py |  2 +-
 .../service_api/app/test_completion.py        |  2 +-
 .../service_api/app/test_conversation.py      |  2 +-
 .../service_api/app/test_workflow.py          |  2 +-
 .../service_api/app/test_workflow_fields.py   |  3 +-
 .../unit_tests/controllers/web/test_audio.py  |  2 +-
 .../controllers/web/test_completion.py        |  2 +-
 .../core/agent/test_cot_agent_runner.py       |  2 +-
 .../core/agent/test_cot_chat_agent_runner.py  |  2 +-
 .../agent/test_cot_completion_agent_runner.py |  4 +-
 .../core/agent/test_fc_agent_runner.py        | 10 +--
 .../test_model_config_converter.py            |  4 +-
 .../test_variables_manager.py                 |  2 +-
 .../features/file_upload/test_manager.py      |  3 +-
 .../core/app/app_config/test_entities.py      |  2 +-
 .../test_app_runner_conversation_variables.py |  2 +-
 .../test_generate_response_converter.py       |  3 +-
 .../test_generate_task_pipeline.py            |  4 +-
 .../test_generate_task_pipeline_core.py       |  4 +-
 .../test_agent_chat_app_generator.py          |  2 +-
 .../agent_chat/test_agent_chat_app_runner.py  |  4 +-
 .../chat/test_app_generator_and_runner.py     |  2 +-
 .../chat/test_base_app_runner_multimodal.py   |  4 +-
 .../test_graph_runtime_state_support.py       |  2 +-
 .../test_workflow_response_converter.py       |  3 +-
 ...workflow_response_converter_human_input.py |  5 +-
 ..._workflow_response_converter_resumption.py |  5 +-
 ..._workflow_response_converter_truncation.py |  4 +-
 .../app/apps/completion/test_app_runner.py    |  2 +-
 ...est_completion_completion_app_generator.py |  2 +-
 ...st_pipeline_generate_response_converter.py |  3 +-
 .../pipeline/test_pipeline_queue_manager.py   |  2 +-
 .../app/apps/pipeline/test_pipeline_runner.py |  2 +-
 .../core/app/apps/test_base_app_generator.py  |  5 +-
 .../core/app/apps/test_base_app_runner.py     | 18 ++---
 .../core/app/apps/test_pause_resume.py        | 11 ++--
 .../app/apps/test_workflow_app_runner_core.py | 34 +++++-----
 .../test_workflow_app_runner_notifications.py |  4 +-
 .../test_workflow_app_runner_single_node.py   |  4 +-
 .../app/apps/test_workflow_pause_events.py    | 10 +--
 .../test_generate_response_converter.py       |  3 +-
 .../workflow/test_generate_task_pipeline.py   |  5 +-
 .../test_generate_task_pipeline_core.py       |  4 +-
 .../core/app/entities/test_task_entities.py   |  3 +-
 ...est_conversation_variable_persist_layer.py |  7 +-
 .../layers/test_pause_state_persist_layer.py  | 20 +++---
 .../core/app/layers/test_suspend_layer.py     |  3 +-
 .../core/app/layers/test_timeslice_layer.py   |  3 +-
 .../app/layers/test_trigger_post_layer.py     |  5 +-
 .../test_based_generate_task_pipeline.py      |  2 +-
 ...st_easy_ui_based_generate_task_pipeline.py |  4 +-
 ...sy_ui_based_generate_task_pipeline_core.py |  6 +-
 .../test_easy_ui_message_end_files.py         |  2 +-
 .../app/test_easy_ui_model_config_manager.py  |  3 +-
 .../app/workflow/layers/test_persistence.py   |  4 +-
 .../core/app/workflow/test_file_runtime.py    |  2 +-
 .../core/app/workflow/test_node_factory.py    |  2 +-
 .../test_observability_layer_extra.py         |  3 +-
 .../app/workflow/test_persistence_layer.py    |  8 +--
 .../base/test_app_generator_tts_publisher.py  |  6 +-
 .../datasource/test_datasource_manager.py     |  6 +-
 .../utils/test_message_transformer.py         |  2 +-
 .../test_entities_execution_extra_content.py  |  5 +-
 .../entities/test_entities_model_entities.py  |  6 +-
 .../test_entities_provider_configuration.py   | 22 +++----
 .../test_entities_provider_entities.py        |  2 +-
 .../unit_tests/core/helper/test_moderation.py |  2 +-
 .../output_parser/test_structured_output.py   | 28 ++++----
 .../core/llm_generator/test_llm_generator.py  |  4 +-
 .../core/mcp/server/test_streamable_http.py   |  2 +-
 .../core/memory/test_token_buffer_memory.py   |  4 +-
 .../test_model_provider_factory.py            |  1 +
 .../ops/aliyun_trace/test_aliyun_trace.py     |  4 +-
 .../aliyun_trace/test_aliyun_trace_utils.py   |  4 +-
 .../ops/langfuse_trace/test_langfuse_trace.py |  2 +-
 .../langsmith_trace/test_langsmith_trace.py   |  2 +-
 .../ops/mlflow_trace/test_mlflow_trace.py     |  2 +-
 .../core/ops/opik_trace/test_opik_trace.py    |  2 +-
 .../ops/tencent_trace/test_span_builder.py    |  4 +-
 .../ops/tencent_trace/test_tencent_trace.py   |  4 +-
 .../core/ops/test_arize_phoenix_trace.py      |  2 +-
 .../core/ops/test_langfuse_trace.py           |  3 +-
 .../core/ops/weave_trace/test_weave_trace.py  |  2 +-
 .../plugin/test_backwards_invocation_model.py |  3 +-
 .../core/plugin/test_model_runtime_adapter.py |  6 +-
 .../core/plugin/test_plugin_entities.py       | 12 ++--
 .../core/plugin/test_plugin_runtime.py        | 16 ++---
 .../core/plugin/utils/test_chunk_merger.py    |  2 +-
 .../prompt/test_advanced_prompt_transform.py  | 14 ++--
 .../test_agent_history_prompt_transform.py    | 15 ++---
 .../core/prompt/test_prompt_message.py        |  5 +-
 .../core/prompt/test_prompt_transform.py      |  2 +-
 .../prompt/test_simple_prompt_transform.py    | 12 ++--
 .../test_data_post_processor.py               |  5 +-
 .../rag/embedding/test_cached_embedding.py    |  4 +-
 .../rag/embedding/test_embedding_service.py   |  8 +--
 .../test_paragraph_index_processor.py         |  6 +-
 .../core/rag/indexing/test_indexing_runner.py |  2 +-
 .../core/rag/rerank/test_reranker.py          |  2 +-
 .../rag/retrieval/test_dataset_retrieval.py   |  4 +-
 ...test_multi_dataset_function_call_router.py |  3 +-
 .../test_multi_dataset_react_route.py         |  5 +-
 ...st_celery_workflow_execution_repository.py |  4 +-
 ...lery_workflow_node_execution_repository.py |  6 +-
 .../test_human_input_form_repository_impl.py  | 10 +--
 .../test_human_input_repository.py            |  4 +-
 ...qlalchemy_workflow_execution_repository.py |  4 +-
 ...hemy_workflow_node_execution_repository.py | 12 ++--
 ...rkflow_node_execution_conflict_handling.py | 10 +--
 ...test_workflow_node_execution_truncation.py | 10 +--
 api/tests/unit_tests/core/test_file.py        |  1 -
 .../unit_tests/core/test_model_manager.py     |  2 +-
 .../core/test_provider_configuration.py       | 18 ++---
 .../unit_tests/core/test_provider_manager.py  |  4 +-
 .../core/tools/test_builtin_tool_base.py      |  2 +-
 .../core/tools/test_builtin_tools_extra.py    |  4 +-
 .../core/tools/test_tool_file_manager.py      |  2 +-
 .../utils/test_model_invocation_utils.py      |  4 +-
 .../utils/test_workflow_configuration_sync.py |  2 +-
 .../tools/workflow_as_tool/test_provider.py   |  2 +-
 .../core/tools/workflow_as_tool/test_tool.py  |  2 +-
 .../debug/test_debug_event_selectors.py       |  2 +-
 .../unit_tests/core/variables/test_segment.py | 10 +--
 .../core/variables/test_segment_type.py       |  1 +
 .../variables/test_segment_type_validation.py |  1 +
 .../core/variables/test_variables.py          |  3 +-
 .../workflow/graph_engine/layers/conftest.py  |  6 +-
 .../graph_engine/layers/test_llm_quota.py     |  9 ++-
 .../graph_engine/layers/test_observability.py |  2 +-
 .../graph_engine/test_mock_factory.py         |  3 +-
 .../workflow/graph_engine/test_mock_nodes.py  |  9 ++-
 .../test_parallel_human_input_join_resume.py  | 15 ++---
 .../graph_engine/test_table_runner.py         | 11 ++--
 .../nodes/agent/test_message_transformer.py   |  3 +-
 .../nodes/agent/test_runtime_support.py       |  3 +-
 .../core/workflow/nodes/answer/test_answer.py |  9 ++-
 .../workflow/nodes/base/test_base_node.py     |  4 +-
 .../test_get_node_type_classes_mapping.py     |  3 +-
 .../workflow/nodes/code/code_node_spec.py     |  3 +-
 .../nodes/datasource/test_datasource_node.py  |  5 +-
 .../test_http_request_executor.py             |  8 +--
 .../http_request/test_http_request_node.py    | 10 +--
 .../human_input/test_email_delivery_config.py |  3 +-
 .../nodes/human_input/test_entities.py        | 36 +++++-----
 .../test_human_input_form_filled_event.py     |  7 +-
 .../test_iteration_child_engine_errors.py     |  4 +-
 .../test_knowledge_index_node.py              |  6 +-
 .../test_knowledge_retrieval_node.py          |  8 +--
 .../workflow/nodes/list_operator/node_spec.py |  4 +-
 .../core/workflow/nodes/llm/test_llm_utils.py |  4 +-
 .../core/workflow/nodes/llm/test_node.py      | 26 ++++----
 .../test_parameter_extractor_node.py          |  4 +-
 .../template_transform_node_spec.py           |  4 +-
 .../test_template_transform_node.py           |  4 +-
 .../core/workflow/nodes/test_base_node.py     |  8 +--
 .../nodes/test_document_extractor_node.py     |  4 +-
 .../core/workflow/nodes/test_if_else.py       | 10 +--
 .../core/workflow/nodes/test_list_operator.py |  4 +-
 .../nodes/test_start_node_json_object.py      |  8 +--
 .../workflow/nodes/tool/test_tool_node.py     |  4 +-
 .../nodes/tool/test_tool_node_runtime.py      | 10 +--
 .../trigger_plugin/test_trigger_event_node.py |  9 ++-
 .../workflow/nodes/webhook/test_exceptions.py |  2 +-
 .../webhook/test_webhook_file_conversion.py   |  7 +-
 .../nodes/webhook/test_webhook_node.py        | 10 +--
 .../core/workflow/test_human_input_compat.py  |  2 +-
 .../core/workflow/test_node_factory.py        |  8 +--
 .../core/workflow/test_node_runtime.py        |  8 +--
 .../core/workflow/test_system_variable.py     |  5 +-
 .../core/workflow/test_variable_pool.py       | 18 ++---
 .../core/workflow/test_workflow_entry.py      | 12 ++--
 .../workflow/test_workflow_entry_helpers.py   | 12 ++--
 .../test_workflow_entry_redis_channel.py      |  5 +-
 .../factories/test_build_from_mapping.py      |  2 +-
 .../factories/test_variable_factory.py        | 10 +--
 .../unit_tests/fields/test_file_fields.py     |  2 +-
 .../unit_tests/libs/_human_input/support.py   |  1 -
 .../libs/_human_input/test_form_service.py    |  2 +-
 .../libs/_human_input/test_models.py          |  2 +-
 .../models/test_conversation_variable.py      |  3 +-
 api/tests/unit_tests/models/test_model.py     |  2 +-
 api/tests/unit_tests/models/test_workflow.py  |  7 +-
 .../unit_tests/models/test_workflow_models.py |  2 +-
 .../services/dataset_service_test_helpers.py  |  2 +-
 .../services/document_service_validation.py   |  2 +-
 .../test_rag_pipeline_dsl_service.py          |  2 +-
 .../rag_pipeline/test_rag_pipeline_service.py |  4 +-
 .../test_datasource_provider_service.py       |  2 +-
 .../services/test_human_input_service.py      | 12 ++--
 .../test_model_load_balancing_service.py      |  6 +-
 .../services/test_model_provider_service.py   |  4 +-
 ...est_model_provider_service_sanitization.py |  4 +-
 .../services/test_variable_truncator.py       |  2 +-
 .../test_variable_truncator_additional.py     |  2 +-
 .../test_webhook_service_additional.py        |  2 +-
 .../test_workflow_run_service_pause.py        |  2 +-
 .../services/test_workflow_service.py         |  2 +-
 .../workflow/test_draft_var_loader_simple.py  |  6 +-
 .../test_workflow_draft_variable_service.py   |  8 +--
 .../test_workflow_event_snapshot_service.py   |  6 +-
 ...kflow_event_snapshot_service_additional.py |  4 +-
 .../test_workflow_human_input_delivery.py     |  6 +-
 .../tasks/test_human_input_timeout_tasks.py   |  2 +-
 api/tests/unit_tests/tools/test_mcp_tool.py   |  2 +-
 .../test_structured_output_parser.py          |  6 +-
 api/tests/workflow_test_utils.py              |  5 +-
 545 files changed, 1480 insertions(+), 1604 deletions(-)

diff --git a/api/.ruff.toml b/api/.ruff.toml
index bd9684ef65..dd78024a02 100644
--- a/api/.ruff.toml
+++ b/api/.ruff.toml
@@ -106,3 +106,6 @@ msg = "Use Pydantic payload/query models instead of reqparse."
 
 [lint.flake8-tidy-imports.banned-api."flask_restx.reqparse.RequestParser"]
 msg = "Use Pydantic payload/query models instead of reqparse."
+
+[lint.isort]
+known-first-party = ["graphon"]
\ No newline at end of file
diff --git a/api/controllers/common/fields.py b/api/controllers/common/fields.py
index 4fe3fc9062..8e665c1386 100644
--- a/api/controllers/common/fields.py
+++ b/api/controllers/common/fields.py
@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from typing import Any
 
-from graphon.file import helpers as file_helpers
 from pydantic import BaseModel, ConfigDict, computed_field
 
+from graphon.file import helpers as file_helpers
 from models.model import IconType
 
 type JSONValue = str | int | float | bool | None | dict[str, Any] | list[Any]
diff --git a/api/controllers/console/app/app.py b/api/controllers/console/app/app.py
index ac0682486b..051d08aa36 100644
--- a/api/controllers/console/app/app.py
+++ b/api/controllers/console/app/app.py
@@ -5,7 +5,6 @@ from typing import Any, Literal
 
 from flask import request
 from flask_restx import Resource
-from graphon.enums import WorkflowExecutionStatus
 from pydantic import AliasChoices, BaseModel, Field, computed_field, field_validator
 from sqlalchemy import select
 from sqlalchemy.orm import Session
@@ -30,6 +29,7 @@ from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.trigger.constants import TRIGGER_NODE_TYPES
 from extensions.ext_database import db
 from fields.base import ResponseModel
+from graphon.enums import WorkflowExecutionStatus
 from libs.helper import build_icon_url
 from libs.login import current_account_with_tenant, login_required
 from models import App, DatasetPermissionEnum, Workflow
diff --git a/api/controllers/console/app/audio.py b/api/controllers/console/app/audio.py
index 78ddb904e1..91fbe4a85a 100644
--- a/api/controllers/console/app/audio.py
+++ b/api/controllers/console/app/audio.py
@@ -2,7 +2,6 @@ import logging
 
 from flask import request
 from flask_restx import Resource, fields
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field
 from werkzeug.exceptions import InternalServerError
 
@@ -23,6 +22,7 @@ from controllers.console.app.error import (
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs.login import login_required
 from models import App, AppMode
 from services.audio_service import AudioService
diff --git a/api/controllers/console/app/completion.py b/api/controllers/console/app/completion.py
index d83925d173..fe274e4c9a 100644
--- a/api/controllers/console/app/completion.py
+++ b/api/controllers/console/app/completion.py
@@ -3,7 +3,6 @@ from typing import Any, Literal
 
 from flask import request
 from flask_restx import Resource
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field, field_validator
 from werkzeug.exceptions import InternalServerError, NotFound
 
@@ -27,6 +26,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from core.helper.trace_id_helper import get_external_trace_id
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from libs.helper import uuid_value
 from libs.login import current_user, login_required
diff --git a/api/controllers/console/app/generator.py b/api/controllers/console/app/generator.py
index 7101d5df7b..c720a5e074 100644
--- a/api/controllers/console/app/generator.py
+++ b/api/controllers/console/app/generator.py
@@ -1,7 +1,6 @@
 from collections.abc import Sequence
 
 from flask_restx import Resource
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field
 
 from controllers.console import console_ns
@@ -20,6 +19,7 @@ from core.helper.code_executor.python3.python3_code_provider import Python3CodeP
 from core.llm_generator.entities import RuleCodeGeneratePayload, RuleGeneratePayload, RuleStructuredOutputPayload
 from core.llm_generator.llm_generator import LLMGenerator
 from extensions.ext_database import db
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs.login import current_account_with_tenant, login_required
 from models import App
 from services.workflow_service import WorkflowService
diff --git a/api/controllers/console/app/message.py b/api/controllers/console/app/message.py
index daeed4627c..44e19b57db 100644
--- a/api/controllers/console/app/message.py
+++ b/api/controllers/console/app/message.py
@@ -4,7 +4,6 @@ from typing import Literal
 
 from flask import request
 from flask_restx import Resource
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy import exists, func, select
 from werkzeug.exceptions import InternalServerError, NotFound
@@ -40,6 +39,7 @@ from fields.conversation_fields import (
     format_files_contained,
     to_timestamp,
 )
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs.helper import uuid_value
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from libs.login import current_account_with_tenant, login_required
diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py
index cca4bbee1e..478f783eb0 100644
--- a/api/controllers/console/app/workflow.py
+++ b/api/controllers/console/app/workflow.py
@@ -5,11 +5,6 @@ from typing import Any
 
 from flask import abort, request
 from flask_restx import Resource, fields, marshal, marshal_with
-from graphon.enums import NodeType
-from graphon.file import File
-from graphon.file import helpers as file_helpers
-from graphon.graph_engine.manager import GraphEngineManager
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field, ValidationError, field_validator
 from sqlalchemy.orm import sessionmaker
 from werkzeug.exceptions import BadRequest, Forbidden, InternalServerError, NotFound
@@ -42,6 +37,11 @@ from factories import file_factory, variable_factory
 from fields.member_fields import simple_account_fields
 from fields.online_user_fields import online_user_list_fields
 from fields.workflow_fields import workflow_fields, workflow_pagination_fields
+from graphon.enums import NodeType
+from graphon.file import File
+from graphon.file import helpers as file_helpers
+from graphon.graph_engine.manager import GraphEngineManager
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs import helper
 from libs.datetime_utils import naive_utc_now
 from libs.helper import TimestampField, uuid_value
diff --git a/api/controllers/console/app/workflow_app_log.py b/api/controllers/console/app/workflow_app_log.py
index 6b402898e8..4b39590235 100644
--- a/api/controllers/console/app/workflow_app_log.py
+++ b/api/controllers/console/app/workflow_app_log.py
@@ -4,7 +4,6 @@ from typing import Any
 from dateutil.parser import isoparse
 from flask import request
 from flask_restx import Resource
-from graphon.enums import WorkflowExecutionStatus
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy.orm import sessionmaker
 
@@ -16,6 +15,7 @@ from extensions.ext_database import db
 from fields.base import ResponseModel
 from fields.end_user_fields import SimpleEndUser
 from fields.member_fields import SimpleAccount
+from graphon.enums import WorkflowExecutionStatus
 from libs.login import login_required
 from models import App
 from models.model import AppMode
diff --git a/api/controllers/console/app/workflow_draft_variable.py b/api/controllers/console/app/workflow_draft_variable.py
index 640189b070..f6319573e0 100644
--- a/api/controllers/console/app/workflow_draft_variable.py
+++ b/api/controllers/console/app/workflow_draft_variable.py
@@ -5,10 +5,6 @@ from typing import Any, TypedDict
 
 from flask import Response, request
 from flask_restx import Resource, fields, marshal, marshal_with
-from graphon.file import helpers as file_helpers
-from graphon.variables.segment_group import SegmentGroup
-from graphon.variables.segments import ArrayFileSegment, FileSegment, Segment
-from graphon.variables.types import SegmentType
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import sessionmaker
 
@@ -25,6 +21,10 @@ from extensions.ext_database import db
 from factories import variable_factory
 from factories.file_factory import build_from_mapping, build_from_mappings
 from factories.variable_factory import build_segment_with_type
+from graphon.file import helpers as file_helpers
+from graphon.variables.segment_group import SegmentGroup
+from graphon.variables.segments import ArrayFileSegment, FileSegment, Segment
+from graphon.variables.types import SegmentType
 from libs.login import current_user, login_required
 from models import App, AppMode
 from models.workflow import WorkflowDraftVariable
diff --git a/api/controllers/console/app/workflow_run.py b/api/controllers/console/app/workflow_run.py
index a1a075be71..6748d95d6b 100644
--- a/api/controllers/console/app/workflow_run.py
+++ b/api/controllers/console/app/workflow_run.py
@@ -3,8 +3,6 @@ from typing import Literal, TypedDict, cast
 
 from flask import request
 from flask_restx import Resource, fields, marshal_with
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.enums import WorkflowExecutionStatus
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy import select
 from sqlalchemy.orm import sessionmaker
@@ -28,6 +26,8 @@ from fields.workflow_run_fields import (
     workflow_run_node_execution_list_fields,
     workflow_run_pagination_fields,
 )
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.enums import WorkflowExecutionStatus
 from libs.archive_storage import ArchiveStorageNotConfiguredError, get_archive_storage
 from libs.custom_inputs import time_duration
 from libs.helper import uuid_value
diff --git a/api/controllers/console/auth/oauth_server.py b/api/controllers/console/auth/oauth_server.py
index b55cda4244..727428c8e7 100644
--- a/api/controllers/console/auth/oauth_server.py
+++ b/api/controllers/console/auth/oauth_server.py
@@ -5,11 +5,11 @@ from typing import Concatenate
 from flask import jsonify, request
 from flask.typing import ResponseReturnValue
 from flask_restx import Resource
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel
 from werkzeug.exceptions import BadRequest, NotFound
 
 from controllers.console.wraps import account_initialization_required, setup_required
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.login import current_account_with_tenant, login_required
 from models import Account
 from models.model import OAuthProviderApp
diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.py
index b2a905366a..ea0fdef0a7 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -2,7 +2,6 @@ from typing import Any, cast
 
 from flask import request
 from flask_restx import Resource, fields, marshal, marshal_with
-from graphon.model_runtime.entities.model_entities import ModelType
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy import func, select
 from werkzeug.exceptions import Forbidden, NotFound
@@ -49,6 +48,7 @@ from fields.dataset_fields import (
     weighted_score_fields,
 )
 from fields.document_fields import document_status_fields
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs.login import current_account_with_tenant, login_required
 from models import ApiToken, Dataset, Document, DocumentSegment, UploadFile
 from models.dataset import DatasetPermission, DatasetPermissionEnum
diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py
index 98d4ad9412..b61e39716f 100644
--- a/api/controllers/console/datasets/datasets_document.py
+++ b/api/controllers/console/datasets/datasets_document.py
@@ -8,8 +8,6 @@ from typing import Any, Literal, cast
 import sqlalchemy as sa
 from flask import request, send_file
 from flask_restx import Resource, fields, marshal, marshal_with
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from pydantic import BaseModel, Field
 from sqlalchemy import asc, desc, func, select
 from werkzeug.exceptions import Forbidden, NotFound
@@ -39,6 +37,8 @@ from fields.document_fields import (
     document_status_fields,
     document_with_segments_fields,
 )
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from libs.datetime_utils import naive_utc_now
 from libs.login import current_account_with_tenant, login_required
 from models import DatasetProcessRule, Document, DocumentSegment, UploadFile
diff --git a/api/controllers/console/datasets/datasets_segments.py b/api/controllers/console/datasets/datasets_segments.py
index 354c299bef..2647bb1f5a 100644
--- a/api/controllers/console/datasets/datasets_segments.py
+++ b/api/controllers/console/datasets/datasets_segments.py
@@ -2,7 +2,6 @@ import uuid
 
 from flask import request
 from flask_restx import Resource, marshal
-from graphon.model_runtime.entities.model_entities import ModelType
 from pydantic import BaseModel, Field
 from sqlalchemy import String, cast, func, or_, select
 from sqlalchemy.dialects.postgresql import JSONB
@@ -32,6 +31,7 @@ from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from fields.segment_fields import child_chunk_fields, segment_fields
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs.helper import escape_like_pattern
 from libs.login import current_account_with_tenant, login_required
 from models.dataset import ChildChunk, DocumentSegment
diff --git a/api/controllers/console/datasets/hit_testing_base.py b/api/controllers/console/datasets/hit_testing_base.py
index 8fb3699849..699fa599c8 100644
--- a/api/controllers/console/datasets/hit_testing_base.py
+++ b/api/controllers/console/datasets/hit_testing_base.py
@@ -2,7 +2,6 @@ import logging
 from typing import Any
 
 from flask_restx import marshal
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field
 from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
 
@@ -21,6 +20,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from fields.hit_testing_fields import hit_testing_record_fields
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs.login import current_user
 from models.account import Account
 from services.dataset_service import DatasetService
diff --git a/api/controllers/console/datasets/rag_pipeline/datasource_auth.py b/api/controllers/console/datasets/rag_pipeline/datasource_auth.py
index bdf83b991e..fd0a8b33bc 100644
--- a/api/controllers/console/datasets/rag_pipeline/datasource_auth.py
+++ b/api/controllers/console/datasets/rag_pipeline/datasource_auth.py
@@ -2,8 +2,6 @@ from typing import Any
 
 from flask import make_response, redirect, request
 from flask_restx import Resource
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field
 from werkzeug.exceptions import Forbidden, NotFound
 
@@ -12,6 +10,8 @@ from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
 from core.plugin.impl.oauth import OAuthHandler
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.login import current_account_with_tenant, login_required
 from models.provider_ids import DatasourceProviderID
 from services.datasource_provider_service import DatasourceProviderService
diff --git a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_draft_variable.py b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_draft_variable.py
index 3549f9542d..b31d73f27d 100644
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_draft_variable.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_draft_variable.py
@@ -4,7 +4,6 @@ from typing import Any, NoReturn
 
 from flask import Response, request
 from flask_restx import Resource, marshal, marshal_with
-from graphon.variables.types import SegmentType
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import sessionmaker
 from werkzeug.exceptions import Forbidden
@@ -28,6 +27,7 @@ from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, SYSTE
 from extensions.ext_database import db
 from factories.file_factory import build_from_mapping, build_from_mappings
 from factories.variable_factory import build_segment_with_type
+from graphon.variables.types import SegmentType
 from libs.login import current_user, login_required
 from models import Account
 from models.dataset import Pipeline
diff --git a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
index a8077d9eb0..ee146e8287 100644
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
@@ -4,7 +4,6 @@ from typing import Any, Literal, cast
 
 from flask import abort, request
 from flask_restx import Resource, marshal_with  # type: ignore
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field, ValidationError
 from sqlalchemy.orm import sessionmaker
 from werkzeug.exceptions import BadRequest, Forbidden, InternalServerError, NotFound
@@ -41,6 +40,7 @@ from core.app.apps.pipeline.pipeline_generator import PipelineGenerator
 from core.app.entities.app_invoke_entities import InvokeFrom
 from extensions.ext_database import db
 from factories import variable_factory
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs import helper
 from libs.helper import TimestampField, UUIDStrOrEmpty
 from libs.login import current_account_with_tenant, current_user, login_required
diff --git a/api/controllers/console/explore/audio.py b/api/controllers/console/explore/audio.py
index a37077af42..ab660d9dc3 100644
--- a/api/controllers/console/explore/audio.py
+++ b/api/controllers/console/explore/audio.py
@@ -1,7 +1,6 @@
 import logging
 
 from flask import request
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.exceptions import InternalServerError
 
 import services
@@ -20,6 +19,7 @@ from controllers.console.app.error import (
 )
 from controllers.console.explore.wraps import InstalledAppResource
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 from services.audio_service import AudioService
 from services.errors.audio import (
     AudioTooLargeServiceError,
diff --git a/api/controllers/console/explore/completion.py b/api/controllers/console/explore/completion.py
index eacd7332fe..ccdccceaa6 100644
--- a/api/controllers/console/explore/completion.py
+++ b/api/controllers/console/explore/completion.py
@@ -2,7 +2,6 @@ import logging
 from typing import Any, Literal
 from uuid import UUID
 
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field, field_validator
 from werkzeug.exceptions import InternalServerError, NotFound
 
@@ -26,6 +25,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from extensions.ext_database import db
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from libs.datetime_utils import naive_utc_now
 from libs.login import current_user
diff --git a/api/controllers/console/explore/installed_app.py b/api/controllers/console/explore/installed_app.py
index 7dbb7220f4..2d9a997fbf 100644
--- a/api/controllers/console/explore/installed_app.py
+++ b/api/controllers/console/explore/installed_app.py
@@ -4,7 +4,6 @@ from typing import Any
 
 from flask import request
 from flask_restx import Resource
-from graphon.file import helpers as file_helpers
 from pydantic import BaseModel, Field, computed_field, field_validator
 from sqlalchemy import and_, select
 from werkzeug.exceptions import BadRequest, Forbidden, NotFound
@@ -15,6 +14,7 @@ from controllers.console.explore.wraps import InstalledAppResource
 from controllers.console.wraps import account_initialization_required, cloud_edition_billing_resource_check
 from extensions.ext_database import db
 from fields.base import ResponseModel
+from graphon.file import helpers as file_helpers
 from libs.datetime_utils import naive_utc_now
 from libs.login import current_account_with_tenant, login_required
 from models import App, InstalledApp, RecommendedApp
diff --git a/api/controllers/console/explore/message.py b/api/controllers/console/explore/message.py
index 64d55d7ca3..209667d1d0 100644
--- a/api/controllers/console/explore/message.py
+++ b/api/controllers/console/explore/message.py
@@ -2,7 +2,6 @@ import logging
 from typing import Literal
 
 from flask import request
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, TypeAdapter
 from werkzeug.exceptions import InternalServerError, NotFound
 
@@ -25,6 +24,7 @@ from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from fields.conversation_fields import ResultResponse
 from fields.message_fields import MessageInfiniteScrollPagination, MessageListItem, SuggestedQuestionsResponse
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from libs.login import current_account_with_tenant
 from models.enums import FeedbackRating
diff --git a/api/controllers/console/explore/trial.py b/api/controllers/console/explore/trial.py
index 0a3595454a..1456301a24 100644
--- a/api/controllers/console/explore/trial.py
+++ b/api/controllers/console/explore/trial.py
@@ -3,8 +3,6 @@ from typing import Any, Literal, cast
 
 from flask import request
 from flask_restx import Resource, fields, marshal, marshal_with
-from graphon.graph_engine.manager import GraphEngineManager
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel
 from sqlalchemy import select
 from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
@@ -61,6 +59,8 @@ from fields.workflow_fields import (
     workflow_fields,
     workflow_partial_fields,
 )
+from graphon.graph_engine.manager import GraphEngineManager
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from libs.helper import uuid_value
 from libs.login import current_user
diff --git a/api/controllers/console/explore/workflow.py b/api/controllers/console/explore/workflow.py
index da88de6776..438cce4fd8 100644
--- a/api/controllers/console/explore/workflow.py
+++ b/api/controllers/console/explore/workflow.py
@@ -1,7 +1,5 @@
 import logging
 
-from graphon.graph_engine.manager import GraphEngineManager
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.exceptions import InternalServerError
 
 from controllers.common.controller_schemas import WorkflowRunPayload
@@ -23,6 +21,8 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from extensions.ext_redis import redis_client
+from graphon.graph_engine.manager import GraphEngineManager
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from libs.login import current_account_with_tenant
 from models.model import AppMode, InstalledApp
diff --git a/api/controllers/console/remote_files.py b/api/controllers/console/remote_files.py
index 551c86fd82..2a46d2250a 100644
--- a/api/controllers/console/remote_files.py
+++ b/api/controllers/console/remote_files.py
@@ -2,7 +2,6 @@ import urllib.parse
 
 import httpx
 from flask_restx import Resource
-from graphon.file import helpers as file_helpers
 from pydantic import BaseModel, Field
 
 import services
@@ -16,6 +15,7 @@ from controllers.console import console_ns
 from core.helper import ssrf_proxy
 from extensions.ext_database import db
 from fields.file_fields import FileWithSignedUrl, RemoteFileInfo
+from graphon.file import helpers as file_helpers
 from libs.login import current_account_with_tenant, login_required
 from services.file_service import FileService
 
diff --git a/api/controllers/console/workspace/account.py b/api/controllers/console/workspace/account.py
index 9de56acc4d..44404005b2 100644
--- a/api/controllers/console/workspace/account.py
+++ b/api/controllers/console/workspace/account.py
@@ -6,7 +6,6 @@ from typing import Any, Literal
 import pytz
 from flask import request
 from flask_restx import Resource
-from graphon.file import helpers as file_helpers
 from pydantic import BaseModel, Field, field_validator, model_validator
 from sqlalchemy import select
 
@@ -40,6 +39,7 @@ from controllers.console.wraps import (
 from extensions.ext_database import db
 from fields.base import ResponseModel
 from fields.member_fields import Account as AccountResponse
+from graphon.file import helpers as file_helpers
 from libs.datetime_utils import naive_utc_now
 from libs.helper import EmailStr, extract_remote_ip, timezone
 from libs.login import current_account_with_tenant, login_required
diff --git a/api/controllers/console/workspace/agent_providers.py b/api/controllers/console/workspace/agent_providers.py
index 3fdcbc4710..764f488755 100644
--- a/api/controllers/console/workspace/agent_providers.py
+++ b/api/controllers/console/workspace/agent_providers.py
@@ -1,8 +1,8 @@
 from flask_restx import Resource, fields
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, setup_required
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.login import current_account_with_tenant, login_required
 from services.agent_service import AgentService
 
diff --git a/api/controllers/console/workspace/endpoint.py b/api/controllers/console/workspace/endpoint.py
index b6b9deb1f9..f45b72f390 100644
--- a/api/controllers/console/workspace/endpoint.py
+++ b/api/controllers/console/workspace/endpoint.py
@@ -2,13 +2,13 @@ from typing import Any
 
 from flask import request
 from flask_restx import Resource
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field
 
 from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, is_admin_or_owner_required, setup_required
 from core.plugin.impl.exc import PluginPermissionDeniedError
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.login import current_account_with_tenant, login_required
 from services.plugin.endpoint_service import EndpointService
 
diff --git a/api/controllers/console/workspace/load_balancing_config.py b/api/controllers/console/workspace/load_balancing_config.py
index e4cfca9fa4..2a6f37aec8 100644
--- a/api/controllers/console/workspace/load_balancing_config.py
+++ b/api/controllers/console/workspace/load_balancing_config.py
@@ -1,12 +1,12 @@
 from flask_restx import Resource
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 from pydantic import BaseModel
 from werkzeug.exceptions import Forbidden
 
 from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, setup_required
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 from libs.login import current_account_with_tenant, login_required
 from models import TenantAccountRole
 from services.model_load_balancing_service import ModelLoadBalancingService
diff --git a/api/controllers/console/workspace/model_providers.py b/api/controllers/console/workspace/model_providers.py
index cbb9677309..4b10561fdb 100644
--- a/api/controllers/console/workspace/model_providers.py
+++ b/api/controllers/console/workspace/model_providers.py
@@ -3,13 +3,13 @@ from typing import Any, Literal
 
 from flask import request, send_file
 from flask_restx import Resource
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field, field_validator
 
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, is_admin_or_owner_required, setup_required
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.helper import uuid_value
 from libs.login import current_account_with_tenant, login_required
 from services.billing_service import BillingService
diff --git a/api/controllers/console/workspace/models.py b/api/controllers/console/workspace/models.py
index f8f95304f0..b2d07ff8f9 100644
--- a/api/controllers/console/workspace/models.py
+++ b/api/controllers/console/workspace/models.py
@@ -3,14 +3,14 @@ from typing import Any, cast
 
 from flask import request
 from flask_restx import Resource
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field, field_validator
 
 from controllers.common.schema import register_enum_models, register_schema_models
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, is_admin_or_owner_required, setup_required
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.helper import uuid_value
 from libs.login import current_account_with_tenant, login_required
 from services.model_load_balancing_service import ModelLoadBalancingService
diff --git a/api/controllers/console/workspace/plugin.py b/api/controllers/console/workspace/plugin.py
index aa674a63b3..b3e344ccea 100644
--- a/api/controllers/console/workspace/plugin.py
+++ b/api/controllers/console/workspace/plugin.py
@@ -4,7 +4,6 @@ from typing import Any, Literal
 
 from flask import request, send_file
 from flask_restx import Resource
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field
 from werkzeug.datastructures import FileStorage
 from werkzeug.exceptions import Forbidden
@@ -15,6 +14,7 @@ from controllers.console import console_ns
 from controllers.console.workspace import plugin_permission_required
 from controllers.console.wraps import account_initialization_required, is_admin_or_owner_required, setup_required
 from core.plugin.impl.exc import PluginDaemonClientSideError
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.login import current_account_with_tenant, login_required
 from models.account import TenantPluginAutoUpgradeStrategy, TenantPluginPermission
 from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
diff --git a/api/controllers/console/workspace/tool_providers.py b/api/controllers/console/workspace/tool_providers.py
index c9956501e2..471594f349 100644
--- a/api/controllers/console/workspace/tool_providers.py
+++ b/api/controllers/console/workspace/tool_providers.py
@@ -5,7 +5,6 @@ from urllib.parse import urlparse
 
 from flask import make_response, redirect, request, send_file
 from flask_restx import Resource
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field, HttpUrl, field_validator, model_validator
 from sqlalchemy.orm import sessionmaker
 from werkzeug.exceptions import Forbidden
@@ -28,6 +27,7 @@ from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.oauth import OAuthHandler
 from core.tools.entities.tool_entities import ApiProviderSchemaType, WorkflowToolParameterConfiguration
 from extensions.ext_database import db
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.helper import alphanumeric, uuid_value
 from libs.login import current_account_with_tenant, login_required
 from models.provider_ids import ToolProviderID
diff --git a/api/controllers/console/workspace/trigger_providers.py b/api/controllers/console/workspace/trigger_providers.py
index 7a28a09861..d11b66244f 100644
--- a/api/controllers/console/workspace/trigger_providers.py
+++ b/api/controllers/console/workspace/trigger_providers.py
@@ -3,7 +3,6 @@ from typing import Any
 
 from flask import make_response, redirect, request
 from flask_restx import Resource
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, model_validator
 from sqlalchemy.orm import sessionmaker
 from werkzeug.exceptions import BadRequest, Forbidden
@@ -16,6 +15,7 @@ from core.plugin.impl.oauth import OAuthHandler
 from core.trigger.entities.entities import SubscriptionBuilderUpdater
 from core.trigger.trigger_manager import TriggerManager
 from extensions.ext_database import db
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.login import current_user, login_required
 from models.account import Account
 from models.provider_ids import TriggerProviderID
diff --git a/api/controllers/inner_api/plugin/plugin.py b/api/controllers/inner_api/plugin/plugin.py
index 83c8fa02fe..72cab3de73 100644
--- a/api/controllers/inner_api/plugin/plugin.py
+++ b/api/controllers/inner_api/plugin/plugin.py
@@ -1,5 +1,4 @@
 from flask_restx import Resource
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 
 from controllers.console.wraps import setup_required
 from controllers.inner_api import inner_api_ns
@@ -30,6 +29,7 @@ from core.plugin.entities.request import (
 )
 from core.tools.entities.tool_entities import ToolProviderType
 from core.tools.signature import get_signed_file_url_for_plugin
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.helper import length_prefixed_response
 from models import Account, Tenant
 from models.model import EndUser
diff --git a/api/controllers/mcp/mcp.py b/api/controllers/mcp/mcp.py
index 8066f198bb..f652bbc581 100644
--- a/api/controllers/mcp/mcp.py
+++ b/api/controllers/mcp/mcp.py
@@ -2,7 +2,6 @@ from typing import Any, Union
 
 from flask import Response
 from flask_restx import Resource
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from pydantic import BaseModel, Field, ValidationError
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
@@ -12,6 +11,7 @@ from controllers.mcp import mcp_ns
 from core.mcp import types as mcp_types
 from core.mcp.server.streamable_http import handle_mcp_request
 from extensions.ext_database import db
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from libs import helper
 from models.enums import AppMCPServerStatus
 from models.model import App, AppMCPServer, AppMode, EndUser
diff --git a/api/controllers/service_api/app/audio.py b/api/controllers/service_api/app/audio.py
index 907dd1b06d..e818573b8f 100644
--- a/api/controllers/service_api/app/audio.py
+++ b/api/controllers/service_api/app/audio.py
@@ -2,7 +2,6 @@ import logging
 
 from flask import request
 from flask_restx import Resource
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.exceptions import InternalServerError
 
 import services
@@ -22,6 +21,7 @@ from controllers.service_api.app.error import (
 )
 from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 from models.model import App, EndUser
 from services.audio_service import AudioService
 from services.errors.audio import (
diff --git a/api/controllers/service_api/app/completion.py b/api/controllers/service_api/app/completion.py
index 3142e5118e..31f2797d66 100644
--- a/api/controllers/service_api/app/completion.py
+++ b/api/controllers/service_api/app/completion.py
@@ -4,7 +4,6 @@ from uuid import UUID
 
 from flask import request
 from flask_restx import Resource
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field, field_validator
 from werkzeug.exceptions import BadRequest, InternalServerError, NotFound
 
@@ -29,6 +28,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from core.helper.trace_id_helper import get_external_trace_id
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from libs.helper import UUIDStrOrEmpty
 from models.model import App, AppMode, EndUser
diff --git a/api/controllers/service_api/app/conversation.py b/api/controllers/service_api/app/conversation.py
index 50851aea08..c4353ca7b8 100644
--- a/api/controllers/service_api/app/conversation.py
+++ b/api/controllers/service_api/app/conversation.py
@@ -3,7 +3,6 @@ from typing import Any, Literal
 
 from flask import request
 from flask_restx import Resource
-from graphon.variables.types import SegmentType
 from pydantic import BaseModel, Field, TypeAdapter, field_validator
 from sqlalchemy.orm import sessionmaker
 from werkzeug.exceptions import BadRequest, NotFound
@@ -22,6 +21,7 @@ from fields.conversation_fields import (
     ConversationInfiniteScrollPagination,
     SimpleConversation,
 )
+from graphon.variables.types import SegmentType
 from libs.helper import UUIDStrOrEmpty
 from models.model import App, AppMode, EndUser
 from services.conversation_service import ConversationService
diff --git a/api/controllers/service_api/app/workflow.py b/api/controllers/service_api/app/workflow.py
index d5544ff473..cc763fa89c 100644
--- a/api/controllers/service_api/app/workflow.py
+++ b/api/controllers/service_api/app/workflow.py
@@ -6,9 +6,6 @@ from typing import Literal
 from dateutil.parser import isoparse
 from flask import request
 from flask_restx import Resource, fields
-from graphon.enums import WorkflowExecutionStatus
-from graphon.graph_engine.manager import GraphEngineManager
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy.orm import sessionmaker
 from werkzeug.exceptions import BadRequest, InternalServerError, NotFound
@@ -38,6 +35,9 @@ from extensions.ext_redis import redis_client
 from fields.base import ResponseModel
 from fields.end_user_fields import SimpleEndUser
 from fields.member_fields import SimpleAccount
+from graphon.enums import WorkflowExecutionStatus
+from graphon.graph_engine.manager import GraphEngineManager
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from models.model import App, AppMode, EndUser
 from models.workflow import WorkflowRun
diff --git a/api/controllers/service_api/dataset/dataset.py b/api/controllers/service_api/dataset/dataset.py
index fd954be6b1..76519cad0a 100644
--- a/api/controllers/service_api/dataset/dataset.py
+++ b/api/controllers/service_api/dataset/dataset.py
@@ -2,7 +2,6 @@ from typing import Any, Literal, cast
 
 from flask import request
 from flask_restx import marshal
-from graphon.model_runtime.entities.model_entities import ModelType
 from pydantic import BaseModel, Field, TypeAdapter, field_validator
 from werkzeug.exceptions import Forbidden, NotFound
 
@@ -19,6 +18,7 @@ from core.plugin.impl.model_runtime_factory import create_plugin_provider_manage
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from fields.dataset_fields import dataset_detail_fields
 from fields.tag_fields import DataSetTag
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs.login import current_user
 from models.account import Account
 from models.dataset import DatasetPermissionEnum
diff --git a/api/controllers/service_api/dataset/segment.py b/api/controllers/service_api/dataset/segment.py
index 971b63577c..5992fa7410 100644
--- a/api/controllers/service_api/dataset/segment.py
+++ b/api/controllers/service_api/dataset/segment.py
@@ -2,7 +2,6 @@ from typing import Any
 
 from flask import request
 from flask_restx import marshal
-from graphon.model_runtime.entities.model_entities import ModelType
 from pydantic import BaseModel, Field
 from sqlalchemy import select
 from werkzeug.exceptions import NotFound
@@ -23,6 +22,7 @@ from core.model_manager import ModelManager
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from extensions.ext_database import db
 from fields.segment_fields import child_chunk_fields, segment_fields
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs.login import current_account_with_tenant
 from models.dataset import Dataset
 from services.dataset_service import DatasetService, DocumentService, SegmentService
diff --git a/api/controllers/service_api/workspace/models.py b/api/controllers/service_api/workspace/models.py
index c0a6cb0a76..5ac65fc4e6 100644
--- a/api/controllers/service_api/workspace/models.py
+++ b/api/controllers/service_api/workspace/models.py
@@ -1,9 +1,9 @@
 from flask_login import current_user
 from flask_restx import Resource
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 
 from controllers.service_api import service_api_ns
 from controllers.service_api.wraps import validate_dataset_token
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from services.model_provider_service import ModelProviderService
 
 
diff --git a/api/controllers/web/audio.py b/api/controllers/web/audio.py
index 0ef4471018..3ad595f1f4 100644
--- a/api/controllers/web/audio.py
+++ b/api/controllers/web/audio.py
@@ -2,7 +2,6 @@ import logging
 
 from flask import request
 from flask_restx import fields, marshal_with
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import field_validator
 from werkzeug.exceptions import InternalServerError
 
@@ -22,6 +21,7 @@ from controllers.web.error import (
 )
 from controllers.web.wraps import WebApiResource
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs.helper import uuid_value
 from models.model import App
 from services.audio_service import AudioService
diff --git a/api/controllers/web/completion.py b/api/controllers/web/completion.py
index e37f9af5f0..0528184d79 100644
--- a/api/controllers/web/completion.py
+++ b/api/controllers/web/completion.py
@@ -1,7 +1,6 @@
 import logging
 from typing import Any, Literal
 
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field, field_validator
 from werkzeug.exceptions import InternalServerError, NotFound
 
@@ -26,6 +25,7 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from libs.helper import uuid_value
 from models.model import AppMode
diff --git a/api/controllers/web/message.py b/api/controllers/web/message.py
index 39afdd843f..07ecf8035b 100644
--- a/api/controllers/web/message.py
+++ b/api/controllers/web/message.py
@@ -2,7 +2,6 @@ import logging
 from typing import Literal
 
 from flask import request
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import BaseModel, Field, TypeAdapter
 from werkzeug.exceptions import InternalServerError, NotFound
 
@@ -24,6 +23,7 @@ from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from fields.conversation_fields import ResultResponse
 from fields.message_fields import SuggestedQuestionsResponse, WebMessageInfiniteScrollPagination, WebMessageListItem
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from models.enums import FeedbackRating
 from models.model import AppMode
diff --git a/api/controllers/web/remote_files.py b/api/controllers/web/remote_files.py
index 38aeccc642..fe31e9d4ac 100644
--- a/api/controllers/web/remote_files.py
+++ b/api/controllers/web/remote_files.py
@@ -1,7 +1,6 @@
 import urllib.parse
 
 import httpx
-from graphon.file import helpers as file_helpers
 from pydantic import BaseModel, Field, HttpUrl
 
 import services
@@ -14,6 +13,7 @@ from controllers.common.errors import (
 from core.helper import ssrf_proxy
 from extensions.ext_database import db
 from fields.file_fields import FileWithSignedUrl, RemoteFileInfo
+from graphon.file import helpers as file_helpers
 from services.file_service import FileService
 
 from ..common.schema import register_schema_models
diff --git a/api/controllers/web/workflow.py b/api/controllers/web/workflow.py
index 796e090976..98211193a0 100644
--- a/api/controllers/web/workflow.py
+++ b/api/controllers/web/workflow.py
@@ -1,7 +1,5 @@
 import logging
 
-from graphon.graph_engine.manager import GraphEngineManager
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.exceptions import InternalServerError
 
 from controllers.common.controller_schemas import WorkflowRunPayload
@@ -24,6 +22,8 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from extensions.ext_redis import redis_client
+from graphon.graph_engine.manager import GraphEngineManager
+from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from models.model import App, AppMode, EndUser
 from services.app_generate_service import AppGenerateService
diff --git a/api/core/agent/base_agent_runner.py b/api/core/agent/base_agent_runner.py
index 06c746990d..790602ef5d 100644
--- a/api/core/agent/base_agent_runner.py
+++ b/api/core/agent/base_agent_runner.py
@@ -4,20 +4,6 @@ import uuid
 from decimal import Decimal
 from typing import Union, cast
 
-from graphon.file import file_manager
-from graphon.model_runtime.entities import (
-    AssistantPromptMessage,
-    LLMUsage,
-    PromptMessage,
-    PromptMessageTool,
-    SystemPromptMessage,
-    TextPromptMessageContent,
-    ToolPromptMessage,
-    UserPromptMessage,
-)
-from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
-from graphon.model_runtime.entities.model_entities import ModelFeature
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from sqlalchemy import func, select
 
 from core.agent.entities import AgentEntity, AgentToolEntity
@@ -43,6 +29,20 @@ from core.tools.tool_manager import ToolManager
 from core.tools.utils.dataset_retriever_tool import DatasetRetrieverTool
 from extensions.ext_database import db
 from factories import file_factory
+from graphon.file import file_manager
+from graphon.model_runtime.entities import (
+    AssistantPromptMessage,
+    LLMUsage,
+    PromptMessage,
+    PromptMessageTool,
+    SystemPromptMessage,
+    TextPromptMessageContent,
+    ToolPromptMessage,
+    UserPromptMessage,
+)
+from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
+from graphon.model_runtime.entities.model_entities import ModelFeature
+from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from models.enums import CreatorUserRole
 from models.model import Conversation, Message, MessageAgentThought, MessageFile
 
diff --git a/api/core/agent/cot_agent_runner.py b/api/core/agent/cot_agent_runner.py
index f07ac64498..0bc93ad34d 100644
--- a/api/core/agent/cot_agent_runner.py
+++ b/api/core/agent/cot_agent_runner.py
@@ -4,15 +4,6 @@ from abc import ABC, abstractmethod
 from collections.abc import Generator, Mapping, Sequence
 from typing import Any, TypedDict
 
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from graphon.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    PromptMessage,
-    PromptMessageTool,
-    ToolPromptMessage,
-    UserPromptMessage,
-)
-
 from core.agent.base_agent_runner import BaseAgentRunner
 from core.agent.entities import AgentScratchpadUnit
 from core.agent.errors import AgentMaxIterationError
@@ -24,6 +15,14 @@ from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransfo
 from core.tools.__base.tool import Tool
 from core.tools.entities.tool_entities import ToolInvokeMeta
 from core.tools.tool_engine import ToolEngine
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    PromptMessage,
+    PromptMessageTool,
+    ToolPromptMessage,
+    UserPromptMessage,
+)
 from models.model import Message
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/agent/cot_chat_agent_runner.py b/api/core/agent/cot_chat_agent_runner.py
index 2b2e26987e..a2186be100 100644
--- a/api/core/agent/cot_chat_agent_runner.py
+++ b/api/core/agent/cot_chat_agent_runner.py
@@ -1,5 +1,6 @@
 import json
 
+from core.agent.cot_agent_runner import CotAgentRunner
 from graphon.file import file_manager
 from graphon.model_runtime.entities import (
     AssistantPromptMessage,
@@ -11,8 +12,6 @@ from graphon.model_runtime.entities import (
 from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
 from graphon.model_runtime.utils.encoders import jsonable_encoder
 
-from core.agent.cot_agent_runner import CotAgentRunner
-
 
 class CotChatAgentRunner(CotAgentRunner):
     def _organize_system_prompt(self) -> SystemPromptMessage:
diff --git a/api/core/agent/cot_completion_agent_runner.py b/api/core/agent/cot_completion_agent_runner.py
index d4c52a8eb1..51a30998ae 100644
--- a/api/core/agent/cot_completion_agent_runner.py
+++ b/api/core/agent/cot_completion_agent_runner.py
@@ -1,5 +1,6 @@
 import json
 
+from core.agent.cot_agent_runner import CotAgentRunner
 from graphon.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     PromptMessage,
@@ -8,8 +9,6 @@ from graphon.model_runtime.entities.message_entities import (
 )
 from graphon.model_runtime.utils.encoders import jsonable_encoder
 
-from core.agent.cot_agent_runner import CotAgentRunner
-
 
 class CotCompletionAgentRunner(CotAgentRunner):
     def _organize_instruction_prompt(self) -> str:
diff --git a/api/core/agent/fc_agent_runner.py b/api/core/agent/fc_agent_runner.py
index fdffde85d0..d38d24d1e7 100644
--- a/api/core/agent/fc_agent_runner.py
+++ b/api/core/agent/fc_agent_runner.py
@@ -4,6 +4,13 @@ from collections.abc import Generator
 from copy import deepcopy
 from typing import Any, Union
 
+from core.agent.base_agent_runner import BaseAgentRunner
+from core.agent.errors import AgentMaxIterationError
+from core.app.apps.base_app_queue_manager import PublishFrom
+from core.app.entities.queue_entities import QueueAgentThoughtEvent, QueueMessageEndEvent, QueueMessageFileEvent
+from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
+from core.tools.entities.tool_entities import ToolInvokeMeta
+from core.tools.tool_engine import ToolEngine
 from graphon.file import file_manager
 from graphon.model_runtime.entities import (
     AssistantPromptMessage,
@@ -19,14 +26,6 @@ from graphon.model_runtime.entities import (
     UserPromptMessage,
 )
 from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
-
-from core.agent.base_agent_runner import BaseAgentRunner
-from core.agent.errors import AgentMaxIterationError
-from core.app.apps.base_app_queue_manager import PublishFrom
-from core.app.entities.queue_entities import QueueAgentThoughtEvent, QueueMessageEndEvent, QueueMessageFileEvent
-from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
-from core.tools.entities.tool_entities import ToolInvokeMeta
-from core.tools.tool_engine import ToolEngine
 from models.model import Message
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/agent/output_parser/cot_output_parser.py b/api/core/agent/output_parser/cot_output_parser.py
index 8cccd2be6d..f341ca5a0b 100644
--- a/api/core/agent/output_parser/cot_output_parser.py
+++ b/api/core/agent/output_parser/cot_output_parser.py
@@ -3,9 +3,8 @@ import re
 from collections.abc import Generator
 from typing import Any, Union
 
-from graphon.model_runtime.entities.llm_entities import LLMResultChunk
-
 from core.agent.entities import AgentScratchpadUnit
+from graphon.model_runtime.entities.llm_entities import LLMResultChunk
 
 
 class CotAgentOutputParser:
diff --git a/api/core/app/app_config/easy_ui_based_app/model_config/converter.py b/api/core/app/app_config/easy_ui_based_app/model_config/converter.py
index b7dd55632e..dbd7527fc6 100644
--- a/api/core/app/app_config/easy_ui_based_app/model_config/converter.py
+++ b/api/core/app/app_config/easy_ui_based_app/model_config/converter.py
@@ -1,14 +1,13 @@
 from typing import cast
 
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-
 from core.app.app_config.entities import EasyUIBasedAppConfig
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.entities.model_entities import ModelStatus
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.plugin.impl.model_runtime_factory import create_plugin_provider_manager
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
+from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 
 
 class ModelConfigConverter:
diff --git a/api/core/app/app_config/easy_ui_based_app/model_config/manager.py b/api/core/app/app_config/easy_ui_based_app/model_config/manager.py
index 9d980e5ca3..02498c23e1 100644
--- a/api/core/app/app_config/easy_ui_based_app/model_config/manager.py
+++ b/api/core/app/app_config/easy_ui_based_app/model_config/manager.py
@@ -1,10 +1,9 @@
 from collections.abc import Mapping
 from typing import Any
 
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
-
 from core.app.app_config.entities import ModelConfigEntity
 from core.plugin.impl.model_runtime_factory import create_plugin_model_assembly
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
 from models.model import AppModelConfigDict
 from models.provider_ids import ModelProviderID
 
diff --git a/api/core/app/app_config/easy_ui_based_app/prompt_template/manager.py b/api/core/app/app_config/easy_ui_based_app/prompt_template/manager.py
index 57c6d1c496..4c07445df3 100644
--- a/api/core/app/app_config/easy_ui_based_app/prompt_template/manager.py
+++ b/api/core/app/app_config/easy_ui_based_app/prompt_template/manager.py
@@ -1,7 +1,5 @@
 from typing import Any
 
-from graphon.model_runtime.entities.message_entities import PromptMessageRole
-
 from core.app.app_config.entities import (
     AdvancedChatMessageEntity,
     AdvancedChatPromptTemplateEntity,
@@ -9,6 +7,7 @@ from core.app.app_config.entities import (
     PromptTemplateEntity,
 )
 from core.prompt.simple_prompt_transform import ModelMode
+from graphon.model_runtime.entities.message_entities import PromptMessageRole
 from models.model import AppMode, AppModelConfigDict
 
 
diff --git a/api/core/app/app_config/easy_ui_based_app/variables/manager.py b/api/core/app/app_config/easy_ui_based_app/variables/manager.py
index c89e1b3c3d..ddb500cccf 100644
--- a/api/core/app/app_config/easy_ui_based_app/variables/manager.py
+++ b/api/core/app/app_config/easy_ui_based_app/variables/manager.py
@@ -1,10 +1,9 @@
 import re
 from typing import Any, cast
 
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
-
 from core.app.app_config.entities import ExternalDataVariableEntity
 from core.external_data_tool.factory import ExternalDataToolFactory
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from models.model import AppModelConfigDict
 
 _ALLOWED_VARIABLE_ENTITY_TYPE = frozenset(
diff --git a/api/core/app/app_config/entities.py b/api/core/app/app_config/entities.py
index 819aca864c..53563dc5da 100644
--- a/api/core/app/app_config/entities.py
+++ b/api/core/app/app_config/entities.py
@@ -1,14 +1,14 @@
 from enum import StrEnum, auto
 from typing import Any, Literal
 
-from graphon.file import FileUploadConfig
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.entities.message_entities import PromptMessageRole
-from graphon.variables.input_entities import VariableEntity as WorkflowVariableEntity
 from pydantic import BaseModel, Field
 
 from core.rag.data_post_processor.data_post_processor import RerankingModelDict, WeightsDict
 from core.rag.entities import MetadataFilteringCondition
+from graphon.file import FileUploadConfig
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.entities.message_entities import PromptMessageRole
+from graphon.variables.input_entities import VariableEntity as WorkflowVariableEntity
 from models.model import AppMode
 
 
diff --git a/api/core/app/app_config/features/file_upload/manager.py b/api/core/app/app_config/features/file_upload/manager.py
index 959c3868b4..8f20ef2ff9 100644
--- a/api/core/app/app_config/features/file_upload/manager.py
+++ b/api/core/app/app_config/features/file_upload/manager.py
@@ -1,9 +1,8 @@
 from collections.abc import Mapping
 from typing import Any
 
-from graphon.file import FileUploadConfig
-
 from constants import DEFAULT_FILE_NUMBER_LIMITS
+from graphon.file import FileUploadConfig
 
 
 class FileUploadConfigManager:
diff --git a/api/core/app/app_config/workflow_ui_based_app/variables/manager.py b/api/core/app/app_config/workflow_ui_based_app/variables/manager.py
index 62e0c31d1a..13ace32fd6 100644
--- a/api/core/app/app_config/workflow_ui_based_app/variables/manager.py
+++ b/api/core/app/app_config/workflow_ui_based_app/variables/manager.py
@@ -1,8 +1,7 @@
 import re
 
-from graphon.variables.input_entities import VariableEntity
-
 from core.app.app_config.entities import RagPipelineVariableEntity
+from graphon.variables.input_entities import VariableEntity
 from models.workflow import Workflow
 
 
diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py
index 985ded0f74..9e64b471cb 100644
--- a/api/core/app/apps/advanced_chat/app_generator.py
+++ b/api/core/app/apps/advanced_chat/app_generator.py
@@ -18,11 +18,6 @@ from constants import UUID_NIL
 
 if TYPE_CHECKING:
     from controllers.console.app.workflow import LoopNodeRunPayload
-from graphon.graph_engine.layers import GraphEngineLayer
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
-from graphon.runtime import GraphRuntimeState
-from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
-
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfigManager
 from core.app.apps.advanced_chat.app_runner import AdvancedChatAppRunner
@@ -48,6 +43,10 @@ from core.repositories import DifyCoreRepositoryFactory
 from core.repositories.factory import WorkflowExecutionRepository, WorkflowNodeExecutionRepository
 from extensions.ext_database import db
 from factories import file_factory
+from graphon.graph_engine.layers import GraphEngineLayer
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
+from graphon.runtime import GraphRuntimeState
+from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
 from libs.flask_utils import preserve_flask_contexts
 from models import Account, App, Conversation, EndUser, Message, Workflow, WorkflowNodeExecutionTriggeredFrom
 from models.enums import WorkflowRunTriggeredFrom
diff --git a/api/core/app/apps/advanced_chat/app_runner.py b/api/core/app/apps/advanced_chat/app_runner.py
index 7b4cb98bd4..4e57b4dedc 100644
--- a/api/core/app/apps/advanced_chat/app_runner.py
+++ b/api/core/app/apps/advanced_chat/app_runner.py
@@ -3,12 +3,6 @@ import time
 from collections.abc import Mapping, Sequence
 from typing import Any, cast
 
-from graphon.enums import WorkflowType
-from graphon.graph_engine.command_channels import RedisChannel
-from graphon.graph_engine.layers import GraphEngineLayer
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variable_loader import VariableLoader
-from graphon.variables.variables import Variable
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -43,6 +37,12 @@ from core.workflow.workflow_entry import WorkflowEntry
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from extensions.otel import WorkflowAppRunnerHandler, trace_span
+from graphon.enums import WorkflowType
+from graphon.graph_engine.command_channels import RedisChannel
+from graphon.graph_engine.layers import GraphEngineLayer
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variable_loader import VariableLoader
+from graphon.variables.variables import Variable
 from models import Workflow
 from models.model import App, Conversation, Message, MessageAnnotation
 from models.workflow import ConversationVariable
diff --git a/api/core/app/apps/advanced_chat/generate_task_pipeline.py b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
index 0ce9ddce9e..78b582bdf5 100644
--- a/api/core/app/apps/advanced_chat/generate_task_pipeline.py
+++ b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
@@ -9,12 +9,6 @@ from datetime import datetime
 from threading import Thread
 from typing import Any, Union
 
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.enums import WorkflowExecutionStatus
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.model_runtime.utils.encoders import jsonable_encoder
-from graphon.nodes import BuiltinNodeTypes
-from graphon.runtime import GraphRuntimeState
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -77,6 +71,12 @@ from core.repositories.human_input_repository import HumanInputFormRepositoryImp
 from core.workflow.file_reference import resolve_file_record_id
 from core.workflow.system_variables import build_system_variables
 from extensions.ext_database import db
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.enums import WorkflowExecutionStatus
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.model_runtime.utils.encoders import jsonable_encoder
+from graphon.nodes import BuiltinNodeTypes
+from graphon.runtime import GraphRuntimeState
 from libs.datetime_utils import naive_utc_now
 from models import Account, Conversation, EndUser, Message, MessageFile
 from models.enums import CreatorUserRole, MessageFileBelongsTo, MessageStatus
diff --git a/api/core/app/apps/agent_chat/app_generator.py b/api/core/app/apps/agent_chat/app_generator.py
index 5872f6b264..5cdc477028 100644
--- a/api/core/app/apps/agent_chat/app_generator.py
+++ b/api/core/app/apps/agent_chat/app_generator.py
@@ -6,7 +6,6 @@ from collections.abc import Generator, Mapping
 from typing import Any, Literal, overload
 
 from flask import Flask, current_app
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from pydantic import ValidationError
 
 from configs import dify_config
@@ -24,6 +23,7 @@ from core.app.entities.app_invoke_entities import AgentChatAppGenerateEntity, In
 from core.ops.ops_trace_manager import TraceQueueManager
 from extensions.ext_database import db
 from factories import file_factory
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from libs.flask_utils import preserve_flask_contexts
 from models import Account, App, EndUser
 from services.conversation_service import ConversationService
diff --git a/api/core/app/apps/agent_chat/app_runner.py b/api/core/app/apps/agent_chat/app_runner.py
index a20d3f3c38..09ddce327e 100644
--- a/api/core/app/apps/agent_chat/app_runner.py
+++ b/api/core/app/apps/agent_chat/app_runner.py
@@ -1,9 +1,6 @@
 import logging
 from typing import cast
 
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from sqlalchemy import select
 
 from core.agent.cot_chat_agent_runner import CotChatAgentRunner
@@ -19,6 +16,9 @@ from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance
 from core.moderation.base import ModerationError
 from extensions.ext_database import db
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
+from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from models.model import App, Conversation, Message
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/app/apps/base_app_generate_response_converter.py b/api/core/app/apps/base_app_generate_response_converter.py
index 406d07927e..d5edfaeb25 100644
--- a/api/core/app/apps/base_app_generate_response_converter.py
+++ b/api/core/app/apps/base_app_generate_response_converter.py
@@ -3,11 +3,10 @@ from abc import ABC, abstractmethod
 from collections.abc import Generator, Mapping
 from typing import Any, Union
 
-from graphon.model_runtime.errors.invoke import InvokeError
-
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.entities.task_entities import AppBlockingResponse, AppStreamResponse
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/app/apps/base_app_generator.py b/api/core/app/apps/base_app_generator.py
index 7eccd59d17..8e8ccf2b90 100644
--- a/api/core/app/apps/base_app_generator.py
+++ b/api/core/app/apps/base_app_generator.py
@@ -2,9 +2,6 @@ from collections.abc import Generator, Mapping, Sequence
 from contextlib import AbstractContextManager, nullcontext
 from typing import TYPE_CHECKING, Any, Union, final
 
-from graphon.enums import NodeType
-from graphon.file import File, FileUploadConfig
-from graphon.variables.input_entities import VariableEntityType
 from sqlalchemy.orm import Session
 
 from core.app.apps.draft_variable_saver import (
@@ -16,6 +13,9 @@ from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.app.file_access import DatabaseFileAccessController, FileAccessScope, bind_file_access_scope
 from extensions.ext_database import db
 from factories import file_factory
+from graphon.enums import NodeType
+from graphon.file import File, FileUploadConfig
+from graphon.variables.input_entities import VariableEntityType
 from libs.orjson import orjson_dumps
 from models import Account, EndUser
 from services.workflow_draft_variable_service import DraftVariableSaver as DraftVariableSaverImpl
diff --git a/api/core/app/apps/base_app_queue_manager.py b/api/core/app/apps/base_app_queue_manager.py
index 20bf81aeec..d1771452c5 100644
--- a/api/core/app/apps/base_app_queue_manager.py
+++ b/api/core/app/apps/base_app_queue_manager.py
@@ -7,7 +7,6 @@ from enum import IntEnum, auto
 from typing import Any
 
 from cachetools import TTLCache, cachedmethod
-from graphon.runtime import GraphRuntimeState
 from redis.exceptions import RedisError
 from sqlalchemy.orm import DeclarativeMeta
 
@@ -22,6 +21,7 @@ from core.app.entities.queue_entities import (
     WorkflowQueueMessage,
 )
 from extensions.ext_redis import redis_client
+from graphon.runtime import GraphRuntimeState
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/app/apps/base_app_runner.py b/api/core/app/apps/base_app_runner.py
index 4aebc0cb30..1251b397e2 100644
--- a/api/core/app/apps/base_app_runner.py
+++ b/api/core/app/apps/base_app_runner.py
@@ -5,17 +5,6 @@ from collections.abc import Generator, Mapping, Sequence
 from mimetypes import guess_extension
 from typing import TYPE_CHECKING, Any, Union
 
-from graphon.file import FileTransferMethod, FileType
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from graphon.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    ImagePromptMessageContent,
-    PromptMessage,
-    TextPromptMessageContent,
-)
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
-from graphon.model_runtime.errors.invoke import InvokeBadRequestError
-
 from core.app.app_config.entities import ExternalDataVariableEntity, PromptTemplateEntity
 from core.app.apps.base_app_queue_manager import AppQueueManager, PublishFrom
 from core.app.entities.app_invoke_entities import (
@@ -41,6 +30,16 @@ from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, Comp
 from core.prompt.simple_prompt_transform import ModelMode, SimplePromptTransform
 from core.tools.tool_file_manager import ToolFileManager
 from extensions.ext_database import db
+from graphon.file import FileTransferMethod, FileType
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    ImagePromptMessageContent,
+    PromptMessage,
+    TextPromptMessageContent,
+)
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
+from graphon.model_runtime.errors.invoke import InvokeBadRequestError
 from models.enums import CreatorUserRole, MessageFileBelongsTo
 from models.model import App, AppMode, Message, MessageAnnotation, MessageFile
 
diff --git a/api/core/app/apps/chat/app_generator.py b/api/core/app/apps/chat/app_generator.py
index 891dcece73..58afefe296 100644
--- a/api/core/app/apps/chat/app_generator.py
+++ b/api/core/app/apps/chat/app_generator.py
@@ -6,7 +6,6 @@ from collections.abc import Generator, Mapping
 from typing import Any, Literal, overload
 
 from flask import Flask, copy_current_request_context, current_app
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from pydantic import ValidationError
 
 from configs import dify_config
@@ -24,6 +23,7 @@ from core.app.entities.app_invoke_entities import ChatAppGenerateEntity, InvokeF
 from core.ops.ops_trace_manager import TraceQueueManager
 from extensions.ext_database import db
 from factories import file_factory
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from models import Account
 from models.model import App, EndUser
 from services.conversation_service import ConversationService
diff --git a/api/core/app/apps/chat/app_runner.py b/api/core/app/apps/chat/app_runner.py
index 050f763e95..077c5239f3 100644
--- a/api/core/app/apps/chat/app_runner.py
+++ b/api/core/app/apps/chat/app_runner.py
@@ -1,8 +1,6 @@
 import logging
 from typing import cast
 
-from graphon.file import File
-from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
 from sqlalchemy import select
 
 from core.app.apps.base_app_queue_manager import AppQueueManager, PublishFrom
@@ -18,6 +16,8 @@ from core.model_manager import ModelInstance
 from core.moderation.base import ModerationError
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
 from extensions.ext_database import db
+from graphon.file import File
+from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
 from models.model import App, Conversation, Message
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/app/apps/common/graph_runtime_state_support.py b/api/core/app/apps/common/graph_runtime_state_support.py
index ab277857fe..2a90fbdad0 100644
--- a/api/core/app/apps/common/graph_runtime_state_support.py
+++ b/api/core/app/apps/common/graph_runtime_state_support.py
@@ -4,9 +4,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from graphon.runtime import GraphRuntimeState
-
 from core.workflow.system_variables import SystemVariableKey, get_system_text
+from graphon.runtime import GraphRuntimeState
 
 if TYPE_CHECKING:
     from core.app.task_pipeline.based_generate_task_pipeline import BasedGenerateTaskPipeline
diff --git a/api/core/app/apps/common/workflow_response_converter.py b/api/core/app/apps/common/workflow_response_converter.py
index a515531616..bd685d5189 100644
--- a/api/core/app/apps/common/workflow_response_converter.py
+++ b/api/core/app/apps/common/workflow_response_converter.py
@@ -6,19 +6,6 @@ from dataclasses import dataclass
 from datetime import datetime
 from typing import Any, NewType, TypedDict, Union
 
-from graphon.entities import WorkflowStartReason
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.enums import (
-    BuiltinNodeTypes,
-    WorkflowExecutionStatus,
-    WorkflowNodeExecutionMetadataKey,
-    WorkflowNodeExecutionStatus,
-)
-from graphon.file import FILE_MODEL_IDENTITY, File
-from graphon.runtime import GraphRuntimeState
-from graphon.variables.segments import ArrayFileSegment, FileSegment, Segment
-from graphon.variables.variables import Variable
-from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -68,6 +55,19 @@ from core.workflow.human_input_forms import load_form_tokens_by_form_id
 from core.workflow.system_variables import SystemVariableKey, system_variables_to_mapping
 from core.workflow.workflow_entry import WorkflowEntry
 from extensions.ext_database import db
+from graphon.entities import WorkflowStartReason
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.enums import (
+    BuiltinNodeTypes,
+    WorkflowExecutionStatus,
+    WorkflowNodeExecutionMetadataKey,
+    WorkflowNodeExecutionStatus,
+)
+from graphon.file import FILE_MODEL_IDENTITY, File
+from graphon.runtime import GraphRuntimeState
+from graphon.variables.segments import ArrayFileSegment, FileSegment, Segment
+from graphon.variables.variables import Variable
+from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from libs.datetime_utils import naive_utc_now
 from models import Account, EndUser
 from models.human_input import HumanInputForm
diff --git a/api/core/app/apps/completion/app_generator.py b/api/core/app/apps/completion/app_generator.py
index 61339b316a..423bfdac51 100644
--- a/api/core/app/apps/completion/app_generator.py
+++ b/api/core/app/apps/completion/app_generator.py
@@ -6,7 +6,6 @@ from collections.abc import Generator, Mapping
 from typing import Any, Literal, overload
 
 from flask import Flask, copy_current_request_context, current_app
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from pydantic import ValidationError
 from sqlalchemy import select
 
@@ -24,6 +23,7 @@ from core.app.entities.app_invoke_entities import CompletionAppGenerateEntity, I
 from core.ops.ops_trace_manager import TraceQueueManager
 from extensions.ext_database import db
 from factories import file_factory
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from models import Account, App, EndUser, Message
 from services.errors.app import MoreLikeThisDisabledError
 from services.errors.message import MessageNotExistsError
diff --git a/api/core/app/apps/completion/app_runner.py b/api/core/app/apps/completion/app_runner.py
index b216f7cf7b..6bb1ecdcb1 100644
--- a/api/core/app/apps/completion/app_runner.py
+++ b/api/core/app/apps/completion/app_runner.py
@@ -1,8 +1,6 @@
 import logging
 from typing import cast
 
-from graphon.file import File
-from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
 from sqlalchemy import select
 
 from core.app.apps.base_app_queue_manager import AppQueueManager
@@ -16,6 +14,8 @@ from core.model_manager import ModelInstance
 from core.moderation.base import ModerationError
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
 from extensions.ext_database import db
+from graphon.file import File
+from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
 from models.model import App, Message
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/app/apps/pipeline/pipeline_generator.py b/api/core/app/apps/pipeline/pipeline_generator.py
index 83c74b86e5..4b2f17189b 100644
--- a/api/core/app/apps/pipeline/pipeline_generator.py
+++ b/api/core/app/apps/pipeline/pipeline_generator.py
@@ -10,8 +10,6 @@ from collections.abc import Generator, Mapping
 from typing import Any, Literal, cast, overload
 
 from flask import Flask, current_app
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
-from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
 from pydantic import ValidationError
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
@@ -43,6 +41,8 @@ from core.repositories.factory import (
     WorkflowNodeExecutionRepository,
 )
 from extensions.ext_database import db
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
+from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
 from libs.flask_utils import preserve_flask_contexts
 from models import Account, EndUser, Workflow, WorkflowNodeExecutionTriggeredFrom
 from models.dataset import Document, DocumentPipelineExecutionLog, Pipeline
diff --git a/api/core/app/apps/pipeline/pipeline_runner.py b/api/core/app/apps/pipeline/pipeline_runner.py
index 36daaf09e9..2ee0ae27eb 100644
--- a/api/core/app/apps/pipeline/pipeline_runner.py
+++ b/api/core/app/apps/pipeline/pipeline_runner.py
@@ -2,12 +2,6 @@ import logging
 import time
 from typing import cast
 
-from graphon.enums import WorkflowType
-from graphon.graph import Graph
-from graphon.graph_events import GraphEngineEvent, GraphRunFailedEvent
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variable_loader import VariableLoader
-from graphon.variables.variables import RAGPipelineVariable, RAGPipelineVariableInput
 from sqlalchemy import select
 
 from core.app.apps.base_app_queue_manager import AppQueueManager
@@ -26,6 +20,12 @@ from core.workflow.system_variables import build_bootstrap_variables, build_syst
 from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add_variables_to_pool
 from core.workflow.workflow_entry import WorkflowEntry
 from extensions.ext_database import db
+from graphon.enums import WorkflowType
+from graphon.graph import Graph
+from graphon.graph_events import GraphEngineEvent, GraphRunFailedEvent
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variable_loader import VariableLoader
+from graphon.variables.variables import RAGPipelineVariable, RAGPipelineVariableInput
 from models.dataset import Document, Pipeline
 from models.model import EndUser
 from models.workflow import Workflow
diff --git a/api/core/app/apps/workflow/app_generator.py b/api/core/app/apps/workflow/app_generator.py
index 6074e81d1e..6937014a06 100644
--- a/api/core/app/apps/workflow/app_generator.py
+++ b/api/core/app/apps/workflow/app_generator.py
@@ -8,10 +8,6 @@ from collections.abc import Generator, Mapping, Sequence
 from typing import TYPE_CHECKING, Any, Literal, overload
 
 from flask import Flask, current_app
-from graphon.graph_engine.layers import GraphEngineLayer
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
-from graphon.runtime import GraphRuntimeState
-from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
 from pydantic import ValidationError
 from sqlalchemy import select
 from sqlalchemy.orm import sessionmaker
@@ -38,6 +34,10 @@ from core.repositories import DifyCoreRepositoryFactory
 from core.repositories.factory import WorkflowExecutionRepository, WorkflowNodeExecutionRepository
 from extensions.ext_database import db
 from factories import file_factory
+from graphon.graph_engine.layers import GraphEngineLayer
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
+from graphon.runtime import GraphRuntimeState
+from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
 from libs.flask_utils import preserve_flask_contexts
 from models.account import Account
 from models.enums import WorkflowRunTriggeredFrom
diff --git a/api/core/app/apps/workflow/app_runner.py b/api/core/app/apps/workflow/app_runner.py
index 2cb8088971..cfb9208486 100644
--- a/api/core/app/apps/workflow/app_runner.py
+++ b/api/core/app/apps/workflow/app_runner.py
@@ -3,12 +3,6 @@ import time
 from collections.abc import Sequence
 from typing import cast
 
-from graphon.enums import WorkflowType
-from graphon.graph_engine.command_channels import RedisChannel
-from graphon.graph_engine.layers import GraphEngineLayer
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variable_loader import VariableLoader
-
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.workflow.app_config_manager import WorkflowAppConfig
 from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
@@ -21,6 +15,11 @@ from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add
 from core.workflow.workflow_entry import WorkflowEntry
 from extensions.ext_redis import redis_client
 from extensions.otel import WorkflowAppRunnerHandler, trace_span
+from graphon.enums import WorkflowType
+from graphon.graph_engine.command_channels import RedisChannel
+from graphon.graph_engine.layers import GraphEngineLayer
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variable_loader import VariableLoader
 from libs.datetime_utils import naive_utc_now
 from models.workflow import Workflow
 
diff --git a/api/core/app/apps/workflow/generate_task_pipeline.py b/api/core/app/apps/workflow/generate_task_pipeline.py
index 96387133b1..15645add57 100644
--- a/api/core/app/apps/workflow/generate_task_pipeline.py
+++ b/api/core/app/apps/workflow/generate_task_pipeline.py
@@ -4,9 +4,6 @@ from collections.abc import Callable, Generator
 from contextlib import contextmanager
 from typing import Union
 
-from graphon.entities import WorkflowStartReason
-from graphon.enums import WorkflowExecutionStatus
-from graphon.runtime import GraphRuntimeState
 from sqlalchemy.orm import Session, sessionmaker
 
 from constants.tts_auto_play_timeout import TTS_AUTO_PLAY_TIMEOUT, TTS_AUTO_PLAY_YIELD_CPU_TIME
@@ -61,6 +58,9 @@ from core.base.tts import AppGeneratorTTSPublisher, AudioTrunk
 from core.ops.ops_trace_manager import TraceQueueManager
 from core.workflow.system_variables import build_system_variables
 from extensions.ext_database import db
+from graphon.entities import WorkflowStartReason
+from graphon.enums import WorkflowExecutionStatus
+from graphon.runtime import GraphRuntimeState
 from models import Account
 from models.enums import CreatorUserRole
 from models.model import EndUser
diff --git a/api/core/app/apps/workflow_app_runner.py b/api/core/app/apps/workflow_app_runner.py
index 437432611d..047b54c86c 100644
--- a/api/core/app/apps/workflow_app_runner.py
+++ b/api/core/app/apps/workflow_app_runner.py
@@ -3,39 +3,6 @@ import time
 from collections.abc import Mapping, Sequence
 from typing import Any, cast
 
-from graphon.entities.graph_config import NodeConfigDictAdapter
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.graph import Graph
-from graphon.graph_engine.layers import GraphEngineLayer
-from graphon.graph_events import (
-    GraphEngineEvent,
-    GraphRunAbortedEvent,
-    GraphRunFailedEvent,
-    GraphRunPartialSucceededEvent,
-    GraphRunPausedEvent,
-    GraphRunStartedEvent,
-    GraphRunSucceededEvent,
-    NodeRunAgentLogEvent,
-    NodeRunExceptionEvent,
-    NodeRunFailedEvent,
-    NodeRunHumanInputFormFilledEvent,
-    NodeRunHumanInputFormTimeoutEvent,
-    NodeRunIterationFailedEvent,
-    NodeRunIterationNextEvent,
-    NodeRunIterationStartedEvent,
-    NodeRunIterationSucceededEvent,
-    NodeRunLoopFailedEvent,
-    NodeRunLoopNextEvent,
-    NodeRunLoopStartedEvent,
-    NodeRunLoopSucceededEvent,
-    NodeRunRetrieverResourceEvent,
-    NodeRunRetryEvent,
-    NodeRunStartedEvent,
-    NodeRunStreamChunkEvent,
-    NodeRunSucceededEvent,
-)
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
 from pydantic import ValidationError
 
 from core.app.apps.base_app_queue_manager import AppQueueManager, PublishFrom
@@ -82,6 +49,39 @@ from core.workflow.system_variables import (
 from core.workflow.variable_pool_initializer import add_variables_to_pool
 from core.workflow.workflow_entry import WorkflowEntry
 from core.workflow.workflow_run_outputs import project_node_outputs_for_workflow_run
+from graphon.entities.graph_config import NodeConfigDictAdapter
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.graph import Graph
+from graphon.graph_engine.layers import GraphEngineLayer
+from graphon.graph_events import (
+    GraphEngineEvent,
+    GraphRunAbortedEvent,
+    GraphRunFailedEvent,
+    GraphRunPartialSucceededEvent,
+    GraphRunPausedEvent,
+    GraphRunStartedEvent,
+    GraphRunSucceededEvent,
+    NodeRunAgentLogEvent,
+    NodeRunExceptionEvent,
+    NodeRunFailedEvent,
+    NodeRunHumanInputFormFilledEvent,
+    NodeRunHumanInputFormTimeoutEvent,
+    NodeRunIterationFailedEvent,
+    NodeRunIterationNextEvent,
+    NodeRunIterationStartedEvent,
+    NodeRunIterationSucceededEvent,
+    NodeRunLoopFailedEvent,
+    NodeRunLoopNextEvent,
+    NodeRunLoopStartedEvent,
+    NodeRunLoopSucceededEvent,
+    NodeRunRetrieverResourceEvent,
+    NodeRunRetryEvent,
+    NodeRunStartedEvent,
+    NodeRunStreamChunkEvent,
+    NodeRunSucceededEvent,
+)
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
 from models.workflow import Workflow
 from tasks.mail_human_input_delivery_task import dispatch_human_input_email_task
 
diff --git a/api/core/app/entities/app_invoke_entities.py b/api/core/app/entities/app_invoke_entities.py
index a3fb7b4c5d..09992f4bbf 100644
--- a/api/core/app/entities/app_invoke_entities.py
+++ b/api/core/app/entities/app_invoke_entities.py
@@ -2,13 +2,13 @@ from collections.abc import Mapping, Sequence
 from enum import StrEnum
 from typing import TYPE_CHECKING, Any
 
-from graphon.file import File, FileUploadConfig
-from graphon.model_runtime.entities.model_entities import AIModelEntity
 from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validator
 
 from constants import UUID_NIL
 from core.app.app_config.entities import EasyUIBasedAppConfig, WorkflowUIBasedAppConfig
 from core.entities.provider_configuration import ProviderModelBundle
+from graphon.file import File, FileUploadConfig
+from graphon.model_runtime.entities.model_entities import AIModelEntity
 
 if TYPE_CHECKING:
     from core.ops.ops_trace_manager import TraceQueueManager
diff --git a/api/core/app/entities/queue_entities.py b/api/core/app/entities/queue_entities.py
index 482f995d8e..221b7fb058 100644
--- a/api/core/app/entities/queue_entities.py
+++ b/api/core/app/entities/queue_entities.py
@@ -3,14 +3,14 @@ from datetime import datetime
 from enum import StrEnum, auto
 from typing import Any
 
-from graphon.entities import WorkflowStartReason
-from graphon.entities.pause_reason import PauseReason
-from graphon.enums import NodeType, WorkflowNodeExecutionMetadataKey
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
 from pydantic import BaseModel, ConfigDict, Field
 
 from core.app.entities.agent_strategy import AgentStrategyInfo
 from core.rag.entities import RetrievalSourceMetadata
+from graphon.entities import WorkflowStartReason
+from graphon.entities.pause_reason import PauseReason
+from graphon.enums import NodeType, WorkflowNodeExecutionMetadataKey
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
 
 
 class QueueEvent(StrEnum):
diff --git a/api/core/app/entities/task_entities.py b/api/core/app/entities/task_entities.py
index 88faf235d1..6e4ca69cf0 100644
--- a/api/core/app/entities/task_entities.py
+++ b/api/core/app/entities/task_entities.py
@@ -2,14 +2,14 @@ from collections.abc import Mapping, Sequence
 from enum import StrEnum
 from typing import Any
 
-from graphon.entities import WorkflowStartReason
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from graphon.nodes.human_input.entities import FormInput, UserAction
 from pydantic import BaseModel, ConfigDict, Field
 
 from core.app.entities.agent_strategy import AgentStrategyInfo
 from core.rag.entities import RetrievalSourceMetadata
+from graphon.entities import WorkflowStartReason
+from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from graphon.nodes.human_input.entities import FormInput, UserAction
 
 
 class AnnotationReplyAccount(BaseModel):
diff --git a/api/core/app/features/hosting_moderation/hosting_moderation.py b/api/core/app/features/hosting_moderation/hosting_moderation.py
index d2d2fea4fb..d59f5125e3 100644
--- a/api/core/app/features/hosting_moderation/hosting_moderation.py
+++ b/api/core/app/features/hosting_moderation/hosting_moderation.py
@@ -1,9 +1,8 @@
 import logging
 
-from graphon.model_runtime.entities.message_entities import PromptMessage
-
 from core.app.entities.app_invoke_entities import EasyUIBasedAppGenerateEntity
 from core.helper import moderation
+from graphon.model_runtime.entities.message_entities import PromptMessage
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/app/layers/conversation_variable_persist_layer.py b/api/core/app/layers/conversation_variable_persist_layer.py
index e09869f5f8..d5e6b04a4a 100644
--- a/api/core/app/layers/conversation_variable_persist_layer.py
+++ b/api/core/app/layers/conversation_variable_persist_layer.py
@@ -9,11 +9,10 @@ scope updates that matter to chat applications.
 
 import logging
 
-from graphon.graph_engine.layers import GraphEngineLayer
-from graphon.graph_events import GraphEngineEvent, NodeRunVariableUpdatedEvent
-
 from core.workflow.system_variables import SystemVariableKey, get_system_text
 from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID
+from graphon.graph_engine.layers import GraphEngineLayer
+from graphon.graph_events import GraphEngineEvent, NodeRunVariableUpdatedEvent
 from services.conversation_variable_updater import ConversationVariableUpdater
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/app/layers/pause_state_persist_layer.py b/api/core/app/layers/pause_state_persist_layer.py
index c027f42788..9811f9f830 100644
--- a/api/core/app/layers/pause_state_persist_layer.py
+++ b/api/core/app/layers/pause_state_persist_layer.py
@@ -1,14 +1,14 @@
 from dataclasses import dataclass
 from typing import Annotated, Literal, Self
 
-from graphon.graph_engine.layers import GraphEngineLayer
-from graphon.graph_events import GraphEngineEvent, GraphRunPausedEvent
 from pydantic import BaseModel, Field
 from sqlalchemy import Engine
 from sqlalchemy.orm import Session, sessionmaker
 
 from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, WorkflowAppGenerateEntity
 from core.workflow.system_variables import SystemVariableKey, get_system_text
+from graphon.graph_engine.layers import GraphEngineLayer
+from graphon.graph_events import GraphEngineEvent, GraphRunPausedEvent
 from models.model import AppMode
 from repositories.api_workflow_run_repository import APIWorkflowRunRepository
 from repositories.factory import DifyAPIRepositoryFactory
diff --git a/api/core/app/layers/timeslice_layer.py b/api/core/app/layers/timeslice_layer.py
index 8c8daf8712..bb9fc1b6fa 100644
--- a/api/core/app/layers/timeslice_layer.py
+++ b/api/core/app/layers/timeslice_layer.py
@@ -3,10 +3,10 @@ import uuid
 from typing import ClassVar
 
 from apscheduler.schedulers.background import BackgroundScheduler  # type: ignore
+
 from graphon.graph_engine.entities.commands import CommandType, GraphEngineCommand
 from graphon.graph_engine.layers import GraphEngineLayer
 from graphon.graph_events import GraphEngineEvent
-
 from services.workflow.entities import WorkflowScheduleCFSPlanEntity
 from services.workflow.scheduler import CFSPlanScheduler, SchedulerCommand
 
diff --git a/api/core/app/layers/trigger_post_layer.py b/api/core/app/layers/trigger_post_layer.py
index 77c7bec67e..b60fe82ffe 100644
--- a/api/core/app/layers/trigger_post_layer.py
+++ b/api/core/app/layers/trigger_post_layer.py
@@ -2,12 +2,12 @@ import logging
 from datetime import UTC, datetime
 from typing import Any, ClassVar
 
-from graphon.graph_engine.layers import GraphEngineLayer
-from graphon.graph_events import GraphEngineEvent, GraphRunFailedEvent, GraphRunPausedEvent, GraphRunSucceededEvent
 from pydantic import TypeAdapter
 
 from core.db.session_factory import session_factory
 from core.workflow.system_variables import SystemVariableKey, get_system_text
+from graphon.graph_engine.layers import GraphEngineLayer
+from graphon.graph_events import GraphEngineEvent, GraphRunFailedEvent, GraphRunPausedEvent, GraphRunSucceededEvent
 from models.enums import WorkflowTriggerStatus
 from repositories.sqlalchemy_workflow_trigger_log_repository import SQLAlchemyWorkflowTriggerLogRepository
 from tasks.workflow_cfs_scheduler.cfs_scheduler import AsyncWorkflowCFSPlanEntity
diff --git a/api/core/app/llm/model_access.py b/api/core/app/llm/model_access.py
index 278d0cb30b..c49c4eb0ac 100644
--- a/api/core/app/llm/model_access.py
+++ b/api/core/app/llm/model_access.py
@@ -2,16 +2,15 @@ from __future__ import annotations
 
 from typing import Any
 
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.nodes.llm.entities import ModelConfig
-from graphon.nodes.llm.exc import LLMModeRequiredError, ModelNotExistError
-from graphon.nodes.llm.protocols import CredentialsProvider
-
 from core.app.entities.app_invoke_entities import DifyRunContext, ModelConfigWithCredentialsEntity
 from core.errors.error import ProviderTokenNotInitError
 from core.model_manager import ModelInstance, ModelManager
 from core.plugin.impl.model_runtime_factory import create_plugin_provider_manager
 from core.provider_manager import ProviderManager
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.nodes.llm.entities import ModelConfig
+from graphon.nodes.llm.exc import LLMModeRequiredError, ModelNotExistError
+from graphon.nodes.llm.protocols import CredentialsProvider
 
 
 class DifyCredentialsProvider:
diff --git a/api/core/app/llm/quota.py b/api/core/app/llm/quota.py
index 0bb10190c4..b6039e1e4e 100644
--- a/api/core/app/llm/quota.py
+++ b/api/core/app/llm/quota.py
@@ -1,4 +1,3 @@
-from graphon.model_runtime.entities.llm_entities import LLMUsage
 from sqlalchemy import update
 from sqlalchemy.orm import sessionmaker
 
@@ -8,6 +7,7 @@ from core.entities.provider_entities import ProviderQuotaType, QuotaUnit
 from core.errors.error import QuotaExceededError
 from core.model_manager import ModelInstance
 from extensions.ext_database import db
+from graphon.model_runtime.entities.llm_entities import LLMUsage
 from libs.datetime_utils import naive_utc_now
 from models.provider import Provider, ProviderType
 from models.provider_ids import ModelProviderID
diff --git a/api/core/app/task_pipeline/based_generate_task_pipeline.py b/api/core/app/task_pipeline/based_generate_task_pipeline.py
index 10b9c36d3e..9e688589db 100644
--- a/api/core/app/task_pipeline/based_generate_task_pipeline.py
+++ b/api/core/app/task_pipeline/based_generate_task_pipeline.py
@@ -1,7 +1,6 @@
 import logging
 import time
 
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -18,6 +17,7 @@ from core.app.entities.task_entities import (
 )
 from core.errors.error import QuotaExceededError
 from core.moderation.output_moderation import ModerationRule, OutputModeration
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from models.enums import MessageStatus
 from models.model import Message
 
diff --git a/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py b/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
index 6bb177fe02..dfe6133cb6 100644
--- a/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
+++ b/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
@@ -4,13 +4,6 @@ from collections.abc import Generator
 from threading import Thread
 from typing import Any, cast
 
-from graphon.file import FileTransferMethod
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from graphon.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    TextPromptMessageContent,
-)
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -60,6 +53,13 @@ from core.prompt.utils.prompt_message_util import PromptMessageUtil
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from events.message_event import message_was_created
 from extensions.ext_database import db
+from graphon.file import FileTransferMethod
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    TextPromptMessageContent,
+)
+from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from libs.datetime_utils import naive_utc_now
 from models.model import AppMode, Conversation, Message, MessageAgentThought, MessageFile, UploadFile
 
diff --git a/api/core/app/task_pipeline/message_file_utils.py b/api/core/app/task_pipeline/message_file_utils.py
index 77310baf74..1dd713821f 100644
--- a/api/core/app/task_pipeline/message_file_utils.py
+++ b/api/core/app/task_pipeline/message_file_utils.py
@@ -1,9 +1,8 @@
 from typing import TypedDict
 
+from core.tools.signature import sign_tool_file
 from graphon.file import FileTransferMethod
 from graphon.file import helpers as file_helpers
-
-from core.tools.signature import sign_tool_file
 from models.model import MessageFile, UploadFile
 
 MAX_TOOL_FILE_EXTENSION_LENGTH = 10
diff --git a/api/core/app/workflow/file_runtime.py b/api/core/app/workflow/file_runtime.py
index 8604235ef2..68e5e5f0c8 100644
--- a/api/core/app/workflow/file_runtime.py
+++ b/api/core/app/workflow/file_runtime.py
@@ -9,10 +9,6 @@ import urllib.parse
 from collections.abc import Generator
 from typing import TYPE_CHECKING, Literal
 
-from graphon.file import FileTransferMethod
-from graphon.file.protocols import HttpResponseProtocol, WorkflowFileRuntimeProtocol
-from graphon.file.runtime import set_workflow_file_runtime
-
 from configs import dify_config
 from core.app.file_access import DatabaseFileAccessController, FileAccessControllerProtocol
 from core.db.session_factory import session_factory
@@ -20,6 +16,9 @@ from core.helper.ssrf_proxy import ssrf_proxy
 from core.tools.signature import sign_tool_file
 from core.workflow.file_reference import parse_file_reference
 from extensions.ext_storage import storage
+from graphon.file import FileTransferMethod
+from graphon.file.protocols import HttpResponseProtocol, WorkflowFileRuntimeProtocol
+from graphon.file.runtime import set_workflow_file_runtime
 
 if TYPE_CHECKING:
     from graphon.file import File
diff --git a/api/core/app/workflow/layers/llm_quota.py b/api/core/app/workflow/layers/llm_quota.py
index c577ce0754..4a7918032e 100644
--- a/api/core/app/workflow/layers/llm_quota.py
+++ b/api/core/app/workflow/layers/llm_quota.py
@@ -7,17 +7,16 @@ This layer centralizes model-quota deduction outside node implementations.
 import logging
 from typing import TYPE_CHECKING, cast, final, override
 
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
+from core.app.llm import deduct_llm_quota, ensure_llm_quota_available
+from core.errors.error import QuotaExceededError
+from core.model_manager import ModelInstance
 from graphon.enums import BuiltinNodeTypes
 from graphon.graph_engine.entities.commands import AbortCommand, CommandType
 from graphon.graph_engine.layers import GraphEngineLayer
 from graphon.graph_events import GraphEngineEvent, GraphNodeEventBase, NodeRunSucceededEvent
 from graphon.nodes.base.node import Node
 
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
-from core.app.llm import deduct_llm_quota, ensure_llm_quota_available
-from core.errors.error import QuotaExceededError
-from core.model_manager import ModelInstance
-
 if TYPE_CHECKING:
     from graphon.nodes.llm.node import LLMNode
     from graphon.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
diff --git a/api/core/app/workflow/layers/observability.py b/api/core/app/workflow/layers/observability.py
index 99e8015c0b..8b5a5b9d7f 100644
--- a/api/core/app/workflow/layers/observability.py
+++ b/api/core/app/workflow/layers/observability.py
@@ -12,10 +12,6 @@ from contextvars import Token
 from dataclasses import dataclass
 from typing import cast, final, override
 
-from graphon.enums import BuiltinNodeTypes, NodeType
-from graphon.graph_engine.layers import GraphEngineLayer
-from graphon.graph_events import GraphNodeEventBase
-from graphon.nodes.base.node import Node
 from opentelemetry import context as context_api
 from opentelemetry.trace import Span, SpanKind, Tracer, get_tracer, set_span_in_context
 
@@ -28,6 +24,10 @@ from extensions.otel.parser import (
     ToolNodeOTelParser,
 )
 from extensions.otel.runtime import is_instrument_flag_enabled
+from graphon.enums import BuiltinNodeTypes, NodeType
+from graphon.graph_engine.layers import GraphEngineLayer
+from graphon.graph_events import GraphNodeEventBase
+from graphon.nodes.base.node import Node
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/app/workflow/layers/persistence.py b/api/core/app/workflow/layers/persistence.py
index ada065a943..87f005a250 100644
--- a/api/core/app/workflow/layers/persistence.py
+++ b/api/core/app/workflow/layers/persistence.py
@@ -14,6 +14,13 @@ from dataclasses import dataclass
 from datetime import datetime
 from typing import Any, Union
 
+from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, WorkflowAppGenerateEntity
+from core.ops.entities.trace_entity import TraceTaskName
+from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
+from core.repositories.factory import WorkflowExecutionRepository, WorkflowNodeExecutionRepository
+from core.workflow.system_variables import SystemVariableKey
+from core.workflow.variable_prefixes import SYSTEM_VARIABLE_NODE_ID
+from core.workflow.workflow_run_outputs import project_node_outputs_for_workflow_run
 from graphon.entities import WorkflowExecution, WorkflowNodeExecution
 from graphon.enums import (
     WorkflowExecutionStatus,
@@ -38,14 +45,6 @@ from graphon.graph_events import (
     NodeRunSucceededEvent,
 )
 from graphon.node_events import NodeRunResult
-
-from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, WorkflowAppGenerateEntity
-from core.ops.entities.trace_entity import TraceTaskName
-from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
-from core.repositories.factory import WorkflowExecutionRepository, WorkflowNodeExecutionRepository
-from core.workflow.system_variables import SystemVariableKey
-from core.workflow.variable_prefixes import SYSTEM_VARIABLE_NODE_ID
-from core.workflow.workflow_run_outputs import project_node_outputs_for_workflow_run
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/core/base/tts/app_generator_tts_publisher.py b/api/core/base/tts/app_generator_tts_publisher.py
index 3d8a7a54f3..9e3c187210 100644
--- a/api/core/base/tts/app_generator_tts_publisher.py
+++ b/api/core/base/tts/app_generator_tts_publisher.py
@@ -6,9 +6,6 @@ import re
 import threading
 from collections.abc import Iterable
 
-from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
-from graphon.model_runtime.entities.model_entities import ModelType
-
 from core.app.entities.queue_entities import (
     MessageQueueMessage,
     QueueAgentMessageEvent,
@@ -18,6 +15,8 @@ from core.app.entities.queue_entities import (
     WorkflowQueueMessage,
 )
 from core.model_manager import ModelInstance, ModelManager
+from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
+from graphon.model_runtime.entities.model_entities import ModelType
 
 
 class AudioTrunk:
diff --git a/api/core/datasource/datasource_manager.py b/api/core/datasource/datasource_manager.py
index a5297fa33a..dc831e5cac 100644
--- a/api/core/datasource/datasource_manager.py
+++ b/api/core/datasource/datasource_manager.py
@@ -3,9 +3,6 @@ from collections.abc import Generator
 from threading import Lock
 from typing import Any, cast
 
-from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from graphon.file import File, FileTransferMethod, FileType, get_file_type_by_mime_type
-from graphon.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
 from sqlalchemy import select
 
 import contexts
@@ -31,6 +28,9 @@ from core.plugin.impl.datasource import PluginDatasourceManager
 from core.workflow.file_reference import build_file_reference
 from core.workflow.nodes.datasource.entities import DatasourceParameter, OnlineDriveDownloadFileParam
 from factories import file_factory
+from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from graphon.file import File, FileTransferMethod, FileType, get_file_type_by_mime_type
+from graphon.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
 from models.model import UploadFile
 from models.tools import ToolFile
 from services.datasource_provider_service import DatasourceProviderService
diff --git a/api/core/datasource/entities/api_entities.py b/api/core/datasource/entities/api_entities.py
index 9c22d5e67c..352e6bfd49 100644
--- a/api/core/datasource/entities/api_entities.py
+++ b/api/core/datasource/entities/api_entities.py
@@ -1,10 +1,10 @@
 from typing import Any, Literal, TypedDict
 
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field, field_validator
 
 from core.datasource.entities.datasource_entities import DatasourceParameter
 from core.tools.entities.common_entities import I18nObject, I18nObjectDict
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 
 
 class DatasourceApiEntity(BaseModel):
diff --git a/api/core/datasource/utils/message_transformer.py b/api/core/datasource/utils/message_transformer.py
index c012e128f4..6a3f9e684a 100644
--- a/api/core/datasource/utils/message_transformer.py
+++ b/api/core/datasource/utils/message_transformer.py
@@ -2,11 +2,10 @@ import logging
 from collections.abc import Generator
 from mimetypes import guess_extension, guess_type
 
-from graphon.file import File, FileTransferMethod, FileType
-
 from core.datasource.entities.datasource_entities import DatasourceMessage
 from core.tools.tool_file_manager import ToolFileManager
 from core.workflow.file_reference import parse_file_reference
+from graphon.file import File, FileTransferMethod, FileType
 from models.tools import ToolFile
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/entities/execution_extra_content.py b/api/core/entities/execution_extra_content.py
index d304c982cd..04ae193396 100644
--- a/api/core/entities/execution_extra_content.py
+++ b/api/core/entities/execution_extra_content.py
@@ -3,9 +3,9 @@ from __future__ import annotations
 from collections.abc import Mapping, Sequence
 from typing import Any, TypeAlias
 
-from graphon.nodes.human_input.entities import FormInput, UserAction
 from pydantic import BaseModel, ConfigDict, Field
 
+from graphon.nodes.human_input.entities import FormInput, UserAction
 from models.execution_extra_content import ExecutionContentType
 
 
diff --git a/api/core/entities/mcp_provider.py b/api/core/entities/mcp_provider.py
index a440829b46..bfa4f56915 100644
--- a/api/core/entities/mcp_provider.py
+++ b/api/core/entities/mcp_provider.py
@@ -6,7 +6,6 @@ from enum import StrEnum
 from typing import TYPE_CHECKING, Any
 from urllib.parse import urlparse
 
-from graphon.file import helpers as file_helpers
 from pydantic import BaseModel
 
 from configs import dify_config
@@ -16,6 +15,7 @@ from core.helper.provider_cache import NoOpProviderCredentialCache
 from core.mcp.types import OAuthClientInformation, OAuthClientMetadata, OAuthTokens
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolProviderType
+from graphon.file import helpers as file_helpers
 
 if TYPE_CHECKING:
     from models.tools import MCPToolProvider
diff --git a/api/core/entities/model_entities.py b/api/core/entities/model_entities.py
index 84d95c38c6..e99a131500 100644
--- a/api/core/entities/model_entities.py
+++ b/api/core/entities/model_entities.py
@@ -1,10 +1,11 @@
 from collections.abc import Sequence
 from enum import StrEnum, auto
 
+from pydantic import BaseModel, ConfigDict
+
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.model_entities import ModelType, ProviderModel
 from graphon.model_runtime.entities.provider_entities import ProviderEntity
-from pydantic import BaseModel, ConfigDict
 
 
 class ModelStatus(StrEnum):
diff --git a/api/core/entities/provider_configuration.py b/api/core/entities/provider_configuration.py
index d07f6f913a..1ab66cceee 100644
--- a/api/core/entities/provider_configuration.py
+++ b/api/core/entities/provider_configuration.py
@@ -8,16 +8,6 @@ from collections.abc import Iterator, Sequence
 from json import JSONDecodeError
 from typing import Any
 
-from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
-from graphon.model_runtime.entities.provider_entities import (
-    ConfigurateMethod,
-    CredentialFormSchema,
-    FormType,
-    ProviderEntity,
-)
-from graphon.model_runtime.model_providers.__base.ai_model import AIModel
-from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
-from graphon.model_runtime.runtime import ModelRuntime
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr, model_validator
 from sqlalchemy import func, select
 from sqlalchemy.orm import Session
@@ -34,6 +24,16 @@ from core.entities.provider_entities import (
 from core.helper import encrypter
 from core.helper.model_provider_cache import ProviderCredentialsCache, ProviderCredentialsCacheType
 from core.plugin.impl.model_runtime_factory import create_plugin_model_provider_factory
+from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
+from graphon.model_runtime.entities.provider_entities import (
+    ConfigurateMethod,
+    CredentialFormSchema,
+    FormType,
+    ProviderEntity,
+)
+from graphon.model_runtime.model_providers.__base.ai_model import AIModel
+from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
+from graphon.model_runtime.runtime import ModelRuntime
 from libs.datetime_utils import naive_utc_now
 from models.engine import db
 from models.enums import CredentialSourceType
diff --git a/api/core/entities/provider_entities.py b/api/core/entities/provider_entities.py
index 95431c0e01..72b29c2277 100644
--- a/api/core/entities/provider_entities.py
+++ b/api/core/entities/provider_entities.py
@@ -3,7 +3,6 @@ from __future__ import annotations
 from enum import StrEnum, auto
 from typing import Any, Union
 
-from graphon.model_runtime.entities.model_entities import ModelType
 from pydantic import BaseModel, ConfigDict, Field
 
 from core.entities.parameter_entities import (
@@ -13,6 +12,7 @@ from core.entities.parameter_entities import (
     ToolSelectorScope,
 )
 from core.tools.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import ModelType
 
 
 class ProviderQuotaType(StrEnum):
diff --git a/api/core/helper/code_executor/code_executor.py b/api/core/helper/code_executor/code_executor.py
index 35bfcfb6a5..951e065b2c 100644
--- a/api/core/helper/code_executor/code_executor.py
+++ b/api/core/helper/code_executor/code_executor.py
@@ -4,7 +4,6 @@ from threading import Lock
 from typing import Any
 
 import httpx
-from graphon.nodes.code.entities import CodeLanguage
 from pydantic import BaseModel
 from yarl import URL
 
@@ -14,6 +13,7 @@ from core.helper.code_executor.jinja2.jinja2_transformer import Jinja2TemplateTr
 from core.helper.code_executor.python3.python3_transformer import Python3TemplateTransformer
 from core.helper.code_executor.template_transformer import TemplateTransformer
 from core.helper.http_client_pooling import get_pooled_http_client
+from graphon.nodes.code.entities import CodeLanguage
 
 logger = logging.getLogger(__name__)
 code_execution_endpoint_url = URL(str(dify_config.CODE_EXECUTION_ENDPOINT))
diff --git a/api/core/helper/moderation.py b/api/core/helper/moderation.py
index a1e782a094..dc37a36943 100644
--- a/api/core/helper/moderation.py
+++ b/api/core/helper/moderation.py
@@ -2,14 +2,13 @@ import logging
 import secrets
 from typing import cast
 
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.invoke import InvokeBadRequestError
-from graphon.model_runtime.model_providers.__base.moderation_model import ModerationModel
-
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.entities import DEFAULT_PLUGIN_ID
 from core.plugin.impl.model_runtime_factory import create_plugin_model_provider_factory
 from extensions.ext_hosting_provider import hosting_configuration
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.invoke import InvokeBadRequestError
+from graphon.model_runtime.model_providers.__base.moderation_model import ModerationModel
 from models.provider import ProviderType
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/hosting_configuration.py b/api/core/hosting_configuration.py
index f8f56e12d2..8bcb899b23 100644
--- a/api/core/hosting_configuration.py
+++ b/api/core/hosting_configuration.py
@@ -1,12 +1,12 @@
 from typing import Any
 
 from flask import Flask
-from graphon.model_runtime.entities.model_entities import ModelType
 from pydantic import BaseModel
 
 from configs import dify_config
 from core.entities import DEFAULT_PLUGIN_ID
 from core.entities.provider_entities import ProviderQuotaType, QuotaUnit, RestrictModel
+from graphon.model_runtime.entities.model_entities import ModelType
 
 
 class HostingQuota(BaseModel):
diff --git a/api/core/indexing_runner.py b/api/core/indexing_runner.py
index 8d0a8b99b4..b6e33396d1 100644
--- a/api/core/indexing_runner.py
+++ b/api/core/indexing_runner.py
@@ -9,7 +9,6 @@ from collections.abc import Mapping
 from typing import Any
 
 from flask import Flask, current_app
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy import delete, func, select, update
 from sqlalchemy.orm.exc import ObjectDeletedError
 
@@ -35,6 +34,7 @@ from core.tools.utils.web_reader_tool import get_image_upload_file_ids
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from extensions.ext_storage import storage
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs import helper
 from libs.datetime_utils import naive_utc_now
 from models import Account
diff --git a/api/core/llm_generator/llm_generator.py b/api/core/llm_generator/llm_generator.py
index c43c0274cd..348526b0ef 100644
--- a/api/core/llm_generator/llm_generator.py
+++ b/api/core/llm_generator/llm_generator.py
@@ -5,11 +5,6 @@ from collections.abc import Sequence
 from typing import Any, Protocol, TypedDict, cast
 
 import json_repair
-from graphon.enums import WorkflowNodeExecutionMetadataKey
-from graphon.model_runtime.entities.llm_entities import LLMResult
-from graphon.model_runtime.entities.message_entities import PromptMessage, SystemPromptMessage, UserPromptMessage
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from sqlalchemy import select
 
 from core.app.app_config.entities import ModelConfig
@@ -35,6 +30,11 @@ from core.ops.utils import measure_time
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from extensions.ext_database import db
 from extensions.ext_storage import storage
+from graphon.enums import WorkflowNodeExecutionMetadataKey
+from graphon.model_runtime.entities.llm_entities import LLMResult
+from graphon.model_runtime.entities.message_entities import PromptMessage, SystemPromptMessage, UserPromptMessage
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from models import App, Message, WorkflowNodeExecutionModel
 from models.workflow import Workflow
 
diff --git a/api/core/llm_generator/output_parser/structured_output.py b/api/core/llm_generator/output_parser/structured_output.py
index a8ad7c9179..d2e375626f 100644
--- a/api/core/llm_generator/output_parser/structured_output.py
+++ b/api/core/llm_generator/output_parser/structured_output.py
@@ -5,6 +5,11 @@ from enum import StrEnum
 from typing import Any, Literal, cast, overload
 
 import json_repair
+from pydantic import TypeAdapter, ValidationError
+
+from core.llm_generator.output_parser.errors import OutputParserError
+from core.llm_generator.prompts import STRUCTURED_OUTPUT_PROMPT
+from core.model_manager import ModelInstance
 from graphon.model_runtime.callbacks.base_callback import Callback
 from graphon.model_runtime.entities.llm_entities import (
     LLMResult,
@@ -21,11 +26,6 @@ from graphon.model_runtime.entities.message_entities import (
     TextPromptMessageContent,
 )
 from graphon.model_runtime.entities.model_entities import AIModelEntity, ParameterRule
-from pydantic import TypeAdapter, ValidationError
-
-from core.llm_generator.output_parser.errors import OutputParserError
-from core.llm_generator.prompts import STRUCTURED_OUTPUT_PROMPT
-from core.model_manager import ModelInstance
 
 
 class ResponseFormat(StrEnum):
diff --git a/api/core/mcp/server/streamable_http.py b/api/core/mcp/server/streamable_http.py
index 72171d1536..884610ca82 100644
--- a/api/core/mcp/server/streamable_http.py
+++ b/api/core/mcp/server/streamable_http.py
@@ -3,12 +3,11 @@ import logging
 from collections.abc import Mapping
 from typing import Any, NotRequired, TypedDict, cast
 
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
-
 from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.features.rate_limiting.rate_limit import RateLimitGenerator
 from core.mcp import types as mcp_types
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from models.model import App, AppMCPServer, AppMode, EndUser
 from services.app_generate_service import AppGenerateService
 
diff --git a/api/core/mcp/utils.py b/api/core/mcp/utils.py
index 7e35044176..7b5a7635f1 100644
--- a/api/core/mcp/utils.py
+++ b/api/core/mcp/utils.py
@@ -4,11 +4,11 @@ from contextlib import AbstractContextManager
 
 import httpx
 import httpx_sse
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from httpx_sse import connect_sse
 
 from configs import dify_config
 from core.mcp.types import ErrorData, JSONRPCError
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 
 HTTP_REQUEST_NODE_SSL_VERIFY = dify_config.HTTP_REQUEST_NODE_SSL_VERIFY
 
diff --git a/api/core/memory/token_buffer_memory.py b/api/core/memory/token_buffer_memory.py
index 5809d6f74a..d840ee213c 100644
--- a/api/core/memory/token_buffer_memory.py
+++ b/api/core/memory/token_buffer_memory.py
@@ -1,5 +1,14 @@
 from collections.abc import Sequence
 
+from sqlalchemy import select
+from sqlalchemy.orm import sessionmaker
+
+from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
+from core.app.file_access import DatabaseFileAccessController
+from core.model_manager import ModelInstance
+from core.prompt.utils.extract_thread_messages import extract_thread_messages
+from extensions.ext_database import db
+from factories import file_factory
 from graphon.file import file_manager
 from graphon.model_runtime.entities import (
     AssistantPromptMessage,
@@ -10,15 +19,6 @@ from graphon.model_runtime.entities import (
     UserPromptMessage,
 )
 from graphon.model_runtime.entities.message_entities import PromptMessageContentUnionTypes
-from sqlalchemy import select
-from sqlalchemy.orm import sessionmaker
-
-from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
-from core.app.file_access import DatabaseFileAccessController
-from core.model_manager import ModelInstance
-from core.prompt.utils.extract_thread_messages import extract_thread_messages
-from extensions.ext_database import db
-from factories import file_factory
 from models.model import AppMode, Conversation, Message, MessageFile
 from models.workflow import Workflow
 from repositories.api_workflow_run_repository import APIWorkflowRunRepository
diff --git a/api/core/model_manager.py b/api/core/model_manager.py
index 36beb55d7f..d8d8dfedd8 100644
--- a/api/core/model_manager.py
+++ b/api/core/model_manager.py
@@ -2,6 +2,15 @@ import logging
 from collections.abc import Callable, Generator, Iterable, Mapping, Sequence
 from typing import IO, Any, Literal, Optional, Union, cast, overload
 
+from configs import dify_config
+from core.entities import PluginCredentialType
+from core.entities.embedding_type import EmbeddingInputType
+from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
+from core.entities.provider_entities import ModelLoadBalancingConfiguration
+from core.errors.error import ProviderTokenNotInitError
+from core.plugin.impl.model_runtime_factory import create_plugin_provider_manager
+from core.provider_manager import ProviderManager
+from extensions.ext_redis import redis_client
 from graphon.model_runtime.callbacks.base_callback import Callback
 from graphon.model_runtime.entities.llm_entities import LLMResult
 from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
@@ -15,16 +24,6 @@ from graphon.model_runtime.model_providers.__base.rerank_model import RerankMode
 from graphon.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel
 from graphon.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 from graphon.model_runtime.model_providers.__base.tts_model import TTSModel
-
-from configs import dify_config
-from core.entities import PluginCredentialType
-from core.entities.embedding_type import EmbeddingInputType
-from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
-from core.entities.provider_entities import ModelLoadBalancingConfiguration
-from core.errors.error import ProviderTokenNotInitError
-from core.plugin.impl.model_runtime_factory import create_plugin_provider_manager
-from core.provider_manager import ProviderManager
-from extensions.ext_redis import redis_client
 from models.provider import ProviderType
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/moderation/openai_moderation/openai_moderation.py b/api/core/moderation/openai_moderation/openai_moderation.py
index 732803b332..6e6e94502c 100644
--- a/api/core/moderation/openai_moderation/openai_moderation.py
+++ b/api/core/moderation/openai_moderation/openai_moderation.py
@@ -1,9 +1,8 @@
 from typing import Any
 
-from graphon.model_runtime.entities.model_entities import ModelType
-
 from core.model_manager import ModelManager
 from core.moderation.base import Moderation, ModerationAction, ModerationInputsResult, ModerationOutputsResult
+from graphon.model_runtime.entities.model_entities import ModelType
 
 
 class OpenAIModeration(Moderation):
diff --git a/api/core/ops/aliyun_trace/aliyun_trace.py b/api/core/ops/aliyun_trace/aliyun_trace.py
index 70aaf2a07b..76e81242f4 100644
--- a/api/core/ops/aliyun_trace/aliyun_trace.py
+++ b/api/core/ops/aliyun_trace/aliyun_trace.py
@@ -1,8 +1,6 @@
 import logging
 from collections.abc import Sequence
 
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from opentelemetry.trace import SpanKind
 from sqlalchemy.orm import sessionmaker
 
@@ -60,6 +58,8 @@ from core.ops.entities.trace_entity import (
 )
 from core.repositories import DifyCoreRepositoryFactory
 from extensions.ext_database import db
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from models import WorkflowNodeExecutionTriggeredFrom
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/ops/aliyun_trace/utils.py b/api/core/ops/aliyun_trace/utils.py
index aa35ac74c2..2e02a186cc 100644
--- a/api/core/ops/aliyun_trace/utils.py
+++ b/api/core/ops/aliyun_trace/utils.py
@@ -2,8 +2,6 @@ import json
 from collections.abc import Mapping
 from typing import Any, TypedDict
 
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import WorkflowNodeExecutionStatus
 from opentelemetry.trace import Link, Status, StatusCode
 
 from core.ops.aliyun_trace.entities.semconv import (
@@ -17,6 +15,8 @@ from core.ops.aliyun_trace.entities.semconv import (
 )
 from core.rag.models.document import Document
 from extensions.ext_database import db
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import WorkflowNodeExecutionStatus
 from models import EndUser
 
 # Constants
diff --git a/api/core/ops/arize_phoenix_trace/arize_phoenix_trace.py b/api/core/ops/arize_phoenix_trace/arize_phoenix_trace.py
index dd5edde630..78516e1a22 100644
--- a/api/core/ops/arize_phoenix_trace/arize_phoenix_trace.py
+++ b/api/core/ops/arize_phoenix_trace/arize_phoenix_trace.py
@@ -6,7 +6,6 @@ from datetime import datetime, timedelta
 from typing import Any, Union, cast
 from urllib.parse import urlparse
 
-from graphon.enums import WorkflowNodeExecutionStatus
 from openinference.semconv.trace import (
     MessageAttributes,
     OpenInferenceMimeTypeValues,
@@ -41,6 +40,7 @@ from core.ops.entities.trace_entity import (
 from core.ops.utils import JSON_DICT_ADAPTER
 from core.repositories import DifyCoreRepositoryFactory
 from extensions.ext_database import db
+from graphon.enums import WorkflowNodeExecutionStatus
 from models.model import EndUser, MessageFile
 from models.workflow import WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/core/ops/langfuse_trace/langfuse_trace.py b/api/core/ops/langfuse_trace/langfuse_trace.py
index d53aa84aed..7eacc2be46 100644
--- a/api/core/ops/langfuse_trace/langfuse_trace.py
+++ b/api/core/ops/langfuse_trace/langfuse_trace.py
@@ -3,7 +3,6 @@ import os
 import uuid
 from datetime import UTC, datetime, timedelta
 
-from graphon.enums import BuiltinNodeTypes
 from langfuse import Langfuse
 from langfuse.api import (
     CreateGenerationBody,
@@ -40,6 +39,7 @@ from core.ops.langfuse_trace.entities.langfuse_trace_entity import (
 from core.ops.utils import filter_none_values
 from core.repositories import DifyCoreRepositoryFactory
 from extensions.ext_database import db
+from graphon.enums import BuiltinNodeTypes
 from models import EndUser, WorkflowNodeExecutionTriggeredFrom
 from models.enums import MessageStatus
 
diff --git a/api/core/ops/langsmith_trace/langsmith_trace.py b/api/core/ops/langsmith_trace/langsmith_trace.py
index 490c64af84..d960038f15 100644
--- a/api/core/ops/langsmith_trace/langsmith_trace.py
+++ b/api/core/ops/langsmith_trace/langsmith_trace.py
@@ -4,7 +4,6 @@ import uuid
 from datetime import datetime, timedelta
 from typing import cast
 
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from langsmith import Client
 from langsmith.schemas import RunBase
 from sqlalchemy.orm import sessionmaker
@@ -30,6 +29,7 @@ from core.ops.langsmith_trace.entities.langsmith_trace_entity import (
 from core.ops.utils import filter_none_values, generate_dotted_order
 from core.repositories import DifyCoreRepositoryFactory
 from extensions.ext_database import db
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from models import EndUser, MessageFile, WorkflowNodeExecutionTriggeredFrom
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/ops/mlflow_trace/mlflow_trace.py b/api/core/ops/mlflow_trace/mlflow_trace.py
index c070a937be..87fcaeabcc 100644
--- a/api/core/ops/mlflow_trace/mlflow_trace.py
+++ b/api/core/ops/mlflow_trace/mlflow_trace.py
@@ -4,7 +4,6 @@ from datetime import datetime, timedelta
 from typing import Any, cast
 
 import mlflow
-from graphon.enums import BuiltinNodeTypes
 from mlflow.entities import Document, Span, SpanEvent, SpanStatusCode, SpanType
 from mlflow.tracing.constant import SpanAttributeKey, TokenUsageKey, TraceMetadataKey
 from mlflow.tracing.fluent import start_span_no_context, update_current_trace
@@ -26,6 +25,7 @@ from core.ops.entities.trace_entity import (
 )
 from core.ops.utils import JSON_DICT_ADAPTER
 from extensions.ext_database import db
+from graphon.enums import BuiltinNodeTypes
 from models import EndUser
 from models.workflow import WorkflowNodeExecutionModel
 
diff --git a/api/core/ops/opik_trace/opik_trace.py b/api/core/ops/opik_trace/opik_trace.py
index e0c7b9bfe5..672efe45bd 100644
--- a/api/core/ops/opik_trace/opik_trace.py
+++ b/api/core/ops/opik_trace/opik_trace.py
@@ -5,7 +5,6 @@ import uuid
 from datetime import datetime, timedelta
 from typing import Any, cast
 
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from opik import Opik, Trace
 from opik.id_helpers import uuid4_to_uuid7
 from sqlalchemy.orm import sessionmaker
@@ -25,6 +24,7 @@ from core.ops.entities.trace_entity import (
 )
 from core.repositories import DifyCoreRepositoryFactory
 from extensions.ext_database import db
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from models import EndUser, MessageFile, WorkflowNodeExecutionTriggeredFrom
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/ops/tencent_trace/span_builder.py b/api/core/ops/tencent_trace/span_builder.py
index f79095d966..36878dc58f 100644
--- a/api/core/ops/tencent_trace/span_builder.py
+++ b/api/core/ops/tencent_trace/span_builder.py
@@ -6,8 +6,6 @@ import json
 import logging
 from datetime import datetime
 
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from opentelemetry.trace import Status, StatusCode
 
 from core.ops.entities.trace_entity import (
@@ -43,6 +41,8 @@ from core.ops.tencent_trace.entities.semconv import (
 from core.ops.tencent_trace.entities.tencent_trace_entity import SpanData
 from core.ops.tencent_trace.utils import TencentTraceUtils
 from core.rag.models.document import Document
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/ops/tencent_trace/tencent_trace.py b/api/core/ops/tencent_trace/tencent_trace.py
index 84f54d8a5a..d681b9da80 100644
--- a/api/core/ops/tencent_trace/tencent_trace.py
+++ b/api/core/ops/tencent_trace/tencent_trace.py
@@ -4,10 +4,6 @@ Tencent APM tracing implementation with separated concerns
 
 import logging
 
-from graphon.entities.workflow_node_execution import (
-    WorkflowNodeExecution,
-)
-from graphon.nodes import BuiltinNodeTypes
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -29,6 +25,10 @@ from core.ops.tencent_trace.span_builder import TencentSpanBuilder
 from core.ops.tencent_trace.utils import TencentTraceUtils
 from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
 from extensions.ext_database import db
+from graphon.entities.workflow_node_execution import (
+    WorkflowNodeExecution,
+)
+from graphon.nodes import BuiltinNodeTypes
 from models import Account, App, TenantAccountJoin, WorkflowNodeExecutionTriggeredFrom
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/ops/weave_trace/weave_trace.py b/api/core/ops/weave_trace/weave_trace.py
index 8d9ba4694d..f79544f1c7 100644
--- a/api/core/ops/weave_trace/weave_trace.py
+++ b/api/core/ops/weave_trace/weave_trace.py
@@ -6,7 +6,6 @@ from typing import Any, cast
 
 import wandb
 import weave
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from sqlalchemy.orm import sessionmaker
 from weave.trace_server.trace_server_interface import (
     CallEndReq,
@@ -33,6 +32,7 @@ from core.ops.entities.trace_entity import (
 from core.ops.weave_trace.entities.weave_trace_entity import WeaveTraceModel
 from core.repositories import DifyCoreRepositoryFactory
 from extensions.ext_database import db
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from models import EndUser, MessageFile, WorkflowNodeExecutionTriggeredFrom
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/plugin/backwards_invocation/model.py b/api/core/plugin/backwards_invocation/model.py
index a4b24ff849..c92438960a 100644
--- a/api/core/plugin/backwards_invocation/model.py
+++ b/api/core/plugin/backwards_invocation/model.py
@@ -3,20 +3,6 @@ from binascii import hexlify, unhexlify
 from collections.abc import Generator
 from typing import Any
 
-from graphon.model_runtime.entities.llm_entities import (
-    LLMResult,
-    LLMResultChunk,
-    LLMResultChunkDelta,
-    LLMResultChunkWithStructuredOutput,
-    LLMResultWithStructuredOutput,
-)
-from graphon.model_runtime.entities.message_entities import (
-    PromptMessage,
-    SystemPromptMessage,
-    UserPromptMessage,
-)
-from graphon.model_runtime.entities.model_entities import ModelType
-
 from core.app.llm import deduct_llm_quota
 from core.llm_generator.output_parser.structured_output import invoke_llm_with_structured_output
 from core.model_manager import ModelManager
@@ -33,6 +19,19 @@ from core.plugin.entities.request import (
 )
 from core.tools.entities.tool_entities import ToolProviderType
 from core.tools.utils.model_invocation_utils import ModelInvocationUtils
+from graphon.model_runtime.entities.llm_entities import (
+    LLMResult,
+    LLMResultChunk,
+    LLMResultChunkDelta,
+    LLMResultChunkWithStructuredOutput,
+    LLMResultWithStructuredOutput,
+)
+from graphon.model_runtime.entities.message_entities import (
+    PromptMessage,
+    SystemPromptMessage,
+    UserPromptMessage,
+)
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.account import Tenant
 
 
diff --git a/api/core/plugin/backwards_invocation/node.py b/api/core/plugin/backwards_invocation/node.py
index 9478997494..9550e49992 100644
--- a/api/core/plugin/backwards_invocation/node.py
+++ b/api/core/plugin/backwards_invocation/node.py
@@ -1,3 +1,4 @@
+from core.plugin.backwards_invocation.base import BaseBackwardsInvocation
 from graphon.enums import BuiltinNodeTypes
 from graphon.nodes.llm.entities import ModelConfig as LLMModelConfig
 from graphon.nodes.parameter_extractor.entities import (
@@ -8,8 +9,6 @@ from graphon.nodes.question_classifier.entities import (
     ClassConfig,
     QuestionClassifierNodeData,
 )
-
-from core.plugin.backwards_invocation.base import BaseBackwardsInvocation
 from services.workflow_service import WorkflowService
 
 
diff --git a/api/core/plugin/entities/marketplace.py b/api/core/plugin/entities/marketplace.py
index fd2094228a..03398873e3 100644
--- a/api/core/plugin/entities/marketplace.py
+++ b/api/core/plugin/entities/marketplace.py
@@ -1,12 +1,12 @@
 from typing import Any
 
-from graphon.model_runtime.entities.provider_entities import ProviderEntity
 from pydantic import BaseModel, Field, computed_field, model_validator
 
 from core.plugin.entities.endpoint import EndpointProviderDeclaration
 from core.plugin.entities.plugin import PluginResourceRequirements
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolProviderEntity
+from graphon.model_runtime.entities.provider_entities import ProviderEntity
 
 
 class MarketplacePluginDeclaration(BaseModel):
diff --git a/api/core/plugin/entities/plugin.py b/api/core/plugin/entities/plugin.py
index 4d28032a57..89e0e8881c 100644
--- a/api/core/plugin/entities/plugin.py
+++ b/api/core/plugin/entities/plugin.py
@@ -3,7 +3,6 @@ from collections.abc import Mapping
 from enum import StrEnum, auto
 from typing import Any
 
-from graphon.model_runtime.entities.provider_entities import ProviderEntity
 from packaging.version import InvalidVersion, Version
 from pydantic import BaseModel, Field, field_validator, model_validator
 
@@ -14,6 +13,7 @@ from core.plugin.entities.endpoint import EndpointProviderDeclaration
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolProviderEntity
 from core.trigger.entities.entities import TriggerProviderEntity
+from graphon.model_runtime.entities.provider_entities import ProviderEntity
 
 
 class PluginInstallationSource(StrEnum):
diff --git a/api/core/plugin/entities/plugin_daemon.py b/api/core/plugin/entities/plugin_daemon.py
index e0ddb746c7..257638ad77 100644
--- a/api/core/plugin/entities/plugin_daemon.py
+++ b/api/core/plugin/entities/plugin_daemon.py
@@ -6,8 +6,6 @@ from datetime import datetime
 from enum import StrEnum
 from typing import Any
 
-from graphon.model_runtime.entities.model_entities import AIModelEntity
-from graphon.model_runtime.entities.provider_entities import ProviderEntity
 from pydantic import BaseModel, ConfigDict, Field
 
 from core.agent.plugin_entities import AgentProviderEntityWithPlugin
@@ -18,6 +16,8 @@ from core.plugin.entities.plugin import PluginDeclaration, PluginEntity
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolProviderEntityWithPlugin
 from core.trigger.entities.entities import TriggerProviderEntity
+from graphon.model_runtime.entities.model_entities import AIModelEntity
+from graphon.model_runtime.entities.provider_entities import ProviderEntity
 
 
 class PluginDaemonBasicResponse[T: BaseModel | dict | list | bool | str](BaseModel):
diff --git a/api/core/plugin/entities/request.py b/api/core/plugin/entities/request.py
index 4a85952dcd..1474883204 100644
--- a/api/core/plugin/entities/request.py
+++ b/api/core/plugin/entities/request.py
@@ -4,6 +4,10 @@ from collections.abc import Mapping
 from typing import Any, Literal
 
 from flask import Response
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+
+from core.entities.provider_entities import BasicProviderConfig
+from core.plugin.utils.http_parser import deserialize_response
 from graphon.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     PromptMessage,
@@ -21,10 +25,6 @@ from graphon.nodes.parameter_extractor.entities import (
 from graphon.nodes.question_classifier.entities import (
     ClassConfig,
 )
-from pydantic import BaseModel, ConfigDict, Field, field_validator
-
-from core.entities.provider_entities import BasicProviderConfig
-from core.plugin.utils.http_parser import deserialize_response
 
 
 class InvokeCredentials(BaseModel):
diff --git a/api/core/plugin/impl/base.py b/api/core/plugin/impl/base.py
index 7f36560b49..9ee8469892 100644
--- a/api/core/plugin/impl/base.py
+++ b/api/core/plugin/impl/base.py
@@ -5,14 +5,6 @@ from collections.abc import Callable, Generator
 from typing import Any, cast
 
 import httpx
-from graphon.model_runtime.errors.invoke import (
-    InvokeAuthorizationError,
-    InvokeBadRequestError,
-    InvokeConnectionError,
-    InvokeRateLimitError,
-    InvokeServerUnavailableError,
-)
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 from pydantic import BaseModel
 from yarl import URL
 
@@ -37,6 +29,14 @@ from core.trigger.errors import (
     TriggerPluginInvokeError,
     TriggerProviderCredentialValidationError,
 )
+from graphon.model_runtime.errors.invoke import (
+    InvokeAuthorizationError,
+    InvokeBadRequestError,
+    InvokeConnectionError,
+    InvokeRateLimitError,
+    InvokeServerUnavailableError,
+)
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 
 plugin_daemon_inner_api_baseurl = URL(str(dify_config.PLUGIN_DAEMON_URL))
 _plugin_daemon_timeout_config = cast(
diff --git a/api/core/plugin/impl/model.py b/api/core/plugin/impl/model.py
index 703af63f7c..47608bdfa6 100644
--- a/api/core/plugin/impl/model.py
+++ b/api/core/plugin/impl/model.py
@@ -2,13 +2,6 @@ import binascii
 from collections.abc import Generator, Sequence
 from typing import IO, Any
 
-from graphon.model_runtime.entities.llm_entities import LLMResultChunk
-from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
-from graphon.model_runtime.entities.model_entities import AIModelEntity
-from graphon.model_runtime.entities.rerank_entities import MultimodalRerankInput, RerankResult
-from graphon.model_runtime.entities.text_embedding_entities import EmbeddingResult
-from graphon.model_runtime.utils.encoders import jsonable_encoder
-
 from core.plugin.entities.plugin_daemon import (
     PluginBasicBooleanResponse,
     PluginDaemonInnerError,
@@ -20,6 +13,12 @@ from core.plugin.entities.plugin_daemon import (
     PluginVoicesResponse,
 )
 from core.plugin.impl.base import BasePluginClient
+from graphon.model_runtime.entities.llm_entities import LLMResultChunk
+from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
+from graphon.model_runtime.entities.model_entities import AIModelEntity
+from graphon.model_runtime.entities.rerank_entities import MultimodalRerankInput, RerankResult
+from graphon.model_runtime.entities.text_embedding_entities import EmbeddingResult
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 
 
 class PluginModelClient(BasePluginClient):
diff --git a/api/core/plugin/impl/model_runtime.py b/api/core/plugin/impl/model_runtime.py
index 22c846b6de..e3fba4ef3a 100644
--- a/api/core/plugin/impl/model_runtime.py
+++ b/api/core/plugin/impl/model_runtime.py
@@ -6,13 +6,6 @@ from collections.abc import Generator, Iterable, Sequence
 from threading import Lock
 from typing import IO, Any, Union
 
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
-from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
-from graphon.model_runtime.entities.model_entities import AIModelEntity, ModelType
-from graphon.model_runtime.entities.provider_entities import ProviderEntity
-from graphon.model_runtime.entities.rerank_entities import MultimodalRerankInput, RerankResult
-from graphon.model_runtime.entities.text_embedding_entities import EmbeddingInputType, EmbeddingResult
-from graphon.model_runtime.runtime import ModelRuntime
 from pydantic import ValidationError
 from redis import RedisError
 
@@ -21,6 +14,13 @@ from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
 from core.plugin.impl.asset import PluginAssetManager
 from core.plugin.impl.model import PluginModelClient
 from extensions.ext_redis import redis_client
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
+from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
+from graphon.model_runtime.entities.model_entities import AIModelEntity, ModelType
+from graphon.model_runtime.entities.provider_entities import ProviderEntity
+from graphon.model_runtime.entities.rerank_entities import MultimodalRerankInput, RerankResult
+from graphon.model_runtime.entities.text_embedding_entities import EmbeddingInputType, EmbeddingResult
+from graphon.model_runtime.runtime import ModelRuntime
 from models.provider_ids import ModelProviderID
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/plugin/impl/model_runtime_factory.py b/api/core/plugin/impl/model_runtime_factory.py
index 4b29a6fc56..35abd2ae8c 100644
--- a/api/core/plugin/impl/model_runtime_factory.py
+++ b/api/core/plugin/impl/model_runtime_factory.py
@@ -2,9 +2,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
-
 from core.plugin.impl.model import PluginModelClient
+from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 
 if TYPE_CHECKING:
     from core.model_manager import ModelManager
diff --git a/api/core/plugin/utils/converter.py b/api/core/plugin/utils/converter.py
index 90350f8400..12d8e282b2 100644
--- a/api/core/plugin/utils/converter.py
+++ b/api/core/plugin/utils/converter.py
@@ -1,8 +1,7 @@
 from typing import Any
 
-from graphon.file import File
-
 from core.tools.entities.tool_entities import ToolSelector
+from graphon.file import File
 
 
 def convert_parameters_to_plugin_format(parameters: dict[str, Any]) -> dict[str, Any]:
diff --git a/api/core/prompt/advanced_prompt_transform.py b/api/core/prompt/advanced_prompt_transform.py
index 19b5e9223a..24e05ef865 100644
--- a/api/core/prompt/advanced_prompt_transform.py
+++ b/api/core/prompt/advanced_prompt_transform.py
@@ -1,6 +1,13 @@
 from collections.abc import Mapping, Sequence
 from typing import cast
 
+from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
+from core.helper.code_executor.jinja2.jinja2_formatter import Jinja2Formatter
+from core.memory.token_buffer_memory import TokenBufferMemory
+from core.model_manager import ModelInstance
+from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
+from core.prompt.prompt_transform import PromptTransform
+from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from graphon.file import File, file_manager
 from graphon.model_runtime.entities import (
     AssistantPromptMessage,
@@ -13,14 +20,6 @@ from graphon.model_runtime.entities import (
 from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
 from graphon.runtime import VariablePool
 
-from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
-from core.helper.code_executor.jinja2.jinja2_formatter import Jinja2Formatter
-from core.memory.token_buffer_memory import TokenBufferMemory
-from core.model_manager import ModelInstance
-from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
-from core.prompt.prompt_transform import PromptTransform
-from core.prompt.utils.prompt_template_parser import PromptTemplateParser
-
 
 class AdvancedPromptTransform(PromptTransform):
     """
diff --git a/api/core/prompt/agent_history_prompt_transform.py b/api/core/prompt/agent_history_prompt_transform.py
index 9be70199b7..8f1d51f08a 100644
--- a/api/core/prompt/agent_history_prompt_transform.py
+++ b/api/core/prompt/agent_history_prompt_transform.py
@@ -1,17 +1,16 @@
 from typing import cast
 
-from graphon.model_runtime.entities.message_entities import (
-    PromptMessage,
-    SystemPromptMessage,
-    UserPromptMessage,
-)
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-
 from core.app.entities.app_invoke_entities import (
     ModelConfigWithCredentialsEntity,
 )
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.prompt.prompt_transform import PromptTransform
+from graphon.model_runtime.entities.message_entities import (
+    PromptMessage,
+    SystemPromptMessage,
+    UserPromptMessage,
+)
+from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 
 
 class AgentHistoryPromptTransform(PromptTransform):
diff --git a/api/core/prompt/prompt_transform.py b/api/core/prompt/prompt_transform.py
index 4539ae9f11..6ff2f44cdc 100644
--- a/api/core/prompt/prompt_transform.py
+++ b/api/core/prompt/prompt_transform.py
@@ -1,12 +1,11 @@
 from typing import Any
 
-from graphon.model_runtime.entities.message_entities import PromptMessage
-from graphon.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey
-
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
+from graphon.model_runtime.entities.message_entities import PromptMessage
+from graphon.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey
 
 
 class PromptTransform:
diff --git a/api/core/prompt/simple_prompt_transform.py b/api/core/prompt/simple_prompt_transform.py
index dc8391a6a5..1665bdeb52 100644
--- a/api/core/prompt/simple_prompt_transform.py
+++ b/api/core/prompt/simple_prompt_transform.py
@@ -4,6 +4,12 @@ from collections.abc import Mapping, Sequence
 from enum import StrEnum, auto
 from typing import TYPE_CHECKING, Any, TypedDict, cast
 
+from core.app.app_config.entities import PromptTemplateEntity
+from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
+from core.memory.token_buffer_memory import TokenBufferMemory
+from core.prompt.entities.advanced_prompt_entities import MemoryConfig
+from core.prompt.prompt_transform import PromptTransform
+from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from graphon.file import file_manager
 from graphon.model_runtime.entities.message_entities import (
     ImagePromptMessageContent,
@@ -13,13 +19,6 @@ from graphon.model_runtime.entities.message_entities import (
     TextPromptMessageContent,
     UserPromptMessage,
 )
-
-from core.app.app_config.entities import PromptTemplateEntity
-from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
-from core.memory.token_buffer_memory import TokenBufferMemory
-from core.prompt.entities.advanced_prompt_entities import MemoryConfig
-from core.prompt.prompt_transform import PromptTransform
-from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from models.model import AppMode
 
 if TYPE_CHECKING:
diff --git a/api/core/prompt/utils/prompt_message_util.py b/api/core/prompt/utils/prompt_message_util.py
index dbda749925..ba76eb0c4e 100644
--- a/api/core/prompt/utils/prompt_message_util.py
+++ b/api/core/prompt/utils/prompt_message_util.py
@@ -1,6 +1,7 @@
 from collections.abc import Sequence
 from typing import Any, cast
 
+from core.prompt.simple_prompt_transform import ModelMode
 from graphon.model_runtime.entities import (
     AssistantPromptMessage,
     AudioPromptMessageContent,
@@ -11,8 +12,6 @@ from graphon.model_runtime.entities import (
     TextPromptMessageContent,
 )
 
-from core.prompt.simple_prompt_transform import ModelMode
-
 
 class PromptMessageUtil:
     @staticmethod
diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py
index 39ef31632e..c3bbe8fc09 100644
--- a/api/core/provider_manager.py
+++ b/api/core/provider_manager.py
@@ -6,14 +6,6 @@ from collections.abc import Sequence
 from json import JSONDecodeError
 from typing import TYPE_CHECKING, Any
 
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.entities.provider_entities import (
-    ConfigurateMethod,
-    CredentialFormSchema,
-    FormType,
-    ProviderEntity,
-)
-from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from pydantic import TypeAdapter
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
@@ -41,6 +33,14 @@ from core.helper.position_helper import is_filtered
 from extensions import ext_hosting_provider
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.entities.provider_entities import (
+    ConfigurateMethod,
+    CredentialFormSchema,
+    FormType,
+    ProviderEntity,
+)
+from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from models.provider import (
     LoadBalancingModelConfig,
     Provider,
diff --git a/api/core/rag/data_post_processor/data_post_processor.py b/api/core/rag/data_post_processor/data_post_processor.py
index 9ce91f52ff..ca530748ed 100644
--- a/api/core/rag/data_post_processor/data_post_processor.py
+++ b/api/core/rag/data_post_processor/data_post_processor.py
@@ -1,8 +1,5 @@
 from typing import TypedDict
 
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
-
 from core.model_manager import ModelInstance, ModelManager
 from core.rag.data_post_processor.reorder import ReorderRunner
 from core.rag.index_processor.constant.query_type import QueryType
@@ -11,6 +8,8 @@ from core.rag.rerank.entity.weight import KeywordSetting, VectorSetting, Weights
 from core.rag.rerank.rerank_base import BaseRerankRunner
 from core.rag.rerank.rerank_factory import RerankRunnerFactory
 from core.rag.rerank.rerank_type import RerankMode
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 
 
 class RerankingModelDict(TypedDict):
diff --git a/api/core/rag/datasource/retrieval_service.py b/api/core/rag/datasource/retrieval_service.py
index fa242a730e..7e71d67ec0 100644
--- a/api/core/rag/datasource/retrieval_service.py
+++ b/api/core/rag/datasource/retrieval_service.py
@@ -4,7 +4,6 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import Any, NotRequired, TypedDict
 
 from flask import Flask, current_app
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy import select
 from sqlalchemy.orm import Session, load_only
 
@@ -24,6 +23,7 @@ from core.rag.rerank.rerank_type import RerankMode
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.tools.signature import sign_upload_file
 from extensions.ext_database import db
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.dataset import (
     ChildChunk,
     Dataset,
diff --git a/api/core/rag/datasource/vdb/vector_factory.py b/api/core/rag/datasource/vdb/vector_factory.py
index dddd5fc994..59d7f3c3c4 100644
--- a/api/core/rag/datasource/vdb/vector_factory.py
+++ b/api/core/rag/datasource/vdb/vector_factory.py
@@ -4,7 +4,6 @@ import time
 from abc import ABC, abstractmethod
 from typing import Any
 
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy import select
 
 from configs import dify_config
@@ -19,6 +18,7 @@ from core.rag.models.document import Document
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from extensions.ext_storage import storage
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.dataset import Dataset, Whitelist
 from models.model import UploadFile
 
diff --git a/api/core/rag/docstore/dataset_docstore.py b/api/core/rag/docstore/dataset_docstore.py
index 8e9ebdd17a..f4699f6869 100644
--- a/api/core/rag/docstore/dataset_docstore.py
+++ b/api/core/rag/docstore/dataset_docstore.py
@@ -3,13 +3,13 @@ from __future__ import annotations
 from collections.abc import Sequence
 from typing import Any
 
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy import delete, func, select
 
 from core.model_manager import ModelManager
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from core.rag.models.document import AttachmentDocument, Document
 from extensions.ext_database import db
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.dataset import ChildChunk, Dataset, DocumentSegment, SegmentAttachmentBinding
 
 
diff --git a/api/core/rag/embedding/cached_embedding.py b/api/core/rag/embedding/cached_embedding.py
index 9f1c73ec88..4926f44f16 100644
--- a/api/core/rag/embedding/cached_embedding.py
+++ b/api/core/rag/embedding/cached_embedding.py
@@ -4,8 +4,6 @@ import pickle
 from typing import Any, cast
 
 import numpy as np
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
-from graphon.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
 
@@ -15,6 +13,8 @@ from core.model_manager import ModelInstance
 from core.rag.embedding.embedding_base import Embeddings
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
+from graphon.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 from libs import helper
 from models.dataset import Embedding
 
diff --git a/api/core/rag/index_processor/processor/paragraph_index_processor.py b/api/core/rag/index_processor/processor/paragraph_index_processor.py
index a487c49053..f8242efe31 100644
--- a/api/core/rag/index_processor/processor/paragraph_index_processor.py
+++ b/api/core/rag/index_processor/processor/paragraph_index_processor.py
@@ -7,16 +7,6 @@ from typing import Any, TypedDict, cast
 
 logger = logging.getLogger(__name__)
 
-from graphon.file import File, FileTransferMethod, FileType, file_manager
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from graphon.model_runtime.entities.message_entities import (
-    ImagePromptMessageContent,
-    PromptMessage,
-    PromptMessageContentUnionTypes,
-    TextPromptMessageContent,
-    UserPromptMessage,
-)
-from graphon.model_runtime.entities.model_entities import ModelFeature, ModelType
 from sqlalchemy import select
 
 from core.app.file_access import DatabaseFileAccessController
@@ -43,6 +33,16 @@ from core.tools.utils.text_processing_utils import remove_leading_symbols
 from core.workflow.file_reference import build_file_reference
 from extensions.ext_database import db
 from factories.file_factory import build_from_mapping
+from graphon.file import File, FileTransferMethod, FileType, file_manager
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from graphon.model_runtime.entities.message_entities import (
+    ImagePromptMessageContent,
+    PromptMessage,
+    PromptMessageContentUnionTypes,
+    TextPromptMessageContent,
+    UserPromptMessage,
+)
+from graphon.model_runtime.entities.model_entities import ModelFeature, ModelType
 from libs import helper
 from models import UploadFile
 from models.account import Account
diff --git a/api/core/rag/models/document.py b/api/core/rag/models/document.py
index 087736d0b0..4ebf095904 100644
--- a/api/core/rag/models/document.py
+++ b/api/core/rag/models/document.py
@@ -2,9 +2,10 @@ from abc import ABC, abstractmethod
 from collections.abc import Sequence
 from typing import Any
 
-from graphon.file import File
 from pydantic import BaseModel, Field
 
+from graphon.file import File
+
 
 class ChildDocument(BaseModel):
     """Class for storing a piece of text and associated metadata."""
diff --git a/api/core/rag/rerank/rerank_model.py b/api/core/rag/rerank/rerank_model.py
index a8d37845a5..bce08f998f 100644
--- a/api/core/rag/rerank/rerank_model.py
+++ b/api/core/rag/rerank/rerank_model.py
@@ -1,8 +1,5 @@
 import base64
 
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.entities.rerank_entities import MultimodalRerankInput, RerankResult
-
 from core.model_manager import ModelInstance, ModelManager
 from core.rag.index_processor.constant.doc_type import DocType
 from core.rag.index_processor.constant.query_type import QueryType
@@ -10,6 +7,8 @@ from core.rag.models.document import Document
 from core.rag.rerank.rerank_base import BaseRerankRunner
 from extensions.ext_database import db
 from extensions.ext_storage import storage
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.entities.rerank_entities import MultimodalRerankInput, RerankResult
 from models.model import UploadFile
 
 
diff --git a/api/core/rag/rerank/weight_rerank.py b/api/core/rag/rerank/weight_rerank.py
index 49123e13d0..d0732b269a 100644
--- a/api/core/rag/rerank/weight_rerank.py
+++ b/api/core/rag/rerank/weight_rerank.py
@@ -2,7 +2,6 @@ import math
 from collections import Counter
 
 import numpy as np
-from graphon.model_runtime.entities.model_entities import ModelType
 
 from core.model_manager import ModelManager
 from core.rag.datasource.keyword.jieba.jieba_keyword_table_handler import JiebaKeywordTableHandler
@@ -12,6 +11,7 @@ from core.rag.index_processor.constant.query_type import QueryType
 from core.rag.models.document import Document
 from core.rag.rerank.entity.weight import VectorSetting, Weights
 from core.rag.rerank.rerank_base import BaseRerankRunner
+from graphon.model_runtime.entities.model_entities import ModelType
 
 
 class WeightRerankRunner(BaseRerankRunner):
diff --git a/api/core/rag/retrieval/dataset_retrieval.py b/api/core/rag/retrieval/dataset_retrieval.py
index 8ebc840b99..1453fe020b 100644
--- a/api/core/rag/retrieval/dataset_retrieval.py
+++ b/api/core/rag/retrieval/dataset_retrieval.py
@@ -9,11 +9,6 @@ from collections.abc import Generator, Mapping
 from typing import Any, Union, cast
 
 from flask import Flask, current_app
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMUsage
-from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, PromptMessageTool
-from graphon.model_runtime.entities.model_entities import ModelFeature, ModelType
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from sqlalchemy import and_, func, literal, or_, select, update
 from sqlalchemy.orm import sessionmaker
 
@@ -69,6 +64,11 @@ from core.workflow.nodes.knowledge_retrieval.retrieval import (
 )
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMUsage
+from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, PromptMessageTool
+from graphon.model_runtime.entities.model_entities import ModelFeature, ModelType
+from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from libs.helper import parse_uuid_str_or_none
 from libs.json_in_md_parser import parse_and_check_json_markdown
 from models import UploadFile
diff --git a/api/core/rag/retrieval/router/multi_dataset_function_call_router.py b/api/core/rag/retrieval/router/multi_dataset_function_call_router.py
index dce7b6226c..e617a9660e 100644
--- a/api/core/rag/retrieval/router/multi_dataset_function_call_router.py
+++ b/api/core/rag/retrieval/router/multi_dataset_function_call_router.py
@@ -1,10 +1,9 @@
 from typing import Union
 
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from graphon.model_runtime.entities.message_entities import PromptMessageTool, SystemPromptMessage, UserPromptMessage
-
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.model_manager import ModelInstance
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from graphon.model_runtime.entities.message_entities import PromptMessageTool, SystemPromptMessage, UserPromptMessage
 
 
 class FunctionCallMultiDatasetRouter:
diff --git a/api/core/rag/retrieval/router/multi_dataset_react_route.py b/api/core/rag/retrieval/router/multi_dataset_react_route.py
index 9b223075d8..21a9d04f7f 100644
--- a/api/core/rag/retrieval/router/multi_dataset_react_route.py
+++ b/api/core/rag/retrieval/router/multi_dataset_react_route.py
@@ -1,10 +1,6 @@
 from collections.abc import Generator, Sequence
 from typing import Any, Union
 
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, PromptMessageTool
-from graphon.model_runtime.entities.model_entities import ModelType
-
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.app.llm import deduct_llm_quota
 from core.model_manager import ModelInstance, ModelManager
@@ -12,6 +8,9 @@ from core.prompt.advanced_prompt_transform import AdvancedPromptTransform
 from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate
 from core.rag.retrieval.output_parser.react_output import ReactAction
 from core.rag.retrieval.output_parser.structured_chat import StructuredChatOutputParser
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, PromptMessageTool
+from graphon.model_runtime.entities.model_entities import ModelType
 
 PREFIX = """Respond to the human as helpfully and accurately as possible. You have access to the following tools:"""
 
diff --git a/api/core/rag/splitter/fixed_text_splitter.py b/api/core/rag/splitter/fixed_text_splitter.py
index 3383c7f3bd..2581c354dd 100644
--- a/api/core/rag/splitter/fixed_text_splitter.py
+++ b/api/core/rag/splitter/fixed_text_splitter.py
@@ -7,10 +7,9 @@ import re
 from collections.abc import Collection
 from typing import Any, Literal
 
-from graphon.model_runtime.model_providers.__base.tokenizers.gpt2_tokenizer import GPT2Tokenizer
-
 from core.model_manager import ModelInstance
 from core.rag.splitter.text_splitter import RecursiveCharacterTextSplitter
+from graphon.model_runtime.model_providers.__base.tokenizers.gpt2_tokenizer import GPT2Tokenizer
 
 
 class EnhanceRecursiveCharacterTextSplitter(RecursiveCharacterTextSplitter):
diff --git a/api/core/repositories/celery_workflow_execution_repository.py b/api/core/repositories/celery_workflow_execution_repository.py
index b07c63fdf0..e87d1cd6b2 100644
--- a/api/core/repositories/celery_workflow_execution_repository.py
+++ b/api/core/repositories/celery_workflow_execution_repository.py
@@ -7,11 +7,11 @@ providing improved performance by offloading database operations to background w
 
 import logging
 
-from graphon.entities import WorkflowExecution
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
 from core.repositories.factory import WorkflowExecutionRepository
+from graphon.entities import WorkflowExecution
 from libs.helper import extract_tenant_id
 from models import Account, CreatorUserRole, EndUser
 from models.enums import WorkflowRunTriggeredFrom
diff --git a/api/core/repositories/celery_workflow_node_execution_repository.py b/api/core/repositories/celery_workflow_node_execution_repository.py
index cdb3af01a8..2451563317 100644
--- a/api/core/repositories/celery_workflow_node_execution_repository.py
+++ b/api/core/repositories/celery_workflow_node_execution_repository.py
@@ -8,7 +8,6 @@ providing improved performance by offloading database operations to background w
 import logging
 from collections.abc import Sequence
 
-from graphon.entities import WorkflowNodeExecution
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
@@ -16,6 +15,7 @@ from core.repositories.factory import (
     OrderConfig,
     WorkflowNodeExecutionRepository,
 )
+from graphon.entities import WorkflowNodeExecution
 from libs.helper import extract_tenant_id
 from models import Account, CreatorUserRole, EndUser
 from models.workflow import WorkflowNodeExecutionTriggeredFrom
diff --git a/api/core/repositories/factory.py b/api/core/repositories/factory.py
index ce3ad15759..4e83e70799 100644
--- a/api/core/repositories/factory.py
+++ b/api/core/repositories/factory.py
@@ -9,11 +9,11 @@ from collections.abc import Sequence
 from dataclasses import dataclass
 from typing import Literal, Protocol
 
-from graphon.entities import WorkflowExecution, WorkflowNodeExecution
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
 from configs import dify_config
+from graphon.entities import WorkflowExecution, WorkflowNodeExecution
 from libs.module_loading import import_string
 from models import Account, EndUser
 from models.enums import WorkflowRunTriggeredFrom
diff --git a/api/core/repositories/human_input_repository.py b/api/core/repositories/human_input_repository.py
index 72d9394149..02625e242f 100644
--- a/api/core/repositories/human_input_repository.py
+++ b/api/core/repositories/human_input_repository.py
@@ -4,8 +4,6 @@ from collections.abc import Mapping, Sequence
 from datetime import datetime
 from typing import Any, Protocol
 
-from graphon.nodes.human_input.entities import FormDefinition, HumanInputNodeData
-from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from sqlalchemy import select
 from sqlalchemy.orm import Session, selectinload
 
@@ -19,6 +17,8 @@ from core.workflow.human_input_compat import (
     InteractiveSurfaceDeliveryMethod,
     is_human_input_webapp_enabled,
 )
+from graphon.nodes.human_input.entities import FormDefinition, HumanInputNodeData
+from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
 from libs.uuid_utils import uuidv7
 from models.account import Account, TenantAccountJoin
diff --git a/api/core/repositories/sqlalchemy_workflow_execution_repository.py b/api/core/repositories/sqlalchemy_workflow_execution_repository.py
index d74cc8f231..6be3902317 100644
--- a/api/core/repositories/sqlalchemy_workflow_execution_repository.py
+++ b/api/core/repositories/sqlalchemy_workflow_execution_repository.py
@@ -5,13 +5,13 @@ SQLAlchemy implementation of the WorkflowExecutionRepository.
 import json
 import logging
 
-from graphon.entities import WorkflowExecution
-from graphon.enums import WorkflowExecutionStatus, WorkflowType
-from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
 from core.repositories.factory import WorkflowExecutionRepository
+from graphon.entities import WorkflowExecution
+from graphon.enums import WorkflowExecutionStatus, WorkflowType
+from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from libs.helper import extract_tenant_id
 from models import (
     Account,
diff --git a/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py b/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
index 13e885672a..b036687bc9 100644
--- a/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
+++ b/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
@@ -10,10 +10,6 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import Any
 
 import psycopg2.errors
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from graphon.model_runtime.utils.encoders import jsonable_encoder
-from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from sqlalchemy import UnaryExpression, asc, desc, select
 from sqlalchemy.engine import Engine
 from sqlalchemy.exc import IntegrityError
@@ -23,6 +19,10 @@ from tenacity import before_sleep_log, retry, retry_if_exception, stop_after_att
 from configs import dify_config
 from core.repositories.factory import OrderConfig, WorkflowNodeExecutionRepository
 from extensions.ext_storage import storage
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from graphon.model_runtime.utils.encoders import jsonable_encoder
+from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from libs.helper import extract_tenant_id
 from libs.uuid_utils import uuidv7
 from models import (
diff --git a/api/core/tools/builtin_tool/providers/audio/tools/asr.py b/api/core/tools/builtin_tool/providers/audio/tools/asr.py
index e539074303..95660ab93b 100644
--- a/api/core/tools/builtin_tool/providers/audio/tools/asr.py
+++ b/api/core/tools/builtin_tool/providers/audio/tools/asr.py
@@ -2,15 +2,14 @@ import io
 from collections.abc import Generator
 from typing import Any
 
-from graphon.file import FileType
-from graphon.file.file_manager import download
-from graphon.model_runtime.entities.model_entities import ModelType
-
 from core.model_manager import ModelManager
 from core.plugin.entities.parameters import PluginParameterOption
 from core.tools.builtin_tool.tool import BuiltinTool
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter
+from graphon.file import FileType
+from graphon.file.file_manager import download
+from graphon.model_runtime.entities.model_entities import ModelType
 from services.model_provider_service import ModelProviderService
 
 
diff --git a/api/core/tools/builtin_tool/providers/audio/tools/tts.py b/api/core/tools/builtin_tool/providers/audio/tools/tts.py
index f49c669fe0..ac3820f1ab 100644
--- a/api/core/tools/builtin_tool/providers/audio/tools/tts.py
+++ b/api/core/tools/builtin_tool/providers/audio/tools/tts.py
@@ -2,13 +2,12 @@ import io
 from collections.abc import Generator
 from typing import Any
 
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
-
 from core.model_manager import ModelManager
 from core.plugin.entities.parameters import PluginParameterOption
 from core.tools.builtin_tool.tool import BuiltinTool
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
 from services.model_provider_service import ModelProviderService
 
 
diff --git a/api/core/tools/builtin_tool/tool.py b/api/core/tools/builtin_tool/tool.py
index 14af63a962..d41503e1e6 100644
--- a/api/core/tools/builtin_tool/tool.py
+++ b/api/core/tools/builtin_tool/tool.py
@@ -1,12 +1,11 @@
 from __future__ import annotations
 
-from graphon.model_runtime.entities.llm_entities import LLMResult
-from graphon.model_runtime.entities.message_entities import PromptMessage, SystemPromptMessage, UserPromptMessage
-
 from core.tools.__base.tool import Tool
 from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.entities.tool_entities import ToolProviderType
 from core.tools.utils.model_invocation_utils import ModelInvocationUtils
+from graphon.model_runtime.entities.llm_entities import LLMResult
+from graphon.model_runtime.entities.message_entities import PromptMessage, SystemPromptMessage, UserPromptMessage
 
 _SUMMARY_PROMPT = """You are a professional language researcher, you are interested in the language
 and you can quickly aimed at the main point of an webpage and reproduce it in your own words but
diff --git a/api/core/tools/custom_tool/tool.py b/api/core/tools/custom_tool/tool.py
index 0a2c37c563..168e5f4493 100644
--- a/api/core/tools/custom_tool/tool.py
+++ b/api/core/tools/custom_tool/tool.py
@@ -6,7 +6,6 @@ from typing import Any, Union
 from urllib.parse import urlencode
 
 import httpx
-from graphon.file.file_manager import download
 
 from core.helper import ssrf_proxy
 from core.tools.__base.tool import Tool
@@ -14,6 +13,7 @@ from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.entities.tool_bundle import ApiToolBundle
 from core.tools.entities.tool_entities import ToolEntity, ToolInvokeMessage, ToolProviderType
 from core.tools.errors import ToolInvokeError, ToolParameterValidationError, ToolProviderCredentialValidationError
+from graphon.file.file_manager import download
 
 API_TOOL_DEFAULT_TIMEOUT = (
     int(getenv("API_TOOL_DEFAULT_CONNECT_TIMEOUT", "10")),
diff --git a/api/core/tools/entities/api_entities.py b/api/core/tools/entities/api_entities.py
index 410ec72baf..42a88c0003 100644
--- a/api/core/tools/entities/api_entities.py
+++ b/api/core/tools/entities/api_entities.py
@@ -2,7 +2,6 @@ from collections.abc import Mapping
 from datetime import datetime
 from typing import Any, Literal
 
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, Field, field_validator
 
 from core.entities.mcp_provider import MCPAuthentication, MCPConfiguration
@@ -10,6 +9,7 @@ from core.plugin.entities.plugin_daemon import CredentialType
 from core.tools.__base.tool import ToolParameter
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolProviderType
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 
 
 class ToolApiEntity(BaseModel):
diff --git a/api/core/tools/mcp_tool/tool.py b/api/core/tools/mcp_tool/tool.py
index f6d09472b3..00fc8a8282 100644
--- a/api/core/tools/mcp_tool/tool.py
+++ b/api/core/tools/mcp_tool/tool.py
@@ -6,8 +6,6 @@ import logging
 from collections.abc import Generator, Mapping
 from typing import Any, cast
 
-from graphon.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
-
 from core.mcp.auth_client import MCPClientWithAuthRetry
 from core.mcp.error import MCPConnectionError
 from core.mcp.types import (
@@ -23,6 +21,7 @@ from core.tools.__base.tool import Tool
 from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.entities.tool_entities import ToolEntity, ToolInvokeMessage, ToolProviderType
 from core.tools.errors import ToolInvokeError
+from graphon.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/tools/tool_engine.py b/api/core/tools/tool_engine.py
index d060fa8b49..3caacb8706 100644
--- a/api/core/tools/tool_engine.py
+++ b/api/core/tools/tool_engine.py
@@ -7,7 +7,6 @@ from datetime import UTC, datetime
 from mimetypes import guess_type
 from typing import Any, Union, cast
 
-from graphon.file import FileTransferMethod, FileType
 from yarl import URL
 
 from core.app.entities.app_invoke_entities import InvokeFrom
@@ -33,6 +32,7 @@ from core.tools.errors import (
 from core.tools.utils.message_transformer import ToolFileMessageTransformer, safe_json_value
 from core.tools.workflow_as_tool.tool import WorkflowTool
 from extensions.ext_database import db
+from graphon.file import FileTransferMethod, FileType
 from models.enums import CreatorUserRole, MessageFileBelongsTo
 from models.model import Message, MessageFile
 
diff --git a/api/core/tools/tool_file_manager.py b/api/core/tools/tool_file_manager.py
index d8674b3af9..b3424cd9a5 100644
--- a/api/core/tools/tool_file_manager.py
+++ b/api/core/tools/tool_file_manager.py
@@ -9,7 +9,6 @@ from mimetypes import guess_extension, guess_type
 from uuid import uuid4
 
 import httpx
-from graphon.file import File, FileTransferMethod, get_file_type_by_mime_type
 from sqlalchemy import select
 
 from configs import dify_config
@@ -17,6 +16,7 @@ from core.db.session_factory import session_factory
 from core.helper import ssrf_proxy
 from core.workflow.file_reference import build_file_reference
 from extensions.ext_storage import storage
+from graphon.file import File, FileTransferMethod, get_file_type_by_mime_type
 from models.model import MessageFile
 from models.tools import ToolFile
 
diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py
index be13d40f3e..f4588904d3 100644
--- a/api/core/tools/tool_manager.py
+++ b/api/core/tools/tool_manager.py
@@ -8,7 +8,6 @@ from threading import Lock
 from typing import TYPE_CHECKING, Any, Literal, Protocol, cast
 
 import sqlalchemy as sa
-from graphon.runtime import VariablePool
 from pydantic import TypeAdapter
 from sqlalchemy import select
 from sqlalchemy.orm import Session
@@ -29,14 +28,13 @@ from core.tools.plugin_tool.tool import PluginTool
 from core.tools.utils.uuid_utils import is_valid_uuid
 from core.tools.workflow_as_tool.provider import WorkflowToolProviderController
 from extensions.ext_database import db
+from graphon.runtime import VariablePool
 from models.provider_ids import ToolProviderID
 from services.tools.mcp_tools_manage_service import MCPToolManageService
 
 if TYPE_CHECKING:
     pass
 
-from graphon.model_runtime.utils.encoders import jsonable_encoder
-
 from core.agent.entities import AgentToolEntity
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.helper.module_import_helper import load_single_subclass_from_source
@@ -62,6 +60,7 @@ from core.tools.tool_label_manager import ToolLabelManager
 from core.tools.utils.configuration import ToolParameterConfigurationManager
 from core.tools.utils.encryption import create_provider_encrypter, create_tool_provider_encrypter
 from core.tools.workflow_as_tool.tool import WorkflowTool
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from models.tools import ApiToolProvider, BuiltinToolProvider, WorkflowToolProvider
 from services.tools.tools_transform_service import ToolTransformService
 
diff --git a/api/core/tools/utils/dataset_retriever/dataset_multi_retriever_tool.py b/api/core/tools/utils/dataset_retriever/dataset_multi_retriever_tool.py
index 03e3c5918d..b6890b2611 100644
--- a/api/core/tools/utils/dataset_retriever/dataset_multi_retriever_tool.py
+++ b/api/core/tools/utils/dataset_retriever/dataset_multi_retriever_tool.py
@@ -1,7 +1,6 @@
 import threading
 
 from flask import Flask, current_app
-from graphon.model_runtime.entities.model_entities import ModelType
 from pydantic import BaseModel, Field
 from sqlalchemy import select
 
@@ -15,6 +14,7 @@ from core.rag.rerank.rerank_model import RerankModelRunner
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
 from extensions.ext_database import db
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.dataset import Dataset, Document, DocumentSegment
 
 default_retrieval_model: DefaultRetrievalModelDict = {
diff --git a/api/core/tools/utils/message_transformer.py b/api/core/tools/utils/message_transformer.py
index 81c85bc90d..79d0c114d4 100644
--- a/api/core/tools/utils/message_transformer.py
+++ b/api/core/tools/utils/message_transformer.py
@@ -9,11 +9,11 @@ from uuid import UUID
 
 import numpy as np
 import pytz
-from graphon.file import File, FileTransferMethod, FileType
 
 from core.tools.entities.tool_entities import ToolInvokeMessage
 from core.tools.tool_file_manager import ToolFileManager
 from core.workflow.file_reference import parse_file_reference
+from graphon.file import File, FileTransferMethod, FileType
 from libs.login import current_user
 from models import Account
 
diff --git a/api/core/tools/utils/model_invocation_utils.py b/api/core/tools/utils/model_invocation_utils.py
index 8d6f83dc07..9e1d41cb39 100644
--- a/api/core/tools/utils/model_invocation_utils.py
+++ b/api/core/tools/utils/model_invocation_utils.py
@@ -8,6 +8,9 @@ import json
 from decimal import Decimal
 from typing import cast
 
+from core.model_manager import ModelManager
+from core.tools.entities.tool_entities import ToolProviderType
+from extensions.ext_database import db
 from graphon.model_runtime.entities.llm_entities import LLMResult
 from graphon.model_runtime.entities.message_entities import PromptMessage
 from graphon.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
@@ -20,10 +23,6 @@ from graphon.model_runtime.errors.invoke import (
 )
 from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from graphon.model_runtime.utils.encoders import jsonable_encoder
-
-from core.model_manager import ModelManager
-from core.tools.entities.tool_entities import ToolProviderType
-from extensions.ext_database import db
 from models.tools import ToolModelInvoke
 
 
diff --git a/api/core/tools/utils/workflow_configuration_sync.py b/api/core/tools/utils/workflow_configuration_sync.py
index 2159eb8638..45718cadb6 100644
--- a/api/core/tools/utils/workflow_configuration_sync.py
+++ b/api/core/tools/utils/workflow_configuration_sync.py
@@ -1,13 +1,12 @@
 from collections.abc import Mapping, Sequence
 from typing import Any
 
+from core.tools.entities.tool_entities import WorkflowToolParameterConfiguration
+from core.tools.errors import WorkflowToolHumanInputNotSupportedError
 from graphon.enums import BuiltinNodeTypes
 from graphon.nodes.base.entities import OutputVariableEntity
 from graphon.variables.input_entities import VariableEntity
 
-from core.tools.entities.tool_entities import WorkflowToolParameterConfiguration
-from core.tools.errors import WorkflowToolHumanInputNotSupportedError
-
 
 class WorkflowToolConfigurationUtils:
     @classmethod
diff --git a/api/core/tools/workflow_as_tool/provider.py b/api/core/tools/workflow_as_tool/provider.py
index a01004448a..5905fd919e 100644
--- a/api/core/tools/workflow_as_tool/provider.py
+++ b/api/core/tools/workflow_as_tool/provider.py
@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from pydantic import Field
 from sqlalchemy import select
 from sqlalchemy.orm import Session
@@ -25,6 +24,7 @@ from core.tools.entities.tool_entities import (
 from core.tools.utils.workflow_configuration_sync import WorkflowToolConfigurationUtils
 from core.tools.workflow_as_tool.tool import WorkflowTool
 from extensions.ext_database import db
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from models.account import Account
 from models.model import App, AppMode
 from models.tools import WorkflowToolProvider
diff --git a/api/core/tools/workflow_as_tool/tool.py b/api/core/tools/workflow_as_tool/tool.py
index 7c4f8ee03a..52ab605963 100644
--- a/api/core/tools/workflow_as_tool/tool.py
+++ b/api/core/tools/workflow_as_tool/tool.py
@@ -5,8 +5,6 @@ import logging
 from collections.abc import Generator, Mapping, Sequence
 from typing import Any, cast
 
-from graphon.file import FILE_MODEL_IDENTITY, File, FileTransferMethod
-from graphon.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
 from sqlalchemy import select
 
 from core.app.file_access import DatabaseFileAccessController
@@ -22,6 +20,8 @@ from core.tools.entities.tool_entities import (
 from core.tools.errors import ToolInvokeError
 from core.workflow.file_reference import resolve_file_record_id
 from factories.file_factory import build_from_mapping
+from graphon.file import FILE_MODEL_IDENTITY, File, FileTransferMethod
+from graphon.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
 from models import Account, Tenant
 from models.model import App, EndUser
 from models.utils.file_input_compat import build_file_from_stored_mapping
diff --git a/api/core/trigger/debug/event_selectors.py b/api/core/trigger/debug/event_selectors.py
index 61d1cd8540..24c1271488 100644
--- a/api/core/trigger/debug/event_selectors.py
+++ b/api/core/trigger/debug/event_selectors.py
@@ -8,7 +8,6 @@ from collections.abc import Mapping
 from datetime import datetime
 from typing import Any
 
-from graphon.entities.graph_config import NodeConfigDict
 from pydantic import BaseModel
 
 from core.plugin.entities.request import TriggerInvokeEventResponse
@@ -28,6 +27,7 @@ from core.trigger.debug.events import (
 from core.workflow.nodes.trigger_plugin.entities import TriggerEventNodeData
 from core.workflow.nodes.trigger_schedule.entities import ScheduleConfig
 from extensions.ext_redis import redis_client
+from graphon.entities.graph_config import NodeConfigDict
 from libs.datetime_utils import ensure_naive_utc, naive_utc_now
 from libs.schedule_utils import calculate_next_run_at
 from models.model import App
diff --git a/api/core/workflow/human_input_compat.py b/api/core/workflow/human_input_compat.py
index c95516a240..75a0a0c202 100644
--- a/api/core/workflow/human_input_compat.py
+++ b/api/core/workflow/human_input_compat.py
@@ -14,12 +14,13 @@ from typing import Annotated, Any, ClassVar, Literal
 
 import bleach
 import markdown
+from markdown.extensions.tables import TableExtension
+from pydantic import AliasChoices, BaseModel, ConfigDict, Field, TypeAdapter
+
 from graphon.enums import BuiltinNodeTypes
 from graphon.nodes.base.variable_template_parser import VariableTemplateParser
 from graphon.runtime import VariablePool
 from graphon.variables.consts import SELECTORS_LENGTH
-from markdown.extensions.tables import TableExtension
-from pydantic import AliasChoices, BaseModel, ConfigDict, Field, TypeAdapter
 
 
 class DeliveryMethodType(enum.StrEnum):
diff --git a/api/core/workflow/node_factory.py b/api/core/workflow/node_factory.py
index b04ac7da3d..351da3444f 100644
--- a/api/core/workflow/node_factory.py
+++ b/api/core/workflow/node_factory.py
@@ -5,22 +5,6 @@ from dataclasses import dataclass
 from functools import lru_cache
 from typing import TYPE_CHECKING, Any, cast, final, override
 
-from graphon.entities.base_node_data import BaseNodeData
-from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
-from graphon.enums import BuiltinNodeTypes, NodeType
-from graphon.file.file_manager import file_manager
-from graphon.graph.graph import NodeFactory
-from graphon.model_runtime.memory import PromptMessageMemory
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from graphon.nodes.base.node import Node
-from graphon.nodes.code.code_node import WorkflowCodeExecutor
-from graphon.nodes.code.entities import CodeLanguage
-from graphon.nodes.code.limits import CodeNodeLimits
-from graphon.nodes.document_extractor import UnstructuredApiConfig
-from graphon.nodes.http_request import build_http_request_config
-from graphon.nodes.llm.entities import LLMNodeData
-from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
-from graphon.nodes.question_classifier.entities import QuestionClassifierNodeData
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -56,6 +40,22 @@ from core.workflow.nodes.agent.runtime_support import AgentRuntimeSupport
 from core.workflow.system_variables import SystemVariableKey, get_system_text, system_variable_selector
 from core.workflow.template_rendering import CodeExecutorJinja2TemplateRenderer
 from extensions.ext_database import db
+from graphon.entities.base_node_data import BaseNodeData
+from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
+from graphon.enums import BuiltinNodeTypes, NodeType
+from graphon.file.file_manager import file_manager
+from graphon.graph.graph import NodeFactory
+from graphon.model_runtime.memory import PromptMessageMemory
+from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
+from graphon.nodes.base.node import Node
+from graphon.nodes.code.code_node import WorkflowCodeExecutor
+from graphon.nodes.code.entities import CodeLanguage
+from graphon.nodes.code.limits import CodeNodeLimits
+from graphon.nodes.document_extractor import UnstructuredApiConfig
+from graphon.nodes.http_request import build_http_request_config
+from graphon.nodes.llm.entities import LLMNodeData
+from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
+from graphon.nodes.question_classifier.entities import QuestionClassifierNodeData
 from models.model import Conversation
 
 if TYPE_CHECKING:
diff --git a/api/core/workflow/node_runtime.py b/api/core/workflow/node_runtime.py
index 19cb3a7b0a..2e632e56f0 100644
--- a/api/core/workflow/node_runtime.py
+++ b/api/core/workflow/node_runtime.py
@@ -4,6 +4,32 @@ from collections.abc import Callable, Generator, Mapping, Sequence
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, cast
 
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
+from core.app.file_access import DatabaseFileAccessController
+from core.callback_handler.workflow_tool_callback_handler import DifyWorkflowCallbackHandler
+from core.llm_generator.output_parser.errors import OutputParserError
+from core.llm_generator.output_parser.structured_output import invoke_llm_with_structured_output
+from core.model_manager import ModelInstance
+from core.plugin.impl.exc import PluginDaemonClientSideError, PluginInvokeError
+from core.plugin.impl.plugin import PluginInstaller
+from core.prompt.utils.prompt_message_util import PromptMessageUtil
+from core.repositories.human_input_repository import (
+    FormCreateParams,
+    HumanInputFormRepository,
+    HumanInputFormRepositoryImpl,
+)
+from core.tools.entities.tool_entities import ToolProviderType as CoreToolProviderType
+from core.tools.errors import ToolInvokeError
+from core.tools.tool_engine import ToolEngine
+from core.tools.tool_file_manager import ToolFileManager
+from core.tools.tool_manager import ToolManager
+from core.tools.utils.message_transformer import ToolFileMessageTransformer
+from core.workflow.file_reference import build_file_reference
+from extensions.ext_database import db
+from factories import file_factory
 from graphon.file import FileTransferMethod, FileType
 from graphon.model_runtime.entities import LLMMode
 from graphon.model_runtime.entities.llm_entities import (
@@ -34,32 +60,6 @@ from graphon.nodes.tool_runtime_entities import (
     ToolRuntimeMessage,
     ToolRuntimeParameter,
 )
-from sqlalchemy import select
-from sqlalchemy.orm import Session
-
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
-from core.app.file_access import DatabaseFileAccessController
-from core.callback_handler.workflow_tool_callback_handler import DifyWorkflowCallbackHandler
-from core.llm_generator.output_parser.errors import OutputParserError
-from core.llm_generator.output_parser.structured_output import invoke_llm_with_structured_output
-from core.model_manager import ModelInstance
-from core.plugin.impl.exc import PluginDaemonClientSideError, PluginInvokeError
-from core.plugin.impl.plugin import PluginInstaller
-from core.prompt.utils.prompt_message_util import PromptMessageUtil
-from core.repositories.human_input_repository import (
-    FormCreateParams,
-    HumanInputFormRepository,
-    HumanInputFormRepositoryImpl,
-)
-from core.tools.entities.tool_entities import ToolProviderType as CoreToolProviderType
-from core.tools.errors import ToolInvokeError
-from core.tools.tool_engine import ToolEngine
-from core.tools.tool_file_manager import ToolFileManager
-from core.tools.tool_manager import ToolManager
-from core.tools.utils.message_transformer import ToolFileMessageTransformer
-from core.workflow.file_reference import build_file_reference
-from extensions.ext_database import db
-from factories import file_factory
 from models.dataset import SegmentAttachmentBinding
 from models.model import UploadFile
 from services.tools.builtin_tools_manage_service import BuiltinToolManageService
@@ -76,13 +76,12 @@ from .human_input_compat import (
 from .system_variables import SystemVariableKey, get_system_text
 
 if TYPE_CHECKING:
+    from core.tools.__base.tool import Tool
+    from core.tools.entities.tool_entities import ToolInvokeMessage as CoreToolInvokeMessage
     from graphon.file import File
     from graphon.nodes.llm.file_saver import LLMFileSaver
     from graphon.nodes.tool.entities import ToolNodeData
 
-    from core.tools.__base.tool import Tool
-    from core.tools.entities.tool_entities import ToolInvokeMessage as CoreToolInvokeMessage
-
 
 _file_access_controller = DatabaseFileAccessController()
 
diff --git a/api/core/workflow/nodes/agent/agent_node.py b/api/core/workflow/nodes/agent/agent_node.py
index bfd5536e4a..7b000101b0 100644
--- a/api/core/workflow/nodes/agent/agent_node.py
+++ b/api/core/workflow/nodes/agent/agent_node.py
@@ -3,15 +3,14 @@ from __future__ import annotations
 from collections.abc import Generator, Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
+from core.workflow.system_variables import SystemVariableKey, get_system_text
 from graphon.entities.graph_config import NodeConfigDict
 from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
 from graphon.node_events import NodeEventBase, NodeRunResult, StreamCompletedEvent
 from graphon.nodes.base.node import Node
 from graphon.nodes.base.variable_template_parser import VariableTemplateParser
 
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
-from core.workflow.system_variables import SystemVariableKey, get_system_text
-
 from .entities import AgentNodeData
 from .exceptions import (
     AgentInvocationError,
diff --git a/api/core/workflow/nodes/agent/entities.py b/api/core/workflow/nodes/agent/entities.py
index c52aad150b..51452c29a3 100644
--- a/api/core/workflow/nodes/agent/entities.py
+++ b/api/core/workflow/nodes/agent/entities.py
@@ -1,12 +1,12 @@
 from enum import IntEnum, StrEnum, auto
 from typing import Any, Literal, Union
 
-from graphon.entities.base_node_data import BaseNodeData
-from graphon.enums import BuiltinNodeTypes, NodeType
 from pydantic import BaseModel
 
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
 from core.tools.entities.tool_entities import ToolSelector
+from graphon.entities.base_node_data import BaseNodeData
+from graphon.enums import BuiltinNodeTypes, NodeType
 
 
 class AgentNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/agent/message_transformer.py b/api/core/workflow/nodes/agent/message_transformer.py
index db74590ed7..f44681377d 100644
--- a/api/core/workflow/nodes/agent/message_transformer.py
+++ b/api/core/workflow/nodes/agent/message_transformer.py
@@ -3,6 +3,14 @@ from __future__ import annotations
 from collections.abc import Generator, Mapping
 from typing import Any, cast
 
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from core.app.file_access import DatabaseFileAccessController
+from core.tools.entities.tool_entities import ToolInvokeMessage
+from core.tools.utils.message_transformer import ToolFileMessageTransformer
+from extensions.ext_database import db
+from factories import file_factory
 from graphon.enums import BuiltinNodeTypes, NodeType, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from graphon.file import File, FileTransferMethod, get_file_type_by_mime_type
 from graphon.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
@@ -15,14 +23,6 @@ from graphon.node_events import (
     StreamCompletedEvent,
 )
 from graphon.variables.segments import ArrayFileSegment
-from sqlalchemy import select
-from sqlalchemy.orm import Session
-
-from core.app.file_access import DatabaseFileAccessController
-from core.tools.entities.tool_entities import ToolInvokeMessage
-from core.tools.utils.message_transformer import ToolFileMessageTransformer
-from extensions.ext_database import db
-from factories import file_factory
 from models import ToolFile
 from services.tools.builtin_tools_manage_service import BuiltinToolManageService
 
diff --git a/api/core/workflow/nodes/agent/runtime_support.py b/api/core/workflow/nodes/agent/runtime_support.py
index be50edbc4d..a872774c98 100644
--- a/api/core/workflow/nodes/agent/runtime_support.py
+++ b/api/core/workflow/nodes/agent/runtime_support.py
@@ -4,8 +4,6 @@ import json
 from collections.abc import Sequence
 from typing import Any, cast
 
-from graphon.model_runtime.entities.model_entities import AIModelEntity, ModelType
-from graphon.runtime import VariablePool
 from packaging.version import Version
 from pydantic import ValidationError
 from sqlalchemy import select
@@ -21,6 +19,8 @@ from core.tools.entities.tool_entities import ToolIdentity, ToolParameter, ToolP
 from core.tools.tool_manager import ToolManager
 from core.workflow.system_variables import SystemVariableKey, get_system_text
 from extensions.ext_database import db
+from graphon.model_runtime.entities.model_entities import AIModelEntity, ModelType
+from graphon.runtime import VariablePool
 from models.model import Conversation
 
 from .entities import AgentNodeData, AgentOldVersionModelFeatures, ParamsAutoGenerated
diff --git a/api/core/workflow/nodes/datasource/datasource_node.py b/api/core/workflow/nodes/datasource/datasource_node.py
index d9247b2593..e4f6b3b470 100644
--- a/api/core/workflow/nodes/datasource/datasource_node.py
+++ b/api/core/workflow/nodes/datasource/datasource_node.py
@@ -1,6 +1,12 @@
 from collections.abc import Generator, Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
+from core.datasource.datasource_manager import DatasourceManager
+from core.datasource.entities.datasource_entities import DatasourceProviderType
+from core.plugin.impl.exc import PluginDaemonClientSideError
+from core.workflow.file_reference import resolve_file_record_id
+from core.workflow.system_variables import SystemVariableKey, get_system_segment
 from graphon.entities.graph_config import NodeConfigDict
 from graphon.enums import (
     BuiltinNodeTypes,
@@ -12,13 +18,6 @@ from graphon.node_events import NodeRunResult, StreamCompletedEvent
 from graphon.nodes.base.node import Node
 from graphon.nodes.base.variable_template_parser import VariableTemplateParser
 
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
-from core.datasource.datasource_manager import DatasourceManager
-from core.datasource.entities.datasource_entities import DatasourceProviderType
-from core.plugin.impl.exc import PluginDaemonClientSideError
-from core.workflow.file_reference import resolve_file_record_id
-from core.workflow.system_variables import SystemVariableKey, get_system_segment
-
 from .entities import DatasourceNodeData, DatasourceParameter, OnlineDriveDownloadFileParam
 from .exc import DatasourceNodeError
 
diff --git a/api/core/workflow/nodes/datasource/entities.py b/api/core/workflow/nodes/datasource/entities.py
index cad32f8d5b..28966f2392 100644
--- a/api/core/workflow/nodes/datasource/entities.py
+++ b/api/core/workflow/nodes/datasource/entities.py
@@ -1,9 +1,10 @@
 from typing import Any, Literal, Union
 
+from pydantic import BaseModel, field_validator
+from pydantic_core.core_schema import ValidationInfo
+
 from graphon.entities.base_node_data import BaseNodeData
 from graphon.enums import BuiltinNodeTypes, NodeType
-from pydantic import BaseModel, field_validator
-from pydantic_core.core_schema import ValidationInfo
 
 
 class DatasourceEntity(BaseModel):
diff --git a/api/core/workflow/nodes/knowledge_index/entities.py b/api/core/workflow/nodes/knowledge_index/entities.py
index 04a10f9257..260881e49c 100644
--- a/api/core/workflow/nodes/knowledge_index/entities.py
+++ b/api/core/workflow/nodes/knowledge_index/entities.py
@@ -1,13 +1,13 @@
 from typing import Union
 
-from graphon.entities.base_node_data import BaseNodeData
-from graphon.enums import NodeType
 from pydantic import BaseModel
 
 from core.rag.entities import RerankingModelConfig, WeightedScoreConfig
 from core.rag.index_processor.index_processor_base import SummaryIndexSettingDict
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.workflow.nodes.knowledge_index import KNOWLEDGE_INDEX_NODE_TYPE
+from graphon.entities.base_node_data import BaseNodeData
+from graphon.enums import NodeType
 
 
 class RetrievalSetting(BaseModel):
diff --git a/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py b/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
index bb72fe3881..d5cab05dbe 100644
--- a/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
+++ b/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
@@ -2,17 +2,16 @@ import logging
 from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any
 
-from graphon.entities.graph_config import NodeConfigDict
-from graphon.enums import NodeExecutionType, WorkflowNodeExecutionStatus
-from graphon.node_events import NodeRunResult
-from graphon.nodes.base.node import Node
-from graphon.nodes.base.template import Template
-
 from core.rag.index_processor.index_processor import IndexProcessor
 from core.rag.index_processor.index_processor_base import SummaryIndexSettingDict
 from core.rag.summary_index.summary_index import SummaryIndex
 from core.workflow.nodes.knowledge_index import KNOWLEDGE_INDEX_NODE_TYPE
 from core.workflow.system_variables import SystemVariableKey, get_system_segment, get_system_text
+from graphon.entities.graph_config import NodeConfigDict
+from graphon.enums import NodeExecutionType, WorkflowNodeExecutionStatus
+from graphon.node_events import NodeRunResult
+from graphon.nodes.base.node import Node
+from graphon.nodes.base.template import Template
 
 from .entities import KnowledgeIndexNodeData
 from .exc import (
diff --git a/api/core/workflow/nodes/knowledge_retrieval/entities.py b/api/core/workflow/nodes/knowledge_retrieval/entities.py
index 460ec693ce..3825f526a2 100644
--- a/api/core/workflow/nodes/knowledge_retrieval/entities.py
+++ b/api/core/workflow/nodes/knowledge_retrieval/entities.py
@@ -1,11 +1,11 @@
 from typing import Literal
 
-from graphon.entities.base_node_data import BaseNodeData
-from graphon.enums import BuiltinNodeTypes, NodeType
-from graphon.nodes.llm.entities import ModelConfig, VisionConfig
 from pydantic import BaseModel, Field
 
 from core.rag.entities import Condition, MetadataFilteringCondition, RerankingModelConfig, WeightedScoreConfig
+from graphon.entities.base_node_data import BaseNodeData
+from graphon.enums import BuiltinNodeTypes, NodeType
+from graphon.nodes.llm.entities import ModelConfig, VisionConfig
 
 __all__ = ["Condition"]
 
diff --git a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
index 13624b27b3..47ad14b499 100644
--- a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
+++ b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
@@ -8,6 +8,11 @@ import logging
 from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Any, Literal
 
+from core.app.app_config.entities import DatasetRetrieveConfigEntity
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
+from core.rag.data_post_processor.data_post_processor import RerankingModelDict, WeightsDict
+from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
+from core.workflow.file_reference import parse_file_reference
 from graphon.entities import GraphInitParams
 from graphon.entities.graph_config import NodeConfigDict
 from graphon.enums import (
@@ -27,12 +32,6 @@ from graphon.variables import (
 )
 from graphon.variables.segments import ArrayObjectSegment
 
-from core.app.app_config.entities import DatasetRetrieveConfigEntity
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
-from core.rag.data_post_processor.data_post_processor import RerankingModelDict, WeightsDict
-from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
-from core.workflow.file_reference import parse_file_reference
-
 from .entities import (
     Condition,
     KnowledgeRetrievalNodeData,
diff --git a/api/core/workflow/nodes/knowledge_retrieval/retrieval.py b/api/core/workflow/nodes/knowledge_retrieval/retrieval.py
index 39e2008a2c..ea45dcf5c2 100644
--- a/api/core/workflow/nodes/knowledge_retrieval/retrieval.py
+++ b/api/core/workflow/nodes/knowledge_retrieval/retrieval.py
@@ -1,10 +1,10 @@
 from typing import Any, Literal, Protocol
 
-from graphon.model_runtime.entities import LLMUsage
-from graphon.nodes.llm.entities import ModelConfig
 from pydantic import BaseModel, Field
 
 from core.rag.data_post_processor.data_post_processor import RerankingModelDict, WeightsDict
+from graphon.model_runtime.entities import LLMUsage
+from graphon.nodes.llm.entities import ModelConfig
 
 from .entities import MetadataFilteringCondition
 
diff --git a/api/core/workflow/nodes/trigger_plugin/entities.py b/api/core/workflow/nodes/trigger_plugin/entities.py
index bf5be2379a..23ed2cd408 100644
--- a/api/core/workflow/nodes/trigger_plugin/entities.py
+++ b/api/core/workflow/nodes/trigger_plugin/entities.py
@@ -1,12 +1,12 @@
 from collections.abc import Mapping
 from typing import Any, Literal, Union
 
-from graphon.entities.base_node_data import BaseNodeData
-from graphon.enums import NodeType
 from pydantic import BaseModel, Field, ValidationInfo, field_validator
 
 from core.trigger.constants import TRIGGER_PLUGIN_NODE_TYPE
 from core.trigger.entities.entities import EventParameter
+from graphon.entities.base_node_data import BaseNodeData
+from graphon.enums import NodeType
 
 from .exc import TriggerEventParameterError
 
diff --git a/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py b/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py
index e50de11bb9..c848a86255 100644
--- a/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py
+++ b/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py
@@ -1,13 +1,12 @@
 from collections.abc import Mapping
 from typing import Any
 
+from core.trigger.constants import TRIGGER_PLUGIN_NODE_TYPE
+from core.workflow.variable_prefixes import SYSTEM_VARIABLE_NODE_ID
 from graphon.enums import NodeExecutionType, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from graphon.node_events import NodeRunResult
 from graphon.nodes.base.node import Node
 
-from core.trigger.constants import TRIGGER_PLUGIN_NODE_TYPE
-from core.workflow.variable_prefixes import SYSTEM_VARIABLE_NODE_ID
-
 from .entities import TriggerEventNodeData
 
 
diff --git a/api/core/workflow/nodes/trigger_schedule/entities.py b/api/core/workflow/nodes/trigger_schedule/entities.py
index 04f1f7e6bb..683c8d420f 100644
--- a/api/core/workflow/nodes/trigger_schedule/entities.py
+++ b/api/core/workflow/nodes/trigger_schedule/entities.py
@@ -1,10 +1,10 @@
 from typing import Any, Literal, Union
 
-from graphon.entities.base_node_data import BaseNodeData
-from graphon.enums import NodeType
 from pydantic import BaseModel, Field
 
 from core.trigger.constants import TRIGGER_SCHEDULE_NODE_TYPE
+from graphon.entities.base_node_data import BaseNodeData
+from graphon.enums import NodeType
 
 
 class TriggerScheduleNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/trigger_schedule/trigger_schedule_node.py b/api/core/workflow/nodes/trigger_schedule/trigger_schedule_node.py
index a9753ab387..b46cc76a6e 100644
--- a/api/core/workflow/nodes/trigger_schedule/trigger_schedule_node.py
+++ b/api/core/workflow/nodes/trigger_schedule/trigger_schedule_node.py
@@ -1,11 +1,10 @@
 from collections.abc import Mapping
 
-from graphon.enums import NodeExecutionType, WorkflowNodeExecutionStatus
-from graphon.node_events import NodeRunResult
-from graphon.nodes.base.node import Node
-
 from core.trigger.constants import TRIGGER_SCHEDULE_NODE_TYPE
 from core.workflow.variable_prefixes import SYSTEM_VARIABLE_NODE_ID
+from graphon.enums import NodeExecutionType, WorkflowNodeExecutionStatus
+from graphon.node_events import NodeRunResult
+from graphon.nodes.base.node import Node
 
 from .entities import TriggerScheduleNodeData
 
diff --git a/api/core/workflow/nodes/trigger_webhook/entities.py b/api/core/workflow/nodes/trigger_webhook/entities.py
index a30f877e4b..b261039448 100644
--- a/api/core/workflow/nodes/trigger_webhook/entities.py
+++ b/api/core/workflow/nodes/trigger_webhook/entities.py
@@ -1,12 +1,12 @@
 from collections.abc import Sequence
 from enum import StrEnum
 
-from graphon.entities.base_node_data import BaseNodeData
-from graphon.enums import NodeType
-from graphon.variables.types import SegmentType
 from pydantic import BaseModel, Field, field_validator
 
 from core.trigger.constants import TRIGGER_WEBHOOK_NODE_TYPE
+from graphon.entities.base_node_data import BaseNodeData
+from graphon.enums import NodeType
+from graphon.variables.types import SegmentType
 
 _WEBHOOK_HEADER_ALLOWED_TYPES: frozenset[SegmentType] = frozenset((SegmentType.STRING,))
 
diff --git a/api/core/workflow/nodes/trigger_webhook/node.py b/api/core/workflow/nodes/trigger_webhook/node.py
index d942a718cc..13c4f05bfd 100644
--- a/api/core/workflow/nodes/trigger_webhook/node.py
+++ b/api/core/workflow/nodes/trigger_webhook/node.py
@@ -2,6 +2,10 @@ import logging
 from collections.abc import Mapping
 from typing import Any
 
+from core.trigger.constants import TRIGGER_WEBHOOK_NODE_TYPE
+from core.workflow.file_reference import resolve_file_record_id
+from core.workflow.variable_prefixes import SYSTEM_VARIABLE_NODE_ID
+from factories.variable_factory import build_segment_with_type
 from graphon.enums import NodeExecutionType, WorkflowNodeExecutionStatus
 from graphon.file import FileTransferMethod
 from graphon.node_events import NodeRunResult
@@ -10,11 +14,6 @@ from graphon.nodes.protocols import FileReferenceFactoryProtocol
 from graphon.variables.types import SegmentType
 from graphon.variables.variables import FileVariable
 
-from core.trigger.constants import TRIGGER_WEBHOOK_NODE_TYPE
-from core.workflow.file_reference import resolve_file_record_id
-from core.workflow.variable_prefixes import SYSTEM_VARIABLE_NODE_ID
-from factories.variable_factory import build_segment_with_type
-
 from .entities import ContentType, WebhookData
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/workflow/template_rendering.py b/api/core/workflow/template_rendering.py
index d51cfadd09..b4ffb37549 100644
--- a/api/core/workflow/template_rendering.py
+++ b/api/core/workflow/template_rendering.py
@@ -3,11 +3,10 @@ from __future__ import annotations
 from collections.abc import Mapping
 from typing import Any
 
+from core.helper.code_executor.code_executor import CodeExecutionError, CodeExecutor
 from graphon.nodes.code.entities import CodeLanguage
 from graphon.template_rendering import Jinja2TemplateRenderer, TemplateRenderError
 
-from core.helper.code_executor.code_executor import CodeExecutionError, CodeExecutor
-
 
 class CodeExecutorJinja2TemplateRenderer(Jinja2TemplateRenderer):
     """Sandbox-backed Jinja2 renderer for workflow-owned node composition."""
diff --git a/api/core/workflow/workflow_entry.py b/api/core/workflow/workflow_entry.py
index f0a5fbb400..4e2f603e5b 100644
--- a/api/core/workflow/workflow_entry.py
+++ b/api/core/workflow/workflow_entry.py
@@ -3,20 +3,6 @@ import time
 from collections.abc import Generator, Mapping, Sequence
 from typing import Any, TypedDict
 
-from graphon.entities import GraphInitParams
-from graphon.entities.graph_config import NodeConfigDictAdapter
-from graphon.errors import WorkflowNodeRunFailedError
-from graphon.file import File
-from graphon.graph import Graph
-from graphon.graph_engine import GraphEngine, GraphEngineConfig
-from graphon.graph_engine.command_channels import CommandChannel, InMemoryChannel
-from graphon.graph_engine.layers import DebugLoggingLayer, ExecutionLimitsLayer
-from graphon.graph_events import GraphEngineEvent, GraphNodeEventBase, GraphRunFailedEvent
-from graphon.nodes import BuiltinNodeTypes
-from graphon.nodes.base.node import Node
-from graphon.runtime import ChildGraphNotFoundError, GraphRuntimeState, VariablePool
-from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
-
 from configs import dify_config
 from context import capture_current_context
 from core.app.apps.exc import GenerateTaskStoppedError
@@ -40,6 +26,19 @@ from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add
 from core.workflow.variable_prefixes import ENVIRONMENT_VARIABLE_NODE_ID
 from extensions.otel.runtime import is_instrument_flag_enabled
 from factories import file_factory
+from graphon.entities import GraphInitParams
+from graphon.entities.graph_config import NodeConfigDictAdapter
+from graphon.errors import WorkflowNodeRunFailedError
+from graphon.file import File
+from graphon.graph import Graph
+from graphon.graph_engine import GraphEngine, GraphEngineConfig
+from graphon.graph_engine.command_channels import CommandChannel, InMemoryChannel
+from graphon.graph_engine.layers import DebugLoggingLayer, ExecutionLimitsLayer
+from graphon.graph_events import GraphEngineEvent, GraphNodeEventBase, GraphRunFailedEvent
+from graphon.nodes import BuiltinNodeTypes
+from graphon.nodes.base.node import Node
+from graphon.runtime import ChildGraphNotFoundError, GraphRuntimeState, VariablePool
+from graphon.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
 from models.workflow import Workflow
 
 logger = logging.getLogger(__name__)
diff --git a/api/enterprise/telemetry/draft_trace.py b/api/enterprise/telemetry/draft_trace.py
index 5a8d0ee6f4..dff558988c 100644
--- a/api/enterprise/telemetry/draft_trace.py
+++ b/api/enterprise/telemetry/draft_trace.py
@@ -3,10 +3,9 @@ from __future__ import annotations
 from collections.abc import Mapping
 from typing import Any
 
-from graphon.enums import WorkflowNodeExecutionMetadataKey
-
 from core.telemetry import TelemetryContext, TelemetryEvent, TraceTaskName
 from core.telemetry import emit as telemetry_emit
+from graphon.enums import WorkflowNodeExecutionMetadataKey
 from models.workflow import WorkflowNodeExecutionModel
 
 
diff --git a/api/events/event_handlers/delete_tool_parameters_cache_when_sync_draft_workflow.py b/api/events/event_handlers/delete_tool_parameters_cache_when_sync_draft_workflow.py
index 7bd8e88231..ba9758175f 100644
--- a/api/events/event_handlers/delete_tool_parameters_cache_when_sync_draft_workflow.py
+++ b/api/events/event_handlers/delete_tool_parameters_cache_when_sync_draft_workflow.py
@@ -1,12 +1,11 @@
 import logging
 
-from graphon.nodes import BuiltinNodeTypes
-from graphon.nodes.tool.entities import ToolEntity
-
 from core.tools.entities.tool_entities import ToolProviderType
 from core.tools.tool_manager import ToolManager
 from core.tools.utils.configuration import ToolParameterConfigurationManager
 from events.app_event import app_draft_workflow_was_synced
+from graphon.nodes import BuiltinNodeTypes
+from graphon.nodes.tool.entities import ToolEntity
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/events/event_handlers/update_app_dataset_join_when_app_published_workflow_updated.py b/api/events/event_handlers/update_app_dataset_join_when_app_published_workflow_updated.py
index 86b5b2bbf0..6769b94cde 100644
--- a/api/events/event_handlers/update_app_dataset_join_when_app_published_workflow_updated.py
+++ b/api/events/event_handlers/update_app_dataset_join_when_app_published_workflow_updated.py
@@ -1,11 +1,11 @@
 from typing import cast
 
-from graphon.nodes import BuiltinNodeTypes
 from sqlalchemy import delete, select
 
 from core.workflow.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
 from events.app_event import app_published_workflow_was_updated
 from extensions.ext_database import db
+from graphon.nodes import BuiltinNodeTypes
 from models.dataset import AppDatasetJoin
 from models.workflow import Workflow
 
diff --git a/api/extensions/ext_sentry.py b/api/extensions/ext_sentry.py
index 5cc58f27c4..69d1f1ab07 100644
--- a/api/extensions/ext_sentry.py
+++ b/api/extensions/ext_sentry.py
@@ -5,11 +5,12 @@ from dify_app import DifyApp
 def init_app(app: DifyApp):
     if dify_config.SENTRY_DSN:
         import sentry_sdk
-        from graphon.model_runtime.errors.invoke import InvokeRateLimitError
         from sentry_sdk.integrations.celery import CeleryIntegration
         from sentry_sdk.integrations.flask import FlaskIntegration
         from werkzeug.exceptions import HTTPException
 
+        from graphon.model_runtime.errors.invoke import InvokeRateLimitError
+
         try:
             from langfuse._utils import parse_error
 
diff --git a/api/extensions/logstore/repositories/logstore_api_workflow_node_execution_repository.py b/api/extensions/logstore/repositories/logstore_api_workflow_node_execution_repository.py
index db599c5d49..64ff0f0674 100644
--- a/api/extensions/logstore/repositories/logstore_api_workflow_node_execution_repository.py
+++ b/api/extensions/logstore/repositories/logstore_api_workflow_node_execution_repository.py
@@ -11,12 +11,12 @@ from collections.abc import Sequence
 from datetime import datetime
 from typing import Any
 
-from graphon.enums import WorkflowNodeExecutionStatus
 from sqlalchemy.orm import sessionmaker
 
 from extensions.logstore.aliyun_logstore import AliyunLogStore
 from extensions.logstore.repositories import safe_float, safe_int
 from extensions.logstore.sql_escape import escape_identifier, escape_logstore_query_value
+from graphon.enums import WorkflowNodeExecutionStatus
 from models.enums import CreatorUserRole
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom
 from repositories.api_workflow_node_execution_repository import DifyAPIWorkflowNodeExecutionRepository
diff --git a/api/extensions/logstore/repositories/logstore_api_workflow_run_repository.py b/api/extensions/logstore/repositories/logstore_api_workflow_run_repository.py
index 2745141431..7f77a0437a 100644
--- a/api/extensions/logstore/repositories/logstore_api_workflow_run_repository.py
+++ b/api/extensions/logstore/repositories/logstore_api_workflow_run_repository.py
@@ -20,12 +20,12 @@ from collections.abc import Sequence
 from datetime import datetime
 from typing import Any, cast
 
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy.orm import sessionmaker
 
 from extensions.logstore.aliyun_logstore import AliyunLogStore
 from extensions.logstore.repositories import safe_float, safe_int
 from extensions.logstore.sql_escape import escape_identifier, escape_logstore_query_value, escape_sql_string
+from graphon.enums import WorkflowExecutionStatus
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
 from models.workflow import WorkflowRun, WorkflowType
diff --git a/api/extensions/logstore/repositories/logstore_workflow_execution_repository.py b/api/extensions/logstore/repositories/logstore_workflow_execution_repository.py
index d0f3e2e244..544109276d 100644
--- a/api/extensions/logstore/repositories/logstore_workflow_execution_repository.py
+++ b/api/extensions/logstore/repositories/logstore_workflow_execution_repository.py
@@ -3,14 +3,14 @@ import logging
 import os
 import time
 
-from graphon.entities import WorkflowExecution
-from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
 from core.repositories.factory import WorkflowExecutionRepository
 from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
 from extensions.logstore.aliyun_logstore import AliyunLogStore
+from graphon.entities import WorkflowExecution
+from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from libs.helper import extract_tenant_id
 from models import (
     Account,
diff --git a/api/extensions/logstore/repositories/logstore_workflow_node_execution_repository.py b/api/extensions/logstore/repositories/logstore_workflow_node_execution_repository.py
index 37952d6464..dc7654a25c 100644
--- a/api/extensions/logstore/repositories/logstore_workflow_node_execution_repository.py
+++ b/api/extensions/logstore/repositories/logstore_workflow_node_execution_repository.py
@@ -13,10 +13,6 @@ from collections.abc import Sequence
 from datetime import datetime
 from typing import Any
 
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from graphon.model_runtime.utils.encoders import jsonable_encoder
-from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
@@ -26,6 +22,10 @@ from core.repositories.factory import OrderConfig, WorkflowNodeExecutionReposito
 from extensions.logstore.aliyun_logstore import AliyunLogStore
 from extensions.logstore.repositories import safe_float, safe_int
 from extensions.logstore.sql_escape import escape_identifier
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from graphon.model_runtime.utils.encoders import jsonable_encoder
+from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from libs.helper import extract_tenant_id
 from models import (
     Account,
diff --git a/api/extensions/otel/parser/base.py b/api/extensions/otel/parser/base.py
index 23d324f9ea..fbf379b3e5 100644
--- a/api/extensions/otel/parser/base.py
+++ b/api/extensions/otel/parser/base.py
@@ -10,17 +10,17 @@ Gate is only active in EE (``ENTERPRISE_ENABLED=True``) when
 import json
 from typing import Any, Protocol
 
-from graphon.enums import BuiltinNodeTypes
-from graphon.file import File
-from graphon.graph_events import GraphNodeEventBase
-from graphon.nodes.base.node import Node
-from graphon.variables import Segment
 from opentelemetry.trace import Span
 from opentelemetry.trace.status import Status, StatusCode
 from pydantic import BaseModel
 
 from configs import dify_config
 from extensions.otel.semconv.gen_ai import ChainAttributes, GenAIAttributes
+from graphon.enums import BuiltinNodeTypes
+from graphon.file import File
+from graphon.graph_events import GraphNodeEventBase
+from graphon.nodes.base.node import Node
+from graphon.variables import Segment
 
 
 def should_include_content() -> bool:
diff --git a/api/extensions/otel/parser/llm.py b/api/extensions/otel/parser/llm.py
index 335c5cc29e..ec3c78a12d 100644
--- a/api/extensions/otel/parser/llm.py
+++ b/api/extensions/otel/parser/llm.py
@@ -6,12 +6,12 @@ import logging
 from collections.abc import Mapping
 from typing import Any
 
-from graphon.graph_events import GraphNodeEventBase
-from graphon.nodes.base.node import Node
 from opentelemetry.trace import Span
 
 from extensions.otel.parser.base import DefaultNodeOTelParser, safe_json_dumps
 from extensions.otel.semconv.gen_ai import LLMAttributes
+from graphon.graph_events import GraphNodeEventBase
+from graphon.nodes.base.node import Node
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/extensions/otel/parser/retrieval.py b/api/extensions/otel/parser/retrieval.py
index 6df5f62c15..56672d1fd4 100644
--- a/api/extensions/otel/parser/retrieval.py
+++ b/api/extensions/otel/parser/retrieval.py
@@ -6,13 +6,13 @@ import logging
 from collections.abc import Sequence
 from typing import Any
 
-from graphon.graph_events import GraphNodeEventBase
-from graphon.nodes.base.node import Node
-from graphon.variables import Segment
 from opentelemetry.trace import Span
 
 from extensions.otel.parser.base import DefaultNodeOTelParser, safe_json_dumps
 from extensions.otel.semconv.gen_ai import RetrieverAttributes
+from graphon.graph_events import GraphNodeEventBase
+from graphon.nodes.base.node import Node
+from graphon.variables import Segment
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/extensions/otel/parser/tool.py b/api/extensions/otel/parser/tool.py
index b9fdd9e1ca..75ddbba448 100644
--- a/api/extensions/otel/parser/tool.py
+++ b/api/extensions/otel/parser/tool.py
@@ -2,14 +2,14 @@
 Parser for tool nodes that captures tool-specific metadata.
 """
 
-from graphon.enums import WorkflowNodeExecutionMetadataKey
-from graphon.graph_events import GraphNodeEventBase
-from graphon.nodes.base.node import Node
-from graphon.nodes.tool.entities import ToolNodeData
 from opentelemetry.trace import Span
 
 from extensions.otel.parser.base import DefaultNodeOTelParser, safe_json_dumps
 from extensions.otel.semconv.gen_ai import ToolAttributes
+from graphon.enums import WorkflowNodeExecutionMetadataKey
+from graphon.graph_events import GraphNodeEventBase
+from graphon.nodes.base.node import Node
+from graphon.nodes.tool.entities import ToolNodeData
 
 
 class ToolNodeOTelParser:
diff --git a/api/factories/file_factory/builders.py b/api/factories/file_factory/builders.py
index 7516d18c8e..288d37d265 100644
--- a/api/factories/file_factory/builders.py
+++ b/api/factories/file_factory/builders.py
@@ -7,12 +7,12 @@ import uuid
 from collections.abc import Mapping, Sequence
 from typing import Any
 
-from graphon.file import File, FileTransferMethod, FileType, FileUploadConfig, helpers, standardize_file_type
 from sqlalchemy import select
 
 from core.app.file_access import FileAccessControllerProtocol
 from core.workflow.file_reference import build_file_reference
 from extensions.ext_database import db
+from graphon.file import File, FileTransferMethod, FileType, FileUploadConfig, helpers, standardize_file_type
 from models import ToolFile, UploadFile
 
 from .common import resolve_mapping_file_id
diff --git a/api/factories/file_factory/message_files.py b/api/factories/file_factory/message_files.py
index 5582b85c95..4b3d514238 100644
--- a/api/factories/file_factory/message_files.py
+++ b/api/factories/file_factory/message_files.py
@@ -4,9 +4,8 @@ from __future__ import annotations
 
 from collections.abc import Sequence
 
-from graphon.file import File, FileBelongsTo, FileTransferMethod, FileUploadConfig
-
 from core.app.file_access import FileAccessControllerProtocol
+from graphon.file import File, FileBelongsTo, FileTransferMethod, FileUploadConfig
 from models import MessageFile
 
 from .builders import build_from_mapping
diff --git a/api/factories/file_factory/storage_keys.py b/api/factories/file_factory/storage_keys.py
index db3a7f3015..dba4c84407 100644
--- a/api/factories/file_factory/storage_keys.py
+++ b/api/factories/file_factory/storage_keys.py
@@ -5,12 +5,12 @@ from __future__ import annotations
 import uuid
 from collections.abc import Mapping, Sequence
 
-from graphon.file import File, FileTransferMethod
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.app.file_access import FileAccessControllerProtocol
 from core.workflow.file_reference import build_file_reference, parse_file_reference
+from graphon.file import File, FileTransferMethod
 from models import ToolFile, UploadFile
 
 
diff --git a/api/factories/variable_factory.py b/api/factories/variable_factory.py
index 57205b5739..fd7acb14d3 100644
--- a/api/factories/variable_factory.py
+++ b/api/factories/variable_factory.py
@@ -8,6 +8,11 @@ shared conversion functions for legacy callers and tests.
 from collections.abc import Mapping, Sequence
 from typing import Any, cast
 
+from configs import dify_config
+from core.workflow.variable_prefixes import (
+    CONVERSATION_VARIABLE_NODE_ID,
+    ENVIRONMENT_VARIABLE_NODE_ID,
+)
 from graphon.variables.exc import VariableError
 from graphon.variables.factory import (
     TypeMismatchError,
@@ -31,12 +36,6 @@ from graphon.variables.variables import (
     VariableBase,
 )
 
-from configs import dify_config
-from core.workflow.variable_prefixes import (
-    CONVERSATION_VARIABLE_NODE_ID,
-    ENVIRONMENT_VARIABLE_NODE_ID,
-)
-
 __all__ = [
     "TypeMismatchError",
     "UnsupportedSegmentTypeError",
diff --git a/api/fields/conversation_fields.py b/api/fields/conversation_fields.py
index 5cb1e9087c..bf5c9ffcb1 100644
--- a/api/fields/conversation_fields.py
+++ b/api/fields/conversation_fields.py
@@ -3,10 +3,10 @@ from __future__ import annotations
 from datetime import datetime
 from typing import Any
 
-from graphon.file import File
 from pydantic import Field, field_validator, model_validator
 
 from fields.base import ResponseModel
+from graphon.file import File
 
 type JSONValue = Any
 
diff --git a/api/fields/conversation_variable_fields.py b/api/fields/conversation_variable_fields.py
index cb6cdb309a..cf4a71d545 100644
--- a/api/fields/conversation_variable_fields.py
+++ b/api/fields/conversation_variable_fields.py
@@ -4,10 +4,10 @@ from datetime import datetime
 from typing import Any
 
 from flask_restx import Namespace, fields
-from graphon.variables.types import SegmentType
 from pydantic import field_validator
 
 from fields.base import ResponseModel
+from graphon.variables.types import SegmentType
 from libs.helper import TimestampField
 
 from ._value_type_serializer import serialize_value_type
diff --git a/api/fields/member_fields.py b/api/fields/member_fields.py
index cfe0015918..67b320beaa 100644
--- a/api/fields/member_fields.py
+++ b/api/fields/member_fields.py
@@ -3,10 +3,10 @@ from __future__ import annotations
 from datetime import datetime
 
 from flask_restx import fields
-from graphon.file import helpers as file_helpers
 from pydantic import computed_field, field_validator
 
 from fields.base import ResponseModel
+from graphon.file import helpers as file_helpers
 
 simple_account_fields = {
     "id": fields.String,
diff --git a/api/fields/message_fields.py b/api/fields/message_fields.py
index 1a871204a0..ca18f1c203 100644
--- a/api/fields/message_fields.py
+++ b/api/fields/message_fields.py
@@ -3,12 +3,12 @@ from __future__ import annotations
 from datetime import datetime
 from uuid import uuid4
 
-from graphon.file import File
 from pydantic import Field, field_validator
 
 from core.entities.execution_extra_content import ExecutionExtraContentDomainModel
 from fields.base import ResponseModel
 from fields.conversation_fields import AgentThought, JSONValue, MessageFile
+from graphon.file import File
 
 type JSONValueType = JSONValue
 
diff --git a/api/fields/raws.py b/api/fields/raws.py
index 4c65cdab7a..ee6f53b360 100644
--- a/api/fields/raws.py
+++ b/api/fields/raws.py
@@ -1,4 +1,5 @@
 from flask_restx import fields
+
 from graphon.file import File
 
 
diff --git a/api/fields/workflow_fields.py b/api/fields/workflow_fields.py
index b0b6cc0b48..f9b5e98936 100644
--- a/api/fields/workflow_fields.py
+++ b/api/fields/workflow_fields.py
@@ -1,8 +1,8 @@
 from flask_restx import fields
-from graphon.variables import SecretVariable, SegmentType, VariableBase
 
 from core.helper import encrypter
 from fields.member_fields import simple_account_fields
+from graphon.variables import SecretVariable, SegmentType, VariableBase
 from libs.helper import TimestampField
 
 from ._value_type_serializer import serialize_value_type
diff --git a/api/libs/helper.py b/api/libs/helper.py
index 69bd483515..ac69a11084 100644
--- a/api/libs/helper.py
+++ b/api/libs/helper.py
@@ -16,8 +16,6 @@ from zoneinfo import available_timezones
 
 from flask import Response, stream_with_context
 from flask_restx import fields
-from graphon.file import helpers as file_helpers
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from pydantic import BaseModel, TypeAdapter
 from pydantic.functional_validators import AfterValidator
 from typing_extensions import TypedDict
@@ -25,6 +23,8 @@ from typing_extensions import TypedDict
 from configs import dify_config
 from core.app.features.rate_limiting.rate_limit import RateLimitGenerator
 from extensions.ext_redis import redis_client
+from graphon.file import helpers as file_helpers
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 
 if TYPE_CHECKING:
     from models import Account
diff --git a/api/models/human_input.py b/api/models/human_input.py
index 79c5d62f6a..b4c7a634b6 100644
--- a/api/models/human_input.py
+++ b/api/models/human_input.py
@@ -3,11 +3,11 @@ from enum import StrEnum
 from typing import Annotated, Literal, Self, final
 
 import sqlalchemy as sa
-from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from core.workflow.human_input_compat import DeliveryMethodType
+from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from libs.helper import generate_string
 
 from .base import Base, DefaultFieldsMixin
diff --git a/api/models/model.py b/api/models/model.py
index 8eabf45363..7fe0731098 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -14,9 +14,6 @@ from uuid import uuid4
 import sqlalchemy as sa
 from flask import request
 from flask_login import UserMixin  # type: ignore[import-untyped]
-from graphon.enums import WorkflowExecutionStatus
-from graphon.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
-from graphon.file import helpers as file_helpers
 from sqlalchemy import BigInteger, Float, Index, PrimaryKeyConstraint, String, exists, func, select, text
 from sqlalchemy.orm import Mapped, Session, mapped_column, sessionmaker
 
@@ -24,6 +21,9 @@ from configs import dify_config
 from constants import DEFAULT_FILE_NUMBER_LIMITS
 from core.tools.signature import sign_tool_file
 from extensions.storage.storage_type import StorageType
+from graphon.enums import WorkflowExecutionStatus
+from graphon.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
+from graphon.file import helpers as file_helpers
 from libs.helper import generate_string  # type: ignore[import-not-found]
 from libs.uuid_utils import uuidv7
 from models.utils.file_input_compat import build_file_from_input_mapping
diff --git a/api/models/provider.py b/api/models/provider.py
index 8270961b31..2bb67d605b 100644
--- a/api/models/provider.py
+++ b/api/models/provider.py
@@ -6,10 +6,10 @@ from functools import cached_property
 from uuid import uuid4
 
 import sqlalchemy as sa
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy import DateTime, String, func, select, text
 from sqlalchemy.orm import Mapped, mapped_column
 
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs.uuid_utils import uuidv7
 
 from .base import TypeBase
diff --git a/api/models/utils/file_input_compat.py b/api/models/utils/file_input_compat.py
index 8b767779ce..a2dc8f6157 100644
--- a/api/models/utils/file_input_compat.py
+++ b/api/models/utils/file_input_compat.py
@@ -4,9 +4,8 @@ from collections.abc import Callable, Mapping
 from functools import lru_cache
 from typing import Any
 
-from graphon.file import File, FileTransferMethod
-
 from core.workflow.file_reference import parse_file_reference
+from graphon.file import File, FileTransferMethod
 
 
 @lru_cache(maxsize=1)
diff --git a/api/models/workflow.py b/api/models/workflow.py
index d688043920..dfda03c2ee 100644
--- a/api/models/workflow.py
+++ b/api/models/workflow.py
@@ -8,19 +8,6 @@ from typing import TYPE_CHECKING, Any, Optional, TypedDict, cast
 from uuid import uuid4
 
 import sqlalchemy as sa
-from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
-from graphon.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
-from graphon.enums import (
-    BuiltinNodeTypes,
-    NodeType,
-    WorkflowExecutionStatus,
-    WorkflowNodeExecutionMetadataKey,
-    WorkflowNodeExecutionStatus,
-)
-from graphon.file import File
-from graphon.file.constants import maybe_file_object
-from graphon.variables import utils as variable_utils
-from graphon.variables.variables import FloatVariable, IntegerVariable, RAGPipelineVariable, StringVariable
 from sqlalchemy import (
     DateTime,
     Index,
@@ -44,6 +31,19 @@ from core.workflow.variable_prefixes import (
 )
 from extensions.ext_storage import Storage
 from factories.variable_factory import TypeMismatchError, build_segment_with_type
+from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
+from graphon.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
+from graphon.enums import (
+    BuiltinNodeTypes,
+    NodeType,
+    WorkflowExecutionStatus,
+    WorkflowNodeExecutionMetadataKey,
+    WorkflowNodeExecutionStatus,
+)
+from graphon.file import File
+from graphon.file.constants import maybe_file_object
+from graphon.variables import utils as variable_utils
+from graphon.variables.variables import FloatVariable, IntegerVariable, RAGPipelineVariable, StringVariable
 from libs.datetime_utils import naive_utc_now
 from libs.uuid_utils import uuidv7
 
@@ -53,11 +53,10 @@ if TYPE_CHECKING:
     from .model import AppMode, UploadFile
 
 
-from graphon.variables import SecretVariable, Segment, SegmentType, VariableBase
-
 from constants import DEFAULT_FILE_NUMBER_LIMITS, HIDDEN_VALUE
 from core.helper import encrypter
 from factories import variable_factory
+from graphon.variables import SecretVariable, Segment, SegmentType, VariableBase
 from libs import helper
 
 from .account import Account
diff --git a/api/repositories/api_workflow_run_repository.py b/api/repositories/api_workflow_run_repository.py
index 100589804c..72b38e7906 100644
--- a/api/repositories/api_workflow_run_repository.py
+++ b/api/repositories/api_workflow_run_repository.py
@@ -38,11 +38,11 @@ from collections.abc import Callable, Sequence
 from datetime import datetime
 from typing import Protocol, TypedDict
 
-from graphon.entities.pause_reason import PauseReason
-from graphon.enums import WorkflowType
 from sqlalchemy.orm import Session
 
 from core.repositories.factory import WorkflowExecutionRepository
+from graphon.entities.pause_reason import PauseReason
+from graphon.enums import WorkflowType
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models.enums import WorkflowRunTriggeredFrom
 from models.workflow import WorkflowAppLog, WorkflowArchiveLog, WorkflowPause, WorkflowPauseReason, WorkflowRun
diff --git a/api/repositories/sqlalchemy_api_workflow_node_execution_repository.py b/api/repositories/sqlalchemy_api_workflow_node_execution_repository.py
index d5c6a203b1..44735eb769 100644
--- a/api/repositories/sqlalchemy_api_workflow_node_execution_repository.py
+++ b/api/repositories/sqlalchemy_api_workflow_node_execution_repository.py
@@ -10,11 +10,11 @@ from collections.abc import Sequence
 from datetime import datetime
 from typing import Protocol, cast
 
-from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from sqlalchemy import asc, delete, desc, func, select
 from sqlalchemy.engine import CursorResult
 from sqlalchemy.orm import Session, sessionmaker
 
+from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionOffload
 from repositories.api_workflow_node_execution_repository import (
     DifyAPIWorkflowNodeExecutionRepository,
diff --git a/api/repositories/sqlalchemy_api_workflow_run_repository.py b/api/repositories/sqlalchemy_api_workflow_run_repository.py
index b760696c5e..474b200fc5 100644
--- a/api/repositories/sqlalchemy_api_workflow_run_repository.py
+++ b/api/repositories/sqlalchemy_api_workflow_run_repository.py
@@ -28,15 +28,15 @@ from decimal import Decimal
 from typing import Any, cast
 
 import sqlalchemy as sa
-from graphon.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
-from graphon.enums import WorkflowExecutionStatus, WorkflowType
-from graphon.nodes.human_input.entities import FormDefinition
 from pydantic import ValidationError
 from sqlalchemy import and_, delete, func, null, or_, select, tuple_
 from sqlalchemy.engine import CursorResult
 from sqlalchemy.orm import Session, selectinload, sessionmaker
 
 from extensions.ext_storage import storage
+from graphon.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
+from graphon.enums import WorkflowExecutionStatus, WorkflowType
+from graphon.nodes.human_input.entities import FormDefinition
 from libs.datetime_utils import naive_utc_now
 from libs.helper import convert_datetime_to_date
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
diff --git a/api/repositories/sqlalchemy_execution_extra_content_repository.py b/api/repositories/sqlalchemy_execution_extra_content_repository.py
index feba5f7eb6..67f8795d3f 100644
--- a/api/repositories/sqlalchemy_execution_extra_content_repository.py
+++ b/api/repositories/sqlalchemy_execution_extra_content_repository.py
@@ -7,9 +7,6 @@ from collections import defaultdict
 from collections.abc import Sequence
 from typing import Any
 
-from graphon.nodes.human_input.entities import FormDefinition
-from graphon.nodes.human_input.enums import HumanInputFormStatus
-from graphon.nodes.human_input.human_input_node import HumanInputNode
 from sqlalchemy import select
 from sqlalchemy.orm import Session, selectinload, sessionmaker
 
@@ -21,6 +18,9 @@ from core.entities.execution_extra_content import (
 from core.entities.execution_extra_content import (
     HumanInputContent as HumanInputContentDomainModel,
 )
+from graphon.nodes.human_input.entities import FormDefinition
+from graphon.nodes.human_input.enums import HumanInputFormStatus
+from graphon.nodes.human_input.human_input_node import HumanInputNode
 from models.execution_extra_content import (
     ExecutionExtraContent as ExecutionExtraContentModel,
 )
diff --git a/api/services/app_dsl_service.py b/api/services/app_dsl_service.py
index 74b800606d..78806927bc 100644
--- a/api/services/app_dsl_service.py
+++ b/api/services/app_dsl_service.py
@@ -10,12 +10,6 @@ from uuid import uuid4
 import yaml
 from Crypto.Cipher import AES
 from Crypto.Util.Padding import pad, unpad
-from graphon.enums import BuiltinNodeTypes
-from graphon.model_runtime.utils.encoders import jsonable_encoder
-from graphon.nodes.llm.entities import LLMNodeData
-from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
-from graphon.nodes.question_classifier.entities import QuestionClassifierNodeData
-from graphon.nodes.tool.entities import ToolNodeData
 from packaging import version
 from packaging.version import parse as parse_version
 from pydantic import BaseModel
@@ -35,6 +29,12 @@ from core.workflow.nodes.trigger_schedule.trigger_schedule_node import TriggerSc
 from events.app_event import app_model_config_was_updated, app_was_created
 from extensions.ext_redis import redis_client
 from factories import variable_factory
+from graphon.enums import BuiltinNodeTypes
+from graphon.model_runtime.utils.encoders import jsonable_encoder
+from graphon.nodes.llm.entities import LLMNodeData
+from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
+from graphon.nodes.question_classifier.entities import QuestionClassifierNodeData
+from graphon.nodes.tool.entities import ToolNodeData
 from libs.datetime_utils import naive_utc_now
 from models import Account, App, AppMode
 from models.model import AppModelConfig, AppModelConfigDict, IconType
diff --git a/api/services/app_service.py b/api/services/app_service.py
index ef170c50ba..afd98e2975 100644
--- a/api/services/app_service.py
+++ b/api/services/app_service.py
@@ -4,8 +4,6 @@ from typing import Any, TypedDict, cast
 
 import sqlalchemy as sa
 from flask_sqlalchemy.pagination import Pagination
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from sqlalchemy import select
 
 from configs import dify_config
@@ -17,6 +15,8 @@ from core.tools.tool_manager import ToolManager
 from core.tools.utils.configuration import ToolParameterConfigurationManager
 from events.app_event import app_was_created, app_was_deleted, app_was_updated
 from extensions.ext_database import db
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
+from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from libs.datetime_utils import naive_utc_now
 from libs.login import current_user
 from models import Account
diff --git a/api/services/app_task_service.py b/api/services/app_task_service.py
index 0842e9d3e7..6e9d6b1c73 100644
--- a/api/services/app_task_service.py
+++ b/api/services/app_task_service.py
@@ -5,11 +5,10 @@ like stopping tasks, handling both legacy Redis flag mechanism and
 new GraphEngine command channel mechanism.
 """
 
-from graphon.graph_engine.manager import GraphEngineManager
-
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.entities.app_invoke_entities import InvokeFrom
 from extensions.ext_redis import redis_client
+from graphon.graph_engine.manager import GraphEngineManager
 from models.model import AppMode
 
 
diff --git a/api/services/audio_service.py b/api/services/audio_service.py
index 1c7027efb4..60948e652b 100644
--- a/api/services/audio_service.py
+++ b/api/services/audio_service.py
@@ -5,12 +5,12 @@ from collections.abc import Generator
 from typing import cast
 
 from flask import Response, stream_with_context
-from graphon.model_runtime.entities.model_entities import ModelType
 from werkzeug.datastructures import FileStorage
 
 from constants import AUDIO_EXTENSIONS
 from core.model_manager import ModelManager
 from extensions.ext_database import db
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.enums import MessageStatus
 from models.model import App, AppMode, Message
 from services.errors.audio import (
diff --git a/api/services/clear_free_plan_tenant_expired_logs.py b/api/services/clear_free_plan_tenant_expired_logs.py
index ea12e40420..dcc93b4b0f 100644
--- a/api/services/clear_free_plan_tenant_expired_logs.py
+++ b/api/services/clear_free_plan_tenant_expired_logs.py
@@ -6,7 +6,6 @@ from concurrent.futures import ThreadPoolExecutor
 
 import click
 from flask import Flask, current_app
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from sqlalchemy import delete, func, select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -14,6 +13,7 @@ from configs import dify_config
 from enums.cloud_plan import CloudPlan
 from extensions.ext_database import db
 from extensions.ext_storage import storage
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from models.account import Tenant
 from models.model import (
     App,
diff --git a/api/services/conversation_service.py b/api/services/conversation_service.py
index f5085af59b..ee8a1c4edd 100644
--- a/api/services/conversation_service.py
+++ b/api/services/conversation_service.py
@@ -3,7 +3,6 @@ import logging
 from collections.abc import Callable, Sequence
 from typing import Any
 
-from graphon.variables.types import SegmentType
 from sqlalchemy import asc, desc, func, or_, select
 from sqlalchemy.orm import Session
 
@@ -13,6 +12,7 @@ from core.db.session_factory import session_factory
 from core.llm_generator.llm_generator import LLMGenerator
 from extensions.ext_database import db
 from factories import variable_factory
+from graphon.variables.types import SegmentType
 from libs.datetime_utils import naive_utc_now
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models import Account, ConversationVariable
diff --git a/api/services/conversation_variable_updater.py b/api/services/conversation_variable_updater.py
index 95a8951951..287d513f48 100644
--- a/api/services/conversation_variable_updater.py
+++ b/api/services/conversation_variable_updater.py
@@ -1,7 +1,7 @@
-from graphon.variables.variables import VariableBase
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
+from graphon.variables.variables import VariableBase
 from models import ConversationVariable
 
 
diff --git a/api/services/dataset_service.py b/api/services/dataset_service.py
index 6c6de192c6..e6f5f80a6d 100644
--- a/api/services/dataset_service.py
+++ b/api/services/dataset_service.py
@@ -10,9 +10,6 @@ from collections.abc import Sequence
 from typing import Any, Literal, TypedDict, cast
 
 import sqlalchemy as sa
-from graphon.file import helpers as file_helpers
-from graphon.model_runtime.entities.model_entities import ModelFeature, ModelType
-from graphon.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 from redis.exceptions import LockNotOwnedError
 from sqlalchemy import delete, exists, func, select, update
 from sqlalchemy.orm import Session, sessionmaker
@@ -31,6 +28,9 @@ from events.dataset_event import dataset_was_deleted
 from events.document_event import document_was_deleted
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
+from graphon.file import helpers as file_helpers
+from graphon.model_runtime.entities.model_entities import ModelFeature, ModelType
+from graphon.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 from libs import helper
 from libs.datetime_utils import naive_utc_now
 from libs.login import current_user
diff --git a/api/services/datasource_provider_service.py b/api/services/datasource_provider_service.py
index 364c4a86a0..416bc8cef9 100644
--- a/api/services/datasource_provider_service.py
+++ b/api/services/datasource_provider_service.py
@@ -3,7 +3,6 @@ import time
 from collections.abc import Mapping
 from typing import Any
 
-from graphon.model_runtime.entities.provider_entities import FormType
 from sqlalchemy import delete, func, select, update
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -18,6 +17,7 @@ from core.plugin.impl.oauth import OAuthHandler
 from core.tools.utils.encryption import ProviderConfigCache, ProviderConfigEncrypter, create_provider_encrypter
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
+from graphon.model_runtime.entities.provider_entities import FormType
 from models.oauth import DatasourceOauthParamConfig, DatasourceOauthTenantParamConfig, DatasourceProvider
 from models.provider_ids import DatasourceProviderID
 from services.plugin.plugin_service import PluginService
diff --git a/api/services/entities/model_provider_entities.py b/api/services/entities/model_provider_entities.py
index a944ef6acd..6679c08ebd 100644
--- a/api/services/entities/model_provider_entities.py
+++ b/api/services/entities/model_provider_entities.py
@@ -1,15 +1,6 @@
 from collections.abc import Sequence
 from enum import StrEnum
 
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.entities.provider_entities import (
-    ConfigurateMethod,
-    ModelCredentialSchema,
-    ProviderCredentialSchema,
-    ProviderHelpEntity,
-    SimpleProviderEntity,
-)
 from pydantic import BaseModel, ConfigDict, model_validator
 
 from configs import dify_config
@@ -24,6 +15,15 @@ from core.entities.provider_entities import (
     QuotaConfiguration,
     UnaddedModelConfiguration,
 )
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.entities.provider_entities import (
+    ConfigurateMethod,
+    ModelCredentialSchema,
+    ProviderCredentialSchema,
+    ProviderHelpEntity,
+    SimpleProviderEntity,
+)
 from models.provider import ProviderType
 
 
diff --git a/api/services/external_knowledge_service.py b/api/services/external_knowledge_service.py
index 6dcedfdced..60b457ecd0 100644
--- a/api/services/external_knowledge_service.py
+++ b/api/services/external_knowledge_service.py
@@ -4,13 +4,13 @@ from typing import Any, cast
 from urllib.parse import urlparse
 
 import httpx
-from graphon.nodes.http_request.exc import InvalidHttpMethodError
 from sqlalchemy import func, select
 
 from constants import HIDDEN_VALUE
 from core.helper import ssrf_proxy
 from core.rag.entities import MetadataFilteringCondition
 from extensions.ext_database import db
+from graphon.nodes.http_request.exc import InvalidHttpMethodError
 from libs.datetime_utils import naive_utc_now
 from models.dataset import (
     Dataset,
diff --git a/api/services/file_service.py b/api/services/file_service.py
index 79a935de4b..52da2a7951 100644
--- a/api/services/file_service.py
+++ b/api/services/file_service.py
@@ -8,7 +8,6 @@ from tempfile import NamedTemporaryFile
 from typing import Literal
 from zipfile import ZIP_DEFLATED, ZipFile
 
-from graphon.file import helpers as file_helpers
 from sqlalchemy import Engine, select
 from sqlalchemy.orm import Session, sessionmaker
 from werkzeug.exceptions import NotFound
@@ -24,6 +23,7 @@ from core.rag.extractor.extract_processor import ExtractProcessor
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from extensions.storage.storage_type import StorageType
+from graphon.file import helpers as file_helpers
 from libs.datetime_utils import naive_utc_now
 from libs.helper import extract_tenant_id
 from models import Account
diff --git a/api/services/hit_testing_service.py b/api/services/hit_testing_service.py
index 43985e49cd..ca84b2a3d8 100644
--- a/api/services/hit_testing_service.py
+++ b/api/services/hit_testing_service.py
@@ -3,8 +3,6 @@ import logging
 import time
 from typing import Any, TypedDict
 
-from graphon.model_runtime.entities import LLMMode
-
 from core.app.app_config.entities import ModelConfig
 from core.rag.datasource.retrieval_service import RetrievalService
 from core.rag.index_processor.constant.query_type import QueryType
@@ -12,6 +10,7 @@ from core.rag.models.document import Document
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from extensions.ext_database import db
+from graphon.model_runtime.entities import LLMMode
 from models import Account
 from models.dataset import Dataset, DatasetQuery
 from models.enums import CreatorUserRole, DatasetQuerySource
diff --git a/api/services/human_input_delivery_test_service.py b/api/services/human_input_delivery_test_service.py
index 77576fa4c0..68ef67dec1 100644
--- a/api/services/human_input_delivery_test_service.py
+++ b/api/services/human_input_delivery_test_service.py
@@ -4,7 +4,6 @@ from dataclasses import dataclass, field
 from enum import StrEnum
 from typing import Protocol
 
-from graphon.runtime import VariablePool
 from sqlalchemy import Engine, select
 from sqlalchemy.orm import sessionmaker
 
@@ -18,6 +17,7 @@ from core.workflow.human_input_compat import (
 )
 from extensions.ext_database import db
 from extensions.ext_mail import mail
+from graphon.runtime import VariablePool
 from libs.email_template_renderer import render_email_template
 from models import Account, TenantAccountJoin
 from services.feature_service import FeatureService
diff --git a/api/services/human_input_service.py b/api/services/human_input_service.py
index 02a6620fc7..76598d31ac 100644
--- a/api/services/human_input_service.py
+++ b/api/services/human_input_service.py
@@ -3,12 +3,6 @@ from collections.abc import Mapping
 from datetime import datetime, timedelta
 from typing import Any
 
-from graphon.nodes.human_input.entities import (
-    FormDefinition,
-    HumanInputSubmissionValidationError,
-    validate_human_input_submission,
-)
-from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from sqlalchemy import Engine, select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -17,6 +11,12 @@ from core.repositories.human_input_repository import (
     HumanInputFormRecord,
     HumanInputFormSubmissionRepository,
 )
+from graphon.nodes.human_input.entities import (
+    FormDefinition,
+    HumanInputSubmissionValidationError,
+    validate_human_input_submission,
+)
+from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from libs.datetime_utils import ensure_naive_utc, naive_utc_now
 from libs.exception import BaseHTTPException
 from models.human_input import RecipientType
diff --git a/api/services/message_service.py b/api/services/message_service.py
index 5b133b0c04..98f24dd6a6 100644
--- a/api/services/message_service.py
+++ b/api/services/message_service.py
@@ -1,6 +1,5 @@
 from collections.abc import Sequence
 
-from graphon.model_runtime.entities.model_entities import ModelType
 from pydantic import TypeAdapter
 from sqlalchemy import select
 from sqlalchemy.orm import sessionmaker
@@ -14,6 +13,7 @@ from core.ops.entities.trace_entity import TraceTaskName
 from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
 from core.ops.utils import measure_time
 from extensions.ext_database import db
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models import Account
 from models.enums import FeedbackFromSource, FeedbackRating
diff --git a/api/services/model_load_balancing_service.py b/api/services/model_load_balancing_service.py
index b652e049ce..c269346f5f 100644
--- a/api/services/model_load_balancing_service.py
+++ b/api/services/model_load_balancing_service.py
@@ -2,12 +2,6 @@ import json
 import logging
 from typing import Any, TypedDict
 
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.entities.provider_entities import (
-    ModelCredentialSchema,
-    ProviderCredentialSchema,
-)
-from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from sqlalchemy import or_, select
 
 from constants import HIDDEN_VALUE
@@ -18,6 +12,12 @@ from core.model_manager import LBModelManager
 from core.plugin.impl.model_runtime_factory import create_plugin_model_assembly, create_plugin_provider_manager
 from core.provider_manager import ProviderManager
 from extensions.ext_database import db
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.entities.provider_entities import (
+    ModelCredentialSchema,
+    ProviderCredentialSchema,
+)
+from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from libs.datetime_utils import naive_utc_now
 from models.enums import CredentialSourceType
 from models.provider import LoadBalancingModelConfig, ProviderCredential, ProviderModelCredential
diff --git a/api/services/model_provider_service.py b/api/services/model_provider_service.py
index bf208c9bc7..51cda79661 100644
--- a/api/services/model_provider_service.py
+++ b/api/services/model_provider_service.py
@@ -1,11 +1,10 @@
 import logging
 from typing import Any
 
-from graphon.model_runtime.entities.model_entities import ModelType, ParameterRule
-
 from core.entities.model_entities import ModelWithProviderEntity, ProviderModelWithStatusEntity
 from core.plugin.impl.model_runtime_factory import create_plugin_model_provider_factory, create_plugin_provider_manager
 from core.provider_manager import ProviderManager
+from graphon.model_runtime.entities.model_entities import ModelType, ParameterRule
 from models.provider import ProviderType
 from services.entities.model_provider_entities import (
     CustomConfigurationResponse,
diff --git a/api/services/rag_pipeline/rag_pipeline.py b/api/services/rag_pipeline/rag_pipeline.py
index 605689226a..968600d1bc 100644
--- a/api/services/rag_pipeline/rag_pipeline.py
+++ b/api/services/rag_pipeline/rag_pipeline.py
@@ -9,15 +9,6 @@ from typing import Any, cast
 from uuid import uuid4
 
 from flask_login import current_user
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import BuiltinNodeTypes, ErrorStrategy, NodeType, WorkflowNodeExecutionStatus
-from graphon.errors import WorkflowNodeRunFailedError
-from graphon.graph_events import GraphNodeEventBase, NodeRunFailedEvent, NodeRunSucceededEvent
-from graphon.node_events import NodeRunResult
-from graphon.nodes.base.node import Node
-from graphon.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, build_http_request_config
-from graphon.runtime import VariablePool
-from graphon.variables.variables import Variable, VariableBase
 from sqlalchemy import func, select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -53,6 +44,15 @@ from core.workflow.variable_pool_initializer import add_variables_to_pool
 from core.workflow.workflow_entry import WorkflowEntry
 from enterprise.telemetry.draft_trace import enqueue_draft_node_execution_trace
 from extensions.ext_database import db
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import BuiltinNodeTypes, ErrorStrategy, NodeType, WorkflowNodeExecutionStatus
+from graphon.errors import WorkflowNodeRunFailedError
+from graphon.graph_events import GraphNodeEventBase, NodeRunFailedEvent, NodeRunSucceededEvent
+from graphon.node_events import NodeRunResult
+from graphon.nodes.base.node import Node
+from graphon.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, build_http_request_config
+from graphon.runtime import VariablePool
+from graphon.variables.variables import Variable, VariableBase
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models import Account
 from models.dataset import (  # type: ignore
diff --git a/api/services/rag_pipeline/rag_pipeline_dsl_service.py b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
index 7dd86f1581..f315d053cb 100644
--- a/api/services/rag_pipeline/rag_pipeline_dsl_service.py
+++ b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
@@ -13,12 +13,6 @@ import yaml  # type: ignore
 from Crypto.Cipher import AES
 from Crypto.Util.Padding import pad, unpad
 from flask_login import current_user
-from graphon.enums import BuiltinNodeTypes
-from graphon.model_runtime.utils.encoders import jsonable_encoder
-from graphon.nodes.llm.entities import LLMNodeData
-from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
-from graphon.nodes.question_classifier.entities import QuestionClassifierNodeData
-from graphon.nodes.tool.entities import ToolNodeData
 from packaging import version
 from pydantic import BaseModel
 from sqlalchemy import select
@@ -33,6 +27,12 @@ from core.workflow.nodes.knowledge_index import KNOWLEDGE_INDEX_NODE_TYPE
 from core.workflow.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
 from extensions.ext_redis import redis_client
 from factories import variable_factory
+from graphon.enums import BuiltinNodeTypes
+from graphon.model_runtime.utils.encoders import jsonable_encoder
+from graphon.nodes.llm.entities import LLMNodeData
+from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
+from graphon.nodes.question_classifier.entities import QuestionClassifierNodeData
+from graphon.nodes.tool.entities import ToolNodeData
 from models import Account
 from models.dataset import Dataset, DatasetCollectionBinding, Pipeline
 from models.enums import CollectionBindingType, DatasetRuntimeMode
diff --git a/api/services/retention/workflow_run/archive_paid_plan_workflow_run.py b/api/services/retention/workflow_run/archive_paid_plan_workflow_run.py
index ab60986bfe..21be411bea 100644
--- a/api/services/retention/workflow_run/archive_paid_plan_workflow_run.py
+++ b/api/services/retention/workflow_run/archive_paid_plan_workflow_run.py
@@ -27,13 +27,13 @@ from dataclasses import dataclass, field
 from typing import Any, TypedDict
 
 import click
-from graphon.enums import WorkflowType
 from sqlalchemy import inspect
 from sqlalchemy.orm import Session, sessionmaker
 
 from configs import dify_config
 from enums.cloud_plan import CloudPlan
 from extensions.ext_database import db
+from graphon.enums import WorkflowType
 from libs.archive_storage import (
     ArchiveStorage,
     ArchiveStorageNotConfiguredError,
diff --git a/api/services/summary_index_service.py b/api/services/summary_index_service.py
index c906e3bca3..a91f49e9e6 100644
--- a/api/services/summary_index_service.py
+++ b/api/services/summary_index_service.py
@@ -6,8 +6,6 @@ import uuid
 from datetime import UTC, datetime
 from typing import TypedDict, cast
 
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -18,6 +16,8 @@ from core.rag.index_processor.constant.doc_type import DocType
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from core.rag.index_processor.index_processor_base import SummaryIndexSettingDict
 from core.rag.models.document import Document
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs import helper
 from models.dataset import Dataset, DocumentSegment, DocumentSegmentSummary
 from models.dataset import Document as DatasetDocument
diff --git a/api/services/tools/api_tools_manage_service.py b/api/services/tools/api_tools_manage_service.py
index 3bfa221528..8ad010f62d 100644
--- a/api/services/tools/api_tools_manage_service.py
+++ b/api/services/tools/api_tools_manage_service.py
@@ -2,7 +2,6 @@ import json
 import logging
 from typing import Any, TypedDict, cast
 
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from httpx import get
 from sqlalchemy import select
 
@@ -21,6 +20,7 @@ from core.tools.tool_manager import ToolManager
 from core.tools.utils.encryption import create_tool_provider_encrypter
 from core.tools.utils.parser import ApiBasedToolSchemaParser
 from extensions.ext_database import db
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from models.tools import ApiToolProvider
 from services.tools.tools_transform_service import ToolTransformService
 
diff --git a/api/services/tools/workflow_tools_manage_service.py b/api/services/tools/workflow_tools_manage_service.py
index be2572b592..8f6600af03 100644
--- a/api/services/tools/workflow_tools_manage_service.py
+++ b/api/services/tools/workflow_tools_manage_service.py
@@ -3,7 +3,6 @@ import logging
 from datetime import datetime
 from typing import Any
 
-from graphon.model_runtime.utils.encoders import jsonable_encoder
 from sqlalchemy import delete, or_, select
 from sqlalchemy.orm import sessionmaker
 
@@ -15,6 +14,7 @@ from core.tools.utils.workflow_configuration_sync import WorkflowToolConfigurati
 from core.tools.workflow_as_tool.provider import WorkflowToolProviderController
 from core.tools.workflow_as_tool.tool import WorkflowTool
 from extensions.ext_database import db
+from graphon.model_runtime.utils.encoders import jsonable_encoder
 from models.model import App
 from models.tools import WorkflowToolProvider
 from models.workflow import Workflow
diff --git a/api/services/trigger/schedule_service.py b/api/services/trigger/schedule_service.py
index 25e80770b8..a827222c1d 100644
--- a/api/services/trigger/schedule_service.py
+++ b/api/services/trigger/schedule_service.py
@@ -2,7 +2,6 @@ import json
 import logging
 from datetime import datetime
 
-from graphon.entities.graph_config import NodeConfigDict
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -14,6 +13,7 @@ from core.workflow.nodes.trigger_schedule.entities import (
     VisualConfig,
 )
 from core.workflow.nodes.trigger_schedule.exc import ScheduleConfigError, ScheduleNotFoundError
+from graphon.entities.graph_config import NodeConfigDict
 from libs.schedule_utils import calculate_next_run_at, convert_12h_to_24h
 from models.account import Account, TenantAccountJoin
 from models.trigger import WorkflowSchedulePlan
diff --git a/api/services/trigger/trigger_service.py b/api/services/trigger/trigger_service.py
index 5a5d13b96d..911331e357 100644
--- a/api/services/trigger/trigger_service.py
+++ b/api/services/trigger/trigger_service.py
@@ -5,7 +5,6 @@ from collections.abc import Mapping
 from typing import Any
 
 from flask import Request, Response
-from graphon.entities.graph_config import NodeConfigDict
 from pydantic import BaseModel
 from sqlalchemy import select
 from sqlalchemy.orm import sessionmaker
@@ -21,6 +20,7 @@ from core.trigger.utils.encryption import create_trigger_provider_encrypter_for_
 from core.workflow.nodes.trigger_plugin.entities import TriggerEventNodeData
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
+from graphon.entities.graph_config import NodeConfigDict
 from models.model import App
 from models.provider_ids import TriggerProviderID
 from models.trigger import TriggerSubscription, WorkflowPluginTrigger
diff --git a/api/services/trigger/webhook_service.py b/api/services/trigger/webhook_service.py
index bb767a6759..ca4e43e516 100644
--- a/api/services/trigger/webhook_service.py
+++ b/api/services/trigger/webhook_service.py
@@ -7,9 +7,6 @@ from typing import Any, NotRequired, TypedDict
 
 import orjson
 from flask import request
-from graphon.entities.graph_config import NodeConfigDict
-from graphon.file import FileTransferMethod
-from graphon.variables.types import ArrayValidation, SegmentType
 from pydantic import BaseModel
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
@@ -31,6 +28,9 @@ from enums.quota_type import QuotaType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from factories import file_factory
+from graphon.entities.graph_config import NodeConfigDict
+from graphon.file import FileTransferMethod
+from graphon.variables.types import ArrayValidation, SegmentType
 from models.enums import AppTriggerStatus, AppTriggerType
 from models.model import App
 from models.trigger import AppTrigger, WorkflowWebhookTrigger
diff --git a/api/services/variable_truncator.py b/api/services/variable_truncator.py
index 4d58a9cf12..c96050ce13 100644
--- a/api/services/variable_truncator.py
+++ b/api/services/variable_truncator.py
@@ -5,6 +5,7 @@ from abc import ABC, abstractmethod
 from collections.abc import Mapping
 from typing import Any, overload
 
+from configs import dify_config
 from graphon.file import File
 from graphon.nodes.variable_assigner.common.helpers import UpdatedVariable
 from graphon.variables.segments import (
@@ -21,8 +22,6 @@ from graphon.variables.segments import (
 )
 from graphon.variables.utils import dumps_with_segments
 
-from configs import dify_config
-
 _MAX_DEPTH = 100
 
 
diff --git a/api/services/vector_service.py b/api/services/vector_service.py
index 9827c8dfbc..58193d75a9 100644
--- a/api/services/vector_service.py
+++ b/api/services/vector_service.py
@@ -1,6 +1,5 @@
 import logging
 
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy import delete, select
 
 from core.model_manager import ModelInstance, ModelManager
@@ -13,6 +12,7 @@ from core.rag.index_processor.index_processor_base import BaseIndexProcessor
 from core.rag.index_processor.index_processor_factory import IndexProcessorFactory
 from core.rag.models.document import AttachmentDocument, Document
 from extensions.ext_database import db
+from graphon.model_runtime.entities.model_entities import ModelType
 from models import UploadFile
 from models.dataset import ChildChunk, Dataset, DatasetProcessRule, DocumentSegment, SegmentAttachmentBinding
 from models.dataset import Document as DatasetDocument
diff --git a/api/services/workflow/workflow_converter.py b/api/services/workflow/workflow_converter.py
index 1582bcd46c..5dedb9e372 100644
--- a/api/services/workflow/workflow_converter.py
+++ b/api/services/workflow/workflow_converter.py
@@ -1,11 +1,6 @@
 import json
 from typing import Any, TypedDict
 
-from graphon.file import FileUploadConfig
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.utils.encoders import jsonable_encoder
-from graphon.nodes import BuiltinNodeTypes
-from graphon.variables.input_entities import VariableEntity
 from sqlalchemy import select
 
 from core.app.app_config.entities import (
@@ -24,6 +19,11 @@ from core.prompt.simple_prompt_transform import SimplePromptTransform
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from events.app_event import app_was_created
 from extensions.ext_database import db
+from graphon.file import FileUploadConfig
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.utils.encoders import jsonable_encoder
+from graphon.nodes import BuiltinNodeTypes
+from graphon.variables.input_entities import VariableEntity
 from models import Account
 from models.api_based_extension import APIBasedExtension, APIBasedExtensionPoint
 from models.model import App, AppMode, AppModelConfig, IconType
diff --git a/api/services/workflow_app_service.py b/api/services/workflow_app_service.py
index b5ab176ad2..59e02ec9b9 100644
--- a/api/services/workflow_app_service.py
+++ b/api/services/workflow_app_service.py
@@ -3,10 +3,10 @@ import uuid
 from datetime import datetime
 from typing import Any, TypedDict
 
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy import and_, func, or_, select
 from sqlalchemy.orm import Session
 
+from graphon.enums import WorkflowExecutionStatus
 from models import Account, App, EndUser, TenantAccountJoin, WorkflowAppLog, WorkflowArchiveLog, WorkflowRun
 from models.enums import AppTriggerType, CreatorUserRole
 from models.trigger import WorkflowTriggerLog
diff --git a/api/services/workflow_draft_variable_service.py b/api/services/workflow_draft_variable_service.py
index 2cc6e21574..5ec00ee336 100644
--- a/api/services/workflow_draft_variable_service.py
+++ b/api/services/workflow_draft_variable_service.py
@@ -7,19 +7,6 @@ from datetime import datetime
 from enum import StrEnum
 from typing import Any, ClassVar, NotRequired, TypedDict
 
-from graphon.enums import NodeType
-from graphon.file import File
-from graphon.nodes import BuiltinNodeTypes
-from graphon.nodes.variable_assigner.common.helpers import get_updated_variables
-from graphon.variable_loader import VariableLoader
-from graphon.variables import Segment, StringSegment, VariableBase
-from graphon.variables.consts import SELECTORS_LENGTH
-from graphon.variables.segments import (
-    ArrayFileSegment,
-    FileSegment,
-)
-from graphon.variables.types import SegmentType
-from graphon.variables.utils import dumps_with_segments
 from sqlalchemy import Engine, delete, orm, select
 from sqlalchemy.dialects.mysql import insert as mysql_insert
 from sqlalchemy.dialects.postgresql import insert as pg_insert
@@ -40,6 +27,19 @@ from core.workflow.variable_prefixes import (
 from extensions.ext_storage import storage
 from factories.file_factory import StorageKeyLoader
 from factories.variable_factory import build_segment, segment_to_variable
+from graphon.enums import NodeType
+from graphon.file import File
+from graphon.nodes import BuiltinNodeTypes
+from graphon.nodes.variable_assigner.common.helpers import get_updated_variables
+from graphon.variable_loader import VariableLoader
+from graphon.variables import Segment, StringSegment, VariableBase
+from graphon.variables.consts import SELECTORS_LENGTH
+from graphon.variables.segments import (
+    ArrayFileSegment,
+    FileSegment,
+)
+from graphon.variables.types import SegmentType
+from graphon.variables.utils import dumps_with_segments
 from libs.datetime_utils import naive_utc_now
 from libs.uuid_utils import uuidv7
 from models import Account, App, Conversation
diff --git a/api/services/workflow_event_snapshot_service.py b/api/services/workflow_event_snapshot_service.py
index 601e9261fc..5fca444723 100644
--- a/api/services/workflow_event_snapshot_service.py
+++ b/api/services/workflow_event_snapshot_service.py
@@ -9,10 +9,6 @@ from collections.abc import Generator, Mapping, Sequence
 from dataclasses import dataclass
 from typing import Any
 
-from graphon.entities import WorkflowStartReason
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-from graphon.runtime import GraphRuntimeState
-from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from sqlalchemy import desc, select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -26,6 +22,10 @@ from core.app.entities.task_entities import (
     WorkflowStartStreamResponse,
 )
 from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext
+from graphon.entities import WorkflowStartReason
+from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
+from graphon.runtime import GraphRuntimeState
+from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from models.model import AppMode, Message
 from models.workflow import WorkflowNodeExecutionTriggeredFrom, WorkflowRun
 from repositories.api_workflow_node_execution_repository import WorkflowNodeExecutionSnapshot
diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py
index 55a93c33b1..d71223314e 100644
--- a/api/services/workflow_service.py
+++ b/api/services/workflow_service.py
@@ -5,31 +5,6 @@ import uuid
 from collections.abc import Callable, Generator, Mapping, Sequence
 from typing import Any, cast
 
-from graphon.entities import WorkflowNodeExecution
-from graphon.entities.graph_config import NodeConfigDict
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.enums import (
-    ErrorStrategy,
-    NodeType,
-    WorkflowNodeExecutionMetadataKey,
-    WorkflowNodeExecutionStatus,
-)
-from graphon.errors import WorkflowNodeRunFailedError
-from graphon.file import File
-from graphon.graph_events import GraphNodeEventBase, NodeRunFailedEvent, NodeRunSucceededEvent
-from graphon.node_events import NodeRunResult
-from graphon.nodes import BuiltinNodeTypes
-from graphon.nodes.base.node import Node
-from graphon.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, build_http_request_config
-from graphon.nodes.human_input.entities import HumanInputNodeData, validate_human_input_submission
-from graphon.nodes.human_input.enums import HumanInputFormKind
-from graphon.nodes.human_input.human_input_node import HumanInputNode
-from graphon.nodes.start.entities import StartNodeData
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variable_loader import load_into_variable_pool
-from graphon.variables import VariableBase
-from graphon.variables.input_entities import VariableEntityType
-from graphon.variables.variables import Variable
 from sqlalchemy import exists, select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -64,6 +39,31 @@ from events.app_event import app_draft_workflow_was_synced, app_published_workfl
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from factories.file_factory import build_from_mapping, build_from_mappings
+from graphon.entities import WorkflowNodeExecution
+from graphon.entities.graph_config import NodeConfigDict
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.enums import (
+    ErrorStrategy,
+    NodeType,
+    WorkflowNodeExecutionMetadataKey,
+    WorkflowNodeExecutionStatus,
+)
+from graphon.errors import WorkflowNodeRunFailedError
+from graphon.file import File
+from graphon.graph_events import GraphNodeEventBase, NodeRunFailedEvent, NodeRunSucceededEvent
+from graphon.node_events import NodeRunResult
+from graphon.nodes import BuiltinNodeTypes
+from graphon.nodes.base.node import Node
+from graphon.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, build_http_request_config
+from graphon.nodes.human_input.entities import HumanInputNodeData, validate_human_input_submission
+from graphon.nodes.human_input.enums import HumanInputFormKind
+from graphon.nodes.human_input.human_input_node import HumanInputNode
+from graphon.nodes.start.entities import StartNodeData
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variable_loader import load_into_variable_pool
+from graphon.variables import VariableBase
+from graphon.variables.input_entities import VariableEntityType
+from graphon.variables.variables import Variable
 from libs.datetime_utils import naive_utc_now
 from models import Account
 from models.human_input import HumanInputFormRecipient, RecipientType
diff --git a/api/tasks/app_generate/workflow_execute_task.py b/api/tasks/app_generate/workflow_execute_task.py
index 8f2f5f261e..c22e7e9918 100644
--- a/api/tasks/app_generate/workflow_execute_task.py
+++ b/api/tasks/app_generate/workflow_execute_task.py
@@ -7,7 +7,6 @@ from typing import Annotated, Any
 
 from celery import shared_task
 from flask import current_app, json
-from graphon.runtime import GraphRuntimeState
 from pydantic import BaseModel, Discriminator, Field, Tag
 from sqlalchemy import Engine, select
 from sqlalchemy.orm import Session, sessionmaker
@@ -23,6 +22,7 @@ from core.app.entities.app_invoke_entities import (
 from core.app.layers.pause_state_persist_layer import PauseStateLayerConfig, WorkflowResumptionContext
 from core.repositories import DifyCoreRepositoryFactory
 from extensions.ext_database import db
+from graphon.runtime import GraphRuntimeState
 from libs.flask_utils import set_login_user
 from models.account import Account
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
diff --git a/api/tasks/async_workflow_tasks.py b/api/tasks/async_workflow_tasks.py
index 9ff34c7c48..5809268992 100644
--- a/api/tasks/async_workflow_tasks.py
+++ b/api/tasks/async_workflow_tasks.py
@@ -10,7 +10,6 @@ from datetime import UTC, datetime
 from typing import Any, NotRequired
 
 from celery import shared_task
-from graphon.runtime import GraphRuntimeState
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 from typing_extensions import TypedDict
@@ -24,6 +23,7 @@ from core.app.layers.trigger_post_layer import TriggerPostLayer
 from core.db.session_factory import session_factory
 from core.repositories import DifyCoreRepositoryFactory
 from extensions.ext_database import db
+from graphon.runtime import GraphRuntimeState
 from models.account import Account
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom, WorkflowTriggerStatus
 from models.model import App, EndUser, Tenant
diff --git a/api/tasks/batch_create_segment_to_index_task.py b/api/tasks/batch_create_segment_to_index_task.py
index 4db551c73c..beb23d8354 100644
--- a/api/tasks/batch_create_segment_to_index_task.py
+++ b/api/tasks/batch_create_segment_to_index_task.py
@@ -8,7 +8,6 @@ from typing import Any
 import click
 import pandas as pd
 from celery import shared_task
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy import func, select
 
 from core.db.session_factory import session_factory
@@ -16,6 +15,7 @@ from core.model_manager import ModelManager
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
 from extensions.ext_redis import redis_client
 from extensions.ext_storage import storage
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs import helper
 from libs.datetime_utils import naive_utc_now
 from models.dataset import Dataset, Document, DocumentSegment
diff --git a/api/tasks/human_input_timeout_tasks.py b/api/tasks/human_input_timeout_tasks.py
index ca73b4d374..fd743205a1 100644
--- a/api/tasks/human_input_timeout_tasks.py
+++ b/api/tasks/human_input_timeout_tasks.py
@@ -2,8 +2,6 @@ import logging
 from datetime import timedelta
 
 from celery import shared_task
-from graphon.enums import WorkflowExecutionStatus
-from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from sqlalchemy import or_, select
 from sqlalchemy.orm import sessionmaker
 
@@ -11,6 +9,8 @@ from configs import dify_config
 from core.repositories.human_input_repository import HumanInputFormSubmissionRepository
 from extensions.ext_database import db
 from extensions.ext_storage import storage
+from graphon.enums import WorkflowExecutionStatus
+from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from libs.datetime_utils import ensure_naive_utc, naive_utc_now
 from models.human_input import HumanInputForm
 from models.workflow import WorkflowPause, WorkflowRun
diff --git a/api/tasks/mail_human_input_delivery_task.py b/api/tasks/mail_human_input_delivery_task.py
index a316eec7b9..f8ae3f4b6e 100644
--- a/api/tasks/mail_human_input_delivery_task.py
+++ b/api/tasks/mail_human_input_delivery_task.py
@@ -6,7 +6,6 @@ from typing import Any
 
 import click
 from celery import shared_task
-from graphon.runtime import GraphRuntimeState, VariablePool
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -15,6 +14,7 @@ from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext
 from core.workflow.human_input_compat import EmailDeliveryConfig, EmailDeliveryMethod
 from extensions.ext_database import db
 from extensions.ext_mail import mail
+from graphon.runtime import GraphRuntimeState, VariablePool
 from models.human_input import (
     DeliveryMethodType,
     HumanInputDelivery,
diff --git a/api/tasks/trigger_processing_tasks.py b/api/tasks/trigger_processing_tasks.py
index 56626e372e..25ea53dfac 100644
--- a/api/tasks/trigger_processing_tasks.py
+++ b/api/tasks/trigger_processing_tasks.py
@@ -12,7 +12,6 @@ from datetime import UTC, datetime
 from typing import Any
 
 from celery import shared_task
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy import func, select
 from sqlalchemy.orm import Session
 
@@ -29,6 +28,7 @@ from core.trigger.provider import PluginTriggerProviderController
 from core.trigger.trigger_manager import TriggerManager
 from core.workflow.nodes.trigger_plugin.entities import TriggerEventNodeData
 from enums.quota_type import QuotaType, unlimited
+from graphon.enums import WorkflowExecutionStatus
 from models.enums import (
     AppTriggerType,
     CreatorUserRole,
diff --git a/api/tasks/workflow_execution_tasks.py b/api/tasks/workflow_execution_tasks.py
index b4f975f4da..5ca04fd7c2 100644
--- a/api/tasks/workflow_execution_tasks.py
+++ b/api/tasks/workflow_execution_tasks.py
@@ -10,11 +10,11 @@ import logging
 from typing import Any
 
 from celery import shared_task
-from graphon.entities import WorkflowExecution
-from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from sqlalchemy import select
 
 from core.db.session_factory import session_factory
+from graphon.entities import WorkflowExecution
+from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from models import CreatorUserRole, WorkflowRun
 from models.enums import WorkflowRunTriggeredFrom
 
diff --git a/api/tasks/workflow_node_execution_tasks.py b/api/tasks/workflow_node_execution_tasks.py
index 128cdd72e1..0d5475a56d 100644
--- a/api/tasks/workflow_node_execution_tasks.py
+++ b/api/tasks/workflow_node_execution_tasks.py
@@ -10,13 +10,13 @@ import logging
 from typing import Any
 
 from celery import shared_task
+from sqlalchemy import select
+
+from core.db.session_factory import session_factory
 from graphon.entities.workflow_node_execution import (
     WorkflowNodeExecution,
 )
 from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
-from sqlalchemy import select
-
-from core.db.session_factory import session_factory
 from models import CreatorUserRole, WorkflowNodeExecutionModel
 from models.workflow import WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py b/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py
index 91245e879e..a876b0c4aa 100644
--- a/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py
+++ b/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py
@@ -1,9 +1,8 @@
 from collections.abc import Generator
 
-from graphon.node_events import StreamCompletedEvent
-
 from core.datasource.datasource_manager import DatasourceManager
 from core.datasource.entities.datasource_entities import DatasourceMessage
+from graphon.node_events import StreamCompletedEvent
 
 
 def _gen_var_stream() -> Generator[DatasourceMessage, None, None]:
diff --git a/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py b/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
index 3fdea10976..b5318aaa2b 100644
--- a/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
+++ b/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
@@ -1,8 +1,7 @@
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.node_events import NodeRunResult, StreamCompletedEvent
-
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
 from core.workflow.nodes.datasource.datasource_node import DatasourceNode
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.node_events import NodeRunResult, StreamCompletedEvent
 
 
 class _Seg:
diff --git a/api/tests/integration_tests/model_runtime/__mock/plugin_model.py b/api/tests/integration_tests/model_runtime/__mock/plugin_model.py
index ce04a158a8..c4146d5ccd 100644
--- a/api/tests/integration_tests/model_runtime/__mock/plugin_model.py
+++ b/api/tests/integration_tests/model_runtime/__mock/plugin_model.py
@@ -4,6 +4,9 @@ from collections.abc import Generator, Sequence
 from decimal import Decimal
 from json import dumps
 
+from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
+from core.plugin.impl.model import PluginModelClient
+
 # import monkeypatch
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.llm_entities import (
@@ -23,9 +26,6 @@ from graphon.model_runtime.entities.model_entities import (
 )
 from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
 
-from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
-from core.plugin.impl.model import PluginModelClient
-
 
 class MockModelClass(PluginModelClient):
     def fetch_model_providers(self, tenant_id: str) -> Sequence[PluginModelProviderEntity]:
diff --git a/api/tests/integration_tests/services/test_workflow_draft_variable_service.py b/api/tests/integration_tests/services/test_workflow_draft_variable_service.py
index c7bb90f019..e130644338 100644
--- a/api/tests/integration_tests/services/test_workflow_draft_variable_service.py
+++ b/api/tests/integration_tests/services/test_workflow_draft_variable_service.py
@@ -3,10 +3,6 @@ import unittest
 import uuid
 
 import pytest
-from graphon.nodes import BuiltinNodeTypes
-from graphon.variables.segments import StringSegment
-from graphon.variables.types import SegmentType
-from graphon.variables.variables import StringVariable
 from sqlalchemy import delete, func, select
 from sqlalchemy.orm import Session
 
@@ -15,6 +11,10 @@ from extensions.ext_database import db
 from extensions.ext_storage import storage
 from extensions.storage.storage_type import StorageType
 from factories.variable_factory import build_segment
+from graphon.nodes import BuiltinNodeTypes
+from graphon.variables.segments import StringSegment
+from graphon.variables.types import SegmentType
+from graphon.variables.variables import StringVariable
 from libs import datetime_utils
 from models.enums import CreatorUserRole
 from models.model import UploadFile
diff --git a/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py b/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py
index 3dfedd811d..4f444598b1 100644
--- a/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py
+++ b/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py
@@ -2,11 +2,11 @@ import uuid
 from unittest.mock import patch
 
 import pytest
-from graphon.variables.segments import StringSegment
 from sqlalchemy import delete, func, select
 
 from core.db.session_factory import session_factory
 from extensions.storage.storage_type import StorageType
+from graphon.variables.segments import StringSegment
 from models import Tenant
 from models.enums import CreatorUserRole
 from models.model import App, UploadFile
@@ -209,7 +209,6 @@ class TestDeleteDraftVariablesWithOffloadIntegration:
     def setup_offload_test_data(self, app_and_tenant):
         tenant, app = app_and_tenant
         from graphon.variables.types import SegmentType
-
         from libs.datetime_utils import naive_utc_now
 
         with session_factory.create_session() as session:
@@ -453,7 +452,6 @@ class TestDeleteDraftVariablesSessionCommit:
     def setup_offload_test_data(self, app_and_tenant):
         """Create test data with offload files for session commit tests."""
         from graphon.variables.types import SegmentType
-
         from libs.datetime_utils import naive_utc_now
 
         tenant, app = app_and_tenant
diff --git a/api/tests/integration_tests/workflow/nodes/__mock/model.py b/api/tests/integration_tests/workflow/nodes/__mock/model.py
index c0143faa85..a9a2617bae 100644
--- a/api/tests/integration_tests/workflow/nodes/__mock/model.py
+++ b/api/tests/integration_tests/workflow/nodes/__mock/model.py
@@ -1,12 +1,11 @@
 from unittest.mock import MagicMock
 
-from graphon.model_runtime.entities.model_entities import ModelType
-
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
 from core.entities.provider_entities import CustomConfiguration, CustomProviderConfiguration, SystemConfiguration
 from core.model_manager import ModelInstance
 from core.plugin.impl.model_runtime_factory import create_plugin_model_provider_factory
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.provider import ProviderType
 
 
diff --git a/api/tests/integration_tests/workflow/nodes/test_code.py b/api/tests/integration_tests/workflow/nodes/test_code.py
index 4f41396c22..e3476c292b 100644
--- a/api/tests/integration_tests/workflow/nodes/test_code.py
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py
@@ -2,17 +2,17 @@ import time
 import uuid
 
 import pytest
+
+from configs import dify_config
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from core.workflow.node_factory import DifyNodeFactory
+from core.workflow.system_variables import build_system_variables
 from graphon.enums import WorkflowNodeExecutionStatus
 from graphon.graph import Graph
 from graphon.node_events import NodeRunResult
 from graphon.nodes.code.code_node import CodeNode
 from graphon.nodes.code.limits import CodeNodeLimits
 from graphon.runtime import GraphRuntimeState, VariablePool
-
-from configs import dify_config
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.workflow.node_factory import DifyNodeFactory
-from core.workflow.system_variables import build_system_variables
 from tests.workflow_test_utils import build_test_graph_init_params
 
 pytest_plugins = ("tests.integration_tests.workflow.nodes.__mock.code_executor",)
diff --git a/api/tests/integration_tests/workflow/nodes/test_http.py b/api/tests/integration_tests/workflow/nodes/test_http.py
index b1f937e738..aa6cf1e021 100644
--- a/api/tests/integration_tests/workflow/nodes/test_http.py
+++ b/api/tests/integration_tests/workflow/nodes/test_http.py
@@ -3,11 +3,6 @@ import uuid
 from urllib.parse import urlencode
 
 import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.file.file_manager import file_manager
-from graphon.graph import Graph
-from graphon.nodes.http_request import HttpRequestNode, HttpRequestNodeConfig
-from graphon.runtime import GraphRuntimeState, VariablePool
 
 from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
@@ -16,6 +11,11 @@ from core.tools.tool_file_manager import ToolFileManager
 from core.workflow.node_factory import DifyNodeFactory
 from core.workflow.node_runtime import DifyFileReferenceFactory
 from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.file.file_manager import file_manager
+from graphon.graph import Graph
+from graphon.nodes.http_request import HttpRequestNode, HttpRequestNodeConfig
+from graphon.runtime import GraphRuntimeState, VariablePool
 from tests.workflow_test_utils import build_test_graph_init_params
 
 pytest_plugins = ("tests.integration_tests.workflow.nodes.__mock.http",)
@@ -192,6 +192,7 @@ def test_custom_authorization_header(setup_http_mock):
 @pytest.mark.parametrize("setup_http_mock", [["none"]], indirect=True)
 def test_custom_auth_with_empty_api_key_raises_error(setup_http_mock):
     """Test: In custom authentication mode, when the api_key is empty, AuthorizationConfigError should be raised."""
+    from core.workflow.system_variables import build_system_variables
     from graphon.enums import BuiltinNodeTypes
     from graphon.nodes.http_request.entities import (
         HttpRequestNodeAuthorization,
@@ -202,8 +203,6 @@ def test_custom_auth_with_empty_api_key_raises_error(setup_http_mock):
     from graphon.nodes.http_request.executor import Executor
     from graphon.runtime import VariablePool
 
-    from core.workflow.system_variables import build_system_variables
-
     # Create variable pool
     variable_pool = VariablePool(
         system_variables=build_system_variables(user_id="test", files=[]),
diff --git a/api/tests/integration_tests/workflow/nodes/test_llm.py b/api/tests/integration_tests/workflow/nodes/test_llm.py
index f0f3fcead1..fa5d63cfbf 100644
--- a/api/tests/integration_tests/workflow/nodes/test_llm.py
+++ b/api/tests/integration_tests/workflow/nodes/test_llm.py
@@ -4,6 +4,11 @@ import uuid
 from collections.abc import Generator
 from unittest.mock import MagicMock, patch
 
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from core.llm_generator.output_parser.structured_output import _parse_structured_output
+from core.model_manager import ModelInstance
+from core.workflow.system_variables import build_system_variables
+from extensions.ext_database import db
 from graphon.enums import WorkflowNodeExecutionStatus
 from graphon.node_events import StreamCompletedEvent
 from graphon.nodes.llm.file_saver import LLMFileSaver
@@ -12,12 +17,6 @@ from graphon.nodes.llm.protocols import CredentialsProvider, ModelFactory
 from graphon.nodes.llm.runtime_protocols import PromptMessageSerializerProtocol
 from graphon.nodes.protocols import HttpClientProtocol
 from graphon.runtime import GraphRuntimeState, VariablePool
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.llm_generator.output_parser.structured_output import _parse_structured_output
-from core.model_manager import ModelInstance
-from core.workflow.system_variables import build_system_variables
-from extensions.ext_database import db
 from tests.workflow_test_utils import build_test_graph_init_params
 
 """FOR MOCK FIXTURES, DO NOT REMOVE"""
diff --git a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
index fe512c2585..52886855b8 100644
--- a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
+++ b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
@@ -3,17 +3,16 @@ import time
 import uuid
 from unittest.mock import MagicMock
 
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.model_runtime.entities import AssistantPromptMessage, UserPromptMessage
-from graphon.nodes.llm.protocols import CredentialsProvider, ModelFactory
-from graphon.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
-from graphon.runtime import GraphRuntimeState, VariablePool
-
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.model_manager import ModelInstance
 from core.workflow.node_runtime import DifyPromptMessageSerializer
 from core.workflow.system_variables import build_system_variables
 from extensions.ext_database import db
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.model_runtime.entities import AssistantPromptMessage, UserPromptMessage
+from graphon.nodes.llm.protocols import CredentialsProvider, ModelFactory
+from graphon.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
+from graphon.runtime import GraphRuntimeState, VariablePool
 from tests.integration_tests.workflow.nodes.__mock.model import get_mocked_fetch_model_instance
 from tests.workflow_test_utils import build_test_graph_init_params
 
diff --git a/api/tests/integration_tests/workflow/nodes/test_template_transform.py b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
index 2d728569be..9e3e1a47e3 100644
--- a/api/tests/integration_tests/workflow/nodes/test_template_transform.py
+++ b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
@@ -1,15 +1,14 @@
 import time
 import uuid
 
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from core.workflow.node_factory import DifyNodeFactory
+from core.workflow.system_variables import build_system_variables
 from graphon.enums import WorkflowNodeExecutionStatus
 from graphon.graph import Graph
 from graphon.nodes.template_transform.template_transform_node import TemplateTransformNode
 from graphon.runtime import GraphRuntimeState, VariablePool
 from graphon.template_rendering import TemplateRenderError
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.workflow.node_factory import DifyNodeFactory
-from core.workflow.system_variables import build_system_variables
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/integration_tests/workflow/nodes/test_tool.py b/api/tests/integration_tests/workflow/nodes/test_tool.py
index 750ced7075..f9ec51ee10 100644
--- a/api/tests/integration_tests/workflow/nodes/test_tool.py
+++ b/api/tests/integration_tests/workflow/nodes/test_tool.py
@@ -2,18 +2,17 @@ import time
 import uuid
 from unittest.mock import MagicMock, patch
 
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.graph import Graph
-from graphon.node_events import StreamCompletedEvent
-from graphon.nodes.protocols import ToolFileManagerProtocol
-from graphon.nodes.tool.tool_node import ToolNode
-from graphon.runtime import GraphRuntimeState, VariablePool
-
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.tools.utils.configuration import ToolParameterConfigurationManager
 from core.workflow.node_factory import DifyNodeFactory
 from core.workflow.node_runtime import DifyToolNodeRuntime
 from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.graph import Graph
+from graphon.node_events import StreamCompletedEvent
+from graphon.nodes.protocols import ToolFileManagerProtocol
+from graphon.nodes.tool.tool_node import ToolNode
+from graphon.runtime import GraphRuntimeState, VariablePool
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
index ea95959a82..5a22f81a69 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
@@ -4,11 +4,11 @@ import json
 import uuid
 
 from flask.testing import FlaskClient
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy.orm import Session
 
 from configs import dify_config
 from constants import HEADER_NAME_CSRF_TOKEN
+from graphon.enums import WorkflowExecutionStatus
 from libs.datetime_utils import naive_utc_now
 from libs.token import _real_cookie_name, generate_csrf_token
 from models import Account, DifySetup, Tenant, TenantAccountJoin
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py
index 8ddf867370..290be87697 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py
@@ -3,12 +3,12 @@
 import uuid
 
 from flask.testing import FlaskClient
-from graphon.variables.segments import StringSegment
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID
 from factories.variable_factory import segment_to_variable
+from graphon.variables.segments import StringSegment
 from models import Workflow
 from models.model import AppMode
 from models.workflow import WorkflowDraftVariable
diff --git a/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py b/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py
index b4b65abdb6..c342e8994b 100644
--- a/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py
+++ b/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py
@@ -22,13 +22,6 @@ import uuid
 from time import time
 
 import pytest
-from graphon.entities.pause_reason import SchedulingPause
-from graphon.enums import WorkflowExecutionStatus
-from graphon.graph_engine.entities.commands import GraphEngineCommand
-from graphon.graph_engine.layers.base import GraphEngineLayerNotInitializedError
-from graphon.graph_events import GraphRunPausedEvent
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
 from sqlalchemy import Engine, delete, select
 from sqlalchemy.orm import Session
 
@@ -40,6 +33,13 @@ from core.app.layers.pause_state_persist_layer import (
 )
 from core.workflow.system_variables import build_system_variables
 from extensions.ext_storage import storage
+from graphon.entities.pause_reason import SchedulingPause
+from graphon.enums import WorkflowExecutionStatus
+from graphon.graph_engine.entities.commands import GraphEngineCommand
+from graphon.graph_engine.layers.base import GraphEngineLayerNotInitializedError
+from graphon.graph_events import GraphRunPausedEvent
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
 from libs.datetime_utils import naive_utc_now
 from models import Account
 from models import WorkflowPause as WorkflowPauseModel
diff --git a/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py b/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py
index 3b1570a9a8..14d5740072 100644
--- a/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py
+++ b/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from uuid import uuid4
 
-from graphon.nodes.human_input.entities import FormDefinition, HumanInputNodeData, UserAction
 from sqlalchemy import Engine, select
 from sqlalchemy.orm import Session
 
@@ -18,6 +17,7 @@ from core.workflow.human_input_compat import (
     MemberRecipient,
     WebAppDeliveryMethod,
 )
+from graphon.nodes.human_input.entities import FormDefinition, HumanInputNodeData, UserAction
 from models.account import (
     Account,
     AccountStatus,
diff --git a/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py b/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py
index 3ecf621095..da4f8847d6 100644
--- a/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py
+++ b/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py
@@ -4,6 +4,17 @@ from datetime import timedelta
 from unittest.mock import MagicMock
 
 import pytest
+from sqlalchemy import delete, select
+from sqlalchemy.orm import Session
+
+from core.app.app_config.entities import WorkflowUIBasedAppConfig
+from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
+from core.app.workflow.layers import PersistenceWorkflowInfo, WorkflowPersistenceLayer
+from core.repositories.human_input_repository import HumanInputFormEntity, HumanInputFormRepository
+from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
+from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLAlchemyWorkflowNodeExecutionRepository
+from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.system_variables import build_system_variables
 from graphon.enums import WorkflowType
 from graphon.graph import Graph
 from graphon.graph_engine import GraphEngine
@@ -16,17 +27,6 @@ from graphon.nodes.human_input.human_input_node import HumanInputNode
 from graphon.nodes.start.entities import StartNodeData
 from graphon.nodes.start.start_node import StartNode
 from graphon.runtime import GraphRuntimeState, VariablePool
-from sqlalchemy import delete, select
-from sqlalchemy.orm import Session
-
-from core.app.app_config.entities import WorkflowUIBasedAppConfig
-from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
-from core.app.workflow.layers import PersistenceWorkflowInfo, WorkflowPersistenceLayer
-from core.repositories.human_input_repository import HumanInputFormEntity, HumanInputFormRepository
-from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
-from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLAlchemyWorkflowNodeExecutionRepository
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
-from core.workflow.system_variables import build_system_variables
 from libs.datetime_utils import naive_utc_now
 from models import Account
 from models.account import AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
diff --git a/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py b/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py
index cc72dc1cf3..2e207ddc67 100644
--- a/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py
+++ b/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py
@@ -4,13 +4,13 @@ from unittest.mock import patch
 from uuid import uuid4
 
 import pytest
-from graphon.file import File, FileTransferMethod, FileType
 from sqlalchemy.orm import Session
 
 from core.app.file_access import DatabaseFileAccessController
 from extensions.ext_database import db
 from extensions.storage.storage_type import StorageType
 from factories.file_factory import StorageKeyLoader
+from graphon.file import File, FileTransferMethod, FileType
 from models import ToolFile, UploadFile
 from models.enums import CreatorUserRole
 
diff --git a/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py b/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
index b745aed141..2fd289dfbc 100644
--- a/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
+++ b/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
@@ -6,7 +6,6 @@ from decimal import Decimal
 from uuid import uuid4
 
 from graphon.nodes.human_input.entities import FormDefinition, UserAction
-
 from libs.datetime_utils import naive_utc_now
 from models.account import Account, Tenant, TenantAccountJoin
 from models.enums import ConversationFromSource, InvokeFrom
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 e922c19a5a..f10f519e25 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
@@ -10,10 +10,10 @@ from unittest.mock import patch
 from uuid import uuid4
 
 import pytest
-from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod
 from sqlalchemy.orm import Session
 
 from core.workflow.file_reference import build_file_reference
+from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod
 from models.model import App, AppMode, Conversation, Message
 
 
diff --git a/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py b/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py
index 4ca87de52d..6352f815df 100644
--- a/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py
+++ b/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py
@@ -9,9 +9,9 @@ from collections.abc import Generator
 from uuid import uuid4
 
 import pytest
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy.orm import Session
 
+from graphon.enums import WorkflowExecutionStatus
 from models.enums import ConversationFromSource, InvokeFrom
 from models.model import App, AppMode, Conversation, Message, Site
 from models.workflow import Workflow, WorkflowRun, WorkflowRunTriggeredFrom, WorkflowType
diff --git a/api/tests/test_containers_integration_tests/models/test_types_enum_text.py b/api/tests/test_containers_integration_tests/models/test_types_enum_text.py
index 957b7145d3..b325c97f7d 100644
--- a/api/tests/test_containers_integration_tests/models/test_types_enum_text.py
+++ b/api/tests/test_containers_integration_tests/models/test_types_enum_text.py
@@ -4,13 +4,13 @@ from typing import Any, NamedTuple
 
 import pytest
 import sqlalchemy as sa
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy import exc as sa_exc
 from sqlalchemy import insert, select
 from sqlalchemy.engine import Connection, Engine
 from sqlalchemy.orm import DeclarativeBase, Mapped, Session, mapped_column
 from sqlalchemy.sql.sqltypes import VARCHAR
 
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.types import EnumText
 
 _USER_TABLE = "enum_text_users"
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
index a68b3a08c7..641399c7f9 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
@@ -5,10 +5,10 @@ from __future__ import annotations
 from datetime import timedelta
 from uuid import uuid4
 
-from graphon.enums import WorkflowNodeExecutionStatus
 from sqlalchemy import Engine, delete
 from sqlalchemy.orm import Session, sessionmaker
 
+from graphon.enums import WorkflowNodeExecutionStatus
 from libs.datetime_utils import naive_utc_now
 from models.enums import CreatorUserRole
 from models.workflow import WorkflowNodeExecutionModel
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
index 64c93ac07c..aebe87839c 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
@@ -8,15 +8,15 @@ from unittest.mock import Mock
 from uuid import uuid4
 
 import pytest
+from sqlalchemy import Engine, delete, select
+from sqlalchemy.orm import Session, sessionmaker
+
+from extensions.ext_storage import storage
 from graphon.entities import WorkflowExecution
 from graphon.entities.pause_reason import HumanInputRequired, PauseReasonType
 from graphon.enums import WorkflowExecutionStatus
 from graphon.nodes.human_input.entities import FormDefinition, FormInput, UserAction
 from graphon.nodes.human_input.enums import FormInputType, HumanInputFormStatus
-from sqlalchemy import Engine, delete, select
-from sqlalchemy.orm import Session, sessionmaker
-
-from extensions.ext_storage import storage
 from libs.datetime_utils import naive_utc_now
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
 from models.human_input import (
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
index 7f44eb6ca3..aaf9a85d60 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
@@ -12,11 +12,11 @@ from decimal import Decimal
 from uuid import uuid4
 
 import pytest
-from graphon.nodes.human_input.entities import FormDefinition, UserAction
-from graphon.nodes.human_input.enums import HumanInputFormStatus
 from sqlalchemy import Engine, delete, select
 from sqlalchemy.orm import Session, sessionmaker
 
+from graphon.nodes.human_input.entities import FormDefinition, UserAction
+from graphon.nodes.human_input.enums import HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.enums import ConversationFromSource, InvokeFrom
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_workflow_node_execution_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_workflow_node_execution_repository.py
index 22e0aa34ff..fa78f1c28b 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_workflow_node_execution_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_workflow_node_execution_repository.py
@@ -7,6 +7,11 @@ from datetime import datetime
 from decimal import Decimal
 from uuid import uuid4
 
+from sqlalchemy import Engine
+from sqlalchemy.orm import Session, sessionmaker
+
+from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
+from core.repositories.factory import OrderConfig
 from graphon.entities import WorkflowNodeExecution
 from graphon.enums import (
     BuiltinNodeTypes,
@@ -14,11 +19,6 @@ from graphon.enums import (
     WorkflowNodeExecutionStatus,
 )
 from graphon.model_runtime.utils.encoders import jsonable_encoder
-from sqlalchemy import Engine
-from sqlalchemy.orm import Session, sessionmaker
-
-from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
-from core.repositories.factory import OrderConfig
 from models.account import Account, Tenant
 from models.enums import CreatorUserRole
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom
diff --git a/api/tests/test_containers_integration_tests/repositories/test_workflow_run_repository.py b/api/tests/test_containers_integration_tests/repositories/test_workflow_run_repository.py
index c5e9201ee3..d6f0657380 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_workflow_run_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_workflow_run_repository.py
@@ -7,12 +7,12 @@ from datetime import timedelta
 from uuid import uuid4
 
 import pytest
-from graphon.entities import WorkflowExecution
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy import Engine, delete
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.orm import Session, sessionmaker
 
+from graphon.entities import WorkflowExecution
+from graphon.enums import WorkflowExecutionStatus
 from libs.datetime_utils import naive_utc_now
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
 from models.workflow import WorkflowRun, WorkflowType
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 4f3c0e4200..00a2f9a59f 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
@@ -842,7 +842,6 @@ class TestAgentService:
         conversation, message = self._create_test_conversation_and_message(db_session_with_containers, app, account)
 
         from graphon.file import FileTransferMethod, FileType
-
         from models.enums import CreatorUserRole
 
         # Add files to message
diff --git a/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py b/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
index 6c15587058..77ce28b999 100644
--- a/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
@@ -9,7 +9,6 @@ from uuid import uuid4
 import pytest
 import yaml
 from faker import Faker
-from graphon.enums import BuiltinNodeTypes
 
 from core.trigger.constants import (
     TRIGGER_PLUGIN_NODE_TYPE,
@@ -17,6 +16,7 @@ from core.trigger.constants import (
     TRIGGER_WEBHOOK_NODE_TYPE,
 )
 from extensions.ext_redis import redis_client
+from graphon.enums import BuiltinNodeTypes
 from models import Account, AppMode
 from models.model import AppModelConfig, IconType
 from services import app_dsl_service
diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
index 1011db9063..0b7bd9ca64 100644
--- a/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
@@ -5,11 +5,11 @@ from unittest.mock import patch
 from uuid import uuid4
 
 import pytest
-from graphon.variables import FloatVariable, IntegerVariable, StringVariable
 from sqlalchemy.orm import sessionmaker
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from extensions.ext_database import db
+from graphon.variables import FloatVariable, IntegerVariable, StringVariable
 from models.account import Account, Tenant, TenantAccountJoin
 from models.enums import ConversationFromSource
 from models.model import App, Conversation, EndUser
diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py b/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py
index fb0adbbcc2..02ab3f8314 100644
--- a/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py
@@ -3,10 +3,10 @@
 from uuid import uuid4
 
 import pytest
-from graphon.variables import StringVariable
 from sqlalchemy.orm import sessionmaker
 
 from extensions.ext_database import db
+from graphon.variables import StringVariable
 from models.workflow import ConversationVariable
 from services.conversation_variable_updater import ConversationVariableNotFoundError, ConversationVariableUpdater
 
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service.py b/api/tests/test_containers_integration_tests/services/test_dataset_service.py
index f9bfa570cb..0de3c64c4f 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service.py
@@ -9,11 +9,11 @@ from unittest.mock import Mock, patch
 from uuid import uuid4
 
 import pytest
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.dataset import Dataset, DatasetPermissionEnum, Document, ExternalKnowledgeBindings, Pipeline
 from models.enums import DatasetRuntimeMode, DataSourceType, DocumentCreatedFrom, IndexingStatus
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service_update_dataset.py b/api/tests/test_containers_integration_tests/services/test_dataset_service_update_dataset.py
index 2974e00897..ac0483a45d 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service_update_dataset.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service_update_dataset.py
@@ -3,10 +3,10 @@ from unittest.mock import Mock, patch
 from uuid import uuid4
 
 import pytest
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.account import (
     Account,
     AccountStatus,
diff --git a/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py b/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py
index c8f04e9215..fe426ae516 100644
--- a/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py
+++ b/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py
@@ -5,9 +5,9 @@ Testcontainers integration tests for archived workflow run deletion service.
 from datetime import UTC, datetime, timedelta
 from uuid import uuid4
 
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy import select
 
+from graphon.enums import WorkflowExecutionStatus
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
 from models.workflow import WorkflowArchiveLog, WorkflowRun
 from services.retention.workflow_run.delete_archived_workflow_run import ArchivedWorkflowRunDeletion
diff --git a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test.py b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test.py
index c46b8fba0b..18c5320d0a 100644
--- a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test.py
+++ b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test.py
@@ -3,8 +3,6 @@ import uuid
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.enums import BuiltinNodeTypes
-from graphon.nodes.human_input.entities import HumanInputNodeData
 
 from core.workflow.human_input_compat import (
     EmailDeliveryConfig,
@@ -12,6 +10,8 @@ from core.workflow.human_input_compat import (
     EmailRecipients,
     ExternalRecipient,
 )
+from graphon.enums import BuiltinNodeTypes
+from graphon.nodes.human_input.entities import HumanInputNodeData
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.model import App, AppMode
 from models.workflow import Workflow, WorkflowType
diff --git a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py
index 0f252515f7..21a54e909e 100644
--- a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py
@@ -5,7 +5,6 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
-from graphon.runtime import VariablePool
 from sqlalchemy.engine import Engine
 
 from configs import dify_config
@@ -16,6 +15,7 @@ from core.workflow.human_input_compat import (
     ExternalRecipient,
     MemberRecipient,
 )
+from graphon.runtime import VariablePool
 from models.account import Account, TenantAccountJoin
 from services import human_input_delivery_test_service as service_module
 from services.human_input_delivery_test_service import (
diff --git a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
index 2340dd2a03..cd63d3ad6c 100644
--- a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
@@ -8,11 +8,11 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from faker import Faker
-from graphon.file import FileType
 from sqlalchemy.orm import Session
 
 from enums.cloud_plan import CloudPlan
 from extensions.ext_redis import redis_client
+from graphon.file import FileType
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.enums import (
     ConversationFromSource,
diff --git a/api/tests/test_containers_integration_tests/services/test_model_provider_service.py b/api/tests/test_containers_integration_tests/services/test_model_provider_service.py
index ba926bf675..8955a3b5f2 100644
--- a/api/tests/test_containers_integration_tests/services/test_model_provider_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_model_provider_service.py
@@ -2,10 +2,10 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from faker import Faker
-from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType
 from sqlalchemy.orm import Session
 
 from core.entities.model_entities import ModelStatus
+from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType
 from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.provider import Provider, ProviderModel, ProviderModelSetting, ProviderType
 from services.model_provider_service import ModelProviderService
@@ -405,11 +405,10 @@ class TestModelProviderService:
         mock_provider_manager = mock_external_service_dependencies["provider_manager"].return_value
 
         # Create mock models
+        from core.entities.model_entities import ModelWithProviderEntity, SimpleModelProviderEntity
         from graphon.model_runtime.entities.common_entities import I18nObject
         from graphon.model_runtime.entities.provider_entities import ProviderEntity
 
-        from core.entities.model_entities import ModelWithProviderEntity, SimpleModelProviderEntity
-
         # Create real model objects instead of mocks
         provider_entity_1 = SimpleModelProviderEntity(
             ProviderEntity(
@@ -644,9 +643,8 @@ class TestModelProviderService:
         mock_provider_manager = mock_external_service_dependencies["provider_manager"].return_value
 
         # Create mock default model response
-        from graphon.model_runtime.entities.common_entities import I18nObject
-
         from core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity
+        from graphon.model_runtime.entities.common_entities import I18nObject
 
         mock_default_model = DefaultModelEntity(
             model="gpt-3.5-turbo",
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
index 749c6fff5b..1e57b5603d 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
@@ -8,9 +8,9 @@ from unittest.mock import patch
 
 import pytest
 from faker import Faker
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy.orm import Session
 
+from graphon.enums import WorkflowExecutionStatus
 from models import EndUser, Workflow, WorkflowAppLog, WorkflowArchiveLog, WorkflowRun
 from models.enums import AppTriggerType, CreatorUserRole, WorkflowRunTriggeredFrom
 from models.workflow import WorkflowAppLogCreatedFrom
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py
index 0c281c8c33..86cf2327c7 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py
@@ -1,9 +1,9 @@
 import pytest
 from faker import Faker
-from graphon.variables.segments import StringSegment
 from sqlalchemy.orm import Session
 
 from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from graphon.variables.segments import StringSegment
 from models import App, Workflow
 from models.enums import DraftVariableType
 from models.workflow import WorkflowDraftVariable
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 ce2fd2eeb1..ce5c2bd162 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
@@ -5,9 +5,6 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from faker import Faker
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.entities.message_entities import PromptMessageRole
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from sqlalchemy.orm import Session
 
 from core.app.app_config.entities import (
@@ -21,6 +18,9 @@ from core.app.app_config.entities import (
     PromptTemplateEntity,
 )
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.entities.message_entities import PromptMessageRole
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from models import Account, Tenant
 from models.api_based_extension import APIBasedExtension, APIBasedExtensionPoint
 from models.model import App, AppMode, AppModelConfig
diff --git a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py
index 7c43bf676b..4dab895135 100644
--- a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py
+++ b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py
@@ -1,10 +1,10 @@
 from datetime import datetime, timedelta
 from uuid import uuid4
 
-from graphon.enums import WorkflowNodeExecutionStatus
 from sqlalchemy import Engine, select
 from sqlalchemy.orm import Session, sessionmaker
 
+from graphon.enums import WorkflowNodeExecutionStatus
 from libs.datetime_utils import naive_utc_now
 from models.enums import CreatorUserRole
 from models.workflow import WorkflowNodeExecutionModel
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py
index 1b4dcf28ea..328bdbf055 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py
@@ -3,9 +3,6 @@ from datetime import UTC, datetime
 from unittest.mock import patch
 
 import pytest
-from graphon.enums import WorkflowExecutionStatus
-from graphon.nodes.human_input.entities import HumanInputNodeData
-from graphon.runtime import GraphRuntimeState, VariablePool
 from sqlalchemy import delete
 
 from configs import dify_config
@@ -21,6 +18,9 @@ from core.workflow.human_input_compat import (
     MemberRecipient,
 )
 from extensions.ext_storage import storage
+from graphon.enums import WorkflowExecutionStatus
+from graphon.nodes.human_input.entities import HumanInputNodeData
+from graphon.runtime import GraphRuntimeState, VariablePool
 from models.account import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
 from models.human_input import HumanInputDelivery, HumanInputForm, HumanInputFormRecipient
diff --git a/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py b/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py
index b5bef145d5..b43b622870 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py
@@ -2,12 +2,12 @@ import uuid
 from unittest.mock import ANY, call, patch
 
 import pytest
-from graphon.variables.segments import StringSegment
-from graphon.variables.types import SegmentType
 from sqlalchemy import delete, func, select
 
 from core.db.session_factory import session_factory
 from extensions.storage.storage_type import StorageType
+from graphon.variables.segments import StringSegment
+from graphon.variables.types import SegmentType
 from libs.datetime_utils import naive_utc_now
 from models import Tenant
 from models.enums import CreatorUserRole
diff --git a/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py b/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py
index 6e98c0855a..b00d827e37 100644
--- a/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py
+++ b/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py
@@ -24,12 +24,12 @@ from dataclasses import dataclass
 from datetime import timedelta
 
 import pytest
-from graphon.entities import WorkflowExecution
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy import delete, func, select
 from sqlalchemy.orm import Session, selectinload, sessionmaker
 
 from extensions.ext_storage import storage
+from graphon.entities import WorkflowExecution
+from graphon.enums import WorkflowExecutionStatus
 from libs.datetime_utils import naive_utc_now
 from models import Account
 from models import WorkflowPause as WorkflowPauseModel
diff --git a/api/tests/test_containers_integration_tests/trigger/test_trigger_e2e.py b/api/tests/test_containers_integration_tests/trigger/test_trigger_e2e.py
index d725fb990a..55aec49878 100644
--- a/api/tests/test_containers_integration_tests/trigger/test_trigger_e2e.py
+++ b/api/tests/test_containers_integration_tests/trigger/test_trigger_e2e.py
@@ -10,7 +10,6 @@ from typing import Any
 import pytest
 from flask import Flask, Response
 from flask.testing import FlaskClient
-from graphon.enums import BuiltinNodeTypes
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -25,6 +24,7 @@ from core.trigger.debug import event_selectors
 from core.trigger.debug.event_bus import TriggerDebugEventBus
 from core.trigger.debug.event_selectors import PluginTriggerDebugEventPoller, WebhookTriggerDebugEventPoller
 from core.trigger.debug.events import PluginTriggerDebugEvent, build_plugin_pool_key
+from graphon.enums import BuiltinNodeTypes
 from libs.datetime_utils import naive_utc_now
 from models.account import Account, Tenant
 from models.enums import AppTriggerStatus, AppTriggerType, CreatorUserRole, WorkflowTriggerStatus
diff --git a/api/tests/unit_tests/controllers/console/app/test_audio.py b/api/tests/unit_tests/controllers/console/app/test_audio.py
index c52bc02420..2d218dac7e 100644
--- a/api/tests/unit_tests/controllers/console/app/test_audio.py
+++ b/api/tests/unit_tests/controllers/console/app/test_audio.py
@@ -4,7 +4,6 @@ import io
 from types import SimpleNamespace
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.datastructures import FileStorage
 from werkzeug.exceptions import InternalServerError
 
@@ -21,6 +20,7 @@ from controllers.console.app.error import (
     UnsupportedAudioTypeError,
 )
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 from services.audio_service import AudioService
 from services.errors.app_model_config import AppModelConfigBrokenError
 from services.errors.audio import (
diff --git a/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py b/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py
index 42b3420c31..1a412aff29 100644
--- a/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py
@@ -5,10 +5,10 @@ from datetime import UTC, datetime
 from types import SimpleNamespace
 
 import pytest
-from graphon.variables.types import SegmentType
 from pydantic import ValidationError
 
 from controllers.console.app import conversation_variables as conversation_variables_module
+from graphon.variables.types import SegmentType
 
 
 def _unwrap(func):
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow.py b/api/tests/unit_tests/controllers/console/app/test_workflow.py
index 9f20886a81..6ff3b19362 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow.py
@@ -6,11 +6,11 @@ from types import SimpleNamespace
 from unittest.mock import Mock
 
 import pytest
-from graphon.file import File, FileTransferMethod, FileType
 from werkzeug.exceptions import HTTPException, NotFound
 
 from controllers.console.app import workflow as workflow_module
 from controllers.console.app.error import DraftWorkflowNotExist, DraftWorkflowNotSync
+from graphon.file import File, FileTransferMethod, FileType
 
 
 def _unwrap(func):
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow_app_log_api.py b/api/tests/unit_tests/controllers/console/app/test_workflow_app_log_api.py
index 2adb69c704..a9853f25b0 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow_app_log_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow_app_log_api.py
@@ -2,9 +2,8 @@ from __future__ import annotations
 
 from datetime import UTC, datetime
 
-from graphon.enums import WorkflowExecutionStatus
-
 from controllers.console.app import workflow_app_log as workflow_app_log_module
+from graphon.enums import WorkflowExecutionStatus
 
 
 def test_workflow_app_log_query_parses_bool_and_datetime():
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py b/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
index e11102acb1..c4a8148446 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
@@ -6,14 +6,14 @@ from unittest.mock import Mock
 
 import pytest
 from flask import Flask
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.enums import WorkflowExecutionStatus
-from graphon.nodes.human_input.entities import FormInput, UserAction
-from graphon.nodes.human_input.enums import FormInputType
 
 from controllers.console import wraps as console_wraps
 from controllers.console.app import workflow_run as workflow_run_module
 from controllers.web.error import NotFoundError
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.enums import WorkflowExecutionStatus
+from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.enums import FormInputType
 from libs import login as login_lib
 from models.account import Account, AccountStatus, TenantAccountRole
 from models.workflow import WorkflowRun
diff --git a/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py b/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py
index 740da1f1df..b19a1740eb 100644
--- a/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py
+++ b/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py
@@ -5,7 +5,6 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from flask_restx import marshal
-from graphon.variables.types import SegmentType
 
 from controllers.console.app.workflow_draft_variable import (
     _WORKFLOW_DRAFT_VARIABLE_FIELDS,
@@ -16,6 +15,7 @@ from controllers.console.app.workflow_draft_variable import (
 )
 from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
 from factories.variable_factory import build_segment
+from graphon.variables.types import SegmentType
 from libs.datetime_utils import naive_utc_now
 from libs.uuid_utils import uuidv7
 from models.workflow import WorkflowDraftVariable, WorkflowDraftVariableFile
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py
index 9c9f8da87c..5136922e88 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py
@@ -1,7 +1,6 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 from werkzeug.exceptions import Forbidden, NotFound
 
 from controllers.console import console_ns
@@ -18,6 +17,7 @@ from controllers.console.datasets.rag_pipeline.datasource_auth import (
     DatasourceUpdateProviderNameApi,
 )
 from core.plugin.impl.oauth import OAuthHandler
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 from services.datasource_provider_service import DatasourceProviderService
 from services.plugin.oauth_service import OAuthProxyService
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py
index 6ef8ccfdbd..63950736c5 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py
@@ -2,7 +2,6 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from flask import Response
-from graphon.variables.types import SegmentType
 
 from controllers.console import console_ns
 from controllers.console.app.error import DraftWorkflowNotExist
@@ -16,6 +15,7 @@ from controllers.console.datasets.rag_pipeline.rag_pipeline_draft_variable impor
 )
 from controllers.web.error import InvalidArgumentError, NotFoundError
 from core.workflow.variable_prefixes import SYSTEM_VARIABLE_NODE_ID
+from graphon.variables.types import SegmentType
 from models.account import Account
 
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py b/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py
index 710c9be684..e4acd91b76 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py
@@ -1,7 +1,6 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
 
 import services
@@ -21,6 +20,7 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
+from graphon.model_runtime.errors.invoke import InvokeError
 from models.account import Account
 from services.dataset_service import DatasetService
 from services.hit_testing_service import HitTestingService
diff --git a/api/tests/unit_tests/controllers/console/explore/test_audio.py b/api/tests/unit_tests/controllers/console/explore/test_audio.py
index 66c9ba48c5..b4b57022e2 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_audio.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_audio.py
@@ -2,7 +2,6 @@ from io import BytesIO
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.exceptions import InternalServerError
 
 import controllers.console.explore.audio as audio_module
@@ -20,6 +19,7 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
+from graphon.model_runtime.errors.invoke import InvokeError
 from services.errors.audio import (
     AudioTooLargeServiceError,
     NoAudioUploadedServiceError,
diff --git a/api/tests/unit_tests/controllers/console/explore/test_message.py b/api/tests/unit_tests/controllers/console/explore/test_message.py
index 2e4ca4f2a4..145cc9cdd7 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_message.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_message.py
@@ -1,7 +1,6 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.exceptions import InternalServerError, NotFound
 
 import controllers.console.explore.message as module
@@ -22,6 +21,7 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
+from graphon.model_runtime.errors.invoke import InvokeError
 from services.errors.conversation import ConversationNotExistsError
 from services.errors.message import (
     FirstMessageNotExistsError,
diff --git a/api/tests/unit_tests/controllers/console/explore/test_trial.py b/api/tests/unit_tests/controllers/console/explore/test_trial.py
index a43c3ca47e..3625056af9 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_trial.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_trial.py
@@ -3,7 +3,6 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
 
 import controllers.console.explore.trial as module
@@ -26,6 +25,7 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
+from graphon.model_runtime.errors.invoke import InvokeError
 from models import Account
 from models.account import TenantStatus
 from models.model import AppMode
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_load_balancing_config.py b/api/tests/unit_tests/controllers/console/workspace/test_load_balancing_config.py
index 9c42ee9529..b2f949c6e2 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_load_balancing_config.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_load_balancing_config.py
@@ -11,9 +11,10 @@ from unittest.mock import MagicMock
 import pytest
 from flask import Flask
 from flask.views import MethodView
+from werkzeug.exceptions import Forbidden
+
 from graphon.model_runtime.entities.model_entities import ModelType
 from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
-from werkzeug.exceptions import Forbidden
 
 if not hasattr(builtins, "MethodView"):
     builtins.MethodView = MethodView  # type: ignore[attr-defined]
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py b/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
index fb9eec98cb..168479af1e 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
@@ -1,7 +1,6 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 from pydantic_core import ValidationError
 from werkzeug.exceptions import Forbidden
 
@@ -14,6 +13,7 @@ from controllers.console.workspace.model_providers import (
     ModelProviderValidateApi,
     PreferredProviderTypeUpdateApi,
 )
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 
 VALID_UUID = "123e4567-e89b-12d3-a456-426614174000"
 INVALID_UUID = "123"
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_models.py b/api/tests/unit_tests/controllers/console/workspace/test_models.py
index c829327bc7..f0d32f81fb 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_models.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_models.py
@@ -2,8 +2,6 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from flask import Flask
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 
 from controllers.console.workspace.models import (
     DefaultModelApi,
@@ -16,6 +14,8 @@ from controllers.console.workspace.models import (
     ModelProviderModelParameterRuleApi,
     ModelProviderModelValidateApi,
 )
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 
 
 def unwrap(func):
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_audio.py b/api/tests/unit_tests/controllers/service_api/app/test_audio.py
index a26fea8fbd..c16ebad739 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_audio.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_audio.py
@@ -13,7 +13,6 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
 from werkzeug.datastructures import FileStorage
 from werkzeug.exceptions import InternalServerError
 
@@ -30,6 +29,7 @@ from controllers.service_api.app.error import (
     UnsupportedAudioTypeError,
 )
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 from services.audio_service import AudioService
 from services.errors.app_model_config import AppModelConfigBrokenError
 from services.errors.audio import (
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_completion.py b/api/tests/unit_tests/controllers/service_api/app/test_completion.py
index 57681d8f5b..3364c07e62 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_completion.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_completion.py
@@ -16,7 +16,6 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
 from pydantic import ValidationError
 from werkzeug.exceptions import BadRequest, NotFound
 
@@ -35,6 +34,7 @@ from controllers.service_api.app.error import (
     NotChatAppError,
 )
 from core.errors.error import QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 from models.model import App, AppMode, EndUser
 from services.app_generate_service import AppGenerateService
 from services.app_task_service import AppTaskService
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_conversation.py b/api/tests/unit_tests/controllers/service_api/app/test_conversation.py
index 97fdf1a011..14c35a9ed5 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_conversation.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_conversation.py
@@ -20,7 +20,6 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.variables.types import SegmentType
 from werkzeug.exceptions import BadRequest, NotFound
 
 import services
@@ -38,6 +37,7 @@ from controllers.service_api.app.conversation import (
     ConversationVariableUpdatePayload,
 )
 from controllers.service_api.app.error import NotChatAppError
+from graphon.variables.types import SegmentType
 from models.model import App, AppMode, EndUser
 from services.conversation_service import ConversationService
 from services.errors.conversation import (
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_workflow.py b/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
index 74a3c75839..da09ec13ce 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
@@ -20,7 +20,6 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.enums import WorkflowExecutionStatus
 from werkzeug.exceptions import BadRequest, NotFound
 
 from controllers.service_api.app.error import NotWorkflowAppError
@@ -37,6 +36,7 @@ from controllers.service_api.app.workflow import (
     WorkflowTaskStopApi,
 )
 from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
+from graphon.enums import WorkflowExecutionStatus
 from models.model import App, AppMode
 from services.app_generate_service import AppGenerateService
 from services.errors.app import IsDraftWorkflowError, WorkflowNotFoundError
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_workflow_fields.py b/api/tests/unit_tests/controllers/service_api/app/test_workflow_fields.py
index 4b8e3a738c..eda270258d 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_workflow_fields.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_workflow_fields.py
@@ -1,8 +1,7 @@
 from types import SimpleNamespace
 
-from graphon.enums import WorkflowExecutionStatus
-
 from controllers.service_api.app.workflow import WorkflowRunOutputsField, WorkflowRunStatusField
+from graphon.enums import WorkflowExecutionStatus
 
 
 def test_workflow_run_status_field_with_enum() -> None:
diff --git a/api/tests/unit_tests/controllers/web/test_audio.py b/api/tests/unit_tests/controllers/web/test_audio.py
index cbfc8fa613..a6ca441801 100644
--- a/api/tests/unit_tests/controllers/web/test_audio.py
+++ b/api/tests/unit_tests/controllers/web/test_audio.py
@@ -8,7 +8,6 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from flask import Flask
-from graphon.model_runtime.errors.invoke import InvokeError
 
 from controllers.web.audio import AudioApi, TextApi
 from controllers.web.error import (
@@ -22,6 +21,7 @@ from controllers.web.error import (
     UnsupportedAudioTypeError,
 )
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 from services.errors.audio import (
     AudioTooLargeServiceError,
     NoAudioUploadedServiceError,
diff --git a/api/tests/unit_tests/controllers/web/test_completion.py b/api/tests/unit_tests/controllers/web/test_completion.py
index 49039d03fe..4f8d848637 100644
--- a/api/tests/unit_tests/controllers/web/test_completion.py
+++ b/api/tests/unit_tests/controllers/web/test_completion.py
@@ -7,7 +7,6 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from flask import Flask
-from graphon.model_runtime.errors.invoke import InvokeError
 
 from controllers.web.completion import ChatApi, ChatStopApi, CompletionApi, CompletionStopApi
 from controllers.web.error import (
@@ -19,6 +18,7 @@ from controllers.web.error import (
     ProviderQuotaExceededError,
 )
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
 
 
 def _completion_app() -> SimpleNamespace:
diff --git a/api/tests/unit_tests/core/agent/test_cot_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
index bc7aea0ef9..cde8820e00 100644
--- a/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
@@ -2,11 +2,11 @@ import json
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMUsage
 
 from core.agent.cot_agent_runner import CotAgentRunner
 from core.agent.entities import AgentScratchpadUnit
 from core.agent.errors import AgentMaxIterationError
+from graphon.model_runtime.entities.llm_entities import LLMUsage
 
 
 class DummyRunner(CotAgentRunner):
diff --git a/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py
index 97206019b9..ea8cc8aa86 100644
--- a/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py
@@ -1,9 +1,9 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
 
 from core.agent.cot_chat_agent_runner import CotChatAgentRunner
+from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
 from tests.unit_tests.core.agent.conftest import (
     DummyAgentConfig,
     DummyAppConfig,
diff --git a/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py
index defc8b4b64..2f5873d865 100644
--- a/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py
@@ -1,6 +1,8 @@
 import json
 
 import pytest
+
+from core.agent.cot_completion_agent_runner import CotCompletionAgentRunner
 from graphon.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     ImagePromptMessageContent,
@@ -8,8 +10,6 @@ from graphon.model_runtime.entities.message_entities import (
     UserPromptMessage,
 )
 
-from core.agent.cot_completion_agent_runner import CotCompletionAgentRunner
-
 # -----------------------------
 # Fixtures
 # -----------------------------
diff --git a/api/tests/unit_tests/core/agent/test_fc_agent_runner.py b/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
index a44a0650eb..17ab5babcb 100644
--- a/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
@@ -3,6 +3,11 @@ from typing import Any
 from unittest.mock import MagicMock
 
 import pytest
+
+from core.agent.errors import AgentMaxIterationError
+from core.agent.fc_agent_runner import FunctionCallAgentRunner
+from core.app.apps.base_app_queue_manager import PublishFrom
+from core.app.entities.queue_entities import QueueMessageFileEvent
 from graphon.model_runtime.entities.llm_entities import LLMUsage
 from graphon.model_runtime.entities.message_entities import (
     DocumentPromptMessageContent,
@@ -11,11 +16,6 @@ from graphon.model_runtime.entities.message_entities import (
     UserPromptMessage,
 )
 
-from core.agent.errors import AgentMaxIterationError
-from core.agent.fc_agent_runner import FunctionCallAgentRunner
-from core.app.apps.base_app_queue_manager import PublishFrom
-from core.app.entities.queue_entities import QueueMessageFileEvent
-
 # ==============================
 # Dummy Helper Classes
 # ==============================
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py
index 5ee66da94a..186b4a501d 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py
@@ -2,8 +2,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.entities.model_entities import ModelStatus
@@ -12,6 +10,8 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 
 
 class TestModelConfigConverter:
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py
index e2f3c16335..d9fe7004ff 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py
@@ -1,9 +1,9 @@
 import pytest
-from graphon.variables.input_entities import VariableEntityType
 
 from core.app.app_config.easy_ui_based_app.variables.manager import (
     BasicVariablesConfigManager,
 )
+from graphon.variables.input_entities import VariableEntityType
 
 
 class TestBasicVariablesConfigManagerConvert:
diff --git a/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py b/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py
index 8bde9c1f97..11b53dd0f9 100644
--- a/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py
@@ -1,8 +1,7 @@
+from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from graphon.file import FileTransferMethod, FileUploadConfig, ImageConfig
 from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
 
-from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
-
 
 def test_convert_with_vision():
     config = {
diff --git a/api/tests/unit_tests/core/app/app_config/test_entities.py b/api/tests/unit_tests/core/app/app_config/test_entities.py
index 000f83cd5a..f2bc3076da 100644
--- a/api/tests/unit_tests/core/app/app_config/test_entities.py
+++ b/api/tests/unit_tests/core/app/app_config/test_entities.py
@@ -1,10 +1,10 @@
 import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
 
 from core.app.app_config.entities import (
     DatasetRetrieveConfigEntity,
     PromptTemplateEntity,
 )
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 
 
 class TestAppConfigEntities:
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner_conversation_variables.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner_conversation_variables.py
index 1fb0dc6cf1..45d4b0e321 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner_conversation_variables.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner_conversation_variables.py
@@ -3,12 +3,12 @@
 from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
-from graphon.variables import SegmentType
 from sqlalchemy.orm import Session
 
 from core.app.apps.advanced_chat.app_runner import AdvancedChatAppRunner
 from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom
 from factories import variable_factory
+from graphon.variables import SegmentType
 from models import ConversationVariable, Workflow
 
 MINIMAL_GRAPH = {
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_response_converter.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_response_converter.py
index e9fdeefee4..f2df35d7d0 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_response_converter.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_response_converter.py
@@ -1,7 +1,5 @@
 from collections.abc import Generator
 
-from graphon.enums import WorkflowNodeExecutionStatus
-
 from core.app.apps.advanced_chat.generate_response_converter import AdvancedChatAppGenerateResponseConverter
 from core.app.entities.task_entities import (
     ChatbotAppBlockingResponse,
@@ -12,6 +10,7 @@ from core.app.entities.task_entities import (
     NodeStartStreamResponse,
     PingStreamResponse,
 )
+from graphon.enums import WorkflowNodeExecutionStatus
 
 
 class TestAdvancedChatGenerateResponseConverter:
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py
index a6d8598955..99a386cd45 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py
@@ -6,8 +6,6 @@ from types import SimpleNamespace
 from unittest import mock
 
 import pytest
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.enums import WorkflowExecutionStatus
 
 from core.app.apps.advanced_chat import generate_task_pipeline as pipeline_module
 from core.app.entities.app_invoke_entities import InvokeFrom
@@ -19,6 +17,8 @@ from core.app.entities.queue_entities import (
     QueueWorkflowSucceededEvent,
 )
 from core.app.entities.task_entities import StreamEvent
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.enums import WorkflowExecutionStatus
 from models.enums import MessageStatus
 from models.execution_extra_content import HumanInputContent
 from models.model import AppMode, EndUser
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
index 82b2e51019..29fd63c063 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
@@ -4,8 +4,6 @@ from contextlib import contextmanager
 from types import SimpleNamespace
 
 import pytest
-from graphon.enums import BuiltinNodeTypes
-from graphon.runtime import GraphRuntimeState, VariablePool
 
 from core.app.app_config.entities import AppAdditionalFeatures, WorkflowUIBasedAppConfig
 from core.app.apps.advanced_chat.generate_task_pipeline import (
@@ -49,6 +47,8 @@ from core.app.entities.task_entities import (
 )
 from core.base.tts.app_generator_tts_publisher import AudioTrunk
 from core.workflow.system_variables import build_system_variables
+from graphon.enums import BuiltinNodeTypes
+from graphon.runtime import GraphRuntimeState, VariablePool
 from libs.datetime_utils import naive_utc_now
 from models.enums import MessageStatus
 from models.model import AppMode, EndUser
diff --git a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py
index 7dc4358150..80f7f94b1a 100644
--- a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py
@@ -1,12 +1,12 @@
 import contextlib
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from pydantic import ValidationError
 
 from core.app.apps.agent_chat.app_generator import AgentChatAppGenerator
 from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.entities.app_invoke_entities import InvokeFrom
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 
 
 class DummyAccount:
diff --git a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py
index 08250bc3b6..4567b35480 100644
--- a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py
@@ -1,10 +1,10 @@
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
 
 from core.agent.entities import AgentEntity
 from core.app.apps.agent_chat.app_runner import AgentChatAppRunner
 from core.moderation.base import ModerationError
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
 
 
 @pytest.fixture
diff --git a/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py b/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py
index 68bcffb0e8..8f3c41701b 100644
--- a/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py
+++ b/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py
@@ -2,7 +2,6 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 
 from core.app.apps.chat.app_generator import ChatAppGenerator
 from core.app.apps.chat.app_runner import ChatAppRunner
@@ -10,6 +9,7 @@ from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.entities.queue_entities import QueueAnnotationReplyEvent
 from core.moderation.base import ModerationError
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from models.model import AppMode
 
 
diff --git a/api/tests/unit_tests/core/app/apps/chat/test_base_app_runner_multimodal.py b/api/tests/unit_tests/core/app/apps/chat/test_base_app_runner_multimodal.py
index f255d2c7df..b3ea1a464f 100644
--- a/api/tests/unit_tests/core/app/apps/chat/test_base_app_runner_multimodal.py
+++ b/api/tests/unit_tests/core/app/apps/chat/test_base_app_runner_multimodal.py
@@ -4,13 +4,13 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
-from graphon.file import FileTransferMethod, FileType
-from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
 
 from core.app.apps.base_app_queue_manager import PublishFrom
 from core.app.apps.base_app_runner import AppRunner
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.entities.queue_entities import QueueMessageFileEvent
+from graphon.file import FileTransferMethod, FileType
+from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
 from models.enums import CreatorUserRole
 
 
diff --git a/api/tests/unit_tests/core/app/apps/common/test_graph_runtime_state_support.py b/api/tests/unit_tests/core/app/apps/common/test_graph_runtime_state_support.py
index 4a94a2b4f1..201923e0e4 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_graph_runtime_state_support.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_graph_runtime_state_support.py
@@ -1,11 +1,11 @@
 from types import SimpleNamespace
 
 import pytest
-from graphon.runtime import GraphRuntimeState, VariablePool
 
 from core.app.apps.common.graph_runtime_state_support import GraphRuntimeStateSupport
 from core.workflow.system_variables import build_system_variables
 from core.workflow.variable_pool_initializer import add_variables_to_pool
+from graphon.runtime import GraphRuntimeState, VariablePool
 
 
 def _make_state(workflow_run_id: str | None) -> GraphRuntimeState:
diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py
index 328cd12f12..3ab63aed25 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py
@@ -1,10 +1,9 @@
 from collections.abc import Mapping, Sequence
 
+from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
 from graphon.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
 from graphon.variables.segments import ArrayFileSegment, FileSegment
 
-from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
-
 
 class TestWorkflowResponseConverterFetchFilesFromVariableValue:
     """Test class for WorkflowResponseConverter._fetch_files_from_variable_value method"""
diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_human_input.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_human_input.py
index bc11bf4174..1bef6f69cd 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_human_input.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_human_input.py
@@ -1,13 +1,12 @@
 from datetime import UTC, datetime
 from types import SimpleNamespace
 
-from graphon.entities import WorkflowStartReason
-from graphon.runtime import GraphRuntimeState, VariablePool
-
 from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.entities.queue_entities import QueueHumanInputFormFilledEvent, QueueHumanInputFormTimeoutEvent
 from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.runtime import GraphRuntimeState, VariablePool
 
 
 def _build_converter():
diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_resumption.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_resumption.py
index c9e146ff12..936ac37e55 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_resumption.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_resumption.py
@@ -1,11 +1,10 @@
 from types import SimpleNamespace
 
-from graphon.entities import WorkflowStartReason
-from graphon.runtime import GraphRuntimeState, VariablePool
-
 from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.runtime import GraphRuntimeState, VariablePool
 
 
 def _build_converter() -> WorkflowResponseConverter:
diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py
index 0fde7565d2..b3c0eb74fa 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py
@@ -10,8 +10,6 @@ from typing import Any
 from unittest.mock import Mock
 
 import pytest
-from graphon.entities import WorkflowStartReason
-from graphon.enums import BuiltinNodeTypes
 
 from core.app.app_config.entities import WorkflowUIBasedAppConfig
 from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
@@ -27,6 +25,8 @@ from core.app.entities.queue_entities import (
     QueueNodeSucceededEvent,
 )
 from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.enums import BuiltinNodeTypes
 from libs.datetime_utils import naive_utc_now
 from models import Account
 from models.model import AppMode
diff --git a/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py b/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
index 619d66085a..aa2085177e 100644
--- a/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
@@ -2,11 +2,11 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
 
 import core.app.apps.completion.app_runner as module
 from core.app.apps.completion.app_runner import CompletionAppRunner
 from core.moderation.base import ModerationError
+from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
 
 
 @pytest.fixture
diff --git a/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py b/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
index 96af9fbdee..f2e35f9900 100644
--- a/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
@@ -3,13 +3,13 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from pydantic import ValidationError
 
 import core.app.apps.completion.app_generator as module
 from core.app.apps.completion.app_generator import CompletionAppGenerator
 from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.entities.app_invoke_entities import InvokeFrom
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from services.errors.app import MoreLikeThisDisabledError
 from services.errors.message import MessageNotExistsError
 
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generate_response_converter.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generate_response_converter.py
index 6cdcab29ab..cfe797aa76 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generate_response_converter.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generate_response_converter.py
@@ -1,7 +1,5 @@
 from collections.abc import Generator
 
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-
 from core.app.apps.pipeline.generate_response_converter import WorkflowAppGenerateResponseConverter
 from core.app.entities.task_entities import (
     AppStreamResponse,
@@ -12,6 +10,7 @@ from core.app.entities.task_entities import (
     WorkflowAppBlockingResponse,
     WorkflowAppStreamResponse,
 )
+from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
 
 
 def test_convert_blocking_full_and_simple_response():
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py
index 4fe82efcb3..9db83f5531 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py
@@ -1,5 +1,4 @@
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMResult
 
 import core.app.apps.pipeline.pipeline_queue_manager as module
 from core.app.apps.base_app_queue_manager import PublishFrom
@@ -14,6 +13,7 @@ from core.app.entities.queue_entities import (
     QueueWorkflowPartialSuccessEvent,
     QueueWorkflowSucceededEvent,
 )
+from graphon.model_runtime.entities.llm_entities import LLMResult
 
 
 def test_publish_sets_stop_listen_and_raises_on_stopped(mocker):
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py
index c8ae288e6f..618c8fd76f 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py
@@ -22,11 +22,11 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.graph_events import GraphRunFailedEvent
 
 import core.app.apps.pipeline.pipeline_runner as module
 from core.app.apps.pipeline.pipeline_runner import PipelineRunner
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from graphon.graph_events import GraphRunFailedEvent
 
 
 def _build_app_generate_entity() -> SimpleNamespace:
diff --git a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
index 6167be3bbd..b0f8b423e1 100644
--- a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
@@ -1,7 +1,7 @@
 import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
 
 from core.app.apps.base_app_generator import BaseAppGenerator
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 
 
 def test_validate_inputs_with_zero():
@@ -476,9 +476,8 @@ class TestBaseAppGeneratorExtras:
         assert converted[1] == "event: ping\n\n"
 
     def test_get_draft_var_saver_factory_debugger(self):
-        from graphon.enums import BuiltinNodeTypes
-
         from core.app.entities.app_invoke_entities import InvokeFrom
+        from graphon.enums import BuiltinNodeTypes
         from models import Account
 
         base_app_generator = BaseAppGenerator()
diff --git a/api/tests/unit_tests/core/app/apps/test_base_app_runner.py b/api/tests/unit_tests/core/app/apps/test_base_app_runner.py
index 1dee7fdab6..17de39ca99 100644
--- a/api/tests/unit_tests/core/app/apps/test_base_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/test_base_app_runner.py
@@ -4,15 +4,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from graphon.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    ImagePromptMessageContent,
-    PromptMessageRole,
-    TextPromptMessageContent,
-)
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
-from graphon.model_runtime.errors.invoke import InvokeBadRequestError
 
 from core.app.app_config.entities import (
     AdvancedChatMessageEntity,
@@ -23,6 +14,15 @@ from core.app.app_config.entities import (
 from core.app.apps.base_app_runner import AppRunner
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.entities.queue_entities import QueueAgentMessageEvent, QueueLLMChunkEvent, QueueMessageEndEvent
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    ImagePromptMessageContent,
+    PromptMessageRole,
+    TextPromptMessageContent,
+)
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
+from graphon.model_runtime.errors.invoke import InvokeBadRequestError
 from models.model import AppMode
 
 
diff --git a/api/tests/unit_tests/core/app/apps/test_pause_resume.py b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
index a126bc85f7..a04a7b7576 100644
--- a/api/tests/unit_tests/core/app/apps/test_pause_resume.py
+++ b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
@@ -4,6 +4,11 @@ from types import ModuleType, SimpleNamespace
 from typing import Any
 
 import graphon.nodes.human_input.entities  # noqa: F401
+from core.app.apps.advanced_chat import app_generator as adv_app_gen_module
+from core.app.apps.workflow import app_generator as wf_app_gen_module
+from core.app.entities.app_invoke_entities import InvokeFrom
+from core.workflow.node_factory import DifyNodeFactory
+from core.workflow.system_variables import build_system_variables
 from graphon.entities import WorkflowStartReason
 from graphon.entities.base_node_data import BaseNodeData, RetryConfig
 from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
@@ -25,12 +30,6 @@ from graphon.nodes.base.node import Node
 from graphon.nodes.end.entities import EndNodeData
 from graphon.nodes.start.entities import StartNodeData
 from graphon.runtime import GraphRuntimeState, VariablePool
-
-from core.app.apps.advanced_chat import app_generator as adv_app_gen_module
-from core.app.apps.workflow import app_generator as wf_app_gen_module
-from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.node_factory import DifyNodeFactory
-from core.workflow.system_variables import build_system_variables
 from tests.workflow_test_utils import build_test_graph_init_params
 
 if "core.ops.ops_trace_manager" not in sys.modules:
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py
index de5bca161c..58c7bfa4bc 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py
@@ -4,6 +4,23 @@ from datetime import UTC, datetime
 from types import SimpleNamespace
 
 import pytest
+
+from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from core.app.entities.queue_entities import (
+    QueueAgentLogEvent,
+    QueueIterationCompletedEvent,
+    QueueLoopCompletedEvent,
+    QueueNodeExceptionEvent,
+    QueueNodeFailedEvent,
+    QueueNodeRetryEvent,
+    QueueNodeSucceededEvent,
+    QueueTextChunkEvent,
+    QueueWorkflowPausedEvent,
+    QueueWorkflowStartedEvent,
+    QueueWorkflowSucceededEvent,
+)
+from core.workflow.system_variables import default_system_variables
 from graphon.entities.pause_reason import HumanInputRequired
 from graphon.enums import BuiltinNodeTypes
 from graphon.graph_events import (
@@ -24,23 +41,6 @@ from graphon.node_events import NodeRunResult
 from graphon.runtime import GraphRuntimeState, VariablePool
 from graphon.variables.variables import StringVariable
 
-from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.app.entities.queue_entities import (
-    QueueAgentLogEvent,
-    QueueIterationCompletedEvent,
-    QueueLoopCompletedEvent,
-    QueueNodeExceptionEvent,
-    QueueNodeFailedEvent,
-    QueueNodeRetryEvent,
-    QueueNodeSucceededEvent,
-    QueueTextChunkEvent,
-    QueueWorkflowPausedEvent,
-    QueueWorkflowStartedEvent,
-    QueueWorkflowSucceededEvent,
-)
-from core.workflow.system_variables import default_system_variables
-
 
 class TestWorkflowBasedAppRunner:
     def test_resolve_user_from(self):
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_notifications.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_notifications.py
index aa789d9ff3..10fb2271f4 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_notifications.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_notifications.py
@@ -1,11 +1,11 @@
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.graph_events import GraphRunPausedEvent
 
 from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
 from core.app.entities.queue_entities import QueueWorkflowPausedEvent
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.graph_events import GraphRunPausedEvent
 
 
 class _DummyQueueManager:
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py
index 9e30faecf2..620a153204 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py
@@ -4,14 +4,14 @@ from typing import Any
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.entities.graph_config import NodeConfigDictAdapter
-from graphon.runtime import GraphRuntimeState, VariablePool
 
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.workflow.app_runner import WorkflowAppRunner
 from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
 from core.workflow.system_variables import default_system_variables
+from graphon.entities.graph_config import NodeConfigDictAdapter
+from graphon.runtime import GraphRuntimeState, VariablePool
 from models.workflow import Workflow
 
 
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py b/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py
index 8a717e1dcc..a3ab379b66 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py
@@ -3,11 +3,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.entities import WorkflowStartReason
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.graph_events import GraphRunPausedEvent
-from graphon.nodes.human_input.entities import FormInput, UserAction
-from graphon.nodes.human_input.enums import FormInputType
 
 from core.app.apps.common import workflow_response_converter
 from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
@@ -16,6 +11,11 @@ from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.entities.queue_entities import QueueWorkflowPausedEvent
 from core.app.entities.task_entities import HumanInputRequiredResponse, WorkflowPauseStreamResponse
 from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.graph_events import GraphRunPausedEvent
+from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.enums import FormInputType
 from models.account import Account
 from models.human_input import RecipientType
 
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_generate_response_converter.py b/api/tests/unit_tests/core/app/apps/workflow/test_generate_response_converter.py
index b768e813bd..7dd7ffd727 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_generate_response_converter.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_generate_response_converter.py
@@ -1,7 +1,5 @@
 from collections.abc import Generator
 
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-
 from core.app.apps.workflow.generate_response_converter import WorkflowAppGenerateResponseConverter
 from core.app.entities.task_entities import (
     ErrorStreamResponse,
@@ -11,6 +9,7 @@ from core.app.entities.task_entities import (
     WorkflowAppBlockingResponse,
     WorkflowAppStreamResponse,
 )
+from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
 
 
 class TestWorkflowGenerateResponseConverter:
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py
index 29df903aa8..1f6e7e12ef 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py
@@ -2,15 +2,14 @@ import time
 from contextlib import contextmanager
 from unittest.mock import MagicMock
 
-from graphon.entities import WorkflowStartReason
-from graphon.runtime import GraphRuntimeState
-
 from core.app.app_config.entities import WorkflowUIBasedAppConfig
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
 from core.app.entities.queue_entities import QueueWorkflowStartedEvent
 from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.runtime import GraphRuntimeState
 from models.account import Account
 from models.model import AppMode
 from tests.workflow_test_utils import build_test_variable_pool
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py
index d91bb85aee..99433478d3 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py
@@ -5,8 +5,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.enums import BuiltinNodeTypes, WorkflowExecutionStatus
-from graphon.runtime import GraphRuntimeState, VariablePool
 
 from core.app.app_config.entities import AppAdditionalFeatures, WorkflowUIBasedAppConfig
 from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline
@@ -47,6 +45,8 @@ from core.app.entities.task_entities import (
 )
 from core.base.tts.app_generator_tts_publisher import AudioTrunk
 from core.workflow.system_variables import build_system_variables, system_variables_to_mapping
+from graphon.enums import BuiltinNodeTypes, WorkflowExecutionStatus
+from graphon.runtime import GraphRuntimeState, VariablePool
 from libs.datetime_utils import naive_utc_now
 from models.enums import CreatorUserRole
 from models.model import AppMode, EndUser
diff --git a/api/tests/unit_tests/core/app/entities/test_task_entities.py b/api/tests/unit_tests/core/app/entities/test_task_entities.py
index 014a0cba72..7c79780641 100644
--- a/api/tests/unit_tests/core/app/entities/test_task_entities.py
+++ b/api/tests/unit_tests/core/app/entities/test_task_entities.py
@@ -1,11 +1,10 @@
-from graphon.enums import WorkflowNodeExecutionStatus
-
 from core.app.entities.task_entities import (
     NodeFinishStreamResponse,
     NodeRetryStreamResponse,
     NodeStartStreamResponse,
     StreamEvent,
 )
+from graphon.enums import WorkflowNodeExecutionStatus
 
 
 class TestTaskEntities:
diff --git a/api/tests/unit_tests/core/app/layers/test_conversation_variable_persist_layer.py b/api/tests/unit_tests/core/app/layers/test_conversation_variable_persist_layer.py
index a78c1b428f..ba55e8f695 100644
--- a/api/tests/unit_tests/core/app/layers/test_conversation_variable_persist_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_conversation_variable_persist_layer.py
@@ -1,6 +1,9 @@
 from collections.abc import Sequence
 from unittest.mock import Mock
 
+from core.app.layers.conversation_variable_persist_layer import ConversationVariablePersistenceLayer
+from core.workflow.system_variables import SystemVariableKey
+from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID
 from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
 from graphon.graph_engine.command_channels import CommandChannel
 from graphon.graph_events import NodeRunSucceededEvent, NodeRunVariableUpdatedEvent
@@ -8,10 +11,6 @@ from graphon.node_events import NodeRunResult
 from graphon.runtime import ReadOnlyGraphRuntimeState
 from graphon.variables import StringVariable
 from graphon.variables.segments import Segment, StringSegment
-
-from core.app.layers.conversation_variable_persist_layer import ConversationVariablePersistenceLayer
-from core.workflow.system_variables import SystemVariableKey
-from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/tests/unit_tests/core/app/layers/test_pause_state_persist_layer.py b/api/tests/unit_tests/core/app/layers/test_pause_state_persist_layer.py
index 035e64325b..539944d683 100644
--- a/api/tests/unit_tests/core/app/layers/test_pause_state_persist_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_pause_state_persist_layer.py
@@ -4,6 +4,16 @@ from time import time
 from unittest.mock import Mock
 
 import pytest
+
+from core.app.app_config.entities import WorkflowUIBasedAppConfig
+from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom, WorkflowAppGenerateEntity
+from core.app.layers.pause_state_persist_layer import (
+    PauseStatePersistenceLayer,
+    WorkflowResumptionContext,
+    _AdvancedChatAppGenerateEntityWrapper,
+    _WorkflowGenerateEntityWrapper,
+)
+from core.workflow.system_variables import SystemVariableKey
 from graphon.entities.pause_reason import SchedulingPause
 from graphon.graph_engine.entities.commands import GraphEngineCommand
 from graphon.graph_engine.layers.base import GraphEngineLayerNotInitializedError
@@ -15,16 +25,6 @@ from graphon.graph_events import (
 )
 from graphon.runtime import ReadOnlyVariablePool
 from graphon.variables.segments import Segment
-
-from core.app.app_config.entities import WorkflowUIBasedAppConfig
-from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom, WorkflowAppGenerateEntity
-from core.app.layers.pause_state_persist_layer import (
-    PauseStatePersistenceLayer,
-    WorkflowResumptionContext,
-    _AdvancedChatAppGenerateEntityWrapper,
-    _WorkflowGenerateEntityWrapper,
-)
-from core.workflow.system_variables import SystemVariableKey
 from models.model import AppMode
 from repositories.factory import DifyAPIRepositoryFactory
 
diff --git a/api/tests/unit_tests/core/app/layers/test_suspend_layer.py b/api/tests/unit_tests/core/app/layers/test_suspend_layer.py
index 95931f4f8b..12d49be0f1 100644
--- a/api/tests/unit_tests/core/app/layers/test_suspend_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_suspend_layer.py
@@ -1,6 +1,5 @@
-from graphon.graph_events import GraphRunPausedEvent
-
 from core.app.layers.suspend_layer import SuspendLayer
+from graphon.graph_events import GraphRunPausedEvent
 
 
 class TestSuspendLayer:
diff --git a/api/tests/unit_tests/core/app/layers/test_timeslice_layer.py b/api/tests/unit_tests/core/app/layers/test_timeslice_layer.py
index 7cf6eb4f31..1ac9a4d8c0 100644
--- a/api/tests/unit_tests/core/app/layers/test_timeslice_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_timeslice_layer.py
@@ -1,8 +1,7 @@
 from unittest.mock import Mock, patch
 
-from graphon.graph_engine.entities.commands import CommandType, GraphEngineCommand
-
 from core.app.layers.timeslice_layer import TimeSliceLayer
+from graphon.graph_engine.entities.commands import CommandType, GraphEngineCommand
 from services.workflow.entities import WorkflowScheduleCFSPlanEntity
 from services.workflow.scheduler import SchedulerCommand
 
diff --git a/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py b/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py
index aa9285789b..d3bd15b6f3 100644
--- a/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py
@@ -2,11 +2,10 @@ from datetime import UTC, datetime, timedelta
 from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
-from graphon.graph_events import GraphRunFailedEvent, GraphRunSucceededEvent
-from graphon.runtime import VariablePool
-
 from core.app.layers.trigger_post_layer import TriggerPostLayer
 from core.workflow.system_variables import build_system_variables
+from graphon.graph_events import GraphRunFailedEvent, GraphRunSucceededEvent
+from graphon.runtime import VariablePool
 from models.enums import WorkflowTriggerStatus
 
 
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py b/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py
index 58aa7d7478..c246f7b783 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py
@@ -2,11 +2,11 @@ from types import SimpleNamespace
 from unittest.mock import Mock
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 
 from core.app.entities.queue_entities import QueueErrorEvent
 from core.app.task_pipeline.based_generate_task_pipeline import BasedGenerateTaskPipeline
 from core.errors.error import QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from models.enums import MessageStatus
 
 
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
index 4aaa10a81a..1c1bf391d3 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
@@ -2,8 +2,6 @@ from types import SimpleNamespace
 from unittest.mock import ANY, Mock, patch
 
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMResult as RuntimeLLMResult
-from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
 
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.entities.app_invoke_entities import ChatAppGenerateEntity
@@ -28,6 +26,8 @@ from core.app.entities.task_entities import (
 from core.app.task_pipeline.easy_ui_based_generate_task_pipeline import EasyUIBasedGenerateTaskPipeline
 from core.base.tts import AppGeneratorTTSPublisher
 from core.ops.ops_trace_manager import TraceQueueManager
+from graphon.model_runtime.entities.llm_entities import LLMResult as RuntimeLLMResult
+from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
 from models.model import AppMode
 
 
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
index f22602a400..a20d89d807 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
@@ -5,9 +5,6 @@ from types import SimpleNamespace
 from unittest.mock import Mock
 
 import pytest
-from graphon.file import FileTransferMethod
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from graphon.model_runtime.entities.message_entities import AssistantPromptMessage, TextPromptMessageContent
 
 from core.app.app_config.entities import (
     AppAdditionalFeatures,
@@ -41,6 +38,9 @@ from core.app.entities.task_entities import (
 )
 from core.app.task_pipeline.easy_ui_based_generate_task_pipeline import EasyUIBasedGenerateTaskPipeline
 from core.base.tts import AudioTrunk
+from graphon.file import FileTransferMethod
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from graphon.model_runtime.entities.message_entities import AssistantPromptMessage, TextPromptMessageContent
 from models.model import AppMode
 
 
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py
index 31b7313066..595d716666 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py
@@ -17,11 +17,11 @@ import uuid
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
-from graphon.file import FileTransferMethod, FileType
 from sqlalchemy.orm import Session
 
 from core.app.entities.task_entities import MessageEndStreamResponse
 from core.app.task_pipeline.easy_ui_based_generate_task_pipeline import EasyUIBasedGenerateTaskPipeline
+from graphon.file import FileTransferMethod, FileType
 from models.model import MessageFile, UploadFile
 
 
diff --git a/api/tests/unit_tests/core/app/test_easy_ui_model_config_manager.py b/api/tests/unit_tests/core/app/test_easy_ui_model_config_manager.py
index 29df7eea86..21c761c579 100644
--- a/api/tests/unit_tests/core/app/test_easy_ui_model_config_manager.py
+++ b/api/tests/unit_tests/core/app/test_easy_ui_model_config_manager.py
@@ -1,10 +1,9 @@
 from types import SimpleNamespace
 from unittest.mock import patch
 
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
-
 from core.app.app_config.easy_ui_based_app.model_config.manager import ModelConfigManager
 from core.app.app_config.entities import ModelConfigEntity
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 from models.provider_ids import ModelProviderID
 
 
diff --git a/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py b/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py
index dc2d82ccd6..5c50cb78da 100644
--- a/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py
+++ b/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py
@@ -2,14 +2,14 @@ from datetime import UTC, datetime
 from unittest.mock import Mock
 
 import pytest
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus, WorkflowType
-from graphon.node_events import NodeRunResult
 
 from core.app.workflow.layers.persistence import (
     PersistenceWorkflowInfo,
     WorkflowPersistenceLayer,
     _NodeRuntimeSnapshot,
 )
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus, WorkflowType
+from graphon.node_events import NodeRunResult
 
 
 def _build_layer() -> WorkflowPersistenceLayer:
diff --git a/api/tests/unit_tests/core/app/workflow/test_file_runtime.py b/api/tests/unit_tests/core/app/workflow/test_file_runtime.py
index 7be9d6ac1e..cddd03f4b0 100644
--- a/api/tests/unit_tests/core/app/workflow/test_file_runtime.py
+++ b/api/tests/unit_tests/core/app/workflow/test_file_runtime.py
@@ -8,13 +8,13 @@ from unittest.mock import MagicMock, patch
 from urllib.parse import parse_qs, urlparse
 
 import pytest
-from graphon.file import File, FileTransferMethod, FileType
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.app.file_access import DatabaseFileAccessController, FileAccessScope
 from core.app.workflow import file_runtime
 from core.app.workflow.file_runtime import DifyWorkflowFileRuntime, bind_dify_workflow_file_runtime
 from core.workflow.file_reference import build_file_reference
+from graphon.file import File, FileTransferMethod, FileType
 from models import ToolFile, UploadFile
 
 
diff --git a/api/tests/unit_tests/core/app/workflow/test_node_factory.py b/api/tests/unit_tests/core/app/workflow/test_node_factory.py
index 8497261d45..c4bfb23272 100644
--- a/api/tests/unit_tests/core/app/workflow/test_node_factory.py
+++ b/api/tests/unit_tests/core/app/workflow/test_node_factory.py
@@ -1,10 +1,10 @@
 from types import SimpleNamespace
 
 import pytest
-from graphon.enums import BuiltinNodeTypes
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom, build_dify_run_context
 from core.workflow.node_factory import DifyNodeFactory
+from graphon.enums import BuiltinNodeTypes
 
 
 class DummyNode:
diff --git a/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py b/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py
index a47d3db6f5..82552470a9 100644
--- a/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py
+++ b/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py
@@ -2,9 +2,8 @@ from __future__ import annotations
 
 from types import SimpleNamespace
 
-from graphon.enums import BuiltinNodeTypes
-
 from core.app.workflow.layers.observability import ObservabilityLayer
+from graphon.enums import BuiltinNodeTypes
 
 
 class TestObservabilityLayerExtras:
diff --git a/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py b/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py
index d8a68f6d00..cacb4dd4fa 100644
--- a/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py
+++ b/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py
@@ -4,6 +4,10 @@ from datetime import UTC, datetime
 from types import SimpleNamespace
 
 import pytest
+
+from core.app.entities.app_invoke_entities import WorkflowAppGenerateEntity
+from core.app.workflow.layers.persistence import PersistenceWorkflowInfo, WorkflowPersistenceLayer
+from core.workflow.system_variables import SystemVariableKey, build_system_variables
 from graphon.entities import WorkflowNodeExecution
 from graphon.entities.pause_reason import SchedulingPause
 from graphon.enums import (
@@ -29,10 +33,6 @@ from graphon.graph_events import (
 from graphon.node_events import NodeRunResult
 from graphon.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
 
-from core.app.entities.app_invoke_entities import WorkflowAppGenerateEntity
-from core.app.workflow.layers.persistence import PersistenceWorkflowInfo, WorkflowPersistenceLayer
-from core.workflow.system_variables import SystemVariableKey, build_system_variables
-
 
 class _RepoRecorder:
     def __init__(self) -> None:
diff --git a/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py b/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py
index 5ff9774b52..7b433ab57b 100644
--- a/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py
+++ b/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py
@@ -301,6 +301,7 @@ class TestAppGeneratorTTSPublisher:
         publisher = AppGeneratorTTSPublisher("tenant", "voice1")
         publisher.executor = MagicMock()
 
+        from core.app.entities.queue_entities import QueueAgentMessageEvent
         from graphon.model_runtime.entities.llm_entities import LLMResultChunk, LLMResultChunkDelta
         from graphon.model_runtime.entities.message_entities import (
             AssistantPromptMessage,
@@ -308,8 +309,6 @@ class TestAppGeneratorTTSPublisher:
             TextPromptMessageContent,
         )
 
-        from core.app.entities.queue_entities import QueueAgentMessageEvent
-
         chunk = LLMResultChunk(
             model="model",
             delta=LLMResultChunkDelta(
@@ -337,11 +336,10 @@ class TestAppGeneratorTTSPublisher:
         publisher = AppGeneratorTTSPublisher("tenant", "voice1")
         publisher.executor = MagicMock()
 
+        from core.app.entities.queue_entities import QueueAgentMessageEvent
         from graphon.model_runtime.entities.llm_entities import LLMResultChunk, LLMResultChunkDelta
         from graphon.model_runtime.entities.message_entities import AssistantPromptMessage
 
-        from core.app.entities.queue_entities import QueueAgentMessageEvent
-
         chunk = LLMResultChunk(
             model="model",
             delta=LLMResultChunkDelta(
diff --git a/api/tests/unit_tests/core/datasource/test_datasource_manager.py b/api/tests/unit_tests/core/datasource/test_datasource_manager.py
index d338cadb77..81315d2508 100644
--- a/api/tests/unit_tests/core/datasource/test_datasource_manager.py
+++ b/api/tests/unit_tests/core/datasource/test_datasource_manager.py
@@ -2,15 +2,15 @@ import types
 from collections.abc import Generator
 
 import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.node_events import StreamChunkEvent, StreamCompletedEvent
 
 from contexts.wrapper import RecyclableContextVar
 from core.datasource.datasource_manager import DatasourceManager
 from core.datasource.entities.datasource_entities import DatasourceMessage, DatasourceProviderType
 from core.datasource.errors import DatasourceProviderNotFoundError
 from core.workflow.file_reference import parse_file_reference
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.node_events import StreamChunkEvent, StreamCompletedEvent
 
 
 def _gen_messages_text_only(text: str) -> Generator[DatasourceMessage, None, None]:
diff --git a/api/tests/unit_tests/core/datasource/utils/test_message_transformer.py b/api/tests/unit_tests/core/datasource/utils/test_message_transformer.py
index fbaf6d497d..0fca43cd0b 100644
--- a/api/tests/unit_tests/core/datasource/utils/test_message_transformer.py
+++ b/api/tests/unit_tests/core/datasource/utils/test_message_transformer.py
@@ -1,10 +1,10 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.file import File, FileTransferMethod, FileType
 
 from core.datasource.entities.datasource_entities import DatasourceMessage
 from core.datasource.utils.message_transformer import DatasourceFileMessageTransformer
+from graphon.file import File, FileTransferMethod, FileType
 from models.tools import ToolFile
 
 
diff --git a/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py b/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py
index ff9fd0d8f3..ef8f360dbf 100644
--- a/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py
+++ b/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py
@@ -1,12 +1,11 @@
-from graphon.nodes.human_input.entities import FormInput, UserAction
-from graphon.nodes.human_input.enums import FormInputType
-
 from core.entities.execution_extra_content import (
     ExecutionExtraContentDomainModel,
     HumanInputContent,
     HumanInputFormDefinition,
     HumanInputFormSubmissionData,
 )
+from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.enums import FormInputType
 from models.execution_extra_content import ExecutionContentType
 
 
diff --git a/api/tests/unit_tests/core/entities/test_entities_model_entities.py b/api/tests/unit_tests/core/entities/test_entities_model_entities.py
index 2acd278a31..a0b2820157 100644
--- a/api/tests/unit_tests/core/entities/test_entities_model_entities.py
+++ b/api/tests/unit_tests/core/entities/test_entities_model_entities.py
@@ -8,9 +8,6 @@ drive provider mapping behavior.
 """
 
 import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType
-from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
 
 from core.entities.model_entities import (
     DefaultModelEntity,
@@ -19,6 +16,9 @@ from core.entities.model_entities import (
     ProviderModelWithStatusEntity,
     SimpleModelProviderEntity,
 )
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType
+from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
 
 
 def _build_model_with_status(status: ModelStatus) -> ProviderModelWithStatusEntity:
diff --git a/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py b/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
index 8cf0409c4c..fe2c226843 100644
--- a/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
+++ b/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
@@ -6,17 +6,6 @@ from typing import Any
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
-from graphon.model_runtime.entities.provider_entities import (
-    ConfigurateMethod,
-    CredentialFormSchema,
-    FieldModelSchema,
-    FormType,
-    ModelCredentialSchema,
-    ProviderCredentialSchema,
-    ProviderEntity,
-)
 
 from constants import HIDDEN_VALUE
 from core.entities.model_entities import ModelStatus
@@ -35,6 +24,17 @@ from core.entities.provider_entities import (
     SystemConfiguration,
     SystemConfigurationStatus,
 )
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
+from graphon.model_runtime.entities.provider_entities import (
+    ConfigurateMethod,
+    CredentialFormSchema,
+    FieldModelSchema,
+    FormType,
+    ModelCredentialSchema,
+    ProviderCredentialSchema,
+    ProviderEntity,
+)
 from models.enums import CredentialSourceType
 from models.provider import ProviderType
 from models.provider_ids import ModelProviderID
diff --git a/api/tests/unit_tests/core/entities/test_entities_provider_entities.py b/api/tests/unit_tests/core/entities/test_entities_provider_entities.py
index 8685d16283..a159d3ad4d 100644
--- a/api/tests/unit_tests/core/entities/test_entities_provider_entities.py
+++ b/api/tests/unit_tests/core/entities/test_entities_provider_entities.py
@@ -1,5 +1,4 @@
 import pytest
-from graphon.model_runtime.entities.model_entities import ModelType
 
 from core.entities.parameter_entities import AppSelectorScope
 from core.entities.provider_entities import (
@@ -9,6 +8,7 @@ from core.entities.provider_entities import (
     ProviderQuotaType,
 )
 from core.tools.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import ModelType
 
 
 def test_provider_quota_type_value_of_returns_enum_member() -> None:
diff --git a/api/tests/unit_tests/core/helper/test_moderation.py b/api/tests/unit_tests/core/helper/test_moderation.py
index 4a84099b74..a0dfa86d20 100644
--- a/api/tests/unit_tests/core/helper/test_moderation.py
+++ b/api/tests/unit_tests/core/helper/test_moderation.py
@@ -2,11 +2,11 @@ from types import SimpleNamespace
 from typing import cast
 
 import pytest
-from graphon.model_runtime.errors.invoke import InvokeBadRequestError
 from pytest_mock import MockerFixture
 
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.helper.moderation import check_moderation
+from graphon.model_runtime.errors.invoke import InvokeBadRequestError
 from models.provider import ProviderType
 
 
diff --git a/api/tests/unit_tests/core/llm_generator/output_parser/test_structured_output.py b/api/tests/unit_tests/core/llm_generator/output_parser/test_structured_output.py
index b45f6fd9a7..6ed9ddb476 100644
--- a/api/tests/unit_tests/core/llm_generator/output_parser/test_structured_output.py
+++ b/api/tests/unit_tests/core/llm_generator/output_parser/test_structured_output.py
@@ -2,20 +2,6 @@ import json
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.entities.llm_entities import (
-    LLMResult,
-    LLMResultChunk,
-    LLMResultChunkDelta,
-    LLMResultWithStructuredOutput,
-    LLMUsage,
-)
-from graphon.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    SystemPromptMessage,
-    TextPromptMessageContent,
-    UserPromptMessage,
-)
-from graphon.model_runtime.entities.model_entities import AIModelEntity, ParameterRule, ParameterType
 
 from core.llm_generator.output_parser.errors import OutputParserError
 from core.llm_generator.output_parser.structured_output import (
@@ -30,6 +16,20 @@ from core.llm_generator.output_parser.structured_output import (
     remove_additional_properties,
 )
 from core.model_manager import ModelInstance
+from graphon.model_runtime.entities.llm_entities import (
+    LLMResult,
+    LLMResultChunk,
+    LLMResultChunkDelta,
+    LLMResultWithStructuredOutput,
+    LLMUsage,
+)
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    SystemPromptMessage,
+    TextPromptMessageContent,
+    UserPromptMessage,
+)
+from graphon.model_runtime.entities.model_entities import AIModelEntity, ParameterRule, ParameterType
 
 
 class TestStructuredOutput:
diff --git a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
index 7cdfb31189..2716f4712c 100644
--- a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
+++ b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
@@ -2,12 +2,12 @@ import json
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMMode, LLMResult
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 
 from core.app.app_config.entities import ModelConfig
 from core.llm_generator.entities import RuleCodeGeneratePayload, RuleGeneratePayload, RuleStructuredOutputPayload
 from core.llm_generator.llm_generator import LLMGenerator
+from graphon.model_runtime.entities.llm_entities import LLMMode, LLMResult
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 
 
 class TestLLMGenerator:
diff --git a/api/tests/unit_tests/core/mcp/server/test_streamable_http.py b/api/tests/unit_tests/core/mcp/server/test_streamable_http.py
index 9a815fb94d..57456085c3 100644
--- a/api/tests/unit_tests/core/mcp/server/test_streamable_http.py
+++ b/api/tests/unit_tests/core/mcp/server/test_streamable_http.py
@@ -3,7 +3,6 @@ from unittest.mock import Mock, patch
 
 import jsonschema
 import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
 
 from core.app.features.rate_limiting.rate_limit import RateLimitGenerator
 from core.mcp import types
@@ -19,6 +18,7 @@ from core.mcp.server.streamable_http import (
     prepare_tool_arguments,
     process_mapping_response,
 )
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from models.model import App, AppMCPServer, AppMode, EndUser
 
 
diff --git a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
index 9a5fb319d7..f459250b8e 100644
--- a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
+++ b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
@@ -4,6 +4,8 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+
+from core.memory.token_buffer_memory import TokenBufferMemory
 from graphon.model_runtime.entities import (
     AssistantPromptMessage,
     ImagePromptMessageContent,
@@ -11,8 +13,6 @@ from graphon.model_runtime.entities import (
     TextPromptMessageContent,
     UserPromptMessage,
 )
-
-from core.memory.token_buffer_memory import TokenBufferMemory
 from models.model import AppMode
 
 # ---------------------------------------------------------------------------
diff --git a/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py b/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py
index 6a672fdfd5..249ecb5006 100644
--- a/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py
+++ b/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py
@@ -1,6 +1,7 @@
 from unittest.mock import Mock
 
 import pytest
+
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
 from graphon.model_runtime.entities.provider_entities import (
diff --git a/api/tests/unit_tests/core/ops/aliyun_trace/test_aliyun_trace.py b/api/tests/unit_tests/core/ops/aliyun_trace/test_aliyun_trace.py
index 62d631a754..c2324fdec4 100644
--- a/api/tests/unit_tests/core/ops/aliyun_trace/test_aliyun_trace.py
+++ b/api/tests/unit_tests/core/ops/aliyun_trace/test_aliyun_trace.py
@@ -5,8 +5,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from opentelemetry.trace import Link, SpanContext, SpanKind, Status, StatusCode, TraceFlags
 
 import core.ops.aliyun_trace.aliyun_trace as aliyun_trace_module
@@ -36,6 +34,8 @@ from core.ops.entities.trace_entity import (
     ToolTraceInfo,
     WorkflowTraceInfo,
 )
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 
 
 class RecordingTraceClient:
diff --git a/api/tests/unit_tests/core/ops/aliyun_trace/test_aliyun_trace_utils.py b/api/tests/unit_tests/core/ops/aliyun_trace/test_aliyun_trace_utils.py
index 2d2be12f05..e4d8f2d5ea 100644
--- a/api/tests/unit_tests/core/ops/aliyun_trace/test_aliyun_trace_utils.py
+++ b/api/tests/unit_tests/core/ops/aliyun_trace/test_aliyun_trace_utils.py
@@ -1,8 +1,6 @@
 import json
 from unittest.mock import MagicMock
 
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import WorkflowNodeExecutionStatus
 from opentelemetry.trace import Link, StatusCode
 
 from core.ops.aliyun_trace.entities.semconv import (
@@ -26,6 +24,8 @@ from core.ops.aliyun_trace.utils import (
     serialize_json_data,
 )
 from core.rag.models.document import Document
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import WorkflowNodeExecutionStatus
 from models import EndUser
 
 
diff --git a/api/tests/unit_tests/core/ops/langfuse_trace/test_langfuse_trace.py b/api/tests/unit_tests/core/ops/langfuse_trace/test_langfuse_trace.py
index 374371fb42..a0bcc92795 100644
--- a/api/tests/unit_tests/core/ops/langfuse_trace/test_langfuse_trace.py
+++ b/api/tests/unit_tests/core/ops/langfuse_trace/test_langfuse_trace.py
@@ -5,7 +5,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.enums import BuiltinNodeTypes
 
 from core.ops.entities.config_entity import LangfuseConfig
 from core.ops.entities.trace_entity import (
@@ -26,6 +25,7 @@ from core.ops.langfuse_trace.entities.langfuse_trace_entity import (
     UnitEnum,
 )
 from core.ops.langfuse_trace.langfuse_trace import LangFuseDataTrace
+from graphon.enums import BuiltinNodeTypes
 from models import EndUser
 from models.enums import MessageStatus
 
diff --git a/api/tests/unit_tests/core/ops/langsmith_trace/test_langsmith_trace.py b/api/tests/unit_tests/core/ops/langsmith_trace/test_langsmith_trace.py
index bfe916f018..34c64c54a1 100644
--- a/api/tests/unit_tests/core/ops/langsmith_trace/test_langsmith_trace.py
+++ b/api/tests/unit_tests/core/ops/langsmith_trace/test_langsmith_trace.py
@@ -3,7 +3,6 @@ from datetime import datetime, timedelta
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 
 from core.ops.entities.config_entity import LangSmithConfig
 from core.ops.entities.trace_entity import (
@@ -22,6 +21,7 @@ from core.ops.langsmith_trace.entities.langsmith_trace_entity import (
     LangSmithRunUpdateModel,
 )
 from core.ops.langsmith_trace.langsmith_trace import LangSmithDataTrace
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from models import EndUser
 
 
diff --git a/api/tests/unit_tests/core/ops/mlflow_trace/test_mlflow_trace.py b/api/tests/unit_tests/core/ops/mlflow_trace/test_mlflow_trace.py
index f4c485a9fc..afc5726ede 100644
--- a/api/tests/unit_tests/core/ops/mlflow_trace/test_mlflow_trace.py
+++ b/api/tests/unit_tests/core/ops/mlflow_trace/test_mlflow_trace.py
@@ -9,7 +9,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.enums import BuiltinNodeTypes
 
 from core.ops.entities.config_entity import DatabricksConfig, MLflowConfig
 from core.ops.entities.trace_entity import (
@@ -22,6 +21,7 @@ from core.ops.entities.trace_entity import (
     WorkflowTraceInfo,
 )
 from core.ops.mlflow_trace.mlflow_trace import MLflowDataTrace, datetime_to_nanoseconds
+from graphon.enums import BuiltinNodeTypes
 
 # ── Helpers ──────────────────────────────────────────────────────────────────
 
diff --git a/api/tests/unit_tests/core/ops/opik_trace/test_opik_trace.py b/api/tests/unit_tests/core/ops/opik_trace/test_opik_trace.py
index 1cb32f2ee0..c02ac413f2 100644
--- a/api/tests/unit_tests/core/ops/opik_trace/test_opik_trace.py
+++ b/api/tests/unit_tests/core/ops/opik_trace/test_opik_trace.py
@@ -5,7 +5,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 
 from core.ops.entities.config_entity import OpikConfig
 from core.ops.entities.trace_entity import (
@@ -19,6 +18,7 @@ from core.ops.entities.trace_entity import (
     WorkflowTraceInfo,
 )
 from core.ops.opik_trace.opik_trace import OpikDataTrace, prepare_opik_uuid, wrap_dict, wrap_metadata
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from models import EndUser
 from models.enums import MessageStatus
 
diff --git a/api/tests/unit_tests/core/ops/tencent_trace/test_span_builder.py b/api/tests/unit_tests/core/ops/tencent_trace/test_span_builder.py
index 696f859b6f..6113e5c6c8 100644
--- a/api/tests/unit_tests/core/ops/tencent_trace/test_span_builder.py
+++ b/api/tests/unit_tests/core/ops/tencent_trace/test_span_builder.py
@@ -1,8 +1,6 @@
 from datetime import datetime
 from unittest.mock import MagicMock, patch
 
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from opentelemetry.trace import StatusCode
 
 from core.ops.entities.trace_entity import (
@@ -27,6 +25,8 @@ from core.ops.tencent_trace.entities.semconv import (
 )
 from core.ops.tencent_trace.span_builder import TencentSpanBuilder
 from core.rag.models.document import Document
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 
 
 class TestTencentSpanBuilder:
diff --git a/api/tests/unit_tests/core/ops/tencent_trace/test_tencent_trace.py b/api/tests/unit_tests/core/ops/tencent_trace/test_tencent_trace.py
index f67abba807..7afd0b824a 100644
--- a/api/tests/unit_tests/core/ops/tencent_trace/test_tencent_trace.py
+++ b/api/tests/unit_tests/core/ops/tencent_trace/test_tencent_trace.py
@@ -2,8 +2,6 @@ import logging
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import BuiltinNodeTypes
 
 from core.ops.entities.config_entity import TencentConfig
 from core.ops.entities.trace_entity import (
@@ -16,6 +14,8 @@ from core.ops.entities.trace_entity import (
     WorkflowTraceInfo,
 )
 from core.ops.tencent_trace.tencent_trace import TencentDataTrace
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import BuiltinNodeTypes
 from models import Account, App, TenantAccountJoin
 
 logger = logging.getLogger(__name__)
diff --git a/api/tests/unit_tests/core/ops/test_arize_phoenix_trace.py b/api/tests/unit_tests/core/ops/test_arize_phoenix_trace.py
index 6b5cb5b09a..4b925390d9 100644
--- a/api/tests/unit_tests/core/ops/test_arize_phoenix_trace.py
+++ b/api/tests/unit_tests/core/ops/test_arize_phoenix_trace.py
@@ -1,7 +1,7 @@
-from graphon.enums import BUILT_IN_NODE_TYPES, BuiltinNodeTypes
 from openinference.semconv.trace import OpenInferenceSpanKindValues
 
 from core.ops.arize_phoenix_trace.arize_phoenix_trace import _NODE_TYPE_TO_SPAN_KIND, _get_node_span_kind
+from graphon.enums import BUILT_IN_NODE_TYPES, BuiltinNodeTypes
 
 
 class TestGetNodeSpanKind:
diff --git a/api/tests/unit_tests/core/ops/test_langfuse_trace.py b/api/tests/unit_tests/core/ops/test_langfuse_trace.py
index f8951d2b4a..017ac8c891 100644
--- a/api/tests/unit_tests/core/ops/test_langfuse_trace.py
+++ b/api/tests/unit_tests/core/ops/test_langfuse_trace.py
@@ -4,11 +4,10 @@ from datetime import datetime, timedelta
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
-from graphon.enums import BuiltinNodeTypes
-
 from core.ops.entities.config_entity import LangfuseConfig
 from core.ops.entities.trace_entity import MessageTraceInfo, WorkflowTraceInfo
 from core.ops.langfuse_trace.langfuse_trace import LangFuseDataTrace
+from graphon.enums import BuiltinNodeTypes
 
 
 def _create_trace_instance() -> LangFuseDataTrace:
diff --git a/api/tests/unit_tests/core/ops/weave_trace/test_weave_trace.py b/api/tests/unit_tests/core/ops/weave_trace/test_weave_trace.py
index 5014f40afc..531c7de05f 100644
--- a/api/tests/unit_tests/core/ops/weave_trace/test_weave_trace.py
+++ b/api/tests/unit_tests/core/ops/weave_trace/test_weave_trace.py
@@ -7,7 +7,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 from weave.trace_server.trace_server_interface import TraceStatus
 
 from core.ops.entities.config_entity import WeaveConfig
@@ -23,6 +22,7 @@ from core.ops.entities.trace_entity import (
 )
 from core.ops.weave_trace.entities.weave_trace_entity import WeaveTraceModel
 from core.ops.weave_trace.weave_trace import WeaveDataTrace
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionMetadataKey
 
 # ── Helpers ──────────────────────────────────────────────────────────────────
 
diff --git a/api/tests/unit_tests/core/plugin/test_backwards_invocation_model.py b/api/tests/unit_tests/core/plugin/test_backwards_invocation_model.py
index 543b278715..c24d3ac012 100644
--- a/api/tests/unit_tests/core/plugin/test_backwards_invocation_model.py
+++ b/api/tests/unit_tests/core/plugin/test_backwards_invocation_model.py
@@ -1,10 +1,9 @@
 from types import SimpleNamespace
 from unittest.mock import patch
 
-from graphon.model_runtime.entities.message_entities import UserPromptMessage
-
 from core.plugin.backwards_invocation.model import PluginModelBackwardsInvocation
 from core.plugin.entities.request import RequestInvokeSummary
+from graphon.model_runtime.entities.message_entities import UserPromptMessage
 
 
 def test_system_model_helpers_forward_user_id():
diff --git a/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py b/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py
index f8d0e127b1..68aa130518 100644
--- a/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py
+++ b/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py
@@ -6,15 +6,15 @@ from types import SimpleNamespace
 from unittest.mock import Mock, sentinel
 
 import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
-from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
 
 from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
 from core.plugin.impl import model_runtime as model_runtime_module
 from core.plugin.impl.model import PluginModelClient
 from core.plugin.impl.model_runtime import TENANT_SCOPE_SCHEMA_CACHE_USER_ID, PluginModelRuntime
 from core.plugin.impl.model_runtime_factory import create_plugin_model_runtime
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
+from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
 
 
 def _build_model_schema() -> AIModelEntity:
diff --git a/api/tests/unit_tests/core/plugin/test_plugin_entities.py b/api/tests/unit_tests/core/plugin/test_plugin_entities.py
index a812b01c5b..f1c4c7e700 100644
--- a/api/tests/unit_tests/core/plugin/test_plugin_entities.py
+++ b/api/tests/unit_tests/core/plugin/test_plugin_entities.py
@@ -4,12 +4,6 @@ from enum import StrEnum
 
 import pytest
 from flask import Response
-from graphon.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    SystemPromptMessage,
-    ToolPromptMessage,
-    UserPromptMessage,
-)
 from pydantic import ValidationError
 
 from core.plugin.entities.endpoint import EndpointEntityWithInstance
@@ -31,6 +25,12 @@ from core.plugin.entities.request import (
 )
 from core.plugin.utils.http_parser import serialize_response
 from core.tools.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    SystemPromptMessage,
+    ToolPromptMessage,
+    UserPromptMessage,
+)
 
 
 class TestEndpointEntity:
diff --git a/api/tests/unit_tests/core/plugin/test_plugin_runtime.py b/api/tests/unit_tests/core/plugin/test_plugin_runtime.py
index a3b1e5f6b0..704b82adc0 100644
--- a/api/tests/unit_tests/core/plugin/test_plugin_runtime.py
+++ b/api/tests/unit_tests/core/plugin/test_plugin_runtime.py
@@ -17,14 +17,6 @@ from unittest.mock import MagicMock, patch
 
 import httpx
 import pytest
-from graphon.model_runtime.errors.invoke import (
-    InvokeAuthorizationError,
-    InvokeBadRequestError,
-    InvokeConnectionError,
-    InvokeRateLimitError,
-    InvokeServerUnavailableError,
-)
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 from pydantic import BaseModel
 
 from core.plugin.entities.plugin_daemon import (
@@ -45,6 +37,14 @@ from core.plugin.impl.exc import (
 )
 from core.plugin.impl.plugin import PluginInstaller
 from core.plugin.impl.tool import PluginToolManager
+from graphon.model_runtime.errors.invoke import (
+    InvokeAuthorizationError,
+    InvokeBadRequestError,
+    InvokeConnectionError,
+    InvokeRateLimitError,
+    InvokeServerUnavailableError,
+)
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
 
 
 @pytest.fixture(autouse=True)
diff --git a/api/tests/unit_tests/core/plugin/utils/test_chunk_merger.py b/api/tests/unit_tests/core/plugin/utils/test_chunk_merger.py
index 90730dff5a..d49b6e4b71 100644
--- a/api/tests/unit_tests/core/plugin/utils/test_chunk_merger.py
+++ b/api/tests/unit_tests/core/plugin/utils/test_chunk_merger.py
@@ -1,12 +1,12 @@
 from collections.abc import Generator
 
 import pytest
-from graphon.file import File, FileTransferMethod, FileType
 
 from core.agent.entities import AgentInvokeMessage
 from core.plugin.utils.chunk_merger import FileChunk, merge_blob_chunks
 from core.plugin.utils.converter import convert_parameters_to_plugin_format
 from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter, ToolSelector
+from graphon.file import File, FileTransferMethod, FileType
 
 
 class TestChunkMerger:
diff --git a/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py
index 2b280dd674..395d392127 100644
--- a/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py
@@ -2,6 +2,13 @@ from typing import cast
 from unittest.mock import MagicMock, patch
 
 import pytest
+
+from configs import dify_config
+from core.app.app_config.entities import ModelConfigEntity
+from core.memory.token_buffer_memory import TokenBufferMemory
+from core.prompt.advanced_prompt_transform import AdvancedPromptTransform
+from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
+from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
@@ -11,13 +18,6 @@ from graphon.model_runtime.entities.message_entities import (
     TextPromptMessageContent,
     UserPromptMessage,
 )
-
-from configs import dify_config
-from core.app.app_config.entities import ModelConfigEntity
-from core.memory.token_buffer_memory import TokenBufferMemory
-from core.prompt.advanced_prompt_transform import AdvancedPromptTransform
-from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
-from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from models.model import Conversation
 
 
diff --git a/api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py
index 4a54649b28..803afa54d7 100644
--- a/api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py
@@ -1,19 +1,18 @@
 from unittest.mock import MagicMock
 
-from graphon.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    SystemPromptMessage,
-    ToolPromptMessage,
-    UserPromptMessage,
-)
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-
 from core.app.entities.app_invoke_entities import (
     ModelConfigWithCredentialsEntity,
 )
 from core.entities.provider_configuration import ProviderModelBundle
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    SystemPromptMessage,
+    ToolPromptMessage,
+    UserPromptMessage,
+)
+from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from models.model import Conversation
 
 
diff --git a/api/tests/unit_tests/core/prompt/test_prompt_message.py b/api/tests/unit_tests/core/prompt/test_prompt_message.py
index a4b3960b0a..5d865d934c 100644
--- a/api/tests/unit_tests/core/prompt/test_prompt_message.py
+++ b/api/tests/unit_tests/core/prompt/test_prompt_message.py
@@ -1,3 +1,5 @@
+from core.prompt.simple_prompt_transform import ModelMode
+from core.prompt.utils.prompt_message_util import PromptMessageUtil
 from graphon.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     AudioPromptMessageContent,
@@ -7,9 +9,6 @@ from graphon.model_runtime.entities.message_entities import (
     UserPromptMessage,
 )
 
-from core.prompt.simple_prompt_transform import ModelMode
-from core.prompt.utils.prompt_message_util import PromptMessageUtil
-
 
 def test_build_prompt_message_with_prompt_message_contents():
     prompt = UserPromptMessage(content=[TextPromptMessageContent(data="Hello, World!")])
diff --git a/api/tests/unit_tests/core/prompt/test_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_prompt_transform.py
index e35ce2c48a..9f9ea33695 100644
--- a/api/tests/unit_tests/core/prompt/test_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_prompt_transform.py
@@ -2,9 +2,9 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 
 from core.prompt.prompt_transform import PromptTransform
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 
 # from core.app.app_config.entities import ModelConfigEntity
 # from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
diff --git a/api/tests/unit_tests/core/prompt/test_simple_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_simple_prompt_transform.py
index 3f188cfbb4..0dc74b33df 100644
--- a/api/tests/unit_tests/core/prompt/test_simple_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_simple_prompt_transform.py
@@ -2,12 +2,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    ImagePromptMessageContent,
-    TextPromptMessageContent,
-    UserPromptMessage,
-)
 
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.memory.token_buffer_memory import TokenBufferMemory
@@ -24,6 +18,12 @@ from core.prompt.prompt_templates.advanced_prompt_templates import (
     CONTEXT,
 )
 from core.prompt.simple_prompt_transform import SimplePromptTransform
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    ImagePromptMessageContent,
+    TextPromptMessageContent,
+    UserPromptMessage,
+)
 from models.model import AppMode, Conversation
 
 
diff --git a/api/tests/unit_tests/core/rag/data_post_processor/test_data_post_processor.py b/api/tests/unit_tests/core/rag/data_post_processor/test_data_post_processor.py
index 006b4e7345..1f3247590c 100644
--- a/api/tests/unit_tests/core/rag/data_post_processor/test_data_post_processor.py
+++ b/api/tests/unit_tests/core/rag/data_post_processor/test_data_post_processor.py
@@ -1,13 +1,12 @@
 from unittest.mock import MagicMock, patch
 
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
-
 from core.rag.data_post_processor.data_post_processor import DataPostProcessor
 from core.rag.data_post_processor.reorder import ReorderRunner
 from core.rag.index_processor.constant.query_type import QueryType
 from core.rag.models.document import Document
 from core.rag.rerank.rerank_type import RerankMode
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 
 
 def _doc(content: str) -> Document:
diff --git a/api/tests/unit_tests/core/rag/embedding/test_cached_embedding.py b/api/tests/unit_tests/core/rag/embedding/test_cached_embedding.py
index 3563186186..051a1455ae 100644
--- a/api/tests/unit_tests/core/rag/embedding/test_cached_embedding.py
+++ b/api/tests/unit_tests/core/rag/embedding/test_cached_embedding.py
@@ -12,11 +12,11 @@ from unittest.mock import Mock, patch
 
 import numpy as np
 import pytest
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
-from graphon.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
 from sqlalchemy.exc import IntegrityError
 
 from core.rag.embedding.cached_embedding import CacheEmbedding
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
+from graphon.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
 from models.dataset import Embedding
 
 
diff --git a/api/tests/unit_tests/core/rag/embedding/test_embedding_service.py b/api/tests/unit_tests/core/rag/embedding/test_embedding_service.py
index 408cf14a51..4b8175b0b4 100644
--- a/api/tests/unit_tests/core/rag/embedding/test_embedding_service.py
+++ b/api/tests/unit_tests/core/rag/embedding/test_embedding_service.py
@@ -49,6 +49,10 @@ from unittest.mock import Mock, patch
 
 import numpy as np
 import pytest
+from sqlalchemy.exc import IntegrityError
+
+from core.entities.embedding_type import EmbeddingInputType
+from core.rag.embedding.cached_embedding import CacheEmbedding
 from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 from graphon.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
 from graphon.model_runtime.errors.invoke import (
@@ -56,10 +60,6 @@ from graphon.model_runtime.errors.invoke import (
     InvokeConnectionError,
     InvokeRateLimitError,
 )
-from sqlalchemy.exc import IntegrityError
-
-from core.entities.embedding_type import EmbeddingInputType
-from core.rag.embedding.cached_embedding import CacheEmbedding
 from models.dataset import Embedding
 
 
diff --git a/api/tests/unit_tests/core/rag/indexing/processor/test_paragraph_index_processor.py b/api/tests/unit_tests/core/rag/indexing/processor/test_paragraph_index_processor.py
index 7ae0da03ff..4ba4d54fa0 100644
--- a/api/tests/unit_tests/core/rag/indexing/processor/test_paragraph_index_processor.py
+++ b/api/tests/unit_tests/core/rag/indexing/processor/test_paragraph_index_processor.py
@@ -3,14 +3,14 @@ from typing import Any
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from graphon.model_runtime.entities.message_entities import AssistantPromptMessage, ImagePromptMessageContent
-from graphon.model_runtime.entities.model_entities import ModelFeature
 
 from core.entities.knowledge_entities import PreviewDetail
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from core.rag.index_processor.processor.paragraph_index_processor import ParagraphIndexProcessor
 from core.rag.models.document import AttachmentDocument, Document
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from graphon.model_runtime.entities.message_entities import AssistantPromptMessage, ImagePromptMessageContent
+from graphon.model_runtime.entities.model_entities import ModelFeature
 
 
 class TestParagraphIndexProcessor:
diff --git a/api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py b/api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
index 641c5d9ba0..7c4defc180 100644
--- a/api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
+++ b/api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
@@ -53,7 +53,6 @@ from typing import Any
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
-from graphon.model_runtime.entities.model_entities import ModelType
 from sqlalchemy.orm.exc import ObjectDeletedError
 
 from core.errors.error import ProviderTokenNotInitError
@@ -64,6 +63,7 @@ from core.indexing_runner import (
 )
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
 from core.rag.models.document import ChildDocument, Document
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs.datetime_utils import naive_utc_now
 from models.dataset import Dataset, DatasetProcessRule
 from models.dataset import Document as DatasetDocument
diff --git a/api/tests/unit_tests/core/rag/rerank/test_reranker.py b/api/tests/unit_tests/core/rag/rerank/test_reranker.py
index c279b00d3b..8bc7dbf70d 100644
--- a/api/tests/unit_tests/core/rag/rerank/test_reranker.py
+++ b/api/tests/unit_tests/core/rag/rerank/test_reranker.py
@@ -17,7 +17,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
-from graphon.model_runtime.entities.rerank_entities import RerankDocument, RerankResult
 
 from core.model_manager import ModelInstance
 from core.rag.index_processor.constant.doc_type import DocType
@@ -29,6 +28,7 @@ from core.rag.rerank.rerank_factory import RerankRunnerFactory
 from core.rag.rerank.rerank_model import RerankModelRunner
 from core.rag.rerank.rerank_type import RerankMode
 from core.rag.rerank.weight_rerank import WeightRerankRunner
+from graphon.model_runtime.entities.rerank_entities import RerankDocument, RerankResult
 
 
 def create_mock_model_instance() -> ModelInstance:
diff --git a/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py b/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py
index 508fe80e2b..89830f7517 100644
--- a/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py
+++ b/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py
@@ -7,8 +7,6 @@ from uuid import uuid4
 
 import pytest
 from flask import Flask, current_app
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.model_runtime.entities.model_entities import ModelFeature
 
 from core.app.app_config.entities import (
     DatasetEntity,
@@ -35,6 +33,8 @@ from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.workflow.nodes.knowledge_retrieval import exc
 from core.workflow.nodes.knowledge_retrieval.retrieval import KnowledgeRetrievalRequest
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.model_runtime.entities.model_entities import ModelFeature
 from models.dataset import Dataset
 from models.enums import CreatorUserRole
 
diff --git a/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_function_call_router.py b/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_function_call_router.py
index 5a2ecb8220..43c521dcfd 100644
--- a/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_function_call_router.py
+++ b/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_function_call_router.py
@@ -1,8 +1,7 @@
 from unittest.mock import Mock
 
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-
 from core.rag.retrieval.router.multi_dataset_function_call_router import FunctionCallMultiDatasetRouter
+from graphon.model_runtime.entities.llm_entities import LLMUsage
 
 
 class TestFunctionCallMultiDatasetRouter:
diff --git a/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_react_route.py b/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_react_route.py
index 539ac0f849..c56528cf55 100644
--- a/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_react_route.py
+++ b/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_react_route.py
@@ -1,13 +1,12 @@
 from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
+from core.rag.retrieval.output_parser.react_output import ReactAction, ReactFinish
+from core.rag.retrieval.router.multi_dataset_react_route import ReactMultiDatasetRouter
 from graphon.model_runtime.entities.llm_entities import LLMUsage
 from graphon.model_runtime.entities.message_entities import PromptMessageRole
 from graphon.model_runtime.entities.model_entities import ModelType
 
-from core.rag.retrieval.output_parser.react_output import ReactAction, ReactFinish
-from core.rag.retrieval.router.multi_dataset_react_route import ReactMultiDatasetRouter
-
 
 class TestReactMultiDatasetRouter:
     def test_invoke_returns_none_when_no_tools(self) -> None:
diff --git a/api/tests/unit_tests/core/repositories/test_celery_workflow_execution_repository.py b/api/tests/unit_tests/core/repositories/test_celery_workflow_execution_repository.py
index e229d5fc1a..3d3322094e 100644
--- a/api/tests/unit_tests/core/repositories/test_celery_workflow_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_celery_workflow_execution_repository.py
@@ -9,10 +9,10 @@ from unittest.mock import Mock, patch
 from uuid import uuid4
 
 import pytest
-from graphon.entities import WorkflowExecution
-from graphon.enums import WorkflowType
 
 from core.repositories.celery_workflow_execution_repository import CeleryWorkflowExecutionRepository
+from graphon.entities import WorkflowExecution
+from graphon.enums import WorkflowType
 from libs.datetime_utils import naive_utc_now
 from models import Account, EndUser
 from models.enums import WorkflowRunTriggeredFrom
diff --git a/api/tests/unit_tests/core/repositories/test_celery_workflow_node_execution_repository.py b/api/tests/unit_tests/core/repositories/test_celery_workflow_node_execution_repository.py
index 7dbf78d0f0..05b4f3a053 100644
--- a/api/tests/unit_tests/core/repositories/test_celery_workflow_node_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_celery_workflow_node_execution_repository.py
@@ -9,14 +9,14 @@ from unittest.mock import Mock, patch
 from uuid import uuid4
 
 import pytest
+
+from core.repositories.celery_workflow_node_execution_repository import CeleryWorkflowNodeExecutionRepository
+from core.repositories.factory import OrderConfig
 from graphon.entities.workflow_node_execution import (
     WorkflowNodeExecution,
     WorkflowNodeExecutionStatus,
 )
 from graphon.enums import BuiltinNodeTypes
-
-from core.repositories.celery_workflow_node_execution_repository import CeleryWorkflowNodeExecutionRepository
-from core.repositories.factory import OrderConfig
 from libs.datetime_utils import naive_utc_now
 from models import Account, EndUser
 from models.workflow import WorkflowNodeExecutionTriggeredFrom
diff --git a/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py b/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py
index 0fc82dda53..8be1ac318c 100644
--- a/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py
+++ b/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py
@@ -7,11 +7,6 @@ from datetime import datetime
 from types import SimpleNamespace
 
 import pytest
-from graphon.nodes.human_input.entities import (
-    FormDefinition,
-    UserAction,
-)
-from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 
 from core.repositories.human_input_repository import (
     HumanInputFormRecord,
@@ -26,6 +21,11 @@ from core.workflow.human_input_compat import (
     ExternalRecipient,
     MemberRecipient,
 )
+from graphon.nodes.human_input.entities import (
+    FormDefinition,
+    UserAction,
+)
+from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
 from models.human_input import (
     EmailExternalRecipientPayload,
diff --git a/api/tests/unit_tests/core/repositories/test_human_input_repository.py b/api/tests/unit_tests/core/repositories/test_human_input_repository.py
index 8ff0e40587..1297a95df1 100644
--- a/api/tests/unit_tests/core/repositories/test_human_input_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_human_input_repository.py
@@ -9,8 +9,6 @@ from typing import Any
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.nodes.human_input.entities import HumanInputNodeData, UserAction
-from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 
 from core.repositories.human_input_repository import (
     FormCreateParams,
@@ -31,6 +29,8 @@ from core.workflow.human_input_compat import (
     MemberRecipient,
     WebAppDeliveryMethod,
 )
+from graphon.nodes.human_input.entities import HumanInputNodeData, UserAction
+from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
 from models.human_input import HumanInputFormRecipient, RecipientType
 
diff --git a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py
index e5c3e85487..a08c5729cb 100644
--- a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py
@@ -3,12 +3,12 @@ from unittest.mock import MagicMock
 from uuid import uuid4
 
 import pytest
-from graphon.entities import WorkflowExecution
-from graphon.enums import WorkflowExecutionStatus, WorkflowType
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
 from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
+from graphon.entities import WorkflowExecution
+from graphon.enums import WorkflowExecutionStatus, WorkflowType
 from models import Account, CreatorUserRole, EndUser, WorkflowRun
 from models.enums import WorkflowRunTriggeredFrom
 
diff --git a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py
index 5b4d26b780..6af7b02d4c 100644
--- a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py
@@ -10,12 +10,6 @@ from unittest.mock import MagicMock, Mock
 
 import psycopg2.errors
 import pytest
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import (
-    BuiltinNodeTypes,
-    WorkflowNodeExecutionMetadataKey,
-    WorkflowNodeExecutionStatus,
-)
 from sqlalchemy import Engine, create_engine
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import sessionmaker
@@ -29,6 +23,12 @@ from core.repositories.sqlalchemy_workflow_node_execution_repository import (
     _find_first,
     _replace_or_append_offload,
 )
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import (
+    BuiltinNodeTypes,
+    WorkflowNodeExecutionMetadataKey,
+    WorkflowNodeExecutionStatus,
+)
 from models import Account, EndUser
 from models.enums import ExecutionOffLoadType
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionOffload, WorkflowNodeExecutionTriggeredFrom
diff --git a/api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py b/api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py
index 84fe522388..abdbc72085 100644
--- a/api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py
+++ b/api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py
@@ -4,17 +4,17 @@ from unittest.mock import MagicMock, Mock
 
 import psycopg2.errors
 import pytest
-from graphon.entities.workflow_node_execution import (
-    WorkflowNodeExecution,
-    WorkflowNodeExecutionStatus,
-)
-from graphon.enums import BuiltinNodeTypes
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import sessionmaker
 
 from core.repositories.sqlalchemy_workflow_node_execution_repository import (
     SQLAlchemyWorkflowNodeExecutionRepository,
 )
+from graphon.entities.workflow_node_execution import (
+    WorkflowNodeExecution,
+    WorkflowNodeExecutionStatus,
+)
+from graphon.enums import BuiltinNodeTypes
 from libs.datetime_utils import naive_utc_now
 from models import Account, WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/tests/unit_tests/core/repositories/test_workflow_node_execution_truncation.py b/api/tests/unit_tests/core/repositories/test_workflow_node_execution_truncation.py
index 27729e7f06..5af1376a0a 100644
--- a/api/tests/unit_tests/core/repositories/test_workflow_node_execution_truncation.py
+++ b/api/tests/unit_tests/core/repositories/test_workflow_node_execution_truncation.py
@@ -11,17 +11,17 @@ from datetime import UTC, datetime
 from typing import Any
 from unittest.mock import MagicMock
 
-from graphon.entities.workflow_node_execution import (
-    WorkflowNodeExecution,
-    WorkflowNodeExecutionStatus,
-)
-from graphon.enums import BuiltinNodeTypes
 from sqlalchemy import Engine
 
 from configs import dify_config
 from core.repositories.sqlalchemy_workflow_node_execution_repository import (
     SQLAlchemyWorkflowNodeExecutionRepository,
 )
+from graphon.entities.workflow_node_execution import (
+    WorkflowNodeExecution,
+    WorkflowNodeExecutionStatus,
+)
+from graphon.enums import BuiltinNodeTypes
 from models import Account, WorkflowNodeExecutionTriggeredFrom
 from models.enums import ExecutionOffLoadType
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionOffload
diff --git a/api/tests/unit_tests/core/test_file.py b/api/tests/unit_tests/core/test_file.py
index ac65d0c02b..f17927f16b 100644
--- a/api/tests/unit_tests/core/test_file.py
+++ b/api/tests/unit_tests/core/test_file.py
@@ -1,7 +1,6 @@
 import json
 
 from graphon.file import File, FileTransferMethod, FileType, FileUploadConfig
-
 from models.workflow import Workflow
 
 
diff --git a/api/tests/unit_tests/core/test_model_manager.py b/api/tests/unit_tests/core/test_model_manager.py
index f5efb78b61..afea9144c0 100644
--- a/api/tests/unit_tests/core/test_model_manager.py
+++ b/api/tests/unit_tests/core/test_model_manager.py
@@ -2,12 +2,12 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 import redis
-from graphon.model_runtime.entities.model_entities import ModelType
 from pytest_mock import MockerFixture
 
 from core.entities.provider_entities import ModelLoadBalancingConfiguration
 from core.model_manager import LBModelManager
 from extensions.ext_redis import redis_client
+from graphon.model_runtime.entities.model_entities import ModelType
 
 
 @pytest.fixture
diff --git a/api/tests/unit_tests/core/test_provider_configuration.py b/api/tests/unit_tests/core/test_provider_configuration.py
index 331166fe63..b19a21d7f4 100644
--- a/api/tests/unit_tests/core/test_provider_configuration.py
+++ b/api/tests/unit_tests/core/test_provider_configuration.py
@@ -1,15 +1,6 @@
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.entities.provider_entities import (
-    ConfigurateMethod,
-    CredentialFormSchema,
-    FormOption,
-    FormType,
-    ProviderEntity,
-)
 
 from core.entities.provider_configuration import ProviderConfiguration, SystemConfigurationStatus
 from core.entities.provider_entities import (
@@ -21,6 +12,15 @@ from core.entities.provider_entities import (
     RestrictModel,
     SystemConfiguration,
 )
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.entities.provider_entities import (
+    ConfigurateMethod,
+    CredentialFormSchema,
+    FormOption,
+    FormType,
+    ProviderEntity,
+)
 from models.provider import Provider, ProviderType
 
 
diff --git a/api/tests/unit_tests/core/test_provider_manager.py b/api/tests/unit_tests/core/test_provider_manager.py
index ee26172459..f45b43082c 100644
--- a/api/tests/unit_tests/core/test_provider_manager.py
+++ b/api/tests/unit_tests/core/test_provider_manager.py
@@ -2,12 +2,12 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, Mock, PropertyMock, patch
 
 import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import ModelType
 from pytest_mock import MockerFixture
 
 from core.entities.provider_entities import ModelSettings
 from core.provider_manager import ProviderManager
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.provider import LoadBalancingModelConfig, ProviderModelSetting, TenantDefaultModel
 from models.provider_ids import ModelProviderID
 
diff --git a/api/tests/unit_tests/core/tools/test_builtin_tool_base.py b/api/tests/unit_tests/core/tools/test_builtin_tool_base.py
index 5d744f88c9..1ff81f6120 100644
--- a/api/tests/unit_tests/core/tools/test_builtin_tool_base.py
+++ b/api/tests/unit_tests/core/tools/test_builtin_tool_base.py
@@ -6,13 +6,13 @@ from typing import Any
 from unittest.mock import patch
 
 import pytest
-from graphon.model_runtime.entities.message_entities import UserPromptMessage
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.builtin_tool.tool import BuiltinTool
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolEntity, ToolIdentity, ToolInvokeMessage, ToolProviderType
+from graphon.model_runtime.entities.message_entities import UserPromptMessage
 
 
 class _BuiltinDummyTool(BuiltinTool):
diff --git a/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py b/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py
index ee0ce51eec..c7829fc0d7 100644
--- a/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py
+++ b/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py
@@ -6,8 +6,6 @@ from datetime import date
 from types import SimpleNamespace
 
 import pytest
-from graphon.file import FileType
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.tools.__base.tool_runtime import ToolRuntime
@@ -29,6 +27,8 @@ from core.tools.builtin_tool.tool import BuiltinTool
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolEntity, ToolIdentity, ToolInvokeMessage
 from core.tools.errors import ToolInvokeError
+from graphon.file import FileType
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 
 
 def _build_builtin_tool(tool_cls: type[BuiltinTool]) -> BuiltinTool:
diff --git a/api/tests/unit_tests/core/tools/test_tool_file_manager.py b/api/tests/unit_tests/core/tools/test_tool_file_manager.py
index 2889cb9db1..ccffdf16d1 100644
--- a/api/tests/unit_tests/core/tools/test_tool_file_manager.py
+++ b/api/tests/unit_tests/core/tools/test_tool_file_manager.py
@@ -12,9 +12,9 @@ from unittest.mock import MagicMock, Mock, patch
 
 import httpx
 import pytest
-from graphon.file import FileTransferMethod
 
 from core.tools.tool_file_manager import ToolFileManager
+from graphon.file import FileTransferMethod
 
 
 def _setup_tool_file_signing(monkeypatch: pytest.MonkeyPatch) -> dict[str, str]:
diff --git a/api/tests/unit_tests/core/tools/utils/test_model_invocation_utils.py b/api/tests/unit_tests/core/tools/utils/test_model_invocation_utils.py
index 84b3f71d5e..44785f939c 100644
--- a/api/tests/unit_tests/core/tools/utils/test_model_invocation_utils.py
+++ b/api/tests/unit_tests/core/tools/utils/test_model_invocation_utils.py
@@ -14,6 +14,8 @@ from typing import Any
 from unittest.mock import Mock, patch
 
 import pytest
+
+from core.tools.utils.model_invocation_utils import InvokeModelError, ModelInvocationUtils
 from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 from graphon.model_runtime.errors.invoke import (
     InvokeAuthorizationError,
@@ -23,8 +25,6 @@ from graphon.model_runtime.errors.invoke import (
     InvokeServerUnavailableError,
 )
 
-from core.tools.utils.model_invocation_utils import InvokeModelError, ModelInvocationUtils
-
 
 def _mock_model_instance(*, schema: dict[str, Any] | None = None) -> SimpleNamespace:
     model_type_instance = Mock()
diff --git a/api/tests/unit_tests/core/tools/utils/test_workflow_configuration_sync.py b/api/tests/unit_tests/core/tools/utils/test_workflow_configuration_sync.py
index 0e3a7e623a..43f3fbd5c9 100644
--- a/api/tests/unit_tests/core/tools/utils/test_workflow_configuration_sync.py
+++ b/api/tests/unit_tests/core/tools/utils/test_workflow_configuration_sync.py
@@ -1,9 +1,9 @@
 import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
 
 from core.tools.entities.tool_entities import ToolParameter, WorkflowToolParameterConfiguration
 from core.tools.errors import WorkflowToolHumanInputNotSupportedError
 from core.tools.utils.workflow_configuration_sync import WorkflowToolConfigurationUtils
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 
 
 def test_ensure_no_human_input_nodes_passes_for_non_human_input():
diff --git a/api/tests/unit_tests/core/tools/workflow_as_tool/test_provider.py b/api/tests/unit_tests/core/tools/workflow_as_tool/test_provider.py
index 4767480a5a..5a585c609a 100644
--- a/api/tests/unit_tests/core/tools/workflow_as_tool/test_provider.py
+++ b/api/tests/unit_tests/core/tools/workflow_as_tool/test_provider.py
@@ -4,7 +4,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
 
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import (
@@ -14,6 +13,7 @@ from core.tools.entities.tool_entities import (
     ToolProviderType,
 )
 from core.tools.workflow_as_tool.provider import WorkflowToolProviderController
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
 
 
 def _controller() -> WorkflowToolProviderController:
diff --git a/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py b/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py
index c20edd7400..72a73dd936 100644
--- a/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py
+++ b/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py
@@ -11,7 +11,6 @@ from typing import Any
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
-from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod, FileType
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.tools.__base.tool_runtime import ToolRuntime
@@ -25,6 +24,7 @@ from core.tools.entities.tool_entities import (
 )
 from core.tools.errors import ToolInvokeError
 from core.tools.workflow_as_tool.tool import WorkflowTool
+from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod, FileType
 
 
 class StubScalars:
diff --git a/api/tests/unit_tests/core/trigger/debug/test_debug_event_selectors.py b/api/tests/unit_tests/core/trigger/debug/test_debug_event_selectors.py
index 0c67effe90..fb7dc52838 100644
--- a/api/tests/unit_tests/core/trigger/debug/test_debug_event_selectors.py
+++ b/api/tests/unit_tests/core/trigger/debug/test_debug_event_selectors.py
@@ -12,7 +12,6 @@ from typing import Any
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.enums import BuiltinNodeTypes, NodeType
 
 from core.plugin.entities.request import TriggerInvokeEventResponse
 from core.trigger.constants import (
@@ -28,6 +27,7 @@ from core.trigger.debug.event_selectors import (
     select_trigger_debug_events,
 )
 from core.trigger.debug.events import PluginTriggerDebugEvent, WebhookDebugEvent
+from graphon.enums import BuiltinNodeTypes, NodeType
 from tests.unit_tests.core.trigger.conftest import VALID_PROVIDER_ID
 
 
diff --git a/api/tests/unit_tests/core/variables/test_segment.py b/api/tests/unit_tests/core/variables/test_segment.py
index 7406b88270..72052c8c05 100644
--- a/api/tests/unit_tests/core/variables/test_segment.py
+++ b/api/tests/unit_tests/core/variables/test_segment.py
@@ -2,6 +2,11 @@ import dataclasses
 
 import orjson
 import pytest
+from pydantic import BaseModel
+
+from core.helper import encrypter
+from core.workflow.system_variables import build_bootstrap_variables, build_system_variables
+from core.workflow.variable_pool_initializer import add_variables_to_pool
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.runtime import VariablePool
 from graphon.variables.segment_group import SegmentGroup
@@ -42,11 +47,6 @@ from graphon.variables.variables import (
     StringVariable,
     Variable,
 )
-from pydantic import BaseModel
-
-from core.helper import encrypter
-from core.workflow.system_variables import build_bootstrap_variables, build_system_variables
-from core.workflow.variable_pool_initializer import add_variables_to_pool
 
 
 def _build_variable_pool(
diff --git a/api/tests/unit_tests/core/variables/test_segment_type.py b/api/tests/unit_tests/core/variables/test_segment_type.py
index 37ecd2890b..d4e862220a 100644
--- a/api/tests/unit_tests/core/variables/test_segment_type.py
+++ b/api/tests/unit_tests/core/variables/test_segment_type.py
@@ -1,4 +1,5 @@
 import pytest
+
 from graphon.variables.segment_group import SegmentGroup
 from graphon.variables.segments import StringSegment
 from graphon.variables.types import ArrayValidation, SegmentType
diff --git a/api/tests/unit_tests/core/variables/test_segment_type_validation.py b/api/tests/unit_tests/core/variables/test_segment_type_validation.py
index 09254e17a3..94e788edb2 100644
--- a/api/tests/unit_tests/core/variables/test_segment_type_validation.py
+++ b/api/tests/unit_tests/core/variables/test_segment_type_validation.py
@@ -9,6 +9,7 @@ from dataclasses import dataclass
 from typing import Any
 
 import pytest
+
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.variables.segment_group import SegmentGroup
 from graphon.variables.segments import (
diff --git a/api/tests/unit_tests/core/variables/test_variables.py b/api/tests/unit_tests/core/variables/test_variables.py
index 75b01bf42e..dae5e1ce98 100644
--- a/api/tests/unit_tests/core/variables/test_variables.py
+++ b/api/tests/unit_tests/core/variables/test_variables.py
@@ -1,4 +1,6 @@
 import pytest
+from pydantic import ValidationError
+
 from graphon.variables import (
     ArrayFileVariable,
     ArrayVariable,
@@ -10,7 +12,6 @@ from graphon.variables import (
     StringVariable,
 )
 from graphon.variables.variables import VariableBase
-from pydantic import ValidationError
 
 
 def test_frozen_variables():
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/layers/conftest.py b/api/tests/unit_tests/core/workflow/graph_engine/layers/conftest.py
index 41627f5e0b..025d79b25d 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/layers/conftest.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/layers/conftest.py
@@ -5,12 +5,13 @@ Shared fixtures for ObservabilityLayer tests.
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.enums import BuiltinNodeTypes
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter
 from opentelemetry.trace import set_tracer_provider
 
+from graphon.enums import BuiltinNodeTypes
+
 
 @pytest.fixture
 def memory_span_exporter():
@@ -61,9 +62,8 @@ def mock_llm_node():
 @pytest.fixture
 def mock_tool_node():
     """Create a mock Tool Node with tool-specific attributes."""
-    from graphon.nodes.tool.entities import ToolNodeData
-
     from core.tools.entities.tool_entities import ToolProviderType
+    from graphon.nodes.tool.entities import ToolNodeData
 
     node = MagicMock()
     node.id = "test-tool-node-id"
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py
index 99d131737e..5d6667257f 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py
@@ -3,17 +3,16 @@ from datetime import datetime
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
+from core.app.entities.app_invoke_entities import DifyRunContext, InvokeFrom, UserFrom
+from core.app.workflow.layers.llm_quota import LLMQuotaLayer
+from core.errors.error import QuotaExceededError
+from core.model_manager import ModelInstance
 from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
 from graphon.graph_engine.entities.commands import CommandType
 from graphon.graph_events import NodeRunSucceededEvent
 from graphon.model_runtime.entities.llm_entities import LLMUsage
 from graphon.node_events import NodeRunResult
 
-from core.app.entities.app_invoke_entities import DifyRunContext, InvokeFrom, UserFrom
-from core.app.workflow.layers.llm_quota import LLMQuotaLayer
-from core.errors.error import QuotaExceededError
-from core.model_manager import ModelInstance
-
 
 def _build_dify_context() -> DifyRunContext:
     return DifyRunContext(
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_observability.py b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_observability.py
index 9cf72763ee..919f15efd0 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_observability.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_observability.py
@@ -13,10 +13,10 @@ Test coverage:
 from unittest.mock import patch
 
 import pytest
-from graphon.enums import BuiltinNodeTypes
 from opentelemetry.trace import StatusCode
 
 from core.app.workflow.layers.observability import ObservabilityLayer
+from graphon.enums import BuiltinNodeTypes
 
 
 class TestObservabilityLayerInitialization:
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
index 88989db856..76b2984a4b 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
@@ -7,12 +7,11 @@ requiring external services (LLM, Agent, Tool, Knowledge Retrieval, HTTP Request
 
 from typing import TYPE_CHECKING, Any
 
+from core.workflow.node_factory import DifyNodeFactory
 from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
 from graphon.enums import BuiltinNodeTypes, NodeType
 from graphon.nodes.base.node import Node
 
-from core.workflow.node_factory import DifyNodeFactory
-
 from .test_mock_nodes import (
     MockAgentNode,
     MockCodeNode,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
index 8b7fbd1b30..971b9b2bbf 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
@@ -10,6 +10,10 @@ from collections.abc import Generator, Mapping
 from typing import TYPE_CHECKING, Any, Optional
 from unittest.mock import MagicMock
 
+from core.model_manager import ModelInstance
+from core.workflow.node_runtime import DifyToolNodeRuntime
+from core.workflow.nodes.agent import AgentNode
+from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
 from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from graphon.model_runtime.entities.llm_entities import LLMUsage
 from graphon.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
@@ -27,11 +31,6 @@ from graphon.nodes.template_transform import TemplateTransformNode
 from graphon.nodes.tool import ToolNode
 from graphon.template_rendering import Jinja2TemplateRenderer, TemplateRenderError
 
-from core.model_manager import ModelInstance
-from core.workflow.node_runtime import DifyToolNodeRuntime
-from core.workflow.nodes.agent import AgentNode
-from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
-
 if TYPE_CHECKING:
     from graphon.entities import GraphInitParams
     from graphon.runtime import GraphRuntimeState
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py
index 8311a1e847..55a329eba9 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py
@@ -4,6 +4,13 @@ from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Any, Protocol
 
+from core.repositories.human_input_repository import (
+    FormCreateParams,
+    HumanInputFormEntity,
+    HumanInputFormRepository,
+)
+from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.system_variables import build_system_variables
 from graphon.entities import WorkflowStartReason
 from graphon.graph import Graph
 from graphon.graph_engine import GraphEngine, GraphEngineConfig
@@ -23,14 +30,6 @@ from graphon.nodes.human_input.human_input_node import HumanInputNode
 from graphon.nodes.start.entities import StartNodeData
 from graphon.nodes.start.start_node import StartNode
 from graphon.runtime import GraphRuntimeState, VariablePool
-
-from core.repositories.human_input_repository import (
-    FormCreateParams,
-    HumanInputFormEntity,
-    HumanInputFormRepository,
-)
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
-from core.workflow.system_variables import build_system_variables
 from libs.datetime_utils import naive_utc_now
 from tests.workflow_test_utils import build_test_graph_init_params
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py b/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py
index b11f957677..7d23b63049 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py
@@ -19,6 +19,11 @@ from functools import lru_cache
 from pathlib import Path
 from typing import Any
 
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
+from core.tools.utils.yaml_utils import _load_yaml_file
+from core.workflow.node_factory import DifyNodeFactory, get_default_root_node_id
+from core.workflow.system_variables import build_bootstrap_variables, build_system_variables
+from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add_variables_to_pool
 from graphon.entities import GraphInitParams
 from graphon.graph import Graph
 from graphon.graph_engine import GraphEngine, GraphEngineConfig
@@ -39,12 +44,6 @@ from graphon.variables import (
     StringVariable,
 )
 
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
-from core.tools.utils.yaml_utils import _load_yaml_file
-from core.workflow.node_factory import DifyNodeFactory, get_default_root_node_id
-from core.workflow.system_variables import build_bootstrap_variables, build_system_variables
-from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add_variables_to_pool
-
 from .test_mock_config import MockConfig
 from .test_mock_factory import MockNodeFactory
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/agent/test_message_transformer.py b/api/tests/unit_tests/core/workflow/nodes/agent/test_message_transformer.py
index cbc920705c..1f4509af9a 100644
--- a/api/tests/unit_tests/core/workflow/nodes/agent/test_message_transformer.py
+++ b/api/tests/unit_tests/core/workflow/nodes/agent/test_message_transformer.py
@@ -1,9 +1,8 @@
 from unittest.mock import patch
 
-from graphon.enums import BuiltinNodeTypes
-
 from core.tools.utils.message_transformer import ToolFileMessageTransformer
 from core.workflow.nodes.agent.message_transformer import AgentMessageTransformer
+from graphon.enums import BuiltinNodeTypes
 
 
 def test_transform_passes_conversation_id_to_tool_file_message_transformer() -> None:
diff --git a/api/tests/unit_tests/core/workflow/nodes/agent/test_runtime_support.py b/api/tests/unit_tests/core/workflow/nodes/agent/test_runtime_support.py
index 59dd763b59..c86de7f6e6 100644
--- a/api/tests/unit_tests/core/workflow/nodes/agent/test_runtime_support.py
+++ b/api/tests/unit_tests/core/workflow/nodes/agent/test_runtime_support.py
@@ -1,9 +1,8 @@
 from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
-from graphon.model_runtime.entities.model_entities import ModelType
-
 from core.workflow.nodes.agent.runtime_support import AgentRuntimeSupport
+from graphon.model_runtime.entities.model_entities import ModelType
 
 
 def test_fetch_model_reuses_single_model_assembly():
diff --git a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
index 7195471eb6..9c0ad25b58 100644
--- a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
+++ b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
@@ -2,15 +2,14 @@ import time
 import uuid
 from unittest.mock import MagicMock
 
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.graph import Graph
-from graphon.nodes.answer.answer_node import AnswerNode
-from graphon.runtime import GraphRuntimeState, VariablePool
-
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.workflow.node_factory import DifyNodeFactory
 from core.workflow.system_variables import build_system_variables
 from extensions.ext_database import db
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.graph import Graph
+from graphon.nodes.answer.answer_node import AnswerNode
+from graphon.runtime import GraphRuntimeState, VariablePool
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py b/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py
index 343bcd3919..ec4cef1955 100644
--- a/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py
@@ -1,10 +1,10 @@
 import pytest
+
+from core.workflow.node_factory import get_node_type_classes_mapping
 from graphon.entities.base_node_data import BaseNodeData
 from graphon.enums import BuiltinNodeTypes, NodeType
 from graphon.nodes.base.node import Node
 
-from core.workflow.node_factory import get_node_type_classes_mapping
-
 # Ensures that all production node classes are imported and registered.
 _ = get_node_type_classes_mapping()
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/base/test_get_node_type_classes_mapping.py b/api/tests/unit_tests/core/workflow/nodes/base/test_get_node_type_classes_mapping.py
index b9371a34f4..ef0df55995 100644
--- a/api/tests/unit_tests/core/workflow/nodes/base/test_get_node_type_classes_mapping.py
+++ b/api/tests/unit_tests/core/workflow/nodes/base/test_get_node_type_classes_mapping.py
@@ -1,6 +1,7 @@
 import types
 from collections.abc import Mapping
 
+from core.workflow.node_factory import get_node_type_classes_mapping
 from graphon.entities.base_node_data import BaseNodeData
 from graphon.enums import BuiltinNodeTypes, NodeType
 from graphon.nodes.base.node import Node
@@ -13,8 +14,6 @@ from graphon.nodes.variable_assigner.v2.node import (
     VariableAssignerNode as VariableAssignerV2,
 )
 
-from core.workflow.node_factory import get_node_type_classes_mapping
-
 
 def test_variable_assigner_latest_prefers_highest_numeric_version():
     # Act
diff --git a/api/tests/unit_tests/core/workflow/nodes/code/code_node_spec.py b/api/tests/unit_tests/core/workflow/nodes/code/code_node_spec.py
index d155124c50..ce0c9b79c6 100644
--- a/api/tests/unit_tests/core/workflow/nodes/code/code_node_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/code/code_node_spec.py
@@ -1,3 +1,4 @@
+from configs import dify_config
 from graphon.nodes.code.code_node import CodeNode
 from graphon.nodes.code.entities import CodeLanguage, CodeNodeData
 from graphon.nodes.code.exc import (
@@ -8,8 +9,6 @@ from graphon.nodes.code.exc import (
 from graphon.nodes.code.limits import CodeNodeLimits
 from graphon.variables.types import SegmentType
 
-from configs import dify_config
-
 CodeNode._limits = CodeNodeLimits(
     max_string_length=dify_config.CODE_MAX_STRING_LENGTH,
     max_number=dify_config.CODE_MAX_NUMBER,
diff --git a/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py b/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
index fb03ae9998..9cceadde49 100644
--- a/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
@@ -1,8 +1,7 @@
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
-
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
 from core.workflow.nodes.datasource.datasource_node import DatasourceNode
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
 
 
 class _VarSeg:
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
index a5026b40cf..be7cc073db 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
@@ -1,4 +1,8 @@
 import pytest
+
+from configs import dify_config
+from core.helper.ssrf_proxy import ssrf_proxy
+from core.workflow.system_variables import default_system_variables
 from graphon.file.file_manager import file_manager
 from graphon.nodes.http_request import (
     BodyData,
@@ -12,10 +16,6 @@ from graphon.nodes.http_request.exc import AuthorizationConfigError
 from graphon.nodes.http_request.executor import Executor
 from graphon.runtime import VariablePool
 
-from configs import dify_config
-from core.helper.ssrf_proxy import ssrf_proxy
-from core.workflow.system_variables import default_system_variables
-
 HTTP_REQUEST_CONFIG = HttpRequestNodeConfig(
     max_connect_timeout=dify_config.HTTP_REQUEST_MAX_CONNECT_TIMEOUT,
     max_read_timeout=dify_config.HTTP_REQUEST_MAX_READ_TIMEOUT,
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
index 4705b3f76e..a3cadc0681 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
@@ -3,17 +3,17 @@ from typing import Any
 
 import httpx
 import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.file.file_manager import file_manager
-from graphon.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
-from graphon.nodes.http_request.entities import HttpRequestNodeTimeout, Response
-from graphon.runtime import GraphRuntimeState, VariablePool
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.helper.ssrf_proxy import ssrf_proxy
 from core.tools.tool_file_manager import ToolFileManager
 from core.workflow.node_runtime import DifyFileReferenceFactory
 from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.file.file_manager import file_manager
+from graphon.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
+from graphon.nodes.http_request.entities import HttpRequestNodeTimeout, Response
+from graphon.runtime import GraphRuntimeState, VariablePool
 from tests.workflow_test_utils import build_test_graph_init_params
 
 HTTP_REQUEST_CONFIG = HttpRequestNodeConfig(
diff --git a/api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py b/api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py
index d16e1233ac..1d6a4da7c4 100644
--- a/api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py
+++ b/api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py
@@ -1,6 +1,5 @@
-from graphon.runtime import VariablePool
-
 from core.workflow.human_input_compat import EmailDeliveryConfig, EmailRecipients
+from graphon.runtime import VariablePool
 
 
 def test_render_body_template_replaces_variable_values():
diff --git a/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py b/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py
index a2cdbbf132..c0e21d0bf7 100644
--- a/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py
+++ b/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py
@@ -10,24 +10,6 @@ from typing import Any
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.entities import GraphInitParams
-from graphon.node_events import PauseRequestedEvent
-from graphon.node_events.node import StreamCompletedEvent
-from graphon.nodes.human_input.entities import (
-    FormInput,
-    FormInputDefault,
-    HumanInputNodeData,
-    UserAction,
-)
-from graphon.nodes.human_input.enums import (
-    ButtonStyle,
-    FormInputType,
-    HumanInputFormStatus,
-    PlaceholderType,
-    TimeoutUnit,
-)
-from graphon.nodes.human_input.human_input_node import HumanInputNode
-from graphon.runtime import GraphRuntimeState, VariablePool
 from pydantic import ValidationError
 
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
@@ -50,6 +32,24 @@ from core.workflow.human_input_compat import (
 )
 from core.workflow.node_runtime import DifyHumanInputNodeRuntime
 from core.workflow.system_variables import build_system_variables
+from graphon.entities import GraphInitParams
+from graphon.node_events import PauseRequestedEvent
+from graphon.node_events.node import StreamCompletedEvent
+from graphon.nodes.human_input.entities import (
+    FormInput,
+    FormInputDefault,
+    HumanInputNodeData,
+    UserAction,
+)
+from graphon.nodes.human_input.enums import (
+    ButtonStyle,
+    FormInputType,
+    HumanInputFormStatus,
+    PlaceholderType,
+    TimeoutUnit,
+)
+from graphon.nodes.human_input.human_input_node import HumanInputNode
+from graphon.runtime import GraphRuntimeState, VariablePool
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py b/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py
index 52802c7ce1..bc98028d5b 100644
--- a/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py
+++ b/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py
@@ -1,6 +1,9 @@
 import datetime
 from types import SimpleNamespace
 
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
+from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.system_variables import default_system_variables
 from graphon.entities import GraphInitParams
 from graphon.enums import BuiltinNodeTypes
 from graphon.graph_events import (
@@ -11,10 +14,6 @@ from graphon.graph_events import (
 from graphon.nodes.human_input.enums import HumanInputFormStatus
 from graphon.nodes.human_input.human_input_node import HumanInputNode
 from graphon.runtime import GraphRuntimeState, VariablePool
-
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
-from core.workflow.system_variables import default_system_variables
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py b/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py
index bbfe350f7e..82cc734274 100644
--- a/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py
+++ b/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py
@@ -2,6 +2,8 @@ from collections.abc import Mapping
 from typing import Any
 
 import pytest
+
+from core.workflow.system_variables import default_system_variables
 from graphon.entities import GraphInitParams
 from graphon.nodes.iteration.exc import IterationGraphNotFoundError
 from graphon.nodes.iteration.iteration_node import IterationNode
@@ -11,8 +13,6 @@ from graphon.runtime import (
     GraphRuntimeState,
     VariablePool,
 )
-
-from core.workflow.system_variables import default_system_variables
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py b/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
index f8802138b5..a6fca1bfb4 100644
--- a/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
@@ -3,9 +3,6 @@ import uuid
 from unittest.mock import Mock
 
 import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variables.segments import StringSegment
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
@@ -19,6 +16,9 @@ from core.workflow.nodes.knowledge_index.protocols import (
     SummaryIndexServiceProtocol,
 )
 from core.workflow.system_variables import SystemVariableKey, build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variables.segments import StringSegment
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py b/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py
index ab64be59ad..45e8ae7d20 100644
--- a/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py
@@ -3,10 +3,6 @@ import uuid
 from unittest.mock import Mock
 
 import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variables import StringSegment
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.workflow.nodes.knowledge_retrieval.entities import (
@@ -21,6 +17,10 @@ from core.workflow.nodes.knowledge_retrieval.exc import RateLimitExceededError
 from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
 from core.workflow.nodes.knowledge_retrieval.retrieval import RAGRetrievalProtocol, Source
 from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variables import StringSegment
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py b/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py
index fdf1706765..eca34f05be 100644
--- a/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py
@@ -1,14 +1,14 @@
 from unittest.mock import MagicMock
 
 import pytest
+
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
 from graphon.entities import GraphInitParams
 from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
 from graphon.nodes.list_operator.node import ListOperatorNode
 from graphon.runtime import GraphRuntimeState
 from graphon.variables import ArrayNumberSegment, ArrayStringSegment
 
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
-
 
 class TestListOperatorNode:
     """Comprehensive tests for ListOperatorNode."""
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
index c784f805c0..4186bbdc93 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
@@ -1,6 +1,8 @@
 from unittest import mock
 
 import pytest
+
+from core.model_manager import ModelInstance
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.model_runtime.entities import (
     ImagePromptMessageContent,
@@ -33,8 +35,6 @@ from graphon.nodes.llm.exc import (
 from graphon.runtime import VariablePool
 from graphon.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment
 
-from core.model_manager import ModelInstance
-
 
 def _build_model_schema(
     *,
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
index 7841bf05ad..b1f81b6c48 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
@@ -5,6 +5,19 @@ from collections.abc import Sequence
 from unittest import mock
 
 import pytest
+
+from core.app.entities.app_invoke_entities import DifyRunContext, InvokeFrom, ModelConfigWithCredentialsEntity, UserFrom
+from core.app.llm.model_access import (
+    DifyCredentialsProvider,
+    DifyModelFactory,
+    build_dify_model_access,
+    fetch_model_config,
+)
+from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
+from core.entities.provider_entities import CustomConfiguration, SystemConfiguration
+from core.plugin.impl.model_runtime_factory import create_plugin_model_runtime
+from core.prompt.entities.advanced_prompt_entities import MemoryConfig
+from core.workflow.system_variables import default_system_variables
 from graphon.entities import GraphInitParams
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.model_runtime.entities.common_entities import I18nObject
@@ -67,19 +80,6 @@ from graphon.nodes.llm.runtime_protocols import PromptMessageSerializerProtocol
 from graphon.runtime import GraphRuntimeState, VariablePool
 from graphon.template_rendering import TemplateRenderError
 from graphon.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment
-
-from core.app.entities.app_invoke_entities import DifyRunContext, InvokeFrom, ModelConfigWithCredentialsEntity, UserFrom
-from core.app.llm.model_access import (
-    DifyCredentialsProvider,
-    DifyModelFactory,
-    build_dify_model_access,
-    fetch_model_config,
-)
-from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
-from core.entities.provider_entities import CustomConfiguration, SystemConfiguration
-from core.plugin.impl.model_runtime_factory import create_plugin_model_runtime
-from core.prompt.entities.advanced_prompt_entities import MemoryConfig
-from core.workflow.system_variables import default_system_variables
 from models.provider import ProviderType
 from tests.workflow_test_utils import build_test_graph_init_params
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py b/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py
index 1c362a0a03..8f8ec49f14 100644
--- a/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py
@@ -6,6 +6,8 @@ from dataclasses import dataclass
 from typing import Any
 
 import pytest
+
+from factories.variable_factory import build_segment_with_type
 from graphon.model_runtime.entities import LLMMode
 from graphon.nodes.llm import ModelConfig, VisionConfig
 from graphon.nodes.parameter_extractor.entities import ParameterConfig, ParameterExtractorNodeData
@@ -18,8 +20,6 @@ from graphon.nodes.parameter_extractor.exc import (
 from graphon.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
 from graphon.variables.types import SegmentType
 
-from factories.variable_factory import build_segment_with_type
-
 
 @dataclass
 class ValidTestCase:
diff --git a/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py b/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py
index d86e0efe02..bc44ececd8 100644
--- a/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py
@@ -1,6 +1,8 @@
 from unittest.mock import MagicMock
 
 import pytest
+
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from graphon.enums import BuiltinNodeTypes, ErrorStrategy, WorkflowNodeExecutionStatus
 from graphon.graph import Graph
 from graphon.nodes.base.entities import VariableSelector
@@ -8,8 +10,6 @@ from graphon.nodes.template_transform.entities import TemplateTransformNodeData
 from graphon.nodes.template_transform.template_transform_node import TemplateTransformNode
 from graphon.runtime import GraphRuntimeState
 from graphon.template_rendering import TemplateRenderError
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py b/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py
index bd22a8e318..636237e56e 100644
--- a/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py
@@ -1,14 +1,14 @@
 from unittest.mock import MagicMock
 
 import pytest
+
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from graphon.nodes.base.entities import VariableSelector
 from graphon.nodes.template_transform.template_transform_node import (
     DEFAULT_TEMPLATE_TRANSFORM_MAX_OUTPUT_LENGTH,
     TemplateTransformNode,
 )
 from graphon.runtime import GraphRuntimeState
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from tests.workflow_test_utils import build_test_graph_init_params
 
 from .template_transform_node_spec import TestTemplateTransformNode  # noqa: F401
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_base_node.py b/api/tests/unit_tests/core/workflow/nodes/test_base_node.py
index e11ebf6eb8..0522dd9d14 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_base_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_base_node.py
@@ -1,16 +1,16 @@
 from collections.abc import Mapping
 
 import pytest
+
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from core.workflow.node_runtime import resolve_dify_run_context
+from core.workflow.system_variables import build_system_variables
 from graphon.entities import GraphInitParams
 from graphon.entities.base_node_data import BaseNodeData
 from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
 from graphon.enums import BuiltinNodeTypes
 from graphon.nodes.base.node import Node
 from graphon.runtime import GraphRuntimeState, VariablePool
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.workflow.node_runtime import resolve_dify_run_context
-from core.workflow.system_variables import build_system_variables
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py b/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
index 555ff0c945..87ec2d5bce 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
@@ -4,6 +4,8 @@ from unittest.mock import Mock, patch
 import pandas as pd
 import pytest
 from docx.oxml.text.paragraph import CT_P
+
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from graphon.entities import GraphInitParams
 from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
 from graphon.file import File, FileTransferMethod
@@ -19,8 +21,6 @@ from graphon.nodes.document_extractor.node import (
 from graphon.variables import ArrayFileSegment
 from graphon.variables.segments import ArrayStringSegment
 from graphon.variables.variables import StringVariable
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_if_else.py b/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
index 1b14f0ab13..782750e02e 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
@@ -3,6 +3,11 @@ import uuid
 from unittest.mock import MagicMock, Mock
 
 import pytest
+
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
+from core.workflow.node_factory import DifyNodeFactory
+from core.workflow.system_variables import build_system_variables
+from extensions.ext_database import db
 from graphon.enums import WorkflowNodeExecutionStatus
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.graph import Graph
@@ -11,11 +16,6 @@ from graphon.nodes.if_else.if_else_node import IfElseNode
 from graphon.runtime import GraphRuntimeState, VariablePool
 from graphon.utils.condition.entities import Condition, SubCondition, SubVariableCondition
 from graphon.variables import ArrayFileSegment
-
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
-from core.workflow.node_factory import DifyNodeFactory
-from core.workflow.system_variables import build_system_variables
-from extensions.ext_database import db
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py b/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
index d28c3e01e5..b217e4e8e7 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
@@ -1,6 +1,8 @@
 from unittest.mock import MagicMock
 
 import pytest
+
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
 from graphon.enums import WorkflowNodeExecutionStatus
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.nodes.list_operator.entities import (
@@ -16,8 +18,6 @@ from graphon.nodes.list_operator.exc import InvalidKeyError
 from graphon.nodes.list_operator.node import ListOperatorNode, _get_file_extract_string_func
 from graphon.variables import ArrayFileSegment
 
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
-
 
 @pytest.fixture
 def list_operator_node():
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py b/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py
index 833c303052..543f9878de 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py
@@ -2,16 +2,16 @@ import json
 import time
 
 import pytest
+from pydantic import ValidationError as PydanticValidationError
+
+from core.workflow.system_variables import build_system_variables
+from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID
 from graphon.nodes.start.entities import StartNodeData
 from graphon.nodes.start.start_node import StartNode
 from graphon.runtime import GraphRuntimeState
 from graphon.variables import build_segment, segment_to_variable
 from graphon.variables.input_entities import VariableEntity, VariableEntityType
 from graphon.variables.variables import Variable
-from pydantic import ValidationError as PydanticValidationError
-
-from core.workflow.system_variables import build_system_variables
-from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID
 from tests.workflow_test_utils import build_test_graph_init_params, build_test_variable_pool
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
index 1587014802..c806181340 100644
--- a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
@@ -8,14 +8,14 @@ from typing import TYPE_CHECKING, Any
 from unittest.mock import MagicMock
 
 import pytest
+
+from core.workflow.system_variables import build_system_variables
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.model_runtime.entities.llm_entities import LLMUsage
 from graphon.node_events import StreamChunkEvent, StreamCompletedEvent
 from graphon.nodes.tool_runtime_entities import ToolRuntimeHandle, ToolRuntimeMessage
 from graphon.runtime import GraphRuntimeState, VariablePool
 from graphon.variables.segments import ArrayFileSegment
-
-from core.workflow.system_variables import build_system_variables
 from tests.workflow_test_utils import build_test_graph_init_params
 
 if TYPE_CHECKING:  # pragma: no cover - imported for type checking only
diff --git a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py
index c4dfc5a179..438af211f3 100644
--- a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py
+++ b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py
@@ -6,11 +6,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.nodes.tool.entities import ToolNodeData, ToolProviderType
-from graphon.nodes.tool.exc import ToolRuntimeInvocationError
-from graphon.nodes.tool_runtime_entities import ToolRuntimeHandle, ToolRuntimeMessage
-from graphon.runtime import VariablePool
 
 from core.callback_handler.workflow_tool_callback_handler import DifyWorkflowCallbackHandler
 from core.plugin.impl.exc import PluginDaemonClientSideError, PluginInvokeError
@@ -22,6 +17,11 @@ from core.tools.tool_manager import ToolManager
 from core.tools.utils.message_transformer import ToolFileMessageTransformer
 from core.workflow.node_runtime import DifyToolNodeRuntime
 from core.workflow.system_variables import build_system_variables
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.nodes.tool.entities import ToolNodeData, ToolProviderType
+from graphon.nodes.tool.exc import ToolRuntimeInvocationError
+from graphon.nodes.tool_runtime_entities import ToolRuntimeHandle, ToolRuntimeMessage
+from graphon.runtime import VariablePool
 from tests.workflow_test_utils import build_test_graph_init_params, build_test_variable_pool
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py b/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py
index 952e798430..c8ddc53284 100644
--- a/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py
@@ -1,13 +1,12 @@
 from collections.abc import Mapping
 
-from graphon.entities import GraphInitParams
-from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
-from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from graphon.runtime import GraphRuntimeState
-
 from core.trigger.constants import TRIGGER_PLUGIN_NODE_TYPE
 from core.workflow.nodes.trigger_plugin.trigger_event_node import TriggerEventNode
 from core.workflow.system_variables import build_system_variables
+from graphon.entities import GraphInitParams
+from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
+from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from graphon.runtime import GraphRuntimeState
 from tests.workflow_test_utils import build_test_graph_init_params, build_test_variable_pool
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/webhook/test_exceptions.py b/api/tests/unit_tests/core/workflow/nodes/webhook/test_exceptions.py
index f1132af02b..617554ee17 100644
--- a/api/tests/unit_tests/core/workflow/nodes/webhook/test_exceptions.py
+++ b/api/tests/unit_tests/core/workflow/nodes/webhook/test_exceptions.py
@@ -1,5 +1,4 @@
 import pytest
-from graphon.entities.exc import BaseNodeError
 
 from core.workflow.nodes.trigger_webhook.exc import (
     WebhookConfigError,
@@ -7,6 +6,7 @@ from core.workflow.nodes.trigger_webhook.exc import (
     WebhookNotFoundError,
     WebhookTimeoutError,
 )
+from graphon.entities.exc import BaseNodeError
 
 
 def test_webhook_node_error_inheritance():
diff --git a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py
index 8056217479..1bbc12b23f 100644
--- a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py
+++ b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py
@@ -9,10 +9,6 @@ when passing files to downstream LLM nodes.
 from typing import Any
 from unittest.mock import Mock, patch
 
-from graphon.entities import GraphInitParams
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.runtime import GraphRuntimeState, VariablePool
-
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
 from core.workflow.nodes.trigger_webhook.entities import (
     ContentType,
@@ -22,6 +18,9 @@ from core.workflow.nodes.trigger_webhook.entities import (
 )
 from core.workflow.nodes.trigger_webhook.node import TriggerWebhookNode
 from core.workflow.system_variables import default_system_variables
+from graphon.entities import GraphInitParams
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.runtime import GraphRuntimeState, VariablePool
 from tests.workflow_test_utils import build_test_variable_pool
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py
index c19e28bbd5..427afa96ec 100644
--- a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py
@@ -2,11 +2,6 @@ from typing import Any
 from unittest.mock import patch
 
 import pytest
-from graphon.entities import GraphInitParams
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variables import FileVariable, StringVariable
 
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
 from core.trigger.constants import TRIGGER_WEBHOOK_NODE_TYPE
@@ -19,6 +14,11 @@ from core.workflow.nodes.trigger_webhook.entities import (
 )
 from core.workflow.nodes.trigger_webhook.node import TriggerWebhookNode
 from core.workflow.system_variables import default_system_variables
+from graphon.entities import GraphInitParams
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variables import FileVariable, StringVariable
 from tests.workflow_test_utils import build_test_variable_pool
 
 
diff --git a/api/tests/unit_tests/core/workflow/test_human_input_compat.py b/api/tests/unit_tests/core/workflow/test_human_input_compat.py
index cd41c43e4a..0623800b30 100644
--- a/api/tests/unit_tests/core/workflow/test_human_input_compat.py
+++ b/api/tests/unit_tests/core/workflow/test_human_input_compat.py
@@ -1,6 +1,5 @@
 from types import SimpleNamespace
 
-from graphon.enums import BuiltinNodeTypes
 from pydantic import BaseModel
 
 from core.workflow.human_input_compat import (
@@ -16,6 +15,7 @@ from core.workflow.human_input_compat import (
     normalize_node_data_for_graph,
     parse_human_input_delivery_methods,
 )
+from graphon.enums import BuiltinNodeTypes
 
 
 def test_email_delivery_config_helpers_render_and_sanitize_text() -> None:
diff --git a/api/tests/unit_tests/core/workflow/test_node_factory.py b/api/tests/unit_tests/core/workflow/test_node_factory.py
index dfe1a47e37..424c50eb26 100644
--- a/api/tests/unit_tests/core/workflow/test_node_factory.py
+++ b/api/tests/unit_tests/core/workflow/test_node_factory.py
@@ -2,15 +2,15 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch, sentinel
 
 import pytest
-from graphon.entities.base_node_data import BaseNodeData
-from graphon.enums import BuiltinNodeTypes, NodeType
-from graphon.nodes.code.entities import CodeLanguage
-from graphon.variables.segments import StringSegment
 
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext, InvokeFrom, UserFrom
 from core.workflow import node_factory
 from core.workflow import template_rendering as workflow_template_rendering
 from core.workflow.nodes.knowledge_index import KNOWLEDGE_INDEX_NODE_TYPE
+from graphon.entities.base_node_data import BaseNodeData
+from graphon.enums import BuiltinNodeTypes, NodeType
+from graphon.nodes.code.entities import CodeLanguage
+from graphon.variables.segments import StringSegment
 
 
 def _assert_typed_node_config(config, *, node_id: str, node_type: NodeType, version: str = "1") -> None:
diff --git a/api/tests/unit_tests/core/workflow/test_node_runtime.py b/api/tests/unit_tests/core/workflow/test_node_runtime.py
index 4f9c1dad59..71a2afb28a 100644
--- a/api/tests/unit_tests/core/workflow/test_node_runtime.py
+++ b/api/tests/unit_tests/core/workflow/test_node_runtime.py
@@ -2,10 +2,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, Mock, sentinel
 
 import pytest
-from graphon.file import FileTransferMethod, FileType
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
-from graphon.nodes.human_input.entities import HumanInputNodeData
 
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext, InvokeFrom, UserFrom
 from core.llm_generator.output_parser.errors import OutputParserError
@@ -30,6 +26,10 @@ from core.workflow.node_runtime import (
     build_dify_llm_file_saver,
     resolve_dify_run_context,
 )
+from graphon.file import FileTransferMethod, FileType
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
+from graphon.nodes.human_input.entities import HumanInputNodeData
 from tests.workflow_test_utils import build_test_run_context
 
 
diff --git a/api/tests/unit_tests/core/workflow/test_system_variable.py b/api/tests/unit_tests/core/workflow/test_system_variable.py
index 05ea3dc311..bdeab1eda8 100644
--- a/api/tests/unit_tests/core/workflow/test_system_variable.py
+++ b/api/tests/unit_tests/core/workflow/test_system_variable.py
@@ -1,14 +1,13 @@
 from types import SimpleNamespace
 
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.nodes import BuiltinNodeTypes
-
 from core.workflow.system_variables import (
     build_system_variables,
     default_system_variables,
     get_node_creation_preload_selectors,
     system_variables_to_mapping,
 )
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.nodes import BuiltinNodeTypes
 
 
 def test_build_system_variables_normalizes_workflow_execution_id():
diff --git a/api/tests/unit_tests/core/workflow/test_variable_pool.py b/api/tests/unit_tests/core/workflow/test_variable_pool.py
index e7b2b2914a..dddd6eb00c 100644
--- a/api/tests/unit_tests/core/workflow/test_variable_pool.py
+++ b/api/tests/unit_tests/core/workflow/test_variable_pool.py
@@ -2,6 +2,15 @@ import uuid
 from collections import defaultdict
 
 import pytest
+
+from core.workflow.system_variables import build_system_variables, system_variables_to_mapping
+from core.workflow.variable_pool_initializer import add_variables_to_pool
+from core.workflow.variable_prefixes import (
+    CONVERSATION_VARIABLE_NODE_ID,
+    ENVIRONMENT_VARIABLE_NODE_ID,
+    SYSTEM_VARIABLE_NODE_ID,
+)
+from factories.variable_factory import build_segment, segment_to_variable
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.runtime import VariablePool
 from graphon.variables import FileSegment, StringSegment
@@ -27,15 +36,6 @@ from graphon.variables.variables import (
     Variable,
 )
 
-from core.workflow.system_variables import build_system_variables, system_variables_to_mapping
-from core.workflow.variable_pool_initializer import add_variables_to_pool
-from core.workflow.variable_prefixes import (
-    CONVERSATION_VARIABLE_NODE_ID,
-    ENVIRONMENT_VARIABLE_NODE_ID,
-    SYSTEM_VARIABLE_NODE_ID,
-)
-from factories.variable_factory import build_segment, segment_to_variable
-
 
 @pytest.fixture
 def pool():
diff --git a/api/tests/unit_tests/core/workflow/test_workflow_entry.py b/api/tests/unit_tests/core/workflow/test_workflow_entry.py
index d8361d06c4..041c5cc612 100644
--- a/api/tests/unit_tests/core/workflow/test_workflow_entry.py
+++ b/api/tests/unit_tests/core/workflow/test_workflow_entry.py
@@ -1,12 +1,6 @@
 from types import SimpleNamespace
 
 import pytest
-from graphon.entities.graph_config import NodeConfigDictAdapter
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.nodes.code.code_node import CodeNode
-from graphon.nodes.code.limits import CodeNodeLimits
-from graphon.runtime import VariablePool
-from graphon.variables.variables import StringVariable
 
 from configs import dify_config
 from core.helper.code_executor.code_executor import CodeLanguage
@@ -16,6 +10,12 @@ from core.workflow.variable_prefixes import (
     ENVIRONMENT_VARIABLE_NODE_ID,
 )
 from core.workflow.workflow_entry import WorkflowEntry
+from graphon.entities.graph_config import NodeConfigDictAdapter
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.nodes.code.code_node import CodeNode
+from graphon.nodes.code.limits import CodeNodeLimits
+from graphon.runtime import VariablePool
+from graphon.variables.variables import StringVariable
 
 
 @pytest.fixture(autouse=True)
diff --git a/api/tests/unit_tests/core/workflow/test_workflow_entry_helpers.py b/api/tests/unit_tests/core/workflow/test_workflow_entry_helpers.py
index 6dcaed1143..55800ffc03 100644
--- a/api/tests/unit_tests/core/workflow/test_workflow_entry_helpers.py
+++ b/api/tests/unit_tests/core/workflow/test_workflow_entry_helpers.py
@@ -4,6 +4,12 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch, sentinel
 
 import pytest
+
+from core.app.apps.exc import GenerateTaskStoppedError
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from core.model_manager import ModelInstance
+from core.workflow import workflow_entry
+from core.workflow.system_variables import default_system_variables
 from graphon.entities.base_node_data import BaseNodeData
 from graphon.entities.graph_config import NodeConfigDictAdapter
 from graphon.enums import NodeType, WorkflowNodeExecutionStatus
@@ -17,12 +23,6 @@ from graphon.nodes import BuiltinNodeTypes
 from graphon.nodes.base.node import Node
 from graphon.runtime import ChildGraphNotFoundError, VariablePool
 from graphon.variables.variables import StringVariable
-
-from core.app.apps.exc import GenerateTaskStoppedError
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.model_manager import ModelInstance
-from core.workflow import workflow_entry
-from core.workflow.system_variables import default_system_variables
 from tests.workflow_test_utils import build_test_graph_init_params, build_test_variable_pool
 
 
diff --git a/api/tests/unit_tests/core/workflow/test_workflow_entry_redis_channel.py b/api/tests/unit_tests/core/workflow/test_workflow_entry_redis_channel.py
index 4b2f98aeff..80dc8927fa 100644
--- a/api/tests/unit_tests/core/workflow/test_workflow_entry_redis_channel.py
+++ b/api/tests/unit_tests/core/workflow/test_workflow_entry_redis_channel.py
@@ -2,11 +2,10 @@
 
 from unittest.mock import MagicMock, patch
 
-from graphon.graph_engine.command_channels import RedisChannel
-from graphon.runtime import GraphRuntimeState, VariablePool
-
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.workflow.workflow_entry import WorkflowEntry
+from graphon.graph_engine.command_channels import RedisChannel
+from graphon.runtime import GraphRuntimeState, VariablePool
 
 
 class TestWorkflowEntryRedisChannel:
diff --git a/api/tests/unit_tests/factories/test_build_from_mapping.py b/api/tests/unit_tests/factories/test_build_from_mapping.py
index 4fe3f2cb28..511192001e 100644
--- a/api/tests/unit_tests/factories/test_build_from_mapping.py
+++ b/api/tests/unit_tests/factories/test_build_from_mapping.py
@@ -2,13 +2,13 @@ import uuid
 from unittest.mock import MagicMock, patch
 
 import pytest
-from graphon.file import File, FileTransferMethod, FileType, FileUploadConfig
 from httpx import Response
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.app.file_access import DatabaseFileAccessController, FileAccessScope, bind_file_access_scope
 from core.workflow.file_reference import build_file_reference, parse_file_reference, resolve_file_record_id
 from factories.file_factory.builders import build_from_mapping as _build_from_mapping
+from graphon.file import File, FileTransferMethod, FileType, FileUploadConfig
 from models import ToolFile, UploadFile
 
 # Test Data
diff --git a/api/tests/unit_tests/factories/test_variable_factory.py b/api/tests/unit_tests/factories/test_variable_factory.py
index a06c42507d..c35e80a826 100644
--- a/api/tests/unit_tests/factories/test_variable_factory.py
+++ b/api/tests/unit_tests/factories/test_variable_factory.py
@@ -4,6 +4,11 @@ from typing import Any
 from uuid import uuid4
 
 import pytest
+from hypothesis import HealthCheck, given, settings
+from hypothesis import strategies as st
+
+from factories import variable_factory
+from factories.variable_factory import TypeMismatchError, build_segment, build_segment_with_type
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.variables import (
     ArrayNumberVariable,
@@ -31,11 +36,6 @@ from graphon.variables.segments import (
     StringSegment,
 )
 from graphon.variables.types import SegmentType
-from hypothesis import HealthCheck, given, settings
-from hypothesis import strategies as st
-
-from factories import variable_factory
-from factories.variable_factory import TypeMismatchError, build_segment, build_segment_with_type
 
 
 def test_string_variable():
diff --git a/api/tests/unit_tests/fields/test_file_fields.py b/api/tests/unit_tests/fields/test_file_fields.py
index 0e848d6ef5..9d9f626b9e 100644
--- a/api/tests/unit_tests/fields/test_file_fields.py
+++ b/api/tests/unit_tests/fields/test_file_fields.py
@@ -4,11 +4,11 @@ from datetime import datetime
 from types import SimpleNamespace
 
 import pytest
-from graphon.file import File, FileTransferMethod, FileType
 
 from core.workflow.file_reference import build_file_reference
 from fields import conversation_fields, message_fields
 from fields.file_fields import FileResponse, FileWithSignedUrl, RemoteFileInfo, UploadConfig
+from graphon.file import File, FileTransferMethod, FileType
 
 
 def test_file_response_serializes_datetime() -> None:
diff --git a/api/tests/unit_tests/libs/_human_input/support.py b/api/tests/unit_tests/libs/_human_input/support.py
index 13577b7ca5..e6cc23161e 100644
--- a/api/tests/unit_tests/libs/_human_input/support.py
+++ b/api/tests/unit_tests/libs/_human_input/support.py
@@ -6,7 +6,6 @@ from typing import Any
 
 from graphon.nodes.human_input.entities import FormInput
 from graphon.nodes.human_input.enums import TimeoutUnit
-
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/tests/unit_tests/libs/_human_input/test_form_service.py b/api/tests/unit_tests/libs/_human_input/test_form_service.py
index f1ce1a2c1c..fa2c02020b 100644
--- a/api/tests/unit_tests/libs/_human_input/test_form_service.py
+++ b/api/tests/unit_tests/libs/_human_input/test_form_service.py
@@ -5,6 +5,7 @@ Unit tests for FormService.
 from datetime import timedelta
 
 import pytest
+
 from graphon.nodes.human_input.entities import (
     FormInput,
     UserAction,
@@ -13,7 +14,6 @@ from graphon.nodes.human_input.enums import (
     FormInputType,
     TimeoutUnit,
 )
-
 from libs.datetime_utils import naive_utc_now
 
 from .support import (
diff --git a/api/tests/unit_tests/libs/_human_input/test_models.py b/api/tests/unit_tests/libs/_human_input/test_models.py
index 0babfbb315..866ee61b3e 100644
--- a/api/tests/unit_tests/libs/_human_input/test_models.py
+++ b/api/tests/unit_tests/libs/_human_input/test_models.py
@@ -5,6 +5,7 @@ Unit tests for human input form models.
 from datetime import datetime, timedelta
 
 import pytest
+
 from graphon.nodes.human_input.entities import (
     FormInput,
     UserAction,
@@ -13,7 +14,6 @@ from graphon.nodes.human_input.enums import (
     FormInputType,
     TimeoutUnit,
 )
-
 from libs.datetime_utils import naive_utc_now
 
 from .support import FormSubmissionData, FormSubmissionRequest, HumanInputForm
diff --git a/api/tests/unit_tests/models/test_conversation_variable.py b/api/tests/unit_tests/models/test_conversation_variable.py
index 86163f1554..bb3a6db1a1 100644
--- a/api/tests/unit_tests/models/test_conversation_variable.py
+++ b/api/tests/unit_tests/models/test_conversation_variable.py
@@ -1,8 +1,7 @@
 from uuid import uuid4
 
-from graphon.variables import SegmentType
-
 from factories import variable_factory
+from graphon.variables import SegmentType
 from models import ConversationVariable
 
 
diff --git a/api/tests/unit_tests/models/test_model.py b/api/tests/unit_tests/models/test_model.py
index 3f6d6bfbe3..a87dd7f15a 100644
--- a/api/tests/unit_tests/models/test_model.py
+++ b/api/tests/unit_tests/models/test_model.py
@@ -2,9 +2,9 @@ import importlib
 import types
 
 import pytest
-from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod
 
 from core.workflow.file_reference import build_file_reference
+from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod
 from models.model import Conversation, Message
 
 
diff --git a/api/tests/unit_tests/models/test_workflow.py b/api/tests/unit_tests/models/test_workflow.py
index e7c0479757..f7bdc97eb5 100644
--- a/api/tests/unit_tests/models/test_workflow.py
+++ b/api/tests/unit_tests/models/test_workflow.py
@@ -3,14 +3,13 @@ import json
 from unittest import mock
 from uuid import uuid4
 
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.variables import FloatVariable, IntegerVariable, SecretVariable, StringVariable
-from graphon.variables.segments import IntegerSegment, Segment
-
 from constants import HIDDEN_VALUE
 from core.helper import encrypter
 from core.workflow.file_reference import build_file_reference
 from factories.variable_factory import build_segment
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.variables import FloatVariable, IntegerVariable, SecretVariable, StringVariable
+from graphon.variables.segments import IntegerSegment, Segment
 from models.workflow import (
     Workflow,
     WorkflowDraftVariable,
diff --git a/api/tests/unit_tests/models/test_workflow_models.py b/api/tests/unit_tests/models/test_workflow_models.py
index 507e1c8c3a..eb9fef7587 100644
--- a/api/tests/unit_tests/models/test_workflow_models.py
+++ b/api/tests/unit_tests/models/test_workflow_models.py
@@ -13,12 +13,12 @@ from datetime import UTC, datetime
 from uuid import uuid4
 
 import pytest
+
 from graphon.enums import (
     BuiltinNodeTypes,
     WorkflowExecutionStatus,
     WorkflowNodeExecutionStatus,
 )
-
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
 from models.workflow import (
     Workflow,
diff --git a/api/tests/unit_tests/services/dataset_service_test_helpers.py b/api/tests/unit_tests/services/dataset_service_test_helpers.py
index c6972b5ef4..3349c1fd8c 100644
--- a/api/tests/unit_tests/services/dataset_service_test_helpers.py
+++ b/api/tests/unit_tests/services/dataset_service_test_helpers.py
@@ -11,7 +11,6 @@ from typing import Any
 from unittest.mock import MagicMock, Mock, create_autospec, patch
 
 import pytest
-from graphon.model_runtime.entities.model_entities import ModelFeature, ModelType
 from werkzeug.exceptions import Forbidden, NotFound
 
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
@@ -20,6 +19,7 @@ from core.rag.index_processor.constant.built_in_field import BuiltInField
 from core.rag.index_processor.constant.index_type import IndexStructureType
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from enums.cloud_plan import CloudPlan
+from graphon.model_runtime.entities.model_entities import ModelFeature, ModelType
 from models import Account, TenantAccountRole
 from models.dataset import (
     ChildChunk,
diff --git a/api/tests/unit_tests/services/document_service_validation.py b/api/tests/unit_tests/services/document_service_validation.py
index 6903c47a24..71df8c4e20 100644
--- a/api/tests/unit_tests/services/document_service_validation.py
+++ b/api/tests/unit_tests/services/document_service_validation.py
@@ -109,11 +109,11 @@ This test suite follows a comprehensive testing strategy that covers:
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.model_runtime.entities.model_entities import ModelType
 
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
 from core.rag.entities import PreProcessingRule, Rule, Segmentation
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
+from graphon.model_runtime.entities.model_entities import ModelType
 from models.dataset import Dataset, DatasetProcessRule, Document
 from services.dataset_service import DatasetService, DocumentService
 from services.entities.knowledge_entities.knowledge_entities import (
diff --git a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
index 434a99b5ae..337659b15f 100644
--- a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
+++ b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
@@ -4,10 +4,10 @@ from unittest.mock import MagicMock, Mock
 
 import pytest
 import yaml
-from graphon.enums import BuiltinNodeTypes
 from sqlalchemy.orm import Session
 
 from core.workflow.nodes.knowledge_index import KNOWLEDGE_INDEX_NODE_TYPE
+from graphon.enums import BuiltinNodeTypes
 from services.entities.knowledge_entities.rag_pipeline_entities import IconInfo, RagPipelineDatasetCreateEntity
 from services.rag_pipeline.rag_pipeline_dsl_service import (
     ImportStatus,
diff --git a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_service.py b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_service.py
index 941a665308..327281d07f 100644
--- a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_service.py
+++ b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_service.py
@@ -787,7 +787,6 @@ def test_retry_error_document_success(mocker, rag_pipeline_service) -> None:
 
 def test_set_datasource_variables_success(mocker, rag_pipeline_service) -> None:
     from graphon.entities.workflow_node_execution import WorkflowNodeExecution
-
     from models.dataset import Pipeline
 
     # 1. Setup mocks
@@ -1483,12 +1482,11 @@ def test_handle_node_run_result_raises_when_no_terminal_event(mocker, rag_pipeli
 
 
 def test_handle_node_run_result_marks_document_error_for_published_invoke(mocker, rag_pipeline_service) -> None:
+    from core.app.entities.app_invoke_entities import InvokeFrom
     from graphon.enums import WorkflowNodeExecutionStatus
     from graphon.graph_events import NodeRunFailedEvent
     from graphon.node_events.base import NodeRunResult
 
-    from core.app.entities.app_invoke_entities import InvokeFrom
-
     class FakeVariablePool:
         def __init__(self):
             self._values = {
diff --git a/api/tests/unit_tests/services/test_datasource_provider_service.py b/api/tests/unit_tests/services/test_datasource_provider_service.py
index c00a4938bb..d304e0ec44 100644
--- a/api/tests/unit_tests/services/test_datasource_provider_service.py
+++ b/api/tests/unit_tests/services/test_datasource_provider_service.py
@@ -2,10 +2,10 @@ from unittest.mock import MagicMock, patch
 
 import httpx
 import pytest
-from graphon.model_runtime.entities.provider_entities import FormType
 from sqlalchemy.orm import Session
 
 from core.plugin.entities.plugin_daemon import CredentialType
+from graphon.model_runtime.entities.provider_entities import FormType
 from models.account import Account
 from models.model import EndUser
 from models.oauth import DatasourceProvider
diff --git a/api/tests/unit_tests/services/test_human_input_service.py b/api/tests/unit_tests/services/test_human_input_service.py
index 9be475d043..55af564821 100644
--- a/api/tests/unit_tests/services/test_human_input_service.py
+++ b/api/tests/unit_tests/services/test_human_input_service.py
@@ -3,18 +3,18 @@ from datetime import datetime, timedelta
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.nodes.human_input.entities import (
-    FormDefinition,
-    FormInput,
-    UserAction,
-)
-from graphon.nodes.human_input.enums import FormInputType, HumanInputFormKind, HumanInputFormStatus
 
 import services.human_input_service as human_input_service_module
 from core.repositories.human_input_repository import (
     HumanInputFormRecord,
     HumanInputFormSubmissionRepository,
 )
+from graphon.nodes.human_input.entities import (
+    FormDefinition,
+    FormInput,
+    UserAction,
+)
+from graphon.nodes.human_input.enums import FormInputType, HumanInputFormKind, HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
 from models.human_input import RecipientType
 from services.human_input_service import (
diff --git a/api/tests/unit_tests/services/test_model_load_balancing_service.py b/api/tests/unit_tests/services/test_model_load_balancing_service.py
index bea288fb9b..3119af40a2 100644
--- a/api/tests/unit_tests/services/test_model_load_balancing_service.py
+++ b/api/tests/unit_tests/services/test_model_load_balancing_service.py
@@ -6,6 +6,9 @@ from typing import Any, cast
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
+
+from constants import HIDDEN_VALUE
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.model_entities import ModelType
 from graphon.model_runtime.entities.provider_entities import (
@@ -15,9 +18,6 @@ from graphon.model_runtime.entities.provider_entities import (
     ModelCredentialSchema,
     ProviderCredentialSchema,
 )
-from pytest_mock import MockerFixture
-
-from constants import HIDDEN_VALUE
 from models.provider import LoadBalancingModelConfig
 from services.model_load_balancing_service import ModelLoadBalancingService
 
diff --git a/api/tests/unit_tests/services/test_model_provider_service.py b/api/tests/unit_tests/services/test_model_provider_service.py
index 756d3e9b59..28d459eac9 100644
--- a/api/tests/unit_tests/services/test_model_provider_service.py
+++ b/api/tests/unit_tests/services/test_model_provider_service.py
@@ -3,10 +3,10 @@ from typing import Any
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType, ParameterRule, ParameterType
 
 from core.entities.model_entities import ModelStatus
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType, ParameterRule, ParameterType
 from models.provider import ProviderType
 from services import model_provider_service as service_module
 from services.errors.app_model_config import ProviderNotFoundError
diff --git a/api/tests/unit_tests/services/test_model_provider_service_sanitization.py b/api/tests/unit_tests/services/test_model_provider_service_sanitization.py
index 1bd979b9ec..97f3bd6f01 100644
--- a/api/tests/unit_tests/services/test_model_provider_service_sanitization.py
+++ b/api/tests/unit_tests/services/test_model_provider_service_sanitization.py
@@ -1,11 +1,11 @@
 import types
 
 import pytest
+
+from core.entities.provider_entities import CredentialConfiguration, CustomModelConfiguration
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.model_entities import ModelType
 from graphon.model_runtime.entities.provider_entities import ConfigurateMethod
-
-from core.entities.provider_entities import CredentialConfiguration, CustomModelConfiguration
 from models.provider import ProviderType
 from services.model_provider_service import ModelProviderService
 
diff --git a/api/tests/unit_tests/services/test_variable_truncator.py b/api/tests/unit_tests/services/test_variable_truncator.py
index 98ec6fb77c..4b864dd221 100644
--- a/api/tests/unit_tests/services/test_variable_truncator.py
+++ b/api/tests/unit_tests/services/test_variable_truncator.py
@@ -16,6 +16,7 @@ from typing import Any
 from uuid import uuid4
 
 import pytest
+
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.variables.segments import (
     ArrayFileSegment,
@@ -28,7 +29,6 @@ from graphon.variables.segments import (
     ObjectSegment,
     StringSegment,
 )
-
 from services.variable_truncator import (
     DummyVariableTruncator,
     MaxDepthExceededError,
diff --git a/api/tests/unit_tests/services/test_variable_truncator_additional.py b/api/tests/unit_tests/services/test_variable_truncator_additional.py
index 4f705cf5f4..e9427c4ab3 100644
--- a/api/tests/unit_tests/services/test_variable_truncator_additional.py
+++ b/api/tests/unit_tests/services/test_variable_truncator_additional.py
@@ -2,10 +2,10 @@ from collections.abc import Mapping
 from typing import Any
 
 import pytest
+
 from graphon.nodes.variable_assigner.common.helpers import UpdatedVariable
 from graphon.variables.segments import IntegerSegment, ObjectSegment, StringSegment
 from graphon.variables.types import SegmentType
-
 from services import variable_truncator as truncator_module
 from services.variable_truncator import BaseTruncator, TruncationResult, VariableTruncator
 
diff --git a/api/tests/unit_tests/services/test_webhook_service_additional.py b/api/tests/unit_tests/services/test_webhook_service_additional.py
index 8a7a463d33..776cb5dc3f 100644
--- a/api/tests/unit_tests/services/test_webhook_service_additional.py
+++ b/api/tests/unit_tests/services/test_webhook_service_additional.py
@@ -4,7 +4,6 @@ from unittest.mock import MagicMock
 
 import pytest
 from flask import Flask
-from graphon.variables.types import SegmentType
 from werkzeug.exceptions import RequestEntityTooLarge
 
 from core.workflow.nodes.trigger_webhook.entities import (
@@ -13,6 +12,7 @@ from core.workflow.nodes.trigger_webhook.entities import (
     WebhookData,
     WebhookParameter,
 )
+from graphon.variables.types import SegmentType
 from services.trigger import webhook_service as service_module
 from services.trigger.webhook_service import WebhookService
 
diff --git a/api/tests/unit_tests/services/test_workflow_run_service_pause.py b/api/tests/unit_tests/services/test_workflow_run_service_pause.py
index a62c9f4555..239cc83518 100644
--- a/api/tests/unit_tests/services/test_workflow_run_service_pause.py
+++ b/api/tests/unit_tests/services/test_workflow_run_service_pause.py
@@ -13,10 +13,10 @@ from datetime import datetime
 from unittest.mock import MagicMock, create_autospec, patch
 
 import pytest
-from graphon.enums import WorkflowExecutionStatus
 from sqlalchemy import Engine
 from sqlalchemy.orm import Session, sessionmaker
 
+from graphon.enums import WorkflowExecutionStatus
 from models.workflow import WorkflowPause
 from repositories.api_workflow_run_repository import APIWorkflowRunRepository
 from repositories.sqlalchemy_api_workflow_run_repository import _PrivateWorkflowPauseEntity
diff --git a/api/tests/unit_tests/services/test_workflow_service.py b/api/tests/unit_tests/services/test_workflow_service.py
index 351f6ffb5f..287f5f2e5e 100644
--- a/api/tests/unit_tests/services/test_workflow_service.py
+++ b/api/tests/unit_tests/services/test_workflow_service.py
@@ -15,6 +15,7 @@ from typing import Any, cast
 from unittest.mock import ANY, MagicMock, Mock, patch
 
 import pytest
+
 from graphon.entities import WorkflowNodeExecution
 from graphon.enums import (
     BuiltinNodeTypes,
@@ -28,7 +29,6 @@ from graphon.model_runtime.entities.model_entities import ModelType
 from graphon.node_events import NodeRunResult
 from graphon.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
 from graphon.variables.input_entities import VariableEntityType
-
 from libs.datetime_utils import naive_utc_now
 from models.human_input import RecipientType
 from models.model import App, AppMode
diff --git a/api/tests/unit_tests/services/workflow/test_draft_var_loader_simple.py b/api/tests/unit_tests/services/workflow/test_draft_var_loader_simple.py
index 8525672da8..60beec7964 100644
--- a/api/tests/unit_tests/services/workflow/test_draft_var_loader_simple.py
+++ b/api/tests/unit_tests/services/workflow/test_draft_var_loader_simple.py
@@ -4,12 +4,12 @@ import json
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.variables.segments import ObjectSegment, StringSegment
-from graphon.variables.types import SegmentType
 from sqlalchemy import Engine
 
 from core.workflow.file_reference import build_file_reference
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.variables.segments import ObjectSegment, StringSegment
+from graphon.variables.types import SegmentType
 from models.model import UploadFile
 from models.workflow import WorkflowDraftVariable, WorkflowDraftVariableFile
 from services.workflow_draft_variable_service import DraftVarLoader
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py b/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py
index e7e72793a3..f6bdb6a60e 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py
@@ -4,10 +4,6 @@ import uuid
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
-from graphon.enums import BuiltinNodeTypes
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.variables.segments import StringSegment
-from graphon.variables.types import SegmentType
 from sqlalchemy import Engine
 from sqlalchemy.orm import Session
 
@@ -17,6 +13,10 @@ from core.workflow.variable_prefixes import (
     ENVIRONMENT_VARIABLE_NODE_ID,
     SYSTEM_VARIABLE_NODE_ID,
 )
+from graphon.enums import BuiltinNodeTypes
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.variables.segments import StringSegment
+from graphon.variables.types import SegmentType
 from libs.uuid_utils import uuidv7
 from models.account import Account
 from models.enums import DraftVariableType
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py
index 4146fd312b..d570dce107 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py
@@ -6,13 +6,13 @@ from datetime import UTC, datetime
 from threading import Event
 
 import pytest
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-from graphon.runtime import GraphRuntimeState, VariablePool
 
 from core.app.app_config.entities import WorkflowUIBasedAppConfig
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
 from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext, _WorkflowGenerateEntityWrapper
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
+from graphon.runtime import GraphRuntimeState, VariablePool
 from models.enums import CreatorUserRole
 from models.model import AppMode
 from models.workflow import WorkflowRun
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service_additional.py b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service_additional.py
index 5e96eb4518..d2634d7d7b 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service_additional.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service_additional.py
@@ -10,14 +10,14 @@ from typing import Any, cast
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.enums import WorkflowExecutionStatus
-from graphon.runtime import GraphRuntimeState, VariablePool
 from sqlalchemy.orm import Session, sessionmaker
 
 from core.app.app_config.entities import WorkflowUIBasedAppConfig
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
 from core.app.entities.task_entities import StreamEvent
 from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext, _WorkflowGenerateEntityWrapper
+from graphon.enums import WorkflowExecutionStatus
+from graphon.runtime import GraphRuntimeState, VariablePool
 from models.enums import CreatorUserRole
 from models.model import AppMode
 from models.workflow import WorkflowRun
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_human_input_delivery.py b/api/tests/unit_tests/services/workflow/test_workflow_human_input_delivery.py
index 98d057e41f..d7192994b2 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_human_input_delivery.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_human_input_delivery.py
@@ -3,9 +3,6 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
-from graphon.enums import BuiltinNodeTypes
-from graphon.nodes.human_input.entities import HumanInputNodeData
 from sqlalchemy.orm import sessionmaker
 
 from core.workflow.human_input_compat import (
@@ -15,6 +12,9 @@ from core.workflow.human_input_compat import (
     ExternalRecipient,
     MemberRecipient,
 )
+from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
+from graphon.enums import BuiltinNodeTypes
+from graphon.nodes.human_input.entities import HumanInputNodeData
 from services import workflow_service as workflow_service_module
 from services.workflow_service import WorkflowService
 
diff --git a/api/tests/unit_tests/tasks/test_human_input_timeout_tasks.py b/api/tests/unit_tests/tasks/test_human_input_timeout_tasks.py
index 7119217e94..591da56f49 100644
--- a/api/tests/unit_tests/tasks/test_human_input_timeout_tasks.py
+++ b/api/tests/unit_tests/tasks/test_human_input_timeout_tasks.py
@@ -5,8 +5,8 @@ from types import SimpleNamespace
 from typing import Any
 
 import pytest
-from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 
+from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from tasks import human_input_timeout_tasks as task_module
 
 
diff --git a/api/tests/unit_tests/tools/test_mcp_tool.py b/api/tests/unit_tests/tools/test_mcp_tool.py
index 544e89fcee..689b973097 100644
--- a/api/tests/unit_tests/tools/test_mcp_tool.py
+++ b/api/tests/unit_tests/tools/test_mcp_tool.py
@@ -4,7 +4,6 @@ from typing import Any
 from unittest.mock import Mock, patch
 
 import pytest
-from graphon.model_runtime.entities.llm_entities import LLMUsage
 
 from core.mcp.types import (
     AudioContent,
@@ -19,6 +18,7 @@ from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolEntity, ToolIdentity, ToolInvokeMessage
 from core.tools.mcp_tool.tool import MCPTool
+from graphon.model_runtime.entities.llm_entities import LLMUsage
 
 
 def _make_mcp_tool(output_schema: dict[str, Any] | None = None) -> MCPTool:
diff --git a/api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py b/api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py
index ffa6833524..c166a946d9 100644
--- a/api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py
+++ b/api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py
@@ -2,6 +2,9 @@ from decimal import Decimal
 from unittest.mock import MagicMock, patch
 
 import pytest
+
+from core.llm_generator.output_parser.errors import OutputParserError
+from core.llm_generator.output_parser.structured_output import invoke_llm_with_structured_output
 from graphon.model_runtime.entities.llm_entities import (
     LLMResult,
     LLMResultChunk,
@@ -18,9 +21,6 @@ from graphon.model_runtime.entities.message_entities import (
 )
 from graphon.model_runtime.entities.model_entities import AIModelEntity, ModelType
 
-from core.llm_generator.output_parser.errors import OutputParserError
-from core.llm_generator.output_parser.structured_output import invoke_llm_with_structured_output
-
 
 def create_mock_usage(prompt_tokens: int = 10, completion_tokens: int = 5) -> LLMUsage:
     """Create a mock LLMUsage with all required fields"""
diff --git a/api/tests/workflow_test_utils.py b/api/tests/workflow_test_utils.py
index d33ac2c710..1415bb1d52 100644
--- a/api/tests/workflow_test_utils.py
+++ b/api/tests/workflow_test_utils.py
@@ -1,13 +1,12 @@
 from collections.abc import Mapping
 from typing import Any
 
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom, build_dify_run_context
+from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add_variables_to_pool
 from graphon.entities import GraphInitParams
 from graphon.runtime import VariablePool
 from graphon.variables.variables import Variable
 
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom, build_dify_run_context
-from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add_variables_to_pool
-
 
 def build_test_run_context(
     *,

From 3445469385527ac67242f44c954d712ab3589707 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 16 Apr 2026 17:53:16 +0800
Subject: [PATCH 19/36] perf(web): optimize first-screen rendering performance
 (#35313)

---
 web/app/(commonLayout)/layout.tsx                 | 6 +++++-
 web/app/components/devtools/react-scan/loader.tsx | 2 +-
 web/app/components/splash.tsx                     | 8 +++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/web/app/(commonLayout)/layout.tsx b/web/app/(commonLayout)/layout.tsx
index 5ac39f1e39..49e9431940 100644
--- a/web/app/(commonLayout)/layout.tsx
+++ b/web/app/(commonLayout)/layout.tsx
@@ -5,7 +5,6 @@ import InSiteMessageNotification from '@/app/components/app/in-site-message/noti
 import AmplitudeProvider from '@/app/components/base/amplitude'
 import GA, { GaType } from '@/app/components/base/ga'
 import Zendesk from '@/app/components/base/zendesk'
-import GotoAnything from '@/app/components/goto-anything'
 import Header from '@/app/components/header'
 import HeaderWrapper from '@/app/components/header/header-wrapper'
 import ReadmePanel from '@/app/components/plugins/readme-panel'
@@ -13,10 +12,15 @@ import { AppContextProvider } from '@/context/app-context-provider'
 import { EventEmitterContextProvider } from '@/context/event-emitter-provider'
 import { ModalContextProvider } from '@/context/modal-context-provider'
 import { ProviderContextProvider } from '@/context/provider-context-provider'
+import dynamic from '@/next/dynamic'
 import PartnerStack from '../components/billing/partner-stack'
 import Splash from '../components/splash'
 import RoleRouteGuard from './role-route-guard'
 
+const GotoAnything = dynamic(() => import('@/app/components/goto-anything'), {
+  ssr: false,
+})
+
 const Layout = ({ children }: { children: ReactNode }) => {
   return (
     <>
diff --git a/web/app/components/devtools/react-scan/loader.tsx b/web/app/components/devtools/react-scan/loader.tsx
index 8e933c2b24..bd310f292f 100644
--- a/web/app/components/devtools/react-scan/loader.tsx
+++ b/web/app/components/devtools/react-scan/loader.tsx
@@ -9,7 +9,7 @@ export function ReactScanLoader() {
     <Script
       src="//unpkg.com/react-scan/dist/auto.global.js"
       crossOrigin="anonymous"
-      strategy="beforeInteractive"
+      strategy="afterInteractive"
     />
   )
 }
diff --git a/web/app/components/splash.tsx b/web/app/components/splash.tsx
index 4f5f484582..3103f09ca3 100644
--- a/web/app/components/splash.tsx
+++ b/web/app/components/splash.tsx
@@ -1,15 +1,13 @@
 'use client'
 import type { FC, PropsWithChildren } from 'react'
 import * as React from 'react'
-import { useIsLogin } from '@/service/use-common'
+import { useUserProfile } from '@/service/use-common'
 import Loading from './base/loading'
 
 const Splash: FC<PropsWithChildren> = () => {
-  // would auto redirect to signin page if not logged in
-  const { isLoading, data: loginData } = useIsLogin()
-  const isLoggedIn = loginData?.logged_in
+  const { isPending, data } = useUserProfile()
 
-  if (isLoading || !isLoggedIn) {
+  if (isPending || !data?.profile) {
     return (
       <div className="fixed inset-0 z-9999999 flex h-full items-center justify-center bg-background-body">
         <Loading />

From e507675860a5285ff72fd34eaa4999b02e6dddd1 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 16 Apr 2026 20:26:06 +0800
Subject: [PATCH 20/36] fix(web): add destructive hover background to menu item
 components (#35322)

---
 web/app/components/base/ui/context-menu/index.tsx  | 6 +++---
 web/app/components/base/ui/dropdown-menu/index.tsx | 6 +++---
 web/app/components/workflow/edge-contextmenu.tsx   | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/app/components/base/ui/context-menu/index.tsx b/web/app/components/base/ui/context-menu/index.tsx
index 4ff7241b23..2e18af249e 100644
--- a/web/app/components/base/ui/context-menu/index.tsx
+++ b/web/app/components/base/ui/context-menu/index.tsx
@@ -124,7 +124,7 @@ export function ContextMenuItem({
 }: ContextMenuItemProps) {
   return (
     <BaseContextMenu.Item
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
       {...props}
     />
   )
@@ -142,7 +142,7 @@ export function ContextMenuLinkItem({
 }: ContextMenuLinkItemProps) {
   return (
     <BaseContextMenu.LinkItem
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
       closeOnClick={closeOnClick}
       {...props}
     />
@@ -213,7 +213,7 @@ export function ContextMenuSubTrigger({
 }: ContextMenuSubTriggerProps) {
   return (
     <BaseContextMenu.SubmenuTrigger
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
       {...props}
     >
       {children}
diff --git a/web/app/components/base/ui/dropdown-menu/index.tsx b/web/app/components/base/ui/dropdown-menu/index.tsx
index 9046e25ca2..b2b0b01c46 100644
--- a/web/app/components/base/ui/dropdown-menu/index.tsx
+++ b/web/app/components/base/ui/dropdown-menu/index.tsx
@@ -182,7 +182,7 @@ export function DropdownMenuSubTrigger({
 }: DropdownMenuSubTriggerProps) {
   return (
     <Menu.SubmenuTrigger
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
       {...props}
     >
       {children}
@@ -235,7 +235,7 @@ export function DropdownMenuItem({
 }: DropdownMenuItemProps) {
   return (
     <Menu.Item
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
       {...props}
     />
   )
@@ -253,7 +253,7 @@ export function DropdownMenuLinkItem({
 }: DropdownMenuLinkItemProps) {
   return (
     <Menu.LinkItem
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive', className)}
+      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
       closeOnClick={closeOnClick}
       {...props}
     />
diff --git a/web/app/components/workflow/edge-contextmenu.tsx b/web/app/components/workflow/edge-contextmenu.tsx
index cf9e70ef81..be0a9caad4 100644
--- a/web/app/components/workflow/edge-contextmenu.tsx
+++ b/web/app/components/workflow/edge-contextmenu.tsx
@@ -48,7 +48,8 @@ const EdgeContextmenu = () => {
         popupClassName="rounded-lg"
       >
         <ContextMenuItem
-          className="justify-between gap-4 px-3 text-text-secondary data-highlighted:bg-state-destructive-hover data-highlighted:text-text-destructive"
+          destructive
+          className="justify-between gap-4 px-3"
           onClick={() => handleEdgeDeleteById(edgeMenu.edgeId)}
         >
           <span>{t('common:operation.delete')}</span>

From abb84f1c384816fcd9b6e6921028bef25f744f04 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Thu, 16 Apr 2026 21:01:35 +0800
Subject: [PATCH 21/36] chore: enable noUncheckedIndexedAccess (#35178)

---
 .../migrate-no-unchecked-indexed-access.js    |   28 +
 .../package.json                              |   20 +
 .../src/cli.ts                                |   45 +
 .../no-unchecked-indexed-access/migrate.ts    | 1835 +++++++++++++++++
 .../no-unchecked-indexed-access/normalize.ts  |   51 +
 .../src/no-unchecked-indexed-access/run.ts    |  325 +++
 .../vite.config.ts                            |   17 +
 pnpm-lock.yaml                                |   16 +
 .../datasets/dataset-settings-flow.test.tsx   |    2 +-
 .../datasets/document-management.test.tsx     |    4 +-
 .../datasets/hit-testing-flow.test.tsx        |    6 +-
 .../pipeline-datasource-flow.test.tsx         |    8 +-
 web/__tests__/datasets/segment-crud.test.tsx  |    2 +-
 .../document-detail-navigation-fix.test.tsx   |    4 +-
 .../explore/explore-app-list-flow.test.tsx    |   19 +-
 .../slash-command-modes.test.tsx              |    4 +-
 .../plugins/plugin-data-utilities.test.ts     |   14 +-
 .../plugins/plugin-page-shell-flow.test.tsx   |   10 +-
 .../chunk-preview-formatting.test.ts          |   22 +-
 .../input-field-crud-flow.test.ts             |   10 +-
 .../rag-pipeline/test-run-flow.test.ts        |   12 +-
 web/__tests__/real-browser-flicker.test.tsx   |   39 +-
 .../tools/provider-list-shell-flow.test.tsx   |    6 +-
 .../tools/tool-data-processing.test.ts        |   38 +-
 web/app/account/oauth/authorize/page.tsx      |    2 +-
 .../app-info/__tests__/index.spec.tsx         |   12 +-
 .../app/annotation/__tests__/list.spec.tsx    |   12 +-
 .../__tests__/index.spec.tsx                  |    8 +-
 .../__tests__/index.spec.tsx                  |  146 +-
 .../header-opts/__tests__/index.spec.tsx      |   10 +-
 .../__tests__/index.spec.tsx                  |   13 +-
 .../add-member-or-group-pop.tsx               |    2 +-
 .../app-publisher/__tests__/index.spec.tsx    |   16 +-
 .../__tests__/version-info-modal.spec.tsx     |   18 +-
 .../app/app-publisher/features-wrapper.tsx    |    2 +-
 .../components/app/app-publisher/index.tsx    |    2 +-
 .../app/configuration/__tests__/utils.spec.ts |    4 +-
 .../__tests__/advanced-prompt-input.spec.tsx  |    2 +-
 .../config-prompt/__tests__/index.spec.tsx    |   16 +-
 .../__tests__/simple-prompt-input.spec.tsx    |   14 +-
 .../config-prompt/advanced-prompt-input.tsx   |    4 +-
 .../app/configuration/config-prompt/index.tsx |    4 +-
 .../config-prompt/simple-prompt-input.tsx     |    4 +-
 .../config-var/__tests__/index.spec.tsx       |   28 +-
 .../__tests__/form-fields.spec.tsx            |    6 +-
 .../config-modal/__tests__/index.spec.tsx     |    4 +-
 .../config-string/__tests__/index.spec.tsx    |   10 +-
 .../app/configuration/config-var/index.tsx    |    6 +-
 .../config-vision/__tests__/index.spec.tsx    |    8 +-
 .../__tests__/index.spec.tsx                  |  176 +-
 .../automatic/__tests__/result.spec.tsx       |   10 +-
 .../dataset-config/__tests__/index.spec.tsx   |   85 +-
 .../card-item/__tests__/index.spec.tsx        |   20 +-
 .../context-var/__tests__/index.spec.tsx      |   89 +-
 .../context-var/__tests__/var-picker.spec.tsx |  133 +-
 .../__tests__/config-content.spec.tsx         |   11 +-
 .../params-config/__tests__/index.spec.tsx    |   19 +-
 .../params-config/config-content.tsx          |    4 +-
 .../params-config/weighted-score.tsx          |    4 +-
 .../__tests__/retrieval-section.spec.tsx      |   53 +-
 .../debug/__tests__/index.spec.tsx            |   44 +-
 .../__tests__/context-provider.spec.tsx       |    6 +-
 .../__tests__/debug-item.spec.tsx             |   45 +-
 .../__tests__/index.spec.tsx                  |   85 +-
 .../model-parameter-trigger.tsx               |    4 +-
 .../__tests__/index.spec.tsx                  |   40 +-
 .../__tests__/use-configuration-utils.spec.ts |    2 +-
 .../external-data-tool-modal-utils.spec.ts    |    2 +-
 .../tools/external-data-tool-modal-utils.ts   |    4 +-
 web/app/components/app/configuration/utils.ts |    2 +-
 .../__tests__/index.spec.tsx                  |   63 +-
 .../app-list/__tests__/index.spec.tsx         |   40 +-
 .../__tests__/index.spec.tsx                  |   22 +-
 .../app/log/__tests__/filter.spec.tsx         |   50 +-
 .../app/log/__tests__/list-utils.spec.ts      |    6 +-
 web/app/components/app/log/index.tsx          |    2 +-
 .../__tests__/app-chart-utils.spec.ts         |   10 +-
 .../app/overview/__tests__/app-chart.spec.tsx |   14 +-
 .../embedded/__tests__/index.spec.tsx         |    4 +-
 .../app/overview/embedded/index.tsx           |    2 +-
 .../saved-items/__tests__/index.spec.tsx      |    8 +-
 .../components/app/type-selector/index.tsx    |    4 +-
 .../workflow-log/__tests__/filter.spec.tsx    |   65 +-
 .../app/workflow-log/__tests__/list.spec.tsx  |  168 +-
 web/app/components/app/workflow-log/index.tsx |    2 +-
 .../components/apps/__tests__/list.spec.tsx   |   92 +-
 web/app/components/apps/app-card.tsx          |    2 +-
 .../__tests__/use-apps-query-state.spec.tsx   |   12 +-
 .../apps/hooks/use-dsl-drag-drop.ts           |    4 +-
 web/app/components/apps/list.tsx              |    2 +-
 .../base/amplitude/__tests__/utils.spec.ts    |    2 +-
 .../app-icon-picker/__tests__/index.spec.tsx  |   20 +-
 .../__tests__/audio.player.manager.spec.ts    |   18 +-
 .../base/audio-btn/__tests__/audio.spec.ts    |  120 +-
 .../base/audio-btn/__tests__/index.spec.tsx   |   36 +-
 .../base/audio-gallery/AudioPlayer.tsx        |    4 +-
 .../__tests__/AudioPlayer.spec.tsx            |   48 +-
 web/app/components/base/block-input/index.tsx |    2 +-
 .../base/carousel/__tests__/index.spec.tsx    |   20 +-
 .../base/chat/__tests__/utils.spec.ts         |   40 +-
 .../__tests__/chat-wrapper.spec.tsx           |  126 +-
 .../__tests__/header-in-mobile.spec.tsx       |   96 +-
 .../__tests__/hooks.spec.tsx                  |    8 +-
 .../header/__tests__/index.spec.tsx           |   29 +-
 .../base/chat/chat-with-history/hooks.tsx     |    2 +-
 .../base/chat/chat/__tests__/hooks.spec.tsx   |  234 +--
 .../chat/answer/__tests__/operation.spec.tsx  |   63 +-
 .../__tests__/suggested-questions.spec.tsx    |   12 +-
 .../__tests__/human-input-form.spec.tsx       |   20 +-
 .../human-input-content/content-item.tsx      |    4 +-
 .../__tests__/operation.spec.tsx              |   12 +-
 .../base/chat/chat/chat-input-area/index.tsx  |    4 +-
 .../chat/citation/__tests__/popup.spec.tsx    |  119 +-
 .../base/chat/chat/citation/index.tsx         |    6 +-
 web/app/components/base/chat/chat/hooks.ts    |   26 +-
 web/app/components/base/chat/chat/index.tsx   |    2 +-
 .../chat/thought/__tests__/index.spec.tsx     |   80 +-
 .../base/chat/chat/use-chat-layout.ts         |    4 +-
 .../inputs-form/__tests__/content.spec.tsx    |   16 +-
 .../base/chat/embedded-chatbot/theme/utils.ts |    2 +-
 web/app/components/base/chat/utils.ts         |   12 +-
 .../checkbox-list/__tests__/index.spec.tsx    |   46 +-
 .../base/chip/__tests__/index.spec.tsx        |   66 +-
 .../calendar/__tests__/index.spec.tsx         |    8 +-
 .../date-picker/__tests__/header.spec.tsx     |    9 +-
 .../date-picker/__tests__/index.spec.tsx      |   84 +-
 .../time-picker/__tests__/index.spec.tsx      |   73 +-
 .../time-picker/__tests__/options.spec.tsx    |   12 +-
 .../base/date-and-time-picker/utils/dayjs.ts  |    4 +-
 .../emoji-picker/__tests__/Inner.spec.tsx     |   22 +-
 .../emoji-picker/__tests__/index.spec.tsx     |   12 +-
 .../__tests__/use-annotation-config.spec.ts   |   10 +-
 .../__tests__/index.spec.tsx                  |   31 +-
 .../__tests__/setting-modal.spec.tsx          |   12 +-
 .../moderation/__tests__/index.spec.tsx       |   51 +-
 .../moderation-setting-modal.spec.tsx         |   83 +-
 .../moderation/moderation-setting-modal.tsx   |    4 +-
 .../__tests__/param-config-content.spec.tsx   |   36 +-
 .../__tests__/voice-settings.spec.tsx         |   10 +-
 .../file-uploader/__tests__/hooks.spec.ts     |   14 +-
 .../file-uploader/__tests__/utils.spec.ts     |   30 +-
 .../base/file-uploader/file-input.tsx         |    4 +-
 .../__tests__/file-item.spec.tsx              |  128 +-
 .../__tests__/file-image-item.spec.tsx        |   56 +-
 .../components/base/file-uploader/hooks.ts    |    6 +-
 .../components/base/file-uploader/utils.ts    |   12 +-
 .../base/__tests__/base-form.spec.tsx         |   36 +-
 .../field/__tests__/file-uploader.spec.tsx    |    6 +-
 .../variable-or-constant-input.spec.tsx       |   18 +-
 .../base/form/form-scenarios/base/index.tsx   |    2 +-
 .../base/form/form-scenarios/demo/index.tsx   |    2 +-
 .../base/form/hooks/use-check-validated.ts    |    2 +-
 .../components/base/form/index.stories.tsx    |    2 +-
 .../base/form/utils/secret-input/index.ts     |    6 +-
 .../base/grid-mask/__tests__/index.spec.tsx   |   32 +-
 .../base/icons/icon-gallery.stories.tsx       |    4 +-
 web/app/components/base/icons/utils.ts        |    6 +-
 .../image-gallery/__tests__/index.spec.tsx    |   20 +-
 .../image-uploader/__tests__/hooks.spec.ts    |   32 +-
 .../image-uploader/__tests__/utils.spec.ts    |    2 +-
 .../components/base/image-uploader/hooks.ts   |   12 +-
 .../base/image-uploader/image-preview.tsx     |    2 +-
 .../base/input/__tests__/index.spec.tsx       |   48 +-
 .../__tests__/code-block.spec.tsx             |   58 +-
 .../markdown-blocks/__tests__/form.spec.tsx   |   33 +-
 .../base/markdown-with-directive/index.tsx    |    8 +-
 .../base/markdown/__tests__/index.spec.tsx    |    8 +-
 .../__tests__/streamdown-wrapper.spec.tsx     |   35 +-
 .../base/markdown/streamdown-wrapper.tsx      |    8 +-
 web/app/components/base/mermaid/index.tsx     |    4 +-
 .../__tests__/index.spec.tsx                  |    8 +-
 .../new-audio-button/__tests__/index.spec.tsx |   24 +-
 web/app/components/base/notion-icon/index.tsx |    2 +-
 .../base/notion-page-selector/base.tsx        |    6 +-
 .../page-selector/__tests__/index.spec.tsx    |   90 +-
 .../__tests__/use-page-selector-model.spec.ts |    8 +-
 .../page-selector/__tests__/utils.spec.ts     |   18 +-
 .../page-selector/virtual-page-list.tsx       |    4 +-
 .../base/pagination/__tests__/index.spec.tsx  |  147 +-
 web/app/components/base/pagination/hook.ts    |    6 +-
 .../base/param-item/index.stories.tsx         |    8 +-
 .../__tests__/index.spec.tsx                  |   14 +-
 .../__tests__/progress-circle.spec.tsx        |   20 +-
 .../prompt-editor/__tests__/hooks.spec.tsx    |   14 +-
 .../prompt-editor/__tests__/utils.spec.ts     |   34 +-
 .../base/prompt-editor/constants.tsx          |    2 +-
 .../components/base/prompt-editor/hooks.ts    |   10 +-
 .../plugins/__tests__/tree-view.spec.tsx      |    4 +-
 .../__tests__/hooks.spec.tsx                  |   98 +-
 .../context-block-replacement-block.spec.tsx  |    4 +-
 .../context-block/__tests__/index.spec.tsx    |    2 +-
 ...r-message-block-replacement-block.spec.tsx |   12 +-
 .../__tests__/index.spec.tsx                  |    8 +-
 .../__tests__/component.spec.tsx              |   14 +-
 .../__tests__/input-field.spec.tsx            |   26 +-
 .../__tests__/pre-populate.spec.tsx           |    6 +-
 .../hitl-input-block-replacement-block.tsx    |    2 +-
 .../hitl-input-block/variable-block.tsx       |    4 +-
 .../plugins/shortcuts-popup-plugin/index.tsx  |    2 +-
 .../__tests__/index.spec.tsx                  |    4 +-
 .../__tests__/component.spec.tsx              |    6 +-
 .../__tests__/index.spec.tsx                  |    8 +-
 ...-variable-block-replacement-block.spec.tsx |   14 +-
 .../workflow-variable-block/component.tsx     |   12 +-
 .../components/base/prompt-editor/utils.ts    |   20 +-
 .../prompt-log-modal/__tests__/index.spec.tsx |   20 +-
 .../components/base/prompt-log-modal/card.tsx |    2 +-
 .../base/prompt-log-modal/index.tsx           |    2 +-
 .../base/select/__tests__/index.spec.tsx      |  249 ++-
 .../base/select/__tests__/pure.spec.tsx       |   30 +-
 .../base/svg-gallery/__tests__/index.spec.tsx |   12 +-
 .../base/svg/__tests__/index.spec.tsx         |    4 +-
 .../base/tag-input/__tests__/index.spec.tsx   |   20 +-
 .../tag-management/__tests__/panel.spec.tsx   |  162 +-
 .../__tests__/selector.spec.tsx               |   72 +-
 .../__tests__/VideoPlayer.spec.tsx            |   25 +-
 .../base/voice-input/__tests__/index.spec.tsx |   40 +-
 .../billing-page/__tests__/index.spec.tsx     |   10 +-
 .../billing/plan/__tests__/index.spec.tsx     |   19 +-
 .../plan/assets/__tests__/index.spec.tsx      |   41 +-
 .../pricing/plans/__tests__/index.spec.tsx    |   14 +-
 .../cloud-plan-item/__tests__/index.spec.tsx  |   57 +-
 .../__tests__/index.spec.tsx                  |   16 +-
 web/app/components/billing/utils/index.ts     |    4 +-
 .../image-list/__tests__/index.spec.tsx       |  160 +-
 .../image-previewer/__tests__/index.spec.tsx  |   56 +-
 .../datasets/common/image-previewer/index.tsx |   22 +-
 .../image-uploader/__tests__/utils.spec.ts    |   10 +-
 .../common/image-uploader/hooks/use-upload.ts |    8 +-
 .../datasets/common/image-uploader/utils.ts   |    2 +-
 .../__tests__/index.spec.tsx                  |   44 +-
 .../common/retrieval-param-config/index.tsx   |    4 +-
 .../__tests__/index.spec.tsx                  |  112 +-
 .../datasets/create/__tests__/index.spec.tsx  |  197 +-
 .../__tests__/rule-detail.spec.tsx            |   14 +-
 .../create/embedding-process/rule-detail.tsx  |    2 +-
 .../file-preview/__tests__/index.spec.tsx     |  104 +-
 .../hooks/__tests__/use-file-upload.spec.tsx  |    8 +-
 web/app/components/datasets/create/index.tsx  |    2 +-
 .../create/step-two/__tests__/index.spec.tsx  |  189 +-
 .../__tests__/indexing-mode-section.spec.tsx  |   28 +-
 .../components/__tests__/inputs.spec.tsx      |   27 +-
 .../__tests__/use-segmentation-state.spec.ts  |    8 +-
 .../create/step-two/hooks/unescape.ts         |    2 +-
 .../__tests__/index.spec.tsx                  |   63 +-
 .../create/website/__tests__/base.spec.tsx    |   70 +-
 .../base/__tests__/crawled-result.spec.tsx    |   30 +-
 .../create/website/base/crawled-result.tsx    |    2 +-
 .../firecrawl/__tests__/index.spec.tsx        |   67 +-
 .../firecrawl/__tests__/options.spec.tsx      |   63 +-
 .../jina-reader/__tests__/index.spec.tsx      |  110 +-
 .../watercrawl/__tests__/index.spec.tsx       |  113 +-
 .../watercrawl/__tests__/options.spec.tsx     |   44 +-
 .../components/__tests__/operations.spec.tsx  |   33 +-
 .../document-list/__tests__/index.spec.tsx    |   81 +-
 .../__tests__/document-table-row.spec.tsx     |   51 +-
 .../components/document-source-icon.tsx       |    2 +-
 .../__tests__/index.spec.tsx                  |   51 +-
 .../__tests__/step-indicator.spec.tsx         |    8 +-
 .../__tests__/index.spec.tsx                  |  249 ++-
 .../data-source-options/index.tsx             |    2 +-
 .../__tests__/index.spec.tsx                  |  131 +-
 .../base/credential-selector/index.tsx        |    2 +-
 .../__tests__/use-local-file-upload.spec.tsx  |   11 +-
 .../data-source/online-documents/index.tsx    |    4 +-
 .../page-selector/__tests__/index.spec.tsx    |  288 ++-
 .../page-selector/__tests__/utils.spec.ts     |   26 +-
 .../online-drive/__tests__/index.spec.tsx     |   98 +-
 .../online-drive/__tests__/utils.spec.ts      |    8 +-
 .../file-list/header/__tests__/index.spec.tsx |  103 +-
 .../breadcrumbs/__tests__/bucket.spec.tsx     |    6 +-
 .../breadcrumbs/__tests__/index.spec.tsx      |  282 ++-
 .../dropdown/__tests__/index.spec.tsx         |  216 +-
 .../file-list/header/breadcrumbs/index.tsx    |    2 +-
 .../online-drive/file-list/list/index.tsx     |    2 +-
 .../online-drive/file-list/list/utils.ts      |   10 +-
 .../data-source/online-drive/utils.ts         |   10 +-
 .../base/__tests__/crawled-result.spec.tsx    |   37 +-
 .../base/__tests__/index.spec.tsx             |  137 +-
 .../website-crawl/base/crawled-result.tsx     |    2 +-
 .../website-crawl/base/options/index.tsx      |    2 +-
 .../__tests__/use-datasource-store.spec.ts    |    2 +-
 .../hooks/use-datasource-actions.ts           |    2 +-
 .../hooks/use-datasource-ui-state.ts          |    2 +-
 .../documents/create-from-pipeline/index.tsx  |    2 +-
 .../preview/__tests__/file-preview.spec.tsx   |   10 +-
 .../preview/__tests__/web-preview.spec.tsx    |   10 +-
 .../preview/chunk-preview.tsx                 |    6 +-
 .../process-documents/form.tsx                |    2 +-
 .../processing/embedding-process/index.tsx    |    2 +-
 .../__tests__/step-three-content.spec.tsx     |   16 +-
 .../detail/__tests__/new-segment.spec.tsx     |   51 +-
 .../__tests__/child-segment-detail.spec.tsx   |   63 +-
 .../detail/completed/__tests__/index.spec.tsx |  154 +-
 .../__tests__/new-child-segment.spec.tsx      |   34 +-
 .../__tests__/segment-detail.spec.tsx         |   61 +-
 .../common/__tests__/action-buttons.spec.tsx  |   33 +-
 .../common/__tests__/chunk-content.spec.tsx   |  100 +-
 .../components/segment-list-content.tsx       |    4 +-
 .../__tests__/use-child-segment-data.spec.ts  |    8 +-
 .../detail/completed/segment-list.tsx         |    2 +-
 .../__tests__/use-embedding-status.spec.tsx   |    2 +-
 .../detail/metadata/__tests__/index.spec.tsx  |  124 +-
 .../__tests__/metadata-field-list.spec.tsx    |   16 +-
 .../components/metadata-field-list.tsx        |    4 +-
 .../use-document-list-query-state.spec.tsx    |   36 +-
 .../__tests__/index.spec.tsx                  |   46 +-
 .../__tests__/index.spec.tsx                  |   32 +-
 .../__tests__/index.spec.tsx                  |   56 +-
 .../create/ExternalApiSelection.tsx           |    4 +-
 .../create/__tests__/index.spec.tsx           |  203 +-
 .../hit-testing/__tests__/index.spec.tsx      |   82 +-
 .../query-input/__tests__/index.spec.tsx      |   59 +-
 web/app/components/datasets/list/datasets.tsx |    2 +-
 .../__tests__/modal.spec.tsx                  |   72 +-
 .../metadata/edit-metadata-batch/modal.tsx    |   10 +-
 .../use-batch-edit-document-metadata.spec.ts  |    8 +-
 .../__tests__/use-metadata-document.spec.ts   |    2 +-
 .../hooks/use-batch-edit-document-metadata.ts |    4 +-
 .../metadata/hooks/use-metadata-document.ts   |    8 +-
 .../dataset-metadata-drawer.spec.tsx          |   84 +-
 .../__tests__/index.spec.tsx                  |  136 +-
 .../__tests__/info-group.spec.tsx             |   38 +-
 .../preview/__tests__/container.spec.tsx      |   47 +-
 .../rename-modal/__tests__/index.spec.tsx     |  348 +++-
 .../chunk-structure/__tests__/hooks.spec.tsx  |   42 +-
 .../__tests__/basic-info-section.spec.tsx     |   96 +-
 .../hooks/__tests__/use-form-state.spec.ts    |    2 +-
 .../index-method/__tests__/index.spec.tsx     |   29 +-
 .../__tests__/index.spec.tsx                  |   72 +-
 .../settings/permission-selector/index.tsx    |   12 +-
 web/app/components/develop/code.tsx           |    2 +-
 .../components/develop/hooks/use-doc-toc.ts   |    2 +-
 .../__tests__/secret-key-button.spec.tsx      |   38 +-
 web/app/components/develop/tag.tsx            |    2 +-
 .../create-app-modal/__tests__/index.spec.tsx |   42 +-
 .../__tests__/use-get-requirements.spec.ts    |   16 +-
 .../try-app/app-info/use-get-requirements.ts  |    6 +-
 .../try-app/preview/basic-app-preview.tsx     |    2 +-
 .../actions/__tests__/index.spec.ts           |   10 +-
 .../actions/__tests__/knowledge.spec.ts       |    4 +-
 .../actions/__tests__/recent-store.spec.ts    |    6 +-
 .../__tests__/direct-commands.spec.ts         |   26 +-
 .../actions/commands/__tests__/go.spec.tsx    |   16 +-
 .../commands/__tests__/language.spec.ts       |    4 +-
 .../commands/__tests__/registry.spec.ts       |    4 +-
 .../actions/commands/__tests__/theme.spec.ts  |    2 +-
 .../goto-anything/command-selector.tsx        |    2 +-
 .../use-goto-anything-results.spec.ts         |    6 +-
 .../hooks/use-goto-anything-results.ts        |    4 +-
 web/app/components/goto-anything/index.tsx    |    2 +-
 .../__tests__/compliance.spec.tsx             |   24 +-
 .../__tests__/index.spec.tsx                  |   12 +-
 .../account-setting/__tests__/index.spec.tsx  |  156 +-
 .../__tests__/index.spec.tsx                  |   49 +-
 .../__tests__/item.spec.tsx                   |   20 +-
 .../__tests__/selector.spec.tsx               |   11 +-
 .../__tests__/card.spec.tsx                   |   35 +-
 .../hooks/use-marketplace-all-plugins.ts      |    4 +-
 .../header/account-setting/index.tsx          |    2 +-
 .../members-page/__tests__/index.spec.tsx     |   53 +-
 .../__tests__/hooks.spec.ts                   |   12 +-
 .../__tests__/utils.spec.ts                   |    2 +-
 .../model-provider-page/hooks.ts              |    4 +-
 .../add-credential-in-load-balancing.spec.tsx |   11 +-
 ...itch-credential-in-load-balancing.spec.tsx |   67 +-
 .../__tests__/authorized-item.spec.tsx        |   18 +-
 .../authorized/__tests__/index.spec.tsx       |   14 +-
 .../hooks/__tests__/use-auth-service.spec.tsx |   16 +-
 .../__tests__/use-custom-models.spec.tsx      |    4 +-
 .../__tests__/use-model-form-schemas.spec.tsx |    2 +-
 .../model-modal/__tests__/Form.spec.tsx       |  159 +-
 .../model-modal/__tests__/index.spec.tsx      |   16 +-
 .../__tests__/parameter-item.spec.tsx         |   44 +-
 .../__tests__/popup-item.spec.tsx             |   22 +-
 .../model-selector/__tests__/popup.spec.tsx   |   56 +-
 .../model-selector/popup-item.tsx             |    2 +-
 .../__tests__/model-list.spec.tsx             |  106 +-
 .../model-load-balancing-modal.spec.tsx       |   41 +-
 .../__tests__/usage-priority-section.spec.tsx |   16 +-
 .../use-activate-credential.spec.tsx          |    4 +-
 .../model-load-balancing-configs.tsx          |    2 +-
 .../model-load-balancing-modal.tsx            |    2 +-
 .../account-setting/plugin-page/index.tsx     |    2 +-
 web/app/components/header/app-nav/index.tsx   |    2 +-
 .../app-selector/__tests__/index.spec.tsx     |   11 +-
 .../nav/nav-selector/__tests__/index.spec.tsx |    8 +-
 .../plugins/__tests__/hooks.spec.ts           |    8 +-
 web/app/components/plugins/card/index.tsx     |    2 +-
 .../plugins/install-plugin/hooks.ts           |    2 +-
 .../steps/__tests__/install-multi.spec.tsx    |   70 +-
 .../steps/hooks/use-install-multi-state.ts    |    2 +-
 .../install-bundle/steps/install.tsx          |    6 +-
 .../install-bundle/steps/installed.tsx        |    6 +-
 .../marketplace/__tests__/query.spec.tsx      |    6 +-
 .../marketplace/__tests__/utils.spec.ts       |   10 +-
 .../marketplace/list/list-with-collection.tsx |    2 +-
 .../search-box/__tests__/index.spec.tsx       |  187 +-
 .../search-box/trigger/marketplace.tsx        |    2 +-
 .../search-box/trigger/tool-selector.tsx      |    2 +-
 .../marketplace/sort-dropdown/index.tsx       |    2 +-
 .../__tests__/authorized-in-node.spec.tsx     |    8 +-
 .../__tests__/plugin-auth-in-agent.spec.tsx   |   16 +-
 .../authorized/__tests__/index.spec.tsx       |  324 ++-
 .../hooks/__tests__/use-credential.spec.ts    |    2 +-
 .../__tests__/agent-strategy-list.spec.tsx    |   12 +-
 .../__tests__/detail-header.spec.tsx          |  104 +-
 .../__tests__/endpoint-card.spec.tsx          |   52 +-
 .../__tests__/endpoint-list.spec.tsx          |   26 +-
 .../__tests__/endpoint-modal.spec.tsx         |   22 +-
 .../__tests__/strategy-detail.spec.tsx        |   40 +-
 .../app-selector/__tests__/index.spec.tsx     |  340 +--
 .../app-selector/app-picker.tsx               |    2 +-
 .../hooks/use-app-inputs-form-schema.ts       |    2 +-
 .../__tests__/tts-params-panel.spec.tsx       |  172 +-
 .../__tests__/index.spec.tsx                  |   16 +-
 .../__tests__/subscription-card.spec.tsx      |   12 +-
 .../create/__tests__/index.spec.tsx           |  305 ++-
 .../__tests__/use-oauth-client-state.spec.ts  |    8 +-
 .../create/hooks/use-common-modal-state.ts    |    2 +-
 .../subscription-list/create/index.tsx        |    6 +-
 .../reasoning-config-form.helpers.ts          |   10 +-
 .../components/reasoning-config-form.tsx      |    4 +-
 .../__tests__/use-tool-selector-state.spec.ts |    4 +-
 .../__tests__/event-detail-drawer.spec.tsx    |   46 +-
 .../trigger/event-detail-drawer.tsx           |    2 +-
 .../plugin-item/__tests__/action.spec.tsx     |  112 +-
 .../components/plugins/plugin-item/index.tsx  |    2 +-
 .../__tests__/category-filter.spec.tsx        |   12 +-
 .../__tests__/index.spec.tsx                  |  141 +-
 .../filter-management/category-filter.tsx     |    2 +-
 .../plugin-page/list/__tests__/index.spec.tsx |  138 +-
 .../plugin-tasks/__tests__/index.spec.tsx     |  121 +-
 .../__tests__/plugin-section.spec.tsx         |   22 +-
 .../__tests__/plugin-task-list.spec.tsx       |   59 +-
 .../components/error-plugin-item.tsx          |    6 +-
 .../plugins/plugin-page/use-uploader.ts       |    2 +-
 .../__tests__/index.spec.tsx                  |  133 +-
 .../update-plugin/plugin-version-picker.tsx   |    2 +-
 .../chunk-card-list/__tests__/index.spec.tsx  |  210 +-
 .../input-field/__tests__/index.spec.tsx      |  146 +-
 .../panel/input-field/editor/form/index.tsx   |    2 +-
 .../field-list/__tests__/field-item.spec.tsx  |   10 +-
 .../field-list/__tests__/hooks.spec.ts        |    8 +-
 .../field-list/__tests__/index.spec.tsx       |  197 +-
 .../panel/input-field/field-list/hooks.ts     |    4 +-
 .../components/panel/input-field/index.tsx    |    4 +-
 .../preparation/__tests__/hooks.spec.ts       |   10 +-
 .../preparation/__tests__/index.spec.tsx      |  134 +-
 .../__tests__/index.spec.tsx                  |   74 +-
 .../preparation/data-source-options/index.tsx |    2 +-
 .../document-processing/options.tsx           |    2 +-
 .../panel/test-run/preparation/index.tsx      |    4 +-
 .../test-run/result/__tests__/index.spec.tsx  |  144 +-
 .../result-preview/__tests__/index.spec.tsx   |  112 +-
 .../__tests__/index.spec.tsx                  |  140 +-
 .../hooks/__tests__/index.spec.ts             |   14 +-
 .../hooks/__tests__/use-input-fields.spec.ts  |   20 +-
 .../__tests__/use-nodes-sync-draft.spec.ts    |   12 +-
 .../__tests__/use-pipeline-config.spec.ts     |    6 +-
 .../__tests__/use-pipeline-template.spec.ts   |   12 +-
 .../hooks/__tests__/use-pipeline.spec.ts      |    6 +-
 .../use-rag-pipeline-search.spec.tsx          |    6 +-
 .../rag-pipeline/hooks/use-pipeline.tsx       |    4 +-
 .../store/__tests__/index.spec.ts             |   28 +-
 .../utils/__tests__/index.spec.ts             |   24 +-
 .../components/rag-pipeline/utils/nodes.ts    |    6 +-
 .../text-generation-result-panel.spec.tsx     |   26 +-
 .../hooks/use-text-generation-batch.ts        |    4 +-
 .../workflow-stream-handlers.spec.ts          |   12 +-
 .../text-generation/result/result-request.ts  |    2 +-
 .../result/workflow-stream-handlers.ts        |   12 +-
 .../csv-download/__tests__/index.spec.tsx     |   10 +-
 .../run-once/__tests__/index.spec.tsx         |   22 +-
 .../__tests__/index.spec.tsx                  |   66 +-
 .../__tests__/test-api.spec.tsx               |   32 +-
 .../mcp/__tests__/mcp-server-modal.spec.tsx   |   46 +-
 .../tools/mcp/__tests__/modal.spec.tsx        |   75 +-
 .../mcp/detail/__tests__/content.spec.tsx     |   73 +-
 .../components/tools/mcp/headers-input.tsx    |    2 +-
 .../__tests__/use-mcp-modal-form.spec.ts      |    8 +-
 .../tools/mcp/hooks/use-mcp-service-card.ts   |    2 +-
 .../__tests__/authentication-section.spec.tsx |   34 +-
 .../__tests__/headers-section.spec.tsx        |   97 +-
 .../tools/provider/__tests__/detail.spec.tsx  |   84 +-
 web/app/components/tools/provider/detail.tsx  |    2 +-
 .../utils/__tests__/to-form-schema.spec.ts    |   60 +-
 .../components/tools/utils/to-form-schema.ts  |    4 +-
 .../__tests__/configure-button.spec.tsx       |  312 ++-
 .../__tests__/method-selector.spec.tsx        |   60 +-
 .../__tests__/use-configure-button.spec.ts    |    6 +-
 .../components/tools/workflow-tool/index.tsx  |    4 +-
 .../workflow-app/components/workflow-main.tsx |    2 +-
 .../__tests__/use-workflow-template.spec.ts   |    6 +-
 web/app/components/workflow-app/utils.ts      |    2 +-
 .../__tests__/candidate-node-main.spec.tsx    |   10 +-
 ...ustom-edge-linear-gradient-render.spec.tsx |   24 +-
 .../__tests__/edge-contextmenu.spec.tsx       |   18 +-
 .../__tests__/workflow-history-store.spec.tsx |    8 +-
 .../__tests__/workflow-test-env.spec.tsx      |   18 +-
 .../__tests__/index-bar.spec.tsx              |    8 +-
 .../block-selector/__tests__/tabs.spec.tsx    |   26 +-
 .../__tests__/view-type-select.spec.tsx       |    8 +-
 .../workflow/block-selector/blocks.tsx        |    2 +-
 .../workflow/block-selector/data-sources.tsx  |    2 +-
 .../workflow/block-selector/index-bar.tsx     |    8 +-
 .../rag-tool-recommendations/list.tsx         |   10 +-
 .../block-selector/tool/action-item.tsx       |    4 +-
 .../tool/tool-list-tree-view/list.tsx         |    2 +-
 .../workflow/block-selector/tool/tool.tsx     |   26 +-
 .../workflow/block-selector/tools.tsx         |   10 +-
 .../trigger-plugin/action-item.tsx            |    6 +-
 .../block-selector/trigger-plugin/item.tsx    |   16 +-
 .../__tests__/collaboration-manager.test.ts   |    8 +-
 .../core/__tests__/crdt-provider.test.ts      |    2 +-
 .../collaboration/utils/user-color.ts         |    2 +-
 .../workflow/comment/mention-input.tsx        |    6 +-
 .../components/workflow/comment/thread.tsx    |    2 +-
 web/app/components/workflow/features.tsx      |    8 +-
 .../header/__tests__/run-mode.spec.tsx        |    8 +-
 .../workflow/header/checklist/node-group.tsx  |    2 +-
 .../header/checklist/plugin-group.tsx         |    2 +-
 .../use-edges-interactions.helpers.spec.ts    |    4 +-
 .../__tests__/use-node-data-update.spec.ts    |    2 +-
 .../__tests__/use-nodes-interactions.spec.ts  |    4 +-
 .../use-workflow-interactions.spec.tsx        |    2 +-
 .../use-workflow-organize.helpers.spec.ts     |    4 +-
 .../__tests__/use-workflow-organize.spec.tsx  |    2 +-
 .../__tests__/use-workflow-variables.spec.ts  |    8 +-
 .../workflow/hooks/use-checklist.ts           |   88 +-
 .../workflow/hooks/use-edges-interactions.ts  |    4 +-
 .../hooks/use-fetch-workflow-inspect-vars.ts  |   12 +-
 .../components/workflow/hooks/use-helpline.ts |   16 +-
 .../hooks/use-inspect-vars-crud-common.ts     |    8 +-
 .../workflow/hooks/use-nodes-interactions.ts  |   46 +-
 .../workflow/hooks/use-workflow-comment.ts    |    4 +-
 .../__tests__/use-workflow-agent-log.spec.ts  |   10 +-
 .../use-workflow-node-finished.spec.ts        |    2 +-
 ...kflow-node-human-input-form-filled.spec.ts |    2 +-
 ...flow-node-human-input-form-timeout.spec.ts |    2 +-
 ...workflow-node-human-input-required.spec.ts |    6 +-
 ...se-workflow-node-iteration-started.spec.ts |    2 +-
 .../use-workflow-node-loop-finished.spec.ts   |    2 +-
 .../use-workflow-node-loop-started.spec.ts    |    2 +-
 .../use-workflow-node-started.spec.ts         |    4 +-
 .../use-workflow-agent-log.ts                 |   16 +-
 .../use-workflow-finished.ts                  |    4 +-
 ...-workflow-node-human-input-form-timeout.ts |    2 +-
 .../use-workflow-node-human-input-required.ts |    4 +-
 .../use-workflow-node-iteration-started.ts    |   14 +-
 .../use-workflow-node-loop-started.ts         |   14 +-
 .../use-workflow-node-started.ts              |   12 +-
 .../components/workflow/hooks/use-workflow.ts |    4 +-
 web/app/components/workflow/index.tsx         |    2 +-
 .../components/before-run-form/form-item.tsx  |   16 +-
 .../_base/components/before-run-form/form.tsx |    4 +-
 .../components/before-run-form/helpers.ts     |    2 +-
 .../code-editor/editor-support-vars.tsx       |    2 +-
 .../_base/components/error-handle/utils.ts    |    4 +-
 .../nodes/_base/components/file-type-item.tsx |    2 +-
 .../nodes/_base/components/next-step/line.tsx |    4 +-
 .../readonly-input-with-select-var.tsx        |    2 +-
 .../components/support-var-input/index.tsx    |    2 +-
 .../components/switch-plugin-version.tsx      |    2 +-
 .../nodes/_base/components/variable-tag.tsx   |    2 +-
 .../__tests__/output-var-list.spec.tsx        |   10 +-
 .../var-reference-picker.trigger.spec.tsx     |   16 +-
 .../var-reference-vars.helpers.spec.ts        |    4 +-
 .../object-child-tree-panel/picker/index.tsx  |    2 +-
 .../object-child-tree-panel/show/index.tsx    |    2 +-
 .../components/variable/output-var-list.tsx   |   10 +-
 .../nodes/_base/components/variable/utils.ts  |   88 +-
 .../variable/var-full-path-panel.tsx          |    6 +-
 .../_base/components/variable/var-list.tsx    |   24 +-
 .../variable/var-reference-picker.helpers.ts  |    4 +-
 .../variable/var-reference-picker.tsx         |   10 +-
 .../variable/var-reference-vars.helpers.ts    |    2 +-
 .../_base/components/workflow-panel/index.tsx |    2 +-
 .../workflow-panel/last-run/use-last-run.ts   |    8 +-
 .../nodes/_base/hooks/use-one-step-run.ts     |   16 +-
 .../nodes/_base/hooks/use-output-var-list.ts  |   14 +-
 .../use-single-run-form-params.spec.ts        |    6 +-
 .../workflow/nodes/agent/use-config.ts        |    4 +-
 .../assigner/__tests__/integration.spec.tsx   |   40 +-
 .../use-single-run-form-params.spec.ts        |    6 +-
 .../assigner/components/var-list/index.tsx    |   22 +-
 .../workflow/nodes/code/code-parser.ts        |    4 +-
 .../workflow/nodes/data-source-empty/hooks.ts |    4 +-
 .../data-source/hooks/use-before-run-form.ts  |    4 +-
 .../__tests__/integration.spec.tsx            |   18 +-
 .../__tests__/panel.spec.tsx                  |   12 +-
 .../use-single-run-form-params.spec.ts        |    4 +-
 .../nodes/end/__tests__/use-config.spec.ts    |    2 +-
 .../components/workflow/nodes/end/node.tsx    |    2 +-
 .../nodes/http/__tests__/integration.spec.tsx |   40 +-
 .../nodes/http/components/curl-parser.ts      |    8 +-
 .../nodes/http/components/edit-body/index.tsx |    4 +-
 .../nodes/http/hooks/use-key-value-list.ts    |    2 +-
 .../__tests__/human-input.spec.tsx            |   59 +-
 .../__tests__/button-style-dropdown.spec.tsx  |   10 +-
 .../__tests__/form-content-preview.spec.tsx   |   16 +-
 .../components/__tests__/user-action.spec.tsx |    6 +-
 .../__tests__/method-item.spec.tsx            |   24 +-
 .../delivery-method/recipient/email-input.tsx |    2 +-
 .../delivery-method/test-email-sender.tsx     |    6 +-
 .../components/variable-in-markdown.tsx       |    8 +-
 .../use-single-run-form-params.spec.ts        |    2 +-
 .../components/condition-list/index.tsx       |    2 +-
 .../nodes/if-else/use-config.helpers.ts       |    2 +-
 web/app/components/workflow/nodes/index.tsx   |    5 +-
 .../__tests__/use-interactions.spec.tsx       |    2 +-
 .../use-single-run-form-params.spec.ts        |   10 +-
 .../iteration/use-single-run-form-params.ts   |    6 +-
 .../use-single-run-form-params.spec.ts        |    6 +-
 .../__tests__/search-method-option.spec.tsx   |   24 +-
 .../top-k-and-score-threshold.spec.tsx        |   10 +-
 .../__tests__/use-config.spec.ts              |    6 +-
 .../use-knowledge-metadata-config.spec.ts     |    4 +-
 .../nodes/knowledge-retrieval/utils.ts        |    4 +-
 .../__tests__/extract-input.spec.tsx          |    6 +-
 .../__tests__/limit-config.spec.tsx           |    6 +-
 .../components/filter-condition.tsx           |    2 +-
 .../workflow/nodes/list-operator/panel.tsx    |    2 +-
 .../nodes/list-operator/use-config.helpers.ts |    2 +-
 .../nodes/llm/__tests__/use-config.spec.ts    |    4 +-
 .../nodes/llm/components/config-prompt.tsx    |   10 +-
 .../visual-editor/hooks.ts                    |   74 +-
 .../__tests__/use-llm-prompt-config.spec.ts   |   22 +-
 .../loop/__tests__/use-config.helpers.spec.ts |   10 +-
 .../loop/__tests__/use-interactions.spec.tsx  |    2 +-
 .../use-single-run-form-params.spec.ts        |    6 +-
 .../workflow/nodes/loop/use-config.helpers.ts |    4 +-
 .../use-single-run-form-params.helpers.ts     |    8 +-
 .../use-single-run-form-params.spec.ts        |   10 +-
 .../__tests__/import-from-tool.spec.tsx       |    4 +-
 .../use-single-run-form-params.spec.ts        |   10 +-
 .../components/class-list.tsx                 |    4 +-
 .../nodes/start/__tests__/use-config.spec.ts  |    4 +-
 .../use-single-run-form-params.spec.ts        |    8 +-
 .../nodes/start/components/var-list.tsx       |    2 +-
 .../workflow/nodes/start/use-config.ts        |    4 +-
 .../use-single-run-form-params.spec.ts        |    6 +-
 .../nodes/tool/__tests__/panel.spec.tsx       |   30 +-
 .../__tests__/index.spec.tsx                  |    8 +-
 .../__tests__/placeholder.spec.tsx            |   16 +-
 .../tool-form/__tests__/index.spec.tsx        |    8 +-
 .../tool-form/__tests__/item.spec.tsx         |   26 +-
 .../use-single-run-form-params.spec.ts        |    8 +-
 .../tool/hooks/use-single-run-form-params.ts  |    4 +-
 .../nodes/tool/output-schema-utils.ts         |    2 +-
 .../nodes/trigger-schedule/default.ts         |    8 +-
 .../utils/__tests__/integration.spec.ts       |   20 +-
 .../trigger-schedule/utils/cron-parser.ts     |    6 +-
 .../utils/execution-time-calculator.ts        |   32 +-
 .../__tests__/generic-table.spec.tsx          |   14 +-
 .../__tests__/header-table.spec.tsx           |    6 +-
 .../__tests__/parameter-table.spec.tsx        |    4 +-
 .../components/parameter-table.tsx            |    2 +-
 .../use-single-run-form-params.spec.ts        |    4 +-
 .../__tests__/node-group-item.spec.tsx        |   20 +-
 .../components/node-group-item.tsx            |    4 +-
 .../variable-assigner/use-config.helpers.ts   |   10 +-
 .../nodes/variable-assigner/use-config.ts     |    8 +-
 .../components/workflow/note-node/index.tsx   |    6 +-
 .../note-editor/toolbar/color-picker.tsx      |   26 +-
 .../components/workflow/operator/index.tsx    |    2 +-
 .../human-input-filled-form-list.spec.tsx     |    6 +-
 .../__tests__/hooks/handle-resume.spec.ts     |   34 +-
 .../__tests__/hooks/handle-send.spec.ts       |    4 +-
 .../__tests__/hooks/opening-statement.spec.ts |   14 +-
 .../__tests__/hooks/sse-callbacks.spec.ts     |   48 +-
 .../conversation-variable-modal.tsx           |    4 +-
 .../workflow/panel/debug-and-preview/hooks.ts |   26 +-
 web/app/components/workflow/panel/index.tsx   |    2 +-
 .../workflow/panel/inputs-panel.tsx           |    2 +-
 .../panel/version-history-panel/index.tsx     |    2 +-
 .../run/__tests__/tracing-panel.spec.tsx      |   18 +-
 .../run/agent-log/agent-result-panel.tsx      |    6 +-
 .../__tests__/loop-log-trigger.spec.tsx       |    6 +-
 .../components/workflow/run/output-panel.tsx  |    8 +-
 .../utils/format-log/__tests__/index.spec.ts  |    4 +-
 .../utils/format-log/graph-to-log-struct.ts   |    6 +-
 .../run/utils/format-log/iteration/index.ts   |    2 +-
 .../workflow/selection-contextmenu.tsx        |   14 +-
 .../__tests__/datasets-detail-store.spec.ts   |    4 +-
 .../__tests__/inspect-vars-slice.spec.ts      |   46 +-
 .../__tests__/inspect-vars-slice.spec.ts      |    8 +-
 .../workflow/debug/inspect-vars-slice.ts      |    6 +-
 .../workflow/update-dsl-modal.helpers.ts      |    2 +-
 .../utils/__tests__/elk-layout.spec.ts        |   14 +-
 .../utils/__tests__/node-navigation.spec.ts   |    8 +-
 .../workflow/utils/__tests__/tool.spec.ts     |    4 +-
 .../workflow/utils/__tests__/trigger.spec.ts  |    6 +-
 .../utils/__tests__/workflow-init.spec.ts     |   86 +-
 .../workflow/utils/__tests__/workflow.spec.ts |    8 +-
 web/app/components/workflow/utils/node.ts     |    2 +-
 .../workflow/utils/workflow-init.ts           |   38 +-
 .../variable-inspect/__tests__/group.spec.tsx |    8 +-
 .../variable-inspect/__tests__/panel.spec.tsx |   10 +-
 .../__tests__/value-content-sections.spec.tsx |    8 +-
 .../value-content-sections.tsx                |    8 +-
 .../variable-inspect/value-content.tsx        |    2 +-
 .../components/__tests__/zoom-in-out.spec.tsx |    4 +-
 .../nodes/loop/__tests__/hooks.spec.tsx       |    2 +-
 .../components/note-node/index.tsx            |    6 +-
 web/app/signin/invite-settings/page.tsx       |    2 +-
 web/context/modal-context.test.tsx            |    8 +-
 web/eslint-suppressions.json                  |  112 +-
 web/hooks/use-app-favicon.ts                  |    2 +-
 web/hooks/use-async-window-open.spec.ts       |    6 +-
 web/hooks/use-query-params.spec.tsx           |   30 +-
 web/i18n-config/index.ts                      |    2 +-
 web/i18n-config/language.ts                   |    2 +-
 web/knip.config.ts                            |    2 -
 web/plugins/dev-proxy/cookies.ts              |    6 +-
 web/plugins/dev-proxy/server.spec.ts          |    2 +-
 web/plugins/vite/utils.ts                     |    6 +-
 web/scripts/analyze-i18n-diff.ts              |    4 +-
 web/scripts/gen-doc-paths.ts                  |   22 +-
 web/service/base.ts                           |   18 +-
 web/service/knowledge/use-create-dataset.ts   |    2 +-
 web/service/use-plugins.ts                    |    6 +-
 web/tsconfig.json                             |    1 +
 web/utils/emoji.ts                            |    2 +-
 web/utils/error-parser.ts                     |    2 +-
 web/utils/format.ts                           |   14 +-
 web/utils/model-config.spec.ts                |    8 +-
 web/utils/urlValidation.ts                    |    2 +-
 web/utils/var.ts                              |    4 +-
 729 files changed, 14660 insertions(+), 7803 deletions(-)
 create mode 100755 packages/migrate-no-unchecked-indexed-access/bin/migrate-no-unchecked-indexed-access.js
 create mode 100644 packages/migrate-no-unchecked-indexed-access/package.json
 create mode 100644 packages/migrate-no-unchecked-indexed-access/src/cli.ts
 create mode 100644 packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/migrate.ts
 create mode 100644 packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/normalize.ts
 create mode 100644 packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/run.ts
 create mode 100644 packages/migrate-no-unchecked-indexed-access/vite.config.ts

diff --git a/packages/migrate-no-unchecked-indexed-access/bin/migrate-no-unchecked-indexed-access.js b/packages/migrate-no-unchecked-indexed-access/bin/migrate-no-unchecked-indexed-access.js
new file mode 100755
index 0000000000..2f2b0d72a9
--- /dev/null
+++ b/packages/migrate-no-unchecked-indexed-access/bin/migrate-no-unchecked-indexed-access.js
@@ -0,0 +1,28 @@
+#!/usr/bin/env node
+
+import { spawnSync } from 'node:child_process'
+import fs from 'node:fs'
+import path from 'node:path'
+import process from 'node:process'
+import { fileURLToPath } from 'node:url'
+
+const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..')
+const entryFile = path.join(packageRoot, 'dist', 'cli.mjs')
+
+if (!fs.existsSync(entryFile))
+  throw new Error(`Built CLI entry not found at ${entryFile}. Run "pnpm --filter migrate-no-unchecked-indexed-access build" first.`)
+
+const result = spawnSync(
+  process.execPath,
+  [entryFile, ...process.argv.slice(2)],
+  {
+    cwd: process.cwd(),
+    env: process.env,
+    stdio: 'inherit',
+  },
+)
+
+if (result.error)
+  throw result.error
+
+process.exit(result.status ?? 1)
diff --git a/packages/migrate-no-unchecked-indexed-access/package.json b/packages/migrate-no-unchecked-indexed-access/package.json
new file mode 100644
index 0000000000..781e88b0e8
--- /dev/null
+++ b/packages/migrate-no-unchecked-indexed-access/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "migrate-no-unchecked-indexed-access",
+  "private": true,
+  "version": "0.0.0-private",
+  "type": "module",
+  "bin": {
+    "migrate-no-unchecked-indexed-access": "./bin/migrate-no-unchecked-indexed-access.js"
+  },
+  "scripts": {
+    "build": "vp pack"
+  },
+  "dependencies": {
+    "typescript": "catalog:"
+  },
+  "devDependencies": {
+    "@types/node": "catalog:",
+    "vite": "catalog:",
+    "vite-plus": "catalog:"
+  }
+}
diff --git a/packages/migrate-no-unchecked-indexed-access/src/cli.ts b/packages/migrate-no-unchecked-indexed-access/src/cli.ts
new file mode 100644
index 0000000000..fa52510905
--- /dev/null
+++ b/packages/migrate-no-unchecked-indexed-access/src/cli.ts
@@ -0,0 +1,45 @@
+import process from 'node:process'
+import { runBatchMigrationCommand } from './no-unchecked-indexed-access/run'
+
+function printUsage() {
+  console.log(`Usage:
+  migrate-no-unchecked-indexed-access [options]
+
+Options:
+  --project <path>
+  --batch-size <number>
+  --batch-iterations <number>
+  --max-rounds <number>
+  --verbose`)
+}
+
+async function flushStandardStreams() {
+  await Promise.all([
+    new Promise<void>(resolve => process.stdout.write('', () => resolve())),
+    new Promise<void>(resolve => process.stderr.write('', () => resolve())),
+  ])
+}
+
+async function main() {
+  const argv = process.argv.slice(2)
+  if (argv.includes('help') || argv.includes('--help') || argv.includes('-h')) {
+    printUsage()
+    return
+  }
+
+  await runBatchMigrationCommand(argv)
+}
+
+let exitCode = 0
+
+try {
+  await main()
+  exitCode = process.exitCode ?? 0
+}
+catch (error) {
+  console.error(error instanceof Error ? error.message : error)
+  exitCode = 1
+}
+
+await flushStandardStreams()
+process.exit(exitCode)
diff --git a/packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/migrate.ts b/packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/migrate.ts
new file mode 100644
index 0000000000..6b79e214bb
--- /dev/null
+++ b/packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/migrate.ts
@@ -0,0 +1,1835 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import process from 'node:process'
+import ts from 'typescript'
+
+const SUPPORTED_EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.cts'])
+export const SUPPORTED_DIAGNOSTIC_CODES = new Set([2322, 2339, 2345, 2488, 2532, 2538, 2604, 2722, 2769, 2786, 7006, 18047, 18048])
+const DEFAULT_MAX_ITERATIONS = 10
+const ACCESS_DIAGNOSTIC_CODES = new Set([2339, 2532, 18047, 18048])
+const ASSIGNABILITY_DIAGNOSTIC_CODES = new Set([2322, 2345, 2769])
+const parsedConfigCache = new Map<string, ts.ParsedCommandLine>()
+
+type CliOptions = {
+  files: string[]
+  maxIterations: number
+  project: string
+  useFullProjectRoots?: boolean
+  verbose: boolean
+  write: boolean
+}
+
+type TextEdit = {
+  end: number
+  expectedText?: string
+  replacement: string
+  start: number
+}
+
+type EditTarget
+  = { expression: ts.Expression, kind: 'expression', sourceFile: ts.SourceFile }
+    | { end: number, kind: 'direct-edit', replacement: string, sourceFile: ts.SourceFile, start: number }
+    | { kind: 'shorthand-property', property: ts.ShorthandPropertyAssignment, sourceFile: ts.SourceFile }
+
+export function parseArgs(argv: string[]): CliOptions {
+  const options: CliOptions = {
+    files: [],
+    maxIterations: DEFAULT_MAX_ITERATIONS,
+    project: 'tsconfig.json',
+    verbose: false,
+    write: false,
+  }
+
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i]
+    if (!arg)
+      continue
+
+    if (arg === '--')
+      continue
+
+    if (arg === '--write') {
+      options.write = true
+      continue
+    }
+
+    if (arg === '--verbose') {
+      options.verbose = true
+      continue
+    }
+
+    if (arg === '--project') {
+      const value = argv[i + 1]
+      if (!value)
+        throw new Error('Missing value for --project')
+
+      options.project = value
+      i += 1
+      continue
+    }
+
+    if (arg === '--max-iterations') {
+      const value = argv[i + 1]
+      if (!value)
+        throw new Error('Missing value for --max-iterations')
+
+      const parsed = Number(value)
+      if (!Number.isInteger(parsed) || parsed <= 0)
+        throw new Error(`Invalid --max-iterations value: ${value}`)
+
+      options.maxIterations = parsed
+      i += 1
+      continue
+    }
+
+    if (arg === '--files') {
+      const value = argv[i + 1]
+      if (!value)
+        throw new Error('Missing value for --files')
+
+      options.files.push(...splitFilesArgument(value))
+      i += 1
+      continue
+    }
+
+    if (arg.startsWith('--'))
+      throw new Error(`Unknown option: ${arg}`)
+
+    options.files.push(...splitFilesArgument(arg))
+  }
+
+  return options
+}
+
+function splitFilesArgument(value: string): string[] {
+  return value
+    .split(',')
+    .map(item => item.trim())
+    .filter(Boolean)
+}
+
+function parseTsConfig(projectPath: string): ts.ParsedCommandLine {
+  const cached = parsedConfigCache.get(projectPath)
+  if (cached)
+    return cached
+
+  const configFile = ts.readConfigFile(projectPath, ts.sys.readFile)
+  if (configFile.error)
+    throw new Error(formatDiagnostic(configFile.error))
+
+  const configDirectory = path.dirname(projectPath)
+  const parsedConfig = ts.parseJsonConfigFileContent(
+    configFile.config,
+    ts.sys,
+    configDirectory,
+    undefined,
+    projectPath,
+  )
+  parsedConfigCache.set(projectPath, parsedConfig)
+  return parsedConfig
+}
+
+function createMigrationProgram(
+  rootNames: string[],
+  parsedConfig: ts.ParsedCommandLine,
+  fileTexts: Map<string, string>,
+  oldProgram?: ts.Program,
+): ts.Program {
+  const compilerHost = ts.createCompilerHost(parsedConfig.options, true)
+  const originalGetSourceFile = compilerHost.getSourceFile.bind(compilerHost)
+
+  compilerHost.readFile = (fileName) => {
+    return fileTexts.get(fileName) ?? ts.sys.readFile(fileName)
+  }
+
+  compilerHost.getSourceFile = (fileName, languageVersion, onError, shouldCreateNewSourceFile) => {
+    const text = fileTexts.get(fileName)
+    if (text !== undefined)
+      return ts.createSourceFile(fileName, text, languageVersion, true)
+
+    return originalGetSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile)
+  }
+
+  return ts.createProgram({
+    oldProgram,
+    host: compilerHost,
+    options: parsedConfig.options,
+    projectReferences: parsedConfig.projectReferences,
+    rootNames,
+  })
+}
+
+function isTargetFile(fileName: string): boolean {
+  const extension = path.extname(fileName)
+  if (!SUPPORTED_EXTENSIONS.has(extension))
+    return false
+
+  if (fileName.endsWith('.d.ts'))
+    return false
+
+  return !fileName.includes(`${path.sep}.next${path.sep}`)
+}
+
+function normalizeFileName(fileName: string): string {
+  return path.resolve(fileName)
+}
+
+function isDeclarationSupportFile(fileName: string): boolean {
+  return fileName.endsWith('.d.ts')
+}
+
+function isSetupSupportFile(fileName: string): boolean {
+  const baseName = path.basename(fileName)
+  return baseName === 'vitest.setup.ts'
+    || baseName === 'vitest.setup.tsx'
+    || baseName === 'jest.setup.ts'
+    || baseName === 'jest.setup.tsx'
+    || baseName === 'setupTests.ts'
+    || baseName === 'setupTests.tsx'
+    || baseName === 'test.setup.ts'
+    || baseName === 'test.setup.tsx'
+}
+
+function getMigrationRootNames(
+  parsedConfig: ts.ParsedCommandLine,
+  targetFiles: string[],
+): string[] {
+  const rootNames = new Set(targetFiles)
+
+  for (const fileName of parsedConfig.fileNames.map(normalizeFileName)) {
+    if (isDeclarationSupportFile(fileName) || isSetupSupportFile(fileName))
+      rootNames.add(fileName)
+  }
+
+  return Array.from(rootNames)
+}
+
+function createFileMatcher(filePatterns: string[]): (fileName: string) => boolean {
+  if (filePatterns.length === 0)
+    return () => true
+
+  const patterns = filePatterns.map(pattern => ({
+    absolute: normalizeFileName(pattern),
+    raw: pattern.split(path.sep).join('/'),
+  }))
+  return (fileName: string) => {
+    const normalized = normalizeFileName(fileName)
+    const unixStyle = normalized.split(path.sep).join('/')
+    return patterns.some(pattern => normalized === pattern.absolute || unixStyle.endsWith(pattern.raw))
+  }
+}
+
+function formatDiagnostic(diagnostic: ts.Diagnostic): string {
+  const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n')
+  if (!diagnostic.file || diagnostic.start === undefined)
+    return message
+
+  const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start)
+  return `${diagnostic.file.fileName}:${position.line + 1}:${position.character + 1} TS${diagnostic.code}: ${message}`
+}
+
+function ensureTrailingNonNullAssertion(expression: string): string {
+  const trimmedExpression = expression.trimEnd()
+  return trimmedExpression.endsWith('!')
+    ? trimmedExpression
+    : `${trimmedExpression}!`
+}
+
+function hasOptionalChainDescendant(node: ts.Node): boolean {
+  let found = false
+
+  const visit = (current: ts.Node) => {
+    if (found)
+      return
+
+    if (ts.isOptionalChain(current)) {
+      found = true
+      return
+    }
+
+    current.forEachChild(visit)
+  }
+
+  visit(node)
+  return found
+}
+
+function shouldPrintInlineNonNullAssertion(expression: ts.Expression): boolean {
+  return ts.isOptionalChain(expression)
+    || (ts.isParenthesizedExpression(expression) && hasOptionalChainDescendant(expression.expression))
+}
+
+function normalizeOptionalChainNonNullContinuations(text: string): string {
+  const sourceFile = ts.createSourceFile('normalize.tsx', text, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX)
+  const edits: TextEdit[] = []
+
+  const visit = (node: ts.Node) => {
+    if (
+      ts.isNonNullExpression(node)
+      && ts.isParenthesizedExpression(node.expression)
+      && hasOptionalChainDescendant(node.expression.expression)
+    ) {
+      edits.push({
+        end: node.getEnd(),
+        replacement: `${node.expression.expression.getText(sourceFile)}!`,
+        start: node.getStart(sourceFile),
+      })
+      return
+    }
+
+    node.forEachChild(visit)
+  }
+
+  visit(sourceFile)
+
+  if (edits.length === 0)
+    return text
+
+  return applyEdits(text, edits).text
+}
+
+function collapseRepeatedInlineComments(text: string): string {
+  return text
+    .split('\n')
+    .map((line) => {
+      const commentIndex = line.indexOf('//')
+      if (commentIndex < 0)
+        return line
+
+      const prefix = line.slice(0, commentIndex).trimEnd()
+      const comment = line.slice(commentIndex + 2).trim()
+      const segments = comment
+        .split(/\s+\/\/\s+/)
+        .map(item => item.trim())
+        .filter(Boolean)
+
+      if (segments.length < 2)
+        return line
+
+      const lastSegment = segments[segments.length - 1]!
+      const stableSegments = segments.slice(0, -1)
+      const repeatedSameComment = stableSegments.length > 0
+        && stableSegments.every(segment => segment === segments[0])
+        && (lastSegment === segments[0] || segments[0]!.startsWith(lastSegment) || lastSegment.startsWith(segments[0]!))
+
+      if (!repeatedSameComment)
+        return line.replace(/!{2,}$/g, '!')
+
+      const normalizedComment = segments[0]!.replace(/!{2,}$/g, '!')
+      return prefix ? `${prefix} // ${normalizedComment}` : `// ${normalizedComment}`
+    })
+    .join('\n')
+}
+
+export function normalizeMalformedAssertions(text: string): string {
+  const normalizedText = text
+    .replace(/\n(\s*)! (\s*\/\/[^\n]*)\n/g, '! $2\n')
+    .replace(/\.not!+(?=[.(])/g, '.not')
+    .replace(/(\(|,\s*)([A-Za-z_$][\w$]*)\s*:\s*any\s*=>/g, '$1($2: any) =>')
+    .replace(/([,{]\s*)([A-Z_$][\w$]*)!=\{/g, '$1$2={')
+    .replace(/\b([A-Z_$][\w$]*)!!,/gi, '$1: $1!,')
+    .replace(/\b([A-Z_$][\w$]*)!!:/gi, '$1:')
+    .replace(/([,{]\s*)([A-Z_$][\w$]*)!:/gi, '$1$2:')
+    .replace(/\b(const|let|var)\s+\{([^=\n]+)\}\s*=\s*([^\n;]+)/g, (fullMatch, keyword: string, bindings: string, expression: string) => {
+      if (!bindings.includes('!'))
+        return fullMatch
+
+      const normalizedBindings = bindings.replace(/!([,\s}:])/g, '$1')
+      return `${keyword} {${normalizedBindings}} = ${ensureTrailingNonNullAssertion(expression)}`
+    })
+
+  return collapseRepeatedInlineComments(normalizeOptionalChainNonNullContinuations(normalizedText))
+}
+
+function isExpressionTarget(target: EditTarget): target is Extract<EditTarget, { kind: 'expression' }> {
+  return target.kind === 'expression'
+}
+
+function createExpressionTarget(expression: ts.Expression): EditTarget {
+  return {
+    expression,
+    kind: 'expression',
+    sourceFile: expression.getSourceFile(),
+  }
+}
+
+function createShorthandPropertyTarget(property: ts.ShorthandPropertyAssignment): EditTarget {
+  return {
+    kind: 'shorthand-property',
+    property,
+    sourceFile: property.getSourceFile(),
+  }
+}
+
+function createDirectEditTarget(
+  sourceFile: ts.SourceFile,
+  start: number,
+  end: number,
+  replacement: string,
+): EditTarget {
+  return {
+    end,
+    kind: 'direct-edit',
+    replacement,
+    sourceFile,
+    start,
+  }
+}
+
+function createIterableFallbackReplacement(
+  expression: ts.Expression,
+  sourceFile: ts.SourceFile,
+): string {
+  return `(${expression.getText(sourceFile)} ?? [])`
+}
+
+function createIterableFallbackTarget(expression: ts.Expression): EditTarget {
+  return createDirectEditTarget(
+    expression.getSourceFile(),
+    expression.getStart(expression.getSourceFile()),
+    expression.getEnd(),
+    createIterableFallbackReplacement(expression, expression.getSourceFile()),
+  )
+}
+
+function createArrayLiteralIterableFallbackTarget(
+  arrayLiteral: ts.ArrayLiteralExpression,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const sourceFile = arrayLiteral.getSourceFile()
+  const start = arrayLiteral.getStart(sourceFile)
+  const end = arrayLiteral.getEnd()
+  const originalText = sourceFile.text.slice(start, end)
+  const edits: TextEdit[] = []
+
+  for (const element of arrayLiteral.elements) {
+    if (!ts.isSpreadElement(element))
+      continue
+
+    if (isAlreadyNonNull(element.expression))
+      continue
+
+    if (!typeIncludesUndefined(checker.getTypeAtLocation(element.expression)))
+      continue
+
+    edits.push({
+      end: element.expression.getEnd() - start,
+      replacement: createIterableFallbackReplacement(element.expression, sourceFile),
+      start: element.expression.getStart(sourceFile) - start,
+    })
+  }
+
+  if (edits.length === 0)
+    return undefined
+
+  return createDirectEditTarget(
+    sourceFile,
+    start,
+    end,
+    applyEdits(originalText, edits).text,
+  )
+}
+
+function getTokenAtPosition(sourceFile: ts.SourceFile, position: number): ts.Node {
+  let current: ts.Node = sourceFile
+
+  while (true) {
+    let next: ts.Node | undefined
+    current.forEachChild((child) => {
+      if (!next && position >= child.getFullStart() && position < child.getEnd())
+        next = child
+    })
+
+    if (!next)
+      return current
+
+    current = next
+  }
+}
+
+function findAncestor<NodeType extends ts.Node>(
+  node: ts.Node | undefined,
+  predicate: (candidate: ts.Node) => candidate is NodeType,
+): NodeType | undefined {
+  let current = node
+
+  while (current) {
+    if (predicate(current))
+      return current
+
+    current = current.parent
+  }
+
+  return undefined
+}
+
+function findTightestExpression(sourceFile: ts.SourceFile, start: number, end: number): ts.Expression | undefined {
+  let node: ts.Node | undefined = getTokenAtPosition(sourceFile, start)
+
+  while (node) {
+    if (ts.isExpression(node)) {
+      const nodeStart = node.getStart(sourceFile)
+      const nodeEnd = node.getEnd()
+      if (nodeStart <= start && end <= nodeEnd)
+        return node
+    }
+
+    node = node.parent
+  }
+
+  return undefined
+}
+
+function isAssignmentOperator(token: ts.SyntaxKind): boolean {
+  return token >= ts.SyntaxKind.FirstAssignment && token <= ts.SyntaxKind.LastAssignment
+}
+
+function typeIncludesUndefined(type: ts.Type): boolean {
+  if ((type.flags & ts.TypeFlags.Undefined) !== 0)
+    return true
+
+  if (!type.isUnion())
+    return false
+
+  return type.types.some(typeIncludesUndefined)
+}
+
+function skipOuterExpressions(expression: ts.Expression): ts.Expression {
+  let current = expression
+
+  while (ts.isParenthesizedExpression(current) || ts.isNonNullExpression(current))
+    current = current.expression
+
+  return current
+}
+
+function isAlreadyNonNull(expression: ts.Expression): boolean {
+  let current = expression
+
+  while (ts.isParenthesizedExpression(current))
+    current = current.expression
+
+  return ts.isNonNullExpression(current)
+}
+
+function findAssignmentLikeCandidate(
+  token: ts.Node,
+  sourceFile: ts.SourceFile,
+  start: number,
+  end: number,
+): ts.Expression | undefined {
+  let current: ts.Node | undefined = token
+
+  while (current) {
+    if (ts.isVariableDeclaration(current) && current.initializer)
+      return current.initializer
+
+    if (ts.isPropertyDeclaration(current) && current.initializer)
+      return current.initializer
+
+    if (ts.isPropertyAssignment(current))
+      return current.initializer
+
+    if (ts.isShorthandPropertyAssignment(current))
+      return current.name
+
+    if (ts.isParameter(current) && current.initializer)
+      return current.initializer
+
+    if (ts.isReturnStatement(current) && current.expression)
+      return current.expression
+
+    if (ts.isBinaryExpression(current) && isAssignmentOperator(current.operatorToken.kind))
+      return current.right
+
+    if (ts.isJsxAttribute(current) && current.initializer && ts.isJsxExpression(current.initializer) && current.initializer.expression)
+      return current.initializer.expression
+
+    if (ts.isJsxSpreadAttribute(current))
+      return current.expression
+
+    current = current.parent
+  }
+
+  return findTightestExpression(sourceFile, start, end)
+}
+
+function findArgumentCandidate(
+  token: ts.Node,
+  sourceFile: ts.SourceFile,
+  start: number,
+  end: number,
+): ts.Expression | undefined {
+  let current: ts.Node | undefined = token
+
+  while (current) {
+    if ((ts.isCallExpression(current) || ts.isNewExpression(current)) && current.arguments) {
+      const argument = current.arguments.find((item) => {
+        const itemStart = item.getStart(sourceFile)
+        const itemEnd = item.getEnd()
+        return itemStart <= start && end <= itemEnd
+      })
+      if (argument)
+        return argument
+    }
+
+    current = current.parent
+  }
+
+  return findTightestExpression(sourceFile, start, end)
+}
+
+function getExpressionFromJsxAttribute(attribute: ts.JsxAttribute): ts.Expression | undefined {
+  return attribute.initializer && ts.isJsxExpression(attribute.initializer)
+    ? attribute.initializer.expression
+    : undefined
+}
+
+function findTargetFromExpression(
+  expression: ts.Expression,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const referencedDeclarationTarget = findReferencedDeclarationInitializerTarget(expression, checker)
+  if (referencedDeclarationTarget)
+    return referencedDeclarationTarget
+
+  const nestedTarget = findNestedContainerTarget(expression, checker)
+  if (nestedTarget)
+    return nestedTarget
+
+  const innerExpression = skipOuterExpressions(expression)
+  if (ts.isConditionalExpression(innerExpression)) {
+    return findTargetFromExpression(innerExpression.whenTrue, checker)
+      ?? findTargetFromExpression(innerExpression.whenFalse, checker)
+  }
+
+  if (
+    ts.isBinaryExpression(innerExpression)
+    && (
+      innerExpression.operatorToken.kind === ts.SyntaxKind.BarBarToken
+      || innerExpression.operatorToken.kind === ts.SyntaxKind.QuestionQuestionToken
+      || innerExpression.operatorToken.kind === ts.SyntaxKind.AmpersandAmpersandToken
+    )
+  ) {
+    return findTargetFromExpression(innerExpression.left, checker)
+      ?? findTargetFromExpression(innerExpression.right, checker)
+  }
+
+  if (ts.isArrowFunction(innerExpression) || ts.isFunctionExpression(innerExpression)) {
+    const functionTarget = findFunctionLikeReturnTarget(innerExpression, checker)
+    if (functionTarget)
+      return functionTarget
+  }
+
+  if (ts.isPropertyAccessExpression(innerExpression)) {
+    const namedPropertyTarget = findNamedPropertyTarget(innerExpression.expression, innerExpression.name.text, checker)
+    if (namedPropertyTarget)
+      return namedPropertyTarget
+  }
+
+  if (ts.isCallExpression(innerExpression)) {
+    const collectionCallbackTarget = findCollectionCallbackTarget(innerExpression, checker)
+    if (collectionCallbackTarget)
+      return collectionCallbackTarget
+
+    const callbackArgumentTarget = findCallbackArgumentTarget(innerExpression, checker)
+    if (callbackArgumentTarget)
+      return callbackArgumentTarget
+
+    const callExpressionTarget = findCallExpressionDeclarationTarget(innerExpression, checker)
+    if (callExpressionTarget)
+      return callExpressionTarget
+  }
+
+  if (!typeIncludesUndefined(checker.getTypeAtLocation(expression)))
+    return undefined
+
+  return createExpressionTarget(expression)
+}
+
+function findJsxSpreadAttributeTarget(
+  token: ts.Node,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const spreadAttribute = findAncestor(token, ts.isJsxSpreadAttribute)
+  if (spreadAttribute)
+    return findTargetFromExpression(spreadAttribute.expression, checker)
+
+  const openingLikeElement = findAncestor(token, node =>
+    ts.isJsxOpeningElement(node) || ts.isJsxSelfClosingElement(node))
+
+  if (!openingLikeElement)
+    return undefined
+
+  for (const attribute of openingLikeElement.attributes.properties) {
+    if (!ts.isJsxSpreadAttribute(attribute))
+      continue
+
+    const target = findTargetFromExpression(attribute.expression, checker)
+    if (target)
+      return target
+  }
+
+  return undefined
+}
+
+function findShorthandPropertyTarget(
+  token: ts.Node,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const property = findAncestor(token, ts.isShorthandPropertyAssignment)
+  if (!property)
+    return undefined
+
+  return typeIncludesUndefined(checker.getTypeAtLocation(property.name))
+    ? createShorthandPropertyTarget(property)
+    : undefined
+}
+
+function findPropertyAssignmentInitializerTarget(
+  token: ts.Node,
+  start: number,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const propertyAssignment = findAncestor(token, ts.isPropertyAssignment)
+  if (!propertyAssignment)
+    return undefined
+
+  const propertyNameStart = propertyAssignment.name.getStart()
+  const propertyNameEnd = propertyAssignment.name.getEnd()
+  if (start < propertyNameStart || start >= propertyNameEnd)
+    return undefined
+
+  const directTarget = findTargetFromExpression(propertyAssignment.initializer, checker)
+  if (directTarget)
+    return directTarget
+
+  const nestedTarget = findNestedContainerTarget(propertyAssignment.initializer, checker)
+  if (nestedTarget)
+    return nestedTarget
+
+  if (!typeIncludesUndefined(checker.getTypeAtLocation(propertyAssignment.initializer)))
+    return undefined
+
+  return createExpressionTarget(propertyAssignment.initializer)
+}
+
+function findPropertyAccessExpressionTarget(
+  token: ts.Node,
+  start: number,
+): EditTarget | undefined {
+  const propertyAccess = findAncestor(token, ts.isPropertyAccessExpression)
+  if (!propertyAccess)
+    return undefined
+
+  if (start >= propertyAccess.name.getStart() && start < propertyAccess.name.getEnd())
+    return createExpressionTarget(propertyAccess.expression)
+
+  return undefined
+}
+
+function findUndefinedAccessTarget(
+  token: ts.Node,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  let current: ts.Node | undefined = token
+  let bestTarget: EditTarget | undefined
+
+  while (current) {
+    if (ts.isPropertyAccessExpression(current)) {
+      const expression = current.expression
+      if (typeIncludesUndefined(checker.getTypeAtLocation(expression)) && !isAlreadyNonNull(expression))
+        bestTarget = createExpressionTarget(expression)
+    }
+
+    if (ts.isElementAccessExpression(current)) {
+      const expression = current.expression
+      if (typeIncludesUndefined(checker.getTypeAtLocation(expression)) && !isAlreadyNonNull(expression))
+        bestTarget = createExpressionTarget(expression)
+    }
+
+    current = current.parent
+  }
+
+  return bestTarget
+}
+
+function findElementAccessArgumentTarget(token: ts.Node): EditTarget | undefined {
+  let current = token
+  let matchingElementAccess: ts.ElementAccessExpression | undefined
+
+  while (current) {
+    if (ts.isElementAccessExpression(current) && current.argumentExpression)
+      matchingElementAccess = current
+
+    current = current.parent
+  }
+
+  if (!matchingElementAccess?.argumentExpression)
+    return undefined
+
+  return createExpressionTarget(matchingElementAccess.argumentExpression)
+}
+
+function findIterableTarget(
+  sourceFile: ts.SourceFile,
+  token: ts.Node,
+  start: number,
+  end: number,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const arrayLiteral = findAncestor(token, ts.isArrayLiteralExpression)
+  if (arrayLiteral) {
+    const arrayLiteralTarget = createArrayLiteralIterableFallbackTarget(arrayLiteral, checker)
+    if (arrayLiteralTarget)
+      return arrayLiteralTarget
+  }
+
+  const spreadElement = findAncestor(token, ts.isSpreadElement)
+  if (spreadElement && !isAlreadyNonNull(spreadElement.expression))
+    return createIterableFallbackTarget(spreadElement.expression)
+
+  const variableDeclaration = findAncestor(token, ts.isVariableDeclaration)
+  if (
+    variableDeclaration?.initializer
+    && typeIncludesUndefined(checker.getTypeAtLocation(variableDeclaration.initializer))
+    && !isAlreadyNonNull(variableDeclaration.initializer)
+  ) {
+    return createExpressionTarget(variableDeclaration.initializer)
+  }
+
+  const binaryExpression = findAncestor(token, ts.isBinaryExpression)
+  if (
+    binaryExpression
+    && isAssignmentOperator(binaryExpression.operatorToken.kind)
+    && typeIncludesUndefined(checker.getTypeAtLocation(binaryExpression.right))
+    && !isAlreadyNonNull(binaryExpression.right)
+  ) {
+    return createExpressionTarget(binaryExpression.right)
+  }
+
+  return undefined
+}
+
+function findImplicitAnyParameterTarget(token: ts.Node): EditTarget | undefined {
+  const parameter = findAncestor(token, ts.isParameter)
+  if (!parameter || parameter.type || !ts.isIdentifier(parameter.name))
+    return undefined
+
+  const sourceFile = parameter.getSourceFile()
+  const replacement = ts.isArrowFunction(parameter.parent) && parameter.parent.parameters.length === 1
+    ? `(${parameter.name.getText(sourceFile)}: any)`
+    : `${parameter.name.getText(sourceFile)}: any`
+
+  return createDirectEditTarget(
+    sourceFile,
+    parameter.getStart(sourceFile),
+    parameter.getEnd(),
+    replacement,
+  )
+}
+
+function getArrayPatternElementTypeText(
+  element: ts.ArrayBindingElement | ts.Expression,
+  checker: ts.TypeChecker,
+): string {
+  if (ts.isOmittedExpression(element))
+    return 'unknown'
+
+  const targetNode = ts.isBindingElement(element)
+    ? element.name
+    : element
+
+  const targetType = checker.getNonNullableType(checker.getTypeAtLocation(targetNode))
+  const typeText = checker.typeToString(targetType)
+  return typeText === 'never' ? 'unknown' : typeText
+}
+
+function createArrayDestructuringReplacement(
+  sourceFile: ts.SourceFile,
+  expression: ts.Expression,
+  elements: readonly (ts.ArrayBindingElement | ts.Expression)[],
+  checker: ts.TypeChecker,
+  options?: {
+    fallbackToEmptyArray?: boolean
+  },
+): string | undefined {
+  if (elements.length === 0)
+    return undefined
+
+  const tupleTypes = elements.map(element => getArrayPatternElementTypeText(element, checker))
+  const expressionText = options?.fallbackToEmptyArray
+    ? `(${expression.getText(sourceFile)} ?? [])`
+    : `(${expression.getText(sourceFile)})`
+  return `${expressionText} as [${tupleTypes.join(', ')}]`
+}
+
+function findArrayDestructuringTarget(
+  token: ts.Node,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const binaryExpression = findAncestor(token, ts.isBinaryExpression)
+  if (binaryExpression && isAssignmentOperator(binaryExpression.operatorToken.kind) && ts.isArrayLiteralExpression(binaryExpression.left)) {
+    const replacement = createArrayDestructuringReplacement(
+      binaryExpression.getSourceFile(),
+      binaryExpression.right,
+      binaryExpression.left.elements,
+      checker,
+      {
+        fallbackToEmptyArray: typeIncludesUndefined(checker.getTypeAtLocation(binaryExpression.right)),
+      },
+    )
+    if (replacement) {
+      return createDirectEditTarget(
+        binaryExpression.getSourceFile(),
+        binaryExpression.right.getStart(binaryExpression.getSourceFile()),
+        binaryExpression.right.getEnd(),
+        replacement,
+      )
+    }
+  }
+
+  const variableDeclaration = findAncestor(token, ts.isVariableDeclaration)
+  if (variableDeclaration?.initializer && ts.isArrayBindingPattern(variableDeclaration.name)) {
+    const replacement = createArrayDestructuringReplacement(
+      variableDeclaration.getSourceFile(),
+      variableDeclaration.initializer,
+      variableDeclaration.name.elements,
+      checker,
+      {
+        fallbackToEmptyArray: typeIncludesUndefined(checker.getTypeAtLocation(variableDeclaration.initializer)),
+      },
+    )
+    if (replacement) {
+      return createDirectEditTarget(
+        variableDeclaration.getSourceFile(),
+        variableDeclaration.initializer.getStart(variableDeclaration.getSourceFile()),
+        variableDeclaration.initializer.getEnd(),
+        replacement,
+      )
+    }
+  }
+
+  return undefined
+}
+
+function findVariableDeclarationInitializerTarget(
+  sourceFile: ts.SourceFile,
+  token: ts.Node,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const variableDeclaration = findAncestor(token, ts.isVariableDeclaration)
+  if (!variableDeclaration?.initializer)
+    return undefined
+
+  const nestedTarget = findNestedContainerTarget(variableDeclaration.initializer, checker)
+  if (nestedTarget)
+    return nestedTarget
+
+  if (!typeIncludesUndefined(checker.getTypeAtLocation(variableDeclaration.initializer)))
+    return undefined
+
+  return createExpressionTarget(variableDeclaration.initializer)
+}
+
+function getResolvedValueDeclaration(
+  symbol: ts.Symbol | undefined,
+  checker: ts.TypeChecker,
+): ts.Declaration | undefined {
+  if (!symbol)
+    return undefined
+
+  const resolvedSymbol = symbol.flags & ts.SymbolFlags.Alias
+    ? checker.getAliasedSymbol(symbol)
+    : symbol
+
+  return resolvedSymbol.valueDeclaration ?? resolvedSymbol.declarations?.[0]
+}
+
+function getFunctionLikeDeclaration(
+  declaration: ts.Declaration,
+): ts.FunctionLikeDeclarationBase | undefined {
+  if (
+    ts.isFunctionDeclaration(declaration)
+    || ts.isMethodDeclaration(declaration)
+    || ts.isFunctionExpression(declaration)
+    || ts.isArrowFunction(declaration)
+  ) {
+    return declaration
+  }
+
+  if (
+    ts.isVariableDeclaration(declaration)
+    && declaration.initializer
+    && (ts.isArrowFunction(declaration.initializer) || ts.isFunctionExpression(declaration.initializer))
+  ) {
+    return declaration.initializer
+  }
+
+  return undefined
+}
+
+function getPropertyNameText(name: ts.PropertyName | ts.BindingName): string | undefined {
+  if (ts.isIdentifier(name) || ts.isStringLiteral(name) || ts.isNumericLiteral(name))
+    return name.text
+
+  return undefined
+}
+
+function getCallExpressionPropertyAccess(callExpression: ts.CallExpression): ts.PropertyAccessExpression | undefined {
+  const callee = skipOuterExpressions(callExpression.expression)
+  return ts.isPropertyAccessExpression(callee) ? callee : undefined
+}
+
+function getFunctionExpressionArgument(callExpression: ts.CallExpression, index = 0): ts.ArrowFunction | ts.FunctionExpression | undefined {
+  const callback = callExpression.arguments[index]
+  return callback && (ts.isArrowFunction(callback) || ts.isFunctionExpression(callback))
+    ? callback
+    : undefined
+}
+
+function findTargetInFunctionBody(
+  body: ts.ConciseBody,
+  resolveExpression: (expression: ts.Expression) => EditTarget | undefined,
+): EditTarget | undefined {
+  if (ts.isBlock(body)) {
+    for (const expression of findReturnStatementExpressions(body)) {
+      const target = resolveExpression(expression)
+      if (target)
+        return target
+    }
+
+    return undefined
+  }
+
+  return resolveExpression(body)
+}
+
+function getParameterCollectionExpression(
+  declaration: ts.ParameterDeclaration,
+): ts.Expression | undefined {
+  const functionLikeDeclaration = declaration.parent
+  if (
+    !(ts.isArrowFunction(functionLikeDeclaration) || ts.isFunctionExpression(functionLikeDeclaration))
+    || !ts.isCallExpression(functionLikeDeclaration.parent)
+    || functionLikeDeclaration.parent.arguments[0] !== functionLikeDeclaration
+  ) {
+    return undefined
+  }
+
+  const callee = getCallExpressionPropertyAccess(functionLikeDeclaration.parent)
+  return callee?.expression
+}
+
+function findObjectLiteralNamedPropertyTarget(
+  objectLiteral: ts.ObjectLiteralExpression,
+  propertyName: string,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  for (const property of objectLiteral.properties) {
+    if (ts.isSpreadAssignment(property))
+      continue
+
+    if (ts.isShorthandPropertyAssignment(property) && property.name.text === propertyName)
+      return createShorthandPropertyTarget(property)
+
+    if (ts.isPropertyAssignment(property)) {
+      const currentPropertyName = getPropertyNameText(property.name)
+      if (currentPropertyName !== propertyName)
+        continue
+
+      return findTargetFromExpression(property.initializer, checker)
+        ?? createExpressionTarget(property.initializer)
+    }
+  }
+
+  return undefined
+}
+
+function findFunctionLikeNamedReturnTarget(
+  declaration: ts.FunctionLikeDeclarationBase,
+  propertyName: string,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  if (!declaration.body)
+    return undefined
+
+  return findTargetInFunctionBody(
+    declaration.body,
+    expression => findNamedPropertyTarget(expression, propertyName, checker),
+  )
+}
+
+function findCollectionPropertyTarget(
+  expression: ts.Expression,
+  propertyName: string,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const innerExpression = skipOuterExpressions(expression)
+
+  if (ts.isIdentifier(innerExpression))
+    return findNamedPropertyTarget(innerExpression, propertyName, checker)
+
+  if (!ts.isCallExpression(innerExpression))
+    return undefined
+
+  const callee = getCallExpressionPropertyAccess(innerExpression)
+  if (!callee)
+    return undefined
+
+  if (callee.name.text === 'map' || callee.name.text === 'flatMap') {
+    const callback = getFunctionExpressionArgument(innerExpression)
+    if (!callback)
+      return undefined
+
+    return findTargetInFunctionBody(
+      callback.body,
+      returnedExpression => findNamedPropertyTarget(returnedExpression, propertyName, checker),
+    )
+  }
+
+  if (callee.name.text === 'filter')
+    return findCollectionPropertyTarget(callee.expression, propertyName, checker)
+
+  return undefined
+}
+
+function findNamedPropertyTarget(
+  expression: ts.Expression,
+  propertyName: string,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const innerExpression = skipOuterExpressions(expression)
+
+  if (ts.isObjectLiteralExpression(innerExpression))
+    return findObjectLiteralNamedPropertyTarget(innerExpression, propertyName, checker)
+
+  if (ts.isIdentifier(innerExpression)) {
+    const declaration = getResolvedValueDeclaration(checker.getSymbolAtLocation(innerExpression), checker)
+    if (!declaration)
+      return undefined
+
+    if (ts.isParameter(declaration)) {
+      const collectionExpression = getParameterCollectionExpression(declaration)
+      if (collectionExpression)
+        return findCollectionPropertyTarget(collectionExpression, propertyName, checker)
+    }
+
+    const functionLikeDeclaration = getFunctionLikeDeclaration(declaration)
+    if (functionLikeDeclaration)
+      return findFunctionLikeNamedReturnTarget(functionLikeDeclaration, propertyName, checker)
+
+    if (ts.isVariableDeclaration(declaration) && declaration.initializer)
+      return findNamedPropertyTarget(declaration.initializer, propertyName, checker)
+
+    return undefined
+  }
+
+  if (ts.isCallExpression(innerExpression)) {
+    const collectionPropertyTarget = findCollectionPropertyTarget(innerExpression, propertyName, checker)
+    if (collectionPropertyTarget)
+      return collectionPropertyTarget
+
+    const declaration = getResolvedValueDeclaration(checker.getSymbolAtLocation(skipOuterExpressions(innerExpression.expression)), checker)
+    if (!declaration)
+      return undefined
+
+    const functionLikeDeclaration = getFunctionLikeDeclaration(declaration)
+    if (!functionLikeDeclaration)
+      return undefined
+
+    return findFunctionLikeNamedReturnTarget(functionLikeDeclaration, propertyName, checker)
+  }
+
+  return undefined
+}
+
+function findReturnStatementExpressions(node: ts.Node): ts.Expression[] {
+  const expressions: ts.Expression[] = []
+
+  const visit = (current: ts.Node) => {
+    if (
+      current !== node
+      && (
+        ts.isArrowFunction(current)
+        || ts.isFunctionExpression(current)
+        || ts.isFunctionDeclaration(current)
+        || ts.isMethodDeclaration(current)
+      )
+    ) {
+      return
+    }
+
+    if (ts.isReturnStatement(current) && current.expression)
+      expressions.push(current.expression)
+
+    current.forEachChild(visit)
+  }
+
+  visit(node)
+  return expressions
+}
+
+function findFunctionLikeReturnTarget(
+  declaration: ts.FunctionLikeDeclarationBase,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  if (!declaration.body)
+    return undefined
+
+  return findTargetInFunctionBody(
+    declaration.body,
+    expression => findTargetFromExpression(expression, checker),
+  )
+}
+
+function findCallExpressionDeclarationTarget(
+  callExpression: ts.CallExpression,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const declaration = getResolvedValueDeclaration(checker.getSymbolAtLocation(skipOuterExpressions(callExpression.expression)), checker)
+  if (!declaration)
+    return undefined
+
+  const functionLikeDeclaration = getFunctionLikeDeclaration(declaration)
+  if (!functionLikeDeclaration)
+    return undefined
+
+  return findFunctionLikeReturnTarget(functionLikeDeclaration, checker)
+}
+
+function findCallbackArgumentTarget(
+  callExpression: ts.CallExpression,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const callee = skipOuterExpressions(callExpression.expression)
+  const calleeName = ts.isIdentifier(callee) ? callee.text : getCallExpressionPropertyAccess(callExpression)?.name.text
+
+  if (calleeName !== 'useCallback' && calleeName !== 'useMemo')
+    return undefined
+
+  const callback = getFunctionExpressionArgument(callExpression)
+  if (!callback)
+    return undefined
+
+  return findFunctionLikeReturnTarget(callback, checker)
+}
+
+function findReferencedDeclarationInitializerTarget(
+  expression: ts.Expression,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const innerExpression = skipOuterExpressions(expression)
+  if (!ts.isIdentifier(innerExpression))
+    return undefined
+
+  const declaration = getResolvedValueDeclaration(checker.getSymbolAtLocation(innerExpression), checker)
+  if (!declaration)
+    return undefined
+
+  if (ts.isBindingElement(declaration)) {
+    const propertyName = declaration.propertyName
+      ? getPropertyNameText(declaration.propertyName)
+      : getPropertyNameText(declaration.name)
+
+    const variableDeclaration = declaration.parent.parent
+    if (propertyName && ts.isVariableDeclaration(variableDeclaration) && variableDeclaration.initializer) {
+      const namedPropertyTarget = findNamedPropertyTarget(variableDeclaration.initializer, propertyName, checker)
+      if (namedPropertyTarget)
+        return namedPropertyTarget
+    }
+  }
+
+  if (ts.isParameter(declaration)) {
+    const collectionExpression = getParameterCollectionExpression(declaration)
+    if (collectionExpression) {
+      const collectionTarget = findTargetFromExpression(collectionExpression, checker)
+      if (collectionTarget)
+        return collectionTarget
+    }
+  }
+
+  const functionLikeDeclaration = getFunctionLikeDeclaration(declaration)
+  if (functionLikeDeclaration) {
+    const functionTarget = findFunctionLikeReturnTarget(functionLikeDeclaration, checker)
+    if (functionTarget)
+      return functionTarget
+  }
+
+  if (!ts.isVariableDeclaration(declaration) || !declaration.initializer)
+    return undefined
+
+  const collectionCallbackTarget = findCollectionCallbackTarget(declaration.initializer, checker)
+  if (collectionCallbackTarget)
+    return collectionCallbackTarget
+
+  const initializerTarget = findTargetFromExpression(declaration.initializer, checker)
+  if (initializerTarget)
+    return initializerTarget
+
+  const nestedTarget = findNestedContainerTarget(declaration.initializer, checker)
+  if (nestedTarget)
+    return nestedTarget
+
+  if (!typeIncludesUndefined(checker.getTypeAtLocation(declaration.initializer)))
+    return undefined
+
+  return createExpressionTarget(declaration.initializer)
+}
+
+function findCollectionCallbackTarget(
+  expression: ts.Expression,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const innerExpression = skipOuterExpressions(expression)
+  if (!ts.isCallExpression(innerExpression))
+    return undefined
+
+  const callee = getCallExpressionPropertyAccess(innerExpression)
+  if (!callee)
+    return undefined
+
+  if (callee.name.text !== 'map' && callee.name.text !== 'flatMap')
+    return undefined
+
+  const callback = getFunctionExpressionArgument(innerExpression)
+  if (!callback)
+    return undefined
+
+  return findFunctionLikeReturnTarget(callback, checker)
+}
+
+function findJsxComponentDeclarationTarget(
+  token: ts.Node,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const openingLikeElement = findAncestor(token, node =>
+    ts.isJsxOpeningElement(node) || ts.isJsxSelfClosingElement(node))
+  if (!openingLikeElement)
+    return undefined
+
+  const tagName = openingLikeElement.tagName
+  if (!ts.isIdentifier(tagName))
+    return undefined
+
+  const symbol = checker.getSymbolAtLocation(tagName)
+  const declaration = symbol?.valueDeclaration
+  if (!declaration || !ts.isVariableDeclaration(declaration) || !declaration.initializer)
+    return undefined
+
+  if (!typeIncludesUndefined(checker.getTypeAtLocation(declaration.initializer)))
+    return undefined
+
+  return createExpressionTarget(declaration.initializer)
+}
+
+function findObjectLiteralPropertyTarget(
+  objectLiteral: ts.ObjectLiteralExpression,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  for (const property of objectLiteral.properties) {
+    if (ts.isSpreadAssignment(property)) {
+      const directTarget = findTargetFromExpression(property.expression, checker)
+      if (directTarget)
+        return directTarget
+
+      if (typeIncludesUndefined(checker.getTypeAtLocation(property.expression)))
+        return createExpressionTarget(property.expression)
+      continue
+    }
+
+    if (ts.isShorthandPropertyAssignment(property)) {
+      if (typeIncludesUndefined(checker.getTypeAtLocation(property.name)))
+        return createShorthandPropertyTarget(property)
+      continue
+    }
+
+    if (ts.isPropertyAssignment(property)) {
+      const directTarget = findTargetFromExpression(property.initializer, checker)
+      if (directTarget)
+        return directTarget
+
+      const nestedTarget = findNestedContainerTarget(property.initializer, checker)
+      if (nestedTarget)
+        return nestedTarget
+
+      if (typeIncludesUndefined(checker.getTypeAtLocation(property.initializer)))
+        return createExpressionTarget(property.initializer)
+    }
+  }
+
+  return undefined
+}
+
+function findArrayLiteralElementTarget(
+  arrayLiteral: ts.ArrayLiteralExpression,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const iterableFallbackTarget = createArrayLiteralIterableFallbackTarget(arrayLiteral, checker)
+  if (iterableFallbackTarget)
+    return iterableFallbackTarget
+
+  for (const element of arrayLiteral.elements) {
+    if (ts.isSpreadElement(element)) {
+      const directTarget = findTargetFromExpression(element.expression, checker)
+      if (directTarget)
+        return directTarget
+
+      if (typeIncludesUndefined(checker.getTypeAtLocation(element.expression)))
+        return createExpressionTarget(element.expression)
+      continue
+    }
+
+    const directTarget = findTargetFromExpression(element, checker)
+    if (directTarget)
+      return directTarget
+
+    const nestedTarget = findNestedContainerTarget(element, checker)
+    if (nestedTarget)
+      return nestedTarget
+
+    if (typeIncludesUndefined(checker.getTypeAtLocation(element)))
+      return createExpressionTarget(element)
+  }
+
+  for (let index = arrayLiteral.elements.length - 1; index >= 0; index -= 1) {
+    const element = arrayLiteral.elements[index]
+    if (!element)
+      continue
+
+    if (ts.isSpreadElement(element))
+      continue
+
+    if (!isAlreadyNonNull(element))
+      return createExpressionTarget(element)
+  }
+
+  return undefined
+}
+
+function findNestedContainerTarget(
+  expression: ts.Expression,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const innerExpression = skipOuterExpressions(expression)
+  if (ts.isObjectLiteralExpression(innerExpression))
+    return findObjectLiteralPropertyTarget(innerExpression, checker)
+
+  if (ts.isArrayLiteralExpression(innerExpression))
+    return findArrayLiteralElementTarget(innerExpression, checker)
+
+  return undefined
+}
+
+function findAccessDiagnosticTarget(
+  sourceFile: ts.SourceFile,
+  token: ts.Node,
+  start: number,
+  end: number,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const directExpression = findTightestExpression(sourceFile, start, end)
+  if (directExpression) {
+    if (typeIncludesUndefined(checker.getTypeAtLocation(directExpression)) && !isAlreadyNonNull(directExpression))
+      return createExpressionTarget(directExpression)
+
+    const referencedDeclarationTarget = findReferencedDeclarationInitializerTarget(directExpression, checker)
+    if (referencedDeclarationTarget && isExpressionTarget(referencedDeclarationTarget) && !isAlreadyNonNull(referencedDeclarationTarget.expression))
+      return referencedDeclarationTarget
+  }
+
+  const bindingPatternTarget = findVariableDeclarationInitializerTarget(sourceFile, token, checker)
+  if (bindingPatternTarget && isExpressionTarget(bindingPatternTarget) && !isAlreadyNonNull(bindingPatternTarget.expression))
+    return bindingPatternTarget
+
+  const accessTarget = findUndefinedAccessTarget(token, checker)
+  if (accessTarget && isExpressionTarget(accessTarget) && !isAlreadyNonNull(accessTarget.expression))
+    return accessTarget
+
+  const propertyAccessTarget = findPropertyAccessExpressionTarget(token, start)
+  if (propertyAccessTarget && isExpressionTarget(propertyAccessTarget) && !isAlreadyNonNull(propertyAccessTarget.expression))
+    return propertyAccessTarget
+
+  return undefined
+}
+
+function findDiagnosticCandidate(
+  sourceFile: ts.SourceFile,
+  token: ts.Node,
+  start: number,
+  end: number,
+  diagnosticCode: number,
+  checker: ts.TypeChecker,
+): ts.Expression | undefined {
+  if (diagnosticCode === 2322) {
+    const directExpression = findTightestExpression(sourceFile, start, end)
+    if (directExpression && typeIncludesUndefined(checker.getTypeAtLocation(directExpression)))
+      return directExpression
+
+    return findAssignmentLikeCandidate(token, sourceFile, start, end)
+  }
+
+  if (diagnosticCode === 2345)
+    return findArgumentCandidate(token, sourceFile, start, end)
+
+  if (diagnosticCode === 2722) {
+    const current = findTightestExpression(sourceFile, start, end)
+    if (current && ts.isCallExpression(current))
+      return current.expression
+
+    return findTightestExpression(sourceFile, start, end)
+  }
+
+  return findTightestExpression(sourceFile, start, end)
+}
+
+function resolveEditTarget(
+  sourceFile: ts.SourceFile,
+  diagnostic: ts.DiagnosticWithLocation,
+  checker: ts.TypeChecker,
+): EditTarget | undefined {
+  const start = diagnostic.start
+  const end = diagnostic.start + diagnostic.length
+  const token = getTokenAtPosition(sourceFile, start)
+
+  const shorthandTarget = findShorthandPropertyTarget(token, checker)
+  if (shorthandTarget)
+    return shorthandTarget
+
+  const propertyAssignmentTarget = findPropertyAssignmentInitializerTarget(token, start, checker)
+  if (propertyAssignmentTarget)
+    return propertyAssignmentTarget
+
+  const jsxSpreadTarget = findJsxSpreadAttributeTarget(token, checker)
+  if (jsxSpreadTarget && isExpressionTarget(jsxSpreadTarget) && !isAlreadyNonNull(jsxSpreadTarget.expression))
+    return jsxSpreadTarget
+
+  const jsxAttribute = findAncestor(token, ts.isJsxAttribute)
+  const jsxExpression = jsxAttribute ? getExpressionFromJsxAttribute(jsxAttribute) : undefined
+
+  if (
+    ASSIGNABILITY_DIAGNOSTIC_CODES.has(diagnostic.code)
+    && jsxExpression
+    && typeIncludesUndefined(checker.getTypeAtLocation(jsxExpression))
+    && !isAlreadyNonNull(jsxExpression)
+  ) {
+    return findTargetFromExpression(jsxExpression, checker)
+      ?? createExpressionTarget(jsxExpression)
+  }
+
+  if (ACCESS_DIAGNOSTIC_CODES.has(diagnostic.code))
+    return findAccessDiagnosticTarget(sourceFile, token, start, end, checker)
+
+  if (diagnostic.code === 2322 || diagnostic.code === 2488) {
+    const arrayDestructuringTarget = findArrayDestructuringTarget(token, checker)
+    if (arrayDestructuringTarget)
+      return arrayDestructuringTarget
+  }
+
+  if (diagnostic.code === 2538) {
+    const elementAccessTarget = findElementAccessArgumentTarget(token)
+    if (elementAccessTarget && isExpressionTarget(elementAccessTarget) && !isAlreadyNonNull(elementAccessTarget.expression))
+      return elementAccessTarget
+  }
+
+  if (diagnostic.code === 7006)
+    return findImplicitAnyParameterTarget(token)
+
+  if (diagnostic.code === 2488) {
+    const iterableTarget = findIterableTarget(sourceFile, token, start, end, checker)
+    if (iterableTarget && (!isExpressionTarget(iterableTarget) || !isAlreadyNonNull(iterableTarget.expression)))
+      return iterableTarget
+  }
+
+  if (diagnostic.code === 2604 || diagnostic.code === 2786) {
+    const jsxComponentTarget = findJsxComponentDeclarationTarget(token, checker)
+    if (jsxComponentTarget && isExpressionTarget(jsxComponentTarget) && !isAlreadyNonNull(jsxComponentTarget.expression))
+      return jsxComponentTarget
+  }
+
+  const candidate = findDiagnosticCandidate(sourceFile, token, start, end, diagnostic.code, checker)
+
+  if (!candidate) {
+    return jsxExpression && !isAlreadyNonNull(jsxExpression)
+      ? createExpressionTarget(jsxExpression)
+      : undefined
+  }
+
+  if (ASSIGNABILITY_DIAGNOSTIC_CODES.has(diagnostic.code)) {
+    if (
+      diagnostic.code === 2345
+      && typeIncludesUndefined(checker.getTypeAtLocation(candidate))
+      && !isAlreadyNonNull(candidate)
+      && (
+        ts.isIdentifier(candidate)
+        || ts.isElementAccessExpression(candidate)
+        || ts.isPropertyAccessExpression(candidate)
+      )
+    ) {
+      return createExpressionTarget(candidate)
+    }
+
+    const referencedDeclarationTarget = findReferencedDeclarationInitializerTarget(candidate, checker)
+    if (referencedDeclarationTarget && isExpressionTarget(referencedDeclarationTarget) && !isAlreadyNonNull(referencedDeclarationTarget.expression))
+      return referencedDeclarationTarget
+
+    const collectionCallbackTarget = findCollectionCallbackTarget(candidate, checker)
+    if (collectionCallbackTarget && isExpressionTarget(collectionCallbackTarget) && !isAlreadyNonNull(collectionCallbackTarget.expression))
+      return collectionCallbackTarget
+  }
+
+  const targetFromCandidate = findTargetFromExpression(candidate, checker)
+  if (targetFromCandidate && (!isExpressionTarget(targetFromCandidate) || !isAlreadyNonNull(targetFromCandidate.expression)))
+    return targetFromCandidate
+
+  if (ASSIGNABILITY_DIAGNOSTIC_CODES.has(diagnostic.code) && (ts.isArrowFunction(candidate) || ts.isFunctionExpression(candidate))) {
+    const functionTarget = findFunctionLikeReturnTarget(candidate, checker)
+    if (functionTarget && isExpressionTarget(functionTarget) && !isAlreadyNonNull(functionTarget.expression))
+      return functionTarget
+  }
+
+  const nestedContainerTarget = findNestedContainerTarget(candidate, checker)
+  if (nestedContainerTarget)
+    return nestedContainerTarget
+
+  if (isAlreadyNonNull(candidate))
+    return undefined
+
+  if (ASSIGNABILITY_DIAGNOSTIC_CODES.has(diagnostic.code) && ts.isObjectLiteralExpression(candidate)) {
+    const objectLiteralTarget = findObjectLiteralPropertyTarget(candidate, checker)
+    if (objectLiteralTarget)
+      return objectLiteralTarget
+  }
+
+  if (diagnostic.code === 2322) {
+    const declarationInitializerTarget = findVariableDeclarationInitializerTarget(sourceFile, token, checker)
+    if (declarationInitializerTarget && isExpressionTarget(declarationInitializerTarget) && !isAlreadyNonNull(declarationInitializerTarget.expression))
+      return declarationInitializerTarget
+  }
+
+  if (ASSIGNABILITY_DIAGNOSTIC_CODES.has(diagnostic.code) && !typeIncludesUndefined(checker.getTypeAtLocation(candidate)))
+    return undefined
+
+  return createExpressionTarget(candidate)
+}
+
+function createEditForTarget(
+  target: EditTarget,
+  printer: ts.Printer,
+): TextEdit {
+  const sourceFile = target.sourceFile
+
+  if (target.kind === 'direct-edit') {
+    return {
+      end: target.end,
+      expectedText: sourceFile.text.slice(target.start, target.end),
+      replacement: target.replacement,
+      start: target.start,
+    }
+  }
+
+  if (target.kind === 'shorthand-property') {
+    const name = target.property.name
+    const nonNullName = printer.printNode(
+      ts.EmitHint.Expression,
+      ts.factory.createNonNullExpression(name),
+      sourceFile,
+    )
+    return {
+      end: target.property.getEnd(),
+      expectedText: sourceFile.text.slice(target.property.getStart(sourceFile), target.property.getEnd()),
+      replacement: `${name.getText(sourceFile)}: ${nonNullName}`,
+      start: target.property.getStart(sourceFile),
+    }
+  }
+
+  const replacement = shouldPrintInlineNonNullAssertion(target.expression)
+    ? `${target.expression.getText(sourceFile)}!`
+    : printer.printNode(
+        ts.EmitHint.Expression,
+        ts.factory.createNonNullExpression(target.expression),
+        sourceFile,
+      )
+
+  return {
+    end: target.expression.getEnd(),
+    expectedText: sourceFile.text.slice(target.expression.getStart(sourceFile), target.expression.getEnd()),
+    replacement,
+    start: target.expression.getStart(sourceFile),
+  }
+}
+
+function hasOverlap(existingEdits: TextEdit[], nextEdit: TextEdit): boolean {
+  return existingEdits.some(edit => nextEdit.start < edit.end && edit.start < nextEdit.end)
+}
+
+function applyEdits(text: string, edits: TextEdit[]): { appliedEditCount: number, text: string } {
+  let currentText = text
+  let appliedEditCount = 0
+
+  for (const edit of edits.sort((left, right) => right.start - left.start)) {
+    if (edit.replacement.length > currentText.length * 4)
+      continue
+
+    try {
+      currentText = `${currentText.slice(0, edit.start)}${edit.replacement}${currentText.slice(edit.end)}`
+      appliedEditCount += 1
+    }
+    catch {
+      continue
+    }
+  }
+
+  return {
+    appliedEditCount,
+    text: currentText,
+  }
+}
+
+function isValidEditRange(text: string, edit: TextEdit): boolean {
+  return Number.isInteger(edit.start)
+    && Number.isInteger(edit.end)
+    && edit.start >= 0
+    && edit.end >= edit.start
+    && edit.end <= text.length
+}
+
+function filterApplicableEdits(text: string, edits: TextEdit[]): TextEdit[] {
+  return edits.filter(edit => isValidEditRange(text, edit) && (!edit.expectedText || text.slice(edit.start, edit.end) === edit.expectedText))
+}
+
+export async function runMigration(options: CliOptions) {
+  const projectPath = path.resolve(process.cwd(), options.project)
+  const parsedConfig = parseTsConfig(projectPath)
+  const matchesRequestedFile = createFileMatcher(options.files)
+  const targetFiles = parsedConfig.fileNames
+    .map(normalizeFileName)
+    .filter(isTargetFile)
+    .filter(matchesRequestedFile)
+
+  if (targetFiles.length === 0) {
+    console.error('No matching TypeScript source files found.')
+    process.exitCode = 1
+    return { converged: false, totalEdits: 0 }
+  }
+
+  const fileTexts = new Map<string, string>()
+  const printer = ts.createPrinter()
+  const migrationRootNames = options.useFullProjectRoots
+    ? parsedConfig.fileNames.map(normalizeFileName)
+    : getMigrationRootNames(parsedConfig, targetFiles)
+
+  let totalEdits = 0
+  let converged = false
+  let previousProgram: ts.Program | undefined
+
+  for (let iteration = 1; iteration <= options.maxIterations; iteration += 1) {
+    const program = createMigrationProgram(migrationRootNames, parsedConfig, fileTexts, previousProgram)
+    const checker = program.getTypeChecker()
+    const editsByFile = new Map<string, TextEdit[]>()
+
+    for (const fileName of targetFiles) {
+      const sourceFile = program.getSourceFile(fileName)
+      if (!sourceFile)
+        continue
+
+      const diagnostics = program
+        .getSemanticDiagnostics(sourceFile)
+        .filter((diagnostic): diagnostic is ts.DiagnosticWithLocation => {
+          return diagnostic.file !== undefined
+            && diagnostic.start !== undefined
+            && diagnostic.length !== undefined
+            && SUPPORTED_DIAGNOSTIC_CODES.has(diagnostic.code)
+        })
+
+      if (options.verbose && diagnostics.length > 0)
+        console.log(`file ${path.relative(process.cwd(), fileName)}: ${diagnostics.length} supported diagnostic(s)`)
+
+      for (const diagnostic of diagnostics) {
+        const target = resolveEditTarget(sourceFile, diagnostic, checker)
+        if (!target) {
+          if (options.verbose)
+            console.log(`unresolved ${formatDiagnostic(diagnostic)}`)
+          continue
+        }
+
+        const editFileName = target.sourceFile.fileName
+        const edit = createEditForTarget(target, printer)
+        const existing = editsByFile.get(editFileName) ?? []
+        if (hasOverlap(existing, edit))
+          continue
+
+        existing.push(edit)
+        editsByFile.set(editFileName, existing)
+
+        if (options.verbose) {
+          const position = target.sourceFile.getLineAndCharacterOfPosition(edit.start)
+          console.log(`iter ${iteration}: ${path.relative(process.cwd(), editFileName)}:${position.line + 1}:${position.character + 1} -> add !`)
+        }
+      }
+    }
+
+    if (editsByFile.size === 0) {
+      console.log(`No more supported diagnostics after ${iteration - 1} iteration(s).`)
+      converged = true
+      break
+    }
+
+    let iterationEditCount = 0
+
+    for (const [fileName, edits] of editsByFile) {
+      const currentText = fileTexts.get(fileName) ?? await fs.readFile(fileName, 'utf8')
+      const applicableEdits = filterApplicableEdits(currentText, edits)
+      if (applicableEdits.length === 0)
+        continue
+
+      const { appliedEditCount, text: editedText } = applyEdits(currentText, applicableEdits)
+      if (appliedEditCount === 0)
+        continue
+
+      const nextText = normalizeMalformedAssertions(editedText)
+      if (nextText === currentText) {
+        if (options.verbose) {
+          const firstEdit = applicableEdits[0]
+          console.log(`iter ${iteration}: no-op after normalization for ${path.relative(process.cwd(), fileName)}:${firstEdit?.start ?? 0} ${JSON.stringify(firstEdit ? currentText.slice(firstEdit.start, firstEdit.end) : '')} -> ${JSON.stringify(firstEdit?.replacement ?? '')}`)
+        }
+        continue
+      }
+
+      fileTexts.set(fileName, nextText)
+      iterationEditCount += appliedEditCount
+    }
+
+    totalEdits += iterationEditCount
+    console.log(`Iteration ${iteration}: ${iterationEditCount} edit(s) across ${editsByFile.size} file(s).`)
+    previousProgram = program
+  }
+
+  if (totalEdits === 0) {
+    console.log('No supported noUncheckedIndexedAccess-style diagnostics were migrated.')
+    return { converged, totalEdits }
+  }
+
+  if (!options.write) {
+    if (!converged)
+      console.log(`Stopped after reaching --max-iterations=${options.maxIterations}.`)
+
+    console.log(`Dry run complete. ${totalEdits} edit(s) are ready. Re-run with --write to apply them.`)
+    return { converged, totalEdits }
+  }
+
+  const changedFiles = Array.from(fileTexts.entries())
+  await Promise.all(changedFiles.map(async ([fileName, text]) => {
+    await fs.writeFile(fileName, text)
+  }))
+
+  if (!converged)
+    console.log(`Stopped after reaching --max-iterations=${options.maxIterations}.`)
+
+  console.log(`Wrote ${totalEdits} edit(s) to ${changedFiles.length} file(s).`)
+  return { converged, totalEdits }
+}
+
+export async function runMigrationCommand(argv: string[]) {
+  await runMigration(parseArgs(argv))
+}
diff --git a/packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/normalize.ts b/packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/normalize.ts
new file mode 100644
index 0000000000..d3b88736fc
--- /dev/null
+++ b/packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/normalize.ts
@@ -0,0 +1,51 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import process from 'node:process'
+import { normalizeMalformedAssertions } from './migrate'
+
+const ROOT = process.cwd()
+const EXTENSIONS = new Set(['.ts', '.tsx'])
+
+async function collectFiles(directory: string): Promise<string[]> {
+  const entries = await fs.readdir(directory, { withFileTypes: true })
+  const files: string[] = []
+
+  for (const entry of entries) {
+    if (entry.name === 'node_modules' || entry.name === '.next')
+      continue
+
+    const absolutePath = path.join(directory, entry.name)
+    if (entry.isDirectory()) {
+      files.push(...await collectFiles(absolutePath))
+      continue
+    }
+
+    if (!EXTENSIONS.has(path.extname(entry.name)))
+      continue
+
+    files.push(absolutePath)
+  }
+
+  return files
+}
+
+async function main() {
+  const files = await collectFiles(ROOT)
+  let changedFileCount = 0
+
+  await Promise.all(files.map(async (fileName) => {
+    const currentText = await fs.readFile(fileName, 'utf8')
+    const nextText = normalizeMalformedAssertions(currentText)
+    if (nextText === currentText)
+      return
+
+    await fs.writeFile(fileName, nextText)
+    changedFileCount += 1
+  }))
+
+  console.log(`Normalized malformed assertion syntax in ${changedFileCount} file(s).`)
+}
+
+export async function runNormalizeCommand(_argv: string[]) {
+  await main()
+}
diff --git a/packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/run.ts b/packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/run.ts
new file mode 100644
index 0000000000..ad655e4f11
--- /dev/null
+++ b/packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/run.ts
@@ -0,0 +1,325 @@
+import { execFile } from 'node:child_process'
+import { createHash } from 'node:crypto'
+import fs from 'node:fs/promises'
+import os from 'node:os'
+import path from 'node:path'
+import process from 'node:process'
+import { promisify } from 'node:util'
+import { runMigration, SUPPORTED_DIAGNOSTIC_CODES } from './migrate'
+
+const execFileAsync = promisify(execFile)
+const DIAGNOSTIC_PATTERN = /^(.+?\.(?:ts|tsx))\((\d+),(\d+)\): error TS(\d+): (.+)$/
+const DEFAULT_BATCH_SIZE = 100
+const DEFAULT_BATCH_ITERATIONS = 5
+const DEFAULT_MAX_ROUNDS = 20
+const TYPECHECK_CACHE_DIR = path.join(os.tmpdir(), 'migrate-no-unchecked-indexed-access')
+
+type CliOptions = {
+  batchIterations: number
+  batchSize: number
+  maxRounds: number
+  project: string
+  verbose: boolean
+}
+
+type DiagnosticEntry = {
+  code: number
+  fileName: string
+  line: number
+  message: string
+}
+
+function parseArgs(argv: string[]): CliOptions {
+  const options: CliOptions = {
+    batchIterations: DEFAULT_BATCH_ITERATIONS,
+    batchSize: DEFAULT_BATCH_SIZE,
+    maxRounds: DEFAULT_MAX_ROUNDS,
+    project: 'tsconfig.json',
+    verbose: false,
+  }
+
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i]
+
+    if (arg === '--')
+      continue
+
+    if (arg === '--verbose') {
+      options.verbose = true
+      continue
+    }
+
+    if (arg === '--project') {
+      const value = argv[i + 1]
+      if (!value)
+        throw new Error('Missing value for --project')
+
+      options.project = value
+      i += 1
+      continue
+    }
+
+    if (arg === '--batch-size') {
+      const value = Number(argv[i + 1])
+      if (!Number.isInteger(value) || value <= 0)
+        throw new Error('Invalid value for --batch-size')
+
+      options.batchSize = value
+      i += 1
+      continue
+    }
+
+    if (arg === '--batch-iterations') {
+      const value = Number(argv[i + 1])
+      if (!Number.isInteger(value) || value <= 0)
+        throw new Error('Invalid value for --batch-iterations')
+
+      options.batchIterations = value
+      i += 1
+      continue
+    }
+
+    if (arg === '--max-rounds') {
+      const value = Number(argv[i + 1])
+      if (!Number.isInteger(value) || value <= 0)
+        throw new Error('Invalid value for --max-rounds')
+
+      options.maxRounds = value
+      i += 1
+      continue
+    }
+
+    throw new Error(`Unknown option: ${arg}`)
+  }
+
+  return options
+}
+
+function getTypeCheckBuildInfoPath(projectPath: string): string {
+  const hash = createHash('sha1')
+    .update(projectPath)
+    .digest('hex')
+    .slice(0, 16)
+
+  return path.join(TYPECHECK_CACHE_DIR, `${hash}.tsbuildinfo`)
+}
+
+async function runTypeCheck(
+  project: string,
+  options?: {
+    incremental?: boolean
+  },
+): Promise<{ diagnostics: DiagnosticEntry[], exitCode: number, rawOutput: string }> {
+  const projectPath = path.resolve(process.cwd(), project)
+  const projectDirectory = path.dirname(projectPath)
+  const buildInfoPath = getTypeCheckBuildInfoPath(projectPath)
+  const incremental = options?.incremental ?? true
+
+  await fs.mkdir(TYPECHECK_CACHE_DIR, { recursive: true })
+
+  const tscArgs = ['exec', 'tsc', '--noEmit', '--pretty', 'false']
+  if (incremental) {
+    tscArgs.push('--incremental', '--tsBuildInfoFile', buildInfoPath)
+  }
+  else {
+    tscArgs.push('--incremental', 'false')
+  }
+  tscArgs.push('--project', projectPath)
+
+  try {
+    const { stdout, stderr } = await execFileAsync('pnpm', tscArgs, {
+      cwd: projectDirectory,
+      env: {
+        ...process.env,
+        NODE_OPTIONS: process.env.NODE_OPTIONS ?? '--max-old-space-size=8192',
+      },
+      maxBuffer: 1024 * 1024 * 32,
+    })
+
+    const rawOutput = `${stdout}${stderr}`.trim()
+    return {
+      diagnostics: parseDiagnostics(rawOutput, projectDirectory),
+      exitCode: 0,
+      rawOutput,
+    }
+  }
+  catch (error) {
+    const exitCode = typeof error === 'object' && error && 'code' in error && typeof error.code === 'number'
+      ? error.code
+      : 1
+    const stdout = typeof error === 'object' && error && 'stdout' in error && typeof error.stdout === 'string'
+      ? error.stdout
+      : ''
+    const stderr = typeof error === 'object' && error && 'stderr' in error && typeof error.stderr === 'string'
+      ? error.stderr
+      : ''
+    const rawOutput = `${stdout}${stderr}`.trim()
+
+    return {
+      diagnostics: parseDiagnostics(rawOutput, projectDirectory),
+      exitCode,
+      rawOutput,
+    }
+  }
+}
+
+function parseDiagnostics(rawOutput: string, projectDirectory: string): DiagnosticEntry[] {
+  return rawOutput
+    .split('\n')
+    .map(line => line.trim())
+    .flatMap((line) => {
+      const match = line.match(DIAGNOSTIC_PATTERN)
+      if (!match)
+        return []
+
+      return [{
+        code: Number(match[4]),
+        fileName: path.resolve(projectDirectory, match[1]!),
+        line: Number(match[2]),
+        message: match[5] ?? '',
+      }]
+    })
+}
+
+function summarizeCodes(diagnostics: DiagnosticEntry[]): string {
+  const counts = new Map<number, number>()
+  for (const diagnostic of diagnostics)
+    counts.set(diagnostic.code, (counts.get(diagnostic.code) ?? 0) + 1)
+
+  return Array.from(counts.entries())
+    .sort((left, right) => right[1] - left[1])
+    .slice(0, 8)
+    .map(([code, count]) => `TS${code}:${count}`)
+    .join(', ')
+}
+
+function chunk<T>(items: T[], size: number): T[][] {
+  const batches: T[][] = []
+  for (let i = 0; i < items.length; i += size)
+    batches.push(items.slice(i, i + size))
+
+  return batches
+}
+
+async function runBatchMigration(options: CliOptions) {
+  for (let round = 1; round <= options.maxRounds; round += 1) {
+    const { diagnostics, exitCode, rawOutput } = await runTypeCheck(options.project)
+    if (exitCode === 0) {
+      const finalCheck = await runTypeCheck(options.project, { incremental: false })
+      if (finalCheck.exitCode !== 0) {
+        const finalDiagnostics = finalCheck.diagnostics
+        console.log(`Final cold type check found ${finalDiagnostics.length} diagnostic(s). ${summarizeCodes(finalDiagnostics)}`)
+
+        if (options.verbose) {
+          for (const diagnostic of finalDiagnostics.slice(0, 40))
+            console.log(`${path.relative(process.cwd(), diagnostic.fileName)}:${diagnostic.line} TS${diagnostic.code} ${diagnostic.message}`)
+        }
+
+        const finalSupportedFiles = Array.from(new Set(
+          finalDiagnostics
+            .filter(diagnostic => SUPPORTED_DIAGNOSTIC_CODES.has(diagnostic.code))
+            .map(diagnostic => diagnostic.fileName),
+        ))
+
+        if (finalSupportedFiles.length > 0) {
+          console.log(`  Final pass batch: ${finalSupportedFiles.length} file(s)`)
+          let finalResult = await runMigration({
+            files: finalSupportedFiles,
+            maxIterations: options.batchIterations,
+            project: options.project,
+            verbose: options.verbose,
+            write: true,
+          })
+
+          if (finalResult.totalEdits === 0) {
+            console.log('    No edits produced; retrying final pass with full project roots.')
+            finalResult = await runMigration({
+              files: finalSupportedFiles,
+              maxIterations: options.batchIterations,
+              project: options.project,
+              useFullProjectRoots: true,
+              verbose: options.verbose,
+              write: true,
+            })
+          }
+
+          if (finalResult.totalEdits > 0)
+            continue
+        }
+
+        if (finalCheck.rawOutput)
+          process.stderr.write(`${finalCheck.rawOutput}\n`)
+        process.exitCode = 1
+        return
+      }
+
+      console.log(`Type check passed after ${round - 1} migration round(s).`)
+      return
+    }
+
+    const supportedDiagnostics = diagnostics.filter(diagnostic => SUPPORTED_DIAGNOSTIC_CODES.has(diagnostic.code))
+    const unsupportedDiagnostics = diagnostics.filter(diagnostic => !SUPPORTED_DIAGNOSTIC_CODES.has(diagnostic.code))
+    const supportedFiles = Array.from(new Set(supportedDiagnostics.map(diagnostic => diagnostic.fileName)))
+
+    console.log(`Round ${round}: ${diagnostics.length} diagnostic(s). ${summarizeCodes(diagnostics)}`)
+
+    if (options.verbose) {
+      for (const diagnostic of diagnostics.slice(0, 40))
+        console.log(`${path.relative(process.cwd(), diagnostic.fileName)}:${diagnostic.line} TS${diagnostic.code} ${diagnostic.message}`)
+    }
+
+    if (supportedFiles.length === 0) {
+      console.error('No supported diagnostics remain to migrate.')
+      if (unsupportedDiagnostics.length > 0) {
+        console.error('Remaining unsupported diagnostics:')
+        for (const diagnostic of unsupportedDiagnostics.slice(0, 40))
+          console.error(`${path.relative(process.cwd(), diagnostic.fileName)}:${diagnostic.line} TS${diagnostic.code} ${diagnostic.message}`)
+      }
+      if (rawOutput)
+        process.stderr.write(`${rawOutput}\n`)
+      process.exitCode = 1
+      return
+    }
+
+    let roundEdits = 0
+    const batches = chunk(supportedFiles, options.batchSize)
+
+    for (const [index, batch] of batches.entries()) {
+      console.log(`  Batch ${index + 1}/${batches.length}: ${batch.length} file(s)`)
+      let result = await runMigration({
+        files: batch,
+        maxIterations: options.batchIterations,
+        project: options.project,
+        verbose: options.verbose,
+        write: true,
+      })
+
+      if (result.totalEdits === 0) {
+        console.log('    No edits produced; retrying batch with full project roots.')
+        result = await runMigration({
+          files: batch,
+          maxIterations: options.batchIterations,
+          project: options.project,
+          useFullProjectRoots: true,
+          verbose: options.verbose,
+          write: true,
+        })
+      }
+
+      roundEdits += result.totalEdits
+    }
+
+    if (roundEdits === 0) {
+      console.error('Migration script made no edits in this round; stopping to avoid an infinite loop.')
+      process.exitCode = 1
+      return
+    }
+  }
+
+  console.error(`Reached --max-rounds=${options.maxRounds} before type check passed.`)
+  process.exitCode = 1
+}
+
+export async function runBatchMigrationCommand(argv: string[]) {
+  await runBatchMigration(parseArgs(argv))
+}
diff --git a/packages/migrate-no-unchecked-indexed-access/vite.config.ts b/packages/migrate-no-unchecked-indexed-access/vite.config.ts
new file mode 100644
index 0000000000..ac4aed1a06
--- /dev/null
+++ b/packages/migrate-no-unchecked-indexed-access/vite.config.ts
@@ -0,0 +1,17 @@
+import { defineConfig } from 'vite-plus'
+
+export default defineConfig({
+  pack: {
+    clean: true,
+    deps: {
+      neverBundle: ['typescript'],
+    },
+    entry: ['src/cli.ts'],
+    format: ['esm'],
+    outDir: 'dist',
+    platform: 'node',
+    sourcemap: true,
+    target: 'node22',
+    treeshake: true,
+  },
+})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d37f6b7977..cdf5001e2d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -624,6 +624,22 @@ importers:
         specifier: 'catalog:'
         version: 0.1.2
 
+  packages/migrate-no-unchecked-indexed-access:
+    dependencies:
+      typescript:
+        specifier: 'catalog:'
+        version: 6.0.2
+    devDependencies:
+      '@types/node':
+        specifier: 'catalog:'
+        version: 25.6.0
+      vite:
+        specifier: npm:@voidzero-dev/vite-plus-core@0.1.18
+        version: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      vite-plus:
+        specifier: 'catalog:'
+        version: 0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
+
   sdks/nodejs-client:
     devDependencies:
       '@eslint/js':
diff --git a/web/__tests__/datasets/dataset-settings-flow.test.tsx b/web/__tests__/datasets/dataset-settings-flow.test.tsx
index b4a5e78326..7c53401b15 100644
--- a/web/__tests__/datasets/dataset-settings-flow.test.tsx
+++ b/web/__tests__/datasets/dataset-settings-flow.test.tsx
@@ -311,7 +311,7 @@ describe('Dataset Settings Flow - Cross-Module Configuration Cascade', () => {
         await result.current.handleSave()
       })
 
-      const savedBody = mockUpdateDatasetSetting.mock.calls[0][0].body as Record<string, unknown>
+      const savedBody = mockUpdateDatasetSetting.mock.calls[0]![0].body as Record<string, unknown>
       expect(savedBody).not.toHaveProperty('partial_member_list')
     })
   })
diff --git a/web/__tests__/datasets/document-management.test.tsx b/web/__tests__/datasets/document-management.test.tsx
index f9d80520ed..96937332a3 100644
--- a/web/__tests__/datasets/document-management.test.tsx
+++ b/web/__tests__/datasets/document-management.test.tsx
@@ -109,7 +109,7 @@ describe('Document Management Flow', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.options.history).toBe('replace')
       expect(update.searchParams.get('keyword')).toBe('test')
       expect(update.searchParams.get('page')).toBe('2')
@@ -123,7 +123,7 @@ describe('Document Management Flow', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.options.history).toBe('replace')
       expect(update.searchParams.toString()).toBe('')
     })
diff --git a/web/__tests__/datasets/hit-testing-flow.test.tsx b/web/__tests__/datasets/hit-testing-flow.test.tsx
index 93d6f77d8f..54f85c5200 100644
--- a/web/__tests__/datasets/hit-testing-flow.test.tsx
+++ b/web/__tests__/datasets/hit-testing-flow.test.tsx
@@ -282,7 +282,7 @@ describe('Hit Testing Flow', () => {
       const response = createHitTestingResponse(5)
 
       for (let i = 1; i < response.records.length; i++) {
-        expect(response.records[i - 1].score).toBeGreaterThanOrEqual(response.records[i].score)
+        expect(response.records[i - 1]!.score).toBeGreaterThanOrEqual(response.records[i]!.score)
       }
     })
 
@@ -290,8 +290,8 @@ describe('Hit Testing Flow', () => {
       const response = createHitTestingResponse(1)
       const record = response.records[0]
 
-      expect(record.segment.document.name).toBeTruthy()
-      expect(record.segment.document.data_source_type).toBeTruthy()
+      expect(record!.segment.document.name).toBeTruthy()
+      expect(record!.segment.document.data_source_type).toBeTruthy()
     })
   })
 
diff --git a/web/__tests__/datasets/pipeline-datasource-flow.test.tsx b/web/__tests__/datasets/pipeline-datasource-flow.test.tsx
index dc140e8514..d005fda558 100644
--- a/web/__tests__/datasets/pipeline-datasource-flow.test.tsx
+++ b/web/__tests__/datasets/pipeline-datasource-flow.test.tsx
@@ -113,8 +113,8 @@ describe('Pipeline Data Source Store Composition - Cross-Slice Integration', ()
       store.getState().setLocalFileList(files)
 
       expect(store.getState().localFileList).toHaveLength(3)
-      expect(store.getState().localFileList[0].fileID).toBe('f1')
-      expect(store.getState().localFileList[2].fileID).toBe('f3')
+      expect(store.getState().localFileList[0]!.fileID).toBe('f1')
+      expect(store.getState().localFileList[2]!.fileID).toBe('f3')
     })
 
     it('should update preview ref when setting file list', () => {
@@ -157,7 +157,7 @@ describe('Pipeline Data Source Store Composition - Cross-Slice Integration', ()
       store.getState().setOnlineDocuments(pages)
 
       expect(store.getState().onlineDocuments).toHaveLength(2)
-      expect(store.getState().onlineDocuments[0].page_id).toBe('page-1')
+      expect(store.getState().onlineDocuments[0]!.page_id).toBe('page-1')
     })
 
     it('should update preview ref when setting online documents', () => {
@@ -391,7 +391,7 @@ describe('Pipeline Data Source Store Composition - Cross-Slice Integration', ()
       store.getState().setLocalFileList(files)
 
       // Step 3: Select current file for preview
-      store.getState().setCurrentLocalFile(files[0].file)
+      store.getState().setCurrentLocalFile(files[0]!.file)
 
       // Verify all state is consistent
       expect(store.getState().currentCredentialId).toBe('upload-cred-1')
diff --git a/web/__tests__/datasets/segment-crud.test.tsx b/web/__tests__/datasets/segment-crud.test.tsx
index 9190e17395..fe21dd5079 100644
--- a/web/__tests__/datasets/segment-crud.test.tsx
+++ b/web/__tests__/datasets/segment-crud.test.tsx
@@ -289,7 +289,7 @@ describe('Segment CRUD Flow', () => {
 
       // Open detail modal
       act(() => {
-        modalResult.current.onClickCard(segments[0])
+        modalResult.current.onClickCard(segments[0]!)
       })
 
       // All states should be independent
diff --git a/web/__tests__/document-detail-navigation-fix.test.tsx b/web/__tests__/document-detail-navigation-fix.test.tsx
index 5cb115830e..c5641d2adf 100644
--- a/web/__tests__/document-detail-navigation-fix.test.tsx
+++ b/web/__tests__/document-detail-navigation-fix.test.tsx
@@ -146,7 +146,7 @@ describe('Document Detail Navigation Fix Verification', () => {
       fireEvent.click(screen.getByTestId('back-button-fixed'))
 
       // URLSearchParams will normalize the encoding, but preserve all parameters
-      const expectedCall = mockPush.mock.calls[0][0]
+      const expectedCall = mockPush.mock.calls[0]![0]
       expect(expectedCall).toMatch(/^\/datasets\/dataset-123\/documents\?/)
       expect(expectedCall).toMatch(/page=1/)
       expect(expectedCall).toMatch(/limit=50/)
@@ -257,7 +257,7 @@ describe('Document Detail Navigation Fix Verification', () => {
 
       // Should still attempt navigation (URLSearchParams will clean up the parameters)
       expect(mockPush).toHaveBeenCalled()
-      const navigationPath = mockPush.mock.calls[0][0]
+      const navigationPath = mockPush.mock.calls[0]![0]
       expect(navigationPath).toMatch(/^\/datasets\/dataset-123\/documents/)
 
       console.log('✅ Malformed parameters handled gracefully:', navigationPath)
diff --git a/web/__tests__/explore/explore-app-list-flow.test.tsx b/web/__tests__/explore/explore-app-list-flow.test.tsx
index 40f2156c06..e2c7831018 100644
--- a/web/__tests__/explore/explore-app-list-flow.test.tsx
+++ b/web/__tests__/explore/explore-app-list-flow.test.tsx
@@ -175,16 +175,16 @@ describe('Explore App List Flow', () => {
     it('should display all apps when no category filter is applied', () => {
       renderAppList()
 
-      expect(screen.getByText('Writer Bot')).toBeInTheDocument()
-      expect(screen.getByText('Translator')).toBeInTheDocument()
-      expect(screen.getByText('Code Helper')).toBeInTheDocument()
+      expect(screen.getByText('Writer Bot'))!.toBeInTheDocument()
+      expect(screen.getByText('Translator'))!.toBeInTheDocument()
+      expect(screen.getByText('Code Helper'))!.toBeInTheDocument()
     })
 
     it('should filter apps by selected category', () => {
       mockTabValue = 'Writing'
       renderAppList()
 
-      expect(screen.getByText('Writer Bot')).toBeInTheDocument()
+      expect(screen.getByText('Writer Bot'))!.toBeInTheDocument()
       expect(screen.queryByText('Translator')).not.toBeInTheDocument()
       expect(screen.queryByText('Code Helper')).not.toBeInTheDocument()
     })
@@ -196,7 +196,7 @@ describe('Explore App List Flow', () => {
       fireEvent.change(input, { target: { value: 'trans' } })
 
       await waitFor(() => {
-        expect(screen.getByText('Translator')).toBeInTheDocument()
+        expect(screen.getByText('Translator'))!.toBeInTheDocument()
         expect(screen.queryByText('Writer Bot')).not.toBeInTheDocument()
         expect(screen.queryByText('Code Helper')).not.toBeInTheDocument()
       })
@@ -218,7 +218,7 @@ describe('Explore App List Flow', () => {
       renderAppList(true, onSuccess)
 
       // Step 2: Click add to workspace button - opens create modal
-      fireEvent.click(screen.getAllByText('explore.appCard.addToWorkspace')[0])
+      fireEvent.click(screen.getAllByText('explore.appCard.addToWorkspace')[0]!)
 
       // Step 3: Confirm creation in modal
       fireEvent.click(await screen.findByTestId('confirm-create'))
@@ -232,7 +232,8 @@ describe('Explore App List Flow', () => {
       expect(mockHandleImportDSL).toHaveBeenCalledTimes(1)
 
       // Step 6: DSL confirm modal appears and user confirms
-      expect(await screen.findByTestId('dsl-confirm-modal')).toBeInTheDocument()
+      // Step 6: DSL confirm modal appears and user confirms
+      expect(await screen.findByTestId('dsl-confirm-modal'))!.toBeInTheDocument()
       fireEvent.click(screen.getByTestId('dsl-confirm'))
 
       // Step 7: Flow completes successfully
@@ -250,7 +251,7 @@ describe('Explore App List Flow', () => {
       mockExploreData = undefined
       const { unmount } = render(appListElement())
 
-      expect(screen.getByRole('status')).toBeInTheDocument()
+      expect(screen.getByRole('status'))!.toBeInTheDocument()
 
       // Step 2: Data loads
       mockIsLoading = false
@@ -262,7 +263,7 @@ describe('Explore App List Flow', () => {
       renderAppList()
 
       expect(screen.queryByRole('status')).not.toBeInTheDocument()
-      expect(screen.getByText('Alpha')).toBeInTheDocument()
+      expect(screen.getByText('Alpha'))!.toBeInTheDocument()
     })
   })
 
diff --git a/web/__tests__/goto-anything/slash-command-modes.test.tsx b/web/__tests__/goto-anything/slash-command-modes.test.tsx
index 38c965e383..bcaddfb27b 100644
--- a/web/__tests__/goto-anything/slash-command-modes.test.tsx
+++ b/web/__tests__/goto-anything/slash-command-modes.test.tsx
@@ -108,8 +108,8 @@ describe('Slash Command Dual-Mode System', () => {
 
       const results = await handler?.search('', 'en')
       expect(results).toHaveLength(2)
-      expect(results?.[0].title).toBe('Light Theme')
-      expect(results?.[1].title).toBe('Dark Theme')
+      expect(results?.[0]!.title).toBe('Light Theme')
+      expect(results?.[1]!.title).toBe('Dark Theme')
     })
 
     it('should not have execute function for submenu mode', () => {
diff --git a/web/__tests__/plugins/plugin-data-utilities.test.ts b/web/__tests__/plugins/plugin-data-utilities.test.ts
index 068b0e3238..cfec48ca4d 100644
--- a/web/__tests__/plugins/plugin-data-utilities.test.ts
+++ b/web/__tests__/plugins/plugin-data-utilities.test.ts
@@ -145,15 +145,15 @@ describe('Plugin Data Utilities Integration', () => {
         validCategory: getValidCategoryKeys(p.category),
       }))
 
-      expect(results[0].validTags.length).toBeGreaterThan(0)
-      expect(results[0].validCategory).toBe('tool')
+      expect(results[0]!.validTags.length).toBeGreaterThan(0)
+      expect(results[0]!.validCategory).toBe('tool')
 
-      expect(results[1].validTags).toContain('image')
-      expect(results[1].validTags).toContain('design')
-      expect(results[1].validCategory).toBe('model')
+      expect(results[1]!.validTags).toContain('image')
+      expect(results[1]!.validTags).toContain('design')
+      expect(results[1]!.validCategory).toBe('model')
 
-      expect(results[2].validTags).toHaveLength(0)
-      expect(results[2].validCategory).toBe('extension')
+      expect(results[2]!.validTags).toHaveLength(0)
+      expect(results[2]!.validCategory).toBe('extension')
     })
   })
 })
diff --git a/web/__tests__/plugins/plugin-page-shell-flow.test.tsx b/web/__tests__/plugins/plugin-page-shell-flow.test.tsx
index 5895a20eef..9202f647af 100644
--- a/web/__tests__/plugins/plugin-page-shell-flow.test.tsx
+++ b/web/__tests__/plugins/plugin-page-shell-flow.test.tsx
@@ -132,16 +132,16 @@ describe('Plugin Page Shell Flow', () => {
   it('switches from installed plugins to marketplace and syncs the active tab into the URL', async () => {
     const { onUrlUpdate } = renderPluginPage()
 
-    expect(screen.getByTestId('plugins-view')).toBeInTheDocument()
+    expect(screen.getByTestId('plugins-view'))!.toBeInTheDocument()
     expect(screen.queryByTestId('marketplace-view')).not.toBeInTheDocument()
 
     fireEvent.click(screen.getByTestId('tab-item-discover'))
 
     await waitFor(() => {
-      expect(screen.getByTestId('marketplace-view')).toBeInTheDocument()
+      expect(screen.getByTestId('marketplace-view'))!.toBeInTheDocument()
     })
 
-    const tabUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+    const tabUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
     expect(tabUpdate.searchParams.get('tab')).toBe('discover')
   })
 
@@ -150,13 +150,13 @@ describe('Plugin Page Shell Flow', () => {
 
     await waitFor(() => {
       expect(mockFetchManifestFromMarketPlace).toHaveBeenCalledWith('langgenius%2Fplugin-demo')
-      expect(screen.getByTestId('install-from-marketplace-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('install-from-marketplace-modal'))!.toBeInTheDocument()
     })
 
     fireEvent.click(screen.getByRole('button', { name: 'close-install-modal' }))
 
     await waitFor(() => {
-      const clearUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const clearUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(clearUpdate.searchParams.has('package-ids')).toBe(false)
     })
   })
diff --git a/web/__tests__/rag-pipeline/chunk-preview-formatting.test.ts b/web/__tests__/rag-pipeline/chunk-preview-formatting.test.ts
index c4cafbc1c5..6c8dfb982f 100644
--- a/web/__tests__/rag-pipeline/chunk-preview-formatting.test.ts
+++ b/web/__tests__/rag-pipeline/chunk-preview-formatting.test.ts
@@ -38,9 +38,9 @@ describe('Chunk Preview Formatting', () => {
       expect(Array.isArray(result)).toBe(true)
       const chunks = result as Array<{ content: string, summary?: string }>
       expect(chunks).toHaveLength(2)
-      expect(chunks[0].content).toBe('Chunk 1 content')
-      expect(chunks[0].summary).toBe('Summary 1')
-      expect(chunks[1].content).toBe('Chunk 2 content')
+      expect(chunks[0]!.content).toBe('Chunk 1 content')
+      expect(chunks[0]!.summary).toBe('Summary 1')
+      expect(chunks[1]!.content).toBe('Chunk 2 content')
     })
 
     it('should limit chunks to RAG_PIPELINE_PREVIEW_CHUNK_NUM', () => {
@@ -84,9 +84,9 @@ describe('Chunk Preview Formatting', () => {
 
       expect(result.parent_mode).toBe('paragraph')
       expect(result.parent_child_chunks).toHaveLength(1)
-      expect(result.parent_child_chunks[0].parent_content).toBe('Parent paragraph')
-      expect(result.parent_child_chunks[0].parent_summary).toBe('Parent summary')
-      expect(result.parent_child_chunks[0].child_contents).toEqual(['Child 1', 'Child 2'])
+      expect(result.parent_child_chunks[0]!.parent_content).toBe('Parent paragraph')
+      expect(result.parent_child_chunks[0]!.parent_summary).toBe('Parent summary')
+      expect(result.parent_child_chunks[0]!.child_contents).toEqual(['Child 1', 'Child 2'])
     })
 
     it('should limit parent chunks in paragraph mode', () => {
@@ -129,8 +129,8 @@ describe('Chunk Preview Formatting', () => {
       }
 
       expect(result.parent_child_chunks).toHaveLength(1)
-      expect(result.parent_child_chunks[0].parent_content).toBe('Full document content')
-      expect(result.parent_child_chunks[0].parent_mode).toBe('full-doc')
+      expect(result.parent_child_chunks[0]!.parent_content).toBe('Full document content')
+      expect(result.parent_child_chunks[0]!.parent_mode).toBe('full-doc')
     })
 
     it('should limit child chunks in full-doc mode', () => {
@@ -149,7 +149,7 @@ describe('Chunk Preview Formatting', () => {
         parent_child_chunks: Array<{ child_contents: string[] }>
       }
 
-      expect(result.parent_child_chunks[0].child_contents).toHaveLength(3) // Mocked limit
+      expect(result.parent_child_chunks[0]!.child_contents).toHaveLength(3) // Mocked limit
     })
   })
 
@@ -168,8 +168,8 @@ describe('Chunk Preview Formatting', () => {
       }
 
       expect(result.qa_chunks).toHaveLength(2)
-      expect(result.qa_chunks[0].question).toBe('What is AI?')
-      expect(result.qa_chunks[0].answer).toBe('Artificial Intelligence is...')
+      expect(result.qa_chunks[0]!.question).toBe('What is AI?')
+      expect(result.qa_chunks[0]!.answer).toBe('Artificial Intelligence is...')
     })
 
     it('should limit QA chunks', () => {
diff --git a/web/__tests__/rag-pipeline/input-field-crud-flow.test.ts b/web/__tests__/rag-pipeline/input-field-crud-flow.test.ts
index 233c9a288a..981107fe44 100644
--- a/web/__tests__/rag-pipeline/input-field-crud-flow.test.ts
+++ b/web/__tests__/rag-pipeline/input-field-crud-flow.test.ts
@@ -268,11 +268,11 @@ describe('Input Field CRUD Flow', () => {
       const restoredFields = formDataList.map(fd => convertFormDataToINputField(fd))
 
       expect(restoredFields).toHaveLength(2)
-      expect(restoredFields[0].variable).toBe('name')
-      expect(restoredFields[0].default_value).toBe('Alice')
-      expect(restoredFields[1].variable).toBe('count')
-      expect(restoredFields[1].default_value).toBe('10')
-      expect(restoredFields[1].unit).toBe('items')
+      expect(restoredFields[0]!.variable).toBe('name')
+      expect(restoredFields[0]!.default_value).toBe('Alice')
+      expect(restoredFields[1]!.variable).toBe('count')
+      expect(restoredFields[1]!.default_value).toBe('10')
+      expect(restoredFields[1]!.unit).toBe('items')
     })
   })
 })
diff --git a/web/__tests__/rag-pipeline/test-run-flow.test.ts b/web/__tests__/rag-pipeline/test-run-flow.test.ts
index a2bf557acd..4ed31a5713 100644
--- a/web/__tests__/rag-pipeline/test-run-flow.test.ts
+++ b/web/__tests__/rag-pipeline/test-run-flow.test.ts
@@ -139,8 +139,8 @@ describe('Test Run Flow Integration', () => {
       const { result } = renderHook(() => useTestRunSteps())
 
       expect(result.current.steps).toHaveLength(2)
-      expect(result.current.steps[0].value).toBe('dataSource')
-      expect(result.current.steps[1].value).toBe('documentProcessing')
+      expect(result.current.steps[0]!.value).toBe('dataSource')
+      expect(result.current.steps[1]!.value).toBe('documentProcessing')
     })
   })
 
@@ -153,8 +153,8 @@ describe('Test Run Flow Integration', () => {
 
       // Should only include DataSource nodes, not KnowledgeBase
       expect(result.current).toHaveLength(2)
-      expect(result.current[0].value).toBe('ds-1')
-      expect(result.current[1].value).toBe('ds-2')
+      expect(result.current[0]!.value).toBe('ds-1')
+      expect(result.current[1]!.value).toBe('ds-2')
     })
 
     it('should include node data in options', async () => {
@@ -163,8 +163,8 @@ describe('Test Run Flow Integration', () => {
       )
       const { result } = renderHook(() => useDatasourceOptions())
 
-      expect(result.current[0].label).toBe('Local Files')
-      expect(result.current[0].data.type).toBe(BlockEnum.DataSource)
+      expect(result.current[0]!.label).toBe('Local Files')
+      expect(result.current[0]!.data.type).toBe(BlockEnum.DataSource)
     })
   })
 
diff --git a/web/__tests__/real-browser-flicker.test.tsx b/web/__tests__/real-browser-flicker.test.tsx
index 60f97d6938..7c3b45af19 100644
--- a/web/__tests__/real-browser-flicker.test.tsx
+++ b/web/__tests__/real-browser-flicker.test.tsx
@@ -296,7 +296,7 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
 
       // Wait for theme system to fully initialize
       await waitFor(() => {
-        expect(screen.getByTestId('theme-indicator')).toHaveTextContent('Current Theme: dark')
+        expect(screen.getByTestId('theme-indicator'))!.toHaveTextContent('Current Theme: dark')
       })
 
       const finalState = {
@@ -319,10 +319,10 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByTestId('theme-indicator')).toHaveTextContent('Current Theme: light')
+        expect(screen.getByTestId('theme-indicator'))!.toHaveTextContent('Current Theme: light')
       })
 
-      expect(screen.getByTestId('visual-appearance')).toHaveTextContent('Appearance: light')
+      expect(screen.getByTestId('visual-appearance'))!.toHaveTextContent('Appearance: light')
     })
 
     it('handles system theme with dark preference', async () => {
@@ -335,10 +335,10 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByTestId('theme-indicator')).toHaveTextContent('Current Theme: dark')
+        expect(screen.getByTestId('theme-indicator'))!.toHaveTextContent('Current Theme: dark')
       })
 
-      expect(screen.getByTestId('visual-appearance')).toHaveTextContent('Appearance: dark')
+      expect(screen.getByTestId('visual-appearance'))!.toHaveTextContent('Appearance: dark')
     })
 
     it('handles system theme with light preference', async () => {
@@ -351,10 +351,10 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByTestId('theme-indicator')).toHaveTextContent('Current Theme: light')
+        expect(screen.getByTestId('theme-indicator'))!.toHaveTextContent('Current Theme: light')
       })
 
-      expect(screen.getByTestId('visual-appearance')).toHaveTextContent('Appearance: light')
+      expect(screen.getByTestId('visual-appearance'))!.toHaveTextContent('Appearance: light')
     })
 
     it('handles no stored theme (defaults to system)', async () => {
@@ -367,7 +367,7 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByTestId('theme-indicator')).toHaveTextContent('Current Theme: light')
+        expect(screen.getByTestId('theme-indicator'))!.toHaveTextContent('Current Theme: light')
       })
     })
 
@@ -384,7 +384,7 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByTestId('timing-status')).toHaveTextContent('Phase: CSR')
+        expect(screen.getByTestId('timing-status'))!.toHaveTextContent('Phase: CSR')
       })
 
       // Analyze timing and style changes
@@ -395,7 +395,7 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
 
       // Check if there are style changes (this is visible flicker)
       const hasStyleChange = timingData.length > 1
-        && timingData[0].styles.backgroundColor !== timingData[timingData.length - 1].styles.backgroundColor
+        && timingData[0]!.styles.backgroundColor !== timingData[timingData.length - 1]!.styles.backgroundColor
 
       if (hasStyleChange)
         console.log('⚠️  Style changes detected - this causes visible flicker')
@@ -420,7 +420,7 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByTestId('css-classes')).toHaveTextContent('bg-gray-900 text-white')
+        expect(screen.getByTestId('css-classes'))!.toHaveTextContent('bg-gray-900 text-white')
       })
 
       console.log('\n=== CSS Class Change Detection ===')
@@ -430,12 +430,12 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
 
       // Check if CSS classes have changed
       const hasCSSChange = cssStates.length > 1
-        && cssStates[0].className !== cssStates[cssStates.length - 1].className
+        && cssStates[0]!.className !== cssStates[cssStates.length - 1]!.className
 
       if (hasCSSChange) {
         console.log('⚠️  CSS class changes detected - may cause style flicker')
-        console.log(`From: "${cssStates[0].className}"`)
-        console.log(`To: "${cssStates[cssStates.length - 1].className}"`)
+        console.log(`From: "${cssStates[0]!.className}"`)
+        console.log(`To: "${cssStates[cssStates.length - 1]!.className}"`)
       }
 
       expect(hasCSSChange).toBe(true) // We expect to see this change
@@ -469,11 +469,12 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
 
         // Should fallback gracefully without crashing
         await waitFor(() => {
-          expect(screen.getByTestId('theme-indicator')).toBeInTheDocument()
+          expect(screen.getByTestId('theme-indicator'))!.toBeInTheDocument()
         })
 
         // Should default to light theme when localStorage fails
-        expect(screen.getByTestId('visual-appearance')).toHaveTextContent('Appearance: light')
+        // Should default to light theme when localStorage fails
+        expect(screen.getByTestId('visual-appearance'))!.toHaveTextContent('Appearance: light')
       }
       finally {
         Reflect.deleteProperty(window, 'localStorage')
@@ -490,12 +491,12 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByTestId('theme-indicator')).toBeInTheDocument()
+        expect(screen.getByTestId('theme-indicator'))!.toBeInTheDocument()
       })
 
       // Should handle invalid values gracefully
       const themeIndicator = screen.getByTestId('theme-indicator')
-      expect(themeIndicator).toBeInTheDocument()
+      expect(themeIndicator)!.toBeInTheDocument()
     })
   })
 
@@ -516,7 +517,7 @@ describe('Real Browser Environment Dark Mode Flicker Test', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByTestId('performance-test')).toHaveTextContent('Theme: dark')
+        expect(screen.getByTestId('performance-test'))!.toHaveTextContent('Theme: dark')
       })
 
       // Analyze performance timeline
diff --git a/web/__tests__/tools/provider-list-shell-flow.test.tsx b/web/__tests__/tools/provider-list-shell-flow.test.tsx
index 5b6ba8a64b..d0d096f072 100644
--- a/web/__tests__/tools/provider-list-shell-flow.test.tsx
+++ b/web/__tests__/tools/provider-list-shell-flow.test.tsx
@@ -174,7 +174,7 @@ describe('Tool Provider List Shell Flow', () => {
     fireEvent.click(screen.getByTestId('tool-card-plugin-tool'))
 
     await waitFor(() => {
-      expect(screen.getByTestId('tool-plugin-detail-panel')).toBeInTheDocument()
+      expect(screen.getByTestId('tool-plugin-detail-panel'))!.toBeInTheDocument()
     })
 
     fireEvent.click(screen.getByRole('button', { name: 'update-plugin-detail' }))
@@ -196,10 +196,10 @@ describe('Tool Provider List Shell Flow', () => {
     fireEvent.click(screen.getByTestId('tab-item-workflow'))
 
     await waitFor(() => {
-      expect(screen.getByTestId('workflow-empty')).toBeInTheDocument()
+      expect(screen.getByTestId('workflow-empty'))!.toBeInTheDocument()
     })
 
-    const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+    const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
     expect(update.searchParams.get('category')).toBe('workflow')
   })
 })
diff --git a/web/__tests__/tools/tool-data-processing.test.ts b/web/__tests__/tools/tool-data-processing.test.ts
index 120461201f..69be82447a 100644
--- a/web/__tests__/tools/tool-data-processing.test.ts
+++ b/web/__tests__/tools/tool-data-processing.test.ts
@@ -50,11 +50,11 @@ describe('Tool Data Processing Pipeline Integration', () => {
 
       const formSchemas = toolParametersToFormSchemas(rawParameters as unknown as Parameters<typeof toolParametersToFormSchemas>[0])
       expect(formSchemas).toHaveLength(2)
-      expect(formSchemas[0].variable).toBe('query')
-      expect(formSchemas[0].required).toBe(true)
-      expect(formSchemas[0].type).toBe('text-input')
-      expect(formSchemas[1].variable).toBe('limit')
-      expect(formSchemas[1].type).toBe('number-input')
+      expect(formSchemas[0]!.variable).toBe('query')
+      expect(formSchemas[0]!.required).toBe(true)
+      expect(formSchemas[0]!.type).toBe('text-input')
+      expect(formSchemas[1]!.variable).toBe('limit')
+      expect(formSchemas[1]!.type).toBe('number-input')
 
       const withDefaults = addDefaultValue({}, formSchemas)
       expect(withDefaults.query).toBe('hello')
@@ -83,9 +83,9 @@ describe('Tool Data Processing Pipeline Integration', () => {
 
       const credentialSchemas = toolCredentialToFormSchemas(rawCredentials as Parameters<typeof toolCredentialToFormSchemas>[0])
       expect(credentialSchemas).toHaveLength(1)
-      expect(credentialSchemas[0].variable).toBe('api_key')
-      expect(credentialSchemas[0].required).toBe(true)
-      expect(credentialSchemas[0].type).toBe('secret-input')
+      expect(credentialSchemas[0]!.variable).toBe('api_key')
+      expect(credentialSchemas[0]!.required).toBe(true)
+      expect(credentialSchemas[0]!.type).toBe('secret-input')
     })
 
     it('processes trigger event parameters through the pipeline', () => {
@@ -107,9 +107,9 @@ describe('Tool Data Processing Pipeline Integration', () => {
 
       const schemas = triggerEventParametersToFormSchemas(rawParams as unknown as Parameters<typeof triggerEventParametersToFormSchemas>[0])
       expect(schemas).toHaveLength(1)
-      expect(schemas[0].name).toBe('event_type')
-      expect(schemas[0].type).toBe('select')
-      expect(schemas[0].options).toHaveLength(2)
+      expect(schemas[0]!.name).toBe('event_type')
+      expect(schemas[0]!.type).toBe('select')
+      expect(schemas[0]!.options).toHaveLength(2)
     })
   })
 
@@ -189,16 +189,16 @@ describe('Tool Data Processing Pipeline Integration', () => {
       ] as Parameters<typeof addFileInfos>[1]
 
       const sorted = sortAgentSorts(thoughts)
-      expect(sorted[0].id).toBe('t1')
-      expect(sorted[1].id).toBe('t2')
-      expect(sorted[2].id).toBe('t3')
+      expect(sorted[0]!.id).toBe('t1')
+      expect(sorted[1]!.id).toBe('t2')
+      expect(sorted[2]!.id).toBe('t3')
 
       const enriched = addFileInfos(sorted, messageFiles)
-      expect(enriched[0].message_files).toBeUndefined()
-      expect(enriched[1].message_files).toHaveLength(1)
-      expect(enriched[1].message_files![0].id).toBe('f2')
-      expect(enriched[2].message_files).toHaveLength(1)
-      expect(enriched[2].message_files![0].id).toBe('f1')
+      expect(enriched[0]!.message_files).toBeUndefined()
+      expect(enriched[1]!.message_files).toHaveLength(1)
+      expect(enriched[1]!.message_files![0]!.id).toBe('f2')
+      expect(enriched[2]!.message_files).toHaveLength(1)
+      expect(enriched[2]!.message_files![0]!.id).toBe('f1')
     })
 
     it('handles null inputs gracefully in the pipeline', () => {
diff --git a/web/app/account/oauth/authorize/page.tsx b/web/app/account/oauth/authorize/page.tsx
index fe24afe7ff..f370efcd3e 100644
--- a/web/app/account/oauth/authorize/page.tsx
+++ b/web/app/account/oauth/authorize/page.tsx
@@ -151,7 +151,7 @@ export default function OAuthAuthorize() {
             return (
               <div key={scope} className="flex items-center gap-2 body-sm-medium text-text-secondary">
                 {Icon ? <Icon.icon className="h-4 w-4" /> : <RiAccountCircleLine className="h-4 w-4" />}
-                {Icon.label}
+                {Icon!.label}
               </div>
             )
           })}
diff --git a/web/app/components/app-sidebar/app-info/__tests__/index.spec.tsx b/web/app/components/app-sidebar/app-info/__tests__/index.spec.tsx
index fc0bb56f75..2f0d748ae9 100644
--- a/web/app/components/app-sidebar/app-info/__tests__/index.spec.tsx
+++ b/web/app/components/app-sidebar/app-info/__tests__/index.spec.tsx
@@ -89,7 +89,7 @@ describe('AppInfo', () => {
 
   it('should render trigger when not onlyShowDetail', () => {
     render(<AppInfo expand />)
-    expect(screen.getByTestId('trigger')).toBeInTheDocument()
+    expect(screen.getByTestId('trigger'))!.toBeInTheDocument()
   })
 
   it('should not render trigger when onlyShowDetail is true', () => {
@@ -99,11 +99,11 @@ describe('AppInfo', () => {
 
   it('should pass expand prop to trigger', () => {
     render(<AppInfo expand />)
-    expect(screen.getByTestId('trigger')).toHaveAttribute('data-expand', 'true')
+    expect(screen.getByTestId('trigger'))!.toHaveAttribute('data-expand', 'true')
 
     const { unmount } = render(<AppInfo expand={false} />)
     const triggers = screen.getAllByTestId('trigger')
-    expect(triggers[triggers.length - 1]).toHaveAttribute('data-expand', 'false')
+    expect(triggers[triggers.length - 1])!.toHaveAttribute('data-expand', 'false')
     unmount()
   })
 
@@ -114,7 +114,7 @@ describe('AppInfo', () => {
     await user.click(screen.getByTestId('trigger'))
 
     expect(mockSetPanelOpen).toHaveBeenCalled()
-    const updater = mockSetPanelOpen.mock.calls[0][0] as (v: boolean) => boolean
+    const updater = mockSetPanelOpen.mock.calls[0]![0] as (v: boolean) => boolean
     expect(updater(false)).toBe(true)
     expect(updater(true)).toBe(false)
   })
@@ -132,12 +132,12 @@ describe('AppInfo', () => {
   it('should show detail panel based on panelOpen when not onlyShowDetail', () => {
     mockUseAppInfoActions.panelOpen = true
     render(<AppInfo expand />)
-    expect(screen.getByTestId('detail-panel')).toBeInTheDocument()
+    expect(screen.getByTestId('detail-panel'))!.toBeInTheDocument()
   })
 
   it('should show detail panel based on openState when onlyShowDetail', () => {
     render(<AppInfo expand onlyShowDetail openState />)
-    expect(screen.getByTestId('detail-panel')).toBeInTheDocument()
+    expect(screen.getByTestId('detail-panel'))!.toBeInTheDocument()
   })
 
   it('should hide detail panel when openState is false and onlyShowDetail', () => {
diff --git a/web/app/components/app/annotation/__tests__/list.spec.tsx b/web/app/components/app/annotation/__tests__/list.spec.tsx
index aa47a5304b..ad6a1e5e9c 100644
--- a/web/app/components/app/annotation/__tests__/list.spec.tsx
+++ b/web/app/components/app/annotation/__tests__/list.spec.tsx
@@ -64,7 +64,7 @@ describe('List', () => {
     )
 
     const checkboxes = getCheckboxes(container)
-    fireEvent.click(checkboxes[1])
+    fireEvent.click(checkboxes[1]!)
     expect(onSelectedIdsChange).toHaveBeenCalledWith(['a'])
 
     rerender(
@@ -79,10 +79,10 @@ describe('List', () => {
       />,
     )
     const updatedCheckboxes = getCheckboxes(container)
-    fireEvent.click(updatedCheckboxes[1])
+    fireEvent.click(updatedCheckboxes[1]!)
     expect(onSelectedIdsChange).toHaveBeenCalledWith([])
 
-    fireEvent.click(updatedCheckboxes[0])
+    fireEvent.click(updatedCheckboxes[0]!)
     expect(onSelectedIdsChange).toHaveBeenCalledWith(['a', 'b'])
   })
 
@@ -103,13 +103,13 @@ describe('List', () => {
 
     const row = screen.getByText(item.question).closest('tr') as HTMLTableRowElement
     const actionButtons = within(row).getAllByRole('button')
-    fireEvent.click(actionButtons[1])
+    fireEvent.click(actionButtons[1]!)
 
-    expect(await screen.findByText('appDebug.feature.annotation.removeConfirm')).toBeInTheDocument()
+    expect(await screen.findByText('appDebug.feature.annotation.removeConfirm'))!.toBeInTheDocument()
     const confirmButton = await screen.findByRole('button', { name: 'common.operation.confirm' })
     fireEvent.click(confirmButton)
     expect(onRemove).toHaveBeenCalledWith(item.id)
 
-    expect(screen.getByText('appAnnotation.batchAction.selected')).toBeInTheDocument()
+    expect(screen.getByText('appAnnotation.batchAction.selected'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/index.spec.tsx b/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/index.spec.tsx
index 5104706045..3176b1addb 100644
--- a/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/index.spec.tsx
@@ -96,15 +96,15 @@ describe('BatchModal', () => {
 
     renderComponent()
 
-    expect(screen.getByTestId('annotation-full')).toBeInTheDocument()
-    expect(screen.getByRole('button', { name: 'appAnnotation.batchModal.run' })).toBeDisabled()
+    expect(screen.getByTestId('annotation-full'))!.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'appAnnotation.batchModal.run' }))!.toBeDisabled()
   })
 
   it('should reset uploader state when modal closes and allow manual cancellation', () => {
     const { rerender, props } = renderComponent()
 
     fireEvent.click(screen.getByTestId('mock-uploader'))
-    expect(screen.getByTestId('selected-file')).toHaveTextContent('batch.csv')
+    expect(screen.getByTestId('selected-file'))!.toHaveTextContent('batch.csv')
 
     rerender(<BatchModal {...props} isShow={false} />)
     rerender(<BatchModal {...props} isShow />)
@@ -137,7 +137,7 @@ describe('BatchModal', () => {
       expect(annotationBatchImportMock).toHaveBeenCalledTimes(1)
     })
 
-    const formData = annotationBatchImportMock.mock.calls[0][0].body as FormData
+    const formData = annotationBatchImportMock.mock.calls[0]![0].body as FormData
     expect(formData.get('file')).toBe(lastUploadedFile)
 
     await waitFor(() => {
diff --git a/web/app/components/app/annotation/edit-annotation-modal/__tests__/index.spec.tsx b/web/app/components/app/annotation/edit-annotation-modal/__tests__/index.spec.tsx
index 53a6f7356a..4844017dde 100644
--- a/web/app/components/app/annotation/edit-annotation-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/annotation/edit-annotation-modal/__tests__/index.spec.tsx
@@ -75,7 +75,8 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       // Assert - Check for modal title as it appears in the mock
-      expect(screen.getByText('appAnnotation.editModal.title')).toBeInTheDocument()
+      // Assert - Check for modal title as it appears in the mock
+      expect(screen.getByText('appAnnotation.editModal.title'))!.toBeInTheDocument()
     })
 
     it('should not render modal when isShow is false', () => {
@@ -85,6 +86,37 @@ describe('EditAnnotationModal', () => {
       // Act
       render(<EditAnnotationModal {...props} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByText('appAnnotation.editModal.title')).not.toBeInTheDocument()
     })
@@ -97,8 +129,9 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       // Assert - Look for query and answer content
-      expect(screen.getByText('Test query')).toBeInTheDocument()
-      expect(screen.getByText('Test answer')).toBeInTheDocument()
+      // Assert - Look for query and answer content
+      expect(screen.getByText('Test query'))!.toBeInTheDocument()
+      expect(screen.getByText('Test answer'))!.toBeInTheDocument()
     })
   })
 
@@ -116,8 +149,9 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       // Assert - Check content is displayed
-      expect(screen.getByText('Custom query content')).toBeInTheDocument()
-      expect(screen.getByText('Custom answer content')).toBeInTheDocument()
+      // Assert - Check content is displayed
+      expect(screen.getByText('Custom query content'))!.toBeInTheDocument()
+      expect(screen.getByText('Custom answer content'))!.toBeInTheDocument()
     })
 
     it('should show remove option when annotationId is provided', () => {
@@ -131,7 +165,8 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       // Assert - Remove option should be present (using pattern)
-      expect(screen.getByText('appAnnotation.editModal.removeThisCache')).toBeInTheDocument()
+      // Assert - Remove option should be present (using pattern)
+      expect(screen.getByText('appAnnotation.editModal.removeThisCache'))!.toBeInTheDocument()
     })
   })
 
@@ -160,7 +195,8 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       // Assert
-      expect(screen.getByText('appAnnotation.editModal.removeThisCache')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appAnnotation.editModal.removeThisCache'))!.toBeInTheDocument()
     })
 
     it('should save content when edited', async () => {
@@ -183,7 +219,7 @@ describe('EditAnnotationModal', () => {
 
       // Find and click edit link for query
       const editLinks = screen.getAllByText(/common\.operation\.edit/i)
-      await user.click(editLinks[0])
+      await user.click(editLinks[0]!)
 
       // Find textarea and enter new content
       const textarea = screen.getByRole('textbox')
@@ -225,7 +261,7 @@ describe('EditAnnotationModal', () => {
 
       // Edit query content
       const editLinks = screen.getAllByText(/common\.operation\.edit/i)
-      await user.click(editLinks[0])
+      await user.click(editLinks[0]!)
 
       const textarea = screen.getByRole('textbox')
       await user.clear(textarea)
@@ -258,7 +294,7 @@ describe('EditAnnotationModal', () => {
 
       // Edit query content
       const editLinks = screen.getAllByText(/common\.operation\.edit/i)
-      await user.click(editLinks[0])
+      await user.click(editLinks[0]!)
 
       const textarea = screen.getByRole('textbox')
       await user.clear(textarea)
@@ -289,6 +325,37 @@ describe('EditAnnotationModal', () => {
       // Act
       render(<EditAnnotationModal {...props} />)
 
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
+      // Assert - Confirm dialog should not be visible initially
       // Assert - Confirm dialog should not be visible initially
       expect(screen.queryByText('appDebug.feature.annotation.removeConfirm')).not.toBeInTheDocument()
     })
@@ -306,7 +373,8 @@ describe('EditAnnotationModal', () => {
       await user.click(screen.getByText('appAnnotation.editModal.removeThisCache'))
 
       // Assert - Confirmation dialog should appear
-      expect(screen.getByText('appDebug.feature.annotation.removeConfirm')).toBeInTheDocument()
+      // Assert - Confirmation dialog should appear
+      expect(screen.getByText('appDebug.feature.annotation.removeConfirm'))!.toBeInTheDocument()
     })
 
     it('should call onRemove when removal is confirmed', async () => {
@@ -342,7 +410,7 @@ describe('EditAnnotationModal', () => {
 
       render(<EditAnnotationModal {...props} />)
       await user.click(screen.getByText('appAnnotation.editModal.removeThisCache'))
-      expect(screen.getByText('appDebug.feature.annotation.removeConfirm')).toBeInTheDocument()
+      expect(screen.getByText('appDebug.feature.annotation.removeConfirm'))!.toBeInTheDocument()
 
       await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
 
@@ -366,7 +434,8 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       // Assert
-      expect(screen.getByText('appAnnotation.editModal.title')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appAnnotation.editModal.title'))!.toBeInTheDocument()
     })
 
     it('should handle very long content', () => {
@@ -383,8 +452,9 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       // Assert
-      expect(screen.getByText(longQuery)).toBeInTheDocument()
-      expect(screen.getByText(longAnswer)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(longQuery))!.toBeInTheDocument()
+      expect(screen.getByText(longAnswer))!.toBeInTheDocument()
     })
 
     it('should handle special characters in content', () => {
@@ -401,8 +471,9 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       // Assert
-      expect(screen.getByText(specialQuery)).toBeInTheDocument()
-      expect(screen.getByText(specialAnswer)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(specialQuery))!.toBeInTheDocument()
+      expect(screen.getByText(specialAnswer))!.toBeInTheDocument()
     })
 
     it('should handle onlyEditResponse prop', () => {
@@ -440,7 +511,7 @@ describe('EditAnnotationModal', () => {
 
       // Find and click edit link for query
       const editLinks = screen.getAllByText(/common\.operation\.edit/i)
-      await user.click(editLinks[0])
+      await user.click(editLinks[0]!)
 
       // Find textarea and enter new content
       const textarea = screen.getByRole('textbox')
@@ -458,8 +529,9 @@ describe('EditAnnotationModal', () => {
       expect(mockOnAdded).not.toHaveBeenCalled()
 
       // Verify edit mode remains open (textarea should still be visible)
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: 'common.operation.save' })).toBeInTheDocument()
+      // Verify edit mode remains open (textarea should still be visible)
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.save' }))!.toBeInTheDocument()
     })
 
     it('should show fallback error message when addAnnotation error has no message', async () => {
@@ -477,7 +549,7 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       const editLinks = screen.getAllByText(/common\.operation\.edit/i)
-      await user.click(editLinks[0])
+      await user.click(editLinks[0]!)
 
       const textarea = screen.getByRole('textbox')
       await user.clear(textarea)
@@ -493,8 +565,9 @@ describe('EditAnnotationModal', () => {
       expect(mockOnAdded).not.toHaveBeenCalled()
 
       // Verify edit mode remains open (textarea should still be visible)
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: 'common.operation.save' })).toBeInTheDocument()
+      // Verify edit mode remains open (textarea should still be visible)
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.save' }))!.toBeInTheDocument()
     })
 
     it('should show error toast and skip callbacks when editAnnotation fails', async () => {
@@ -516,7 +589,7 @@ describe('EditAnnotationModal', () => {
 
       // Edit query content
       const editLinks = screen.getAllByText(/common\.operation\.edit/i)
-      await user.click(editLinks[0])
+      await user.click(editLinks[0]!)
 
       const textarea = screen.getByRole('textbox')
       await user.clear(textarea)
@@ -532,8 +605,9 @@ describe('EditAnnotationModal', () => {
       expect(mockOnEdited).not.toHaveBeenCalled()
 
       // Verify edit mode remains open (textarea should still be visible)
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: 'common.operation.save' })).toBeInTheDocument()
+      // Verify edit mode remains open (textarea should still be visible)
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.save' }))!.toBeInTheDocument()
     })
 
     it('should show fallback error message when editAnnotation error is not an Error instance', async () => {
@@ -553,7 +627,7 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       const editLinks = screen.getAllByText(/common\.operation\.edit/i)
-      await user.click(editLinks[0])
+      await user.click(editLinks[0]!)
 
       const textarea = screen.getByRole('textbox')
       await user.clear(textarea)
@@ -569,8 +643,9 @@ describe('EditAnnotationModal', () => {
       expect(mockOnEdited).not.toHaveBeenCalled()
 
       // Verify edit mode remains open (textarea should still be visible)
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: 'common.operation.save' })).toBeInTheDocument()
+      // Verify edit mode remains open (textarea should still be visible)
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.save' }))!.toBeInTheDocument()
     })
   })
 
@@ -589,7 +664,7 @@ describe('EditAnnotationModal', () => {
 
       // Assert - Check that the formatted time appears somewhere in the component
       const container = screen.getByRole('dialog')
-      expect(container).toHaveTextContent('2023-12-01 10:30:00')
+      expect(container)!.toHaveTextContent('2023-12-01 10:30:00')
     })
 
     it('should not show createdAt when not provided', () => {
@@ -619,7 +694,8 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       // Assert - Should have remove functionality
-      expect(screen.getByText('appAnnotation.editModal.removeThisCache')).toBeInTheDocument()
+      // Assert - Should have remove functionality
+      expect(screen.getByText('appAnnotation.editModal.removeThisCache'))!.toBeInTheDocument()
     })
   })
 
@@ -634,7 +710,7 @@ describe('EditAnnotationModal', () => {
       render(<EditAnnotationModal {...props} />)
 
       const editLinks = screen.getAllByText(/common\.operation\.edit/i)
-      await user.click(editLinks[0])
+      await user.click(editLinks[0]!)
 
       const textarea = screen.getByRole('textbox')
       await user.clear(textarea)
@@ -661,7 +737,8 @@ describe('EditAnnotationModal', () => {
       rerender(<EditAnnotationModal {...props} />)
 
       // Assert - Component should still be visible (no errors thrown)
-      expect(screen.getByText('appAnnotation.editModal.title')).toBeInTheDocument()
+      // Assert - Component should still be visible (no errors thrown)
+      expect(screen.getByText('appAnnotation.editModal.title'))!.toBeInTheDocument()
     })
 
     it('should re-render when props change', () => {
@@ -674,7 +751,8 @@ describe('EditAnnotationModal', () => {
       rerender(<EditAnnotationModal {...newProps} />)
 
       // Assert - Should show new content
-      expect(screen.getByText('New query content')).toBeInTheDocument()
+      // Assert - Should show new content
+      expect(screen.getByText('New query content'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx b/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx
index a4e2d98917..944a8563eb 100644
--- a/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx
+++ b/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx
@@ -172,7 +172,7 @@ type HeaderOptionsProps = ComponentProps<typeof HeaderOptions>
 
 const renderComponent = (
   props: Partial<HeaderOptionsProps> = {},
-  locale: Locale = LanguagesSupported[0],
+  locale: Locale = LanguagesSupported[0]!,
 ) => {
   ;(useLocale as Mock).mockReturnValue(locale)
 
@@ -279,8 +279,8 @@ describe('HeaderOptions', () => {
 
     const { csvButton, jsonButton } = await getExportButtons()
 
-    expect(csvButton).toBeDisabled()
-    expect(jsonButton).toBeDisabled()
+    expect(csvButton)!.toBeDisabled()
+    expect(jsonButton)!.toBeDisabled()
 
     expect(lastCSVDownloaderProps).toMatchObject({
       data: [['Question', 'Answer']],
@@ -323,7 +323,7 @@ describe('HeaderOptions', () => {
     await openOperationsPopover(user)
     await clickOperationAction(user, 'appAnnotation.table.header.bulkImport')
 
-    expect(await screen.findByText('appAnnotation.batchModal.title')).toBeInTheDocument()
+    expect(await screen.findByText('appAnnotation.batchModal.title'))!.toBeInTheDocument()
     await user.click(
       screen.getByRole('button', { name: 'appAnnotation.batchModal.cancel' }),
     )
@@ -375,7 +375,7 @@ describe('HeaderOptions', () => {
     })
     const lines = blobContent.trim().split('\n')
     expect(lines).toHaveLength(1)
-    expect(JSON.parse(lines[0])).toEqual({
+    expect(JSON.parse(lines[0]!)).toEqual({
       messages: [
         { role: 'system', content: '' },
         { role: 'user', content: 'Question 1' },
diff --git a/web/app/components/app/annotation/view-annotation-modal/__tests__/index.spec.tsx b/web/app/components/app/annotation/view-annotation-modal/__tests__/index.spec.tsx
index d05fa27ccd..1b46443bd8 100644
--- a/web/app/components/app/annotation/view-annotation-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/annotation/view-annotation-modal/__tests__/index.spec.tsx
@@ -126,7 +126,8 @@ describe('ViewAnnotationModal', () => {
     fireEvent.click(screen.getByText('appAnnotation.viewModal.hitHistory'))
 
     // Assert
-    expect(await screen.findByText('appAnnotation.viewModal.noHitHistory')).toBeInTheDocument()
+    // Assert
+    expect(await screen.findByText('appAnnotation.viewModal.noHitHistory'))!.toBeInTheDocument()
     expect(mockFormatTime).toHaveBeenCalledWith(props.item.created_at, 'appLog.dateTimeFormat')
   })
 
@@ -138,16 +139,16 @@ describe('ViewAnnotationModal', () => {
 
     fireEvent.click(await screen.findByText('appAnnotation.viewModal.hitHistory'))
 
-    expect(await screen.findByText('user input')).toBeInTheDocument()
-    expect(screen.getByText('15 appAnnotation.viewModal.hits')).toBeInTheDocument()
-    expect(mockFormatTime).toHaveBeenCalledWith(hits[0].created_at, 'appLog.dateTimeFormat')
+    expect(await screen.findByText('user input'))!.toBeInTheDocument()
+    expect(screen.getByText('15 appAnnotation.viewModal.hits'))!.toBeInTheDocument()
+    expect(mockFormatTime).toHaveBeenCalledWith(hits[0]!.created_at, 'appLog.dateTimeFormat')
   })
 
   it('should confirm before removing the annotation and hide on success', async () => {
     const { props } = renderComponent()
 
     fireEvent.click(screen.getByText('appAnnotation.editModal.removeThisCache'))
-    expect(await screen.findByText('appDebug.feature.annotation.removeConfirm')).toBeInTheDocument()
+    expect(await screen.findByText('appDebug.feature.annotation.removeConfirm'))!.toBeInTheDocument()
 
     const confirmButton = await screen.findByRole('button', { name: 'common.operation.confirm' })
     fireEvent.click(confirmButton)
@@ -162,7 +163,7 @@ describe('ViewAnnotationModal', () => {
     renderComponent()
 
     fireEvent.click(screen.getByText('appAnnotation.editModal.removeThisCache'))
-    expect(await screen.findByText('appDebug.feature.annotation.removeConfirm')).toBeInTheDocument()
+    expect(await screen.findByText('appDebug.feature.annotation.removeConfirm'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
 
diff --git a/web/app/components/app/app-access-control/add-member-or-group-pop.tsx b/web/app/components/app/app-access-control/add-member-or-group-pop.tsx
index 125a4865a7..8c8087cf17 100644
--- a/web/app/components/app/app-access-control/add-member-or-group-pop.tsx
+++ b/web/app/components/app/app-access-control/add-member-or-group-pop.tsx
@@ -36,7 +36,7 @@ export default function AddMemberOrGroupDialog() {
     let observer: IntersectionObserver | undefined
     if (anchorRef.current) {
       observer = new IntersectionObserver((entries) => {
-        if (entries[0].isIntersecting && !isLoading && hasMore)
+        if (entries[0]!.isIntersecting && !isLoading && hasMore)
           fetchNextPage()
       }, { rootMargin: '20px' })
       observer.observe(anchorRef.current)
diff --git a/web/app/components/app/app-publisher/__tests__/index.spec.tsx b/web/app/components/app/app-publisher/__tests__/index.spec.tsx
index 1e29e44c82..bba2f53afc 100644
--- a/web/app/components/app/app-publisher/__tests__/index.spec.tsx
+++ b/web/app/components/app/app-publisher/__tests__/index.spec.tsx
@@ -207,7 +207,7 @@ describe('AppPublisher', () => {
 
     fireEvent.click(screen.getByText('common.publish'))
 
-    expect(screen.getByText('publisher-summary-publish')).toBeInTheDocument()
+    expect(screen.getByText('publisher-summary-publish'))!.toBeInTheDocument()
     expect(mockOnToggle).toHaveBeenCalledWith(true)
 
     await waitFor(() => {
@@ -248,7 +248,7 @@ describe('AppPublisher', () => {
     fireEvent.click(screen.getByText('common.publish'))
     fireEvent.click(screen.getByText('publisher-embed'))
 
-    expect(screen.getByTestId('embedded-modal')).toBeInTheDocument()
+    expect(screen.getByTestId('embedded-modal'))!.toBeInTheDocument()
   })
 
   it('should close embedded and access control panels through child callbacks', async () => {
@@ -265,7 +265,7 @@ describe('AppPublisher', () => {
 
     fireEvent.click(screen.getByText('common.publish'))
     fireEvent.click(screen.getByText('publisher-access-control'))
-    expect(screen.getByTestId('access-control')).toBeInTheDocument()
+    expect(screen.getByTestId('access-control'))!.toBeInTheDocument()
     fireEvent.click(screen.getByText('close-access-control'))
     expect(screen.queryByTestId('access-control')).not.toBeInTheDocument()
   })
@@ -280,7 +280,7 @@ describe('AppPublisher', () => {
     fireEvent.click(screen.getByText('common.publish'))
     fireEvent.click(screen.getByText('publisher-access-control'))
 
-    expect(screen.getByTestId('access-control')).toBeInTheDocument()
+    expect(screen.getByTestId('access-control'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText('confirm-access-control'))
 
@@ -338,7 +338,7 @@ describe('AppPublisher', () => {
       />,
     )
 
-    ahooksMocks.keyPressHandlers[0]({ preventDefault })
+    ahooksMocks.keyPressHandlers[0]!({ preventDefault })
 
     await waitFor(() => {
       expect(preventDefault).toHaveBeenCalled()
@@ -367,7 +367,7 @@ describe('AppPublisher', () => {
       />,
     )
 
-    ahooksMocks.keyPressHandlers[0]({ preventDefault })
+    ahooksMocks.keyPressHandlers[0]!({ preventDefault })
 
     await waitFor(() => {
       expect(preventDefault).toHaveBeenCalled()
@@ -381,7 +381,7 @@ describe('AppPublisher', () => {
     await waitFor(() => {
       expect(onRestore).toHaveBeenCalledTimes(1)
     })
-    expect(screen.getByText('publisher-summary-publish')).toBeInTheDocument()
+    expect(screen.getByText('publisher-summary-publish'))!.toBeInTheDocument()
   })
 
   it('should report missing explore installations', async () => {
@@ -455,6 +455,6 @@ describe('AppPublisher', () => {
     await waitFor(() => {
       expect(mockFetchAppDetailDirect).not.toHaveBeenCalled()
     })
-    expect(screen.getByTestId('access-control')).toBeInTheDocument()
+    expect(screen.getByTestId('access-control'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/app/app-publisher/__tests__/version-info-modal.spec.tsx b/web/app/components/app/app-publisher/__tests__/version-info-modal.spec.tsx
index fa8b1c92fc..ed86bb8571 100644
--- a/web/app/components/app/app-publisher/__tests__/version-info-modal.spec.tsx
+++ b/web/app/components/app/app-publisher/__tests__/version-info-modal.spec.tsx
@@ -34,8 +34,8 @@ describe('VersionInfoModal', () => {
       />,
     )
 
-    expect(screen.getByDisplayValue('Release 1')).toBeInTheDocument()
-    expect(screen.getByDisplayValue('Initial release')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('Release 1'))!.toBeInTheDocument()
+    expect(screen.getByDisplayValue('Initial release'))!.toBeInTheDocument()
   })
 
   it('should reject overlong titles', () => {
@@ -50,7 +50,7 @@ describe('VersionInfoModal', () => {
     )
 
     const [titleInput] = screen.getAllByRole('textbox')
-    fireEvent.change(titleInput, { target: { value: 'a'.repeat(16) } })
+    fireEvent.change(titleInput!, { target: { value: 'a'.repeat(16) } })
     fireEvent.click(screen.getByRole('button', { name: 'common.publish' }))
 
     expect(toast.error).toHaveBeenCalledWith('versionHistory.editField.titleLengthLimit')
@@ -75,8 +75,8 @@ describe('VersionInfoModal', () => {
     )
 
     const [titleInput, notesInput] = screen.getAllByRole('textbox')
-    fireEvent.change(titleInput, { target: { value: 'Release 2' } })
-    fireEvent.change(notesInput, { target: { value: 'Updated notes' } })
+    fireEvent.change(titleInput!, { target: { value: 'Release 2' } })
+    fireEvent.change(notesInput!, { target: { value: 'Updated notes' } })
     fireEvent.click(screen.getByRole('button', { name: 'common.publish' }))
 
     expect(handlePublish).toHaveBeenCalledWith({
@@ -106,16 +106,16 @@ describe('VersionInfoModal', () => {
 
     const [titleInput, notesInput] = screen.getAllByRole('textbox')
 
-    fireEvent.change(titleInput, { target: { value: 'a'.repeat(16) } })
+    fireEvent.change(titleInput!, { target: { value: 'a'.repeat(16) } })
     fireEvent.click(screen.getByRole('button', { name: 'common.publish' }))
     expect(toast.error).toHaveBeenCalledWith('versionHistory.editField.titleLengthLimit')
 
-    fireEvent.change(titleInput, { target: { value: 'Release 3' } })
-    fireEvent.change(notesInput, { target: { value: 'b'.repeat(101) } })
+    fireEvent.change(titleInput!, { target: { value: 'Release 3' } })
+    fireEvent.change(notesInput!, { target: { value: 'b'.repeat(101) } })
     fireEvent.click(screen.getByRole('button', { name: 'common.publish' }))
     expect(toast.error).toHaveBeenCalledWith('versionHistory.editField.releaseNotesLengthLimit')
 
-    fireEvent.change(notesInput, { target: { value: 'Stable release notes' } })
+    fireEvent.change(notesInput!, { target: { value: 'Stable release notes' } })
     fireEvent.click(screen.getByRole('button', { name: 'common.publish' }))
 
     expect(handlePublish).toHaveBeenCalledWith({
diff --git a/web/app/components/app/app-publisher/features-wrapper.tsx b/web/app/components/app/app-publisher/features-wrapper.tsx
index 47ce63645c..7c39535701 100644
--- a/web/app/components/app/app-publisher/features-wrapper.tsx
+++ b/web/app/components/app/app-publisher/features-wrapper.tsx
@@ -62,7 +62,7 @@ const FeaturesWrappedAppPublisher = (props: Props) => {
         },
         enabled: !!(file_upload?.enabled || file_upload?.image?.enabled),
         allowed_file_types: file_upload?.allowed_file_types || [SupportUploadFileTypes.image],
-        allowed_file_extensions: file_upload?.allowed_file_extensions || FILE_EXTS[SupportUploadFileTypes.image].map(ext => `.${ext}`),
+        allowed_file_extensions: file_upload?.allowed_file_extensions || FILE_EXTS[SupportUploadFileTypes.image]!.map(ext => `.${ext}`),
         allowed_file_upload_methods: file_upload?.allowed_file_upload_methods || file_upload?.image?.transfer_methods || ['local_file', 'remote_url'],
         number_limits: file_upload?.number_limits || file_upload?.image?.number_limits || 3,
       } as FileUpload
diff --git a/web/app/components/app/app-publisher/index.tsx b/web/app/components/app/app-publisher/index.tsx
index 6738860298..ce3698dbb7 100644
--- a/web/app/components/app/app-publisher/index.tsx
+++ b/web/app/components/app/app-publisher/index.tsx
@@ -197,7 +197,7 @@ const AppPublisher = ({
         throw new Error('App not found')
       const { installed_apps } = await fetchInstalledAppList(appDetail.id)
       if (installed_apps?.length > 0)
-        return `${basePath}/explore/installed/${installed_apps[0].id}`
+        return `${basePath}/explore/installed/${installed_apps[0]!.id}`
       throw new Error('No app found in Explore')
     }, {
       onError: (err) => {
diff --git a/web/app/components/app/configuration/__tests__/utils.spec.ts b/web/app/components/app/configuration/__tests__/utils.spec.ts
index 65a6192177..6db1c0c09c 100644
--- a/web/app/components/app/configuration/__tests__/utils.spec.ts
+++ b/web/app/components/app/configuration/__tests__/utils.spec.ts
@@ -60,8 +60,8 @@ describe('configuration utils', () => {
         { id: 'tool-2', icon: '/console/icons/prefixed.svg' },
       ] as never, '/console')
 
-      expect(result[0].icon).toBe('/console/icons/tool.svg')
-      expect(result[1].icon).toBe('/console/icons/prefixed.svg')
+      expect(result[0]!.icon).toBe('/console/icons/tool.svg')
+      expect(result[1]!.icon).toBe('/console/icons/prefixed.svg')
     })
   })
 
diff --git a/web/app/components/app/configuration/config-prompt/__tests__/advanced-prompt-input.spec.tsx b/web/app/components/app/configuration/config-prompt/__tests__/advanced-prompt-input.spec.tsx
index 413721ee2e..f7cfff94fb 100644
--- a/web/app/components/app/configuration/config-prompt/__tests__/advanced-prompt-input.spec.tsx
+++ b/web/app/components/app/configuration/config-prompt/__tests__/advanced-prompt-input.spec.tsx
@@ -208,7 +208,7 @@ describe('AdvancedPromptInput', () => {
 
     fireEvent.click(screen.getByText('open-advanced-tool-modal'))
 
-    const modalConfig = mockSetShowExternalDataToolModal.mock.calls[0][0]
+    const modalConfig = mockSetShowExternalDataToolModal.mock.calls[0]![0]
     expect(modalConfig.onValidateBeforeSaveCallback({ variable: 'existing_var' })).toBe(false)
     expect(mockToastError).toHaveBeenCalledWith('varKeyError.keyAlreadyExists')
 
diff --git a/web/app/components/app/configuration/config-prompt/__tests__/index.spec.tsx b/web/app/components/app/configuration/config-prompt/__tests__/index.spec.tsx
index d42eedf16b..70283e02c9 100644
--- a/web/app/components/app/configuration/config-prompt/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config-prompt/__tests__/index.spec.tsx
@@ -144,8 +144,8 @@ describe('Prompt config component', () => {
     renderComponent({ onChange }, { isAdvancedMode: false })
 
     const simplePrompt = screen.getByTestId('simple-prompt-input')
-    expect(simplePrompt).toBeInTheDocument()
-    expect(simplePrompt).toHaveAttribute('data-mode', AppModeEnum.CHAT)
+    expect(simplePrompt)!.toBeInTheDocument()
+    expect(simplePrompt)!.toHaveAttribute('data-mode', AppModeEnum.CHAT)
     expect(mockSimplePromptInputProps?.promptTemplate).toBe('initial template')
     fireEvent.click(simplePrompt)
     expect(onChange).toHaveBeenCalledWith('mocked prompt', defaultPromptVariables)
@@ -171,9 +171,9 @@ describe('Prompt config component', () => {
 
     const renderedMessages = screen.getAllByTestId('advanced-message-input')
     expect(renderedMessages).toHaveLength(2)
-    expect(renderedMessages[0]).toHaveAttribute('data-context-missing', 'true')
-    fireEvent.click(screen.getAllByText('hide-context')[0])
-    expect(screen.getAllByTestId('advanced-message-input')[0]).toHaveAttribute('data-context-missing', 'false')
+    expect(renderedMessages[0])!.toHaveAttribute('data-context-missing', 'true')
+    fireEvent.click(screen.getAllByText('hide-context')[0]!)
+    expect(screen.getAllByTestId('advanced-message-input')[0])!.toHaveAttribute('data-context-missing', 'false')
   })
 
   // Chat message mutations
@@ -193,7 +193,7 @@ describe('Prompt config component', () => {
       },
     )
 
-    fireEvent.click(screen.getAllByText('change')[0])
+    fireEvent.click(screen.getAllByText('change')[0]!)
     expect(setCurrentAdvancedPrompt).toHaveBeenCalledWith(
       [
         { role: PromptRole.user, text: 'updated text' },
@@ -219,7 +219,7 @@ describe('Prompt config component', () => {
       },
     )
 
-    fireEvent.click(screen.getAllByText('type')[1])
+    fireEvent.click(screen.getAllByText('type')[1]!)
     expect(setCurrentAdvancedPrompt).toHaveBeenCalledWith(
       [
         { role: PromptRole.user, text: 'first' },
@@ -244,7 +244,7 @@ describe('Prompt config component', () => {
       },
     )
 
-    fireEvent.click(screen.getAllByText('delete')[0])
+    fireEvent.click(screen.getAllByText('delete')[0]!)
     expect(setCurrentAdvancedPrompt).toHaveBeenCalledWith([{ role: PromptRole.assistant, text: 'second' }])
   })
 
diff --git a/web/app/components/app/configuration/config-prompt/__tests__/simple-prompt-input.spec.tsx b/web/app/components/app/configuration/config-prompt/__tests__/simple-prompt-input.spec.tsx
index a0bc072760..0f8b9b032f 100644
--- a/web/app/components/app/configuration/config-prompt/__tests__/simple-prompt-input.spec.tsx
+++ b/web/app/components/app/configuration/config-prompt/__tests__/simple-prompt-input.spec.tsx
@@ -151,7 +151,7 @@ describe('SimplePromptInput', () => {
 
     fireEvent.click(screen.getByText('blur-prompt'))
 
-    expect(screen.getByText('autoAddVar')).toBeInTheDocument()
+    expect(screen.getByText('autoAddVar'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText('operation.add'))
 
@@ -180,7 +180,7 @@ describe('SimplePromptInput', () => {
     fireEvent.click(screen.getByText('open-tool-modal'))
 
     expect(mockSetShowExternalDataToolModal).toHaveBeenCalledTimes(1)
-    const modalConfig = mockSetShowExternalDataToolModal.mock.calls[0][0]
+    const modalConfig = mockSetShowExternalDataToolModal.mock.calls[0]![0]
 
     expect(modalConfig.onValidateBeforeSaveCallback({ variable: 'existing_var' })).toBe(false)
     expect(mockToastError).toHaveBeenCalledWith('varKeyError.keyAlreadyExists')
@@ -267,10 +267,10 @@ describe('SimplePromptInput', () => {
       </ConfigContext.Provider>,
     )
 
-    expect(screen.getByText('datasets:Knowledge Base')).toBeInTheDocument()
-    expect(screen.getByText('variables:existing_var')).toBeInTheDocument()
-    expect(screen.getByText('external-tools:search_api')).toBeInTheDocument()
-    expect(screen.getByText('query-selectable:false')).toBeInTheDocument()
+    expect(screen.getByText('datasets:Knowledge Base'))!.toBeInTheDocument()
+    expect(screen.getByText('variables:existing_var'))!.toBeInTheDocument()
+    expect(screen.getByText('external-tools:search_api'))!.toBeInTheDocument()
+    expect(screen.getByText('query-selectable:false'))!.toBeInTheDocument()
   })
 
   it('should skip external tool variables and incomplete prompt variables when deciding whether to auto add', () => {
@@ -312,7 +312,7 @@ describe('SimplePromptInput', () => {
     )
 
     fireEvent.click(screen.getByText('blur-prompt'))
-    expect(screen.getByText('autoAddVar')).toBeInTheDocument()
+    expect(screen.getByText('autoAddVar'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText('operation.cancel'))
     expect(mockOnChange).toHaveBeenCalledWith('Hello {{existing_var}}', [])
diff --git a/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx b/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx
index 2783f66c3f..1de6e6ce0c 100644
--- a/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx
+++ b/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx
@@ -96,8 +96,8 @@ const AdvancedPromptInput: FC<Props> = ({
       },
       onValidateBeforeSaveCallback: (newExternalDataTool: ExternalDataTool) => {
         for (let i = 0; i < promptVariables.length; i++) {
-          if (promptVariables[i].key === newExternalDataTool.variable) {
-            toast.error(t('varKeyError.keyAlreadyExists', { ns: 'appDebug', key: promptVariables[i].key }))
+          if (promptVariables[i]!.key === newExternalDataTool.variable) {
+            toast.error(t('varKeyError.keyAlreadyExists', { ns: 'appDebug', key: promptVariables[i]!.key }))
             return false
           }
         }
diff --git a/web/app/components/app/configuration/config-prompt/index.tsx b/web/app/components/app/configuration/config-prompt/index.tsx
index 3a36358d5e..8a77d4bb58 100644
--- a/web/app/components/app/configuration/config-prompt/index.tsx
+++ b/web/app/components/app/configuration/config-prompt/index.tsx
@@ -53,7 +53,7 @@ const Prompt: FC<IPromptProps> = ({
 
   const handleMessageTypeChange = (index: number, role: PromptRole) => {
     const newPrompt = produce(currentAdvancedPrompt as PromptItem[], (draft) => {
-      draft[index].role = role
+      draft[index]!.role = role
     })
     setCurrentAdvancedPrompt(newPrompt)
   }
@@ -61,7 +61,7 @@ const Prompt: FC<IPromptProps> = ({
   const handleValueChange = (value: string, index?: number) => {
     if (modelModeType === ModelModeType.chat) {
       const newPrompt = produce(currentAdvancedPrompt as PromptItem[], (draft) => {
-        draft[index as number].text = value
+        draft[index as number]!.text = value
       })
       setCurrentAdvancedPrompt(newPrompt, true)
     }
diff --git a/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx b/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
index 0f6d2b94a6..6b5c3acccb 100644
--- a/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
+++ b/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
@@ -94,8 +94,8 @@ const Prompt: FC<ISimplePromptInput> = ({
       },
       onValidateBeforeSaveCallback: (newExternalDataTool: ExternalDataTool) => {
         for (let i = 0; i < promptVariables.length; i++) {
-          if (promptVariables[i].key === newExternalDataTool.variable) {
-            toast.error(t('varKeyError.keyAlreadyExists', { ns: 'appDebug', key: promptVariables[i].key }))
+          if (promptVariables[i]!.key === newExternalDataTool.variable) {
+            toast.error(t('varKeyError.keyAlreadyExists', { ns: 'appDebug', key: promptVariables[i]!.key }))
             return false
           }
         }
diff --git a/web/app/components/app/configuration/config-var/__tests__/index.spec.tsx b/web/app/components/app/configuration/config-var/__tests__/index.spec.tsx
index fb190d844a..4486489a20 100644
--- a/web/app/components/app/configuration/config-var/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config-var/__tests__/index.spec.tsx
@@ -118,7 +118,7 @@ describe('ConfigVar', () => {
     it('should show empty state when no variables exist', () => {
       renderConfigVar({ promptVariables: [] })
 
-      expect(screen.getByText('appDebug.notSetVar')).toBeInTheDocument()
+      expect(screen.getByText('appDebug.notSetVar'))!.toBeInTheDocument()
     })
 
     it('should render variable items and allow reordering via sortable list', () => {
@@ -131,8 +131,8 @@ describe('ConfigVar', () => {
         onPromptVariablesChange,
       })
 
-      expect(screen.getByText('first')).toBeInTheDocument()
-      expect(screen.getByText('second')).toBeInTheDocument()
+      expect(screen.getByText('first'))!.toBeInTheDocument()
+      expect(screen.getByText('second'))!.toBeInTheDocument()
 
       act(() => {
         latestSortableProps?.setList([
@@ -163,7 +163,7 @@ describe('ConfigVar', () => {
       fireEvent.click(await screen.findByText('appDebug.variableConfig.string'))
 
       expect(onPromptVariablesChange).toHaveBeenCalledTimes(1)
-      const [nextVariables] = onPromptVariablesChange.mock.calls[0]
+      const [nextVariables] = (onPromptVariablesChange.mock.calls[0] ?? []) as [any]
       expect(nextVariables).toHaveLength(1)
       expect(nextVariables[0].type).toBe('string')
     })
@@ -178,7 +178,7 @@ describe('ConfigVar', () => {
       expect(onPromptVariablesChange).toHaveBeenCalledTimes(1)
       expect(setShowExternalDataToolModal).toHaveBeenCalledTimes(1)
 
-      const modalState = setShowExternalDataToolModal.mock.calls[0][0]
+      const modalState = setShowExternalDataToolModal.mock.calls[0]![0]
       expect(modalState.payload.type).toBe('api')
 
       act(() => {
@@ -197,13 +197,13 @@ describe('ConfigVar', () => {
       fireEvent.click(screen.getByText('common.operation.add'))
       fireEvent.click(await screen.findByText('appDebug.variableConfig.apiBasedVar'))
 
-      const modalState = setShowExternalDataToolModal.mock.calls[0][0]
+      const modalState = setShowExternalDataToolModal.mock.calls[0]![0]
       act(() => {
         modalState.onCancelCallback?.()
       })
 
       expect(onPromptVariablesChange).toHaveBeenCalledTimes(2)
-      const [addedVariables] = onPromptVariablesChange.mock.calls[0]
+      const [addedVariables] = (onPromptVariablesChange.mock.calls[0] ?? []) as [any]
       expect(addedVariables).toHaveLength(2)
       expect(addedVariables[0]).toBe(existingVar)
       expect(addedVariables[1].type).toBe('api')
@@ -235,7 +235,7 @@ describe('ConfigVar', () => {
       expect(itemContainer).not.toBeNull()
       const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
       expect(actionButtons).toHaveLength(2)
-      fireEvent.click(actionButtons[0])
+      fireEvent.click(actionButtons[0]!)
 
       const editDialog = await screen.findByRole('dialog')
       const saveButton = within(editDialog).getByRole('button', { name: 'common.operation.save' })
@@ -261,10 +261,10 @@ describe('ConfigVar', () => {
       expect(itemContainer).not.toBeNull()
       const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
       expect(actionButtons).toHaveLength(2)
-      fireEvent.click(actionButtons[0])
+      fireEvent.click(actionButtons[0]!)
 
       const inputs = await screen.findAllByPlaceholderText('appDebug.variableConfig.inputPlaceholder')
-      fireEvent.change(inputs[0], { target: { value: 'second' } })
+      fireEvent.change(inputs[0]!, { target: { value: 'second' } })
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
@@ -287,10 +287,10 @@ describe('ConfigVar', () => {
       expect(itemContainer).not.toBeNull()
       const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
       expect(actionButtons).toHaveLength(2)
-      fireEvent.click(actionButtons[0])
+      fireEvent.click(actionButtons[0]!)
 
       const inputs = await screen.findAllByPlaceholderText('appDebug.variableConfig.inputPlaceholder')
-      fireEvent.change(inputs[1], { target: { value: 'Second' } })
+      fireEvent.change(inputs[1]!, { target: { value: 'Second' } })
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
@@ -412,7 +412,7 @@ describe('ConfigVar', () => {
       expect(itemContainer).not.toBeNull()
 
       const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
-      fireEvent.click(actionButtons[0])
+      fireEvent.click(actionButtons[0]!)
 
       const modalState = setShowExternalDataToolModal.mock.calls.at(-1)?.[0]
 
@@ -461,7 +461,7 @@ describe('ConfigVar', () => {
       expect(itemContainer).not.toBeNull()
 
       const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
-      fireEvent.click(actionButtons[0])
+      fireEvent.click(actionButtons[0]!)
 
       const modalState = setShowExternalDataToolModal.mock.calls.at(-1)?.[0]
 
diff --git a/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx b/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx
index 101cbab8fb..8cc8775bf5 100644
--- a/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx
@@ -178,8 +178,8 @@ describe('ConfigModalFormFields', () => {
     render(<ConfigModalFormFields {...singleFileProps} />)
     fireEvent.click(screen.getByText('single-file-setting'))
     fireEvent.click(screen.getByText('upload-file'))
-    fireEvent.click(screen.getAllByText('unchecked')[0])
-    fireEvent.click(screen.getAllByText('unchecked')[1])
+    fireEvent.click(screen.getAllByText('unchecked')[0]!)
+    fireEvent.click(screen.getAllByText('unchecked')[1]!)
 
     expect(singleFileProps.onFilePayloadChange).toHaveBeenCalledWith({ number_limits: 1 })
     expect(singleFileProps.payloadChangeHandlers.default).toHaveBeenCalledWith(expect.objectContaining({
@@ -198,7 +198,7 @@ describe('ConfigModalFormFields', () => {
     }
     render(<ConfigModalFormFields {...multiFileProps} />)
     fireEvent.click(screen.getByText('multi-file-setting'))
-    fireEvent.click(screen.getAllByText('upload-file')[1])
+    fireEvent.click(screen.getAllByText('upload-file')[1]!)
     expect(multiFileProps.onFilePayloadChange).toHaveBeenCalledWith({ number_limits: 3 })
     expect(multiFileProps.payloadChangeHandlers.default).toHaveBeenCalledWith([
       expect.objectContaining({ fileId: 'file-1' }),
diff --git a/web/app/components/app/configuration/config-var/config-modal/__tests__/index.spec.tsx b/web/app/components/app/configuration/config-var/config-modal/__tests__/index.spec.tsx
index 31256f0c08..d15d6527c5 100644
--- a/web/app/components/app/configuration/config-var/config-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/__tests__/index.spec.tsx
@@ -44,9 +44,9 @@ describe('ConfigModal', () => {
     )
 
     const textboxes = screen.getAllByRole('textbox')
-    fireEvent.blur(textboxes[0], { target: { value: 'question' } })
+    fireEvent.blur(textboxes[0]!, { target: { value: 'question' } })
 
-    expect(textboxes[1]).toHaveValue('question')
+    expect(textboxes[1])!.toHaveValue('question')
   })
 
   it('should submit the edited payload when the form is valid', () => {
diff --git a/web/app/components/app/configuration/config-var/config-string/__tests__/index.spec.tsx b/web/app/components/app/configuration/config-var/config-string/__tests__/index.spec.tsx
index 5fb2aaf732..b83a27d670 100644
--- a/web/app/components/app/configuration/config-var/config-string/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-string/__tests__/index.spec.tsx
@@ -27,15 +27,15 @@ describe('ConfigString', () => {
 
       const input = screen.getByRole('spinbutton')
 
-      expect(input).toHaveValue(3)
-      expect(input).toHaveAttribute('min', '1')
-      expect(input).toHaveAttribute('max', '8')
+      expect(input)!.toHaveValue(3)
+      expect(input)!.toHaveAttribute('min', '1')
+      expect(input)!.toHaveAttribute('max', '8')
     })
 
     it('should render empty input when value is undefined', () => {
       const { onChange } = renderConfigString({ value: undefined })
 
-      expect(screen.getByRole('spinbutton')).toHaveValue(null)
+      expect(screen.getByRole('spinbutton'))!.toHaveValue(null)
       expect(onChange).not.toHaveBeenCalled()
     })
   })
@@ -116,7 +116,7 @@ describe('ConfigString', () => {
       fireEvent.change(screen.getByRole('spinbutton'), { target: { value: '' } })
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      expect(onChange.mock.calls[0][0]).toBeNaN()
+      expect(onChange.mock.calls[0]![0]).toBeNaN()
     })
   })
 })
diff --git a/web/app/components/app/configuration/config-var/index.tsx b/web/app/components/app/configuration/config-var/index.tsx
index 951680c035..aca2817249 100644
--- a/web/app/components/app/configuration/config-var/index.tsx
+++ b/web/app/components/app/configuration/config-var/index.tsx
@@ -165,8 +165,8 @@ const ConfigVar: FC<IConfigVarProps> = ({ promptVariables, readonly, onPromptVar
       },
       onValidateBeforeSaveCallback: (newExternalDataTool: ExternalDataTool) => {
         for (let i = 0; i < promptVariables.length; i++) {
-          if (promptVariables[i].key === newExternalDataTool.variable && i !== index) {
-            toast.error(t('varKeyError.keyAlreadyExists', { ns: 'appDebug', key: promptVariables[i].key }))
+          if (promptVariables[i]!.key === newExternalDataTool.variable && i !== index) {
+            toast.error(t('varKeyError.keyAlreadyExists', { ns: 'appDebug', key: promptVariables[i]!.key }))
             return false
           }
         }
@@ -220,7 +220,7 @@ const ConfigVar: FC<IConfigVarProps> = ({ promptVariables, readonly, onPromptVar
   const handleRemoveVar = useCallback((index: number) => {
     const removeVar = promptVariables[index]
 
-    if (mode === AppModeEnum.COMPLETION && dataSets.length > 0 && removeVar.is_context_var) {
+    if (mode === AppModeEnum.COMPLETION && dataSets.length > 0 && removeVar!.is_context_var) {
       showDeleteContextVarModal()
       setRemoveIndex(index)
       return
diff --git a/web/app/components/app/configuration/config-vision/__tests__/index.spec.tsx b/web/app/components/app/configuration/config-vision/__tests__/index.spec.tsx
index 6ff73ae008..b46f561bdb 100644
--- a/web/app/components/app/configuration/config-vision/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config-vision/__tests__/index.spec.tsx
@@ -69,7 +69,7 @@ const setupFeatureStore = (fileOverrides: Partial<FileUpload> = {}) => {
 
 const getLatestFileConfig = () => {
   expect(setFeaturesMock).toHaveBeenCalled()
-  const latestFeatures = setFeaturesMock.mock.calls[setFeaturesMock.mock.calls.length - 1][0] as { file: FileUpload }
+  const latestFeatures = setFeaturesMock.mock.calls[setFeaturesMock.mock.calls.length - 1]![0] as { file: FileUpload }
   return latestFeatures.file
 }
 
@@ -98,8 +98,8 @@ describe('ConfigVision', () => {
   it('should show the toggle and parameter controls when visible', () => {
     render(<ConfigVision />)
 
-    expect(screen.getByText('appDebug.vision.name')).toBeInTheDocument()
-    expect(screen.getByRole('switch')).toHaveAttribute('aria-checked', 'false')
+    expect(screen.getByText('appDebug.vision.name'))!.toBeInTheDocument()
+    expect(screen.getByRole('switch'))!.toHaveAttribute('aria-checked', 'false')
   })
 
   it('should enable both image and video uploads when toggled on with video support', async () => {
@@ -178,7 +178,7 @@ describe('ParamConfig', () => {
 
     await user.click(screen.getByRole('button', { name: 'appDebug.voice.settings' }))
 
-    expect(await screen.findByText('appDebug.vision.visionSettings.title')).toBeInTheDocument()
+    expect(await screen.findByText('appDebug.vision.visionSettings.title'))!.toBeInTheDocument()
   })
 })
 
diff --git a/web/app/components/app/configuration/config/assistant-type-picker/__tests__/index.spec.tsx b/web/app/components/app/configuration/config/assistant-type-picker/__tests__/index.spec.tsx
index 073ff5a639..b32f14d089 100644
--- a/web/app/components/app/configuration/config/assistant-type-picker/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config/assistant-type-picker/__tests__/index.spec.tsx
@@ -46,7 +46,8 @@ describe('AssistantTypePicker', () => {
       renderComponent()
 
       // Assert
-      expect(screen.getByText(/chatAssistant.name/i)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/chatAssistant.name/i))!.toBeInTheDocument()
     })
 
     it('should render chat assistant by default when value is "chat"', () => {
@@ -54,7 +55,8 @@ describe('AssistantTypePicker', () => {
       renderComponent({ value: 'chat' })
 
       // Assert
-      expect(screen.getByText(/chatAssistant.name/i)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/chatAssistant.name/i))!.toBeInTheDocument()
     })
 
     it('should render agent assistant when value is "agent"', () => {
@@ -62,7 +64,8 @@ describe('AssistantTypePicker', () => {
       renderComponent({ value: 'agent' })
 
       // Assert
-      expect(screen.getByText(/agentAssistant.name/i)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/agentAssistant.name/i))!.toBeInTheDocument()
     })
   })
 
@@ -73,7 +76,8 @@ describe('AssistantTypePicker', () => {
       renderComponent({ value: 'agent' })
 
       // Assert
-      expect(screen.getByText(/agentAssistant.name/i)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/agentAssistant.name/i))!.toBeInTheDocument()
     })
 
     it('should handle agentConfig prop', () => {
@@ -91,7 +95,8 @@ describe('AssistantTypePicker', () => {
       }).not.toThrow()
 
       // Assert
-      expect(screen.getByText(/chatAssistant.name/i)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/chatAssistant.name/i))!.toBeInTheDocument()
     })
 
     it('should handle undefined agentConfig prop', () => {
@@ -101,7 +106,8 @@ describe('AssistantTypePicker', () => {
       }).not.toThrow()
 
       // Assert
-      expect(screen.getByText(/chatAssistant.name/i)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/chatAssistant.name/i))!.toBeInTheDocument()
     })
   })
 
@@ -137,7 +143,7 @@ describe('AssistantTypePicker', () => {
 
       // Wait for dropdown to open and find chat option
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
       })
 
       // Find and click the chat option by its unique description
@@ -160,7 +166,7 @@ describe('AssistantTypePicker', () => {
 
       // Wait for dropdown to open and click agent option
       await waitFor(() => {
-        expect(screen.getByText(/agentAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/agentAssistant.description/i))!.toBeInTheDocument()
       })
 
       const agentOption = getOptionByDescription(/agentAssistant.description/i)
@@ -181,7 +187,7 @@ describe('AssistantTypePicker', () => {
 
       // Wait for dropdown and select chat
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
       })
 
       const chatOption = getOptionByDescription(/chatAssistant.description/i)
@@ -209,11 +215,11 @@ describe('AssistantTypePicker', () => {
       })
 
       const agentOptions = screen.getAllByText(/agentAssistant.name/i)
-      await user.click(agentOptions[0])
+      await user.click(agentOptions[0]!)
 
       // Assert - Dropdown should remain open (agent settings should be visible)
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
     })
 
@@ -234,7 +240,7 @@ describe('AssistantTypePicker', () => {
       })
 
       const chatOptions = screen.getAllByText(/chatAssistant.name/i)
-      await user.click(chatOptions[1])
+      await user.click(chatOptions[1]!)
 
       // Assert
       expect(onChange).not.toHaveBeenCalled()
@@ -255,7 +261,7 @@ describe('AssistantTypePicker', () => {
 
       // Wait for dropdown to open
       await waitFor(() => {
-        expect(screen.getByText(/agentAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/agentAssistant.description/i))!.toBeInTheDocument()
       })
 
       // Act - Try to click an option
@@ -292,7 +298,7 @@ describe('AssistantTypePicker', () => {
 
       // Assert - Agent settings option should be visible
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
     })
   })
@@ -310,7 +316,7 @@ describe('AssistantTypePicker', () => {
 
       // Click agent settings
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const agentSettingsTrigger = screen.getByText(/agent.setting.name/i)
@@ -318,7 +324,7 @@ describe('AssistantTypePicker', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByText(/common.operation.save/i)).toBeInTheDocument()
+        expect(screen.getByText(/common.operation.save/i))!.toBeInTheDocument()
       })
     })
 
@@ -333,9 +339,40 @@ describe('AssistantTypePicker', () => {
 
       // Wait for dropdown to open
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
       })
 
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
+      // Assert - Agent settings modal should not appear (value is 'chat')
       // Assert - Agent settings modal should not appear (value is 'chat')
       expect(screen.queryByText(/common.operation.save/i)).not.toBeInTheDocument()
     })
@@ -351,7 +388,7 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const agentSettingsTrigger = screen.getByText(/agent.setting.name/i)
@@ -359,7 +396,7 @@ describe('AssistantTypePicker', () => {
 
       // Wait for modal and click save
       await waitFor(() => {
-        expect(screen.getByText(/common.operation.save/i)).toBeInTheDocument()
+        expect(screen.getByText(/common.operation.save/i))!.toBeInTheDocument()
       })
 
       const saveButton = screen.getByText(/common.operation.save/i)
@@ -379,14 +416,14 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const agentSettingsTrigger = screen.getByText(/agent.setting.name/i)
       await user.click(agentSettingsTrigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/appDebug.agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/appDebug.agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const saveButton = screen.getByText(/common.operation.save/i)
@@ -409,14 +446,14 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const agentSettingsTrigger = screen.getByText(/agent.setting.name/i)
       await user.click(agentSettingsTrigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/common.operation.save/i)).toBeInTheDocument()
+        expect(screen.getByText(/common.operation.save/i))!.toBeInTheDocument()
       })
 
       const cancelButton = screen.getByText(/common.operation.cancel/i)
@@ -439,7 +476,7 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const agentSettingsTrigger = screen.getByText(/agent.setting.name/i)
@@ -447,7 +484,7 @@ describe('AssistantTypePicker', () => {
 
       // Assert - Modal should be open and dropdown should close
       await waitFor(() => {
-        expect(screen.getByText(/common.operation.save/i)).toBeInTheDocument()
+        expect(screen.getByText(/common.operation.save/i))!.toBeInTheDocument()
       })
 
       // The dropdown should be closed (agent settings description should not be visible)
@@ -472,7 +509,8 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       // Assert - Should not crash
-      expect(trigger).toBeInTheDocument()
+      // Assert - Should not crash
+      expect(trigger)!.toBeInTheDocument()
     })
 
     it('should handle multiple rapid selection changes', async () => {
@@ -486,7 +524,7 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/agentAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/agentAssistant.description/i))!.toBeInTheDocument()
       })
 
       // Click agent option - this stays open because value is 'agent'
@@ -523,7 +561,8 @@ describe('AssistantTypePicker', () => {
       }).not.toThrow()
 
       // Assert
-      expect(screen.getByText(/chatAssistant.name/i)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/chatAssistant.name/i))!.toBeInTheDocument()
     })
 
     describe('should render with different prop combinations', () => {
@@ -542,7 +581,7 @@ describe('AssistantTypePicker', () => {
 
           // Assert
           const expectedText = combo.value === 'agent' ? 'agentAssistant.name' : 'chatAssistant.name'
-          expect(screen.getByText(new RegExp(expectedText, 'i'))).toBeInTheDocument()
+          expect(screen.getByText(new RegExp(expectedText, 'i')))!.toBeInTheDocument()
         },
       )
     })
@@ -561,15 +600,15 @@ describe('AssistantTypePicker', () => {
 
       // Assert - Both options should be visible and clickable
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
-        expect(screen.getByText(/agentAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
+        expect(screen.getByText(/agentAssistant.description/i))!.toBeInTheDocument()
       })
 
       // Verify we can interact with option elements using helper function
       const chatOption = getOptionByDescription(/chatAssistant.description/i)
       const agentOption = getOptionByDescription(/agentAssistant.description/i)
-      expect(chatOption).toBeInTheDocument()
-      expect(agentOption).toBeInTheDocument()
+      expect(chatOption)!.toBeInTheDocument()
+      expect(agentOption)!.toBeInTheDocument()
     })
   })
 
@@ -586,16 +625,16 @@ describe('AssistantTypePicker', () => {
 
       // Assert - Both options should be visible with radio components
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
-        expect(screen.getByText(/agentAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
+        expect(screen.getByText(/agentAssistant.description/i))!.toBeInTheDocument()
       })
 
       // The SelectItem components render with different visual states
       // based on isChecked prop - we verify both options are rendered
       const chatOption = getOptionByDescription(/chatAssistant.description/i)
       const agentOption = getOptionByDescription(/agentAssistant.description/i)
-      expect(chatOption).toBeInTheDocument()
-      expect(agentOption).toBeInTheDocument()
+      expect(chatOption)!.toBeInTheDocument()
+      expect(agentOption)!.toBeInTheDocument()
     })
 
     it('should render description text', async () => {
@@ -609,8 +648,8 @@ describe('AssistantTypePicker', () => {
 
       // Assert - Descriptions should be visible
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
-        expect(screen.getByText(/agentAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
+        expect(screen.getByText(/agentAssistant.description/i))!.toBeInTheDocument()
       })
     })
 
@@ -625,8 +664,8 @@ describe('AssistantTypePicker', () => {
 
       // Assert - Radio components should be present (both options visible)
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
-        expect(screen.getByText(/agentAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
+        expect(screen.getByText(/agentAssistant.description/i))!.toBeInTheDocument()
       })
     })
   })
@@ -643,7 +682,7 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const agentSettingsTrigger = screen.getByText(/agent.setting.name/i)
@@ -651,9 +690,9 @@ describe('AssistantTypePicker', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByText(/common.operation.save/i)).toBeInTheDocument()
+        expect(screen.getByText(/common.operation.save/i))!.toBeInTheDocument()
       })
-      expect(screen.getByText(/appDebug.agent.agentModeType.functionCall/i)).toBeInTheDocument()
+      expect(screen.getByText(/appDebug.agent.agentModeType.functionCall/i))!.toBeInTheDocument()
     })
 
     it('should show built-in prompt when isFunctionCall is false', async () => {
@@ -666,7 +705,7 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const agentSettingsTrigger = screen.getByText(/agent.setting.name/i)
@@ -674,9 +713,9 @@ describe('AssistantTypePicker', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByText(/common.operation.save/i)).toBeInTheDocument()
+        expect(screen.getByText(/common.operation.save/i))!.toBeInTheDocument()
       })
-      expect(screen.getByText(/tools.builtInPromptTitle/i)).toBeInTheDocument()
+      expect(screen.getByText(/tools.builtInPromptTitle/i))!.toBeInTheDocument()
     })
 
     it('should initialize max iteration from agentConfig payload', async () => {
@@ -696,7 +735,7 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const agentSettingsTrigger = screen.getByText(/agent.setting.name/i)
@@ -705,7 +744,7 @@ describe('AssistantTypePicker', () => {
       // Assert
       await screen.findByText(/common.operation.save/i)
       const maxIterationInput = await screen.findByRole('spinbutton')
-      expect(maxIterationInput).toHaveValue(10)
+      expect(maxIterationInput)!.toHaveValue(10)
     })
   })
 
@@ -721,7 +760,7 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
       })
 
       // Press Escape
@@ -741,8 +780,9 @@ describe('AssistantTypePicker', () => {
       const trigger = screen.getByText(/chatAssistant.name/i)
 
       // Assert - Element should be focusable
-      expect(trigger).toBeInTheDocument()
-      expect(trigger.parentElement).toBeInTheDocument()
+      // Assert - Element should be focusable
+      expect(trigger)!.toBeInTheDocument()
+      expect(trigger.parentElement)!.toBeInTheDocument()
     })
 
     it('should allow keyboard focus on dropdown options', async () => {
@@ -755,7 +795,7 @@ describe('AssistantTypePicker', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
       })
 
       // Get options
@@ -763,8 +803,9 @@ describe('AssistantTypePicker', () => {
       const agentOption = getOptionByDescription(/agentAssistant.description/i)
 
       // Assert - Options should be focusable
-      expect(chatOption).toBeInTheDocument()
-      expect(agentOption).toBeInTheDocument()
+      // Assert - Options should be focusable
+      expect(chatOption)!.toBeInTheDocument()
+      expect(agentOption)!.toBeInTheDocument()
 
       // Verify options exist and can receive focus programmatically
       // Note: focus() doesn't always update document.activeElement in JSDOM
@@ -787,11 +828,11 @@ describe('AssistantTypePicker', () => {
 
       // Assert - Agent settings button should be focusable
       await waitFor(() => {
-        expect(screen.getByText(/agent.setting.name/i)).toBeInTheDocument()
+        expect(screen.getByText(/agent.setting.name/i))!.toBeInTheDocument()
       })
 
       const agentSettings = screen.getByText(/agent.setting.name/i)
-      expect(agentSettings).toBeInTheDocument()
+      expect(agentSettings)!.toBeInTheDocument()
     })
   })
 
@@ -804,7 +845,7 @@ describe('AssistantTypePicker', () => {
 
       // Act - Check initial state
       const portalContainer = container.querySelector('[data-state]')
-      expect(portalContainer).toHaveAttribute('data-state', 'closed')
+      expect(portalContainer)!.toHaveAttribute('data-state', 'closed')
 
       // Open dropdown
       const trigger = screen.getByText(/chatAssistant.name/i)
@@ -813,7 +854,7 @@ describe('AssistantTypePicker', () => {
       // Assert - State should change to open
       await waitFor(() => {
         const openPortal = container.querySelector('[data-state="open"]')
-        expect(openPortal).toBeInTheDocument()
+        expect(openPortal)!.toBeInTheDocument()
       })
     })
 
@@ -823,11 +864,12 @@ describe('AssistantTypePicker', () => {
 
       // Assert - Portal should have data-state for accessibility
       const portalContainer = container.querySelector('[data-state]')
-      expect(portalContainer).toBeInTheDocument()
-      expect(portalContainer).toHaveAttribute('data-state')
+      expect(portalContainer)!.toBeInTheDocument()
+      expect(portalContainer)!.toHaveAttribute('data-state')
 
       // Should start in closed state
-      expect(portalContainer).toHaveAttribute('data-state', 'closed')
+      // Should start in closed state
+      expect(portalContainer)!.toHaveAttribute('data-state', 'closed')
     })
 
     it('should maintain accessible structure for screen readers', () => {
@@ -835,7 +877,8 @@ describe('AssistantTypePicker', () => {
       renderComponent({ value: 'chat' })
 
       // Assert - Text content should be accessible
-      expect(screen.getByText(/chatAssistant.name/i)).toBeInTheDocument()
+      // Assert - Text content should be accessible
+      expect(screen.getByText(/chatAssistant.name/i))!.toBeInTheDocument()
 
       // Icons should have proper structure
       const { container } = renderComponent()
@@ -854,12 +897,13 @@ describe('AssistantTypePicker', () => {
 
       // Assert - All options should have descriptive text
       await waitFor(() => {
-        expect(screen.getByText(/chatAssistant.description/i)).toBeInTheDocument()
-        expect(screen.getByText(/agentAssistant.description/i)).toBeInTheDocument()
+        expect(screen.getByText(/chatAssistant.description/i))!.toBeInTheDocument()
+        expect(screen.getByText(/agentAssistant.description/i))!.toBeInTheDocument()
       })
 
       // Title text should be visible
-      expect(screen.getByText(/assistantType.name/i)).toBeInTheDocument()
+      // Title text should be visible
+      expect(screen.getByText(/assistantType.name/i))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/configuration/config/automatic/__tests__/result.spec.tsx b/web/app/components/app/configuration/config/automatic/__tests__/result.spec.tsx
index 7e9c26bd06..30f41b7828 100644
--- a/web/app/components/app/configuration/config/automatic/__tests__/result.spec.tsx
+++ b/web/app/components/app/configuration/config/automatic/__tests__/result.spec.tsx
@@ -81,11 +81,11 @@ describe('Result', () => {
       />,
     )
 
-    expect(screen.getByTestId('prompt-toast')).toHaveTextContent('optimization note')
-    expect(screen.getByTestId('prompt-res')).toHaveTextContent('generated output')
+    expect(screen.getByTestId('prompt-toast'))!.toHaveTextContent('optimization note')
+    expect(screen.getByTestId('prompt-res'))!.toHaveTextContent('generated output')
 
     fireEvent.click(screen.getByTestId('version-selector'))
-    fireEvent.click(screen.getAllByRole('button')[1])
+    fireEvent.click(screen.getAllByRole('button')[1]!)
     fireEvent.click(screen.getByText('generate.apply'))
 
     expect(mockSetCurrentVersionIndex).toHaveBeenCalledWith(1)
@@ -106,7 +106,7 @@ describe('Result', () => {
       />,
     )
 
-    expect(screen.getByTestId('prompt-res-in-workflow')).toHaveTextContent('generated output')
+    expect(screen.getByTestId('prompt-res-in-workflow'))!.toHaveTextContent('generated output')
     expect(mockPromptResInWorkflow).toHaveBeenCalledWith(expect.objectContaining({
       nodeId: 'node-1',
       value: 'generated output',
@@ -121,6 +121,6 @@ describe('Result', () => {
       />,
     )
 
-    expect(screen.getByTestId('code-editor')).toHaveTextContent('generated output')
+    expect(screen.getByTestId('code-editor'))!.toHaveTextContent('generated output')
   })
 })
diff --git a/web/app/components/app/configuration/dataset-config/__tests__/index.spec.tsx b/web/app/components/app/configuration/dataset-config/__tests__/index.spec.tsx
index 11562e8d9b..25e38b4855 100644
--- a/web/app/components/app/configuration/dataset-config/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/__tests__/index.spec.tsx
@@ -61,7 +61,7 @@ vi.mock('es-toolkit/compat', () => ({
       return []
 
     // Start with first array and filter down
-    return validArrays[0].filter((item: any) => {
+    return validArrays[0]!.filter((item: any) => {
       if (!item || !item.name)
         return false
 
@@ -317,14 +317,14 @@ describe('DatasetConfig', () => {
     it('should render dataset configuration panel when component mounts', () => {
       renderDatasetConfig()
 
-      expect(screen.getByText('appDebug.feature.dataSet.title')).toBeInTheDocument()
+      expect(screen.getByText('appDebug.feature.dataSet.title'))!.toBeInTheDocument()
     })
 
     it('should display empty state message when no datasets are configured', () => {
       renderDatasetConfig()
 
-      expect(screen.getByText(/no.*data/i)).toBeInTheDocument()
-      expect(screen.getByTestId('params-config')).toBeDisabled()
+      expect(screen.getByText(/no.*data/i))!.toBeInTheDocument()
+      expect(screen.getByTestId('params-config'))!.toBeDisabled()
     })
 
     it('should render dataset cards and enable parameters when datasets exist', () => {
@@ -333,16 +333,16 @@ describe('DatasetConfig', () => {
         dataSets: [dataset],
       })
 
-      expect(screen.getByTestId(`card-item-${dataset.id}`)).toBeInTheDocument()
-      expect(screen.getByText(dataset.name)).toBeInTheDocument()
+      expect(screen.getByTestId(`card-item-${dataset.id}`))!.toBeInTheDocument()
+      expect(screen.getByText(dataset.name))!.toBeInTheDocument()
       expect(screen.getByTestId('params-config')).not.toBeDisabled()
     })
 
     it('should show configuration title and add dataset button in header', () => {
       renderDatasetConfig()
 
-      expect(screen.getByText('appDebug.feature.dataSet.title')).toBeInTheDocument()
-      expect(screen.getByText('common.operation.add')).toBeInTheDocument()
+      expect(screen.getByText('appDebug.feature.dataSet.title'))!.toBeInTheDocument()
+      expect(screen.getByText('common.operation.add'))!.toBeInTheDocument()
     })
 
     it('should hide parameters configuration when in agent mode', () => {
@@ -436,7 +436,7 @@ describe('DatasetConfig', () => {
         dataSets: [dataset],
       })
 
-      expect(screen.getByTestId(`card-item-${dataset.id}`)).toBeInTheDocument()
+      expect(screen.getByTestId(`card-item-${dataset.id}`))!.toBeInTheDocument()
     })
   })
 
@@ -456,9 +456,10 @@ describe('DatasetConfig', () => {
         },
       })
 
-      expect(screen.getByTestId('context-var')).toBeInTheDocument()
+      expect(screen.getByTestId('context-var'))!.toBeInTheDocument()
       // Should find the selected context variable in the options
-      expect(screen.getByText('Select context variable')).toBeInTheDocument()
+      // Should find the selected context variable in the options
+      expect(screen.getByText('Select context variable'))!.toBeInTheDocument()
     })
 
     it('should not show context variable selector in chat mode', () => {
@@ -514,8 +515,8 @@ describe('DatasetConfig', () => {
         dataSets: [dataset],
       })
 
-      expect(screen.getByTestId('metadata-filter')).toBeInTheDocument()
-      expect(screen.getByTestId('metadata-list-count')).toHaveTextContent('2') // both 'category' and 'priority'
+      expect(screen.getByTestId('metadata-filter'))!.toBeInTheDocument()
+      expect(screen.getByTestId('metadata-list-count'))!.toHaveTextContent('2') // both 'category' and 'priority'
     })
 
     it('should handle metadata filter mode change', async () => {
@@ -740,8 +741,8 @@ describe('DatasetConfig', () => {
         dataSets: [dataset],
       })
 
-      expect(screen.getByTestId('metadata-filter')).toBeInTheDocument()
-      expect(screen.getByTestId('metadata-list-count')).toHaveTextContent('0')
+      expect(screen.getByTestId('metadata-filter'))!.toBeInTheDocument()
+      expect(screen.getByTestId('metadata-list-count'))!.toHaveTextContent('0')
     })
 
     it('should handle empty doc_metadata array', () => {
@@ -753,8 +754,8 @@ describe('DatasetConfig', () => {
         dataSets: [dataset],
       })
 
-      expect(screen.getByTestId('metadata-filter')).toBeInTheDocument()
-      expect(screen.getByTestId('metadata-list-count')).toHaveTextContent('0')
+      expect(screen.getByTestId('metadata-filter'))!.toBeInTheDocument()
+      expect(screen.getByTestId('metadata-list-count'))!.toHaveTextContent('0')
     })
 
     it('should handle missing userProfile', () => {
@@ -769,7 +770,7 @@ describe('DatasetConfig', () => {
         dataSets: [dataset],
       })
 
-      expect(screen.getByTestId(`card-item-${dataset.id}`)).toBeInTheDocument()
+      expect(screen.getByTestId(`card-item-${dataset.id}`))!.toBeInTheDocument()
     })
 
     it('should handle missing datasetConfigsRef gracefully', () => {
@@ -816,10 +817,10 @@ describe('DatasetConfig', () => {
         dataSets: datasets,
       })
 
-      expect(screen.getByTestId('card-item-ds1')).toBeInTheDocument()
-      expect(screen.getByTestId('card-item-ds2')).toBeInTheDocument()
-      expect(screen.getByText('Dataset 1')).toBeInTheDocument()
-      expect(screen.getByText('Dataset 2')).toBeInTheDocument()
+      expect(screen.getByTestId('card-item-ds1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('card-item-ds2'))!.toBeInTheDocument()
+      expect(screen.getByText('Dataset 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Dataset 2'))!.toBeInTheDocument()
     })
 
     it('should integrate with params config component', () => {
@@ -833,8 +834,8 @@ describe('DatasetConfig', () => {
       })
 
       const paramsConfig = screen.getByTestId('params-config')
-      expect(paramsConfig).toBeInTheDocument()
-      expect(paramsConfig).toHaveTextContent('Params (2)')
+      expect(paramsConfig)!.toBeInTheDocument()
+      expect(paramsConfig)!.toHaveTextContent('Params (2)')
       expect(paramsConfig).not.toBeDisabled()
     })
 
@@ -860,9 +861,10 @@ describe('DatasetConfig', () => {
       })
 
       const metadataFilter = screen.getByTestId('metadata-filter')
-      expect(metadataFilter).toBeInTheDocument()
+      expect(metadataFilter)!.toBeInTheDocument()
       // Should show intersection (only 'category')
-      expect(screen.getByTestId('metadata-list-count')).toHaveTextContent('1')
+      // Should show intersection (only 'category')
+      expect(screen.getByTestId('metadata-list-count'))!.toHaveTextContent('1')
     })
   })
 
@@ -884,7 +886,7 @@ describe('DatasetConfig', () => {
       })
 
       const metadataFilter = screen.getByTestId('metadata-filter')
-      expect(metadataFilter).toBeInTheDocument()
+      expect(metadataFilter)!.toBeInTheDocument()
 
       fireEvent.click(within(metadataFilter).getByText('Change Metadata Model'))
 
@@ -915,7 +917,7 @@ describe('DatasetConfig', () => {
       })
 
       const metadataFilter = screen.getByTestId('metadata-filter')
-      expect(metadataFilter).toBeInTheDocument()
+      expect(metadataFilter)!.toBeInTheDocument()
 
       fireEvent.click(within(metadataFilter).getByText('Change Metadata Params'))
 
@@ -941,7 +943,8 @@ describe('DatasetConfig', () => {
       })
 
       // The editable property should be false when no permission
-      expect(screen.getByTestId(`card-item-${dataset.id}`)).toBeInTheDocument()
+      // The editable property should be false when no permission
+      expect(screen.getByTestId(`card-item-${dataset.id}`))!.toBeInTheDocument()
     })
 
     it('should show readonly state for non-editable datasets', () => {
@@ -956,7 +959,7 @@ describe('DatasetConfig', () => {
         dataSets: [dataset],
       })
 
-      expect(screen.getByTestId(`card-item-${dataset.id}`)).toBeInTheDocument()
+      expect(screen.getByTestId(`card-item-${dataset.id}`))!.toBeInTheDocument()
     })
 
     it('should allow editing when user has partial member permission', () => {
@@ -972,7 +975,7 @@ describe('DatasetConfig', () => {
         dataSets: [dataset],
       })
 
-      expect(screen.getByTestId(`card-item-${dataset.id}`)).toBeInTheDocument()
+      expect(screen.getByTestId(`card-item-${dataset.id}`))!.toBeInTheDocument()
     })
   })
 
@@ -989,9 +992,10 @@ describe('DatasetConfig', () => {
       })
 
       // Verify order is maintained
-      expect(screen.getByText('Dataset 1')).toBeInTheDocument()
-      expect(screen.getByText('Dataset 2')).toBeInTheDocument()
-      expect(screen.getByText('Dataset 3')).toBeInTheDocument()
+      // Verify order is maintained
+      expect(screen.getByText('Dataset 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Dataset 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Dataset 3'))!.toBeInTheDocument()
     })
 
     it('should handle multiple dataset operations correctly', async () => {
@@ -1007,7 +1011,7 @@ describe('DatasetConfig', () => {
 
       // Remove first dataset
       const removeButton1 = screen.getAllByText('Remove')[0]
-      await user.click(removeButton1)
+      await user.click(removeButton1!)
 
       expect(mockConfigContext.setDataSets).toHaveBeenCalledWith([datasets[1]])
     })
@@ -1050,7 +1054,7 @@ describe('DatasetConfig', () => {
         dataSets: datasets,
       })
 
-      expect(screen.getByTestId('params-config')).toHaveTextContent('Params (2)')
+      expect(screen.getByTestId('params-config'))!.toHaveTextContent('Params (2)')
     })
 
     it('should handle external knowledge base integration', () => {
@@ -1068,8 +1072,8 @@ describe('DatasetConfig', () => {
         dataSets: [externalDataset],
       })
 
-      expect(screen.getByTestId(`card-item-${externalDataset.id}`)).toBeInTheDocument()
-      expect(screen.getByText(externalDataset.name)).toBeInTheDocument()
+      expect(screen.getByTestId(`card-item-${externalDataset.id}`))!.toBeInTheDocument()
+      expect(screen.getByText(externalDataset.name))!.toBeInTheDocument()
     })
   })
 
@@ -1090,7 +1094,7 @@ describe('DatasetConfig', () => {
         dataSets: manyDatasets,
       })
 
-      expect(screen.getByTestId('params-config')).toHaveTextContent('Params (50)')
+      expect(screen.getByTestId('params-config'))!.toHaveTextContent('Params (50)')
     })
 
     it('should handle metadata intersection calculation efficiently', () => {
@@ -1118,7 +1122,8 @@ describe('DatasetConfig', () => {
       })
 
       // Should calculate intersection correctly
-      expect(screen.getByTestId('metadata-filter')).toBeInTheDocument()
+      // Should calculate intersection correctly
+      expect(screen.getByTestId('metadata-filter'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/configuration/dataset-config/card-item/__tests__/index.spec.tsx b/web/app/components/app/configuration/dataset-config/card-item/__tests__/index.spec.tsx
index 16a539bae3..1d14f7dbd2 100644
--- a/web/app/components/app/configuration/dataset-config/card-item/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/card-item/__tests__/index.spec.tsx
@@ -157,9 +157,9 @@ describe('dataset-config/card-item', () => {
     const card = screen.getByText(dataset.name).closest('.group') as HTMLElement
     const actionButtons = within(card).getAllByRole('button', { hidden: true })
 
-    expect(screen.getByText(dataset.name)).toBeInTheDocument()
-    expect(screen.getByText('dataset.indexingTechnique.high_quality · dataset.indexingMethod.semantic_search')).toBeInTheDocument()
-    expect(screen.getByText('dataset.externalTag')).toBeInTheDocument()
+    expect(screen.getByText(dataset.name))!.toBeInTheDocument()
+    expect(screen.getByText('dataset.indexingTechnique.high_quality · dataset.indexingMethod.semantic_search'))!.toBeInTheDocument()
+    expect(screen.getByText('dataset.externalTag'))!.toBeInTheDocument()
     expect(actionButtons).toHaveLength(2)
   })
 
@@ -170,9 +170,9 @@ describe('dataset-config/card-item', () => {
 
     const card = screen.getByText(dataset.name).closest('.group') as HTMLElement
     const [editButton] = within(card).getAllByRole('button', { hidden: true })
-    await user.click(editButton)
+    await user.click(editButton!)
 
-    expect(await screen.findByText('Mock settings modal')).toBeInTheDocument()
+    expect(await screen.findByText('Mock settings modal'))!.toBeInTheDocument()
     fireEvent.click(await screen.findByText('Save changes'))
 
     await waitFor(() => {
@@ -213,8 +213,8 @@ describe('dataset-config/card-item', () => {
     const nameElement = screen.getByText(dataset.name)
     const iconElement = nameElement.parentElement?.firstElementChild as HTMLElement
 
-    expect(iconElement).toHaveStyle({ background: '#FFF4ED' })
-    expect(iconElement.querySelector('em-emoji')).toHaveAttribute('id', '📙')
+    expect(iconElement)!.toHaveStyle({ background: '#FFF4ED' })
+    expect(iconElement.querySelector('em-emoji'))!.toHaveAttribute('id', '📙')
   })
 
   it('should apply mask overlay on mobile when drawer is open', async () => {
@@ -226,12 +226,12 @@ describe('dataset-config/card-item', () => {
 
     const card = screen.getByText(dataset.name).closest('.group') as HTMLElement
     const [editButton] = within(card).getAllByRole('button', { hidden: true })
-    await user.click(editButton)
-    expect(screen.getByText('Mock settings modal')).toBeInTheDocument()
+    await user.click(editButton!)
+    expect(screen.getByText('Mock settings modal'))!.toBeInTheDocument()
 
     const overlay = [...document.querySelectorAll('[class]')]
       .find(element => element.className.toString().includes('bg-black/30'))
 
-    expect(overlay).toBeInTheDocument()
+    expect(overlay)!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/app/configuration/dataset-config/context-var/__tests__/index.spec.tsx b/web/app/components/app/configuration/dataset-config/context-var/__tests__/index.spec.tsx
index 0d886fa9e5..6726ba0583 100644
--- a/web/app/components/app/configuration/dataset-config/context-var/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/context-var/__tests__/index.spec.tsx
@@ -87,7 +87,8 @@ describe('ContextVar', () => {
       render(<ContextVar {...props} />)
 
       // Assert
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.title')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.title'))!.toBeInTheDocument()
     })
 
     it('should show selected variable with proper formatting when value is provided', () => {
@@ -98,9 +99,10 @@ describe('ContextVar', () => {
       render(<ContextVar {...props} />)
 
       // Assert
-      expect(screen.getByText('var1')).toBeInTheDocument()
-      expect(screen.getByText('{{')).toBeInTheDocument()
-      expect(screen.getByText('}}')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('var1'))!.toBeInTheDocument()
+      expect(screen.getByText('{{'))!.toBeInTheDocument()
+      expect(screen.getByText('}}'))!.toBeInTheDocument()
     })
   })
 
@@ -114,7 +116,8 @@ describe('ContextVar', () => {
       render(<ContextVar {...props} />)
 
       // Assert - Should display the selected value
-      expect(screen.getByText('var2')).toBeInTheDocument()
+      // Assert - Should display the selected value
+      expect(screen.getByText('var2'))!.toBeInTheDocument()
     })
 
     it('should show placeholder text when no value is selected', () => {
@@ -127,9 +130,40 @@ describe('ContextVar', () => {
       // Act
       render(<ContextVar {...props} />)
 
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
+      // Assert - Should show placeholder instead of variable
       // Assert - Should show placeholder instead of variable
       expect(screen.queryByText('var1')).not.toBeInTheDocument()
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder')).toBeInTheDocument()
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
     })
 
     it('should display custom tip message when notSelectedVarTip is provided', () => {
@@ -144,7 +178,8 @@ describe('ContextVar', () => {
       render(<ContextVar {...props} />)
 
       // Assert
-      expect(screen.getByText('Select a variable')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Select a variable'))!.toBeInTheDocument()
     })
 
     it('should apply custom className to VarPicker when provided', () => {
@@ -158,7 +193,8 @@ describe('ContextVar', () => {
       const { container } = render(<ContextVar {...props} />)
 
       // Assert
-      expect(container.querySelector('.custom-class')).toBeInTheDocument()
+      // Assert
+      expect(container.querySelector('.custom-class'))!.toBeInTheDocument()
     })
   })
 
@@ -176,13 +212,13 @@ describe('ContextVar', () => {
       const triggers = screen.getAllByTestId('portal-trigger')
       const varPickerTrigger = triggers[triggers.length - 1]
 
-      await user.click(varPickerTrigger)
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      await user.click(varPickerTrigger!)
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
 
       // Select a different option
       const options = screen.getAllByText('var2')
       expect(options.length).toBeGreaterThan(0)
-      await user.click(options[0])
+      await user.click(options[0]!)
 
       // Assert
       expect(onChange).toHaveBeenCalledWith('var2')
@@ -201,11 +237,11 @@ describe('ContextVar', () => {
       const varPickerTrigger = triggers[triggers.length - 1]
 
       // Open dropdown
-      await user.click(varPickerTrigger)
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      await user.click(varPickerTrigger!)
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
 
       // Close dropdown
-      await user.click(varPickerTrigger)
+      await user.click(varPickerTrigger!)
       expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
     })
   })
@@ -223,8 +259,9 @@ describe('ContextVar', () => {
       render(<ContextVar {...props} />)
 
       // Assert
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.title')).toBeInTheDocument()
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.title'))!.toBeInTheDocument()
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
       expect(screen.queryByText('var1')).not.toBeInTheDocument()
     })
 
@@ -240,8 +277,9 @@ describe('ContextVar', () => {
       render(<ContextVar {...props} />)
 
       // Assert
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.title')).toBeInTheDocument()
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.title'))!.toBeInTheDocument()
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
     })
 
     it('should handle null value without crashing', () => {
@@ -255,8 +293,9 @@ describe('ContextVar', () => {
       render(<ContextVar {...props} />)
 
       // Assert
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.title')).toBeInTheDocument()
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.title'))!.toBeInTheDocument()
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
     })
 
     it('should handle options with different data types', () => {
@@ -275,9 +314,10 @@ describe('ContextVar', () => {
       render(<ContextVar {...props} />)
 
       // Assert
-      expect(screen.getByText('strVar')).toBeInTheDocument()
-      expect(screen.getByText('{{')).toBeInTheDocument()
-      expect(screen.getByText('}}')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('strVar'))!.toBeInTheDocument()
+      expect(screen.getByText('{{'))!.toBeInTheDocument()
+      expect(screen.getByText('}}'))!.toBeInTheDocument()
     })
 
     it('should render variable names with special characters safely', () => {
@@ -294,7 +334,8 @@ describe('ContextVar', () => {
       render(<ContextVar {...props} />)
 
       // Assert
-      expect(screen.getByText('specialVar')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('specialVar'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/configuration/dataset-config/context-var/__tests__/var-picker.spec.tsx b/web/app/components/app/configuration/dataset-config/context-var/__tests__/var-picker.spec.tsx
index 15052e9351..1d81a31091 100644
--- a/web/app/components/app/configuration/dataset-config/context-var/__tests__/var-picker.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/context-var/__tests__/var-picker.spec.tsx
@@ -88,8 +88,9 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
-      expect(screen.getByText('var1')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByText('var1'))!.toBeInTheDocument()
     })
 
     it('should display selected variable with type icon when value is provided', () => {
@@ -100,11 +101,13 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByText('var1')).toBeInTheDocument()
-      expect(screen.getByText('{{')).toBeInTheDocument()
-      expect(screen.getByText('}}')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('var1'))!.toBeInTheDocument()
+      expect(screen.getByText('{{'))!.toBeInTheDocument()
+      expect(screen.getByText('}}'))!.toBeInTheDocument()
       // IconTypeIcon should be rendered (check for svg icon)
-      expect(document.querySelector('svg')).toBeInTheDocument()
+      // IconTypeIcon should be rendered (check for svg icon)
+      expect(document.querySelector('svg'))!.toBeInTheDocument()
     })
 
     it('should show placeholder text when no value is selected', () => {
@@ -117,9 +120,40 @@ describe('VarPicker', () => {
       // Act
       render(<VarPicker {...props} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByText('var1')).not.toBeInTheDocument()
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder')).toBeInTheDocument()
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
     })
 
     it('should display custom tip message when notSelectedVarTip is provided', () => {
@@ -134,7 +168,8 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByText('Select a variable')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Select a variable'))!.toBeInTheDocument()
     })
 
     it('should render dropdown indicator icon', () => {
@@ -145,7 +180,8 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert - Trigger should be present
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
+      // Assert - Trigger should be present
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -162,7 +198,8 @@ describe('VarPicker', () => {
       const { container } = render(<VarPicker {...props} />)
 
       // Assert
-      expect(container.querySelector('.custom-class')).toBeInTheDocument()
+      // Assert
+      expect(container.querySelector('.custom-class'))!.toBeInTheDocument()
     })
 
     it('should apply custom triggerClassName to trigger button', () => {
@@ -176,7 +213,8 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByTestId('portal-trigger')).toHaveClass('custom-trigger-class')
+      // Assert
+      expect(screen.getByTestId('portal-trigger'))!.toHaveClass('custom-trigger-class')
     })
 
     it('should display selected value with proper formatting', () => {
@@ -193,9 +231,10 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByText('customVar')).toBeInTheDocument()
-      expect(screen.getByText('{{')).toBeInTheDocument()
-      expect(screen.getByText('}}')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('customVar'))!.toBeInTheDocument()
+      expect(screen.getByText('{{'))!.toBeInTheDocument()
+      expect(screen.getByText('}}'))!.toBeInTheDocument()
     })
   })
 
@@ -212,7 +251,8 @@ describe('VarPicker', () => {
       await user.click(screen.getByTestId('portal-trigger'))
 
       // Assert
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should call onChange and close dropdown when selecting an option', async () => {
@@ -226,12 +266,12 @@ describe('VarPicker', () => {
 
       // Open dropdown
       await user.click(screen.getByTestId('portal-trigger'))
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
 
       // Select a different option
       const options = screen.getAllByText('var2')
       expect(options.length).toBeGreaterThan(0)
-      await user.click(options[0])
+      await user.click(options[0]!)
 
       // Assert
       expect(onChange).toHaveBeenCalledWith('var2')
@@ -250,7 +290,7 @@ describe('VarPicker', () => {
 
       // Open dropdown
       await user.click(trigger)
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
 
       // Close dropdown
       await user.click(trigger)
@@ -267,6 +307,37 @@ describe('VarPicker', () => {
       // Act
       render(<VarPicker {...props} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
     })
@@ -284,7 +355,7 @@ describe('VarPicker', () => {
 
       // Open dropdown
       await user.click(trigger)
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
 
       // Close dropdown
       await user.click(trigger)
@@ -305,7 +376,8 @@ describe('VarPicker', () => {
       await user.click(trigger)
 
       // Assert
-      expect(screen.getByText('var1')).toBeInTheDocument() // Original value still displayed
+      // Assert
+      expect(screen.getByText('var1'))!.toBeInTheDocument() // Original value still displayed
     })
   })
 
@@ -322,8 +394,9 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder')).toBeInTheDocument()
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
     })
 
     it('should handle empty options array', () => {
@@ -338,8 +411,9 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
     })
 
     it('should handle null value without crashing', () => {
@@ -353,7 +427,8 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
     })
 
     it('should handle variable names with special characters safely', () => {
@@ -370,7 +445,8 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByText('specialVar')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('specialVar'))!.toBeInTheDocument()
     })
 
     it('should handle long variable names', () => {
@@ -387,8 +463,9 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Assert
-      expect(screen.getByText('longVar')).toBeInTheDocument()
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('longVar'))!.toBeInTheDocument()
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/configuration/dataset-config/params-config/__tests__/config-content.spec.tsx b/web/app/components/app/configuration/dataset-config/params-config/__tests__/config-content.spec.tsx
index 6d734763ea..a17b39e4b4 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/__tests__/config-content.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/__tests__/config-content.spec.tsx
@@ -203,7 +203,7 @@ describe('ConfigContent', () => {
       await waitFor(() => {
         expect(onChange).toHaveBeenCalled()
       })
-      const [nextConfigs] = onChange.mock.calls[0]
+      const [nextConfigs] = (onChange.mock.calls[0] ?? []) as [any]
       expect(nextConfigs.retrieval_model).toBe(RETRIEVE_TYPE.multiWay)
     })
   })
@@ -239,10 +239,11 @@ describe('ConfigContent', () => {
       )
 
       // Assert
-      expect(screen.getByText('dataset.weightedScore.title')).toBeInTheDocument()
-      expect(screen.getByText('common.modelProvider.rerankModel.key')).toBeInTheDocument()
-      expect(screen.getByText('dataset.weightedScore.semantic')).toBeInTheDocument()
-      expect(screen.getByText('dataset.weightedScore.keyword')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('dataset.weightedScore.title'))!.toBeInTheDocument()
+      expect(screen.getByText('common.modelProvider.rerankModel.key'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.weightedScore.semantic'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.weightedScore.keyword'))!.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/app/configuration/dataset-config/params-config/__tests__/index.spec.tsx b/web/app/components/app/configuration/dataset-config/params-config/__tests__/index.spec.tsx
index d75f46b371..a892de7fee 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/__tests__/index.spec.tsx
@@ -164,7 +164,8 @@ describe('dataset-config/params-config', () => {
       renderParamsConfig({ disabled: true })
 
       // Assert
-      expect(screen.getByRole('button', { name: 'dataset.retrievalSettings' })).toBeDisabled()
+      // Assert
+      expect(screen.getByRole('button', { name: 'dataset.retrievalSettings' }))!.toBeDisabled()
     })
   })
 
@@ -181,11 +182,11 @@ describe('dataset-config/params-config', () => {
       const dialogScope = within(dialog)
 
       const incrementButtons = dialogScope.getAllByRole('button', { name: /increment/i })
-      await user.click(incrementButtons[0])
+      await user.click(incrementButtons[0]!)
 
       await waitFor(() => {
         const [topKInput] = dialogScope.getAllByRole('textbox')
-        expect(topKInput).toHaveValue('5')
+        expect(topKInput)!.toHaveValue('5')
       })
 
       await user.click(dialogScope.getByRole('button', { name: 'common.operation.save' }))
@@ -200,7 +201,8 @@ describe('dataset-config/params-config', () => {
       const [reopenedTopKInput] = reopenedScope.getAllByRole('textbox')
 
       // Assert
-      expect(reopenedTopKInput).toHaveValue('5')
+      // Assert
+      expect(reopenedTopKInput)!.toHaveValue('5')
     })
 
     it('should discard changes when cancel is clicked', async () => {
@@ -214,11 +216,11 @@ describe('dataset-config/params-config', () => {
       const dialogScope = within(dialog)
 
       const incrementButtons = dialogScope.getAllByRole('button', { name: /increment/i })
-      await user.click(incrementButtons[0])
+      await user.click(incrementButtons[0]!)
 
       await waitFor(() => {
         const [topKInput] = dialogScope.getAllByRole('textbox')
-        expect(topKInput).toHaveValue('5')
+        expect(topKInput)!.toHaveValue('5')
       })
 
       const cancelButton = await dialogScope.findByRole('button', { name: 'common.operation.cancel' })
@@ -234,7 +236,8 @@ describe('dataset-config/params-config', () => {
       const [reopenedTopKInput] = reopenedScope.getAllByRole('textbox')
 
       // Assert
-      expect(reopenedTopKInput).toHaveValue('4')
+      // Assert
+      expect(reopenedTopKInput)!.toHaveValue('4')
     })
 
     it('should prevent saving when rerank model is required but invalid', async () => {
@@ -255,7 +258,7 @@ describe('dataset-config/params-config', () => {
 
       // Assert
       expect(toastErrorSpy).toHaveBeenCalledWith('appDebug.datasetConfig.rerankModelRequired')
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
+      expect(screen.getByRole('dialog'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx b/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx
index f712d7017a..bb260fb499 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/config-content.tsx
@@ -121,10 +121,10 @@ const ConfigContent: FC<Props> = ({
         ...datasetConfigs.weights!,
         vector_setting: {
           ...datasetConfigs.weights!.vector_setting!,
-          vector_weight: value.value[0],
+          vector_weight: value.value[0]!,
         },
         keyword_setting: {
-          keyword_weight: value.value[1],
+          keyword_weight: value.value[1]!,
         },
       },
     }
diff --git a/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx b/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
index d4ce935a4d..c8f7bc49ec 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
@@ -54,10 +54,10 @@ const WeightedScore = ({
             <div className="mr-1 truncate uppercase" title={t('weightedScore.semantic', { ns: 'dataset' }) || ''}>
               {t('weightedScore.semantic', { ns: 'dataset' })}
             </div>
-            {formatNumber(value.value[0])}
+            {formatNumber(value.value[0]!)}
           </div>
           <div className="flex w-[90px] shrink-0 items-center justify-end text-util-colors-teal-teal-500 system-xs-semibold-uppercase">
-            {formatNumber(value.value[1])}
+            {formatNumber(value.value[1]!)}
             <div className="ml-1 truncate uppercase" title={t('weightedScore.keyword', { ns: 'dataset' }) || ''}>
               {t('weightedScore.keyword', { ns: 'dataset' })}
             </div>
diff --git a/web/app/components/app/configuration/dataset-config/settings-modal/__tests__/retrieval-section.spec.tsx b/web/app/components/app/configuration/dataset-config/settings-modal/__tests__/retrieval-section.spec.tsx
index e100ed9490..e4e3f5ab71 100644
--- a/web/app/components/app/configuration/dataset-config/settings-modal/__tests__/retrieval-section.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/settings-modal/__tests__/retrieval-section.spec.tsx
@@ -152,7 +152,8 @@ describe('RetrievalChangeTip', () => {
     await userEvent.click(screen.getByRole('button', { name: 'close-retrieval-change-tip' }))
 
     // Assert
-    expect(screen.getByText('Test message')).toBeInTheDocument()
+    // Assert
+    expect(screen.getByText('Test message'))!.toBeInTheDocument()
     expect(onDismiss).toHaveBeenCalledTimes(1)
   })
 
@@ -160,6 +161,37 @@ describe('RetrievalChangeTip', () => {
     // Arrange & Act
     render(<RetrievalChangeTip {...defaultProps} visible={false} />)
 
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
     // Assert
     expect(screen.queryByText('Test message')).not.toBeInTheDocument()
   })
@@ -213,12 +245,13 @@ describe('RetrievalSection', () => {
       />,
     )
     const [topKIncrement] = screen.getAllByRole('button', { name: /increment/i })
-    await userEvent.click(topKIncrement)
+    await userEvent.click(topKIncrement!)
 
     // Assert
-    expect(screen.getByText('External API')).toBeInTheDocument()
-    expect(screen.getByText('https://api.external.com')).toBeInTheDocument()
-    expect(screen.getByText('ext-id-999')).toBeInTheDocument()
+    // Assert
+    expect(screen.getByText('External API'))!.toBeInTheDocument()
+    expect(screen.getByText('https://api.external.com'))!.toBeInTheDocument()
+    expect(screen.getByText('ext-id-999'))!.toBeInTheDocument()
     expect(handleExternalChange).toHaveBeenCalledWith(expect.objectContaining({ top_k: 4 }))
   })
 
@@ -243,9 +276,10 @@ describe('RetrievalSection', () => {
     )
 
     // Assert
-    expect(screen.getByText('dataset.retrieval.semantic_search.title')).toBeInTheDocument()
+    // Assert
+    expect(screen.getByText('dataset.retrieval.semantic_search.title'))!.toBeInTheDocument()
     const learnMoreLink = screen.getByRole('link', { name: 'datasetSettings.form.retrievalSetting.learnMore' })
-    expect(learnMoreLink).toHaveAttribute('href', 'https://docs.example/use-dify/knowledge/create-knowledge/setting-indexing-methods')
+    expect(learnMoreLink)!.toHaveAttribute('href', 'https://docs.example/use-dify/knowledge/create-knowledge/setting-indexing-methods')
     expect(docLink).toHaveBeenCalledWith('/use-dify/knowledge/create-knowledge/setting-indexing-methods')
   })
 
@@ -268,10 +302,11 @@ describe('RetrievalSection', () => {
       />,
     )
     const [topKIncrement] = screen.getAllByRole('button', { name: /increment/i })
-    await userEvent.click(topKIncrement)
+    await userEvent.click(topKIncrement!)
 
     // Assert
-    expect(screen.getByText('dataset.retrieval.keyword_search.title')).toBeInTheDocument()
+    // Assert
+    expect(screen.getByText('dataset.retrieval.keyword_search.title'))!.toBeInTheDocument()
     expect(handleRetrievalChange).toHaveBeenCalledWith(expect.objectContaining({
       top_k: 3,
     }))
diff --git a/web/app/components/app/configuration/debug/__tests__/index.spec.tsx b/web/app/components/app/configuration/debug/__tests__/index.spec.tsx
index 071307303b..4a50ecc626 100644
--- a/web/app/components/app/configuration/debug/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/debug/__tests__/index.spec.tsx
@@ -479,8 +479,8 @@ describe('Debug', () => {
         },
       })
 
-      expect(screen.getByText('appDebug.noModelProviderConfigured')).toBeInTheDocument()
-      expect(screen.getByText('appDebug.noModelProviderConfiguredTip')).toBeInTheDocument()
+      expect(screen.getByText('appDebug.noModelProviderConfigured'))!.toBeInTheDocument()
+      expect(screen.getByText('appDebug.noModelProviderConfiguredTip'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByRole('button', { name: 'appDebug.manageModels' }))
       expect(onSetting).toHaveBeenCalledTimes(1)
@@ -500,8 +500,8 @@ describe('Debug', () => {
         },
       })
 
-      expect(screen.getByText('appDebug.noModelSelected')).toBeInTheDocument()
-      expect(screen.getByText('appDebug.noModelSelectedTip')).toBeInTheDocument()
+      expect(screen.getByText('appDebug.noModelSelected'))!.toBeInTheDocument()
+      expect(screen.getByText('appDebug.noModelSelectedTip'))!.toBeInTheDocument()
       expect(screen.queryByText('appDebug.noModelProviderConfigured')).not.toBeInTheDocument()
     })
   })
@@ -510,9 +510,9 @@ describe('Debug', () => {
     it('should render single-model panel and refresh conversation', () => {
       renderDebug()
 
-      expect(screen.getByTestId('debug-with-single-model')).toBeInTheDocument()
+      expect(screen.getByTestId('debug-with-single-model'))!.toBeInTheDocument()
 
-      fireEvent.click(screen.getAllByTestId('action-button')[0])
+      fireEvent.click(screen.getAllByTestId('action-button')[0]!)
       expect(mockState.mockHandleRestart).toHaveBeenCalledTimes(1)
     })
 
@@ -535,8 +535,8 @@ describe('Debug', () => {
         },
       })
 
-      expect(screen.getByTestId('chat-user-input')).toBeInTheDocument()
-      fireEvent.click(screen.getAllByTestId('action-button')[1])
+      expect(screen.getByTestId('chat-user-input'))!.toBeInTheDocument()
+      fireEvent.click(screen.getAllByTestId('action-button')[1]!)
       expect(screen.queryByTestId('chat-user-input')).not.toBeInTheDocument()
     })
 
@@ -560,7 +560,7 @@ describe('Debug', () => {
         },
       })
 
-      expect(screen.getByTestId('formatting-changed')).toBeInTheDocument()
+      expect(screen.getByTestId('formatting-changed'))!.toBeInTheDocument()
       fireEvent.click(screen.getByTestId('formatting-cancel'))
       expect(setFormattingChanged).toHaveBeenCalledWith(false)
     })
@@ -623,8 +623,8 @@ describe('Debug', () => {
         },
       })
 
-      expect(screen.getByTestId('prompt-value-panel')).toBeInTheDocument()
-      expect(screen.getByText('appDebug.noResult')).toBeInTheDocument()
+      expect(screen.getByTestId('prompt-value-panel'))!.toBeInTheDocument()
+      expect(screen.getByText('appDebug.noResult'))!.toBeInTheDocument()
     })
 
     it('should notify when required input is missing', () => {
@@ -696,7 +696,7 @@ describe('Debug', () => {
       })
 
       fireEvent.click(screen.getByTestId('panel-send'))
-      expect(screen.getByTestId('cannot-query-dataset')).toBeInTheDocument()
+      expect(screen.getByTestId('cannot-query-dataset'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('cannot-query-confirm'))
       expect(screen.queryByTestId('cannot-query-dataset')).not.toBeInTheDocument()
@@ -752,7 +752,7 @@ describe('Debug', () => {
       fireEvent.click(screen.getByTestId('panel-send'))
 
       await waitFor(() => expect(mockState.mockSendCompletionMessage).toHaveBeenCalledTimes(1))
-      const [, requestData] = mockState.mockSendCompletionMessage.mock.calls[0]
+      const [, requestData] = (mockState.mockSendCompletionMessage.mock.calls[0] ?? []) as [unknown, any]
       expect(requestData).toMatchObject({
         inputs: { question: 'hello' },
         model_config: {
@@ -763,9 +763,9 @@ describe('Debug', () => {
           dataset_query_variable: 'question',
         },
       })
-      expect(screen.getByTestId('text-generation')).toHaveTextContent('final answer')
-      expect(screen.getByTestId('text-generation')).toHaveAttribute('data-message-id', 'msg-1')
-      expect(screen.getByTestId('text-generation')).toHaveAttribute('data-tts', 'true')
+      expect(screen.getByTestId('text-generation'))!.toHaveTextContent('final answer')
+      expect(screen.getByTestId('text-generation'))!.toHaveAttribute('data-message-id', 'msg-1')
+      expect(screen.getByTestId('text-generation'))!.toHaveAttribute('data-tts', 'true')
     })
 
     it('should notify when sending again while a response is in progress', async () => {
@@ -830,7 +830,7 @@ describe('Debug', () => {
       fireEvent.click(screen.getByTestId('panel-send'))
 
       await waitFor(() => expect(mockState.mockSendCompletionMessage).toHaveBeenCalledTimes(1))
-      expect(screen.getByText('appDebug.noResult')).toBeInTheDocument()
+      expect(screen.getByText('appDebug.noResult'))!.toBeInTheDocument()
     })
 
     it('should render prompt log modal in completion mode when store flag is enabled', () => {
@@ -845,7 +845,7 @@ describe('Debug', () => {
         },
       })
 
-      expect(screen.getByTestId('prompt-log-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('prompt-log-modal'))!.toBeInTheDocument()
     })
 
     it('should close prompt log modal in completion mode', () => {
@@ -904,7 +904,7 @@ describe('Debug', () => {
         },
       })
 
-      expect(screen.getByRole('button', { name: 'common.modelProvider.addModel(4/4)' })).toBeDisabled()
+      expect(screen.getByRole('button', { name: 'common.modelProvider.addModel(4/4)' }))!.toBeDisabled()
     })
 
     it('should emit completion event in multiple-model completion mode', () => {
@@ -945,7 +945,7 @@ describe('Debug', () => {
         },
       })
 
-      fireEvent.click(screen.getAllByTestId('action-button')[0])
+      fireEvent.click(screen.getAllByTestId('action-button')[0]!)
       expect(mockState.mockEventEmitterEmit).toHaveBeenCalledWith({
         type: APP_CHAT_WITH_MULTIPLE_MODEL_RESTART,
       })
@@ -1012,8 +1012,8 @@ describe('Debug', () => {
         },
       })
 
-      expect(screen.getByTestId('prompt-log-modal')).toBeInTheDocument()
-      expect(screen.getByTestId('agent-log-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('prompt-log-modal'))!.toBeInTheDocument()
+      expect(screen.getByTestId('agent-log-modal'))!.toBeInTheDocument()
     })
 
     it('should close prompt and agent log modals in multiple-model mode', () => {
diff --git a/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/context-provider.spec.tsx b/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/context-provider.spec.tsx
index 5608f4c5a2..6ed016ecc7 100644
--- a/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/context-provider.spec.tsx
+++ b/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/context-provider.spec.tsx
@@ -8,7 +8,7 @@ const ContextConsumer = () => {
     <div>
       <div>{value.multipleModelConfigs.length}</div>
       <button onClick={() => value.onMultipleModelConfigsChange(true, value.multipleModelConfigs)}>change-multiple</button>
-      <button onClick={() => value.onDebugWithMultipleModelChange(value.multipleModelConfigs[0])}>change-single</button>
+      <button onClick={() => value.onDebugWithMultipleModelChange(value.multipleModelConfigs[0]!)}>change-single</button>
       <div>{String(value.checkCanSend?.())}</div>
     </div>
   )
@@ -32,7 +32,7 @@ describe('DebugWithMultipleModelContextProvider', () => {
       </DebugWithMultipleModelContextProvider>,
     )
 
-    expect(screen.getByText('1')).toBeInTheDocument()
-    expect(screen.getByText('true')).toBeInTheDocument()
+    expect(screen.getByText('1'))!.toBeInTheDocument()
+    expect(screen.getByText('true'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/debug-item.spec.tsx b/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/debug-item.spec.tsx
index 19c5fbf3fa..747ea4efcb 100644
--- a/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/debug-item.spec.tsx
+++ b/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/debug-item.spec.tsx
@@ -141,8 +141,8 @@ describe('DebugItem', () => {
     it('should render with basic props', () => {
       renderComponent()
 
-      expect(screen.getByTestId('model-parameter-trigger')).toBeInTheDocument()
-      expect(screen.getByTestId('dropdown')).toBeInTheDocument()
+      expect(screen.getByTestId('model-parameter-trigger'))!.toBeInTheDocument()
+      expect(screen.getByTestId('dropdown'))!.toBeInTheDocument()
     })
 
     it('should display correct index number', () => {
@@ -170,7 +170,7 @@ describe('DebugItem', () => {
       })
 
       const wrapper = container.firstChild as HTMLElement
-      expect(wrapper).toHaveClass('custom-class')
+      expect(wrapper)!.toHaveClass('custom-class')
       expect(wrapper.style.backgroundColor).toBe('red')
     })
 
@@ -193,7 +193,7 @@ describe('DebugItem', () => {
 
       renderComponent()
 
-      expect(screen.getByTestId('chat-item')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-item'))!.toBeInTheDocument()
       expect(screen.queryByTestId('text-generation-item')).not.toBeInTheDocument()
     })
 
@@ -207,7 +207,7 @@ describe('DebugItem', () => {
 
       renderComponent()
 
-      expect(screen.getByTestId('chat-item')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-item'))!.toBeInTheDocument()
     })
 
     it('should not render ChatItem when model is not active', () => {
@@ -261,7 +261,7 @@ describe('DebugItem', () => {
 
       renderComponent()
 
-      expect(screen.getByTestId('text-generation-item')).toBeInTheDocument()
+      expect(screen.getByTestId('text-generation-item'))!.toBeInTheDocument()
       expect(screen.queryByTestId('chat-item')).not.toBeInTheDocument()
     })
 
@@ -502,7 +502,7 @@ describe('DebugItem', () => {
         expect.arrayContaining([
           models[0],
           models[1],
-          expect.objectContaining({ model: models[1].model }),
+          expect.objectContaining({ model: models[1]!.model }),
           models[2],
         ]),
       )
@@ -545,6 +545,37 @@ describe('DebugItem', () => {
 
       renderComponent()
 
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
+      // When provider/model doesn't match, ChatItem won't render
       // When provider/model doesn't match, ChatItem won't render
       expect(screen.queryByTestId('chat-item')).not.toBeInTheDocument()
     })
diff --git a/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/index.spec.tsx b/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/index.spec.tsx
index f1ee03ebbc..bd12ff2c14 100644
--- a/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/debug/debug-with-multiple-model/__tests__/index.spec.tsx
@@ -194,13 +194,13 @@ describe('DebugWithMultipleModel', () => {
     it('should handle empty multipleModelConfigs array', () => {
       renderComponent({ multipleModelConfigs: [] })
       expect(screen.queryByTestId('debug-item')).not.toBeInTheDocument()
-      expect(screen.getByTestId('chat-input-area')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-input-area'))!.toBeInTheDocument()
     })
 
     it('should handle model config with missing required fields', () => {
       const incompleteConfig = { id: 'incomplete' } as ModelAndParameter
       renderComponent({ multipleModelConfigs: [incompleteConfig] })
-      expect(screen.getByTestId('debug-item')).toBeInTheDocument()
+      expect(screen.getByTestId('debug-item'))!.toBeInTheDocument()
     })
 
     it('should handle more than 4 model configs', () => {
@@ -257,7 +257,8 @@ describe('DebugWithMultipleModel', () => {
       renderComponent()
 
       // Should still render but handle gracefully
-      expect(screen.getByTestId('chat-input-area')).toBeInTheDocument()
+      // Should still render but handle gracefully
+      expect(screen.getByTestId('chat-input-area'))!.toBeInTheDocument()
       expect(capturedChatInputProps?.inputsForm).toHaveLength(3)
     })
   })
@@ -287,7 +288,7 @@ describe('DebugWithMultipleModel', () => {
       rerender(<DebugWithMultipleModel {...props2} />)
 
       const items = screen.getAllByTestId('debug-item')
-      expect(items[0]).toHaveAttribute('data-model-id', 'model-2')
+      expect(items[0])!.toHaveAttribute('data-model-id', 'model-2')
     })
   })
 
@@ -296,14 +297,14 @@ describe('DebugWithMultipleModel', () => {
       renderComponent()
 
       const chatInput = screen.getByTestId('chat-input-area')
-      expect(chatInput).toBeInTheDocument()
+      expect(chatInput)!.toBeInTheDocument()
 
       // Check for button accessibility
       const sendButton = screen.getByRole('button', { name: /send/i })
-      expect(sendButton).toBeInTheDocument()
+      expect(sendButton)!.toBeInTheDocument()
 
       const featureButton = screen.getByRole('button', { name: /feature/i })
-      expect(featureButton).toBeInTheDocument()
+      expect(featureButton)!.toBeInTheDocument()
     })
 
     it('should apply ARIA attributes correctly', () => {
@@ -312,8 +313,8 @@ describe('DebugWithMultipleModel', () => {
 
       // Debug items should be identifiable
       const debugItem = screen.getByTestId('debug-item')
-      expect(debugItem).toBeInTheDocument()
-      expect(debugItem).toHaveAttribute('data-model-id')
+      expect(debugItem)!.toBeInTheDocument()
+      expect(debugItem)!.toHaveAttribute('data-model-id')
     })
   })
 
@@ -422,7 +423,8 @@ describe('DebugWithMultipleModel', () => {
       fireEvent.click(screen.getByRole('button', { name: /feature/i }))
 
       // Assert
-      expect(screen.getByTestId('chat-input-area')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('chat-input-area'))!.toBeInTheDocument()
       expect(capturedChatInputProps?.inputs).toEqual({ audience: 'engineers' })
       expect(capturedChatInputProps?.inputsForm).toEqual([
         expect.objectContaining({ label: 'City', variable: 'city', hide: false, required: true }),
@@ -446,7 +448,8 @@ describe('DebugWithMultipleModel', () => {
       renderComponent()
 
       // Assert
-      expect(screen.getByTestId('chat-input-area')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('chat-input-area'))!.toBeInTheDocument()
     })
 
     it('should hide chat input when not in chat mode', () => {
@@ -459,6 +462,37 @@ describe('DebugWithMultipleModel', () => {
       // Act
       renderComponent({ multipleModelConfigs })
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByTestId('chat-input-area')).not.toBeInTheDocument()
       expect(screen.getAllByTestId('debug-item')).toHaveLength(1)
@@ -538,7 +572,8 @@ describe('DebugWithMultipleModel', () => {
       expect(secondItems).toHaveLength(1)
 
       // Check that the element still renders the same content
-      expect(firstItems[0]).toHaveTextContent(secondItems[0].textContent || '')
+      // Check that the element still renders the same content
+      expect(firstItems[0])!.toHaveTextContent(secondItems[0]!.textContent || '')
     })
 
     it('should recalculate size and position when number of models changes', () => {
@@ -557,8 +592,8 @@ describe('DebugWithMultipleModel', () => {
       )
 
       const twoItems = screen.getAllByTestId('debug-item')
-      expect(twoItems[0].style.width).toBe('calc(50% - 4px - 24px)')
-      expect(twoItems[1].style.width).toBe('calc(50% - 4px - 24px)')
+      expect(twoItems[0]!.style.width).toBe('calc(50% - 4px - 24px)')
+      expect(twoItems[1]!.style.width).toBe('calc(50% - 4px - 24px)')
     })
   })
 
@@ -583,7 +618,7 @@ describe('DebugWithMultipleModel', () => {
         expect(element.style.height).toBe('')
 
       expect(element.style.transform).toBe(expectation.transform)
-      expectation.classes?.forEach(cls => expect(element).toHaveClass(cls))
+      expectation.classes?.forEach(cls => expect(element)!.toHaveClass(cls))
     }
 
     it('should arrange items in two-column layout for two models', () => {
@@ -596,13 +631,13 @@ describe('DebugWithMultipleModel', () => {
 
       // Assert
       expect(items).toHaveLength(2)
-      expectItemLayout(items[0], {
+      expectItemLayout(items[0]!, {
         width: 'calc(50% - 4px - 24px)',
         height: '100%',
         transform: 'translateX(0) translateY(0)',
         classes: ['mr-2'],
       })
-      expectItemLayout(items[1], {
+      expectItemLayout(items[1]!, {
         width: 'calc(50% - 4px - 24px)',
         height: '100%',
         transform: 'translateX(calc(100% + 8px)) translateY(0)',
@@ -620,19 +655,19 @@ describe('DebugWithMultipleModel', () => {
 
       // Assert
       expect(items).toHaveLength(3)
-      expectItemLayout(items[0], {
+      expectItemLayout(items[0]!, {
         width: 'calc(33.3% - 5.33px - 16px)',
         height: '100%',
         transform: 'translateX(0) translateY(0)',
         classes: ['mr-2'],
       })
-      expectItemLayout(items[1], {
+      expectItemLayout(items[1]!, {
         width: 'calc(33.3% - 5.33px - 16px)',
         height: '100%',
         transform: 'translateX(calc(100% + 8px)) translateY(0)',
         classes: ['mr-2'],
       })
-      expectItemLayout(items[2], {
+      expectItemLayout(items[2]!, {
         width: 'calc(33.3% - 5.33px - 16px)',
         height: '100%',
         transform: 'translateX(calc(200% + 16px)) translateY(0)',
@@ -655,25 +690,25 @@ describe('DebugWithMultipleModel', () => {
 
       // Assert
       expect(items).toHaveLength(4)
-      expectItemLayout(items[0], {
+      expectItemLayout(items[0]!, {
         width: 'calc(50% - 4px - 24px)',
         height: 'calc(50% - 4px)',
         transform: 'translateX(0) translateY(0)',
         classes: ['mr-2', 'mb-2'],
       })
-      expectItemLayout(items[1], {
+      expectItemLayout(items[1]!, {
         width: 'calc(50% - 4px - 24px)',
         height: 'calc(50% - 4px)',
         transform: 'translateX(calc(100% + 8px)) translateY(0)',
         classes: ['mb-2'],
       })
-      expectItemLayout(items[2], {
+      expectItemLayout(items[2]!, {
         width: 'calc(50% - 4px - 24px)',
         height: 'calc(50% - 4px)',
         transform: 'translateX(0) translateY(calc(100% + 8px))',
         classes: ['mr-2'],
       })
-      expectItemLayout(items[3], {
+      expectItemLayout(items[3]!, {
         width: 'calc(50% - 4px - 24px)',
         height: 'calc(50% - 4px)',
         transform: 'translateX(calc(100% + 8px)) translateY(calc(100% + 8px))',
@@ -699,7 +734,7 @@ describe('DebugWithMultipleModel', () => {
     it('should set scroll area height for chat modes', () => {
       const { container } = renderComponent()
       const scrollArea = container.querySelector('.relative.mb-3.grow.overflow-auto.px-6') as HTMLElement
-      expect(scrollArea).toBeInTheDocument()
+      expect(scrollArea)!.toBeInTheDocument()
       expect(scrollArea.style.height).toBe('calc(100% - 60px)')
     })
 
diff --git a/web/app/components/app/configuration/debug/debug-with-multiple-model/model-parameter-trigger.tsx b/web/app/components/app/configuration/debug/debug-with-multiple-model/model-parameter-trigger.tsx
index 65e6067e1a..a870538edc 100644
--- a/web/app/components/app/configuration/debug/debug-with-multiple-model/model-parameter-trigger.tsx
+++ b/web/app/components/app/configuration/debug/debug-with-multiple-model/model-parameter-trigger.tsx
@@ -40,7 +40,7 @@ const ModelParameterTrigger: FC<ModelParameterTriggerProps> = ({
   const handleSelectModel = ({ modelId, provider }: { modelId: string, provider: string }) => {
     const newModelConfigs = [...multipleModelConfigs]
     newModelConfigs[index] = {
-      ...newModelConfigs[index],
+      ...newModelConfigs[index]!,
       model: modelId,
       provider,
     }
@@ -49,7 +49,7 @@ const ModelParameterTrigger: FC<ModelParameterTriggerProps> = ({
   const handleParamsChange = (params: FormValue) => {
     const newModelConfigs = [...multipleModelConfigs]
     newModelConfigs[index] = {
-      ...newModelConfigs[index],
+      ...newModelConfigs[index]!,
       parameters: params,
     }
     onMultipleModelConfigsChange(true, newModelConfigs)
diff --git a/web/app/components/app/configuration/debug/debug-with-single-model/__tests__/index.spec.tsx b/web/app/components/app/configuration/debug/debug-with-single-model/__tests__/index.spec.tsx
index 0ab6e86c17..634dd6217f 100644
--- a/web/app/components/app/configuration/debug/debug-with-single-model/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/debug/debug-with-single-model/__tests__/index.spec.tsx
@@ -591,9 +591,10 @@ describe('DebugWithSingleModel', () => {
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
       // Verify Chat component is rendered
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
-      expect(screen.getByTestId('chat-input')).toBeInTheDocument()
-      expect(screen.getByTestId('send-button')).toBeInTheDocument()
+      // Verify Chat component is rendered
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
+      expect(screen.getByTestId('chat-input'))!.toBeInTheDocument()
+      expect(screen.getByTestId('send-button'))!.toBeInTheDocument()
     })
 
     it('should render with custom checkCanSend prop', () => {
@@ -601,7 +602,7 @@ describe('DebugWithSingleModel', () => {
 
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} checkCanSend={checkCanSend} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
   })
 
@@ -620,7 +621,7 @@ describe('DebugWithSingleModel', () => {
         expect(mockSsePost).toHaveBeenCalled()
       })
 
-      expect(mockSsePost.mock.calls[0][0]).toBe('apps/test-app-id/chat-messages')
+      expect(mockSsePost.mock.calls[0]![0]).toBe('apps/test-app-id/chat-messages')
     })
 
     it('should prevent send when checkCanSend returns false', async () => {
@@ -666,7 +667,7 @@ describe('DebugWithSingleModel', () => {
         expect(mockSsePost).toHaveBeenCalled()
       })
 
-      const body = mockSsePost.mock.calls[0][1].body
+      const body = mockSsePost.mock.calls[0]![1].body
       expect(body.model_config.opening_statement).toBe('Hello!')
       expect(body.model_config.suggested_questions).toEqual(['Q1'])
     })
@@ -685,7 +686,7 @@ describe('DebugWithSingleModel', () => {
         expect(mockSsePost).toHaveBeenCalled()
       })
 
-      const body = mockSsePost.mock.calls[0][1].body
+      const body = mockSsePost.mock.calls[0]![1].body
       expect(body.model_config.opening_statement).toBe('')
       expect(body.model_config.suggested_questions).toEqual([])
     })
@@ -717,7 +718,7 @@ describe('DebugWithSingleModel', () => {
 
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
 
     it('should handle missing model in provider list', () => {
@@ -735,7 +736,7 @@ describe('DebugWithSingleModel', () => {
 
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
   })
 
@@ -759,7 +760,8 @@ describe('DebugWithSingleModel', () => {
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
       // Component should render successfully with filtered variables
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      // Component should render successfully with filtered variables
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
 
     it('should handle empty prompt variables', () => {
@@ -775,7 +777,7 @@ describe('DebugWithSingleModel', () => {
 
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
   })
 
@@ -784,7 +786,7 @@ describe('DebugWithSingleModel', () => {
     it('should map tool icons from collection list', () => {
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
 
     it('should handle empty tools list', () => {
@@ -802,7 +804,7 @@ describe('DebugWithSingleModel', () => {
 
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
 
     it('should handle missing collection for tool', () => {
@@ -829,7 +831,7 @@ describe('DebugWithSingleModel', () => {
 
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
   })
 
@@ -843,7 +845,7 @@ describe('DebugWithSingleModel', () => {
 
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
 
     it('should handle missing user profile', () => {
@@ -859,7 +861,7 @@ describe('DebugWithSingleModel', () => {
 
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
 
     it('should handle null completion params', () => {
@@ -870,7 +872,7 @@ describe('DebugWithSingleModel', () => {
 
       render(<DebugWithSingleModel ref={ref as RefObject<DebugWithSingleModelRefType>} />)
 
-      expect(screen.getByTestId('chat-component')).toBeInTheDocument()
+      expect(screen.getByTestId('chat-component'))!.toBeInTheDocument()
     })
   })
 
@@ -940,7 +942,7 @@ describe('DebugWithSingleModel', () => {
         expect(mockSsePost).toHaveBeenCalled()
       })
 
-      const body = mockSsePost.mock.calls[0][1].body
+      const body = mockSsePost.mock.calls[0]![1].body
       expect(body.files).toEqual([])
     })
 
@@ -989,7 +991,7 @@ describe('DebugWithSingleModel', () => {
         expect(mockSsePost).toHaveBeenCalled()
       })
 
-      const body = mockSsePost.mock.calls[0][1].body
+      const body = mockSsePost.mock.calls[0]![1].body
       expect(body.files).toHaveLength(1)
     })
   })
diff --git a/web/app/components/app/configuration/hooks/__tests__/use-configuration-utils.spec.ts b/web/app/components/app/configuration/hooks/__tests__/use-configuration-utils.spec.ts
index b5d00bd573..c0353c233d 100644
--- a/web/app/components/app/configuration/hooks/__tests__/use-configuration-utils.spec.ts
+++ b/web/app/components/app/configuration/hooks/__tests__/use-configuration-utils.spec.ts
@@ -345,7 +345,7 @@ describe('useConfiguration utils', () => {
       },
       url: '/datasets',
     })
-    expect(state.collectionList[0].icon).toBe('/console/tool.svg')
+    expect(state.collectionList[0]!.icon).toBe('/console/tool.svg')
     expect(state.promptMode).toBe('advanced')
     expect(state.nextDataSets).toEqual([{ id: 'dataset-1', name: 'Dataset One' }])
     expect(state.annotationConfig).toEqual(expect.objectContaining({
diff --git a/web/app/components/app/configuration/tools/__tests__/external-data-tool-modal-utils.spec.ts b/web/app/components/app/configuration/tools/__tests__/external-data-tool-modal-utils.spec.ts
index 5d55c303c5..03f77671d9 100644
--- a/web/app/components/app/configuration/tools/__tests__/external-data-tool-modal-utils.spec.ts
+++ b/web/app/components/app/configuration/tools/__tests__/external-data-tool-modal-utils.spec.ts
@@ -42,7 +42,7 @@ describe('external-data-tool-modal-utils', () => {
   it('should build localized providers and default configs for code-based tools', () => {
     const providers = buildProviders({
       codeBasedExtensionList,
-      locale: LanguagesSupported[1],
+      locale: LanguagesSupported[1]!,
       t,
     })
 
diff --git a/web/app/components/app/configuration/tools/external-data-tool-modal-utils.ts b/web/app/components/app/configuration/tools/external-data-tool-modal-utils.ts
index 702ebdb5f4..0a9d0724e4 100644
--- a/web/app/components/app/configuration/tools/external-data-tool-modal-utils.ts
+++ b/web/app/components/app/configuration/tools/external-data-tool-modal-utils.ts
@@ -114,8 +114,8 @@ export const getValidationError = ({
   if (!systemTypes.includes(localeData.type as typeof systemTypes[number]) && currentProvider?.form_schema) {
     for (let i = 0; i < currentProvider.form_schema.length; i++) {
       const form = currentProvider.form_schema[i]
-      if (!localeData.config?.[form.variable] && form.required) {
-        return t('errorMessage.valueOfVarRequired', { ns: 'appDebug', key: locale === LanguagesSupported[1] ? form.label['zh-Hans'] : form.label['en-US'] })
+      if (!localeData.config?.[form!.variable] && form!.required) {
+        return t('errorMessage.valueOfVarRequired', { ns: 'appDebug', key: locale === LanguagesSupported[1] ? form!.label['zh-Hans'] : form!.label['en-US'] })
       }
     }
   }
diff --git a/web/app/components/app/configuration/utils.ts b/web/app/components/app/configuration/utils.ts
index 3f06c863a4..18bc144b5e 100644
--- a/web/app/components/app/configuration/utils.ts
+++ b/web/app/components/app/configuration/utils.ts
@@ -40,7 +40,7 @@ export const buildConfigurationFeaturesData = (
       },
       enabled: !!(modelConfig.file_upload?.enabled || modelConfig.file_upload?.image?.enabled),
       allowed_file_types: modelConfig.file_upload?.allowed_file_types || [],
-      allowed_file_extensions: modelConfig.file_upload?.allowed_file_extensions || [...FILE_EXTS[SupportUploadFileTypes.image], ...FILE_EXTS[SupportUploadFileTypes.video]].map(ext => `.${ext}`),
+      allowed_file_extensions: modelConfig.file_upload?.allowed_file_extensions || [...(FILE_EXTS[SupportUploadFileTypes.image] ?? []), ...(FILE_EXTS[SupportUploadFileTypes.video] ?? [])].map(ext => `.${ext}`),
       allowed_file_upload_methods: modelConfig.file_upload?.allowed_file_upload_methods || modelConfig.file_upload?.image?.transfer_methods || ['local_file', 'remote_url'],
       number_limits: modelConfig.file_upload?.number_limits || modelConfig.file_upload?.image?.number_limits || 3,
       fileUploadConfig: fileUploadConfigResponse,
diff --git a/web/app/components/app/create-app-dialog/__tests__/index.spec.tsx b/web/app/components/app/create-app-dialog/__tests__/index.spec.tsx
index 6fa30ded24..cc59ce7456 100644
--- a/web/app/components/app/create-app-dialog/__tests__/index.spec.tsx
+++ b/web/app/components/app/create-app-dialog/__tests__/index.spec.tsx
@@ -53,6 +53,37 @@ describe('CreateAppTemplateDialog', () => {
     it('should not render when show is false', () => {
       render(<CreateAppTemplateDialog {...defaultProps} />)
 
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
+      // FullScreenModal should not render any content when open is false
       // FullScreenModal should not render any content when open is false
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
     })
@@ -61,14 +92,15 @@ describe('CreateAppTemplateDialog', () => {
       render(<CreateAppTemplateDialog {...defaultProps} show={true} />)
 
       // FullScreenModal renders with role="dialog"
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-      expect(screen.getByTestId('app-list')).toBeInTheDocument()
+      // FullScreenModal renders with role="dialog"
+      expect(screen.getByRole('dialog'))!.toBeInTheDocument()
+      expect(screen.getByTestId('app-list'))!.toBeInTheDocument()
     })
 
     it('should render create from blank button when onCreateFromBlank is provided', () => {
       render(<CreateAppTemplateDialog {...defaultProps} show={true} />)
 
-      expect(screen.getByTestId('create-from-blank')).toBeInTheDocument()
+      expect(screen.getByTestId('create-from-blank'))!.toBeInTheDocument()
     })
 
     it('should not render create from blank button when onCreateFromBlank is not provided', () => {
@@ -87,7 +119,7 @@ describe('CreateAppTemplateDialog', () => {
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
 
       rerender(<CreateAppTemplateDialog {...defaultProps} show={true} />)
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
+      expect(screen.getByRole('dialog'))!.toBeInTheDocument()
     })
 
     it('should pass closable prop to FullScreenModal', () => {
@@ -97,8 +129,8 @@ describe('CreateAppTemplateDialog', () => {
 
       // Verify that the modal has the proper dialog structure
       const dialog = screen.getByRole('dialog')
-      expect(dialog).toBeInTheDocument()
-      expect(dialog).toHaveAttribute('aria-modal', 'true')
+      expect(dialog)!.toBeInTheDocument()
+      expect(dialog)!.toHaveAttribute('aria-modal', 'true')
     })
   })
 
@@ -109,11 +141,12 @@ describe('CreateAppTemplateDialog', () => {
 
       // Test that the modal is rendered
       const dialog = screen.getByRole('dialog')
-      expect(dialog).toBeInTheDocument()
+      expect(dialog)!.toBeInTheDocument()
 
       // Test that AppList component renders (child component interactions)
-      expect(screen.getByTestId('app-list')).toBeInTheDocument()
-      expect(screen.getByTestId('app-list-success')).toBeInTheDocument()
+      // Test that AppList component renders (child component interactions)
+      expect(screen.getByTestId('app-list'))!.toBeInTheDocument()
+      expect(screen.getByTestId('app-list-success'))!.toBeInTheDocument()
     })
 
     it('should call both onSuccess and onClose when app list success is triggered', () => {
@@ -204,8 +237,8 @@ describe('CreateAppTemplateDialog', () => {
       // Verify that useKeyPress was called with a function
       const calls = mockUseKeyPress.mock.calls
       expect(calls.length).toBeGreaterThan(0)
-      expect(calls[0][0]).toBe('esc')
-      expect(typeof calls[0][1]).toBe('function')
+      expect(calls[0]![0]).toBe('esc')
+      expect(typeof calls[0]![1]).toBe('function')
     })
   })
 
@@ -243,7 +276,7 @@ describe('CreateAppTemplateDialog', () => {
 
       // Test show state
       render(<CreateAppTemplateDialog {...defaultProps} show={true} />)
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
+      expect(screen.getByRole('dialog'))!.toBeInTheDocument()
 
       // Test hide state
       render(<CreateAppTemplateDialog {...defaultProps} show={false} />)
@@ -258,7 +291,7 @@ describe('CreateAppTemplateDialog', () => {
         render(<CreateAppTemplateDialog {...propsWithoutOnCreate} show={true} />)
       }).not.toThrow()
 
-      expect(screen.getByTestId('app-list')).toBeInTheDocument()
+      expect(screen.getByTestId('app-list'))!.toBeInTheDocument()
       expect(screen.queryByTestId('create-from-blank')).not.toBeInTheDocument()
     })
 
@@ -273,8 +306,8 @@ describe('CreateAppTemplateDialog', () => {
         render(<CreateAppTemplateDialog {...requiredProps} />)
       }).not.toThrow()
 
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-      expect(screen.getByTestId('app-list')).toBeInTheDocument()
+      expect(screen.getByRole('dialog'))!.toBeInTheDocument()
+      expect(screen.getByTestId('app-list'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/create-app-dialog/app-list/__tests__/index.spec.tsx b/web/app/components/app/create-app-dialog/app-list/__tests__/index.spec.tsx
index a319bb58f7..34024da54c 100644
--- a/web/app/components/app/create-app-dialog/app-list/__tests__/index.spec.tsx
+++ b/web/app/components/app/create-app-dialog/app-list/__tests__/index.spec.tsx
@@ -183,15 +183,15 @@ describe('Apps', () => {
     render(<Apps />)
 
     expect(screen.getAllByTestId('app-card')).toHaveLength(6)
-    expect(screen.getByText('Alpha')).toBeInTheDocument()
-    expect(screen.getByText('Bravo')).toBeInTheDocument()
+    expect(screen.getByText('Alpha'))!.toBeInTheDocument()
+    expect(screen.getByText('Bravo'))!.toBeInTheDocument()
   })
 
   it('opens create modal when a template card is clicked', () => {
     render(<Apps />)
 
-    fireEvent.click(screen.getAllByTestId('app-card')[0])
-    expect(screen.getByTestId('create-from-template-modal')).toBeInTheDocument()
+    fireEvent.click(screen.getAllByTestId('app-card')[0]!)
+    expect(screen.getByTestId('create-from-template-modal'))!.toBeInTheDocument()
   })
 
   it('shows no template message when list is empty', () => {
@@ -202,8 +202,8 @@ describe('Apps', () => {
 
     render(<Apps />)
 
-    expect(screen.getByText('app.newApp.noTemplateFound')).toBeInTheDocument()
-    expect(screen.getByText('app.newApp.noTemplateFoundTip')).toBeInTheDocument()
+    expect(screen.getByText('app.newApp.noTemplateFound'))!.toBeInTheDocument()
+    expect(screen.getByText('app.newApp.noTemplateFoundTip'))!.toBeInTheDocument()
   })
 
   it('filters templates by keyword and selected app type', async () => {
@@ -214,7 +214,7 @@ describe('Apps', () => {
     })
 
     await waitFor(() => {
-      expect(screen.getByText('Bravo')).toBeInTheDocument()
+      expect(screen.getByText('Bravo'))!.toBeInTheDocument()
       expect(screen.queryByText('Alpha')).not.toBeInTheDocument()
     })
 
@@ -224,8 +224,8 @@ describe('Apps', () => {
     fireEvent.click(screen.getByTestId('type-selector-chat'))
 
     await waitFor(() => {
-      expect(screen.getByText('Alpha')).toBeInTheDocument()
-      expect(screen.getByText('Bravo')).toBeInTheDocument()
+      expect(screen.getByText('Alpha'))!.toBeInTheDocument()
+      expect(screen.getByText('Bravo'))!.toBeInTheDocument()
       expect(screen.queryByText('Charlie')).not.toBeInTheDocument()
     })
   })
@@ -235,7 +235,7 @@ describe('Apps', () => {
 
     render(<Apps onSuccess={onSuccess} />)
 
-    fireEvent.click(screen.getAllByTestId('app-card')[0])
+    fireEvent.click(screen.getAllByTestId('app-card')[0]!)
     fireEvent.click(screen.getByTestId('confirm-create'))
 
     await waitFor(() => {
@@ -264,7 +264,7 @@ describe('Apps', () => {
 
     render(<Apps />)
 
-    fireEvent.click(screen.getAllByTestId('app-card')[0])
+    fireEvent.click(screen.getAllByTestId('app-card')[0]!)
     fireEvent.click(screen.getByTestId('confirm-create'))
 
     await waitFor(() => {
@@ -290,7 +290,7 @@ describe('Apps', () => {
 
     render(<Apps />)
 
-    expect(screen.getByRole('status')).toBeInTheDocument()
+    expect(screen.getByRole('status'))!.toBeInTheDocument()
   })
 
   it('should handle an undefined template payload by falling back to the empty state', () => {
@@ -301,7 +301,7 @@ describe('Apps', () => {
 
     render(<Apps />)
 
-    expect(screen.getByText('app.newApp.noTemplateFound')).toBeInTheDocument()
+    expect(screen.getByText('app.newApp.noTemplateFound'))!.toBeInTheDocument()
   })
 
   it('should filter templates by category and the remaining app modes', async () => {
@@ -309,8 +309,8 @@ describe('Apps', () => {
 
     fireEvent.click(screen.getByText('Cat C'))
     expect(screen.queryByText('Alpha')).not.toBeInTheDocument()
-    expect(screen.getByText('Echo')).toBeInTheDocument()
-    expect(screen.getByText('Foxtrot')).toBeInTheDocument()
+    expect(screen.getByText('Echo'))!.toBeInTheDocument()
+    expect(screen.getByText('Foxtrot'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByTestId('type-selector-advanced'))
     await waitFor(() => {
@@ -322,13 +322,13 @@ describe('Apps', () => {
     fireEvent.click(screen.getByText('Cat C'))
     fireEvent.click(screen.getByTestId('type-selector-agent'))
     await waitFor(() => {
-      expect(screen.getByText('Echo')).toBeInTheDocument()
+      expect(screen.getByText('Echo'))!.toBeInTheDocument()
       expect(screen.queryByText('Foxtrot')).not.toBeInTheDocument()
     })
 
     fireEvent.click(screen.getByTestId('type-selector-workflow'))
     await waitFor(() => {
-      expect(screen.getByText('Foxtrot')).toBeInTheDocument()
+      expect(screen.getByText('Foxtrot'))!.toBeInTheDocument()
       expect(screen.queryByText('Echo')).not.toBeInTheDocument()
     })
 
@@ -356,11 +356,11 @@ describe('Apps', () => {
     })
 
     await waitFor(() => {
-      expect(screen.getByText('Cat A')).toBeInTheDocument()
+      expect(screen.getByText('Cat A'))!.toBeInTheDocument()
     })
 
-    fireEvent.click(screen.getAllByTestId('app-card')[0])
-    expect(screen.getByTestId('create-from-template-modal')).toBeInTheDocument()
+    fireEvent.click(screen.getAllByTestId('app-card')[0]!)
+    expect(screen.getByTestId('create-from-template-modal'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByTestId('hide-create-modal'))
 
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 e106cc7eb3..40c32b7dd6 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
@@ -137,10 +137,10 @@ describe('CreateFromDSLModal', () => {
       />,
     )
 
-    expect(screen.getByText('importFromDSL')).toBeInTheDocument()
+    expect(screen.getByText('importFromDSL'))!.toBeInTheDocument()
 
     await waitFor(() => {
-      expect(screen.getByText('demo.yml')).toBeInTheDocument()
+      expect(screen.getByText('demo.yml'))!.toBeInTheDocument()
     })
   })
 
@@ -159,7 +159,7 @@ describe('CreateFromDSLModal', () => {
     await act(async () => {
       fireEvent.click(screen.getByText('importFromDSLUrl'))
     })
-    expect(screen.getByPlaceholderText('importFromDSLUrlPlaceholder')).toBeInTheDocument()
+    expect(screen.getByPlaceholderText('importFromDSLUrlPlaceholder'))!.toBeInTheDocument()
 
     const closeTrigger = screen.getByText('importFromDSL').parentElement?.querySelector('.cursor-pointer.items-center') as HTMLElement
     fireEvent.click(closeTrigger)
@@ -222,7 +222,7 @@ describe('CreateFromDSLModal', () => {
     )
 
     await waitFor(() => {
-      expect(screen.getByText('demo.yml')).toBeInTheDocument()
+      expect(screen.getByText('demo.yml'))!.toBeInTheDocument()
     })
 
     await act(async () => {
@@ -245,7 +245,7 @@ describe('CreateFromDSLModal', () => {
     )
 
     await waitFor(() => {
-      expect(screen.getByText('demo.yml')).toBeInTheDocument()
+      expect(screen.getByText('demo.yml'))!.toBeInTheDocument()
     })
 
     const removeButton = screen.getByText('demo.yml').closest('.group')?.querySelector('button') as HTMLButtonElement
@@ -255,7 +255,7 @@ describe('CreateFromDSLModal', () => {
 
     await waitFor(() => {
       expect(screen.queryByText('demo.yml')).not.toBeInTheDocument()
-      expect(getCreateButton()).toBeDisabled()
+      expect(getCreateButton())!.toBeDisabled()
     })
 
     ahooksMocks.handlers.findLast(item => Array.isArray(item.keys))?.handler()
@@ -294,10 +294,10 @@ describe('CreateFromDSLModal', () => {
       vi.advanceTimersByTime(300)
     })
 
-    expect(screen.getAllByText('newApp.appCreateDSLErrorTitle')[0]).toBeInTheDocument()
+    expect(screen.getAllByText('newApp.appCreateDSLErrorTitle')[0])!.toBeInTheDocument()
 
     await act(async () => {
-      fireEvent.click(screen.getAllByRole('button', { name: 'newApp.Confirm' })[0])
+      fireEvent.click(screen.getAllByRole('button', { name: 'newApp.Confirm' })[0]!)
     })
 
     expect(mockImportDSLConfirm).toHaveBeenCalledWith({
@@ -386,7 +386,7 @@ describe('CreateFromDSLModal', () => {
       />,
     )
 
-    expect(screen.getByText('apps-full')).toBeInTheDocument()
+    expect(screen.getByText('apps-full'))!.toBeInTheDocument()
     ahooksMocks.handlers.findLast(item => Array.isArray(item.keys))?.handler()
     expect(mockImportDSL).toHaveBeenCalledTimes(1)
   })
@@ -461,12 +461,12 @@ describe('CreateFromDSLModal', () => {
       vi.advanceTimersByTime(300)
     })
     await act(async () => {
-      fireEvent.click(screen.getAllByRole('button', { name: 'newApp.Confirm' })[0])
+      fireEvent.click(screen.getAllByRole('button', { name: 'newApp.Confirm' })[0]!)
     })
     expect(toastMocks.error).toHaveBeenCalledWith('newApp.appCreateFailed')
 
     await act(async () => {
-      fireEvent.click(screen.getAllByRole('button', { name: 'newApp.Confirm' })[0])
+      fireEvent.click(screen.getAllByRole('button', { name: 'newApp.Confirm' })[0]!)
     })
     expect(toastMocks.error).toHaveBeenCalledTimes(2)
   })
diff --git a/web/app/components/app/log/__tests__/filter.spec.tsx b/web/app/components/app/log/__tests__/filter.spec.tsx
index 4c377ecde7..ec1a0183be 100644
--- a/web/app/components/app/log/__tests__/filter.spec.tsx
+++ b/web/app/components/app/log/__tests__/filter.spec.tsx
@@ -77,7 +77,7 @@ describe('Filter', () => {
     it('should render filter components', () => {
       render(<Filter {...defaultProps} />)
 
-      expect(screen.getByPlaceholderText('operation.search')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('operation.search'))!.toBeInTheDocument()
     })
 
     it('should return null when loading', () => {
@@ -89,13 +89,13 @@ describe('Filter', () => {
     it('should render sort component in chat mode', () => {
       render(<Filter {...defaultProps} isChatMode />)
 
-      expect(screen.getByPlaceholderText('operation.search')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('operation.search'))!.toBeInTheDocument()
     })
 
     it('should not render sort component when not in chat mode', () => {
       render(<Filter {...defaultProps} isChatMode={false} />)
 
-      expect(screen.getByPlaceholderText('operation.search')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('operation.search'))!.toBeInTheDocument()
     })
   })
 
@@ -105,23 +105,23 @@ describe('Filter', () => {
     })
 
     it('should have today period with value 0', () => {
-      expect(TIME_PERIOD_MAPPING['1'].value).toBe(0)
-      expect(TIME_PERIOD_MAPPING['1'].name).toBe('today')
+      expect(TIME_PERIOD_MAPPING['1']!.value).toBe(0)
+      expect(TIME_PERIOD_MAPPING['1']!.name).toBe('today')
     })
 
     it('should have last7days period with value 7', () => {
-      expect(TIME_PERIOD_MAPPING['2'].value).toBe(7)
-      expect(TIME_PERIOD_MAPPING['2'].name).toBe('last7days')
+      expect(TIME_PERIOD_MAPPING['2']!.value).toBe(7)
+      expect(TIME_PERIOD_MAPPING['2']!.name).toBe('last7days')
     })
 
     it('should have last4weeks period with value 28', () => {
-      expect(TIME_PERIOD_MAPPING['3'].value).toBe(28)
-      expect(TIME_PERIOD_MAPPING['3'].name).toBe('last4weeks')
+      expect(TIME_PERIOD_MAPPING['3']!.value).toBe(28)
+      expect(TIME_PERIOD_MAPPING['3']!.name).toBe('last4weeks')
     })
 
     it('should have allTime period with value -1', () => {
-      expect(TIME_PERIOD_MAPPING['9'].value).toBe(-1)
-      expect(TIME_PERIOD_MAPPING['9'].name).toBe('allTime')
+      expect(TIME_PERIOD_MAPPING['9']!.value).toBe(-1)
+      expect(TIME_PERIOD_MAPPING['9']!.name).toBe('allTime')
     })
   })
 
@@ -158,25 +158,25 @@ describe('Filter', () => {
     it('should update and clear period, annotation, and sort filters', () => {
       render(<Filter {...defaultProps} isChatMode />)
 
-      fireEvent.click(screen.getAllByText('select-9')[0])
+      fireEvent.click(screen.getAllByText('select-9')[0]!)
       expect(mockSetQueryParams).toHaveBeenCalledWith({
         ...defaultQueryParams,
         period: '9',
       })
 
-      fireEvent.click(screen.getAllByText('clear-chip')[0])
+      fireEvent.click(screen.getAllByText('clear-chip')[0]!)
       expect(mockSetQueryParams).toHaveBeenCalledWith({
         ...defaultQueryParams,
         period: '9',
       })
 
-      fireEvent.click(screen.getAllByText('select-not_annotated')[0])
+      fireEvent.click(screen.getAllByText('select-not_annotated')[0]!)
       expect(mockSetQueryParams).toHaveBeenCalledWith({
         ...defaultQueryParams,
         annotation_status: 'not_annotated',
       })
 
-      fireEvent.click(screen.getAllByText('clear-chip')[1])
+      fireEvent.click(screen.getAllByText('clear-chip')[1]!)
       expect(mockSetQueryParams).toHaveBeenCalledWith({
         ...defaultQueryParams,
         annotation_status: 'all',
@@ -200,7 +200,8 @@ describe('Filter', () => {
       render(<Filter {...propsWithPeriod} />)
 
       // Period '1' maps to 'today' in TIME_PERIOD_MAPPING
-      expect(screen.getByText('filter.period.today')).toBeInTheDocument()
+      // Period '1' maps to 'today' in TIME_PERIOD_MAPPING
+      expect(screen.getByText('filter.period.today'))!.toBeInTheDocument()
     })
 
     it('should display "last7days" when period is set to 2', () => {
@@ -211,14 +212,15 @@ describe('Filter', () => {
 
       render(<Filter {...propsWithPeriod} />)
 
-      expect(screen.getByText('filter.period.last7days')).toBeInTheDocument()
+      expect(screen.getByText('filter.period.last7days'))!.toBeInTheDocument()
     })
 
     it('should display "allTime" when period is set to 9', () => {
       render(<Filter {...defaultProps} />)
 
       // Default period is '9' which maps to 'allTime'
-      expect(screen.getByText('filter.period.allTime')).toBeInTheDocument()
+      // Default period is '9' which maps to 'allTime'
+      expect(screen.getByText('filter.period.allTime'))!.toBeInTheDocument()
     })
 
     it('should display annotated status with count when annotation_status is annotated', () => {
@@ -230,7 +232,8 @@ describe('Filter', () => {
       render(<Filter {...propsWithAnnotation} />)
 
       // The mock returns count: 10, so the text should include the count
-      expect(screen.getByText('filter.annotation.annotated (10)')).toBeInTheDocument()
+      // The mock returns count: 10, so the text should include the count
+      expect(screen.getByText('filter.annotation.annotated (10)'))!.toBeInTheDocument()
     })
 
     it('should display not_annotated status when annotation_status is not_annotated', () => {
@@ -241,14 +244,15 @@ describe('Filter', () => {
 
       render(<Filter {...propsWithNotAnnotated} />)
 
-      expect(screen.getByText('filter.annotation.not_annotated')).toBeInTheDocument()
+      expect(screen.getByText('filter.annotation.not_annotated'))!.toBeInTheDocument()
     })
 
     it('should display all annotation status when annotation_status is all', () => {
       render(<Filter {...defaultProps} />)
 
       // Default annotation_status is 'all'
-      expect(screen.getByText('filter.annotation.all')).toBeInTheDocument()
+      // Default annotation_status is 'all'
+      expect(screen.getByText('filter.annotation.all'))!.toBeInTheDocument()
     })
 
     it('should return null when annotation count data is unavailable', () => {
@@ -269,7 +273,7 @@ describe('Filter', () => {
 
       render(<Filter {...propsWithSort} />)
 
-      expect(screen.getByPlaceholderText('operation.search')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('operation.search'))!.toBeInTheDocument()
     })
 
     it('should handle descending sort order', () => {
@@ -281,7 +285,7 @@ describe('Filter', () => {
 
       render(<Filter {...propsWithDescSort} />)
 
-      expect(screen.getByPlaceholderText('operation.search')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('operation.search'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/log/__tests__/list-utils.spec.ts b/web/app/components/app/log/__tests__/list-utils.spec.ts
index 245ff0567e..deaaa01591 100644
--- a/web/app/components/app/log/__tests__/list-utils.spec.ts
+++ b/web/app/components/app/log/__tests__/list-utils.spec.ts
@@ -150,12 +150,12 @@ describe('log list utils', () => {
   it('should update annotation state helpers', () => {
     const items = createChatItems()
 
-    expect(applyAnnotationEdited(items, 'updated question', 'updated answer', 1)[0].content).toBe('updated question')
-    expect(applyAnnotationAdded(items, 'annotation-1', 'Dify', 'question', 'answer', 1)[1].annotation).toEqual(expect.objectContaining({
+    expect(applyAnnotationEdited(items, 'updated question', 'updated answer', 1)[0]!.content).toBe('updated question')
+    expect(applyAnnotationAdded(items, 'annotation-1', 'Dify', 'question', 'answer', 1)[1]!.annotation).toEqual(expect.objectContaining({
       id: 'annotation-1',
       authorName: 'Dify',
     }))
-    expect(applyAnnotationRemoved(items, 1)[1].annotation).toBeUndefined()
+    expect(applyAnnotationRemoved(items, 1)[1]!.annotation).toBeUndefined()
   })
 
   it('should derive urls, scroll thresholds, row values, and detail metadata', () => {
diff --git a/web/app/components/app/log/index.tsx b/web/app/components/app/log/index.tsx
index c30cf6cf51..411ec8694d 100644
--- a/web/app/components/app/log/index.tsx
+++ b/web/app/components/app/log/index.tsx
@@ -78,7 +78,7 @@ const Logs: FC<ILogsProps> = ({ appDetail }) => {
     limit,
     ...((debouncedQueryParams.period !== '9')
       ? {
-          start: dayjs().subtract(TIME_PERIOD_MAPPING[debouncedQueryParams.period].value, 'day').startOf('day').format('YYYY-MM-DD HH:mm'),
+          start: dayjs().subtract(TIME_PERIOD_MAPPING[debouncedQueryParams.period]!.value, 'day').startOf('day').format('YYYY-MM-DD HH:mm'),
           end: dayjs().endOf('day').format('YYYY-MM-DD HH:mm'),
         }
       : {}),
diff --git a/web/app/components/app/overview/__tests__/app-chart-utils.spec.ts b/web/app/components/app/overview/__tests__/app-chart-utils.spec.ts
index a087df241a..5064af5f36 100644
--- a/web/app/components/app/overview/__tests__/app-chart-utils.spec.ts
+++ b/web/app/components/app/overview/__tests__/app-chart-utils.spec.ts
@@ -97,7 +97,7 @@ describe('app-chart-utils', () => {
       expect(dataset.dimensions).toEqual(['date', 'count'])
       expect(dataset.source).toHaveLength(2)
       expect(yAxis.max).toBe(100)
-      expect(series[0].lineStyle.color).toBe('rgba(6, 148, 162, 1)')
+      expect(series[0]!.lineStyle.color).toBe('rgba(6, 148, 162, 1)')
     })
 
     it('should build token-aware tooltip content and split-line intervals for cost charts', () => {
@@ -112,11 +112,11 @@ describe('app-chart-utils', () => {
       })
 
       const xAxis = options.xAxis as Array<Record<string, any>>
-      const formatter = xAxis[0].axisLabel.formatter as (value: string) => string
-      const outerInterval = xAxis[0].splitLine.interval as (index: number) => boolean
-      const innerInterval = xAxis[1].splitLine.interval as (_index: number, value: string) => boolean
+      const formatter = xAxis[0]!.axisLabel.formatter as (value: string) => string
+      const outerInterval = xAxis[0]!.splitLine.interval as (index: number) => boolean
+      const innerInterval = xAxis[1]!.splitLine.interval as (_index: number, value: string) => boolean
       const series = options.series as Array<Record<string, any>>
-      const tooltipFormatter = series[0].tooltip.formatter as (params: { name: string, data: { total_cost: number, total_price: string } }) => string
+      const tooltipFormatter = series[0]!.tooltip.formatter as (params: { name: string, data: { total_cost: number, total_price: string } }) => string
 
       expect(formatter('Jan 2, 2024')).toBe('Jan 2, 2024')
       expect(outerInterval(0)).toBe(true)
diff --git a/web/app/components/app/overview/__tests__/app-chart.spec.tsx b/web/app/components/app/overview/__tests__/app-chart.spec.tsx
index ccd59a8f4a..d6aa241405 100644
--- a/web/app/components/app/overview/__tests__/app-chart.spec.tsx
+++ b/web/app/components/app/overview/__tests__/app-chart.spec.tsx
@@ -58,10 +58,10 @@ describe('app-chart', () => {
         />,
       )
 
-      expect(screen.getByText('Cost title')).toBeInTheDocument()
-      expect(screen.getByText('300')).toBeInTheDocument()
-      expect(screen.getByText(/\$3\.7500/)).toBeInTheDocument()
-      expect(screen.getByTestId('echarts')).toBeInTheDocument()
+      expect(screen.getByText('Cost title'))!.toBeInTheDocument()
+      expect(screen.getByText('300'))!.toBeInTheDocument()
+      expect(screen.getByText(/\$3\.7500/))!.toBeInTheDocument()
+      expect(screen.getByTestId('echarts'))!.toBeInTheDocument()
     })
   })
 
@@ -85,10 +85,10 @@ describe('app-chart', () => {
         />,
       )
 
-      expect(screen.getByText('analysis.totalMessages.title')).toBeInTheDocument()
-      expect(screen.getByTestId('echarts')).toBeInTheDocument()
+      expect(screen.getByText('analysis.totalMessages.title'))!.toBeInTheDocument()
+      expect(screen.getByTestId('echarts'))!.toBeInTheDocument()
 
-      const options = reactEChartsMock.mock.calls[0][0] as {
+      const options = reactEChartsMock.mock.calls[0]![0] as {
         dataset: { source: Array<Record<string, unknown>> }
         yAxis: { max: number }
       }
diff --git a/web/app/components/app/overview/embedded/__tests__/index.spec.tsx b/web/app/components/app/overview/embedded/__tests__/index.spec.tsx
index 9b8a2ad8c4..0a843c26fd 100644
--- a/web/app/components/app/overview/embedded/__tests__/index.spec.tsx
+++ b/web/app/components/app/overview/embedded/__tests__/index.spec.tsx
@@ -102,12 +102,12 @@ describe('Embedded', () => {
     const optionButtons = document.body.querySelectorAll('[class*="option"]')
     expect(optionButtons.length).toBeGreaterThanOrEqual(3)
     act(() => {
-      fireEvent.click(optionButtons[2])
+      fireEvent.click(optionButtons[2]!)
     })
 
     const [chromeText] = screen.getAllByText('appOverview.overview.appInfo.embedded.chromePlugin')
     act(() => {
-      fireEvent.click(chromeText)
+      fireEvent.click(chromeText!)
     })
 
     expect(mockWindowOpen).toHaveBeenCalledWith(
diff --git a/web/app/components/app/overview/embedded/index.tsx b/web/app/components/app/overview/embedded/index.tsx
index 547d80f0fe..029566587e 100644
--- a/web/app/components/app/overview/embedded/index.tsx
+++ b/web/app/components/app/overview/embedded/index.tsx
@@ -105,7 +105,7 @@ const Embedded = ({ siteInfo, isShow, onClose, appBaseUrl, accessToken, classNam
     if (option === 'chromePlugin') {
       const splitUrl = OPTION_MAP[option].getContent(appBaseUrl, accessToken).split(': ')
       if (splitUrl.length > 1)
-        copy(splitUrl[1])
+        copy(splitUrl[1]!)
     }
     else {
       copy(OPTION_MAP[option].getContent(appBaseUrl, accessToken, themeBuilder.theme?.primaryColor ?? '#1C64F2', isTestEnv))
diff --git a/web/app/components/app/text-generate/saved-items/__tests__/index.spec.tsx b/web/app/components/app/text-generate/saved-items/__tests__/index.spec.tsx
index ddfea01951..3989817a71 100644
--- a/web/app/components/app/text-generate/saved-items/__tests__/index.spec.tsx
+++ b/web/app/components/app/text-generate/saved-items/__tests__/index.spec.tsx
@@ -37,8 +37,8 @@ describe('SavedItems', () => {
     const { container } = render(<SavedItems {...baseProps} />)
 
     const markdownElement = container.querySelector('.markdown-body')
-    expect(markdownElement).toBeInTheDocument()
-    expect(screen.getByText('11 common.unit.char')).toBeInTheDocument()
+    expect(markdownElement)!.toBeInTheDocument()
+    expect(screen.getByText('11 common.unit.char'))!.toBeInTheDocument()
 
     const actionArea = container.querySelector('[class*="bg-components-actionbar-bg"]')
     const actionButtons = actionArea?.querySelectorAll('button') ?? []
@@ -56,11 +56,11 @@ describe('SavedItems', () => {
     const copyButton = actionButtons[1]
     const deleteButton = actionButtons[2]
 
-    fireEvent.click(copyButton)
+    fireEvent.click(copyButton!)
     expect(mockCopy).toHaveBeenCalledWith('hello world')
     expect(toastSuccessSpy).toHaveBeenCalledWith('common.actionMsg.copySuccessfully')
 
-    fireEvent.click(deleteButton)
+    fireEvent.click(deleteButton!)
     expect(handleRemove).toHaveBeenCalledWith('1')
   })
 })
diff --git a/web/app/components/app/type-selector/index.tsx b/web/app/components/app/type-selector/index.tsx
index 6b8f8985c2..873593a600 100644
--- a/web/app/components/app/type-selector/index.tsx
+++ b/web/app/components/app/type-selector/index.tsx
@@ -148,9 +148,9 @@ function AppTypeSelectTrigger({ values }: { readonly values: AppSelectorProps['v
         'flex h-8 flex-nowrap items-center justify-between gap-1',
       )}
       >
-        <AppTypeIcon type={values[0]} />
+        <AppTypeIcon type={values[0]!} />
         <div className="line-clamp-1 flex flex-1 items-center text-center">
-          <AppTypeLabel type={values[0]} className="system-sm-medium text-components-menu-item-text" />
+          <AppTypeLabel type={values[0]!} className="system-sm-medium text-components-menu-item-text" />
         </div>
       </div>
     )
diff --git a/web/app/components/app/workflow-log/__tests__/filter.spec.tsx b/web/app/components/app/workflow-log/__tests__/filter.spec.tsx
index d255537354..237862fd71 100644
--- a/web/app/components/app/workflow-log/__tests__/filter.spec.tsx
+++ b/web/app/components/app/workflow-log/__tests__/filter.spec.tsx
@@ -56,8 +56,9 @@ describe('Filter', () => {
       )
 
       // Should render status chip, period chip, and search input
-      expect(screen.getByText('All')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('common.operation.search')).toBeInTheDocument()
+      // Should render status chip, period chip, and search input
+      expect(screen.getByText('All'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('common.operation.search'))!.toBeInTheDocument()
     })
 
     it('should render all filter components', () => {
@@ -69,11 +70,14 @@ describe('Filter', () => {
       )
 
       // Status chip
-      expect(screen.getByText('All')).toBeInTheDocument()
+      // Status chip
+      expect(screen.getByText('All'))!.toBeInTheDocument()
       // Period chip (shows translated key)
-      expect(screen.getByText('appLog.filter.period.last7days')).toBeInTheDocument()
+      // Period chip (shows translated key)
+      expect(screen.getByText('appLog.filter.period.last7days'))!.toBeInTheDocument()
       // Search input
-      expect(screen.getByPlaceholderText('common.operation.search')).toBeInTheDocument()
+      // Search input
+      expect(screen.getByPlaceholderText('common.operation.search'))!.toBeInTheDocument()
     })
   })
 
@@ -90,7 +94,8 @@ describe('Filter', () => {
       )
 
       // Chip should show Success for succeeded status
-      expect(screen.getByText('Success')).toBeInTheDocument()
+      // Chip should show Success for succeeded status
+      expect(screen.getByText('Success'))!.toBeInTheDocument()
     })
 
     it('should open status dropdown when clicked', async () => {
@@ -107,10 +112,10 @@ describe('Filter', () => {
 
       // Should show all status options
       await waitFor(() => {
-        expect(screen.getByText('Success')).toBeInTheDocument()
-        expect(screen.getByText('Fail')).toBeInTheDocument()
-        expect(screen.getByText('Stop')).toBeInTheDocument()
-        expect(screen.getByText('Partial Success')).toBeInTheDocument()
+        expect(screen.getByText('Success'))!.toBeInTheDocument()
+        expect(screen.getByText('Fail'))!.toBeInTheDocument()
+        expect(screen.getByText('Stop'))!.toBeInTheDocument()
+        expect(screen.getByText('Partial Success'))!.toBeInTheDocument()
       })
     })
 
@@ -167,7 +172,7 @@ describe('Filter', () => {
       // Find the clear icon (div with group/clear class) in the status chip
       const clearIcon = container.querySelector('.group\\/clear')
 
-      expect(clearIcon).toBeInTheDocument()
+      expect(clearIcon)!.toBeInTheDocument()
       await user.click(clearIcon!)
 
       expect(setQueryParams).toHaveBeenCalledWith({
@@ -190,7 +195,7 @@ describe('Filter', () => {
         />,
       )
 
-      expect(screen.getByText(expectedLabel)).toBeInTheDocument()
+      expect(screen.getByText(expectedLabel))!.toBeInTheDocument()
     })
   })
 
@@ -206,7 +211,7 @@ describe('Filter', () => {
         />,
       )
 
-      expect(screen.getByText('appLog.filter.period.today')).toBeInTheDocument()
+      expect(screen.getByText('appLog.filter.period.today'))!.toBeInTheDocument()
     })
 
     it('should open period dropdown when clicked', async () => {
@@ -223,10 +228,10 @@ describe('Filter', () => {
 
       // Should show all period options
       await waitFor(() => {
-        expect(screen.getByText('appLog.filter.period.today')).toBeInTheDocument()
-        expect(screen.getByText('appLog.filter.period.last4weeks')).toBeInTheDocument()
-        expect(screen.getByText('appLog.filter.period.last3months')).toBeInTheDocument()
-        expect(screen.getByText('appLog.filter.period.allTime')).toBeInTheDocument()
+        expect(screen.getByText('appLog.filter.period.today'))!.toBeInTheDocument()
+        expect(screen.getByText('appLog.filter.period.last4weeks'))!.toBeInTheDocument()
+        expect(screen.getByText('appLog.filter.period.last3months'))!.toBeInTheDocument()
+        expect(screen.getByText('appLog.filter.period.allTime'))!.toBeInTheDocument()
       })
     })
 
@@ -287,7 +292,7 @@ describe('Filter', () => {
         />,
       )
 
-      expect(screen.getByDisplayValue('test search')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('test search'))!.toBeInTheDocument()
     })
 
     it('should call setQueryParams when typing in search', async () => {
@@ -337,7 +342,7 @@ describe('Filter', () => {
       // Find the clear icon div (has cursor-pointer class and contains RiCloseCircleFill)
       const clearIconDiv = inputWrapper?.querySelector('div.cursor-pointer')
 
-      expect(clearIconDiv).toBeInTheDocument()
+      expect(clearIconDiv)!.toBeInTheDocument()
       await user.click(clearIconDiv!)
 
       expect(setQueryParams).toHaveBeenCalledWith({
@@ -399,11 +404,11 @@ describe('Filter', () => {
       ['9', 'allTime', -1],
     ])('TIME_PERIOD_MAPPING[%s] should have name=%s and correct value', (key, name, expectedValue) => {
       const mapping = TIME_PERIOD_MAPPING[key]
-      expect(mapping.name).toBe(name)
+      expect(mapping!.name).toBe(name)
       if (expectedValue >= 0)
-        expect(mapping.value).toBe(expectedValue)
+        expect(mapping!.value).toBe(expectedValue)
       else
-        expect(mapping.value).toBe(-1)
+        expect(mapping!.value).toBe(-1)
     })
   })
 
@@ -420,7 +425,7 @@ describe('Filter', () => {
       )
 
       const input = screen.getByPlaceholderText('common.operation.search')
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
     })
 
     it('should handle empty string keyword', () => {
@@ -432,7 +437,7 @@ describe('Filter', () => {
       )
 
       const input = screen.getByPlaceholderText('common.operation.search')
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
     })
 
     it('should preserve other query params when updating status', async () => {
@@ -515,9 +520,9 @@ describe('Filter', () => {
         />,
       )
 
-      expect(screen.getByText('Success')).toBeInTheDocument()
-      expect(screen.getByText('appLog.filter.period.today')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('integration test')).toBeInTheDocument()
+      expect(screen.getByText('Success'))!.toBeInTheDocument()
+      expect(screen.getByText('appLog.filter.period.today'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('integration test'))!.toBeInTheDocument()
     })
 
     it('should have proper layout with flex and gap', () => {
@@ -529,9 +534,9 @@ describe('Filter', () => {
       )
 
       const filterContainer = container.firstChild as HTMLElement
-      expect(filterContainer).toHaveClass('flex')
-      expect(filterContainer).toHaveClass('flex-row')
-      expect(filterContainer).toHaveClass('gap-2')
+      expect(filterContainer)!.toHaveClass('flex')
+      expect(filterContainer)!.toHaveClass('flex-row')
+      expect(filterContainer)!.toHaveClass('gap-2')
     })
   })
 })
diff --git a/web/app/components/app/workflow-log/__tests__/list.spec.tsx b/web/app/components/app/workflow-log/__tests__/list.spec.tsx
index 356aaa5a48..35e6369e67 100644
--- a/web/app/components/app/workflow-log/__tests__/list.spec.tsx
+++ b/web/app/components/app/workflow-log/__tests__/list.spec.tsx
@@ -181,7 +181,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={undefined} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(container.querySelector('.spin-animation')).toBeInTheDocument()
+      expect(container.querySelector('.spin-animation'))!.toBeInTheDocument()
     })
 
     it('should render loading state when appDetail is undefined', () => {
@@ -191,7 +191,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={undefined} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(container.querySelector('.spin-animation')).toBeInTheDocument()
+      expect(container.querySelector('.spin-animation'))!.toBeInTheDocument()
     })
 
     it('should render table when data is available', () => {
@@ -201,7 +201,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should render all table headers', () => {
@@ -211,11 +211,11 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('appLog.table.header.startTime')).toBeInTheDocument()
-      expect(screen.getByText('appLog.table.header.status')).toBeInTheDocument()
-      expect(screen.getByText('appLog.table.header.runtime')).toBeInTheDocument()
-      expect(screen.getByText('appLog.table.header.tokens')).toBeInTheDocument()
-      expect(screen.getByText('appLog.table.header.user')).toBeInTheDocument()
+      expect(screen.getByText('appLog.table.header.startTime'))!.toBeInTheDocument()
+      expect(screen.getByText('appLog.table.header.status'))!.toBeInTheDocument()
+      expect(screen.getByText('appLog.table.header.runtime'))!.toBeInTheDocument()
+      expect(screen.getByText('appLog.table.header.tokens'))!.toBeInTheDocument()
+      expect(screen.getByText('appLog.table.header.user'))!.toBeInTheDocument()
     })
 
     it('should render trigger column for workflow apps', () => {
@@ -226,7 +226,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={workflowApp} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('appLog.table.header.triggered_from')).toBeInTheDocument()
+      expect(screen.getByText('appLog.table.header.triggered_from'))!.toBeInTheDocument()
     })
 
     it('should not render trigger column for non-workflow apps', () => {
@@ -256,7 +256,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('Success')).toBeInTheDocument()
+      expect(screen.getByText('Success'))!.toBeInTheDocument()
     })
 
     it('should render failure status correctly', () => {
@@ -270,7 +270,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('Failure')).toBeInTheDocument()
+      expect(screen.getByText('Failure'))!.toBeInTheDocument()
     })
 
     it('should render stopped status correctly', () => {
@@ -284,7 +284,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('Stop')).toBeInTheDocument()
+      expect(screen.getByText('Stop'))!.toBeInTheDocument()
     })
 
     it('should render running status correctly', () => {
@@ -298,7 +298,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('Running')).toBeInTheDocument()
+      expect(screen.getByText('Running'))!.toBeInTheDocument()
     })
 
     it('should render partial-succeeded status correctly', () => {
@@ -312,7 +312,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('Partial Success')).toBeInTheDocument()
+      expect(screen.getByText('Partial Success'))!.toBeInTheDocument()
     })
   })
 
@@ -332,7 +332,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('John Doe')).toBeInTheDocument()
+      expect(screen.getByText('John Doe'))!.toBeInTheDocument()
     })
 
     it('should display end user session id when created by end user', () => {
@@ -347,7 +347,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('session-abc-123')).toBeInTheDocument()
+      expect(screen.getByText('session-abc-123'))!.toBeInTheDocument()
     })
 
     it('should display N/A when no user info', () => {
@@ -362,7 +362,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('N/A')).toBeInTheDocument()
+      expect(screen.getByText('N/A'))!.toBeInTheDocument()
     })
   })
 
@@ -405,7 +405,7 @@ describe('WorkflowAppLogList', () => {
       // Arrow should rotate (indicated by class change)
       // The sort icon should have rotate-180 class for ascending
       const sortIcon = startTimeHeader.closest('div')?.querySelector('svg')
-      expect(sortIcon).toBeInTheDocument()
+      expect(sortIcon)!.toBeInTheDocument()
     })
 
     it('should render sort arrow icon', () => {
@@ -417,7 +417,7 @@ describe('WorkflowAppLogList', () => {
 
       // Check for ArrowDownIcon presence
       const sortArrow = container.querySelector('svg.ml-0\\.5')
-      expect(sortArrow).toBeInTheDocument()
+      expect(sortArrow)!.toBeInTheDocument()
     })
   })
 
@@ -440,11 +440,11 @@ describe('WorkflowAppLogList', () => {
       )
 
       const dataRows = screen.getAllByRole('row')
-      await user.click(dataRows[1]) // Click first data row
+      await user.click(dataRows[1]!) // Click first data row
 
       const dialog = await screen.findByRole('dialog')
-      expect(dialog).toBeInTheDocument()
-      expect(screen.getByText('appLog.runDetail.workflowTitle')).toBeInTheDocument()
+      expect(dialog)!.toBeInTheDocument()
+      expect(screen.getByText('appLog.runDetail.workflowTitle'))!.toBeInTheDocument()
     })
 
     it('should close drawer and call onRefresh when closing', async () => {
@@ -459,7 +459,7 @@ describe('WorkflowAppLogList', () => {
 
       // Open drawer
       const dataRows = screen.getAllByRole('row')
-      await user.click(dataRows[1])
+      await user.click(dataRows[1]!)
       await screen.findByRole('dialog')
 
       // Close drawer using Escape key
@@ -482,14 +482,46 @@ describe('WorkflowAppLogList', () => {
       const dataRows = screen.getAllByRole('row')
       const dataRow = dataRows[1]
 
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
+      // Before click - no highlight
       // Before click - no highlight
       expect(dataRow).not.toHaveClass('bg-background-default-hover')
 
       // After click - has highlight (via currentLog state)
-      await user.click(dataRow)
+      await user.click(dataRow!)
 
       // The row should have the selected class
-      expect(dataRow).toHaveClass('bg-background-default-hover')
+      // The row should have the selected class
+      expect(dataRow)!.toHaveClass('bg-background-default-hover')
     })
   })
 
@@ -515,7 +547,7 @@ describe('WorkflowAppLogList', () => {
 
       // Open drawer
       const dataRows = screen.getAllByRole('row')
-      await user.click(dataRows[1])
+      await user.click(dataRows[1]!)
       await screen.findByRole('dialog')
 
       // Replay button should be present for app-run triggers
@@ -543,12 +575,12 @@ describe('WorkflowAppLogList', () => {
 
       // Open drawer
       const dataRows = screen.getAllByRole('row')
-      await user.click(dataRows[1])
+      await user.click(dataRows[1]!)
       await screen.findByRole('dialog')
 
       // Replay button should be present for debugging triggers
       const replayButton = screen.getByRole('button', { name: 'appLog.runDetail.testWithParams' })
-      expect(replayButton).toBeInTheDocument()
+      expect(replayButton)!.toBeInTheDocument()
     })
 
     it('should not show replay for webhook triggers', async () => {
@@ -569,9 +601,40 @@ describe('WorkflowAppLogList', () => {
 
       // Open drawer
       const dataRows = screen.getAllByRole('row')
-      await user.click(dataRows[1])
+      await user.click(dataRows[1]!)
       await screen.findByRole('dialog')
 
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
+      // Replay button should not be present for webhook triggers
       // Replay button should not be present for webhook triggers
       expect(screen.queryByRole('button', { name: 'appLog.runDetail.testWithParams' })).not.toBeInTheDocument()
     })
@@ -594,7 +657,7 @@ describe('WorkflowAppLogList', () => {
 
       // Unread indicator is a small blue dot
       const unreadDot = container.querySelector('.bg-util-colors-blue-blue-500')
-      expect(unreadDot).toBeInTheDocument()
+      expect(unreadDot)!.toBeInTheDocument()
     })
 
     it('should not show unread indicator for read logs', () => {
@@ -629,7 +692,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('1.235s')).toBeInTheDocument()
+      expect(screen.getByText('1.235s'))!.toBeInTheDocument()
     })
 
     it('should display 0 elapsed time with special styling', () => {
@@ -644,8 +707,8 @@ describe('WorkflowAppLogList', () => {
       )
 
       const zeroTime = screen.getByText('0.000s')
-      expect(zeroTime).toBeInTheDocument()
-      expect(zeroTime).toHaveClass('text-text-quaternary')
+      expect(zeroTime)!.toBeInTheDocument()
+      expect(zeroTime)!.toHaveClass('text-text-quaternary')
     })
   })
 
@@ -664,7 +727,7 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('12345')).toBeInTheDocument()
+      expect(screen.getByText('12345'))!.toBeInTheDocument()
     })
   })
 
@@ -680,7 +743,7 @@ describe('WorkflowAppLogList', () => {
       )
 
       const table = screen.getByRole('table')
-      expect(table).toBeInTheDocument()
+      expect(table)!.toBeInTheDocument()
 
       // Should only have header row
       const rows = screen.getAllByRole('row')
@@ -721,8 +784,8 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={createMockApp()} onRefresh={defaultOnRefresh} />,
       )
 
-      expect(screen.getByText('0.000s')).toBeInTheDocument()
-      expect(screen.getByText('0')).toBeInTheDocument()
+      expect(screen.getByText('0.000s'))!.toBeInTheDocument()
+      expect(screen.getByText('0'))!.toBeInTheDocument()
     })
 
     it('should handle null workflow_run.triggered_from for non-workflow apps', () => {
@@ -739,6 +802,37 @@ describe('WorkflowAppLogList', () => {
         <WorkflowAppLogList logs={logs} appDetail={chatApp} onRefresh={defaultOnRefresh} />,
       )
 
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
+      // Should render without trigger column
       // Should render without trigger column
       expect(screen.queryByText('appLog.table.header.triggered_from')).not.toBeInTheDocument()
     })
diff --git a/web/app/components/app/workflow-log/index.tsx b/web/app/components/app/workflow-log/index.tsx
index 79ae2ed83c..242fd7d093 100644
--- a/web/app/components/app/workflow-log/index.tsx
+++ b/web/app/components/app/workflow-log/index.tsx
@@ -47,7 +47,7 @@ const Logs: FC<ILogsProps> = ({ appDetail }) => {
     ...(debouncedQueryParams.keyword ? { keyword: debouncedQueryParams.keyword } : {}),
     ...((debouncedQueryParams.period !== '9')
       ? {
-          created_at__after: dayjs().subtract(TIME_PERIOD_MAPPING[debouncedQueryParams.period].value, 'day').startOf('day').tz(timezone).format('YYYY-MM-DDTHH:mm:ssZ'),
+          created_at__after: dayjs().subtract(TIME_PERIOD_MAPPING[debouncedQueryParams.period]!.value, 'day').startOf('day').tz(timezone).format('YYYY-MM-DDTHH:mm:ssZ'),
           created_at__before: dayjs().endOf('day').tz(timezone).format('YYYY-MM-DDTHH:mm:ssZ'),
         }
       : {}),
diff --git a/web/app/components/apps/__tests__/list.spec.tsx b/web/app/components/apps/__tests__/list.spec.tsx
index 9b82648986..eddcb31d60 100644
--- a/web/app/components/apps/__tests__/list.spec.tsx
+++ b/web/app/components/apps/__tests__/list.spec.tsx
@@ -222,55 +222,55 @@ describe('List', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       renderList()
-      expect(screen.getByText('app.types.all')).toBeInTheDocument()
+      expect(screen.getByText('app.types.all'))!.toBeInTheDocument()
     })
 
     it('should render tab slider with all app types', () => {
       renderList()
 
-      expect(screen.getByText('app.types.all')).toBeInTheDocument()
-      expect(screen.getByText('app.types.workflow')).toBeInTheDocument()
-      expect(screen.getByText('app.types.advanced')).toBeInTheDocument()
-      expect(screen.getByText('app.types.chatbot')).toBeInTheDocument()
-      expect(screen.getByText('app.types.agent')).toBeInTheDocument()
-      expect(screen.getByText('app.types.completion')).toBeInTheDocument()
+      expect(screen.getByText('app.types.all'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.workflow'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.advanced'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.chatbot'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.agent'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.completion'))!.toBeInTheDocument()
     })
 
     it('should render search input', () => {
       renderList()
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should render tag filter', () => {
       renderList()
-      expect(screen.getByText('common.tag.placeholder')).toBeInTheDocument()
+      expect(screen.getByText('common.tag.placeholder'))!.toBeInTheDocument()
     })
 
     it('should render created by me checkbox', () => {
       renderList()
-      expect(screen.getByText('app.showMyCreatedAppsOnly')).toBeInTheDocument()
+      expect(screen.getByText('app.showMyCreatedAppsOnly'))!.toBeInTheDocument()
     })
 
     it('should render app cards when apps exist', () => {
       renderList()
 
-      expect(screen.getByTestId('app-card-app-1')).toBeInTheDocument()
-      expect(screen.getByTestId('app-card-app-2')).toBeInTheDocument()
+      expect(screen.getByTestId('app-card-app-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('app-card-app-2'))!.toBeInTheDocument()
     })
 
     it('should render new app card for editors', () => {
       renderList()
-      expect(screen.getByTestId('new-app-card')).toBeInTheDocument()
+      expect(screen.getByTestId('new-app-card'))!.toBeInTheDocument()
     })
 
     it('should render footer when branding is disabled', () => {
       renderList()
-      expect(screen.getByTestId('footer')).toBeInTheDocument()
+      expect(screen.getByTestId('footer'))!.toBeInTheDocument()
     })
 
     it('should render drop DSL hint for editors', () => {
       renderList()
-      expect(screen.getByText('app.newApp.dropDSLToCreateApp')).toBeInTheDocument()
+      expect(screen.getByText('app.newApp.dropDSLToCreateApp'))!.toBeInTheDocument()
     })
   })
 
@@ -281,7 +281,7 @@ describe('List', () => {
       fireEvent.click(screen.getByText('app.types.workflow'))
 
       await vi.waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(lastCall.searchParams.get('category')).toBe(AppModeEnum.WORKFLOW)
     })
 
@@ -291,7 +291,7 @@ describe('List', () => {
       fireEvent.click(screen.getByText('app.types.all'))
 
       await vi.waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       // nuqs removes the default value ('all') from URL params
       expect(lastCall.searchParams.has('category')).toBe(false)
     })
@@ -300,7 +300,7 @@ describe('List', () => {
   describe('Search Functionality', () => {
     it('should render search input field', () => {
       renderList()
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should handle search input change', () => {
@@ -318,7 +318,7 @@ describe('List', () => {
       renderList()
 
       const clearButton = document.querySelector('.group')
-      expect(clearButton).toBeInTheDocument()
+      expect(clearButton)!.toBeInTheDocument()
       if (clearButton)
         fireEvent.click(clearButton)
 
@@ -329,14 +329,14 @@ describe('List', () => {
   describe('Tag Filter', () => {
     it('should render tag filter component', () => {
       renderList()
-      expect(screen.getByText('common.tag.placeholder')).toBeInTheDocument()
+      expect(screen.getByText('common.tag.placeholder'))!.toBeInTheDocument()
     })
   })
 
   describe('Created By Me Filter', () => {
     it('should render checkbox with correct label', () => {
       renderList()
-      expect(screen.getByText('app.showMyCreatedAppsOnly')).toBeInTheDocument()
+      expect(screen.getByText('app.showMyCreatedAppsOnly'))!.toBeInTheDocument()
     })
 
     it('should handle checkbox change', () => {
@@ -391,39 +391,39 @@ describe('List', () => {
   describe('Edge Cases', () => {
     it('should handle multiple renders without issues', () => {
       const { unmount } = renderWithNuqs(<List />)
-      expect(screen.getByText('app.types.all')).toBeInTheDocument()
+      expect(screen.getByText('app.types.all'))!.toBeInTheDocument()
 
       unmount()
       renderList()
-      expect(screen.getByText('app.types.all')).toBeInTheDocument()
+      expect(screen.getByText('app.types.all'))!.toBeInTheDocument()
     })
 
     it('should render app cards correctly', () => {
       renderList()
 
-      expect(screen.getByText('Test App 1')).toBeInTheDocument()
-      expect(screen.getByText('Test App 2')).toBeInTheDocument()
+      expect(screen.getByText('Test App 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Test App 2'))!.toBeInTheDocument()
     })
 
     it('should render with all filter options visible', () => {
       renderList()
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
-      expect(screen.getByText('common.tag.placeholder')).toBeInTheDocument()
-      expect(screen.getByText('app.showMyCreatedAppsOnly')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+      expect(screen.getByText('common.tag.placeholder'))!.toBeInTheDocument()
+      expect(screen.getByText('app.showMyCreatedAppsOnly'))!.toBeInTheDocument()
     })
   })
 
   describe('Dragging State', () => {
     it('should show drop hint when DSL feature is enabled for editors', () => {
       renderList()
-      expect(screen.getByText('app.newApp.dropDSLToCreateApp')).toBeInTheDocument()
+      expect(screen.getByText('app.newApp.dropDSLToCreateApp'))!.toBeInTheDocument()
     })
 
     it('should render dragging state overlay when dragging', () => {
       mockDragging = true
       const { container } = renderList()
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
   })
 
@@ -431,12 +431,12 @@ describe('List', () => {
     it('should render all app type tabs', () => {
       renderList()
 
-      expect(screen.getByText('app.types.all')).toBeInTheDocument()
-      expect(screen.getByText('app.types.workflow')).toBeInTheDocument()
-      expect(screen.getByText('app.types.advanced')).toBeInTheDocument()
-      expect(screen.getByText('app.types.chatbot')).toBeInTheDocument()
-      expect(screen.getByText('app.types.agent')).toBeInTheDocument()
-      expect(screen.getByText('app.types.completion')).toBeInTheDocument()
+      expect(screen.getByText('app.types.all'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.workflow'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.advanced'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.chatbot'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.agent'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.completion'))!.toBeInTheDocument()
     })
 
     it('should update URL for each app type tab click', async () => {
@@ -454,7 +454,7 @@ describe('List', () => {
         onUrlUpdate.mockClear()
         fireEvent.click(screen.getByText(text))
         await vi.waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-        const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+        const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
         expect(lastCall.searchParams.get('category')).toBe(mode)
       }
     })
@@ -464,22 +464,22 @@ describe('List', () => {
     it('should display all app cards from data', () => {
       renderList()
 
-      expect(screen.getByTestId('app-card-app-1')).toBeInTheDocument()
-      expect(screen.getByTestId('app-card-app-2')).toBeInTheDocument()
+      expect(screen.getByTestId('app-card-app-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('app-card-app-2'))!.toBeInTheDocument()
     })
 
     it('should display app names correctly', () => {
       renderList()
 
-      expect(screen.getByText('Test App 1')).toBeInTheDocument()
-      expect(screen.getByText('Test App 2')).toBeInTheDocument()
+      expect(screen.getByText('Test App 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Test App 2'))!.toBeInTheDocument()
     })
   })
 
   describe('Footer Visibility', () => {
     it('should render footer when branding is disabled', () => {
       renderList()
-      expect(screen.getByTestId('footer')).toBeInTheDocument()
+      expect(screen.getByTestId('footer'))!.toBeInTheDocument()
     })
   })
 
@@ -493,7 +493,7 @@ describe('List', () => {
           mockOnDSLFileDropped(mockFile)
       })
 
-      expect(screen.getByTestId('create-dsl-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('create-dsl-modal'))!.toBeInTheDocument()
     })
 
     it('should close DSL modal when onClose is called', () => {
@@ -505,7 +505,7 @@ describe('List', () => {
           mockOnDSLFileDropped(mockFile)
       })
 
-      expect(screen.getByTestId('create-dsl-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('create-dsl-modal'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('close-dsl-modal'))
 
@@ -521,7 +521,7 @@ describe('List', () => {
           mockOnDSLFileDropped(mockFile)
       })
 
-      expect(screen.getByTestId('create-dsl-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('create-dsl-modal'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('success-dsl-modal'))
 
@@ -585,7 +585,7 @@ describe('List', () => {
     it('should handle error state in useEffect', () => {
       mockServiceState.error = new Error('Test error')
       const { container } = renderList()
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/apps/app-card.tsx b/web/app/components/apps/app-card.tsx
index ba85ce5178..6d76d632f7 100644
--- a/web/app/components/apps/app-card.tsx
+++ b/web/app/components/apps/app-card.tsx
@@ -115,7 +115,7 @@ const AppCardOperationsMenu: React.FC<AppCardOperationsMenuProps> = ({
       await openAsyncWindow(async () => {
         const { installed_apps } = await fetchInstalledAppList(app.id)
         if (installed_apps?.length > 0)
-          return `${basePath}/explore/installed/${installed_apps[0].id}`
+          return `${basePath}/explore/installed/${installed_apps[0]!.id}`
         throw new Error('No app found in Explore')
       }, {
         onError: (err) => {
diff --git a/web/app/components/apps/hooks/__tests__/use-apps-query-state.spec.tsx b/web/app/components/apps/hooks/__tests__/use-apps-query-state.spec.tsx
index 8e8e5821a8..4b0c63f580 100644
--- a/web/app/components/apps/hooks/__tests__/use-apps-query-state.spec.tsx
+++ b/web/app/components/apps/hooks/__tests__/use-apps-query-state.spec.tsx
@@ -114,7 +114,7 @@ describe('useAppsQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('keywords')).toBe('search')
       expect(update.options.history).toBe('push')
     })
@@ -127,7 +127,7 @@ describe('useAppsQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('tagIDs')).toBe('tag1;tag2')
     })
 
@@ -139,7 +139,7 @@ describe('useAppsQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('isCreatedByMe')).toBe('true')
     })
 
@@ -151,7 +151,7 @@ describe('useAppsQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('keywords')).toBe(false)
     })
 
@@ -163,7 +163,7 @@ describe('useAppsQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('tagIDs')).toBe(false)
     })
 
@@ -175,7 +175,7 @@ describe('useAppsQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('isCreatedByMe')).toBe(false)
     })
   })
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 77d89b87da..3e795018b0 100644
--- a/web/app/components/apps/hooks/use-dsl-drag-drop.ts
+++ b/web/app/components/apps/hooks/use-dsl-drag-drop.ts
@@ -41,8 +41,8 @@ export const useDSLDragDrop = ({ onDSLFileDropped, containerRef, enabled = true
       return
 
     const file = files[0]
-    if (file.name.toLowerCase().endsWith('.yaml') || file.name.toLowerCase().endsWith('.yml'))
-      onDSLFileDropped(file)
+    if (file!.name.toLowerCase().endsWith('.yaml') || file!.name.toLowerCase().endsWith('.yml'))
+      onDSLFileDropped(file!)
   }
 
   useEffect(() => {
diff --git a/web/app/components/apps/list.tsx b/web/app/components/apps/list.tsx
index a898e682f5..3b30a839d4 100644
--- a/web/app/components/apps/list.tsx
+++ b/web/app/components/apps/list.tsx
@@ -151,7 +151,7 @@ const List: FC<Props> = ({
       const dynamicMargin = Math.max(100, Math.min(containerHeight * 0.2, 200)) // Clamps to 100-200px range, using 20% of container height as the base value
 
       observer = new IntersectionObserver((entries) => {
-        if (entries[0].isIntersecting && !isLoading && !isFetchingNextPage && !error && hasMore)
+        if (entries[0]!.isIntersecting && !isLoading && !isFetchingNextPage && !error && hasMore)
           fetchNextPage()
       }, {
         root: containerRef.current,
diff --git a/web/app/components/base/amplitude/__tests__/utils.spec.ts b/web/app/components/base/amplitude/__tests__/utils.spec.ts
index f1ff5db1e3..87ac9159d0 100644
--- a/web/app/components/base/amplitude/__tests__/utils.spec.ts
+++ b/web/app/components/base/amplitude/__tests__/utils.spec.ts
@@ -85,7 +85,7 @@ describe('amplitude utils', () => {
       setUserProperties(properties)
 
       expect(mockIdentify).toHaveBeenCalledTimes(1)
-      const identifyArg = mockIdentify.mock.calls[0][0] as InstanceType<typeof MockIdentify>
+      const identifyArg = mockIdentify.mock.calls[0]![0] as InstanceType<typeof MockIdentify>
       expect(identifyArg).toBeInstanceOf(MockIdentify)
       expect(identifyArg.setCalls).toEqual([
         ['role', 'owner'],
diff --git a/web/app/components/base/app-icon-picker/__tests__/index.spec.tsx b/web/app/components/base/app-icon-picker/__tests__/index.spec.tsx
index 8334512047..07dd809f41 100644
--- a/web/app/components/base/app-icon-picker/__tests__/index.spec.tsx
+++ b/web/app/components/base/app-icon-picker/__tests__/index.spec.tsx
@@ -156,10 +156,10 @@ describe('AppIconPicker', () => {
     it('should render emoji and image tabs when upload is enabled', async () => {
       renderPicker()
 
-      expect(await screen.findByText(/emoji/i)).toBeInTheDocument()
-      expect(screen.getByText(/image/i)).toBeInTheDocument()
-      expect(screen.getByText(/cancel/i)).toBeInTheDocument()
-      expect(screen.getByText(/ok/i)).toBeInTheDocument()
+      expect(await screen.findByText(/emoji/i))!.toBeInTheDocument()
+      expect(screen.getByText(/image/i))!.toBeInTheDocument()
+      expect(screen.getByText(/cancel/i))!.toBeInTheDocument()
+      expect(screen.getByText(/ok/i))!.toBeInTheDocument()
     })
 
     it('should hide the image tab when upload is disabled', () => {
@@ -167,7 +167,7 @@ describe('AppIconPicker', () => {
       renderPicker()
 
       expect(screen.queryByText(/image/i)).not.toBeInTheDocument()
-      expect(screen.getByPlaceholderText(/search/i)).toBeInTheDocument()
+      expect(screen.getByPlaceholderText(/search/i))!.toBeInTheDocument()
     })
   })
 
@@ -184,10 +184,10 @@ describe('AppIconPicker', () => {
       renderPicker()
 
       await userEvent.click(screen.getByText(/image/i))
-      expect(screen.getByText(/drop.*here/i)).toBeInTheDocument()
+      expect(screen.getByText(/drop.*here/i))!.toBeInTheDocument()
 
       await userEvent.click(screen.getByText(/emoji/i))
-      expect(screen.getByPlaceholderText(/search/i)).toBeInTheDocument()
+      expect(screen.getByPlaceholderText(/search/i))!.toBeInTheDocument()
     })
 
     it('should call onSelect with emoji data after emoji selection', async () => {
@@ -251,7 +251,7 @@ describe('AppIconPicker', () => {
       fireEvent.change(input, { target: { files: [new File(['png'], 'avatar.png', { type: 'image/png' })] } })
 
       await waitFor(() => {
-        expect(screen.getByTestId('mock-cropper')).toBeInTheDocument()
+        expect(screen.getByTestId('mock-cropper'))!.toBeInTheDocument()
       })
 
       await userEvent.click(screen.getByTestId('trigger-crop'))
@@ -261,7 +261,7 @@ describe('AppIconPicker', () => {
         expect(mocks.handleLocalFileUpload).toHaveBeenCalledTimes(1)
       })
 
-      const uploadedFile = mocks.handleLocalFileUpload.mock.calls[0][0]
+      const uploadedFile = mocks.handleLocalFileUpload.mock.calls[0]![0]
       expect(uploadedFile).toBeInstanceOf(File)
       expect(uploadedFile.name).toBe('avatar.png')
       expect(uploadedFile.type).toBe('image/png')
@@ -291,7 +291,7 @@ describe('AppIconPicker', () => {
       await waitFor(() => {
         expect(screen.queryByTestId('mock-cropper')).not.toBeInTheDocument()
         const preview = screen.queryByTestId('animated-image')
-        expect(preview).toBeInTheDocument()
+        expect(preview)!.toBeInTheDocument()
         expect(preview?.getAttribute('src')).toContain('blob:mock-url')
       })
 
diff --git a/web/app/components/base/audio-btn/__tests__/audio.player.manager.spec.ts b/web/app/components/base/audio-btn/__tests__/audio.player.manager.spec.ts
index c613aa2c11..4a98524ed2 100644
--- a/web/app/components/base/audio-btn/__tests__/audio.player.manager.spec.ts
+++ b/web/app/components/base/audio-btn/__tests__/audio.player.manager.spec.ts
@@ -90,8 +90,8 @@ describe('AudioPlayerManager', () => {
 
       expect(mockAudioPlayerConstructor).toHaveBeenCalledTimes(1)
       expect(first).toBe(second)
-      expect(mockState.instances[0].setCallback).toHaveBeenCalledTimes(1)
-      expect(mockState.instances[0].setCallback).toHaveBeenCalledWith(secondCallback)
+      expect(mockState.instances[0]!.setCallback).toHaveBeenCalledTimes(1)
+      expect(mockState.instances[0]!.setCallback).toHaveBeenCalledWith(secondCallback)
     })
 
     it('should cleanup existing player and create a new one when msg id changes', () => {
@@ -102,9 +102,9 @@ describe('AudioPlayerManager', () => {
 
       const next = manager.getAudioPlayer('/apps/1/text-to-audio', false, 'msg-2', 'world', 'en-US', callback)
 
-      expect(previous.pauseAudio).toHaveBeenCalledTimes(1)
-      expect(previous.cacheBuffers).toEqual([])
-      expect(previous.sourceBuffer?.abort).toHaveBeenCalledTimes(1)
+      expect(previous!.pauseAudio).toHaveBeenCalledTimes(1)
+      expect(previous!.cacheBuffers).toEqual([])
+      expect(previous!.sourceBuffer?.abort).toHaveBeenCalledTimes(1)
       expect(mockAudioPlayerConstructor).toHaveBeenCalledTimes(2)
       expect(next).toBe(mockState.instances[1])
     })
@@ -114,7 +114,7 @@ describe('AudioPlayerManager', () => {
       const callback = vi.fn()
       manager.getAudioPlayer('/text-to-audio', false, 'msg-1', 'hello', 'en-US', callback)
       const previous = mockState.instances[0]
-      previous.pauseAudio.mockImplementation(() => {
+      previous!.pauseAudio.mockImplementation(() => {
         throw new Error('cleanup failure')
       })
 
@@ -122,7 +122,7 @@ describe('AudioPlayerManager', () => {
         manager.getAudioPlayer('/apps/1/text-to-audio', false, 'msg-2', 'world', 'en-US', callback)
       }).not.toThrow()
 
-      expect(previous.pauseAudio).toHaveBeenCalledTimes(1)
+      expect(previous!.pauseAudio).toHaveBeenCalledTimes(1)
       expect(mockAudioPlayerConstructor).toHaveBeenCalledTimes(2)
     })
   })
@@ -135,8 +135,8 @@ describe('AudioPlayerManager', () => {
 
       manager.resetMsgId('msg-updated')
 
-      expect(mockState.instances[0].resetMsgId).toHaveBeenCalledTimes(1)
-      expect(mockState.instances[0].resetMsgId).toHaveBeenCalledWith('msg-updated')
+      expect(mockState.instances[0]!.resetMsgId).toHaveBeenCalledTimes(1)
+      expect(mockState.instances[0]!.resetMsgId).toHaveBeenCalledWith('msg-updated')
     })
 
     it('should not throw when resetting message id without an audio player', () => {
diff --git a/web/app/components/base/audio-btn/__tests__/audio.spec.ts b/web/app/components/base/audio-btn/__tests__/audio.spec.ts
index 4399cb40fd..16f880719d 100644
--- a/web/app/components/base/audio-btn/__tests__/audio.spec.ts
+++ b/web/app/components/base/audio-btn/__tests__/audio.spec.ts
@@ -241,10 +241,10 @@ describe('AudioPlayer', () => {
 
       expect(player.mediaSource).toBe(mediaSource as unknown as MediaSource)
       expect(globalThis.URL.createObjectURL).toHaveBeenCalledTimes(1)
-      expect(audio.src).toBe('blob:mock-url')
-      expect(audio.autoplay).toBe(true)
-      expect(audioContext.createMediaElementSource).toHaveBeenCalledWith(audio)
-      expect(audioContext.connect).toHaveBeenCalledTimes(1)
+      expect(audio!.src).toBe('blob:mock-url')
+      expect(audio!.autoplay).toBe(true)
+      expect(audioContext!.createMediaElementSource).toHaveBeenCalledWith(audio)
+      expect(audioContext!.connect).toHaveBeenCalledTimes(1)
     })
 
     it('should notify unsupported browser when no MediaSource implementation exists', () => {
@@ -254,7 +254,7 @@ describe('AudioPlayer', () => {
       const audio = testState.audios[0]
 
       expect(player.mediaSource).toBeNull()
-      expect(audio.src).toBe('')
+      expect(audio!.src).toBe('')
       expect(mockToastNotify).toHaveBeenCalledTimes(1)
       expect(mockToastNotify).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -271,8 +271,8 @@ describe('AudioPlayer', () => {
       const audio = testState.audios[0]
 
       expect(player.mediaSource).not.toBeNull()
-      expect(audio.disableRemotePlayback).toBe(true)
-      expect(audio.controls).toBe(true)
+      expect(audio!.disableRemotePlayback).toBe(true)
+      expect(audio!.controls).toBe(true)
     })
   })
 
@@ -282,14 +282,14 @@ describe('AudioPlayer', () => {
       const player = new AudioPlayer('/text-to-audio', true, 'msg-1', 'hello', 'en-US', callback)
       const audio = testState.audios[0]
 
-      audio.emit('play')
-      audio.emit('ended')
-      audio.emit('error')
-      audio.emit('paused')
-      audio.emit('loaded')
-      audio.emit('timeupdate')
-      audio.emit('loadeddate')
-      audio.emit('canplay')
+      audio!.emit('play')
+      audio!.emit('ended')
+      audio!.emit('error')
+      audio!.emit('paused')
+      audio!.emit('loaded')
+      audio!.emit('timeupdate')
+      audio!.emit('loadeddate')
+      audio!.emit('canplay')
 
       expect(player.callback).toBe(callback)
       expect(callback).toHaveBeenCalledWith('play')
@@ -306,11 +306,11 @@ describe('AudioPlayer', () => {
       const player = new AudioPlayer('/text-to-audio', true, 'msg-1', 'hello', 'en-US', vi.fn())
       const mediaSource = testState.mediaSources[0]
 
-      mediaSource.emit('sourceopen')
-      mediaSource.emit('sourceopen')
+      mediaSource!.emit('sourceopen')
+      mediaSource!.emit('sourceopen')
 
-      expect(mediaSource.addSourceBuffer).toHaveBeenCalledTimes(1)
-      expect(player.sourceBuffer).toBe(mediaSource.sourceBuffer)
+      expect(mediaSource!.addSourceBuffer).toHaveBeenCalledTimes(1)
+      expect(player.sourceBuffer).toBe(mediaSource!.sourceBuffer)
     })
   })
 
@@ -366,12 +366,12 @@ describe('AudioPlayer', () => {
       const audioContext = testState.audioContexts[0]
 
       player.isLoadData = true
-      audioContext.state = 'suspended'
+      audioContext!.state = 'suspended'
       player.playAudio()
       await Promise.resolve()
 
-      expect(audioContext.resume).toHaveBeenCalledTimes(1)
-      expect(audio.play).toHaveBeenCalledTimes(1)
+      expect(audioContext!.resume).toHaveBeenCalledTimes(1)
+      expect(audio!.play).toHaveBeenCalledTimes(1)
       expect(callback).toHaveBeenCalledWith('play')
     })
 
@@ -382,11 +382,11 @@ describe('AudioPlayer', () => {
       const audioContext = testState.audioContexts[0]
 
       player.isLoadData = true
-      audioContext.state = 'running'
-      audio.ended = true
+      audioContext!.state = 'running'
+      audio!.ended = true
       player.playAudio()
 
-      expect(audio.play).toHaveBeenCalledTimes(1)
+      expect(audio!.play).toHaveBeenCalledTimes(1)
       expect(callback).toHaveBeenCalledWith('play')
     })
 
@@ -397,11 +397,11 @@ describe('AudioPlayer', () => {
       const audioContext = testState.audioContexts[0]
 
       player.isLoadData = true
-      audioContext.state = 'running'
-      audio.ended = false
+      audioContext!.state = 'running'
+      audio!.ended = false
       player.playAudio()
 
-      expect(audio.play).not.toHaveBeenCalled()
+      expect(audio!.play).not.toHaveBeenCalled()
       expect(callback).toHaveBeenCalledWith('play')
     })
 
@@ -427,8 +427,8 @@ describe('AudioPlayer', () => {
       player.pauseAudio()
 
       expect(callback).toHaveBeenCalledWith('paused')
-      expect(audio.pause).toHaveBeenCalledTimes(1)
-      expect(audioContext.suspend).toHaveBeenCalledTimes(1)
+      expect(audio!.pause).toHaveBeenCalledTimes(1)
+      expect(audioContext!.suspend).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -453,7 +453,7 @@ describe('AudioPlayer', () => {
 
         expect(player.isLoadData).toBe(false)
         expect(player.cacheBuffers).toHaveLength(0)
-        expect(mediaSource.endOfStream).toHaveBeenCalledTimes(1)
+        expect(mediaSource!.endOfStream).toHaveBeenCalledTimes(1)
         expect(callback).not.toHaveBeenCalledWith('play')
       }
       finally {
@@ -469,19 +469,19 @@ describe('AudioPlayer', () => {
       const mediaSource = testState.mediaSources[0]
       const audioBase64 = Buffer.from('hello').toString('base64')
 
-      mediaSource.emit('sourceopen')
-      audio.paused = true
+      mediaSource!.emit('sourceopen')
+      audio!.paused = true
       await player.playAudioWithAudio(audioBase64, true)
       await Promise.resolve()
 
       expect(player.isLoadData).toBe(true)
       expect(player.cacheBuffers).toHaveLength(0)
-      expect(mediaSource.sourceBuffer.appendBuffer).toHaveBeenCalledTimes(1)
-      const appendedAudioData = mediaSource.sourceBuffer.appendBuffer.mock.calls[0][0]
+      expect(mediaSource!.sourceBuffer.appendBuffer).toHaveBeenCalledTimes(1)
+      const appendedAudioData = mediaSource!.sourceBuffer.appendBuffer.mock.calls[0]![0]
       expect(appendedAudioData).toBeInstanceOf(ArrayBuffer)
       expect(appendedAudioData.byteLength).toBeGreaterThan(0)
-      expect(audioContext.resume).toHaveBeenCalledTimes(1)
-      expect(audio.play).toHaveBeenCalledTimes(1)
+      expect(audioContext!.resume).toHaveBeenCalledTimes(1)
+      expect(audio!.play).toHaveBeenCalledTimes(1)
       expect(callback).toHaveBeenCalledWith('play')
     })
 
@@ -494,8 +494,8 @@ describe('AudioPlayer', () => {
       await player.playAudioWithAudio(Buffer.from('hello').toString('base64'), false)
 
       expect(player.isLoadData).toBe(false)
-      expect(audioContext.resume).not.toHaveBeenCalled()
-      expect(audio.play).not.toHaveBeenCalled()
+      expect(audioContext!.resume).not.toHaveBeenCalled()
+      expect(audio!.play).not.toHaveBeenCalled()
       expect(callback).not.toHaveBeenCalledWith('play')
     })
 
@@ -504,11 +504,11 @@ describe('AudioPlayer', () => {
       const player = new AudioPlayer('/text-to-audio', true, 'msg-1', 'hello', 'en-US', callback)
       const audio = testState.audios[0]
 
-      audio.paused = false
-      audio.ended = true
+      audio!.paused = false
+      audio!.ended = true
       await player.playAudioWithAudio(Buffer.from('hello').toString('base64'), true)
 
-      expect(audio.play).toHaveBeenCalledTimes(1)
+      expect(audio!.play).toHaveBeenCalledTimes(1)
       expect(callback).toHaveBeenCalledWith('play')
     })
 
@@ -517,12 +517,12 @@ describe('AudioPlayer', () => {
       const player = new AudioPlayer('/text-to-audio', true, 'msg-1', 'hello', 'en-US', callback)
       const audio = testState.audios[0]
 
-      audio.paused = false
-      audio.ended = false
-      audio.played = {}
+      audio!.paused = false
+      audio!.ended = false
+      audio!.played = {}
       await player.playAudioWithAudio(Buffer.from('hello').toString('base64'), true)
 
-      expect(audio.play).not.toHaveBeenCalled()
+      expect(audio!.play).not.toHaveBeenCalled()
       expect(callback).not.toHaveBeenCalledWith('play')
     })
 
@@ -531,12 +531,12 @@ describe('AudioPlayer', () => {
       const player = new AudioPlayer('/text-to-audio', true, 'msg-1', 'hello', 'en-US', callback)
       const audio = testState.audios[0]
 
-      audio.paused = false
-      audio.ended = false
-      audio.played = null
+      audio!.paused = false
+      audio!.ended = false
+      audio!.played = null
       await player.playAudioWithAudio(Buffer.from('hello').toString('base64'), true)
 
-      expect(audio.play).toHaveBeenCalledTimes(1)
+      expect(audio!.play).toHaveBeenCalledTimes(1)
       expect(callback).toHaveBeenCalledWith('play')
     })
   })
@@ -567,8 +567,8 @@ describe('AudioPlayer', () => {
     it('should queue incoming buffer when source buffer is updating', () => {
       const player = new AudioPlayer('/text-to-audio', true, 'msg-1', 'hello', 'en-US', null)
       const mediaSource = testState.mediaSources[0]
-      mediaSource.emit('sourceopen')
-      mediaSource.sourceBuffer.updating = true
+      mediaSource!.emit('sourceopen')
+      mediaSource!.sourceBuffer.updating = true
 
       ; (player as unknown as { receiveAudioData: (data: Uint8Array) => void }).receiveAudioData(new Uint8Array([1, 2, 3]))
 
@@ -578,16 +578,16 @@ describe('AudioPlayer', () => {
     it('should append previously queued buffer before new one when source buffer is idle', () => {
       const player = new AudioPlayer('/text-to-audio', true, 'msg-1', 'hello', 'en-US', null)
       const mediaSource = testState.mediaSources[0]
-      mediaSource.emit('sourceopen')
+      mediaSource!.emit('sourceopen')
 
       const existingBuffer = new ArrayBuffer(2)
       player.cacheBuffers = [existingBuffer]
-      mediaSource.sourceBuffer.updating = false
+      mediaSource!.sourceBuffer.updating = false
 
       ; (player as unknown as { receiveAudioData: (data: Uint8Array) => void }).receiveAudioData(new Uint8Array([9]))
 
-      expect(mediaSource.sourceBuffer.appendBuffer).toHaveBeenCalledTimes(1)
-      expect(mediaSource.sourceBuffer.appendBuffer).toHaveBeenCalledWith(existingBuffer)
+      expect(mediaSource!.sourceBuffer.appendBuffer).toHaveBeenCalledTimes(1)
+      expect(mediaSource!.sourceBuffer.appendBuffer).toHaveBeenCalledWith(existingBuffer)
       expect(player.cacheBuffers.length).toBe(1)
     })
 
@@ -595,15 +595,15 @@ describe('AudioPlayer', () => {
       vi.useFakeTimers()
       const player = new AudioPlayer('/text-to-audio', true, 'msg-1', 'hello', 'en-US', null)
       const mediaSource = testState.mediaSources[0]
-      mediaSource.emit('sourceopen')
-      mediaSource.sourceBuffer.updating = false
+      mediaSource!.emit('sourceopen')
+      mediaSource!.sourceBuffer.updating = false
       player.cacheBuffers = [new ArrayBuffer(3)]
 
       ; (player as unknown as { finishStream: () => void }).finishStream()
       vi.advanceTimersByTime(50)
 
-      expect(mediaSource.sourceBuffer.appendBuffer).toHaveBeenCalledTimes(1)
-      expect(mediaSource.endOfStream).toHaveBeenCalledTimes(1)
+      expect(mediaSource!.sourceBuffer.appendBuffer).toHaveBeenCalledTimes(1)
+      expect(mediaSource!.endOfStream).toHaveBeenCalledTimes(1)
       vi.useRealTimers()
     })
   })
diff --git a/web/app/components/base/audio-btn/__tests__/index.spec.tsx b/web/app/components/base/audio-btn/__tests__/index.spec.tsx
index 8f6c26d12b..0fb81e9ab6 100644
--- a/web/app/components/base/audio-btn/__tests__/index.spec.tsx
+++ b/web/app/components/base/audio-btn/__tests__/index.spec.tsx
@@ -32,7 +32,7 @@ describe('AudioBtn', () => {
 
   const hoverAndCheckTooltip = async (expectedText: string) => {
     await userEvent.hover(getButton())
-    expect(await screen.findByText(expectedText)).toBeInTheDocument()
+    expect(await screen.findByText(expectedText))!.toBeInTheDocument()
   }
 
   const getLatestAudioCallback = () => {
@@ -64,7 +64,7 @@ describe('AudioBtn', () => {
     it('should render button with play tooltip by default', async () => {
       render(<AudioBtn value="hello" />)
 
-      expect(getButton()).toBeInTheDocument()
+      expect(getButton())!.toBeInTheDocument()
       expect(getButton()).not.toBeDisabled()
       await hoverAndCheckTooltip('play')
     })
@@ -73,7 +73,7 @@ describe('AudioBtn', () => {
       const { container } = render(<AudioBtn value="hello" className="custom-wrapper" />)
       const wrapper = container.firstElementChild
 
-      expect(wrapper).toHaveClass('custom-wrapper')
+      expect(wrapper)!.toHaveClass('custom-wrapper')
     })
   })
 
@@ -87,8 +87,8 @@ describe('AudioBtn', () => {
 
       await waitFor(() => expect(mockGetAudioPlayer).toHaveBeenCalled())
       const call = mockGetAudioPlayer.mock.calls[0]
-      expect(call[0]).toBe('/text-to-audio')
-      expect(call[1]).toBe(true)
+      expect(call![0]).toBe('/text-to-audio')
+      expect(call![1]).toBe(true)
     })
 
     it('should call app endpoint when appId exists', async () => {
@@ -100,8 +100,8 @@ describe('AudioBtn', () => {
 
       await waitFor(() => expect(mockGetAudioPlayer).toHaveBeenCalled())
       const call = mockGetAudioPlayer.mock.calls[0]
-      expect(call[0]).toBe('/apps/123/text-to-audio')
-      expect(call[1]).toBe(false)
+      expect(call![0]).toBe('/apps/123/text-to-audio')
+      expect(call![1]).toBe(false)
     })
 
     it('should call installed app endpoint for explore installed routes', async () => {
@@ -113,8 +113,8 @@ describe('AudioBtn', () => {
 
       await waitFor(() => expect(mockGetAudioPlayer).toHaveBeenCalled())
       const call = mockGetAudioPlayer.mock.calls[0]
-      expect(call[0]).toBe('/installed-apps/456/text-to-audio')
-      expect(call[1]).toBe(false)
+      expect(call![0]).toBe('/installed-apps/456/text-to-audio')
+      expect(call![1]).toBe(false)
     })
   })
 
@@ -126,9 +126,9 @@ describe('AudioBtn', () => {
 
       await waitFor(() => {
         expect(mockPlayAudio).toHaveBeenCalledTimes(1)
-        expect(getButton()).toBeDisabled()
+        expect(getButton())!.toBeDisabled()
       })
-      expect(screen.getByRole('status')).toBeInTheDocument()
+      expect(screen.getByRole('status'))!.toBeInTheDocument()
       await hoverAndCheckTooltip('loading')
     })
 
@@ -159,7 +159,7 @@ describe('AudioBtn', () => {
       })
 
       await hoverAndCheckTooltip('loading')
-      expect(getButton()).toBeDisabled()
+      expect(getButton())!.toBeDisabled()
     })
 
     it.each(['ended', 'paused', 'error'])('should return to play tooltip when %s event is received', async (event) => {
@@ -183,9 +183,9 @@ describe('AudioBtn', () => {
 
       await waitFor(() => expect(mockGetAudioPlayer).toHaveBeenCalled())
       const call = mockGetAudioPlayer.mock.calls[0]
-      expect(call[2]).toBe('msg-1')
-      expect(call[3]).toBe('hello')
-      expect(call[4]).toBe('en-US')
+      expect(call![2]).toBe('msg-1')
+      expect(call![3]).toBe('hello')
+      expect(call![4]).toBe('en-US')
     })
 
     it('should keep empty route when neither token nor appId is present', async () => {
@@ -194,9 +194,9 @@ describe('AudioBtn', () => {
 
       await waitFor(() => expect(mockGetAudioPlayer).toHaveBeenCalled())
       const call = mockGetAudioPlayer.mock.calls[0]
-      expect(call[0]).toBe('')
-      expect(call[1]).toBe(false)
-      expect(call[3]).toBeUndefined()
+      expect(call![0]).toBe('')
+      expect(call![1]).toBe(false)
+      expect(call![3]).toBeUndefined()
     })
   })
 })
diff --git a/web/app/components/base/audio-gallery/AudioPlayer.tsx b/web/app/components/base/audio-gallery/AudioPlayer.tsx
index 9174b13356..c3b2056698 100644
--- a/web/app/components/base/audio-gallery/AudioPlayer.tsx
+++ b/web/app/components/base/audio-gallery/AudioPlayer.tsx
@@ -95,7 +95,7 @@ const AudioPlayer: React.FC<AudioPlayerProps> = ({ src, srcs }) => {
       for (let i = 0; i < samples; i++) {
         let sum = 0
         for (let j = 0; j < blockSize; j++)
-          sum += Math.abs(channelData[i * blockSize + j])
+          sum += Math.abs(channelData[i * blockSize + j]!)
         // Apply nonlinear scaling to enhance small amplitudes
         waveformData.push((sum / blockSize) * 5)
       }
@@ -145,7 +145,7 @@ const AudioPlayer: React.FC<AudioPlayerProps> = ({ src, srcs }) => {
     e.preventDefault()
     const getClientX = (event: React.MouseEvent | React.TouchEvent): number => {
       if ('touches' in event)
-        return event.touches[0].clientX
+        return event.touches[0]!.clientX
       return event.clientX
     }
     const updateProgress = (clientX: number) => {
diff --git a/web/app/components/base/audio-gallery/__tests__/AudioPlayer.spec.tsx b/web/app/components/base/audio-gallery/__tests__/AudioPlayer.spec.tsx
index a86188f635..fc5578d5a4 100644
--- a/web/app/components/base/audio-gallery/__tests__/AudioPlayer.spec.tsx
+++ b/web/app/components/base/audio-gallery/__tests__/AudioPlayer.spec.tsx
@@ -47,7 +47,7 @@ async function advanceWaveformTimer() {
 type ReactEventHandler = ((...args: any[]) => void) | undefined
 function getReactProps<T extends Element>(el: T): Record<string, ReactEventHandler> {
   const key = Object.keys(el).find(k => k.startsWith('__reactProps$'))
-  return key ? (el as unknown as Record<string, Record<string, ReactEventHandler>>)[key] : {}
+  return key ? (el as unknown as Record<string, Record<string, ReactEventHandler>>)[key]! : {}
 }
 
 // ─── Setup / teardown ─────────────────────────────────────────────────────────
@@ -77,8 +77,8 @@ describe('AudioPlayer — rendering', () => {
   it('should render the play button and audio element when given a src', () => {
     render(<AudioPlayer src="https://example.com/a.mp3" />)
 
-    expect(screen.getByTestId('play-pause-btn')).toBeInTheDocument()
-    expect(document.querySelector('audio')).toBeInTheDocument()
+    expect(screen.getByTestId('play-pause-btn'))!.toBeInTheDocument()
+    expect(document.querySelector('audio'))!.toBeInTheDocument()
     expect(document.querySelector('audio')?.getAttribute('src')).toBe('https://example.com/a.mp3')
   })
 
@@ -93,7 +93,7 @@ describe('AudioPlayer — rendering', () => {
 
   it('should render without crashing when no props are supplied', () => {
     render(<AudioPlayer />)
-    expect(screen.getByTestId('play-pause-btn')).toBeInTheDocument()
+    expect(screen.getByTestId('play-pause-btn'))!.toBeInTheDocument()
   })
 })
 
@@ -129,14 +129,14 @@ describe('AudioPlayer — play/pause', () => {
     render(<AudioPlayer src="https://example.com/a.mp3" />)
     const btn = screen.getByTestId('play-pause-btn')
 
-    expect(btn.querySelector('.i-ri-play-large-fill')).toBeInTheDocument()
+    expect(btn.querySelector('.i-ri-play-large-fill'))!.toBeInTheDocument()
     expect(btn.querySelector('.i-ri-pause-circle-fill')).not.toBeInTheDocument()
 
     await act(async () => {
       fireEvent.click(btn)
     })
 
-    expect(btn.querySelector('.i-ri-pause-circle-fill')).toBeInTheDocument()
+    expect(btn.querySelector('.i-ri-pause-circle-fill'))!.toBeInTheDocument()
     expect(btn.querySelector('.i-ri-play-large-fill')).not.toBeInTheDocument()
   })
 
@@ -147,14 +147,14 @@ describe('AudioPlayer — play/pause', () => {
     await act(async () => {
       fireEvent.click(btn)
     })
-    expect(btn.querySelector('.i-ri-pause-circle-fill')).toBeInTheDocument()
+    expect(btn.querySelector('.i-ri-pause-circle-fill'))!.toBeInTheDocument()
 
     const audio = document.querySelector('audio') as HTMLAudioElement
     await act(async () => {
       audio.dispatchEvent(new Event('ended'))
     })
 
-    expect(btn.querySelector('.i-ri-play-large-fill')).toBeInTheDocument()
+    expect(btn.querySelector('.i-ri-play-large-fill'))!.toBeInTheDocument()
   })
 
   it('should disable the play button when an audio error occurs', async () => {
@@ -165,7 +165,7 @@ describe('AudioPlayer — play/pause', () => {
       audio.dispatchEvent(new Event('error'))
     })
 
-    expect(screen.getByTestId('play-pause-btn')).toBeDisabled()
+    expect(screen.getByTestId('play-pause-btn'))!.toBeDisabled()
   })
 })
 
@@ -181,7 +181,7 @@ describe('AudioPlayer — audio events', () => {
       audio.dispatchEvent(new Event('loadedmetadata'))
     })
 
-    expect(screen.getByText('1:30')).toBeInTheDocument()
+    expect(screen.getByText('1:30'))!.toBeInTheDocument()
   })
 
   it('should update bufferedTime on progress event', async () => {
@@ -216,7 +216,7 @@ describe('AudioPlayer — audio events', () => {
       audio.dispatchEvent(new Event('error'))
     })
 
-    expect(screen.getByTestId('play-pause-btn')).toBeDisabled()
+    expect(screen.getByTestId('play-pause-btn'))!.toBeDisabled()
   })
 })
 
@@ -230,7 +230,7 @@ describe('AudioPlayer — waveform generation', () => {
     render(<AudioPlayer src="https://cdn.example/audio.mp3" />)
     await advanceWaveformTimer()
 
-    expect(screen.getByTestId('waveform-canvas')).toBeInTheDocument()
+    expect(screen.getByTestId('waveform-canvas'))!.toBeInTheDocument()
   })
 
   it('should use fallback random waveform when fetch returns not-ok', async () => {
@@ -240,7 +240,7 @@ describe('AudioPlayer — waveform generation', () => {
     render(<AudioPlayer src="https://cdn.example/audio.mp3" />)
     await advanceWaveformTimer()
 
-    expect(screen.getByTestId('waveform-canvas')).toBeInTheDocument()
+    expect(screen.getByTestId('waveform-canvas'))!.toBeInTheDocument()
   })
 
   it('should use fallback waveform when decodeAudioData rejects', async () => {
@@ -257,7 +257,7 @@ describe('AudioPlayer — waveform generation', () => {
     render(<AudioPlayer src="https://cdn.example/audio.mp3" />)
     await advanceWaveformTimer()
 
-    expect(screen.getByTestId('waveform-canvas')).toBeInTheDocument()
+    expect(screen.getByTestId('waveform-canvas'))!.toBeInTheDocument()
   })
 
   it('should show Toast when AudioContext is not available', async () => {
@@ -276,7 +276,7 @@ describe('AudioPlayer — waveform generation', () => {
     render(<AudioPlayer srcs={['blob:something']} />)
     await advanceWaveformTimer()
 
-    expect(screen.getByTestId('play-pause-btn')).toBeDisabled()
+    expect(screen.getByTestId('play-pause-btn'))!.toBeDisabled()
   })
 
   it('should not trigger waveform generation when no src or srcs provided', async () => {
@@ -305,7 +305,7 @@ describe('AudioPlayer — waveform generation', () => {
     render(<AudioPlayer src="https://cdn.example/audio.mp3" />)
     await advanceWaveformTimer()
 
-    expect(screen.getByTestId('waveform-canvas')).toBeInTheDocument()
+    expect(screen.getByTestId('waveform-canvas'))!.toBeInTheDocument()
   })
 
   it('should use webkitAudioContext when AudioContext is unavailable', async () => {
@@ -316,7 +316,7 @@ describe('AudioPlayer — waveform generation', () => {
     render(<AudioPlayer src="https://cdn.example/audio.mp3" />)
     await advanceWaveformTimer()
 
-    expect(screen.getByTestId('waveform-canvas')).toBeInTheDocument()
+    expect(screen.getByTestId('waveform-canvas'))!.toBeInTheDocument()
   })
 })
 
@@ -425,7 +425,7 @@ describe('AudioPlayer — missing coverage', () => {
     HTMLCanvasElement.prototype.getContext = vi.fn().mockReturnValue(null)
 
     render(<AudioPlayer src="https://example.com/audio.mp3" />)
-    expect(screen.getByTestId('waveform-canvas')).toBeInTheDocument()
+    expect(screen.getByTestId('waveform-canvas'))!.toBeInTheDocument()
 
     HTMLCanvasElement.prototype.getContext = originalGetContext
   })
@@ -535,7 +535,7 @@ describe('AudioPlayer — missing coverage', () => {
       fireEvent.click(btn)
     })
 
-    expect(btn).toBeDisabled()
+    expect(btn)!.toBeDisabled()
     expect(HTMLMediaElement.prototype.play).not.toHaveBeenCalled()
     expect(toastSpy).not.toHaveBeenCalled()
     toastSpy.mockRestore()
@@ -606,7 +606,7 @@ describe('AudioPlayer — additional branch coverage', () => {
       audio.dispatchEvent(new Event('error'))
     })
 
-    expect(screen.queryByTestId('play-pause-btn')).toBeDisabled()
+    expect(screen.queryByTestId('play-pause-btn'))!.toBeDisabled()
   })
 
   it('should update current time on timeupdate event', async () => {
@@ -632,7 +632,7 @@ describe('AudioPlayer — additional branch coverage', () => {
       fireEvent.click(btn)
     })
 
-    expect(btn).toBeDisabled()
+    expect(btn)!.toBeDisabled()
     expect(HTMLMediaElement.prototype.play).not.toHaveBeenCalled()
     expect(toastSpy).not.toHaveBeenCalled()
     toastSpy.mockRestore()
@@ -654,7 +654,7 @@ describe('AudioPlayer — additional branch coverage', () => {
     })
     await advanceWaveformTimer()
 
-    expect(screen.getByTestId('waveform-canvas')).toBeInTheDocument()
+    expect(screen.getByTestId('waveform-canvas'))!.toBeInTheDocument()
   })
 
   it('should handle missing canvas/audio in handleCanvasInteraction/handleMouseMove', async () => {
@@ -683,7 +683,7 @@ describe('AudioPlayer — additional branch coverage', () => {
       audio.dispatchEvent(new Event('timeupdate'))
     })
 
-    expect(canvas).toBeInTheDocument()
+    expect(canvas)!.toBeInTheDocument()
   })
 
   it('should hit null-ref guards in canvas handlers after unmount', async () => {
@@ -710,6 +710,6 @@ describe('AudioPlayer — additional branch coverage', () => {
       fireEvent.mouseMove(canvas, { clientX: 180 }) // time near 90, outside 0-10
     })
 
-    expect(canvas).toBeInTheDocument()
+    expect(canvas)!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/base/block-input/index.tsx b/web/app/components/base/block-input/index.tsx
index 3a467e97dc..70f66ad3ad 100644
--- a/web/app/components/base/block-input/index.tsx
+++ b/web/app/components/base/block-input/index.tsx
@@ -75,7 +75,7 @@ const BlockInput: FC<IBlockInputProps> = ({
         return (
           <VarHighlight
             key={`var-${index}`}
-            name={variableMatch[1]}
+            name={variableMatch[1]!}
           />
         )
       }
diff --git a/web/app/components/base/carousel/__tests__/index.spec.tsx b/web/app/components/base/carousel/__tests__/index.spec.tsx
index e409b85757..f448d02825 100644
--- a/web/app/components/base/carousel/__tests__/index.spec.tsx
+++ b/web/app/components/base/carousel/__tests__/index.spec.tsx
@@ -99,10 +99,10 @@ describe('Carousel', () => {
     it('should render region and slides when used with content and items', () => {
       renderCarouselWithControls()
 
-      expect(screen.getByRole('region')).toHaveAttribute('aria-roledescription', 'carousel')
-      expect(screen.getByTestId('carousel-content')).toHaveClass('flex')
+      expect(screen.getByRole('region'))!.toHaveAttribute('aria-roledescription', 'carousel')
+      expect(screen.getByTestId('carousel-content'))!.toHaveClass('flex')
       screen.getAllByRole('group').forEach((slide) => {
-        expect(slide).toHaveAttribute('aria-roledescription', 'slide')
+        expect(slide)!.toHaveAttribute('aria-roledescription', 'slide')
       })
     })
   })
@@ -130,7 +130,7 @@ describe('Carousel', () => {
         { axis: 'y' },
         undefined,
       )
-      expect(screen.getByTestId('carousel-content')).toHaveClass('flex-col')
+      expect(screen.getByTestId('carousel-content'))!.toHaveClass('flex-col')
     })
   })
 
@@ -171,7 +171,7 @@ describe('Carousel', () => {
       renderCarouselWithControls()
       const dots = screen.getAllByRole('button', { name: 'Dot' })
 
-      fireEvent.click(dots[2])
+      fireEvent.click(dots[2]!)
 
       expect(mockApi.scrollTo).toHaveBeenCalledWith(2)
     })
@@ -191,9 +191,9 @@ describe('Carousel', () => {
       })
 
       const dots = screen.getAllByRole('button', { name: 'Dot' })
-      expect(screen.getByRole('button', { name: 'Prev' })).toBeEnabled()
-      expect(screen.getByRole('button', { name: 'Next' })).toBeEnabled()
-      expect(dots[2]).toHaveAttribute('data-state', 'active')
+      expect(screen.getByRole('button', { name: 'Prev' }))!.toBeEnabled()
+      expect(screen.getByRole('button', { name: 'Next' }))!.toBeEnabled()
+      expect(dots[2])!.toHaveAttribute('data-state', 'active')
     })
 
     it('should subscribe to embla events and unsubscribe from select on unmount', () => {
@@ -232,8 +232,8 @@ describe('Carousel', () => {
 
       renderCarouselWithControls()
 
-      expect(screen.getByRole('button', { name: 'Prev' })).toBeDisabled()
-      expect(screen.getByRole('button', { name: 'Next' })).toBeDisabled()
+      expect(screen.getByRole('button', { name: 'Prev' }))!.toBeDisabled()
+      expect(screen.getByRole('button', { name: 'Next' }))!.toBeDisabled()
       expect(screen.queryByRole('button', { name: 'Dot' })).not.toBeInTheDocument()
     })
 
diff --git a/web/app/components/base/chat/__tests__/utils.spec.ts b/web/app/components/base/chat/__tests__/utils.spec.ts
index a9a05c6065..0951880f9c 100644
--- a/web/app/components/base/chat/__tests__/utils.spec.ts
+++ b/web/app/components/base/chat/__tests__/utils.spec.ts
@@ -418,11 +418,11 @@ describe('chat utils - url params and answer helpers', () => {
 
       const tree = buildChatItemTree(list)
       expect(tree.length).toBe(1)
-      expect(tree[0].id).toBe('q1')
-      expect(tree[0].children?.[0].id).toBe('a1')
-      expect(tree[0].children?.[0].children?.[0].id).toBe('q2')
-      expect(tree[0].children?.[0].children?.[0].children?.[0].id).toBe('a2')
-      expect(tree[0].children?.[0].children?.[0].children?.[0].siblingIndex).toBe(0)
+      expect(tree[0]!.id).toBe('q1')
+      expect(tree[0]!.children?.[0]!.id).toBe('a1')
+      expect(tree[0]!.children?.[0]!.children?.[0]!.id).toBe('q2')
+      expect(tree[0]!.children?.[0]!.children?.[0]!.children?.[0]!.id).toBe('a2')
+      expect(tree[0]!.children?.[0]!.children?.[0]!.children?.[0]!.siblingIndex).toBe(0)
     })
 
     it('buildChatItemTree builds nested tree based on parentMessageId', () => {
@@ -439,23 +439,23 @@ describe('chat utils - url params and answer helpers', () => {
 
       const tree = buildChatItemTree(list)
       expect(tree.length).toBe(2)
-      expect(tree[0].id).toBe('q1')
-      expect(tree[1].id).toBe('q4')
+      expect(tree[0]!.id).toBe('q1')
+      expect(tree[1]!.id).toBe('q4')
 
-      const a1 = tree[0].children![0]
-      expect(a1.id).toBe('a1')
-      expect(a1.children?.length).toBe(2)
-      expect(a1.children![0].id).toBe('q2')
-      expect(a1.children![1].id).toBe('q3')
-      expect(a1.children![0].children![0].siblingIndex).toBe(0)
-      expect(a1.children![1].children![0].siblingIndex).toBe(1)
+      const a1 = tree[0]!.children![0]
+      expect(a1!.id).toBe('a1')
+      expect(a1!.children?.length).toBe(2)
+      expect(a1!.children![0]!.id).toBe('q2')
+      expect(a1!.children![1]!.id).toBe('q3')
+      expect(a1!.children![0]!.children![0]!.siblingIndex).toBe(0)
+      expect(a1!.children![1]!.children![0]!.siblingIndex).toBe(1)
     })
 
     it('getThreadMessages node without children', () => {
       const tree = [{ id: 'q1', isAnswer: false }]
       const thread = getThreadMessages(tree as unknown as ChatItemInTree[], 'q1')
       expect(thread.length).toBe(1)
-      expect(thread[0].id).toBe('q1')
+      expect(thread[0]!.id).toBe('q1')
     })
 
     it('getThreadMessages target not found', () => {
@@ -494,8 +494,8 @@ describe('chat utils - url params and answer helpers', () => {
       const thread = getThreadMessages(tree as unknown as ChatItemInTree[])
       expect(thread.length).toBe(4)
       expect(thread.map(t => t.id)).toEqual(['q1', 'a1', 'q2', 'a2'])
-      expect(thread[1].siblingCount).toBe(1)
-      expect(thread[3].siblingCount).toBe(1)
+      expect(thread[1]!.siblingCount).toBe(1)
+      expect(thread[3]!.siblingCount).toBe(1)
     })
 
     it('getThreadMessages to specific target', () => {
@@ -531,8 +531,8 @@ describe('chat utils - url params and answer helpers', () => {
       const thread = getThreadMessages(tree as unknown as ChatItemInTree[], 'a3')
       expect(thread.length).toBe(4)
       expect(thread.map(t => t.id)).toEqual(['q1', 'a1', 'q3', 'a3'])
-      expect(thread[3].prevSibling).toBe('a2')
-      expect(thread[3].nextSibling).toBeUndefined()
+      expect(thread[3]!.prevSibling).toBe('a2')
+      expect(thread[3]!.nextSibling).toBeUndefined()
     })
 
     it('getThreadMessages targetNode has descendants', () => {
@@ -568,7 +568,7 @@ describe('chat utils - url params and answer helpers', () => {
       const thread = getThreadMessages(tree as unknown as ChatItemInTree[], 'a1')
       expect(thread.length).toBe(4)
       expect(thread.map(t => t.id)).toEqual(['q1', 'a1', 'q3', 'a3'])
-      expect(thread[3].prevSibling).toBe('a2')
+      expect(thread[3]!.prevSibling).toBe('a2')
     })
   })
 })
diff --git a/web/app/components/base/chat/chat-with-history/__tests__/chat-wrapper.spec.tsx b/web/app/components/base/chat/chat-with-history/__tests__/chat-wrapper.spec.tsx
index bd5f01bcda..83a8666e79 100644
--- a/web/app/components/base/chat/chat-with-history/__tests__/chat-wrapper.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/__tests__/chat-wrapper.spec.tsx
@@ -151,8 +151,8 @@ describe('ChatWrapper', () => {
 
     render(<ChatWrapper />)
 
-    expect(await screen.findByText('Welcome')).toBeInTheDocument()
-    expect(await screen.findByText('Q1')).toBeInTheDocument()
+    expect(await screen.findByText('Welcome'))!.toBeInTheDocument()
+    expect(await screen.findByText('Q1'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText('Q1'))
     expect(handleSend).toHaveBeenCalled()
@@ -170,7 +170,7 @@ describe('ChatWrapper', () => {
     } as unknown as ChatHookReturn)
 
     render(<ChatWrapper />)
-    expect(screen.getByText('Default opening statement')).toBeInTheDocument()
+    expect(screen.getByText('Default opening statement'))!.toBeInTheDocument()
   })
 
   it('should render welcome screen without suggested questions', async () => {
@@ -186,7 +186,7 @@ describe('ChatWrapper', () => {
     } as unknown as ChatHookReturn)
 
     render(<ChatWrapper />)
-    expect(await screen.findByText('Welcome message')).toBeInTheDocument()
+    expect(await screen.findByText('Welcome message'))!.toBeInTheDocument()
   })
 
   it('should show responding state', async () => {
@@ -197,7 +197,7 @@ describe('ChatWrapper', () => {
     } as unknown as ChatHookReturn)
 
     render(<ChatWrapper />)
-    expect(await screen.findByText('Bot thinking...')).toBeInTheDocument()
+    expect(await screen.findByText('Bot thinking...'))!.toBeInTheDocument()
   })
 
   it('should handle manual message input and stop responding', async () => {
@@ -320,9 +320,9 @@ describe('ChatWrapper', () => {
     render(<ChatWrapper />)
     const textboxes = screen.getAllByRole('textbox')
     const chatInput = textboxes[textboxes.length - 1]
-    const disabledContainer = chatInput.closest('.pointer-events-none')
-    expect(disabledContainer).toBeInTheDocument()
-    expect(disabledContainer).toHaveClass('opacity-50')
+    const disabledContainer = chatInput!.closest('.pointer-events-none')
+    expect(disabledContainer)!.toBeInTheDocument()
+    expect(disabledContainer)!.toHaveClass('opacity-50')
   })
 
   it('should not disable input when required field has value', () => {
@@ -337,7 +337,7 @@ describe('ChatWrapper', () => {
     render(<ChatWrapper />)
     const textboxes = screen.getAllByRole('textbox')
     const chatInput = textboxes[textboxes.length - 1]
-    const container = chatInput.closest('.pointer-events-none')
+    const container = chatInput!.closest('.pointer-events-none')
     expect(container).not.toBeInTheDocument()
   })
 
@@ -361,8 +361,8 @@ describe('ChatWrapper', () => {
     render(<ChatWrapper />)
     const textboxes = screen.getAllByRole('textbox')
     const chatInput = textboxes[textboxes.length - 1]
-    const container = chatInput.closest('.pointer-events-none')
-    expect(container).toBeInTheDocument()
+    const container = chatInput!.closest('.pointer-events-none')
+    expect(container)!.toBeInTheDocument()
   })
 
   it('should not disable input when file is fully uploaded', () => {
@@ -411,8 +411,8 @@ describe('ChatWrapper', () => {
     render(<ChatWrapper />)
     const textboxes = screen.getAllByRole('textbox')
     const chatInput = textboxes[textboxes.length - 1]
-    const container = chatInput.closest('.pointer-events-none')
-    expect(container).toBeInTheDocument()
+    const container = chatInput!.closest('.pointer-events-none')
+    expect(container)!.toBeInTheDocument()
   })
 
   it('should not disable when all files are uploaded', () => {
@@ -457,7 +457,7 @@ describe('ChatWrapper', () => {
     render(<ChatWrapper />)
     const textarea = screen.getByRole('textbox')
     const container = textarea.closest('.pointer-events-none')
-    expect(container).toBeInTheDocument()
+    expect(container)!.toBeInTheDocument()
   })
 
   it('should not disable input when allInputsHidden is true', () => {
@@ -523,7 +523,7 @@ describe('ChatWrapper', () => {
     render(<ChatWrapper />)
 
     expect(handleSwitchSibling).toHaveBeenCalledWith('resume-node', expect.any(Object))
-    const resumeOptions = handleSwitchSibling.mock.calls[0][1]
+    const resumeOptions = handleSwitchSibling.mock.calls[0]![1]
     resumeOptions.onGetSuggestedQuestions('response-from-resume')
     expect(fetchSuggestedQuestions).toHaveBeenCalledWith('response-from-resume', 'webApp', 'test-app-id')
   })
@@ -619,7 +619,7 @@ describe('ChatWrapper', () => {
 
     render(<ChatWrapper />)
 
-    const onStopCallback = vi.mocked(useChat).mock.calls[0][3] as (taskId: string) => void
+    const onStopCallback = vi.mocked(useChat).mock.calls[0]![3] as (taskId: string) => void
     onStopCallback('taskId-123')
     expect(stopChatMessageResponding).toHaveBeenCalledWith('', 'taskId-123', 'webApp', 'test-app-id')
   })
@@ -645,7 +645,7 @@ describe('ChatWrapper', () => {
     expect(handleSend).toHaveBeenCalled()
 
     // Get the options passed to handleSend
-    const options = handleSend.mock.calls[0][2]
+    const options = handleSend.mock.calls[0]![2]
     expect(options.isPublicAPI).toBe(true)
 
     // Call onGetSuggestedQuestions
@@ -679,7 +679,7 @@ describe('ChatWrapper', () => {
       fireEvent.click(nextButton)
       expect(handleSwitchSibling).toHaveBeenCalled()
 
-      const options = handleSwitchSibling.mock.calls[0][1]
+      const options = handleSwitchSibling.mock.calls[0]![1]
       options.onGetSuggestedQuestions('response-id')
       expect(fetchSuggestedQuestions).toHaveBeenCalledWith('response-id', 'webApp', 'test-app-id')
     }
@@ -708,8 +708,8 @@ describe('ChatWrapper', () => {
       expect(handleSend).toHaveBeenCalled()
       const args = handleSend.mock.calls[0]
       // args[1] is data
-      expect(args[1].query).toBe('Q1')
-      expect(args[1].parent_message_id).toBeNull()
+      expect(args![1].query).toBe('Q1')
+      expect(args![1].parent_message_id).toBeNull()
     }
   })
 
@@ -737,7 +737,7 @@ describe('ChatWrapper', () => {
       fireEvent.click(regenerateBtn)
       expect(handleSend).toHaveBeenCalled()
       const args = handleSend.mock.calls[0]
-      expect(args[1].parent_message_id).toBe('a0')
+      expect(args![1].parent_message_id).toBe('a0')
     }
   })
 
@@ -774,10 +774,10 @@ describe('ChatWrapper', () => {
     } as unknown as ChatHookReturn)
 
     render(<ChatWrapper />)
-    expect(await screen.findByText('Node 1')).toBeInTheDocument()
+    expect(await screen.findByText('Node 1'))!.toBeInTheDocument()
 
     const input = screen.getAllByRole('textbox').find(el => el.closest('.chat-answer-container')) || screen.getAllByRole('textbox')[0]
-    fireEvent.change(input, { target: { value: 'test' } })
+    fireEvent.change(input!, { target: { value: 'test' } })
 
     const runButton = screen.getByText('Run')
     fireEvent.click(runButton)
@@ -817,10 +817,10 @@ describe('ChatWrapper', () => {
     } as unknown as ChatHookReturn)
 
     render(<ChatWrapper />)
-    expect(await screen.findByText('Node Web 1')).toBeInTheDocument()
+    expect(await screen.findByText('Node Web 1'))!.toBeInTheDocument()
 
     const input = screen.getAllByRole('textbox').find(el => el.closest('.chat-answer-container')) || screen.getAllByRole('textbox')[0]
-    fireEvent.change(input, { target: { value: 'web-test' } })
+    fireEvent.change(input!, { target: { value: 'web-test' } })
     fireEvent.click(screen.getByText('Run'))
 
     await waitFor(() => {
@@ -841,7 +841,7 @@ describe('ChatWrapper', () => {
 
     render(<ChatWrapper />)
     expect(document.querySelector('.chat-answer-container')).not.toBeInTheDocument()
-    expect(screen.getByText('Welcome')).toBeInTheDocument()
+    expect(screen.getByText('Welcome'))!.toBeInTheDocument()
   })
 
   it('should show all messages including opening statement when there are multiple messages', () => {
@@ -861,7 +861,7 @@ describe('ChatWrapper', () => {
     render(<ChatWrapper />)
     const welcomeElements = screen.getAllByText('Welcome')
     expect(welcomeElements.length).toBeGreaterThan(0)
-    expect(screen.getByText('User message')).toBeInTheDocument()
+    expect(screen.getByText('User message'))!.toBeInTheDocument()
   })
 
   it('should show chatNode and inputs form on desktop for new conversation', () => {
@@ -873,7 +873,7 @@ describe('ChatWrapper', () => {
     })
 
     render(<ChatWrapper />)
-    expect(screen.getByText('Test')).toBeInTheDocument()
+    expect(screen.getByText('Test'))!.toBeInTheDocument()
   })
 
   it('should show chatNode on mobile for new conversation only', () => {
@@ -885,7 +885,7 @@ describe('ChatWrapper', () => {
     })
 
     const { rerender } = render(<ChatWrapper />)
-    expect(screen.getByText('Test')).toBeInTheDocument()
+    expect(screen.getByText('Test'))!.toBeInTheDocument()
 
     vi.mocked(useChatWithHistoryContext).mockReturnValue({
       ...defaultContextValue,
@@ -974,8 +974,8 @@ describe('ChatWrapper', () => {
     } as unknown as ChatHookReturn)
 
     render(<ChatWrapper />)
-    expect(screen.getByText('Answer')).toBeInTheDocument()
-    expect(screen.getByAltText('answer icon')).toBeInTheDocument()
+    expect(screen.getByText('Answer'))!.toBeInTheDocument()
+    expect(screen.getByAltText('answer icon'))!.toBeInTheDocument()
   })
 
   it('should render question icon fallback when user avatar is available', () => {
@@ -993,7 +993,7 @@ describe('ChatWrapper', () => {
     } as unknown as ChatHookReturn)
 
     render(<ChatWrapper />)
-    expect(screen.getByText('J')).toBeInTheDocument()
+    expect(screen.getByText('J'))!.toBeInTheDocument()
   })
 
   it('should use fallback values for nullable appData, appMeta and avatar name', () => {
@@ -1012,8 +1012,8 @@ describe('ChatWrapper', () => {
     } as unknown as ChatHookReturn)
 
     render(<ChatWrapper />)
-    expect(screen.getByText('Question with fallback avatar name')).toBeInTheDocument()
-    expect(screen.getByText('U')).toBeInTheDocument()
+    expect(screen.getByText('Question with fallback avatar name'))!.toBeInTheDocument()
+    expect(screen.getByText('U'))!.toBeInTheDocument()
   })
 
   it('should set handleStop on currentChatInstanceRef', () => {
@@ -1101,8 +1101,8 @@ describe('ChatWrapper', () => {
     render(<ChatWrapper />)
     const textboxes = screen.getAllByRole('textbox')
     const chatInput = textboxes[textboxes.length - 1]
-    const container = chatInput.closest('.pointer-events-none')
-    expect(container).toBeInTheDocument()
+    const container = chatInput!.closest('.pointer-events-none')
+    expect(container)!.toBeInTheDocument()
   })
 
   it('should call formatBooleanInputs when sending message', async () => {
@@ -1223,7 +1223,8 @@ describe('ChatWrapper', () => {
 
     render(<ChatWrapper />)
     // This tests line 91 - using currentConversationItem.introduction
-    expect(screen.getByText('Custom introduction from conversation item')).toBeInTheDocument()
+    // This tests line 91 - using currentConversationItem.introduction
+    expect(screen.getByText('Custom introduction from conversation item'))!.toBeInTheDocument()
   })
 
   it('should handle early return when hasEmptyInput is already set', () => {
@@ -1242,8 +1243,8 @@ describe('ChatWrapper', () => {
     // This tests line 106 - early return when hasEmptyInput is set
     const textboxes = screen.getAllByRole('textbox')
     const chatInput = textboxes[textboxes.length - 1]
-    const container = chatInput.closest('.pointer-events-none')
-    expect(container).toBeInTheDocument()
+    const container = chatInput!.closest('.pointer-events-none')
+    expect(container)!.toBeInTheDocument()
   })
 
   it('should handle early return when fileIsUploading is already set', () => {
@@ -1270,8 +1271,8 @@ describe('ChatWrapper', () => {
     // This tests line 109 - early return when fileIsUploading is set
     const textboxes = screen.getAllByRole('textbox')
     const chatInput = textboxes[textboxes.length - 1]
-    const container = chatInput.closest('.pointer-events-none')
-    expect(container).toBeInTheDocument()
+    const container = chatInput!.closest('.pointer-events-none')
+    expect(container)!.toBeInTheDocument()
   })
 
   it('should handle doSend with no parent message id', async () => {
@@ -1561,7 +1562,7 @@ describe('ChatWrapper', () => {
     } as unknown as ChatHookReturn)
 
     render(<ChatWrapper />)
-    expect(screen.getByText('Default opening statement')).toBeInTheDocument()
+    expect(screen.getByText('Default opening statement'))!.toBeInTheDocument()
   })
 
   it('should handle doSend when regenerating with null parentAnswer', async () => {
@@ -1609,7 +1610,9 @@ describe('ChatWrapper', () => {
 
     // Just verify the component renders - the actual editedQuestion flow
     // is tested through the doRegenerate callback that's passed to Chat
-    expect(screen.getByText('Answer')).toBeInTheDocument()
+    // Just verify the component renders - the actual editedQuestion flow
+    // is tested through the doRegenerate callback that's passed to Chat
+    expect(screen.getByText('Answer'))!.toBeInTheDocument()
     expect(handleSend).toBeDefined()
   })
 
@@ -1629,7 +1632,9 @@ describe('ChatWrapper', () => {
 
     // The doRegenerate is passed to Chat component and would be called
     // This ensures lines 198-200 are covered
-    expect(screen.getByText('A1')).toBeInTheDocument()
+    // The doRegenerate is passed to Chat component and would be called
+    // This ensures lines 198-200 are covered
+    expect(screen.getByText('A1'))!.toBeInTheDocument()
   })
 
   it('should handle doRegenerate when question has message_files', async () => {
@@ -1809,7 +1814,38 @@ describe('ChatWrapper', () => {
     render(<ChatWrapper />)
     const textboxes = screen.getAllByRole('textbox')
     const chatInput = textboxes[textboxes.length - 1]
-    const container = chatInput.closest('.pointer-events-none')
+    const container = chatInput!.closest('.pointer-events-none')
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
+    // Should not be disabled because it's not required
     // Should not be disabled because it's not required
     expect(container).not.toBeInTheDocument()
   })
diff --git a/web/app/components/base/chat/chat-with-history/__tests__/header-in-mobile.spec.tsx b/web/app/components/base/chat/chat-with-history/__tests__/header-in-mobile.spec.tsx
index d75f9897a7..a183a7670b 100644
--- a/web/app/components/base/chat/chat-with-history/__tests__/header-in-mobile.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/__tests__/header-in-mobile.spec.tsx
@@ -143,7 +143,7 @@ describe('HeaderInMobile', () => {
 
   it('should render title when no conversation', () => {
     render(<HeaderInMobile />)
-    expect(screen.getByText('Test Chat')).toBeInTheDocument()
+    expect(screen.getByText('Test Chat'))!.toBeInTheDocument()
   })
 
   it('should render conversation name when active', async () => {
@@ -154,7 +154,7 @@ describe('HeaderInMobile', () => {
     })
 
     render(<HeaderInMobile />)
-    expect(await screen.findByText('Conv 1')).toBeInTheDocument()
+    expect(await screen.findByText('Conv 1'))!.toBeInTheDocument()
   })
 
   it('should open and close sidebar', async () => {
@@ -162,11 +162,12 @@ describe('HeaderInMobile', () => {
 
     // Open sidebar (menu button is the first action btn)
     const menuButton = screen.getAllByRole('button')[0]
-    fireEvent.click(menuButton)
+    fireEvent.click(menuButton!)
 
     // HeaderInMobile renders MobileSidebar which renders Sidebar and overlay
-    expect(await screen.findByTestId('mobile-sidebar-overlay')).toBeInTheDocument()
-    expect(screen.getByTestId('sidebar-content')).toBeInTheDocument()
+    // HeaderInMobile renders MobileSidebar which renders Sidebar and overlay
+    expect(await screen.findByTestId('mobile-sidebar-overlay'))!.toBeInTheDocument()
+    expect(screen.getByTestId('sidebar-content'))!.toBeInTheDocument()
 
     // Close sidebar via overlay click
     fireEvent.click(screen.getByTestId('mobile-sidebar-overlay'))
@@ -180,15 +181,16 @@ describe('HeaderInMobile', () => {
 
     // Open sidebar
     const menuButton = screen.getAllByRole('button')[0]
-    fireEvent.click(menuButton)
+    fireEvent.click(menuButton!)
 
-    expect(await screen.findByTestId('mobile-sidebar-overlay')).toBeInTheDocument()
+    expect(await screen.findByTestId('mobile-sidebar-overlay'))!.toBeInTheDocument()
 
     // Click inside sidebar content (should not close)
     fireEvent.click(screen.getByTestId('sidebar-content'))
 
     // Sidebar should still be visible
-    expect(screen.getByTestId('mobile-sidebar-overlay')).toBeInTheDocument()
+    // Sidebar should still be visible
+    expect(screen.getByTestId('mobile-sidebar-overlay'))!.toBeInTheDocument()
   })
 
   it('should open and close chat settings', async () => {
@@ -204,12 +206,13 @@ describe('HeaderInMobile', () => {
 
     // Find and click "View Chat Settings"
     await waitFor(() => {
-      expect(screen.getByText(/share\.chat\.viewChatSettings/i)).toBeInTheDocument()
+      expect(screen.getByText(/share\.chat\.viewChatSettings/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/share\.chat\.viewChatSettings/i))
 
     // Check if chat settings overlay is open
-    expect(screen.getByTestId('mobile-chat-settings-overlay')).toBeInTheDocument()
+    // Check if chat settings overlay is open
+    expect(screen.getByTestId('mobile-chat-settings-overlay'))!.toBeInTheDocument()
 
     // Close chat settings via overlay click
     fireEvent.click(screen.getByTestId('mobile-chat-settings-overlay'))
@@ -229,18 +232,19 @@ describe('HeaderInMobile', () => {
     // Open dropdown and chat settings
     fireEvent.click(await screen.findByTestId('mobile-more-btn'))
     await waitFor(() => {
-      expect(screen.getByText(/share\.chat\.viewChatSettings/i)).toBeInTheDocument()
+      expect(screen.getByText(/share\.chat\.viewChatSettings/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/share\.chat\.viewChatSettings/i))
 
-    expect(screen.getByTestId('mobile-chat-settings-overlay')).toBeInTheDocument()
+    expect(screen.getByTestId('mobile-chat-settings-overlay'))!.toBeInTheDocument()
 
     // Click inside the settings panel (find the title)
     const settingsTitle = screen.getByText(/share\.chat\.chatSettingsTitle/i)
     fireEvent.click(settingsTitle)
 
     // Settings should still be visible
-    expect(screen.getByTestId('mobile-chat-settings-overlay')).toBeInTheDocument()
+    // Settings should still be visible
+    expect(screen.getByTestId('mobile-chat-settings-overlay'))!.toBeInTheDocument()
   })
 
   it('should hide chat settings option when no input forms', async () => {
@@ -274,7 +278,7 @@ describe('HeaderInMobile', () => {
 
     // Click "New Conversation" or "Reset Chat"
     await waitFor(() => {
-      expect(screen.getByText(/share\.chat\.resetChat/i)).toBeInTheDocument()
+      expect(screen.getByText(/share\.chat\.resetChat/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/share\.chat\.resetChat/i))
 
@@ -297,7 +301,7 @@ describe('HeaderInMobile', () => {
     fireEvent.click(await screen.findByText('Conv 1'))
 
     await waitFor(() => {
-      expect(screen.getByText(/explore\.sidebar\.action\.pin/i)).toBeInTheDocument()
+      expect(screen.getByText(/explore\.sidebar\.action\.pin/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/explore\.sidebar\.action\.pin/i))
     expect(handlePin).toHaveBeenCalledWith('1')
@@ -319,7 +323,7 @@ describe('HeaderInMobile', () => {
     fireEvent.click(await screen.findByText('Conv 1'))
 
     await waitFor(() => {
-      expect(screen.getByText(/explore\.sidebar\.action\.unpin/i)).toBeInTheDocument()
+      expect(screen.getByText(/explore\.sidebar\.action\.unpin/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/explore\.sidebar\.action\.unpin/i))
     expect(handleUnpin).toHaveBeenCalledWith('1')
@@ -339,12 +343,13 @@ describe('HeaderInMobile', () => {
     fireEvent.click(await screen.findByText('Conv 1'))
 
     await waitFor(() => {
-      expect(screen.getByText(/explore\.sidebar\.action\.rename/i)).toBeInTheDocument()
+      expect(screen.getByText(/explore\.sidebar\.action\.rename/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/explore\.sidebar\.action\.rename/i))
 
     // RenameModal should be visible
-    expect(screen.getByRole('dialog')).toBeInTheDocument()
+    // RenameModal should be visible
+    expect(screen.getByRole('dialog'))!.toBeInTheDocument()
     const input = screen.getByDisplayValue('Conv 1')
     fireEvent.change(input, { target: { value: 'New Name' } })
 
@@ -367,12 +372,13 @@ describe('HeaderInMobile', () => {
     fireEvent.click(await screen.findByText('Conv 1'))
 
     await waitFor(() => {
-      expect(screen.getByText(/explore\.sidebar\.action\.rename/i)).toBeInTheDocument()
+      expect(screen.getByText(/explore\.sidebar\.action\.rename/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/explore\.sidebar\.action\.rename/i))
 
     // RenameModal should be visible
-    expect(screen.getByRole('dialog')).toBeInTheDocument()
+    // RenameModal should be visible
+    expect(screen.getByRole('dialog'))!.toBeInTheDocument()
 
     // Click cancel button
     const cancelButton = screen.getByRole('button', { name: /common\.operation\.cancel/i })
@@ -399,12 +405,13 @@ describe('HeaderInMobile', () => {
     fireEvent.click(await screen.findByText('Conv 1'))
 
     await waitFor(() => {
-      expect(screen.getByText(/explore\.sidebar\.action\.rename/i)).toBeInTheDocument()
+      expect(screen.getByText(/explore\.sidebar\.action\.rename/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/explore\.sidebar\.action\.rename/i))
 
     // RenameModal should be visible with loading state
-    expect(screen.getByRole('dialog')).toBeInTheDocument()
+    // RenameModal should be visible with loading state
+    expect(screen.getByRole('dialog'))!.toBeInTheDocument()
   })
 
   it('should handle delete conversation', async () => {
@@ -421,13 +428,13 @@ describe('HeaderInMobile', () => {
     fireEvent.click(await screen.findByText('Conv 1'))
 
     await waitFor(() => {
-      expect(screen.getByText(/explore\.sidebar\.action\.delete/i)).toBeInTheDocument()
+      expect(screen.getByText(/explore\.sidebar\.action\.delete/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/explore\.sidebar\.action\.delete/i))
 
     // Confirm modal
     await waitFor(() => {
-      expect(screen.getAllByText(/share\.chat\.deleteConversation\.title/i)[0]).toBeInTheDocument()
+      expect(screen.getAllByText(/share\.chat\.deleteConversation\.title/i)[0])!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByRole('button', { name: /common\.operation\.confirm/i }))
     expect(handleDelete).toHaveBeenCalledWith('1', expect.any(Object))
@@ -447,13 +454,13 @@ describe('HeaderInMobile', () => {
     fireEvent.click(await screen.findByText('Conv 1'))
 
     await waitFor(() => {
-      expect(screen.getByText(/explore\.sidebar\.action\.delete/i)).toBeInTheDocument()
+      expect(screen.getByText(/explore\.sidebar\.action\.delete/i))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByText(/explore\.sidebar\.action\.delete/i))
 
     // Confirm modal should be visible
     await waitFor(() => {
-      expect(screen.getAllByText(/share\.chat\.deleteConversation\.title/i)[0]).toBeInTheDocument()
+      expect(screen.getAllByText(/share\.chat\.deleteConversation\.title/i)[0])!.toBeInTheDocument()
     })
 
     // Click cancel
@@ -519,7 +526,7 @@ describe('HeaderInMobile', () => {
     })
 
     render(<HeaderInMobile />)
-    expect(screen.getByText('My App')).toBeInTheDocument()
+    expect(screen.getByText('My App'))!.toBeInTheDocument()
   })
 
   it('should properly show and hide modals conditionally', async () => {
@@ -537,6 +544,37 @@ describe('HeaderInMobile', () => {
 
     render(<HeaderInMobile />)
 
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
+    // Initially no modals
     // Initially no modals
     expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
     expect(screen.queryByText('share.chat.deleteConversation.title')).not.toBeInTheDocument()
@@ -565,7 +603,7 @@ describe('HeaderInMobile', () => {
       fireEvent.click(await screen.findByText('Conv 1'))
       fireEvent.click(await screen.findByText(/sidebar\.action\.delete/i))
 
-      expect(await screen.findByRole('button', { name: /common\.operation\.confirm|operation\.confirm/i })).toBeInTheDocument()
+      expect(await screen.findByRole('button', { name: /common\.operation\.confirm|operation\.confirm/i }))!.toBeInTheDocument()
       fireEvent.click(screen.getByRole('button', { name: /common\.operation\.confirm|operation\.confirm/i }))
       expect(handleDelete).toHaveBeenCalledWith('1', expect.any(Object))
     }
@@ -590,7 +628,7 @@ describe('HeaderInMobile', () => {
     fireEvent.click(await screen.findByText(/explore\.sidebar\.action\.rename|sidebar\.action\.rename/i))
 
     const input = await screen.findByRole('textbox')
-    expect(input).toHaveValue('')
+    expect(input)!.toHaveValue('')
 
     fireEvent.change(input, { target: { value: 'Renamed from empty' } })
     fireEvent.click(screen.getByRole('button', { name: /common\.operation\.save/i }))
diff --git a/web/app/components/base/chat/chat-with-history/__tests__/hooks.spec.tsx b/web/app/components/base/chat/chat-with-history/__tests__/hooks.spec.tsx
index f4c8ef0c45..3f69cab96f 100644
--- a/web/app/components/base/chat/chat-with-history/__tests__/hooks.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/__tests__/hooks.spec.tsx
@@ -497,7 +497,7 @@ describe('useChatWithHistory', () => {
       expect(mockRenameConversation).toHaveBeenCalledWith(AppSourceType.webApp, 'app-1', 'conversation-1', 'New Name')
       expect(onSuccess).toHaveBeenCalledTimes(1)
       await waitFor(() => {
-        expect(result!.current.conversationList[0].name).toBe('New Name')
+        expect(result!.current.conversationList[0]!.name).toBe('New Name')
       })
     })
 
@@ -615,7 +615,7 @@ describe('useChatWithHistory', () => {
 
       // Assert: new item with empty id prepended
       await waitFor(() => {
-        expect(result!.current.conversationList[0].id).toBe('')
+        expect(result!.current.conversationList[0]!.id).toBe('')
       })
     })
   })
@@ -1597,7 +1597,7 @@ describe('useChatWithHistory', () => {
       })
 
       // Assert
-      expect(result!.current.conversationList[0].id).toBe('conversation-1')
+      expect(result!.current.conversationList[0]!.id).toBe('conversation-1')
     })
   })
 
@@ -1857,7 +1857,7 @@ describe('useChatWithHistory', () => {
 
       // Assert
       await waitFor(() => {
-        expect(result!.current.conversationList[0].name).toBe('Updated Name')
+        expect(result!.current.conversationList[0]!.name).toBe('Updated Name')
       })
     })
   })
diff --git a/web/app/components/base/chat/chat-with-history/header/__tests__/index.spec.tsx b/web/app/components/base/chat/chat-with-history/header/__tests__/index.spec.tsx
index 5feaccd191..b1c23a129b 100644
--- a/web/app/components/base/chat/chat-with-history/header/__tests__/index.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/__tests__/index.spec.tsx
@@ -108,7 +108,7 @@ describe('Header Component', () => {
         currentConversationItem: mockConv,
         sidebarCollapseState: true,
       })
-      expect(screen.getByText('My Chat')).toBeInTheDocument()
+      expect(screen.getByText('My Chat'))!.toBeInTheDocument()
     })
 
     it('should render ViewFormDropdown trigger when inputsForms are present', () => {
@@ -133,7 +133,7 @@ describe('Header Component', () => {
       const buttons = screen.getAllByRole('button')
       // Sidebar, NewChat, ResetChat (3)
       const resetChatBtn = buttons[buttons.length - 1]
-      await userEvent.click(resetChatBtn)
+      await userEvent.click(resetChatBtn!)
 
       expect(handleNewConversation).toHaveBeenCalled()
     })
@@ -144,7 +144,7 @@ describe('Header Component', () => {
 
       const buttons = screen.getAllByRole('button')
       const sidebarBtn = buttons[0]
-      await userEvent.click(sidebarBtn)
+      await userEvent.click(sidebarBtn!)
 
       expect(handleSidebarCollapse).toHaveBeenCalledWith(false)
     })
@@ -163,7 +163,7 @@ describe('Header Component', () => {
       await userEvent.click(trigger)
 
       const pinBtn = await screen.findByText('explore.sidebar.action.pin')
-      expect(pinBtn).toBeInTheDocument()
+      expect(pinBtn)!.toBeInTheDocument()
 
       await userEvent.click(pinBtn)
 
@@ -225,7 +225,7 @@ describe('Header Component', () => {
       const renameMenuBtn = await screen.findByText('explore.sidebar.action.rename')
       await userEvent.click(renameMenuBtn)
 
-      expect(await screen.findByText('common.chat.renameConversation')).toBeInTheDocument()
+      expect(await screen.findByText('common.chat.renameConversation'))!.toBeInTheDocument()
 
       const input = screen.getByDisplayValue('My Chat')
       await userEvent.clear(input)
@@ -236,7 +236,7 @@ describe('Header Component', () => {
 
       expect(handleRenameConversation).toHaveBeenCalledWith('conv-1', 'New Name', expect.any(Object))
 
-      const successCallback = handleRenameConversation.mock.calls[0][2].onSuccess
+      const successCallback = handleRenameConversation.mock.calls[0]![2].onSuccess
       await act(async () => {
         successCallback()
       })
@@ -262,14 +262,14 @@ describe('Header Component', () => {
       await userEvent.click(deleteMenuBtn)
 
       expect(handleDeleteConversation).not.toHaveBeenCalled()
-      expect(await screen.findByText('share.chat.deleteConversation.title')).toBeInTheDocument()
+      expect(await screen.findByText('share.chat.deleteConversation.title'))!.toBeInTheDocument()
 
       const confirmBtn = await screen.findByText('common.operation.confirm')
       await userEvent.click(confirmBtn)
 
       expect(handleDeleteConversation).toHaveBeenCalledWith('conv-1', expect.any(Object))
 
-      const successCallback = handleDeleteConversation.mock.calls[0][1].onSuccess
+      const successCallback = handleDeleteConversation.mock.calls[0]![1].onSuccess
       await act(async () => {
         successCallback()
       })
@@ -311,7 +311,7 @@ describe('Header Component', () => {
       await userEvent.click(screen.getByText('My Chat'))
       await userEvent.click(await screen.findByText('explore.sidebar.action.delete'))
 
-      expect(await screen.findByText('share.chat.deleteConversation.title')).toBeInTheDocument()
+      expect(await screen.findByText('share.chat.deleteConversation.title'))!.toBeInTheDocument()
     })
   })
 
@@ -332,7 +332,7 @@ describe('Header Component', () => {
     it('should render system title if conversation id is missing', () => {
       setup({ currentConversationId: '', sidebarCollapseState: true })
       const titleEl = screen.getByText('Test App')
-      expect(titleEl).toHaveClass('system-md-semibold')
+      expect(titleEl)!.toHaveClass('system-md-semibold')
     })
 
     it('should render app icon from URL when icon_url is provided', () => {
@@ -347,7 +347,7 @@ describe('Header Component', () => {
         },
       })
       const img = screen.getByAltText('app icon')
-      expect(img).toHaveAttribute('src', 'https://example.com/icon.png')
+      expect(img)!.toHaveAttribute('src', 'https://example.com/icon.png')
     })
 
     it('should handle undefined appData gracefully (optional chaining)', () => {
@@ -364,7 +364,8 @@ describe('Header Component', () => {
         sidebarCollapseState: true,
       })
       // The separator is just a div with text content '/'
-      expect(screen.getByText('/')).toBeInTheDocument()
+      // The separator is just a div with text content '/'
+      expect(screen.getByText('/'))!.toBeInTheDocument()
     })
 
     it('should handle New Chat button state when currentConversationId is present but isResponding is true', () => {
@@ -377,7 +378,7 @@ describe('Header Component', () => {
       const buttons = screen.getAllByRole('button')
       // Sidebar, NewChat, ResetChat (3)
       const newChatBtn = buttons[1]
-      expect(newChatBtn).toBeDisabled()
+      expect(newChatBtn)!.toBeDisabled()
     })
 
     it('should handle New Chat button state when currentConversationId is missing and isResponding is false', () => {
@@ -390,7 +391,7 @@ describe('Header Component', () => {
       const buttons = screen.getAllByRole('button')
       // Sidebar, NewChat (2)
       const newChatBtn = buttons[1]
-      expect(newChatBtn).toBeDisabled()
+      expect(newChatBtn)!.toBeDisabled()
     })
 
     it('should not render operation menu if conversation id is missing', () => {
diff --git a/web/app/components/base/chat/chat-with-history/hooks.tsx b/web/app/components/base/chat/chat-with-history/hooks.tsx
index e6f5657ff5..df261d750c 100644
--- a/web/app/components/base/chat/chat-with-history/hooks.tsx
+++ b/web/app/components/base/chat/chat-with-history/hooks.tsx
@@ -452,7 +452,7 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
       toast.success(t('actionMsg.modifiedSuccessfully', { ns: 'common' }))
       setOriginConversationList(produce((draft) => {
         const index = originConversationList.findIndex(item => item.id === conversationId)
-        const item = draft[index]
+        const item = draft[index]!
         draft[index] = {
           ...item,
           name: newName,
diff --git a/web/app/components/base/chat/chat/__tests__/hooks.spec.tsx b/web/app/components/base/chat/chat/__tests__/hooks.spec.tsx
index 89327341de..9d65246a7f 100644
--- a/web/app/components/base/chat/chat/__tests__/hooks.spec.tsx
+++ b/web/app/components/base/chat/chat/__tests__/hooks.spec.tsx
@@ -102,8 +102,8 @@ describe('useChat', () => {
     const { result } = renderHook(() => useChat(config as ChatConfig, formSettings))
 
     expect(result.current.chatList).toHaveLength(1)
-    expect(result.current.chatList[0].content).toBe('Hello Alice')
-    expect(result.current.chatList[0].suggestedQuestions).toEqual(['One', 'Two'])
+    expect(result.current.chatList[0]!.content).toBe('Hello Alice')
+    expect(result.current.chatList[0]!.suggestedQuestions).toEqual(['One', 'Two'])
   })
 
   it('should update existing opening statement if already present in threadMessages', () => {
@@ -121,7 +121,7 @@ describe('useChat', () => {
 
     const { result } = renderHook(() => useChat(config as ChatConfig, undefined, prevChatTree as ChatItemInTree[]))
     expect(result.current.chatList).toHaveLength(1)
-    expect(result.current.chatList[0].content).toBe('Hello updated')
+    expect(result.current.chatList[0]!.content).toBe('Hello updated')
   })
 
   it('should update existing opening statement suggested questions using processed values', () => {
@@ -143,8 +143,8 @@ describe('useChat', () => {
 
     const { result } = renderHook(() => useChat(config as ChatConfig, formSettings as UseChatFormSettings, prevChatTree as ChatItemInTree[]))
 
-    expect(result.current.chatList[0].content).toBe('Hello Bob')
-    expect(result.current.chatList[0].suggestedQuestions).toEqual(['Ask Bob'])
+    expect(result.current.chatList[0]!.content).toBe('Hello Bob')
+    expect(result.current.chatList[0]!.suggestedQuestions).toEqual(['Ask Bob'])
   })
 
   describe('opening statement referential stability', () => {
@@ -162,8 +162,8 @@ describe('useChat', () => {
       const { result } = renderHook(() => useChat(config as ChatConfig))
 
       const openerInitial = result.current.chatList[0]
-      expect(openerInitial.isOpeningStatement).toBe(true)
-      expect(openerInitial.content).toBe('Welcome!')
+      expect(openerInitial!.isOpeningStatement).toBe(true)
+      expect(openerInitial!.content).toBe('Welcome!')
 
       act(() => {
         result.current.handleSend('url', { query: 'hello' }, {})
@@ -207,8 +207,8 @@ describe('useChat', () => {
       )
 
       const openerBefore = result.current.chatList[0]
-      expect(openerBefore.content).toBe('Hello Alice')
-      expect(openerBefore.suggestedQuestions).toEqual(['Ask about Alice'])
+      expect(openerBefore!.content).toBe('Hello Alice')
+      expect(openerBefore!.suggestedQuestions).toEqual(['Ask about Alice'])
 
       rerender({ fs: { inputs: { name: 'Alice' }, inputsForm: [] } })
 
@@ -232,8 +232,8 @@ describe('useChat', () => {
 
       const after = result.current.chatList[0]
       expect(after).not.toBe(before)
-      expect(after.content).toBe('Hello Bob')
-      expect(after.suggestedQuestions).toEqual(['Ask Bob'])
+      expect(after!.content).toBe('Hello Bob')
+      expect(after!.suggestedQuestions).toEqual(['Ask Bob'])
     })
 
     it('should keep content and suggestedQuestions stable for opener already in prevChatTree even when sibling metadata changes', () => {
@@ -259,11 +259,11 @@ describe('useChat', () => {
       )
 
       const openerBefore = result.current.chatList[0]
-      expect(openerBefore.content).toBe('Hello updated')
-      expect(openerBefore.suggestedQuestions).toEqual(['S1'])
+      expect(openerBefore!.content).toBe('Hello updated')
+      expect(openerBefore!.suggestedQuestions).toEqual(['S1'])
 
-      const contentBefore = openerBefore.content
-      const suggestionsBefore = openerBefore.suggestedQuestions
+      const contentBefore = openerBefore!.content
+      const suggestionsBefore = openerBefore!.suggestedQuestions
 
       act(() => {
         result.current.handleSend('url', { query: 'msg' }, {})
@@ -274,15 +274,15 @@ describe('useChat', () => {
 
       expect(result.current.chatList.length).toBeGreaterThan(1)
       const openerAfter = result.current.chatList[0]
-      expect(openerAfter.content).toBe(contentBefore)
-      expect(openerAfter.suggestedQuestions).toBe(suggestionsBefore)
+      expect(openerAfter!.content).toBe(contentBefore)
+      expect(openerAfter!.suggestedQuestions).toBe(suggestionsBefore)
     })
 
     it('should use a stable id of "opening-statement"', () => {
       const { result } = renderHook(() =>
         useChat({ opening_statement: 'Hi' } as ChatConfig),
       )
-      expect(result.current.chatList[0].id).toBe('opening-statement')
+      expect(result.current.chatList[0]!.id).toBe('opening-statement')
     })
   })
 
@@ -329,8 +329,8 @@ describe('useChat', () => {
       })
 
       expect(result.current.isResponding).toBe(false)
-      expect(result.current.chatList[1].content).toBe('hi there')
-      expect(result.current.chatList[1].id).toBe('m-1')
+      expect(result.current.chatList[1]!.content).toBe('hi there')
+      expect(result.current.chatList[1]!.id).toBe('m-1')
     })
 
     it('should handle onThought and different workflow events', async () => {
@@ -387,10 +387,10 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.agent_thoughts).toHaveLength(2)
-      expect(lastResponse.agent_thoughts![0].thought).toContain('thinking...')
-      expect(lastResponse.agent_thoughts![1].thought).toContain('second thought')
-      expect(lastResponse.workflowProcess?.tracing).toHaveLength(3) // node, iteration, loop
+      expect(lastResponse!.agent_thoughts).toHaveLength(2)
+      expect(lastResponse!.agent_thoughts![0]!.thought).toContain('thinking...')
+      expect(lastResponse!.agent_thoughts![1]!.thought).toContain('second thought')
+      expect(lastResponse!.workflowProcess?.tracing).toHaveLength(3) // node, iteration, loop
     })
 
     it('should handle human input forms, pauses, TTS, and message ends', async () => {
@@ -435,11 +435,11 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.humanInputFormDataList).toHaveLength(0) // Removed when filled
-      expect(lastResponse.humanInputFilledFormDataList).toHaveLength(2)
+      expect(lastResponse!.humanInputFormDataList).toHaveLength(0) // Removed when filled
+      expect(lastResponse!.humanInputFilledFormDataList).toHaveLength(2)
       expect(sseGet).toHaveBeenCalled() // from workflowPaused
-      expect(lastResponse.annotation?.id).toBe('anno-1')
-      expect(lastResponse.content).toBe('Replaced content')
+      expect(lastResponse!.annotation?.id).toBe('anno-1')
+      expect(lastResponse!.content).toBe('Replaced content')
       expect(result.current.isResponding).toBe(false) // from onError
     })
 
@@ -466,8 +466,8 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.message_files).toHaveLength(1)
-      expect(lastResponse.agent_thoughts![0].message_files).toHaveLength(1)
+      expect(lastResponse!.message_files).toHaveLength(1)
+      expect(lastResponse!.agent_thoughts![0]!.message_files).toHaveLength(1)
     })
 
     it('should fetch conversation messages and suggested questions onCompleted', async () => {
@@ -524,7 +524,7 @@ describe('useChat', () => {
       expect(onConversationComplete).toHaveBeenCalledWith('c-1')
 
       const updatedResponse = result.current.chatList[1]
-      expect(updatedResponse.content).toBe('Updated answer from history') // Fetched from mock
+      expect(updatedResponse!.content).toBe('Updated answer from history') // Fetched from mock
       expect(result.current.suggestedQuestions).toEqual(['Suggested 1', 'Suggested 2'])
     })
 
@@ -590,8 +590,8 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.workflowProcess?.tracing).toHaveLength(3) // node, iter, loop
-      expect(lastResponse.workflowProcess?.status).toBe('failed')
+      expect(lastResponse!.workflowProcess?.tracing).toHaveLength(3) // node, iter, loop
+      expect(lastResponse!.workflowProcess?.status).toBe('failed')
     })
 
     it('should handle early exits in tracing events during iteration or loop', async () => {
@@ -629,7 +629,7 @@ describe('useChat', () => {
         callbacks.onNodeFinished({ data: { id: 'n-1', iteration_id: 'iter-1' } })
       })
 
-      const traceLen1 = result.current.chatList[result.current.chatList.length - 1].workflowProcess?.tracing?.length
+      const traceLen1 = result.current.chatList[result.current.chatList.length - 1]!.workflowProcess?.tracing?.length
       expect(traceLen1).toBe(0) // None added due to iteration early hits
     })
 
@@ -678,8 +678,8 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.workflowProcess?.tracing).toBeDefined()
-      expect(lastResponse.workflowProcess?.status).toBe('failed')
+      expect(lastResponse!.workflowProcess?.tracing).toBeDefined()
+      expect(lastResponse!.workflowProcess?.status).toBe('failed')
     })
 
     it('should insert and then replace child QA when sending with parent_message_id', () => {
@@ -713,7 +713,7 @@ describe('useChat', () => {
 
       expect(result.current.chatList.some(item => item.id === 'question-m-child')).toBe(true)
       expect(result.current.chatList.some(item => item.id === 'm-child')).toBe(true)
-      expect(result.current.chatList[result.current.chatList.length - 1].content).toBe('child answer')
+      expect(result.current.chatList[result.current.chatList.length - 1]!.content).toBe('child answer')
     })
 
     it('should strip local file urls before sending payload', () => {
@@ -746,7 +746,7 @@ describe('useChat', () => {
         result.current.handleSend('test-url', { query: 'file payload', files: [localFile as FileEntity, remoteFile as FileEntity] }, {})
       })
 
-      const payload = vi.mocked(ssePost).mock.calls[0][1] as {
+      const payload = vi.mocked(ssePost).mock.calls[0]![1] as {
         body: {
           files: Array<{
             transfer_method: string
@@ -776,10 +776,10 @@ describe('useChat', () => {
         result.current.handleSend('test-url', { query: 'first request' }, {})
       })
       act(() => {
-        callbacksList[0].getAbortController(previousWorkflowAbort)
+        callbacksList[0]!.getAbortController(previousWorkflowAbort)
       })
       await act(async () => {
-        await callbacksList[0].onCompleted(true)
+        await callbacksList[0]!.onCompleted(true)
       })
 
       act(() => {
@@ -811,7 +811,7 @@ describe('useChat', () => {
       })
 
       expect(onGetConversationMessages).toHaveBeenCalled()
-      expect(result.current.chatList[result.current.chatList.length - 1].content).toBe('streamed content')
+      expect(result.current.chatList[result.current.chatList.length - 1]!.content).toBe('streamed content')
     })
 
     it('should clear suggested questions when suggestion fetch fails after completion', async () => {
@@ -858,7 +858,7 @@ describe('useChat', () => {
       })
 
       const latestResponse = result.current.chatList[result.current.chatList.length - 1]
-      expect(latestResponse.workflowProcess?.tracing).toHaveLength(0)
+      expect(latestResponse!.workflowProcess?.tracing).toHaveLength(0)
     })
 
     it('should handle paused workflow finish, thought id binding, empty tts chunk, and human-input pause updates', () => {
@@ -885,11 +885,11 @@ describe('useChat', () => {
       })
 
       const latestResponse = result.current.chatList[result.current.chatList.length - 1]
-      expect(latestResponse.id).toBe('m-th-bind')
-      expect(latestResponse.conversationId).toBe('c-th-bind')
-      expect(latestResponse.workflowProcess?.status).toBe('succeeded')
-      expect(latestResponse.humanInputFormDataList?.map(item => item.node_id)).toEqual(['human-node', 'human-node-2'])
-      expect(latestResponse.workflowProcess?.tracing?.find(item => item.node_id === 'human-node')?.status).toBe('paused')
+      expect(latestResponse!.id).toBe('m-th-bind')
+      expect(latestResponse!.conversationId).toBe('c-th-bind')
+      expect(latestResponse!.workflowProcess?.status).toBe('succeeded')
+      expect(latestResponse!.humanInputFormDataList?.map(item => item.node_id)).toEqual(['human-node', 'human-node-2'])
+      expect(latestResponse!.workflowProcess?.tracing?.find(item => item.node_id === 'human-node')?.status).toBe('paused')
     })
   })
 
@@ -978,13 +978,13 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[result.current.chatList.length - 1]
-      expect(lastResponse.agent_thoughts![0].thought).toContain('resumed')
+      expect(lastResponse!.agent_thoughts![0]!.thought).toContain('resumed')
 
-      expect(lastResponse.workflowProcess?.tracing?.length).toBeGreaterThan(0)
-      expect(lastResponse.workflowProcess?.status).toBe('paused')
-      expect(lastResponse.humanInputFilledFormDataList).toHaveLength(1)
-      expect(lastResponse.humanInputFormDataList).toHaveLength(0)
-      expect(lastResponse.content).toBe('replaced resume')
+      expect(lastResponse!.workflowProcess?.tracing?.length).toBeGreaterThan(0)
+      expect(lastResponse!.workflowProcess?.status).toBe('paused')
+      expect(lastResponse!.humanInputFilledFormDataList).toHaveLength(1)
+      expect(lastResponse!.humanInputFormDataList).toHaveLength(0)
+      expect(lastResponse!.content).toBe('replaced resume')
     })
 
     it('should handle non-agent mode resume', async () => {
@@ -1017,7 +1017,7 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.content).toBe('initial append')
+      expect(lastResponse!.content).toBe('initial append')
     })
 
     it('should stop resume completion flow early when hasError is true', async () => {
@@ -1084,7 +1084,7 @@ describe('useChat', () => {
         result.current.handleResume('m-resume', 'wr-1', { isPublicAPI: true })
       })
       act(() => {
-        callbacksList[0].getAbortController(previousWorkflowAbort)
+        callbacksList[0]!.getAbortController(previousWorkflowAbort)
       })
       act(() => {
         result.current.handleResume('m-resume', 'wr-2', { isPublicAPI: true })
@@ -1127,7 +1127,7 @@ describe('useChat', () => {
         callbacks.onTTSChunk('m-guard', '')
       })
 
-      expect(result.current.chatList[1].content).toBe('initial')
+      expect(result.current.chatList[1]!.content).toBe('initial')
     })
 
     it('should clear suggested questions when resume suggestion fetch fails', async () => {
@@ -1207,9 +1207,9 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.humanInputFormDataList?.map(item => item.node_id)).toEqual(['node-2'])
-      expect(lastResponse.humanInputFilledFormDataList?.map(item => item.node_id)).toEqual(['node-1', 'node-3'])
-      expect(lastResponse.workflowProcess?.tracing?.find(item => item.node_id === 'node-1')?.status).toBe('paused')
+      expect(lastResponse!.humanInputFormDataList?.map(item => item.node_id)).toEqual(['node-2'])
+      expect(lastResponse!.humanInputFilledFormDataList?.map(item => item.node_id)).toEqual(['node-1', 'node-3'])
+      expect(lastResponse!.workflowProcess?.tracing?.find(item => item.node_id === 'node-1')?.status).toBe('paused')
     })
 
     it('should handle resume non-annotation lifecycle branches and parallel node finish', () => {
@@ -1256,11 +1256,11 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.message_files).toHaveLength(1)
-      expect(lastResponse.conversationId).toBe('c-resume-branches')
-      expect(lastResponse.citation).toEqual([{ id: 'r-1' }])
-      expect(lastResponse.workflowProcess?.status).toBe('succeeded')
-      expect(lastResponse.workflowProcess?.tracing?.some(item => item.id === 'n-parallel')).toBe(true)
+      expect(lastResponse!.message_files).toHaveLength(1)
+      expect(lastResponse!.conversationId).toBe('c-resume-branches')
+      expect(lastResponse!.citation).toEqual([{ id: 'r-1' }])
+      expect(lastResponse!.workflowProcess?.status).toBe('succeeded')
+      expect(lastResponse!.workflowProcess?.tracing?.some(item => item.id === 'n-parallel')).toBe(true)
     })
   })
 
@@ -1349,7 +1349,7 @@ describe('useChat', () => {
       })
 
       // Simulate taskIdRef population
-      const callbacks = vi.mocked(ssePost).mock.calls[0][2] as HookCallbacks
+      const callbacks = vi.mocked(ssePost).mock.calls[0]![2] as HookCallbacks
       act(() => {
         callbacks.onWorkflowStarted({ task_id: 'task-123' })
       })
@@ -1467,21 +1467,21 @@ describe('useChat', () => {
       act(() => {
         result.current.handleAnnotationEdited('edited query', 'edited answer', 1)
       })
-      expect(result.current.chatList[0].content).toBe('edited query')
-      expect(result.current.chatList[1].content).toBe('edited answer')
+      expect(result.current.chatList[0]!.content).toBe('edited query')
+      expect(result.current.chatList[1]!.content).toBe('edited answer')
 
       // Added
       act(() => {
         result.current.handleAnnotationAdded('anno-1', 'admin', 'q2', 'a2', 1)
       })
-      expect(result.current.chatList[1].annotation?.id).toBe('anno-1')
-      expect(result.current.chatList[1].annotation?.authorName).toBe('admin')
+      expect(result.current.chatList[1]!.annotation?.id).toBe('anno-1')
+      expect(result.current.chatList[1]!.annotation?.authorName).toBe('admin')
 
       // Removed
       act(() => {
         result.current.handleAnnotationRemoved(1)
       })
-      expect(result.current.chatList[1].annotation?.id).toBe('')
+      expect(result.current.chatList[1]!.annotation?.id).toBe('')
     })
 
     it('should handle switch sibling and trigger handleResume if human input', () => {
@@ -1554,13 +1554,13 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.message_files).toHaveLength(3)
-      expect(lastResponse.message_files![0].type).toBe('video/mp4')
-      expect(lastResponse.message_files![0].supportFileType).toBe('video')
-      expect(lastResponse.message_files![1].type).toBe('audio/mpeg')
-      expect(lastResponse.message_files![1].supportFileType).toBe('audio')
-      expect(lastResponse.message_files![2].type).toBe('application/octet-stream')
-      expect(lastResponse.message_files![2].supportFileType).toBe('document')
+      expect(lastResponse!.message_files).toHaveLength(3)
+      expect(lastResponse!.message_files![0]!.type).toBe('video/mp4')
+      expect(lastResponse!.message_files![0]!.supportFileType).toBe('video')
+      expect(lastResponse!.message_files![1]!.type).toBe('audio/mpeg')
+      expect(lastResponse!.message_files![1]!.supportFileType).toBe('audio')
+      expect(lastResponse!.message_files![2]!.type).toBe('application/octet-stream')
+      expect(lastResponse!.message_files![2]!.supportFileType).toBe('document')
     })
 
     it('should handle onMessageEnd empty citation and empty processed files fallbacks', () => {
@@ -1580,7 +1580,7 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.citation).toEqual([])
+      expect(lastResponse!.citation).toEqual([])
     })
 
     it('should handle iteration and loop tracing edge cases (lazy arrays, node finish index -1)', () => {
@@ -1660,9 +1660,9 @@ describe('useChat', () => {
 
       // Ensure the tracing array exists and holds the loop item
       const lastResponse = result3.current.chatList[1]
-      expect(lastResponse.workflowProcess?.tracing).toBeDefined()
-      expect(lastResponse.workflowProcess?.tracing).toHaveLength(1)
-      expect(lastResponse.workflowProcess?.tracing![0].node_id).toBe('loop-1')
+      expect(lastResponse!.workflowProcess?.tracing).toBeDefined()
+      expect(lastResponse!.workflowProcess?.tracing).toHaveLength(1)
+      expect(lastResponse!.workflowProcess?.tracing![0]!.node_id).toBe('loop-1')
     })
 
     it('should handle onCompleted fallback to answer when agent thought does not match and provider latency is 0', async () => {
@@ -1699,9 +1699,9 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.content).toBe('final answer')
-      expect(lastResponse.more?.latency).toBe('0.00')
-      expect(lastResponse.more?.tokens_per_second).toBeUndefined()
+      expect(lastResponse!.content).toBe('final answer')
+      expect(lastResponse!.more?.latency).toBe('0.00')
+      expect(lastResponse!.more?.tokens_per_second).toBeUndefined()
     })
 
     it('should handle onCompleted using agent thought when thought matches answer', async () => {
@@ -1738,7 +1738,7 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.content).toBe('') // isUseAgentThought sets content to empty string
+      expect(lastResponse!.content).toBe('') // isUseAgentThought sets content to empty string
     })
 
     it('should cover pausedStateRef reset on workflowFinished and missing tracing arrays in node finish / human input', () => {
@@ -1781,7 +1781,7 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[1]
-      expect(lastResponse.workflowProcess?.status).toBe('succeeded')
+      expect(lastResponse!.workflowProcess?.status).toBe('succeeded')
     })
 
     it('should cover onThought creating tracing and appending message correctly when isAgentMode=true', () => {
@@ -1806,8 +1806,8 @@ describe('useChat', () => {
       })
 
       const lastResponse = result.current.chatList[result.current.chatList.length - 1]
-      expect(lastResponse.agent_thoughts).toHaveLength(1)
-      expect(lastResponse.agent_thoughts![0].thought).toBe('initial thought appended')
+      expect(lastResponse!.agent_thoughts).toHaveLength(1)
+      expect(lastResponse!.agent_thoughts![0]!.thought).toBe('initial thought appended')
     })
   })
 
@@ -1897,10 +1897,10 @@ describe('useChat', () => {
     })
 
     const lastSendResponse = result.current.chatList[1]
-    expect(lastSendResponse.message_files).toHaveLength(2)
+    expect(lastSendResponse!.message_files).toHaveLength(2)
 
     const lastResumeResponse = resumeResult.current.chatList[1]
-    expect(lastResumeResponse.message_files).toHaveLength(1)
+    expect(lastResumeResponse!.message_files).toHaveLength(1)
   })
 
   it('should cover parallel_id tracing matches in iteration and loop finish', () => {
@@ -1931,10 +1931,10 @@ describe('useChat', () => {
     })
 
     const lastResponse = result.current.chatList[1]
-    const tracing = lastResponse.workflowProcess!.tracing!
+    const tracing = lastResponse!.workflowProcess!.tracing!
     expect(tracing).toHaveLength(3)
-    expect(tracing[0].status).toBe('succeeded')
-    expect(tracing[1].status).toBe('succeeded')
+    expect(tracing[0]!.status).toBe('succeeded')
+    expect(tracing[1]!.status).toBe('succeeded')
   })
 
   it('should cover baseFile with ALL fields, avoiding all fallbacks', () => {
@@ -1964,9 +1964,9 @@ describe('useChat', () => {
     })
 
     const lastResponse = result.current.chatList[result.current.chatList.length - 1]
-    expect(lastResponse.message_files).toHaveLength(1)
-    expect(lastResponse.message_files![0].type).toBe('custom/mime')
-    expect(lastResponse.message_files![0].size).toBe(1024)
+    expect(lastResponse!.message_files).toHaveLength(1)
+    expect(lastResponse!.message_files![0]!.type).toBe('custom/mime')
+    expect(lastResponse!.message_files![0]!.size).toBe(1024)
   })
 
   it('should cover handleResume missing branches for onMessageEnd, onFile fallbacks, and workflow edges', () => {
@@ -2010,13 +2010,14 @@ describe('useChat', () => {
       resumeCallbacks.onHumanInputFormTimeout({ data: { node_id: 'timeout-id' } })
 
       // Empty file list
-      result.current.chatList[1].message_files = undefined
+      // Empty file list
+      result.current.chatList[1]!.message_files = undefined
       // Call onFile while agent_thoughts is empty/undefined to hit the `else` fallback branch
       resumeCallbacks.onFile({ id: 'f-agent', type: 'image', url: 'agent.png' })
     })
 
     const lastResponse = result.current.chatList[1]
-    expect(lastResponse.message_files![0]).toBeDefined()
+    expect(lastResponse!.message_files![0]).toBeDefined()
   })
 
   it('should cover edge case where node_id is missing or index is -1 in handleResume onNodeFinished and onLoopFinish', () => {
@@ -2054,7 +2055,7 @@ describe('useChat', () => {
     })
 
     const lastResponse = result.current.chatList[1]
-    expect(lastResponse.workflowProcess?.tracing).toHaveLength(0) // None were updated
+    expect(lastResponse!.workflowProcess?.tracing).toHaveLength(0) // None were updated
   })
 
   it('should cover TTS chunks branching where audio is empty', () => {
@@ -2092,7 +2093,8 @@ describe('useChat', () => {
       sendCallbacks.onData(' append', false, { conversationId: 'c-1' } as Record<string, unknown>)
 
       // Empty message files fallback
-      result.current.chatList[1].message_files = undefined
+      // Empty message files fallback
+      result.current.chatList[1]!.message_files = undefined
       sendCallbacks.onFile({ id: 'f-send', type: 'image', url: 'img.png' })
 
       // Empty message files passing to processing fallback
@@ -2113,7 +2115,7 @@ describe('useChat', () => {
       sendCallbacks.onHumanInputFormTimeout({ data: { node_id: 'timeout' } } as Record<string, unknown>)
     })
 
-    expect(result.current.chatList[1].message_files).toBeDefined()
+    expect(result.current.chatList[1]!.message_files).toBeDefined()
   })
 
   it('should cover handleSwitchSibling target message not found early returns', () => {
@@ -2137,7 +2139,7 @@ describe('useChat', () => {
     act(() => {
       sendCallbacks.onNodeStarted({ data: { node_id: 'n-new', id: 'n-new' } })
     })
-    expect(result.current.chatList[1].workflowProcess).toBeUndefined()
+    expect(result.current.chatList[1]!.workflowProcess).toBeUndefined()
   })
 
   it('should cover handleSend onNodeStarted missing tracing in workflowProcess (L969)', () => {
@@ -2155,14 +2157,14 @@ describe('useChat', () => {
     // Get the shared reference from the tree to mutate the local closed-over responseItem's workflowProcess
     act(() => {
       const response = result.current.chatList[1]
-      if (response.workflowProcess) {
+      if (response!.workflowProcess) {
         // @ts-expect-error deliberately removing tracing to cover the fallback branch
         delete response.workflowProcess.tracing
       }
       sendCallbacks.onNodeStarted({ data: { node_id: 'n-new', id: 'n-new' } })
     })
-    expect(result.current.chatList[1].workflowProcess?.tracing).toBeDefined()
-    expect(result.current.chatList[1].workflowProcess?.tracing?.length).toBe(1)
+    expect(result.current.chatList[1]!.workflowProcess?.tracing).toBeDefined()
+    expect(result.current.chatList[1]!.workflowProcess?.tracing?.length).toBe(1)
   })
 
   it('should cover handleSend onTTSChunk and onTTSEnd truthy audio strings', () => {
@@ -2256,7 +2258,7 @@ describe('useChat', () => {
       sendCallbacks.onWorkflowStarted({ workflow_run_id: 'wr-1', task_id: 't-1' })
     })
 
-    expect(result.current.chatList[1].workflowProcess!.tracing).toHaveLength(1)
+    expect(result.current.chatList[1]!.workflowProcess!.tracing).toHaveLength(1)
   })
 
   it('should cover handleResume onHumanInputFormFilled splicing and onHumanInputFormTimeout updating', () => {
@@ -2292,8 +2294,8 @@ describe('useChat', () => {
     })
 
     const lastResponse = result.current.chatList[1]
-    expect(lastResponse.humanInputFormDataList).toHaveLength(0)
-    expect(lastResponse.humanInputFilledFormDataList).toHaveLength(1)
+    expect(lastResponse!.humanInputFormDataList).toHaveLength(0)
+    expect(lastResponse!.humanInputFilledFormDataList).toHaveLength(1)
   })
 
   it('should cover handleResume branches where workflowProcess exists but tracing is missing (L386, L414, L472)', () => {
@@ -2333,7 +2335,7 @@ describe('useChat', () => {
     })
 
     const lastResponse = result.current.chatList[1]
-    expect(lastResponse.workflowProcess?.tracing).toHaveLength(3)
+    expect(lastResponse!.workflowProcess?.tracing).toHaveLength(3)
   })
 
   it('should cover handleRestart with and without callback', () => {
@@ -2363,10 +2365,10 @@ describe('useChat', () => {
       // (annotationId, authorName, query, answer, index)
       result.current.handleAnnotationAdded('anno-id', 'author', 'q-new', 'a-new', 1)
     })
-    expect(result.current.chatList[0].content).toBe('q-new')
-    expect(result.current.chatList[1].content).toBe('a')
-    expect(result.current.chatList[1].annotation?.logAnnotation?.content).toBe('a-new')
-    expect(result.current.chatList[1].annotation?.id).toBe('anno-id')
+    expect(result.current.chatList[0]!.content).toBe('q-new')
+    expect(result.current.chatList[1]!.content).toBe('a')
+    expect(result.current.chatList[1]!.annotation?.logAnnotation?.content).toBe('a-new')
+    expect(result.current.chatList[1]!.annotation?.id).toBe('anno-id')
   })
 
   it('should cover handleAnnotationEdited updating node', async () => {
@@ -2381,8 +2383,8 @@ describe('useChat', () => {
       // (query, answer, index)
       result.current.handleAnnotationEdited('q-edit', 'a-edit', 1)
     })
-    expect(result.current.chatList[0].content).toBe('q-edit')
-    expect(result.current.chatList[1].content).toBe('a-edit')
+    expect(result.current.chatList[0]!.content).toBe('q-edit')
+    expect(result.current.chatList[1]!.content).toBe('a-edit')
   })
 
   it('should cover handleAnnotationRemoved updating node', () => {
@@ -2402,6 +2404,6 @@ describe('useChat', () => {
     act(() => {
       result.current.handleAnnotationRemoved(1)
     })
-    expect(result.current.chatList[1].annotation?.id).toBe('')
+    expect(result.current.chatList[1]!.annotation?.id).toBe('')
   })
 })
diff --git a/web/app/components/base/chat/chat/answer/__tests__/operation.spec.tsx b/web/app/components/base/chat/chat/answer/__tests__/operation.spec.tsx
index 588b261323..e3bc2dcd38 100644
--- a/web/app/components/base/chat/chat/answer/__tests__/operation.spec.tsx
+++ b/web/app/components/base/chat/chat/answer/__tests__/operation.spec.tsx
@@ -219,8 +219,8 @@ describe('Operation', () => {
 
     it('should show copy and regenerate buttons', () => {
       renderOperation()
-      expect(screen.getByTestId('copy-btn')).toBeInTheDocument()
-      expect(screen.getByTestId('regenerate-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('copy-btn'))!.toBeInTheDocument()
+      expect(screen.getByTestId('regenerate-btn'))!.toBeInTheDocument()
     })
 
     it('should hide regenerate button when noChatInput is true', () => {
@@ -231,7 +231,7 @@ describe('Operation', () => {
     it('should show TTS button when text_to_speech is enabled', () => {
       mockContextValue.config = makeChatConfig({ text_to_speech: { enabled: true } })
       renderOperation()
-      expect(screen.getByTestId('audio-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('audio-btn'))!.toBeInTheDocument()
     })
 
     it('should show annotation button when config supports it', () => {
@@ -240,12 +240,12 @@ describe('Operation', () => {
         annotation_reply: { id: 'ar-1', score_threshold: 0.5, embedding_model: { embedding_provider_name: '', embedding_model_name: '' }, enabled: true },
       })
       renderOperation()
-      expect(screen.getByTestId('annotation-ctrl')).toBeInTheDocument()
+      expect(screen.getByTestId('annotation-ctrl'))!.toBeInTheDocument()
     })
 
     it('should show prompt log when showPromptLog is true', () => {
       renderOperation({ ...baseProps, showPromptLog: true })
-      expect(screen.getByTestId('log-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('log-btn'))!.toBeInTheDocument()
     })
 
     it('should not show prompt log for opening statements', () => {
@@ -311,8 +311,8 @@ describe('Operation', () => {
     it('should show like/dislike buttons', () => {
       renderOperation()
       const bar = screen.getByTestId('operation-bar')
-      expect(bar.querySelector('.i-ri-thumb-up-line')).toBeInTheDocument()
-      expect(bar.querySelector('.i-ri-thumb-down-line')).toBeInTheDocument()
+      expect(bar.querySelector('.i-ri-thumb-up-line'))!.toBeInTheDocument()
+      expect(bar.querySelector('.i-ri-thumb-down-line'))!.toBeInTheDocument()
     })
 
     it('should call onFeedback with like on like click', async () => {
@@ -328,7 +328,7 @@ describe('Operation', () => {
       renderOperation()
       const thumbDown = screen.getByTestId('operation-bar').querySelector('.i-ri-thumb-down-line')!.closest('button')!
       await user.click(thumbDown)
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should submit dislike feedback from modal', async () => {
@@ -348,7 +348,7 @@ describe('Operation', () => {
       renderOperation()
       const thumbDown = screen.getByTestId('operation-bar').querySelector('.i-ri-thumb-down-line')!.closest('button')!
       await user.click(thumbDown)
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
       const cancelBtn = screen.getByText(/cancel/i)
       await user.click(cancelBtn)
       expect(screen.queryByRole('textbox')).not.toBeInTheDocument()
@@ -405,14 +405,14 @@ describe('Operation', () => {
       const item = { ...baseItem, feedback: { rating: 'dislike' as const, content: 'Too slow' } }
       renderOperation({ ...baseProps, item })
       const bar = screen.getByTestId('operation-bar')
-      expect(bar.querySelector('.i-ri-thumb-down-line')).toBeInTheDocument()
+      expect(bar.querySelector('.i-ri-thumb-down-line'))!.toBeInTheDocument()
     })
 
     it('should show tooltip with only rating', () => {
       const item = { ...baseItem, feedback: { rating: 'like' as const } }
       renderOperation({ ...baseProps, item })
       const bar = screen.getByTestId('operation-bar')
-      expect(bar.querySelector('.i-ri-thumb-up-line')).toBeInTheDocument()
+      expect(bar.querySelector('.i-ri-thumb-up-line'))!.toBeInTheDocument()
     })
 
     it('should not show feedback bar for opening statements', () => {
@@ -442,7 +442,8 @@ describe('Operation', () => {
       const thumbDown = screen.getByTestId('operation-bar').querySelector('.i-ri-thumb-down-line')!.closest('button')!
       await user.click(thumbDown)
       // Check if modal title/labels fallback works
-      expect(screen.getByRole('tooltip')).toBeInTheDocument()
+      // Check if modal title/labels fallback works
+      expect(screen.getByRole('tooltip'))!.toBeInTheDocument()
       mockT.mockImplementation(key => key)
     })
   })
@@ -463,7 +464,7 @@ describe('Operation', () => {
       const user = userEvent.setup()
       renderOperation()
       const thumbs = screen.getByTestId('operation-bar').querySelectorAll('.i-ri-thumb-up-line')
-      const adminThumb = thumbs[thumbs.length - 1].closest('button')!
+      const adminThumb = thumbs[thumbs.length - 1]!.closest('button')!
       await user.click(adminThumb)
       expect(mockContextValue.onFeedback).toHaveBeenCalledWith('msg-1', { rating: 'like', content: undefined })
     })
@@ -472,9 +473,9 @@ describe('Operation', () => {
       const user = userEvent.setup()
       renderOperation()
       const thumbs = screen.getByTestId('operation-bar').querySelectorAll('.i-ri-thumb-down-line')
-      const adminThumb = thumbs[thumbs.length - 1].closest('button')!
+      const adminThumb = thumbs[thumbs.length - 1]!.closest('button')!
       await user.click(adminThumb)
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should show user feedback read-only in admin bar when user has liked', () => {
@@ -488,7 +489,7 @@ describe('Operation', () => {
       const item = { ...baseItem, feedback: { rating: 'dislike' as const } }
       renderOperation({ ...baseProps, item })
       const bar = screen.getByTestId('operation-bar')
-      expect(bar.querySelector('.bg-components-actionbar-border')).toBeInTheDocument()
+      expect(bar.querySelector('.bg-components-actionbar-border'))!.toBeInTheDocument()
     })
 
     it('should show existing admin like feedback and allow undo', async () => {
@@ -513,12 +514,12 @@ describe('Operation', () => {
       const user = userEvent.setup()
       renderOperation()
       const thumbs = screen.getByTestId('operation-bar').querySelectorAll('.i-ri-thumb-up-line')
-      const adminThumb = thumbs[thumbs.length - 1].closest('button')!
+      const adminThumb = thumbs[thumbs.length - 1]!.closest('button')!
       await user.click(adminThumb)
       expect(mockContextValue.onFeedback).toHaveBeenCalledWith('msg-1', { rating: 'like', content: undefined })
 
       const thumbsUndo = screen.getByTestId('operation-bar').querySelectorAll('.i-ri-thumb-up-line')
-      const adminThumbUndo = thumbsUndo[thumbsUndo.length - 1].closest('button')!
+      const adminThumbUndo = thumbsUndo[thumbsUndo.length - 1]!.closest('button')!
       await user.click(adminThumbUndo)
       expect(mockContextValue.onFeedback).toHaveBeenCalledWith('msg-1', { rating: null, content: undefined })
     })
@@ -527,13 +528,13 @@ describe('Operation', () => {
       const user = userEvent.setup()
       renderOperation()
       const thumbs = screen.getByTestId('operation-bar').querySelectorAll('.i-ri-thumb-down-line')
-      const adminThumb = thumbs[thumbs.length - 1].closest('button')!
+      const adminThumb = thumbs[thumbs.length - 1]!.closest('button')!
       await user.click(adminThumb)
       const submitBtn = screen.getByText(/submit/i)
       await user.click(submitBtn)
 
       const thumbsUndo = screen.getByTestId('operation-bar').querySelectorAll('.i-ri-thumb-down-line')
-      const adminThumbUndo = thumbsUndo[thumbsUndo.length - 1].closest('button')!
+      const adminThumbUndo = thumbsUndo[thumbsUndo.length - 1]!.closest('button')!
       await user.click(adminThumbUndo)
       expect(mockContextValue.onFeedback).toHaveBeenCalledWith('msg-1', { rating: null, content: undefined })
     })
@@ -554,7 +555,9 @@ describe('Operation', () => {
       renderOperation({ ...baseProps, item })
       // Since it renders the 'else' block for hasAdminFeedback (which is false due to !)
       // the like/dislike regular ActionButtons should hit the Default state
-      expect(screen.getByTestId('operation-bar')).toBeInTheDocument()
+      // Since it renders the 'else' block for hasAdminFeedback (which is false due to !)
+      // the like/dislike regular ActionButtons should hit the Default state
+      expect(screen.getByTestId('operation-bar'))!.toBeInTheDocument()
     })
   })
 
@@ -587,7 +590,7 @@ describe('Operation', () => {
       const item = { ...baseItem, feedback: { rating: 'like' as const }, adminFeedback: { rating: 'dislike' as const } }
       renderOperation({ ...baseProps, item, showPromptLog: true })
       const bar = screen.getByTestId('operation-bar')
-      expect(bar).toBeInTheDocument()
+      expect(bar)!.toBeInTheDocument()
     })
 
     it('should show separator when user has feedback in admin mode', () => {
@@ -595,7 +598,7 @@ describe('Operation', () => {
       const item = { ...baseItem, feedback: { rating: 'like' as const } }
       renderOperation({ ...baseProps, item })
       const bar = screen.getByTestId('operation-bar')
-      expect(bar.querySelector('.bg-components-actionbar-border')).toBeInTheDocument()
+      expect(bar.querySelector('.bg-components-actionbar-border'))!.toBeInTheDocument()
     })
 
     it('should handle missing translation fallbacks in buildFeedbackTooltip', () => {
@@ -608,7 +611,7 @@ describe('Operation', () => {
       })
 
       renderOperation()
-      expect(screen.getByTestId('operation-bar')).toBeInTheDocument()
+      expect(screen.getByTestId('operation-bar'))!.toBeInTheDocument()
 
       // Reset to default behavior
       mockT.mockImplementation(key => key)
@@ -625,7 +628,7 @@ describe('Operation', () => {
       })
       const itemLike = { ...baseItem, feedback: { rating: 'like' as const, content: 'test content' } }
       const { rerender } = renderOperation({ ...baseProps, item: itemLike })
-      expect(screen.getByTestId('operation-bar')).toBeInTheDocument()
+      expect(screen.getByTestId('operation-bar'))!.toBeInTheDocument()
 
       const itemDislike = { ...baseItem, feedback: { rating: 'dislike' as const, content: 'test content' } }
       rerender(
@@ -633,7 +636,7 @@ describe('Operation', () => {
           <Operation {...baseProps} item={itemDislike} />
         </div>,
       )
-      expect(screen.getByTestId('operation-bar')).toBeInTheDocument()
+      expect(screen.getByTestId('operation-bar'))!.toBeInTheDocument()
 
       mockT.mockImplementation(key => key)
     })
@@ -643,7 +646,7 @@ describe('Operation', () => {
       const item = { ...baseItem, feedback: { rating: null } as unknown as Record<string, unknown> } as unknown as ChatItem
       renderOperation({ ...baseProps, item })
       const bar = screen.getByTestId('operation-bar')
-      expect(bar).toBeInTheDocument()
+      expect(bar)!.toBeInTheDocument()
     })
 
     it('should handle missing onFeedback gracefully in handleFeedback', async () => {
@@ -703,7 +706,7 @@ describe('Operation', () => {
       renderOperation({ ...baseProps, item })
       const editBtn = screen.getByTestId('annotation-edit-btn')
       await user.click(editBtn)
-      expect(screen.getByTestId('edit-reply-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('edit-reply-modal'))!.toBeInTheDocument()
     })
 
     it('should call onAnnotationEdited from edit reply modal', async () => {
@@ -742,7 +745,7 @@ describe('Operation', () => {
       renderOperation({ ...baseProps, item })
       const editBtn = screen.getByTestId('annotation-edit-btn')
       await user.click(editBtn)
-      expect(screen.getByTestId('edit-reply-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('edit-reply-modal'))!.toBeInTheDocument()
       await user.click(screen.getByTestId('modal-hide'))
       expect(screen.queryByTestId('edit-reply-modal')).not.toBeInTheDocument()
     })
@@ -755,7 +758,7 @@ describe('Operation', () => {
 
     it('should show audio play button when TTS enabled', () => {
       renderOperation()
-      expect(screen.getByTestId('audio-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('audio-btn'))!.toBeInTheDocument()
     })
 
     it('should not show audio button for humanInputFormDataList', () => {
diff --git a/web/app/components/base/chat/chat/answer/__tests__/suggested-questions.spec.tsx b/web/app/components/base/chat/chat/answer/__tests__/suggested-questions.spec.tsx
index 16128759bd..6fe7c959cb 100644
--- a/web/app/components/base/chat/chat/answer/__tests__/suggested-questions.spec.tsx
+++ b/web/app/components/base/chat/chat/answer/__tests__/suggested-questions.spec.tsx
@@ -35,8 +35,8 @@ describe('SuggestedQuestions', () => {
 
     const questions = screen.getAllByTestId('suggested-question')
     expect(questions).toHaveLength(2)
-    expect(questions[0]).toHaveTextContent('What is Dify?')
-    expect(questions[1]).toHaveTextContent('How to use it?')
+    expect(questions[0])!.toHaveTextContent('What is Dify?')
+    expect(questions[1])!.toHaveTextContent('How to use it?')
   })
 
   it('should call onSend when a question is clicked', async () => {
@@ -44,7 +44,7 @@ describe('SuggestedQuestions', () => {
     render(<SuggestedQuestions item={mockItem} />)
 
     const questions = screen.getAllByTestId('suggested-question')
-    await user.click(questions[0])
+    await user.click(questions[0]!)
 
     expect(mockOnSend).toHaveBeenCalledWith('What is Dify?')
   })
@@ -74,10 +74,10 @@ describe('SuggestedQuestions', () => {
     render(<SuggestedQuestions item={mockItem} />)
 
     const questions = screen.getAllByTestId('suggested-question')
-    expect(questions[0]).toHaveClass('pointer-events-none')
-    expect(questions[0]).toHaveClass('opacity-50')
+    expect(questions[0])!.toHaveClass('pointer-events-none')
+    expect(questions[0])!.toHaveClass('opacity-50')
 
-    await user.click(questions[0])
+    await user.click(questions[0]!)
     expect(mockOnSend).not.toHaveBeenCalled()
   })
 })
diff --git a/web/app/components/base/chat/chat/answer/human-input-content/__tests__/human-input-form.spec.tsx b/web/app/components/base/chat/chat/answer/human-input-content/__tests__/human-input-form.spec.tsx
index 89ba71b2d9..4b3f7b2445 100644
--- a/web/app/components/base/chat/chat/answer/human-input-content/__tests__/human-input-form.spec.tsx
+++ b/web/app/components/base/chat/chat/answer/human-input-content/__tests__/human-input-form.spec.tsx
@@ -46,16 +46,16 @@ describe('HumanInputForm', () => {
     // splitByOutputVar should yield 3 parts: "Part 1 ", "{{#$output.field1#}}", " Part 2"
     const contentItems = screen.getAllByTestId('mock-content-item')
     expect(contentItems).toHaveLength(3)
-    expect(contentItems[0]).toHaveTextContent('Part 1')
-    expect(contentItems[1]).toHaveTextContent('{{#$output.field1#}}')
-    expect(contentItems[2]).toHaveTextContent('Part 2')
+    expect(contentItems[0])!.toHaveTextContent('Part 1')
+    expect(contentItems[1])!.toHaveTextContent('{{#$output.field1#}}')
+    expect(contentItems[2])!.toHaveTextContent('Part 2')
 
     const buttons = screen.getAllByTestId('action-button')
     expect(buttons).toHaveLength(4)
-    expect(buttons[0]).toHaveTextContent('Submit')
-    expect(buttons[1]).toHaveTextContent('Cancel')
-    expect(buttons[2]).toHaveTextContent('Accent')
-    expect(buttons[3]).toHaveTextContent('Ghost')
+    expect(buttons[0])!.toHaveTextContent('Submit')
+    expect(buttons[1])!.toHaveTextContent('Cancel')
+    expect(buttons[2])!.toHaveTextContent('Accent')
+    expect(buttons[3])!.toHaveTextContent('Ghost')
   })
 
   it('should handle input changes and submit correctly', async () => {
@@ -64,7 +64,7 @@ describe('HumanInputForm', () => {
     render(<HumanInputForm formData={mockFormData} onSubmit={mockOnSubmit} />)
 
     // Update input via mock ContentItem
-    await user.click(screen.getAllByTestId('update-input')[0])
+    await user.click(screen.getAllByTestId('update-input')[0]!)
 
     // Submit
     const submitButton = screen.getByRole('button', { name: 'Submit' })
@@ -91,8 +91,8 @@ describe('HumanInputForm', () => {
 
     await user.click(submitButton)
 
-    expect(submitButton).toBeDisabled()
-    expect(cancelButton).toBeDisabled()
+    expect(submitButton)!.toBeDisabled()
+    expect(cancelButton)!.toBeDisabled()
 
     // Finish submission
     await act(async () => {
diff --git a/web/app/components/base/chat/chat/answer/human-input-content/content-item.tsx b/web/app/components/base/chat/chat/answer/human-input-content/content-item.tsx
index 9649a92167..b958b48a17 100644
--- a/web/app/components/base/chat/chat/answer/human-input-content/content-item.tsx
+++ b/web/app/components/base/chat/chat/answer/human-input-content/content-item.tsx
@@ -18,7 +18,7 @@ const ContentItem = ({
   const extractFieldName = (str: string): string => {
     const outputVarRegex = /\{\{#\$output\.([^#]+)#\}\}/
     const match = outputVarRegex.exec(str)
-    return match ? match[1] : ''
+    return match ? match[1]! : ''
   }
 
   const fieldName = useMemo(() => {
@@ -43,7 +43,7 @@ const ContentItem = ({
       {formInputField.type === 'paragraph' && (
         <Textarea
           className="h-[104px] sm:text-xs"
-          value={inputs[fieldName]}
+          value={inputs[fieldName]!}
           onChange={(e) => { onInputChange(fieldName, e.target.value) }}
           data-testid="content-item-textarea"
         />
diff --git a/web/app/components/base/chat/chat/chat-input-area/__tests__/operation.spec.tsx b/web/app/components/base/chat/chat/chat-input-area/__tests__/operation.spec.tsx
index 096b18d047..bda994cd43 100644
--- a/web/app/components/base/chat/chat/chat-input-area/__tests__/operation.spec.tsx
+++ b/web/app/components/base/chat/chat/chat-input-area/__tests__/operation.spec.tsx
@@ -26,7 +26,7 @@ describe('Operation', () => {
     it('should render send button always', () => {
       render(<Operation onSend={vi.fn()} />)
 
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
 
     it('should render file uploader when fileConfig.enabled is true', () => {
@@ -39,7 +39,7 @@ describe('Operation', () => {
         />,
       )
 
-      expect(screen.getByTestId('file-uploader')).toBeInTheDocument()
+      expect(screen.getByTestId('file-uploader'))!.toBeInTheDocument()
     })
 
     it('should not render file uploader when fileConfig is undefined', () => {
@@ -106,7 +106,7 @@ describe('Operation', () => {
         />,
       )
 
-      expect(screen.getByRole('button')).toHaveStyle({
+      expect(screen.getByRole('button'))!.toHaveStyle({
         backgroundColor: 'rgb(255, 0, 0)',
       })
     })
@@ -139,7 +139,7 @@ describe('Operation', () => {
       const buttons = screen.getAllByRole('button')
       const voiceButton = buttons[0]
 
-      await user.click(voiceButton)
+      await user.click(voiceButton!)
 
       expect(onShowVoiceInput).toHaveBeenCalledTimes(1)
     })
@@ -160,9 +160,9 @@ describe('Operation', () => {
       const buttons = screen.getAllByRole('button')
       const voiceButton = buttons[0]
 
-      expect(voiceButton).toBeDisabled()
+      expect(voiceButton)!.toBeDisabled()
 
-      await user.click(voiceButton)
+      await user.click(voiceButton!)
 
       expect(onShowVoiceInput).not.toHaveBeenCalled()
     })
diff --git a/web/app/components/base/chat/chat/chat-input-area/index.tsx b/web/app/components/base/chat/chat/chat-input-area/index.tsx
index f6a2b66c3b..f5444a8d7b 100644
--- a/web/app/components/base/chat/chat/chat-input-area/index.tsx
+++ b/web/app/components/base/chat/chat/chat-input-area/index.tsx
@@ -112,14 +112,14 @@ const ChatInputArea = ({ readonly, botName, showFeatureBar, showFileUpload, feat
       // When the cmd + up key is pressed, output the previous element
       if (currentIndex > 0) {
         setCurrentIndex(currentIndex - 1)
-        handleQueryChange(historyRef.current[currentIndex - 1])
+        handleQueryChange(historyRef.current[currentIndex - 1]!)
       }
     }
     else if (e.key === 'ArrowDown' && !e.shiftKey && !e.nativeEvent.isComposing && e.metaKey) {
       // When the cmd + down key is pressed, output the next element
       if (currentIndex < historyRef.current.length - 1) {
         setCurrentIndex(currentIndex + 1)
-        handleQueryChange(historyRef.current[currentIndex + 1])
+        handleQueryChange(historyRef.current[currentIndex + 1]!)
       }
       else if (currentIndex === historyRef.current.length - 1) {
         // If it is the last element, clear the input box
diff --git a/web/app/components/base/chat/chat/citation/__tests__/popup.spec.tsx b/web/app/components/base/chat/chat/citation/__tests__/popup.spec.tsx
index 7678c5e654..3a2cec9820 100644
--- a/web/app/components/base/chat/chat/citation/__tests__/popup.spec.tsx
+++ b/web/app/components/base/chat/chat/citation/__tests__/popup.spec.tsx
@@ -72,27 +72,27 @@ describe('Popup', () => {
   describe('Rendering – Trigger', () => {
     it('should render the trigger element', () => {
       render(<Popup data={makeData()} />)
-      expect(screen.getByTestId('popup-trigger')).toBeInTheDocument()
+      expect(screen.getByTestId('popup-trigger'))!.toBeInTheDocument()
     })
 
     it('should show the document name in the trigger', () => {
       render(<Popup data={makeData({ documentName: 'My Report.pdf' })} />)
-      expect(screen.getByTestId('popup-trigger')).toHaveTextContent('My Report.pdf')
+      expect(screen.getByTestId('popup-trigger'))!.toHaveTextContent('My Report.pdf')
     })
 
     it('should pass the extracted file extension to FileIcon for non-notion sources', () => {
       render(<Popup data={makeData({ documentName: 'report.pdf', dataSourceType: 'upload_file' })} />)
-      expect(screen.getAllByTestId('file-icon')[0]).toHaveAttribute('data-type', 'pdf')
+      expect(screen.getAllByTestId('file-icon')[0])!.toHaveAttribute('data-type', 'pdf')
     })
 
     it('should pass notion as fileType to FileIcon for notion sources', () => {
       render(<Popup data={makeData({ documentName: 'Notion Page', dataSourceType: 'notion' })} />)
-      expect(screen.getAllByTestId('file-icon')[0]).toHaveAttribute('data-type', 'notion')
+      expect(screen.getAllByTestId('file-icon')[0])!.toHaveAttribute('data-type', 'notion')
     })
 
     it('should pass empty string as fileType when document has no extension', () => {
       render(<Popup data={makeData({ documentName: 'nodotfile', dataSourceType: 'upload_file' })} />)
-      expect(screen.getAllByTestId('file-icon')[0]).toHaveAttribute('data-type', '')
+      expect(screen.getAllByTestId('file-icon')[0])!.toHaveAttribute('data-type', '')
     })
 
     it('should not render popup content before trigger is clicked', () => {
@@ -108,7 +108,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-content')).toBeInTheDocument()
+      expect(screen.getByTestId('popup-content'))!.toBeInTheDocument()
     })
 
     it('should close the popup on second trigger click', async () => {
@@ -129,7 +129,7 @@ describe('Popup', () => {
       await openPopup(user)
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-content')).toBeInTheDocument()
+      expect(screen.getByTestId('popup-content'))!.toBeInTheDocument()
     })
   })
 
@@ -140,7 +140,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-download-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('popup-download-btn'))!.toBeInTheDocument()
     })
 
     it('should render download button in header for file dataSourceType with dataset_id', async () => {
@@ -155,7 +155,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-download-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('popup-download-btn'))!.toBeInTheDocument()
     })
 
     it('should render plain document name in header (no button) for notion type', async () => {
@@ -199,7 +199,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-download-btn')).toBeDisabled()
+      expect(screen.getByTestId('popup-download-btn'))!.toBeDisabled()
     })
   })
 
@@ -219,7 +219,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-source-content')).toHaveTextContent('Unique content text')
+      expect(screen.getByTestId('popup-source-content'))!.toHaveTextContent('Unique content text')
     })
 
     it('should show segment_position when it is truthy', async () => {
@@ -228,7 +228,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-segment-position')).toHaveTextContent('7')
+      expect(screen.getByTestId('popup-segment-position'))!.toHaveTextContent('7')
     })
 
     it('should fall back to index + 1 when segment_position is 0', async () => {
@@ -237,7 +237,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-segment-position')).toHaveTextContent('1')
+      expect(screen.getByTestId('popup-segment-position'))!.toHaveTextContent('1')
     })
   })
 
@@ -332,7 +332,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-dataset-link')).toBeInTheDocument()
+      expect(screen.getByTestId('popup-dataset-link'))!.toBeInTheDocument()
     })
 
     it('should render the dataset link with correct href', async () => {
@@ -341,9 +341,9 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-dataset-link')).toHaveAttribute(
+      expect(screen.getByTestId('popup-dataset-link'))!.toHaveAttribute(
         'href',
-        `/datasets/${dataWithScore.sources[0].dataset_id}/documents/${dataWithScore.sources[0].document_id}`,
+        `/datasets/${dataWithScore.sources[0]!.dataset_id}/documents/${dataWithScore.sources[0]!.document_id}`,
       )
     })
 
@@ -353,7 +353,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-dataset-link')).toHaveTextContent(/linkToDataset/i)
+      expect(screen.getByTestId('popup-dataset-link'))!.toHaveTextContent(/linkToDataset/i)
     })
 
     it('should render hit info section when showHitInfo is true', async () => {
@@ -362,7 +362,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-hit-info')).toBeInTheDocument()
+      expect(screen.getByTestId('popup-hit-info'))!.toBeInTheDocument()
     })
 
     it('should render three Tooltip components (characters, hitCount, vectorHash)', async () => {
@@ -380,7 +380,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('progress-tooltip')).toBeInTheDocument()
+      expect(screen.getByTestId('progress-tooltip'))!.toBeInTheDocument()
     })
 
     it('should not render ProgressTooltip when source score is 0', async () => {
@@ -398,7 +398,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('progress-tooltip')).toHaveTextContent('0.86')
+      expect(screen.getByTestId('progress-tooltip'))!.toHaveTextContent('0.86')
     })
 
     it('should pass word_count to the characters Tooltip', async () => {
@@ -408,7 +408,7 @@ describe('Popup', () => {
       await openPopup(user)
 
       const tooltips = screen.getAllByTestId('citation-tooltip')
-      expect(tooltips[0]).toHaveTextContent('250')
+      expect(tooltips[0])!.toHaveTextContent('250')
     })
 
     it('should pass hit_count to the hitCount Tooltip', async () => {
@@ -418,7 +418,7 @@ describe('Popup', () => {
       await openPopup(user)
 
       const tooltips = screen.getAllByTestId('citation-tooltip')
-      expect(tooltips[1]).toHaveTextContent('7')
+      expect(tooltips[1])!.toHaveTextContent('7')
     })
 
     it('should pass truncated index_node_hash (first 7 chars) to vectorHash Tooltip', async () => {
@@ -428,7 +428,7 @@ describe('Popup', () => {
       await openPopup(user)
 
       const tooltips = screen.getAllByTestId('citation-tooltip')
-      expect(tooltips[2]).toHaveTextContent('abcdef1')
+      expect(tooltips[2])!.toHaveTextContent('abcdef1')
     })
 
     it('should render hit info for each source when multiple sources are present', async () => {
@@ -602,7 +602,7 @@ describe('Popup', () => {
       await openPopup(user)
 
       const tooltips = screen.getAllByTestId('citation-tooltip')
-      expect(tooltips[2]).toBeInTheDocument()
+      expect(tooltips[2])!.toBeInTheDocument()
     })
 
     describe('Item Key Generation (Branch Coverage)', () => {
@@ -617,7 +617,8 @@ describe('Popup', () => {
         )
         await openPopup(user)
         // Verify it renders without key collision (no console error expected, though not explicitly checked here)
-        expect(screen.getByTestId('popup-source-item')).toBeInTheDocument()
+        // Verify it renders without key collision (no console error expected, though not explicitly checked here)
+        expect(screen.getByTestId('popup-source-item'))!.toBeInTheDocument()
       })
 
       it('should use data.documentId when both source ids are missing', async () => {
@@ -631,7 +632,7 @@ describe('Popup', () => {
           />,
         )
         await openPopup(user)
-        expect(screen.getByTestId('popup-source-item')).toBeInTheDocument()
+        expect(screen.getByTestId('popup-source-item'))!.toBeInTheDocument()
       })
 
       it('should fallback to \'doc\' when all ids are missing', async () => {
@@ -645,7 +646,7 @@ describe('Popup', () => {
           />,
         )
         await openPopup(user)
-        expect(screen.getByTestId('popup-source-item')).toBeInTheDocument()
+        expect(screen.getByTestId('popup-source-item'))!.toBeInTheDocument()
       })
 
       it('should fallback to index when segment_position is missing', async () => {
@@ -658,7 +659,7 @@ describe('Popup', () => {
           />,
         )
         await openPopup(user)
-        expect(screen.getByTestId('popup-segment-position')).toHaveTextContent('1')
+        expect(screen.getByTestId('popup-segment-position'))!.toHaveTextContent('1')
       })
     })
 
@@ -676,6 +677,68 @@ describe('Popup', () => {
         await openPopup(user)
         // Even if the button is rendered (it shouldn't be based on line 71),
         // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
+        // Even if the button is rendered (it shouldn't be based on line 71),
+        // we check the handler directly if possible, or just the button absence.
         expect(screen.queryByTestId('popup-download-btn')).not.toBeInTheDocument()
       })
 
diff --git a/web/app/components/base/chat/chat/citation/index.tsx b/web/app/components/base/chat/chat/citation/index.tsx
index 1123497878..56eb0e602d 100644
--- a/web/app/components/base/chat/chat/citation/index.tsx
+++ b/web/app/components/base/chat/chat/citation/index.tsx
@@ -32,7 +32,7 @@ const Citation: FC<CitationProps> = ({
     const documentIndex = prev.findIndex(i => i.documentId === documentId)
 
     if (documentIndex > -1) {
-      prev[documentIndex].sources.push(next)
+      prev[documentIndex]!.sources.push(next)
     }
     else {
       prev.push({
@@ -51,10 +51,10 @@ const Citation: FC<CitationProps> = ({
     let totalWidth = 0
     let limit = 0
     for (let i = 0; i < resources.length; i++) {
-      totalWidth += elesRef.current[i].clientWidth
+      totalWidth += elesRef.current[i]!.clientWidth
 
       if (totalWidth + i * 4 > containerWidth) {
-        totalWidth -= elesRef.current[i].clientWidth
+        totalWidth -= elesRef.current[i]!.clientWidth
 
         if (totalWidth + 34 > containerWidth)
           limit = i - 1
diff --git a/web/app/components/base/chat/chat/hooks.ts b/web/app/components/base/chat/chat/hooks.ts
index 30dd7e0db1..d6e5c2f936 100644
--- a/web/app/components/base/chat/chat/hooks.ts
+++ b/web/app/components/base/chat/chat/hooks.ts
@@ -532,7 +532,7 @@ export const useChat = (
           if (responseItem.workflowProcess?.tracing) {
             const currentTracingIndex = responseItem.workflowProcess.tracing.findIndex(item => item.node_id === humanInputRequiredData.node_id)
             if (currentTracingIndex > -1)
-              responseItem.workflowProcess.tracing[currentTracingIndex].status = NodeRunningStatus.Paused
+              responseItem.workflowProcess.tracing[currentTracingIndex]!.status = NodeRunningStatus.Paused
           }
         })
       },
@@ -555,7 +555,7 @@ export const useChat = (
         updateChatTreeNode(messageId, (responseItem) => {
           if (responseItem.humanInputFormDataList?.length) {
             const currentFormIndex = responseItem.humanInputFormDataList.findIndex(item => item.node_id === humanInputFormTimeoutData.node_id)
-            responseItem.humanInputFormDataList[currentFormIndex].expiration_time = humanInputFormTimeoutData.expiration_time
+            responseItem.humanInputFormDataList[currentFormIndex]!.expiration_time = humanInputFormTimeoutData.expiration_time
           }
         })
       },
@@ -1098,7 +1098,7 @@ export const useChat = (
         }
         const currentTracingIndex = responseItem.workflowProcess!.tracing!.findIndex(item => item.node_id === humanInputRequiredData.node_id)
         if (currentTracingIndex > -1) {
-          responseItem.workflowProcess!.tracing[currentTracingIndex].status = NodeRunningStatus.Paused
+          responseItem.workflowProcess!.tracing[currentTracingIndex]!.status = NodeRunningStatus.Paused
           updateCurrentQAOnTree({
             placeholderQuestionId,
             questionItem,
@@ -1128,7 +1128,7 @@ export const useChat = (
       onHumanInputFormTimeout: ({ data: humanInputFormTimeoutData }) => {
         if (responseItem.humanInputFormDataList?.length) {
           const currentFormIndex = responseItem.humanInputFormDataList!.findIndex(item => item.node_id === humanInputFormTimeoutData.node_id)
-          responseItem.humanInputFormDataList[currentFormIndex].expiration_time = humanInputFormTimeoutData.expiration_time
+          responseItem.humanInputFormDataList[currentFormIndex]!.expiration_time = humanInputFormTimeoutData.expiration_time
         }
         updateCurrentQAOnTree({
           placeholderQuestionId,
@@ -1181,8 +1181,8 @@ export const useChat = (
   ])
 
   const handleAnnotationEdited = useCallback((query: string, answer: string, index: number) => {
-    const targetQuestionId = chatList[index - 1].id
-    const targetAnswerId = chatList[index].id
+    const targetQuestionId = chatList[index - 1]!.id
+    const targetAnswerId = chatList[index]!.id
 
     updateChatTreeNode(targetQuestionId, {
       content: query,
@@ -1190,22 +1190,22 @@ export const useChat = (
     updateChatTreeNode(targetAnswerId, {
       content: answer,
       annotation: {
-        ...chatList[index].annotation,
+        ...chatList[index]!.annotation,
         logAnnotation: undefined,
       } as any,
     })
   }, [chatList, updateChatTreeNode])
 
   const handleAnnotationAdded = useCallback((annotationId: string, authorName: string, query: string, answer: string, index: number) => {
-    const targetQuestionId = chatList[index - 1].id
-    const targetAnswerId = chatList[index].id
+    const targetQuestionId = chatList[index - 1]!.id
+    const targetAnswerId = chatList[index]!.id
 
     updateChatTreeNode(targetQuestionId, {
       content: query,
     })
 
     updateChatTreeNode(targetAnswerId, {
-      content: chatList[index].content,
+      content: chatList[index]!.content,
       annotation: {
         id: annotationId,
         authorName,
@@ -1222,12 +1222,12 @@ export const useChat = (
   }, [chatList, updateChatTreeNode])
 
   const handleAnnotationRemoved = useCallback((index: number) => {
-    const targetAnswerId = chatList[index].id
+    const targetAnswerId = chatList[index]!.id
 
     updateChatTreeNode(targetAnswerId, {
-      content: chatList[index].content,
+      content: chatList[index]!.content,
       annotation: {
-        ...chatList[index].annotation,
+        ...chatList[index]!.annotation,
         id: '',
       } as Annotation,
     })
diff --git a/web/app/components/base/chat/chat/index.tsx b/web/app/components/base/chat/chat/index.tsx
index 0343366a7f..3500059203 100644
--- a/web/app/components/base/chat/chat/index.tsx
+++ b/web/app/components/base/chat/chat/index.tsx
@@ -177,7 +177,7 @@ const Chat: FC<ChatProps> = ({
                       appData={appData}
                       key={item.id}
                       item={item}
-                      question={chatList[index - 1]?.content}
+                      question={chatList[index - 1]?.content!}
                       index={index}
                       config={config}
                       answerIcon={answerIcon}
diff --git a/web/app/components/base/chat/chat/thought/__tests__/index.spec.tsx b/web/app/components/base/chat/chat/thought/__tests__/index.spec.tsx
index 8a4ea5717d..dc1ba74674 100644
--- a/web/app/components/base/chat/chat/thought/__tests__/index.spec.tsx
+++ b/web/app/components/base/chat/chat/thought/__tests__/index.spec.tsx
@@ -22,8 +22,8 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText(/used/i)).toBeInTheDocument()
-      expect(screen.getByText('test-tool')).toBeInTheDocument()
+      expect(screen.getByText(/used/i))!.toBeInTheDocument()
+      expect(screen.getByText('test-tool'))!.toBeInTheDocument()
     })
 
     it('should render multiple tool thoughts from JSON array', () => {
@@ -36,8 +36,8 @@ describe('Thought', () => {
       render(<Thought thought={thought} isFinished={false} />)
 
       expect(screen.getAllByText(/using/i)).toHaveLength(2)
-      expect(screen.getByText('tool1')).toBeInTheDocument()
-      expect(screen.getByText('tool2')).toBeInTheDocument()
+      expect(screen.getByText('tool1'))!.toBeInTheDocument()
+      expect(screen.getByText('tool2'))!.toBeInTheDocument()
     })
 
     it('should show input and output when expanded', async () => {
@@ -54,8 +54,8 @@ describe('Thought', () => {
 
       await user.click(screen.getByText(/used/i))
 
-      expect(screen.getByText('test input data')).toBeInTheDocument()
-      expect(screen.getByText('test output data')).toBeInTheDocument()
+      expect(screen.getByText('test input data'))!.toBeInTheDocument()
+      expect(screen.getByText('test output data'))!.toBeInTheDocument()
     })
   })
 
@@ -65,7 +65,7 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText(/used/i)).toBeInTheDocument()
+      expect(screen.getByText(/used/i))!.toBeInTheDocument()
     })
 
     it('should show in-progress state with correct text', () => {
@@ -73,7 +73,7 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={false} />)
 
-      expect(screen.getByText(/using/i)).toBeInTheDocument()
+      expect(screen.getByText(/using/i))!.toBeInTheDocument()
     })
   })
 
@@ -85,7 +85,7 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText('custom-tool')).toBeInTheDocument()
+      expect(screen.getByText('custom-tool'))!.toBeInTheDocument()
     })
 
     it('should fallback to tool name when tool_labels is undefined', () => {
@@ -96,7 +96,7 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText('fallback-tool')).toBeInTheDocument()
+      expect(screen.getByText('fallback-tool'))!.toBeInTheDocument()
     })
 
     it('should fallback to tool name when toolName property is missing', () => {
@@ -107,7 +107,7 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText('another-tool')).toBeInTheDocument()
+      expect(screen.getByText('another-tool'))!.toBeInTheDocument()
     })
 
     it('should fallback to tool name when language property is missing', () => {
@@ -123,7 +123,7 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText('test-tool')).toBeInTheDocument()
+      expect(screen.getByText('test-tool'))!.toBeInTheDocument()
     })
 
     it('should show knowledge label for dataset tools', () => {
@@ -133,7 +133,7 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText(/knowledge/i)).toBeInTheDocument()
+      expect(screen.getByText(/knowledge/i))!.toBeInTheDocument()
     })
   })
 
@@ -145,7 +145,7 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText('invalid-json-{')).toBeInTheDocument()
+      expect(screen.getByText('invalid-json-{'))!.toBeInTheDocument()
     })
 
     it('should handle non-array JSON in tool field', () => {
@@ -155,7 +155,7 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText('{"name":"object-tool"}')).toBeInTheDocument()
+      expect(screen.getByText('{"name":"object-tool"}'))!.toBeInTheDocument()
     })
 
     it('should handle invalid JSON in tool_input when parsing array', async () => {
@@ -169,7 +169,7 @@ describe('Thought', () => {
 
       await user.click(screen.getByText(/used/i))
 
-      expect(screen.getByText('invalid-json-{')).toBeInTheDocument()
+      expect(screen.getByText('invalid-json-{'))!.toBeInTheDocument()
     })
 
     it('should handle invalid JSON in observation when parsing array', async () => {
@@ -183,7 +183,7 @@ describe('Thought', () => {
 
       await user.click(screen.getByText(/used/i))
 
-      expect(screen.getByText('invalid-json-[')).toBeInTheDocument()
+      expect(screen.getByText('invalid-json-['))!.toBeInTheDocument()
     })
 
     it('should extract correct values from JSON arrays by index', async () => {
@@ -199,17 +199,17 @@ describe('Thought', () => {
       const toolSections = screen.getAllByText(/used/i)
       expect(toolSections).toHaveLength(3)
 
-      await user.click(toolSections[0])
-      expect(screen.getByText('input1')).toBeInTheDocument()
-      expect(screen.getByText('output1')).toBeInTheDocument()
+      await user.click(toolSections[0]!)
+      expect(screen.getByText('input1'))!.toBeInTheDocument()
+      expect(screen.getByText('output1'))!.toBeInTheDocument()
 
-      await user.click(toolSections[1])
-      expect(screen.getByText('input2')).toBeInTheDocument()
-      expect(screen.getByText('output2')).toBeInTheDocument()
+      await user.click(toolSections[1]!)
+      expect(screen.getByText('input2'))!.toBeInTheDocument()
+      expect(screen.getByText('output2'))!.toBeInTheDocument()
 
-      await user.click(toolSections[2])
-      expect(screen.getByText('input3')).toBeInTheDocument()
-      expect(screen.getByText('output3')).toBeInTheDocument()
+      await user.click(toolSections[2]!)
+      expect(screen.getByText('input3'))!.toBeInTheDocument()
+      expect(screen.getByText('output3'))!.toBeInTheDocument()
     })
 
     it('should use original value when isValueArray is false', async () => {
@@ -224,8 +224,8 @@ describe('Thought', () => {
 
       await user.click(screen.getByText(/used/i))
 
-      expect(screen.getByText('regular input')).toBeInTheDocument()
-      expect(screen.getByText('regular output')).toBeInTheDocument()
+      expect(screen.getByText('regular input'))!.toBeInTheDocument()
+      expect(screen.getByText('regular output'))!.toBeInTheDocument()
     })
   })
 
@@ -242,7 +242,7 @@ describe('Thought', () => {
       expect(screen.queryByText('test input')).not.toBeInTheDocument()
 
       await user.click(screen.getByText(/used/i))
-      expect(screen.getByText('test input')).toBeInTheDocument()
+      expect(screen.getByText('test input'))!.toBeInTheDocument()
 
       await user.click(screen.getByText(/used/i))
       expect(screen.queryByText('test input')).not.toBeInTheDocument()
@@ -260,13 +260,13 @@ describe('Thought', () => {
 
       const toolHeaders = screen.getAllByText(/used/i)
 
-      await user.click(toolHeaders[0])
-      expect(screen.getByText('input1')).toBeInTheDocument()
+      await user.click(toolHeaders[0]!)
+      expect(screen.getByText('input1'))!.toBeInTheDocument()
       expect(screen.queryByText('input2')).not.toBeInTheDocument()
 
-      await user.click(toolHeaders[1])
-      expect(screen.getByText('input1')).toBeInTheDocument()
-      expect(screen.getByText('input2')).toBeInTheDocument()
+      await user.click(toolHeaders[1]!)
+      expect(screen.getByText('input1'))!.toBeInTheDocument()
+      expect(screen.getByText('input2'))!.toBeInTheDocument()
     })
   })
 
@@ -292,8 +292,8 @@ describe('Thought', () => {
 
       render(<Thought thought={thought} isFinished={true} />)
 
-      expect(screen.getByText(/knowledge/i)).toBeInTheDocument()
-      expect(screen.getByText('regular-tool')).toBeInTheDocument()
+      expect(screen.getByText(/knowledge/i))!.toBeInTheDocument()
+      expect(screen.getByText('regular-tool'))!.toBeInTheDocument()
     })
   })
 
@@ -309,7 +309,7 @@ describe('Thought', () => {
 
       await user.click(screen.getByText(/used/i))
 
-      expect(screen.getByText(/requestTitle/i)).toBeInTheDocument()
+      expect(screen.getByText(/requestTitle/i))!.toBeInTheDocument()
     })
 
     it('should handle empty observation', async () => {
@@ -323,7 +323,7 @@ describe('Thought', () => {
 
       await user.click(screen.getByText(/used/i))
 
-      expect(screen.getByText(/responseTitle/i)).toBeInTheDocument()
+      expect(screen.getByText(/responseTitle/i))!.toBeInTheDocument()
     })
 
     it('should handle JSON array with undefined elements', async () => {
@@ -337,9 +337,9 @@ describe('Thought', () => {
       render(<Thought thought={thought} isFinished={true} />)
 
       const toolHeaders = screen.getAllByText(/used/i)
-      await user.click(toolHeaders[1])
+      await user.click(toolHeaders[1]!)
 
-      expect(screen.getByText('tool2')).toBeInTheDocument()
+      expect(screen.getByText('tool2'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/base/chat/chat/use-chat-layout.ts b/web/app/components/base/chat/chat/use-chat-layout.ts
index 41f622c523..712382070d 100644
--- a/web/app/components/base/chat/chat/use-chat-layout.ts
+++ b/web/app/components/base/chat/chat/use-chat-layout.ts
@@ -76,7 +76,7 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
     if (chatFooterRef.current && chatContainerRef.current) {
       const resizeContainerObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
-          const { blockSize } = entry.borderBoxSize[0]
+          const { blockSize } = entry.borderBoxSize[0]!
           chatContainerRef.current!.style.paddingBottom = `${blockSize}px`
           handleScrollToBottom()
         }
@@ -85,7 +85,7 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
 
       const resizeFooterObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
-          const { inlineSize } = entry.borderBoxSize[0]
+          const { inlineSize } = entry.borderBoxSize[0]!
           chatFooterRef.current!.style.width = `${inlineSize}px`
         }
       })
diff --git a/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/content.spec.tsx b/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/content.spec.tsx
index 50c3790e83..526fca2061 100644
--- a/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/content.spec.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/content.spec.tsx
@@ -153,7 +153,7 @@ describe('InputsFormContent', () => {
   it('should handle text input changes', async () => {
     render(<InputsFormContent />)
     const inputs = screen.getAllByPlaceholderText('Text Label')
-    await user.type(inputs[0], 'hello')
+    await user.type(inputs[0]!, 'hello')
 
     expect(mockContextValue.setCurrentConversationInputs).toHaveBeenCalled()
     expect(mockContextValue.handleNewConversationInputsChange).toHaveBeenCalled()
@@ -162,7 +162,7 @@ describe('InputsFormContent', () => {
   it('should handle number input changes', async () => {
     render(<InputsFormContent />)
     const inputs = screen.getAllByPlaceholderText('Number Label')
-    await user.type(inputs[0], '123')
+    await user.type(inputs[0]!, '123')
 
     expect(mockContextValue.setCurrentConversationInputs).toHaveBeenCalled()
     expect(mockContextValue.handleNewConversationInputsChange).toHaveBeenCalled()
@@ -171,7 +171,7 @@ describe('InputsFormContent', () => {
   it('should handle paragraph input changes', async () => {
     render(<InputsFormContent />)
     const inputs = screen.getAllByPlaceholderText('Paragraph Label')
-    await user.type(inputs[0], 'long text')
+    await user.type(inputs[0]!, 'long text')
 
     expect(mockContextValue.setCurrentConversationInputs).toHaveBeenCalled()
     expect(mockContextValue.handleNewConversationInputsChange).toHaveBeenCalled()
@@ -203,7 +203,7 @@ describe('InputsFormContent', () => {
   it('should handle single file upload change', async () => {
     render(<InputsFormContent />)
     const uploadButtons = screen.getAllByText('Upload')
-    await user.click(uploadButtons[0]) // First one is single file
+    await user.click(uploadButtons[0]!) // First one is single file
 
     expect(mockContextValue.setCurrentConversationInputs).toHaveBeenCalled()
     expect(mockContextValue.handleNewConversationInputsChange).toHaveBeenCalled()
@@ -212,7 +212,7 @@ describe('InputsFormContent', () => {
   it('should handle multi files upload change', async () => {
     render(<InputsFormContent />)
     const uploadButtons = screen.getAllByText('Upload')
-    await user.click(uploadButtons[1]) // Second one is multi files
+    await user.click(uploadButtons[1]!) // Second one is multi files
 
     expect(mockContextValue.setCurrentConversationInputs).toHaveBeenCalled()
     expect(mockContextValue.handleNewConversationInputsChange).toHaveBeenCalled()
@@ -229,7 +229,7 @@ describe('InputsFormContent', () => {
 
   it('should show tip when showTip is true', () => {
     render(<InputsFormContent showTip />)
-    expect(screen.getByText(/chat.chatFormTip/i)).toBeInTheDocument()
+    expect(screen.getByText(/chat.chatFormTip/i))!.toBeInTheDocument()
   })
 
   it('should set initial values from context', () => {
@@ -243,7 +243,7 @@ describe('InputsFormContent', () => {
     vi.mocked(useEmbeddedChatbotContext).mockReturnValue(contextWithValues as unknown as any)
 
     render(<InputsFormContent />)
-    expect(screen.getByDisplayValue('initial value')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('initial value'))!.toBeInTheDocument()
   })
 
   it('should use currentConversationInputs when currentConversationId exists', () => {
@@ -258,6 +258,6 @@ describe('InputsFormContent', () => {
     vi.mocked(useEmbeddedChatbotContext).mockReturnValue(contextWithConv as unknown as any)
 
     render(<InputsFormContent />)
-    expect(screen.getByDisplayValue('conv value')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('conv value'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/base/chat/embedded-chatbot/theme/utils.ts b/web/app/components/base/chat/embedded-chatbot/theme/utils.ts
index 812b9283aa..45effbb0fa 100644
--- a/web/app/components/base/chat/embedded-chatbot/theme/utils.ts
+++ b/web/app/components/base/chat/embedded-chatbot/theme/utils.ts
@@ -22,7 +22,7 @@ export function CssTransform(cssString: string): object {
   for (const pair of propertyValuePairs) {
     if (pair.trim().length > 0) {
       const [property, value] = pair.split(':')
-      Object.assign(style, { [property.trim()]: value.trim() })
+      Object.assign(style, { [property!.trim()]: value!.trim() })
     }
   }
   return style
diff --git a/web/app/components/base/chat/utils.ts b/web/app/components/base/chat/utils.ts
index 5881f565a4..ff9085c4e6 100644
--- a/web/app/components/base/chat/utils.ts
+++ b/web/app/components/base/chat/utils.ts
@@ -94,7 +94,7 @@ function isValidGeneratedAnswer(item?: ChatItem | ChatItemInTree): boolean {
 
 function getLastAnswer<T extends ChatItem | ChatItemInTree>(chatList: T[]): T | null {
   for (let i = chatList.length - 1; i >= 0; i--) {
-    const item = chatList[i]
+    const item = chatList[i]!
     if (isValidGeneratedAnswer(item))
       return item
   }
@@ -158,7 +158,7 @@ function buildChatItemTree(allMessages: IChatItem[]): ChatItemInTree[] {
         rootNodes.push(questionNode)
       }
       else {
-        map[parentMessageId].children!.push(questionNode)
+        map[parentMessageId]!.children!.push(questionNode)
       }
     }
   }
@@ -188,8 +188,8 @@ function getThreadMessages(tree: ChatItemInTree[], targetMessageId?: string): Ch
 
         const parentAnswer = path[index - 2]
         const siblingCount = !parentAnswer ? tree.length : parentAnswer.children!.length
-        const prevSibling = !parentAnswer ? tree[item.siblingIndex! - 1]?.children?.[0]?.id : parentAnswer.children![item.siblingIndex! - 1]?.children?.[0].id
-        const nextSibling = !parentAnswer ? tree[item.siblingIndex! + 1]?.children?.[0]?.id : parentAnswer.children![item.siblingIndex! + 1]?.children?.[0].id
+        const prevSibling = !parentAnswer ? tree[item.siblingIndex! - 1]?.children?.[0]?.id : parentAnswer.children![item.siblingIndex! - 1]?.children?.[0]!.id
+        const nextSibling = !parentAnswer ? tree[item.siblingIndex! + 1]?.children?.[0]?.id : parentAnswer.children![item.siblingIndex! + 1]?.children?.[0]!.id
 
         return { ...item, siblingCount, prevSibling, nextSibling }
       })
@@ -198,8 +198,8 @@ function getThreadMessages(tree: ChatItemInTree[], targetMessageId?: string): Ch
     if (node.children) {
       for (let i = node.children.length - 1; i >= 0; i--) {
         stack.push({
-          node: node.children[i],
-          path: [...path, node.children[i]],
+          node: node.children[i]!,
+          path: [...path, node.children[i]!],
         })
       }
     }
diff --git a/web/app/components/base/checkbox-list/__tests__/index.spec.tsx b/web/app/components/base/checkbox-list/__tests__/index.spec.tsx
index b4f816dda8..10c390962b 100644
--- a/web/app/components/base/checkbox-list/__tests__/index.spec.tsx
+++ b/web/app/components/base/checkbox-list/__tests__/index.spec.tsx
@@ -18,10 +18,10 @@ describe('checkbox list component', () => {
         options={options}
       />,
     )
-    expect(screen.getByText('Test Title')).toBeInTheDocument()
-    expect(screen.getByText('Test Description')).toBeInTheDocument()
+    expect(screen.getByText('Test Title'))!.toBeInTheDocument()
+    expect(screen.getByText('Test Description'))!.toBeInTheDocument()
     options.forEach((option) => {
-      expect(screen.getByText(option.label)).toBeInTheDocument()
+      expect(screen.getByText(option.label))!.toBeInTheDocument()
     })
   })
 
@@ -31,7 +31,7 @@ describe('checkbox list component', () => {
     const input = screen.getByRole('textbox')
     await userEvent.type(input, 'app')
 
-    expect(screen.getByText('Apple')).toBeInTheDocument()
+    expect(screen.getByText('Apple'))!.toBeInTheDocument()
     expect(screen.queryByText('Option 2')).not.toBeInTheDocument()
     expect(screen.queryByText('Option 3')).not.toBeInTheDocument()
   })
@@ -39,7 +39,7 @@ describe('checkbox list component', () => {
   it('renders select-all checkbox', () => {
     render(<CheckboxList options={options} showSelectAll />)
     const checkboxes = screen.getByTestId('checkbox-selectAll')
-    expect(checkboxes).toBeInTheDocument()
+    expect(checkboxes)!.toBeInTheDocument()
   })
 
   it('selects all options when select-all is clicked', async () => {
@@ -110,7 +110,7 @@ describe('checkbox list component', () => {
     )
 
     const selectAll = screen.getByTestId('checkbox-selectAll')
-    expect(selectAll.querySelector('[data-testid="check-icon-selectAll"]')).toBeInTheDocument()
+    expect(selectAll.querySelector('[data-testid="check-icon-selectAll"]'))!.toBeInTheDocument()
   })
 
   it('hides select-all checkbox when searching', async () => {
@@ -184,7 +184,7 @@ describe('checkbox list component', () => {
     const input = screen.getByRole('textbox')
     await userEvent.type(input, 'ban')
     await userEvent.click(screen.getByText('common.operation.resetKeywords'))
-    expect(input).toHaveValue('')
+    expect(input)!.toHaveValue('')
   })
 
   it('does not toggle disabled option when clicked', async () => {
@@ -221,8 +221,8 @@ describe('checkbox list component', () => {
 
     // Find option and click the div container
     const optionLabels = screen.getAllByText('Option 1')
-    const optionDiv = optionLabels[0].closest('[data-testid="option-item"]')
-    expect(optionDiv).toBeInTheDocument()
+    const optionDiv = optionLabels[0]!.closest('[data-testid="option-item"]')
+    expect(optionDiv)!.toBeInTheDocument()
     await userEvent.click(optionDiv as HTMLElement)
     expect(onChange).not.toHaveBeenCalled()
   })
@@ -234,7 +234,7 @@ describe('checkbox list component', () => {
         label="Test Label"
       />,
     )
-    expect(screen.getByText('Test Label')).toBeInTheDocument()
+    expect(screen.getByText('Test Label'))!.toBeInTheDocument()
   })
 
   it('renders without showSelectAll, showCount, showSearch', () => {
@@ -248,7 +248,7 @@ describe('checkbox list component', () => {
     )
     expect(screen.queryByTestId('checkbox-selectAll')).not.toBeInTheDocument()
     options.forEach((option) => {
-      expect(screen.getByText(option.label)).toBeInTheDocument()
+      expect(screen.getByText(option.label))!.toBeInTheDocument()
     })
   })
 
@@ -259,7 +259,7 @@ describe('checkbox list component', () => {
         containerClassName="custom-class"
       />,
     )
-    expect(container.querySelector('.custom-class')).toBeInTheDocument()
+    expect(container.querySelector('.custom-class'))!.toBeInTheDocument()
   })
 
   it('applies maxHeight style to options container', () => {
@@ -270,7 +270,7 @@ describe('checkbox list component', () => {
       />,
     )
     const optionsContainer = screen.getByTestId('options-container')
-    expect(optionsContainer).toHaveStyle({ maxHeight: '200px', overflowY: 'auto' })
+    expect(optionsContainer)!.toHaveStyle({ maxHeight: '200px', overflowY: 'auto' })
   })
 
   it('shows indeterminate state when some options are selected', async () => {
@@ -285,8 +285,8 @@ describe('checkbox list component', () => {
     )
     // When some but not all options are selected, clicking select-all should select all remaining options
     const selectAll = screen.getByTestId('checkbox-selectAll')
-    expect(selectAll).toBeInTheDocument()
-    expect(selectAll).toHaveAttribute('aria-checked', 'mixed')
+    expect(selectAll)!.toBeInTheDocument()
+    expect(selectAll)!.toHaveAttribute('aria-checked', 'mixed')
 
     await userEvent.click(selectAll)
     expect(onChange).toHaveBeenCalledWith(['option1', 'option2', 'option3', 'apple'])
@@ -298,9 +298,9 @@ describe('checkbox list component', () => {
     const input = screen.getByRole('textbox')
     await userEvent.type(input, 'option')
 
-    expect(screen.getByText('Option 1')).toBeInTheDocument()
-    expect(screen.getByText('Option 2')).toBeInTheDocument()
-    expect(screen.getByText('Option 3')).toBeInTheDocument()
+    expect(screen.getByText('Option 1'))!.toBeInTheDocument()
+    expect(screen.getByText('Option 2'))!.toBeInTheDocument()
+    expect(screen.getByText('Option 3'))!.toBeInTheDocument()
     expect(screen.queryByText('Apple')).not.toBeInTheDocument()
   })
 
@@ -310,7 +310,7 @@ describe('checkbox list component', () => {
     const input = screen.getByRole('textbox')
     await userEvent.type(input, 'xyz')
 
-    expect(screen.getByText(/common.operation.noSearchResults/i)).toBeInTheDocument()
+    expect(screen.getByText(/common.operation.noSearchResults/i))!.toBeInTheDocument()
   })
 
   it('toggles option by clicking option row', async () => {
@@ -327,7 +327,7 @@ describe('checkbox list component', () => {
 
     const optionLabel = screen.getByText('Option 1')
     const optionRow = optionLabel.closest('div[data-testid="option-item"]')
-    expect(optionRow).toBeInTheDocument()
+    expect(optionRow)!.toBeInTheDocument()
     await userEvent.click(optionRow as HTMLElement)
 
     expect(onChange).toHaveBeenCalledWith(['option1'])
@@ -348,7 +348,7 @@ describe('checkbox list component', () => {
     )
 
     const optionRow = screen.getByText('Option 1').closest('div[data-testid="option-item"]')
-    expect(optionRow).toBeInTheDocument()
+    expect(optionRow)!.toBeInTheDocument()
     await userEvent.click(optionRow as HTMLElement)
 
     expect(onChange).not.toHaveBeenCalled()
@@ -377,7 +377,7 @@ describe('checkbox list component', () => {
     const input = screen.getByRole('textbox')
     await userEvent.type(input, 'opt')
 
-    expect(screen.getByText(/operation.searchCount/i)).toBeInTheDocument()
+    expect(screen.getByText(/operation.searchCount/i))!.toBeInTheDocument()
   })
 
   it('shows no data message when no options are provided', () => {
@@ -386,7 +386,7 @@ describe('checkbox list component', () => {
         options={[]}
       />,
     )
-    expect(screen.getByText('common.noData')).toBeInTheDocument()
+    expect(screen.getByText('common.noData'))!.toBeInTheDocument()
   })
 
   it('does not toggle option when component is disabled even with enabled option', async () => {
diff --git a/web/app/components/base/chip/__tests__/index.spec.tsx b/web/app/components/base/chip/__tests__/index.spec.tsx
index 24c04b51a5..ac3a68292c 100644
--- a/web/app/components/base/chip/__tests__/index.spec.tsx
+++ b/web/app/components/base/chip/__tests__/index.spec.tsx
@@ -54,13 +54,13 @@ describe('Chip', () => {
     it('should render without crashing', () => {
       renderChip()
 
-      expect(screen.getByText('All Items')).toBeInTheDocument()
+      expect(screen.getByText('All Items'))!.toBeInTheDocument()
     })
 
     it('should display current selected item name', () => {
       renderChip({ value: 'active' })
 
-      expect(screen.getByText('Active')).toBeInTheDocument()
+      expect(screen.getByText('Active'))!.toBeInTheDocument()
     })
 
     it('should display empty content when value does not match any item', () => {
@@ -76,7 +76,7 @@ describe('Chip', () => {
   describe('Props', () => {
     it('should update displayed item name when value prop changes', () => {
       const { rerender } = renderChip({ value: 'all' })
-      expect(screen.getByText('All Items')).toBeInTheDocument()
+      expect(screen.getByText('All Items'))!.toBeInTheDocument()
 
       rerender(
         <Chip
@@ -86,7 +86,7 @@ describe('Chip', () => {
           onClear={onClear}
         />,
       )
-      expect(screen.getByText('Archived')).toBeInTheDocument()
+      expect(screen.getByText('Archived'))!.toBeInTheDocument()
     })
 
     it('should show left icon by default', () => {
@@ -94,7 +94,7 @@ describe('Chip', () => {
 
       // The filter icon should be visible
       const svg = container.querySelector('svg')
-      expect(svg).toBeInTheDocument()
+      expect(svg)!.toBeInTheDocument()
     })
 
     it('should hide left icon when showLeftIcon is false', () => {
@@ -114,7 +114,7 @@ describe('Chip', () => {
 
       renderChip({ leftIcon: <CustomIcon /> })
 
-      expect(screen.getByTestId('custom-icon')).toBeInTheDocument()
+      expect(screen.getByTestId('custom-icon'))!.toBeInTheDocument()
     })
 
     it('should apply custom className to trigger', () => {
@@ -123,7 +123,7 @@ describe('Chip', () => {
       const { container } = renderChip({ className: customClass })
 
       const chipElement = container.querySelector(`.${customClass}`)
-      expect(chipElement).toBeInTheDocument()
+      expect(chipElement)!.toBeInTheDocument()
     })
 
     it('should apply custom panelClassName to dropdown panel', () => {
@@ -134,7 +134,7 @@ describe('Chip', () => {
 
       // Panel is rendered in a portal, so check document.body
       const panel = document.body.querySelector(`.${customPanelClass}`)
-      expect(panel).toBeInTheDocument()
+      expect(panel)!.toBeInTheDocument()
     })
   })
 
@@ -144,18 +144,18 @@ describe('Chip', () => {
 
       // Initially closed - check data-state attribute
       const trigger = getTrigger(container)
-      expect(trigger).toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('data-state', 'closed')
 
       // Open panel
       openPanel(container)
-      expect(trigger).toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('data-state', 'open')
       // Panel items should be visible
       expect(screen.getAllByText('All Items').length).toBeGreaterThan(1)
 
       // Close panel
       if (trigger)
         fireEvent.click(trigger)
-      expect(trigger).toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('data-state', 'closed')
     })
 
     it('should close panel after selecting an item', () => {
@@ -163,14 +163,14 @@ describe('Chip', () => {
 
       openPanel(container)
       const trigger = getTrigger(container)
-      expect(trigger).toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('data-state', 'open')
 
       // Click on an item in the dropdown panel
       const activeItems = screen.getAllByText('Active')
       // The second one should be in the dropdown
-      fireEvent.click(activeItems[activeItems.length - 1])
+      fireEvent.click(activeItems[activeItems.length - 1]!)
 
-      expect(trigger).toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('data-state', 'closed')
     })
   })
 
@@ -181,7 +181,7 @@ describe('Chip', () => {
       openPanel(container)
       // Get all "Active" texts and click the one in the dropdown (should be the last one)
       const activeItems = screen.getAllByText('Active')
-      fireEvent.click(activeItems[activeItems.length - 1])
+      fireEvent.click(activeItems[activeItems.length - 1]!)
 
       expect(onSelect).toHaveBeenCalledTimes(1)
       expect(onSelect).toHaveBeenCalledWith(items[1])
@@ -197,7 +197,7 @@ describe('Chip', () => {
       const closeIcon = svgs?.[svgs.length - 1]
       const clearButton = closeIcon?.parentElement
 
-      expect(clearButton).toBeInTheDocument()
+      expect(clearButton)!.toBeInTheDocument()
       if (clearButton)
         fireEvent.click(clearButton)
 
@@ -208,7 +208,7 @@ describe('Chip', () => {
       const { container } = renderChip({ value: 'active' })
 
       const trigger = getTrigger(container)
-      expect(trigger).toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('data-state', 'closed')
 
       // Find the close icon (last SVG) and click its parent
       const svgs = trigger?.querySelectorAll('svg')
@@ -219,7 +219,8 @@ describe('Chip', () => {
         fireEvent.click(clearButton)
 
       // Panel should remain closed
-      expect(trigger).toHaveAttribute('data-state', 'closed')
+      // Panel should remain closed
+      expect(trigger)!.toHaveAttribute('data-state', 'closed')
       expect(onClear).toHaveBeenCalledTimes(1)
     })
 
@@ -231,17 +232,17 @@ describe('Chip', () => {
       // Click 1: open
       if (trigger)
         fireEvent.click(trigger)
-      expect(trigger).toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('data-state', 'open')
 
       // Click 2: close
       if (trigger)
         fireEvent.click(trigger)
-      expect(trigger).toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('data-state', 'closed')
 
       // Click 3: open again
       if (trigger)
         fireEvent.click(trigger)
-      expect(trigger).toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('data-state', 'open')
     })
   })
 
@@ -283,10 +284,11 @@ describe('Chip', () => {
       const trigger = getTrigger(container)
 
       // Closed by default
-      expect(trigger).toHaveAttribute('data-state', 'closed')
+      // Closed by default
+      expect(trigger)!.toHaveAttribute('data-state', 'closed')
 
       openPanel(container)
-      expect(trigger).toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('data-state', 'open')
       // Items should be duplicated (once in trigger, once in panel)
       expect(screen.getAllByText('All Items').length).toBeGreaterThan(1)
     })
@@ -300,11 +302,11 @@ describe('Chip', () => {
       const allActiveTexts = screen.getAllByText('Active')
       // The dropdown item should be the last one
       const dropdownItem = allActiveTexts[allActiveTexts.length - 1]
-      const parentContainer = dropdownItem.parentElement
+      const parentContainer = dropdownItem!.parentElement
 
       // The check icon should be a sibling within the parent
       const checkIcon = parentContainer?.querySelector('svg')
-      expect(checkIcon).toBeInTheDocument()
+      expect(checkIcon)!.toBeInTheDocument()
     })
 
     it('should render all items in dropdown when open', () => {
@@ -326,14 +328,14 @@ describe('Chip', () => {
 
       // Trigger should still render
       const trigger = container.querySelector('[data-state]')
-      expect(trigger).toBeInTheDocument()
+      expect(trigger)!.toBeInTheDocument()
     })
 
     it('should handle value not in items list', () => {
       const { container } = renderChip({ value: 'nonexistent' })
 
       const trigger = getTrigger(container)
-      expect(trigger).toBeInTheDocument()
+      expect(trigger)!.toBeInTheDocument()
 
       // The trigger should not display any item name text
       expect(trigger?.textContent?.trim()).toBeFalsy()
@@ -346,7 +348,7 @@ describe('Chip', () => {
 
       // Click on the already selected item in the dropdown
       const activeItems = screen.getAllByText('Active')
-      fireEvent.click(activeItems[activeItems.length - 1])
+      fireEvent.click(activeItems[activeItems.length - 1]!)
 
       expect(onSelect).toHaveBeenCalledTimes(1)
       expect(onSelect).toHaveBeenCalledWith(items[1])
@@ -361,13 +363,13 @@ describe('Chip', () => {
 
       const { container } = renderChip({ value: 2, items: numericItems })
 
-      expect(screen.getByText('Second')).toBeInTheDocument()
+      expect(screen.getByText('Second'))!.toBeInTheDocument()
 
       // Open panel and select Third
       openPanel(container)
 
       const thirdItems = screen.getAllByText('Third')
-      fireEvent.click(thirdItems[thirdItems.length - 1])
+      fireEvent.click(thirdItems[thirdItems.length - 1]!)
 
       expect(onSelect).toHaveBeenCalledWith(numericItems[2])
     })
@@ -380,13 +382,13 @@ describe('Chip', () => {
 
       const { container } = renderChip({ value: 'a', items: itemsWithExtra })
 
-      expect(screen.getByText('Item A')).toBeInTheDocument()
+      expect(screen.getByText('Item A'))!.toBeInTheDocument()
 
       // Open panel and select Item B
       openPanel(container)
 
       const itemBs = screen.getAllByText('Item B')
-      fireEvent.click(itemBs[itemBs.length - 1])
+      fireEvent.click(itemBs[itemBs.length - 1]!)
 
       expect(onSelect).toHaveBeenCalledWith(itemsWithExtra[1])
     })
diff --git a/web/app/components/base/date-and-time-picker/calendar/__tests__/index.spec.tsx b/web/app/components/base/date-and-time-picker/calendar/__tests__/index.spec.tsx
index 8839798c15..c747d15be0 100644
--- a/web/app/components/base/date-and-time-picker/calendar/__tests__/index.spec.tsx
+++ b/web/app/components/base/date-and-time-picker/calendar/__tests__/index.spec.tsx
@@ -56,7 +56,7 @@ describe('Calendar', () => {
       // Verify the component renders successfully with wrapperClassName
       const dayLabels = screen.getAllByText(/daysInWeek/)
       expect(dayLabels).toHaveLength(7)
-      expect(container.firstChild).toHaveClass('custom-class')
+      expect(container.firstChild)!.toHaveClass('custom-class')
     })
   })
 
@@ -69,10 +69,10 @@ describe('Calendar', () => {
       render(<Calendar {...props} />)
 
       const dayButtons = screen.getAllByRole('button')
-      fireEvent.click(dayButtons[1])
+      fireEvent.click(dayButtons[1]!)
 
       expect(onDateClick).toHaveBeenCalledTimes(1)
-      expect(onDateClick).toHaveBeenCalledWith(days[1].date)
+      expect(onDateClick).toHaveBeenCalledWith(days[1]!.date)
     })
   })
 
@@ -87,7 +87,7 @@ describe('Calendar', () => {
       render(<Calendar {...props} />)
 
       const dayButtons = screen.getAllByRole('button')
-      fireEvent.click(dayButtons[0])
+      fireEvent.click(dayButtons[0]!)
 
       expect(onDateClick).not.toHaveBeenCalled()
     })
diff --git a/web/app/components/base/date-and-time-picker/date-picker/__tests__/header.spec.tsx b/web/app/components/base/date-and-time-picker/date-picker/__tests__/header.spec.tsx
index dedb2ef68d..ce30157ae6 100644
--- a/web/app/components/base/date-and-time-picker/date-picker/__tests__/header.spec.tsx
+++ b/web/app/components/base/date-and-time-picker/date-picker/__tests__/header.spec.tsx
@@ -24,7 +24,8 @@ describe('DatePicker Header', () => {
       render(<Header {...props} />)
 
       // The useMonths hook returns translated keys; check for year
-      expect(screen.getByText(/2024/)).toBeInTheDocument()
+      // The useMonths hook returns translated keys; check for year
+      expect(screen.getByText(/2024/))!.toBeInTheDocument()
     })
 
     it('should render navigation buttons', () => {
@@ -46,7 +47,7 @@ describe('DatePicker Header', () => {
 
       // First button is the month/year display
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
 
       expect(handleOpenYearMonthPicker).toHaveBeenCalledTimes(1)
     })
@@ -58,7 +59,7 @@ describe('DatePicker Header', () => {
 
       // Second button is prev month
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[1])
+      fireEvent.click(buttons[1]!)
 
       expect(onClickPrevMonth).toHaveBeenCalledTimes(1)
     })
@@ -70,7 +71,7 @@ describe('DatePicker Header', () => {
 
       // Third button is next month
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[2])
+      fireEvent.click(buttons[2]!)
 
       expect(onClickNextMonth).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx b/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx
index f324af37c1..ea4f1bb928 100644
--- a/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx
+++ b/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx
@@ -33,14 +33,14 @@ describe('DatePicker', () => {
       const props = createDatePickerProps()
       render(<DatePicker {...props} />)
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should render with custom placeholder', () => {
       const props = createDatePickerProps({ placeholder: 'Select date' })
       render(<DatePicker {...props} />)
 
-      expect(screen.getByRole('textbox')).toHaveAttribute('placeholder', 'Select date')
+      expect(screen.getByRole('textbox'))!.toHaveAttribute('placeholder', 'Select date')
     })
 
     it('should display formatted date value when value is provided', () => {
@@ -55,7 +55,7 @@ describe('DatePicker', () => {
       const props = createDatePickerProps()
       render(<DatePicker {...props} />)
 
-      expect(screen.getByRole('textbox')).toHaveValue('')
+      expect(screen.getByRole('textbox'))!.toHaveValue('')
     })
 
     it('should normalize value with timezone applied', () => {
@@ -93,7 +93,7 @@ describe('DatePicker', () => {
       openPicker()
       openPicker() // second click closes
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should restore selected date from value when reopening', () => {
@@ -104,7 +104,8 @@ describe('DatePicker', () => {
       openPicker()
 
       // Calendar should be showing June 2024
-      expect(screen.getByText(/2024/)).toBeInTheDocument()
+      // Calendar should be showing June 2024
+      expect(screen.getByText(/2024/))!.toBeInTheDocument()
     })
 
     it('should close when clicking outside the container', () => {
@@ -119,7 +120,8 @@ describe('DatePicker', () => {
       })
 
       // The picker should now be closed - input shows its value
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      // The picker should now be closed - input shows its value
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
   })
 
@@ -131,7 +133,7 @@ describe('DatePicker', () => {
 
       openPicker()
 
-      expect(screen.getByText('--:-- --')).toBeInTheDocument()
+      expect(screen.getByText('--:-- --'))!.toBeInTheDocument()
     })
 
     it('should not show time toggle when needTimePicker is false', () => {
@@ -153,7 +155,8 @@ describe('DatePicker', () => {
       fireEvent.click(screen.getByText('--:-- --'))
 
       // In time view, the "pickDate" text should appear instead of the time
-      expect(screen.getByText(/operation\.pickDate/)).toBeInTheDocument()
+      // In time view, the "pickDate" text should appear instead of the time
+      expect(screen.getByText(/operation\.pickDate/))!.toBeInTheDocument()
     })
 
     it('should switch back to date view when pickDate is clicked in time view', () => {
@@ -181,8 +184,9 @@ describe('DatePicker', () => {
       fireEvent.click(screen.getByText(/\d{2}:\d{2}\s(AM|PM)/))
 
       // Should show AM/PM options (TimePickerOptions renders these)
-      expect(screen.getByText('AM')).toBeInTheDocument()
-      expect(screen.getByText('PM')).toBeInTheDocument()
+      // Should show AM/PM options (TimePickerOptions renders these)
+      expect(screen.getByText('AM'))!.toBeInTheDocument()
+      expect(screen.getByText('PM'))!.toBeInTheDocument()
     })
 
     it('should update selected time when hour is selected in time view', () => {
@@ -196,11 +200,12 @@ describe('DatePicker', () => {
 
       // Click hour "05" from the time options
       const allLists = screen.getAllByRole('list')
-      const hourItems = within(allLists[0]).getAllByRole('listitem')
-      fireEvent.click(hourItems[4])
+      const hourItems = within(allLists[0]!).getAllByRole('listitem')
+      fireEvent.click(hourItems[4]!)
 
       // The picker should still be in time view
-      expect(screen.getByText(/operation\.pickDate/)).toBeInTheDocument()
+      // The picker should still be in time view
+      expect(screen.getByText(/operation\.pickDate/))!.toBeInTheDocument()
     })
 
     it('should update selected time when minute is selected in time view', () => {
@@ -214,10 +219,10 @@ describe('DatePicker', () => {
 
       // Click minute "45" from the time options
       const allLists = screen.getAllByRole('list')
-      const minuteItems = within(allLists[1]).getAllByRole('listitem')
-      fireEvent.click(minuteItems[45])
+      const minuteItems = within(allLists[1]!).getAllByRole('listitem')
+      fireEvent.click(minuteItems[45]!)
 
-      expect(screen.getByText(/operation\.pickDate/)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.pickDate/))!.toBeInTheDocument()
     })
 
     it('should update selected time when period is changed in time view', () => {
@@ -232,7 +237,7 @@ describe('DatePicker', () => {
       // Click AM to switch period
       fireEvent.click(screen.getByText('AM'))
 
-      expect(screen.getByText(/operation\.pickDate/)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.pickDate/))!.toBeInTheDocument()
     })
 
     it('should update time when no selectedDate exists and hour is selected', () => {
@@ -246,10 +251,10 @@ describe('DatePicker', () => {
 
       // Click hour "03" from the time options
       const allLists = screen.getAllByRole('list')
-      const hourItems = within(allLists[0]).getAllByRole('listitem')
-      fireEvent.click(hourItems[2])
+      const hourItems = within(allLists[0]!).getAllByRole('listitem')
+      fireEvent.click(hourItems[2]!)
 
-      expect(screen.getByText(/operation\.pickDate/)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.pickDate/))!.toBeInTheDocument()
     })
 
     it('should update time when no selectedDate exists and minute is selected', () => {
@@ -260,10 +265,10 @@ describe('DatePicker', () => {
       fireEvent.click(screen.getByText('--:-- --'))
 
       const allLists = screen.getAllByRole('list')
-      const minuteItems = within(allLists[1]).getAllByRole('listitem')
-      fireEvent.click(minuteItems[15])
+      const minuteItems = within(allLists[1]!).getAllByRole('listitem')
+      fireEvent.click(minuteItems[15]!)
 
-      expect(screen.getByText(/operation\.pickDate/)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.pickDate/))!.toBeInTheDocument()
     })
 
     it('should update time when no selectedDate exists and period is selected', () => {
@@ -274,7 +279,7 @@ describe('DatePicker', () => {
       fireEvent.click(screen.getByText('--:-- --'))
       fireEvent.click(screen.getByText('PM'))
 
-      expect(screen.getByText(/operation\.pickDate/)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.pickDate/))!.toBeInTheDocument()
     })
   })
 
@@ -314,7 +319,8 @@ describe('DatePicker', () => {
       fireEvent.click(dayButton)
 
       // The date should now appear in the header/display
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      // The date should now appear in the header/display
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should immediately confirm when noConfirm is true and a date is clicked', () => {
@@ -420,7 +426,7 @@ describe('DatePicker', () => {
       // The header has: month/year button, prev button, next button
       // Then calendar days are also buttons. We need the 3rd button (next month).
       // Header buttons come first in DOM order.
-      fireEvent.click(allButtons[2]) // next month button
+      fireEvent.click(allButtons[2]!) // next month button
 
       expect(screen.getAllByRole('button').length).toBeGreaterThan(0)
     })
@@ -432,7 +438,7 @@ describe('DatePicker', () => {
       openPicker()
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[1]) // prev month button
+      fireEvent.click(allButtons[1]!) // prev month button
 
       expect(screen.getAllByRole('button').length).toBeGreaterThan(0)
     })
@@ -450,7 +456,8 @@ describe('DatePicker', () => {
       fireEvent.click(headerButton)
 
       // Cancel button visible in year/month picker footer
-      expect(screen.getByText(/operation\.cancel/)).toBeInTheDocument()
+      // Cancel button visible in year/month picker footer
+      expect(screen.getByText(/operation\.cancel/))!.toBeInTheDocument()
     })
 
     it('should close year/month picker when cancel is clicked', () => {
@@ -479,7 +486,7 @@ describe('DatePicker', () => {
 
       // Confirm - click the last OK button (year/month footer)
       const okButtons = screen.getAllByText(/operation\.ok/)
-      fireEvent.click(okButtons[okButtons.length - 1])
+      fireEvent.click(okButtons[okButtons.length - 1]!)
 
       // Should return to date view
       expect(screen.getAllByText(/daysInWeek/).length).toBeGreaterThan(0)
@@ -496,7 +503,7 @@ describe('DatePicker', () => {
       // The header in year/month view shows selected month/year with an up arrow
       // Clicking it closes the year/month picker
       const headerButtons = screen.getAllByRole('button')
-      fireEvent.click(headerButtons[0]) // First button in year/month view is the header
+      fireEvent.click(headerButtons[0]!) // First button in year/month view is the header
 
       // Should return to date view
       expect(screen.getAllByText(/daysInWeek/).length).toBeGreaterThan(0)
@@ -511,12 +518,12 @@ describe('DatePicker', () => {
 
       // Select a different month using RTL queries
       const allLists = screen.getAllByRole('list')
-      const monthItems = within(allLists[0]).getAllByRole('listitem')
-      fireEvent.click(monthItems[0])
+      const monthItems = within(allLists[0]!).getAllByRole('listitem')
+      fireEvent.click(monthItems[0]!)
 
       // Confirm the selection - click the last OK button (year/month footer)
       const okButtons = screen.getAllByText(/operation\.ok/)
-      fireEvent.click(okButtons[okButtons.length - 1])
+      fireEvent.click(okButtons[okButtons.length - 1]!)
 
       // Should return to date view
       expect(screen.getAllByText(/daysInWeek/).length).toBeGreaterThan(0)
@@ -547,7 +554,7 @@ describe('DatePicker', () => {
       const props = createDatePickerProps({ renderTrigger })
       render(<DatePicker {...props} />)
 
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
 
     it('should open picker when custom trigger is clicked', () => {
@@ -591,7 +598,7 @@ describe('DatePicker', () => {
       })
       render(<DatePicker {...props} />)
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should call onChange when timezone changes with a value', () => {
@@ -639,7 +646,7 @@ describe('DatePicker', () => {
 
       // Should have been called with the new timezone-adjusted value
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(emitted.isValid()).toBe(true)
     })
 
@@ -656,7 +663,7 @@ describe('DatePicker', () => {
       rerender(<DatePicker {...props} timezone="Asia/Tokyo" />)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
   })
 
@@ -670,7 +677,8 @@ describe('DatePicker', () => {
       openPicker()
 
       // The footer should show the time from selectedDate (02:30 PM)
-      expect(screen.getByText(/\d{2}:\d{2}\s(AM|PM)/)).toBeInTheDocument()
+      // The footer should show the time from selectedDate (02:30 PM)
+      expect(screen.getByText(/\d{2}:\d{2}\s(AM|PM)/))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx b/web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx
index 199ed4ee41..7fbed3a736 100644
--- a/web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx
+++ b/web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx
@@ -28,7 +28,7 @@ describe('TimePicker', () => {
       />,
     )
 
-    expect(screen.getByDisplayValue('06:45 PM')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('06:45 PM'))!.toBeInTheDocument()
   })
 
   it('confirms cleared value when confirming without selection', () => {
@@ -71,7 +71,7 @@ describe('TimePicker', () => {
     fireEvent.click(nowButton)
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    const emitted = onChange.mock.calls[0][0]
+    const emitted = onChange.mock.calls[0]![0]
     expect(isDayjsObject(emitted)).toBe(true)
     expect(emitted?.utcOffset()).toBe(dayjs().tz('America/New_York').utcOffset())
   })
@@ -82,7 +82,7 @@ describe('TimePicker', () => {
       render(<TimePicker {...baseProps} />)
 
       const input = screen.getByRole('textbox')
-      expect(input).toHaveAttribute('placeholder', expect.stringMatching(/defaultPlaceholder/i))
+      expect(input)!.toHaveAttribute('placeholder', expect.stringMatching(/defaultPlaceholder/i))
     })
 
     it('should toggle open state when trigger is clicked', () => {
@@ -91,11 +91,11 @@ describe('TimePicker', () => {
       const input = screen.getByRole('textbox')
       // Open
       fireEvent.click(input)
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
 
       // Close by clicking again
       fireEvent.click(input)
-      expect(input).toHaveValue('10:00 AM')
+      expect(input)!.toHaveValue('10:00 AM')
     })
 
     it('should handle document mousedown listener while picker is open', () => {
@@ -103,10 +103,10 @@ describe('TimePicker', () => {
 
       const input = screen.getByRole('textbox')
       fireEvent.click(input)
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
 
       fireEvent.mouseDown(document.body)
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
     })
 
     it('should call onClear when clear is clicked while picker is closed', () => {
@@ -166,7 +166,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
       expect(onChange).toHaveBeenCalledTimes(1)
 
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(isDayjsObject(emitted)).toBe(true)
       expect(emitted.hour()).toBe(10)
       expect(emitted.minute()).toBe(0)
@@ -202,7 +202,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(isDayjsObject(emitted)).toBe(true)
       // Resynced from value prop: dayjs('2024-01-01T10:30:00Z') in UTC = 10:30 AM
       expect(emitted.hour()).toBe(10)
@@ -221,7 +221,7 @@ describe('TimePicker', () => {
       )
 
       const input = screen.getByRole('textbox')
-      expect(input).toHaveAttribute('placeholder', 'Select time')
+      expect(input)!.toHaveAttribute('placeholder', 'Select time')
     })
 
     it('should render with triggerFullWidth prop without errors', () => {
@@ -233,7 +233,8 @@ describe('TimePicker', () => {
       )
 
       // Verify the component renders successfully with triggerFullWidth
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      // Verify the component renders successfully with triggerFullWidth
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should use renderTrigger when provided', () => {
@@ -250,7 +251,7 @@ describe('TimePicker', () => {
         />,
       )
 
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
       expect(renderTrigger).toHaveBeenCalled()
     })
 
@@ -265,7 +266,8 @@ describe('TimePicker', () => {
       )
 
       // In test env the icon stays in DOM, but must remain hidden when notClearable is set
-      expect(screen.getByRole('button', { name: /clear/i })).toHaveClass('hidden')
+      // In test env the icon stays in DOM, but must remain hidden when notClearable is set
+      expect(screen.getByRole('button', { name: /clear/i }))!.toHaveClass('hidden')
     })
   })
 
@@ -289,7 +291,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(isDayjsObject(emitted)).toBe(true)
       expect(emitted.hour()).toBe(10)
       expect(emitted.minute()).toBe(30)
@@ -343,7 +345,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(isDayjsObject(emitted)).toBe(true)
       // Hour 05 in AM (since original was 10:30 AM) = 5
       expect(emitted.hour()).toBe(5)
@@ -371,7 +373,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(emitted.minute()).toBe(45)
     })
 
@@ -396,7 +398,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       // Original was 10:30 AM, switching to PM makes it 22:30
       expect(emitted.hour()).toBe(22)
     })
@@ -422,7 +424,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(isDayjsObject(emitted)).toBe(true)
       expect(emitted.hour()).toBe(3)
     })
@@ -448,7 +450,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(emitted.minute()).toBe(15)
     })
 
@@ -472,7 +474,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(isDayjsObject(emitted)).toBe(true)
       expect(emitted.hour()).toBeGreaterThanOrEqual(12)
     })
@@ -491,7 +493,7 @@ describe('TimePicker', () => {
       fireEvent.click(confirmButton)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(emitted.hour()).toBe(3)
     })
   })
@@ -523,7 +525,7 @@ describe('TimePicker', () => {
 
       expect(onChangeA).not.toHaveBeenCalled()
       expect(onChangeB).not.toHaveBeenCalled()
-      expect(screen.getByDisplayValue('10:30 AM')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('10:30 AM'))!.toBeInTheDocument()
     })
 
     it('should safely return when value changes to an unparsable time string', () => {
@@ -548,7 +550,7 @@ describe('TimePicker', () => {
       )
 
       expect(onChange).not.toHaveBeenCalled()
-      expect(screen.getByRole('textbox')).toHaveValue('')
+      expect(screen.getByRole('textbox'))!.toHaveValue('')
     })
 
     it('should call onChange when timezone changes with an existing value', () => {
@@ -574,7 +576,7 @@ describe('TimePicker', () => {
       )
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(isDayjsObject(emitted)).toBe(true)
       // 10:30 UTC converted to America/New_York (UTC-5 in Jan) = 05:30
       expect(emitted.utcOffset()).toBe(dayjs.tz('2024-01-01', 'America/New_York').utcOffset())
@@ -607,7 +609,8 @@ describe('TimePicker', () => {
       expect(onChange).not.toHaveBeenCalled()
 
       // But the display should update
-      expect(screen.getByDisplayValue('02:00 PM')).toBeInTheDocument()
+      // But the display should update
+      expect(screen.getByDisplayValue('02:00 PM'))!.toBeInTheDocument()
     })
 
     it('should handle timezone change when value is undefined', () => {
@@ -653,7 +656,8 @@ describe('TimePicker', () => {
         />,
       )
       // Input should be empty now
-      expect(screen.getByRole('textbox')).toHaveValue('')
+      // Input should be empty now
+      expect(screen.getByRole('textbox'))!.toHaveValue('')
       // onChange should not fire when value is undefined, even if selectedTime was set
       expect(onChange).not.toHaveBeenCalled()
     })
@@ -682,7 +686,7 @@ describe('TimePicker', () => {
       fireEvent.click(screen.getByRole('button', { name: /operation\.ok/i }))
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      const emitted = onChange.mock.calls[0][0]
+      const emitted = onChange.mock.calls[0]![0]
       expect(isDayjsObject(emitted)).toBe(true)
       expect(emitted.hour()).toBe(10)
       expect(emitted.minute()).toBe(30)
@@ -738,7 +742,8 @@ describe('TimePicker', () => {
       expect(onChange).not.toHaveBeenCalled()
 
       // 15:00 UTC in America/New_York (UTC-5) = 10:00 AM
-      expect(screen.getByDisplayValue('10:00 AM')).toBeInTheDocument()
+      // 15:00 UTC in America/New_York (UTC-5) = 10:00 AM
+      expect(screen.getByDisplayValue('10:00 AM'))!.toBeInTheDocument()
     })
   })
 
@@ -747,7 +752,7 @@ describe('TimePicker', () => {
     it('should return empty string when value is undefined', () => {
       render(<TimePicker {...baseProps} />)
 
-      expect(screen.getByRole('textbox')).toHaveValue('')
+      expect(screen.getByRole('textbox'))!.toHaveValue('')
     })
 
     it('should format dayjs value correctly', () => {
@@ -759,7 +764,7 @@ describe('TimePicker', () => {
         />,
       )
 
-      expect(screen.getByDisplayValue('02:30 PM')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('02:30 PM'))!.toBeInTheDocument()
     })
 
     it('should format string value correctly', () => {
@@ -771,7 +776,7 @@ describe('TimePicker', () => {
         />,
       )
 
-      expect(screen.getByDisplayValue('09:15 AM')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('09:15 AM'))!.toBeInTheDocument()
     })
 
     it('should return empty display value for an unparsable truthy string', () => {
@@ -784,7 +789,7 @@ describe('TimePicker', () => {
         />,
       )
 
-      expect(screen.getByRole('textbox')).toHaveValue('')
+      expect(screen.getByRole('textbox'))!.toHaveValue('')
     })
   })
 
@@ -825,8 +830,8 @@ describe('TimePicker', () => {
       )
 
       const timezoneLabel = screen.getByTitle(/Timezone: Asia\/Shanghai/)
-      expect(timezoneLabel).toBeInTheDocument()
-      expect(timezoneLabel).toHaveTextContent(/UTC[+-]\d+/)
+      expect(timezoneLabel)!.toBeInTheDocument()
+      expect(timezoneLabel)!.toHaveTextContent(/UTC[+-]\d+/)
     })
 
     it('should not display timezone label when showTimezone is true but timezone is not provided', () => {
diff --git a/web/app/components/base/date-and-time-picker/time-picker/__tests__/options.spec.tsx b/web/app/components/base/date-and-time-picker/time-picker/__tests__/options.spec.tsx
index 9d945dcf2e..d7fa3be797 100644
--- a/web/app/components/base/date-and-time-picker/time-picker/__tests__/options.spec.tsx
+++ b/web/app/components/base/date-and-time-picker/time-picker/__tests__/options.spec.tsx
@@ -43,8 +43,8 @@ describe('TimePickerOptions', () => {
 
       render(<Options {...props} />)
 
-      expect(screen.getByText('AM')).toBeInTheDocument()
-      expect(screen.getByText('PM')).toBeInTheDocument()
+      expect(screen.getByText('AM'))!.toBeInTheDocument()
+      expect(screen.getByText('PM'))!.toBeInTheDocument()
     })
   })
 
@@ -65,13 +65,13 @@ describe('TimePickerOptions', () => {
       const props = createOptionsProps({ selectedTime: dayjs('2024-01-01 05:30:00') })
       render(<Options {...props} />)
       const selectedHour = screen.getAllByRole('listitem').find(item => item.textContent === '05')
-      expect(selectedHour).toHaveClass('bg-components-button-ghost-bg-hover')
+      expect(selectedHour)!.toHaveClass('bg-components-button-ghost-bg-hover')
     })
     it('should render selected minute in the list', () => {
       const props = createOptionsProps({ selectedTime: dayjs('2024-01-01 05:30:00') })
       render(<Options {...props} />)
       const selectedMinute = screen.getAllByRole('listitem').find(item => item.textContent === '30')
-      expect(selectedMinute).toHaveClass('bg-components-button-ghost-bg-hover')
+      expect(selectedMinute)!.toHaveClass('bg-components-button-ghost-bg-hover')
     })
 
     it('should call handleSelectPeriod when AM is clicked', () => {
@@ -79,7 +79,7 @@ describe('TimePickerOptions', () => {
       const props = createOptionsProps({ handleSelectPeriod })
 
       render(<Options {...props} />)
-      fireEvent.click(screen.getAllByText('AM')[0])
+      fireEvent.click(screen.getAllByText('AM')[0]!)
 
       expect(handleSelectPeriod).toHaveBeenCalledWith('AM')
     })
@@ -89,7 +89,7 @@ describe('TimePickerOptions', () => {
       const props = createOptionsProps({ handleSelectPeriod })
 
       render(<Options {...props} />)
-      fireEvent.click(screen.getAllByText('PM')[0])
+      fireEvent.click(screen.getAllByText('PM')[0]!)
 
       expect(handleSelectPeriod).toHaveBeenCalledWith('PM')
     })
diff --git a/web/app/components/base/date-and-time-picker/utils/dayjs.ts b/web/app/components/base/date-and-time-picker/utils/dayjs.ts
index 3e20e51cf3..ae5cb90701 100644
--- a/web/app/components/base/date-and-time-picker/utils/dayjs.ts
+++ b/web/app/components/base/date-and-time-picker/utils/dayjs.ts
@@ -116,8 +116,8 @@ export const convertTimezoneToOffsetStr = (timezone?: string) => {
   if (!offsetMatch)
     return DEFAULT_OFFSET_STR
   // Parse hours and minutes separately
-  const hours = Number.parseInt(offsetMatch[1], 10)
-  const minutes = Number.parseInt(offsetMatch[2], 10)
+  const hours = Number.parseInt(offsetMatch[1]!, 10)
+  const minutes = Number.parseInt(offsetMatch[2]!, 10)
   const sign = hours >= 0 ? '+' : ''
   // If minutes are non-zero, include them in the output (e.g., "UTC+5:30")
   // Otherwise, only show hours (e.g., "UTC+8")
diff --git a/web/app/components/base/emoji-picker/__tests__/Inner.spec.tsx b/web/app/components/base/emoji-picker/__tests__/Inner.spec.tsx
index eac18dd48a..f0cf3091d7 100644
--- a/web/app/components/base/emoji-picker/__tests__/Inner.spec.tsx
+++ b/web/app/components/base/emoji-picker/__tests__/Inner.spec.tsx
@@ -41,9 +41,9 @@ describe('EmojiPickerInner', () => {
     it('renders initial categories and emojis correctly', () => {
       render(<EmojiPickerInner onSelect={mockOnSelect} />)
 
-      expect(screen.getByText('nature')).toBeInTheDocument()
-      expect(screen.getByText('food')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('Search emojis...')).toBeInTheDocument()
+      expect(screen.getByText('nature'))!.toBeInTheDocument()
+      expect(screen.getByText('food'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Search emojis...'))!.toBeInTheDocument()
     })
   })
 
@@ -57,7 +57,7 @@ describe('EmojiPickerInner', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('Search')).toBeInTheDocument()
+        expect(screen.getByText('Search'))!.toBeInTheDocument()
       })
 
       const searchSection = screen.getByText('Search').parentElement
@@ -69,7 +69,7 @@ describe('EmojiPickerInner', () => {
       const emojiContainers = screen.getAllByTestId(/^emoji-container-/)
 
       await act(async () => {
-        fireEvent.click(emojiContainers[0])
+        fireEvent.click(emojiContainers[0]!)
       })
 
       expect(mockOnSelect).toHaveBeenCalledWith('rabbit', expect.any(String))
@@ -81,13 +81,13 @@ describe('EmojiPickerInner', () => {
       expect(screen.queryByText('#FFEAD5')).not.toBeInTheDocument()
 
       const toggleButton = screen.getByTestId('toggle-colors')
-      expect(toggleButton).toBeInTheDocument()
+      expect(toggleButton)!.toBeInTheDocument()
 
       await act(async () => {
         fireEvent.click(toggleButton!)
       })
 
-      expect(screen.getByText('Choose Style')).toBeInTheDocument()
+      expect(screen.getByText('Choose Style'))!.toBeInTheDocument()
       const colorOptions = document.querySelectorAll('[style^="background:"]')
       expect(colorOptions.length).toBeGreaterThan(0)
     })
@@ -102,14 +102,14 @@ describe('EmojiPickerInner', () => {
 
       const emojiContainers = screen.getAllByTestId(/^emoji-container-/)
       await act(async () => {
-        fireEvent.click(emojiContainers[0])
+        fireEvent.click(emojiContainers[0]!)
       })
 
       mockOnSelect.mockClear()
 
       const colorOptions = document.querySelectorAll('[style^="background:"]')
       await act(async () => {
-        fireEvent.click(colorOptions[1].parentElement!)
+        fireEvent.click(colorOptions[1]!.parentElement!)
       })
 
       expect(mockOnSelect).toHaveBeenCalledWith('rabbit', '#E4FBCC')
@@ -127,7 +127,7 @@ describe('EmojiPickerInner', () => {
 
       const searchEmojis = screen.getAllByTestId(/^emoji-search-result-/)
       await act(async () => {
-        fireEvent.click(searchEmojis![0])
+        fireEvent.click(searchEmojis![0]!)
       })
 
       expect(mockOnSelect).toHaveBeenCalledWith('dog', expect.any(String))
@@ -141,7 +141,7 @@ describe('EmojiPickerInner', () => {
       await act(async () => {
         fireEvent.click(toggleButton!)
       })
-      expect(screen.getByText('Choose Style')).toBeInTheDocument()
+      expect(screen.getByText('Choose Style'))!.toBeInTheDocument()
 
       await act(async () => {
         fireEvent.click(screen.getByTestId('toggle-colors')!) // It should be the other icon now
diff --git a/web/app/components/base/emoji-picker/__tests__/index.spec.tsx b/web/app/components/base/emoji-picker/__tests__/index.spec.tsx
index 5eb6593213..36b161b7c7 100644
--- a/web/app/components/base/emoji-picker/__tests__/index.spec.tsx
+++ b/web/app/components/base/emoji-picker/__tests__/index.spec.tsx
@@ -46,9 +46,9 @@ describe('EmojiPicker', () => {
           <EmojiPicker isModal={true} />,
         )
       })
-      expect(screen.getByPlaceholderText('Search emojis...')).toBeInTheDocument()
-      expect(screen.getByText(/Cancel/i)).toBeInTheDocument()
-      expect(screen.getByText(/OK/i)).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Search emojis...'))!.toBeInTheDocument()
+      expect(screen.getByText(/Cancel/i))!.toBeInTheDocument()
+      expect(screen.getByText(/OK/i))!.toBeInTheDocument()
     })
 
     it('OK button is disabled initially', async () => {
@@ -58,7 +58,7 @@ describe('EmojiPicker', () => {
         )
       })
       const okButton = screen.getByText(/OK/i).closest('button')
-      expect(okButton).toBeDisabled()
+      expect(okButton)!.toBeDisabled()
     })
 
     it('applies custom className to modal wrapper', async () => {
@@ -69,7 +69,7 @@ describe('EmojiPicker', () => {
         )
       })
       const dialog = screen.getByRole('dialog')
-      expect(dialog).toHaveClass(customClass)
+      expect(dialog)!.toHaveClass(customClass)
     })
   })
 
@@ -84,7 +84,7 @@ describe('EmojiPicker', () => {
       const emojiWrappers = screen.getAllByTestId(/^emoji-container-/)
       expect(emojiWrappers.length).toBeGreaterThan(0)
       await act(async () => {
-        fireEvent.click(emojiWrappers[0])
+        fireEvent.click(emojiWrappers[0]!)
       })
 
       const okButton = screen.getByText(/OK/i)
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/use-annotation-config.spec.ts b/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/use-annotation-config.spec.ts
index 47caa70261..14f6d68bda 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/use-annotation-config.spec.ts
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/use-annotation-config.spec.ts
@@ -101,7 +101,7 @@ describe('useAnnotationConfig', () => {
     })
 
     expect(setAnnotationConfig).toHaveBeenCalled()
-    const updatedConfig = setAnnotationConfig.mock.calls[0][0]
+    const updatedConfig = setAnnotationConfig.mock.calls[0]![0]
     expect(updatedConfig.enabled).toBe(true)
     expect(updatedConfig.embedding_model.embedding_model_name).toBe('text-embedding-3-small')
   })
@@ -123,7 +123,7 @@ describe('useAnnotationConfig', () => {
     })
 
     expect(setAnnotationConfig).toHaveBeenCalled()
-    const updatedConfig = setAnnotationConfig.mock.calls[0][0]
+    const updatedConfig = setAnnotationConfig.mock.calls[0]![0]
     expect(updatedConfig.enabled).toBe(false)
   })
 
@@ -158,7 +158,7 @@ describe('useAnnotationConfig', () => {
     })
 
     expect(setAnnotationConfig).toHaveBeenCalled()
-    const updatedConfig = setAnnotationConfig.mock.calls[0][0]
+    const updatedConfig = setAnnotationConfig.mock.calls[0]![0]
     expect(updatedConfig.score_threshold).toBe(0.85)
   })
 
@@ -178,7 +178,7 @@ describe('useAnnotationConfig', () => {
     })
 
     expect(setAnnotationConfig).toHaveBeenCalled()
-    const updatedConfig = setAnnotationConfig.mock.calls[0][0]
+    const updatedConfig = setAnnotationConfig.mock.calls[0]![0]
     expect(updatedConfig.score_threshold).toBe(0.95)
     expect(updatedConfig.embedding_model.embedding_provider_name).toBe('cohere')
   })
@@ -236,7 +236,7 @@ describe('useAnnotationConfig', () => {
     })
 
     expect(setAnnotationConfig).toHaveBeenCalled()
-    const updatedConfig = setAnnotationConfig.mock.calls[0][0]
+    const updatedConfig = setAnnotationConfig.mock.calls[0]![0]
     expect(updatedConfig.enabled).toBe(true)
     expect(updatedConfig.score_threshold).toBeDefined()
   })
diff --git a/web/app/components/base/features/new-feature-panel/conversation-opener/__tests__/index.spec.tsx b/web/app/components/base/features/new-feature-panel/conversation-opener/__tests__/index.spec.tsx
index b7ee5b39b2..9e74a1d0df 100644
--- a/web/app/components/base/features/new-feature-panel/conversation-opener/__tests__/index.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/conversation-opener/__tests__/index.spec.tsx
@@ -43,19 +43,19 @@ describe('ConversationOpener', () => {
   it('should render the conversation opener title', () => {
     renderWithProvider()
 
-    expect(screen.getByText(/feature\.conversationOpener\.title/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.conversationOpener\.title/))!.toBeInTheDocument()
   })
 
   it('should render description when not enabled', () => {
     renderWithProvider()
 
-    expect(screen.getByText(/feature\.conversationOpener\.description/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.conversationOpener\.description/))!.toBeInTheDocument()
   })
 
   it('should render a switch toggle', () => {
     renderWithProvider()
 
-    expect(screen.getByRole('switch')).toBeInTheDocument()
+    expect(screen.getByRole('switch'))!.toBeInTheDocument()
   })
 
   it('should call onChange when toggled', () => {
@@ -72,7 +72,7 @@ describe('ConversationOpener', () => {
       opening: { enabled: true, opening_statement: 'Welcome to the app!' },
     })
 
-    expect(screen.getByText('Welcome to the app!')).toBeInTheDocument()
+    expect(screen.getByText('Welcome to the app!'))!.toBeInTheDocument()
   })
 
   it('should show placeholder when enabled but no opening statement', () => {
@@ -80,7 +80,7 @@ describe('ConversationOpener', () => {
       opening: { enabled: true, opening_statement: '' },
     })
 
-    expect(screen.getByText(/openingStatement\.placeholder/)).toBeInTheDocument()
+    expect(screen.getByText(/openingStatement\.placeholder/))!.toBeInTheDocument()
   })
 
   it('should show edit button when hovering over enabled feature', () => {
@@ -91,7 +91,7 @@ describe('ConversationOpener', () => {
     const card = screen.getByText(/feature\.conversationOpener\.title/).closest('[class]')!
     fireEvent.mouseEnter(card)
 
-    expect(screen.getByText(/openingStatement\.writeOpener/)).toBeInTheDocument()
+    expect(screen.getByText(/openingStatement\.writeOpener/))!.toBeInTheDocument()
   })
 
   it('should open modal when edit button is clicked', () => {
@@ -127,7 +127,7 @@ describe('ConversationOpener', () => {
     fireEvent.mouseEnter(card)
     fireEvent.click(screen.getByText(/openingStatement\.writeOpener/))
 
-    const modalCall = mockSetShowOpeningModal.mock.calls[0][0]
+    const modalCall = mockSetShowOpeningModal.mock.calls[0]![0]
     expect(modalCall.payload).toBeDefined()
     expect(modalCall.onSaveCallback).toBeDefined()
     expect(modalCall.onCancelCallback).toBeDefined()
@@ -143,7 +143,7 @@ describe('ConversationOpener', () => {
     fireEvent.mouseEnter(card)
     fireEvent.click(screen.getByText(/openingStatement\.writeOpener/))
 
-    const modalCall = mockSetShowOpeningModal.mock.calls[0][0]
+    const modalCall = mockSetShowOpeningModal.mock.calls[0]![0]
     act(() => {
       modalCall.onSaveCallback({ enabled: true, opening_statement: 'Updated' })
     })
@@ -161,7 +161,7 @@ describe('ConversationOpener', () => {
     fireEvent.mouseEnter(card)
     fireEvent.click(screen.getByText(/openingStatement\.writeOpener/))
 
-    const modalCall = mockSetShowOpeningModal.mock.calls[0][0]
+    const modalCall = mockSetShowOpeningModal.mock.calls[0]![0]
     modalCall.onCancelCallback()
 
     expect(onChange).toHaveBeenCalled()
@@ -173,18 +173,21 @@ describe('ConversationOpener', () => {
     })
 
     // Before hover, opening statement visible
-    expect(screen.getByText('Welcome!')).toBeInTheDocument()
+    // Before hover, opening statement visible
+    expect(screen.getByText('Welcome!'))!.toBeInTheDocument()
 
     const card = screen.getByText(/feature\.conversationOpener\.title/).closest('[class]')!
     fireEvent.mouseEnter(card)
 
     // After hover, button visible, statement hidden
-    expect(screen.getByText(/openingStatement\.writeOpener/)).toBeInTheDocument()
+    // After hover, button visible, statement hidden
+    expect(screen.getByText(/openingStatement\.writeOpener/))!.toBeInTheDocument()
 
     fireEvent.mouseLeave(card)
 
     // After leave, statement visible again
-    expect(screen.getByText('Welcome!')).toBeInTheDocument()
+    // After leave, statement visible again
+    expect(screen.getByText('Welcome!'))!.toBeInTheDocument()
   })
 
   it('should return early from opener handler when disabled and hovered', () => {
@@ -208,7 +211,7 @@ describe('ConversationOpener', () => {
     fireEvent.mouseEnter(card)
     fireEvent.click(screen.getByText(/openingStatement\.writeOpener/))
 
-    const modalCall = mockSetShowOpeningModal.mock.calls[0][0]
+    const modalCall = mockSetShowOpeningModal.mock.calls[0]![0]
     act(() => {
       modalCall.onSaveCallback({ enabled: true, opening_statement: 'Updated without callback' })
       modalCall.onCancelCallback()
@@ -221,6 +224,6 @@ describe('ConversationOpener', () => {
     renderWithProvider()
 
     fireEvent.click(screen.getByRole('switch'))
-    expect(screen.getByRole('switch')).toBeInTheDocument()
+    expect(screen.getByRole('switch'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/base/features/new-feature-panel/file-upload/__tests__/setting-modal.spec.tsx b/web/app/components/base/features/new-feature-panel/file-upload/__tests__/setting-modal.spec.tsx
index afa690f31a..dc111a680b 100644
--- a/web/app/components/base/features/new-feature-panel/file-upload/__tests__/setting-modal.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/file-upload/__tests__/setting-modal.spec.tsx
@@ -46,7 +46,7 @@ describe('FileUploadSettings (setting-modal)', () => {
       </FileUploadSettings>,
     )
 
-    expect(screen.getByText('Upload Settings')).toBeInTheDocument()
+    expect(screen.getByText('Upload Settings'))!.toBeInTheDocument()
   })
 
   it('should render SettingContent in portal', async () => {
@@ -57,7 +57,7 @@ describe('FileUploadSettings (setting-modal)', () => {
     )
 
     await waitFor(() => {
-      expect(screen.getByText(/feature\.fileUpload\.modalTitle/)).toBeInTheDocument()
+      expect(screen.getByText(/feature\.fileUpload\.modalTitle/))!.toBeInTheDocument()
     })
   })
 
@@ -73,7 +73,7 @@ describe('FileUploadSettings (setting-modal)', () => {
 
     expect(onOpen).toHaveBeenCalled()
     // The toggle function should flip the open state
-    const toggleFn = onOpen.mock.calls[0][0]
+    const toggleFn = onOpen.mock.calls[0]![0]
     expect(typeof toggleFn).toBe('function')
     expect(toggleFn(false)).toBe(true)
     expect(toggleFn(true)).toBe(false)
@@ -101,7 +101,7 @@ describe('FileUploadSettings (setting-modal)', () => {
     )
 
     await waitFor(() => {
-      expect(screen.getByText(/operation\.cancel/)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.cancel/))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByRole('button', { name: /operation\.cancel/ }))
 
@@ -118,7 +118,7 @@ describe('FileUploadSettings (setting-modal)', () => {
     )
 
     await waitFor(() => {
-      expect(screen.getByText(/operation\.save/)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.save/))!.toBeInTheDocument()
     })
     fireEvent.click(screen.getByRole('button', { name: /operation\.save/ }))
 
@@ -134,7 +134,7 @@ describe('FileUploadSettings (setting-modal)', () => {
     )
 
     await waitFor(() => {
-      expect(screen.getByText(/feature\.imageUpload\.modalTitle/)).toBeInTheDocument()
+      expect(screen.getByText(/feature\.imageUpload\.modalTitle/))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/base/features/new-feature-panel/moderation/__tests__/index.spec.tsx b/web/app/components/base/features/new-feature-panel/moderation/__tests__/index.spec.tsx
index 994213c779..b5fb6c0043 100644
--- a/web/app/components/base/features/new-feature-panel/moderation/__tests__/index.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/moderation/__tests__/index.spec.tsx
@@ -56,19 +56,19 @@ describe('Moderation', () => {
   it('should render the moderation title', () => {
     renderWithProvider()
 
-    expect(screen.getByText(/feature\.moderation\.title/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.title/))!.toBeInTheDocument()
   })
 
   it('should render description when not enabled', () => {
     renderWithProvider()
 
-    expect(screen.getByText(/feature\.moderation\.description/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.description/))!.toBeInTheDocument()
   })
 
   it('should render a switch toggle', () => {
     renderWithProvider()
 
-    expect(screen.getByRole('switch')).toBeInTheDocument()
+    expect(screen.getByRole('switch'))!.toBeInTheDocument()
   })
 
   it('should open moderation setting modal when enabled without type', () => {
@@ -91,7 +91,7 @@ describe('Moderation', () => {
       },
     })
 
-    expect(screen.getByText(/feature\.moderation\.modal\.provider\.openai/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.modal\.provider\.openai/))!.toBeInTheDocument()
   })
 
   it('should show provider info when enabled with keywords type', () => {
@@ -106,7 +106,7 @@ describe('Moderation', () => {
       },
     })
 
-    expect(screen.getByText(/feature\.moderation\.modal\.provider\.keywords/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.modal\.provider\.keywords/))!.toBeInTheDocument()
   })
 
   it('should show allEnabled when both inputs and outputs are enabled', () => {
@@ -121,7 +121,7 @@ describe('Moderation', () => {
       },
     })
 
-    expect(screen.getByText(/feature\.moderation\.allEnabled/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.allEnabled/))!.toBeInTheDocument()
   })
 
   it('should show inputEnabled when only inputs are enabled', () => {
@@ -136,7 +136,7 @@ describe('Moderation', () => {
       },
     })
 
-    expect(screen.getByText(/feature\.moderation\.inputEnabled/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.inputEnabled/))!.toBeInTheDocument()
   })
 
   it('should show outputEnabled when only outputs are enabled', () => {
@@ -151,7 +151,7 @@ describe('Moderation', () => {
       },
     })
 
-    expect(screen.getByText(/feature\.moderation\.outputEnabled/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.outputEnabled/))!.toBeInTheDocument()
   })
 
   it('should show settings button when hovering over enabled feature', () => {
@@ -168,7 +168,7 @@ describe('Moderation', () => {
     const card = screen.getByText(/feature\.moderation\.title/).closest('[class]')!
     fireEvent.mouseEnter(card)
 
-    expect(screen.getByText(/operation\.settings/)).toBeInTheDocument()
+    expect(screen.getByText(/operation\.settings/))!.toBeInTheDocument()
   })
 
   it('should open moderation modal when settings button is clicked', () => {
@@ -218,7 +218,7 @@ describe('Moderation', () => {
       },
     })
 
-    expect(screen.getByText(/apiBasedExtension\.selector\.title/)).toBeInTheDocument()
+    expect(screen.getByText(/apiBasedExtension\.selector\.title/))!.toBeInTheDocument()
   })
 
   it('should disable moderation and call onChange when switch is toggled off', () => {
@@ -260,7 +260,7 @@ describe('Moderation', () => {
     fireEvent.click(screen.getByRole('switch'))
 
     // Extract the onSaveCallback from the modal call
-    const modalCall = mockSetShowModerationSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowModerationSettingModal.mock.calls[0]![0]
     expect(modalCall.onSaveCallback).toBeDefined()
     expect(modalCall.onCancelCallback).toBeDefined()
   })
@@ -281,7 +281,7 @@ describe('Moderation', () => {
     fireEvent.mouseEnter(card)
     fireEvent.click(screen.getByText(/operation\.settings/))
 
-    const modalCall = mockSetShowModerationSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowModerationSettingModal.mock.calls[0]![0]
     modalCall.onCancelCallback()
 
     expect(onChange).toHaveBeenCalled()
@@ -302,7 +302,7 @@ describe('Moderation', () => {
     fireEvent.mouseEnter(card)
     fireEvent.click(screen.getByText(/operation\.settings/))
 
-    const modalCall = mockSetShowModerationSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowModerationSettingModal.mock.calls[0]![0]
     expect(() => modalCall.onCancelCallback()).not.toThrow()
   })
 
@@ -322,7 +322,7 @@ describe('Moderation', () => {
     fireEvent.mouseEnter(card)
     fireEvent.click(screen.getByText(/operation\.settings/))
 
-    const modalCall = mockSetShowModerationSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowModerationSettingModal.mock.calls[0]![0]
     modalCall.onSaveCallback({ enabled: true, type: 'keywords', config: {} })
 
     expect(onChange).toHaveBeenCalled()
@@ -343,7 +343,7 @@ describe('Moderation', () => {
     fireEvent.mouseEnter(card)
     fireEvent.click(screen.getByText(/operation\.settings/))
 
-    const modalCall = mockSetShowModerationSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowModerationSettingModal.mock.calls[0]![0]
     expect(() => modalCall.onSaveCallback({ enabled: true, type: 'keywords', config: {} })).not.toThrow()
   })
 
@@ -359,7 +359,8 @@ describe('Moderation', () => {
     })
 
     // For unknown types, falls back to codeBasedExtensionList label or '-'
-    expect(screen.getByText('-')).toBeInTheDocument()
+    // For unknown types, falls back to codeBasedExtensionList label or '-'
+    expect(screen.getByText('-'))!.toBeInTheDocument()
   })
 
   it('should show code-based extension label when custom type is configured', () => {
@@ -379,7 +380,7 @@ describe('Moderation', () => {
       },
     })
 
-    expect(screen.getByText('Custom Moderation')).toBeInTheDocument()
+    expect(screen.getByText('Custom Moderation'))!.toBeInTheDocument()
   })
 
   it('should not show enable content text when both input and output moderation are disabled', () => {
@@ -422,7 +423,7 @@ describe('Moderation', () => {
 
     fireEvent.click(screen.getByRole('switch'))
 
-    const modalCall = mockSetShowModerationSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowModerationSettingModal.mock.calls[0]![0]
     // Execute the onSaveCallback
     modalCall.onSaveCallback({ enabled: true, type: 'keywords', config: {} })
 
@@ -434,7 +435,7 @@ describe('Moderation', () => {
 
     fireEvent.click(screen.getByRole('switch'))
 
-    const modalCall = mockSetShowModerationSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowModerationSettingModal.mock.calls[0]![0]
     expect(() => modalCall.onSaveCallback({ enabled: true, type: 'keywords', config: {} })).not.toThrow()
   })
 
@@ -444,7 +445,7 @@ describe('Moderation', () => {
 
     fireEvent.click(screen.getByRole('switch'))
 
-    const modalCall = mockSetShowModerationSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowModerationSettingModal.mock.calls[0]![0]
     // Execute the onCancelCallback
     modalCall.onCancelCallback()
 
@@ -456,7 +457,7 @@ describe('Moderation', () => {
 
     fireEvent.click(screen.getByRole('switch'))
 
-    const modalCall = mockSetShowModerationSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowModerationSettingModal.mock.calls[0]![0]
     expect(() => modalCall.onCancelCallback()).not.toThrow()
   })
 
@@ -510,12 +511,14 @@ describe('Moderation', () => {
     const card = screen.getByText(/feature\.moderation\.title/).closest('[class]')!
 
     // Info is visible before hover
-    expect(screen.getByText(/feature\.moderation\.modal\.provider\.keywords/)).toBeInTheDocument()
+    // Info is visible before hover
+    expect(screen.getByText(/feature\.moderation\.modal\.provider\.keywords/))!.toBeInTheDocument()
 
     fireEvent.mouseEnter(card)
 
     // Info hidden, settings button shown
-    expect(screen.getByText(/operation\.settings/)).toBeInTheDocument()
+    // Info hidden, settings button shown
+    expect(screen.getByText(/operation\.settings/))!.toBeInTheDocument()
   })
 
   it('should show info display again when mouse leaves', () => {
@@ -534,6 +537,6 @@ describe('Moderation', () => {
     fireEvent.mouseEnter(card)
     fireEvent.mouseLeave(card)
 
-    expect(screen.getByText(/feature\.moderation\.modal\.provider\.keywords/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.modal\.provider\.keywords/))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/base/features/new-feature-panel/moderation/__tests__/moderation-setting-modal.spec.tsx b/web/app/components/base/features/new-feature-panel/moderation/__tests__/moderation-setting-modal.spec.tsx
index 30b9ea13bd..fd6ca654aa 100644
--- a/web/app/components/base/features/new-feature-panel/moderation/__tests__/moderation-setting-modal.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/moderation/__tests__/moderation-setting-modal.spec.tsx
@@ -111,7 +111,7 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/feature\.moderation\.modal\.title/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.modal\.title/))!.toBeInTheDocument()
   })
 
   it('should render provider options', async () => {
@@ -123,10 +123,10 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/feature\.moderation\.modal\.provider\.openai/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.modal\.provider\.openai/))!.toBeInTheDocument()
     // Keywords text appears both as provider option and section label
     expect(screen.getAllByText(/feature\.moderation\.modal\.provider\.keywords/).length).toBeGreaterThanOrEqual(1)
-    expect(screen.getByText(/apiBasedExtension\.selector\.title/)).toBeInTheDocument()
+    expect(screen.getByText(/apiBasedExtension\.selector\.title/))!.toBeInTheDocument()
   })
 
   it('should show keywords textarea when keywords type is selected', async () => {
@@ -139,8 +139,8 @@ describe('ModerationSettingModal', () => {
     )
 
     const textarea = screen.getByPlaceholderText(/feature\.moderation\.modal\.keywords\.placeholder/) as HTMLTextAreaElement
-    expect(textarea).toBeInTheDocument()
-    expect(textarea).toHaveValue('bad\nword')
+    expect(textarea)!.toBeInTheDocument()
+    expect(textarea)!.toHaveValue('bad\nword')
   })
 
   it('should render cancel and save buttons', async () => {
@@ -152,8 +152,8 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/operation\.cancel/)).toBeInTheDocument()
-    expect(screen.getByText(/operation\.save/)).toBeInTheDocument()
+    expect(screen.getByText(/operation\.cancel/))!.toBeInTheDocument()
+    expect(screen.getByText(/operation\.save/))!.toBeInTheDocument()
   })
 
   it('should call onCancel when cancel is clicked', async () => {
@@ -182,7 +182,7 @@ describe('ModerationSettingModal', () => {
     )
 
     const closeButton = document.querySelector('div[role="button"][tabindex="0"]') as HTMLElement
-    expect(closeButton).toBeInTheDocument()
+    expect(closeButton)!.toBeInTheDocument()
     closeButton.focus()
     fireEvent.keyDown(closeButton, { key: 'Enter' })
 
@@ -200,7 +200,7 @@ describe('ModerationSettingModal', () => {
     )
 
     const closeButton = document.querySelector('div[role="button"][tabindex="0"]') as HTMLElement
-    expect(closeButton).toBeInTheDocument()
+    expect(closeButton)!.toBeInTheDocument()
     closeButton.focus()
     fireEvent.keyDown(closeButton, { key: ' ' })
 
@@ -218,7 +218,7 @@ describe('ModerationSettingModal', () => {
     )
 
     const closeButton = document.querySelector('div[role="button"][tabindex="0"]') as HTMLElement
-    expect(closeButton).toBeInTheDocument()
+    expect(closeButton)!.toBeInTheDocument()
     closeButton.focus()
     fireEvent.keyDown(closeButton, { key: 'Escape' })
 
@@ -311,7 +311,7 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    expect(screen.getByTestId('api-selector')).toBeInTheDocument()
+    expect(screen.getByTestId('api-selector'))!.toBeInTheDocument()
   })
 
   it('should switch provider type when clicked', async () => {
@@ -326,6 +326,37 @@ describe('ModerationSettingModal', () => {
     // Click on openai_moderation provider
     fireEvent.click(screen.getByText(/feature\.moderation\.modal\.provider\.openai/))
 
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
+    // The keywords textarea should no longer be visible since type changed
     // The keywords textarea should no longer be visible since type changed
     expect(screen.queryByPlaceholderText(/feature\.moderation\.modal\.keywords\.placeholder/)).not.toBeInTheDocument()
   })
@@ -342,7 +373,7 @@ describe('ModerationSettingModal', () => {
     const textarea = screen.getByPlaceholderText(/feature\.moderation\.modal\.keywords\.placeholder/) as HTMLTextAreaElement
     fireEvent.change(textarea, { target: { value: 'new\nkeywords' } })
 
-    expect(textarea).toHaveValue('new\nkeywords')
+    expect(textarea)!.toHaveValue('new\nkeywords')
   })
 
   it('should render moderation content sections', async () => {
@@ -354,8 +385,8 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/feature\.moderation\.modal\.content\.input/)).toBeInTheDocument()
-    expect(screen.getByText(/feature\.moderation\.modal\.content\.output/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.modal\.content\.input/))!.toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.modal\.content\.output/))!.toBeInTheDocument()
   })
 
   it('should show error when inputs enabled but no preset_response for keywords type', async () => {
@@ -471,7 +502,7 @@ describe('ModerationSettingModal', () => {
     const switches = screen.getAllByRole('switch')
     expect(screen.getAllByPlaceholderText(/feature\.moderation\.modal\.content\.placeholder/)).toHaveLength(1)
 
-    fireEvent.click(switches[0])
+    fireEvent.click(switches[0]!)
 
     expect(screen.queryAllByPlaceholderText(/feature\.moderation\.modal\.content\.placeholder/)).toHaveLength(0)
   })
@@ -488,7 +519,7 @@ describe('ModerationSettingModal', () => {
     const switches = screen.getAllByRole('switch')
     expect(screen.getAllByPlaceholderText(/feature\.moderation\.modal\.content\.placeholder/)).toHaveLength(1)
 
-    fireEvent.click(switches[1])
+    fireEvent.click(switches[1]!)
 
     expect(screen.getAllByPlaceholderText(/feature\.moderation\.modal\.content\.placeholder/)).toHaveLength(2)
   })
@@ -594,7 +625,8 @@ describe('ModerationSettingModal', () => {
     fireEvent.click(screen.getByText(/apiBasedExtension\.selector\.title/))
 
     // API selector should now be visible, keywords textarea should be hidden
-    expect(screen.getByTestId('api-selector')).toBeInTheDocument()
+    // API selector should now be visible, keywords textarea should be hidden
+    expect(screen.getByTestId('api-selector'))!.toBeInTheDocument()
     expect(screen.queryByPlaceholderText(/feature\.moderation\.modal\.keywords\.placeholder/)).not.toBeInTheDocument()
   })
 
@@ -638,7 +670,7 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/feature\.moderation\.modal\.openaiNotConfig\.before/)).toBeInTheDocument()
+    expect(screen.getByText(/feature\.moderation\.modal\.openaiNotConfig\.before/))!.toBeInTheDocument()
   })
 
   it('should open settings modal when provider link is clicked in OpenAI warning', async () => {
@@ -670,7 +702,7 @@ describe('ModerationSettingModal', () => {
 
     expect(mockSetShowAccountSettingModal).toHaveBeenCalled()
 
-    const modalCall = mockSetShowAccountSettingModal.mock.calls[0][0]
+    const modalCall = mockSetShowAccountSettingModal.mock.calls[0]![0]
     modalCall.onCancelCallback()
     expect(mockModelProvidersData.refetch).toHaveBeenCalled()
   })
@@ -726,7 +758,7 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    expect(screen.getByText('Custom Extension')).toBeInTheDocument()
+    expect(screen.getByText('Custom Extension'))!.toBeInTheDocument()
   })
 
   it('should show form generation when code-based extension is selected', async () => {
@@ -750,8 +782,8 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    expect(screen.getByText('API URL')).toBeInTheDocument()
-    expect(screen.getByPlaceholderText('Enter URL')).toBeInTheDocument()
+    expect(screen.getByText('API URL'))!.toBeInTheDocument()
+    expect(screen.getByPlaceholderText('Enter URL'))!.toBeInTheDocument()
   })
 
   it('should initialize config from form schema when switching to code-based extension', async () => {
@@ -779,7 +811,8 @@ describe('ModerationSettingModal', () => {
     fireEvent.click(screen.getByText('Custom Extension'))
 
     // The form input should use the default value from form schema
-    expect(screen.getByDisplayValue('https://default.com')).toBeInTheDocument()
+    // The form input should use the default value from form schema
+    expect(screen.getByDisplayValue('https://default.com'))!.toBeInTheDocument()
   })
 
   it('should show error when required form schema field is empty on save', async () => {
@@ -882,7 +915,7 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/apiBasedExtension\.link/)).toBeInTheDocument()
+    expect(screen.getByText(/apiBasedExtension\.link/))!.toBeInTheDocument()
   })
 
   it('should fallback missing inputs_config to disabled in formatted save data', async () => {
@@ -933,7 +966,7 @@ describe('ModerationSettingModal', () => {
     )
 
     const textarea = screen.getAllByRole('textbox')[0]
-    expect(textarea).toHaveAttribute('placeholder', '')
+    expect(textarea)!.toHaveAttribute('placeholder', '')
     useTranslationSpy.mockRestore()
   })
 })
diff --git a/web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx b/web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx
index 1247321bd8..438af2e9a1 100644
--- a/web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx
+++ b/web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx
@@ -205,8 +205,8 @@ const ModerationSettingModal: FC<ModerationSettingModalProps> = ({
 
     if (systemTypes.findIndex(t => t === localeData.type) < 0 && currentProvider?.form_schema) {
       for (let i = 0; i < currentProvider.form_schema.length; i++) {
-        if (!localeData.config?.[currentProvider.form_schema[i].variable] && currentProvider.form_schema[i].required) {
-          toast.error(t('errorMessage.valueOfVarRequired', { ns: 'appDebug', key: locale !== LanguagesSupported[1] ? currentProvider.form_schema[i].label['en-US'] : currentProvider.form_schema[i].label['zh-Hans'] }))
+        if (!localeData.config?.[currentProvider.form_schema[i]!.variable] && currentProvider.form_schema[i]!.required) {
+          toast.error(t('errorMessage.valueOfVarRequired', { ns: 'appDebug', key: locale !== LanguagesSupported[1] ? currentProvider.form_schema[i]!.label['en-US'] : currentProvider.form_schema[i]!.label['zh-Hans'] }))
           return
         }
       }
diff --git a/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/param-config-content.spec.tsx b/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/param-config-content.spec.tsx
index 535d40e00a..754bde98a6 100644
--- a/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/param-config-content.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/param-config-content.spec.tsx
@@ -83,35 +83,35 @@ describe('ParamConfigContent', () => {
     it('should render voice settings title', () => {
       renderWithProvider()
 
-      expect(screen.getByText(/voice\.voiceSettings\.title/)).toBeInTheDocument()
+      expect(screen.getByText(/voice\.voiceSettings\.title/))!.toBeInTheDocument()
     })
 
     it('should render language label', () => {
       renderWithProvider()
 
-      expect(screen.getByText(/voice\.voiceSettings\.language/)).toBeInTheDocument()
+      expect(screen.getByText(/voice\.voiceSettings\.language/))!.toBeInTheDocument()
     })
 
     it('should render voice label', () => {
       renderWithProvider()
 
-      expect(screen.getByText(/voice\.voiceSettings\.voice/)).toBeInTheDocument()
+      expect(screen.getByText(/voice\.voiceSettings\.voice/))!.toBeInTheDocument()
     })
 
     it('should render autoPlay toggle', () => {
       renderWithProvider()
 
-      expect(screen.getByText(/voice\.voiceSettings\.autoPlay/)).toBeInTheDocument()
-      expect(screen.getByRole('switch')).toBeInTheDocument()
+      expect(screen.getByText(/voice\.voiceSettings\.autoPlay/))!.toBeInTheDocument()
+      expect(screen.getByRole('switch'))!.toBeInTheDocument()
     })
 
     it('should render tooltip icon for language', () => {
       renderWithProvider()
 
       const languageLabel = screen.getByText(/voice\.voiceSettings\.language/)
-      expect(languageLabel).toBeInTheDocument()
+      expect(languageLabel)!.toBeInTheDocument()
       const tooltip = languageLabel.parentElement as HTMLElement
-      expect(tooltip.querySelector('svg')).toBeInTheDocument()
+      expect(tooltip.querySelector('svg'))!.toBeInTheDocument()
     })
 
     it('should display language listbox button', () => {
@@ -126,14 +126,14 @@ describe('ParamConfigContent', () => {
 
       const buttons = screen.getAllByRole('button')
       const voiceButton = buttons.find(btn => btn.textContent?.includes('Alloy'))
-      expect(voiceButton).toBeInTheDocument()
+      expect(voiceButton)!.toBeInTheDocument()
     })
 
     it('should render audition button when language has example', () => {
       renderWithProvider()
 
       const auditionButton = screen.queryByTestId('audition-button')
-      expect(auditionButton).toBeInTheDocument()
+      expect(auditionButton)!.toBeInTheDocument()
     })
 
     it('should not render audition button when language has no example', () => {
@@ -164,7 +164,7 @@ describe('ParamConfigContent', () => {
 
       const buttons = screen.getAllByRole('button')
       const voiceButton = buttons.find(btn => btn.textContent?.includes('Alloy'))
-      expect(voiceButton).toBeInTheDocument()
+      expect(voiceButton)!.toBeInTheDocument()
     })
   })
 
@@ -221,11 +221,11 @@ describe('ParamConfigContent', () => {
       )
 
       const autoPlaySwitch = screen.getByRole('switch')
-      expect(autoPlaySwitch).toHaveAttribute('aria-checked', 'true')
+      expect(autoPlaySwitch)!.toHaveAttribute('aria-checked', 'true')
 
       await userEvent.click(autoPlaySwitch)
 
-      expect(autoPlaySwitch).toHaveAttribute('aria-checked', 'false')
+      expect(autoPlaySwitch)!.toHaveAttribute('aria-checked', 'false')
       expect(onChange).toHaveBeenCalled()
     })
 
@@ -234,7 +234,7 @@ describe('ParamConfigContent', () => {
 
       await userEvent.click(screen.getByRole('switch'))
 
-      expect(screen.getByRole('switch')).toBeInTheDocument()
+      expect(screen.getByRole('switch'))!.toBeInTheDocument()
     })
 
     it('should open language listbox and show options', async () => {
@@ -259,7 +259,7 @@ describe('ParamConfigContent', () => {
       await userEvent.click(languageButton!)
       const options = await screen.findAllByRole('option')
       expect(options.length).toBeGreaterThan(1)
-      await userEvent.click(options[1])
+      await userEvent.click(options[1]!)
       expect(onChange).toHaveBeenCalled()
     })
 
@@ -273,7 +273,7 @@ describe('ParamConfigContent', () => {
       await userEvent.click(voiceButton!)
       const options = await screen.findAllByRole('option')
       expect(options.length).toBeGreaterThan(1)
-      await userEvent.click(options[1])
+      await userEvent.click(options[1]!)
       expect(onChange).toHaveBeenCalled()
     })
 
@@ -289,7 +289,7 @@ describe('ParamConfigContent', () => {
 
       const selectedOption = options.find(opt => opt.textContent?.includes('voice.language.enUS'))
       expect(selectedOption).toBeDefined()
-      expect(selectedOption).toHaveAttribute('aria-selected', 'true')
+      expect(selectedOption)!.toHaveAttribute('aria-selected', 'true')
     })
 
     it('should show selected voice option in listbox', async () => {
@@ -304,7 +304,7 @@ describe('ParamConfigContent', () => {
 
       const selectedOption = options.find(opt => opt.textContent?.includes('Alloy'))
       expect(selectedOption).toBeDefined()
-      expect(selectedOption).toHaveAttribute('aria-selected', 'true')
+      expect(selectedOption)!.toHaveAttribute('aria-selected', 'true')
     })
   })
 
@@ -343,7 +343,7 @@ describe('ParamConfigContent', () => {
         text2speech: { enabled: true, language: '', voice: '', autoPlay: TtsAutoPlay.disabled },
       })
 
-      expect(screen.getByText(/voice\.language\./)).toBeInTheDocument()
+      expect(screen.getByText(/voice\.language\./))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/voice-settings.spec.tsx b/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/voice-settings.spec.tsx
index f77802c133..574aeddd4a 100644
--- a/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/voice-settings.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/voice-settings.spec.tsx
@@ -78,7 +78,7 @@ describe('VoiceSettings', () => {
       </VoiceSettings>,
     )
 
-    expect(screen.getByText('Settings')).toBeInTheDocument()
+    expect(screen.getByText('Settings'))!.toBeInTheDocument()
   })
 
   it('should render ParamConfigContent in portal', () => {
@@ -88,7 +88,7 @@ describe('VoiceSettings', () => {
       </VoiceSettings>,
     )
 
-    expect(screen.getByText(/voice\.voiceSettings\.title/)).toBeInTheDocument()
+    expect(screen.getByText(/voice\.voiceSettings\.title/))!.toBeInTheDocument()
   })
 
   it('should call onOpen with toggle function when trigger is clicked', () => {
@@ -103,7 +103,7 @@ describe('VoiceSettings', () => {
 
     expect(onOpen).toHaveBeenCalled()
     // The toggle function should flip the open state
-    const toggleFn = onOpen.mock.calls[0][0]
+    const toggleFn = onOpen.mock.calls[0]![0]
     expect(typeof toggleFn).toBe('function')
     expect(toggleFn(false)).toBe(true)
     expect(toggleFn(true)).toBe(false)
@@ -146,7 +146,7 @@ describe('VoiceSettings', () => {
       .find(item => item.hasAttribute('data-main-axis'))
 
     expect(portal).toBeDefined()
-    expect(portal).toHaveAttribute('data-placement', 'top')
-    expect(portal).toHaveAttribute('data-main-axis', '4')
+    expect(portal)!.toHaveAttribute('data-placement', 'top')
+    expect(portal)!.toHaveAttribute('data-main-axis', '4')
   })
 })
diff --git a/web/app/components/base/file-uploader/__tests__/hooks.spec.ts b/web/app/components/base/file-uploader/__tests__/hooks.spec.ts
index 017a139163..e9c3675c2f 100644
--- a/web/app/components/base/file-uploader/__tests__/hooks.spec.ts
+++ b/web/app/components/base/file-uploader/__tests__/hooks.spec.ts
@@ -225,7 +225,7 @@ describe('useFile', () => {
       const { result } = renderHook(() => useFile(defaultFileConfig))
       result.current.handleReUploadFile('file-1')
 
-      const uploadCall = mockFileUpload.mock.calls[0][0]
+      const uploadCall = mockFileUpload.mock.calls[0]![0]
       uploadCall.onProgressCallback(50)
       expect(mockSetFiles).toHaveBeenCalled()
     })
@@ -246,7 +246,7 @@ describe('useFile', () => {
       const { result } = renderHook(() => useFile(defaultFileConfig))
       result.current.handleReUploadFile('file-1')
 
-      const uploadCall = mockFileUpload.mock.calls[0][0]
+      const uploadCall = mockFileUpload.mock.calls[0]![0]
       uploadCall.onSuccessCallback({ id: 'uploaded-1' })
       expect(mockSetFiles).toHaveBeenCalled()
     })
@@ -267,7 +267,7 @@ describe('useFile', () => {
       const { result } = renderHook(() => useFile(defaultFileConfig))
       result.current.handleReUploadFile('file-1')
 
-      const uploadCall = mockFileUpload.mock.calls[0][0]
+      const uploadCall = mockFileUpload.mock.calls[0]![0]
       uploadCall.onErrorCallback(new Error('fail'))
       expect(mockNotify).toHaveBeenCalledWith(expect.objectContaining({ type: 'error' }))
     })
@@ -668,7 +668,7 @@ describe('useFile', () => {
 
       expect(mockSetFiles).toHaveBeenCalled()
       // The file should have been added with base64Url set (for image type)
-      const addedFiles = mockSetFiles.mock.calls[0][0]
+      const addedFiles = mockSetFiles.mock.calls[0]![0]
       expect(addedFiles[0].base64Url).toBe('data:text/plain;base64,Y29udGVudA==')
     })
 
@@ -680,7 +680,7 @@ describe('useFile', () => {
       result.current.handleLocalFileUpload(file)
 
       expect(mockSetFiles).toHaveBeenCalled()
-      const addedFiles = mockSetFiles.mock.calls[0][0]
+      const addedFiles = mockSetFiles.mock.calls[0]![0]
       expect(addedFiles[0].base64Url).toBe('')
     })
 
@@ -691,7 +691,7 @@ describe('useFile', () => {
       result.current.handleLocalFileUpload(file)
 
       expect(mockFileUpload).toHaveBeenCalled()
-      const uploadCall = mockFileUpload.mock.calls[0][0]
+      const uploadCall = mockFileUpload.mock.calls[0]![0]
 
       // Test progress callback
       uploadCall.onProgressCallback(50)
@@ -708,7 +708,7 @@ describe('useFile', () => {
       const { result } = renderHook(() => useFile(defaultFileConfig))
       result.current.handleLocalFileUpload(file)
 
-      const uploadCall = mockFileUpload.mock.calls[0][0]
+      const uploadCall = mockFileUpload.mock.calls[0]![0]
       uploadCall.onErrorCallback(new Error('upload failed'))
 
       expect(mockNotify).toHaveBeenCalledWith(expect.objectContaining({ type: 'error' }))
diff --git a/web/app/components/base/file-uploader/__tests__/utils.spec.ts b/web/app/components/base/file-uploader/__tests__/utils.spec.ts
index 7a4956307d..4c85bfa3f8 100644
--- a/web/app/components/base/file-uploader/__tests__/utils.spec.ts
+++ b/web/app/components/base/file-uploader/__tests__/utils.spec.ts
@@ -340,7 +340,7 @@ describe('file-uploader utils', () => {
       }] as unknown as FileEntity[]
 
       const result = getProcessedFiles(files)
-      expect(result[0].url).toBe('')
+      expect(result[0]!.url).toBe('')
     })
 
     it('should fallback to empty string when uploadedId is missing', () => {
@@ -357,7 +357,7 @@ describe('file-uploader utils', () => {
       }] as unknown as FileEntity[]
 
       const result = getProcessedFiles(files)
-      expect(result[0].upload_file_id).toBe('')
+      expect(result[0]!.upload_file_id).toBe('')
     })
 
     it('should filter out files with progress -1', () => {
@@ -384,7 +384,7 @@ describe('file-uploader utils', () => {
 
       const result = getProcessedFiles(files)
       expect(result).toHaveLength(1)
-      expect(result[0].upload_file_id).toBe('1')
+      expect(result[0]!.upload_file_id).toBe('1')
     })
   })
 
@@ -432,7 +432,7 @@ describe('file-uploader utils', () => {
       }]
 
       const result = getProcessedFilesFromResponse(files)
-      expect(result[0].supportFileType).toBe('image')
+      expect(result[0]!.supportFileType).toBe('image')
     })
 
     it('should correct video file misclassified as document', () => {
@@ -450,7 +450,7 @@ describe('file-uploader utils', () => {
       }]
 
       const result = getProcessedFilesFromResponse(files)
-      expect(result[0].supportFileType).toBe('video')
+      expect(result[0]!.supportFileType).toBe('video')
     })
 
     it('should correct audio file misclassified as document', () => {
@@ -468,7 +468,7 @@ describe('file-uploader utils', () => {
       }]
 
       const result = getProcessedFilesFromResponse(files)
-      expect(result[0].supportFileType).toBe('audio')
+      expect(result[0]!.supportFileType).toBe('audio')
     })
 
     it('should correct document file misclassified as image', () => {
@@ -486,7 +486,7 @@ describe('file-uploader utils', () => {
       }]
 
       const result = getProcessedFilesFromResponse(files)
-      expect(result[0].supportFileType).toBe('document')
+      expect(result[0]!.supportFileType).toBe('document')
     })
 
     it('should NOT correct when filename and MIME type conflict', () => {
@@ -504,7 +504,7 @@ describe('file-uploader utils', () => {
       }]
 
       const result = getProcessedFilesFromResponse(files)
-      expect(result[0].supportFileType).toBe('document')
+      expect(result[0]!.supportFileType).toBe('document')
     })
 
     it('should NOT correct when filename and MIME type both point to same type', () => {
@@ -522,7 +522,7 @@ describe('file-uploader utils', () => {
       }]
 
       const result = getProcessedFilesFromResponse(files)
-      expect(result[0].supportFileType).toBe('image')
+      expect(result[0]!.supportFileType).toBe('image')
     })
 
     it('should handle files with missing filename', () => {
@@ -540,7 +540,7 @@ describe('file-uploader utils', () => {
       }]
 
       const result = getProcessedFilesFromResponse(files)
-      expect(result[0].supportFileType).toBe('document')
+      expect(result[0]!.supportFileType).toBe('document')
     })
 
     it('should handle files with missing MIME type', () => {
@@ -558,7 +558,7 @@ describe('file-uploader utils', () => {
       }]
 
       const result = getProcessedFilesFromResponse(files)
-      expect(result[0].supportFileType).toBe('document')
+      expect(result[0]!.supportFileType).toBe('document')
     })
 
     it('should handle files with unknown extensions', () => {
@@ -576,7 +576,7 @@ describe('file-uploader utils', () => {
       }]
 
       const result = getProcessedFilesFromResponse(files)
-      expect(result[0].supportFileType).toBe('document')
+      expect(result[0]!.supportFileType).toBe('document')
     })
 
     it('should handle multiple different file types correctly', () => {
@@ -621,9 +621,9 @@ describe('file-uploader utils', () => {
 
       const result = getProcessedFilesFromResponse(files)
 
-      expect(result[0].supportFileType).toBe('image') // correct, no change
-      expect(result[1].supportFileType).toBe('image') // corrected from document to image
-      expect(result[2].supportFileType).toBe('document') // conflict, no change
+      expect(result[0]!.supportFileType).toBe('image') // correct, no change
+      expect(result[1]!.supportFileType).toBe('image') // corrected from document to image
+      expect(result[2]!.supportFileType).toBe('document') // conflict, no change
     })
   })
 
diff --git a/web/app/components/base/file-uploader/file-input.tsx b/web/app/components/base/file-uploader/file-input.tsx
index 56d71f59ab..f4cd4514e7 100644
--- a/web/app/components/base/file-uploader/file-input.tsx
+++ b/web/app/components/base/file-uploader/file-input.tsx
@@ -19,11 +19,11 @@ const FileInput = ({
       if (fileConfig.number_limits) {
         for (let i = 0; i < targetFiles.length; i++) {
           if (i + 1 + files.length <= fileConfig.number_limits)
-            handleLocalFileUpload(targetFiles[i])
+            handleLocalFileUpload(targetFiles[i]!)
         }
       }
       else {
-        handleLocalFileUpload(targetFiles[0])
+        handleLocalFileUpload(targetFiles[0]!)
       }
     }
   }
diff --git a/web/app/components/base/file-uploader/file-uploader-in-attachment/__tests__/file-item.spec.tsx b/web/app/components/base/file-uploader/file-uploader-in-attachment/__tests__/file-item.spec.tsx
index b2198680f5..002eced6ca 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-attachment/__tests__/file-item.spec.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-attachment/__tests__/file-item.spec.tsx
@@ -33,20 +33,20 @@ describe('FileInAttachmentItem', () => {
   it('should render file name and extension', () => {
     render(<FileInAttachmentItem file={createFile()} />)
 
-    expect(screen.getByText(/document\.pdf/i)).toBeInTheDocument()
-    expect(screen.getByText(/^pdf$/i)).toBeInTheDocument()
+    expect(screen.getByText(/document\.pdf/i))!.toBeInTheDocument()
+    expect(screen.getByText(/^pdf$/i))!.toBeInTheDocument()
   })
 
   it('should render file size', () => {
     render(<FileInAttachmentItem file={createFile({ size: 2048 })} />)
 
-    expect(screen.getByText(/2048B/)).toBeInTheDocument()
+    expect(screen.getByText(/2048B/))!.toBeInTheDocument()
   })
 
   it('should render FileTypeIcon for non-image files', () => {
     const { container } = render(<FileInAttachmentItem file={createFile()} />)
 
-    expect(container.querySelector('svg')).toBeInTheDocument()
+    expect(container.querySelector('svg'))!.toBeInTheDocument()
   })
 
   it('should render FileImageRender for image files', () => {
@@ -59,8 +59,8 @@ describe('FileInAttachmentItem', () => {
     )
 
     const img = screen.getByRole('img')
-    expect(img).toBeInTheDocument()
-    expect(img).toHaveAttribute('src', 'data:image/png;base64,abc')
+    expect(img)!.toBeInTheDocument()
+    expect(img)!.toHaveAttribute('src', 'data:image/png;base64,abc')
   })
 
   it('should render delete button when showDeleteAction is true', () => {
@@ -102,9 +102,9 @@ describe('FileInAttachmentItem', () => {
 
     // ProgressCircle renders an SVG with a <circle> and <path> element
     const svg = container.querySelector('svg')
-    expect(svg).toBeInTheDocument()
+    expect(svg)!.toBeInTheDocument()
     const circle = container.querySelector('circle')
-    expect(circle).toBeInTheDocument()
+    expect(circle)!.toBeInTheDocument()
   })
 
   it('should render replay icon when upload failed', () => {
@@ -112,7 +112,7 @@ describe('FileInAttachmentItem', () => {
 
     // ReplayLine renders an SVG with data-icon="ReplayLine"
     const replayIcon = container.querySelector('[data-icon="ReplayLine"]')
-    expect(replayIcon).toBeInTheDocument()
+    expect(replayIcon)!.toBeInTheDocument()
   })
 
   it('should call onReUpload when replay icon is clicked', () => {
@@ -131,7 +131,7 @@ describe('FileInAttachmentItem', () => {
 
     // Error state is confirmed by the presence of the replay icon
     const replayIcon = container.querySelector('[data-icon="ReplayLine"]')
-    expect(replayIcon).toBeInTheDocument()
+    expect(replayIcon)!.toBeInTheDocument()
   })
 
   it('should render eye icon for previewable image files', () => {
@@ -164,7 +164,7 @@ describe('FileInAttachmentItem', () => {
     // The eye button is rendered before the download button for image files
     const buttons = screen.getAllByRole('button')
     // Click the eye button (the first action button for image preview)
-    fireEvent.click(buttons[0])
+    fireEvent.click(buttons[0]!)
 
     // ImagePreview renders a portal with an img element
     const previewImages = document.querySelectorAll('img')
@@ -184,16 +184,47 @@ describe('FileInAttachmentItem', () => {
     )
 
     const buttons = screen.getAllByRole('button')
-    fireEvent.click(buttons[0])
+    fireEvent.click(buttons[0]!)
 
     // ImagePreview renders via createPortal with class "image-preview-container"
     const previewContainer = document.querySelector('.image-preview-container')!
-    expect(previewContainer).toBeInTheDocument()
+    expect(previewContainer)!.toBeInTheDocument()
 
     // Close button is the last clickable div with an SVG in the preview container
     const closeIcon = screen.getByTestId('image-preview-close-button')
     fireEvent.click(closeIcon.parentElement!)
 
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
+    // Preview should be removed
     // Preview should be removed
     expect(document.querySelector('.image-preview-container')).not.toBeInTheDocument()
   })
@@ -287,7 +318,7 @@ describe('FileInAttachmentItem', () => {
     )
 
     const img = screen.getByRole('img')
-    expect(img).toHaveAttribute('src', 'https://example.com/img.png')
+    expect(img)!.toHaveAttribute('src', 'https://example.com/img.png')
   })
 
   it('should render image element even when both urls are empty', () => {
@@ -301,7 +332,7 @@ describe('FileInAttachmentItem', () => {
     )
 
     const img = screen.getByRole('img')
-    expect(img).toBeInTheDocument()
+    expect(img)!.toBeInTheDocument()
   })
 
   it('should not render eye icon when canPreview is false for image files', () => {
@@ -347,7 +378,8 @@ describe('FileInAttachmentItem', () => {
     render(<FileInAttachmentItem file={createFile({ name: 'noext' })} />)
 
     // The file name should still show
-    expect(screen.getByText(/noext/)).toBeInTheDocument()
+    // The file name should still show
+    expect(screen.getByText(/noext/))!.toBeInTheDocument()
   })
 
   it('should show image preview with empty url when url is undefined', () => {
@@ -364,8 +396,70 @@ describe('FileInAttachmentItem', () => {
 
     const buttons = screen.getAllByRole('button')
     // Click the eye preview button
-    fireEvent.click(buttons[0])
+    fireEvent.click(buttons[0]!)
 
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
+    // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
+    // Empty string is falsy, so preview should NOT render
     // setImagePreviewUrl(url || '') = setImagePreviewUrl('')
     // Empty string is falsy, so preview should NOT render
     expect(document.querySelector('.image-preview-container')).not.toBeInTheDocument()
diff --git a/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-image-item.spec.tsx b/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-image-item.spec.tsx
index 2bc418cf1d..cfe6719b20 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-image-item.spec.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-image-item.spec.tsx
@@ -30,15 +30,15 @@ describe('FileImageItem', () => {
     render(<FileImageItem file={createFile()} />)
 
     const img = screen.getByRole('img')
-    expect(img).toBeInTheDocument()
-    expect(img).toHaveAttribute('src', 'data:image/png;base64,abc')
+    expect(img)!.toBeInTheDocument()
+    expect(img)!.toHaveAttribute('src', 'data:image/png;base64,abc')
   })
 
   it('should use url when base64Url is not available', () => {
     render(<FileImageItem file={createFile({ base64Url: undefined })} />)
 
     const img = screen.getByRole('img')
-    expect(img).toHaveAttribute('src', 'https://example.com/photo.png')
+    expect(img)!.toHaveAttribute('src', 'https://example.com/photo.png')
   })
 
   it('should render delete button when showDeleteAction is true', () => {
@@ -53,7 +53,7 @@ describe('FileImageItem', () => {
     render(<FileImageItem file={createFile()} showDeleteAction onRemove={onRemove} />)
 
     const buttons = screen.getAllByRole('button')
-    fireEvent.click(buttons[0])
+    fireEvent.click(buttons[0]!)
 
     expect(onRemove).toHaveBeenCalledWith('file-1')
   })
@@ -65,7 +65,7 @@ describe('FileImageItem', () => {
 
     const svgs = container.querySelectorAll('svg')
     const progressSvg = Array.from(svgs).find(svg => svg.querySelector('circle'))
-    expect(progressSvg).toBeInTheDocument()
+    expect(progressSvg)!.toBeInTheDocument()
   })
 
   it('should render replay icon when upload failed', () => {
@@ -73,7 +73,7 @@ describe('FileImageItem', () => {
 
     // ReplayLine renders as an SVG icon with data-icon attribute
     const replaySvg = container.querySelector('svg[data-icon="ReplayLine"]')
-    expect(replaySvg).toBeInTheDocument()
+    expect(replaySvg)!.toBeInTheDocument()
   })
 
   it('should call onReUpload when replay icon is clicked', () => {
@@ -96,7 +96,8 @@ describe('FileImageItem', () => {
     fireEvent.click(img.parentElement!)
 
     // ImagePreview renders via createPortal with class "image-preview-container", not role="dialog"
-    expect(document.querySelector('.image-preview-container')).toBeInTheDocument()
+    // ImagePreview renders via createPortal with class "image-preview-container", not role="dialog"
+    expect(document.querySelector('.image-preview-container'))!.toBeInTheDocument()
   })
 
   it('should not show image preview when canPreview is false', () => {
@@ -115,7 +116,7 @@ describe('FileImageItem', () => {
     fireEvent.click(img.parentElement!)
     // ImagePreview renders via createPortal with class "image-preview-container"
     const previewContainer = document.querySelector('.image-preview-container')!
-    expect(previewContainer).toBeInTheDocument()
+    expect(previewContainer)!.toBeInTheDocument()
 
     // Close button is the last clickable div with an SVG in the preview container
     const closeIcon = screen.getByTestId('image-preview-close-button')
@@ -156,14 +157,14 @@ describe('FileImageItem', () => {
     render(<FileImageItem file={createFile({ base64Url: undefined, url: 'https://example.com/img.png' })} />)
 
     const img = screen.getByRole('img')
-    expect(img).toHaveAttribute('src', 'https://example.com/img.png')
+    expect(img)!.toHaveAttribute('src', 'https://example.com/img.png')
   })
 
   it('should render image element even when both base64Url and url are undefined', () => {
     render(<FileImageItem file={createFile({ base64Url: undefined, url: undefined })} />)
 
     const img = screen.getByRole('img')
-    expect(img).toBeInTheDocument()
+    expect(img)!.toBeInTheDocument()
   })
 
   it('should use url with attachment param for download_url when url is available', async () => {
@@ -205,7 +206,7 @@ describe('FileImageItem', () => {
     const img = screen.getByRole('img')
     fireEvent.click(img.parentElement!)
 
-    expect(document.querySelector('.image-preview-container')).toBeInTheDocument()
+    expect(document.querySelector('.image-preview-container'))!.toBeInTheDocument()
   })
 
   it('should set preview url using url when base64Url is not available', () => {
@@ -214,7 +215,7 @@ describe('FileImageItem', () => {
     const img = screen.getByRole('img')
     fireEvent.click(img.parentElement!)
 
-    expect(document.querySelector('.image-preview-container')).toBeInTheDocument()
+    expect(document.querySelector('.image-preview-container'))!.toBeInTheDocument()
   })
 
   it('should set preview url to empty string when both base64Url and url are undefined', () => {
@@ -223,6 +224,37 @@ describe('FileImageItem', () => {
     const img = screen.getByRole('img')
     fireEvent.click(img.parentElement!)
 
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
+    // Preview won't show because imagePreviewUrl is empty string (falsy)
     // Preview won't show because imagePreviewUrl is empty string (falsy)
     expect(document.querySelector('.image-preview-container')).not.toBeInTheDocument()
   })
diff --git a/web/app/components/base/file-uploader/hooks.ts b/web/app/components/base/file-uploader/hooks.ts
index 6c7b75aebf..2df4b005af 100644
--- a/web/app/components/base/file-uploader/hooks.ts
+++ b/web/app/components/base/file-uploader/hooks.ts
@@ -151,13 +151,13 @@ export const useFile = (fileConfig: FileUpload, noNeedToCheckEnable = true) => {
     const index = files.findIndex(file => file.id === fileId)
 
     if (index > -1) {
-      const uploadingFile = files[index]
+      const uploadingFile = files[index]!
       const newFiles = produce(files, (draft) => {
-        draft[index].progress = 0
+        draft[index]!.progress = 0
       })
       setFiles(newFiles)
       fileUpload({
-        file: uploadingFile.originalFile!,
+        file: uploadingFile!.originalFile!,
         onProgressCallback: (progress) => {
           handleUpdateFile({ ...uploadingFile, progress })
         },
diff --git a/web/app/components/base/file-uploader/utils.ts b/web/app/components/base/file-uploader/utils.ts
index 23e460db51..3229667bd2 100644
--- a/web/app/components/base/file-uploader/utils.ts
+++ b/web/app/components/base/file-uploader/utils.ts
@@ -95,7 +95,7 @@ export const getFileExtension = (fileName: string, fileMimetype: string, isRemot
     const fileNamePairLength = fileNamePair.length
 
     if (fileNamePairLength > 1) {
-      extensionInFileName = fileNamePair[fileNamePairLength - 1].toLowerCase()
+      extensionInFileName = fileNamePair[fileNamePairLength - 1]!.toLowerCase()
       if (extensions.has(extensionInFileName))
         extension = extensionInFileName
     }
@@ -122,13 +122,13 @@ export const getFileAppearanceType = (fileName: string, fileMimetype: string) =>
   if (extension === 'gif')
     return FileAppearanceTypeEnum.gif
 
-  if (FILE_EXTS.image.includes(extension.toUpperCase()))
+  if (FILE_EXTS.image!.includes(extension.toUpperCase()))
     return FileAppearanceTypeEnum.image
 
-  if (FILE_EXTS.video.includes(extension.toUpperCase()))
+  if (FILE_EXTS.video!.includes(extension.toUpperCase()))
     return FileAppearanceTypeEnum.video
 
-  if (FILE_EXTS.audio.includes(extension.toUpperCase()))
+  if (FILE_EXTS.audio!.includes(extension.toUpperCase()))
     return FileAppearanceTypeEnum.audio
 
   if (extension === 'html')
@@ -149,7 +149,7 @@ export const getFileAppearanceType = (fileName: string, fileMimetype: string) =>
   if (extension === 'pptx' || extension === 'ppt')
     return FileAppearanceTypeEnum.ppt
 
-  if (FILE_EXTS.document.includes(extension.toUpperCase()))
+  if (FILE_EXTS.document!.includes(extension.toUpperCase()))
     return FileAppearanceTypeEnum.document
 
   return FileAppearanceTypeEnum.custom
@@ -161,7 +161,7 @@ export const getSupportFileType = (fileName: string, fileMimetype: string, isCus
 
   const extension = getFileExtension(fileName, fileMimetype)
   for (const key in FILE_EXTS) {
-    if ((FILE_EXTS[key]).includes(extension.toUpperCase()))
+    if ((FILE_EXTS[key])!.includes(extension.toUpperCase()))
       return key
   }
 
diff --git a/web/app/components/base/form/components/base/__tests__/base-form.spec.tsx b/web/app/components/base/form/components/base/__tests__/base-form.spec.tsx
index 387dcb0658..e89b0e6271 100644
--- a/web/app/components/base/form/components/base/__tests__/base-form.spec.tsx
+++ b/web/app/components/base/form/components/base/__tests__/base-form.spec.tsx
@@ -60,8 +60,8 @@ describe('BaseForm', () => {
   it('should render fields with default values from schema', () => {
     render(<BaseForm formSchemas={baseSchemas} />)
 
-    expect(screen.getByDisplayValue('show')).toBeInTheDocument()
-    expect(screen.getByDisplayValue('Initial title')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('show'))!.toBeInTheDocument()
+    expect(screen.getByDisplayValue('Initial title'))!.toBeInTheDocument()
   })
 
   it('should hide conditional fields when show_on conditions are not met', () => {
@@ -72,7 +72,7 @@ describe('BaseForm', () => {
       />,
     )
 
-    expect(screen.getByDisplayValue('hide')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('hide'))!.toBeInTheDocument()
     expect(screen.queryByDisplayValue('Hidden title')).not.toBeInTheDocument()
   })
 
@@ -117,8 +117,8 @@ describe('BaseForm', () => {
       ])
     })
 
-    expect(screen.getByDisplayValue('Changed title')).toBeInTheDocument()
-    expect(screen.getByText('Title is invalid')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('Changed title'))!.toBeInTheDocument()
+    expect(screen.getByText('Title is invalid'))!.toBeInTheDocument()
     expect(formRef.current?.getForm()).toBeTruthy()
     expect(formRef.current?.getFormValues({})).toBeTruthy()
   })
@@ -141,7 +141,7 @@ describe('BaseForm', () => {
       ])
     })
 
-    expect(screen.getByText('Title warning')).toBeInTheDocument()
+    expect(screen.getByText('Title warning'))!.toBeInTheDocument()
   })
 
   it('should use formFromProps if provided', () => {
@@ -160,7 +160,7 @@ describe('BaseForm', () => {
       setFieldValue: vi.fn(),
     }
     render(<BaseForm formSchemas={baseSchemas} formFromProps={mockForm as unknown as AnyFormApi} />)
-    expect(screen.getByText('Kind')).toBeInTheDocument()
+    expect(screen.getByText('Kind'))!.toBeInTheDocument()
   })
 
   it('should handle setFields with explicit validateStatus', async () => {
@@ -174,7 +174,7 @@ describe('BaseForm', () => {
         errors: ['Explicit error'],
       }])
     })
-    expect(screen.getByText('Explicit error')).toBeInTheDocument()
+    expect(screen.getByText('Explicit error'))!.toBeInTheDocument()
   })
 
   it('should handle setFields with no value change', async () => {
@@ -187,12 +187,12 @@ describe('BaseForm', () => {
         errors: ['Error only'],
       }])
     })
-    expect(screen.getByText('Error only')).toBeInTheDocument()
+    expect(screen.getByText('Error only'))!.toBeInTheDocument()
   })
 
   it('should use default values from schema when defaultValues prop is missing', () => {
     render(<BaseForm formSchemas={baseSchemas} />)
-    expect(screen.getByDisplayValue('show')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('show'))!.toBeInTheDocument()
   })
 
   it('should handle submit without preventDefaultSubmit', async () => {
@@ -225,23 +225,23 @@ describe('BaseForm', () => {
 
   it('should handle undefined formSchemas', () => {
     const { container } = render(<BaseForm formSchemas={undefined as unknown as FormSchema[]} />)
-    expect(container).toBeEmptyDOMElement()
+    expect(container)!.toBeEmptyDOMElement()
   })
 
   it('should handle empty array formSchemas', () => {
     const { container } = render(<BaseForm formSchemas={[]} />)
-    expect(container).toBeEmptyDOMElement()
+    expect(container)!.toBeEmptyDOMElement()
   })
 
   it('should fallback to schema class names if props are missing', () => {
     const schemaWithClasses: FormSchema[] = [{
-      ...baseSchemas[0],
+      ...baseSchemas[0]!,
       fieldClassName: 'schema-field',
       labelClassName: 'schema-label',
     }]
     render(<BaseForm formSchemas={schemaWithClasses} />)
-    expect(screen.getByText('Kind')).toHaveClass('schema-label')
-    expect(screen.getByText('Kind').parentElement).toHaveClass('schema-field')
+    expect(screen.getByText('Kind'))!.toHaveClass('schema-label')
+    expect(screen.getByText('Kind').parentElement)!.toHaveClass('schema-field')
   })
 
   it('should handle preventDefaultSubmit', async () => {
@@ -292,7 +292,7 @@ describe('BaseForm', () => {
         value: 'new-show',
       }])
     })
-    expect(screen.getByDisplayValue('new-show')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('new-show'))!.toBeInTheDocument()
   })
 
   it('should handle schema without show_on in showOnValues', () => {
@@ -304,7 +304,7 @@ describe('BaseForm', () => {
     }]
     // Simply rendering should trigger showOnValues selector
     render(<BaseForm formSchemas={schemaNoShowOn} />)
-    expect(screen.getByText('Test')).toBeInTheDocument()
+    expect(screen.getByText('Test'))!.toBeInTheDocument()
   })
 
   it('should apply prop-based class names', () => {
@@ -316,6 +316,6 @@ describe('BaseForm', () => {
       />,
     )
     const label = screen.getByText('Kind')
-    expect(label).toHaveClass('custom-label')
+    expect(label)!.toHaveClass('custom-label')
   })
 })
diff --git a/web/app/components/base/form/components/field/__tests__/file-uploader.spec.tsx b/web/app/components/base/form/components/field/__tests__/file-uploader.spec.tsx
index bff8e9cbf9..67716a00c8 100644
--- a/web/app/components/base/form/components/field/__tests__/file-uploader.spec.tsx
+++ b/web/app/components/base/form/components/field/__tests__/file-uploader.spec.tsx
@@ -60,8 +60,8 @@ describe('FileUploaderField', () => {
       />,
     )
 
-    expect(screen.getByText('Attachments')).toBeInTheDocument()
-    expect(screen.getByText('report.pdf')).toBeInTheDocument()
+    expect(screen.getByText('Attachments'))!.toBeInTheDocument()
+    expect(screen.getByText('report.pdf'))!.toBeInTheDocument()
   })
 
   it('should update field value when users remove a file', () => {
@@ -76,7 +76,7 @@ describe('FileUploaderField', () => {
     )
 
     const deleteButtons = screen.getAllByRole('button')
-    fireEvent.click(deleteButtons[1])
+    fireEvent.click(deleteButtons[1]!)
     expect(mockField.handleChange).toHaveBeenCalledWith([])
   })
 })
diff --git a/web/app/components/base/form/components/field/__tests__/variable-or-constant-input.spec.tsx b/web/app/components/base/form/components/field/__tests__/variable-or-constant-input.spec.tsx
index 4f1c9234fc..b4aa8bd24e 100644
--- a/web/app/components/base/form/components/field/__tests__/variable-or-constant-input.spec.tsx
+++ b/web/app/components/base/form/components/field/__tests__/variable-or-constant-input.spec.tsx
@@ -16,33 +16,33 @@ describe('VariableOrConstantInputField', () => {
 
   it('should render variable picker by default', () => {
     render(<VariableOrConstantInputField label="Input source" />)
-    expect(screen.getByRole('button', { name: 'Variable picker' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'Variable picker' }))!.toBeInTheDocument()
   })
 
   it('should switch to constant input when users choose constant', () => {
     render(<VariableOrConstantInputField label="Input source" />)
-    fireEvent.click(screen.getAllByRole('button')[1])
+    fireEvent.click(screen.getAllByRole('button')[1]!)
     expect(screen.queryByRole('button', { name: 'Variable picker' })).not.toBeInTheDocument()
-    expect(screen.getByRole('textbox')).toBeInTheDocument()
+    expect(screen.getByRole('textbox'))!.toBeInTheDocument()
   })
 
   it('should show typed constant value in the input', () => {
     render(<VariableOrConstantInputField label="Input source" />)
-    fireEvent.click(screen.getAllByRole('button')[1])
+    fireEvent.click(screen.getAllByRole('button')[1]!)
     const textbox = screen.getByRole('textbox')
     fireEvent.change(textbox, { target: { value: 'constant-value' } })
-    expect(textbox).toHaveValue('constant-value')
+    expect(textbox)!.toHaveValue('constant-value')
   })
 
   it('should switch back to variable mode when users choose variable again', () => {
     render(<VariableOrConstantInputField label="Input source" />)
     const modeButtons = screen.getAllByRole('button')
 
-    fireEvent.click(modeButtons[1])
-    expect(screen.getByRole('textbox')).toBeInTheDocument()
+    fireEvent.click(modeButtons[1]!)
+    expect(screen.getByRole('textbox'))!.toBeInTheDocument()
 
-    fireEvent.click(modeButtons[0])
-    expect(screen.getByRole('button', { name: 'Variable picker' })).toBeInTheDocument()
+    fireEvent.click(modeButtons[0]!)
+    expect(screen.getByRole('button', { name: 'Variable picker' }))!.toBeInTheDocument()
   })
 
   it('should handle variable picker changes', () => {
diff --git a/web/app/components/base/form/form-scenarios/base/index.tsx b/web/app/components/base/form/form-scenarios/base/index.tsx
index af552e4a81..3cc2d197ae 100644
--- a/web/app/components/base/form/form-scenarios/base/index.tsx
+++ b/web/app/components/base/form/form-scenarios/base/index.tsx
@@ -23,7 +23,7 @@ const BaseForm = ({
         const result = schema.safeParse(value)
         if (!result.success) {
           const issues = result.error.issues
-          const firstIssue = issues[0].message
+          const firstIssue = issues[0]!.message
           return firstIssue
         }
         return undefined
diff --git a/web/app/components/base/form/form-scenarios/demo/index.tsx b/web/app/components/base/form/form-scenarios/demo/index.tsx
index f1a11b4788..44f59b6713 100644
--- a/web/app/components/base/form/form-scenarios/demo/index.tsx
+++ b/web/app/components/base/form/form-scenarios/demo/index.tsx
@@ -14,7 +14,7 @@ const DemoForm = () => {
         if (!result.success) {
           const issues = result.error.issues
           console.log('Validation errors:', issues)
-          return issues[0].message
+          return issues[0]!.message
         }
         return undefined
       },
diff --git a/web/app/components/base/form/hooks/use-check-validated.ts b/web/app/components/base/form/hooks/use-check-validated.ts
index 0a6cb20fc0..6530b3f0be 100644
--- a/web/app/components/base/form/hooks/use-check-validated.ts
+++ b/web/app/components/base/form/hooks/use-check-validated.ts
@@ -20,7 +20,7 @@ export const useCheckValidated = (form: AnyFormApi, FormSchemas: FormSchema[]) =
           const conditionValue = showOnValues[condition.variable]
           return conditionValue === condition.value
         })
-        const errors: any[] = show ? fields[key].errors : []
+        const errors: any[] = show ? fields[key]!.errors : []
         return [...acc, ...errors]
       }, [] as string[])
       if (errorArray.length) {
diff --git a/web/app/components/base/form/index.stories.tsx b/web/app/components/base/form/index.stories.tsx
index 0cd28379de..c6d6638e3c 100644
--- a/web/app/components/base/form/index.stories.tsx
+++ b/web/app/components/base/form/index.stories.tsx
@@ -106,7 +106,7 @@ const FormPlayground = () => {
           onSubmit: ({ value: formValue }) => {
             const result = UserSchema.safeParse(formValue as typeof demoFormOpts.defaultValues)
             if (!result.success)
-              return result.error.issues[0].message
+              return result.error.issues[0]!.message
             return undefined
           },
         },
diff --git a/web/app/components/base/form/utils/secret-input/index.ts b/web/app/components/base/form/utils/secret-input/index.ts
index e8458f90b2..ba0eafce27 100644
--- a/web/app/components/base/form/utils/secret-input/index.ts
+++ b/web/app/components/base/form/utils/secret-input/index.ts
@@ -18,10 +18,10 @@ export const getTransformedValuesWhenSecretInputPristine = (formSchemas: FormSch
   const isPristineSecretInputNames: string[] = []
   for (let i = 0; i < formSchemas.length; i++) {
     const schema = formSchemas[i]
-    if (schema.type === FormTypeEnum.secretInput) {
-      const fieldMeta = form?.getFieldMeta(schema.name)
+    if (schema!.type === FormTypeEnum.secretInput) {
+      const fieldMeta = form?.getFieldMeta(schema!.name)
       if (fieldMeta?.isPristine)
-        isPristineSecretInputNames.push(schema.name)
+        isPristineSecretInputNames.push(schema!.name)
     }
   }
 
diff --git a/web/app/components/base/grid-mask/__tests__/index.spec.tsx b/web/app/components/base/grid-mask/__tests__/index.spec.tsx
index 302d23a61a..267e454ef0 100644
--- a/web/app/components/base/grid-mask/__tests__/index.spec.tsx
+++ b/web/app/components/base/grid-mask/__tests__/index.spec.tsx
@@ -15,48 +15,48 @@ describe('GridMask', () => {
   describe('Rendering', () => {
     it('should render children in the content layer', () => {
       renderGridMask({}, <button>Run</button>)
-      expect(screen.getByRole('button', { name: 'Run' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Run' }))!.toBeInTheDocument()
     })
 
     it('should render correctly without optional className props', () => {
       const { wrapper, canvasLayer, gradientLayer, contentLayer } = renderGridMask({}, <span>Plain child</span>)
 
-      expect(wrapper).toHaveClass('bg-saas-background')
-      expect(canvasLayer).toHaveClass('absolute')
-      expect(gradientLayer).toHaveClass('absolute')
-      expect(contentLayer).toHaveTextContent('Plain child')
+      expect(wrapper)!.toHaveClass('bg-saas-background')
+      expect(canvasLayer)!.toHaveClass('absolute')
+      expect(gradientLayer)!.toHaveClass('absolute')
+      expect(contentLayer)!.toHaveTextContent('Plain child')
     })
 
     it('should render wrapper, canvas, gradient and content layers in order', () => {
       const { wrapper, canvasLayer, gradientLayer, contentLayer } = renderGridMask({}, <span>Content</span>)
-      expect(wrapper).toBeInTheDocument()
+      expect(wrapper)!.toBeInTheDocument()
       expect(wrapper.children).toHaveLength(3)
-      expect(canvasLayer).toHaveClass('z-0')
-      expect(gradientLayer).toHaveClass('z-1')
-      expect(contentLayer).toHaveClass('z-2')
-      expect(contentLayer).toHaveTextContent('Content')
+      expect(canvasLayer)!.toHaveClass('z-0')
+      expect(gradientLayer)!.toHaveClass('z-1')
+      expect(contentLayer)!.toHaveClass('z-2')
+      expect(contentLayer)!.toHaveTextContent('Content')
     })
   })
 
   describe('Props', () => {
     it('should apply wrapperClassName to wrapper element', () => {
       const { wrapper } = renderGridMask({ wrapperClassName: 'custom-wrapper' }, <span>Child</span>)
-      expect(wrapper).toHaveClass('custom-wrapper')
-      expect(wrapper).toHaveClass('relative')
+      expect(wrapper)!.toHaveClass('custom-wrapper')
+      expect(wrapper)!.toHaveClass('relative')
     })
 
     it('should apply canvasClassName and grid background class to canvas layer', () => {
       const { canvasLayer } = renderGridMask({ canvasClassName: 'custom-canvas' }, <span>Child</span>)
 
-      expect(canvasLayer).toHaveClass('custom-canvas')
-      expect(canvasLayer).toHaveClass(Style.gridBg)
+      expect(canvasLayer)!.toHaveClass('custom-canvas')
+      expect(canvasLayer)!.toHaveClass(Style.gridBg!)
     })
 
     it('should apply gradientClassName to gradient layer', () => {
       const { gradientLayer } = renderGridMask({ gradientClassName: 'custom-gradient' }, <span>Child</span>)
 
-      expect(gradientLayer).toHaveClass('custom-gradient')
-      expect(gradientLayer).toHaveClass('bg-grid-mask-background')
+      expect(gradientLayer)!.toHaveClass('custom-gradient')
+      expect(gradientLayer)!.toHaveClass('bg-grid-mask-background')
     })
   })
 })
diff --git a/web/app/components/base/icons/icon-gallery.stories.tsx b/web/app/components/base/icons/icon-gallery.stories.tsx
index 8d49f70ce2..d91e5672c3 100644
--- a/web/app/components/base/icons/icon-gallery.stories.tsx
+++ b/web/app/components/base/icons/icon-gallery.stories.tsx
@@ -59,7 +59,7 @@ const groupByCategory = (entries: IconEntry[]) => entries.reduce((acc, entry) =>
   if (!acc[entry.category])
     acc[entry.category] = []
 
-  acc[entry.category].push(entry)
+  acc[entry.category]!.push(entry)
   return acc
 }, {} as Record<string, IconEntry[]>)
 
@@ -221,7 +221,7 @@ const IconGalleryStory = () => {
         <section key={category} style={sectionStyle}>
           <h2 style={{ margin: 0, fontSize: 18 }}>{category}</h2>
           <div style={gridStyle}>
-            {grouped[category].map(entry => (
+            {grouped[category]!.map(entry => (
               <div key={entry.path} style={cardStyle}>
                 <div
                   style={{
diff --git a/web/app/components/base/icons/utils.ts b/web/app/components/base/icons/utils.ts
index 51a1d70568..a26b276513 100644
--- a/web/app/components/base/icons/utils.ts
+++ b/web/app/components/base/icons/utils.ts
@@ -28,8 +28,8 @@ export function normalizeAttrs(attrs: Attrs = {}): Attrs {
     if (val === undefined)
       return acc
 
-    key = key.replace(/(-\w)/g, (g: string) => g[1].toUpperCase())
-    key = key.replace(/(:\w)/g, (g: string) => g[1].toUpperCase())
+    key = key.replace(/(-\w)/g, (g: string) => g[1]!.toUpperCase())
+    key = key.replace(/(:\w)/g, (g: string) => g[1]!.toUpperCase())
 
     // Additional filter after camelCase conversion
     if (key === 'xmlnsInkscape'
@@ -49,7 +49,7 @@ export function normalizeAttrs(attrs: Attrs = {}): Attrs {
           const pairs = next?.split(':')
 
           if (pairs[0] && pairs[1]) {
-            const k = pairs[0].replace(/(-\w)/g, (g: string) => g[1].toUpperCase())
+            const k = pairs[0].replace(/(-\w)/g, (g: string) => g[1]!.toUpperCase())
             prev[k] = pairs[1]
           }
 
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 61187f1c5f..4975ac8f1c 100644
--- a/web/app/components/base/image-gallery/__tests__/index.spec.tsx
+++ b/web/app/components/base/image-gallery/__tests__/index.spec.tsx
@@ -11,7 +11,7 @@ describe('ImageGallery', () => {
 
       const imgs = getImages(container)
       expect(imgs).toHaveLength(1)
-      expect(imgs[0]).toHaveAttribute('src', 'https://example.com/img1.png')
+      expect(imgs[0])!.toHaveAttribute('src', 'https://example.com/img1.png')
     })
 
     it('should render multiple images', () => {
@@ -46,7 +46,7 @@ describe('ImageGallery', () => {
       const { container } = render(<ImageGallery srcs={['https://example.com/1.png']} />)
 
       const img = getImages(container)[0]
-      expect(img.style.maxWidth).toBe('100%')
+      expect(img!.style.maxWidth).toBe('100%')
     })
 
     it('should apply calc(50% - 4px) width for 2 images', () => {
@@ -88,11 +88,11 @@ describe('ImageGallery', () => {
     it('should show ImagePreview when an image is clicked', async () => {
       const user = userEvent.setup()
       const { container } = render(<ImageGallery srcs={['https://example.com/img1.png']} />)
-      await user.click(getImages(container)[0])
+      await user.click(getImages(container)[0]!)
 
       const previewContainer = screen.queryByTestId('image-preview-container')
-      expect(previewContainer).toBeInTheDocument()
-      expect(previewContainer?.querySelector('img')).toHaveAttribute('src', 'https://example.com/img1.png')
+      expect(previewContainer)!.toBeInTheDocument()
+      expect(previewContainer?.querySelector('img'))!.toHaveAttribute('src', 'https://example.com/img1.png')
     })
 
     it('should show preview for the specific clicked image', async () => {
@@ -100,18 +100,18 @@ describe('ImageGallery', () => {
       const srcs = ['https://example.com/1.png', 'https://example.com/2.png']
       const { container } = render(<ImageGallery srcs={srcs} />)
 
-      await user.click(getImages(container)[1])
+      await user.click(getImages(container)[1]!)
 
       const previewContainer = screen.queryByTestId('image-preview-container')
-      expect(previewContainer?.querySelector('img')).toHaveAttribute('src', 'https://example.com/2.png')
+      expect(previewContainer?.querySelector('img'))!.toHaveAttribute('src', 'https://example.com/2.png')
     })
 
     it('should hide ImagePreview when Escape is pressed', async () => {
       const user = userEvent.setup()
       const { container } = render(<ImageGallery srcs={['https://example.com/img1.png']} />)
 
-      await user.click(getImages(container)[0])
-      expect(screen.queryByTestId('image-preview-container')).toBeInTheDocument()
+      await user.click(getImages(container)[0]!)
+      expect(screen.queryByTestId('image-preview-container'))!.toBeInTheDocument()
 
       await user.keyboard('{Escape}')
 
@@ -126,7 +126,7 @@ describe('ImageGallery', () => {
       const { container } = render(<ImageGallery srcs={['https://example.com/broken.png']} />)
 
       const img = getImages(container)[0]
-      fireEvent.error(img)
+      fireEvent.error(img!)
 
       expect(getImages(container)).toHaveLength(0)
     })
diff --git a/web/app/components/base/image-uploader/__tests__/hooks.spec.ts b/web/app/components/base/image-uploader/__tests__/hooks.spec.ts
index b3b1469f44..f01f00b779 100644
--- a/web/app/components/base/image-uploader/__tests__/hooks.spec.ts
+++ b/web/app/components/base/image-uploader/__tests__/hooks.spec.ts
@@ -64,7 +64,7 @@ describe('useImageFiles', () => {
     })
 
     expect(result.current.files).toHaveLength(1)
-    expect(result.current.files[0]._id).toBe('file-1')
+    expect(result.current.files[0]!._id).toBe('file-1')
   })
 
   it('should update an existing file via onUpload when _id matches', () => {
@@ -80,7 +80,7 @@ describe('useImageFiles', () => {
     })
 
     expect(result.current.files).toHaveLength(1)
-    expect(result.current.files[0].progress).toBe(50)
+    expect(result.current.files[0]!.progress).toBe(50)
   })
 
   it('should mark a file as deleted via onRemove', () => {
@@ -127,7 +127,7 @@ describe('useImageFiles', () => {
       result.current.onImageLinkLoadError('file-1')
     })
 
-    expect(result.current.files[0].progress).toBe(-1)
+    expect(result.current.files[0]!.progress).toBe(-1)
   })
 
   it('should not modify files when onImageLinkLoadError is called with non-existent id', () => {
@@ -142,7 +142,7 @@ describe('useImageFiles', () => {
       result.current.onImageLinkLoadError('non-existent')
     })
 
-    expect(result.current.files[0].progress).toBe(0)
+    expect(result.current.files[0]!.progress).toBe(0)
   })
 
   it('should set progress to 100 via onImageLinkLoadSuccess', () => {
@@ -157,7 +157,7 @@ describe('useImageFiles', () => {
       result.current.onImageLinkLoadSuccess('file-1')
     })
 
-    expect(result.current.files[0].progress).toBe(100)
+    expect(result.current.files[0]!.progress).toBe(100)
   })
 
   it('should not modify files when onImageLinkLoadSuccess is called with non-existent id', () => {
@@ -172,7 +172,7 @@ describe('useImageFiles', () => {
       result.current.onImageLinkLoadSuccess('non-existent')
     })
 
-    expect(result.current.files[0].progress).toBe(50)
+    expect(result.current.files[0]!.progress).toBe(50)
   })
 
   it('should clear all files via onClear', () => {
@@ -241,13 +241,13 @@ describe('useImageFiles', () => {
         result.current.onReUpload('file-1')
       })
 
-      const uploadCall = mockImageUpload.mock.calls[0][0]
+      const uploadCall = mockImageUpload.mock.calls[0]![0]
 
       act(() => {
         uploadCall.onProgressCallback(50)
       })
 
-      expect(result.current.files[0].progress).toBe(50)
+      expect(result.current.files[0]!.progress).toBe(50)
     })
 
     it('should update fileId and progress on success callback during re-upload', () => {
@@ -263,14 +263,14 @@ describe('useImageFiles', () => {
         result.current.onReUpload('file-1')
       })
 
-      const uploadCall = mockImageUpload.mock.calls[0][0]
+      const uploadCall = mockImageUpload.mock.calls[0]![0]
 
       act(() => {
         uploadCall.onSuccessCallback({ id: 'server-file-123' })
       })
 
-      expect(result.current.files[0].fileId).toBe('server-file-123')
-      expect(result.current.files[0].progress).toBe(100)
+      expect(result.current.files[0]!.fileId).toBe('server-file-123')
+      expect(result.current.files[0]!.progress).toBe(100)
     })
 
     it('should set progress to -1 and notify on error callback during re-upload', () => {
@@ -286,13 +286,13 @@ describe('useImageFiles', () => {
         result.current.onReUpload('file-1')
       })
 
-      const uploadCall = mockImageUpload.mock.calls[0][0]
+      const uploadCall = mockImageUpload.mock.calls[0]![0]
 
       act(() => {
         uploadCall.onErrorCallback(new Error('Network error'))
       })
 
-      expect(result.current.files[0].progress).toBe(-1)
+      expect(result.current.files[0]!.progress).toBe(-1)
       expect(mockNotify).toHaveBeenCalledWith({ type: 'error', message: 'Upload error' })
     })
   })
@@ -425,7 +425,7 @@ describe('useLocalFileUploader', () => {
       expect(mockImageUpload).toHaveBeenCalled()
     })
 
-    const uploadCall = mockImageUpload.mock.calls[0][0]
+    const uploadCall = mockImageUpload.mock.calls[0]![0]
 
     act(() => {
       uploadCall.onProgressCallback(75)
@@ -452,7 +452,7 @@ describe('useLocalFileUploader', () => {
       expect(mockImageUpload).toHaveBeenCalled()
     })
 
-    const uploadCall = mockImageUpload.mock.calls[0][0]
+    const uploadCall = mockImageUpload.mock.calls[0]![0]
 
     act(() => {
       uploadCall.onSuccessCallback({ id: 'uploaded-id' })
@@ -479,7 +479,7 @@ describe('useLocalFileUploader', () => {
       expect(mockImageUpload).toHaveBeenCalled()
     })
 
-    const uploadCall = mockImageUpload.mock.calls[0][0]
+    const uploadCall = mockImageUpload.mock.calls[0]![0]
 
     act(() => {
       uploadCall.onErrorCallback(new Error('fail'))
diff --git a/web/app/components/base/image-uploader/__tests__/utils.spec.ts b/web/app/components/base/image-uploader/__tests__/utils.spec.ts
index 0596287654..2bbea9c23b 100644
--- a/web/app/components/base/image-uploader/__tests__/utils.spec.ts
+++ b/web/app/components/base/image-uploader/__tests__/utils.spec.ts
@@ -78,7 +78,7 @@ describe('image-uploader utils', () => {
 
       expect(upload).toHaveBeenCalledTimes(1)
 
-      const [options, isPublic, url] = vi.mocked(upload).mock.calls[0]
+      const [options, isPublic, url] = (vi.mocked(upload).mock.calls[0] ?? []) as [any, any, any]
       expect(isPublic).toBe(true)
       expect(url).toBe('/files/upload')
       expect(options.xhr).toBeInstanceOf(XMLHttpRequest)
diff --git a/web/app/components/base/image-uploader/hooks.ts b/web/app/components/base/image-uploader/hooks.ts
index 8a1a082b0f..ec1b1248f1 100644
--- a/web/app/components/base/image-uploader/hooks.ts
+++ b/web/app/components/base/image-uploader/hooks.ts
@@ -31,7 +31,7 @@ export const useImageFiles = () => {
     const files = filesRef.current
     const index = files.findIndex(file => file._id === imageFileId)
     if (index > -1) {
-      const currentFile = files[index]
+      const currentFile = files[index]!
       const newFiles = [...files.slice(0, index), { ...currentFile, deleted: true }, ...files.slice(index + 1)]
       setFiles(newFiles)
       filesRef.current = newFiles
@@ -41,7 +41,7 @@ export const useImageFiles = () => {
     const files = filesRef.current
     const index = files.findIndex(file => file._id === imageFileId)
     if (index > -1) {
-      const currentFile = files[index]
+      const currentFile = files[index]!
       const newFiles = [...files.slice(0, index), { ...currentFile, progress: -1 }, ...files.slice(index + 1)]
       filesRef.current = newFiles
       setFiles(newFiles)
@@ -51,7 +51,7 @@ export const useImageFiles = () => {
     const files = filesRef.current
     const index = files.findIndex(file => file._id === imageFileId)
     if (index > -1) {
-      const currentImageFile = files[index]
+      const currentImageFile = files[index]!
       const newFiles = [...files.slice(0, index), { ...currentImageFile, progress: 100 }, ...files.slice(index + 1)]
       filesRef.current = newFiles
       setFiles(newFiles)
@@ -61,9 +61,9 @@ export const useImageFiles = () => {
     const files = filesRef.current
     const index = files.findIndex(file => file._id === imageFileId)
     if (index > -1) {
-      const currentImageFile = files[index]
+      const currentImageFile = files[index]!
       imageUpload({
-        file: currentImageFile.file!,
+        file: currentImageFile!.file!,
         onProgressCallback: (progress) => {
           const newFiles = [...files.slice(0, index), { ...currentImageFile, progress }, ...files.slice(index + 1)]
           filesRef.current = newFiles
@@ -114,7 +114,7 @@ export const useLocalFileUploader = ({ limit, disabled = false, onUpload }: useL
       // TODO: leave some warnings?
       return
     }
-    if (!ALLOW_FILE_EXTENSIONS.includes(file.type.split('/')[1]))
+    if (!ALLOW_FILE_EXTENSIONS.includes(file.type.split('/')[1]!))
       return
     if (limit && file.size > limit * 1024 * 1024) {
       toast.error(t('imageUploader.uploadFromComputerLimit', { ns: 'common', size: limit }))
diff --git a/web/app/components/base/image-uploader/image-preview.tsx b/web/app/components/base/image-uploader/image-preview.tsx
index d906132e9b..4ae6ccb7e6 100644
--- a/web/app/components/base/image-uploader/image-preview.tsx
+++ b/web/app/components/base/image-uploader/image-preview.tsx
@@ -99,7 +99,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({
     const shareImage = async () => {
       try {
         const base64Data = url.split(',')[1]
-        const blob = imageBase64ToBlob(base64Data, 'image/png')
+        const blob = imageBase64ToBlob(base64Data!, 'image/png')
 
         await navigator.clipboard.write([
           new ClipboardItem({
diff --git a/web/app/components/base/input/__tests__/index.spec.tsx b/web/app/components/base/input/__tests__/index.spec.tsx
index 1c50454962..7dc5d22eab 100644
--- a/web/app/components/base/input/__tests__/index.spec.tsx
+++ b/web/app/components/base/input/__tests__/index.spec.tsx
@@ -36,7 +36,7 @@ describe('Input component', () => {
   it('renders correctly with default props', () => {
     render(<Input />)
     const input = screen.getByPlaceholderText(/input/i)
-    expect(input).toBeInTheDocument()
+    expect(input)!.toBeInTheDocument()
     expect(input).not.toBeDisabled()
     expect(input).not.toHaveClass('cursor-not-allowed')
   })
@@ -44,17 +44,17 @@ describe('Input component', () => {
   it('shows left icon when showLeftIcon is true', () => {
     render(<Input showLeftIcon />)
     const searchIcon = document.querySelector('.i-ri-search-line')
-    expect(searchIcon).toBeInTheDocument()
+    expect(searchIcon)!.toBeInTheDocument()
     const input = screen.getByPlaceholderText(/search/i)
-    expect(input).toHaveClass('pl-[26px]')
+    expect(input)!.toHaveClass('pl-[26px]')
   })
 
   it('shows clear icon when showClearIcon is true and has value', () => {
     render(<Input showClearIcon value="test" />)
     const clearIcon = document.querySelector('.i-ri-close-circle-fill')
-    expect(clearIcon).toBeInTheDocument()
+    expect(clearIcon)!.toBeInTheDocument()
     const input = screen.getByDisplayValue('test')
-    expect(input).toHaveClass('pr-[26px]')
+    expect(input)!.toHaveClass('pr-[26px]')
   })
 
   it('does not show clear icon when disabled, even with value', () => {
@@ -74,23 +74,23 @@ describe('Input component', () => {
   it('shows warning icon when destructive is true', () => {
     render(<Input destructive />)
     const warningIcon = document.querySelector('.i-ri-error-warning-line')
-    expect(warningIcon).toBeInTheDocument()
+    expect(warningIcon)!.toBeInTheDocument()
     const input = screen.getByPlaceholderText(/input/i)
-    expect(input).toHaveClass('border-components-input-border-destructive')
+    expect(input)!.toHaveClass('border-components-input-border-destructive')
   })
 
   it('applies disabled styles when disabled', () => {
     render(<Input disabled />)
     const input = screen.getByPlaceholderText(/input/i)
-    expect(input).toBeDisabled()
-    expect(input).toHaveClass('cursor-not-allowed')
-    expect(input).toHaveClass('bg-components-input-bg-disabled')
+    expect(input)!.toBeDisabled()
+    expect(input)!.toHaveClass('cursor-not-allowed')
+    expect(input)!.toHaveClass('bg-components-input-bg-disabled')
   })
 
   it('displays custom unit when provided', () => {
     render(<Input unit="km" />)
     const unitElement = screen.getByText('km')
-    expect(unitElement).toBeInTheDocument()
+    expect(unitElement)!.toBeInTheDocument()
   })
 
   it('applies custom className and style', () => {
@@ -98,8 +98,8 @@ describe('Input component', () => {
     const customStyle = { color: 'red' }
     render(<Input className={customClass} styleCss={customStyle} />)
     const input = screen.getByPlaceholderText(/input/i)
-    expect(input).toHaveClass(customClass)
-    expect(input).toHaveStyle({ color: 'red' })
+    expect(input)!.toHaveClass(customClass)
+    expect(input)!.toHaveStyle({ color: 'red' })
   })
 
   it('applies large size variant correctly', () => {
@@ -112,41 +112,41 @@ describe('Input component', () => {
     const placeholder = 'Custom placeholder'
     render(<Input placeholder={placeholder} />)
     const input = screen.getByPlaceholderText(placeholder)
-    expect(input).toBeInTheDocument()
+    expect(input)!.toBeInTheDocument()
   })
 
   describe('Additional Layout Branches', () => {
     it('applies pl-7 when showLeftIcon and size is large', () => {
       render(<Input showLeftIcon size="large" />)
       const input = screen.getByRole('textbox')
-      expect(input).toHaveClass('pl-7')
+      expect(input)!.toHaveClass('pl-7')
     })
 
     it('applies pr-7 when showClearIcon, has value, and size is large', () => {
       render(<Input showClearIcon value="123" size="large" onChange={vi.fn()} />)
       const input = screen.getByRole('textbox')
-      expect(input).toHaveClass('pr-7')
+      expect(input)!.toHaveClass('pr-7')
     })
 
     it('applies pr-7 when destructive and size is large', () => {
       render(<Input destructive size="large" />)
       const input = screen.getByRole('textbox')
-      expect(input).toHaveClass('pr-7')
+      expect(input)!.toHaveClass('pr-7')
     })
 
     it('shows copy icon and applies pr-[26px] when showCopyIcon is true', () => {
       render(<Input showCopyIcon />)
       const input = screen.getByRole('textbox')
-      expect(input).toHaveClass('pr-[26px]')
+      expect(input)!.toHaveClass('pr-[26px]')
       // Assert that CopyFeedbackNew wrapper is present
       const copyWrapper = document.querySelector('.group.absolute.right-0')
-      expect(copyWrapper).toBeInTheDocument()
+      expect(copyWrapper)!.toBeInTheDocument()
     })
 
     it('shows copy icon and applies pr-7 when showCopyIcon and size is large', () => {
       render(<Input showCopyIcon size="large" value="my-val" onChange={vi.fn()} />)
       const input = screen.getByRole('textbox')
-      expect(input).toHaveClass('pr-7')
+      expect(input)!.toHaveClass('pr-7')
     })
   })
 
@@ -198,10 +198,10 @@ describe('Input component', () => {
       fireEvent.blur(input)
 
       expect(onChange).toHaveBeenCalledTimes(1)
-      expect(onChange.mock.calls[0][0].type).toBe('change')
-      expect(onChange.mock.calls[0][0].target.value).toBe('12')
+      expect(onChange.mock.calls[0]![0].type).toBe('change')
+      expect(onChange.mock.calls[0]![0].target.value).toBe('12')
       expect(onBlur).toHaveBeenCalledTimes(1)
-      expect(onBlur.mock.calls[0][0].target.value).toBe('12')
+      expect(onBlur.mock.calls[0]![0].target.value).toBe('12')
     })
 
     it('does not trigger change on blur-sm when value is already normalized', () => {
@@ -214,7 +214,7 @@ describe('Input component', () => {
 
       expect(onChange).not.toHaveBeenCalled()
       expect(onBlur).toHaveBeenCalledTimes(1)
-      expect(onBlur.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/markdown-blocks/__tests__/code-block.spec.tsx b/web/app/components/base/markdown-blocks/__tests__/code-block.spec.tsx
index 2eebe44af9..a3d28a3b5e 100644
--- a/web/app/components/base/markdown-blocks/__tests__/code-block.spec.tsx
+++ b/web/app/components/base/markdown-blocks/__tests__/code-block.spec.tsx
@@ -121,7 +121,7 @@ vi.mock('@/app/components/base/mermaid', () => ({
 
 const findEchartsHost = async () => {
   await waitFor(() => {
-    expect(document.querySelector('.echarts-for-react')).toBeInTheDocument()
+    expect(document.querySelector('.echarts-for-react'))!.toBeInTheDocument()
   })
   return document.querySelector('.echarts-for-react') as HTMLDivElement
 }
@@ -214,7 +214,7 @@ describe('CodeBlock', () => {
     it('should render syntax-highlighted output when language is standard', async () => {
       render(<CodeBlock className="language-javascript">const x = 1;</CodeBlock>)
 
-      expect(screen.getByText('JavaScript')).toBeInTheDocument()
+      expect(screen.getByText('JavaScript'))!.toBeInTheDocument()
       await waitFor(() => {
         expect(document.querySelector('code.language-javascript')?.textContent).toContain('const x = 1;')
       })
@@ -223,7 +223,7 @@ describe('CodeBlock', () => {
     it('should format unknown language labels with capitalized fallback when language is not in map', () => {
       render(<CodeBlock className="language-ruby">puts "ok"</CodeBlock>)
 
-      expect(screen.getByText('Ruby')).toBeInTheDocument()
+      expect(screen.getByText('Ruby'))!.toBeInTheDocument()
     })
 
     // it('should render mermaid controls when language is mermaid', async () => {
@@ -235,24 +235,24 @@ describe('CodeBlock', () => {
     it('should render mermaid block when language is mermaid', async () => {
       render(<CodeBlock className="language-mermaid">{'graph TD; A-->B;'}</CodeBlock>)
 
-      expect(screen.getByText('Mermaid')).toBeInTheDocument()
-      expect(await screen.findByTestId('mock-mermaid')).toHaveTextContent('graph TD; A-->B;')
+      expect(screen.getByText('Mermaid'))!.toBeInTheDocument()
+      expect(await screen.findByTestId('mock-mermaid'))!.toHaveTextContent('graph TD; A-->B;')
     })
 
     it('should render abc section header when language is abc', () => {
       render(<CodeBlock className="language-abc">X:1\nT:test</CodeBlock>)
 
-      expect(screen.getByText('ABC')).toBeInTheDocument()
+      expect(screen.getByText('ABC'))!.toBeInTheDocument()
     })
 
     it('should hide svg renderer when toggle is clicked for svg language', async () => {
       const user = userEvent.setup()
       render(<CodeBlock className="language-svg">{'<svg/>'}</CodeBlock>)
 
-      expect(await screen.findByText(/Error rendering SVG/i)).toBeInTheDocument()
+      expect(await screen.findByText(/Error rendering SVG/i))!.toBeInTheDocument()
 
       const svgToggleButton = screen.getAllByRole('button')[0]
-      await user.click(svgToggleButton)
+      await user.click(svgToggleButton!)
 
       expect(screen.queryByText(/Error rendering SVG/i)).not.toBeInTheDocument()
     })
@@ -262,7 +262,7 @@ describe('CodeBlock', () => {
 
       render(<CodeBlock className="language-javascript">const y = 2;</CodeBlock>)
 
-      expect(screen.getByText('JavaScript')).toBeInTheDocument()
+      expect(screen.getByText('JavaScript'))!.toBeInTheDocument()
       await waitFor(() => {
         expect(document.querySelector('code.language-javascript')?.textContent).toContain('const y = 2;')
       })
@@ -274,7 +274,7 @@ describe('CodeBlock', () => {
       render(<CodeBlock className="language-javascript">const z = 3;</CodeBlock>)
 
       await waitFor(() => {
-        expect(screen.getByText('const z = 3;')).toBeInTheDocument()
+        expect(screen.getByText('const z = 3;'))!.toBeInTheDocument()
       })
       expect(document.querySelector('code.language-javascript')).toBeNull()
     })
@@ -285,53 +285,53 @@ describe('CodeBlock', () => {
     it('should show loading indicator when echarts content is empty', () => {
       render(<CodeBlock className="language-echarts"></CodeBlock>)
 
-      expect(screen.getByText(/Chart loading.../i)).toBeInTheDocument()
+      expect(screen.getByText(/Chart loading.../i))!.toBeInTheDocument()
     })
 
     it('should keep loading when echarts content is whitespace only', () => {
       render(<CodeBlock className="language-echarts">{'   '}</CodeBlock>)
 
-      expect(screen.getByText(/Chart loading.../i)).toBeInTheDocument()
+      expect(screen.getByText(/Chart loading.../i))!.toBeInTheDocument()
     })
 
     it('should render echarts with parsed option when JSON is valid', async () => {
       const option = { title: [{ text: 'Hello' }] }
       render(<CodeBlock className="language-echarts">{JSON.stringify(option)}</CodeBlock>)
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
       expect(screen.queryByText(/Chart loading.../i)).not.toBeInTheDocument()
     })
 
     it('should use error option when echarts content is invalid but structurally complete', async () => {
       render(<CodeBlock className="language-echarts">{'{a:1}'}</CodeBlock>)
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
       expect(screen.queryByText(/Chart loading.../i)).not.toBeInTheDocument()
     })
 
     it('should use error option when echarts content is invalid non-structured text', async () => {
       render(<CodeBlock className="language-echarts">{'not a json {'}</CodeBlock>)
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
       expect(screen.queryByText(/Chart loading.../i)).not.toBeInTheDocument()
     })
 
     it('should keep loading when option is valid JSON but not an object', async () => {
       render(<CodeBlock className="language-echarts">"text-value"</CodeBlock>)
 
-      expect(await screen.findByText(/Chart loading.../i)).toBeInTheDocument()
+      expect(await screen.findByText(/Chart loading.../i))!.toBeInTheDocument()
     })
 
     it('should keep loading when echarts content matches incomplete quote-pattern guard', async () => {
       render(<CodeBlock className="language-echarts">{'x{"a":1'}</CodeBlock>)
 
-      expect(await screen.findByText(/Chart loading.../i)).toBeInTheDocument()
+      expect(await screen.findByText(/Chart loading.../i))!.toBeInTheDocument()
     })
 
     it('should keep loading when echarts content has unmatched opening array bracket', async () => {
       render(<CodeBlock className="language-echarts">[[1,2]</CodeBlock>)
 
-      expect(await screen.findByText(/Chart loading.../i)).toBeInTheDocument()
+      expect(await screen.findByText(/Chart loading.../i))!.toBeInTheDocument()
     })
 
     it('should keep chart instance stable when window resize is triggered', async () => {
@@ -343,7 +343,7 @@ describe('CodeBlock', () => {
         window.dispatchEvent(new Event('resize'))
       })
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
     })
 
     it('should keep rendering when echarts content updates repeatedly', async () => {
@@ -355,7 +355,7 @@ describe('CodeBlock', () => {
       rerender(<CodeBlock className="language-echarts">{'{"a":4}'}</CodeBlock>)
       rerender(<CodeBlock className="language-echarts">{'{"a":5}'}</CodeBlock>)
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
     })
 
     it('should stop processing extra finished events when chart finished callback fires repeatedly', async () => {
@@ -374,27 +374,27 @@ describe('CodeBlock', () => {
         await new Promise(resolve => setTimeout(resolve, 500))
       })
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
     })
 
     it('should switch from loading to chart when streaming content becomes valid JSON', async () => {
       const { rerender } = render(<CodeBlock className="language-echarts">{'{ "a":'}</CodeBlock>)
-      expect(screen.getByText(/Chart loading.../i)).toBeInTheDocument()
+      expect(screen.getByText(/Chart loading.../i))!.toBeInTheDocument()
 
       rerender(<CodeBlock className="language-echarts">{'{ "a": 1 }'}</CodeBlock>)
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
     })
 
     it('should parse array JSON after previously incomplete streaming content', async () => {
       const parseSpy = vi.spyOn(JSON, 'parse')
       parseSpy.mockImplementationOnce(() => ({ series: [] }) as unknown as object)
       const { rerender } = render(<CodeBlock className="language-echarts">[1, 2</CodeBlock>)
-      expect(screen.getByText(/Chart loading.../i)).toBeInTheDocument()
+      expect(screen.getByText(/Chart loading.../i))!.toBeInTheDocument()
 
       rerender(<CodeBlock className="language-echarts">[1, 2]</CodeBlock>)
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
       parseSpy.mockRestore()
     })
 
@@ -404,7 +404,7 @@ describe('CodeBlock', () => {
 
       render(<CodeBlock className="language-echarts">abcde</CodeBlock>)
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
       parseSpy.mockRestore()
     })
 
@@ -412,14 +412,14 @@ describe('CodeBlock', () => {
       mockUseTheme.mockReturnValue({ theme: Theme.dark })
       render(<CodeBlock className="language-echarts">{'{"series":[]}'}</CodeBlock>)
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
     })
 
     it('should render dark mode error option when app theme is dark and echarts content is invalid', async () => {
       mockUseTheme.mockReturnValue({ theme: Theme.dark })
       render(<CodeBlock className="language-echarts">{'{a:1}'}</CodeBlock>)
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
     })
 
     it('should wire resize listener when echarts view re-enters with a ready chart instance', async () => {
@@ -433,7 +433,7 @@ describe('CodeBlock', () => {
         window.dispatchEvent(new Event('resize'))
       })
 
-      expect(await findEchartsHost()).toBeInTheDocument()
+      expect(await findEchartsHost())!.toBeInTheDocument()
       unmount()
     })
 
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 9c88b8a0a6..ebf70b6b77 100644
--- a/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
+++ b/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
@@ -92,11 +92,11 @@ describe('MarkdownForm', () => {
 
       render(<MarkdownForm node={node} />)
 
-      expect(screen.getByText('Name')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('Enter name')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('Enter bio')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: 'Submit' })).toBeInTheDocument()
-      expect(screen.getByText(UNSUPPORTED_TAG_ARTICLE_RE)).toBeInTheDocument()
+      expect(screen.getByText('Name'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Enter name'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Enter bio'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Submit' }))!.toBeInTheDocument()
+      expect(screen.getByText(UNSUPPORTED_TAG_ARTICLE_RE))!.toBeInTheDocument()
     })
   })
 
@@ -221,7 +221,7 @@ describe('MarkdownForm', () => {
       try {
         render(<MarkdownForm node={node} />)
 
-        expect(screen.getByRole('button', { name: 'Submit' })).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: 'Submit' }))!.toBeInTheDocument()
         expect(consoleErrorSpy).toHaveBeenCalled()
       }
       finally {
@@ -413,7 +413,7 @@ describe('MarkdownForm', () => {
 
       // Click the "Now" button in the footer to select current time (calls onChange)
       const nowButtons = await screen.findAllByText('time.operation.now')
-      await user.click(nowButtons[0])
+      await user.click(nowButtons[0]!)
 
       // Submit the form
       await user.click(screen.getByRole('button', { name: 'Submit' }))
@@ -529,7 +529,7 @@ describe('MarkdownForm', () => {
       await user.click(button)
 
       await waitFor(() => {
-        expect(button).toBeDisabled()
+        expect(button)!.toBeDisabled()
       })
     })
 
@@ -586,7 +586,7 @@ describe('MarkdownForm', () => {
       render(<MarkdownForm node={node} />)
 
       const button = screen.getByRole('button', { name: 'Go' })
-      expect(button).toBeInTheDocument()
+      expect(button)!.toBeInTheDocument()
     })
 
     it('should ignore invalid variant and size values', () => {
@@ -596,7 +596,7 @@ describe('MarkdownForm', () => {
 
       render(<MarkdownForm node={node} />)
 
-      expect(screen.getByRole('button', { name: 'Go' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Go' }))!.toBeInTheDocument()
     })
   })
 
@@ -610,7 +610,7 @@ describe('MarkdownForm', () => {
       render(<MarkdownForm node={node} />)
 
       const input = screen.getByPlaceholderText('Password')
-      expect(input).toHaveAttribute('type', 'password')
+      expect(input)!.toHaveAttribute('type', 'password')
     })
 
     it('should render email input', () => {
@@ -620,7 +620,7 @@ describe('MarkdownForm', () => {
 
       render(<MarkdownForm node={node} />)
 
-      expect(screen.getByPlaceholderText('Email')).toHaveAttribute('type', 'email')
+      expect(screen.getByPlaceholderText('Email'))!.toHaveAttribute('type', 'email')
     })
 
     it('should render number input', () => {
@@ -630,7 +630,7 @@ describe('MarkdownForm', () => {
 
       render(<MarkdownForm node={node} />)
 
-      expect(screen.getByPlaceholderText('Age')).toHaveAttribute('type', 'number')
+      expect(screen.getByPlaceholderText('Age'))!.toHaveAttribute('type', 'number')
     })
 
     it('should submit typed value from password input', async () => {
@@ -664,7 +664,7 @@ describe('MarkdownForm', () => {
       render(<MarkdownForm node={node} />)
 
       expect(screen.queryByRole('slider')).not.toBeInTheDocument()
-      expect(screen.getByText(UNSUPPORTED_TAG_RE)).toBeInTheDocument()
+      expect(screen.getByText(UNSUPPORTED_TAG_RE))!.toBeInTheDocument()
     })
   })
 
@@ -689,7 +689,7 @@ describe('MarkdownForm', () => {
 
       render(<MarkdownForm node={node} />)
 
-      expect(screen.getByTestId('checkbox-agree')).toBeInTheDocument()
+      expect(screen.getByTestId('checkbox-agree'))!.toBeInTheDocument()
     })
 
     it('should render select with no options when dataOptions is missing', () => {
@@ -700,7 +700,8 @@ describe('MarkdownForm', () => {
       render(<MarkdownForm node={node} />)
 
       // Select renders with empty items list
-      expect(screen.getByTestId('markdown-form')).toBeInTheDocument()
+      // Select renders with empty items list
+      expect(screen.getByTestId('markdown-form'))!.toBeInTheDocument()
     })
 
     it('should render button with empty text when children array is empty', () => {
diff --git a/web/app/components/base/markdown-with-directive/index.tsx b/web/app/components/base/markdown-with-directive/index.tsx
index 8b5f5162c0..552d8a3aaa 100644
--- a/web/app/components/base/markdown-with-directive/index.tsx
+++ b/web/app/components/base/markdown-with-directive/index.tsx
@@ -104,9 +104,9 @@ function buildDirectiveRehypePlugins(): PluggableList {
   }
 
   return [
-    defaultRehypePlugins.raw,
+    defaultRehypePlugins.raw!,
     [sanitizePlugin, sanitizeSchema] as Pluggable,
-    defaultRehypePlugins.harden,
+    defaultRehypePlugins.harden!,
   ]
 }
 
@@ -122,12 +122,12 @@ function normalizeDirectiveAttributeBlocks(markdown: string): string {
 
     const directivePrefix = match[1]
     const attributeBlocks = match[2]
-    const attrMatches = [...attributeBlocks.matchAll(ATTRIBUTE_BLOCK_REGEX)]
+    const attrMatches = [...attributeBlocks!.matchAll(ATTRIBUTE_BLOCK_REGEX)]
     if (attrMatches.length === 0)
       return line
 
     const mergedAttributes = attrMatches
-      .map(result => result[1].trim())
+      .map(result => result[1]!.trim())
       .filter(Boolean)
       .join(' ')
 
diff --git a/web/app/components/base/markdown/__tests__/index.spec.tsx b/web/app/components/base/markdown/__tests__/index.spec.tsx
index 8e4ce7e0ce..f28635650a 100644
--- a/web/app/components/base/markdown/__tests__/index.spec.tsx
+++ b/web/app/components/base/markdown/__tests__/index.spec.tsx
@@ -32,7 +32,7 @@ type CapturedProps = {
 const getLastWrapperProps = (): CapturedProps => {
   const calls = mockReactMarkdownWrapper.mock.calls
   const lastCall = calls[calls.length - 1]
-  return lastCall[0] as CapturedProps
+  return lastCall![0] as CapturedProps
 }
 
 describe('Markdown', () => {
@@ -42,19 +42,19 @@ describe('Markdown', () => {
 
   it('should render wrapper content', () => {
     render(<Markdown content="Hello World" />)
-    expect(screen.getByTestId('react-markdown-wrapper')).toHaveTextContent('Hello World')
+    expect(screen.getByTestId('react-markdown-wrapper'))!.toHaveTextContent('Hello World')
   })
 
   it('should apply default classes', () => {
     const { container } = render(<Markdown content="Test" />)
     const markdownDiv = container.querySelector('.markdown-body')
-    expect(markdownDiv).toHaveClass('markdown-body', 'text-text-primary!')
+    expect(markdownDiv)!.toHaveClass('markdown-body', 'text-text-primary!')
   })
 
   it('should merge custom className with default classes', () => {
     const { container } = render(<Markdown content="Test" className="custom another" />)
     const markdownDiv = container.querySelector('.markdown-body')
-    expect(markdownDiv).toHaveClass('markdown-body', 'text-text-primary!', 'custom', 'another')
+    expect(markdownDiv)!.toHaveClass('markdown-body', 'text-text-primary!', 'custom', 'another')
   })
 
   it('should not include undefined in className', () => {
diff --git a/web/app/components/base/markdown/__tests__/streamdown-wrapper.spec.tsx b/web/app/components/base/markdown/__tests__/streamdown-wrapper.spec.tsx
index 7bc4748339..2db4d9218c 100644
--- a/web/app/components/base/markdown/__tests__/streamdown-wrapper.spec.tsx
+++ b/web/app/components/base/markdown/__tests__/streamdown-wrapper.spec.tsx
@@ -37,7 +37,9 @@ describe('StreamdownWrapper', () => {
 
       // Assert - check that ~ is rendered as text, not as strikethrough (del element)
       // The content should contain the tilde as literal text
-      expect(screen.getByText(TILDE_RANGE_RE)).toBeInTheDocument()
+      // Assert - check that ~ is rendered as text, not as strikethrough (del element)
+      // The content should contain the tilde as literal text
+      expect(screen.getByText(TILDE_RANGE_RE))!.toBeInTheDocument()
       expect(document.querySelector('del')).toBeNull()
     })
 
@@ -65,10 +67,11 @@ describe('StreamdownWrapper', () => {
       // Only double tildes should create strikethrough
       const delElements = document.querySelectorAll('del')
       expect(delElements).toHaveLength(1)
-      expect(delElements[0].textContent).toBe('removed feature')
+      expect(delElements[0]!.textContent).toBe('removed feature')
 
       // Single tilde should remain as literal text
-      expect(screen.getByText(TILDE_RANGE_RE)).toBeInTheDocument()
+      // Single tilde should remain as literal text
+      expect(screen.getByText(TILDE_RANGE_RE))!.toBeInTheDocument()
     })
   })
 
@@ -81,7 +84,8 @@ describe('StreamdownWrapper', () => {
       render(<StreamdownWrapper latexContent={content} />)
 
       // Assert
-      expect(screen.getByText('Hello World')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Hello World'))!.toBeInTheDocument()
     })
 
     it('should render bold text', () => {
@@ -92,7 +96,8 @@ describe('StreamdownWrapper', () => {
       render(<StreamdownWrapper latexContent={content} />)
 
       // Assert
-      expect(screen.getByText('bold text')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('bold text'))!.toBeInTheDocument()
       expect(document.querySelector('[data-streamdown="strong"]')).not.toBeNull()
     })
 
@@ -104,7 +109,8 @@ describe('StreamdownWrapper', () => {
       render(<StreamdownWrapper latexContent={content} />)
 
       // Assert
-      expect(screen.getByText('italic text')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('italic text'))!.toBeInTheDocument()
       expect(document.querySelector('em')).not.toBeNull()
     })
 
@@ -113,7 +119,8 @@ describe('StreamdownWrapper', () => {
       render(<StreamdownWrapper latexContent="![standard-img](https://example.com/img.png)" />)
 
       // Assert
-      expect(screen.getByTestId('img')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('img'))!.toBeInTheDocument()
     })
 
     it('should render a CodeBlock component for code markdown', async () => {
@@ -126,7 +133,7 @@ describe('StreamdownWrapper', () => {
       // Assert
       // We mocked code block to return <code>{children}</code>
       const codeElement = await screen.findByText('console.log("hello")')
-      expect(codeElement).toBeInTheDocument()
+      expect(codeElement)!.toBeInTheDocument()
     })
   })
 
@@ -140,7 +147,8 @@ describe('StreamdownWrapper', () => {
       render(<StreamdownWrapper latexContent={content} pluginInfo={pluginInfo} />)
 
       // Assert
-      expect(screen.getByTestId('plugin-img')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('plugin-img'))!.toBeInTheDocument()
       expect(screen.queryByTestId('img')).toBeNull()
 
       expect(screen.getAllByTestId('plugin-paragraph').length).toBeGreaterThan(0)
@@ -159,7 +167,8 @@ describe('StreamdownWrapper', () => {
       render(<StreamdownWrapper latexContent="[link](https://example.com)" customComponents={customComponents} />)
 
       // Assert
-      expect(screen.getByTestId('custom-link')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('custom-link'))!.toBeInTheDocument()
     })
 
     it('should disallow customDisallowedElements', () => {
@@ -177,7 +186,8 @@ describe('StreamdownWrapper', () => {
       render(<StreamdownWrapper latexContent={'<div ref="someRef">content</div>'} />)
 
       // Assert - ref attribute should be removed
-      expect(screen.getByText('content')).toBeInTheDocument()
+      // Assert - ref attribute should be removed
+      expect(screen.getByText('content'))!.toBeInTheDocument()
       expect(document.querySelector('[ref="someRef"]')).toBeNull()
     })
 
@@ -186,7 +196,8 @@ describe('StreamdownWrapper', () => {
       render(<StreamdownWrapper latexContent="<custom-element>content</custom-element>" />)
 
       // Assert - rehype-sanitize strips the tag but keeps inner text
-      expect(screen.getByText('content')).toBeInTheDocument()
+      // Assert - rehype-sanitize strips the tag but keeps inner text
+      expect(screen.getByText('content'))!.toBeInTheDocument()
       expect(document.querySelector('custom-element')).toBeNull()
     })
   })
diff --git a/web/app/components/base/markdown/streamdown-wrapper.tsx b/web/app/components/base/markdown/streamdown-wrapper.tsx
index e20898135b..342f5cf44b 100644
--- a/web/app/components/base/markdown/streamdown-wrapper.tsx
+++ b/web/app/components/base/markdown/streamdown-wrapper.tsx
@@ -101,10 +101,10 @@ function buildRehypePlugins(extraPlugins?: PluggableList): PluggableList {
         const name = typeof entry === 'string' ? entry : entry[0]
         return !overrideNames.has(name as string)
       })
-      mergedAttributes[tag] = [...filtered, ...ALLOWED_TAGS[tag]]
+      mergedAttributes[tag] = [...filtered, ...(ALLOWED_TAGS[tag] ?? [])]
     }
     else {
-      mergedAttributes[tag] = ALLOWED_TAGS[tag]
+      mergedAttributes[tag] = ALLOWED_TAGS[tag]!
     }
   }
 
@@ -132,10 +132,10 @@ function buildRehypePlugins(extraPlugins?: PluggableList): PluggableList {
   }
 
   return [
-    defaultRehypePlugins.raw,
+    defaultRehypePlugins.raw!,
     ...(extraPlugins ?? []),
     [sanitizePlugin, customSchema] as Pluggable,
-    defaultRehypePlugins.harden,
+    defaultRehypePlugins.harden!,
   ]
 }
 
diff --git a/web/app/components/base/mermaid/index.tsx b/web/app/components/base/mermaid/index.tsx
index 9af1024ba9..75bc201071 100644
--- a/web/app/components/base/mermaid/index.tsx
+++ b/web/app/components/base/mermaid/index.tsx
@@ -239,8 +239,8 @@ const Flowchart = (props: FlowchartProps) => {
               if (!taskMatch)
                 return line // Not a task line, return as is.
 
-              const taskName = taskMatch[1].trim()
-              let paramsStr = taskMatch[2].trim()
+              const taskName = taskMatch[1]!.trim()
+              let paramsStr = taskMatch[2]!.trim()
 
               // Rule 1: Correct multiple "after" dependencies ONLY if they exist.
               // This is a common mistake, e.g., "..., after task1, after task2, ..."
diff --git a/web/app/components/base/message-log-modal/__tests__/index.spec.tsx b/web/app/components/base/message-log-modal/__tests__/index.spec.tsx
index 2955d29b26..525f190743 100644
--- a/web/app/components/base/message-log-modal/__tests__/index.spec.tsx
+++ b/web/app/components/base/message-log-modal/__tests__/index.spec.tsx
@@ -60,8 +60,8 @@ describe('MessageLogModal', () => {
 
     it('renders modal with correct title and Run component', () => {
       render(<MessageLogModal width={800} onCancel={onCancel} currentLogItem={mockLog} />)
-      expect(screen.getByText(/title/i)).toBeInTheDocument()
-      expect(screen.getByTestId('workflow-run')).toBeInTheDocument()
+      expect(screen.getByText(/title/i))!.toBeInTheDocument()
+      expect(screen.getByTestId('workflow-run'))!.toBeInTheDocument()
     })
   })
 
@@ -92,7 +92,7 @@ describe('MessageLogModal', () => {
     it('calls onCancel when close icon is clicked', () => {
       render(<MessageLogModal width={800} onCancel={onCancel} currentLogItem={mockLog} />)
       const closeButton = screen.getByTestId('close-button')
-      expect(closeButton).toBeInTheDocument()
+      expect(closeButton)!.toBeInTheDocument()
       fireEvent.click(closeButton)
       expect(onCancel).toHaveBeenCalledTimes(1)
     })
@@ -107,7 +107,7 @@ describe('MessageLogModal', () => {
     it('does not call onCancel when clicked away if not mounted', () => {
       render(<MessageLogModal width={800} onCancel={onCancel} currentLogItem={mockLog} />)
       expect(clickAwayHandlers.length).toBeGreaterThan(0)
-      clickAwayHandlers[0]() // This is the closure from the initial render, where mounted is false
+      clickAwayHandlers[0]!() // This is the closure from the initial render, where mounted is false
       expect(onCancel).not.toHaveBeenCalled()
     })
   })
diff --git a/web/app/components/base/new-audio-button/__tests__/index.spec.tsx b/web/app/components/base/new-audio-button/__tests__/index.spec.tsx
index 23696fca74..0e5444c4e4 100644
--- a/web/app/components/base/new-audio-button/__tests__/index.spec.tsx
+++ b/web/app/components/base/new-audio-button/__tests__/index.spec.tsx
@@ -28,7 +28,7 @@ describe('AudioBtn', () => {
   const hoverAndCheckTooltip = async (expectedText: string) => {
     const button = getButton()
     await userEvent.hover(button)
-    expect(await screen.findByText(expectedText)).toBeInTheDocument()
+    expect(await screen.findByText(expectedText))!.toBeInTheDocument()
   }
 
   const getAudioCallback = () => {
@@ -61,8 +61,8 @@ describe('AudioBtn', () => {
       await userEvent.click(getButton())
 
       await waitFor(() => expect(mockGetAudioPlayer).toHaveBeenCalled())
-      expect(mockGetAudioPlayer.mock.calls[0][0]).toBe('/text-to-audio')
-      expect(mockGetAudioPlayer.mock.calls[0][1]).toBe(true)
+      expect(mockGetAudioPlayer.mock.calls[0]![0]).toBe('/text-to-audio')
+      expect(mockGetAudioPlayer.mock.calls[0]![1]).toBe(true)
     })
 
     it('should generate app URL when appId is present', async () => {
@@ -73,8 +73,8 @@ describe('AudioBtn', () => {
       await userEvent.click(getButton())
 
       await waitFor(() => expect(mockGetAudioPlayer).toHaveBeenCalled())
-      expect(mockGetAudioPlayer.mock.calls[0][0]).toBe('/apps/123/text-to-audio')
-      expect(mockGetAudioPlayer.mock.calls[0][1]).toBe(false)
+      expect(mockGetAudioPlayer.mock.calls[0]![0]).toBe('/apps/123/text-to-audio')
+      expect(mockGetAudioPlayer.mock.calls[0]![1]).toBe(false)
     })
 
     it('should generate installed app URL correctly', async () => {
@@ -85,7 +85,7 @@ describe('AudioBtn', () => {
       await userEvent.click(getButton())
 
       await waitFor(() => expect(mockGetAudioPlayer).toHaveBeenCalled())
-      expect(mockGetAudioPlayer.mock.calls[0][0]).toBe('/installed-apps/456/text-to-audio')
+      expect(mockGetAudioPlayer.mock.calls[0]![0]).toBe('/installed-apps/456/text-to-audio')
     })
   })
 
@@ -94,7 +94,7 @@ describe('AudioBtn', () => {
       render(<AudioBtn value="test" />)
 
       await hoverAndCheckTooltip('play')
-      expect(getButton()).toHaveClass('action-btn')
+      expect(getButton())!.toHaveClass('action-btn')
       expect(getButton()).not.toBeDisabled()
     })
 
@@ -107,7 +107,7 @@ describe('AudioBtn', () => {
       })
 
       await hoverAndCheckTooltip('playing')
-      expect(getButton()).toHaveClass('action-btn-active')
+      expect(getButton())!.toHaveClass('action-btn-active')
     })
 
     it('should transition to ended state', async () => {
@@ -186,7 +186,7 @@ describe('AudioBtn', () => {
       render(<AudioBtn value="test" />)
       await userEvent.click(getButton())
 
-      await waitFor(() => expect(getButton()).toBeDisabled())
+      await waitFor(() => expect(getButton())!.toBeDisabled())
     })
   })
 
@@ -197,9 +197,9 @@ describe('AudioBtn', () => {
 
       await waitFor(() => expect(mockGetAudioPlayer).toHaveBeenCalled())
       const call = mockGetAudioPlayer.mock.calls[0]
-      expect(call[2]).toBe('msg-1')
-      expect(call[3]).toBe('hello')
-      expect(call[4]).toBe('en-US')
+      expect(call![2]).toBe('msg-1')
+      expect(call![3]).toBe('hello')
+      expect(call![4]).toBe('en-US')
     })
   })
 })
diff --git a/web/app/components/base/notion-icon/index.tsx b/web/app/components/base/notion-icon/index.tsx
index 62fcef1dc1..f2b5146d73 100644
--- a/web/app/components/base/notion-icon/index.tsx
+++ b/web/app/components/base/notion-icon/index.tsx
@@ -31,7 +31,7 @@ const NotionIcon = ({
       )
     }
     return (
-      <div className={cn('flex h-5 w-5 items-center justify-center rounded-sm bg-gray-200 text-xs font-medium text-gray-500', className)}>{name?.[0].toLocaleUpperCase()}</div>
+      <div className={cn('flex h-5 w-5 items-center justify-center rounded-sm bg-gray-200 text-xs font-medium text-gray-500', className)}>{name?.[0]!.toLocaleUpperCase()}</div>
     )
   }
 
diff --git a/web/app/components/base/notion-page-selector/base.tsx b/web/app/components/base/notion-page-selector/base.tsx
index 34926849a6..23dd3be69a 100644
--- a/web/app/components/base/notion-page-selector/base.tsx
+++ b/web/app/components/base/notion-page-selector/base.tsx
@@ -119,14 +119,14 @@ const NotionPageSelector = ({
   }, [currentCredentialId, datasetId, invalidPreImportNotionPages, onSelect])
 
   const handleSelectPages = useCallback((newSelectedPagesId: Set<string>) => {
-    const selectedPages = Array.from(newSelectedPagesId).map(pageId => pagesMapAndSelectedPagesId[0][pageId])
+    const selectedPages = Array.from(newSelectedPagesId).map(pageId => pagesMapAndSelectedPagesId[0][pageId]!)
 
     onSelect(selectedPages)
   }, [pagesMapAndSelectedPagesId, onSelect])
 
   const handlePreviewPage = useCallback((previewPageId: string) => {
     if (onPreview)
-      onPreview(pagesMapAndSelectedPagesId[0][previewPageId])
+      onPreview(pagesMapAndSelectedPagesId[0][previewPageId]!)
   }, [pagesMapAndSelectedPagesId, onPreview])
 
   const handleConfigureNotion = useCallback(() => {
@@ -177,7 +177,7 @@ const NotionPageSelector = ({
                   value={selectedPagesId}
                   disabledValue={pagesMapAndSelectedPagesId[2]}
                   searchValue={searchValue}
-                  list={notionsPages!.notion_info?.[0].pages || []}
+                  list={notionsPages!.notion_info?.[0]!.pages || []}
                   pagesMap={pagesMapAndSelectedPagesId[0]}
                   onSelect={handleSelectPages}
                   canPreview={canPreview}
diff --git a/web/app/components/base/notion-page-selector/page-selector/__tests__/index.spec.tsx b/web/app/components/base/notion-page-selector/page-selector/__tests__/index.spec.tsx
index d4b559452e..21a7a08d63 100644
--- a/web/app/components/base/notion-page-selector/page-selector/__tests__/index.spec.tsx
+++ b/web/app/components/base/notion-page-selector/page-selector/__tests__/index.spec.tsx
@@ -24,11 +24,11 @@ const mockList: DataSourceNotionPage[] = [
 ]
 
 const mockPagesMap: DataSourceNotionPageMap = {
-  'root-1': { ...mockList[0], workspace_id: 'workspace-1' },
-  'child-1': { ...mockList[1], workspace_id: 'workspace-1' },
-  'grandchild-1': { ...mockList[2], workspace_id: 'workspace-1' },
-  'child-2': { ...mockList[3], workspace_id: 'workspace-1' },
-  'root-2': { ...mockList[4], workspace_id: 'workspace-1' },
+  'root-1': { ...mockList[0]!, workspace_id: 'workspace-1' },
+  'child-1': { ...mockList[1]!, workspace_id: 'workspace-1' },
+  'grandchild-1': { ...mockList[2]!, workspace_id: 'workspace-1' },
+  'child-2': { ...mockList[3]!, workspace_id: 'workspace-1' },
+  'root-2': { ...mockList[4]!, workspace_id: 'workspace-1' },
 }
 
 describe('PageSelector', () => {
@@ -39,7 +39,7 @@ describe('PageSelector', () => {
   it('should render root level pages initially', () => {
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={vi.fn()} />)
 
-    expect(screen.getByText('Root 1')).toBeInTheDocument()
+    expect(screen.getByText('Root 1'))!.toBeInTheDocument()
     expect(screen.queryByText('Child 1')).not.toBeInTheDocument()
   })
 
@@ -50,13 +50,13 @@ describe('PageSelector', () => {
     const toggle = screen.getByTestId('notion-page-toggle-root-1')
     await user.click(toggle)
 
-    expect(screen.getByText('Child 1')).toBeInTheDocument()
+    expect(screen.getByText('Child 1'))!.toBeInTheDocument()
   })
 
   it('should call onSelect with descendants when parent is selected', async () => {
     const handleSelect = vi.fn()
     const user = userEvent.setup()
-    render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={[mockList[0], mockList[1], mockList[2]]} onSelect={handleSelect} />)
+    render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={[mockList[0]!, mockList[1]!, mockList[2]!]} onSelect={handleSelect} />)
 
     const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-root-1')
     await user.click(checkbox)
@@ -78,7 +78,7 @@ describe('PageSelector', () => {
   it('should show breadcrumbs when searching', () => {
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="Grandchild" pagesMap={mockPagesMap} list={mockList} onSelect={vi.fn()} />)
 
-    expect(screen.getByText('Root 1 / Child 1 / Grandchild 1')).toBeInTheDocument()
+    expect(screen.getByText('Root 1 / Child 1 / Grandchild 1'))!.toBeInTheDocument()
   })
 
   it('should call onPreview when preview button is clicked', async () => {
@@ -95,7 +95,7 @@ describe('PageSelector', () => {
   it('should show no result message when search returns nothing', () => {
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="nonexistent" pagesMap={mockPagesMap} list={[]} onSelect={vi.fn()} />)
 
-    expect(screen.getByText('common.dataSource.notion.selector.noSearchResult')).toBeInTheDocument()
+    expect(screen.getByText('common.dataSource.notion.selector.noSearchResult'))!.toBeInTheDocument()
   })
 
   it('should handle selection when searchValue is present', async () => {
@@ -124,7 +124,7 @@ describe('PageSelector', () => {
 
     const toggleBtn = screen.getByTestId('notion-page-toggle-root-1')
     await user.click(toggleBtn) // Expand
-    await waitFor(() => expect(screen.queryByText('Child 1')).toBeInTheDocument())
+    await waitFor(() => expect(screen.queryByText('Child 1'))!.toBeInTheDocument())
 
     await user.click(toggleBtn) // Collapse
     await waitFor(() => expect(screen.queryByText('Child 1')).not.toBeInTheDocument())
@@ -149,14 +149,14 @@ describe('PageSelector', () => {
   it('should render preview button when canPreview is true', () => {
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={vi.fn()} canPreview={true} />)
 
-    expect(screen.getByTestId('notion-page-preview-root-1')).toBeInTheDocument()
+    expect(screen.getByTestId('notion-page-preview-root-1'))!.toBeInTheDocument()
   })
 
   it('should use previewPageId prop when provided', () => {
     const { rerender } = render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={vi.fn()} previewPageId="root-1" />)
 
     let row = screen.getByTestId('notion-page-row-root-1')
-    expect(row).toHaveClass('bg-state-base-hover')
+    expect(row)!.toHaveClass('bg-state-base-hover')
 
     rerender(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={vi.fn()} previewPageId="root-2" />)
 
@@ -190,8 +190,9 @@ describe('PageSelector', () => {
     await user.click(toggle)
 
     // Both children should be visible
-    expect(screen.getByText('Child 1')).toBeInTheDocument()
-    expect(screen.getByText('Child 2')).toBeInTheDocument()
+    // Both children should be visible
+    expect(screen.getByText('Child 1'))!.toBeInTheDocument()
+    expect(screen.getByText('Child 2'))!.toBeInTheDocument()
   })
 
   it('should expand nested children when toggling parent', async () => {
@@ -201,12 +202,12 @@ describe('PageSelector', () => {
     // Expand root-1
     let toggle = screen.getByTestId('notion-page-toggle-root-1')
     await user.click(toggle)
-    expect(screen.getByText('Child 1')).toBeInTheDocument()
+    expect(screen.getByText('Child 1'))!.toBeInTheDocument()
 
     // Expand child-1
     toggle = screen.getByTestId('notion-page-toggle-child-1')
     await user.click(toggle)
-    expect(screen.getByText('Grandchild 1')).toBeInTheDocument()
+    expect(screen.getByText('Grandchild 1'))!.toBeInTheDocument()
 
     // Collapse child-1
     await user.click(toggle)
@@ -227,7 +228,7 @@ describe('PageSelector', () => {
   it('should only select the item when searching (no descendants)', async () => {
     const handleSelect = vi.fn()
     const user = userEvent.setup()
-    render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="Child" pagesMap={mockPagesMap} list={[mockList[1]]} onSelect={handleSelect} />)
+    render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="Child" pagesMap={mockPagesMap} list={[mockList[1]!]} onSelect={handleSelect} />)
 
     const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-child-1')
     await user.click(checkbox)
@@ -239,7 +240,7 @@ describe('PageSelector', () => {
   it('should deselect only the item when searching (no descendants)', async () => {
     const handleSelect = vi.fn()
     const user = userEvent.setup()
-    render(<PageSelector value={new Set(['child-1'])} disabledValue={new Set()} searchValue="Child" pagesMap={mockPagesMap} list={[mockList[1]]} onSelect={handleSelect} />)
+    render(<PageSelector value={new Set(['child-1'])} disabledValue={new Set()} searchValue="Child" pagesMap={mockPagesMap} list={[mockList[1]!]} onSelect={handleSelect} />)
 
     const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-child-1')
     await user.click(checkbox)
@@ -250,8 +251,8 @@ describe('PageSelector', () => {
   it('should handle multiple root pages', async () => {
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={vi.fn()} />)
 
-    expect(screen.getByText('Root 1')).toBeInTheDocument()
-    expect(screen.getByText('Root 2')).toBeInTheDocument()
+    expect(screen.getByText('Root 1'))!.toBeInTheDocument()
+    expect(screen.getByText('Root 2'))!.toBeInTheDocument()
   })
 
   it('should update preview when clicking preview button with onPreview provided', async () => {
@@ -276,29 +277,61 @@ describe('PageSelector', () => {
     rerender(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={vi.fn()} canPreview={true} />)
 
     const row = screen.getByTestId('notion-page-row-root-1')
-    expect(row).toHaveClass('bg-state-base-hover')
+    expect(row)!.toHaveClass('bg-state-base-hover')
   })
 
   it('should render page name with correct title attribute', () => {
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={vi.fn()} />)
 
     const pageName = screen.getByTestId('notion-page-name-root-1')
-    expect(pageName).toHaveAttribute('title', 'Root 1')
+    expect(pageName)!.toHaveAttribute('title', 'Root 1')
   })
 
   it('should handle empty list gracefully', () => {
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={[]} onSelect={vi.fn()} />)
 
-    expect(screen.getByText('common.dataSource.notion.selector.noSearchResult')).toBeInTheDocument()
+    expect(screen.getByText('common.dataSource.notion.selector.noSearchResult'))!.toBeInTheDocument()
   })
 
   it('should filter search results correctly with partial matches', () => {
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="1" pagesMap={mockPagesMap} list={mockList} onSelect={vi.fn()} />)
 
     // Should show Root 1, Child 1, and Grandchild 1
-    expect(screen.getByTestId('notion-page-name-root-1')).toBeInTheDocument()
-    expect(screen.getByTestId('notion-page-name-child-1')).toBeInTheDocument()
-    expect(screen.getByTestId('notion-page-name-grandchild-1')).toBeInTheDocument()
+    // Should show Root 1, Child 1, and Grandchild 1
+    expect(screen.getByTestId('notion-page-name-root-1'))!.toBeInTheDocument()
+    expect(screen.getByTestId('notion-page-name-child-1'))!.toBeInTheDocument()
+    expect(screen.getByTestId('notion-page-name-grandchild-1'))!.toBeInTheDocument()
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
+    // Should not show Root 2, Child 2
     // Should not show Root 2, Child 2
     expect(screen.queryByTestId('notion-page-name-root-2')).not.toBeInTheDocument()
     expect(screen.queryByTestId('notion-page-name-child-2')).not.toBeInTheDocument()
@@ -313,6 +346,7 @@ describe('PageSelector', () => {
     await user.click(toggle)
 
     // Should expand even though parent is disabled
-    expect(screen.getByText('Child 1')).toBeInTheDocument()
+    // Should expand even though parent is disabled
+    expect(screen.getByText('Child 1'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/base/notion-page-selector/page-selector/__tests__/use-page-selector-model.spec.ts b/web/app/components/base/notion-page-selector/page-selector/__tests__/use-page-selector-model.spec.ts
index d90c50308d..04166f1d83 100644
--- a/web/app/components/base/notion-page-selector/page-selector/__tests__/use-page-selector-model.spec.ts
+++ b/web/app/components/base/notion-page-selector/page-selector/__tests__/use-page-selector-model.spec.ts
@@ -20,10 +20,10 @@ const list: DataSourceNotionPage[] = [
 ]
 
 const pagesMap: DataSourceNotionPageMap = {
-  'root-1': { ...list[0], workspace_id: 'workspace-1' },
-  'child-1': { ...list[1], workspace_id: 'workspace-1' },
-  'grandchild-1': { ...list[2], workspace_id: 'workspace-1' },
-  'child-2': { ...list[3], workspace_id: 'workspace-1' },
+  'root-1': { ...list[0]!, workspace_id: 'workspace-1' },
+  'child-1': { ...list[1]!, workspace_id: 'workspace-1' },
+  'grandchild-1': { ...list[2]!, workspace_id: 'workspace-1' },
+  'child-2': { ...list[3]!, workspace_id: 'workspace-1' },
 }
 
 const createProps = (
diff --git a/web/app/components/base/notion-page-selector/page-selector/__tests__/utils.spec.ts b/web/app/components/base/notion-page-selector/page-selector/__tests__/utils.spec.ts
index 2e6005c573..b0ad0b05b6 100644
--- a/web/app/components/base/notion-page-selector/page-selector/__tests__/utils.spec.ts
+++ b/web/app/components/base/notion-page-selector/page-selector/__tests__/utils.spec.ts
@@ -25,21 +25,21 @@ const list: DataSourceNotionPage[] = [
 ]
 
 const pagesMap: DataSourceNotionPageMap = {
-  'root-1': { ...list[0], workspace_id: 'workspace-1' },
-  'child-1': { ...list[1], workspace_id: 'workspace-1' },
-  'grandchild-1': { ...list[2], workspace_id: 'workspace-1' },
-  'child-2': { ...list[3], workspace_id: 'workspace-1' },
-  'orphan-1': { ...list[4], workspace_id: 'workspace-1' },
+  'root-1': { ...list[0]!, workspace_id: 'workspace-1' },
+  'child-1': { ...list[1]!, workspace_id: 'workspace-1' },
+  'grandchild-1': { ...list[2]!, workspace_id: 'workspace-1' },
+  'child-2': { ...list[3]!, workspace_id: 'workspace-1' },
+  'orphan-1': { ...list[4]!, workspace_id: 'workspace-1' },
 }
 
 describe('page-selector utils', () => {
   it('should build a tree with descendants, depth, and ancestors', () => {
     const treeMap = buildNotionPageTree(list, pagesMap)
 
-    expect(treeMap['root-1'].children).toEqual(new Set(['child-1', 'child-2']))
-    expect(treeMap['root-1'].descendants).toEqual(new Set(['child-1', 'grandchild-1', 'child-2']))
-    expect(treeMap['grandchild-1'].depth).toBe(2)
-    expect(treeMap['grandchild-1'].ancestors).toEqual(['Root 1', 'Child 1'])
+    expect(treeMap['root-1']!.children).toEqual(new Set(['child-1', 'child-2']))
+    expect(treeMap['root-1']!.descendants).toEqual(new Set(['child-1', 'grandchild-1', 'child-2']))
+    expect(treeMap['grandchild-1']!.depth).toBe(2)
+    expect(treeMap['grandchild-1']!.ancestors).toEqual(['Root 1', 'Child 1'])
   })
 
   it('should return root page ids for true roots and pages with missing parents', () => {
diff --git a/web/app/components/base/notion-page-selector/page-selector/virtual-page-list.tsx b/web/app/components/base/notion-page-selector/page-selector/virtual-page-list.tsx
index 6fec6c0b84..07f56b015d 100644
--- a/web/app/components/base/notion-page-selector/page-selector/virtual-page-list.tsx
+++ b/web/app/components/base/notion-page-selector/page-selector/virtual-page-list.tsx
@@ -58,8 +58,8 @@ const VirtualPageList = ({
         }}
       >
         {virtualRows.map((virtualRow) => {
-          const row = rows[virtualRow.index]
-          const pageId = row.page.page_id
+          const row = rows[virtualRow.index]!
+          const pageId = row!.page.page_id
 
           return (
             <PageRow
diff --git a/web/app/components/base/pagination/__tests__/index.spec.tsx b/web/app/components/base/pagination/__tests__/index.spec.tsx
index 426751ec9d..7267d84f54 100644
--- a/web/app/components/base/pagination/__tests__/index.spec.tsx
+++ b/web/app/components/base/pagination/__tests__/index.spec.tsx
@@ -16,14 +16,16 @@ describe('CustomizedPagination', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       const { container } = render(<CustomizedPagination {...defaultProps} />)
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should display current page and total pages', () => {
       render(<CustomizedPagination {...defaultProps} current={0} total={100} limit={10} />)
       // current + 1 = 1, totalPages = 10
       // The page info display shows "1 / 10" and page buttons also show numbers
-      expect(screen.getByText('/')).toBeInTheDocument()
+      // current + 1 = 1, totalPages = 10
+      // The page info display shows "1 / 10" and page buttons also show numbers
+      expect(screen.getByText('/'))!.toBeInTheDocument()
       expect(screen.getAllByText('1').length).toBeGreaterThanOrEqual(1)
     })
 
@@ -36,13 +38,14 @@ describe('CustomizedPagination', () => {
     it('should render page number buttons', () => {
       render(<CustomizedPagination {...defaultProps} total={50} limit={10} />)
       // 5 pages total, should see page numbers
-      expect(screen.getByText('2')).toBeInTheDocument()
-      expect(screen.getByText('3')).toBeInTheDocument()
+      // 5 pages total, should see page numbers
+      expect(screen.getByText('2'))!.toBeInTheDocument()
+      expect(screen.getByText('3'))!.toBeInTheDocument()
     })
 
     it('should display slash separator between current page and total', () => {
       render(<CustomizedPagination {...defaultProps} />)
-      expect(screen.getByText('/')).toBeInTheDocument()
+      expect(screen.getByText('/'))!.toBeInTheDocument()
     })
   })
 
@@ -50,7 +53,7 @@ describe('CustomizedPagination', () => {
     it('should apply custom className', () => {
       const { container } = render(<CustomizedPagination {...defaultProps} className="my-custom" />)
       const wrapper = container.firstChild as HTMLElement
-      expect(wrapper).toHaveClass('my-custom')
+      expect(wrapper)!.toHaveClass('my-custom')
     })
 
     it('should default limit to 10', () => {
@@ -69,14 +72,16 @@ describe('CustomizedPagination', () => {
       render(<CustomizedPagination {...defaultProps} current={0} />)
       const buttons = screen.getAllByRole('button')
       // First button is prev
-      expect(buttons[0]).toBeDisabled()
+      // First button is prev
+      expect(buttons[0])!.toBeDisabled()
     })
 
     it('should disable next button on last page', () => {
       render(<CustomizedPagination {...defaultProps} current={9} total={100} limit={10} />)
       const buttons = screen.getAllByRole('button')
       // Last button is next
-      expect(buttons[buttons.length - 1]).toBeDisabled()
+      // Last button is next
+      expect(buttons[buttons.length - 1])!.toBeDisabled()
     })
 
     it('should not render limit selector when onLimitChange is not provided', () => {
@@ -88,8 +93,9 @@ describe('CustomizedPagination', () => {
       const onLimitChange = vi.fn()
       render(<CustomizedPagination {...defaultProps} onLimitChange={onLimitChange} />)
       // Should show limit options 10, 25, 50
-      expect(screen.getByText('25')).toBeInTheDocument()
-      expect(screen.getByText('50')).toBeInTheDocument()
+      // Should show limit options 10, 25, 50
+      expect(screen.getByText('25'))!.toBeInTheDocument()
+      expect(screen.getByText('50'))!.toBeInTheDocument()
     })
   })
 
@@ -99,7 +105,7 @@ describe('CustomizedPagination', () => {
       render(<CustomizedPagination {...defaultProps} current={0} onChange={onChange} />)
       const buttons = screen.getAllByRole('button')
       const nextButton = buttons[buttons.length - 1]
-      fireEvent.click(nextButton)
+      fireEvent.click(nextButton!)
       expect(onChange).toHaveBeenCalledWith(1)
     })
 
@@ -107,7 +113,7 @@ describe('CustomizedPagination', () => {
       const onChange = vi.fn()
       render(<CustomizedPagination {...defaultProps} current={5} onChange={onChange} />)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
       expect(onChange).toHaveBeenCalledWith(4)
     })
 
@@ -116,7 +122,8 @@ describe('CustomizedPagination', () => {
       // Click the current page display (the div containing "1 / 10")
       fireEvent.click(screen.getByText('/'))
       // Input should appear
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      // Input should appear
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should navigate to entered page on Enter key', () => {
@@ -139,8 +146,39 @@ describe('CustomizedPagination', () => {
       const input = screen.getByRole('textbox')
       fireEvent.keyDown(input, { key: 'Escape' })
       // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
+      // Input should be hidden and page display should return
       expect(screen.queryByRole('textbox')).not.toBeInTheDocument()
-      expect(screen.getByText('/')).toBeInTheDocument()
+      expect(screen.getByText('/'))!.toBeInTheDocument()
     })
 
     it('should confirm input on blur-sm', () => {
@@ -191,10 +229,10 @@ describe('CustomizedPagination', () => {
       const input = screen.getByRole('textbox')
 
       fireEvent.change(input, { target: { value: 'abc' } })
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
 
       fireEvent.change(input, { target: { value: '' } })
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
     })
 
     it('should show per page tip on hover and hide on leave', () => {
@@ -205,7 +243,8 @@ describe('CustomizedPagination', () => {
 
       fireEvent.mouseEnter(container)
       // I18n mock returns ns.key
-      expect(screen.getByText('common.pagination.perPage')).toBeInTheDocument()
+      // I18n mock returns ns.key
+      expect(screen.getByText('common.pagination.perPage'))!.toBeInTheDocument()
 
       fireEvent.mouseLeave(container)
       expect(screen.queryByText('common.pagination.perPage')).not.toBeInTheDocument()
@@ -247,19 +286,19 @@ describe('CustomizedPagination', () => {
       // Test limit 25
       const { container: containerA } = render(<CustomizedPagination current={0} total={100} limit={25} onChange={vi.fn()} onLimitChange={vi.fn()} />)
       const wrapper25 = Array.from(containerA.querySelectorAll('div.system-sm-medium')).find(el => el.textContent === '25')!
-      expect(wrapper25).toHaveClass('bg-components-segmented-control-item-active-bg')
+      expect(wrapper25)!.toHaveClass('bg-components-segmented-control-item-active-bg')
 
       // Test limit 50
       const { container: containerB } = render(<CustomizedPagination current={0} total={100} limit={50} onChange={vi.fn()} onLimitChange={vi.fn()} />)
       const wrapper50 = Array.from(containerB.querySelectorAll('div.system-sm-medium')).find(el => el.textContent === '50')!
-      expect(wrapper50).toHaveClass('bg-components-segmented-control-item-active-bg')
+      expect(wrapper50)!.toHaveClass('bg-components-segmented-control-item-active-bg')
     })
   })
 
   describe('Edge Cases', () => {
     it('should handle total of 0', () => {
       const { container } = render(<CustomizedPagination {...defaultProps} total={0} />)
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should handle confirm when input value is unchanged (covers false branch of empty string check)', () => {
@@ -287,7 +326,7 @@ describe('CustomizedPagination', () => {
       const input = screen.getByRole('textbox')
 
       fireEvent.keyDown(input, { key: 'a' })
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should trigger handleInputConfirm with empty string specifically on keydown Enter', async () => {
@@ -303,6 +342,37 @@ describe('CustomizedPagination', () => {
       // Wait for debounce 500ms
       await new Promise(r => setTimeout(r, 600))
 
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
+      // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
       // Validates `inputValue === ''` path under `handleInputConfirm` triggered by Enter
       expect(screen.queryByRole('textbox')).not.toBeInTheDocument()
     })
@@ -326,8 +396,8 @@ describe('CustomizedPagination', () => {
       render(<CustomizedPagination {...defaultProps} total={5} limit={10} />)
       // totalPages = 1, both buttons should be disabled
       const buttons = screen.getAllByRole('button')
-      expect(buttons[0]).toBeDisabled()
-      expect(buttons[buttons.length - 1]).toBeDisabled()
+      expect(buttons[0])!.toBeDisabled()
+      expect(buttons[buttons.length - 1])!.toBeDisabled()
     })
 
     it('should restore input value when blurred with empty value', () => {
@@ -337,6 +407,37 @@ describe('CustomizedPagination', () => {
       fireEvent.change(input, { target: { value: '' } })
       fireEvent.blur(input)
       // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
+      // Should close input without calling onChange, restoring to current + 1
       expect(screen.queryByRole('textbox')).not.toBeInTheDocument()
     })
   })
diff --git a/web/app/components/base/pagination/hook.ts b/web/app/components/base/pagination/hook.ts
index 25fa24cb26..0b9fd87989 100644
--- a/web/app/components/base/pagination/hook.ts
+++ b/web/app/components/base/pagination/hook.ts
@@ -34,7 +34,7 @@ const usePagination = ({
   }, [currentPage, isReachedToFirst, isReachedToLast, middlePagesSiblingCount, pages])
 
   const getAllPreviousPages = useCallback(() => {
-    return pages.slice(0, middlePages[0] - 1)
+    return pages.slice(0, middlePages[0]! - 1)
   }, [middlePages, pages])
 
   const previousPages = React.useMemo(() => {
@@ -67,12 +67,12 @@ const usePagination = ({
 
   const isPreviousTruncable = React.useMemo(() => {
     // Is truncable if first value of middlePage is larger than last value of previousPages
-    return middlePages[0] > previousPages[previousPages.length - 1] + 1
+    return middlePages[0]! > previousPages[previousPages.length - 1]! + 1
   }, [previousPages, middlePages])
 
   const isNextTruncable = React.useMemo(() => {
     // Is truncable if last value of middlePage is larger than first value of previousPages
-    return middlePages[middlePages.length - 1] + 1 < nextPages[0]
+    return middlePages[middlePages.length - 1]! + 1 < nextPages[0]!
   }, [nextPages, middlePages])
 
   return {
diff --git a/web/app/components/base/param-item/index.stories.tsx b/web/app/components/base/param-item/index.stories.tsx
index 0cf6c40146..6ba6650dd4 100644
--- a/web/app/components/base/param-item/index.stories.tsx
+++ b/web/app/components/base/param-item/index.stories.tsx
@@ -56,7 +56,7 @@ const ParamItemPlayground = () => {
     setState(prev => ({
       ...prev,
       [id]: {
-        ...prev[id],
+        ...prev[id]!,
         value: Number.parseFloat(value.toFixed(3)),
       },
     }))
@@ -66,7 +66,7 @@ const ParamItemPlayground = () => {
     setState(prev => ({
       ...prev,
       [id]: {
-        ...prev[id],
+        ...prev[id]!,
         enabled,
       },
     }))
@@ -87,8 +87,8 @@ const ParamItemPlayground = () => {
           id={param.id}
           name={param.name}
           tip={param.tip}
-          value={state[param.id].value}
-          enable={state[param.id].enabled}
+          value={state[param.id]!.value}
+          enable={state[param.id]!.enabled}
           min={param.min}
           max={param.max}
           step={param.step}
diff --git a/web/app/components/base/portal-to-follow-elem/__tests__/index.spec.tsx b/web/app/components/base/portal-to-follow-elem/__tests__/index.spec.tsx
index 373ae018c7..3c1b09d947 100644
--- a/web/app/components/base/portal-to-follow-elem/__tests__/index.spec.tsx
+++ b/web/app/components/base/portal-to-follow-elem/__tests__/index.spec.tsx
@@ -68,7 +68,7 @@ describe('PortalToFollowElem', () => {
           <PortalToFollowElemTrigger>Trigger Text</PortalToFollowElemTrigger>
         </PortalToFollowElem>,
       )
-      expect(getByText('Trigger Text')).toBeInTheDocument()
+      expect(getByText('Trigger Text'))!.toBeInTheDocument()
     })
 
     it('should handle asChild prop correctly', () => {
@@ -80,7 +80,7 @@ describe('PortalToFollowElem', () => {
         </PortalToFollowElem>,
       )
 
-      expect(getByRole('button')).toHaveTextContent('Button Trigger')
+      expect(getByRole('button'))!.toHaveTextContent('Button Trigger')
     })
   })
 
@@ -104,7 +104,7 @@ describe('PortalToFollowElem', () => {
         </PortalToFollowElem>,
       )
 
-      expect(getByText('Popup Content')).toBeInTheDocument()
+      expect(getByText('Popup Content'))!.toBeInTheDocument()
     })
   })
 
@@ -161,7 +161,7 @@ describe('PortalToFollowElem', () => {
         }]
       }
 
-      const sizeMiddleware = useFloatingMock.mock.calls[0][0].middleware.find(
+      const sizeMiddleware = useFloatingMock.mock.calls[0]![0].middleware.find(
         (m: { name: string }) => m.name === 'size',
       ) as SizeMiddleware
       expect(sizeMiddleware).toBeDefined()
@@ -193,7 +193,7 @@ describe('PortalToFollowElem', () => {
           </PortalToFollowElemTrigger>
         </PortalToFollowElem>,
       )
-      expect(getByRole('button')).toHaveAttribute('data-state', 'open')
+      expect(getByRole('button'))!.toHaveAttribute('data-state', 'open')
     })
 
     it('should handle missing ref on child', () => {
@@ -204,7 +204,7 @@ describe('PortalToFollowElem', () => {
           </PortalToFollowElemTrigger>
         </PortalToFollowElem>,
       )
-      expect(getByRole('button')).toBeInTheDocument()
+      expect(getByRole('button'))!.toBeInTheDocument()
     })
   })
 
@@ -223,7 +223,7 @@ describe('PortalToFollowElem', () => {
         </PortalToFollowElem>,
       )
 
-      expect(getByTestId('content')).toHaveStyle('visibility: hidden')
+      expect(getByTestId('content'))!.toHaveStyle('visibility: hidden')
       mockFloatingData = {}
     })
   })
diff --git a/web/app/components/base/progress-bar/__tests__/progress-circle.spec.tsx b/web/app/components/base/progress-bar/__tests__/progress-circle.spec.tsx
index 4a3ee2e653..14bb9896e3 100644
--- a/web/app/components/base/progress-bar/__tests__/progress-circle.spec.tsx
+++ b/web/app/components/base/progress-bar/__tests__/progress-circle.spec.tsx
@@ -5,7 +5,7 @@ const extractLargeArcFlag = (pathData: string): string => {
   const afterA = pathData.slice(pathData.indexOf('A') + 1)
   const tokens = afterA.replace(/,/g, ' ').trim().split(/\s+/)
   // Arc syntax: A rx ry x-axis-rotation large-arc-flag sweep-flag x y
-  return tokens[3]
+  return tokens[3]!
 }
 
 describe('ProgressCircle', () => {
@@ -17,9 +17,9 @@ describe('ProgressCircle', () => {
       const circle = container.querySelector('circle')
       const path = container.querySelector('path')
 
-      expect(svg).toBeInTheDocument()
-      expect(circle).toBeInTheDocument()
-      expect(path).toBeInTheDocument()
+      expect(svg)!.toBeInTheDocument()
+      expect(circle)!.toBeInTheDocument()
+      expect(path)!.toBeInTheDocument()
     })
   })
 
@@ -34,9 +34,9 @@ describe('ProgressCircle', () => {
 
       const svg = container.querySelector('svg') as SVGElement
 
-      expect(svg).toHaveAttribute('width', String(size + strokeWidth))
-      expect(svg).toHaveAttribute('height', String(size + strokeWidth))
-      expect(svg).toHaveAttribute(
+      expect(svg)!.toHaveAttribute('width', String(size + strokeWidth))
+      expect(svg)!.toHaveAttribute('height', String(size + strokeWidth))
+      expect(svg)!.toHaveAttribute(
         'viewBox',
         `0 0 ${size + strokeWidth} ${size + strokeWidth}`,
       )
@@ -50,8 +50,8 @@ describe('ProgressCircle', () => {
         />,
       )
       const circle = container.querySelector('circle')!
-      expect(circle!).toHaveClass('stroke-red-500')
-      expect(circle!).toHaveClass('fill-red-100')
+      expect(circle!)!.toHaveClass('stroke-red-500')
+      expect(circle!)!.toHaveClass('fill-red-100')
     })
 
     it('applies custom sector fill color to the path', () => {
@@ -59,7 +59,7 @@ describe('ProgressCircle', () => {
         <ProgressCircle sectorFillColor="fill-blue-500" />,
       )
       const path = container.querySelector('path')!
-      expect(path!).toHaveClass('fill-blue-500')
+      expect(path!)!.toHaveClass('fill-blue-500')
     })
 
     it('uses large arc flag when percentage is greater than 50', () => {
diff --git a/web/app/components/base/prompt-editor/__tests__/hooks.spec.tsx b/web/app/components/base/prompt-editor/__tests__/hooks.spec.tsx
index c8451ee596..9917918628 100644
--- a/web/app/components/base/prompt-editor/__tests__/hooks.spec.tsx
+++ b/web/app/components/base/prompt-editor/__tests__/hooks.spec.tsx
@@ -359,23 +359,23 @@ describe('prompt-editor/hooks', () => {
       const user = userEvent.setup()
       render(<TriggerHarness />)
 
-      expect(screen.getByText('closed')).toBeInTheDocument()
+      expect(screen.getByText('closed'))!.toBeInTheDocument()
 
       await user.click(screen.getByTestId('trigger-target'))
-      expect(screen.getByText('open')).toBeInTheDocument()
+      expect(screen.getByText('open'))!.toBeInTheDocument()
 
       await user.click(screen.getByTestId('trigger-target'))
-      expect(screen.getByText('closed')).toBeInTheDocument()
+      expect(screen.getByText('closed'))!.toBeInTheDocument()
     })
 
     it('should keep state unchanged when consumer does not attach the returned ref', async () => {
       const user = userEvent.setup()
       const { unmount } = render(<TriggerNoRefHarness />)
 
-      expect(screen.getByTestId('trigger-no-ref-state')).toHaveTextContent('closed')
+      expect(screen.getByTestId('trigger-no-ref-state'))!.toHaveTextContent('closed')
 
       await user.click(screen.getByTestId('trigger-no-ref-state'))
-      expect(screen.getByTestId('trigger-no-ref-state')).toHaveTextContent('closed')
+      expect(screen.getByTestId('trigger-no-ref-state'))!.toHaveTextContent('closed')
 
       expect(() => unmount()).not.toThrow()
     })
@@ -399,8 +399,8 @@ describe('prompt-editor/hooks', () => {
       expect(mockState.editor.registerNodeTransform).toHaveBeenCalledTimes(2)
       // Verify the first call uses TextNode, not MockTargetNode
       const calls = mockState.editor.registerNodeTransform.mock.calls
-      expect(calls[0][0]).not.toBe(MockTargetNode)
-      expect(typeof calls[0][0]).toBe('function')
+      expect(calls[0]![0]).not.toBe(MockTargetNode)
+      expect(typeof calls[0]![0]).toBe('function')
       expect(mockState.editor.registerNodeTransform).toHaveBeenCalledWith(
         MockTargetNode,
         expect.any(Function),
diff --git a/web/app/components/base/prompt-editor/__tests__/utils.spec.ts b/web/app/components/base/prompt-editor/__tests__/utils.spec.ts
index 443f7a5d6d..af1bab1562 100644
--- a/web/app/components/base/prompt-editor/__tests__/utils.spec.ts
+++ b/web/app/components/base/prompt-editor/__tests__/utils.spec.ts
@@ -151,7 +151,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((node: TextNode) => node as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const reverseTransform = registerNodeTransform.mock.calls[1][1] as (n: TN) => void
+      const reverseTransform = registerNodeTransform.mock.calls[1]![1] as (n: TN) => void
       const node = new TargetNode() as TN
       reverseTransform(node)
 
@@ -181,7 +181,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const reverseTransform = registerNodeTransform.mock.calls[1][1] as (n: TN) => void
+      const reverseTransform = registerNodeTransform.mock.calls[1]![1] as (n: TN) => void
       const node = new TargetNode() as TN
       reverseTransform(node)
 
@@ -206,7 +206,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const reverseTransform = registerNodeTransform.mock.calls[1][1] as (n: TN) => void
+      const reverseTransform = registerNodeTransform.mock.calls[1]![1] as (n: TN) => void
       const node = new TargetNode() as TN
       reverseTransform(node)
 
@@ -240,7 +240,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const reverseTransform = registerNodeTransform.mock.calls[1][1] as (n: TN) => void
+      const reverseTransform = registerNodeTransform.mock.calls[1]![1] as (n: TN) => void
       const node = new TargetNode() as TN
       reverseTransform(node)
 
@@ -275,7 +275,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const reverseTransform = registerNodeTransform.mock.calls[1][1] as (n: TN) => void
+      const reverseTransform = registerNodeTransform.mock.calls[1]![1] as (n: TN) => void
       const node = new TargetNode() as TN
       reverseTransform(node)
 
@@ -330,7 +330,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       const node = new NodeUnderTest() as unknown as TextNode
       textTransform(node)
 
@@ -367,7 +367,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       const node = new NodeUnderTest() as unknown as TextNode
       textTransform(node)
 
@@ -403,7 +403,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       const node = new NodeUnderTest() as unknown as TextNode
       textTransform(node)
 
@@ -438,7 +438,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn(() => replacementNode as unknown as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       const node = new NodeUnderTest() as unknown as TextNode
       textTransform(node)
 
@@ -765,7 +765,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       const node = new NodeUnderTest() as unknown as TextNode
       textTransform(node)
 
@@ -804,7 +804,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((node: TextNode) => node as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       textTransform(new NodeUnderTest() as unknown as TextNode)
 
       // nextMatch.start !== 0 → return (line 123)
@@ -849,7 +849,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn(() => replacementNode as unknown as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       textTransform(new NodeUnderTest() as unknown as TextNode)
 
       // createNode was called (first match replacement) and currentNode=null exits loop at 152
@@ -904,7 +904,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((node: TextNode) => node as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       textTransform(new NodeUnderTest() as unknown as TextNode)
 
       // continue was executed (createNode skipped for the continue iteration), exits via match=null
@@ -1000,7 +1000,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       textTransform(new NodeUnderTest() as unknown as TextNode)
 
       // isSimpleText returns false → return at line 59, getMatch never called
@@ -1059,7 +1059,7 @@ describe('prompt-editor/utils', () => {
       }
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       textTransform(new NodeUnderTest2() as unknown as TextNode)
 
       // diff=1, text.length=2 → remaining='d' → setTextContent called with '@ab'+'c'='@abc'
@@ -1116,7 +1116,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       const node = new NodeUnderTest() as unknown as TextNode
       textTransform(node)
 
@@ -1158,7 +1158,7 @@ describe('prompt-editor/utils', () => {
       const createNode = vi.fn((n: TextNode) => n as TN)
 
       registerLexicalTextEntity(editor, getMatch, targetNodeClass, createNode)
-      const textTransform = registerNodeTransform.mock.calls[0][1] as (n: TextNode) => void
+      const textTransform = registerNodeTransform.mock.calls[0]![1] as (n: TextNode) => void
       textTransform(new NodeUnderTest() as unknown as TextNode)
 
       // Returns at line 131 because nextMatch.start===0 for nextText → no split/replace
diff --git a/web/app/components/base/prompt-editor/constants.tsx b/web/app/components/base/prompt-editor/constants.tsx
index 2dcc62706a..f3d906ffee 100644
--- a/web/app/components/base/prompt-editor/constants.tsx
+++ b/web/app/components/base/prompt-editor/constants.tsx
@@ -52,7 +52,7 @@ export const getInputVars = (text: string): ValueSelector[] => {
       .filter(item => item.includes('.'))
       .map((item) => {
         const valueSelector = item.replace('{{#', '').replace('#}}', '').split('.')
-        if (valueSelector[1] === 'sys' && /^\d+$/.test(valueSelector[0]))
+        if (valueSelector[1] === 'sys' && /^\d+$/.test(valueSelector[0]!))
           return valueSelector.slice(1)
 
         return valueSelector
diff --git a/web/app/components/base/prompt-editor/hooks.ts b/web/app/components/base/prompt-editor/hooks.ts
index 49fc6a8eb0..dd6c6295a6 100644
--- a/web/app/components/base/prompt-editor/hooks.ts
+++ b/web/app/components/base/prompt-editor/hooks.ts
@@ -171,12 +171,12 @@ export function useBasicTypeaheadTriggerMatch(
       const match = TypeaheadTriggerRegex.exec(text)
       if (match !== null) {
         const maybeLeadingWhitespace = match[1]
-        const matchingString = match[3]
-        if (matchingString.length >= minLength) {
+        const matchingString = match[3]!
+        if (matchingString!.length >= minLength) {
           return {
-            leadOffset: match.index + maybeLeadingWhitespace.length,
-            matchingString,
-            replaceableString: match[2],
+            leadOffset: match.index + maybeLeadingWhitespace!.length,
+            matchingString: matchingString!,
+            replaceableString: match[2]!,
           }
         }
       }
diff --git a/web/app/components/base/prompt-editor/plugins/__tests__/tree-view.spec.tsx b/web/app/components/base/prompt-editor/plugins/__tests__/tree-view.spec.tsx
index c2c9fe9237..a61e9dd209 100644
--- a/web/app/components/base/prompt-editor/plugins/__tests__/tree-view.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/__tests__/tree-view.spec.tsx
@@ -43,9 +43,9 @@ describe('TreeViewPlugin', () => {
     await waitFor(() => {
       expect(editor).not.toBeNull()
     })
-    expect(screen.getByTestId('lexical-tree-view')).toBeInTheDocument()
+    expect(screen.getByTestId('lexical-tree-view'))!.toBeInTheDocument()
 
-    const firstCallProps = mockTreeView.mock.calls[0][0] as Record<string, unknown>
+    const firstCallProps = mockTreeView.mock.calls[0]![0] as Record<string, unknown>
 
     expect(firstCallProps.editor).toBe(editor)
     expect(firstCallProps.viewClassName).toBe('tree-view-output')
diff --git a/web/app/components/base/prompt-editor/plugins/component-picker-block/__tests__/hooks.spec.tsx b/web/app/components/base/prompt-editor/plugins/component-picker-block/__tests__/hooks.spec.tsx
index e28304dd15..c21ad32456 100644
--- a/web/app/components/base/prompt-editor/plugins/component-picker-block/__tests__/hooks.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/component-picker-block/__tests__/hooks.spec.tsx
@@ -148,7 +148,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       expect(result.current).toHaveLength(1)
-      expect(result.current[0].group).toBe('prompt context')
+      expect(result.current[0]!.group).toBe('prompt context')
     })
 
     it('should render the context PromptMenuItem without crashing', () => {
@@ -157,7 +157,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       // renderMenuOption returns a React element – just verify it's truthy
-      const el = result.current[0].renderMenuOption(renderProps)
+      const el = result.current[0]!.renderMenuOption(renderProps)
       expect(el).toBeTruthy()
     })
 
@@ -175,7 +175,7 @@ describe('usePromptOptions', () => {
       )
 
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       expect(spy).toHaveBeenCalledTimes(1)
     })
 
@@ -192,7 +192,7 @@ describe('usePromptOptions', () => {
       )
 
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       expect(spy).not.toHaveBeenCalled()
     })
   })
@@ -215,7 +215,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       expect(result.current).toHaveLength(1)
-      expect(result.current[0].group).toBe('prompt query')
+      expect(result.current[0]!.group).toBe('prompt query')
     })
 
     it('should render the query PromptMenuItem without crashing', () => {
@@ -223,7 +223,7 @@ describe('usePromptOptions', () => {
         () => usePromptOptions(undefined, makeQueryBlock()),
         { wrapper },
       )
-      const el = result.current[0].renderMenuOption(renderProps)
+      const el = result.current[0]!.renderMenuOption(renderProps)
       expect(el).toBeTruthy()
     })
 
@@ -238,7 +238,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       expect(spy).toHaveBeenCalledTimes(1)
     })
 
@@ -253,7 +253,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       expect(spy).not.toHaveBeenCalled()
     })
   })
@@ -276,7 +276,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       expect(result.current).toHaveLength(1)
-      expect(result.current[0].group).toBe('request URL')
+      expect(result.current[0]!.group).toBe('request URL')
     })
 
     it('should render the requestURL PromptMenuItem without crashing', () => {
@@ -284,7 +284,7 @@ describe('usePromptOptions', () => {
         () => usePromptOptions(undefined, undefined, undefined, makeRequestURLBlock()),
         { wrapper },
       )
-      const el = result.current[0].renderMenuOption(renderProps)
+      const el = result.current[0]!.renderMenuOption(renderProps)
       expect(el).toBeTruthy()
     })
 
@@ -299,7 +299,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       expect(spy).toHaveBeenCalledTimes(1)
     })
 
@@ -314,7 +314,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       expect(spy).not.toHaveBeenCalled()
     })
   })
@@ -337,7 +337,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       expect(result.current).toHaveLength(1)
-      expect(result.current[0].group).toBe('prompt history')
+      expect(result.current[0]!.group).toBe('prompt history')
     })
 
     it('should render the history PromptMenuItem without crashing', () => {
@@ -345,7 +345,7 @@ describe('usePromptOptions', () => {
         () => usePromptOptions(undefined, undefined, makeHistoryBlock()),
         { wrapper },
       )
-      const el = result.current[0].renderMenuOption(renderProps)
+      const el = result.current[0]!.renderMenuOption(renderProps)
       expect(el).toBeTruthy()
     })
 
@@ -360,7 +360,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       expect(spy).toHaveBeenCalledTimes(1)
     })
 
@@ -375,7 +375,7 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       expect(spy).not.toHaveBeenCalled()
     })
   })
@@ -398,11 +398,11 @@ describe('usePromptOptions', () => {
         { wrapper },
       )
       expect(result.current).toHaveLength(4)
-      expect(result.current[0].group).toBe('prompt context')
-      expect(result.current[1].group).toBe('prompt query')
+      expect(result.current[0]!.group).toBe('prompt context')
+      expect(result.current[1]!.group).toBe('prompt query')
       // requestURL is pushed 3rd – before historyBlock
-      expect(result.current[2].group).toBe('request URL')
-      expect(result.current[3].group).toBe('prompt history')
+      expect(result.current[2]!.group).toBe('request URL')
+      expect(result.current[3]!.group).toBe('prompt history')
     })
   })
 })
@@ -455,7 +455,7 @@ describe('useVariableOptions', () => {
         { wrapper },
       )
       expect(result.current).toHaveLength(1)
-      expect(result.current[0].group).toBe('prompt variable')
+      expect(result.current[0]!.group).toBe('prompt variable')
     })
   })
 
@@ -474,8 +474,8 @@ describe('useVariableOptions', () => {
       )
       // 2 variable options + 1 addOption = 3
       expect(result.current).toHaveLength(3)
-      expect(result.current[0].key).toBe('alpha')
-      expect(result.current[1].key).toBe('beta')
+      expect(result.current[0]!.key).toBe('alpha')
+      expect(result.current[1]!.key).toBe('beta')
     })
 
     it('should render variable VariableMenuItems without crashing', () => {
@@ -485,7 +485,7 @@ describe('useVariableOptions', () => {
         { wrapper },
       )
       // Pass a queryString so we exercise the highlight splitting code path in VariableMenuItem
-      const el = result.current[0].renderMenuOption({ ...renderProps, queryString: 'my' })
+      const el = result.current[0]!.renderMenuOption({ ...renderProps, queryString: 'my' })
       expect(el).toBeTruthy()
     })
 
@@ -501,7 +501,7 @@ describe('useVariableOptions', () => {
         { wrapper },
       )
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       // The command payload wraps the value in {{ }}
       expect(spy).toHaveBeenCalledWith(expect.anything(), '{{myvar}}')
     })
@@ -523,8 +523,8 @@ describe('useVariableOptions', () => {
       )
       // 'alpha' regex (case-insensitive) matches 'alpha' and 'ALPHA_UPPER'; addOption is always appended
       expect(result.current).toHaveLength(3)
-      expect(result.current[0].key).toBe('alpha')
-      expect(result.current[1].key).toBe('ALPHA_UPPER')
+      expect(result.current[0]!.key).toBe('alpha')
+      expect(result.current[1]!.key).toBe('ALPHA_UPPER')
     })
 
     it('should return only addOption when no variables match the queryString', () => {
@@ -554,7 +554,7 @@ describe('useVariableOptions', () => {
         { wrapper },
       )
       const lastOption = result.current[result.current.length - 1]
-      const el = lastOption.renderMenuOption(renderProps)
+      const el = lastOption!.renderMenuOption(renderProps)
       expect(el).toBeTruthy()
     })
 
@@ -570,7 +570,7 @@ describe('useVariableOptions', () => {
       )
       const spy = vi.spyOn(capturedEditor!, 'update')
       const lastOption = result.current[result.current.length - 1]
-      lastOption.onSelectMenuOption()
+      lastOption!.onSelectMenuOption()
       expect(spy).toHaveBeenCalledTimes(1)
     })
   })
@@ -630,7 +630,7 @@ describe('useExternalToolOptions', () => {
         { wrapper },
       )
       expect(result.current).toHaveLength(1)
-      expect(result.current[0].group).toBe('external tool')
+      expect(result.current[0]!.group).toBe('external tool')
     })
   })
 
@@ -648,8 +648,8 @@ describe('useExternalToolOptions', () => {
         { wrapper },
       )
       expect(result.current).toHaveLength(3)
-      expect(result.current[0].key).toBe('tool-a')
-      expect(result.current[1].key).toBe('tool-b')
+      expect(result.current[0]!.key).toBe('tool-a')
+      expect(result.current[1]!.key).toBe('tool-b')
     })
 
     it('should render tool VariableMenuItem (with AppIcon and variableName extra element) without crashing', () => {
@@ -658,7 +658,7 @@ describe('useExternalToolOptions', () => {
         { wrapper },
       )
       // pass a queryString to also exercise the highlighting code path
-      const el = result.current[0].renderMenuOption({ ...renderProps, queryString: 'wea' })
+      const el = result.current[0]!.renderMenuOption({ ...renderProps, queryString: 'wea' })
       expect(el).toBeTruthy()
     })
 
@@ -673,7 +673,7 @@ describe('useExternalToolOptions', () => {
         { wrapper },
       )
       const spy = vi.spyOn(capturedEditor!, 'dispatchCommand')
-      result.current[0].onSelectMenuOption()
+      result.current[0]!.onSelectMenuOption()
       // variableName is 'weather_tool', wrapped in {{ }}
       expect(spy).toHaveBeenCalledWith(expect.anything(), '{{weather_tool}}')
     })
@@ -694,7 +694,7 @@ describe('useExternalToolOptions', () => {
       )
       // 'weather' regex matches 'WeatherTool'; addOption is always appended
       expect(result.current).toHaveLength(2)
-      expect(result.current[0].key).toBe('WeatherTool')
+      expect(result.current[0]!.key).toBe('WeatherTool')
     })
 
     it('should return only addOption when no tools match', () => {
@@ -718,7 +718,7 @@ describe('useExternalToolOptions', () => {
         { wrapper },
       )
       const lastOption = result.current[result.current.length - 1]
-      const el = lastOption.renderMenuOption(renderProps)
+      const el = lastOption!.renderMenuOption(renderProps)
       expect(el).toBeTruthy()
     })
 
@@ -729,7 +729,7 @@ describe('useExternalToolOptions', () => {
         { wrapper },
       )
       const lastOption = result.current[result.current.length - 1]
-      lastOption.onSelectMenuOption()
+      lastOption!.onSelectMenuOption()
       expect(onAddExternalTool).toHaveBeenCalledTimes(1)
     })
 
@@ -742,7 +742,7 @@ describe('useExternalToolOptions', () => {
         { wrapper },
       )
       const lastOption = result.current[result.current.length - 1]
-      expect(() => lastOption.onSelectMenuOption()).not.toThrow()
+      expect(() => lastOption!.onSelectMenuOption()).not.toThrow()
     })
   })
 })
@@ -828,7 +828,7 @@ describe('useOptions', () => {
         { wrapper },
       )
       expect(result.current.workflowVariableOptions).toHaveLength(1)
-      expect(result.current.workflowVariableOptions[0].nodeId).toBe('node-1')
+      expect(result.current.workflowVariableOptions[0]!.nodeId).toBe('node-1')
     })
   })
 
@@ -873,9 +873,9 @@ describe('useOptions', () => {
         ),
         { wrapper },
       )
-      expect(result.current.workflowVariableOptions[0].nodeId).toBe('error_message')
-      expect(result.current.workflowVariableOptions[0].vars[0].variable).toBe('error_message')
-      expect(result.current.workflowVariableOptions[0].vars[0].type).toBe(VarType.string)
+      expect(result.current.workflowVariableOptions[0]!.nodeId).toBe('error_message')
+      expect(result.current.workflowVariableOptions[0]!.vars[0]!.variable).toBe('error_message')
+      expect(result.current.workflowVariableOptions[0]!.vars[0]!.type).toBe(VarType.string)
     })
 
     it('should NOT inject error_message when already present in variables', () => {
@@ -942,8 +942,8 @@ describe('useOptions', () => {
         ),
         { wrapper },
       )
-      expect(result.current.workflowVariableOptions[0].nodeId).toBe('last_run')
-      expect(result.current.workflowVariableOptions[0].vars[0].type).toBe(VarType.object)
+      expect(result.current.workflowVariableOptions[0]!.nodeId).toBe('last_run')
+      expect(result.current.workflowVariableOptions[0]!.vars[0]!.type).toBe(VarType.object)
     })
 
     it('should NOT inject last_run when already present in variables', () => {
@@ -1014,7 +1014,7 @@ describe('useOptions', () => {
       const currentNode = result.current.workflowVariableOptions.find(v => v.nodeId === 'current')
       expect(currentNode).toBeDefined()
       expect(currentNode!.title).toBe('current_prompt')
-      expect(currentNode!.vars[0].type).toBe(VarType.string)
+      expect(currentNode!.vars[0]!.type).toBe(VarType.string)
     })
 
     it('should prepend current node with title "current_code" when generatorType is not prompt', () => {
@@ -1153,10 +1153,10 @@ describe('useOptions', () => {
 
       // workflowVariableOptions: current + last_run + error_message + node-x = 4
       expect(result.current.workflowVariableOptions).toHaveLength(4)
-      expect(result.current.workflowVariableOptions[0].nodeId).toBe('current')
-      expect(result.current.workflowVariableOptions[1].nodeId).toBe('last_run')
-      expect(result.current.workflowVariableOptions[2].nodeId).toBe('error_message')
-      expect(result.current.workflowVariableOptions[3].nodeId).toBe('node-x')
+      expect(result.current.workflowVariableOptions[0]!.nodeId).toBe('current')
+      expect(result.current.workflowVariableOptions[1]!.nodeId).toBe('last_run')
+      expect(result.current.workflowVariableOptions[2]!.nodeId).toBe('error_message')
+      expect(result.current.workflowVariableOptions[3]!.nodeId).toBe('node-x')
     })
   })
 })
diff --git a/web/app/components/base/prompt-editor/plugins/context-block/__tests__/context-block-replacement-block.spec.tsx b/web/app/components/base/prompt-editor/plugins/context-block/__tests__/context-block-replacement-block.spec.tsx
index 09ff3f9b90..4f62941601 100644
--- a/web/app/components/base/prompt-editor/plugins/context-block/__tests__/context-block-replacement-block.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/context-block/__tests__/context-block-replacement-block.spec.tsx
@@ -75,8 +75,8 @@ function insertTextAndRead(text: string): ReadResult {
     const nodes = $nodesOfType(ContextBlockNode)
     result.count = nodes.length
     if (nodes.length > 0) {
-      result.datasets = nodes[0].getDatasets()
-      result.canNotAddContext = nodes[0].getCanNotAddContext()
+      result.datasets = nodes[0]!.getDatasets()
+      result.canNotAddContext = nodes[0]!.getCanNotAddContext()
     }
   })
   return result
diff --git a/web/app/components/base/prompt-editor/plugins/context-block/__tests__/index.spec.tsx b/web/app/components/base/prompt-editor/plugins/context-block/__tests__/index.spec.tsx
index 8ca0d80ef2..807b1f7aa4 100644
--- a/web/app/components/base/prompt-editor/plugins/context-block/__tests__/index.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/context-block/__tests__/index.spec.tsx
@@ -184,7 +184,7 @@ describe('ContextBlock', () => {
       renderWithEditor(<ContextBlock />)
 
       dispatchInsert()
-      const onAddContextArg = mockCreateContextBlockNode.mock.calls[0][1] as () => void
+      const onAddContextArg = mockCreateContextBlockNode.mock.calls[0]![1] as () => void
 
       expect(typeof onAddContextArg).toBe('function')
       expect(() => onAddContextArg()).not.toThrow()
diff --git a/web/app/components/base/prompt-editor/plugins/error-message-block/__tests__/error-message-block-replacement-block.spec.tsx b/web/app/components/base/prompt-editor/plugins/error-message-block/__tests__/error-message-block-replacement-block.spec.tsx
index ccef57867a..21606240d3 100644
--- a/web/app/components/base/prompt-editor/plugins/error-message-block/__tests__/error-message-block-replacement-block.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/error-message-block/__tests__/error-message-block-replacement-block.spec.tsx
@@ -75,7 +75,7 @@ describe('ErrorMessageBlockReplacementBlock', () => {
   it('should pass matcher and creator to decoratorTransform and match placeholder text', () => {
     renderWithLexicalContext(<ErrorMessageBlockReplacementBlock />)
 
-    const transformCallback = mockRegisterNodeTransform.mock.calls[0][1] as (node: LexicalNode) => void
+    const transformCallback = mockRegisterNodeTransform.mock.calls[0]![1] as (node: LexicalNode) => void
     const textNode = { id: 't-1' } as unknown as LexicalNode
     transformCallback(textNode)
 
@@ -85,7 +85,7 @@ describe('ErrorMessageBlockReplacementBlock', () => {
       expect.any(Function),
     )
 
-    const getMatch = vi.mocked(decoratorTransform).mock.calls[0][1] as (text: string) => EntityMatch | null
+    const getMatch = vi.mocked(decoratorTransform).mock.calls[0]![1] as (text: string) => EntityMatch | null
     const match = getMatch(`hello ${ERROR_MESSAGE_PLACEHOLDER_TEXT} world`)
 
     expect(match).toEqual({
@@ -99,10 +99,10 @@ describe('ErrorMessageBlockReplacementBlock', () => {
     const onInsert = vi.fn()
     renderWithLexicalContext(<ErrorMessageBlockReplacementBlock onInsert={onInsert} />)
 
-    const transformCallback = mockRegisterNodeTransform.mock.calls[0][1] as (node: LexicalNode) => void
+    const transformCallback = mockRegisterNodeTransform.mock.calls[0]![1] as (node: LexicalNode) => void
     transformCallback({ id: 't-1' } as unknown as LexicalNode)
 
-    const createNode = vi.mocked(decoratorTransform).mock.calls[0][2] as () => ErrorMessageBlockNode
+    const createNode = vi.mocked(decoratorTransform).mock.calls[0]![2] as () => ErrorMessageBlockNode
     const created = createNode()
 
     expect(onInsert).toHaveBeenCalledTimes(1)
@@ -114,10 +114,10 @@ describe('ErrorMessageBlockReplacementBlock', () => {
   it('should create replacement node without onInsert callback', () => {
     renderWithLexicalContext(<ErrorMessageBlockReplacementBlock />)
 
-    const transformCallback = mockRegisterNodeTransform.mock.calls[0][1] as (node: LexicalNode) => void
+    const transformCallback = mockRegisterNodeTransform.mock.calls[0]![1] as (node: LexicalNode) => void
     transformCallback({ id: 't-1' } as unknown as LexicalNode)
 
-    const createNode = vi.mocked(decoratorTransform).mock.calls[0][2] as () => ErrorMessageBlockNode
+    const createNode = vi.mocked(decoratorTransform).mock.calls[0]![2] as () => ErrorMessageBlockNode
 
     expect(() => createNode()).not.toThrow()
     expect($createErrorMessageBlockNode).toHaveBeenCalled()
diff --git a/web/app/components/base/prompt-editor/plugins/error-message-block/__tests__/index.spec.tsx b/web/app/components/base/prompt-editor/plugins/error-message-block/__tests__/index.spec.tsx
index fa52df0a23..bd7b5b266d 100644
--- a/web/app/components/base/prompt-editor/plugins/error-message-block/__tests__/index.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/error-message-block/__tests__/index.spec.tsx
@@ -90,7 +90,7 @@ describe('ErrorMessageBlock', () => {
     const onInsert = vi.fn()
     renderWithLexicalContext(<ErrorMessageBlock onInsert={onInsert} />)
 
-    const insertHandler = mockRegisterCommand.mock.calls[0][1] as () => boolean
+    const insertHandler = mockRegisterCommand.mock.calls[0]![1] as () => boolean
     const result = insertHandler()
 
     expect($createErrorMessageBlockNode).toHaveBeenCalledTimes(1)
@@ -102,7 +102,7 @@ describe('ErrorMessageBlock', () => {
   it('should return true on insert command without onInsert callback', () => {
     renderWithLexicalContext(<ErrorMessageBlock />)
 
-    const insertHandler = mockRegisterCommand.mock.calls[0][1] as () => boolean
+    const insertHandler = mockRegisterCommand.mock.calls[0]![1] as () => boolean
 
     expect(insertHandler()).toBe(true)
     expect($insertNodes).toHaveBeenCalled()
@@ -112,7 +112,7 @@ describe('ErrorMessageBlock', () => {
     const onDelete = vi.fn()
     renderWithLexicalContext(<ErrorMessageBlock onDelete={onDelete} />)
 
-    const deleteHandler = mockRegisterCommand.mock.calls[1][1] as () => boolean
+    const deleteHandler = mockRegisterCommand.mock.calls[1]![1] as () => boolean
     const result = deleteHandler()
 
     expect(onDelete).toHaveBeenCalledTimes(1)
@@ -122,7 +122,7 @@ describe('ErrorMessageBlock', () => {
   it('should return true on delete command without onDelete callback', () => {
     renderWithLexicalContext(<ErrorMessageBlock />)
 
-    const deleteHandler = mockRegisterCommand.mock.calls[1][1] as () => boolean
+    const deleteHandler = mockRegisterCommand.mock.calls[1]![1] as () => boolean
 
     expect(deleteHandler()).toBe(true)
   })
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/component.spec.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/component.spec.tsx
index f219f2f805..ee82595d1c 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/component.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/component.spec.tsx
@@ -100,8 +100,8 @@ describe('HITLInputComponent', () => {
     await user.click(screen.getByRole('button', { name: 'emit-same-name' }))
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0]).toHaveLength(1)
-    expect(onChange.mock.calls[0][0][0].output_variable_name).toBe('user_name')
+    expect(onChange.mock.calls[0]![0]).toHaveLength(1)
+    expect(onChange.mock.calls[0]![0][0].output_variable_name).toBe('user_name')
   })
 
   it('should replace payload when variable name is renamed', async () => {
@@ -124,7 +124,7 @@ describe('HITLInputComponent', () => {
     await user.click(screen.getByRole('button', { name: 'emit-rename' }))
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0][0].output_variable_name).toBe('renamed_name')
+    expect(onChange.mock.calls[0]![0][0].output_variable_name).toBe('renamed_name')
   })
 
   it('should update existing payload when variable name stays the same', async () => {
@@ -157,9 +157,9 @@ describe('HITLInputComponent', () => {
     await user.click(screen.getByRole('button', { name: 'emit-update' }))
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0][0].default.value).toBe('updated')
-    expect(onChange.mock.calls[0][0][0].output_variable_name).toBe('user_name')
-    expect(onChange.mock.calls[0][0][1].output_variable_name).toBe('other_name')
-    expect(onChange.mock.calls[0][0][1].default.value).toBe('other')
+    expect(onChange.mock.calls[0]![0][0].default.value).toBe('updated')
+    expect(onChange.mock.calls[0]![0][0].output_variable_name).toBe('user_name')
+    expect(onChange.mock.calls[0]![0][1].output_variable_name).toBe('other_name')
+    expect(onChange.mock.calls[0]![0][1].default.value).toBe('other')
   })
 })
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/input-field.spec.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/input-field.spec.tsx
index 949295a8a8..ad6ef42a0f 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/input-field.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/input-field.spec.tsx
@@ -49,11 +49,11 @@ describe('InputField', () => {
     )
 
     const inputs = screen.getAllByRole('textbox')
-    await user.clear(inputs[0])
-    await user.type(inputs[0], 'invalid name')
+    await user.clear(inputs[0]!)
+    await user.type(inputs[0]!, 'invalid name')
 
-    expect(screen.getByText('workflow.nodes.humanInput.insertInputField.variableNameInvalid')).toBeInTheDocument()
-    expect(screen.getByRole('button', { name: 'common.operation.save' })).toBeDisabled()
+    expect(screen.getByText('workflow.nodes.humanInput.insertInputField.variableNameInvalid'))!.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.save' }))!.toBeDisabled()
     await user.click(screen.getByRole('button', { name: 'common.operation.save' }))
     await user.keyboard('{Control>}{Enter}{/Control}')
     expect(onChange).not.toHaveBeenCalled()
@@ -76,7 +76,7 @@ describe('InputField', () => {
     await user.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0]).toEqual(createPayload())
+    expect(onChange.mock.calls[0]![0]).toEqual(createPayload())
   })
 
   it('should call onCancel when cancel button is clicked', async () => {
@@ -112,11 +112,11 @@ describe('InputField', () => {
     )
 
     const nameInput = screen.getAllByRole('textbox')[0]
-    await user.type(nameInput, 'generated_name')
+    await user.type(nameInput!, 'generated_name')
     await user.click(screen.getByRole('button', { name: /workflow\.nodes\.humanInput\.insertInputField\.insert/i }))
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0]).toEqual({
+    expect(onChange.mock.calls[0]![0]).toEqual({
       type: InputVarType.paragraph,
       output_variable_name: 'generated_name',
       default: {
@@ -149,11 +149,11 @@ describe('InputField', () => {
 
     await user.keyboard('{Tab}')
     const inputs = screen.getAllByRole('textbox')
-    await user.type(inputs[1], 'constant-default')
+    await user.type(inputs[1]!, 'constant-default')
     await user.keyboard('{Control>}{Enter}{/Control}')
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0].default).toEqual({
+    expect(onChange.mock.calls[0]![0].default).toEqual({
       type: 'constant',
       selector: [],
       value: 'constant-default',
@@ -184,7 +184,7 @@ describe('InputField', () => {
     await user.click(screen.getByRole('button', { name: /workflow\.nodes\.humanInput\.insertInputField\.insert/i }))
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0].default.type).toBe('variable')
+    expect(onChange.mock.calls[0]![0].default.type).toBe('variable')
   })
 
   it('should switch to constant mode when variable mode type switch is clicked', async () => {
@@ -211,7 +211,7 @@ describe('InputField', () => {
     await user.click(screen.getByRole('button', { name: /workflow\.nodes\.humanInput\.insertInputField\.insert/i }))
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0].default.type).toBe('constant')
+    expect(onChange.mock.calls[0]![0].default.type).toBe('constant')
   })
 
   it('should update default selector when variable picker is used', async () => {
@@ -238,7 +238,7 @@ describe('InputField', () => {
     await user.click(screen.getByRole('button', { name: /workflow\.nodes\.humanInput\.insertInputField\.insert/i }))
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0].default).toEqual({
+    expect(onChange.mock.calls[0]![0].default).toEqual({
       type: 'variable',
       selector: ['node-a', 'var-a'],
       value: '',
@@ -268,7 +268,7 @@ describe('InputField', () => {
     await user.click(screen.getByRole('button', { name: /workflow\.nodes\.humanInput\.insertInputField\.insert/i }))
 
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0].default).toEqual({
+    expect(onChange.mock.calls[0]![0].default).toEqual({
       type: 'variable',
       selector: [],
       value: '',
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/pre-populate.spec.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/pre-populate.spec.tsx
index f5efc52c23..990a7ced4a 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/pre-populate.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/pre-populate.spec.tsx
@@ -82,12 +82,12 @@ describe('PrePopulate', () => {
       />,
     )
 
-    expect(screen.getByText('Static Content')).toBeInTheDocument()
+    expect(screen.getByText('Static Content'))!.toBeInTheDocument()
 
     await user.keyboard('{Tab}')
 
     expect(screen.queryByText('Static Content')).not.toBeInTheDocument()
-    expect(screen.getByRole('textbox')).toBeInTheDocument()
+    expect(screen.getByRole('textbox'))!.toBeInTheDocument()
   })
 
   it('should update constant value and toggle to variable mode when type switch is clicked', async () => {
@@ -154,7 +154,7 @@ describe('PrePopulate', () => {
       />,
     )
 
-    const pickerProps = mockVarReferencePicker.mock.calls[0][0] as VarReferencePickerProps
+    const pickerProps = mockVarReferencePicker.mock.calls[0]![0] as VarReferencePickerProps
 
     const allowString = pickerProps.filterVar({ type: 'string' } as Var)
     const allowNumber = pickerProps.filterVar({ type: 'number' } as Var)
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/hitl-input-block-replacement-block.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/hitl-input-block-replacement-block.tsx
index 0da99b9155..a63d694e2b 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/hitl-input-block-replacement-block.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/hitl-input-block-replacement-block.tsx
@@ -45,7 +45,7 @@ const HITLInputReplacementBlock = ({
   }, [editor])
 
   const createHITLInputBlockNode = useCallback((textNode: TextNode): HITLInputNode => {
-    const varName = textNode.getTextContent().split('.')[1].replace(/#\}\}$/, '')
+    const varName = textNode.getTextContent().split('.')[1]!.replace(/#\}\}$/, '')
     return $applyNodeReplacement($createHITLInputNode(
       varName,
       nodeId,
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/variable-block.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/variable-block.tsx
index a466d64eff..44303c8faa 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/variable-block.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/variable-block.tsx
@@ -63,7 +63,7 @@ const HITLInputVariableBlockComponent = ({
     }
   )()
   const [localWorkflowNodesMap, setLocalWorkflowNodesMap] = useState<WorkflowNodesMap>(workflowNodesMap)
-  const node = localWorkflowNodesMap![variables[isRagVar ? 1 : 0]]
+  const node = localWorkflowNodesMap![variables[isRagVar ? 1 : 0]!]
 
   const isException = isExceptionVariable(varName, node?.type)
   const variableValid = useMemo(() => {
@@ -131,7 +131,7 @@ const HITLInputVariableBlockComponent = ({
           path={variables.slice(1)}
           varType={getVarType
             ? getVarType({
-                nodeId: variables[0],
+                nodeId: variables[0]!,
                 valueSelector: variables,
               })
             : Type.string}
diff --git a/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx b/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx
index 2dedc9768b..19a2efb5bc 100644
--- a/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx
+++ b/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx
@@ -203,7 +203,7 @@ export default function ShortcutsPopupPlugin({
       let rect: DOMRect | null = null
 
       if (rects && rects.length)
-        rect = rects[rects.length - 1]
+        rect = rects[rects.length - 1]!
 
       else
         rect = range.getBoundingClientRect()
diff --git a/web/app/components/base/prompt-editor/plugins/variable-value-block/__tests__/index.spec.tsx b/web/app/components/base/prompt-editor/plugins/variable-value-block/__tests__/index.spec.tsx
index a77c62859b..cb36a2e8de 100644
--- a/web/app/components/base/prompt-editor/plugins/variable-value-block/__tests__/index.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/variable-value-block/__tests__/index.spec.tsx
@@ -62,7 +62,7 @@ describe('VariableValueBlock', () => {
   it('should return match offsets when placeholder exists and null when not present', () => {
     renderWithLexicalContext(<VariableValueBlock />)
 
-    const getMatch = vi.mocked(useLexicalTextEntity).mock.calls[0][0] as (text: string) => EntityMatch | null
+    const getMatch = vi.mocked(useLexicalTextEntity).mock.calls[0]![0] as (text: string) => EntityMatch | null
 
     const match = getMatch('prefix {{foo_1}} suffix')
     expect(match).toEqual({ start: 7, end: 16 })
@@ -73,7 +73,7 @@ describe('VariableValueBlock', () => {
   it('should create variable node from text node content in create callback', () => {
     renderWithLexicalContext(<VariableValueBlock />)
 
-    const createNode = vi.mocked(useLexicalTextEntity).mock.calls[0][2] as (
+    const createNode = vi.mocked(useLexicalTextEntity).mock.calls[0]![2] as (
       textNode: { getTextContent: () => string },
     ) => VariableValueBlockNode
 
diff --git a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/component.spec.tsx b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/component.spec.tsx
index a6cb70ddb6..804d4653ce 100644
--- a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/component.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/component.spec.tsx
@@ -129,7 +129,7 @@ describe('WorkflowVariableBlockComponent', () => {
       />,
     )
 
-    expect(screen.getByRole('button', { name: 'label' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'label' }))!.toBeInTheDocument()
     expect(mockHasNodes).toHaveBeenCalledWith([WorkflowVariableBlockNode])
     expect(mockRegisterCommand).toHaveBeenCalledWith(
       UPDATE_WORKFLOW_NODES_MAP,
@@ -188,7 +188,7 @@ describe('WorkflowVariableBlockComponent', () => {
       />,
     )
 
-    expect(screen.getByRole('button', { name: 'label' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'label' }))!.toBeInTheDocument()
   })
 
   it('should pass computed varType when getVarType is provided', () => {
@@ -489,7 +489,7 @@ describe('WorkflowVariableBlockComponent', () => {
       />,
     )
 
-    const updateHandler = mockRegisterCommand.mock.calls[0][1] as (payload: UpdateWorkflowNodesMapPayload) => boolean
+    const updateHandler = mockRegisterCommand.mock.calls[0]![1] as (payload: UpdateWorkflowNodesMapPayload) => boolean
     let result = false
     act(() => {
       result = updateHandler({
diff --git a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/index.spec.tsx b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/index.spec.tsx
index 00b5b66660..7494d73b8d 100644
--- a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/index.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/index.spec.tsx
@@ -133,7 +133,7 @@ describe('WorkflowVariableBlock', () => {
       />,
     )
 
-    const insertHandler = mockRegisterCommand.mock.calls[0][1] as (variables: string[]) => boolean
+    const insertHandler = mockRegisterCommand.mock.calls[0]![1] as (variables: string[]) => boolean
     const result = insertHandler(['node-1', 'answer'])
 
     expect($createWorkflowVariableBlockNode).toHaveBeenCalledWith(
@@ -154,7 +154,7 @@ describe('WorkflowVariableBlock', () => {
       />,
     )
 
-    const insertHandler = mockRegisterCommand.mock.calls[0][1] as (variables: string[]) => boolean
+    const insertHandler = mockRegisterCommand.mock.calls[0]![1] as (variables: string[]) => boolean
     expect(insertHandler(['node-1', 'answer'])).toBe(true)
   })
 
@@ -168,7 +168,7 @@ describe('WorkflowVariableBlock', () => {
       />,
     )
 
-    const deleteHandler = mockRegisterCommand.mock.calls[1][1] as () => boolean
+    const deleteHandler = mockRegisterCommand.mock.calls[1]![1] as () => boolean
     const result = deleteHandler()
 
     expect(onDelete).toHaveBeenCalledTimes(1)
@@ -182,7 +182,7 @@ describe('WorkflowVariableBlock', () => {
       />,
     )
 
-    const deleteHandler = mockRegisterCommand.mock.calls[1][1] as () => boolean
+    const deleteHandler = mockRegisterCommand.mock.calls[1]![1] as () => boolean
     expect(deleteHandler()).toBe(true)
   })
 
diff --git a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/workflow-variable-block-replacement-block.spec.tsx b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/workflow-variable-block-replacement-block.spec.tsx
index 9dcc37ec35..6b6729a3a2 100644
--- a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/workflow-variable-block-replacement-block.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/__tests__/workflow-variable-block-replacement-block.spec.tsx
@@ -123,7 +123,7 @@ describe('WorkflowVariableBlockReplacementBlock', () => {
       />,
     )
 
-    const transformCallback = mockRegisterNodeTransform.mock.calls[0][1] as (node: LexicalNode) => void
+    const transformCallback = mockRegisterNodeTransform.mock.calls[0]![1] as (node: LexicalNode) => void
     const textNode = { id: 'text-node' } as unknown as LexicalNode
     transformCallback(textNode)
 
@@ -141,10 +141,10 @@ describe('WorkflowVariableBlockReplacementBlock', () => {
       />,
     )
 
-    const transformCallback = mockRegisterNodeTransform.mock.calls[0][1] as (node: LexicalNode) => void
+    const transformCallback = mockRegisterNodeTransform.mock.calls[0]![1] as (node: LexicalNode) => void
     transformCallback({ id: 'text-node' } as unknown as LexicalNode)
 
-    const getMatch = vi.mocked(decoratorTransform).mock.calls[0][1] as (text: string) => EntityMatch | null
+    const getMatch = vi.mocked(decoratorTransform).mock.calls[0]![1] as (text: string) => EntityMatch | null
     const match = getMatch('prefix {{#node-1.output#}} suffix')
 
     expect(match).toEqual({
@@ -167,10 +167,10 @@ describe('WorkflowVariableBlockReplacementBlock', () => {
       />,
     )
 
-    const transformCallback = mockRegisterNodeTransform.mock.calls[0][1] as (node: LexicalNode) => void
+    const transformCallback = mockRegisterNodeTransform.mock.calls[0]![1] as (node: LexicalNode) => void
     transformCallback({ id: 'text-node' } as unknown as LexicalNode)
 
-    const createNode = vi.mocked(decoratorTransform).mock.calls[0][2] as (
+    const createNode = vi.mocked(decoratorTransform).mock.calls[0]![2] as (
       textNode: { getTextContent: () => string },
     ) => WorkflowVariableBlockNode
 
@@ -196,10 +196,10 @@ describe('WorkflowVariableBlockReplacementBlock', () => {
       />,
     )
 
-    const transformCallback = mockRegisterNodeTransform.mock.calls[0][1] as (node: LexicalNode) => void
+    const transformCallback = mockRegisterNodeTransform.mock.calls[0]![1] as (node: LexicalNode) => void
     transformCallback({ id: 'text-node' } as unknown as LexicalNode)
 
-    const createNode = vi.mocked(decoratorTransform).mock.calls[0][2] as (
+    const createNode = vi.mocked(decoratorTransform).mock.calls[0]![2] as (
       textNode: { getTextContent: () => string },
     ) => WorkflowVariableBlockNode
 
diff --git a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/component.tsx b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/component.tsx
index bf91d25834..f30970ba6d 100644
--- a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/component.tsx
+++ b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/component.tsx
@@ -69,11 +69,11 @@ const WorkflowVariableBlockComponent = ({
   )()
   const [localWorkflowNodesMap, setLocalWorkflowNodesMap] = useState<WorkflowNodesMap>(workflowNodesMap)
   const [localAvailableVariables, setLocalAvailableVariables] = useState<NodeOutPutVar[]>(availableVariables || [])
-  const node = localWorkflowNodesMap![variables[isRagVar ? 1 : 0]]
+  const node = localWorkflowNodesMap![variables[isRagVar ? 1 : 0]!]
 
   const isException = isExceptionVariable(varName, node?.type)
   const sourceNodeId = variables[isRagVar ? 1 : 0]
-  const isLlmModelInstalled = useLlmModelPluginInstalled(sourceNodeId, localWorkflowNodesMap)
+  const isLlmModelInstalled = useLlmModelPluginInstalled(sourceNodeId!, localWorkflowNodesMap)
   const variableValid = useMemo(() => {
     if (isSpecialVar(variables[0] ?? ''))
       return true
@@ -120,10 +120,10 @@ const WorkflowVariableBlockComponent = ({
     } = reactflow
     const { transform } = store.getState()
     const zoom = transform[2]
-    const position = node.position
+    const position = node!.position
     setViewport({
-      x: (clientWidth - 400 - node.width! * zoom) / 2 - position!.x * zoom,
-      y: (clientHeight - node.height! * zoom) / 2 - position!.y * zoom,
+      x: (clientWidth - 400 - node!.width! * zoom) / 2 - position!.x * zoom,
+      y: (clientHeight - node!.height! * zoom) / 2 - position!.y * zoom,
       zoom: transform[2],
     })
   }, [node, reactflow, store])
@@ -163,7 +163,7 @@ const WorkflowVariableBlockComponent = ({
           path={variables.slice(1)}
           varType={getVarType
             ? getVarType({
-                nodeId: variables[0],
+                nodeId: variables[0]!,
                 valueSelector: variables,
               })
             : Type.string}
diff --git a/web/app/components/base/prompt-editor/utils.ts b/web/app/components/base/prompt-editor/utils.ts
index d81820fa16..af1d052400 100644
--- a/web/app/components/base/prompt-editor/utils.ts
+++ b/web/app/components/base/prompt-editor/utils.ts
@@ -140,13 +140,13 @@ export function registerLexicalTextEntity<T extends TextNode>(
       let nodeToReplace
 
       if (match.start === 0)
-        [nodeToReplace, currentNode] = currentNode.splitText(match.end)
+        [nodeToReplace, currentNode] = (currentNode.splitText(match.end)) as [any, TextNode]
       else
-        [, nodeToReplace, currentNode] = currentNode.splitText(match.start, match.end)
+        [, nodeToReplace, currentNode] = (currentNode.splitText(match.start, match.end)) as [unknown, any, TextNode]
 
-      const replacementNode = createNode(nodeToReplace)
-      replacementNode.setFormat(nodeToReplace.getFormat())
-      nodeToReplace.replace(replacementNode)
+      const replacementNode = createNode(nodeToReplace!)
+      replacementNode.setFormat(nodeToReplace!.getFormat())
+      nodeToReplace!.replace(replacementNode)
 
       if (currentNode == null)
         return
@@ -240,12 +240,12 @@ export const decoratorTransform = (
     let nodeToReplace
 
     if (match.start === 0)
-      [nodeToReplace, currentNode] = currentNode.splitText(match.end)
+      [nodeToReplace, currentNode] = (currentNode.splitText(match.end)) as [any, CustomTextNode]
     else
-      [, nodeToReplace, currentNode] = currentNode.splitText(match.start, match.end)
+      [, nodeToReplace, currentNode] = (currentNode.splitText(match.start, match.end)) as [unknown, any, CustomTextNode]
 
-    const replacementNode = createNode(nodeToReplace)
-    nodeToReplace.replace(replacementNode)
+    const replacementNode = createNode(nodeToReplace!)
+    nodeToReplace!.replace(replacementNode)
 
     if (currentNode == null)
       return
@@ -292,7 +292,7 @@ export function $splitNodeContainingQuery(match: MenuTextMatch): TextNode | null
   else
     [, newNode] = anchorNode.splitText(startOffset, selectionOffset)
 
-  return newNode
+  return newNode!
 }
 
 export function textToEditorState(text: string) {
diff --git a/web/app/components/base/prompt-log-modal/__tests__/index.spec.tsx b/web/app/components/base/prompt-log-modal/__tests__/index.spec.tsx
index 01902f2e99..95de5aff39 100644
--- a/web/app/components/base/prompt-log-modal/__tests__/index.spec.tsx
+++ b/web/app/components/base/prompt-log-modal/__tests__/index.spec.tsx
@@ -32,8 +32,8 @@ describe('PromptLogModal', () => {
   describe('Render', () => {
     it('renders correctly when currentLogItem is provided', () => {
       render(<PromptLogModal {...defaultProps} />)
-      expect(screen.getByText('PROMPT LOG')).toBeInTheDocument()
-      expect(screen.getByText('Hello')).toBeInTheDocument()
+      expect(screen.getByText('PROMPT LOG'))!.toBeInTheDocument()
+      expect(screen.getByText('Hello'))!.toBeInTheDocument()
     })
 
     it('returns null when currentLogItem is missing', () => {
@@ -43,7 +43,7 @@ describe('PromptLogModal', () => {
 
     it('renders copy feedback when log length is 1', () => {
       render(<PromptLogModal {...defaultProps} />)
-      expect(screen.getByTestId('close-btn-container')).toBeInTheDocument()
+      expect(screen.getByTestId('close-btn-container'))!.toBeInTheDocument()
     })
 
     it('renders multiple logs in Card correctly', () => {
@@ -58,9 +58,9 @@ describe('PromptLogModal', () => {
         },
       } as unknown as Parameters<typeof PromptLogModal>[0]
       render(<PromptLogModal {...props} />)
-      expect(screen.getByText('USER')).toBeInTheDocument()
-      expect(screen.getByText('ASSISTANT')).toBeInTheDocument()
-      expect(screen.getByText('Hi there')).toBeInTheDocument()
+      expect(screen.getByText('USER'))!.toBeInTheDocument()
+      expect(screen.getByText('ASSISTANT'))!.toBeInTheDocument()
+      expect(screen.getByText('Hi there'))!.toBeInTheDocument()
     })
 
     it('returns null when currentLogItem.log is missing', () => {
@@ -73,7 +73,7 @@ describe('PromptLogModal', () => {
     it('calls onCancel when close button is clicked', () => {
       render(<PromptLogModal {...defaultProps} />)
       const closeBtn = screen.getByTestId('close-btn')
-      expect(closeBtn).toBeInTheDocument()
+      expect(closeBtn)!.toBeInTheDocument()
       fireEvent.click(closeBtn)
       expect(defaultProps.onCancel).toHaveBeenCalled()
     })
@@ -88,7 +88,8 @@ describe('PromptLogModal', () => {
       expect(clickAwayHandlers.length).toBeGreaterThan(0)
 
       // Call the last registered handler (simulating click away)
-      clickAwayHandlers[clickAwayHandlers.length - 1]()
+      // Call the last registered handler (simulating click away)
+      clickAwayHandlers[clickAwayHandlers.length - 1]!()
       expect(onCancel).toHaveBeenCalled()
     })
 
@@ -98,7 +99,8 @@ describe('PromptLogModal', () => {
 
       expect(clickAwayHandlers.length).toBeGreaterThan(0)
       // The first handler in the array is captured during the initial render before useEffect runs
-      clickAwayHandlers[0]()
+      // The first handler in the array is captured during the initial render before useEffect runs
+      clickAwayHandlers[0]!()
       expect(onCancel).not.toHaveBeenCalled()
     })
   })
diff --git a/web/app/components/base/prompt-log-modal/card.tsx b/web/app/components/base/prompt-log-modal/card.tsx
index ca03837c6b..515fa6bf2c 100644
--- a/web/app/components/base/prompt-log-modal/card.tsx
+++ b/web/app/components/base/prompt-log-modal/card.tsx
@@ -13,7 +13,7 @@ const Card: FC<CardProps> = ({
         log.length === 1 && (
           <div className="px-4 py-2">
             <div className="whitespace-pre-line text-text-secondary">
-              {log[0].text}
+              {log[0]!.text}
             </div>
           </div>
         )
diff --git a/web/app/components/base/prompt-log-modal/index.tsx b/web/app/components/base/prompt-log-modal/index.tsx
index 6a79dfffeb..5b9468a501 100644
--- a/web/app/components/base/prompt-log-modal/index.tsx
+++ b/web/app/components/base/prompt-log-modal/index.tsx
@@ -48,7 +48,7 @@ const PromptLogModal: FC<PromptLogModalProps> = ({
           {
             currentLogItem.log?.length === 1 && (
               <>
-                <CopyFeedbackNew className="h-6 w-6" content={currentLogItem.log[0].text} />
+                <CopyFeedbackNew className="h-6 w-6" content={currentLogItem.log[0]!.text} />
                 <div className="mx-2.5 h-[14px] w-px bg-divider-regular" />
               </>
             )
diff --git a/web/app/components/base/select/__tests__/index.spec.tsx b/web/app/components/base/select/__tests__/index.spec.tsx
index e76768953d..6ddc51c177 100644
--- a/web/app/components/base/select/__tests__/index.spec.tsx
+++ b/web/app/components/base/select/__tests__/index.spec.tsx
@@ -25,7 +25,7 @@ describe('Select', () => {
         />,
       )
 
-      expect(screen.getByTitle('Banana')).toBeInTheDocument()
+      expect(screen.getByTitle('Banana'))!.toBeInTheDocument()
     })
 
     it('should render null selectedItem when defaultValue does not match any item', () => {
@@ -38,6 +38,37 @@ describe('Select', () => {
         />,
       )
 
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
+      // No item title should appear for a non-matching default
       // No item title should appear for a non-matching default
       expect(screen.queryByTitle('Apple')).not.toBeInTheDocument()
       expect(screen.queryByTitle('Banana')).not.toBeInTheDocument()
@@ -53,7 +84,7 @@ describe('Select', () => {
         />,
       )
 
-      expect(screen.getByRole('combobox')).toBeInTheDocument()
+      expect(screen.getByRole('combobox'))!.toBeInTheDocument()
     })
 
     it('should apply custom bgClassName', () => {
@@ -67,7 +98,7 @@ describe('Select', () => {
         />,
       )
 
-      expect(screen.getByTitle('Apple')).toBeInTheDocument()
+      expect(screen.getByTitle('Apple'))!.toBeInTheDocument()
     })
   })
 
@@ -128,13 +159,44 @@ describe('Select', () => {
 
       // First, click the chevron button to open the dropdown
       const buttons = screen.getAllByRole('button')
-      await user.click(buttons[0])
+      await user.click(buttons[0]!)
 
       // Now type in the search input to filter
       const input = screen.getByRole('combobox')
       await user.clear(input)
       await user.type(input, 'ban')
 
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
+      // Citrus should be filtered away
       // Citrus should be filtered away
       expect(screen.queryByText('Citrus')).not.toBeInTheDocument()
     })
@@ -155,6 +217,68 @@ describe('Select', () => {
       // we must use fireEvent because userEvent throws on disabled inputs
       fireEvent.change(input, { target: { value: 'ban' } })
 
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
+      // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
+      // Since it's disabled, no search dropdown should appear.
       // We just want to ensure it doesn't throw and covers the !disabled branch in onChange.
       // Since it's disabled, no search dropdown should appear.
       expect(screen.queryByRole('listbox')).not.toBeInTheDocument()
@@ -206,6 +330,37 @@ describe('Select', () => {
       fireEvent.click(button)
       fireEvent.click(chevron)
 
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
+      // Dropdown options should not appear because the internal `if (!disabled)` guards it
       // Dropdown options should not appear because the internal `if (!disabled)` guards it
       expect(screen.queryByText('Banana')).not.toBeInTheDocument()
     })
@@ -226,7 +381,7 @@ describe('Select', () => {
           }}
         />,
       )
-      expect(screen.getByText('Custom: Fallback')).toBeInTheDocument()
+      expect(screen.getByText('Custom: Fallback'))!.toBeInTheDocument()
     })
 
     it('should render with custom renderOption', async () => {
@@ -249,8 +404,8 @@ describe('Select', () => {
 
       await user.click(screen.getByTitle('Apple'))
 
-      expect(screen.getByTestId('custom-opt-apple')).toBeInTheDocument()
-      expect(screen.getByTestId('custom-opt-banana')).toBeInTheDocument()
+      expect(screen.getByTestId('custom-opt-apple'))!.toBeInTheDocument()
+      expect(screen.getByTestId('custom-opt-banana'))!.toBeInTheDocument()
     })
 
     it('should show ChevronUpIcon when open and ChevronDownIcon when closed', async () => {
@@ -268,7 +423,8 @@ describe('Select', () => {
       // Initially closed — should have a chevron button
       await user.click(screen.getByTitle('Apple'))
       // Dropdown is now open
-      expect(screen.getByText('Banana')).toBeInTheDocument()
+      // Dropdown is now open
+      expect(screen.getByText('Banana'))!.toBeInTheDocument()
     })
   })
 })
@@ -291,7 +447,7 @@ describe('SimpleSelect', () => {
         />,
       )
 
-      expect(screen.getByText(/select/i)).toBeInTheDocument()
+      expect(screen.getByText(/select/i))!.toBeInTheDocument()
     })
 
     it('should render custom placeholder when provided', () => {
@@ -304,7 +460,7 @@ describe('SimpleSelect', () => {
         />,
       )
 
-      expect(screen.getByText('Pick one')).toBeInTheDocument()
+      expect(screen.getByText('Pick one'))!.toBeInTheDocument()
     })
 
     it('should render selected item name when defaultValue matches', () => {
@@ -316,7 +472,7 @@ describe('SimpleSelect', () => {
         />,
       )
 
-      expect(screen.getByText('Banana')).toBeInTheDocument()
+      expect(screen.getByText('Banana'))!.toBeInTheDocument()
     })
 
     it('should render with isLoading=true showing spinner', () => {
@@ -330,7 +486,8 @@ describe('SimpleSelect', () => {
       )
 
       // Loader icon should be rendered (RiLoader4Line has aria hidden)
-      expect(screen.getByText('Apple')).toBeInTheDocument()
+      // Loader icon should be rendered (RiLoader4Line has aria hidden)
+      expect(screen.getByText('Apple'))!.toBeInTheDocument()
     })
 
     it('should render group items as non-selectable headers', async () => {
@@ -350,7 +507,7 @@ describe('SimpleSelect', () => {
       )
 
       await user.click(screen.getByRole('button'))
-      expect(screen.getByText('Fruits')).toBeInTheDocument()
+      expect(screen.getByText('Fruits'))!.toBeInTheDocument()
     })
 
     it('should not render ListboxOptions when disabled', () => {
@@ -363,7 +520,7 @@ describe('SimpleSelect', () => {
         />,
       )
 
-      expect(screen.getByText('Apple')).toBeInTheDocument()
+      expect(screen.getByText('Apple'))!.toBeInTheDocument()
     })
 
     it('should not open SimpleSelect when disabled', async () => {
@@ -381,6 +538,37 @@ describe('SimpleSelect', () => {
       const button = screen.getByRole('button')
       await user.click(button)
 
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
+      // Banana should not be visible as it won't open
       // Banana should not be visible as it won't open
       expect(screen.queryByText('Banana')).not.toBeInTheDocument()
     })
@@ -426,7 +614,7 @@ describe('SimpleSelect', () => {
         value: 'apple',
         name: 'Apple',
       }))
-      expect(screen.getByText('Apple')).toBeInTheDocument()
+      expect(screen.getByText('Apple'))!.toBeInTheDocument()
     })
 
     it('should pass open state into renderTrigger', async () => {
@@ -443,9 +631,9 @@ describe('SimpleSelect', () => {
         />,
       )
 
-      expect(screen.getByText('none-closed')).toBeInTheDocument()
+      expect(screen.getByText('none-closed'))!.toBeInTheDocument()
       await user.click(screen.getByText('none-closed'))
-      expect(screen.getByText('none-open')).toBeInTheDocument()
+      expect(screen.getByText('none-open'))!.toBeInTheDocument()
     })
 
     it('should clear selection when XMark is clicked (notClearable=false)', async () => {
@@ -463,7 +651,7 @@ describe('SimpleSelect', () => {
 
       // The clear button (XMarkIcon) should be visible when an item is selected
       const clearBtn = screen.getByRole('button').querySelector('[aria-hidden="false"]')
-      expect(clearBtn).toBeInTheDocument()
+      expect(clearBtn)!.toBeInTheDocument()
 
       await user.click(clearBtn!)
 
@@ -519,10 +707,11 @@ describe('SimpleSelect', () => {
       )
 
       await user.click(screen.getByRole('button'))
-      expect(screen.getByTestId('simple-opt-apple')).toBeInTheDocument()
-      expect(screen.getByTestId('simple-opt-banana')).toBeInTheDocument()
+      expect(screen.getByTestId('simple-opt-apple'))!.toBeInTheDocument()
+      expect(screen.getByTestId('simple-opt-banana'))!.toBeInTheDocument()
       // Verify the custom render shows selected state
-      expect(screen.getByTestId('simple-opt-apple')).toHaveTextContent('Apple (selected)')
+      // Verify the custom render shows selected state
+      expect(screen.getByTestId('simple-opt-apple'))!.toHaveTextContent('Apple (selected)')
     })
 
     it('should call onOpenChange when the button is clicked', async () => {
@@ -561,7 +750,8 @@ describe('SimpleSelect', () => {
 
       await user.click(screen.getByRole('button'))
       // Banana should be rendered but not selectable
-      expect(screen.getByText('Banana')).toBeInTheDocument()
+      // Banana should be rendered but not selectable
+      expect(screen.getByText('Banana'))!.toBeInTheDocument()
     })
   })
 })
@@ -584,7 +774,7 @@ describe('PortalSelect', () => {
         />,
       )
 
-      expect(screen.getByText(/select/i)).toBeInTheDocument()
+      expect(screen.getByText(/select/i))!.toBeInTheDocument()
     })
 
     it('should show selected item name when value matches', () => {
@@ -596,7 +786,7 @@ describe('PortalSelect', () => {
         />,
       )
 
-      expect(screen.getByTitle('Banana')).toBeInTheDocument()
+      expect(screen.getByTitle('Banana'))!.toBeInTheDocument()
     })
 
     it('should render with custom placeholder', () => {
@@ -609,7 +799,7 @@ describe('PortalSelect', () => {
         />,
       )
 
-      expect(screen.getByText('Choose fruit')).toBeInTheDocument()
+      expect(screen.getByText('Choose fruit'))!.toBeInTheDocument()
     })
 
     it('should render with renderTrigger', () => {
@@ -624,7 +814,7 @@ describe('PortalSelect', () => {
         />,
       )
 
-      expect(screen.getByTestId('custom-trigger')).toHaveTextContent('Apple')
+      expect(screen.getByTestId('custom-trigger'))!.toHaveTextContent('Apple')
     })
 
     it('should show INSTALLED badge when installedValue differs from selected value', () => {
@@ -637,7 +827,7 @@ describe('PortalSelect', () => {
         />,
       )
 
-      expect(screen.getByTitle('Banana')).toBeInTheDocument()
+      expect(screen.getByTitle('Banana'))!.toBeInTheDocument()
     })
 
     it('should apply triggerClassNameFn', () => {
@@ -741,7 +931,8 @@ describe('PortalSelect', () => {
 
       await user.click(screen.getByTitle('Banana'))
       // The installed badge should appear in the dropdown
-      expect(screen.getByText('INSTALLED')).toBeInTheDocument()
+      // The installed badge should appear in the dropdown
+      expect(screen.getByText('INSTALLED'))!.toBeInTheDocument()
     })
 
     it('should render item.extra content in dropdown', async () => {
@@ -760,7 +951,7 @@ describe('PortalSelect', () => {
       )
 
       await user.click(screen.getByText(/select/i))
-      expect(screen.getByTestId('extra-apple')).toBeInTheDocument()
+      expect(screen.getByTestId('extra-apple'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/base/select/__tests__/pure.spec.tsx b/web/app/components/base/select/__tests__/pure.spec.tsx
index c92cc408fb..7b62754ec4 100644
--- a/web/app/components/base/select/__tests__/pure.spec.tsx
+++ b/web/app/components/base/select/__tests__/pure.spec.tsx
@@ -18,27 +18,27 @@ describe('PureSelect', () => {
   describe('Rendering', () => {
     it('should render i18n placeholder when single value is empty', () => {
       render(<PureSelect options={options} />)
-      expect(screen.getByTitle(/select/i)).toBeInTheDocument()
+      expect(screen.getByTitle(/select/i))!.toBeInTheDocument()
     })
 
     it('should render custom placeholder when provided', () => {
       render(<PureSelect options={options} placeholder="Choose value" />)
-      expect(screen.getByTitle('Choose value')).toBeInTheDocument()
+      expect(screen.getByTitle('Choose value'))!.toBeInTheDocument()
     })
 
     it('should render selected option label in single mode', () => {
       render(<PureSelect options={options} value="banana" />)
-      expect(screen.getByTitle('Banana')).toBeInTheDocument()
+      expect(screen.getByTitle('Banana'))!.toBeInTheDocument()
     })
 
     it('should render selected count text in multiple mode', () => {
       render(<PureSelect options={options} multiple={true} value={['apple', 'banana']} />)
-      expect(screen.getByText(/selected/i)).toBeInTheDocument()
+      expect(screen.getByText(/selected/i))!.toBeInTheDocument()
     })
 
     it('should render placeholder in multiple mode when selected values are empty', () => {
       render(<PureSelect options={options} multiple={true} value={[]} placeholder="Pick fruits" />)
-      expect(screen.getByTitle('Pick fruits')).toBeInTheDocument()
+      expect(screen.getByTitle('Pick fruits'))!.toBeInTheDocument()
     })
   })
 
@@ -51,7 +51,7 @@ describe('PureSelect', () => {
       render(<PureSelect options={options} onChange={onChange} />)
 
       await user.click(screen.getByTitle(/select/i))
-      expect(screen.getByTitle('Banana')).toBeInTheDocument()
+      expect(screen.getByTitle('Banana'))!.toBeInTheDocument()
 
       await user.click(screen.getByTitle('Banana'))
 
@@ -73,7 +73,7 @@ describe('PureSelect', () => {
       )
 
       await user.click(screen.getByText(/common\.dynamicSelect\.selected/i))
-      await user.click(screen.getAllByTitle('Banana')[0])
+      await user.click(screen.getAllByTitle('Banana')[0]!)
 
       expect(onChange).toHaveBeenCalledWith(['apple', 'banana'])
     })
@@ -92,7 +92,7 @@ describe('PureSelect', () => {
       )
 
       await user.click(screen.getByText(/common\.dynamicSelect\.selected/i))
-      await user.click(screen.getAllByTitle('Apple')[0])
+      await user.click(screen.getAllByTitle('Apple')[0]!)
 
       expect(onChange).toHaveBeenCalledWith(['banana'])
     })
@@ -110,7 +110,7 @@ describe('PureSelect', () => {
         />,
       )
 
-      await user.click(screen.getAllByTitle('Apple')[0])
+      await user.click(screen.getAllByTitle('Apple')[0]!)
       expect(onChange).toHaveBeenCalledWith(['apple'])
     })
   })
@@ -128,7 +128,7 @@ describe('PureSelect', () => {
         />,
       )
 
-      expect(screen.getByTitle('Apple')).toBeInTheDocument()
+      expect(screen.getByTitle('Apple'))!.toBeInTheDocument()
       await user.click(screen.getByTitle(/select/i))
 
       expect(onOpenChange).toHaveBeenCalledWith(false)
@@ -161,7 +161,7 @@ describe('PureSelect', () => {
         />,
       )
 
-      await user.click(screen.getAllByTitle('Apple')[0])
+      await user.click(screen.getAllByTitle('Apple')[0]!)
       expect(onChange).not.toHaveBeenCalled()
     })
   })
@@ -187,11 +187,11 @@ describe('PureSelect', () => {
       const triggerLabel = screen.getByTitle(/select/i)
       const trigger = triggerLabel.parentElement
 
-      expect(trigger).toHaveClass('trigger-class')
-      expect(document.querySelector('.wrapper-class')).toBeInTheDocument()
-      expect(document.querySelector('.popup-class')).toBeInTheDocument()
+      expect(trigger)!.toHaveClass('trigger-class')
+      expect(document.querySelector('.wrapper-class'))!.toBeInTheDocument()
+      expect(document.querySelector('.popup-class'))!.toBeInTheDocument()
       expect(document.querySelectorAll('.item-class')).toHaveLength(options.length)
-      expect(screen.getByText('Available options')).toHaveClass('title-class')
+      expect(screen.getByText('Available options'))!.toHaveClass('title-class')
     })
   })
 })
diff --git a/web/app/components/base/svg-gallery/__tests__/index.spec.tsx b/web/app/components/base/svg-gallery/__tests__/index.spec.tsx
index f88856dce2..c08b527d94 100644
--- a/web/app/components/base/svg-gallery/__tests__/index.spec.tsx
+++ b/web/app/components/base/svg-gallery/__tests__/index.spec.tsx
@@ -64,7 +64,7 @@ describe('SVGRenderer', () => {
       render(<SVGRenderer content="invalid" />)
 
       await waitFor(() => {
-        expect(screen.getByText(/Error rendering SVG/)).toBeInTheDocument()
+        expect(screen.getByText(/Error rendering SVG/))!.toBeInTheDocument()
       })
     })
 
@@ -104,14 +104,14 @@ describe('SVGRenderer', () => {
       await waitFor(() => {
         expect(mockClick).toHaveBeenCalled()
       })
-      const clickHandler = mockClick.mock.calls[0][0]
+      const clickHandler = mockClick.mock.calls[0]![0]
 
       await act(async () => {
         clickHandler()
       })
       const img = screen.getByAltText('Preview')
-      expect(img).toBeInTheDocument()
-      expect(img).toHaveAttribute(
+      expect(img)!.toBeInTheDocument()
+      expect(img)!.toHaveAttribute(
         'src',
         expect.stringContaining('data:image/svg+xml;base64'),
       )
@@ -124,12 +124,12 @@ describe('SVGRenderer', () => {
       await waitFor(() => {
         expect(mockClick).toHaveBeenCalled()
       })
-      const clickHandler = mockClick.mock.calls[0][0]
+      const clickHandler = mockClick.mock.calls[0]![0]
       await act(async () => {
         clickHandler()
       })
 
-      expect(screen.getByAltText('Preview')).toBeInTheDocument()
+      expect(screen.getByAltText('Preview'))!.toBeInTheDocument()
 
       await user.click(screen.getByTestId('image-preview-close-button'))
 
diff --git a/web/app/components/base/svg/__tests__/index.spec.tsx b/web/app/components/base/svg/__tests__/index.spec.tsx
index 88d5969729..43c8c23c35 100644
--- a/web/app/components/base/svg/__tests__/index.spec.tsx
+++ b/web/app/components/base/svg/__tests__/index.spec.tsx
@@ -6,7 +6,7 @@ describe('SVGBtn', () => {
     it('renders correctly', () => {
       const setIsSVG = vi.fn()
       render(<SVGBtn isSVG={false} setIsSVG={setIsSVG} />)
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
   })
 
@@ -19,7 +19,7 @@ describe('SVGBtn', () => {
       fireEvent.click(button)
 
       expect(setIsSVG).toHaveBeenCalledTimes(1)
-      const toggleFunc = setIsSVG.mock.calls[0][0]
+      const toggleFunc = setIsSVG.mock.calls[0]![0]
       expect(typeof toggleFunc).toBe('function')
       expect(toggleFunc(false)).toBe(true)
       expect(toggleFunc(true)).toBe(false)
diff --git a/web/app/components/base/tag-input/__tests__/index.spec.tsx b/web/app/components/base/tag-input/__tests__/index.spec.tsx
index 4edd34c377..82ace7f49b 100644
--- a/web/app/components/base/tag-input/__tests__/index.spec.tsx
+++ b/web/app/components/base/tag-input/__tests__/index.spec.tsx
@@ -37,21 +37,21 @@ describe('TagInput', () => {
     it('should render existing tags and default placeholder', () => {
       renderTagInput({ items: ['alpha', 'beta'] })
 
-      expect(screen.getByText('alpha')).toBeInTheDocument()
-      expect(screen.getByText('beta')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('datasetDocuments.segment.addKeyWord')).toBeInTheDocument()
+      expect(screen.getByText('alpha'))!.toBeInTheDocument()
+      expect(screen.getByText('beta'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('datasetDocuments.segment.addKeyWord'))!.toBeInTheDocument()
     })
 
     it('should render special mode placeholder when confirm key is Tab', () => {
       renderTagInput({ customizedConfirmKey: 'Tab' })
 
-      expect(screen.getByPlaceholderText('common.model.params.stop_sequencesPlaceholder')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('common.model.params.stop_sequencesPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should render custom placeholder when placeholder prop is provided', () => {
       renderTagInput({ placeholder: 'Custom placeholder' })
 
-      expect(screen.getByPlaceholderText('Custom placeholder')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Custom placeholder'))!.toBeInTheDocument()
     })
 
     it('should hide input when add is disabled', () => {
@@ -71,11 +71,11 @@ describe('TagInput', () => {
       const input = screen.getByRole('textbox')
       const inputContainer = input.parentElement
 
-      expect(inputContainer).toHaveClass('border-transparent')
+      expect(inputContainer)!.toHaveClass('border-transparent')
 
       await userEvent.click(input)
 
-      expect(inputContainer).toHaveClass('border-dashed')
+      expect(inputContainer)!.toHaveClass('border-dashed')
     })
   })
 
@@ -85,7 +85,7 @@ describe('TagInput', () => {
 
       const removeControl = screen.getAllByTestId('remove-tag')[0]
 
-      await userEvent.click(removeControl)
+      await userEvent.click(removeControl!)
 
       expect(onChange).toHaveBeenCalledWith(['beta'])
     })
@@ -99,7 +99,7 @@ describe('TagInput', () => {
 
       expect(onChange).toHaveBeenCalledWith(['new-tag'])
       await waitFor(() => {
-        expect(input).toHaveValue('')
+        expect(input)!.toHaveValue('')
       })
     })
 
@@ -122,7 +122,7 @@ describe('TagInput', () => {
       await user.type(input, 'stop')
       await user.keyboard('{Enter}')
 
-      expect(input).toHaveValue('stop↵')
+      expect(input)!.toHaveValue('stop↵')
       expect(onChange).not.toHaveBeenCalled()
 
       // Low-level test for preventDefault
diff --git a/web/app/components/base/tag-management/__tests__/panel.spec.tsx b/web/app/components/base/tag-management/__tests__/panel.spec.tsx
index 2bdf5798ab..4f98549783 100644
--- a/web/app/components/base/tag-management/__tests__/panel.spec.tsx
+++ b/web/app/components/base/tag-management/__tests__/panel.spec.tsx
@@ -61,8 +61,8 @@ const knowledgeTag: Tag = { id: 'tag-k1', name: 'KnowledgeDB', type: 'knowledge'
 const defaultProps = {
   targetID: 'target-1',
   type: 'app' as const,
-  value: ['tag-1'], // tag-1 is already selected/bound
-  selectedTags: [appTags[0]], // pre-selected tags shown separately
+  value: ['tag-1'!], // tag-1 is already selected/bound
+  selectedTags: [appTags[0]!], // pre-selected tags shown separately
   onCacheUpdate: vi.fn<(tags: Tag[]) => void>(),
   onChange: vi.fn<() => void>(),
   onCreate: vi.fn<() => void>(),
@@ -82,13 +82,13 @@ describe('Panel', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<Panel {...defaultProps} />)
-      expect(screen.getByPlaceholderText(i18n.selectorPlaceholder)).toBeInTheDocument()
+      expect(screen.getByPlaceholderText(i18n.selectorPlaceholder))!.toBeInTheDocument()
     })
 
     it('should render the search input', () => {
       render(<Panel {...defaultProps} />)
       const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      expect(input).toBeInTheDocument()
+      expect(input)!.toBeInTheDocument()
       expect(input.tagName).toBe('INPUT')
     })
 
@@ -103,30 +103,62 @@ describe('Panel', () => {
 
       render(<Panel {...defaultProps} />)
 
-      expect(screen.getByRole('textbox')).toHaveAttribute('placeholder', '')
+      expect(screen.getByRole('textbox'))!.toHaveAttribute('placeholder', '')
     })
 
     it('should render selected tags from selectedTags prop', () => {
       render(<Panel {...defaultProps} />)
-      expect(screen.getByText('Frontend')).toBeInTheDocument()
+      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
     })
 
     it('should render unselected tags matching the type', () => {
       render(<Panel {...defaultProps} />)
       // tag-2 and tag-3 are app type and not in value[]
-      expect(screen.getByText('Backend')).toBeInTheDocument()
-      expect(screen.getByText('API')).toBeInTheDocument()
+      // tag-2 and tag-3 are app type and not in value[]
+      expect(screen.getByText('Backend'))!.toBeInTheDocument()
+      expect(screen.getByText('API'))!.toBeInTheDocument()
     })
 
     it('should not render tags of a different type', () => {
       render(<Panel {...defaultProps} />)
       // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
+      // knowledgeTag is type 'knowledge', should not appear
       expect(screen.queryByText('KnowledgeDB')).not.toBeInTheDocument()
     })
 
     it('should render the manage tags button', () => {
       render(<Panel {...defaultProps} />)
-      expect(screen.getByText(i18n.manageTags)).toBeInTheDocument()
+      expect(screen.getByText(i18n.manageTags))!.toBeInTheDocument()
     })
 
     it('should show no-tag message when there are no tags', () => {
@@ -134,7 +166,7 @@ describe('Panel', () => {
         useTagStore.setState({ tagList: [] })
       })
       render(<Panel {...defaultProps} value={[]} selectedTags={[]} />)
-      expect(screen.getByText(i18n.noTag)).toBeInTheDocument()
+      expect(screen.getByText(i18n.noTag))!.toBeInTheDocument()
     })
 
     it('should not show no-tag message when tags exist', () => {
@@ -151,7 +183,7 @@ describe('Panel', () => {
       const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
       await user.type(input, 'Back')
 
-      expect(screen.getByText('Backend')).toBeInTheDocument()
+      expect(screen.getByText('Backend'))!.toBeInTheDocument()
       expect(screen.queryByText('API')).not.toBeInTheDocument()
     })
 
@@ -162,7 +194,7 @@ describe('Panel', () => {
       const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
       await user.type(input, 'Front')
 
-      expect(screen.getByText('Frontend')).toBeInTheDocument()
+      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
       expect(screen.queryByText('Backend')).not.toBeInTheDocument()
     })
 
@@ -179,8 +211,9 @@ describe('Panel', () => {
       await user.type(input, 'BrandNewTag')
 
       // The create row shows "Create 'BrandNewTag'"
-      expect(screen.getByText(/BrandNewTag/)).toBeInTheDocument()
-      expect(screen.getByText(i18n.create, { exact: false })).toBeInTheDocument()
+      // The create row shows "Create 'BrandNewTag'"
+      expect(screen.getByText(/BrandNewTag/))!.toBeInTheDocument()
+      expect(screen.getByText(i18n.create, { exact: false }))!.toBeInTheDocument()
     })
 
     it('should not show create option when keyword matches an existing tag name', async () => {
@@ -194,6 +227,37 @@ describe('Panel', () => {
       const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
       await user.type(input, 'Frontend')
 
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
+      // 'Frontend' matches tag-1 name, so notExisted = false
       // 'Frontend' matches tag-1 name, so notExisted = false
       expect(screen.queryByText(i18n.create, { exact: false })).not.toBeInTheDocument()
     })
@@ -204,16 +268,17 @@ describe('Panel', () => {
 
       const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
       await user.type(input, 'Back')
-      expect(input).toHaveValue('Back')
+      expect(input)!.toHaveValue('Back')
 
       // The Input component renders a clear icon with data-testid="input-clear"
       const clearButton = screen.getByTestId('input-clear')
       await user.click(clearButton)
 
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
       // All tags should be visible again
-      expect(screen.getByText('Backend')).toBeInTheDocument()
-      expect(screen.getByText('API')).toBeInTheDocument()
+      // All tags should be visible again
+      expect(screen.getByText('Backend'))!.toBeInTheDocument()
+      expect(screen.getByText('API'))!.toBeInTheDocument()
     })
   })
 
@@ -234,7 +299,7 @@ describe('Panel', () => {
       await user.click(screen.getByText('Backend'))
 
       const backendRowAfterSelect = getTagRow('Backend')
-      expect(within(backendRowAfterSelect).getByTestId('check-icon-tag-2')).toBeInTheDocument()
+      expect(within(backendRowAfterSelect).getByTestId('check-icon-tag-2'))!.toBeInTheDocument()
     })
 
     it('should deselect a selected tag when clicked', async () => {
@@ -242,7 +307,7 @@ describe('Panel', () => {
       render(<Panel {...defaultProps} />)
 
       const frontendRowBeforeDeselect = getTagRow('Frontend')
-      expect(within(frontendRowBeforeDeselect).getByTestId('check-icon-tag-1')).toBeInTheDocument()
+      expect(within(frontendRowBeforeDeselect).getByTestId('check-icon-tag-1'))!.toBeInTheDocument()
 
       await user.click(screen.getByText('Frontend'))
 
@@ -260,7 +325,7 @@ describe('Panel', () => {
       await user.click(screen.getByText('Backend'))
 
       const backendRowAfterFirstClick = getTagRow('Backend')
-      expect(within(backendRowAfterFirstClick).getByTestId('check-icon-tag-2')).toBeInTheDocument()
+      expect(within(backendRowAfterFirstClick).getByTestId('check-icon-tag-2'))!.toBeInTheDocument()
 
       await user.click(screen.getByText('Backend'))
 
@@ -321,7 +386,7 @@ describe('Panel', () => {
       await user.click(createOption)
 
       await waitFor(() => {
-        expect(input).toHaveValue('')
+        expect(input)!.toHaveValue('')
       })
     })
 
@@ -382,6 +447,37 @@ describe('Panel', () => {
     it('should not create tag when keywords is empty', () => {
       render(<Panel {...defaultProps} />)
 
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
+      // The create option should not appear when no keywords
       // The create option should not appear when no keywords
       expect(screen.queryByText(i18n.create, { exact: false })).not.toBeInTheDocument()
       expect(createTag).not.toHaveBeenCalled()
@@ -459,8 +555,8 @@ describe('Panel', () => {
         expect(defaultProps.onCacheUpdate).toHaveBeenCalledTimes(1)
       })
 
-      const [updatedTags] = vi.mocked(defaultProps.onCacheUpdate).mock.calls[0]
-      expect(updatedTags.map(tag => tag.id)).toEqual(['tag-1', 'tag-2'])
+      const [updatedTags] = (vi.mocked(defaultProps.onCacheUpdate).mock.calls[0] ?? []) as [any]
+      expect(updatedTags.map((tag: any) => tag.id)).toEqual(['tag-1', 'tag-2'])
     })
 
     it('should not call bind/unbind when value has not changed', async () => {
@@ -568,9 +664,10 @@ describe('Panel', () => {
     it('should handle empty value array', () => {
       render(<Panel {...defaultProps} value={[]} selectedTags={[]} />)
       // All app-type tags should appear in the unselected list
-      expect(screen.getByText('Frontend')).toBeInTheDocument()
-      expect(screen.getByText('Backend')).toBeInTheDocument()
-      expect(screen.getByText('API')).toBeInTheDocument()
+      // All app-type tags should appear in the unselected list
+      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
+      expect(screen.getByText('Backend'))!.toBeInTheDocument()
+      expect(screen.getByText('API'))!.toBeInTheDocument()
     })
 
     it('should handle empty tagList in store', () => {
@@ -578,7 +675,7 @@ describe('Panel', () => {
         useTagStore.setState({ tagList: [] })
       })
       render(<Panel {...defaultProps} value={[]} selectedTags={[]} />)
-      expect(screen.getByText(i18n.noTag)).toBeInTheDocument()
+      expect(screen.getByText(i18n.noTag))!.toBeInTheDocument()
     })
 
     it('should handle all tags already selected', () => {
@@ -590,9 +687,10 @@ describe('Panel', () => {
         />,
       )
       // All app tags appear in selectedTags, filteredTagList should be empty
-      expect(screen.getByText('Frontend')).toBeInTheDocument()
-      expect(screen.getByText('Backend')).toBeInTheDocument()
-      expect(screen.getByText('API')).toBeInTheDocument()
+      // All app tags appear in selectedTags, filteredTagList should be empty
+      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
+      expect(screen.getByText('Backend'))!.toBeInTheDocument()
+      expect(screen.getByText('API'))!.toBeInTheDocument()
     })
 
     it('should show divider between create option and tag list when both present', async () => {
@@ -622,7 +720,7 @@ describe('Panel', () => {
           selectedTags={[]}
         />,
       )
-      expect(screen.getByText('KnowledgeDB')).toBeInTheDocument()
+      expect(screen.getByText('KnowledgeDB'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/base/tag-management/__tests__/selector.spec.tsx b/web/app/components/base/tag-management/__tests__/selector.spec.tsx
index 6285164193..b12ed449d0 100644
--- a/web/app/components/base/tag-management/__tests__/selector.spec.tsx
+++ b/web/app/components/base/tag-management/__tests__/selector.spec.tsx
@@ -53,8 +53,8 @@ const appTags: Tag[] = [
 const defaultProps = {
   targetID: 'target-1',
   type: 'app' as const,
-  value: ['tag-1'],
-  selectedTags: [appTags[0]],
+  value: ['tag-1'!],
+  selectedTags: [appTags[0]!],
   onCacheUpdate: vi.fn(),
   onChange: vi.fn(),
 }
@@ -80,29 +80,31 @@ describe('TagSelector', () => {
   describe('Rendering', () => {
     it('should render TagSelector trigger with selected tag names from defaultProps when isPopover defaults to true', () => {
       render(<TagSelector {...defaultProps} />)
-      expect(screen.getByText('Frontend')).toBeInTheDocument()
+      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
     })
 
     it('should render TagSelector add-tag placeholder when defaultProps are overridden with empty selectedTags and value', () => {
       render(<TagSelector {...defaultProps} selectedTags={[]} value={[]} />)
-      expect(screen.getByText(i18n.addTag)).toBeInTheDocument()
+      expect(screen.getByText(i18n.addTag))!.toBeInTheDocument()
     })
 
     it('should render nothing when isPopover is false', () => {
       const { container } = render(<TagSelector {...defaultProps} isPopover={false} />)
       // Only the empty fragment wrapper
-      expect(container).toBeEmptyDOMElement()
+      // Only the empty fragment wrapper
+      expect(container)!.toBeEmptyDOMElement()
     })
 
     it('should render the popover trigger button', () => {
       render(<TagSelector {...defaultProps} />)
       // The trigger is wrapped in a PopoverButton
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      // The trigger is wrapped in a PopoverButton
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
 
     it('should render when minWidth is provided', () => {
       render(<TagSelector {...defaultProps} minWidth="320px" />)
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
   })
 
@@ -112,12 +114,13 @@ describe('TagSelector', () => {
       render(
         <TagSelector
           {...defaultProps}
-          selectedTags={[appTags[0], unknownTag]}
+          selectedTags={[appTags[0]!, unknownTag]}
           value={['tag-1', 'unknown']}
         />,
       )
       // 'Frontend' is in tagList, 'Unknown' is not
-      expect(screen.getByText('Frontend')).toBeInTheDocument()
+      // 'Frontend' is in tagList, 'Unknown' is not
+      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
       expect(screen.queryByText('Unknown')).not.toBeInTheDocument()
     })
 
@@ -129,8 +132,8 @@ describe('TagSelector', () => {
           value={['tag-1', 'tag-2']}
         />,
       )
-      expect(screen.getByText('Frontend')).toBeInTheDocument()
-      expect(screen.getByText('Backend')).toBeInTheDocument()
+      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
+      expect(screen.getByText('Backend'))!.toBeInTheDocument()
     })
   })
 
@@ -143,8 +146,8 @@ describe('TagSelector', () => {
 
       // Panel renders the search input and manage tags
       await waitFor(() => {
-        expect(screen.getByPlaceholderText(i18n.selectorPlaceholder)).toBeInTheDocument()
-        expect(screen.getByText(i18n.manageTags)).toBeInTheDocument()
+        expect(screen.getByPlaceholderText(i18n.selectorPlaceholder))!.toBeInTheDocument()
+        expect(screen.getByText(i18n.manageTags))!.toBeInTheDocument()
       })
     })
 
@@ -155,7 +158,7 @@ describe('TagSelector', () => {
       await user.click(screen.getByRole('button'))
 
       await waitFor(() => {
-        expect(screen.getByText('Backend')).toBeInTheDocument()
+        expect(screen.getByText('Backend'))!.toBeInTheDocument()
       })
     })
 
@@ -169,7 +172,7 @@ describe('TagSelector', () => {
       await user.click(screen.getByRole('button'))
 
       await waitFor(() => {
-        expect(screen.getByText(i18n.noTag)).toBeInTheDocument()
+        expect(screen.getByText(i18n.noTag))!.toBeInTheDocument()
       })
     })
 
@@ -231,7 +234,7 @@ describe('TagSelector', () => {
       await user.click(screen.getByRole('button'))
 
       await waitFor(() => {
-        expect(screen.getByPlaceholderText(i18n.selectorPlaceholder)).toBeInTheDocument()
+        expect(screen.getByPlaceholderText(i18n.selectorPlaceholder))!.toBeInTheDocument()
       })
 
       const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
@@ -267,8 +270,39 @@ describe('TagSelector', () => {
         />,
       )
       // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
+      // Orphan tag is not in store tagList, so tags memo returns []
       expect(screen.queryByText('Orphan')).not.toBeInTheDocument()
-      expect(screen.getByText(i18n.addTag)).toBeInTheDocument()
+      expect(screen.getByText(i18n.addTag))!.toBeInTheDocument()
     })
 
     it('should handle knowledge type', async () => {
@@ -290,13 +324,13 @@ describe('TagSelector', () => {
         />,
       )
 
-      expect(screen.getByText('KnowledgeDB')).toBeInTheDocument()
+      expect(screen.getByText('KnowledgeDB'))!.toBeInTheDocument()
 
       // Open popover and verify panel uses knowledge type
       await user.click(screen.getByRole('button'))
 
       await waitFor(() => {
-        expect(screen.getByPlaceholderText(i18n.selectorPlaceholder)).toBeInTheDocument()
+        expect(screen.getByPlaceholderText(i18n.selectorPlaceholder))!.toBeInTheDocument()
       })
 
       const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
diff --git a/web/app/components/base/video-gallery/__tests__/VideoPlayer.spec.tsx b/web/app/components/base/video-gallery/__tests__/VideoPlayer.spec.tsx
index f78155d5c8..20a6298419 100644
--- a/web/app/components/base/video-gallery/__tests__/VideoPlayer.spec.tsx
+++ b/web/app/components/base/video-gallery/__tests__/VideoPlayer.spec.tsx
@@ -89,8 +89,8 @@ describe('VideoPlayer', () => {
       render(<VideoPlayer srcs={mockSrcs} />)
       const sources = screen.getByTestId('video-element').querySelectorAll('source')
       expect(sources).toHaveLength(2)
-      expect(sources[0].src).toContain(mockSrcs[0])
-      expect(sources[1].src).toContain(mockSrcs[1])
+      expect(sources[0]!.src).toContain(mockSrcs[0])
+      expect(sources[1]!.src).toContain(mockSrcs[1])
     })
   })
 
@@ -155,11 +155,11 @@ describe('VideoPlayer', () => {
       const video = screen.getByTestId('video-element') as HTMLVideoElement
 
       fireEvent(video, new Event('loadedmetadata'))
-      expect(screen.getByTestId('video-time-display')).toHaveTextContent('00:00 / 01:40')
+      expect(screen.getByTestId('video-time-display'))!.toHaveTextContent('00:00 / 01:40')
 
       Object.defineProperty(video, 'currentTime', { value: 30, configurable: true })
       fireEvent(video, new Event('timeupdate'))
-      expect(screen.getByTestId('video-time-display')).toHaveTextContent('00:30 / 01:40')
+      expect(screen.getByTestId('video-time-display'))!.toHaveTextContent('00:30 / 01:40')
     })
 
     it('should handle video end', async () => {
@@ -171,7 +171,7 @@ describe('VideoPlayer', () => {
       await user.click(playPauseBtn)
       fireEvent(video, new Event('ended'))
 
-      expect(playPauseBtn).toBeInTheDocument()
+      expect(playPauseBtn)!.toBeInTheDocument()
     })
 
     it('should show/hide controls on mouse move and timeout', () => {
@@ -198,7 +198,7 @@ describe('VideoPlayer', () => {
 
       // Hover
       fireEvent.mouseMove(progressBar, { clientX: 50 })
-      expect(screen.getByTestId('video-hover-time')).toHaveTextContent('00:50')
+      expect(screen.getByTestId('video-hover-time'))!.toHaveTextContent('00:50')
       fireEvent.mouseLeave(progressBar)
       expect(screen.queryByTestId('video-hover-time')).not.toBeInTheDocument()
 
@@ -262,7 +262,7 @@ describe('VideoPlayer', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByTestId('video-time-display')).toBeInTheDocument()
+        expect(screen.getByTestId('video-time-display'))!.toBeInTheDocument()
       })
     })
 
@@ -318,7 +318,7 @@ describe('VideoPlayer', () => {
 
       // mouseLeave while dragging — hoverTime should remain visible
       fireEvent.mouseLeave(progressBar)
-      expect(screen.getByTestId('video-hover-time')).toBeInTheDocument()
+      expect(screen.getByTestId('video-hover-time'))!.toBeInTheDocument()
 
       // End drag
       fireEvent.mouseUp(document)
@@ -345,7 +345,7 @@ describe('VideoPlayer', () => {
     it('should render without src or srcs', () => {
       render(<VideoPlayer />)
       const video = screen.getByTestId('video-element') as HTMLVideoElement
-      expect(video).toBeInTheDocument()
+      expect(video)!.toBeInTheDocument()
       expect(video.getAttribute('src')).toBeNull()
       expect(video.querySelectorAll('source')).toHaveLength(0)
     })
@@ -357,18 +357,19 @@ describe('VideoPlayer', () => {
       const controls = screen.getByTestId('video-controls')
 
       // Initial state: visible
-      expect(controls).toHaveAttribute('data-is-visible', 'true')
+      // Initial state: visible
+      expect(controls)!.toHaveAttribute('data-is-visible', 'true')
 
       // Let controls hide
       fireEvent.mouseMove(container)
       act(() => {
         vi.advanceTimersByTime(3001)
       })
-      expect(controls).toHaveAttribute('data-is-visible', 'false')
+      expect(controls)!.toHaveAttribute('data-is-visible', 'false')
 
       // mouseEnter should show controls again
       fireEvent.mouseEnter(container)
-      expect(controls).toHaveAttribute('data-is-visible', 'true')
+      expect(controls)!.toHaveAttribute('data-is-visible', 'true')
 
       vi.useRealTimers()
     })
diff --git a/web/app/components/base/voice-input/__tests__/index.spec.tsx b/web/app/components/base/voice-input/__tests__/index.spec.tsx
index e252c42f84..4de7a0bdaa 100644
--- a/web/app/components/base/voice-input/__tests__/index.spec.tsx
+++ b/web/app/components/base/voice-input/__tests__/index.spec.tsx
@@ -101,9 +101,9 @@ describe('VoiceInput', () => {
     // eslint-disable-next-line ts/no-explicit-any
     const recorder = mockState.recorderInstances[0] as any
     expect(recorder.start).toHaveBeenCalled()
-    expect(await screen.findByText('common.voiceInput.speaking')).toBeInTheDocument()
-    expect(screen.getByTestId('voice-input-stop')).toBeInTheDocument()
-    expect(screen.getByTestId('voice-input-timer')).toHaveTextContent('00:00')
+    expect(await screen.findByText('common.voiceInput.speaking'))!.toBeInTheDocument()
+    expect(screen.getByTestId('voice-input-stop'))!.toBeInTheDocument()
+    expect(screen.getByTestId('voice-input-timer'))!.toHaveTextContent('00:00')
   })
 
   it('should call onCancel when recording start fails', async () => {
@@ -126,9 +126,9 @@ describe('VoiceInput', () => {
 
     // eslint-disable-next-line ts/no-explicit-any
     const recorder = mockState.recorderInstances[0] as any
-    expect(await screen.findByTestId('voice-input-converting-text')).toBeInTheDocument()
-    expect(screen.getByText('common.voiceInput.converting')).toBeInTheDocument()
-    expect(screen.getByTestId('voice-input-loader')).toBeInTheDocument()
+    expect(await screen.findByTestId('voice-input-converting-text'))!.toBeInTheDocument()
+    expect(screen.getByText('common.voiceInput.converting'))!.toBeInTheDocument()
+    expect(screen.getByTestId('voice-input-loader'))!.toBeInTheDocument()
 
     await waitFor(() => {
       expect(recorder.stop).toHaveBeenCalled()
@@ -216,7 +216,7 @@ describe('VoiceInput', () => {
 
     await waitFor(() => {
       expect(audioToText).toHaveBeenCalled()
-      const formData = vi.mocked(audioToText).mock.calls[0][2] as FormData
+      const formData = vi.mocked(audioToText).mock.calls[0]![2] as FormData
       expect(formData.get('word_timestamps')).toBe('enabled')
     })
   })
@@ -311,13 +311,13 @@ describe('VoiceInput', () => {
 
     render(<VoiceInput onConverted={onConverted} onCancel={onCancel} />)
     const timer = await screen.findByTestId('voice-input-timer')
-    expect(timer).toHaveTextContent('00:00')
+    expect(timer)!.toHaveTextContent('00:00')
 
     await act(async () => {
       if (rafState.callback)
         rafState.callback()
     })
-    expect(timer).toHaveTextContent('00:01')
+    expect(timer)!.toHaveTextContent('00:01')
 
     for (let i = 0; i < 9; i++) {
       await act(async () => {
@@ -325,7 +325,7 @@ describe('VoiceInput', () => {
           rafState.callback()
       })
     }
-    expect(timer).toHaveTextContent('00:10')
+    expect(timer)!.toHaveTextContent('00:10')
   })
 
   it('should show timer element with formatted time', async () => {
@@ -333,7 +333,7 @@ describe('VoiceInput', () => {
 
     render(<VoiceInput onConverted={onConverted} onCancel={onCancel} />)
     const timer = screen.getByTestId('voice-input-timer')
-    expect(timer).toBeInTheDocument()
+    expect(timer)!.toBeInTheDocument()
     // Initial state should show 00:00
     expect(timer.textContent).toMatch(/0\d:\d{2}/)
   })
@@ -364,7 +364,7 @@ describe('VoiceInput', () => {
     render(<VoiceInput onConverted={onConverted} onCancel={onCancel} />)
     await screen.findByTestId('voice-input-stop')
 
-    expect(screen.getByTestId('voice-input-stop')).toBeInTheDocument()
+    expect(screen.getByTestId('voice-input-stop'))!.toBeInTheDocument()
 
     dprSpy.mockRestore()
   })
@@ -387,7 +387,7 @@ describe('VoiceInput', () => {
 
   it('should render speaking state indicator', async () => {
     render(<VoiceInput onConverted={onConverted} onCancel={onCancel} />)
-    expect(await screen.findByText('common.voiceInput.speaking')).toBeInTheDocument()
+    expect(await screen.findByText('common.voiceInput.speaking'))!.toBeInTheDocument()
   })
 
   it('should cleanup on unmount', () => {
@@ -442,7 +442,7 @@ describe('VoiceInput', () => {
     await waitFor(() => {
       const calls = vi.mocked(audioToText).mock.calls
       expect(calls.length).toBeGreaterThan(0)
-      const [url, sourceType, formData] = calls[0]
+      const [url, sourceType, formData] = (calls[0] ?? []) as [any, any, any]
       expect(url).toBe('/audio-to-text')
       expect(sourceType).toBe('webApp')
       expect(formData.get('word_timestamps')).toBe('enabled')
@@ -471,12 +471,12 @@ describe('VoiceInput', () => {
   it('should render timer with initial 00:00 value', () => {
     render(<VoiceInput onConverted={onConverted} onCancel={onCancel} />)
     const timer = screen.getByTestId('voice-input-timer')
-    expect(timer).toHaveTextContent('00:00')
+    expect(timer)!.toHaveTextContent('00:00')
   })
 
   it('should render stop button during recording', async () => {
     render(<VoiceInput onConverted={onConverted} onCancel={onCancel} />)
-    expect(await screen.findByTestId('voice-input-stop')).toBeInTheDocument()
+    expect(await screen.findByTestId('voice-input-stop'))!.toBeInTheDocument()
   })
 
   it('should render converting UI after stopping', async () => {
@@ -489,8 +489,8 @@ describe('VoiceInput', () => {
     await user.click(stopBtn)
 
     await screen.findByTestId('voice-input-loader')
-    expect(screen.getByTestId('voice-input-converting-text')).toBeInTheDocument()
-    expect(screen.getByTestId('voice-input-cancel')).toBeInTheDocument()
+    expect(screen.getByTestId('voice-input-converting-text'))!.toBeInTheDocument()
+    expect(screen.getByTestId('voice-input-cancel'))!.toBeInTheDocument()
   })
 
   it('should auto-stop recording and convert audio when duration reaches 10 minutes (600s)', async () => {
@@ -498,7 +498,7 @@ describe('VoiceInput', () => {
     mockState.params = { token: 'abc' }
 
     render(<VoiceInput onConverted={onConverted} onCancel={onCancel} />)
-    expect(await screen.findByTestId('voice-input-stop')).toBeInTheDocument()
+    expect(await screen.findByTestId('voice-input-stop'))!.toBeInTheDocument()
 
     for (let i = 0; i < 601; i++) {
       await act(async () => {
@@ -507,7 +507,7 @@ describe('VoiceInput', () => {
       })
     }
 
-    expect(await screen.findByTestId('voice-input-converting-text')).toBeInTheDocument()
+    expect(await screen.findByTestId('voice-input-converting-text'))!.toBeInTheDocument()
     await waitFor(() => {
       expect(onConverted).toHaveBeenCalledWith('auto-stopped text')
     })
diff --git a/web/app/components/billing/billing-page/__tests__/index.spec.tsx b/web/app/components/billing/billing-page/__tests__/index.spec.tsx
index fe99fe3e4a..929e16afb2 100644
--- a/web/app/components/billing/billing-page/__tests__/index.spec.tsx
+++ b/web/app/components/billing/billing-page/__tests__/index.spec.tsx
@@ -66,7 +66,7 @@ describe('Billing', () => {
     fireEvent.click(actionButton)
 
     await waitFor(() => expect(openAsyncWindowMock).toHaveBeenCalled())
-    const [, options] = openAsyncWindowMock.mock.calls[0]
+    const [, options] = (openAsyncWindowMock.mock.calls[0] ?? []) as [unknown, any]
     expect(options).toMatchObject({
       immediateUrl: currentBillingUrl,
       features: 'noopener,noreferrer',
@@ -82,7 +82,7 @@ describe('Billing', () => {
     fireEvent.click(actionButton)
 
     await waitFor(() => expect(openAsyncWindowMock).toHaveBeenCalled())
-    const [asyncCallback] = openAsyncWindowMock.mock.calls[0]
+    const [asyncCallback] = (openAsyncWindowMock.mock.calls[0] ?? []) as [any]
 
     // Execute the async callback passed to openAsyncWindow
     const result = await asyncCallback()
@@ -98,7 +98,7 @@ describe('Billing', () => {
     fireEvent.click(actionButton)
 
     await waitFor(() => expect(openAsyncWindowMock).toHaveBeenCalled())
-    const [asyncCallback] = openAsyncWindowMock.mock.calls[0]
+    const [asyncCallback] = (openAsyncWindowMock.mock.calls[0] ?? []) as [any]
 
     // Execute the async callback when url is null
     const result = await asyncCallback()
@@ -113,7 +113,7 @@ describe('Billing', () => {
     fireEvent.click(actionButton)
 
     await waitFor(() => expect(openAsyncWindowMock).toHaveBeenCalled())
-    const [, options] = openAsyncWindowMock.mock.calls[0]
+    const [, options] = (openAsyncWindowMock.mock.calls[0] ?? []) as [unknown, any]
 
     // Execute the onError callback
     const testError = new Error('Test error')
@@ -128,6 +128,6 @@ describe('Billing', () => {
     render(<Billing />)
 
     const actionButton = screen.getByRole('button', { name: /billing\.viewBillingTitle/ })
-    expect(actionButton).toBeDisabled()
+    expect(actionButton)!.toBeDisabled()
   })
 })
diff --git a/web/app/components/billing/plan/__tests__/index.spec.tsx b/web/app/components/billing/plan/__tests__/index.spec.tsx
index bed7ebd9fb..27f6b3005d 100644
--- a/web/app/components/billing/plan/__tests__/index.spec.tsx
+++ b/web/app/components/billing/plan/__tests__/index.spec.tsx
@@ -95,8 +95,8 @@ describe('PlanComp', () => {
   it('renders plan info and handles education verify success', async () => {
     render(<PlanComp loc="billing-page" />)
 
-    expect(screen.getByText('billing.plans.professional.name')).toBeInTheDocument()
-    expect(screen.getByTestId('plan-upgrade-btn')).toBeInTheDocument()
+    expect(screen.getByText('billing.plans.professional.name'))!.toBeInTheDocument()
+    expect(screen.getByTestId('plan-upgrade-btn'))!.toBeInTheDocument()
 
     const verifyBtn = screen.getByText('education.toVerified')
     fireEvent.click(verifyBtn)
@@ -143,7 +143,7 @@ describe('PlanComp', () => {
     })
     render(<PlanComp loc="billing-page" />)
 
-    expect(screen.getByText('billing.plans.sandbox.name')).toBeInTheDocument()
+    expect(screen.getByText('billing.plans.sandbox.name'))!.toBeInTheDocument()
   })
 
   it('renders team plan', () => {
@@ -155,7 +155,7 @@ describe('PlanComp', () => {
     })
     render(<PlanComp loc="billing-page" />)
 
-    expect(screen.getByText('billing.plans.team.name')).toBeInTheDocument()
+    expect(screen.getByText('billing.plans.team.name'))!.toBeInTheDocument()
   })
 
   it('shows verify button when education account is about to expire', () => {
@@ -167,7 +167,7 @@ describe('PlanComp', () => {
     })
     render(<PlanComp loc="billing-page" />)
 
-    expect(screen.getByText('education.toVerified')).toBeInTheDocument()
+    expect(screen.getByText('education.toVerified'))!.toBeInTheDocument()
   })
 
   it('renders enterprise plan without upgrade button', () => {
@@ -179,7 +179,7 @@ describe('PlanComp', () => {
     })
     render(<PlanComp loc="billing-page" />)
 
-    expect(screen.getByText('billing.plans.enterprise.name')).toBeInTheDocument()
+    expect(screen.getByText('billing.plans.enterprise.name'))!.toBeInTheDocument()
     expect(screen.queryByTestId('plan-upgrade-btn')).not.toBeInTheDocument()
   })
 
@@ -198,7 +198,8 @@ describe('PlanComp', () => {
     render(<PlanComp loc="billing-page" />)
 
     // Sandbox plan with finite apiRateLimit and null reset uses getDaysUntilEndOfMonth()
-    expect(screen.getByText('billing.plans.sandbox.name')).toBeInTheDocument()
+    // Sandbox plan with finite apiRateLimit and null reset uses getDaysUntilEndOfMonth()
+    expect(screen.getByText('billing.plans.sandbox.name'))!.toBeInTheDocument()
   })
 
   it('shows apiRateLimit reset info when reset is a number', () => {
@@ -215,7 +216,7 @@ describe('PlanComp', () => {
     })
     render(<PlanComp loc="billing-page" />)
 
-    expect(screen.getByText('billing.plans.professional.name')).toBeInTheDocument()
+    expect(screen.getByText('billing.plans.professional.name'))!.toBeInTheDocument()
   })
 
   it('does not show education verify when enableEducationPlan is false', () => {
@@ -241,7 +242,7 @@ describe('PlanComp', () => {
     await waitFor(() => expect(screen.getByTestId('verify-modal').getAttribute('data-is-show')).toBe('true'))
 
     // Get the props passed to the modal and call onConfirm/onCancel
-    const lastCall = verifyStateModalMock.mock.calls[verifyStateModalMock.mock.calls.length - 1][0]
+    const lastCall = verifyStateModalMock.mock.calls[verifyStateModalMock.mock.calls.length - 1]![0]
     expect(lastCall.onConfirm).toBeDefined()
     expect(lastCall.onCancel).toBeDefined()
 
diff --git a/web/app/components/billing/plan/assets/__tests__/index.spec.tsx b/web/app/components/billing/plan/assets/__tests__/index.spec.tsx
index 9fde4a4094..99da2d9ce3 100644
--- a/web/app/components/billing/plan/assets/__tests__/index.spec.tsx
+++ b/web/app/components/billing/plan/assets/__tests__/index.spec.tsx
@@ -73,36 +73,36 @@ describe('Billing Plan Assets - Integration Tests', () => {
       const { container } = render(<Sandbox />)
       const svg = container.querySelector('svg')
 
-      expect(svg).toBeInTheDocument()
-      expect(svg).toHaveAttribute('width', '32')
-      expect(svg).toHaveAttribute('height', '32')
+      expect(svg)!.toBeInTheDocument()
+      expect(svg)!.toHaveAttribute('width', '32')
+      expect(svg)!.toHaveAttribute('height', '32')
     })
 
     it('should render Professional component correctly', () => {
       const { container } = render(<Professional />)
       const svg = container.querySelector('svg')
 
-      expect(svg).toBeInTheDocument()
-      expect(svg).toHaveAttribute('width', '32')
-      expect(svg).toHaveAttribute('height', '32')
+      expect(svg)!.toBeInTheDocument()
+      expect(svg)!.toHaveAttribute('width', '32')
+      expect(svg)!.toHaveAttribute('height', '32')
     })
 
     it('should render Team component correctly', () => {
       const { container } = render(<Team />)
       const svg = container.querySelector('svg')
 
-      expect(svg).toBeInTheDocument()
-      expect(svg).toHaveAttribute('width', '32')
-      expect(svg).toHaveAttribute('height', '32')
+      expect(svg)!.toBeInTheDocument()
+      expect(svg)!.toHaveAttribute('width', '32')
+      expect(svg)!.toHaveAttribute('height', '32')
     })
 
     it('should render Enterprise component correctly', () => {
       const { container } = render(<Enterprise />)
       const svg = container.querySelector('svg')
 
-      expect(svg).toBeInTheDocument()
-      expect(svg).toHaveAttribute('width', '32')
-      expect(svg).toHaveAttribute('height', '32')
+      expect(svg)!.toBeInTheDocument()
+      expect(svg)!.toHaveAttribute('width', '32')
+      expect(svg)!.toHaveAttribute('height', '32')
     })
   })
 
@@ -119,9 +119,9 @@ describe('Billing Plan Assets - Integration Tests', () => {
         const { container } = render(component)
         const svg = container.querySelector('svg')
 
-        expect(svg).toHaveAttribute('width', '32')
-        expect(svg).toHaveAttribute('height', '32')
-        expect(svg).toHaveAttribute('viewBox', '0 0 32 32')
+        expect(svg)!.toHaveAttribute('width', '32')
+        expect(svg)!.toHaveAttribute('height', '32')
+        expect(svg)!.toHaveAttribute('viewBox', '0 0 32 32')
       })
     })
 
@@ -148,8 +148,9 @@ describe('Billing Plan Assets - Integration Tests', () => {
       const svg2 = container2.querySelector('svg')
 
       // Components should not affect each other
-      expect(svg1).toBeInTheDocument()
-      expect(svg2).toBeInTheDocument()
+      // Components should not affect each other
+      expect(svg1)!.toBeInTheDocument()
+      expect(svg2)!.toBeInTheDocument()
       expect(svg1).not.toBe(svg2)
     })
 
@@ -158,7 +159,7 @@ describe('Billing Plan Assets - Integration Tests', () => {
       const { container } = render(<Team />)
       const svg = container.querySelector('svg')
 
-      expect(svg).toBeInTheDocument()
+      expect(svg)!.toBeInTheDocument()
     })
   })
 
@@ -179,7 +180,7 @@ describe('Billing Plan Assets - Integration Tests', () => {
         // Component can be function or object (React.memo wraps it)
         expect(['function', 'object']).toContain(typeof Component)
         const { container } = render(<Component />)
-        expect(container.querySelector('svg')).toBeInTheDocument()
+        expect(container.querySelector('svg'))!.toBeInTheDocument()
       })
     })
   })
@@ -299,7 +300,7 @@ describe('Billing Plan Assets - Integration Tests', () => {
         <div>
           {Array.from({ length: 20 }).map((_, i) => {
             const components = [Sandbox, Professional, Team, Enterprise]
-            const Component = components[i % 4]
+            const Component = components[i % 4]!
             return <Component key={i} />
           })}
         </div>,
diff --git a/web/app/components/billing/pricing/plans/__tests__/index.spec.tsx b/web/app/components/billing/pricing/plans/__tests__/index.spec.tsx
index 0a407de39a..0c506b1ba2 100644
--- a/web/app/components/billing/pricing/plans/__tests__/index.spec.tsx
+++ b/web/app/components/billing/pricing/plans/__tests__/index.spec.tsx
@@ -58,11 +58,11 @@ describe('Plans', () => {
         />,
       )
 
-      expect(screen.getByTestId('cloud-plan-sandbox')).toBeInTheDocument()
-      expect(screen.getByTestId('cloud-plan-professional')).toBeInTheDocument()
-      expect(screen.getByTestId('cloud-plan-team')).toBeInTheDocument()
+      expect(screen.getByTestId('cloud-plan-sandbox'))!.toBeInTheDocument()
+      expect(screen.getByTestId('cloud-plan-professional'))!.toBeInTheDocument()
+      expect(screen.getByTestId('cloud-plan-team'))!.toBeInTheDocument()
 
-      const firstCallProps = (cloudPlanItem as unknown as Mock).mock.calls[0][0]
+      const firstCallProps = (cloudPlanItem as unknown as Mock).mock.calls[0]![0]
       expect(firstCallProps.plan).toBe(Plan.sandbox)
       // Enterprise should be normalized to team when passed down
       expect(firstCallProps.currentPlan).toBe(Plan.team)
@@ -81,9 +81,9 @@ describe('Plans', () => {
         />,
       )
 
-      expect(screen.getByTestId('self-plan-community')).toBeInTheDocument()
-      expect(screen.getByTestId('self-plan-premium')).toBeInTheDocument()
-      expect(screen.getByTestId('self-plan-enterprise')).toBeInTheDocument()
+      expect(screen.getByTestId('self-plan-community'))!.toBeInTheDocument()
+      expect(screen.getByTestId('self-plan-premium'))!.toBeInTheDocument()
+      expect(screen.getByTestId('self-plan-enterprise'))!.toBeInTheDocument()
 
       expect(selfHostedPlanItem).toHaveBeenCalledTimes(3)
     })
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/__tests__/index.spec.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/__tests__/index.spec.tsx
index 0ae553ec01..a4b8888b27 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/__tests__/index.spec.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/__tests__/index.spec.tsx
@@ -98,10 +98,10 @@ describe('CloudPlanItem', () => {
         />,
       )
 
-      expect(screen.getByText('billing.plans.sandbox.name')).toBeInTheDocument()
-      expect(screen.getByText('billing.plans.sandbox.description')).toBeInTheDocument()
-      expect(screen.getByText('billing.plansCommon.free')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: 'billing.plansCommon.currentPlan' })).toBeInTheDocument()
+      expect(screen.getByText('billing.plans.sandbox.name'))!.toBeInTheDocument()
+      expect(screen.getByText('billing.plans.sandbox.description'))!.toBeInTheDocument()
+      expect(screen.getByText('billing.plansCommon.free'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'billing.plansCommon.currentPlan' }))!.toBeInTheDocument()
     })
 
     it('should display yearly pricing with discount when planRange is yearly', () => {
@@ -115,9 +115,9 @@ describe('CloudPlanItem', () => {
       )
 
       const professionalPlan = ALL_PLANS[Plan.professional]
-      expect(screen.getByText(`$${professionalPlan.price * 12}`)).toBeInTheDocument()
-      expect(screen.getByText(`$${professionalPlan.price * 10}`)).toBeInTheDocument()
-      expect(screen.getByText(/billing\.plansCommon\.priceTip.*billing\.plansCommon\.year/)).toBeInTheDocument()
+      expect(screen.getByText(`$${professionalPlan.price * 12}`))!.toBeInTheDocument()
+      expect(screen.getByText(`$${professionalPlan.price * 10}`))!.toBeInTheDocument()
+      expect(screen.getByText(/billing\.plansCommon\.priceTip.*billing\.plansCommon\.year/))!.toBeInTheDocument()
     })
 
     it('should show "most popular" badge for professional plan', () => {
@@ -130,7 +130,7 @@ describe('CloudPlanItem', () => {
         />,
       )
 
-      expect(screen.getByText('billing.plansCommon.mostPopular')).toBeInTheDocument()
+      expect(screen.getByText('billing.plansCommon.mostPopular'))!.toBeInTheDocument()
     })
 
     it('should not show "most popular" badge for non-professional plans', () => {
@@ -157,7 +157,7 @@ describe('CloudPlanItem', () => {
       )
 
       const button = screen.getByRole('button', { name: 'billing.plansCommon.startBuilding' })
-      expect(button).toBeDisabled()
+      expect(button)!.toBeDisabled()
     })
   })
 
@@ -176,7 +176,7 @@ describe('CloudPlanItem', () => {
       )
 
       fireEvent.click(screen.getByRole('button', { name: 'billing.plansCommon.startBuilding' }))
-      expect(screen.getByText('billing.buyPermissionDeniedTip')).toBeInTheDocument()
+      expect(screen.getByText('billing.buyPermissionDeniedTip'))!.toBeInTheDocument()
       expect(mockBillingInvoices).not.toHaveBeenCalled()
     })
 
@@ -320,7 +320,7 @@ describe('CloudPlanItem', () => {
         expect(openWindow).toHaveBeenCalledTimes(1)
         // The onError callback should have been passed to openAsyncWindow
         const callArgs = openWindow.mock.calls[0]
-        expect(callArgs[1]).toHaveProperty('onError')
+        expect(callArgs![1]).toHaveProperty('onError')
       })
     })
 
@@ -336,8 +336,39 @@ describe('CloudPlanItem', () => {
       )
 
       const teamPlan = ALL_PLANS[Plan.team]
-      expect(screen.getByText(`$${teamPlan.price}`)).toBeInTheDocument()
-      expect(screen.getByText(/billing\.plansCommon\.priceTip.*billing\.plansCommon\.month/)).toBeInTheDocument()
+      expect(screen.getByText(`$${teamPlan.price}`))!.toBeInTheDocument()
+      expect(screen.getByText(/billing\.plansCommon\.priceTip.*billing\.plansCommon\.month/))!.toBeInTheDocument()
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
+      // Should NOT show crossed-out yearly price
       // Should NOT show crossed-out yearly price
       expect(screen.queryByText(`$${teamPlan.price * 12}`)).not.toBeInTheDocument()
     })
diff --git a/web/app/components/billing/trigger-events-limit-modal/__tests__/index.spec.tsx b/web/app/components/billing/trigger-events-limit-modal/__tests__/index.spec.tsx
index b0ada6ff16..47577a5b48 100644
--- a/web/app/components/billing/trigger-events-limit-modal/__tests__/index.spec.tsx
+++ b/web/app/components/billing/trigger-events-limit-modal/__tests__/index.spec.tsx
@@ -42,13 +42,13 @@ describe('TriggerEventsLimitModal', () => {
     expect(modal.getAttribute('data-description')).toContain('billing.triggerLimitModal.description')
     expect(planUpgradeModalMock).toHaveBeenCalled()
 
-    const passedProps = planUpgradeModalMock.mock.calls[0][0]
+    const passedProps = planUpgradeModalMock.mock.calls[0]![0]
     expect(passedProps.onClose).toBe(mockOnClose)
     expect(passedProps.onUpgrade).toBe(mockOnUpgrade)
 
-    expect(screen.getByText('billing.triggerLimitModal.usageTitle')).toBeInTheDocument()
-    expect(screen.getByText('12')).toBeInTheDocument()
-    expect(screen.getByText('20')).toBeInTheDocument()
+    expect(screen.getByText('billing.triggerLimitModal.usageTitle'))!.toBeInTheDocument()
+    expect(screen.getByText('12'))!.toBeInTheDocument()
+    expect(screen.getByText('20'))!.toBeInTheDocument()
   })
 
   it('renders even when trigger modal is hidden', () => {
@@ -78,9 +78,9 @@ describe('TriggerEventsLimitModal', () => {
       />,
     )
 
-    expect(screen.getByText('billing.triggerLimitModal.usageTitle')).toBeInTheDocument()
-    expect(screen.getByText('18000')).toBeInTheDocument()
-    expect(screen.getByText('20000')).toBeInTheDocument()
+    expect(screen.getByText('billing.triggerLimitModal.usageTitle'))!.toBeInTheDocument()
+    expect(screen.getByText('18000'))!.toBeInTheDocument()
+    expect(screen.getByText('20000'))!.toBeInTheDocument()
   })
 
   it('passes correct title and description translations', () => {
@@ -110,7 +110,7 @@ describe('TriggerEventsLimitModal', () => {
       />,
     )
 
-    const passedProps = planUpgradeModalMock.mock.calls[0][0]
+    const passedProps = planUpgradeModalMock.mock.calls[0]![0]
     expect(passedProps.onClose).toBe(mockOnClose)
     expect(passedProps.onUpgrade).toBe(mockOnUpgrade)
   })
diff --git a/web/app/components/billing/utils/index.ts b/web/app/components/billing/utils/index.ts
index 6974f89c8b..2d37eecbd5 100644
--- a/web/app/components/billing/utils/index.ts
+++ b/web/app/components/billing/utils/index.ts
@@ -11,8 +11,8 @@ export const parseVectorSpaceToMB = (vectorSpace: string): number => {
   if (!match)
     return 0
 
-  const value = Number.parseInt(match[1], 10)
-  const unit = match[2].toUpperCase()
+  const value = Number.parseInt(match[1]!, 10)
+  const unit = match[2]!.toUpperCase()
 
   return unit === 'GB' ? value * 1024 : value
 }
diff --git a/web/app/components/datasets/common/image-list/__tests__/index.spec.tsx b/web/app/components/datasets/common/image-list/__tests__/index.spec.tsx
index 3b04b2708e..e1fde328bb 100644
--- a/web/app/components/datasets/common/image-list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/common/image-list/__tests__/index.spec.tsx
@@ -72,7 +72,7 @@ describe('ImageList', () => {
     it('should render without crashing', () => {
       const images = createMockImages(3)
       const { container } = render(<ImageList images={images} size="md" />)
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render all images when count is below limit', () => {
@@ -87,7 +87,8 @@ describe('ImageList', () => {
       const images = createMockImages(15)
       render(<ImageList images={images} size="md" limit={9} />)
       // More button should be visible
-      expect(screen.getByText(/\+6/)).toBeInTheDocument()
+      // More button should be visible
+      expect(screen.getByText(/\+6/))!.toBeInTheDocument()
     })
   })
 
@@ -97,33 +98,35 @@ describe('ImageList', () => {
       const { container } = render(
         <ImageList images={images} size="md" className="custom-class" />,
       )
-      expect(container.firstChild).toHaveClass('custom-class')
+      expect(container.firstChild)!.toHaveClass('custom-class')
     })
 
     it('should use default limit of 9', () => {
       const images = createMockImages(12)
       render(<ImageList images={images} size="md" />)
       // Should show "+3" for remaining images
-      expect(screen.getByText(/\+3/)).toBeInTheDocument()
+      // Should show "+3" for remaining images
+      expect(screen.getByText(/\+3/))!.toBeInTheDocument()
     })
 
     it('should respect custom limit', () => {
       const images = createMockImages(10)
       render(<ImageList images={images} size="md" limit={5} />)
       // Should show "+5" for remaining images
-      expect(screen.getByText(/\+5/)).toBeInTheDocument()
+      // Should show "+5" for remaining images
+      expect(screen.getByText(/\+5/))!.toBeInTheDocument()
     })
 
     it('should handle size prop sm', () => {
       const images = createMockImages(2)
       const { container } = render(<ImageList images={images} size="sm" />)
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should handle size prop md', () => {
       const images = createMockImages(2)
       const { container } = render(<ImageList images={images} size="md" />)
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 
@@ -135,6 +138,37 @@ describe('ImageList', () => {
       const moreButton = screen.getByText(/\+6/)
       fireEvent.click(moreButton)
 
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
+      // More button should disappear
       // More button should disappear
       expect(screen.queryByText(/\+6/)).not.toBeInTheDocument()
     })
@@ -146,9 +180,10 @@ describe('ImageList', () => {
       // Find and click an image thumbnail
       const thumbnails = document.querySelectorAll('[class*="cursor-pointer"]')
       if (thumbnails.length > 0) {
-        fireEvent.click(thumbnails[0])
+        fireEvent.click(thumbnails[0]!)
         // Preview should open
-        expect(screen.getByTestId('image-previewer')).toBeInTheDocument()
+        // Preview should open
+        expect(screen.getByTestId('image-previewer'))!.toBeInTheDocument()
       }
     })
 
@@ -159,12 +194,43 @@ describe('ImageList', () => {
       // Open preview
       const thumbnails = document.querySelectorAll('[class*="cursor-pointer"]')
       if (thumbnails.length > 0) {
-        fireEvent.click(thumbnails[0])
+        fireEvent.click(thumbnails[0]!)
 
         // Close preview
         const closeButton = screen.getByTestId('close-preview')
         fireEvent.click(closeButton)
 
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
+        // Preview should be closed
         // Preview should be closed
         expect(screen.queryByTestId('image-previewer')).not.toBeInTheDocument()
       }
@@ -174,7 +240,7 @@ describe('ImageList', () => {
   describe('Edge Cases', () => {
     it('should handle empty images array', () => {
       const { container } = render(<ImageList images={[]} size="md" />)
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should not open preview when clicked image not found in list (index === -1)', () => {
@@ -185,7 +251,8 @@ describe('ImageList', () => {
       fireEvent.click(firstThumb)
 
       // Preview should open for valid image
-      expect(screen.getByTestId('image-previewer')).toBeInTheDocument()
+      // Preview should open for valid image
+      expect(screen.getByTestId('image-previewer'))!.toBeInTheDocument()
 
       // Close preview
       fireEvent.click(screen.getByTestId('close-preview'))
@@ -197,7 +264,7 @@ describe('ImageList', () => {
 
       const validThumb = screen.getByTestId('file-thumb-https://example.com/image-1.png')
       fireEvent.click(validThumb)
-      expect(screen.getByTestId('image-previewer')).toBeInTheDocument()
+      expect(screen.getByTestId('image-previewer'))!.toBeInTheDocument()
     })
 
     it('should return early when file sourceUrl is not found in limitedImages (index === -1)', () => {
@@ -216,6 +283,37 @@ describe('ImageList', () => {
         })
       }
 
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
+      // Preview should NOT open because the file was not found in limitedImages
       // Preview should NOT open because the file was not found in limitedImages
       expect(screen.queryByTestId('image-previewer')).not.toBeInTheDocument()
     })
@@ -223,7 +321,7 @@ describe('ImageList', () => {
     it('should handle single image', () => {
       const images = createMockImages(1)
       const { container } = render(<ImageList images={images} size="md" />)
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should not show More button when images count equals limit', () => {
@@ -236,13 +334,45 @@ describe('ImageList', () => {
       const images = createMockImages(5)
       render(<ImageList images={images} size="md" limit={0} />)
       // Should show "+5" for all images
-      expect(screen.getByText(/\+5/)).toBeInTheDocument()
+      // Should show "+5" for all images
+      expect(screen.getByText(/\+5/))!.toBeInTheDocument()
     })
 
     it('should handle limit larger than images count', () => {
       const images = createMockImages(5)
       render(<ImageList images={images} size="md" limit={100} />)
       // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
+      // Should not show More button
       expect(screen.queryByText(/\+/)).not.toBeInTheDocument()
     })
   })
diff --git a/web/app/components/datasets/common/image-previewer/__tests__/index.spec.tsx b/web/app/components/datasets/common/image-previewer/__tests__/index.spec.tsx
index 44f0e95c08..1ff5cb33f8 100644
--- a/web/app/components/datasets/common/image-previewer/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/common/image-previewer/__tests__/index.spec.tsx
@@ -65,7 +65,8 @@ describe('ImagePreviewer', () => {
       })
 
       // Should render in portal
-      expect(document.body.querySelector('.image-previewer')).toBeInTheDocument()
+      // Should render in portal
+      expect(document.body.querySelector('.image-previewer'))!.toBeInTheDocument()
     })
 
     it('should render close button', async () => {
@@ -77,7 +78,8 @@ describe('ImagePreviewer', () => {
       })
 
       // Esc text should be visible
-      expect(screen.getByText('Esc')).toBeInTheDocument()
+      // Esc text should be visible
+      expect(screen.getByText('Esc'))!.toBeInTheDocument()
     })
 
     it('should show loading state initially', async () => {
@@ -92,7 +94,8 @@ describe('ImagePreviewer', () => {
       })
 
       // Loading component should be visible
-      expect(document.body.querySelector('.image-previewer')).toBeInTheDocument()
+      // Loading component should be visible
+      expect(document.body.querySelector('.image-previewer'))!.toBeInTheDocument()
     })
   })
 
@@ -107,7 +110,8 @@ describe('ImagePreviewer', () => {
 
       await waitFor(() => {
         // Should start at second image
-        expect(screen.getByText('image2.png')).toBeInTheDocument()
+        // Should start at second image
+        expect(screen.getByText('image2.png'))!.toBeInTheDocument()
       })
     })
 
@@ -120,7 +124,7 @@ describe('ImagePreviewer', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('image1.png')).toBeInTheDocument()
+        expect(screen.getByText('image1.png'))!.toBeInTheDocument()
       })
     })
   })
@@ -151,7 +155,7 @@ describe('ImagePreviewer', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('image1.png')).toBeInTheDocument()
+        expect(screen.getByText('image1.png'))!.toBeInTheDocument()
       })
 
       // Find and click next button (right arrow)
@@ -166,7 +170,7 @@ describe('ImagePreviewer', () => {
         })
 
         await waitFor(() => {
-          expect(screen.getByText('image2.png')).toBeInTheDocument()
+          expect(screen.getByText('image2.png'))!.toBeInTheDocument()
         })
       }
     })
@@ -180,7 +184,7 @@ describe('ImagePreviewer', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('image2.png')).toBeInTheDocument()
+        expect(screen.getByText('image2.png'))!.toBeInTheDocument()
       })
 
       // Find and click prev button (left arrow)
@@ -195,7 +199,7 @@ describe('ImagePreviewer', () => {
         })
 
         await waitFor(() => {
-          expect(screen.getByText('image1.png')).toBeInTheDocument()
+          expect(screen.getByText('image1.png'))!.toBeInTheDocument()
         })
       }
     })
@@ -213,7 +217,7 @@ describe('ImagePreviewer', () => {
         btn.className.includes('left-8'),
       )
 
-      expect(prevButton).toBeDisabled()
+      expect(prevButton)!.toBeDisabled()
     })
 
     it('should disable next button at last image', async () => {
@@ -229,7 +233,7 @@ describe('ImagePreviewer', () => {
         btn.className.includes('right-8'),
       )
 
-      expect(nextButton).toBeDisabled()
+      expect(nextButton)!.toBeDisabled()
     })
   })
 
@@ -258,7 +262,7 @@ describe('ImagePreviewer', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText(/Failed to load image/)).toBeInTheDocument()
+        expect(screen.getByText(/Failed to load image/))!.toBeInTheDocument()
       })
     })
 
@@ -275,7 +279,7 @@ describe('ImagePreviewer', () => {
       await waitFor(() => {
         // Retry button should be visible
         const retryButton = document.querySelector('button.rounded-full')
-        expect(retryButton).toBeInTheDocument()
+        expect(retryButton)!.toBeInTheDocument()
       })
     })
   })
@@ -290,7 +294,7 @@ describe('ImagePreviewer', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('image1.png')).toBeInTheDocument()
+        expect(screen.getByText('image1.png'))!.toBeInTheDocument()
       })
 
       const buttons = document.querySelectorAll('button')
@@ -306,7 +310,7 @@ describe('ImagePreviewer', () => {
 
         // Should still be at first image
         await waitFor(() => {
-          expect(screen.getByText('image1.png')).toBeInTheDocument()
+          expect(screen.getByText('image1.png'))!.toBeInTheDocument()
         })
       }
     })
@@ -320,7 +324,7 @@ describe('ImagePreviewer', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('image3.png')).toBeInTheDocument()
+        expect(screen.getByText('image3.png'))!.toBeInTheDocument()
       })
 
       const buttons = document.querySelectorAll('button')
@@ -336,7 +340,7 @@ describe('ImagePreviewer', () => {
 
         // Should still be at last image
         await waitFor(() => {
-          expect(screen.getByText('image3.png')).toBeInTheDocument()
+          expect(screen.getByText('image3.png'))!.toBeInTheDocument()
         })
       }
     })
@@ -366,7 +370,7 @@ describe('ImagePreviewer', () => {
 
       // Wait for error state
       await waitFor(() => {
-        expect(screen.getByText(/Failed to load image/)).toBeInTheDocument()
+        expect(screen.getByText(/Failed to load image/))!.toBeInTheDocument()
       })
 
       const retryButton = document.querySelector('button.rounded-full')
@@ -393,7 +397,7 @@ describe('ImagePreviewer', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText(/Failed to load image/)).toBeInTheDocument()
+        expect(screen.getByText(/Failed to load image/))!.toBeInTheDocument()
       })
 
       // Find and click the retry button (not the nav buttons)
@@ -402,7 +406,7 @@ describe('ImagePreviewer', () => {
         btn.className.includes('rounded-full') && !btn.className.includes('left-8') && !btn.className.includes('right-8'),
       )
 
-      expect(retryButton).toBeInTheDocument()
+      expect(retryButton)!.toBeInTheDocument()
 
       if (retryButton) {
         mockFetch.mockClear()
@@ -451,7 +455,7 @@ describe('ImagePreviewer', () => {
   describe('Edge Cases', () => {
     it('should handle single image', async () => {
       const onClose = vi.fn()
-      const images = [createMockImages()[0]]
+      const images = [createMockImages()[0]!]
 
       await act(async () => {
         render(<ImagePreviewer images={images} onClose={onClose} />)
@@ -466,8 +470,8 @@ describe('ImagePreviewer', () => {
         btn.className.includes('right-8'),
       )
 
-      expect(prevButton).toBeDisabled()
-      expect(nextButton).toBeDisabled()
+      expect(prevButton)!.toBeDisabled()
+      expect(nextButton)!.toBeDisabled()
     })
 
     it('should stop event propagation on container click', async () => {
@@ -500,7 +504,8 @@ describe('ImagePreviewer', () => {
 
       await waitFor(() => {
         // Should display dimensions (800 × 600 from MockImage)
-        expect(screen.getByText(/800.*600/)).toBeInTheDocument()
+        // Should display dimensions (800 × 600 from MockImage)
+        expect(screen.getByText(/800.*600/))!.toBeInTheDocument()
       })
     })
 
@@ -514,7 +519,8 @@ describe('ImagePreviewer', () => {
 
       await waitFor(() => {
         // Should display formatted file size
-        expect(screen.getByText('image1.png')).toBeInTheDocument()
+        // Should display formatted file size
+        expect(screen.getByText('image1.png'))!.toBeInTheDocument()
       })
     })
   })
diff --git a/web/app/components/datasets/common/image-previewer/index.tsx b/web/app/components/datasets/common/image-previewer/index.tsx
index f899dcb33d..2cc51a3be5 100644
--- a/web/app/components/datasets/common/image-previewer/index.tsx
+++ b/web/app/components/datasets/common/image-previewer/index.tsx
@@ -137,7 +137,7 @@ const ImagePreviewer = ({
       return {
         ...prev,
         [image.url]: {
-          ...prev[image.url],
+          ...prev[image.url]!,
           status: 'loading',
         },
       }
@@ -168,15 +168,15 @@ const ImagePreviewer = ({
           Esc
         </span>
       </div>
-      {cachedImages[currentImage.url].status === 'loading' && (
+      {cachedImages[currentImage!.url]!.status === 'loading' && (
         <Loading type="app" />
       )}
-      {cachedImages[currentImage.url].status === 'error' && (
+      {cachedImages[currentImage!.url]!.status === 'error' && (
         <div className="flex max-w-sm flex-col items-center gap-y-2 system-sm-regular text-text-tertiary">
-          <span>{`Failed to load image: ${currentImage.url}. Please try again.`}</span>
+          <span>{`Failed to load image: ${currentImage!.url}. Please try again.`}</span>
           <Button
             variant="secondary"
-            onClick={() => retryImage(currentImage)}
+            onClick={() => retryImage(currentImage!)}
             className="size-9 rounded-full p-0"
             size="large"
           >
@@ -184,19 +184,19 @@ const ImagePreviewer = ({
           </Button>
         </div>
       )}
-      {cachedImages[currentImage.url].status === 'loaded' && (
+      {cachedImages[currentImage!.url]!.status === 'loaded' && (
         <div className="flex size-full flex-col items-center justify-center gap-y-2">
           <img
-            alt={currentImage.name}
-            src={cachedImages[currentImage.url].blobUrl}
+            alt={currentImage!.name}
+            src={cachedImages[currentImage!.url]!.blobUrl}
             className="max-h-[calc(100%-2.5rem)] max-w-full object-contain shadow-lg ring-8 ring-effects-image-frame backdrop-blur-[5px]"
           />
           <div className="flex shrink-0 gap-x-2 pt-3 pb-1 system-sm-regular text-text-tertiary">
-            <span>{currentImage.name}</span>
+            <span>{currentImage!.name}</span>
             <span>·</span>
-            <span>{`${cachedImages[currentImage.url].width} ×  ${cachedImages[currentImage.url].height}`}</span>
+            <span>{`${cachedImages[currentImage!.url]!.width} ×  ${cachedImages[currentImage!.url]!.height}`}</span>
             <span>·</span>
-            <span>{formatFileSize(currentImage.size)}</span>
+            <span>{formatFileSize(currentImage!.size)}</span>
           </div>
         </div>
       )}
diff --git a/web/app/components/datasets/common/image-uploader/__tests__/utils.spec.ts b/web/app/components/datasets/common/image-uploader/__tests__/utils.spec.ts
index 8bf66ea349..cf9e240275 100644
--- a/web/app/components/datasets/common/image-uploader/__tests__/utils.spec.ts
+++ b/web/app/components/datasets/common/image-uploader/__tests__/utils.spec.ts
@@ -235,8 +235,8 @@ describe('image-uploader utils', () => {
 
       const result = await traverseFileEntry(mockEntry)
       expect(result).toHaveLength(1)
-      expect(result[0].name).toBe('test.png')
-      expect(result[0].relativePath).toBe('test.png')
+      expect(result[0]!.name).toBe('test.png')
+      expect(result[0]!.relativePath).toBe('test.png')
     })
 
     it('should resolve with file array with prefix for nested file', async () => {
@@ -249,7 +249,7 @@ describe('image-uploader utils', () => {
 
       const result = await traverseFileEntry(mockEntry, 'folder/')
       expect(result).toHaveLength(1)
-      expect(result[0].relativePath).toBe('folder/test.png')
+      expect(result[0]!.relativePath).toBe('folder/test.png')
     })
 
     it('should resolve empty array for unknown entry type', async () => {
@@ -312,8 +312,8 @@ describe('image-uploader utils', () => {
 
       const result = await traverseFileEntry(mockEntry)
       expect(result).toHaveLength(2)
-      expect(result[0].relativePath).toBe('folder/file1.png')
-      expect(result[1].relativePath).toBe('folder/file2.png')
+      expect(result[0]!.relativePath).toBe('folder/file1.png')
+      expect(result[1]!.relativePath).toBe('folder/file2.png')
     })
   })
 })
diff --git a/web/app/components/datasets/common/image-uploader/hooks/use-upload.ts b/web/app/components/datasets/common/image-uploader/hooks/use-upload.ts
index d262401f4b..2c8bc611dc 100644
--- a/web/app/components/datasets/common/image-uploader/hooks/use-upload.ts
+++ b/web/app/components/datasets/common/image-uploader/hooks/use-upload.ts
@@ -44,7 +44,7 @@ export const useUpload = () => {
 
   const checkFileType = useCallback((file: File) => {
     const ext = getFileType(file)
-    return ACCEPT_TYPES.includes(ext.toLowerCase())
+    return ACCEPT_TYPES.includes(ext!.toLowerCase())
   }, [])
 
   const checkFileSize = useCallback((file: File) => {
@@ -131,13 +131,13 @@ export const useUpload = () => {
     const index = files.findIndex(file => file.id === fileId)
 
     if (index > -1) {
-      const uploadingFile = files[index]
+      const uploadingFile = files[index]!
       const newFiles = produce(files, (draft) => {
-        draft[index].progress = 0
+        draft[index]!.progress = 0
       })
       setFiles(newFiles)
       fileUpload({
-        file: uploadingFile.originalFile!,
+        file: uploadingFile!.originalFile!,
         onProgressCallback: (progress) => {
           handleUpdateFile({ ...uploadingFile, progress })
         },
diff --git a/web/app/components/datasets/common/image-uploader/utils.ts b/web/app/components/datasets/common/image-uploader/utils.ts
index d8c8582e2a..952c82a0c4 100644
--- a/web/app/components/datasets/common/image-uploader/utils.ts
+++ b/web/app/components/datasets/common/image-uploader/utils.ts
@@ -11,7 +11,7 @@ export const getFileType = (currentFile: File) => {
     return ''
 
   const arr = currentFile.name.split('.')
-  return arr[arr.length - 1]
+  return arr[arr.length - 1]!
 }
 
 type FileWithPath = {
diff --git a/web/app/components/datasets/common/retrieval-param-config/__tests__/index.spec.tsx b/web/app/components/datasets/common/retrieval-param-config/__tests__/index.spec.tsx
index f5c85b518e..6566aa5951 100644
--- a/web/app/components/datasets/common/retrieval-param-config/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/common/retrieval-param-config/__tests__/index.spec.tsx
@@ -173,7 +173,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('rerank-switch')).toBeInTheDocument()
+      expect(screen.getByTestId('rerank-switch'))!.toBeInTheDocument()
     })
 
     it('should render model selector when reranking is enabled', () => {
@@ -186,7 +186,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('model-selector')).toBeInTheDocument()
+      expect(screen.getByTestId('model-selector'))!.toBeInTheDocument()
     })
 
     it('should not render model selector when reranking is disabled', () => {
@@ -212,8 +212,8 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('top-k-item')).toBeInTheDocument()
-      expect(screen.getByTestId('top-k-item')).toHaveAttribute('data-value', '5')
+      expect(screen.getByTestId('top-k-item'))!.toBeInTheDocument()
+      expect(screen.getByTestId('top-k-item'))!.toHaveAttribute('data-value', '5')
     })
 
     it('should render score threshold item when reranking is enabled', () => {
@@ -226,7 +226,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('score-threshold-item')).toBeInTheDocument()
+      expect(screen.getByTestId('score-threshold-item'))!.toBeInTheDocument()
     })
 
     it('should toggle reranking enable', () => {
@@ -349,7 +349,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByText('datasetSettings.form.retrievalSetting.multiModalTip')).toBeInTheDocument()
+      expect(screen.getByText('datasetSettings.form.retrievalSetting.multiModalTip'))!.toBeInTheDocument()
     })
 
     it('should not show multimodal tip when showMultiModalTip is false', () => {
@@ -378,7 +378,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('rerank-switch')).toBeInTheDocument()
+      expect(screen.getByTestId('rerank-switch'))!.toBeInTheDocument()
     })
 
     it('should hide score threshold when reranking is disabled for full text search', () => {
@@ -410,7 +410,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('score-threshold-item')).toBeInTheDocument()
+      expect(screen.getByTestId('score-threshold-item'))!.toBeInTheDocument()
     })
   })
 
@@ -451,7 +451,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('top-k-item')).toBeInTheDocument()
+      expect(screen.getByTestId('top-k-item'))!.toBeInTheDocument()
     })
 
     it('should not render score threshold for keyword search', () => {
@@ -496,7 +496,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByText('dataset.weightedScore.title')).toBeInTheDocument()
+      expect(screen.getByText('dataset.weightedScore.title'))!.toBeInTheDocument()
     })
 
     it('should have RerankingModel option', () => {
@@ -508,7 +508,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByText('common.modelProvider.rerankModel.key')).toBeInTheDocument()
+      expect(screen.getByText('common.modelProvider.rerankModel.key'))!.toBeInTheDocument()
     })
 
     it('should show model selector when RerankingModel mode is selected', () => {
@@ -520,7 +520,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('model-selector')).toBeInTheDocument()
+      expect(screen.getByTestId('model-selector'))!.toBeInTheDocument()
     })
 
     it('should show WeightedScore component when WeightedScore mode is selected', () => {
@@ -547,7 +547,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('weighted-score')).toBeInTheDocument()
+      expect(screen.getByTestId('weighted-score'))!.toBeInTheDocument()
       expect(screen.queryByTestId('model-selector')).not.toBeInTheDocument()
     })
 
@@ -565,7 +565,7 @@ describe('RetrievalParamConfig', () => {
       fireEvent.click(weightedScoreCard!)
 
       expect(mockOnChange).toHaveBeenCalled()
-      const calledWith = mockOnChange.mock.calls[0][0]
+      const calledWith = mockOnChange.mock.calls[0]![0]
       expect(calledWith.reranking_mode).toBe(RerankingModeEnum.WeightedScore)
       expect(calledWith.weights).toBeDefined()
     })
@@ -645,7 +645,7 @@ describe('RetrievalParamConfig', () => {
       fireEvent.click(screen.getByTestId('change-weights-btn'))
 
       expect(mockOnChange).toHaveBeenCalled()
-      const calledWith = mockOnChange.mock.calls[0][0]
+      const calledWith = mockOnChange.mock.calls[0]![0]
       expect(calledWith.weights.vector_setting.vector_weight).toBe(0.6)
       expect(calledWith.weights.keyword_setting.keyword_weight).toBe(0.4)
     })
@@ -659,8 +659,8 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('top-k-item')).toBeInTheDocument()
-      expect(screen.getByTestId('score-threshold-item')).toBeInTheDocument()
+      expect(screen.getByTestId('top-k-item'))!.toBeInTheDocument()
+      expect(screen.getByTestId('score-threshold-item'))!.toBeInTheDocument()
     })
 
     it('should update top_k for hybrid search', () => {
@@ -724,7 +724,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByText('datasetSettings.form.retrievalSetting.multiModalTip')).toBeInTheDocument()
+      expect(screen.getByText('datasetSettings.form.retrievalSetting.multiModalTip'))!.toBeInTheDocument()
     })
 
     it('should not show multimodal tip for hybrid search with WeightedScore', () => {
@@ -799,7 +799,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByTestId('tooltip')).toBeInTheDocument()
+      expect(screen.getByTestId('tooltip'))!.toBeInTheDocument()
     })
   })
 
@@ -814,7 +814,7 @@ describe('RetrievalParamConfig', () => {
         />,
       )
 
-      expect(screen.getByText('common.modelProvider.rerankModel.key')).toBeInTheDocument()
+      expect(screen.getByText('common.modelProvider.rerankModel.key'))!.toBeInTheDocument()
     })
   })
 
@@ -838,7 +838,7 @@ describe('RetrievalParamConfig', () => {
       fireEvent.click(weightedScoreCard!)
 
       expect(mockOnChange).toHaveBeenCalled()
-      const calledWith = mockOnChange.mock.calls[0][0]
+      const calledWith = mockOnChange.mock.calls[0]![0]
       expect(calledWith.weights).toBeDefined()
       expect(calledWith.weights.weight_type).toBe(WeightedScoreEnum.Customized)
     })
@@ -872,7 +872,7 @@ describe('RetrievalParamConfig', () => {
       fireEvent.click(weightedScoreCard!)
 
       expect(mockOnChange).toHaveBeenCalled()
-      const calledWith = mockOnChange.mock.calls[0][0]
+      const calledWith = mockOnChange.mock.calls[0]![0]
       expect(calledWith.weights.vector_setting.vector_weight).toBe(0.8)
     })
   })
diff --git a/web/app/components/datasets/common/retrieval-param-config/index.tsx b/web/app/components/datasets/common/retrieval-param-config/index.tsx
index 5fbe1db5b1..9f227baa22 100644
--- a/web/app/components/datasets/common/retrieval-param-config/index.tsx
+++ b/web/app/components/datasets/common/retrieval-param-config/index.tsx
@@ -246,11 +246,11 @@ const RetrievalParamConfig: FC<Props> = ({
                         ...value.weights!,
                         vector_setting: {
                           ...value.weights!.vector_setting,
-                          vector_weight: v.value[0],
+                          vector_weight: v.value[0]!,
                         },
                         keyword_setting: {
                           ...value.weights!.keyword_setting,
-                          keyword_weight: v.value[1],
+                          keyword_weight: v.value[1]!,
                         },
                       },
                     })
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/index.spec.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/index.spec.tsx
index 8ad70696fe..7719c5b744 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/index.spec.tsx
@@ -113,7 +113,7 @@ describe('CreateFromDSLModal', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('app.importFromDSL')).toBeInTheDocument()
+      expect(screen.getByText('app.importFromDSL'))!.toBeInTheDocument()
     })
 
     it('should not render modal content when show is false', () => {
@@ -139,8 +139,8 @@ describe('CreateFromDSLModal', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('app.importFromDSLFile')).toBeInTheDocument()
-      expect(screen.getByText('app.importFromDSLUrl')).toBeInTheDocument()
+      expect(screen.getByText('app.importFromDSLFile'))!.toBeInTheDocument()
+      expect(screen.getByText('app.importFromDSLUrl'))!.toBeInTheDocument()
     })
 
     it('should render cancel and import buttons', () => {
@@ -152,8 +152,8 @@ describe('CreateFromDSLModal', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('app.newApp.Cancel')).toBeInTheDocument()
-      expect(screen.getByText('app.newApp.import')).toBeInTheDocument()
+      expect(screen.getByText('app.newApp.Cancel'))!.toBeInTheDocument()
+      expect(screen.getByText('app.newApp.import'))!.toBeInTheDocument()
     })
 
     it('should render uploader when file tab is active', () => {
@@ -166,7 +166,7 @@ describe('CreateFromDSLModal', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('app.dslUploader.button')).toBeInTheDocument()
+      expect(screen.getByText('app.dslUploader.button'))!.toBeInTheDocument()
     })
 
     it('should render URL input when URL tab is active', () => {
@@ -179,8 +179,8 @@ describe('CreateFromDSLModal', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('DSL URL')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('app.importFromDSLUrlPlaceholder')).toBeInTheDocument()
+      expect(screen.getByText('DSL URL'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('app.importFromDSLUrlPlaceholder'))!.toBeInTheDocument()
     })
   })
 
@@ -195,7 +195,8 @@ describe('CreateFromDSLModal', () => {
       )
 
       // File tab content should be visible
-      expect(screen.getByText('app.dslUploader.button')).toBeInTheDocument()
+      // File tab content should be visible
+      expect(screen.getByText('app.dslUploader.button'))!.toBeInTheDocument()
     })
 
     it('should use provided activeTab prop', () => {
@@ -208,7 +209,7 @@ describe('CreateFromDSLModal', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('DSL URL')).toBeInTheDocument()
+      expect(screen.getByText('DSL URL'))!.toBeInTheDocument()
     })
 
     it('should use provided dslUrl prop', () => {
@@ -223,7 +224,7 @@ describe('CreateFromDSLModal', () => {
       )
 
       const input = screen.getByPlaceholderText('app.importFromDSLUrlPlaceholder')
-      expect(input).toHaveValue('https://example.com/test.pipeline')
+      expect(input)!.toHaveValue('https://example.com/test.pipeline')
     })
 
     it('should call onClose when cancel button is clicked', () => {
@@ -252,12 +253,14 @@ describe('CreateFromDSLModal', () => {
       )
 
       // Initially file tab is active
-      expect(screen.getByText('app.dslUploader.button')).toBeInTheDocument()
+      // Initially file tab is active
+      expect(screen.getByText('app.dslUploader.button'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByText('app.importFromDSLUrl'))
 
       // URL input should be visible
-      expect(screen.getByText('DSL URL')).toBeInTheDocument()
+      // URL input should be visible
+      expect(screen.getByText('DSL URL'))!.toBeInTheDocument()
     })
 
     it('should update URL value when typing', () => {
@@ -273,7 +276,7 @@ describe('CreateFromDSLModal', () => {
       const input = screen.getByPlaceholderText('app.importFromDSLUrlPlaceholder')
       fireEvent.change(input, { target: { value: 'https://example.com/test.pipeline' } })
 
-      expect(input).toHaveValue('https://example.com/test.pipeline')
+      expect(input)!.toHaveValue('https://example.com/test.pipeline')
     })
 
     it('should have disabled import button when no file is selected in file tab', () => {
@@ -287,7 +290,7 @@ describe('CreateFromDSLModal', () => {
       )
 
       const importButton = screen.getByText('app.newApp.import').closest('button')
-      expect(importButton).toBeDisabled()
+      expect(importButton)!.toBeDisabled()
     })
 
     it('should have disabled import button when no URL is entered in URL tab', () => {
@@ -301,7 +304,7 @@ describe('CreateFromDSLModal', () => {
       )
 
       const importButton = screen.getByText('app.newApp.import').closest('button')
-      expect(importButton).toBeDisabled()
+      expect(importButton)!.toBeDisabled()
     })
 
     it('should enable import button when URL is entered', () => {
@@ -445,7 +448,7 @@ describe('CreateFromDSLModal', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('app.newApp.appCreateDSLErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('app.newApp.appCreateDSLErrorTitle'))!.toBeInTheDocument()
       })
 
       vi.useRealTimers()
@@ -663,14 +666,14 @@ describe('CreateFromDSLModal', () => {
 
       // File tab with no file - disabled
       let importButton = screen.getByText('app.newApp.import').closest('button')
-      expect(importButton).toBeDisabled()
+      expect(importButton)!.toBeDisabled()
 
       // Switch to URL tab by clicking on it
       fireEvent.click(screen.getByText('app.importFromDSLUrl'))
 
       // Still disabled (no URL)
       importButton = screen.getByText('app.newApp.import').closest('button')
-      expect(importButton).toBeDisabled()
+      expect(importButton)!.toBeDisabled()
 
       // Add URL value - should enable
       const input = screen.getByPlaceholderText('app.importFromDSLUrlPlaceholder')
@@ -902,7 +905,7 @@ describe('CreateFromDSLModal', () => {
 
       // Wait for file to be displayed
       await waitFor(() => {
-        expect(screen.getByText('test.pipeline')).toBeInTheDocument()
+        expect(screen.getByText('test.pipeline'))!.toBeInTheDocument()
       })
 
       // Now remove the file by clicking delete button (inside ActionButton)
@@ -912,7 +915,7 @@ describe('CreateFromDSLModal', () => {
         fireEvent.click(deleteButton)
         // File should be removed - uploader prompt should show again
         await waitFor(() => {
-          expect(screen.getByText('app.dslUploader.button')).toBeInTheDocument()
+          expect(screen.getByText('app.dslUploader.button'))!.toBeInTheDocument()
         })
       }
     })
@@ -968,7 +971,7 @@ describe('CreateFromDSLModal', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('app.newApp.Confirm')).toBeInTheDocument()
+        expect(screen.getByText('app.newApp.Confirm'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByText('app.newApp.Confirm'))
@@ -1016,7 +1019,7 @@ describe('CreateFromDSLModal', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('app.newApp.Confirm')).toBeInTheDocument()
+        expect(screen.getByText('app.newApp.Confirm'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByText('app.newApp.Confirm'))
@@ -1056,7 +1059,7 @@ describe('CreateFromDSLModal', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('app.newApp.Confirm')).toBeInTheDocument()
+        expect(screen.getByText('app.newApp.Confirm'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByText('app.newApp.Confirm'))
@@ -1103,7 +1106,7 @@ describe('CreateFromDSLModal', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('app.newApp.Confirm')).toBeInTheDocument()
+        expect(screen.getByText('app.newApp.Confirm'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByText('app.newApp.Confirm'))
@@ -1144,13 +1147,13 @@ describe('CreateFromDSLModal', () => {
 
       // Error modal should be visible
       await waitFor(() => {
-        expect(screen.getByText('app.newApp.appCreateDSLErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('app.newApp.appCreateDSLErrorTitle'))!.toBeInTheDocument()
       })
 
       // There are two Cancel buttons now (one in main modal footer, one in error modal)
       // Find the Cancel button in the error modal context
       const cancelButtons = screen.getAllByText('app.newApp.Cancel')
-      fireEvent.click(cancelButtons[cancelButtons.length - 1])
+      fireEvent.click(cancelButtons[cancelButtons.length - 1]!)
 
       vi.useRealTimers()
     })
@@ -1166,14 +1169,14 @@ describe('Header', () => {
   describe('Rendering', () => {
     it('should render title', () => {
       render(<Header onClose={vi.fn()} />)
-      expect(screen.getByText('app.importFromDSL')).toBeInTheDocument()
+      expect(screen.getByText('app.importFromDSL'))!.toBeInTheDocument()
     })
 
     it('should render close icon', () => {
       render(<Header onClose={vi.fn()} />)
       // Check for close icon container
       const closeButton = document.querySelector('[class*="cursor-pointer"]')
-      expect(closeButton).toBeInTheDocument()
+      expect(closeButton)!.toBeInTheDocument()
     })
   })
 
@@ -1205,8 +1208,8 @@ describe('Tab', () => {
         />,
       )
 
-      expect(screen.getByText('app.importFromDSLFile')).toBeInTheDocument()
-      expect(screen.getByText('app.importFromDSLUrl')).toBeInTheDocument()
+      expect(screen.getByText('app.importFromDSLFile'))!.toBeInTheDocument()
+      expect(screen.getByText('app.importFromDSLUrl'))!.toBeInTheDocument()
     })
   })
 
@@ -1223,7 +1226,7 @@ describe('Tab', () => {
       fireEvent.click(screen.getByText('app.importFromDSLFile'))
       // Tab uses bind() which passes the key as first argument and event as second
       expect(setCurrentTab).toHaveBeenCalled()
-      expect(setCurrentTab.mock.calls[0][0]).toBe(CreateFromDSLModalTab.FROM_FILE)
+      expect(setCurrentTab.mock.calls[0]![0]).toBe(CreateFromDSLModalTab.FROM_FILE)
     })
 
     it('should call setCurrentTab when clicking URL tab', () => {
@@ -1238,7 +1241,7 @@ describe('Tab', () => {
       fireEvent.click(screen.getByText('app.importFromDSLUrl'))
       // Tab uses bind() which passes the key as first argument and event as second
       expect(setCurrentTab).toHaveBeenCalled()
-      expect(setCurrentTab.mock.calls[0][0]).toBe(CreateFromDSLModalTab.FROM_URL)
+      expect(setCurrentTab.mock.calls[0]![0]).toBe(CreateFromDSLModalTab.FROM_URL)
     })
   })
 })
@@ -1259,7 +1262,7 @@ describe('TabItem', () => {
         />,
       )
 
-      expect(screen.getByText('Test Tab')).toBeInTheDocument()
+      expect(screen.getByText('Test Tab'))!.toBeInTheDocument()
     })
 
     it('should render active indicator when active', () => {
@@ -1273,7 +1276,7 @@ describe('TabItem', () => {
 
       // Active indicator is the bottom border div
       const indicator = document.querySelector('[class*="bg-util-colors-blue"]')
-      expect(indicator).toBeInTheDocument()
+      expect(indicator)!.toBeInTheDocument()
     })
 
     it('should not render active indicator when inactive', () => {
@@ -1348,8 +1351,8 @@ describe('Uploader', () => {
         />,
       )
 
-      expect(screen.getByText('app.dslUploader.button')).toBeInTheDocument()
-      expect(screen.getByText('app.dslUploader.browse')).toBeInTheDocument()
+      expect(screen.getByText('app.dslUploader.button'))!.toBeInTheDocument()
+      expect(screen.getByText('app.dslUploader.browse'))!.toBeInTheDocument()
     })
 
     it('should render file info when file is selected', () => {
@@ -1362,8 +1365,8 @@ describe('Uploader', () => {
         />,
       )
 
-      expect(screen.getByText('test.pipeline')).toBeInTheDocument()
-      expect(screen.getByText('PIPELINE')).toBeInTheDocument()
+      expect(screen.getByText('test.pipeline'))!.toBeInTheDocument()
+      expect(screen.getByText('PIPELINE'))!.toBeInTheDocument()
     })
 
     it('should apply custom className', () => {
@@ -1375,7 +1378,7 @@ describe('Uploader', () => {
         />,
       )
 
-      expect(container.firstChild).toHaveClass('custom-class')
+      expect(container.firstChild)!.toHaveClass('custom-class')
     })
   })
 
@@ -1484,7 +1487,8 @@ describe('Uploader', () => {
       dropArea.dispatchEvent(dragOverEvent)
 
       // Event should be handled without errors
-      expect(dropArea).toBeInTheDocument()
+      // Event should be handled without errors
+      expect(dropArea)!.toBeInTheDocument()
     })
 
     it('should handle dragLeave event and reset dragging state when target is dragRef', async () => {
@@ -1513,7 +1517,7 @@ describe('Uploader', () => {
 
       // The dragRef div appears when dragging is true
       const dragRefDiv = document.querySelector('[class*="absolute top-0 left-0"]')
-      expect(dragRefDiv).toBeInTheDocument()
+      expect(dragRefDiv)!.toBeInTheDocument()
 
       // When dragLeave happens on the dragRef element, setDragging(false) is called
       if (dragRefDiv) {
@@ -1648,7 +1652,7 @@ describe('Uploader', () => {
 
       // Get the file input
       const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement
-      expect(fileInput).toBeInTheDocument()
+      expect(fileInput)!.toBeInTheDocument()
 
       // Spy on input click before triggering selectHandle
       const clickSpy = vi.spyOn(fileInput, 'click').mockImplementation(() => {
@@ -1715,7 +1719,7 @@ describe('Uploader', () => {
 
       // Find and click delete button
       const deleteButton = document.querySelector('button')
-      expect(deleteButton).toBeInTheDocument()
+      expect(deleteButton)!.toBeInTheDocument()
 
       if (deleteButton) {
         fireEvent.click(deleteButton)
@@ -1745,7 +1749,7 @@ describe('DSLConfirmModal', () => {
         />,
       )
 
-      expect(screen.getByText('app.newApp.appCreateDSLErrorTitle')).toBeInTheDocument()
+      expect(screen.getByText('app.newApp.appCreateDSLErrorTitle'))!.toBeInTheDocument()
     })
 
     it('should render version information', () => {
@@ -1760,8 +1764,8 @@ describe('DSLConfirmModal', () => {
         />,
       )
 
-      expect(screen.getByText('0.9.0')).toBeInTheDocument()
-      expect(screen.getByText('1.0.0')).toBeInTheDocument()
+      expect(screen.getByText('0.9.0'))!.toBeInTheDocument()
+      expect(screen.getByText('1.0.0'))!.toBeInTheDocument()
     })
 
     it('should render cancel and confirm buttons', () => {
@@ -1772,8 +1776,8 @@ describe('DSLConfirmModal', () => {
         />,
       )
 
-      expect(screen.getByText('app.newApp.Cancel')).toBeInTheDocument()
-      expect(screen.getByText('app.newApp.Confirm')).toBeInTheDocument()
+      expect(screen.getByText('app.newApp.Cancel'))!.toBeInTheDocument()
+      expect(screen.getByText('app.newApp.Confirm'))!.toBeInTheDocument()
     })
 
     it('should render with default empty versions', () => {
@@ -1785,7 +1789,8 @@ describe('DSLConfirmModal', () => {
       )
 
       // Should not crash with default empty strings
-      expect(screen.getByText('app.newApp.appCreateDSLErrorTitle')).toBeInTheDocument()
+      // Should not crash with default empty strings
+      expect(screen.getByText('app.newApp.appCreateDSLErrorTitle'))!.toBeInTheDocument()
     })
 
     it('should disable confirm button when confirmDisabled is true', () => {
@@ -1798,7 +1803,7 @@ describe('DSLConfirmModal', () => {
       )
 
       const confirmButton = screen.getByText('app.newApp.Confirm').closest('button')
-      expect(confirmButton).toBeDisabled()
+      expect(confirmButton)!.toBeDisabled()
     })
   })
 
@@ -1879,7 +1884,8 @@ describe('DSLConfirmModal', () => {
       )
 
       // Component should render without crashing
-      expect(screen.getByText('app.newApp.appCreateDSLErrorTitle')).toBeInTheDocument()
+      // Component should render without crashing
+      expect(screen.getByText('app.newApp.appCreateDSLErrorTitle'))!.toBeInTheDocument()
     })
 
     it('should use default confirmDisabled when not provided', () => {
@@ -1988,7 +1994,7 @@ describe('CreateFromDSLModal Integration', () => {
 
     // Verify error modal is shown
     await waitFor(() => {
-      expect(screen.getByText('app.newApp.appCreateDSLErrorTitle')).toBeInTheDocument()
+      expect(screen.getByText('app.newApp.appCreateDSLErrorTitle'))!.toBeInTheDocument()
     })
 
     vi.useRealTimers()
diff --git a/web/app/components/datasets/create/__tests__/index.spec.tsx b/web/app/components/datasets/create/__tests__/index.spec.tsx
index 59d5dd891a..7ad5f0b6bd 100644
--- a/web/app/components/datasets/create/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/__tests__/index.spec.tsx
@@ -302,20 +302,20 @@ describe('DatasetUpdateForm', () => {
     it('should render without crashing', () => {
       render(<DatasetUpdateForm />)
 
-      expect(screen.getByTestId('top-bar')).toBeInTheDocument()
-      expect(screen.getByTestId('step-one')).toBeInTheDocument()
+      expect(screen.getByTestId('top-bar'))!.toBeInTheDocument()
+      expect(screen.getByTestId('step-one'))!.toBeInTheDocument()
     })
 
     it('should render TopBar with correct active index for step 1', () => {
       render(<DatasetUpdateForm />)
 
-      expect(screen.getByTestId('top-bar-active-index')).toHaveTextContent('0')
+      expect(screen.getByTestId('top-bar-active-index'))!.toHaveTextContent('0')
     })
 
     it('should render StepOne by default', () => {
       render(<DatasetUpdateForm />)
 
-      expect(screen.getByTestId('step-one')).toBeInTheDocument()
+      expect(screen.getByTestId('step-one'))!.toBeInTheDocument()
       expect(screen.queryByTestId('step-two')).not.toBeInTheDocument()
       expect(screen.queryByTestId('step-three')).not.toBeInTheDocument()
     })
@@ -325,6 +325,37 @@ describe('DatasetUpdateForm', () => {
 
       render(<DatasetUpdateForm />)
 
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
+      // Assert - Loading component should be rendered (not the steps)
       // Assert - Loading component should be rendered (not the steps)
       expect(screen.queryByTestId('step-one')).not.toBeInTheDocument()
     })
@@ -334,7 +365,7 @@ describe('DatasetUpdateForm', () => {
 
       render(<DatasetUpdateForm />)
 
-      expect(screen.getByText('datasetCreation.error.unavailable')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.error.unavailable'))!.toBeInTheDocument()
     })
   })
 
@@ -344,7 +375,7 @@ describe('DatasetUpdateForm', () => {
       it('should pass datasetId to TopBar', () => {
         render(<DatasetUpdateForm datasetId="dataset-abc" />)
 
-        expect(screen.getByTestId('top-bar-dataset-id')).toHaveTextContent('dataset-abc')
+        expect(screen.getByTestId('top-bar-dataset-id'))!.toHaveTextContent('dataset-abc')
       })
 
       it('should pass datasetId to StepOne', () => {
@@ -356,7 +387,7 @@ describe('DatasetUpdateForm', () => {
       it('should render without datasetId', () => {
         render(<DatasetUpdateForm />)
 
-        expect(screen.getByTestId('top-bar-dataset-id')).toHaveTextContent('none')
+        expect(screen.getByTestId('top-bar-dataset-id'))!.toHaveTextContent('none')
         expect(stepOneProps.datasetId).toBeUndefined()
       })
     })
@@ -368,7 +399,7 @@ describe('DatasetUpdateForm', () => {
       it('should initialize with FILE data source type', () => {
         render(<DatasetUpdateForm />)
 
-        expect(screen.getByTestId('step-one-data-source-type')).toHaveTextContent(DataSourceType.FILE)
+        expect(screen.getByTestId('step-one-data-source-type'))!.toHaveTextContent(DataSourceType.FILE)
       })
 
       it('should update dataSourceType when changeType is called', () => {
@@ -376,7 +407,7 @@ describe('DatasetUpdateForm', () => {
 
         fireEvent.click(screen.getByTestId('step-one-change-type'))
 
-        expect(screen.getByTestId('step-one-data-source-type')).toHaveTextContent(DataSourceType.NOTION)
+        expect(screen.getByTestId('step-one-data-source-type'))!.toHaveTextContent(DataSourceType.NOTION)
       })
     })
 
@@ -384,8 +415,8 @@ describe('DatasetUpdateForm', () => {
       it('should initialize at step 1', () => {
         render(<DatasetUpdateForm />)
 
-        expect(screen.getByTestId('step-one')).toBeInTheDocument()
-        expect(screen.getByTestId('top-bar-active-index')).toHaveTextContent('0')
+        expect(screen.getByTestId('step-one'))!.toBeInTheDocument()
+        expect(screen.getByTestId('top-bar-active-index'))!.toHaveTextContent('0')
       })
 
       it('should transition to step 2 when nextStep is called', () => {
@@ -394,8 +425,8 @@ describe('DatasetUpdateForm', () => {
         fireEvent.click(screen.getByTestId('step-one-next'))
 
         expect(screen.queryByTestId('step-one')).not.toBeInTheDocument()
-        expect(screen.getByTestId('step-two')).toBeInTheDocument()
-        expect(screen.getByTestId('top-bar-active-index')).toHaveTextContent('1')
+        expect(screen.getByTestId('step-two'))!.toBeInTheDocument()
+        expect(screen.getByTestId('top-bar-active-index'))!.toHaveTextContent('1')
       })
 
       it('should transition to step 3 from step 2', () => {
@@ -408,8 +439,8 @@ describe('DatasetUpdateForm', () => {
         fireEvent.click(screen.getByTestId('step-two-next'))
 
         expect(screen.queryByTestId('step-two')).not.toBeInTheDocument()
-        expect(screen.getByTestId('step-three')).toBeInTheDocument()
-        expect(screen.getByTestId('top-bar-active-index')).toHaveTextContent('2')
+        expect(screen.getByTestId('step-three'))!.toBeInTheDocument()
+        expect(screen.getByTestId('top-bar-active-index'))!.toHaveTextContent('2')
       })
 
       it('should go back to step 1 from step 2', () => {
@@ -418,7 +449,7 @@ describe('DatasetUpdateForm', () => {
 
         fireEvent.click(screen.getByTestId('step-two-prev'))
 
-        expect(screen.getByTestId('step-one')).toBeInTheDocument()
+        expect(screen.getByTestId('step-one'))!.toBeInTheDocument()
         expect(screen.queryByTestId('step-two')).not.toBeInTheDocument()
       })
     })
@@ -427,7 +458,7 @@ describe('DatasetUpdateForm', () => {
       it('should initialize with empty file list', () => {
         render(<DatasetUpdateForm />)
 
-        expect(screen.getByTestId('step-one-files-count')).toHaveTextContent('0')
+        expect(screen.getByTestId('step-one-files-count'))!.toHaveTextContent('0')
       })
 
       it('should update file list when updateFileList is called', () => {
@@ -435,7 +466,7 @@ describe('DatasetUpdateForm', () => {
 
         fireEvent.click(screen.getByTestId('step-one-update-files'))
 
-        expect(screen.getByTestId('step-one-files-count')).toHaveTextContent('1')
+        expect(screen.getByTestId('step-one-files-count'))!.toHaveTextContent('1')
       })
     })
 
@@ -443,7 +474,7 @@ describe('DatasetUpdateForm', () => {
       it('should initialize with empty notion pages', () => {
         render(<DatasetUpdateForm />)
 
-        expect(screen.getByTestId('step-one-notion-pages-count')).toHaveTextContent('0')
+        expect(screen.getByTestId('step-one-notion-pages-count'))!.toHaveTextContent('0')
       })
 
       it('should update notion pages when updateNotionPages is called', () => {
@@ -451,7 +482,7 @@ describe('DatasetUpdateForm', () => {
 
         fireEvent.click(screen.getByTestId('step-one-update-notion-pages'))
 
-        expect(screen.getByTestId('step-one-notion-pages-count')).toHaveTextContent('1')
+        expect(screen.getByTestId('step-one-notion-pages-count'))!.toHaveTextContent('1')
       })
     })
 
@@ -459,7 +490,7 @@ describe('DatasetUpdateForm', () => {
       it('should initialize with empty website pages', () => {
         render(<DatasetUpdateForm />)
 
-        expect(screen.getByTestId('step-one-website-pages-count')).toHaveTextContent('0')
+        expect(screen.getByTestId('step-one-website-pages-count'))!.toHaveTextContent('0')
       })
 
       it('should update website pages when setWebsitePages is called', () => {
@@ -467,7 +498,7 @@ describe('DatasetUpdateForm', () => {
 
         fireEvent.click(screen.getByTestId('step-one-update-website-pages'))
 
-        expect(screen.getByTestId('step-one-website-pages-count')).toHaveTextContent('1')
+        expect(screen.getByTestId('step-one-website-pages-count'))!.toHaveTextContent('1')
       })
     })
   })
@@ -579,7 +610,7 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-one-update-file-progress'))
 
       // Assert - Progress should be updated
-      expect(stepOneProps.files[0].progress).toBe(50)
+      expect(stepOneProps.files[0]!.progress).toBe(50)
     })
 
     it('should update notion credential id', () => {
@@ -599,7 +630,7 @@ describe('DatasetUpdateForm', () => {
 
       fireEvent.click(screen.getByTestId('step-one-next'))
 
-      expect(screen.getByTestId('step-two-is-api-key-set')).toHaveTextContent('true')
+      expect(screen.getByTestId('step-two-is-api-key-set'))!.toHaveTextContent('true')
     })
 
     it('should pass isAPIKeySet as false when embeddingsDefaultModel is undefined', () => {
@@ -608,7 +639,7 @@ describe('DatasetUpdateForm', () => {
 
       fireEvent.click(screen.getByTestId('step-one-next'))
 
-      expect(screen.getByTestId('step-two-is-api-key-set')).toHaveTextContent('false')
+      expect(screen.getByTestId('step-two-is-api-key-set'))!.toHaveTextContent('false')
     })
 
     it('should pass correct dataSourceType to StepTwo', () => {
@@ -617,7 +648,7 @@ describe('DatasetUpdateForm', () => {
 
       fireEvent.click(screen.getByTestId('step-one-next'))
 
-      expect(screen.getByTestId('step-two-data-source-type')).toHaveTextContent(DataSourceType.NOTION)
+      expect(screen.getByTestId('step-two-data-source-type'))!.toHaveTextContent(DataSourceType.NOTION)
     })
 
     it('should pass files mapped to file property to StepTwo', () => {
@@ -626,7 +657,7 @@ describe('DatasetUpdateForm', () => {
 
       fireEvent.click(screen.getByTestId('step-one-next'))
 
-      expect(screen.getByTestId('step-two-files-count')).toHaveTextContent('1')
+      expect(screen.getByTestId('step-two-files-count'))!.toHaveTextContent('1')
     })
 
     it('should update indexing type cache from StepTwo', () => {
@@ -637,7 +668,7 @@ describe('DatasetUpdateForm', () => {
 
       // Assert - Go to step 3 and verify
       fireEvent.click(screen.getByTestId('step-two-next'))
-      expect(screen.getByTestId('step-three-indexing-type')).toHaveTextContent('high_quality')
+      expect(screen.getByTestId('step-three-indexing-type'))!.toHaveTextContent('high_quality')
     })
 
     it('should update retrieval method cache from StepTwo', () => {
@@ -648,7 +679,7 @@ describe('DatasetUpdateForm', () => {
 
       // Assert - Go to step 3 and verify
       fireEvent.click(screen.getByTestId('step-two-next'))
-      expect(screen.getByTestId('step-three-retrieval-method')).toHaveTextContent('semantic_search')
+      expect(screen.getByTestId('step-three-retrieval-method'))!.toHaveTextContent('semantic_search')
     })
 
     it('should update result cache from StepTwo', () => {
@@ -672,6 +703,37 @@ describe('DatasetUpdateForm', () => {
 
       fireEvent.click(screen.getByTestId('step-one-next'))
 
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
+      // Assert - StepTwo should not render due to condition
       // Assert - StepTwo should not render due to condition
       expect(screen.queryByTestId('step-two')).not.toBeInTheDocument()
     })
@@ -682,7 +744,7 @@ describe('DatasetUpdateForm', () => {
 
       fireEvent.click(screen.getByTestId('step-one-next'))
 
-      expect(screen.getByTestId('step-two')).toBeInTheDocument()
+      expect(screen.getByTestId('step-two'))!.toBeInTheDocument()
     })
 
     it('should pass indexingType from datasetDetail to StepTwo', () => {
@@ -706,7 +768,7 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-one-next'))
       fireEvent.click(screen.getByTestId('step-two-next'))
 
-      expect(screen.getByTestId('step-three-dataset-id')).toHaveTextContent('dataset-456')
+      expect(screen.getByTestId('step-three-dataset-id'))!.toHaveTextContent('dataset-456')
     })
 
     it('should pass datasetName from datasetDetail to StepThree', () => {
@@ -716,7 +778,7 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-one-next'))
       fireEvent.click(screen.getByTestId('step-two-next'))
 
-      expect(screen.getByTestId('step-three-dataset-name')).toHaveTextContent('My Special Dataset')
+      expect(screen.getByTestId('step-three-dataset-name'))!.toHaveTextContent('My Special Dataset')
     })
 
     it('should use cached indexing type when datasetDetail indexing_technique is not available', () => {
@@ -729,7 +791,7 @@ describe('DatasetUpdateForm', () => {
       // Act - Navigate to step 3
       fireEvent.click(screen.getByTestId('step-two-next'))
 
-      expect(screen.getByTestId('step-three-indexing-type')).toHaveTextContent('high_quality')
+      expect(screen.getByTestId('step-three-indexing-type'))!.toHaveTextContent('high_quality')
     })
 
     it('should use datasetDetail indexing_technique over cached value', () => {
@@ -744,7 +806,8 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-two-next'))
 
       // Assert - Should use datasetDetail value, not cache
-      expect(screen.getByTestId('step-three-indexing-type')).toHaveTextContent('economy')
+      // Assert - Should use datasetDetail value, not cache
+      expect(screen.getByTestId('step-three-indexing-type'))!.toHaveTextContent('economy')
     })
 
     it('should use retrieval method from datasetDetail when available', () => {
@@ -758,7 +821,7 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-one-next'))
       fireEvent.click(screen.getByTestId('step-two-next'))
 
-      expect(screen.getByTestId('step-three-retrieval-method')).toHaveTextContent('full_text_search')
+      expect(screen.getByTestId('step-three-retrieval-method'))!.toHaveTextContent('full_text_search')
     })
   })
 
@@ -833,7 +896,8 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-two-next'))
 
       // Assert - Should use cached value
-      expect(screen.getByTestId('step-three-retrieval-method')).toHaveTextContent('semantic_search')
+      // Assert - Should use cached value
+      expect(screen.getByTestId('step-three-retrieval-method'))!.toHaveTextContent('semantic_search')
     })
 
     it('should handle step state correctly after multiple navigations', () => {
@@ -845,8 +909,8 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-one-next')) // to step 2
       fireEvent.click(screen.getByTestId('step-two-next')) // to step 3
 
-      expect(screen.getByTestId('step-three')).toBeInTheDocument()
-      expect(screen.getByTestId('top-bar-active-index')).toHaveTextContent('2')
+      expect(screen.getByTestId('step-three'))!.toBeInTheDocument()
+      expect(screen.getByTestId('top-bar-active-index'))!.toHaveTextContent('2')
     })
 
     it('should handle result cache being undefined', () => {
@@ -887,9 +951,10 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-two-prev'))
 
       // Assert - All state should be preserved
-      expect(screen.getByTestId('step-one-data-source-type')).toHaveTextContent(DataSourceType.NOTION)
-      expect(screen.getByTestId('step-one-files-count')).toHaveTextContent('1')
-      expect(screen.getByTestId('step-one-notion-pages-count')).toHaveTextContent('1')
+      // Assert - All state should be preserved
+      expect(screen.getByTestId('step-one-data-source-type'))!.toHaveTextContent(DataSourceType.NOTION)
+      expect(screen.getByTestId('step-one-files-count'))!.toHaveTextContent('1')
+      expect(screen.getByTestId('step-one-notion-pages-count'))!.toHaveTextContent('1')
     })
   })
 
@@ -909,8 +974,9 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-two-next'))
 
       // Assert - All data flows through to Step 3
-      expect(screen.getByTestId('step-three-indexing-type')).toHaveTextContent('high_quality')
-      expect(screen.getByTestId('step-three-retrieval-method')).toHaveTextContent('semantic_search')
+      // Assert - All data flows through to Step 3
+      expect(screen.getByTestId('step-three-indexing-type'))!.toHaveTextContent('high_quality')
+      expect(screen.getByTestId('step-three-retrieval-method'))!.toHaveTextContent('semantic_search')
       expect(stepThreeProps.creationCache?.batch).toBe('batch-1')
     })
 
@@ -970,8 +1036,9 @@ describe('DatasetUpdateForm', () => {
       fireEvent.click(screen.getByTestId('step-two-next'))
 
       // Assert - Step 3 should show dataset details
-      expect(screen.getByTestId('step-three-dataset-name')).toHaveTextContent('Existing Dataset')
-      expect(screen.getByTestId('step-three-indexing-type')).toHaveTextContent('high_quality')
+      // Assert - Step 3 should show dataset details
+      expect(screen.getByTestId('step-three-dataset-name'))!.toHaveTextContent('Existing Dataset')
+      expect(screen.getByTestId('step-three-indexing-type'))!.toHaveTextContent('high_quality')
     })
   })
 
@@ -1014,7 +1081,7 @@ describe('DatasetUpdateForm', () => {
       render(<DatasetUpdateForm />)
 
       const errorElement = screen.getByText('datasetCreation.error.unavailable')
-      expect(errorElement).toBeInTheDocument()
+      expect(errorElement)!.toBeInTheDocument()
     })
 
     it('should not render steps when in error state', () => {
@@ -1033,7 +1100,8 @@ describe('DatasetUpdateForm', () => {
       render(<DatasetUpdateForm />)
 
       // Assert - Error state renders AppUnavailable, not the normal layout
-      expect(screen.getByText('500')).toBeInTheDocument()
+      // Assert - Error state renders AppUnavailable, not the normal layout
+      expect(screen.getByText('500'))!.toBeInTheDocument()
       expect(screen.queryByTestId('top-bar')).not.toBeInTheDocument()
     })
   })
@@ -1053,13 +1121,44 @@ describe('DatasetUpdateForm', () => {
 
       render(<DatasetUpdateForm />)
 
-      expect(screen.getByTestId('top-bar')).toBeInTheDocument()
+      expect(screen.getByTestId('top-bar'))!.toBeInTheDocument()
     })
 
     it('should render StepOne after loading completes', async () => {
       mockIsLoadingDataSourceList = true
       const { rerender } = render(<DatasetUpdateForm />)
 
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
+      // Assert - Initially not rendered
       // Assert - Initially not rendered
       expect(screen.queryByTestId('step-one')).not.toBeInTheDocument()
 
@@ -1069,7 +1168,7 @@ describe('DatasetUpdateForm', () => {
 
       // Assert - Now rendered
       await waitFor(() => {
-        expect(screen.getByTestId('step-one')).toBeInTheDocument()
+        expect(screen.getByTestId('step-one'))!.toBeInTheDocument()
       })
     })
   })
diff --git a/web/app/components/datasets/create/embedding-process/__tests__/rule-detail.spec.tsx b/web/app/components/datasets/create/embedding-process/__tests__/rule-detail.spec.tsx
index ba557a55f1..5213e9f685 100644
--- a/web/app/components/datasets/create/embedding-process/__tests__/rule-detail.spec.tsx
+++ b/web/app/components/datasets/create/embedding-process/__tests__/rule-detail.spec.tsx
@@ -58,7 +58,7 @@ describe('RuleDetail', () => {
     )
 
     const values = screen.getAllByTestId('field-value')
-    expect(values[0].textContent).toContain('embedding.custom')
+    expect(values[0]!.textContent).toContain('embedding.custom')
   })
 
   it('should display hierarchical mode with parent mode label', () => {
@@ -78,7 +78,7 @@ describe('RuleDetail', () => {
     )
 
     const values = screen.getAllByTestId('field-value')
-    expect(values[0].textContent).toContain('embedding.hierarchical')
+    expect(values[0]!.textContent).toContain('embedding.hierarchical')
   })
 
   it('should display "-" when no sourceData mode', () => {
@@ -90,7 +90,7 @@ describe('RuleDetail', () => {
     )
 
     const values = screen.getAllByTestId('field-value')
-    expect(values[0].textContent).toBe('-')
+    expect(values[0]!.textContent).toBe('-')
   })
 
   it('should display segment length for general mode', () => {
@@ -102,7 +102,7 @@ describe('RuleDetail', () => {
     )
 
     const values = screen.getAllByTestId('field-value')
-    expect(values[1].textContent).toBe('500')
+    expect(values[1]!.textContent).toBe('500')
   })
 
   it('should display enabled pre-processing rules', () => {
@@ -115,7 +115,7 @@ describe('RuleDetail', () => {
 
     const values = screen.getAllByTestId('field-value')
     // Only remove_extra_spaces is enabled
-    expect(values[2].textContent).toContain('stepTwo.removeExtraSpaces')
+    expect(values[2]!.textContent).toContain('stepTwo.removeExtraSpaces')
   })
 
   it('should display economical index mode', () => {
@@ -128,7 +128,7 @@ describe('RuleDetail', () => {
 
     const values = screen.getAllByTestId('field-value')
     // Index mode field is 4th (index 3)
-    expect(values[3].textContent).toContain('stepTwo.economical')
+    expect(values[3]!.textContent).toContain('stepTwo.economical')
   })
 
   it('should display qualified index mode for high_quality', () => {
@@ -140,6 +140,6 @@ describe('RuleDetail', () => {
     )
 
     const values = screen.getAllByTestId('field-value')
-    expect(values[3].textContent).toContain('stepTwo.qualified')
+    expect(values[3]!.textContent).toContain('stepTwo.qualified')
   })
 })
diff --git a/web/app/components/datasets/create/embedding-process/rule-detail.tsx b/web/app/components/datasets/create/embedding-process/rule-detail.tsx
index 553c751056..5e5d4923a7 100644
--- a/web/app/components/datasets/create/embedding-process/rule-detail.tsx
+++ b/web/app/components/datasets/create/embedding-process/rule-detail.tsx
@@ -112,7 +112,7 @@ const RuleDetail: FC<RuleDetailProps> = ({ sourceData, indexingType, retrievalMe
         <FieldInfo
           key={field}
           label={segmentationRuleLabels[field as keyof typeof segmentationRuleLabels]}
-          displayedValue={String(fieldValueGetters[field]())}
+          displayedValue={String(fieldValueGetters[field]!())}
         />
       ))}
       <FieldInfo
diff --git a/web/app/components/datasets/create/file-preview/__tests__/index.spec.tsx b/web/app/components/datasets/create/file-preview/__tests__/index.spec.tsx
index 2b4bb343ff..6839a8cc87 100644
--- a/web/app/components/datasets/create/file-preview/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/file-preview/__tests__/index.spec.tsx
@@ -62,23 +62,23 @@ describe('FilePreview', () => {
       renderFilePreview()
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.filePreview')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.filePreview'))!.toBeInTheDocument()
       })
     })
 
     it('should render file preview header', async () => {
       renderFilePreview()
 
-      expect(screen.getByText('datasetCreation.stepOne.filePreview')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.filePreview'))!.toBeInTheDocument()
     })
 
     it('should render close button with XMarkIcon', async () => {
       const { container } = renderFilePreview()
 
       const closeButton = container.querySelector('.cursor-pointer')
-      expect(closeButton).toBeInTheDocument()
+      expect(closeButton)!.toBeInTheDocument()
       const xMarkIcon = closeButton?.querySelector('svg')
-      expect(xMarkIcon).toBeInTheDocument()
+      expect(xMarkIcon)!.toBeInTheDocument()
     })
 
     it('should render file name without extension', async () => {
@@ -87,7 +87,7 @@ describe('FilePreview', () => {
       renderFilePreview({ file })
 
       await waitFor(() => {
-        expect(screen.getByText('document')).toBeInTheDocument()
+        expect(screen.getByText('document'))!.toBeInTheDocument()
       })
     })
 
@@ -96,14 +96,14 @@ describe('FilePreview', () => {
 
       renderFilePreview({ file })
 
-      expect(screen.getByText('.pdf')).toBeInTheDocument()
+      expect(screen.getByText('.pdf'))!.toBeInTheDocument()
     })
 
     it('should apply correct CSS classes to container', async () => {
       const { container } = renderFilePreview()
 
       const wrapper = container.firstChild as HTMLElement
-      expect(wrapper).toHaveClass('h-full')
+      expect(wrapper)!.toHaveClass('h-full')
     })
   })
 
@@ -119,7 +119,7 @@ describe('FilePreview', () => {
 
       // Assert - Loading should be visible initially (using spin-animation class)
       const loadingElement = findLoadingSpinner(container)
-      expect(loadingElement).toBeInTheDocument()
+      expect(loadingElement)!.toBeInTheDocument()
     })
 
     it('should hide loading indicator after content loads', async () => {
@@ -128,7 +128,7 @@ describe('FilePreview', () => {
       const { container } = renderFilePreview()
 
       await waitFor(() => {
-        expect(screen.getByText('Loaded content')).toBeInTheDocument()
+        expect(screen.getByText('Loaded content'))!.toBeInTheDocument()
       })
       // Loading should be gone
       const loadingElement = findLoadingSpinner(container)
@@ -152,7 +152,8 @@ describe('FilePreview', () => {
       )
 
       // First file loading - spinner should be visible
-      expect(findLoadingSpinner(container)).toBeInTheDocument()
+      // First file loading - spinner should be visible
+      expect(findLoadingSpinner(container))!.toBeInTheDocument()
 
       // Resolve first file
       await act(async () => {
@@ -160,7 +161,7 @@ describe('FilePreview', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('Content 1')).toBeInTheDocument()
+        expect(screen.getByText('Content 1'))!.toBeInTheDocument()
       })
 
       // Rerender with new file
@@ -168,7 +169,7 @@ describe('FilePreview', () => {
 
       // Should show loading again
       await waitFor(() => {
-        expect(findLoadingSpinner(container)).toBeInTheDocument()
+        expect(findLoadingSpinner(container))!.toBeInTheDocument()
       })
 
       // Resolve second file
@@ -177,7 +178,7 @@ describe('FilePreview', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('Content 2')).toBeInTheDocument()
+        expect(screen.getByText('Content 2'))!.toBeInTheDocument()
       })
     })
   })
@@ -234,7 +235,7 @@ describe('FilePreview', () => {
       renderFilePreview()
 
       await waitFor(() => {
-        expect(screen.getByText('File preview content from API')).toBeInTheDocument()
+        expect(screen.getByText('File preview content from API'))!.toBeInTheDocument()
       })
     })
 
@@ -245,10 +246,11 @@ describe('FilePreview', () => {
 
       // Assert - Component should not crash, loading may persist
       await waitFor(() => {
-        expect(container.firstChild).toBeInTheDocument()
+        expect(container.firstChild)!.toBeInTheDocument()
       })
       // No error thrown, component still rendered
-      expect(screen.getByText('datasetCreation.stepOne.filePreview')).toBeInTheDocument()
+      // No error thrown, component still rendered
+      expect(screen.getByText('datasetCreation.stepOne.filePreview'))!.toBeInTheDocument()
     })
 
     it('should handle empty content response', async () => {
@@ -284,7 +286,7 @@ describe('FilePreview', () => {
 
       // Assert - onClick receives the event object
       expect(hidePreview).toHaveBeenCalled()
-      expect(hidePreview.mock.calls[0][0]).toBeDefined()
+      expect(hidePreview.mock.calls[0]![0]).toBeDefined()
     })
 
     it('should handle multiple clicks on close button', async () => {
@@ -308,7 +310,7 @@ describe('FilePreview', () => {
       const { container } = renderFilePreview()
 
       const loadingElement = findLoadingSpinner(container)
-      expect(loadingElement).toBeInTheDocument()
+      expect(loadingElement)!.toBeInTheDocument()
     })
 
     it('should update previewContent state after successful fetch', async () => {
@@ -317,7 +319,7 @@ describe('FilePreview', () => {
       renderFilePreview()
 
       await waitFor(() => {
-        expect(screen.getByText('New preview content')).toBeInTheDocument()
+        expect(screen.getByText('New preview content'))!.toBeInTheDocument()
       })
     })
 
@@ -334,7 +336,7 @@ describe('FilePreview', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByText('Content 1')).toBeInTheDocument()
+        expect(screen.getByText('Content 1'))!.toBeInTheDocument()
       })
 
       // Change file
@@ -343,7 +345,7 @@ describe('FilePreview', () => {
       // Assert - Loading should be shown again
       await waitFor(() => {
         const loadingElement = findLoadingSpinner(container)
-        expect(loadingElement).toBeInTheDocument()
+        expect(loadingElement)!.toBeInTheDocument()
       })
     })
 
@@ -362,7 +364,7 @@ describe('FilePreview', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByText('Content 1')).toBeInTheDocument()
+        expect(screen.getByText('Content 1'))!.toBeInTheDocument()
       })
 
       // Change file - loading should replace content
@@ -374,7 +376,7 @@ describe('FilePreview', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('Content 2')).toBeInTheDocument()
+        expect(screen.getByText('Content 2'))!.toBeInTheDocument()
         expect(screen.queryByText('Content 1')).not.toBeInTheDocument()
       })
     })
@@ -387,15 +389,16 @@ describe('FilePreview', () => {
 
         renderFilePreview({ file })
 
-        expect(screen.getByText('my-document')).toBeInTheDocument()
-        expect(screen.getByText('.pdf')).toBeInTheDocument()
+        expect(screen.getByText('my-document'))!.toBeInTheDocument()
+        expect(screen.getByText('.pdf'))!.toBeInTheDocument()
       })
 
       it('should render correctly without file prop', async () => {
         renderFilePreview({ file: undefined })
 
         // Assert - Header should still render
-        expect(screen.getByText('datasetCreation.stepOne.filePreview')).toBeInTheDocument()
+        // Assert - Header should still render
+        expect(screen.getByText('datasetCreation.stepOne.filePreview'))!.toBeInTheDocument()
       })
 
       it('should handle file with multiple dots in name', async () => {
@@ -404,7 +407,8 @@ describe('FilePreview', () => {
         renderFilePreview({ file })
 
         // Assert - Should join all parts except last with comma
-        expect(screen.getByText('my,document,v2')).toBeInTheDocument()
+        // Assert - Should join all parts except last with comma
+        expect(screen.getByText('my,document,v2'))!.toBeInTheDocument()
       })
 
       it('should handle file with no extension in name', async () => {
@@ -414,7 +418,7 @@ describe('FilePreview', () => {
 
         // Assert - getFileName returns empty for single segment, but component still renders
         const fileNameElement = container.querySelector('[class*="fileName"]')
-        expect(fileNameElement).toBeInTheDocument()
+        expect(fileNameElement)!.toBeInTheDocument()
         // The first span (file name) should be empty
         const fileNameSpan = fileNameElement?.querySelector('span:first-child')
         expect(fileNameSpan?.textContent).toBe('')
@@ -426,7 +430,8 @@ describe('FilePreview', () => {
         const { container } = renderFilePreview({ file })
 
         // Assert - Should not crash
-        expect(container.firstChild).toBeInTheDocument()
+        // Assert - Should not crash
+        expect(container.firstChild)!.toBeInTheDocument()
       })
     })
 
@@ -437,7 +442,8 @@ describe('FilePreview', () => {
         renderFilePreview({ hidePreview })
 
         // Assert - No errors thrown
-        expect(screen.getByText('datasetCreation.stepOne.filePreview')).toBeInTheDocument()
+        // Assert - No errors thrown
+        expect(screen.getByText('datasetCreation.stepOne.filePreview'))!.toBeInTheDocument()
       })
     })
   })
@@ -450,7 +456,7 @@ describe('FilePreview', () => {
 
       // Assert - Should not call API, remain in loading state
       expect(mockFetchFilePreview).not.toHaveBeenCalled()
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should handle file with empty string id', async () => {
@@ -468,7 +474,7 @@ describe('FilePreview', () => {
 
       renderFilePreview({ file })
 
-      expect(screen.getByText('a'.repeat(200))).toBeInTheDocument()
+      expect(screen.getByText('a'.repeat(200)))!.toBeInTheDocument()
     })
 
     it('should handle file with special characters in name', async () => {
@@ -476,7 +482,7 @@ describe('FilePreview', () => {
 
       renderFilePreview({ file })
 
-      expect(screen.getByText('file-with_special@#$%')).toBeInTheDocument()
+      expect(screen.getByText('file-with_special@#$%'))!.toBeInTheDocument()
     })
 
     it('should handle very long preview content', async () => {
@@ -486,7 +492,7 @@ describe('FilePreview', () => {
       renderFilePreview()
 
       await waitFor(() => {
-        expect(screen.getByText(longContent)).toBeInTheDocument()
+        expect(screen.getByText(longContent))!.toBeInTheDocument()
       })
     })
 
@@ -499,7 +505,7 @@ describe('FilePreview', () => {
       // Assert - Should render as text, not execute scripts
       await waitFor(() => {
         const contentDiv = container.querySelector('[class*="fileContent"]')
-        expect(contentDiv).toBeInTheDocument()
+        expect(contentDiv)!.toBeInTheDocument()
         // Content is escaped by React, so HTML entities are displayed
         expect(contentDiv?.textContent).toContain('alert')
       })
@@ -512,7 +518,7 @@ describe('FilePreview', () => {
       renderFilePreview()
 
       await waitFor(() => {
-        expect(screen.getByText(unicodeContent)).toBeInTheDocument()
+        expect(screen.getByText(unicodeContent))!.toBeInTheDocument()
       })
     })
 
@@ -525,7 +531,7 @@ describe('FilePreview', () => {
       // Assert - Content should be in the DOM
       await waitFor(() => {
         const contentDiv = container.querySelector('[class*="fileContent"]')
-        expect(contentDiv).toBeInTheDocument()
+        expect(contentDiv)!.toBeInTheDocument()
         expect(contentDiv?.textContent).toContain('Line 1')
         expect(contentDiv?.textContent).toContain('Line 2')
         expect(contentDiv?.textContent).toContain('Line 3')
@@ -539,7 +545,7 @@ describe('FilePreview', () => {
 
       // Assert - Should not crash
       await waitFor(() => {
-        expect(container.firstChild).toBeInTheDocument()
+        expect(container.firstChild)!.toBeInTheDocument()
       })
     })
   })
@@ -633,7 +639,8 @@ describe('FilePreview', () => {
       rerender(<FilePreview file={undefined} hidePreview={vi.fn()} />)
 
       // Assert - Should not crash, API should not be called again
-      expect(container.firstChild).toBeInTheDocument()
+      // Assert - Should not crash, API should not be called again
+      expect(container.firstChild)!.toBeInTheDocument()
       expect(mockFetchFilePreview).toHaveBeenCalledTimes(1)
     })
   })
@@ -645,7 +652,7 @@ describe('FilePreview', () => {
 
       renderFilePreview({ file })
 
-      expect(screen.getByText('document')).toBeInTheDocument()
+      expect(screen.getByText('document'))!.toBeInTheDocument()
     })
 
     it('should handle filename with multiple dots', async () => {
@@ -654,7 +661,8 @@ describe('FilePreview', () => {
       renderFilePreview({ file })
 
       // Assert - Should join all parts except last with comma
-      expect(screen.getByText('file,name,with,dots')).toBeInTheDocument()
+      // Assert - Should join all parts except last with comma
+      expect(screen.getByText('file,name,with,dots'))!.toBeInTheDocument()
     })
 
     it('should return empty for filename without dot', async () => {
@@ -673,7 +681,7 @@ describe('FilePreview', () => {
 
       // Assert - File name area should have empty first span
       const fileNameElement = container.querySelector('.system-xs-medium')
-      expect(fileNameElement).toBeInTheDocument()
+      expect(fileNameElement)!.toBeInTheDocument()
     })
   })
 
@@ -682,14 +690,14 @@ describe('FilePreview', () => {
       const { container } = renderFilePreview()
 
       const closeButton = container.querySelector('.cursor-pointer')
-      expect(closeButton).toBeInTheDocument()
-      expect(closeButton).toHaveClass('cursor-pointer')
+      expect(closeButton)!.toBeInTheDocument()
+      expect(closeButton)!.toHaveClass('cursor-pointer')
     })
 
     it('should have proper heading structure', async () => {
       renderFilePreview()
 
-      expect(screen.getByText('datasetCreation.stepOne.filePreview')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.filePreview'))!.toBeInTheDocument()
     })
   })
 
@@ -702,7 +710,7 @@ describe('FilePreview', () => {
 
       // Assert - Component should still render
       await waitFor(() => {
-        expect(container.firstChild).toBeInTheDocument()
+        expect(container.firstChild)!.toBeInTheDocument()
       })
     })
 
@@ -712,7 +720,7 @@ describe('FilePreview', () => {
       const { container } = renderFilePreview()
 
       await waitFor(() => {
-        expect(container.firstChild).toBeInTheDocument()
+        expect(container.firstChild)!.toBeInTheDocument()
       })
     })
 
@@ -722,7 +730,7 @@ describe('FilePreview', () => {
       const { container } = renderFilePreview()
 
       await waitFor(() => {
-        expect(container.firstChild).toBeInTheDocument()
+        expect(container.firstChild)!.toBeInTheDocument()
       })
     })
   })
diff --git a/web/app/components/datasets/create/file-uploader/hooks/__tests__/use-file-upload.spec.tsx b/web/app/components/datasets/create/file-uploader/hooks/__tests__/use-file-upload.spec.tsx
index d47053fb80..bde599320c 100644
--- a/web/app/components/datasets/create/file-uploader/hooks/__tests__/use-file-upload.spec.tsx
+++ b/web/app/components/datasets/create/file-uploader/hooks/__tests__/use-file-upload.spec.tsx
@@ -294,7 +294,7 @@ describe('useFileUpload', () => {
 
       // Should be called with at most batch_count_limit files
       if (prepareFileList.mock.calls.length > 0) {
-        const calledFiles = prepareFileList.mock.calls[0][0]
+        const calledFiles = prepareFileList.mock.calls[0]![0]
         expect(calledFiles.length).toBeLessThanOrEqual(mockFileUploadConfig.batch_count_limit)
       }
     })
@@ -413,7 +413,7 @@ describe('useFileUpload', () => {
         dropzone.dispatchEvent(dragOverEvent)
       })
 
-      expect(dropzone).toBeInTheDocument()
+      expect(dropzone)!.toBeInTheDocument()
     })
 
     it('should set dragging false on dragleave from drag overlay', async () => {
@@ -532,7 +532,7 @@ describe('useFileUpload', () => {
 
       await waitFor(() => {
         if (prepareFileList.mock.calls.length > 0) {
-          const calledFiles = prepareFileList.mock.calls[0][0]
+          const calledFiles = prepareFileList.mock.calls[0]![0]
           expect(calledFiles.length).toBe(1)
         }
       })
@@ -900,7 +900,7 @@ describe('useFileUpload', () => {
 
       await waitFor(() => {
         if (prepareFileList.mock.calls.length > 0) {
-          const files = prepareFileList.mock.calls[0][0]
+          const files = prepareFileList.mock.calls[0]![0]
           expect(files[0].progress).toBe(PROGRESS_NOT_STARTED)
         }
       })
diff --git a/web/app/components/datasets/create/index.tsx b/web/app/components/datasets/create/index.tsx
index a028bc0775..717582444a 100644
--- a/web/app/components/datasets/create/index.tsx
+++ b/web/app/components/datasets/create/index.tsx
@@ -76,7 +76,7 @@ const DatasetUpdateForm = ({ datasetId }: DatasetUpdateFormProps) => {
     const targetIndex = list.findIndex(file => file.fileID === fileItem.fileID)
     const newList = produce(list, (draft) => {
       draft[targetIndex] = {
-        ...draft[targetIndex],
+        ...draft[targetIndex]!,
         progress,
       }
     })
diff --git a/web/app/components/datasets/create/step-two/__tests__/index.spec.tsx b/web/app/components/datasets/create/step-two/__tests__/index.spec.tsx
index 86e8ec2ab5..a5318430be 100644
--- a/web/app/components/datasets/create/step-two/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/step-two/__tests__/index.spec.tsx
@@ -1717,22 +1717,23 @@ describe('StepTwoFooter', () => {
       render(<StepTwoFooter {...defaultProps} />)
 
       // Should render Previous and Next buttons with correct text
-      expect(screen.getByText(/previousStep/i)).toBeInTheDocument()
-      expect(screen.getByText(/nextStep/i)).toBeInTheDocument()
+      // Should render Previous and Next buttons with correct text
+      expect(screen.getByText(/previousStep/i))!.toBeInTheDocument()
+      expect(screen.getByText(/nextStep/i))!.toBeInTheDocument()
     })
 
     it('should render Previous and Next buttons when not in setting mode', () => {
       render(<StepTwoFooter {...defaultProps} />)
 
-      expect(screen.getByText(/previousStep/i)).toBeInTheDocument()
-      expect(screen.getByText(/nextStep/i)).toBeInTheDocument()
+      expect(screen.getByText(/previousStep/i))!.toBeInTheDocument()
+      expect(screen.getByText(/nextStep/i))!.toBeInTheDocument()
     })
 
     it('should render Save and Cancel buttons when in setting mode', () => {
       render(<StepTwoFooter {...defaultProps} isSetting={true} />)
 
-      expect(screen.getByText(/save/i)).toBeInTheDocument()
-      expect(screen.getByText(/cancel/i)).toBeInTheDocument()
+      expect(screen.getByText(/save/i))!.toBeInTheDocument()
+      expect(screen.getByText(/cancel/i))!.toBeInTheDocument()
     })
   })
 
@@ -1772,14 +1773,14 @@ describe('StepTwoFooter', () => {
       render(<StepTwoFooter {...defaultProps} isCreating={true} />)
 
       const nextButton = screen.getByText(/nextStep/i).closest('button')
-      expect(nextButton).toBeDisabled()
+      expect(nextButton)!.toBeDisabled()
     })
 
     it('should show loading state on Save button when creating in setting mode', () => {
       render(<StepTwoFooter {...defaultProps} isSetting={true} isCreating={true} />)
 
       const saveButton = screen.getByText(/save/i).closest('button')
-      expect(saveButton).toBeDisabled()
+      expect(saveButton)!.toBeDisabled()
     })
   })
 })
@@ -1811,18 +1812,50 @@ describe('PreviewPanel', () => {
       render(<PreviewPanel {...defaultProps} />)
 
       // Check for the preview header title text
-      expect(screen.getByText('datasetCreation.stepTwo.preview')).toBeInTheDocument()
+      // Check for the preview header title text
+      expect(screen.getByText('datasetCreation.stepTwo.preview'))!.toBeInTheDocument()
     })
 
     it('should render idle state when isIdle is true', () => {
       render(<PreviewPanel {...defaultProps} isIdle={true} />)
 
-      expect(screen.getByText(/previewChunkTip/i)).toBeInTheDocument()
+      expect(screen.getByText(/previewChunkTip/i))!.toBeInTheDocument()
     })
 
     it('should render loading skeleton when isPending is true', () => {
       render(<PreviewPanel {...defaultProps} isIdle={false} isPending={true} />)
 
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
+      // Should show skeleton containers
       // Should show skeleton containers
       expect(screen.queryByText(/previewChunkTip/i)).not.toBeInTheDocument()
     })
@@ -1841,7 +1874,7 @@ describe('PreviewPanel', () => {
         />,
       )
 
-      expect(screen.getByText('Chunk 1 content')).toBeInTheDocument()
+      expect(screen.getByText('Chunk 1 content'))!.toBeInTheDocument()
     })
 
     it('should render QA preview when docForm is qa', () => {
@@ -1855,8 +1888,8 @@ describe('PreviewPanel', () => {
         />,
       )
 
-      expect(screen.getByText('Q1')).toBeInTheDocument()
-      expect(screen.getByText('A1')).toBeInTheDocument()
+      expect(screen.getByText('Q1'))!.toBeInTheDocument()
+      expect(screen.getByText('A1'))!.toBeInTheDocument()
     })
 
     it('should show chunk count badge for non-QA doc form', () => {
@@ -1870,7 +1903,7 @@ describe('PreviewPanel', () => {
         />,
       )
 
-      expect(screen.getByText(/25/)).toBeInTheDocument()
+      expect(screen.getByText(/25/))!.toBeInTheDocument()
     })
 
     it('should render parent-child preview when docForm is parentChild', () => {
@@ -1893,11 +1926,13 @@ describe('PreviewPanel', () => {
       )
 
       // Should render parent chunk label
-      expect(screen.getByText('Chunk-1')).toBeInTheDocument()
+      // Should render parent chunk label
+      expect(screen.getByText('Chunk-1'))!.toBeInTheDocument()
       // Should render child chunks
-      expect(screen.getByText('Child 1')).toBeInTheDocument()
-      expect(screen.getByText('Child 2')).toBeInTheDocument()
-      expect(screen.getByText('Child 3')).toBeInTheDocument()
+      // Should render child chunks
+      expect(screen.getByText('Child 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Child 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Child 3'))!.toBeInTheDocument()
     })
 
     it('should limit child chunks when chunkForContext is full-doc', () => {
@@ -1920,10 +1955,43 @@ describe('PreviewPanel', () => {
       )
 
       // Should render parent chunk
-      expect(screen.getByText('Chunk-1')).toBeInTheDocument()
+      // Should render parent chunk
+      expect(screen.getByText('Chunk-1'))!.toBeInTheDocument()
       // full-doc mode limits to FULL_DOC_PREVIEW_LENGTH (50)
-      expect(screen.getByText('ChildChunk1')).toBeInTheDocument()
-      expect(screen.getByText('ChildChunk50')).toBeInTheDocument()
+      // full-doc mode limits to FULL_DOC_PREVIEW_LENGTH (50)
+      expect(screen.getByText('ChildChunk1'))!.toBeInTheDocument()
+      expect(screen.getByText('ChildChunk50'))!.toBeInTheDocument()
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
+      // Should not render beyond the limit
       // Should not render beyond the limit
       expect(screen.queryByText('ChildChunk51')).not.toBeInTheDocument()
     })
@@ -1944,10 +2012,10 @@ describe('PreviewPanel', () => {
         />,
       )
 
-      expect(screen.getByText('Chunk-1')).toBeInTheDocument()
-      expect(screen.getByText('Chunk-2')).toBeInTheDocument()
-      expect(screen.getByText('P1-C1')).toBeInTheDocument()
-      expect(screen.getByText('P2-C1')).toBeInTheDocument()
+      expect(screen.getByText('Chunk-1'))!.toBeInTheDocument()
+      expect(screen.getByText('Chunk-2'))!.toBeInTheDocument()
+      expect(screen.getByText('P1-C1'))!.toBeInTheDocument()
+      expect(screen.getByText('P2-C1'))!.toBeInTheDocument()
     })
   })
 
@@ -2222,19 +2290,20 @@ describe('StepTwo Component', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
-      expect(screen.getByText(/stepTwo\.segmentation/i)).toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.segmentation/i))!.toBeInTheDocument()
     })
 
     it('should show general chunking options when not in upload', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
       // Should render the segmentation section
-      expect(screen.getByText(/stepTwo\.segmentation/i)).toBeInTheDocument()
+      // Should render the segmentation section
+      expect(screen.getByText(/stepTwo\.segmentation/i))!.toBeInTheDocument()
     })
 
     it('should show footer with Previous and Next buttons', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
-      expect(screen.getByText(/stepTwo\.previousStep/i)).toBeInTheDocument()
-      expect(screen.getByText(/stepTwo\.nextStep/i)).toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.previousStep/i))!.toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.nextStep/i))!.toBeInTheDocument()
     })
   })
 
@@ -2282,7 +2351,7 @@ describe('StepTwo Component', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
       // GeneralChunkingOptions renders a "Preview Chunk" button
       const previewButtons = screen.getAllByText(/stepTwo\.previewChunk/i)
-      fireEvent.click(previewButtons[0])
+      fireEvent.click(previewButtons[0]!)
       // updatePreview calls estimateHook.fetchEstimate()
       // No error means the handler executed successfully
     })
@@ -2292,7 +2361,7 @@ describe('StepTwo Component', () => {
       // ParentChildOptions renders an OptionCard; find the title element and click its parent card
       const parentChildTitles = screen.getAllByText(/stepTwo\.parentChild/i)
       // The first match is the title; click it to trigger onDocFormChange
-      fireEvent.click(parentChildTitles[0])
+      fireEvent.click(parentChildTitles[0]!)
       // handleDocFormChange sets docForm, segmentationType, and resets estimate
     })
   })
@@ -2307,7 +2376,8 @@ describe('StepTwo Component', () => {
         />,
       )
       // When currentDataset has parentChild doc_form, should show parent-child option
-      expect(screen.getByText(/stepTwo\.segmentation/i)).toBeInTheDocument()
+      // When currentDataset has parentChild doc_form, should show parent-child option
+      expect(screen.getByText(/stepTwo\.segmentation/i))!.toBeInTheDocument()
     })
 
     it('should render setting mode with Save/Cancel buttons', () => {
@@ -2320,8 +2390,8 @@ describe('StepTwo Component', () => {
           datasetId="test-id"
         />,
       )
-      expect(screen.getByText(/stepTwo\.save/i)).toBeInTheDocument()
-      expect(screen.getByText(/stepTwo\.cancel/i)).toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.save/i))!.toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.cancel/i))!.toBeInTheDocument()
     })
 
     it('should call onCancel when Cancel button is clicked in setting mode', () => {
@@ -2362,8 +2432,9 @@ describe('StepTwo Component', () => {
     it('should show both general and parent-child options in create page', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
       // When isInInit (no datasetId, no isSetting), both options should show
-      expect(screen.getByText('datasetCreation.stepTwo.general')).toBeInTheDocument()
-      expect(screen.getByText('datasetCreation.stepTwo.parentChild')).toBeInTheDocument()
+      // When isInInit (no datasetId, no isSetting), both options should show
+      expect(screen.getByText('datasetCreation.stepTwo.general'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepTwo.parentChild'))!.toBeInTheDocument()
     })
 
     it('should only show parent-child option when dataset has parentChild doc_form', () => {
@@ -2376,7 +2447,9 @@ describe('StepTwo Component', () => {
       )
       // showGeneralOption should be false (parentChild not in [text, qa])
       // showParentChildOption should be true
-      expect(screen.getByText('datasetCreation.stepTwo.parentChild')).toBeInTheDocument()
+      // showGeneralOption should be false (parentChild not in [text, qa])
+      // showParentChildOption should be true
+      expect(screen.getByText('datasetCreation.stepTwo.parentChild'))!.toBeInTheDocument()
     })
 
     it('should show general option only when dataset has text doc_form', () => {
@@ -2388,7 +2461,8 @@ describe('StepTwo Component', () => {
         />,
       )
       // showGeneralOption should be true (text is in [text, qa])
-      expect(screen.getByText('datasetCreation.stepTwo.general')).toBeInTheDocument()
+      // showGeneralOption should be true (text is in [text, qa])
+      expect(screen.getByText('datasetCreation.stepTwo.general'))!.toBeInTheDocument()
     })
   })
 
@@ -2401,7 +2475,7 @@ describe('StepTwo Component', () => {
           datasetId="test-id"
         />,
       )
-      expect(screen.getByText(/stepTwo\.segmentation/i)).toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.segmentation/i))!.toBeInTheDocument()
     })
 
     it('should show general option for empty dataset (no doc_form)', () => {
@@ -2413,7 +2487,7 @@ describe('StepTwo Component', () => {
           datasetId="test-id"
         />,
       )
-      expect(screen.getByText(/stepTwo\.segmentation/i)).toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.segmentation/i))!.toBeInTheDocument()
     })
 
     it('should show both options in empty dataset upload', () => {
@@ -2426,8 +2500,9 @@ describe('StepTwo Component', () => {
         />,
       )
       // isUploadInEmptyDataset=true shows both options
-      expect(screen.getByText('datasetCreation.stepTwo.general')).toBeInTheDocument()
-      expect(screen.getByText('datasetCreation.stepTwo.parentChild')).toBeInTheDocument()
+      // isUploadInEmptyDataset=true shows both options
+      expect(screen.getByText('datasetCreation.stepTwo.general'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepTwo.parentChild'))!.toBeInTheDocument()
     })
   })
 
@@ -2435,19 +2510,22 @@ describe('StepTwo Component', () => {
     it('should render indexing mode section', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
       // IndexingModeSection renders the index mode title
-      expect(screen.getByText(/stepTwo\.indexMode/i)).toBeInTheDocument()
+      // IndexingModeSection renders the index mode title
+      expect(screen.getByText(/stepTwo\.indexMode/i))!.toBeInTheDocument()
     })
 
     it('should render embedding model selector when QUALIFIED', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
       // ModelSelector is mocked and rendered with data-testid
-      expect(screen.getByTestId('model-selector')).toBeInTheDocument()
+      // ModelSelector is mocked and rendered with data-testid
+      expect(screen.getByTestId('model-selector'))!.toBeInTheDocument()
     })
 
     it('should render retrieval method config', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
       // RetrievalMethodConfig is mocked with data-testid
-      expect(screen.getByTestId('retrieval-method-config')).toBeInTheDocument()
+      // RetrievalMethodConfig is mocked with data-testid
+      expect(screen.getByTestId('retrieval-method-config'))!.toBeInTheDocument()
     })
 
     it('should disable model and retrieval config when datasetId has existing data source', () => {
@@ -2460,14 +2538,14 @@ describe('StepTwo Component', () => {
       )
       // isModelAndRetrievalConfigDisabled should be true
       const modelSelector = screen.getByTestId('model-selector')
-      expect(modelSelector).toHaveAttribute('data-readonly', 'true')
+      expect(modelSelector)!.toHaveAttribute('data-readonly', 'true')
     })
   })
 
   describe('Preview Panel', () => {
     it('should render preview panel', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
-      expect(screen.getByText('datasetCreation.stepTwo.preview')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepTwo.preview'))!.toBeInTheDocument()
     })
 
     it('should hide document picker in setting mode', () => {
@@ -2481,7 +2559,8 @@ describe('StepTwo Component', () => {
         />,
       )
       // Preview panel should still render
-      expect(screen.getByText('datasetCreation.stepTwo.preview')).toBeInTheDocument()
+      // Preview panel should still render
+      expect(screen.getByText('datasetCreation.stepTwo.preview'))!.toBeInTheDocument()
     })
   })
 
@@ -2498,35 +2577,35 @@ describe('StepTwo Component', () => {
     it('should switch to QUALIFIED when selecting parentChild in ECONOMICAL mode', async () => {
       render(<StepTwo {...defaultStepTwoProps} isAPIKeySet={false} />)
       await vi.waitFor(() => {
-        expect(screen.getByText(/stepTwo\.segmentation/i)).toBeInTheDocument()
+        expect(screen.getByText(/stepTwo\.segmentation/i))!.toBeInTheDocument()
       })
       const parentChildTitles = screen.getAllByText(/stepTwo\.parentChild/i)
-      fireEvent.click(parentChildTitles[0])
+      fireEvent.click(parentChildTitles[0]!)
     })
 
     it('should open QA confirm dialog and confirm switch when QA selected in ECONOMICAL mode', async () => {
       render(<StepTwo {...defaultStepTwoProps} isAPIKeySet={false} />)
       await vi.waitFor(() => {
-        expect(screen.getByText(/stepTwo\.segmentation/i)).toBeInTheDocument()
+        expect(screen.getByText(/stepTwo\.segmentation/i))!.toBeInTheDocument()
       })
       const qaCheckbox = screen.getByText(/stepTwo\.useQALanguage/i)
       fireEvent.click(qaCheckbox)
       // Dialog should open → click Switch to confirm (triggers handleQAConfirm)
       const switchButton = await screen.findByText(/stepTwo\.switch/i)
-      expect(switchButton).toBeInTheDocument()
+      expect(switchButton)!.toBeInTheDocument()
       fireEvent.click(switchButton)
     })
 
     it('should close QA confirm dialog when cancel is clicked', async () => {
       render(<StepTwo {...defaultStepTwoProps} isAPIKeySet={false} />)
       await vi.waitFor(() => {
-        expect(screen.getByText(/stepTwo\.segmentation/i)).toBeInTheDocument()
+        expect(screen.getByText(/stepTwo\.segmentation/i))!.toBeInTheDocument()
       })
       // Open QA confirm dialog
       const qaCheckbox = screen.getByText(/stepTwo\.useQALanguage/i)
       fireEvent.click(qaCheckbox)
       const dialogCancelButtons = await screen.findAllByText(/stepTwo\.cancel/i)
-      fireEvent.click(dialogCancelButtons[0])
+      fireEvent.click(dialogCancelButtons[0]!)
     })
 
     it('should handle picker change when selecting a different file', () => {
@@ -2545,7 +2624,7 @@ describe('StepTwo Component', () => {
       render(<StepTwo {...defaultStepTwoProps} />)
       // The default maxChunkLength (1024) now exceeds the limit (100)
       const previewButtons = screen.getAllByText(/stepTwo\.previewChunk/i)
-      fireEvent.click(previewButtons[0])
+      fireEvent.click(previewButtons[0]!)
       // Restore
       document.body.removeAttribute('data-public-indexing-max-segmentation-tokens-length')
     })
diff --git a/web/app/components/datasets/create/step-two/components/__tests__/indexing-mode-section.spec.tsx b/web/app/components/datasets/create/step-two/components/__tests__/indexing-mode-section.spec.tsx
index e46ff6d484..64011c1ebe 100644
--- a/web/app/components/datasets/create/step-two/components/__tests__/indexing-mode-section.spec.tsx
+++ b/web/app/components/datasets/create/step-two/components/__tests__/indexing-mode-section.spec.tsx
@@ -81,28 +81,28 @@ describe('IndexingModeSection', () => {
   describe('Rendering', () => {
     it('should render index mode title', () => {
       render(<IndexingModeSection {...defaultProps} />)
-      expect(screen.getByText(`${ns}.stepTwo.indexMode`)).toBeInTheDocument()
+      expect(screen.getByText(`${ns}.stepTwo.indexMode`))!.toBeInTheDocument()
     })
 
     it('should render qualified option when not locked to economical', () => {
       render(<IndexingModeSection {...defaultProps} />)
-      expect(screen.getByText(`${ns}.stepTwo.qualified`)).toBeInTheDocument()
+      expect(screen.getByText(`${ns}.stepTwo.qualified`))!.toBeInTheDocument()
     })
 
     it('should render economical option when not locked to qualified', () => {
       render(<IndexingModeSection {...defaultProps} />)
-      expect(screen.getByText(`${ns}.stepTwo.economical`)).toBeInTheDocument()
+      expect(screen.getByText(`${ns}.stepTwo.economical`))!.toBeInTheDocument()
     })
 
     it('should only show qualified option when hasSetIndexType and type is qualified', () => {
       render(<IndexingModeSection {...defaultProps} hasSetIndexType indexType={IndexingType.QUALIFIED} />)
-      expect(screen.getByText(`${ns}.stepTwo.qualified`)).toBeInTheDocument()
+      expect(screen.getByText(`${ns}.stepTwo.qualified`))!.toBeInTheDocument()
       expect(screen.queryByText(`${ns}.stepTwo.economical`)).not.toBeInTheDocument()
     })
 
     it('should only show economical option when hasSetIndexType and type is economical', () => {
       render(<IndexingModeSection {...defaultProps} hasSetIndexType indexType={IndexingType.ECONOMICAL} />)
-      expect(screen.getByText(`${ns}.stepTwo.economical`)).toBeInTheDocument()
+      expect(screen.getByText(`${ns}.stepTwo.economical`))!.toBeInTheDocument()
       expect(screen.queryByText(`${ns}.stepTwo.qualified`)).not.toBeInTheDocument()
     })
   })
@@ -110,7 +110,7 @@ describe('IndexingModeSection', () => {
   describe('Embedding Model', () => {
     it('should show model selector when indexType is qualified', () => {
       render(<IndexingModeSection {...defaultProps} indexType={IndexingType.QUALIFIED} />)
-      expect(screen.getByTestId('model-selector')).toBeInTheDocument()
+      expect(screen.getByTestId('model-selector'))!.toBeInTheDocument()
     })
 
     it('should not show model selector when indexType is economical', () => {
@@ -120,7 +120,7 @@ describe('IndexingModeSection', () => {
 
     it('should mark model selector as readonly when disabled', () => {
       render(<IndexingModeSection {...defaultProps} isModelAndRetrievalConfigDisabled />)
-      expect(screen.getByTestId('model-selector')).toHaveAttribute('data-readonly', 'true')
+      expect(screen.getByTestId('model-selector'))!.toHaveAttribute('data-readonly', 'true')
     })
 
     it('should call onEmbeddingModelChange when model selected', () => {
@@ -134,12 +134,12 @@ describe('IndexingModeSection', () => {
   describe('Retrieval Config', () => {
     it('should show RetrievalMethodConfig when qualified', () => {
       render(<IndexingModeSection {...defaultProps} indexType={IndexingType.QUALIFIED} />)
-      expect(screen.getByTestId('retrieval-method-config')).toBeInTheDocument()
+      expect(screen.getByTestId('retrieval-method-config'))!.toBeInTheDocument()
     })
 
     it('should show EconomicalRetrievalMethodConfig when economical', () => {
       render(<IndexingModeSection {...defaultProps} indexType={IndexingType.ECONOMICAL} />)
-      expect(screen.getByTestId('economical-retrieval-config')).toBeInTheDocument()
+      expect(screen.getByTestId('economical-retrieval-config'))!.toBeInTheDocument()
     })
 
     it('should call onRetrievalConfigChange from qualified config', () => {
@@ -164,14 +164,14 @@ describe('IndexingModeSection', () => {
       // The economical option card should have disabled styling
       const economicalText = screen.getByText(`${ns}.stepTwo.economical`)
       const card = economicalText.closest('[class*="rounded-xl"]')
-      expect(card).toHaveClass('pointer-events-none')
+      expect(card)!.toHaveClass('pointer-events-none')
     })
   })
 
   describe('High Quality Tip', () => {
     it('should show high quality tip when qualified is selected and not locked', () => {
       render(<IndexingModeSection {...defaultProps} indexType={IndexingType.QUALIFIED} hasSetIndexType={false} />)
-      expect(screen.getByText(`${ns}.stepTwo.highQualityTip`)).toBeInTheDocument()
+      expect(screen.getByText(`${ns}.stepTwo.highQualityTip`))!.toBeInTheDocument()
     })
 
     it('should not show high quality tip when index type is locked', () => {
@@ -185,7 +185,7 @@ describe('IndexingModeSection', () => {
       const onClose = vi.fn()
       render(<IndexingModeSection {...defaultProps} isQAConfirmDialogOpen onQAConfirmDialogClose={onClose} />)
       const cancelBtns = screen.getAllByText(`${ns}.stepTwo.cancel`)
-      fireEvent.click(cancelBtns[0])
+      fireEvent.click(cancelBtns[0]!)
       expect(onClose).toHaveBeenCalled()
     })
 
@@ -200,8 +200,8 @@ describe('IndexingModeSection', () => {
   describe('Dataset Settings Link', () => {
     it('should show settings link when economical and hasSetIndexType', () => {
       render(<IndexingModeSection {...defaultProps} hasSetIndexType indexType={IndexingType.ECONOMICAL} datasetId="ds-123" />)
-      expect(screen.getByText(`${ns}.stepTwo.datasetSettingLink`)).toBeInTheDocument()
-      expect(screen.getByText(`${ns}.stepTwo.datasetSettingLink`).closest('a')).toHaveAttribute('href', '/datasets/ds-123/settings')
+      expect(screen.getByText(`${ns}.stepTwo.datasetSettingLink`))!.toBeInTheDocument()
+      expect(screen.getByText(`${ns}.stepTwo.datasetSettingLink`).closest('a'))!.toHaveAttribute('href', '/datasets/ds-123/settings')
     })
 
     it('should show settings link under model selector when disabled', () => {
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 2c0480e508..f1ab5392ce 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
@@ -12,26 +12,27 @@ describe('DelimiterInput', () => {
 
   it('should render separator label', () => {
     render(<DelimiterInput />)
-    expect(screen.getByText(`${ns}.stepTwo.separator`)).toBeInTheDocument()
+    expect(screen.getByText(`${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')
+    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()
+    expect(screen.getByDisplayValue('test-val'))!.toBeInTheDocument()
   })
 
   it('should render tooltip content', () => {
     render(<DelimiterInput />)
     // Tooltip triggers render; component mounts without error
-    expect(screen.getByText(`${ns}.stepTwo.separator`)).toBeInTheDocument()
+    // Tooltip triggers render; component mounts without error
+    expect(screen.getByText(`${ns}.stepTwo.separator`))!.toBeInTheDocument()
   })
 
   it('should suppress onChange during IME composition', () => {
@@ -47,7 +48,7 @@ describe('DelimiterInput', () => {
 
     fireEvent.compositionEnd(input)
     expect(onChange).toHaveBeenCalledTimes(1)
-    expect(onChange.mock.calls[0][0].target.value).toBe(finalValue)
+    expect(onChange.mock.calls[0]![0].target.value).toBe(finalValue)
   })
 })
 
@@ -58,24 +59,24 @@ describe('MaxLengthInput', () => {
 
   it('should render max length label', () => {
     render(<MaxLengthInput onChange={vi.fn()} />)
-    expect(screen.getByText(`${ns}.stepTwo.maxLength`)).toBeInTheDocument()
+    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()
+    expect(input)!.toBeInTheDocument()
   })
 
   it('should accept value prop', () => {
     render(<MaxLengthInput value={500} onChange={vi.fn()} />)
-    expect(screen.getByRole('textbox')).toHaveValue('500')
+    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()
+    expect(input)!.toBeInTheDocument()
   })
 
   it('should reset to the minimum when users clear the value', () => {
@@ -107,18 +108,18 @@ describe('OverlapInput', () => {
   it('should render number input', () => {
     render(<OverlapInput onChange={vi.fn()} />)
     const input = screen.getByRole('textbox')
-    expect(input).toBeInTheDocument()
+    expect(input)!.toBeInTheDocument()
   })
 
   it('should accept value prop', () => {
     render(<OverlapInput value={50} onChange={vi.fn()} />)
-    expect(screen.getByRole('textbox')).toHaveValue('50')
+    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()
+    expect(input)!.toBeInTheDocument()
   })
 
   it('should reset to the minimum when users clear the value', () => {
diff --git a/web/app/components/datasets/create/step-two/hooks/__tests__/use-segmentation-state.spec.ts b/web/app/components/datasets/create/step-two/hooks/__tests__/use-segmentation-state.spec.ts
index bdf0de31e4..c80c54bf96 100644
--- a/web/app/components/datasets/create/step-two/hooks/__tests__/use-segmentation-state.spec.ts
+++ b/web/app/components/datasets/create/step-two/hooks/__tests__/use-segmentation-state.spec.ts
@@ -133,8 +133,8 @@ describe('useSegmentationState', () => {
         result.current.toggleRule('remove_extra_spaces')
       })
 
-      expect(result.current.rules[0].enabled).toBe(false)
-      expect(result.current.rules[1].enabled).toBe(false)
+      expect(result.current.rules[0]!.enabled).toBe(false)
+      expect(result.current.rules[1]!.enabled).toBe(false)
     })
 
     it('should toggle second rule without affecting first', () => {
@@ -151,8 +151,8 @@ describe('useSegmentationState', () => {
         result.current.toggleRule('remove_urls_emails')
       })
 
-      expect(result.current.rules[0].enabled).toBe(true)
-      expect(result.current.rules[1].enabled).toBe(true)
+      expect(result.current.rules[0]!.enabled).toBe(true)
+      expect(result.current.rules[1]!.enabled).toBe(true)
     })
   })
 
diff --git a/web/app/components/datasets/create/step-two/hooks/unescape.ts b/web/app/components/datasets/create/step-two/hooks/unescape.ts
index fae3e96ee2..b12cfb25cd 100644
--- a/web/app/components/datasets/create/step-two/hooks/unescape.ts
+++ b/web/app/components/datasets/create/step-two/hooks/unescape.ts
@@ -47,7 +47,7 @@ const unescape = (str: string) => {
     else if (python !== undefined)
       return fromHex(python)
     else
-      return usualEscapeSequences[specialCharacter]
+      return usualEscapeSequences[specialCharacter]!
   })
 }
 
diff --git a/web/app/components/datasets/create/stop-embedding-modal/__tests__/index.spec.tsx b/web/app/components/datasets/create/stop-embedding-modal/__tests__/index.spec.tsx
index 5dc30be00f..1b3abfeadc 100644
--- a/web/app/components/datasets/create/stop-embedding-modal/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/stop-embedding-modal/__tests__/index.spec.tsx
@@ -49,31 +49,31 @@ describe('StopEmbeddingModal', () => {
     it('should render without crashing when show is true', () => {
       renderStopEmbeddingModal({ show: true })
 
-      expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
     })
 
     it('should render modal title', () => {
       renderStopEmbeddingModal({ show: true })
 
-      expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
     })
 
     it('should render modal content', () => {
       renderStopEmbeddingModal({ show: true })
 
-      expect(screen.getByText('datasetCreation.stepThree.modelContent')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelContent'))!.toBeInTheDocument()
     })
 
     it('should render confirm button with correct text', () => {
       renderStopEmbeddingModal({ show: true })
 
-      expect(screen.getByText('datasetCreation.stepThree.modelButtonConfirm')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelButtonConfirm'))!.toBeInTheDocument()
     })
 
     it('should render cancel button with correct text', () => {
       renderStopEmbeddingModal({ show: true })
 
-      expect(screen.getByText('datasetCreation.stepThree.modelButtonCancel')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelButtonCancel'))!.toBeInTheDocument()
     })
 
     it('should not render modal content when show is false', () => {
@@ -94,24 +94,25 @@ describe('StopEmbeddingModal', () => {
       renderStopEmbeddingModal({ show: true })
 
       const confirmButton = screen.getByText('datasetCreation.stepThree.modelButtonConfirm')
-      expect(confirmButton).toHaveClass('ml-2', 'w-24')
+      expect(confirmButton)!.toHaveClass('ml-2', 'w-24')
     })
 
     it('should render cancel button with default styling', () => {
       renderStopEmbeddingModal({ show: true })
 
       const cancelButton = screen.getByText('datasetCreation.stepThree.modelButtonCancel')
-      expect(cancelButton).toHaveClass('w-24')
+      expect(cancelButton)!.toHaveClass('w-24')
     })
 
     it('should render all modal elements', () => {
       renderStopEmbeddingModal({ show: true })
 
       // Assert - Modal should contain title, content, and buttons
-      expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
-      expect(screen.getByText('datasetCreation.stepThree.modelContent')).toBeInTheDocument()
-      expect(screen.getByText('datasetCreation.stepThree.modelButtonConfirm')).toBeInTheDocument()
-      expect(screen.getByText('datasetCreation.stepThree.modelButtonCancel')).toBeInTheDocument()
+      // Assert - Modal should contain title, content, and buttons
+      expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelContent'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelButtonConfirm'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelButtonCancel'))!.toBeInTheDocument()
     })
   })
 
@@ -121,7 +122,7 @@ describe('StopEmbeddingModal', () => {
       it('should show modal when show is true', () => {
         renderStopEmbeddingModal({ show: true })
 
-        expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
       })
 
       it('should hide modal when show is false', () => {
@@ -155,7 +156,7 @@ describe('StopEmbeddingModal', () => {
 
         // Assert - Modal should be visible
         await waitFor(() => {
-          expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+          expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
         })
       })
     })
@@ -167,7 +168,8 @@ describe('StopEmbeddingModal', () => {
         renderStopEmbeddingModal({ onConfirm })
 
         // Assert - No errors thrown
-        expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+        // Assert - No errors thrown
+        expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
       })
     })
 
@@ -178,7 +180,8 @@ describe('StopEmbeddingModal', () => {
         renderStopEmbeddingModal({ onHide })
 
         // Assert - No errors thrown
-        expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+        // Assert - No errors thrown
+        expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
       })
     })
   })
@@ -308,7 +311,8 @@ describe('StopEmbeddingModal', () => {
         }
         else {
           // If no close span found with class, just verify the modal renders
-          expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+          // If no close span found with class, just verify the modal renders
+          expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
         }
       })
 
@@ -431,8 +435,8 @@ describe('StopEmbeddingModal', () => {
         />,
       )
 
-      expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
-      expect(screen.getByText('datasetCreation.stepThree.modelContent')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelContent'))!.toBeInTheDocument()
     })
   })
 
@@ -442,14 +446,14 @@ describe('StopEmbeddingModal', () => {
       renderStopEmbeddingModal({ show: true })
 
       const buttons = screen.getAllByRole('button')
-      expect(buttons[0].closest('div')).toHaveClass('flex', 'flex-row-reverse')
+      expect(buttons[0]!.closest('div'))!.toHaveClass('flex', 'flex-row-reverse')
     })
 
     it('should render title and content elements', () => {
       renderStopEmbeddingModal({ show: true })
 
-      expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
-      expect(screen.getByText('datasetCreation.stepThree.modelContent')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepThree.modelContent'))!.toBeInTheDocument()
     })
 
     it('should render two buttons', () => {
@@ -532,7 +536,8 @@ describe('StopEmbeddingModal', () => {
       )
 
       // Assert - Modal should be visible
-      expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+      // Assert - Modal should be visible
+      expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
 
       // Act - Hide modal
       await act(async () => {
@@ -566,10 +571,10 @@ describe('StopEmbeddingModal', () => {
     it('should have accessible text content', () => {
       renderStopEmbeddingModal({ show: true })
 
-      expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeVisible()
-      expect(screen.getByText('datasetCreation.stepThree.modelContent')).toBeVisible()
-      expect(screen.getByText('datasetCreation.stepThree.modelButtonConfirm')).toBeVisible()
-      expect(screen.getByText('datasetCreation.stepThree.modelButtonCancel')).toBeVisible()
+      expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeVisible()
+      expect(screen.getByText('datasetCreation.stepThree.modelContent'))!.toBeVisible()
+      expect(screen.getByText('datasetCreation.stepThree.modelButtonConfirm'))!.toBeVisible()
+      expect(screen.getByText('datasetCreation.stepThree.modelButtonCancel'))!.toBeVisible()
     })
   })
 
@@ -608,7 +613,8 @@ describe('StopEmbeddingModal', () => {
       )
 
       // Verify initial render
-      expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+      // Verify initial render
+      expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
 
       // Update props
       await act(async () => {
@@ -616,7 +622,8 @@ describe('StopEmbeddingModal', () => {
       })
 
       // Assert - Still renders correctly
-      expect(screen.getByText('datasetCreation.stepThree.modelTitle')).toBeInTheDocument()
+      // Assert - Still renders correctly
+      expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/create/website/__tests__/base.spec.tsx b/web/app/components/datasets/create/website/__tests__/base.spec.tsx
index 980d1b8382..3a3954f305 100644
--- a/web/app/components/datasets/create/website/__tests__/base.spec.tsx
+++ b/web/app/components/datasets/create/website/__tests__/base.spec.tsx
@@ -33,8 +33,8 @@ describe('Input', () => {
       render(<Input {...props} />)
 
       const input = screen.getByRole('textbox')
-      expect(input).toBeInTheDocument()
-      expect(input).toHaveAttribute('type', 'text')
+      expect(input)!.toBeInTheDocument()
+      expect(input)!.toHaveAttribute('type', 'text')
     })
 
     it('should render number input when isNumber is true', () => {
@@ -42,23 +42,23 @@ describe('Input', () => {
       render(<Input {...props} />)
 
       const input = screen.getByRole('spinbutton')
-      expect(input).toBeInTheDocument()
-      expect(input).toHaveAttribute('type', 'number')
-      expect(input).toHaveAttribute('min', '0')
+      expect(input)!.toBeInTheDocument()
+      expect(input)!.toHaveAttribute('type', 'number')
+      expect(input)!.toHaveAttribute('min', '0')
     })
 
     it('should render with placeholder', () => {
       const props = createInputProps({ placeholder: 'Enter URL' })
       render(<Input {...props} />)
 
-      expect(screen.getByPlaceholderText('Enter URL')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Enter URL'))!.toBeInTheDocument()
     })
 
     it('should render with initial value', () => {
       const props = createInputProps({ value: 'test value' })
       render(<Input {...props} />)
 
-      expect(screen.getByDisplayValue('test value')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('test value'))!.toBeInTheDocument()
     })
   })
 
@@ -164,7 +164,7 @@ describe('Header', () => {
       const props = createHeaderProps()
       render(<Header {...props} />)
 
-      expect(screen.getByText('Test Title')).toBeInTheDocument()
+      expect(screen.getByText('Test Title'))!.toBeInTheDocument()
     })
 
     it('should render doc link', () => {
@@ -172,15 +172,15 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const link = screen.getByRole('link')
-      expect(link).toHaveAttribute('href', 'https://docs.example.com')
-      expect(link).toHaveAttribute('target', '_blank')
+      expect(link)!.toHaveAttribute('href', 'https://docs.example.com')
+      expect(link)!.toHaveAttribute('target', '_blank')
     })
 
     it('should render button text when not in pipeline', () => {
       const props = createHeaderProps({ buttonText: 'Configure' })
       render(<Header {...props} />)
 
-      expect(screen.getByText('Configure')).toBeInTheDocument()
+      expect(screen.getByText('Configure'))!.toBeInTheDocument()
     })
 
     it('should not render button text when in pipeline', () => {
@@ -197,7 +197,7 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const titleElement = screen.getByText('Test Title')
-      expect(titleElement).toHaveClass('system-sm-semibold')
+      expect(titleElement)!.toHaveClass('system-sm-semibold')
     })
 
     it('should apply default styles when isInPipeline is false', () => {
@@ -205,7 +205,7 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const titleElement = screen.getByText('Test Title')
-      expect(titleElement).toHaveClass('system-md-semibold')
+      expect(titleElement)!.toHaveClass('system-md-semibold')
     })
 
     it('should apply compact button styles when isInPipeline is true', () => {
@@ -213,8 +213,8 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const button = screen.getByRole('button')
-      expect(button).toHaveClass('size-6')
-      expect(button).toHaveClass('px-1')
+      expect(button)!.toHaveClass('size-6')
+      expect(button)!.toHaveClass('px-1')
     })
 
     it('should apply default button styles when isInPipeline is false', () => {
@@ -222,8 +222,8 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const button = screen.getByRole('button')
-      expect(button).toHaveClass('gap-x-0.5')
-      expect(button).toHaveClass('px-1.5')
+      expect(button)!.toHaveClass('gap-x-0.5')
+      expect(button)!.toHaveClass('px-1.5')
     })
   })
 
@@ -269,8 +269,8 @@ describe('CrawledResultItem', () => {
       })
       render(<CrawledResultItem {...props} />)
 
-      expect(screen.getByText('My Page')).toBeInTheDocument()
-      expect(screen.getByText('https://mysite.com')).toBeInTheDocument()
+      expect(screen.getByText('My Page'))!.toBeInTheDocument()
+      expect(screen.getByText('https://mysite.com'))!.toBeInTheDocument()
     })
 
     it('should render checkbox (custom Checkbox component)', () => {
@@ -279,14 +279,14 @@ describe('CrawledResultItem', () => {
 
       // Find checkbox by data-testid
       const checkbox = screen.getByTestId('checkbox-test-item')
-      expect(checkbox).toBeInTheDocument()
+      expect(checkbox)!.toBeInTheDocument()
     })
 
     it('should render preview button', () => {
       const props = createItemProps()
       render(<CrawledResultItem {...props} />)
 
-      expect(screen.getByText('datasetCreation.stepOne.website.preview')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.website.preview'))!.toBeInTheDocument()
     })
   })
 
@@ -330,7 +330,7 @@ describe('CrawledResultItem', () => {
       const { container } = render(<CrawledResultItem {...props} />)
 
       const wrapper = container.firstChild
-      expect(wrapper).toHaveClass('bg-state-base-active')
+      expect(wrapper)!.toHaveClass('bg-state-base-active')
     })
 
     it('should not apply active style when isPreview is false', () => {
@@ -374,9 +374,9 @@ describe('CrawledResult', () => {
       const props = createResultProps()
       render(<CrawledResult {...props} />)
 
-      expect(screen.getByText('Page 1')).toBeInTheDocument()
-      expect(screen.getByText('Page 2')).toBeInTheDocument()
-      expect(screen.getByText('Page 3')).toBeInTheDocument()
+      expect(screen.getByText('Page 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Page 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Page 3'))!.toBeInTheDocument()
     })
 
     it('should render time info', () => {
@@ -384,14 +384,15 @@ describe('CrawledResult', () => {
       render(<CrawledResult {...props} />)
 
       // The component uses i18n, so we check for the key pattern
-      expect(screen.getByText(/scrapTimeInfo/)).toBeInTheDocument()
+      // The component uses i18n, so we check for the key pattern
+      expect(screen.getByText(/scrapTimeInfo/))!.toBeInTheDocument()
     })
 
     it('should render select all checkbox', () => {
       const props = createResultProps()
       render(<CrawledResult {...props} />)
 
-      expect(screen.getByText('datasetCreation.stepOne.website.selectAll')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.website.selectAll'))!.toBeInTheDocument()
     })
 
     it('should render reset all when all items are checked', () => {
@@ -402,7 +403,7 @@ describe('CrawledResult', () => {
       const props = createResultProps({ list, checkedList: list })
       render(<CrawledResult {...props} />)
 
-      expect(screen.getByText('datasetCreation.stepOne.website.resetAll')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.website.resetAll'))!.toBeInTheDocument()
     })
   })
 
@@ -457,7 +458,7 @@ describe('CrawledResult', () => {
         createCrawlResultItem({ source_url: 'https://page1.com', title: 'Page 1' }),
         createCrawlResultItem({ source_url: 'https://page2.com', title: 'Page 2' }),
       ]
-      const props = createResultProps({ list, checkedList: [list[0]], onSelectedChange })
+      const props = createResultProps({ list, checkedList: [list[0]!], onSelectedChange })
 
       render(<CrawledResult {...props} />)
       await userEvent.click(getItemCheckbox(0))
@@ -472,7 +473,7 @@ describe('CrawledResult', () => {
         createCrawlResultItem({ source_url: 'https://page2.com', title: 'Page 2' }),
         createCrawlResultItem({ source_url: 'https://page3.com', title: 'Page 3' }),
       ]
-      const props = createResultProps({ list, checkedList: [list[0], list[1]], onSelectedChange })
+      const props = createResultProps({ list, checkedList: [list[0]!, list[1]!], onSelectedChange })
 
       render(<CrawledResult {...props} />)
       await userEvent.click(getItemCheckbox(0))
@@ -493,7 +494,7 @@ describe('CrawledResult', () => {
       render(<CrawledResult {...props} />)
 
       const previewButtons = screen.getAllByText('datasetCreation.stepOne.website.preview')
-      await userEvent.click(previewButtons[1])
+      await userEvent.click(previewButtons[1]!)
 
       expect(onPreview).toHaveBeenCalledWith(list[1])
     })
@@ -509,7 +510,7 @@ describe('CrawledResult', () => {
       render(<CrawledResult {...props} />)
 
       const previewButtons = screen.getAllByText('datasetCreation.stepOne.website.preview')
-      await userEvent.click(previewButtons[0])
+      await userEvent.click(previewButtons[0]!)
 
       expect(onPreview).toHaveBeenCalledWith(list[0])
     })
@@ -527,14 +528,15 @@ describe('CrawledResult', () => {
       render(<CrawledResult {...props} />)
 
       // Should still render the header with resetAll (empty list = all checked)
-      expect(screen.getByText('datasetCreation.stepOne.website.resetAll')).toBeInTheDocument()
+      // Should still render the header with resetAll (empty list = all checked)
+      expect(screen.getByText('datasetCreation.stepOne.website.resetAll'))!.toBeInTheDocument()
     })
 
     it('should handle className prop', () => {
       const props = createResultProps({ className: 'custom-class' })
       const { container } = render(<CrawledResult {...props} />)
 
-      expect(container.firstChild).toHaveClass('custom-class')
+      expect(container.firstChild)!.toHaveClass('custom-class')
     })
   })
 })
diff --git a/web/app/components/datasets/create/website/base/__tests__/crawled-result.spec.tsx b/web/app/components/datasets/create/website/base/__tests__/crawled-result.spec.tsx
index 922ae2adc9..749b50e6f4 100644
--- a/web/app/components/datasets/create/website/base/__tests__/crawled-result.spec.tsx
+++ b/web/app/components/datasets/create/website/base/__tests__/crawled-result.spec.tsx
@@ -80,7 +80,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByTestId('select-all')).toBeInTheDocument()
+      expect(screen.getByTestId('select-all'))!.toBeInTheDocument()
     })
 
     it('should render all items from list', () => {
@@ -95,9 +95,9 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByTestId('item-0')).toBeInTheDocument()
-      expect(screen.getByTestId('item-1')).toBeInTheDocument()
-      expect(screen.getByTestId('item-2')).toBeInTheDocument()
+      expect(screen.getByTestId('item-0'))!.toBeInTheDocument()
+      expect(screen.getByTestId('item-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('item-2'))!.toBeInTheDocument()
     })
 
     it('should render scrap time info', () => {
@@ -112,7 +112,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByText(/scrapTimeInfo/i)).toBeInTheDocument()
+      expect(screen.getByText(/scrapTimeInfo/i))!.toBeInTheDocument()
     })
 
     it('should apply custom className', () => {
@@ -129,7 +129,7 @@ describe('CrawledResult', () => {
       )
 
       const rootElement = container.firstChild as HTMLElement
-      expect(rootElement).toHaveClass('custom-class')
+      expect(rootElement)!.toHaveClass('custom-class')
     })
   })
 
@@ -139,7 +139,7 @@ describe('CrawledResult', () => {
       render(
         <CrawledResult
           list={list}
-          checkedList={[list[0]]}
+          checkedList={[list[0]!]}
           onSelectedChange={mockOnSelectedChange}
           onPreview={mockOnPreview}
           usedTime={1.5}
@@ -175,14 +175,14 @@ describe('CrawledResult', () => {
       render(
         <CrawledResult
           list={list}
-          checkedList={[list[0]]}
+          checkedList={[list[0]!]}
           onSelectedChange={mockOnSelectedChange}
           onPreview={mockOnPreview}
           usedTime={1.5}
         />,
       )
 
-      expect(screen.getByText(/selectAll/i)).toBeInTheDocument()
+      expect(screen.getByText(/selectAll/i))!.toBeInTheDocument()
     })
 
     it('should show resetAll label when all checked', () => {
@@ -197,14 +197,14 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByText(/resetAll/i)).toBeInTheDocument()
+      expect(screen.getByText(/resetAll/i))!.toBeInTheDocument()
     })
   })
 
   describe('Individual Item Check', () => {
     it('should call onSelectedChange with added item when checking', () => {
       const list = createMockList()
-      const checkedList = [list[0]]
+      const checkedList = [list[0]!]
       render(
         <CrawledResult
           list={list}
@@ -223,7 +223,7 @@ describe('CrawledResult', () => {
 
     it('should call onSelectedChange with removed item when unchecking', () => {
       const list = createMockList()
-      const checkedList = [list[0], list[1]]
+      const checkedList = [list[0]!, list[1]!]
       render(
         <CrawledResult
           list={list}
@@ -276,7 +276,7 @@ describe('CrawledResult', () => {
       fireEvent.click(previewButton)
 
       const item0 = screen.getByTestId('item-0')
-      expect(item0).toHaveAttribute('data-preview', 'true')
+      expect(item0)!.toHaveAttribute('data-preview', 'true')
     })
   })
 
@@ -292,7 +292,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByTestId('select-all')).toBeInTheDocument()
+      expect(screen.getByTestId('select-all'))!.toBeInTheDocument()
     })
 
     it('should handle single item list', () => {
@@ -307,7 +307,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByTestId('item-0')).toBeInTheDocument()
+      expect(screen.getByTestId('item-0'))!.toBeInTheDocument()
     })
   })
 })
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 0f72cc5172..8f34b75d37 100644
--- a/web/app/components/datasets/create/website/base/crawled-result.tsx
+++ b/web/app/components/datasets/create/website/base/crawled-result.tsx
@@ -53,7 +53,7 @@ const CrawledResult: FC<Props> = ({
   const handlePreview = useCallback((index: number) => {
     return () => {
       setPreviewIndex(index)
-      onPreview(list[index])
+      onPreview(list[index]!)
     }
   }, [list, onPreview])
 
diff --git a/web/app/components/datasets/create/website/firecrawl/__tests__/index.spec.tsx b/web/app/components/datasets/create/website/firecrawl/__tests__/index.spec.tsx
index c154c1a534..32b536c8f0 100644
--- a/web/app/components/datasets/create/website/firecrawl/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/website/firecrawl/__tests__/index.spec.tsx
@@ -102,34 +102,65 @@ describe('FireCrawl', () => {
     it('should render without crashing', () => {
       render(<FireCrawl {...defaultProps} />)
 
-      expect(screen.getByText(/firecrawlTitle/i)).toBeInTheDocument()
+      expect(screen.getByText(/firecrawlTitle/i))!.toBeInTheDocument()
     })
 
     it('should render Header component with correct props', () => {
       render(<FireCrawl {...defaultProps} />)
 
-      expect(screen.getByText(/firecrawlTitle/i)).toBeInTheDocument()
-      expect(screen.getByText(/configureFirecrawl/i)).toBeInTheDocument()
-      expect(screen.getByText(/firecrawlDoc/i)).toBeInTheDocument()
+      expect(screen.getByText(/firecrawlTitle/i))!.toBeInTheDocument()
+      expect(screen.getByText(/configureFirecrawl/i))!.toBeInTheDocument()
+      expect(screen.getByText(/firecrawlDoc/i))!.toBeInTheDocument()
     })
 
     it('should render UrlInput component', () => {
       render(<FireCrawl {...defaultProps} />)
 
-      expect(getUrlInput()).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: /run/i })).toBeInTheDocument()
+      expect(getUrlInput())!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /run/i }))!.toBeInTheDocument()
     })
 
     it('should render Options component', () => {
       render(<FireCrawl {...defaultProps} />)
 
-      expect(screen.getByText(/crawlSubPage/i)).toBeInTheDocument()
-      expect(screen.getByText(/limit/i)).toBeInTheDocument()
+      expect(screen.getByText(/crawlSubPage/i))!.toBeInTheDocument()
+      expect(screen.getByText(/limit/i))!.toBeInTheDocument()
     })
 
     it('should not render crawling or result components initially', () => {
       render(<FireCrawl {...defaultProps} />)
 
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
+      // Crawling and result components should not be visible in init state
       // Crawling and result components should not be visible in init state
       expect(screen.queryByText(/crawling/i)).not.toBeInTheDocument()
     })
@@ -443,7 +474,7 @@ describe('FireCrawl', () => {
       await user.click(runButton)
 
       await waitFor(() => {
-        expect(screen.getByText(/exceptionErrorTitle/i)).toBeInTheDocument()
+        expect(screen.getByText(/exceptionErrorTitle/i))!.toBeInTheDocument()
       })
     })
 
@@ -465,7 +496,7 @@ describe('FireCrawl', () => {
       await user.click(runButton)
 
       await waitFor(() => {
-        expect(screen.getByText(/exceptionErrorTitle/i)).toBeInTheDocument()
+        expect(screen.getByText(/exceptionErrorTitle/i))!.toBeInTheDocument()
       })
     })
 
@@ -547,7 +578,7 @@ describe('FireCrawl', () => {
       await user.click(runButton)
 
       await waitFor(() => {
-        expect(screen.getByText(/exceptionErrorTitle/i)).toBeInTheDocument()
+        expect(screen.getByText(/exceptionErrorTitle/i))!.toBeInTheDocument()
       })
     })
 
@@ -567,7 +598,7 @@ describe('FireCrawl', () => {
       await user.click(runButton)
 
       await waitFor(() => {
-        expect(screen.getByText(/exceptionErrorTitle/i)).toBeInTheDocument()
+        expect(screen.getByText(/exceptionErrorTitle/i))!.toBeInTheDocument()
       })
     })
 
@@ -589,7 +620,7 @@ describe('FireCrawl', () => {
       await user.click(runButton)
 
       await waitFor(() => {
-        expect(screen.getByText('Custom error message')).toBeInTheDocument()
+        expect(screen.getByText('Custom error message'))!.toBeInTheDocument()
       })
     })
 
@@ -611,7 +642,7 @@ describe('FireCrawl', () => {
       await user.click(runButton)
 
       await waitFor(() => {
-        expect(screen.getByText(/unknownError/i)).toBeInTheDocument()
+        expect(screen.getByText(/unknownError/i))!.toBeInTheDocument()
       })
     })
   })
@@ -635,7 +666,7 @@ describe('FireCrawl', () => {
 
       // Use data-testid to find checkboxes since they are custom div elements
       const checkboxes = container.querySelectorAll('[data-testid^="checkbox-"]')
-      fireEvent.click(checkboxes[0]) // crawl_sub_pages
+      fireEvent.click(checkboxes[0]!) // crawl_sub_pages
 
       expect(mockOnCrawlOptionsChange).toHaveBeenCalledWith(
         expect.objectContaining({ crawl_sub_pages: false }),
@@ -669,8 +700,8 @@ describe('FireCrawl', () => {
       await user.click(runButton)
 
       await waitFor(() => {
-        expect(screen.getByText('Result Page 1')).toBeInTheDocument()
-        expect(screen.getByText('Result Page 2')).toBeInTheDocument()
+        expect(screen.getByText('Result Page 1'))!.toBeInTheDocument()
+        expect(screen.getByText('Result Page 2'))!.toBeInTheDocument()
       })
     })
 
@@ -710,7 +741,7 @@ describe('FireCrawl', () => {
 
       rerender(<FireCrawl {...defaultProps} />)
 
-      expect(screen.getByText(/firecrawlTitle/i)).toBeInTheDocument()
+      expect(screen.getByText(/firecrawlTitle/i))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/create/website/firecrawl/__tests__/options.spec.tsx b/web/app/components/datasets/create/website/firecrawl/__tests__/options.spec.tsx
index 313ad9c051..946c04aa93 100644
--- a/web/app/components/datasets/create/website/firecrawl/__tests__/options.spec.tsx
+++ b/web/app/components/datasets/create/website/firecrawl/__tests__/options.spec.tsx
@@ -35,9 +35,10 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       // Check that key elements are rendered
-      expect(screen.getByText(/crawlSubPage/i)).toBeInTheDocument()
-      expect(screen.getByText(/limit/i)).toBeInTheDocument()
-      expect(screen.getByText(/maxDepth/i)).toBeInTheDocument()
+      // Check that key elements are rendered
+      expect(screen.getByText(/crawlSubPage/i))!.toBeInTheDocument()
+      expect(screen.getByText(/limit/i))!.toBeInTheDocument()
+      expect(screen.getByText(/maxDepth/i))!.toBeInTheDocument()
     })
 
     it('should render all form fields', () => {
@@ -45,14 +46,16 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       // Checkboxes
-      expect(screen.getByText(/crawlSubPage/i)).toBeInTheDocument()
-      expect(screen.getByText(/extractOnlyMainContent/i)).toBeInTheDocument()
+      // Checkboxes
+      expect(screen.getByText(/crawlSubPage/i))!.toBeInTheDocument()
+      expect(screen.getByText(/extractOnlyMainContent/i))!.toBeInTheDocument()
 
       // Text/Number fields
-      expect(screen.getByText(/limit/i)).toBeInTheDocument()
-      expect(screen.getByText(/maxDepth/i)).toBeInTheDocument()
-      expect(screen.getByText(/excludePaths/i)).toBeInTheDocument()
-      expect(screen.getByText(/includeOnlyPaths/i)).toBeInTheDocument()
+      // Text/Number fields
+      expect(screen.getByText(/limit/i))!.toBeInTheDocument()
+      expect(screen.getByText(/maxDepth/i))!.toBeInTheDocument()
+      expect(screen.getByText(/excludePaths/i))!.toBeInTheDocument()
+      expect(screen.getByText(/includeOnlyPaths/i))!.toBeInTheDocument()
     })
 
     it('should render with custom className', () => {
@@ -62,7 +65,7 @@ describe('Options', () => {
       )
 
       const rootElement = container.firstChild as HTMLElement
-      expect(rootElement).toHaveClass('custom-class')
+      expect(rootElement)!.toHaveClass('custom-class')
     })
 
     it('should render limit field with required indicator', () => {
@@ -71,7 +74,7 @@ describe('Options', () => {
 
       // Limit field should have required indicator (*)
       const requiredIndicator = screen.getByText('*')
-      expect(requiredIndicator).toBeInTheDocument()
+      expect(requiredIndicator)!.toBeInTheDocument()
     })
 
     it('should render placeholder for excludes field', () => {
@@ -79,7 +82,7 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       const excludesInput = screen.getByPlaceholderText('blog/*, /about/*')
-      expect(excludesInput).toBeInTheDocument()
+      expect(excludesInput)!.toBeInTheDocument()
     })
 
     it('should render placeholder for includes field', () => {
@@ -87,7 +90,7 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       const includesInput = screen.getByPlaceholderText('articles/*')
-      expect(includesInput).toBeInTheDocument()
+      expect(includesInput)!.toBeInTheDocument()
     })
 
     it('should render two checkboxes', () => {
@@ -106,7 +109,8 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       // First checkbox should have check icon when checked
-      expect(screen.queryByTestId('check-icon-crawl-sub-page')).toBeInTheDocument()
+      // First checkbox should have check icon when checked
+      expect(screen.queryByTestId('check-icon-crawl-sub-page'))!.toBeInTheDocument()
     })
 
     it('should display crawl_sub_pages checkbox without check icon when false', () => {
@@ -118,7 +122,7 @@ describe('Options', () => {
     it('should display only_main_content checkbox with check icon when true', () => {
       const payload = createMockCrawlOptions({ only_main_content: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.getByTestId('check-icon-only-main-content')).toBeInTheDocument()
+      expect(screen.getByTestId('check-icon-only-main-content'))!.toBeInTheDocument()
     })
 
     it('should display only_main_content checkbox without check icon when false', () => {
@@ -132,7 +136,7 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       const limitInput = screen.getByDisplayValue('25')
-      expect(limitInput).toBeInTheDocument()
+      expect(limitInput)!.toBeInTheDocument()
     })
 
     it('should display max_depth value in input', () => {
@@ -140,7 +144,7 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       const maxDepthInput = screen.getByDisplayValue('5')
-      expect(maxDepthInput).toBeInTheDocument()
+      expect(maxDepthInput)!.toBeInTheDocument()
     })
 
     it('should display excludes value in input', () => {
@@ -148,7 +152,7 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       const excludesInput = screen.getByDisplayValue('test/*')
-      expect(excludesInput).toBeInTheDocument()
+      expect(excludesInput)!.toBeInTheDocument()
     })
 
     it('should display includes value in input', () => {
@@ -156,7 +160,7 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       const includesInput = screen.getByDisplayValue('docs/*')
-      expect(includesInput).toBeInTheDocument()
+      expect(includesInput)!.toBeInTheDocument()
     })
   })
 
@@ -166,7 +170,7 @@ describe('Options', () => {
       const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
 
       const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[0])
+      fireEvent.click(checkboxes[0]!)
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
@@ -179,7 +183,7 @@ describe('Options', () => {
       const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
 
       const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[1])
+      fireEvent.click(checkboxes[1]!)
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
@@ -251,7 +255,8 @@ describe('Options', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       // Component should render without crashing
-      expect(screen.getByText(/limit/i)).toBeInTheDocument()
+      // Component should render without crashing
+      expect(screen.getByText(/limit/i))!.toBeInTheDocument()
     })
 
     it('should handle zero values', () => {
@@ -273,8 +278,8 @@ describe('Options', () => {
       })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByDisplayValue('9999')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('100')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('9999'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('100'))!.toBeInTheDocument()
     })
 
     it('should handle special characters in text fields', () => {
@@ -284,8 +289,8 @@ describe('Options', () => {
       })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByDisplayValue('path/*/file?query=1&param=2')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('docs/**/*.md')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('path/*/file?query=1&param=2'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('docs/**/*.md'))!.toBeInTheDocument()
     })
 
     it('should preserve other payload fields when updating one field', () => {
@@ -357,7 +362,7 @@ describe('Options', () => {
 
       rerender(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByText(/limit/i)).toBeInTheDocument()
+      expect(screen.getByText(/limit/i))!.toBeInTheDocument()
     })
 
     it('should re-render when payload changes', () => {
@@ -365,10 +370,10 @@ describe('Options', () => {
       const payload2 = createMockCrawlOptions({ limit: 20 })
 
       const { rerender } = render(<Options payload={payload1} onChange={mockOnChange} />)
-      expect(screen.getByDisplayValue('10')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('10'))!.toBeInTheDocument()
 
       rerender(<Options payload={payload2} onChange={mockOnChange} />)
-      expect(screen.getByDisplayValue('20')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('20'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/create/website/jina-reader/__tests__/index.spec.tsx b/web/app/components/datasets/create/website/jina-reader/__tests__/index.spec.tsx
index b8829b1042..16896df2bb 100644
--- a/web/app/components/datasets/create/website/jina-reader/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/website/jina-reader/__tests__/index.spec.tsx
@@ -75,7 +75,7 @@ describe('JinaReader', () => {
 
       render(<JinaReader {...props} />)
 
-      expect(screen.getByText('datasetCreation.stepOne.website.jinaReaderTitle')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.website.jinaReaderTitle'))!.toBeInTheDocument()
     })
 
     it('should render header with configuration button', () => {
@@ -83,7 +83,7 @@ describe('JinaReader', () => {
 
       render(<JinaReader {...props} />)
 
-      expect(screen.getByText('datasetCreation.stepOne.website.configureJinaReader')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.website.configureJinaReader'))!.toBeInTheDocument()
     })
 
     it('should render URL input field', () => {
@@ -91,7 +91,7 @@ describe('JinaReader', () => {
 
       render(<JinaReader {...props} />)
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should render run button', () => {
@@ -99,7 +99,7 @@ describe('JinaReader', () => {
 
       render(<JinaReader {...props} />)
 
-      expect(screen.getByRole('button', { name: /run/i })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /run/i }))!.toBeInTheDocument()
     })
 
     it('should render options section', () => {
@@ -107,7 +107,7 @@ describe('JinaReader', () => {
 
       render(<JinaReader {...props} />)
 
-      expect(screen.getByText('datasetCreation.stepOne.website.options')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.website.options'))!.toBeInTheDocument()
     })
 
     it('should render doc link to Jina Reader', () => {
@@ -116,7 +116,7 @@ describe('JinaReader', () => {
       render(<JinaReader {...props} />)
 
       const docLink = screen.getByRole('link')
-      expect(docLink).toHaveAttribute('href', 'https://jina.ai/reader')
+      expect(docLink)!.toHaveAttribute('href', 'https://jina.ai/reader')
     })
 
     it('should not render crawling or result components initially', () => {
@@ -152,7 +152,8 @@ describe('JinaReader', () => {
       }
       else {
         // Options might not be visible, just verify component renders
-        expect(screen.getByText('datasetCreation.stepOne.website.options')).toBeInTheDocument()
+        // Options might not be visible, just verify component renders
+        expect(screen.getByText('datasetCreation.stepOne.website.options'))!.toBeInTheDocument()
       }
     })
 
@@ -191,7 +192,8 @@ describe('JinaReader', () => {
       render(<JinaReader {...props} />)
 
       // Assert - component renders with empty limit
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      // Assert - component renders with empty limit
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
   })
 
@@ -208,14 +210,14 @@ describe('JinaReader', () => {
 
       render(<JinaReader {...props} />)
       const urlInput = screen.getAllByRole('textbox')[0]
-      await userEvent.type(urlInput, 'https://example.com')
+      await userEvent.type(urlInput!, 'https://example.com')
 
       const runButton = screen.getByRole('button', { name: /run/i })
       fireEvent.click(runButton)
 
       // Assert - crawling indicator should appear
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped/i)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped/i))!.toBeInTheDocument()
       })
 
       // Cleanup - resolve the promise and wait for component to finish
@@ -244,7 +246,7 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText(/selectAll|resetAll/i)).toBeInTheDocument()
+        expect(screen.getByText(/selectAll|resetAll/i))!.toBeInTheDocument()
       })
     })
 
@@ -305,7 +307,8 @@ describe('JinaReader', () => {
       render(<JinaReader {...props} />)
 
       // Options should be visible initially
-      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage')).toBeInTheDocument()
+      // Options should be visible initially
+      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage'))!.toBeInTheDocument()
 
       const input = screen.getByRole('textbox')
       await userEvent.type(input, 'https://example.com')
@@ -355,7 +358,8 @@ describe('JinaReader', () => {
       render(<JinaReader {...props} />)
 
       // Initially options should be visible
-      expect(screen.getByText('datasetCreation.stepOne.website.options')).toBeInTheDocument()
+      // Initially options should be visible
+      expect(screen.getByText('datasetCreation.stepOne.website.options'))!.toBeInTheDocument()
 
       const input = screen.getByRole('textbox')
       await userEvent.type(input, 'https://example.com')
@@ -363,7 +367,7 @@ describe('JinaReader', () => {
 
       // Assert - the crawling indicator should appear
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped/i)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped/i))!.toBeInTheDocument()
       })
 
       // Cleanup - resolve the promise
@@ -411,7 +415,8 @@ describe('JinaReader', () => {
       rerender(<JinaReader {...props} />)
 
       // Assert - component should still work correctly
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      // Assert - component should still work correctly
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
   })
 
@@ -476,7 +481,7 @@ describe('JinaReader', () => {
 
       // Assert - result should be displayed
       await waitFor(() => {
-        expect(screen.getByText('Preview Test')).toBeInTheDocument()
+        expect(screen.getByText('Preview Test'))!.toBeInTheDocument()
       })
 
       const previewButton = screen.getByText('datasetCreation.stepOne.website.preview')
@@ -508,18 +513,51 @@ describe('JinaReader', () => {
       render(<JinaReader {...props} />)
 
       // Options content should be visible initially
-      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage')).toBeInTheDocument()
+      // Options content should be visible initially
+      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage'))!.toBeInTheDocument()
 
       const optionsHeader = screen.getByText('datasetCreation.stepOne.website.options')
       await userEvent.click(optionsHeader)
 
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
       // Assert - options should be hidden
       expect(screen.queryByText('datasetCreation.stepOne.website.crawlSubPage')).not.toBeInTheDocument()
 
       await userEvent.click(optionsHeader)
 
       // Options should be visible again
-      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage')).toBeInTheDocument()
+      // Options should be visible again
+      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage'))!.toBeInTheDocument()
     })
   })
 
@@ -627,10 +665,10 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
 
-      expect(screen.getByText('Crawl failed due to network error')).toBeInTheDocument()
+      expect(screen.getByText('Crawl failed due to network error'))!.toBeInTheDocument()
     })
 
     it('should handle API error during status check', async () => {
@@ -650,7 +688,7 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
     })
 
@@ -810,7 +848,7 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
 
       consoleSpy.mockRestore()
@@ -834,7 +872,7 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
     })
 
@@ -856,7 +894,7 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.unknownError')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.unknownError'))!.toBeInTheDocument()
       })
     })
 
@@ -964,7 +1002,7 @@ describe('JinaReader', () => {
 
       // Assert - should show 0/10 when crawlResult is undefined
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped.*0\/10/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped.*0\/10/))!.toBeInTheDocument()
       })
 
       // Cleanup - resolve the promise
@@ -996,7 +1034,7 @@ describe('JinaReader', () => {
 
       // Assert - should show 0/0 when limit parses to 0
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped.*0\/0/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped.*0\/0/))!.toBeInTheDocument()
       })
 
       // Cleanup - resolve the promise
@@ -1029,7 +1067,7 @@ describe('JinaReader', () => {
 
       // Assert - should complete and show results even if empty
       await waitFor(() => {
-        expect(screen.getByText(/scrapTimeInfo/i)).toBeInTheDocument()
+        expect(screen.getByText(/scrapTimeInfo/i))!.toBeInTheDocument()
       })
     })
 
@@ -1055,7 +1093,7 @@ describe('JinaReader', () => {
 
       // Assert - should use limit (15) as total
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped.*0\/15/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped.*0\/15/))!.toBeInTheDocument()
       })
 
       // Cleanup - resolve the promise
@@ -1094,7 +1132,7 @@ describe('JinaReader', () => {
 
       // Assert - should show progress indicator
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped/))!.toBeInTheDocument()
       })
 
       // Cleanup - resolve the promise
@@ -1329,7 +1367,7 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped.*0\/10/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped.*0\/10/))!.toBeInTheDocument()
       })
 
       // Cleanup - resolve the promise
@@ -1354,7 +1392,7 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText(/scrapTimeInfo/i)).toBeInTheDocument()
+        expect(screen.getByText(/scrapTimeInfo/i))!.toBeInTheDocument()
       })
     })
 
@@ -1378,7 +1416,7 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('Result Page')).toBeInTheDocument()
+        expect(screen.getByText('Result Page'))!.toBeInTheDocument()
       })
     })
 
@@ -1397,7 +1435,7 @@ describe('JinaReader', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
     })
   })
@@ -1453,8 +1491,8 @@ describe('JinaReader', () => {
 
       // Assert - final results should be displayed
       await waitFor(() => {
-        expect(screen.getByText('Page 1')).toBeInTheDocument()
-        expect(screen.getByText('Page 5')).toBeInTheDocument()
+        expect(screen.getByText('Page 1'))!.toBeInTheDocument()
+        expect(screen.getByText('Page 5'))!.toBeInTheDocument()
       })
 
       // Assert - checked results should be updated
@@ -1483,7 +1521,7 @@ describe('JinaReader', () => {
 
       // Wait for results
       await waitFor(() => {
-        expect(screen.getByText('Single')).toBeInTheDocument()
+        expect(screen.getByText('Single'))!.toBeInTheDocument()
       })
 
       const selectAllCheckbox = screen.getByText(/selectAll|resetAll/i)
diff --git a/web/app/components/datasets/create/website/watercrawl/__tests__/index.spec.tsx b/web/app/components/datasets/create/website/watercrawl/__tests__/index.spec.tsx
index e9d933cc03..1023cbd045 100644
--- a/web/app/components/datasets/create/website/watercrawl/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/website/watercrawl/__tests__/index.spec.tsx
@@ -77,7 +77,7 @@ describe('WaterCrawl', () => {
 
       render(<WaterCrawl {...props} />)
 
-      expect(screen.getByText('datasetCreation.stepOne.website.watercrawlTitle')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.website.watercrawlTitle'))!.toBeInTheDocument()
     })
 
     it('should render header with configuration button', () => {
@@ -85,7 +85,7 @@ describe('WaterCrawl', () => {
 
       render(<WaterCrawl {...props} />)
 
-      expect(screen.getByText('datasetCreation.stepOne.website.configureWatercrawl')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.website.configureWatercrawl'))!.toBeInTheDocument()
     })
 
     it('should render URL input field', () => {
@@ -94,7 +94,8 @@ describe('WaterCrawl', () => {
       render(<WaterCrawl {...props} />)
 
       // Assert - URL input has specific placeholder
-      expect(screen.getByPlaceholderText('https://docs.dify.ai/en/')).toBeInTheDocument()
+      // Assert - URL input has specific placeholder
+      expect(screen.getByPlaceholderText('https://docs.dify.ai/en/'))!.toBeInTheDocument()
     })
 
     it('should render run button', () => {
@@ -102,7 +103,7 @@ describe('WaterCrawl', () => {
 
       render(<WaterCrawl {...props} />)
 
-      expect(screen.getByRole('button', { name: /run/i })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /run/i }))!.toBeInTheDocument()
     })
 
     it('should render options section', () => {
@@ -110,7 +111,7 @@ describe('WaterCrawl', () => {
 
       render(<WaterCrawl {...props} />)
 
-      expect(screen.getByText('datasetCreation.stepOne.website.options')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.website.options'))!.toBeInTheDocument()
     })
 
     it('should render doc link to WaterCrawl', () => {
@@ -119,7 +120,7 @@ describe('WaterCrawl', () => {
       render(<WaterCrawl {...props} />)
 
       const docLink = screen.getByRole('link')
-      expect(docLink).toHaveAttribute('href', 'https://docs.watercrawl.dev/')
+      expect(docLink)!.toHaveAttribute('href', 'https://docs.watercrawl.dev/')
     })
 
     it('should not render crawling or result components initially', () => {
@@ -155,7 +156,8 @@ describe('WaterCrawl', () => {
       }
       else {
         // Options might not be visible, just verify component renders
-        expect(screen.getByText('datasetCreation.stepOne.website.options')).toBeInTheDocument()
+        // Options might not be visible, just verify component renders
+        expect(screen.getByText('datasetCreation.stepOne.website.options'))!.toBeInTheDocument()
       }
     })
 
@@ -195,7 +197,8 @@ describe('WaterCrawl', () => {
       render(<WaterCrawl {...props} />)
 
       // Assert - component renders with empty limit
-      expect(screen.getByPlaceholderText('https://docs.dify.ai/en/')).toBeInTheDocument()
+      // Assert - component renders with empty limit
+      expect(screen.getByPlaceholderText('https://docs.dify.ai/en/'))!.toBeInTheDocument()
     })
   })
 
@@ -218,7 +221,7 @@ describe('WaterCrawl', () => {
 
       // Assert - crawling indicator should appear
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped/i)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped/i))!.toBeInTheDocument()
       })
 
       // Cleanup - resolve the promise
@@ -245,7 +248,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText(/selectAll|resetAll/i)).toBeInTheDocument()
+        expect(screen.getByText(/selectAll|resetAll/i))!.toBeInTheDocument()
       })
     })
 
@@ -307,7 +310,8 @@ describe('WaterCrawl', () => {
       render(<WaterCrawl {...props} />)
 
       // Options should be visible initially
-      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage')).toBeInTheDocument()
+      // Options should be visible initially
+      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage'))!.toBeInTheDocument()
 
       const input = screen.getByPlaceholderText('https://docs.dify.ai/en/')
       await userEvent.type(input, 'https://example.com')
@@ -353,7 +357,8 @@ describe('WaterCrawl', () => {
       render(<WaterCrawl {...props} />)
 
       // Initially options should be visible
-      expect(screen.getByText('datasetCreation.stepOne.website.options')).toBeInTheDocument()
+      // Initially options should be visible
+      expect(screen.getByText('datasetCreation.stepOne.website.options'))!.toBeInTheDocument()
 
       const input = screen.getByPlaceholderText('https://docs.dify.ai/en/')
       await userEvent.type(input, 'https://example.com')
@@ -361,7 +366,7 @@ describe('WaterCrawl', () => {
 
       // Assert - the crawling indicator should appear
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped/i)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped/i))!.toBeInTheDocument()
       })
     })
   })
@@ -411,7 +416,8 @@ describe('WaterCrawl', () => {
       rerender(<WaterCrawl {...props} />)
 
       // Assert - component should still work correctly
-      expect(screen.getByPlaceholderText('https://docs.dify.ai/en/')).toBeInTheDocument()
+      // Assert - component should still work correctly
+      expect(screen.getByPlaceholderText('https://docs.dify.ai/en/'))!.toBeInTheDocument()
     })
   })
 
@@ -478,7 +484,7 @@ describe('WaterCrawl', () => {
 
       // Assert - result should be displayed
       await waitFor(() => {
-        expect(screen.getByText('Preview Test')).toBeInTheDocument()
+        expect(screen.getByText('Preview Test'))!.toBeInTheDocument()
       })
 
       const previewButton = screen.getByText('datasetCreation.stepOne.website.preview')
@@ -510,18 +516,51 @@ describe('WaterCrawl', () => {
       render(<WaterCrawl {...props} />)
 
       // Options content should be visible initially
-      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage')).toBeInTheDocument()
+      // Options content should be visible initially
+      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage'))!.toBeInTheDocument()
 
       const optionsHeader = screen.getByText('datasetCreation.stepOne.website.options')
       await userEvent.click(optionsHeader)
 
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
+      // Assert - options should be hidden
       // Assert - options should be hidden
       expect(screen.queryByText('datasetCreation.stepOne.website.crawlSubPage')).not.toBeInTheDocument()
 
       await userEvent.click(optionsHeader)
 
       // Options should be visible again
-      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage')).toBeInTheDocument()
+      // Options should be visible again
+      expect(screen.getByText('datasetCreation.stepOne.website.crawlSubPage'))!.toBeInTheDocument()
     })
   })
 
@@ -577,7 +616,7 @@ describe('WaterCrawl', () => {
 
       // Assert - max_depth should be deleted from the request
       await waitFor(() => {
-        const callArgs = mockCreateTask.mock.calls[0][0]
+        const callArgs = mockCreateTask.mock.calls[0]![0]
         expect(callArgs.options).not.toHaveProperty('max_depth')
       })
     })
@@ -632,10 +671,10 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
 
-      expect(screen.getByText('Crawl failed due to network error')).toBeInTheDocument()
+      expect(screen.getByText('Crawl failed due to network error'))!.toBeInTheDocument()
     })
 
     it('should handle API error during status check', async () => {
@@ -655,7 +694,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
     })
 
@@ -706,7 +745,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
     })
   })
@@ -843,7 +882,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
 
       consoleSpy.mockRestore()
@@ -867,7 +906,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.unknownError')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.unknownError'))!.toBeInTheDocument()
       })
     })
 
@@ -971,7 +1010,7 @@ describe('WaterCrawl', () => {
 
       // Assert - should show 0/10 in crawling indicator
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped.*0\/10/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped.*0\/10/))!.toBeInTheDocument()
       })
     })
 
@@ -993,7 +1032,7 @@ describe('WaterCrawl', () => {
 
       // Assert - should show 0/0
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped.*0\/0/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped.*0\/0/))!.toBeInTheDocument()
       })
     })
 
@@ -1020,7 +1059,7 @@ describe('WaterCrawl', () => {
 
       // Assert - should complete and show results
       await waitFor(() => {
-        expect(screen.getByText(/scrapTimeInfo/i)).toBeInTheDocument()
+        expect(screen.getByText(/scrapTimeInfo/i))!.toBeInTheDocument()
       })
     })
 
@@ -1042,7 +1081,7 @@ describe('WaterCrawl', () => {
 
       // Assert - should use limit (15) as total
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped.*0\/15/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped.*0\/15/))!.toBeInTheDocument()
       })
     })
 
@@ -1070,7 +1109,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped/))!.toBeInTheDocument()
       })
     })
   })
@@ -1335,7 +1374,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText(/totalPageScraped.*0\/10/)).toBeInTheDocument()
+        expect(screen.getByText(/totalPageScraped.*0\/10/))!.toBeInTheDocument()
       })
     })
 
@@ -1360,7 +1399,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText(/scrapTimeInfo/i)).toBeInTheDocument()
+        expect(screen.getByText(/scrapTimeInfo/i))!.toBeInTheDocument()
       })
     })
 
@@ -1384,7 +1423,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('Result Page')).toBeInTheDocument()
+        expect(screen.getByText('Result Page'))!.toBeInTheDocument()
       })
     })
 
@@ -1403,7 +1442,7 @@ describe('WaterCrawl', () => {
       await userEvent.click(screen.getByRole('button', { name: /run/i }))
 
       await waitFor(() => {
-        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle')).toBeInTheDocument()
+        expect(screen.getByText('datasetCreation.stepOne.website.exceptionErrorTitle'))!.toBeInTheDocument()
       })
     })
 
@@ -1515,8 +1554,8 @@ describe('WaterCrawl', () => {
 
       // Assert - final results should be displayed
       await waitFor(() => {
-        expect(screen.getByText('Page 1')).toBeInTheDocument()
-        expect(screen.getByText('Page 5')).toBeInTheDocument()
+        expect(screen.getByText('Page 1'))!.toBeInTheDocument()
+        expect(screen.getByText('Page 5'))!.toBeInTheDocument()
       })
 
       // Assert - checked results should be updated
@@ -1550,7 +1589,7 @@ describe('WaterCrawl', () => {
 
       // Wait for results
       await waitFor(() => {
-        expect(screen.getByText('Single')).toBeInTheDocument()
+        expect(screen.getByText('Single'))!.toBeInTheDocument()
       })
 
       const selectAllCheckbox = screen.getByText(/selectAll|resetAll/i)
@@ -1596,7 +1635,7 @@ describe('WaterCrawl', () => {
 
       // Step 3: Wait for completion
       await waitFor(() => {
-        expect(screen.getByText('Preview Page')).toBeInTheDocument()
+        expect(screen.getByText('Preview Page'))!.toBeInTheDocument()
       })
 
       // Step 4: Click preview
diff --git a/web/app/components/datasets/create/website/watercrawl/__tests__/options.spec.tsx b/web/app/components/datasets/create/website/watercrawl/__tests__/options.spec.tsx
index bda01dc152..b65df109ad 100644
--- a/web/app/components/datasets/create/website/watercrawl/__tests__/options.spec.tsx
+++ b/web/app/components/datasets/create/website/watercrawl/__tests__/options.spec.tsx
@@ -34,12 +34,12 @@ describe('Options (watercrawl)', () => {
       const payload = createMockCrawlOptions()
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByText(/crawlSubPage/i)).toBeInTheDocument()
-      expect(screen.getByText(/extractOnlyMainContent/i)).toBeInTheDocument()
-      expect(screen.getByText(/limit/i)).toBeInTheDocument()
-      expect(screen.getByText(/maxDepth/i)).toBeInTheDocument()
-      expect(screen.getByText(/excludePaths/i)).toBeInTheDocument()
-      expect(screen.getByText(/includeOnlyPaths/i)).toBeInTheDocument()
+      expect(screen.getByText(/crawlSubPage/i))!.toBeInTheDocument()
+      expect(screen.getByText(/extractOnlyMainContent/i))!.toBeInTheDocument()
+      expect(screen.getByText(/limit/i))!.toBeInTheDocument()
+      expect(screen.getByText(/maxDepth/i))!.toBeInTheDocument()
+      expect(screen.getByText(/excludePaths/i))!.toBeInTheDocument()
+      expect(screen.getByText(/includeOnlyPaths/i))!.toBeInTheDocument()
     })
 
     it('should render two checkboxes', () => {
@@ -55,21 +55,21 @@ describe('Options (watercrawl)', () => {
       render(<Options payload={payload} onChange={mockOnChange} />)
 
       const requiredIndicator = screen.getByText('*')
-      expect(requiredIndicator).toBeInTheDocument()
+      expect(requiredIndicator)!.toBeInTheDocument()
     })
 
     it('should render placeholder for excludes field', () => {
       const payload = createMockCrawlOptions()
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByPlaceholderText('blog/*, /about/*')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('blog/*, /about/*'))!.toBeInTheDocument()
     })
 
     it('should render placeholder for includes field', () => {
       const payload = createMockCrawlOptions()
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByPlaceholderText('articles/*')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('articles/*'))!.toBeInTheDocument()
     })
 
     it('should render with custom className', () => {
@@ -79,7 +79,7 @@ describe('Options (watercrawl)', () => {
       )
 
       const rootElement = container.firstChild as HTMLElement
-      expect(rootElement).toHaveClass('custom-class')
+      expect(rootElement)!.toHaveClass('custom-class')
     })
   })
 
@@ -89,7 +89,7 @@ describe('Options (watercrawl)', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByTestId('check-icon-crawl-sub-pages')).toBeInTheDocument()
+      expect(screen.getByTestId('check-icon-crawl-sub-pages'))!.toBeInTheDocument()
     })
 
     it('should display crawl_sub_pages checkbox without check icon when false', () => {
@@ -97,13 +97,13 @@ describe('Options (watercrawl)', () => {
       const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
 
       const checkboxes = getCheckboxes(container)
-      expect(checkboxes[0].querySelector('svg')).not.toBeInTheDocument()
+      expect(checkboxes[0]!.querySelector('svg')).not.toBeInTheDocument()
     })
 
     it('should display only_main_content checkbox with check icon when true', () => {
       const payload = createMockCrawlOptions({ only_main_content: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.getByTestId('check-icon-only-main-content')).toBeInTheDocument()
+      expect(screen.getByTestId('check-icon-only-main-content'))!.toBeInTheDocument()
     })
 
     it('should display only_main_content checkbox without check icon when false', () => {
@@ -111,35 +111,35 @@ describe('Options (watercrawl)', () => {
       const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
 
       const checkboxes = getCheckboxes(container)
-      expect(checkboxes[1].querySelector('svg')).not.toBeInTheDocument()
+      expect(checkboxes[1]!.querySelector('svg')).not.toBeInTheDocument()
     })
 
     it('should display limit value in input', () => {
       const payload = createMockCrawlOptions({ limit: 25 })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByDisplayValue('25')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('25'))!.toBeInTheDocument()
     })
 
     it('should display max_depth value in input', () => {
       const payload = createMockCrawlOptions({ max_depth: 5 })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByDisplayValue('5')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('5'))!.toBeInTheDocument()
     })
 
     it('should display excludes value in input', () => {
       const payload = createMockCrawlOptions({ excludes: 'test/*' })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByDisplayValue('test/*')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('test/*'))!.toBeInTheDocument()
     })
 
     it('should display includes value in input', () => {
       const payload = createMockCrawlOptions({ includes: 'docs/*' })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByDisplayValue('docs/*')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('docs/*'))!.toBeInTheDocument()
     })
   })
 
@@ -149,7 +149,7 @@ describe('Options (watercrawl)', () => {
       const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
 
       const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[0])
+      fireEvent.click(checkboxes[0]!)
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
@@ -162,7 +162,7 @@ describe('Options (watercrawl)', () => {
       const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
 
       const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[1])
+      fireEvent.click(checkboxes[1]!)
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
@@ -264,10 +264,10 @@ describe('Options (watercrawl)', () => {
       const payload2 = createMockCrawlOptions({ limit: 20 })
 
       const { rerender } = render(<Options payload={payload1} onChange={mockOnChange} />)
-      expect(screen.getByDisplayValue('10')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('10'))!.toBeInTheDocument()
 
       rerender(<Options payload={payload2} onChange={mockOnChange} />)
-      expect(screen.getByDisplayValue('20')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('20'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/documents/components/__tests__/operations.spec.tsx b/web/app/components/datasets/documents/components/__tests__/operations.spec.tsx
index 0d60ef86db..c89059d185 100644
--- a/web/app/components/datasets/documents/components/__tests__/operations.spec.tsx
+++ b/web/app/components/datasets/documents/components/__tests__/operations.spec.tsx
@@ -105,7 +105,7 @@ describe('Operations', () => {
   describe('rendering', () => {
     it('should render without crashing', () => {
       render(<Operations {...defaultProps} />)
-      expect(document.querySelector('.flex.items-center')).toBeInTheDocument()
+      expect(document.querySelector('.flex.items-center'))!.toBeInTheDocument()
     })
 
     it('should render buttons when embeddingAvailable', () => {
@@ -122,7 +122,7 @@ describe('Operations', () => {
     it('should render disabled switch when embeddingAvailable is false in list scene', () => {
       render(<Operations {...defaultProps} embeddingAvailable={false} scene="list" />)
       const disabledSwitch = screen.getByRole('switch')
-      expect(disabledSwitch).toHaveAttribute('aria-disabled', 'true')
+      expect(disabledSwitch)!.toHaveAttribute('aria-disabled', 'true')
     })
   })
 
@@ -209,7 +209,7 @@ describe('Operations', () => {
       const buttons = screen.getAllByRole('button')
       const settingsButton = buttons[0]
       await act(async () => {
-        fireEvent.click(settingsButton)
+        fireEvent.click(settingsButton!)
       })
       expect(mockPush).toHaveBeenCalledWith('/datasets/dataset-1/documents/doc-1/settings')
     })
@@ -219,7 +219,7 @@ describe('Operations', () => {
     it('should render differently in detail scene', () => {
       render(<Operations {...defaultProps} scene="detail" />)
       const container = document.querySelector('.flex.items-center')
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should not render switch in detail scene', () => {
@@ -239,7 +239,7 @@ describe('Operations', () => {
           onSelectedIdChange={mockOnSelectedIdChange}
         />,
       )
-      expect(document.querySelector('.flex.items-center')).toBeInTheDocument()
+      expect(document.querySelector('.flex.items-center'))!.toBeInTheDocument()
     })
   })
 
@@ -257,7 +257,8 @@ describe('Operations', () => {
       render(<Operations {...defaultProps} />)
       await openPopover()
       // Check if popover content is visible
-      expect(screen.getByText('datasetDocuments.list.table.rename')).toBeInTheDocument()
+      // Check if popover content is visible
+      expect(screen.getByText('datasetDocuments.list.table.rename'))!.toBeInTheDocument()
     })
 
     it('should call archive when archive action is clicked', async () => {
@@ -297,7 +298,8 @@ describe('Operations', () => {
         fireEvent.click(deleteButton)
       })
       // Check if confirmation modal is shown
-      expect(screen.getByText('datasetDocuments.list.delete.title')).toBeInTheDocument()
+      // Check if confirmation modal is shown
+      expect(screen.getByText('datasetDocuments.list.delete.title'))!.toBeInTheDocument()
     })
 
     it('should call delete when confirm is clicked in delete modal', async () => {
@@ -324,7 +326,8 @@ describe('Operations', () => {
         fireEvent.click(deleteButton)
       })
       // Verify modal is shown
-      expect(screen.getByText('datasetDocuments.list.delete.title')).toBeInTheDocument()
+      // Verify modal is shown
+      expect(screen.getByText('datasetDocuments.list.delete.title'))!.toBeInTheDocument()
       // Find and click the cancel button
       const cancelButton = screen.getByText('common.operation.cancel')
       await act(async () => {
@@ -366,7 +369,7 @@ describe('Operations', () => {
       await user.click(renameAction)
 
       const renameInput = await screen.findByRole('textbox')
-      expect(renameInput).toHaveValue('Test Document')
+      expect(renameInput)!.toHaveValue('Test Document')
     })
 
     it('should call sync for notion data source', async () => {
@@ -458,7 +461,7 @@ describe('Operations', () => {
         />,
       )
       await openPopover()
-      expect(screen.getByText('datasetDocuments.list.action.download')).toBeInTheDocument()
+      expect(screen.getByText('datasetDocuments.list.action.download'))!.toBeInTheDocument()
     })
 
     it('should download archived file when download is clicked', async () => {
@@ -543,7 +546,7 @@ describe('Operations', () => {
           detail={{ ...defaultDetail, display_status: 'indexing' }}
         />,
       )
-      expect(document.querySelector('.flex.items-center')).toBeInTheDocument()
+      expect(document.querySelector('.flex.items-center'))!.toBeInTheDocument()
     })
 
     it('should render resume action when status is paused', () => {
@@ -553,7 +556,7 @@ describe('Operations', () => {
           detail={{ ...defaultDetail, display_status: 'paused' }}
         />,
       )
-      expect(document.querySelector('.flex.items-center')).toBeInTheDocument()
+      expect(document.querySelector('.flex.items-center'))!.toBeInTheDocument()
     })
 
     it('should not show pause/resume for available status', async () => {
@@ -582,7 +585,7 @@ describe('Operations', () => {
           detail={{ ...defaultDetail, data_source_type: 'notion_import' }}
         />,
       )
-      expect(document.querySelector('.flex.items-center')).toBeInTheDocument()
+      expect(document.querySelector('.flex.items-center'))!.toBeInTheDocument()
     })
 
     it('should handle web data source type', () => {
@@ -592,7 +595,7 @@ describe('Operations', () => {
           detail={{ ...defaultDetail, data_source_type: 'website_crawl' }}
         />,
       )
-      expect(document.querySelector('.flex.items-center')).toBeInTheDocument()
+      expect(document.querySelector('.flex.items-center'))!.toBeInTheDocument()
     })
 
     it('should not show download for non-file data source', async () => {
@@ -622,7 +625,7 @@ describe('Operations', () => {
     it('should accept custom className prop', () => {
       // The className is passed to CustomPopover, verify component renders without errors
       render(<Operations {...defaultProps} className="custom-class" />)
-      expect(document.querySelector('.flex.items-center')).toBeInTheDocument()
+      expect(document.querySelector('.flex.items-center'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx b/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx
index 97ae1c92a1..01d6299492 100644
--- a/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx
@@ -112,25 +112,26 @@ describe('DocumentList', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<DocumentList {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should render all documents', () => {
       render(<DocumentList {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('Document 1.txt')).toBeInTheDocument()
-      expect(screen.getByText('Document 2.txt')).toBeInTheDocument()
-      expect(screen.getByText('Document 3.txt')).toBeInTheDocument()
+      expect(screen.getByText('Document 1.txt'))!.toBeInTheDocument()
+      expect(screen.getByText('Document 2.txt'))!.toBeInTheDocument()
+      expect(screen.getByText('Document 3.txt'))!.toBeInTheDocument()
     })
 
     it('should render table headers', () => {
       render(<DocumentList {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('#')).toBeInTheDocument()
+      expect(screen.getByText('#'))!.toBeInTheDocument()
     })
 
     it('should render pagination when total is provided', () => {
       render(<DocumentList {...defaultProps} />, { wrapper: createWrapper() })
       // Pagination component should be present
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      // Pagination component should be present
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should not render pagination when total is 0', () => {
@@ -139,13 +140,13 @@ describe('DocumentList', () => {
         pagination: { ...defaultPagination, total: 0 },
       }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should render empty table when no documents', () => {
       const props = { ...defaultProps, documents: [] }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
   })
 
@@ -165,7 +166,8 @@ describe('DocumentList', () => {
       const props = { ...defaultProps, embeddingAvailable: false }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
       // Row checkboxes should still be there, but header checkbox should be hidden
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      // Row checkboxes should still be there, but header checkbox should be hidden
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should call onSelectedIdChange when select all is clicked', () => {
@@ -175,7 +177,7 @@ describe('DocumentList', () => {
 
       const checkboxes = findCheckboxes(container)
       if (checkboxes.length > 0) {
-        fireEvent.click(checkboxes[0])
+        fireEvent.click(checkboxes[0]!)
         expect(onSelectedIdChange).toHaveBeenCalled()
       }
     })
@@ -190,7 +192,7 @@ describe('DocumentList', () => {
       // When checked, checkbox should have a check icon (svg) inside
       props.selectedIds.forEach((id) => {
         const checkIcon = screen.getByTestId(`check-icon-doc-row-${id}`)
-        expect(checkIcon).toBeInTheDocument()
+        expect(checkIcon)!.toBeInTheDocument()
       })
     })
 
@@ -206,7 +208,9 @@ describe('DocumentList', () => {
       expect(checkboxes.length).toBeGreaterThan(0)
       // Header checkbox should show indeterminate icon, not check icon
       // Just verify it's rendered
-      expect(checkboxes[0]).toBeInTheDocument()
+      // Header checkbox should show indeterminate icon, not check icon
+      // Just verify it's rendered
+      expect(checkboxes[0])!.toBeInTheDocument()
     })
 
     it('should call onSelectedIdChange with single document when row checkbox is clicked', () => {
@@ -216,7 +220,7 @@ describe('DocumentList', () => {
 
       const checkboxes = findCheckboxes(container)
       if (checkboxes.length > 1) {
-        fireEvent.click(checkboxes[1])
+        fireEvent.click(checkboxes[1]!)
         expect(onSelectedIdChange).toHaveBeenCalled()
       }
     })
@@ -236,7 +240,7 @@ describe('DocumentList', () => {
 
       const sortableHeaders = container.querySelectorAll('thead button')
       if (sortableHeaders.length > 0)
-        fireEvent.click(sortableHeaders[0])
+        fireEvent.click(sortableHeaders[0]!)
 
       expect(onSortChange).toHaveBeenCalled()
     })
@@ -251,14 +255,16 @@ describe('DocumentList', () => {
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
       // BatchAction component should be visible
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      // BatchAction component should be visible
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should not show batch action bar when no documents selected', () => {
       render(<DocumentList {...defaultProps} />, { wrapper: createWrapper() })
 
       // BatchAction should not be present
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      // BatchAction should not be present
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should render batch action bar with archive option', () => {
@@ -269,7 +275,8 @@ describe('DocumentList', () => {
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
       // BatchAction component should be visible when documents are selected
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      // BatchAction component should be visible when documents are selected
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should render batch action bar with enable option', () => {
@@ -279,7 +286,7 @@ describe('DocumentList', () => {
       }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should render batch action bar with disable option', () => {
@@ -289,7 +296,7 @@ describe('DocumentList', () => {
       }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should render batch action bar with delete option', () => {
@@ -299,7 +306,7 @@ describe('DocumentList', () => {
       }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should clear selection when cancel is clicked', () => {
@@ -329,7 +336,8 @@ describe('DocumentList', () => {
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
       // BatchAction should be visible
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      // BatchAction should be visible
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should show re-index option for error documents', () => {
@@ -343,7 +351,8 @@ describe('DocumentList', () => {
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
       // BatchAction with re-index should be present for error documents
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      // BatchAction with re-index should be present for error documents
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
   })
 
@@ -354,7 +363,7 @@ describe('DocumentList', () => {
       const rows = screen.getAllByRole('row')
       // First row is header, second row is first document
       if (rows.length > 1) {
-        fireEvent.click(rows[1])
+        fireEvent.click(rows[1]!)
         expect(mockPush).toHaveBeenCalledWith('/datasets/dataset-1/documents/doc-1')
       }
     })
@@ -376,11 +385,11 @@ describe('DocumentList', () => {
       const renameButtons = container.querySelectorAll('.cursor-pointer.rounded-md')
       if (renameButtons.length > 0) {
         await act(async () => {
-          fireEvent.click(renameButtons[0])
+          fireEvent.click(renameButtons[0]!)
         })
       }
 
-      expect(screen.getByRole('dialog', { name: 'datasetDocuments.list.table.rename' })).toBeInTheDocument()
+      expect(screen.getByRole('dialog', { name: 'datasetDocuments.list.table.rename' }))!.toBeInTheDocument()
     })
 
     it('should call onUpdate when document is renamed', () => {
@@ -389,7 +398,8 @@ describe('DocumentList', () => {
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
       // The handleRenamed callback wraps onUpdate
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      // The handleRenamed callback wraps onUpdate
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
   })
 
@@ -408,7 +418,7 @@ describe('DocumentList', () => {
         })
       }
 
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should call onManageMetadata when manage metadata is triggered', () => {
@@ -421,26 +431,27 @@ describe('DocumentList', () => {
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
       // The onShowManage callback in EditMetadataBatchModal should call hideEditModal then onManageMetadata
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      // The onShowManage callback in EditMetadataBatchModal should call hideEditModal then onManageMetadata
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
   })
 
   describe('Chunking Mode', () => {
     it('should render with general mode', () => {
       render(<DocumentList {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should render with QA mode', () => {
       // This test uses the default mock which returns ChunkingMode.text
       // The component will compute isQAMode based on doc_form
       render(<DocumentList {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should render with parent-child mode', () => {
       render(<DocumentList {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
   })
 
@@ -449,7 +460,7 @@ describe('DocumentList', () => {
       const props = { ...defaultProps, documents: [] }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should handle documents with missing optional fields', () => {
@@ -463,7 +474,7 @@ describe('DocumentList', () => {
       }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should handle remote sort value', () => {
@@ -473,7 +484,7 @@ describe('DocumentList', () => {
       }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     })
 
     it('should handle large number of documents', () => {
@@ -482,7 +493,7 @@ describe('DocumentList', () => {
       const props = { ...defaultProps, documents: manyDocs }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
-      expect(screen.getByRole('table')).toBeInTheDocument()
+      expect(screen.getByRole('table'))!.toBeInTheDocument()
     }, 10000)
   })
 })
diff --git a/web/app/components/datasets/documents/components/document-list/components/__tests__/document-table-row.spec.tsx b/web/app/components/datasets/documents/components/document-list/components/__tests__/document-table-row.spec.tsx
index d5e4f480be..b6b02ed829 100644
--- a/web/app/components/datasets/documents/components/document-list/components/__tests__/document-table-row.spec.tsx
+++ b/web/app/components/datasets/documents/components/document-list/components/__tests__/document-table-row.spec.tsx
@@ -103,23 +103,23 @@ describe('DocumentTableRow', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<DocumentTableRow {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('test-document.txt')).toBeInTheDocument()
+      expect(screen.getByText('test-document.txt'))!.toBeInTheDocument()
     })
 
     it('should render index number correctly', () => {
       render(<DocumentTableRow {...defaultProps} index={5} />, { wrapper: createWrapper() })
-      expect(screen.getByText('6')).toBeInTheDocument()
+      expect(screen.getByText('6'))!.toBeInTheDocument()
     })
 
     it('should render document name with tooltip', () => {
       render(<DocumentTableRow {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('test-document.txt')).toBeInTheDocument()
+      expect(screen.getByText('test-document.txt'))!.toBeInTheDocument()
     })
 
     it('should render checkbox element', () => {
       const { container } = render(<DocumentTableRow {...defaultProps} />, { wrapper: createWrapper() })
       const checkbox = findCheckbox(container)
-      expect(checkbox).toBeInTheDocument()
+      expect(checkbox)!.toBeInTheDocument()
     })
   })
 
@@ -127,14 +127,14 @@ describe('DocumentTableRow', () => {
     it('should show check icon when isSelected is true', () => {
       const { container } = render(<DocumentTableRow {...defaultProps} isSelected />, { wrapper: createWrapper() })
       const checkbox = findCheckbox(container)
-      expect(checkbox).toBeInTheDocument()
-      expect(screen.getByTestId('check-icon-doc-row-doc-1')).toBeInTheDocument()
+      expect(checkbox)!.toBeInTheDocument()
+      expect(screen.getByTestId('check-icon-doc-row-doc-1'))!.toBeInTheDocument()
     })
 
     it('should not show check icon when isSelected is false', () => {
       const { container } = render(<DocumentTableRow {...defaultProps} isSelected={false} />, { wrapper: createWrapper() })
       const checkbox = findCheckbox(container)
-      expect(checkbox).toBeInTheDocument()
+      expect(checkbox)!.toBeInTheDocument()
       expect(screen.queryByTestId('check-icon-doc-row-doc-1')).not.toBeInTheDocument()
     })
 
@@ -200,13 +200,13 @@ describe('DocumentTableRow', () => {
     it('should display word count less than 1000 as is', () => {
       const doc = createMockDoc({ word_count: 500 })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByText('500')).toBeInTheDocument()
+      expect(screen.getByText('500'))!.toBeInTheDocument()
     })
 
     it('should display word count 1000 or more in k format', () => {
       const doc = createMockDoc({ word_count: 1500 })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByText('1.5k')).toBeInTheDocument()
+      expect(screen.getByText('1.5k'))!.toBeInTheDocument()
     })
 
     it('should display 0 with empty style when word_count is 0', () => {
@@ -219,7 +219,7 @@ describe('DocumentTableRow', () => {
     it('should handle undefined word_count', () => {
       const doc = createMockDoc({ word_count: undefined as unknown as number })
       const { container } = render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
   })
 
@@ -227,13 +227,13 @@ describe('DocumentTableRow', () => {
     it('should display hit count less than 1000 as is', () => {
       const doc = createMockDoc({ hit_count: 100 })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByText('100')).toBeInTheDocument()
+      expect(screen.getByText('100'))!.toBeInTheDocument()
     })
 
     it('should display hit count 1000 or more in k format', () => {
       const doc = createMockDoc({ hit_count: 2500 })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByText('2.5k')).toBeInTheDocument()
+      expect(screen.getByText('2.5k'))!.toBeInTheDocument()
     })
 
     it('should display 0 with empty style when hit_count is 0', () => {
@@ -248,12 +248,13 @@ describe('DocumentTableRow', () => {
     it('should render ChunkingModeLabel with general mode', () => {
       render(<DocumentTableRow {...defaultProps} isGeneralMode isQAMode={false} />, { wrapper: createWrapper() })
       // ChunkingModeLabel should be rendered
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      // ChunkingModeLabel should be rendered
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
 
     it('should render ChunkingModeLabel with QA mode', () => {
       render(<DocumentTableRow {...defaultProps} isGeneralMode={false} isQAMode />, { wrapper: createWrapper() })
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
   })
 
@@ -261,13 +262,13 @@ describe('DocumentTableRow', () => {
     it('should render SummaryStatus when summary_index_status is present', () => {
       const doc = createMockDoc({ summary_index_status: 'completed' })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
 
     it('should not render SummaryStatus when summary_index_status is absent', () => {
       const doc = createMockDoc({ summary_index_status: undefined })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
   })
 
@@ -282,7 +283,7 @@ describe('DocumentTableRow', () => {
       // Find the rename button by finding the RiEditLine icon's parent
       const renameButtons = container.querySelectorAll('.cursor-pointer.rounded-md')
       if (renameButtons.length > 0) {
-        fireEvent.click(renameButtons[0])
+        fireEvent.click(renameButtons[0]!)
         expect(onShowRenameModal).toHaveBeenCalledWith(defaultProps.doc)
         expect(mockPush).not.toHaveBeenCalled()
       }
@@ -292,13 +293,13 @@ describe('DocumentTableRow', () => {
   describe('Operations', () => {
     it('should pass selectedIds to Operations component', () => {
       render(<DocumentTableRow {...defaultProps} selectedIds={['doc-1', 'doc-2']} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
 
     it('should pass onSelectedIdChange to Operations component', () => {
       const onSelectedIdChange = vi.fn()
       render(<DocumentTableRow {...defaultProps} onSelectedIdChange={onSelectedIdChange} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
   })
 
@@ -306,7 +307,7 @@ describe('DocumentTableRow', () => {
     it('should render with FILE data source type', () => {
       const doc = createMockDoc({ data_source_type: DataSourceType.FILE })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
 
     it('should render with NOTION data source type', () => {
@@ -315,13 +316,13 @@ describe('DocumentTableRow', () => {
         data_source_info: { notion_page_icon: 'icon.png' },
       })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
 
     it('should render with WEB data source type', () => {
       const doc = createMockDoc({ data_source_type: DataSourceType.WEB })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
   })
 
@@ -329,13 +330,13 @@ describe('DocumentTableRow', () => {
     it('should handle document with very long name', () => {
       const doc = createMockDoc({ name: `${'a'.repeat(500)}.txt` })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
 
     it('should handle document with special characters in name', () => {
       const doc = createMockDoc({ name: '<script>test</script>.txt' })
       render(<DocumentTableRow {...defaultProps} doc={doc} />, { wrapper: createWrapper() })
-      expect(screen.getByText('<script>test</script>.txt')).toBeInTheDocument()
+      expect(screen.getByText('<script>test</script>.txt'))!.toBeInTheDocument()
     })
 
     it('should memoize the component', () => {
@@ -343,7 +344,7 @@ describe('DocumentTableRow', () => {
       const { rerender } = render(<DocumentTableRow {...defaultProps} />, { wrapper })
 
       rerender(<DocumentTableRow {...defaultProps} />)
-      expect(screen.getByRole('row')).toBeInTheDocument()
+      expect(screen.getByRole('row'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/documents/components/document-list/components/document-source-icon.tsx b/web/app/components/datasets/documents/components/document-list/components/document-source-icon.tsx
index 5461f34921..0d51837cf2 100644
--- a/web/app/components/datasets/documents/components/document-list/components/document-source-icon.tsx
+++ b/web/app/components/datasets/documents/components/document-list/components/document-source-icon.tsx
@@ -39,7 +39,7 @@ const getFileExtension = (fileName: string): string => {
   const parts = fileName.split('.')
   if (parts.length <= 1 || (parts[0] === '' && parts.length === 2))
     return ''
-  return parts[parts.length - 1].toLowerCase()
+  return parts[parts.length - 1]!.toLowerCase()
 }
 
 const DocumentSourceIcon: FC<DocumentSourceIconProps> = React.memo(({
diff --git a/web/app/components/datasets/documents/create-from-pipeline/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/__tests__/index.spec.tsx
index 8a2e251770..7daff43a8b 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/__tests__/index.spec.tsx
@@ -569,7 +569,7 @@ describe('StepOneContent', () => {
 
   it('should render VectorSpaceFull when isShowVectorSpaceFull is true', () => {
     render(<StepOneContent {...defaultProps} isShowVectorSpaceFull={true} />)
-    expect(screen.getByTestId('vector-space-full')).toBeInTheDocument()
+    expect(screen.getByTestId('vector-space-full'))!.toBeInTheDocument()
   })
 
   it('should not render VectorSpaceFull when isShowVectorSpaceFull is false', () => {
@@ -587,7 +587,7 @@ describe('StepOneContent', () => {
         localFileListLength={2}
       />,
     )
-    expect(screen.getByTestId('upgrade-card')).toBeInTheDocument()
+    expect(screen.getByTestId('upgrade-card'))!.toBeInTheDocument()
   })
 
   it('should not render UpgradeCard when supportBatchUpload is true', () => {
@@ -618,7 +618,7 @@ describe('StepOneContent', () => {
     render(<StepOneContent {...defaultProps} nextBtnDisabled={true} />)
 
     const nextButton = screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })
-    expect(nextButton).toBeDisabled()
+    expect(nextButton)!.toBeDisabled()
   })
 })
 
@@ -664,17 +664,17 @@ describe('StepTwoContent', () => {
 
   it('should render ProcessDocuments component', () => {
     render(<StepTwoContent {...defaultProps} />)
-    expect(screen.getByTestId('process-documents')).toBeInTheDocument()
+    expect(screen.getByTestId('process-documents'))!.toBeInTheDocument()
   })
 
   it('should pass dataSourceNodeId to ProcessDocuments', () => {
     render(<StepTwoContent {...defaultProps} dataSourceNodeId="custom-node" />)
-    expect(screen.getByTestId('datasource-node-id')).toHaveTextContent('custom-node')
+    expect(screen.getByTestId('datasource-node-id'))!.toHaveTextContent('custom-node')
   })
 
   it('should pass isRunning to ProcessDocuments', () => {
     render(<StepTwoContent {...defaultProps} isRunning={true} />)
-    expect(screen.getByTestId('is-running')).toHaveTextContent('true')
+    expect(screen.getByTestId('is-running'))!.toHaveTextContent('true')
   })
 
   it('should call onProcess when process button is clicked', () => {
@@ -709,18 +709,18 @@ describe('StepThreeContent', () => {
 
   it('should render Processing component', () => {
     render(<StepThreeContent batchId="batch-123" documents={[]} />)
-    expect(screen.getByTestId('processing')).toBeInTheDocument()
+    expect(screen.getByTestId('processing'))!.toBeInTheDocument()
   })
 
   it('should pass batchId to Processing', () => {
     render(<StepThreeContent batchId="batch-123" documents={[]} />)
-    expect(screen.getByTestId('batch-id')).toHaveTextContent('batch-123')
+    expect(screen.getByTestId('batch-id'))!.toHaveTextContent('batch-123')
   })
 
   it('should pass documents count to Processing', () => {
     const documents = [{ id: '1' }, { id: '2' }]
     render(<StepThreeContent batchId="batch-123" documents={documents as InitialDocumentDetail[]} />)
-    expect(screen.getByTestId('documents-count')).toHaveTextContent('2')
+    expect(screen.getByTestId('documents-count'))!.toHaveTextContent('2')
   })
 })
 
@@ -787,8 +787,8 @@ describe('StepOnePreview', () => {
         currentLocalFile={createMockFile()}
       />,
     )
-    expect(screen.getByTestId('file-preview')).toBeInTheDocument()
-    expect(screen.getByTestId('file-name')).toHaveTextContent('test.txt')
+    expect(screen.getByTestId('file-preview'))!.toBeInTheDocument()
+    expect(screen.getByTestId('file-name'))!.toHaveTextContent('test.txt')
   })
 
   it('should render OnlineDocumentPreview when currentDocument is set', () => {
@@ -799,7 +799,7 @@ describe('StepOnePreview', () => {
         currentDocument={createMockNotionPage()}
       />,
     )
-    expect(screen.getByTestId('online-document-preview')).toBeInTheDocument()
+    expect(screen.getByTestId('online-document-preview'))!.toBeInTheDocument()
   })
 
   it('should render WebsitePreview when currentWebsite is set', () => {
@@ -809,7 +809,7 @@ describe('StepOnePreview', () => {
         currentWebsite={createMockCrawlResult()}
       />,
     )
-    expect(screen.getByTestId('web-preview')).toBeInTheDocument()
+    expect(screen.getByTestId('web-preview'))!.toBeInTheDocument()
   })
 
   it('should call hidePreviewLocalFile when hide button is clicked', () => {
@@ -868,22 +868,22 @@ describe('StepTwoPreview', () => {
 
   it('should render ChunkPreview component', () => {
     render(<StepTwoPreview {...defaultProps} />)
-    expect(screen.getByTestId('chunk-preview')).toBeInTheDocument()
+    expect(screen.getByTestId('chunk-preview'))!.toBeInTheDocument()
   })
 
   it('should pass datasourceType to ChunkPreview', () => {
     render(<StepTwoPreview {...defaultProps} datasourceType={DatasourceType.onlineDocument} />)
-    expect(screen.getByTestId('datasource-type')).toHaveTextContent(DatasourceType.onlineDocument)
+    expect(screen.getByTestId('datasource-type'))!.toHaveTextContent(DatasourceType.onlineDocument)
   })
 
   it('should pass isIdle to ChunkPreview', () => {
     render(<StepTwoPreview {...defaultProps} isIdle={false} />)
-    expect(screen.getByTestId('is-idle')).toHaveTextContent('false')
+    expect(screen.getByTestId('is-idle'))!.toHaveTextContent('false')
   })
 
   it('should pass isPendingPreview to ChunkPreview', () => {
     render(<StepTwoPreview {...defaultProps} isPendingPreview={true} />)
-    expect(screen.getByTestId('is-pending')).toHaveTextContent('true')
+    expect(screen.getByTestId('is-pending'))!.toHaveTextContent('true')
   })
 
   it('should call onPreview when preview button is clicked', () => {
@@ -1092,7 +1092,7 @@ describe('Store Hooks', () => {
       mockStoreState.selectedFileIds = ['file-1']
       const { result } = renderHook(() => useOnlineDrive())
       expect(result.current.selectedOnlineDriveFileList).toHaveLength(1)
-      expect(result.current.selectedOnlineDriveFileList[0].id).toBe('file-1')
+      expect(result.current.selectedOnlineDriveFileList[0]!.id).toBe('file-1')
     })
   })
 })
@@ -1166,8 +1166,8 @@ describe('useDatasourceOptions', () => {
 
     const { result } = renderHook(() => useDatasourceOptions(mockNodes))
     expect(result.current).toHaveLength(1)
-    expect(result.current[0].label).toBe('Local File Source')
-    expect(result.current[0].value).toBe('node-1')
+    expect(result.current[0]!.label).toBe('Local File Source')
+    expect(result.current[0]!.value).toBe('node-1')
   })
 
   it('should return multiple options for multiple data source nodes', () => {
@@ -1616,7 +1616,7 @@ describe('StepOneContent - All Datasource Types', () => {
         datasourceType={DatasourceType.onlineDocument}
       />,
     )
-    expect(screen.getByTestId('online-documents-component')).toBeInTheDocument()
+    expect(screen.getByTestId('online-documents-component'))!.toBeInTheDocument()
   })
 
   it('should render WebsiteCrawl when datasourceType is websiteCrawl', () => {
@@ -1632,7 +1632,7 @@ describe('StepOneContent - All Datasource Types', () => {
         datasourceType={DatasourceType.websiteCrawl}
       />,
     )
-    expect(screen.getByTestId('website-crawl-component')).toBeInTheDocument()
+    expect(screen.getByTestId('website-crawl-component'))!.toBeInTheDocument()
   })
 
   it('should render OnlineDrive when datasourceType is onlineDrive', () => {
@@ -1648,7 +1648,7 @@ describe('StepOneContent - All Datasource Types', () => {
         datasourceType={DatasourceType.onlineDrive}
       />,
     )
-    expect(screen.getByTestId('online-drive-component')).toBeInTheDocument()
+    expect(screen.getByTestId('online-drive-component'))!.toBeInTheDocument()
   })
 
   it('should render LocalFile when datasourceType is localFile', () => {
@@ -1659,7 +1659,7 @@ describe('StepOneContent - All Datasource Types', () => {
         datasourceType={DatasourceType.localFile}
       />,
     )
-    expect(screen.getByTestId('local-file-component')).toBeInTheDocument()
+    expect(screen.getByTestId('local-file-component'))!.toBeInTheDocument()
   })
 })
 
@@ -1690,7 +1690,8 @@ describe('StepTwoPreview - File List Mapping', () => {
     )
 
     // ChunkPreview should be rendered
-    expect(screen.getByTestId('chunk-preview')).toBeInTheDocument()
+    // ChunkPreview should be rendered
+    expect(screen.getByTestId('chunk-preview'))!.toBeInTheDocument()
   })
 })
 
diff --git a/web/app/components/datasets/documents/create-from-pipeline/__tests__/step-indicator.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/__tests__/step-indicator.spec.tsx
index 7103dced26..7bffe3577e 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/__tests__/step-indicator.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/__tests__/step-indicator.spec.tsx
@@ -19,14 +19,14 @@ describe('StepIndicator', () => {
     const { container } = render(<StepIndicator steps={steps} currentStep={2} />)
     const dots = container.querySelectorAll('.rounded-lg')
     // Second step (index 1) should be active
-    expect(dots[1].className).toContain('bg-state-accent-solid')
-    expect(dots[1].className).toContain('w-2')
+    expect(dots[1]!.className).toContain('bg-state-accent-solid')
+    expect(dots[1]!.className).toContain('w-2')
   })
 
   it('should not apply active style to non-current steps', () => {
     const { container } = render(<StepIndicator steps={steps} currentStep={1} />)
     const dots = container.querySelectorAll('.rounded-lg')
-    expect(dots[1].className).toContain('bg-divider-solid')
-    expect(dots[2].className).toContain('bg-divider-solid')
+    expect(dots[1]!.className).toContain('bg-divider-solid')
+    expect(dots[2]!.className).toContain('bg-divider-solid')
   })
 })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source-options/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source-options/__tests__/index.spec.tsx
index 0ac2dfce20..78542ad522 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source-options/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source-options/__tests__/index.spec.tsx
@@ -129,7 +129,7 @@ describe('DatasourceIcon', () => {
     it('should render without crashing', () => {
       const { container } = render(<DatasourceIcon iconUrl="https://example.com/icon.png" />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render icon with background image', () => {
@@ -138,15 +138,16 @@ describe('DatasourceIcon', () => {
       const { container } = render(<DatasourceIcon iconUrl={iconUrl} />)
 
       const iconDiv = container.querySelector('[style*="background-image"]')
-      expect(iconDiv).toHaveStyle({ backgroundImage: `url(${iconUrl})` })
+      expect(iconDiv)!.toHaveStyle({ backgroundImage: `url(${iconUrl})` })
     })
 
     it('should render with default size (sm)', () => {
       const { container } = render(<DatasourceIcon iconUrl="https://example.com/icon.png" />)
 
       // Assert - Default size is 'sm' which maps to 'w-5 h-5'
-      expect(container.firstChild).toHaveClass('w-5')
-      expect(container.firstChild).toHaveClass('h-5')
+      // Assert - Default size is 'sm' which maps to 'w-5 h-5'
+      expect(container.firstChild)!.toHaveClass('w-5')
+      expect(container.firstChild)!.toHaveClass('h-5')
     })
   })
 
@@ -157,9 +158,9 @@ describe('DatasourceIcon', () => {
           <DatasourceIcon iconUrl="https://example.com/icon.png" size="xs" />,
         )
 
-        expect(container.firstChild).toHaveClass('w-4')
-        expect(container.firstChild).toHaveClass('h-4')
-        expect(container.firstChild).toHaveClass('rounded-[5px]')
+        expect(container.firstChild)!.toHaveClass('w-4')
+        expect(container.firstChild)!.toHaveClass('h-4')
+        expect(container.firstChild)!.toHaveClass('rounded-[5px]')
       })
 
       it('should render with sm size', () => {
@@ -167,9 +168,9 @@ describe('DatasourceIcon', () => {
           <DatasourceIcon iconUrl="https://example.com/icon.png" size="sm" />,
         )
 
-        expect(container.firstChild).toHaveClass('w-5')
-        expect(container.firstChild).toHaveClass('h-5')
-        expect(container.firstChild).toHaveClass('rounded-md')
+        expect(container.firstChild)!.toHaveClass('w-5')
+        expect(container.firstChild)!.toHaveClass('h-5')
+        expect(container.firstChild)!.toHaveClass('rounded-md')
       })
 
       it('should render with md size', () => {
@@ -177,9 +178,9 @@ describe('DatasourceIcon', () => {
           <DatasourceIcon iconUrl="https://example.com/icon.png" size="md" />,
         )
 
-        expect(container.firstChild).toHaveClass('w-6')
-        expect(container.firstChild).toHaveClass('h-6')
-        expect(container.firstChild).toHaveClass('rounded-lg')
+        expect(container.firstChild)!.toHaveClass('w-6')
+        expect(container.firstChild)!.toHaveClass('h-6')
+        expect(container.firstChild)!.toHaveClass('rounded-lg')
       })
     })
 
@@ -189,7 +190,7 @@ describe('DatasourceIcon', () => {
           <DatasourceIcon iconUrl="https://example.com/icon.png" className="custom-class" />,
         )
 
-        expect(container.firstChild).toHaveClass('custom-class')
+        expect(container.firstChild)!.toHaveClass('custom-class')
       })
 
       it('should merge custom className with default classes', () => {
@@ -197,9 +198,9 @@ describe('DatasourceIcon', () => {
           <DatasourceIcon iconUrl="https://example.com/icon.png" className="custom-class" size="sm" />,
         )
 
-        expect(container.firstChild).toHaveClass('custom-class')
-        expect(container.firstChild).toHaveClass('w-5')
-        expect(container.firstChild).toHaveClass('h-5')
+        expect(container.firstChild)!.toHaveClass('custom-class')
+        expect(container.firstChild)!.toHaveClass('w-5')
+        expect(container.firstChild)!.toHaveClass('h-5')
       })
     })
 
@@ -208,7 +209,7 @@ describe('DatasourceIcon', () => {
         const { container } = render(<DatasourceIcon iconUrl="" />)
 
         const iconDiv = container.querySelector('[style*="background-image"]')
-        expect(iconDiv).toHaveStyle({ backgroundImage: 'url()' })
+        expect(iconDiv)!.toHaveStyle({ backgroundImage: 'url()' })
       })
 
       it('should handle special characters in iconUrl', () => {
@@ -217,7 +218,7 @@ describe('DatasourceIcon', () => {
         const { container } = render(<DatasourceIcon iconUrl={iconUrl} />)
 
         const iconDiv = container.querySelector('[style*="background-image"]')
-        expect(iconDiv).toHaveStyle({ backgroundImage: `url(${iconUrl})` })
+        expect(iconDiv)!.toHaveStyle({ backgroundImage: `url(${iconUrl})` })
       })
 
       it('should handle data URL as iconUrl', () => {
@@ -226,7 +227,7 @@ describe('DatasourceIcon', () => {
         const { container } = render(<DatasourceIcon iconUrl={dataUrl} />)
 
         const iconDiv = container.querySelector('[style*="background-image"]')
-        expect(iconDiv).toBeInTheDocument()
+        expect(iconDiv)!.toBeInTheDocument()
       })
     })
   })
@@ -235,25 +236,26 @@ describe('DatasourceIcon', () => {
     it('should have flex container classes', () => {
       const { container } = render(<DatasourceIcon iconUrl="https://example.com/icon.png" />)
 
-      expect(container.firstChild).toHaveClass('flex')
-      expect(container.firstChild).toHaveClass('items-center')
-      expect(container.firstChild).toHaveClass('justify-center')
+      expect(container.firstChild)!.toHaveClass('flex')
+      expect(container.firstChild)!.toHaveClass('items-center')
+      expect(container.firstChild)!.toHaveClass('justify-center')
     })
 
     it('should have shadow-xs class from size map', () => {
       const { container } = render(<DatasourceIcon iconUrl="https://example.com/icon.png" />)
 
       // Assert - Default size 'sm' has shadow-xs
-      expect(container.firstChild).toHaveClass('shadow-xs')
+      // Assert - Default size 'sm' has shadow-xs
+      expect(container.firstChild)!.toHaveClass('shadow-xs')
     })
 
     it('should have inner div with bg-cover class', () => {
       const { container } = render(<DatasourceIcon iconUrl="https://example.com/icon.png" />)
 
       const innerDiv = container.querySelector('.bg-cover')
-      expect(innerDiv).toBeInTheDocument()
-      expect(innerDiv).toHaveClass('bg-center')
-      expect(innerDiv).toHaveClass('rounded-md')
+      expect(innerDiv)!.toBeInTheDocument()
+      expect(innerDiv)!.toHaveClass('bg-center')
+      expect(innerDiv)!.toHaveClass('rounded-md')
     })
   })
 })
@@ -519,13 +521,13 @@ describe('OptionCard', () => {
     it('should render without crashing', () => {
       renderWithProviders(<OptionCard {...defaultProps} />)
 
-      expect(screen.getByText('Test Option')).toBeInTheDocument()
+      expect(screen.getByText('Test Option'))!.toBeInTheDocument()
     })
 
     it('should render label text', () => {
       renderWithProviders(<OptionCard {...defaultProps} label="Custom Label" />)
 
-      expect(screen.getByText('Custom Label')).toBeInTheDocument()
+      expect(screen.getByText('Custom Label'))!.toBeInTheDocument()
     })
 
     it('should render DatasourceIcon component', () => {
@@ -533,7 +535,7 @@ describe('OptionCard', () => {
 
       // Assert - DatasourceIcon container should exist
       const iconContainer = container.querySelector('.size-8')
-      expect(iconContainer).toBeInTheDocument()
+      expect(iconContainer)!.toBeInTheDocument()
     })
 
     it('should set title attribute for label truncation', () => {
@@ -542,7 +544,7 @@ describe('OptionCard', () => {
       renderWithProviders(<OptionCard {...defaultProps} label={longLabel} />)
 
       const labelElement = screen.getByText(longLabel)
-      expect(labelElement).toHaveAttribute('title', longLabel)
+      expect(labelElement)!.toHaveAttribute('title', longLabel)
     })
   })
 
@@ -554,8 +556,8 @@ describe('OptionCard', () => {
         )
 
         const card = container.firstChild
-        expect(card).toHaveClass('border-components-option-card-option-selected-border')
-        expect(card).toHaveClass('bg-components-option-card-option-selected-bg')
+        expect(card)!.toHaveClass('border-components-option-card-option-selected-border')
+        expect(card)!.toHaveClass('bg-components-option-card-option-selected-bg')
       })
 
       it('should apply unselected styles when selected is false', () => {
@@ -564,22 +566,22 @@ describe('OptionCard', () => {
         )
 
         const card = container.firstChild
-        expect(card).toHaveClass('border-components-option-card-option-border')
-        expect(card).toHaveClass('bg-components-option-card-option-bg')
+        expect(card)!.toHaveClass('border-components-option-card-option-border')
+        expect(card)!.toHaveClass('bg-components-option-card-option-bg')
       })
 
       it('should apply text-text-primary to label when selected', () => {
         renderWithProviders(<OptionCard {...defaultProps} selected={true} />)
 
         const label = screen.getByText('Test Option')
-        expect(label).toHaveClass('text-text-primary')
+        expect(label)!.toHaveClass('text-text-primary')
       })
 
       it('should apply text-text-secondary to label when not selected', () => {
         renderWithProviders(<OptionCard {...defaultProps} selected={false} />)
 
         const label = screen.getByText('Test Option')
-        expect(label).toHaveClass('text-text-secondary')
+        expect(label)!.toHaveClass('text-text-secondary')
       })
     })
 
@@ -593,7 +595,7 @@ describe('OptionCard', () => {
         // Act - Click on the label text's parent card
         const labelElement = screen.getByText('Test Option')
         const card = labelElement.closest('[class*="cursor-pointer"]')
-        expect(card).toBeInTheDocument()
+        expect(card)!.toBeInTheDocument()
         fireEvent.click(card!)
 
         expect(mockOnClick).toHaveBeenCalledTimes(1)
@@ -607,11 +609,12 @@ describe('OptionCard', () => {
         // Act - Click on the label text's parent card should not throw
         const labelElement = screen.getByText('Test Option')
         const card = labelElement.closest('[class*="cursor-pointer"]')
-        expect(card).toBeInTheDocument()
+        expect(card)!.toBeInTheDocument()
         fireEvent.click(card!)
 
         // Assert - Component should still be rendered
-        expect(screen.getByText('Test Option')).toBeInTheDocument()
+        // Assert - Component should still be rendered
+        expect(screen.getByText('Test Option'))!.toBeInTheDocument()
       })
     })
 
@@ -631,35 +634,35 @@ describe('OptionCard', () => {
     it('should have cursor-pointer class', () => {
       const { container } = renderWithProviders(<OptionCard {...defaultProps} />)
 
-      expect(container.firstChild).toHaveClass('cursor-pointer')
+      expect(container.firstChild)!.toHaveClass('cursor-pointer')
     })
 
     it('should have flex layout classes', () => {
       const { container } = renderWithProviders(<OptionCard {...defaultProps} />)
 
-      expect(container.firstChild).toHaveClass('flex')
-      expect(container.firstChild).toHaveClass('items-center')
-      expect(container.firstChild).toHaveClass('gap-2')
+      expect(container.firstChild)!.toHaveClass('flex')
+      expect(container.firstChild)!.toHaveClass('items-center')
+      expect(container.firstChild)!.toHaveClass('gap-2')
     })
 
     it('should have rounded-xl border', () => {
       const { container } = renderWithProviders(<OptionCard {...defaultProps} />)
 
-      expect(container.firstChild).toHaveClass('rounded-xl')
-      expect(container.firstChild).toHaveClass('border')
+      expect(container.firstChild)!.toHaveClass('rounded-xl')
+      expect(container.firstChild)!.toHaveClass('border')
     })
 
     it('should have padding p-3', () => {
       const { container } = renderWithProviders(<OptionCard {...defaultProps} />)
 
-      expect(container.firstChild).toHaveClass('p-3')
+      expect(container.firstChild)!.toHaveClass('p-3')
     })
 
     it('should have line-clamp-2 for label truncation', () => {
       renderWithProviders(<OptionCard {...defaultProps} />)
 
       const label = screen.getByText('Test Option')
-      expect(label).toHaveClass('line-clamp-2')
+      expect(label)!.toHaveClass('line-clamp-2')
     })
   })
 
@@ -669,7 +672,7 @@ describe('OptionCard', () => {
       expect(OptionCard).toBeDefined()
       // React.memo wraps the component, so we check it renders correctly
       const { container } = renderWithProviders(<OptionCard {...defaultProps} />)
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 })
@@ -698,27 +701,27 @@ describe('DataSourceOptions', () => {
     it('should render without crashing', () => {
       renderWithProviders(<DataSourceOptions {...defaultProps} />)
 
-      expect(screen.getByText('Data Source 1')).toBeInTheDocument()
-      expect(screen.getByText('Data Source 2')).toBeInTheDocument()
-      expect(screen.getByText('Data Source 3')).toBeInTheDocument()
+      expect(screen.getByText('Data Source 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Data Source 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Data Source 3'))!.toBeInTheDocument()
     })
 
     it('should render correct number of option cards', () => {
       renderWithProviders(<DataSourceOptions {...defaultProps} />)
 
-      expect(screen.getByText('Data Source 1')).toBeInTheDocument()
-      expect(screen.getByText('Data Source 2')).toBeInTheDocument()
-      expect(screen.getByText('Data Source 3')).toBeInTheDocument()
+      expect(screen.getByText('Data Source 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Data Source 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Data Source 3'))!.toBeInTheDocument()
     })
 
     it('should render with grid layout', () => {
       const { container } = renderWithProviders(<DataSourceOptions {...defaultProps} />)
 
       const gridContainer = container.firstChild
-      expect(gridContainer).toHaveClass('grid')
-      expect(gridContainer).toHaveClass('w-full')
-      expect(gridContainer).toHaveClass('grid-cols-4')
-      expect(gridContainer).toHaveClass('gap-1')
+      expect(gridContainer)!.toHaveClass('grid')
+      expect(gridContainer)!.toHaveClass('w-full')
+      expect(gridContainer)!.toHaveClass('grid-cols-4')
+      expect(gridContainer)!.toHaveClass('gap-1')
     })
 
     it('should render no option cards when options is empty', () => {
@@ -728,16 +731,17 @@ describe('DataSourceOptions', () => {
 
       expect(screen.queryByText('Data Source')).not.toBeInTheDocument()
       // Grid container should still exist
-      expect(container.firstChild).toHaveClass('grid')
+      // Grid container should still exist
+      expect(container.firstChild)!.toHaveClass('grid')
     })
 
     it('should render single option card when only one option exists', () => {
-      const singleOption = [createMockDatasourceOption(defaultNodes[0])]
+      const singleOption = [createMockDatasourceOption(defaultNodes[0]!)]
       mockUseDatasourceOptions.mockReturnValue(singleOption)
 
       renderWithProviders(<DataSourceOptions {...defaultProps} />)
 
-      expect(screen.getByText('Data Source 1')).toBeInTheDocument()
+      expect(screen.getByText('Data Source 1'))!.toBeInTheDocument()
       expect(screen.queryByText('Data Source 2')).not.toBeInTheDocument()
     })
   })
@@ -778,7 +782,7 @@ describe('DataSourceOptions', () => {
 
         // Assert - Check for selected styling on second card
         const cards = container.querySelectorAll('.rounded-xl.border')
-        expect(cards[1]).toHaveClass('border-components-option-card-option-selected-border')
+        expect(cards[1])!.toHaveClass('border-components-option-card-option-selected-border')
       })
 
       it('should show no selection when datasourceNodeId is empty', () => {
@@ -816,7 +820,7 @@ describe('DataSourceOptions', () => {
 
         // Assert initial selection
         let cards = container.querySelectorAll('.rounded-xl.border')
-        expect(cards[0]).toHaveClass('border-components-option-card-option-selected-border')
+        expect(cards[0])!.toHaveClass('border-components-option-card-option-selected-border')
 
         // Act - Change selection
         rerender(
@@ -831,7 +835,7 @@ describe('DataSourceOptions', () => {
         // Assert new selection
         cards = container.querySelectorAll('.rounded-xl.border')
         expect(cards[0]).not.toHaveClass('border-components-option-card-option-selected-border')
-        expect(cards[1]).toHaveClass('border-components-option-card-option-selected-border')
+        expect(cards[1])!.toHaveClass('border-components-option-card-option-selected-border')
       })
     })
 
@@ -847,7 +851,8 @@ describe('DataSourceOptions', () => {
         )
 
         // Assert - Component renders without error
-        expect(screen.getByText('Data Source 1')).toBeInTheDocument()
+        // Assert - Component renders without error
+        expect(screen.getByText('Data Source 1'))!.toBeInTheDocument()
       })
     })
   })
@@ -870,7 +875,7 @@ describe('DataSourceOptions', () => {
         expect(mockOnSelect).toHaveBeenCalledTimes(1)
         expect(mockOnSelect).toHaveBeenCalledWith({
           nodeId: 'node-1',
-          nodeData: defaultOptions[0].data,
+          nodeData: defaultOptions[0]!.data,
         } satisfies Datasource)
       })
 
@@ -948,7 +953,8 @@ describe('DataSourceOptions', () => {
       )
 
       // Get initial click handlers
-      expect(screen.getByText('Data Source 1')).toBeInTheDocument()
+      // Get initial click handlers
+      expect(screen.getByText('Data Source 1'))!.toBeInTheDocument()
 
       // Trigger clicks to test handlers work
       fireEvent.click(screen.getByText('Data Source 1'))
@@ -1003,7 +1009,7 @@ describe('DataSourceOptions', () => {
       expect(mockOnSelect2).toHaveBeenCalledTimes(1)
       expect(mockOnSelect2).toHaveBeenCalledWith({
         nodeId: 'node-3',
-        nodeData: defaultOptions[2].data,
+        nodeData: defaultOptions[2]!.data,
       })
     })
 
@@ -1022,7 +1028,7 @@ describe('DataSourceOptions', () => {
       fireEvent.click(screen.getByText('Data Source 1'))
       expect(mockOnSelect).toHaveBeenCalledWith({
         nodeId: 'node-1',
-        nodeData: defaultOptions[0].data,
+        nodeData: defaultOptions[0]!.data,
       })
 
       // Act - Change options
@@ -1045,8 +1051,8 @@ describe('DataSourceOptions', () => {
 
       // Assert - Callback receives new option data
       expect(mockOnSelect).toHaveBeenLastCalledWith({
-        nodeId: newOptions[0].value,
-        nodeData: newOptions[0].data,
+        nodeId: newOptions[0]!.value,
+        nodeData: newOptions[0]!.data,
       })
     })
   })
@@ -1070,7 +1076,7 @@ describe('DataSourceOptions', () => {
         expect(mockOnSelect).toHaveBeenCalledTimes(1)
         expect(mockOnSelect).toHaveBeenCalledWith({
           nodeId: 'node-2',
-          nodeData: defaultOptions[1].data,
+          nodeData: defaultOptions[1]!.data,
         } satisfies Datasource)
       })
 
@@ -1090,7 +1096,7 @@ describe('DataSourceOptions', () => {
         expect(mockOnSelect).toHaveBeenCalledTimes(1)
         expect(mockOnSelect).toHaveBeenCalledWith({
           nodeId: 'node-1',
-          nodeData: defaultOptions[0].data,
+          nodeData: defaultOptions[0]!.data,
         })
       })
 
@@ -1112,15 +1118,15 @@ describe('DataSourceOptions', () => {
         expect(mockOnSelect).toHaveBeenCalledTimes(3)
         expect(mockOnSelect).toHaveBeenNthCalledWith(1, {
           nodeId: 'node-1',
-          nodeData: defaultOptions[0].data,
+          nodeData: defaultOptions[0]!.data,
         })
         expect(mockOnSelect).toHaveBeenNthCalledWith(2, {
           nodeId: 'node-2',
-          nodeData: defaultOptions[1].data,
+          nodeData: defaultOptions[1]!.data,
         })
         expect(mockOnSelect).toHaveBeenNthCalledWith(3, {
           nodeId: 'node-3',
-          nodeData: defaultOptions[2].data,
+          nodeData: defaultOptions[2]!.data,
         })
       })
     })
@@ -1164,7 +1170,7 @@ describe('DataSourceOptions', () => {
           />,
         )
 
-        expect(container.firstChild).toBeInTheDocument()
+        expect(container.firstChild)!.toBeInTheDocument()
       })
 
       it('should not crash when datasourceNodeId is undefined', () => {
@@ -1176,7 +1182,7 @@ describe('DataSourceOptions', () => {
           />,
         )
 
-        expect(screen.getByText('Data Source 1')).toBeInTheDocument()
+        expect(screen.getByText('Data Source 1'))!.toBeInTheDocument()
       })
     })
 
@@ -1202,7 +1208,7 @@ describe('DataSourceOptions', () => {
 
         renderWithProviders(<DataSourceOptions {...defaultProps} />)
 
-        expect(screen.getByText('Minimal Option')).toBeInTheDocument()
+        expect(screen.getByText('Minimal Option'))!.toBeInTheDocument()
       })
     })
 
@@ -1219,8 +1225,8 @@ describe('DataSourceOptions', () => {
           />,
         )
 
-        expect(screen.getByText('Data Source 1')).toBeInTheDocument()
-        expect(screen.getByText('Data Source 50')).toBeInTheDocument()
+        expect(screen.getByText('Data Source 1'))!.toBeInTheDocument()
+        expect(screen.getByText('Data Source 50'))!.toBeInTheDocument()
       })
     })
 
@@ -1243,7 +1249,8 @@ describe('DataSourceOptions', () => {
         )
 
         // Assert - Special characters should be escaped/rendered safely
-        expect(screen.getByText('Data Source <script>alert("xss")</script>')).toBeInTheDocument()
+        // Assert - Special characters should be escaped/rendered safely
+        expect(screen.getByText('Data Source <script>alert("xss")</script>'))!.toBeInTheDocument()
       })
 
       it('should handle unicode characters in option labels', () => {
@@ -1263,7 +1270,7 @@ describe('DataSourceOptions', () => {
           />,
         )
 
-        expect(screen.getByText('数据源 📁 Source émoji')).toBeInTheDocument()
+        expect(screen.getByText('数据源 📁 Source émoji'))!.toBeInTheDocument()
       })
 
       it('should handle empty string as option value', () => {
@@ -1276,13 +1283,13 @@ describe('DataSourceOptions', () => {
 
         renderWithProviders(<DataSourceOptions {...defaultProps} />)
 
-        expect(screen.getByText('Empty Value Option')).toBeInTheDocument()
+        expect(screen.getByText('Empty Value Option'))!.toBeInTheDocument()
       })
     })
 
     describe('Boundary Conditions', () => {
       it('should handle single option selection correctly', () => {
-        const singleOption = [createMockDatasourceOption(defaultNodes[0])]
+        const singleOption = [createMockDatasourceOption(defaultNodes[0]!)]
         mockUseDatasourceOptions.mockReturnValue(singleOption)
         const mockOnSelect = vi.fn()
 
@@ -1327,7 +1334,7 @@ describe('DataSourceOptions', () => {
         const labels = screen.getAllByText('Duplicate Label')
         expect(labels).toHaveLength(2)
 
-        fireEvent.click(labels[1])
+        fireEvent.click(labels[1]!)
         expect(mockOnSelect).toHaveBeenCalledWith({
           nodeId: 'node-b',
           nodeData: expect.objectContaining({ plugin_id: 'plugin-b' }),
@@ -1347,6 +1354,37 @@ describe('DataSourceOptions', () => {
 
         unmount()
 
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
+        // Assert - No errors thrown, component cleanly unmounted
         // Assert - No errors thrown, component cleanly unmounted
         expect(screen.queryByText('Data Source 1')).not.toBeInTheDocument()
       })
@@ -1367,6 +1405,37 @@ describe('DataSourceOptions', () => {
         // Unmount during/after interaction
         unmount()
 
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
+        // Assert - Should not throw
         // Assert - Should not throw
         expect(screen.queryByText('Data Source 1')).not.toBeInTheDocument()
       })
@@ -1392,7 +1461,7 @@ describe('DataSourceOptions', () => {
 
       const cards = container.querySelectorAll('.rounded-xl.border')
       expect(cards[0]).not.toHaveClass('border-components-option-card-option-selected-border')
-      expect(cards[1]).toHaveClass('border-components-option-card-option-selected-border')
+      expect(cards[1])!.toHaveClass('border-components-option-card-option-selected-border')
       expect(cards[2]).not.toHaveClass('border-components-option-card-option-selected-border')
     })
 
@@ -1427,7 +1496,7 @@ describe('DataSourceOptions', () => {
         />,
       )
 
-      expect(screen.getByText('Data Source 1')).toBeInTheDocument()
+      expect(screen.getByText('Data Source 1'))!.toBeInTheDocument()
     })
 
     it.each([
@@ -1449,7 +1518,7 @@ describe('DataSourceOptions', () => {
       )
 
       if (count > 0)
-        expect(screen.getByText('Data Source 1')).toBeInTheDocument()
+        expect(screen.getByText('Data Source 1'))!.toBeInTheDocument()
       else
         expect(screen.queryByText('Data Source 1')).not.toBeInTheDocument()
     })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source-options/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source-options/index.tsx
index 8e3a29cfe5..51cf34d273 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source-options/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source-options/index.tsx
@@ -31,7 +31,7 @@ const DataSourceOptions = ({
 
   useEffect(() => {
     if (options.length > 0 && !datasourceNodeId)
-      handelSelect(options[0].value)
+      handelSelect(options[0]!.value)
   }, [])
 
   return (
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx
index d595a50fe1..49b0cb0789 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx
@@ -97,8 +97,8 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByTestId('portal-root')).toBeInTheDocument()
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-root'))!.toBeInTheDocument()
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
     })
 
     it('should render current credential name in trigger', () => {
@@ -106,7 +106,7 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByText('Credential 1')).toBeInTheDocument()
+      expect(screen.getByText('Credential 1'))!.toBeInTheDocument()
     })
 
     it('should render credential icon with correct props', () => {
@@ -116,8 +116,8 @@ describe('CredentialSelector', () => {
 
       // Assert - CredentialIcon renders an img when avatarUrl is provided
       const iconImg = container.querySelector('img')
-      expect(iconImg).toBeInTheDocument()
-      expect(iconImg).toHaveAttribute('src', 'https://example.com/avatar-1.png')
+      expect(iconImg)!.toBeInTheDocument()
+      expect(iconImg)!.toHaveAttribute('src', 'https://example.com/avatar-1.png')
     })
 
     it('should render dropdown arrow icon', () => {
@@ -126,7 +126,7 @@ describe('CredentialSelector', () => {
       const { container } = render(<CredentialSelector {...props} />)
 
       const svgIcon = container.querySelector('svg')
-      expect(svgIcon).toBeInTheDocument()
+      expect(svgIcon)!.toBeInTheDocument()
     })
 
     it('should not render dropdown content initially', () => {
@@ -146,7 +146,8 @@ describe('CredentialSelector', () => {
       fireEvent.click(trigger)
 
       // Assert - All credentials should be visible (current credential appears in both trigger and list)
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      // Assert - All credentials should be visible (current credential appears in both trigger and list)
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
       // 3 in dropdown list + 1 in trigger (current) = 4 total
       expect(screen.getAllByText(/Credential \d/)).toHaveLength(4)
     })
@@ -160,7 +161,7 @@ describe('CredentialSelector', () => {
 
         render(<CredentialSelector {...props} />)
 
-        expect(screen.getByText('Credential 1')).toBeInTheDocument()
+        expect(screen.getByText('Credential 1'))!.toBeInTheDocument()
       })
 
       it('should display second credential when currentCredentialId matches second', () => {
@@ -168,7 +169,7 @@ describe('CredentialSelector', () => {
 
         render(<CredentialSelector {...props} />)
 
-        expect(screen.getByText('Credential 2')).toBeInTheDocument()
+        expect(screen.getByText('Credential 2'))!.toBeInTheDocument()
       })
 
       it('should display third credential when currentCredentialId matches third', () => {
@@ -176,7 +177,7 @@ describe('CredentialSelector', () => {
 
         render(<CredentialSelector {...props} />)
 
-        expect(screen.getByText('Credential 3')).toBeInTheDocument()
+        expect(screen.getByText('Credential 3'))!.toBeInTheDocument()
       })
 
       it.each([
@@ -188,7 +189,7 @@ describe('CredentialSelector', () => {
 
         render(<CredentialSelector {...props} />)
 
-        expect(screen.getByText(expectedName)).toBeInTheDocument()
+        expect(screen.getByText(expectedName))!.toBeInTheDocument()
       })
     })
 
@@ -201,7 +202,7 @@ describe('CredentialSelector', () => {
 
         render(<CredentialSelector {...props} />)
 
-        expect(screen.getByText('Test Credential')).toBeInTheDocument()
+        expect(screen.getByText('Test Credential'))!.toBeInTheDocument()
       })
 
       it('should render multiple credentials in dropdown', () => {
@@ -226,7 +227,7 @@ describe('CredentialSelector', () => {
 
         render(<CredentialSelector {...props} />)
 
-        expect(screen.getByText('Test & Credential <special>')).toBeInTheDocument()
+        expect(screen.getByText('Test & Credential <special>'))!.toBeInTheDocument()
       })
     })
 
@@ -293,6 +294,37 @@ describe('CredentialSelector', () => {
       const props = createDefaultProps()
       render(<CredentialSelector {...props} />)
 
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
+      // Assert - Initially closed
       // Assert - Initially closed
       expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
 
@@ -301,7 +333,8 @@ describe('CredentialSelector', () => {
       fireEvent.click(trigger)
 
       // Assert - Now open
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      // Assert - Now open
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should call onCredentialChange when clicking a credential item', () => {
@@ -327,7 +360,7 @@ describe('CredentialSelector', () => {
       const trigger = screen.getByTestId('portal-trigger')
       fireEvent.click(trigger)
 
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
 
       const credential2 = screen.getByText('Credential 2')
       fireEvent.click(credential2)
@@ -347,7 +380,8 @@ describe('CredentialSelector', () => {
       fireEvent.click(trigger)
 
       // Assert - Should not crash
-      expect(trigger).toBeInTheDocument()
+      // Assert - Should not crash
+      expect(trigger)!.toBeInTheDocument()
     })
 
     it('should allow selecting credentials multiple times', () => {
@@ -504,7 +538,8 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Assert - Should display credential 2
-      expect(screen.getByText('Credential 2')).toBeInTheDocument()
+      // Assert - Should display credential 2
+      expect(screen.getByText('Credential 2'))!.toBeInTheDocument()
     })
 
     it('should update currentCredential when currentCredentialId changes', () => {
@@ -512,13 +547,15 @@ describe('CredentialSelector', () => {
       const { rerender } = render(<CredentialSelector {...props} />)
 
       // Assert initial
-      expect(screen.getByText('Credential 1')).toBeInTheDocument()
+      // Assert initial
+      expect(screen.getByText('Credential 1'))!.toBeInTheDocument()
 
       // Act - Change currentCredentialId
       rerender(<CredentialSelector {...props} currentCredentialId="cred-3" />)
 
       // Assert - Should now display credential 3
-      expect(screen.getByText('Credential 3')).toBeInTheDocument()
+      // Assert - Should now display credential 3
+      expect(screen.getByText('Credential 3'))!.toBeInTheDocument()
     })
 
     it('should update currentCredential when credentials array changes', () => {
@@ -526,7 +563,8 @@ describe('CredentialSelector', () => {
       const { rerender } = render(<CredentialSelector {...props} />)
 
       // Assert initial
-      expect(screen.getByText('Credential 1')).toBeInTheDocument()
+      // Assert initial
+      expect(screen.getByText('Credential 1'))!.toBeInTheDocument()
 
       // Act - Change credentials
       const newCredentials = [
@@ -535,7 +573,8 @@ describe('CredentialSelector', () => {
       rerender(<CredentialSelector {...props} credentials={newCredentials} />)
 
       // Assert - Should display updated name
-      expect(screen.getByText('Updated Credential 1')).toBeInTheDocument()
+      // Assert - Should display updated name
+      expect(screen.getByText('Updated Credential 1'))!.toBeInTheDocument()
     })
 
     it('should return undefined currentCredential when id not found', () => {
@@ -581,11 +620,12 @@ describe('CredentialSelector', () => {
       const { rerender } = render(<CredentialSelector {...props} />)
 
       // Assert initial
-      expect(screen.getByText('Credential 1')).toBeInTheDocument()
+      // Assert initial
+      expect(screen.getByText('Credential 1'))!.toBeInTheDocument()
 
       rerender(<CredentialSelector {...props} currentCredentialId="cred-2" />)
 
-      expect(screen.getByText('Credential 2')).toBeInTheDocument()
+      expect(screen.getByText('Credential 2'))!.toBeInTheDocument()
     })
 
     it('should re-render when credentials array reference changes', () => {
@@ -598,7 +638,7 @@ describe('CredentialSelector', () => {
       ]
       rerender(<CredentialSelector {...props} credentials={newCredentials} />)
 
-      expect(screen.getByText('New Name 1')).toBeInTheDocument()
+      expect(screen.getByText('New Name 1'))!.toBeInTheDocument()
     })
 
     it('should re-render when onCredentialChange reference changes', () => {
@@ -631,7 +671,8 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Assert - Should render without crashing
-      expect(screen.getByTestId('portal-root')).toBeInTheDocument()
+      // Assert - Should render without crashing
+      expect(screen.getByTestId('portal-root'))!.toBeInTheDocument()
     })
 
     it('should handle undefined avatar_url in credential', () => {
@@ -648,12 +689,14 @@ describe('CredentialSelector', () => {
       const { container } = render(<CredentialSelector {...props} />)
 
       // Assert - Should render without crashing and show first letter fallback
-      expect(screen.getByText('No Avatar Credential')).toBeInTheDocument()
+      // Assert - Should render without crashing and show first letter fallback
+      expect(screen.getByText('No Avatar Credential'))!.toBeInTheDocument()
       // When avatar_url is undefined, CredentialIcon shows first letter instead of img
       const iconImg = container.querySelector('img')
       expect(iconImg).not.toBeInTheDocument()
       // First letter 'N' should be displayed
-      expect(screen.getByText('N')).toBeInTheDocument()
+      // First letter 'N' should be displayed
+      expect(screen.getByText('N'))!.toBeInTheDocument()
     })
 
     it('should handle empty string name in credential', () => {
@@ -669,7 +712,8 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Assert - Should render without crashing
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
+      // Assert - Should render without crashing
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
     })
 
     it('should handle very long credential name', () => {
@@ -685,7 +729,7 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByText(longName)).toBeInTheDocument()
+      expect(screen.getByText(longName))!.toBeInTheDocument()
     })
 
     it('should handle special characters in credential name', () => {
@@ -701,7 +745,7 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByText(specialName)).toBeInTheDocument()
+      expect(screen.getByText(specialName))!.toBeInTheDocument()
     })
 
     it('should handle numeric id as string', () => {
@@ -716,7 +760,7 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByText('Numeric ID Credential')).toBeInTheDocument()
+      expect(screen.getByText('Numeric ID Credential'))!.toBeInTheDocument()
     })
 
     it('should handle large number of credentials', () => {
@@ -728,7 +772,7 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByText('Credential 50')).toBeInTheDocument()
+      expect(screen.getByText('Credential 50'))!.toBeInTheDocument()
     })
 
     it('should handle credential selection with duplicate names', () => {
@@ -752,7 +796,7 @@ describe('CredentialSelector', () => {
       const sameNameElements = screen.getAllByText('Same Name')
       expect(sameNameElements.length).toBe(3)
 
-      fireEvent.click(sameNameElements[2])
+      fireEvent.click(sameNameElements[2]!)
 
       // Assert - Should call with the correct id even with duplicate names
       expect(mockOnChange).toHaveBeenCalledWith('cred-2')
@@ -787,7 +831,8 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Assert - Should render without crashing
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
+      // Assert - Should render without crashing
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -799,7 +844,7 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       const trigger = screen.getByTestId('portal-trigger')
-      expect(trigger).toHaveClass('overflow-hidden')
+      expect(trigger)!.toHaveClass('overflow-hidden')
     })
 
     it('should apply grow class to trigger', () => {
@@ -808,7 +853,7 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       const trigger = screen.getByTestId('portal-trigger')
-      expect(trigger).toHaveClass('grow')
+      expect(trigger)!.toHaveClass('grow')
     })
 
     it('should apply z-10 class to dropdown content', () => {
@@ -819,7 +864,7 @@ describe('CredentialSelector', () => {
       fireEvent.click(trigger)
 
       const content = screen.getByTestId('portal-content')
-      expect(content).toHaveClass('z-10')
+      expect(content)!.toHaveClass('z-10')
     })
   })
 
@@ -831,7 +876,8 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Assert - Trigger should display the correct credential
-      expect(screen.getByText('Credential 2')).toBeInTheDocument()
+      // Assert - Trigger should display the correct credential
+      expect(screen.getByText('Credential 2'))!.toBeInTheDocument()
     })
 
     it('should pass isOpen state to Trigger component', () => {
@@ -840,14 +886,15 @@ describe('CredentialSelector', () => {
 
       // Assert - Initially closed
       const portalRoot = screen.getByTestId('portal-root')
-      expect(portalRoot).toHaveAttribute('data-open', 'false')
+      expect(portalRoot)!.toHaveAttribute('data-open', 'false')
 
       // Act - Open
       const trigger = screen.getByTestId('portal-trigger')
       fireEvent.click(trigger)
 
       // Assert - Now open
-      expect(portalRoot).toHaveAttribute('data-open', 'true')
+      // Assert - Now open
+      expect(portalRoot)!.toHaveAttribute('data-open', 'true')
     })
 
     it('should pass credentials to List component', () => {
@@ -899,7 +946,7 @@ describe('CredentialSelector', () => {
       const props = createDefaultProps()
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByTestId('portal-root')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-root'))!.toBeInTheDocument()
     })
 
     it('should configure PortalToFollowElem with offset mainAxis 4', () => {
@@ -907,7 +954,7 @@ describe('CredentialSelector', () => {
       const props = createDefaultProps()
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByTestId('portal-root')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-root'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx
index 2f14b0f3b8..116b762277 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx
@@ -29,7 +29,7 @@ const CredentialSelector = ({
 
   useEffect(() => {
     if (!currentCredential && credentials.length)
-      onCredentialChange(credentials[0].id)
+      onCredentialChange(credentials[0]!.id)
   }, [currentCredential, credentials])
 
   const handleCredentialChange = useCallback((credentialId: string) => {
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/local-file/hooks/__tests__/use-local-file-upload.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/local-file/hooks/__tests__/use-local-file-upload.spec.tsx
index cc531aad8f..80a8fc854d 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/local-file/hooks/__tests__/use-local-file-upload.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/local-file/hooks/__tests__/use-local-file-upload.spec.tsx
@@ -404,7 +404,7 @@ describe('useLocalFileUpload', () => {
 
       // Should only process first 5 files (batch_count_limit)
       const firstCall = mockSetLocalFileList.mock.calls[0]
-      expect(firstCall[0].length).toBeLessThanOrEqual(5)
+      expect(firstCall![0].length).toBeLessThanOrEqual(5)
     })
   })
 
@@ -591,7 +591,8 @@ describe('useLocalFileUpload', () => {
       })
 
       // dragover should not throw
-      expect(dropzone).toBeInTheDocument()
+      // dragover should not throw
+      expect(dropzone)!.toBeInTheDocument()
     })
 
     it('should set dragging false on dragleave from drag overlay', async () => {
@@ -715,7 +716,7 @@ describe('useLocalFileUpload', () => {
       await waitFor(() => {
         expect(mockSetLocalFileList).toHaveBeenCalled()
         // Should only have 1 file (limited by supportBatchUpload: false)
-        const callArgs = mockSetLocalFileList.mock.calls[0][0]
+        const callArgs = mockSetLocalFileList.mock.calls[0]![0]
         expect(callArgs.length).toBe(1)
       })
     })
@@ -873,7 +874,7 @@ describe('useLocalFileUpload', () => {
       })
 
       await waitFor(() => {
-        const callArgs = mockSetLocalFileList.mock.calls[0][0]
+        const callArgs = mockSetLocalFileList.mock.calls[0]![0]
         expect(callArgs[0].progress).toBe(PROGRESS_NOT_STARTED)
       })
     })
@@ -899,7 +900,7 @@ describe('useLocalFileUpload', () => {
 
       await waitFor(() => {
         const calls = mockSetLocalFileList.mock.calls
-        const lastCall = calls[calls.length - 1][0]
+        const lastCall = calls[calls.length - 1]![0]
         expect(lastCall.some((f: FileItem) => f.progress === PROGRESS_ERROR)).toBe(true)
       })
     })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/index.tsx
index 5051d343cb..5321986cd7 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/index.tsx
@@ -115,7 +115,7 @@ const OnlineDocuments = ({
 
   const handleSelectPages = useCallback((newSelectedPagesId: Set<string>) => {
     const { setSelectedPagesId, setOnlineDocuments } = dataSourceStore.getState()
-    const selectedPages = Array.from(newSelectedPagesId).map(pageId => PagesMapAndSelectedPagesId[pageId])
+    const selectedPages = Array.from(newSelectedPagesId).map(pageId => PagesMapAndSelectedPagesId[pageId]!)
     setSelectedPagesId(new Set(Array.from(newSelectedPagesId)))
     setOnlineDocuments(selectedPages)
   }, [dataSourceStore, PagesMapAndSelectedPagesId])
@@ -160,7 +160,7 @@ const OnlineDocuments = ({
                   checkedIds={selectedPagesId}
                   disabledValue={new Set()}
                   searchValue={searchValue}
-                  list={documentsData[0].pages || []}
+                  list={documentsData[0]!.pages || []}
                   pagesMap={PagesMapAndSelectedPagesId}
                   onSelect={handleSelectPages}
                   canPreview={!isInPipeline}
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/index.spec.tsx
index a6d5738e2d..04676156e6 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/index.spec.tsx
@@ -83,7 +83,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByTestId('virtual-list')).toBeInTheDocument()
+      expect(screen.getByTestId('virtual-list'))!.toBeInTheDocument()
     })
 
     it('should render empty state when list is empty', () => {
@@ -94,7 +94,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByText('common.dataSource.notion.selector.noSearchResult')).toBeInTheDocument()
+      expect(screen.getByText('common.dataSource.notion.selector.noSearchResult'))!.toBeInTheDocument()
       expect(screen.queryByTestId('virtual-list')).not.toBeInTheDocument()
     })
 
@@ -110,8 +110,8 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByText('Page 1')).toBeInTheDocument()
-      expect(screen.getByText('Page 2')).toBeInTheDocument()
+      expect(screen.getByText('Page 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Page 2'))!.toBeInTheDocument()
     })
 
     it('should render checkboxes when isMultipleChoice is true', () => {
@@ -119,7 +119,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(getCheckbox()).toBeInTheDocument()
+      expect(getCheckbox())!.toBeInTheDocument()
     })
 
     it('should render radio buttons when isMultipleChoice is false', () => {
@@ -127,7 +127,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(getRadio()).toBeInTheDocument()
+      expect(getRadio())!.toBeInTheDocument()
     })
 
     it('should render preview button when canPreview is true', () => {
@@ -135,7 +135,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByText('common.dataSource.notion.selector.preview')).toBeInTheDocument()
+      expect(screen.getByText('common.dataSource.notion.selector.preview'))!.toBeInTheDocument()
     })
 
     it('should not render preview button when canPreview is false', () => {
@@ -153,7 +153,7 @@ describe('PageSelector', () => {
 
       // Assert - NotionIcon renders svg when page_icon is null
       const notionIcon = document.querySelector('.h-5.w-5')
-      expect(notionIcon).toBeInTheDocument()
+      expect(notionIcon)!.toBeInTheDocument()
     })
 
     it('should render page name', () => {
@@ -164,7 +164,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByText('My Custom Page')).toBeInTheDocument()
+      expect(screen.getByText('My Custom Page'))!.toBeInTheDocument()
     })
   })
 
@@ -181,7 +181,7 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
 
         const checkbox = getCheckbox()
-        expect(checkbox).toBeInTheDocument()
+        expect(checkbox)!.toBeInTheDocument()
         expect(isCheckboxChecked(checkbox)).toBe(true)
       })
 
@@ -196,7 +196,7 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
 
         const checkbox = getCheckbox()
-        expect(checkbox).toBeInTheDocument()
+        expect(checkbox)!.toBeInTheDocument()
         expect(isCheckboxChecked(checkbox)).toBe(false)
       })
 
@@ -206,7 +206,7 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
 
         const checkbox = getCheckbox()
-        expect(checkbox).toBeInTheDocument()
+        expect(checkbox)!.toBeInTheDocument()
         expect(isCheckboxChecked(checkbox)).toBe(false)
       })
 
@@ -225,9 +225,9 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
 
         const checkboxes = getAllCheckboxes()
-        expect(isCheckboxChecked(checkboxes[0])).toBe(true)
-        expect(isCheckboxChecked(checkboxes[1])).toBe(false)
-        expect(isCheckboxChecked(checkboxes[2])).toBe(true)
+        expect(isCheckboxChecked(checkboxes[0]!)).toBe(true)
+        expect(isCheckboxChecked(checkboxes[1]!)).toBe(false)
+        expect(isCheckboxChecked(checkboxes[2]!)).toBe(true)
       })
     })
 
@@ -243,7 +243,7 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
 
         const checkbox = getCheckbox()
-        expect(checkbox).toBeInTheDocument()
+        expect(checkbox)!.toBeInTheDocument()
         expect(isCheckboxDisabled(checkbox)).toBe(true)
       })
 
@@ -258,7 +258,7 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
 
         const checkbox = getCheckbox()
-        expect(checkbox).toBeInTheDocument()
+        expect(checkbox)!.toBeInTheDocument()
         expect(isCheckboxDisabled(checkbox)).toBe(false)
       })
 
@@ -276,8 +276,8 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
 
         const checkboxes = getAllCheckboxes()
-        expect(isCheckboxDisabled(checkboxes[0])).toBe(true)
-        expect(isCheckboxDisabled(checkboxes[1])).toBe(false)
+        expect(isCheckboxDisabled(checkboxes[0]!)).toBe(true)
+        expect(isCheckboxDisabled(checkboxes[1]!)).toBe(false)
       })
     })
 
@@ -301,6 +301,37 @@ describe('PageSelector', () => {
         expect(screen.getAllByText('Apple Page').length).toBeGreaterThan(0)
         expect(screen.getAllByText('Apple Pie').length).toBeGreaterThan(0)
         // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
+        // Banana Page is filtered out because it doesn't contain "Apple"
         expect(screen.queryByText('Banana Page')).not.toBeInTheDocument()
       })
 
@@ -314,7 +345,7 @@ describe('PageSelector', () => {
 
         render(<PageSelector {...props} />)
 
-        expect(screen.getByText('common.dataSource.notion.selector.noSearchResult')).toBeInTheDocument()
+        expect(screen.getByText('common.dataSource.notion.selector.noSearchResult'))!.toBeInTheDocument()
       })
 
       it('should show all pages when searchValue is empty', () => {
@@ -330,8 +361,8 @@ describe('PageSelector', () => {
 
         render(<PageSelector {...props} />)
 
-        expect(screen.getByText('Page 1')).toBeInTheDocument()
-        expect(screen.getByText('Page 2')).toBeInTheDocument()
+        expect(screen.getByText('Page 1'))!.toBeInTheDocument()
+        expect(screen.getByText('Page 2'))!.toBeInTheDocument()
       })
 
       it('should show breadcrumbs when searchValue is present', () => {
@@ -345,7 +376,8 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
 
         // Assert - page name should be visible
-        expect(screen.getByText('Grandchild 1')).toBeInTheDocument()
+        // Assert - page name should be visible
+        expect(screen.getByText('Grandchild 1'))!.toBeInTheDocument()
       })
 
       it('should perform case-sensitive search', () => {
@@ -374,7 +406,7 @@ describe('PageSelector', () => {
 
         render(<PageSelector {...props} />)
 
-        expect(screen.getByText('common.dataSource.notion.selector.preview')).toBeInTheDocument()
+        expect(screen.getByText('common.dataSource.notion.selector.preview'))!.toBeInTheDocument()
       })
 
       it('should hide preview button when canPreview is false', () => {
@@ -391,7 +423,7 @@ describe('PageSelector', () => {
 
         render(<PageSelector {...props} />)
 
-        expect(screen.getByText('common.dataSource.notion.selector.preview')).toBeInTheDocument()
+        expect(screen.getByText('common.dataSource.notion.selector.preview'))!.toBeInTheDocument()
       })
     })
 
@@ -401,7 +433,7 @@ describe('PageSelector', () => {
 
         render(<PageSelector {...props} />)
 
-        expect(getCheckbox()).toBeInTheDocument()
+        expect(getCheckbox())!.toBeInTheDocument()
         expect(getRadio()).not.toBeInTheDocument()
       })
 
@@ -410,7 +442,7 @@ describe('PageSelector', () => {
 
         render(<PageSelector {...props} />)
 
-        expect(getRadio()).toBeInTheDocument()
+        expect(getRadio())!.toBeInTheDocument()
         expect(getCheckbox()).not.toBeInTheDocument()
       })
 
@@ -420,7 +452,7 @@ describe('PageSelector', () => {
 
         render(<PageSelector {...props} />)
 
-        expect(getCheckbox()).toBeInTheDocument()
+        expect(getCheckbox())!.toBeInTheDocument()
       })
     })
 
@@ -449,7 +481,7 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
         fireEvent.click(getCheckbox())
 
-        const calledSet = mockOnSelect.mock.calls[0][0] as Set<string>
+        const calledSet = mockOnSelect.mock.calls[0]![0] as Set<string>
         expect(calledSet.has('page-1')).toBe(true)
       })
     })
@@ -498,13 +530,15 @@ describe('PageSelector', () => {
         const { rerender } = render(<PageSelector {...props} />)
 
         // Assert - Initial render
-        expect(screen.getByText('Page 1')).toBeInTheDocument()
+        // Assert - Initial render
+        expect(screen.getByText('Page 1'))!.toBeInTheDocument()
 
         // Rerender with new credential
         rerender(<PageSelector {...props} currentCredentialId="cred-2" />)
 
         // Assert - Should still show pages (reset and rebuild)
-        expect(screen.getByText('Page 1')).toBeInTheDocument()
+        // Assert - Should still show pages (reset and rebuild)
+        expect(screen.getByText('Page 1'))!.toBeInTheDocument()
       })
     })
   })
@@ -521,7 +555,39 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       // Assert - Only root level page should be visible initially
-      expect(screen.getByText(rootPage.page_name)).toBeInTheDocument()
+      // Assert - Only root level page should be visible initially
+      expect(screen.getByText(rootPage.page_name))!.toBeInTheDocument()
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
+      // Child pages should not be visible until expanded
       // Child pages should not be visible until expanded
       expect(screen.queryByText(childPage1.page_name)).not.toBeInTheDocument()
     })
@@ -540,9 +606,9 @@ describe('PageSelector', () => {
       if (arrowButton)
         fireEvent.click(arrowButton)
 
-      expect(screen.getByText(rootPage.page_name)).toBeInTheDocument()
-      expect(screen.getByText(childPage1.page_name)).toBeInTheDocument()
-      expect(screen.getByText(childPage2.page_name)).toBeInTheDocument()
+      expect(screen.getByText(rootPage.page_name))!.toBeInTheDocument()
+      expect(screen.getByText(childPage1.page_name))!.toBeInTheDocument()
+      expect(screen.getByText(childPage2.page_name))!.toBeInTheDocument()
     })
 
     it('should maintain currentPreviewPageId state', () => {
@@ -560,7 +626,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
       const previewButtons = screen.getAllByText('common.dataSource.notion.selector.preview')
-      fireEvent.click(previewButtons[0])
+      fireEvent.click(previewButtons[0]!)
 
       expect(mockOnPreview).toHaveBeenCalledWith('page-1')
     })
@@ -596,13 +662,14 @@ describe('PageSelector', () => {
       })
 
       const { rerender } = render(<PageSelector {...props} />)
-      expect(screen.getByText('Page 1')).toBeInTheDocument()
+      expect(screen.getByText('Page 1'))!.toBeInTheDocument()
 
       // Change credential
       rerender(<PageSelector {...props} currentCredentialId="cred-2" />)
 
       // Assert - Component should still render correctly
-      expect(screen.getByText('Page 1')).toBeInTheDocument()
+      // Assert - Component should still render correctly
+      expect(screen.getByText('Page 1'))!.toBeInTheDocument()
     })
 
     it('should filter root pages correctly on initialization', () => {
@@ -615,7 +682,8 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       // Assert - Only root level pages visible
-      expect(screen.getByText(rootPage.page_name)).toBeInTheDocument()
+      // Assert - Only root level pages visible
+      expect(screen.getByText(rootPage.page_name))!.toBeInTheDocument()
       expect(screen.queryByText(childPage1.page_name)).not.toBeInTheDocument()
     })
 
@@ -633,7 +701,8 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       // Assert - Orphan page should be visible at root level
-      expect(screen.getByText('Orphan Page')).toBeInTheDocument()
+      // Assert - Orphan page should be visible at root level
+      expect(screen.getByText('Orphan Page'))!.toBeInTheDocument()
     })
   })
 
@@ -654,8 +723,9 @@ describe('PageSelector', () => {
         fireEvent.click(expandArrow)
 
       // Assert - Children should be visible
-      expect(screen.getByText(childPage1.page_name)).toBeInTheDocument()
-      expect(screen.getByText(childPage2.page_name)).toBeInTheDocument()
+      // Assert - Children should be visible
+      expect(screen.getByText(childPage1.page_name))!.toBeInTheDocument()
+      expect(screen.getByText(childPage2.page_name))!.toBeInTheDocument()
     })
 
     it('should have stable handleToggle that collapses descendants', () => {
@@ -675,6 +745,37 @@ describe('PageSelector', () => {
         fireEvent.click(expandArrow)
       }
 
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
+      // Assert - Children should be hidden again
       // Assert - Children should be hidden again
       expect(screen.queryByText(childPage1.page_name)).not.toBeInTheDocument()
       expect(screen.queryByText(childPage2.page_name)).not.toBeInTheDocument()
@@ -698,7 +799,7 @@ describe('PageSelector', () => {
 
       // Assert - onSelect should be called with the page and its descendants
       expect(mockOnSelect).toHaveBeenCalled()
-      const selectedSet = mockOnSelect.mock.calls[0][0] as Set<string>
+      const selectedSet = mockOnSelect.mock.calls[0]![0] as Set<string>
       expect(selectedSet.has('root-page')).toBe(true)
     })
 
@@ -752,7 +853,7 @@ describe('PageSelector', () => {
 
       // Assert - Tree structure should be built (verified by expand functionality)
       const expandArrow = document.querySelector('[class*="hover:bg-components-button-ghost-bg-hover"]')
-      expect(expandArrow).toBeInTheDocument() // Root page has children
+      expect(expandArrow)!.toBeInTheDocument() // Root page has children
     })
 
     it('should recompute listMapWithChildrenAndDescendants when list changes', () => {
@@ -763,7 +864,7 @@ describe('PageSelector', () => {
       })
 
       const { rerender } = render(<PageSelector {...props} />)
-      expect(screen.getByText('Page 1')).toBeInTheDocument()
+      expect(screen.getByText('Page 1'))!.toBeInTheDocument()
 
       // Update with new list
       const newList = [
@@ -772,7 +873,7 @@ describe('PageSelector', () => {
       ]
       rerender(<PageSelector {...props} list={newList} pagesMap={createMockPagesMap(newList)} />)
 
-      expect(screen.getByText('Page 1')).toBeInTheDocument()
+      expect(screen.getByText('Page 1'))!.toBeInTheDocument()
       // Page 2 won't show because dataList state hasn't updated (only resets on credentialId change)
     })
 
@@ -793,7 +894,8 @@ describe('PageSelector', () => {
       rerender(<PageSelector {...props} pagesMap={newPagesMap} />)
 
       // Assert - Should not throw
-      expect(screen.getByText('Page 1')).toBeInTheDocument()
+      // Assert - Should not throw
+      expect(screen.getByText('Page 1'))!.toBeInTheDocument()
     })
 
     it('should handle empty list in memoization', () => {
@@ -804,7 +906,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByText('common.dataSource.notion.selector.noSearchResult')).toBeInTheDocument()
+      expect(screen.getByText('common.dataSource.notion.selector.noSearchResult'))!.toBeInTheDocument()
     })
   })
 
@@ -819,6 +921,37 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
+      // Initially children are hidden
       // Initially children are hidden
       expect(screen.queryByText(childPage1.page_name)).not.toBeInTheDocument()
 
@@ -827,7 +960,8 @@ describe('PageSelector', () => {
         fireEvent.click(expandArrow)
 
       // Children become visible
-      expect(screen.getByText(childPage1.page_name)).toBeInTheDocument()
+      // Children become visible
+      expect(screen.getByText(childPage1.page_name))!.toBeInTheDocument()
     })
 
     it('should check/uncheck page when clicking checkbox', () => {
@@ -873,11 +1007,11 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
       const radios = getAllRadios()
-      fireEvent.click(radios[1]) // Click on page-2
+      fireEvent.click(radios[1]!) // Click on page-2
 
       // Assert - Should clear page-1 and select page-2
       expect(mockOnSelect).toHaveBeenCalled()
-      const selectedSet = mockOnSelect.mock.calls[0][0] as Set<string>
+      const selectedSet = mockOnSelect.mock.calls[0]![0] as Set<string>
       expect(selectedSet.has('page-2')).toBe(true)
       expect(selectedSet.has('page-1')).toBe(false)
     })
@@ -912,7 +1046,7 @@ describe('PageSelector', () => {
 
       // Assert - Only the clicked page should be selected (no descendants)
       expect(mockOnSelect).toHaveBeenCalled()
-      const selectedSet = mockOnSelect.mock.calls[0][0] as Set<string>
+      const selectedSet = mockOnSelect.mock.calls[0]![0] as Set<string>
       expect(selectedSet.size).toBe(1)
       expect(selectedSet.has('root-page')).toBe(true)
     })
@@ -927,7 +1061,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByText('common.dataSource.notion.selector.noSearchResult')).toBeInTheDocument()
+      expect(screen.getByText('common.dataSource.notion.selector.noSearchResult'))!.toBeInTheDocument()
     })
 
     it('should handle null page_icon', () => {
@@ -941,7 +1075,7 @@ describe('PageSelector', () => {
 
       // Assert - NotionIcon renders svg (RiFileTextLine) when page_icon is null
       const notionIcon = document.querySelector('.h-5.w-5')
-      expect(notionIcon).toBeInTheDocument()
+      expect(notionIcon)!.toBeInTheDocument()
     })
 
     it('should handle page_icon with all properties', () => {
@@ -956,7 +1090,8 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       // Assert - NotionIcon renders the emoji
-      expect(screen.getByText('📄')).toBeInTheDocument()
+      // Assert - NotionIcon renders the emoji
+      expect(screen.getByText('📄'))!.toBeInTheDocument()
     })
 
     it('should handle empty searchValue correctly', () => {
@@ -964,7 +1099,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByTestId('virtual-list')).toBeInTheDocument()
+      expect(screen.getByTestId('virtual-list'))!.toBeInTheDocument()
     })
 
     it('should handle special characters in page name', () => {
@@ -976,7 +1111,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByText('Test <script>alert("xss")</script>')).toBeInTheDocument()
+      expect(screen.getByText('Test <script>alert("xss")</script>'))!.toBeInTheDocument()
     })
 
     it('should handle unicode characters in page name', () => {
@@ -988,7 +1123,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByText('测试页面 🔍 привет')).toBeInTheDocument()
+      expect(screen.getByText('测试页面 🔍 привет'))!.toBeInTheDocument()
     })
 
     it('should handle very long page names', () => {
@@ -1001,7 +1136,7 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByText(longName)).toBeInTheDocument()
+      expect(screen.getByText(longName))!.toBeInTheDocument()
     })
 
     it('should handle deeply nested hierarchy', () => {
@@ -1027,7 +1162,8 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       // Assert - Only root level visible
-      expect(screen.getByText('Level 0')).toBeInTheDocument()
+      // Assert - Only root level visible
+      expect(screen.getByText('Level 0'))!.toBeInTheDocument()
       expect(screen.queryByText('Level 1')).not.toBeInTheDocument()
     })
 
@@ -1048,7 +1184,8 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       // Assert - Should render the orphan page at root level
-      expect(screen.getByText('Orphan Page')).toBeInTheDocument()
+      // Assert - Should render the orphan page at root level
+      expect(screen.getByText('Orphan Page'))!.toBeInTheDocument()
     })
 
     it('should handle empty checkedIds Set', () => {
@@ -1057,7 +1194,7 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       const checkbox = getCheckbox()
-      expect(checkbox).toBeInTheDocument()
+      expect(checkbox)!.toBeInTheDocument()
       expect(isCheckboxChecked(checkbox)).toBe(false)
     })
 
@@ -1067,7 +1204,7 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       const checkbox = getCheckbox()
-      expect(checkbox).toBeInTheDocument()
+      expect(checkbox)!.toBeInTheDocument()
       expect(isCheckboxDisabled(checkbox)).toBe(false)
     })
 
@@ -1112,16 +1249,16 @@ describe('PageSelector', () => {
 
       render(<PageSelector {...props} />)
 
-      expect(screen.getByTestId('virtual-list')).toBeInTheDocument()
+      expect(screen.getByTestId('virtual-list'))!.toBeInTheDocument()
       if (propVariation.canPreview)
-        expect(screen.getByText('common.dataSource.notion.selector.preview')).toBeInTheDocument()
+        expect(screen.getByText('common.dataSource.notion.selector.preview'))!.toBeInTheDocument()
       else
         expect(screen.queryByText('common.dataSource.notion.selector.preview')).not.toBeInTheDocument()
 
       if (propVariation.isMultipleChoice)
-        expect(getCheckbox()).toBeInTheDocument()
+        expect(getCheckbox())!.toBeInTheDocument()
       else
-        expect(getRadio()).toBeInTheDocument()
+        expect(getRadio())!.toBeInTheDocument()
     })
 
     it('should handle all default prop values', () => {
@@ -1140,8 +1277,9 @@ describe('PageSelector', () => {
       render(<PageSelector {...minimalProps} />)
 
       // Assert - Defaults should be applied
-      expect(getCheckbox()).toBeInTheDocument()
-      expect(screen.getByText('common.dataSource.notion.selector.preview')).toBeInTheDocument()
+      // Assert - Defaults should be applied
+      expect(getCheckbox())!.toBeInTheDocument()
+      expect(screen.getByText('common.dataSource.notion.selector.preview'))!.toBeInTheDocument()
     })
   })
 
@@ -1166,8 +1304,8 @@ describe('PageSelector', () => {
       recursivePushInParentDescendants(pagesMap, listTreeMap, childEntry, childEntry)
 
       expect(listTreeMap.parent).toBeDefined()
-      expect(listTreeMap.parent.children.has('child')).toBe(true)
-      expect(listTreeMap.parent.descendants.has('child')).toBe(true)
+      expect(listTreeMap.parent!.children.has('child')).toBe(true)
+      expect(listTreeMap.parent!.descendants.has('child')).toBe(true)
       expect(childEntry.depth).toBe(1)
       expect(childEntry.ancestors).toContain('Parent')
     })
@@ -1274,8 +1412,8 @@ describe('PageSelector', () => {
 
       expect(l2Entry.depth).toBe(2)
       expect(l2Entry.ancestors).toEqual(['Level 0', 'Level 1'])
-      expect(listTreeMap.l1.children.has('l2')).toBe(true)
-      expect(listTreeMap.l0.descendants.has('l2')).toBe(true)
+      expect(listTreeMap.l1!.children.has('l2')).toBe(true)
+      expect(listTreeMap.l0!.descendants.has('l2')).toBe(true)
     })
 
     it('should update existing parent entry', () => {
@@ -1329,7 +1467,7 @@ describe('PageSelector', () => {
 
       // Assert - Item should have preview styling class
       const itemContainer = screen.getByText('Test Page').closest('[class*="group"]')
-      expect(itemContainer).toHaveClass('bg-state-base-hover')
+      expect(itemContainer)!.toHaveClass('bg-state-base-hover')
     })
 
     it('should show arrow for pages with children', () => {
@@ -1343,7 +1481,7 @@ describe('PageSelector', () => {
 
       // Assert - Root page should have expand arrow
       const arrowContainer = document.querySelector('[class*="hover:bg-components-button-ghost-bg-hover"]')
-      expect(arrowContainer).toBeInTheDocument()
+      expect(arrowContainer)!.toBeInTheDocument()
     })
 
     it('should not show arrow for leaf pages', () => {
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/utils.spec.ts b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/utils.spec.ts
index 2a081ef418..a7175a47de 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/utils.spec.ts
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/utils.spec.ts
@@ -28,11 +28,11 @@ describe('recursivePushInParentDescendants', () => {
       child1: makePageEntry({ page_id: 'child1', parent_id: 'parent1', page_name: 'Child' }),
     }
 
-    recursivePushInParentDescendants(pagesMap, listTreeMap, listTreeMap.child1, listTreeMap.child1)
+    recursivePushInParentDescendants(pagesMap, listTreeMap, listTreeMap.child1!, listTreeMap.child1!)
 
     expect(listTreeMap.parent1).toBeDefined()
-    expect(listTreeMap.parent1.children.has('child1')).toBe(true)
-    expect(listTreeMap.parent1.descendants.has('child1')).toBe(true)
+    expect(listTreeMap.parent1!.children.has('child1')).toBe(true)
+    expect(listTreeMap.parent1!.descendants.has('child1')).toBe(true)
   })
 
   it('should recursively populate ancestors for deeply nested items', () => {
@@ -47,11 +47,11 @@ describe('recursivePushInParentDescendants', () => {
       child: makePageEntry({ page_id: 'child', parent_id: 'parent', page_name: 'Child' }),
     }
 
-    recursivePushInParentDescendants(pagesMap, listTreeMap, listTreeMap.child, listTreeMap.child)
+    recursivePushInParentDescendants(pagesMap, listTreeMap, listTreeMap.child!, listTreeMap.child!)
 
-    expect(listTreeMap.child.depth).toBe(2)
-    expect(listTreeMap.child.ancestors).toContain('Grandparent')
-    expect(listTreeMap.child.ancestors).toContain('Parent')
+    expect(listTreeMap.child!.depth).toBe(2)
+    expect(listTreeMap.child!.ancestors).toContain('Grandparent')
+    expect(listTreeMap.child!.ancestors).toContain('Parent')
   })
 
   it('should do nothing for root parent', () => {
@@ -63,7 +63,7 @@ describe('recursivePushInParentDescendants', () => {
       root_child: makePageEntry({ page_id: 'root_child', parent_id: 'root', page_name: 'Root Child' }),
     }
 
-    recursivePushInParentDescendants(pagesMap, listTreeMap, listTreeMap.root_child, listTreeMap.root_child)
+    recursivePushInParentDescendants(pagesMap, listTreeMap, listTreeMap.root_child!, listTreeMap.root_child!)
 
     // No new entries should be added since parent is root
     expect(Object.keys(listTreeMap)).toEqual(['root_child'])
@@ -76,7 +76,7 @@ describe('recursivePushInParentDescendants', () => {
 
     // Should not throw
     recursivePushInParentDescendants(pagesMap, listTreeMap, current, current)
-    expect(listTreeMap.orphan.depth).toBe(0)
+    expect(listTreeMap.orphan!.depth).toBe(0)
   })
 
   it('should add to existing parent entry when parent already in tree', () => {
@@ -91,10 +91,10 @@ describe('recursivePushInParentDescendants', () => {
       child2: makePageEntry({ page_id: 'child2', parent_id: 'parent', page_name: 'Child2' }),
     }
 
-    recursivePushInParentDescendants(pagesMap, listTreeMap, listTreeMap.child2, listTreeMap.child2)
+    recursivePushInParentDescendants(pagesMap, listTreeMap, listTreeMap.child2!, listTreeMap.child2!)
 
-    expect(listTreeMap.parent.children.has('child2')).toBe(true)
-    expect(listTreeMap.parent.descendants.has('child2')).toBe(true)
-    expect(listTreeMap.parent.children.has('child1')).toBe(true)
+    expect(listTreeMap.parent!.children.has('child2')).toBe(true)
+    expect(listTreeMap.parent!.descendants.has('child2')).toBe(true)
+    expect(listTreeMap.parent!.children.has('child1')).toBe(true)
   })
 })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/index.spec.tsx
index 7c1941afd9..6eed119ede 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/index.spec.tsx
@@ -259,8 +259,8 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('header')).toBeInTheDocument()
-      expect(screen.getByTestId('file-list')).toBeInTheDocument()
+      expect(screen.getByTestId('header'))!.toBeInTheDocument()
+      expect(screen.getByTestId('file-list'))!.toBeInTheDocument()
     })
 
     it('should render Header with correct props', () => {
@@ -271,9 +271,9 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('header-doc-title')).toHaveTextContent('Docs')
-      expect(screen.getByTestId('header-plugin-name')).toHaveTextContent('My Online Drive')
-      expect(screen.getByTestId('header-credential-id')).toHaveTextContent('cred-123')
+      expect(screen.getByTestId('header-doc-title'))!.toHaveTextContent('Docs')
+      expect(screen.getByTestId('header-plugin-name'))!.toHaveTextContent('My Online Drive')
+      expect(screen.getByTestId('header-credential-id'))!.toHaveTextContent('cred-123')
     })
 
     it('should render FileList with correct props', () => {
@@ -290,11 +290,11 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('file-list')).toBeInTheDocument()
-      expect(screen.getByTestId('file-list-keywords')).toHaveTextContent('search-term')
-      expect(screen.getByTestId('file-list-breadcrumbs')).toHaveTextContent('folder1/folder2')
-      expect(screen.getByTestId('file-list-bucket')).toHaveTextContent('my-bucket')
-      expect(screen.getByTestId('file-list-selected-count')).toHaveTextContent('2')
+      expect(screen.getByTestId('file-list'))!.toBeInTheDocument()
+      expect(screen.getByTestId('file-list-keywords'))!.toHaveTextContent('search-term')
+      expect(screen.getByTestId('file-list-breadcrumbs'))!.toHaveTextContent('folder1/folder2')
+      expect(screen.getByTestId('file-list-bucket'))!.toHaveTextContent('my-bucket')
+      expect(screen.getByTestId('file-list-selected-count'))!.toHaveTextContent('2')
     })
 
     it('should pass docLink with correct path to Header', () => {
@@ -371,7 +371,7 @@ describe('OnlineDrive', () => {
 
         render(<OnlineDrive {...props} />)
 
-        expect(screen.getByTestId('header-plugin-name')).toHaveTextContent('Custom Online Drive')
+        expect(screen.getByTestId('header-plugin-name'))!.toHaveTextContent('Custom Online Drive')
       })
     })
 
@@ -411,7 +411,7 @@ describe('OnlineDrive', () => {
 
         render(<OnlineDrive {...props} />)
 
-        expect(screen.getByTestId('file-list-is-in-pipeline')).toHaveTextContent('true')
+        expect(screen.getByTestId('file-list-is-in-pipeline'))!.toHaveTextContent('true')
       })
     })
 
@@ -421,7 +421,7 @@ describe('OnlineDrive', () => {
 
         render(<OnlineDrive {...props} />)
 
-        expect(screen.getByTestId('file-list-support-batch')).toHaveTextContent('true')
+        expect(screen.getByTestId('file-list-support-batch'))!.toHaveTextContent('true')
       })
 
       it('should pass supportBatchUpload false to FileList when supportBatchUpload is false', () => {
@@ -429,7 +429,7 @@ describe('OnlineDrive', () => {
 
         render(<OnlineDrive {...props} />)
 
-        expect(screen.getByTestId('file-list-support-batch')).toHaveTextContent('false')
+        expect(screen.getByTestId('file-list-support-batch'))!.toHaveTextContent('false')
       })
 
       it.each([
@@ -441,7 +441,7 @@ describe('OnlineDrive', () => {
 
         render(<OnlineDrive {...props} />)
 
-        expect(screen.getByTestId('file-list-support-batch')).toHaveTextContent(expected)
+        expect(screen.getByTestId('file-list-support-batch'))!.toHaveTextContent(expected)
       })
     })
 
@@ -504,7 +504,7 @@ describe('OnlineDrive', () => {
       render(<OnlineDrive {...props} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('file-list-loading')).toHaveTextContent('true')
+        expect(screen.getByTestId('file-list-loading'))!.toHaveTextContent('true')
       })
     })
 
@@ -566,7 +566,8 @@ describe('OnlineDrive', () => {
       render(<OnlineDrive {...props} />)
 
       // Assert - filteredOnlineDriveFileList should have 2 items matching 'test'
-      expect(screen.getByTestId('file-list-count')).toHaveTextContent('2')
+      // Assert - filteredOnlineDriveFileList should have 2 items matching 'test'
+      expect(screen.getByTestId('file-list-count'))!.toHaveTextContent('2')
     })
 
     it('should return all files when keywords is empty', () => {
@@ -580,7 +581,7 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('file-list-count')).toHaveTextContent('3')
+      expect(screen.getByTestId('file-list-count'))!.toHaveTextContent('3')
     })
 
     it('should filter files case-insensitively', () => {
@@ -594,7 +595,7 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('file-list-count')).toHaveTextContent('2')
+      expect(screen.getByTestId('file-list-count'))!.toHaveTextContent('2')
     })
   })
 
@@ -932,7 +933,7 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('header-credentials-count')).toHaveTextContent('0')
+      expect(screen.getByTestId('header-credentials-count'))!.toHaveTextContent('0')
     })
 
     it('should handle undefined credentials data', () => {
@@ -943,7 +944,7 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('header-credentials-count')).toHaveTextContent('0')
+      expect(screen.getByTestId('header-credentials-count'))!.toHaveTextContent('0')
     })
 
     it('should handle undefined pipelineId', async () => {
@@ -969,7 +970,7 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('file-list-count')).toHaveTextContent('0')
+      expect(screen.getByTestId('file-list-count'))!.toHaveTextContent('0')
     })
 
     it('should handle empty breadcrumbs', () => {
@@ -978,7 +979,7 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('file-list-breadcrumbs')).toHaveTextContent('')
+      expect(screen.getByTestId('file-list-breadcrumbs'))!.toHaveTextContent('')
     })
 
     it('should handle empty bucket', () => {
@@ -987,7 +988,7 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('file-list-bucket')).toHaveTextContent('')
+      expect(screen.getByTestId('file-list-bucket'))!.toHaveTextContent('')
     })
 
     it('should handle special characters in keywords', () => {
@@ -1001,7 +1002,8 @@ describe('OnlineDrive', () => {
       render(<OnlineDrive {...props} />)
 
       // Assert - Should find file with special characters
-      expect(screen.getByTestId('file-list-count')).toHaveTextContent('1')
+      // Assert - Should find file with special characters
+      expect(screen.getByTestId('file-list-count'))!.toHaveTextContent('1')
     })
 
     it('should handle very long file names', () => {
@@ -1013,7 +1015,7 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('file-list-count')).toHaveTextContent('1')
+      expect(screen.getByTestId('file-list-count'))!.toHaveTextContent('1')
     })
 
     it('should handle bucket list initiation response', async () => {
@@ -1051,10 +1053,10 @@ describe('OnlineDrive', () => {
 
       render(<OnlineDrive {...props} />)
 
-      expect(screen.getByTestId('header')).toBeInTheDocument()
-      expect(screen.getByTestId('file-list')).toBeInTheDocument()
-      expect(screen.getByTestId('file-list-is-in-pipeline')).toHaveTextContent(String(propVariation.isInPipeline))
-      expect(screen.getByTestId('file-list-support-batch')).toHaveTextContent(String(propVariation.supportBatchUpload))
+      expect(screen.getByTestId('header'))!.toBeInTheDocument()
+      expect(screen.getByTestId('file-list'))!.toBeInTheDocument()
+      expect(screen.getByTestId('file-list-is-in-pipeline'))!.toHaveTextContent(String(propVariation.isInPipeline))
+      expect(screen.getByTestId('file-list-support-batch'))!.toHaveTextContent(String(propVariation.supportBatchUpload))
     })
 
     it.each([
@@ -1117,7 +1119,7 @@ describe('Header', () => {
 
       render(<Header {...props} />)
 
-      expect(screen.getByText('Documentation')).toBeInTheDocument()
+      expect(screen.getByText('Documentation'))!.toBeInTheDocument()
     })
 
     it('should render doc link with correct href', () => {
@@ -1129,9 +1131,9 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const link = screen.getByRole('link')
-      expect(link).toHaveAttribute('href', 'https://custom-docs.com/path')
-      expect(link).toHaveAttribute('target', '_blank')
-      expect(link).toHaveAttribute('rel', 'noopener noreferrer')
+      expect(link)!.toHaveAttribute('href', 'https://custom-docs.com/path')
+      expect(link)!.toHaveAttribute('target', '_blank')
+      expect(link)!.toHaveAttribute('rel', 'noopener noreferrer')
     })
 
     it('should render doc title text', () => {
@@ -1139,7 +1141,7 @@ describe('Header', () => {
 
       render(<Header {...props} />)
 
-      expect(screen.getByText('My Documentation Title')).toBeInTheDocument()
+      expect(screen.getByText('My Documentation Title'))!.toBeInTheDocument()
     })
 
     it('should render configuration button', () => {
@@ -1147,7 +1149,7 @@ describe('Header', () => {
 
       render(<Header {...props} />)
 
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
   })
 
@@ -1164,7 +1166,7 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         if (docTitle)
-          expect(screen.getByText(docTitle)).toBeInTheDocument()
+          expect(screen.getByText(docTitle))!.toBeInTheDocument()
       })
     })
 
@@ -1178,7 +1180,7 @@ describe('Header', () => {
 
         render(<Header {...props} />)
 
-        expect(screen.getByRole('link')).toHaveAttribute('href', docLink)
+        expect(screen.getByRole('link'))!.toHaveAttribute('href', docLink)
       })
     })
 
@@ -1209,7 +1211,7 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const titleSpan = screen.getByTitle('Accessible Title')
-      expect(titleSpan).toBeInTheDocument()
+      expect(titleSpan)!.toBeInTheDocument()
     })
   })
 })
@@ -1437,10 +1439,10 @@ describe('utils', () => {
         const result = convertOnlineDriveData(data, [], 'my-bucket')
 
         expect(result.fileList).toHaveLength(4)
-        expect(result.fileList[0].type).toBe(OnlineDriveFileType.folder)
-        expect(result.fileList[1].type).toBe(OnlineDriveFileType.file)
-        expect(result.fileList[2].type).toBe(OnlineDriveFileType.folder)
-        expect(result.fileList[3].type).toBe(OnlineDriveFileType.file)
+        expect(result.fileList[0]!.type).toBe(OnlineDriveFileType.folder)
+        expect(result.fileList[1]!.type).toBe(OnlineDriveFileType.file)
+        expect(result.fileList[2]!.type).toBe(OnlineDriveFileType.folder)
+        expect(result.fileList[3]!.type).toBe(OnlineDriveFileType.file)
       })
     })
 
@@ -1539,7 +1541,7 @@ describe('utils', () => {
 
         const result = convertOnlineDriveData(data, [], 'my-bucket')
 
-        expect(result.fileList[0].size).toBe(0)
+        expect(result.fileList[0]!.size).toBe(0)
       })
 
       it('should handle files with very large size', () => {
@@ -1555,7 +1557,7 @@ describe('utils', () => {
 
         const result = convertOnlineDriveData(data, [], 'my-bucket')
 
-        expect(result.fileList[0].size).toBe(largeSize)
+        expect(result.fileList[0]!.size).toBe(largeSize)
       })
 
       it('should handle files with special characters in name', () => {
@@ -1574,9 +1576,9 @@ describe('utils', () => {
 
         const result = convertOnlineDriveData(data, [], 'my-bucket')
 
-        expect(result.fileList[0].name).toBe('file[1] (copy).txt')
-        expect(result.fileList[1].name).toBe('doc-with-dash_and_underscore.pdf')
-        expect(result.fileList[2].name).toBe('file with spaces.txt')
+        expect(result.fileList[0]!.name).toBe('file[1] (copy).txt')
+        expect(result.fileList[1]!.name).toBe('doc-with-dash_and_underscore.pdf')
+        expect(result.fileList[2]!.name).toBe('file with spaces.txt')
       })
 
       it('should handle complex next_page_parameters', () => {
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/utils.spec.ts b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/utils.spec.ts
index 7c5761be8a..9ac2ef9f89 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/utils.spec.ts
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/utils.spec.ts
@@ -93,10 +93,10 @@ describe('online-drive utils', () => {
 
       const result = convertOnlineDriveData(data, [], 'bucket-1')
       expect(result.fileList).toHaveLength(2)
-      expect(result.fileList[0].type).toBe(OnlineDriveFileType.file)
-      expect(result.fileList[0].size).toBe(100)
-      expect(result.fileList[1].type).toBe(OnlineDriveFileType.folder)
-      expect(result.fileList[1].size).toBeUndefined()
+      expect(result.fileList[0]!.type).toBe(OnlineDriveFileType.file)
+      expect(result.fileList[0]!.size).toBe(100)
+      expect(result.fileList[1]!.type).toBe(OnlineDriveFileType.folder)
+      expect(result.fileList[1]!.size).toBeUndefined()
       expect(result.isTruncated).toBe(true)
       expect(result.nextPageParameters).toEqual({ token: 'next' })
       expect(result.hasBucket).toBe(true)
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/__tests__/index.spec.tsx
index 07308361ad..dcb1922fe9 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/__tests__/index.spec.tsx
@@ -60,7 +60,8 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       // Assert - search input should be visible
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      // Assert - search input should be visible
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should render with correct container styles', () => {
@@ -70,12 +71,12 @@ describe('Header', () => {
 
       // Assert - container should have correct class names
       const wrapper = container.firstChild as HTMLElement
-      expect(wrapper).toHaveClass('flex')
-      expect(wrapper).toHaveClass('items-center')
-      expect(wrapper).toHaveClass('gap-x-2')
-      expect(wrapper).toHaveClass('bg-components-panel-bg')
-      expect(wrapper).toHaveClass('p-1')
-      expect(wrapper).toHaveClass('pl-3')
+      expect(wrapper)!.toHaveClass('flex')
+      expect(wrapper)!.toHaveClass('items-center')
+      expect(wrapper)!.toHaveClass('gap-x-2')
+      expect(wrapper)!.toHaveClass('bg-components-panel-bg')
+      expect(wrapper)!.toHaveClass('p-1')
+      expect(wrapper)!.toHaveClass('pl-3')
     })
 
     it('should render Input component with correct props', () => {
@@ -84,8 +85,8 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const input = screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')
-      expect(input).toBeInTheDocument()
-      expect(input).toHaveValue('test-value')
+      expect(input)!.toBeInTheDocument()
+      expect(input)!.toHaveValue('test-value')
     })
 
     it('should render Input with search icon', () => {
@@ -95,7 +96,7 @@ describe('Header', () => {
 
       // Assert - Input should have search icon class
       const searchIcon = container.querySelector('.i-ri-search-line.h-4.w-4')
-      expect(searchIcon).toBeInTheDocument()
+      expect(searchIcon)!.toBeInTheDocument()
     })
 
     it('should render Input with correct wrapper width', () => {
@@ -105,7 +106,7 @@ describe('Header', () => {
 
       // Assert - Input wrapper should have w-[200px] class
       const inputWrapper = container.querySelector('.w-\\[200px\\]')
-      expect(inputWrapper).toBeInTheDocument()
+      expect(inputWrapper)!.toBeInTheDocument()
     })
   })
 
@@ -117,7 +118,7 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         const input = screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')
-        expect(input).toHaveValue('')
+        expect(input)!.toHaveValue('')
       })
 
       it('should display input value correctly', () => {
@@ -126,7 +127,7 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         const input = screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')
-        expect(input).toHaveValue('search-query')
+        expect(input)!.toHaveValue('search-query')
       })
 
       it('should handle special characters in inputValue', () => {
@@ -136,7 +137,7 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         const input = screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')
-        expect(input).toHaveValue(specialChars)
+        expect(input)!.toHaveValue(specialChars)
       })
 
       it('should handle unicode characters in inputValue', () => {
@@ -146,7 +147,7 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         const input = screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')
-        expect(input).toHaveValue(unicodeValue)
+        expect(input)!.toHaveValue(unicodeValue)
       })
     })
 
@@ -157,7 +158,8 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         // Assert - Component should render without errors
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        // Assert - Component should render without errors
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
 
       it('should render with single breadcrumb', () => {
@@ -165,7 +167,7 @@ describe('Header', () => {
 
         render(<Header {...props} />)
 
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
 
       it('should render with multiple breadcrumbs', () => {
@@ -173,7 +175,7 @@ describe('Header', () => {
 
         render(<Header {...props} />)
 
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
     })
 
@@ -184,7 +186,8 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         // Assert - keywords are passed through, component renders
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        // Assert - keywords are passed through, component renders
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
     })
 
@@ -194,7 +197,7 @@ describe('Header', () => {
 
         render(<Header {...props} />)
 
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
 
       it('should render with bucket value', () => {
@@ -202,7 +205,7 @@ describe('Header', () => {
 
         render(<Header {...props} />)
 
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
     })
 
@@ -212,7 +215,7 @@ describe('Header', () => {
 
         render(<Header {...props} />)
 
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
 
       it('should handle positive search results', () => {
@@ -221,7 +224,8 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         // Assert - Breadcrumbs will show search results text when keywords exist and results > 0
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        // Assert - Breadcrumbs will show search results text when keywords exist and results > 0
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
 
       it('should handle large search results count', () => {
@@ -229,7 +233,7 @@ describe('Header', () => {
 
         render(<Header {...props} />)
 
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
     })
 
@@ -239,7 +243,7 @@ describe('Header', () => {
 
         render(<Header {...props} />)
 
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
 
       it('should render correctly when isInPipeline is true', () => {
@@ -247,7 +251,7 @@ describe('Header', () => {
 
         render(<Header {...props} />)
 
-        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
       })
     })
   })
@@ -265,7 +269,7 @@ describe('Header', () => {
 
         expect(mockHandleInputChange).toHaveBeenCalledTimes(1)
         // Verify that onChange event was triggered (React's synthetic event structure)
-        expect(mockHandleInputChange.mock.calls[0][0]).toHaveProperty('type', 'change')
+        expect(mockHandleInputChange.mock.calls[0]![0]).toHaveProperty('type', 'change')
       })
 
       it('should call handleInputChange on each keystroke', () => {
@@ -290,7 +294,7 @@ describe('Header', () => {
         fireEvent.change(input, { target: { value: '' } })
 
         expect(mockHandleInputChange).toHaveBeenCalledTimes(1)
-        expect(mockHandleInputChange.mock.calls[0][0]).toHaveProperty('type', 'change')
+        expect(mockHandleInputChange.mock.calls[0]![0]).toHaveProperty('type', 'change')
       })
 
       it('should handle whitespace-only input', () => {
@@ -302,7 +306,7 @@ describe('Header', () => {
         fireEvent.change(input, { target: { value: '   ' } })
 
         expect(mockHandleInputChange).toHaveBeenCalledTimes(1)
-        expect(mockHandleInputChange.mock.calls[0][0]).toHaveProperty('type', 'change')
+        expect(mockHandleInputChange.mock.calls[0]![0]).toHaveProperty('type', 'change')
       })
     })
 
@@ -317,7 +321,7 @@ describe('Header', () => {
 
         // Act - Find and click the clear icon container
         const clearButton = screen.getByTestId('input-clear')
-        expect(clearButton).toBeInTheDocument()
+        expect(clearButton)!.toBeInTheDocument()
         fireEvent.click(clearButton!)
 
         expect(mockHandleResetKeywords).toHaveBeenCalledTimes(1)
@@ -338,7 +342,7 @@ describe('Header', () => {
 
         // Act & Assert - Clear icon should be visible
         const clearIcon = screen.getByTestId('input-clear')
-        expect(clearIcon).toBeInTheDocument()
+        expect(clearIcon)!.toBeInTheDocument()
       })
     })
   })
@@ -365,21 +369,23 @@ describe('Header', () => {
       rerender(<Header {...props} />)
 
       // Assert - Component renders without errors
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      // Assert - Component renders without errors
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should re-render when inputValue changes', () => {
       const props = createDefaultProps({ inputValue: 'initial' })
       const { rerender } = render(<Header {...props} />)
       const input = screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')
-      expect(input).toHaveValue('initial')
+      expect(input)!.toHaveValue('initial')
 
       // Act - Rerender with different inputValue
       const newProps = createDefaultProps({ inputValue: 'changed' })
       rerender(<Header {...newProps} />)
 
       // Assert - Input value should be updated
-      expect(input).toHaveValue('changed')
+      // Assert - Input value should be updated
+      expect(input)!.toHaveValue('changed')
     })
 
     it('should re-render when breadcrumbs change', () => {
@@ -391,7 +397,8 @@ describe('Header', () => {
       rerender(<Header {...newProps} />)
 
       // Assert - Component renders without errors
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      // Assert - Component renders without errors
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should re-render when keywords change', () => {
@@ -403,7 +410,8 @@ describe('Header', () => {
       rerender(<Header {...newProps} />)
 
       // Assert - Component renders without errors
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      // Assert - Component renders without errors
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
   })
 
@@ -415,7 +423,7 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const input = screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')
-      expect(input).toHaveValue(longValue)
+      expect(input)!.toHaveValue(longValue)
     })
 
     it('should handle very long breadcrumb paths', () => {
@@ -424,7 +432,7 @@ describe('Header', () => {
 
       render(<Header {...props} />)
 
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should handle breadcrumbs with special characters', () => {
@@ -433,7 +441,7 @@ describe('Header', () => {
 
       render(<Header {...props} />)
 
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should handle breadcrumbs with unicode names', () => {
@@ -442,7 +450,7 @@ describe('Header', () => {
 
       render(<Header {...props} />)
 
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should handle bucket with special characters', () => {
@@ -450,7 +458,7 @@ describe('Header', () => {
 
       render(<Header {...props} />)
 
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should pass the event object to handleInputChange callback', () => {
@@ -463,7 +471,7 @@ describe('Header', () => {
 
       // Assert - Verify the event object is passed correctly
       expect(mockHandleInputChange).toHaveBeenCalledTimes(1)
-      const eventArg = mockHandleInputChange.mock.calls[0][0]
+      const eventArg = mockHandleInputChange.mock.calls[0]![0]
       expect(eventArg).toHaveProperty('type', 'change')
       expect(eventArg).toHaveProperty('target')
     })
@@ -480,7 +488,7 @@ describe('Header', () => {
 
       render(<Header {...props} />)
 
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it.each([
@@ -493,7 +501,7 @@ describe('Header', () => {
 
       render(<Header {...props} />)
 
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it.each([
@@ -507,7 +515,7 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const input = screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')
-      expect(input).toHaveValue(inputValue)
+      expect(input)!.toHaveValue(inputValue)
     })
   })
 
@@ -525,7 +533,8 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       // Assert - Component should render successfully, meaning props are passed correctly
-      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')).toBeInTheDocument()
+      // Assert - Component should render successfully, meaning props are passed correctly
+      expect(screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should pass correct props to Input component', () => {
@@ -540,7 +549,7 @@ describe('Header', () => {
       render(<Header {...props} />)
 
       const input = screen.getByPlaceholderText('datasetPipeline.onlineDrive.breadcrumbs.searchPlaceholder')
-      expect(input).toHaveValue('test-input')
+      expect(input)!.toHaveValue('test-input')
 
       // Test onChange handler
       fireEvent.change(input, { target: { value: 'new-value' } })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/__tests__/bucket.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/__tests__/bucket.spec.tsx
index c407be51ac..83e17e6e04 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/__tests__/bucket.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/__tests__/bucket.spec.tsx
@@ -22,18 +22,18 @@ describe('Bucket', () => {
 
   it('should render bucket name', () => {
     render(<Bucket {...defaultProps} />)
-    expect(screen.getByText('my-bucket')).toBeInTheDocument()
+    expect(screen.getByText('my-bucket'))!.toBeInTheDocument()
   })
 
   it('should render bucket icon', () => {
     render(<Bucket {...defaultProps} />)
-    expect(screen.getByTestId('buckets-gray')).toBeInTheDocument()
+    expect(screen.getByTestId('buckets-gray'))!.toBeInTheDocument()
   })
 
   it('should call handleBackToBucketList on icon button click', () => {
     render(<Bucket {...defaultProps} />)
     const buttons = screen.getAllByRole('button')
-    fireEvent.click(buttons[0])
+    fireEvent.click(buttons[0]!)
     expect(defaultProps.handleBackToBucketList).toHaveBeenCalledOnce()
   })
 
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/__tests__/index.spec.tsx
index a6aaf3a50b..24a241ff93 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/__tests__/index.spec.tsx
@@ -58,7 +58,7 @@ describe('Breadcrumbs', () => {
 
       // Assert - Container should be in the document
       const container = document.querySelector('.flex.grow')
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should render with correct container styles', () => {
@@ -67,10 +67,10 @@ describe('Breadcrumbs', () => {
       const { container } = render(<Breadcrumbs {...props} />)
 
       const wrapper = container.firstChild as HTMLElement
-      expect(wrapper).toHaveClass('flex')
-      expect(wrapper).toHaveClass('grow')
-      expect(wrapper).toHaveClass('items-center')
-      expect(wrapper).toHaveClass('overflow-hidden')
+      expect(wrapper)!.toHaveClass('flex')
+      expect(wrapper)!.toHaveClass('grow')
+      expect(wrapper)!.toHaveClass('items-center')
+      expect(wrapper)!.toHaveClass('overflow-hidden')
     })
 
     describe('Search Results Display', () => {
@@ -84,7 +84,8 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - Search result text should be displayed
-        expect(screen.getByText(/datasetPipeline\.onlineDrive\.breadcrumbs\.searchResult/)).toBeInTheDocument()
+        // Assert - Search result text should be displayed
+        expect(screen.getByText(/datasetPipeline\.onlineDrive\.breadcrumbs\.searchResult/))!.toBeInTheDocument()
       })
 
       it('should not show search results when keywords is empty', () => {
@@ -121,7 +122,8 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - Should use bucket name in search result
-        expect(screen.getByText(/searchResult.*my-bucket/i)).toBeInTheDocument()
+        // Assert - Should use bucket name in search result
+        expect(screen.getByText(/searchResult.*my-bucket/i))!.toBeInTheDocument()
       })
 
       it('should use last breadcrumb as folderName when breadcrumbs exist', () => {
@@ -135,7 +137,8 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - Should use last breadcrumb in search result
-        expect(screen.getByText(/searchResult.*folder2/i)).toBeInTheDocument()
+        // Assert - Should use last breadcrumb in search result
+        expect(screen.getByText(/searchResult.*folder2/i))!.toBeInTheDocument()
       })
     })
 
@@ -150,7 +153,7 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
-        expect(screen.getByText('datasetPipeline.onlineDrive.breadcrumbs.allBuckets')).toBeInTheDocument()
+        expect(screen.getByText('datasetPipeline.onlineDrive.breadcrumbs.allBuckets'))!.toBeInTheDocument()
       })
 
       it('should not show all buckets title when breadcrumbs exist', () => {
@@ -174,6 +177,37 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
+        // Assert - Should show bucket name instead
         // Assert - Should show bucket name instead
         expect(screen.queryByText('datasetPipeline.onlineDrive.breadcrumbs.allBuckets')).not.toBeInTheDocument()
       })
@@ -190,7 +224,8 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - Bucket name should be displayed
-        expect(screen.getByText('test-bucket')).toBeInTheDocument()
+        // Assert - Bucket name should be displayed
+        expect(screen.getByText('test-bucket'))!.toBeInTheDocument()
       })
 
       it('should not render Bucket when hasBucket is false', () => {
@@ -202,6 +237,37 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
+        // Assert - Bucket should not be displayed, Drive should be shown instead
         // Assert - Bucket should not be displayed, Drive should be shown instead
         expect(screen.queryByText('test-bucket')).not.toBeInTheDocument()
       })
@@ -217,7 +283,8 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - "All Files" should be displayed
-        expect(screen.getByText('datasetPipeline.onlineDrive.breadcrumbs.allFiles')).toBeInTheDocument()
+        // Assert - "All Files" should be displayed
+        expect(screen.getByText('datasetPipeline.onlineDrive.breadcrumbs.allFiles'))!.toBeInTheDocument()
       })
 
       it('should not render Drive component when hasBucket is true', () => {
@@ -243,8 +310,8 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
-        expect(screen.getByText('folder1')).toBeInTheDocument()
-        expect(screen.getByText('folder2')).toBeInTheDocument()
+        expect(screen.getByText('folder1'))!.toBeInTheDocument()
+        expect(screen.getByText('folder2'))!.toBeInTheDocument()
       })
 
       it('should render last breadcrumb as active', () => {
@@ -257,8 +324,8 @@ describe('Breadcrumbs', () => {
 
         // Assert - Last breadcrumb should have active styles
         const lastBreadcrumb = screen.getByText('folder2')
-        expect(lastBreadcrumb).toHaveClass('system-sm-medium')
-        expect(lastBreadcrumb).toHaveClass('text-text-secondary')
+        expect(lastBreadcrumb)!.toHaveClass('system-sm-medium')
+        expect(lastBreadcrumb)!.toHaveClass('text-text-secondary')
       })
 
       it('should render non-last breadcrumbs with tertiary styles', () => {
@@ -271,8 +338,8 @@ describe('Breadcrumbs', () => {
 
         // Assert - First breadcrumb should have tertiary styles
         const firstBreadcrumb = screen.getByText('folder1')
-        expect(firstBreadcrumb).toHaveClass('system-sm-regular')
-        expect(firstBreadcrumb).toHaveClass('text-text-tertiary')
+        expect(firstBreadcrumb)!.toHaveClass('system-sm-regular')
+        expect(firstBreadcrumb)!.toHaveClass('text-text-tertiary')
       })
     })
 
@@ -287,7 +354,8 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - Dropdown trigger (more button) should be present
-        expect(screen.getByRole('button', { name: '' })).toBeInTheDocument()
+        // Assert - Dropdown trigger (more button) should be present
+        expect(screen.getByRole('button', { name: '' }))!.toBeInTheDocument()
       })
 
       it('should not show dropdown when breadcrumbs do not exceed displayBreadcrumbNum', () => {
@@ -301,8 +369,10 @@ describe('Breadcrumbs', () => {
 
         // Assert - Should not have dropdown, just regular breadcrumbs
         // All breadcrumbs should be directly visible
-        expect(screen.getByText('folder1')).toBeInTheDocument()
-        expect(screen.getByText('folder2')).toBeInTheDocument()
+        // Assert - Should not have dropdown, just regular breadcrumbs
+        // All breadcrumbs should be directly visible
+        expect(screen.getByText('folder1'))!.toBeInTheDocument()
+        expect(screen.getByText('folder2'))!.toBeInTheDocument()
         // Count buttons - should be 3 (allFiles + folder1 + folder2)
         const buttons = container.querySelectorAll('button')
         expect(buttons.length).toBe(3)
@@ -318,9 +388,41 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - First breadcrumb and last breadcrumb should be visible
-        expect(screen.getByText('folder1')).toBeInTheDocument()
-        expect(screen.getByText('folder2')).toBeInTheDocument()
-        expect(screen.getByText('folder5')).toBeInTheDocument()
+        // Assert - First breadcrumb and last breadcrumb should be visible
+        expect(screen.getByText('folder1'))!.toBeInTheDocument()
+        expect(screen.getByText('folder2'))!.toBeInTheDocument()
+        expect(screen.getByText('folder5'))!.toBeInTheDocument()
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
+        // Middle breadcrumbs should be in dropdown
         // Middle breadcrumbs should be in dropdown
         expect(screen.queryByText('folder3')).not.toBeInTheDocument()
         expect(screen.queryByText('folder4')).not.toBeInTheDocument()
@@ -341,8 +443,8 @@ describe('Breadcrumbs', () => {
 
         // Assert - Collapsed breadcrumbs should be visible
         await waitFor(() => {
-          expect(screen.getByText('folder3')).toBeInTheDocument()
-          expect(screen.getByText('folder4')).toBeInTheDocument()
+          expect(screen.getByText('folder3'))!.toBeInTheDocument()
+          expect(screen.getByText('folder4'))!.toBeInTheDocument()
         })
       })
     })
@@ -357,7 +459,8 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - Only Drive should be visible
-        expect(screen.getByText('datasetPipeline.onlineDrive.breadcrumbs.allFiles')).toBeInTheDocument()
+        // Assert - Only Drive should be visible
+        expect(screen.getByText('datasetPipeline.onlineDrive.breadcrumbs.allFiles'))!.toBeInTheDocument()
       })
 
       it('should handle single breadcrumb', () => {
@@ -366,7 +469,7 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
-        expect(screen.getByText('single-folder')).toBeInTheDocument()
+        expect(screen.getByText('single-folder'))!.toBeInTheDocument()
       })
 
       it('should handle breadcrumbs with special characters', () => {
@@ -377,8 +480,8 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
-        expect(screen.getByText('folder [1]')).toBeInTheDocument()
-        expect(screen.getByText('folder (copy)')).toBeInTheDocument()
+        expect(screen.getByText('folder [1]'))!.toBeInTheDocument()
+        expect(screen.getByText('folder (copy)'))!.toBeInTheDocument()
       })
 
       it('should handle breadcrumbs with unicode characters', () => {
@@ -389,8 +492,8 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
-        expect(screen.getByText('文件夹')).toBeInTheDocument()
-        expect(screen.getByText('フォルダ')).toBeInTheDocument()
+        expect(screen.getByText('文件夹'))!.toBeInTheDocument()
+        expect(screen.getByText('フォルダ'))!.toBeInTheDocument()
       })
     })
 
@@ -403,7 +506,7 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
-        expect(screen.getByText(/searchResult/)).toBeInTheDocument()
+        expect(screen.getByText(/searchResult/))!.toBeInTheDocument()
       })
 
       it('should handle whitespace keywords', () => {
@@ -415,7 +518,8 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - Whitespace is truthy, so should show search results
-        expect(screen.getByText(/searchResult/)).toBeInTheDocument()
+        // Assert - Whitespace is truthy, so should show search results
+        expect(screen.getByText(/searchResult/))!.toBeInTheDocument()
       })
     })
 
@@ -428,7 +532,7 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
-        expect(screen.getByText('production-bucket')).toBeInTheDocument()
+        expect(screen.getByText('production-bucket'))!.toBeInTheDocument()
       })
 
       it('should handle bucket with special characters', () => {
@@ -439,7 +543,7 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
-        expect(screen.getByText('bucket-v2.0_backup')).toBeInTheDocument()
+        expect(screen.getByText('bucket-v2.0_backup'))!.toBeInTheDocument()
       })
     })
 
@@ -452,6 +556,37 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
+        // Assert - Should not show search results
         // Assert - Should not show search results
         expect(screen.queryByText(/searchResult/)).not.toBeInTheDocument()
       })
@@ -464,7 +599,7 @@ describe('Breadcrumbs', () => {
 
         render(<Breadcrumbs {...props} />)
 
-        expect(screen.getByText(/searchResult.*10000/)).toBeInTheDocument()
+        expect(screen.getByText(/searchResult.*10000/))!.toBeInTheDocument()
       })
     })
 
@@ -495,9 +630,10 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - Should NOT collapse because 3 <= 3
-        expect(screen.getByText('folder1')).toBeInTheDocument()
-        expect(screen.getByText('folder2')).toBeInTheDocument()
-        expect(screen.getByText('folder3')).toBeInTheDocument()
+        // Assert - Should NOT collapse because 3 <= 3
+        expect(screen.getByText('folder1'))!.toBeInTheDocument()
+        expect(screen.getByText('folder2'))!.toBeInTheDocument()
+        expect(screen.getByText('folder3'))!.toBeInTheDocument()
       })
 
       it('should reduce displayBreadcrumbNum by 1 when bucket is set', () => {
@@ -533,9 +669,11 @@ describe('Breadcrumbs', () => {
 
         // Assert - displayBreadcrumbNum = 3, so 4 breadcrumbs should collapse
         // First 2 visible, dropdown, last 1 visible
-        expect(screen.getByText('a')).toBeInTheDocument()
-        expect(screen.getByText('b')).toBeInTheDocument()
-        expect(screen.getByText('d')).toBeInTheDocument()
+        // Assert - displayBreadcrumbNum = 3, so 4 breadcrumbs should collapse
+        // First 2 visible, dropdown, last 1 visible
+        expect(screen.getByText('a'))!.toBeInTheDocument()
+        expect(screen.getByText('b'))!.toBeInTheDocument()
+        expect(screen.getByText('d'))!.toBeInTheDocument()
         expect(screen.queryByText('c')).not.toBeInTheDocument()
       })
 
@@ -550,8 +688,9 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - displayBreadcrumbNum = 2, so 3 breadcrumbs should collapse
-        expect(screen.getByText('a')).toBeInTheDocument()
-        expect(screen.getByText('c')).toBeInTheDocument()
+        // Assert - displayBreadcrumbNum = 2, so 3 breadcrumbs should collapse
+        expect(screen.getByText('a'))!.toBeInTheDocument()
+        expect(screen.getByText('c'))!.toBeInTheDocument()
         expect(screen.queryByText('b')).not.toBeInTheDocument()
       })
 
@@ -566,8 +705,9 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - displayBreadcrumbNum = 3 - 1 = 2, so 3 breadcrumbs should collapse
-        expect(screen.getByText('a')).toBeInTheDocument()
-        expect(screen.getByText('c')).toBeInTheDocument()
+        // Assert - displayBreadcrumbNum = 3 - 1 = 2, so 3 breadcrumbs should collapse
+        expect(screen.getByText('a'))!.toBeInTheDocument()
+        expect(screen.getByText('c'))!.toBeInTheDocument()
         expect(screen.queryByText('b')).not.toBeInTheDocument()
       })
     })
@@ -589,12 +729,15 @@ describe('Breadcrumbs', () => {
         // prefixBreadcrumbs = ['f1', 'f2']
         // collapsedBreadcrumbs = ['f3', 'f4']
         // lastBreadcrumb = 'f5'
-        expect(screen.getByText('f1')).toBeInTheDocument()
-        expect(screen.getByText('f2')).toBeInTheDocument()
-        expect(screen.getByText('f5')).toBeInTheDocument()
+        // prefixBreadcrumbs = ['f1', 'f2']
+        // collapsedBreadcrumbs = ['f3', 'f4']
+        // lastBreadcrumb = 'f5'
+        expect(screen.getByText('f1'))!.toBeInTheDocument()
+        expect(screen.getByText('f2'))!.toBeInTheDocument()
+        expect(screen.getByText('f5'))!.toBeInTheDocument()
         await waitFor(() => {
-          expect(screen.getByText('f3')).toBeInTheDocument()
-          expect(screen.getByText('f4')).toBeInTheDocument()
+          expect(screen.getByText('f3'))!.toBeInTheDocument()
+          expect(screen.getByText('f4'))!.toBeInTheDocument()
         })
       })
 
@@ -608,8 +751,9 @@ describe('Breadcrumbs', () => {
         render(<Breadcrumbs {...props} />)
 
         // Assert - All breadcrumbs should be visible
-        expect(screen.getByText('f1')).toBeInTheDocument()
-        expect(screen.getByText('f2')).toBeInTheDocument()
+        // Assert - All breadcrumbs should be visible
+        expect(screen.getByText('f1'))!.toBeInTheDocument()
+        expect(screen.getByText('f2'))!.toBeInTheDocument()
       })
     })
   })
@@ -627,7 +771,7 @@ describe('Breadcrumbs', () => {
 
         // Act - Click bucket icon button (first button in Bucket component)
         const buttons = screen.getAllByRole('button')
-        fireEvent.click(buttons[0]) // Bucket icon button
+        fireEvent.click(buttons[0]!) // Bucket icon button
 
         expect(mockStoreState.setOnlineDriveFileList).toHaveBeenCalledWith([])
         expect(mockStoreState.setSelectedFileIds).toHaveBeenCalledWith([])
@@ -744,7 +888,7 @@ describe('Breadcrumbs', () => {
           fireEvent.click(dropdownTrigger)
 
         await waitFor(() => {
-          expect(screen.getByText('f3')).toBeInTheDocument()
+          expect(screen.getByText('f3'))!.toBeInTheDocument()
         })
 
         fireEvent.click(screen.getByText('f3'))
@@ -771,19 +915,19 @@ describe('Breadcrumbs', () => {
 
       // Assert - Component should render without errors
       const container = document.querySelector('.flex.grow')
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should re-render when breadcrumbs change', () => {
       mockStoreState.hasBucket = false
       const props = createDefaultProps({ breadcrumbs: ['folder1'] })
       const { rerender } = render(<Breadcrumbs {...props} />)
-      expect(screen.getByText('folder1')).toBeInTheDocument()
+      expect(screen.getByText('folder1'))!.toBeInTheDocument()
 
       // Act - Rerender with different breadcrumbs
       rerender(<Breadcrumbs {...createDefaultProps({ breadcrumbs: ['folder2'] })} />)
 
-      expect(screen.getByText('folder2')).toBeInTheDocument()
+      expect(screen.getByText('folder2'))!.toBeInTheDocument()
     })
   })
 
@@ -798,7 +942,7 @@ describe('Breadcrumbs', () => {
 
       render(<Breadcrumbs {...props} />)
 
-      expect(screen.getByText(longName)).toBeInTheDocument()
+      expect(screen.getByText(longName))!.toBeInTheDocument()
     })
 
     it('should handle many breadcrumbs', async () => {
@@ -815,11 +959,12 @@ describe('Breadcrumbs', () => {
         fireEvent.click(dropdownTrigger)
 
       // Assert - First, last, and collapsed should be accessible
-      expect(screen.getByText('folder-0')).toBeInTheDocument()
-      expect(screen.getByText('folder-1')).toBeInTheDocument()
-      expect(screen.getByText('folder-19')).toBeInTheDocument()
+      // Assert - First, last, and collapsed should be accessible
+      expect(screen.getByText('folder-0'))!.toBeInTheDocument()
+      expect(screen.getByText('folder-1'))!.toBeInTheDocument()
+      expect(screen.getByText('folder-19'))!.toBeInTheDocument()
       await waitFor(() => {
-        expect(screen.getByText('folder-2')).toBeInTheDocument()
+        expect(screen.getByText('folder-2'))!.toBeInTheDocument()
       })
     })
 
@@ -833,7 +978,8 @@ describe('Breadcrumbs', () => {
       render(<Breadcrumbs {...props} />)
 
       // Assert - Should show all buckets title
-      expect(screen.getByText('datasetPipeline.onlineDrive.breadcrumbs.allBuckets')).toBeInTheDocument()
+      // Assert - Should show all buckets title
+      expect(screen.getByText('datasetPipeline.onlineDrive.breadcrumbs.allBuckets'))!.toBeInTheDocument()
     })
 
     it('should handle breadcrumb with only whitespace', () => {
@@ -845,7 +991,8 @@ describe('Breadcrumbs', () => {
       render(<Breadcrumbs {...props} />)
 
       // Assert - Both should be rendered
-      expect(screen.getByText('normal-folder')).toBeInTheDocument()
+      // Assert - Both should be rendered
+      expect(screen.getByText('normal-folder'))!.toBeInTheDocument()
     })
   })
 
@@ -863,7 +1010,7 @@ describe('Breadcrumbs', () => {
 
       // Assert - Component should render without errors
       const container = document.querySelector('.flex.grow')
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
 
     it.each([
@@ -916,7 +1063,8 @@ describe('Breadcrumbs', () => {
       render(<Breadcrumbs {...props} />)
 
       // Assert - Search result should be shown, navigation elements should be hidden
-      expect(screen.getByText(/searchResult/)).toBeInTheDocument()
+      // Assert - Search result should be shown, navigation elements should be hidden
+      expect(screen.getByText(/searchResult/))!.toBeInTheDocument()
       expect(screen.queryByText('my-bucket')).not.toBeInTheDocument()
     })
   })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/__tests__/index.spec.tsx
index 0157d3cf79..f7112c243b 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/__tests__/index.spec.tsx
@@ -23,7 +23,8 @@ describe('Dropdown', () => {
       render(<Dropdown {...props} />)
 
       // Assert - Trigger button should be visible
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      // Assert - Trigger button should be visible
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
 
     it('should render trigger button with more icon', () => {
@@ -33,8 +34,8 @@ describe('Dropdown', () => {
 
       // Assert - Button should have RiMoreFill icon (rendered as svg)
       const button = screen.getByRole('button')
-      expect(button).toBeInTheDocument()
-      expect(container.querySelector('svg')).toBeInTheDocument()
+      expect(button)!.toBeInTheDocument()
+      expect(container.querySelector('svg'))!.toBeInTheDocument()
     })
 
     it('should render separator after dropdown', () => {
@@ -43,7 +44,8 @@ describe('Dropdown', () => {
       render(<Dropdown {...props} />)
 
       // Assert - Separator "/" should be visible
-      expect(screen.getByText('/')).toBeInTheDocument()
+      // Assert - Separator "/" should be visible
+      expect(screen.getByText('/'))!.toBeInTheDocument()
     })
 
     it('should render trigger button with correct default styles', () => {
@@ -52,11 +54,11 @@ describe('Dropdown', () => {
       render(<Dropdown {...props} />)
 
       const button = screen.getByRole('button')
-      expect(button).toHaveClass('flex')
-      expect(button).toHaveClass('size-6')
-      expect(button).toHaveClass('items-center')
-      expect(button).toHaveClass('justify-center')
-      expect(button).toHaveClass('rounded-md')
+      expect(button)!.toHaveClass('flex')
+      expect(button)!.toHaveClass('size-6')
+      expect(button)!.toHaveClass('items-center')
+      expect(button)!.toHaveClass('justify-center')
+      expect(button)!.toHaveClass('rounded-md')
     })
 
     it('should not render menu content when closed', () => {
@@ -64,6 +66,37 @@ describe('Dropdown', () => {
 
       render(<Dropdown {...props} />)
 
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
+      // Assert - Menu content should not be visible when dropdown is closed
       // Assert - Menu content should not be visible when dropdown is closed
       expect(screen.queryByText('visible-folder')).not.toBeInTheDocument()
     })
@@ -77,8 +110,8 @@ describe('Dropdown', () => {
 
       // Assert - Menu items should be visible
       await waitFor(() => {
-        expect(screen.getByText('test-folder1')).toBeInTheDocument()
-        expect(screen.getByText('test-folder2')).toBeInTheDocument()
+        expect(screen.getByText('test-folder1'))!.toBeInTheDocument()
+        expect(screen.getByText('test-folder2'))!.toBeInTheDocument()
       })
     })
   })
@@ -98,7 +131,7 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('folder1')).toBeInTheDocument()
+          expect(screen.getByText('folder1'))!.toBeInTheDocument()
         })
 
         fireEvent.click(screen.getByText('folder1'))
@@ -120,7 +153,7 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('folder2')).toBeInTheDocument()
+          expect(screen.getByText('folder2'))!.toBeInTheDocument()
         })
 
         fireEvent.click(screen.getByText('folder2'))
@@ -140,9 +173,9 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('folder-a')).toBeInTheDocument()
-          expect(screen.getByText('folder-b')).toBeInTheDocument()
-          expect(screen.getByText('folder-c')).toBeInTheDocument()
+          expect(screen.getByText('folder-a'))!.toBeInTheDocument()
+          expect(screen.getByText('folder-b'))!.toBeInTheDocument()
+          expect(screen.getByText('folder-c'))!.toBeInTheDocument()
         })
       })
 
@@ -155,7 +188,7 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('single-folder')).toBeInTheDocument()
+          expect(screen.getByText('single-folder'))!.toBeInTheDocument()
         })
       })
 
@@ -170,7 +203,8 @@ describe('Dropdown', () => {
         // Assert - Menu should be rendered but with no items
         await waitFor(() => {
           // The menu container should exist but be empty
-          expect(screen.getByRole('button')).toBeInTheDocument()
+          // The menu container should exist but be empty
+          expect(screen.getByRole('button'))!.toBeInTheDocument()
         })
       })
 
@@ -183,9 +217,9 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('folder [1]')).toBeInTheDocument()
-          expect(screen.getByText('folder (copy)')).toBeInTheDocument()
-          expect(screen.getByText('folder-v2.0')).toBeInTheDocument()
+          expect(screen.getByText('folder [1]'))!.toBeInTheDocument()
+          expect(screen.getByText('folder (copy)'))!.toBeInTheDocument()
+          expect(screen.getByText('folder-v2.0'))!.toBeInTheDocument()
         })
       })
 
@@ -198,9 +232,9 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('文件夹')).toBeInTheDocument()
-          expect(screen.getByText('フォルダ')).toBeInTheDocument()
-          expect(screen.getByText('Папка')).toBeInTheDocument()
+          expect(screen.getByText('文件夹'))!.toBeInTheDocument()
+          expect(screen.getByText('フォルダ'))!.toBeInTheDocument()
+          expect(screen.getByText('Папка'))!.toBeInTheDocument()
         })
       })
     })
@@ -218,7 +252,7 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('folder1')).toBeInTheDocument()
+          expect(screen.getByText('folder1'))!.toBeInTheDocument()
         })
 
         fireEvent.click(screen.getByText('folder1'))
@@ -236,6 +270,37 @@ describe('Dropdown', () => {
 
         render(<Dropdown {...props} />)
 
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
+        // Assert - Menu content should not be visible
         // Assert - Menu content should not be visible
         expect(screen.queryByText('test-folder')).not.toBeInTheDocument()
       })
@@ -247,7 +312,7 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('test-folder')).toBeInTheDocument()
+          expect(screen.getByText('test-folder'))!.toBeInTheDocument()
         })
       })
 
@@ -258,7 +323,7 @@ describe('Dropdown', () => {
         // Act - Open and then close
         fireEvent.click(screen.getByRole('button'))
         await waitFor(() => {
-          expect(screen.getByText('test-folder')).toBeInTheDocument()
+          expect(screen.getByText('test-folder'))!.toBeInTheDocument()
         })
 
         fireEvent.click(screen.getByRole('button'))
@@ -280,7 +345,7 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('test-folder')).toBeInTheDocument()
+          expect(screen.getByText('test-folder'))!.toBeInTheDocument()
         })
 
         fireEvent.click(screen.getByText('test-folder'))
@@ -297,14 +362,15 @@ describe('Dropdown', () => {
         const button = screen.getByRole('button')
 
         // Assert - Initial state (closed): should have hover:bg-state-base-hover
-        expect(button).toHaveClass('hover:bg-state-base-hover')
+        // Assert - Initial state (closed): should have hover:bg-state-base-hover
+        expect(button)!.toHaveClass('hover:bg-state-base-hover')
 
         // Act - Open dropdown
         fireEvent.click(button)
 
         // Assert - Open state: should have bg-state-base-hover
         await waitFor(() => {
-          expect(button).toHaveClass('bg-state-base-hover')
+          expect(button)!.toHaveClass('bg-state-base-hover')
         })
       })
     })
@@ -317,6 +383,37 @@ describe('Dropdown', () => {
         const props = createDefaultProps({ breadcrumbs: ['folder'] })
         render(<Dropdown {...props} />)
 
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
+        // Act & Assert - Initially closed
         // Act & Assert - Initially closed
         expect(screen.queryByText('folder')).not.toBeInTheDocument()
 
@@ -325,7 +422,7 @@ describe('Dropdown', () => {
 
         // Assert - Now open
         await waitFor(() => {
-          expect(screen.getByText('folder')).toBeInTheDocument()
+          expect(screen.getByText('folder'))!.toBeInTheDocument()
         })
       })
 
@@ -338,7 +435,7 @@ describe('Dropdown', () => {
         // 1st click - open
         fireEvent.click(button)
         await waitFor(() => {
-          expect(screen.getByText('folder')).toBeInTheDocument()
+          expect(screen.getByText('folder'))!.toBeInTheDocument()
         })
 
         // 2nd click - close
@@ -350,7 +447,7 @@ describe('Dropdown', () => {
         // 3rd click - open again
         fireEvent.click(button)
         await waitFor(() => {
-          expect(screen.getByText('folder')).toBeInTheDocument()
+          expect(screen.getByText('folder'))!.toBeInTheDocument()
         })
       })
     })
@@ -368,7 +465,7 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('folder1')).toBeInTheDocument()
+          expect(screen.getByText('folder1'))!.toBeInTheDocument()
         })
 
         fireEvent.click(screen.getByText('folder1'))
@@ -394,7 +491,7 @@ describe('Dropdown', () => {
         fireEvent.click(screen.getByRole('button'))
 
         await waitFor(() => {
-          expect(screen.getByText('folder1')).toBeInTheDocument()
+          expect(screen.getByText('folder1'))!.toBeInTheDocument()
         })
 
         fireEvent.click(screen.getByText('folder1'))
@@ -423,7 +520,7 @@ describe('Dropdown', () => {
       // Act - Open and click
       fireEvent.click(screen.getByRole('button'))
       await waitFor(() => {
-        expect(screen.getByText('folder')).toBeInTheDocument()
+        expect(screen.getByText('folder'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('folder'))
 
@@ -431,7 +528,7 @@ describe('Dropdown', () => {
       rerender(<Dropdown {...props} />)
       fireEvent.click(screen.getByRole('button'))
       await waitFor(() => {
-        expect(screen.getByText('folder')).toBeInTheDocument()
+        expect(screen.getByText('folder'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('folder'))
 
@@ -450,7 +547,7 @@ describe('Dropdown', () => {
       // Act - Open and click with first callback
       fireEvent.click(screen.getByRole('button'))
       await waitFor(() => {
-        expect(screen.getByText('folder')).toBeInTheDocument()
+        expect(screen.getByText('folder'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('folder'))
 
@@ -466,7 +563,7 @@ describe('Dropdown', () => {
       // Open and click with second callback
       fireEvent.click(screen.getByRole('button'))
       await waitFor(() => {
-        expect(screen.getByText('folder')).toBeInTheDocument()
+        expect(screen.getByText('folder'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('folder'))
 
@@ -482,7 +579,8 @@ describe('Dropdown', () => {
       rerender(<Dropdown {...props} />)
 
       // Assert - Component should render without errors
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      // Assert - Component should render without errors
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
   })
 
@@ -499,7 +597,7 @@ describe('Dropdown', () => {
 
       // Assert - Should handle gracefully (open after odd number of clicks)
       await waitFor(() => {
-        expect(screen.getByText('folder')).toBeInTheDocument()
+        expect(screen.getByText('folder'))!.toBeInTheDocument()
       })
     })
 
@@ -513,7 +611,7 @@ describe('Dropdown', () => {
       fireEvent.click(screen.getByRole('button'))
 
       await waitFor(() => {
-        expect(screen.getByText(longName)).toBeInTheDocument()
+        expect(screen.getByText(longName))!.toBeInTheDocument()
       })
     })
 
@@ -528,8 +626,8 @@ describe('Dropdown', () => {
 
       // Assert - First and last items should be visible
       await waitFor(() => {
-        expect(screen.getByText('folder-0')).toBeInTheDocument()
-        expect(screen.getByText('folder-19')).toBeInTheDocument()
+        expect(screen.getByText('folder-0'))!.toBeInTheDocument()
+        expect(screen.getByText('folder-19'))!.toBeInTheDocument()
       })
     })
 
@@ -544,7 +642,7 @@ describe('Dropdown', () => {
 
       fireEvent.click(screen.getByRole('button'))
       await waitFor(() => {
-        expect(screen.getByText('folder')).toBeInTheDocument()
+        expect(screen.getByText('folder'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('folder'))
 
@@ -562,7 +660,7 @@ describe('Dropdown', () => {
 
       fireEvent.click(screen.getByRole('button'))
       await waitFor(() => {
-        expect(screen.getByText('folder')).toBeInTheDocument()
+        expect(screen.getByText('folder'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('folder'))
 
@@ -578,7 +676,7 @@ describe('Dropdown', () => {
       fireEvent.click(screen.getByRole('button'))
 
       await waitFor(() => {
-        expect(screen.getByText('normal-folder')).toBeInTheDocument()
+        expect(screen.getByText('normal-folder'))!.toBeInTheDocument()
       })
     })
 
@@ -591,7 +689,7 @@ describe('Dropdown', () => {
       fireEvent.click(screen.getByRole('button'))
 
       await waitFor(() => {
-        expect(screen.getByText('folder')).toBeInTheDocument()
+        expect(screen.getByText('folder'))!.toBeInTheDocument()
       })
     })
   })
@@ -613,9 +711,9 @@ describe('Dropdown', () => {
 
       fireEvent.click(screen.getByRole('button'))
       await waitFor(() => {
-        expect(screen.getByText(breadcrumbs[0])).toBeInTheDocument()
+        expect(screen.getByText(breadcrumbs[0]!))!.toBeInTheDocument()
       })
-      fireEvent.click(screen.getByText(breadcrumbs[0]))
+      fireEvent.click(screen.getByText(breadcrumbs[0]!))
 
       expect(mockOnBreadcrumbClick).toHaveBeenCalledWith(expectedIndex)
     })
@@ -634,7 +732,7 @@ describe('Dropdown', () => {
       // Assert - Should render without errors
       await waitFor(() => {
         if (breadcrumbs.length > 0)
-          expect(screen.getByText(breadcrumbs[0])).toBeInTheDocument()
+          expect(screen.getByText(breadcrumbs[0]!))!.toBeInTheDocument()
       })
     })
   })
@@ -650,9 +748,9 @@ describe('Dropdown', () => {
       fireEvent.click(screen.getByRole('button'))
 
       await waitFor(() => {
-        expect(screen.getByText('Documents')).toBeInTheDocument()
-        expect(screen.getByText('Projects')).toBeInTheDocument()
-        expect(screen.getByText('Archive')).toBeInTheDocument()
+        expect(screen.getByText('Documents'))!.toBeInTheDocument()
+        expect(screen.getByText('Projects'))!.toBeInTheDocument()
+        expect(screen.getByText('Archive'))!.toBeInTheDocument()
       })
     })
 
@@ -668,7 +766,7 @@ describe('Dropdown', () => {
       // Act - Open and click on second item
       fireEvent.click(screen.getByRole('button'))
       await waitFor(() => {
-        expect(screen.getByText('second')).toBeInTheDocument()
+        expect(screen.getByText('second'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('second'))
 
@@ -687,7 +785,7 @@ describe('Dropdown', () => {
       // Act - Open and click on middle item
       fireEvent.click(screen.getByRole('button'))
       await waitFor(() => {
-        expect(screen.getByText('item2')).toBeInTheDocument()
+        expect(screen.getByText('item2'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('item2'))
 
@@ -714,7 +812,7 @@ describe('Dropdown', () => {
 
         fireEvent.click(screen.getByRole('button'))
         await waitFor(() => {
-          expect(screen.getByText(`folder-${String.fromCharCode(97 + i)}`)).toBeInTheDocument()
+          expect(screen.getByText(`folder-${String.fromCharCode(97 + i)}`))!.toBeInTheDocument()
         })
         fireEvent.click(screen.getByText(`folder-${String.fromCharCode(97 + i)}`))
 
@@ -731,7 +829,7 @@ describe('Dropdown', () => {
       render(<Dropdown {...props} />)
 
       const button = screen.getByRole('button')
-      expect(button).toBeInTheDocument()
+      expect(button)!.toBeInTheDocument()
       expect(button.tagName).toBe('BUTTON')
     })
 
@@ -741,7 +839,7 @@ describe('Dropdown', () => {
       render(<Dropdown {...props} />)
 
       const button = screen.getByRole('button')
-      expect(button).toHaveAttribute('type', 'button')
+      expect(button)!.toHaveAttribute('type', 'button')
     })
   })
 })
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 714b393d03..91d3acc1d1 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
@@ -152,7 +152,7 @@ const Breadcrumbs = ({
               <BreadcrumbItem
                 index={breadcrumbs.length - 1}
                 handleClick={handleClickBreadcrumb}
-                name={breadcrumbsConfig.lastBreadcrumb}
+                name={breadcrumbsConfig.lastBreadcrumb!}
                 isActive={true}
                 disabled={true}
                 showSeparator={false}
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 f0245cc9a4..00386ec135 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
@@ -39,7 +39,7 @@ const List = ({
     if (anchorRef.current) {
       observerRef.current = new IntersectionObserver((entries) => {
         const { setNextPageParameters, currentNextPageParametersRef, isTruncated } = dataSourceStore.getState()
-        if (entries[0].isIntersecting && isTruncated.current && !isLoading)
+        if (entries[0]!.isIntersecting && isTruncated.current && !isLoading)
           setNextPageParameters(currentNextPageParametersRef.current)
       }, {
         rootMargin: '100px',
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/utils.ts b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/utils.ts
index 6b367ebe3c..07b23a56ff 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/utils.ts
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/utils.ts
@@ -8,7 +8,7 @@ export const getFileExtension = (fileName: string): string => {
   if (parts.length <= 1 || (parts[0] === '' && parts.length === 2))
     return ''
 
-  return parts[parts.length - 1].toLowerCase()
+  return parts[parts.length - 1]!.toLowerCase()
 }
 
 export const getFileType = (fileName: string) => {
@@ -17,13 +17,13 @@ export const getFileType = (fileName: string) => {
   if (extension === 'gif')
     return FileAppearanceTypeEnum.gif
 
-  if (FILE_EXTS.image.includes(extension.toUpperCase()))
+  if (FILE_EXTS.image!.includes(extension.toUpperCase()))
     return FileAppearanceTypeEnum.image
 
-  if (FILE_EXTS.video.includes(extension.toUpperCase()))
+  if (FILE_EXTS.video!.includes(extension.toUpperCase()))
     return FileAppearanceTypeEnum.video
 
-  if (FILE_EXTS.audio.includes(extension.toUpperCase()))
+  if (FILE_EXTS.audio!.includes(extension.toUpperCase()))
     return FileAppearanceTypeEnum.audio
 
   if (extension === 'html' || extension === 'htm' || extension === 'xml' || extension === 'json')
@@ -44,7 +44,7 @@ export const getFileType = (fileName: string) => {
   if (extension === 'pptx' || extension === 'ppt')
     return FileAppearanceTypeEnum.ppt
 
-  if (FILE_EXTS.document.includes(extension.toUpperCase()))
+  if (FILE_EXTS.document!.includes(extension.toUpperCase()))
     return FileAppearanceTypeEnum.document
 
   return FileAppearanceTypeEnum.custom
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/utils.ts b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/utils.ts
index 89b84069fe..8f0ff13ac5 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/utils.ts
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/utils.ts
@@ -10,7 +10,7 @@ export const isBucketListInitiation = (data: OnlineDriveData[], prefix: string[]
   if (bucket || prefix.length > 0)
     return false
   const hasBucket = data.every(item => !!item.bucket)
-  return hasBucket && (data.length > 1 || (data.length === 1 && !!data[0].bucket && data[0].files.length === 0))
+  return hasBucket && (data.length > 1 || (data.length === 1 && !!data[0]!.bucket && data[0]!.files.length === 0))
 }
 
 export const convertOnlineDriveData = (data: OnlineDriveData[], prefix: string[], bucket: string): {
@@ -38,7 +38,7 @@ export const convertOnlineDriveData = (data: OnlineDriveData[], prefix: string[]
     hasBucket = true
   }
   else {
-    data[0].files.forEach((file) => {
+    data[0]!.files.forEach((file) => {
       const { id, name, size, type } = file
       const isFileType = isFile(type)
       fileList.push({
@@ -48,9 +48,9 @@ export const convertOnlineDriveData = (data: OnlineDriveData[], prefix: string[]
         type: isFileType ? OnlineDriveFileType.file : OnlineDriveFileType.folder,
       })
     })
-    isTruncated = data[0].is_truncated ?? false
-    nextPageParameters = data[0].next_page_parameters ?? {}
-    hasBucket = !!data[0].bucket
+    isTruncated = data[0]!.is_truncated ?? false
+    nextPageParameters = data[0]!.next_page_parameters ?? {}
+    hasBucket = !!data[0]!.bucket
   }
   return { fileList, isTruncated, nextPageParameters, hasBucket }
 }
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/crawled-result.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/crawled-result.spec.tsx
index 9c71f91d8d..6c476e6dd6 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/crawled-result.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/crawled-result.spec.tsx
@@ -49,9 +49,9 @@ const createItem = (url: string): CrawlResultItem => ({
 })
 
 const defaultList: CrawlResultItem[] = [
-  createItem('https://example.com/a'),
-  createItem('https://example.com/b'),
-  createItem('https://example.com/c'),
+  createItem('https://example.com/a')!,
+  createItem('https://example.com/b')!,
+  createItem('https://example.com/c')!,
 ]
 
 describe('CrawledResult', () => {
@@ -70,19 +70,18 @@ describe('CrawledResult', () => {
     it('should render scrap time info with correct total and time', () => {
       render(<CrawledResult {...defaultProps} />)
 
-      expect(
-        screen.getByText(/scrapTimeInfo/),
-      ).toBeInTheDocument()
+      expect(screen.getByText(/scrapTimeInfo/))!.toBeInTheDocument()
       // The global i18n mock serialises params, so verify total and time appear
-      expect(screen.getByText(/"total":3/)).toBeInTheDocument()
-      expect(screen.getByText(/"time":"12.3"/)).toBeInTheDocument()
+      // The global i18n mock serialises params, so verify total and time appear
+      expect(screen.getByText(/"total":3/))!.toBeInTheDocument()
+      expect(screen.getByText(/"time":"12.3"/))!.toBeInTheDocument()
     })
 
     it('should render all items from list', () => {
       render(<CrawledResult {...defaultProps} />)
 
       for (const item of defaultList) {
-        expect(screen.getByTestId(`crawled-item-${item.source_url}`)).toBeInTheDocument()
+        expect(screen.getByTestId(`crawled-item-${item.source_url}`))!.toBeInTheDocument()
       }
     })
 
@@ -91,7 +90,7 @@ describe('CrawledResult', () => {
         <CrawledResult {...defaultProps} className="my-custom-class" />,
       )
 
-      expect(container.firstChild).toHaveClass('my-custom-class')
+      expect(container.firstChild)!.toHaveClass('my-custom-class')
     })
   })
 
@@ -100,7 +99,7 @@ describe('CrawledResult', () => {
     it('should show check-all checkbox in multiple choice mode', () => {
       render(<CrawledResult {...defaultProps} isMultipleChoice={true} />)
 
-      expect(screen.getByTestId('check-all-checkbox')).toBeInTheDocument()
+      expect(screen.getByTestId('check-all-checkbox'))!.toBeInTheDocument()
     })
 
     it('should hide check-all checkbox in single choice mode', () => {
@@ -117,7 +116,7 @@ describe('CrawledResult', () => {
       render(
         <CrawledResult
           {...defaultProps}
-          checkedList={[defaultList[0]]}
+          checkedList={[defaultList[0]!]}
           onSelectedChange={onSelectedChange}
         />,
       )
@@ -150,13 +149,13 @@ describe('CrawledResult', () => {
       render(
         <CrawledResult
           {...defaultProps}
-          checkedList={[defaultList[0]]}
+          checkedList={[defaultList[0]!]}
           onSelectedChange={onSelectedChange}
           isMultipleChoice={true}
         />,
       )
 
-      fireEvent.click(screen.getByTestId(`check-${defaultList[1].source_url}`))
+      fireEvent.click(screen.getByTestId(`check-${defaultList[1]!.source_url}`))
 
       expect(onSelectedChange).toHaveBeenCalledWith([defaultList[0], defaultList[1]])
     })
@@ -166,13 +165,13 @@ describe('CrawledResult', () => {
       render(
         <CrawledResult
           {...defaultProps}
-          checkedList={[defaultList[0]]}
+          checkedList={[defaultList[0]!]}
           onSelectedChange={onSelectedChange}
           isMultipleChoice={false}
         />,
       )
 
-      fireEvent.click(screen.getByTestId(`check-${defaultList[1].source_url}`))
+      fireEvent.click(screen.getByTestId(`check-${defaultList[1]!.source_url}`))
 
       expect(onSelectedChange).toHaveBeenCalledWith([defaultList[1]])
     })
@@ -182,13 +181,13 @@ describe('CrawledResult', () => {
       render(
         <CrawledResult
           {...defaultProps}
-          checkedList={[defaultList[0], defaultList[1]]}
+          checkedList={[defaultList[0]!, defaultList[1]!]}
           onSelectedChange={onSelectedChange}
           isMultipleChoice={true}
         />,
       )
 
-      fireEvent.click(screen.getByTestId(`check-${defaultList[0].source_url}`))
+      fireEvent.click(screen.getByTestId(`check-${defaultList[0]!.source_url}`))
 
       expect(onSelectedChange).toHaveBeenCalledWith([defaultList[1]])
     })
@@ -206,7 +205,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      fireEvent.click(screen.getByTestId(`preview-${defaultList[1].source_url}`))
+      fireEvent.click(screen.getByTestId(`preview-${defaultList[1]!.source_url}`))
 
       expect(onPreview).toHaveBeenCalledWith(defaultList[1], 1)
     })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/index.spec.tsx
index 99002e687c..fa5633e2df 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/index.spec.tsx
@@ -39,7 +39,7 @@ describe('CheckboxWithLabel', () => {
     it('should render without crashing', () => {
       render(<CheckboxWithLabel {...defaultProps} />)
 
-      expect(screen.getByText('Test Label')).toBeInTheDocument()
+      expect(screen.getByText('Test Label'))!.toBeInTheDocument()
     })
 
     it('should render checkbox in unchecked state', () => {
@@ -47,7 +47,7 @@ describe('CheckboxWithLabel', () => {
 
       // Assert - Custom checkbox component uses div with data-testid
       const checkbox = container.querySelector('[data-testid^="checkbox"]')
-      expect(checkbox).toBeInTheDocument()
+      expect(checkbox)!.toBeInTheDocument()
       expect(checkbox).not.toHaveClass('bg-components-checkbox-bg')
     })
 
@@ -56,7 +56,7 @@ describe('CheckboxWithLabel', () => {
 
       // Assert - Checked state has check icon
       const checkIcon = container.querySelector('[data-testid^="check-icon"]')
-      expect(checkIcon).toBeInTheDocument()
+      expect(checkIcon)!.toBeInTheDocument()
     })
 
     it('should render tooltip when provided', () => {
@@ -64,7 +64,7 @@ describe('CheckboxWithLabel', () => {
 
       // Assert - Tooltip trigger should be present
       const tooltipTrigger = document.querySelector('[class*="ml-0.5"]')
-      expect(tooltipTrigger).toBeInTheDocument()
+      expect(tooltipTrigger)!.toBeInTheDocument()
     })
 
     it('should not render tooltip when not provided', () => {
@@ -82,14 +82,14 @@ describe('CheckboxWithLabel', () => {
       )
 
       const label = container.querySelector('label')
-      expect(label).toHaveClass('custom-class')
+      expect(label)!.toHaveClass('custom-class')
     })
 
     it('should apply custom labelClassName', () => {
       render(<CheckboxWithLabel {...defaultProps} labelClassName="custom-label-class" />)
 
       const labelText = screen.getByText('Test Label')
-      expect(labelText).toHaveClass('custom-label-class')
+      expect(labelText)!.toHaveClass('custom-label-class')
     })
   })
 
@@ -147,8 +147,8 @@ describe('CrawledResultItem', () => {
     it('should render without crashing', () => {
       render(<CrawledResultItem {...defaultProps} />)
 
-      expect(screen.getByText('Test Page Title')).toBeInTheDocument()
-      expect(screen.getByText('https://example.com/page1')).toBeInTheDocument()
+      expect(screen.getByText('Test Page Title'))!.toBeInTheDocument()
+      expect(screen.getByText('https://example.com/page1'))!.toBeInTheDocument()
     })
 
     it('should render checkbox when isMultipleChoice is true', () => {
@@ -156,7 +156,7 @@ describe('CrawledResultItem', () => {
 
       // Assert - Custom checkbox uses data-testid
       const checkbox = container.querySelector('[data-testid^="checkbox"]')
-      expect(checkbox).toBeInTheDocument()
+      expect(checkbox)!.toBeInTheDocument()
     })
 
     it('should render radio when isMultipleChoice is false', () => {
@@ -164,7 +164,7 @@ describe('CrawledResultItem', () => {
 
       // Assert - Radio component has size-4 rounded-full classes
       const radio = container.querySelector('.size-4.rounded-full')
-      expect(radio).toBeInTheDocument()
+      expect(radio)!.toBeInTheDocument()
     })
 
     it('should render checkbox as checked when isChecked is true', () => {
@@ -172,13 +172,13 @@ describe('CrawledResultItem', () => {
 
       // Assert - Checked state shows check icon
       const checkIcon = container.querySelector('[data-testid^="check-icon"]')
-      expect(checkIcon).toBeInTheDocument()
+      expect(checkIcon)!.toBeInTheDocument()
     })
 
     it('should render preview button when showPreview is true', () => {
       render(<CrawledResultItem {...defaultProps} showPreview={true} />)
 
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
 
     it('should not render preview button when showPreview is false', () => {
@@ -191,15 +191,15 @@ describe('CrawledResultItem', () => {
       const { container } = render(<CrawledResultItem {...defaultProps} isPreview={true} />)
 
       const item = container.firstChild
-      expect(item).toHaveClass('bg-state-base-active')
+      expect(item)!.toHaveClass('bg-state-base-active')
     })
 
     it('should apply hover styles when isPreview is false', () => {
       const { container } = render(<CrawledResultItem {...defaultProps} isPreview={false} />)
 
       const item = container.firstChild
-      expect(item).toHaveClass('group')
-      expect(item).toHaveClass('hover:bg-state-base-hover')
+      expect(item)!.toHaveClass('group')
+      expect(item)!.toHaveClass('hover:bg-state-base-hover')
     })
   })
 
@@ -209,7 +209,7 @@ describe('CrawledResultItem', () => {
 
       render(<CrawledResultItem {...defaultProps} payload={payload} />)
 
-      expect(screen.getByText('Custom Title')).toBeInTheDocument()
+      expect(screen.getByText('Custom Title'))!.toBeInTheDocument()
     })
 
     it('should display payload source_url', () => {
@@ -217,7 +217,7 @@ describe('CrawledResultItem', () => {
 
       render(<CrawledResultItem {...defaultProps} payload={payload} />)
 
-      expect(screen.getByText('https://custom.url/path')).toBeInTheDocument()
+      expect(screen.getByText('https://custom.url/path'))!.toBeInTheDocument()
     })
 
     it('should set title attribute for truncation tooltip', () => {
@@ -226,7 +226,7 @@ describe('CrawledResultItem', () => {
       render(<CrawledResultItem {...defaultProps} payload={payload} />)
 
       const titleElement = screen.getByText('Very Long Title')
-      expect(titleElement).toHaveAttribute('title', 'Very Long Title')
+      expect(titleElement)!.toHaveAttribute('title', 'Very Long Title')
     })
   })
 
@@ -310,22 +310,24 @@ describe('CrawledResult', () => {
       render(<CrawledResult {...defaultProps} />)
 
       // Assert - Check for time info which contains total count
-      expect(screen.getByText(/1.5/)).toBeInTheDocument()
+      // Assert - Check for time info which contains total count
+      expect(screen.getByText(/1.5/))!.toBeInTheDocument()
     })
 
     it('should render all list items', () => {
       render(<CrawledResult {...defaultProps} />)
 
-      expect(screen.getByText('Page 1')).toBeInTheDocument()
-      expect(screen.getByText('Page 2')).toBeInTheDocument()
-      expect(screen.getByText('Page 3')).toBeInTheDocument()
+      expect(screen.getByText('Page 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Page 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Page 3'))!.toBeInTheDocument()
     })
 
     it('should display scrape time info', () => {
       render(<CrawledResult {...defaultProps} usedTime={2.5} />)
 
       // Assert - Check for the time display
-      expect(screen.getByText(/2.5/)).toBeInTheDocument()
+      // Assert - Check for the time display
+      expect(screen.getByText(/2.5/))!.toBeInTheDocument()
     })
 
     it('should render select all checkbox when isMultipleChoice is true', () => {
@@ -350,7 +352,7 @@ describe('CrawledResult', () => {
     it('should show "Select All" when not all items are checked', () => {
       render(<CrawledResult {...defaultProps} checkedList={[]} />)
 
-      expect(screen.getByText(/selectAll|Select All/i)).toBeInTheDocument()
+      expect(screen.getByText(/selectAll|Select All/i))!.toBeInTheDocument()
     })
 
     it('should show "Reset All" when all items are checked', () => {
@@ -358,7 +360,7 @@ describe('CrawledResult', () => {
 
       render(<CrawledResult {...defaultProps} checkedList={allChecked} />)
 
-      expect(screen.getByText(/resetAll|Reset All/i)).toBeInTheDocument()
+      expect(screen.getByText(/resetAll|Reset All/i))!.toBeInTheDocument()
     })
   })
 
@@ -368,7 +370,7 @@ describe('CrawledResult', () => {
         <CrawledResult {...defaultProps} className="custom-class" />,
       )
 
-      expect(container.firstChild).toHaveClass('custom-class')
+      expect(container.firstChild)!.toHaveClass('custom-class')
     })
 
     it('should highlight item at previewIndex', () => {
@@ -378,7 +380,7 @@ describe('CrawledResult', () => {
 
       // Assert - Second item should have active state
       const items = container.querySelectorAll('[class*="rounded-lg"][class*="cursor-pointer"]')
-      expect(items[1]).toHaveClass('bg-state-base-active')
+      expect(items[1])!.toHaveClass('bg-state-base-active')
     })
 
     it('should pass showPreview to items', () => {
@@ -411,7 +413,7 @@ describe('CrawledResult', () => {
 
       // Act - Click select all checkbox (first checkbox)
       const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      fireEvent.click(checkboxes[0])
+      fireEvent.click(checkboxes[0]!)
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith(list)
     })
@@ -429,7 +431,7 @@ describe('CrawledResult', () => {
       )
 
       const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      fireEvent.click(checkboxes[0])
+      fireEvent.click(checkboxes[0]!)
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith([])
     })
@@ -441,14 +443,14 @@ describe('CrawledResult', () => {
         <CrawledResult
           {...defaultProps}
           list={list}
-          checkedList={[list[0]]}
+          checkedList={[list[0]!]}
           onSelectedChange={mockOnSelectedChange}
         />,
       )
 
       // Act - Click second item checkbox (index 2, accounting for select all)
       const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      fireEvent.click(checkboxes[2])
+      fireEvent.click(checkboxes[2]!)
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith([list[0], list[1]])
     })
@@ -460,14 +462,14 @@ describe('CrawledResult', () => {
         <CrawledResult
           {...defaultProps}
           list={list}
-          checkedList={[list[0], list[1]]}
+          checkedList={[list[0]!, list[1]!]}
           onSelectedChange={mockOnSelectedChange}
         />,
       )
 
       // Act - Uncheck first item (index 1, after select all)
       const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      fireEvent.click(checkboxes[1])
+      fireEvent.click(checkboxes[1]!)
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith([list[1]])
     })
@@ -479,7 +481,7 @@ describe('CrawledResult', () => {
         <CrawledResult
           {...defaultProps}
           list={list}
-          checkedList={[list[0]]}
+          checkedList={[list[0]!]}
           onSelectedChange={mockOnSelectedChange}
           isMultipleChoice={false}
         />,
@@ -487,7 +489,7 @@ describe('CrawledResult', () => {
 
       // Act - Click second item radio (Radio uses size-4 rounded-full classes)
       const radios = container.querySelectorAll('.size-4.rounded-full')
-      fireEvent.click(radios[1])
+      fireEvent.click(radios[1]!)
 
       // Assert - Should only select the clicked item
       expect(mockOnSelectedChange).toHaveBeenCalledWith([list[1]])
@@ -506,7 +508,7 @@ describe('CrawledResult', () => {
       )
 
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[1]) // Second item's preview button
+      fireEvent.click(buttons[1]!) // Second item's preview button
 
       expect(mockOnPreview).toHaveBeenCalledWith(list[1], 1)
     })
@@ -525,10 +527,11 @@ describe('CrawledResult', () => {
 
       // Act - Click preview button should trigger early return in handlePreview
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
 
       // Assert - Should not throw error, component still renders
-      expect(screen.getByText('Page 1')).toBeInTheDocument()
+      // Assert - Should not throw error, component still renders
+      expect(screen.getByText('Page 1'))!.toBeInTheDocument()
     })
   })
 
@@ -537,7 +540,8 @@ describe('CrawledResult', () => {
       render(<CrawledResult {...defaultProps} list={[]} usedTime={0.5} />)
 
       // Assert - Should show time info with 0 count
-      expect(screen.getByText(/0.5/)).toBeInTheDocument()
+      // Assert - Should show time info with 0 count
+      expect(screen.getByText(/0.5/))!.toBeInTheDocument()
     })
 
     it('should handle single item list', () => {
@@ -545,13 +549,13 @@ describe('CrawledResult', () => {
 
       render(<CrawledResult {...defaultProps} list={singleItem} />)
 
-      expect(screen.getByText('Test Page Title')).toBeInTheDocument()
+      expect(screen.getByText('Test Page Title'))!.toBeInTheDocument()
     })
 
     it('should format usedTime to one decimal place', () => {
       render(<CrawledResult {...defaultProps} usedTime={1.567} />)
 
-      expect(screen.getByText(/1.6/)).toBeInTheDocument()
+      expect(screen.getByText(/1.6/))!.toBeInTheDocument()
     })
   })
 })
@@ -571,13 +575,13 @@ describe('Crawling', () => {
     it('should render without crashing', () => {
       render(<Crawling {...defaultProps} />)
 
-      expect(screen.getByText(/5\/10/)).toBeInTheDocument()
+      expect(screen.getByText(/5\/10/))!.toBeInTheDocument()
     })
 
     it('should display crawled count and total', () => {
       render(<Crawling crawledNum={3} totalNum={15} />)
 
-      expect(screen.getByText(/3\/15/)).toBeInTheDocument()
+      expect(screen.getByText(/3\/15/))!.toBeInTheDocument()
     })
 
     it('should render skeleton items', () => {
@@ -602,19 +606,19 @@ describe('Crawling', () => {
         <Crawling {...defaultProps} className="custom-crawling-class" />,
       )
 
-      expect(container.firstChild).toHaveClass('custom-crawling-class')
+      expect(container.firstChild)!.toHaveClass('custom-crawling-class')
     })
 
     it('should handle zero values', () => {
       render(<Crawling crawledNum={0} totalNum={0} />)
 
-      expect(screen.getByText(/0\/0/)).toBeInTheDocument()
+      expect(screen.getByText(/0\/0/))!.toBeInTheDocument()
     })
 
     it('should handle large numbers', () => {
       render(<Crawling crawledNum={999} totalNum={1000} />)
 
-      expect(screen.getByText(/999\/1000/)).toBeInTheDocument()
+      expect(screen.getByText(/999\/1000/))!.toBeInTheDocument()
     })
   })
 
@@ -623,9 +627,10 @@ describe('Crawling', () => {
       const { container } = render(<Crawling {...defaultProps} />)
 
       // Assert - Check for various width classes
-      expect(container.querySelector('.w-\\[35\\%\\]')).toBeInTheDocument()
-      expect(container.querySelector('.w-\\[50\\%\\]')).toBeInTheDocument()
-      expect(container.querySelector('.w-\\[40\\%\\]')).toBeInTheDocument()
+      // Assert - Check for various width classes
+      expect(container.querySelector('.w-\\[35\\%\\]'))!.toBeInTheDocument()
+      expect(container.querySelector('.w-\\[50\\%\\]'))!.toBeInTheDocument()
+      expect(container.querySelector('.w-\\[40\\%\\]'))!.toBeInTheDocument()
     })
   })
 })
@@ -644,27 +649,27 @@ describe('ErrorMessage', () => {
     it('should render without crashing', () => {
       render(<ErrorMessage {...defaultProps} />)
 
-      expect(screen.getByText('Error Title')).toBeInTheDocument()
+      expect(screen.getByText('Error Title'))!.toBeInTheDocument()
     })
 
     it('should render error icon', () => {
       const { container } = render(<ErrorMessage {...defaultProps} />)
 
       const icon = container.querySelector('svg')
-      expect(icon).toBeInTheDocument()
-      expect(icon).toHaveClass('text-text-destructive')
+      expect(icon)!.toBeInTheDocument()
+      expect(icon)!.toHaveClass('text-text-destructive')
     })
 
     it('should render title', () => {
       render(<ErrorMessage title="Custom Error Title" />)
 
-      expect(screen.getByText('Custom Error Title')).toBeInTheDocument()
+      expect(screen.getByText('Custom Error Title'))!.toBeInTheDocument()
     })
 
     it('should render error message when provided', () => {
       render(<ErrorMessage {...defaultProps} errorMsg="Detailed error description" />)
 
-      expect(screen.getByText('Detailed error description')).toBeInTheDocument()
+      expect(screen.getByText('Detailed error description'))!.toBeInTheDocument()
     })
 
     it('should not render error message when not provided', () => {
@@ -682,14 +687,15 @@ describe('ErrorMessage', () => {
         <ErrorMessage {...defaultProps} className="custom-error-class" />,
       )
 
-      expect(container.firstChild).toHaveClass('custom-error-class')
+      expect(container.firstChild)!.toHaveClass('custom-error-class')
     })
 
     it('should render with empty errorMsg', () => {
       render(<ErrorMessage {...defaultProps} errorMsg="" />)
 
       // Assert - Empty string should not render message div
-      expect(screen.getByText('Error Title')).toBeInTheDocument()
+      // Assert - Empty string should not render message div
+      expect(screen.getByText('Error Title'))!.toBeInTheDocument()
     })
 
     it('should handle long title text', () => {
@@ -697,7 +703,7 @@ describe('ErrorMessage', () => {
 
       render(<ErrorMessage title={longTitle} />)
 
-      expect(screen.getByText(longTitle)).toBeInTheDocument()
+      expect(screen.getByText(longTitle))!.toBeInTheDocument()
     })
 
     it('should handle long error message', () => {
@@ -705,7 +711,7 @@ describe('ErrorMessage', () => {
 
       render(<ErrorMessage {...defaultProps} errorMsg={longErrorMsg} />)
 
-      expect(screen.getByText(longErrorMsg)).toBeInTheDocument()
+      expect(screen.getByText(longErrorMsg))!.toBeInTheDocument()
     })
   })
 
@@ -713,19 +719,19 @@ describe('ErrorMessage', () => {
     it('should have error background styling', () => {
       const { container } = render(<ErrorMessage {...defaultProps} />)
 
-      expect(container.firstChild).toHaveClass('bg-toast-error-bg')
+      expect(container.firstChild)!.toHaveClass('bg-toast-error-bg')
     })
 
     it('should have border styling', () => {
       const { container } = render(<ErrorMessage {...defaultProps} />)
 
-      expect(container.firstChild).toHaveClass('border-components-panel-border')
+      expect(container.firstChild)!.toHaveClass('border-components-panel-border')
     })
 
     it('should have rounded-sm corners', () => {
       const { container } = render(<ErrorMessage {...defaultProps} />)
 
-      expect(container.firstChild).toHaveClass('rounded-xl')
+      expect(container.firstChild)!.toHaveClass('rounded-xl')
     })
   })
 })
@@ -744,8 +750,9 @@ describe('Base Components Integration', () => {
     )
 
     // Assert - Both items should render
-    expect(screen.getByText('Page 1')).toBeInTheDocument()
-    expect(screen.getByText('Page 2')).toBeInTheDocument()
+    // Assert - Both items should render
+    expect(screen.getByText('Page 1'))!.toBeInTheDocument()
+    expect(screen.getByText('Page 2'))!.toBeInTheDocument()
   })
 
   it('should render CrawledResult with CheckboxWithLabel for select all', () => {
@@ -784,13 +791,13 @@ describe('Base Components Integration', () => {
 
     // Act - Select first item (index 1, after select all)
     const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-    fireEvent.click(checkboxes[1])
+    fireEvent.click(checkboxes[1]!)
 
     expect(mockOnSelectedChange).toHaveBeenCalledWith([list[0]])
 
     // Act - Preview second item
     const previewButtons = screen.getAllByRole('button')
-    fireEvent.click(previewButtons[1])
+    fireEvent.click(previewButtons[1]!)
 
     expect(mockOnPreview).toHaveBeenCalledWith(list[1], 1)
   })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/crawled-result.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/crawled-result.tsx
index 8cd9a46054..b91c5bd6bc 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/crawled-result.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/crawled-result.tsx
@@ -59,7 +59,7 @@ const CrawledResult = ({
   const handlePreview = useCallback((index: number) => {
     if (!onPreview)
       return
-    onPreview(list[index], index)
+    onPreview(list[index]!, index)
   }, [list, onPreview])
 
   return (
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/options/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/options/index.tsx
index 899c70e216..c8a06ea807 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/options/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/options/index.tsx
@@ -43,7 +43,7 @@ const Options = ({
         if (!result.success) {
           const issues = result.error.issues
           const firstIssue = issues[0]
-          const errorMessage = `"${firstIssue.path.join('.')}" ${firstIssue.message}`
+          const errorMessage = `"${firstIssue!.path.join('.')}" ${firstIssue!.message}`
           toast.error(errorMessage)
           return errorMessage
         }
diff --git a/web/app/components/datasets/documents/create-from-pipeline/hooks/__tests__/use-datasource-store.spec.ts b/web/app/components/datasets/documents/create-from-pipeline/hooks/__tests__/use-datasource-store.spec.ts
index 155b41541b..70d95000d7 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/hooks/__tests__/use-datasource-store.spec.ts
+++ b/web/app/components/datasets/documents/create-from-pipeline/hooks/__tests__/use-datasource-store.spec.ts
@@ -85,7 +85,7 @@ describe('useOnlineDocument', () => {
 
     const { result } = renderHook(() => useOnlineDocument(), { wrapper: createWrapper(store) })
     expect(result.current.PagesMapAndSelectedPagesId).toHaveProperty('p1')
-    expect(result.current.PagesMapAndSelectedPagesId.p1.workspace_id).toBe('w1')
+    expect(result.current.PagesMapAndSelectedPagesId.p1!.workspace_id).toBe('w1')
   })
 
   it('should hide preview online document', () => {
diff --git a/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-actions.ts b/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-actions.ts
index 66bd325c33..bad3b779fa 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-actions.ts
+++ b/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-actions.ts
@@ -251,7 +251,7 @@ export const useDatasourceActions = ({
     if (datasourceType === DatasourceType.onlineDocument) {
       const allIds = currentWorkspacePages?.map(page => page.page_id) || []
       if (onlineDocuments.length < allIds.length) {
-        const selectedPages = Array.from(allIds).map(pageId => PagesMapAndSelectedPagesId[pageId])
+        const selectedPages = Array.from(allIds).map(pageId => PagesMapAndSelectedPagesId[pageId]!)
         setOnlineDocuments(selectedPages)
         setSelectedPagesId(new Set(allIds))
       }
diff --git a/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-ui-state.ts b/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-ui-state.ts
index e398f90a48..f4c222f652 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-ui-state.ts
+++ b/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-ui-state.ts
@@ -122,7 +122,7 @@ export const useDatasourceUIState = ({
 
   return {
     datasourceType,
-    isShowVectorSpaceFull,
+    isShowVectorSpaceFull: isShowVectorSpaceFull!,
     nextBtnDisabled,
     showSelect,
     totalOptions,
diff --git a/web/app/components/datasets/documents/create-from-pipeline/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/index.tsx
index 62c1b919fe..8b8fad5885 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/index.tsx
@@ -133,7 +133,7 @@ const CreateFormPipeline = () => {
         [DatasourceType.onlineDrive]: selectedFileIds.length,
       }
       const count = datasourceType ? multipleCheckMap[datasourceType] : 0
-      if (count > 1) {
+      if (count! > 1) {
         showPlanUpgradeModal()
         return
       }
diff --git a/web/app/components/datasets/documents/create-from-pipeline/preview/__tests__/file-preview.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/preview/__tests__/file-preview.spec.tsx
index 715d1650df..82011102b6 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/preview/__tests__/file-preview.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/preview/__tests__/file-preview.spec.tsx
@@ -39,30 +39,30 @@ describe('FilePreview', () => {
 
   it('should render preview label', () => {
     render(<FilePreview {...defaultProps} />)
-    expect(screen.getByText('datasetPipeline.addDocuments.stepOne.preview')).toBeInTheDocument()
+    expect(screen.getByText('datasetPipeline.addDocuments.stepOne.preview'))!.toBeInTheDocument()
   })
 
   it('should render file name', () => {
     render(<FilePreview {...defaultProps} />)
-    expect(screen.getByText('document.pdf')).toBeInTheDocument()
+    expect(screen.getByText('document.pdf'))!.toBeInTheDocument()
   })
 
   it('should render file content when loaded', () => {
     render(<FilePreview {...defaultProps} />)
-    expect(screen.getByText('file content here with some text')).toBeInTheDocument()
+    expect(screen.getByText('file content here with some text'))!.toBeInTheDocument()
   })
 
   it('should render loading state', () => {
     mockIsFetching = true
     render(<FilePreview {...defaultProps} />)
-    expect(screen.getByTestId('loading')).toBeInTheDocument()
+    expect(screen.getByTestId('loading'))!.toBeInTheDocument()
   })
 
   it('should call hidePreview when close button clicked', () => {
     render(<FilePreview {...defaultProps} />)
     const buttons = screen.getAllByRole('button')
     const closeBtn = buttons[buttons.length - 1]
-    fireEvent.click(closeBtn)
+    fireEvent.click(closeBtn!)
     expect(defaultProps.hidePreview).toHaveBeenCalled()
   })
 })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/preview/__tests__/web-preview.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/preview/__tests__/web-preview.spec.tsx
index 1f59e11035..7bef4d0716 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/preview/__tests__/web-preview.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/preview/__tests__/web-preview.spec.tsx
@@ -20,29 +20,29 @@ describe('WebPreview', () => {
 
   it('should render preview label', () => {
     render(<WebPreview {...defaultProps} />)
-    expect(screen.getByText('datasetPipeline.addDocuments.stepOne.preview')).toBeInTheDocument()
+    expect(screen.getByText('datasetPipeline.addDocuments.stepOne.preview'))!.toBeInTheDocument()
   })
 
   it('should render page title', () => {
     render(<WebPreview {...defaultProps} />)
-    expect(screen.getByText('Test Page')).toBeInTheDocument()
+    expect(screen.getByText('Test Page'))!.toBeInTheDocument()
   })
 
   it('should render source URL', () => {
     render(<WebPreview {...defaultProps} />)
-    expect(screen.getByText('https://example.com')).toBeInTheDocument()
+    expect(screen.getByText('https://example.com'))!.toBeInTheDocument()
   })
 
   it('should render markdown content', () => {
     render(<WebPreview {...defaultProps} />)
-    expect(screen.getByText('Hello **markdown** content')).toBeInTheDocument()
+    expect(screen.getByText('Hello **markdown** content'))!.toBeInTheDocument()
   })
 
   it('should call hidePreview when close button clicked', () => {
     render(<WebPreview {...defaultProps} />)
     const buttons = screen.getAllByRole('button')
     const closeBtn = buttons[buttons.length - 1]
-    fireEvent.click(closeBtn)
+    fireEvent.click(closeBtn!)
     expect(defaultProps.hidePreview).toHaveBeenCalled()
   })
 })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/preview/chunk-preview.tsx b/web/app/components/datasets/documents/create-from-pipeline/preview/chunk-preview.tsx
index a56e5bd6dc..2d729ee079 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/preview/chunk-preview.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/preview/chunk-preview.tsx
@@ -55,9 +55,9 @@ const ChunkPreview = ({
   const currentDocForm = useDatasetDetailContextWithSelector(s => s.dataset?.doc_form)
 
   const [previewFile, setPreviewFile] = useState<DocumentItem>(localFiles[0] as DocumentItem)
-  const [previewOnlineDocument, setPreviewOnlineDocument] = useState<NotionPage>(onlineDocuments[0])
-  const [previewWebsitePage, setPreviewWebsitePage] = useState<CrawlResultItem>(websitePages[0])
-  const [previewOnlineDriveFile, setPreviewOnlineDriveFile] = useState<OnlineDriveFile>(onlineDriveFiles[0])
+  const [previewOnlineDocument, setPreviewOnlineDocument] = useState<NotionPage>(onlineDocuments[0]!)
+  const [previewWebsitePage, setPreviewWebsitePage] = useState<CrawlResultItem>(websitePages[0]!)
+  const [previewOnlineDriveFile, setPreviewOnlineDriveFile] = useState<OnlineDriveFile>(onlineDriveFiles[0]!)
 
   return (
     <PreviewContainer
diff --git a/web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx b/web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx
index 33703d56b2..7fde02adcd 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx
@@ -33,7 +33,7 @@ const Form = ({
         if (!result.success) {
           const issues = result.error.issues
           const firstIssue = issues[0]
-          const errorMessage = `"${firstIssue.path.join('.')}" ${firstIssue.message}`
+          const errorMessage = `"${firstIssue!.path.join('.')}" ${firstIssue!.message}`
           toast.error(errorMessage)
           return errorMessage
         }
diff --git a/web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx
index c03fc8aba2..09d6eb0960 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx
@@ -81,7 +81,7 @@ const EmbeddingProcess = ({
 
   // get rule
   const firstDocument = documents[0]
-  const { data: ruleDetail } = useProcessRule(firstDocument.id)
+  const { data: ruleDetail } = useProcessRule(firstDocument!.id)
 
   const invalidDocumentList = useInvalidDocumentList()
   const navToDocumentList = () => {
diff --git a/web/app/components/datasets/documents/create-from-pipeline/steps/__tests__/step-three-content.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/steps/__tests__/step-three-content.spec.tsx
index e217248d2b..8e80ab2878 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/steps/__tests__/step-three-content.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/steps/__tests__/step-three-content.spec.tsx
@@ -56,42 +56,42 @@ describe('StepThreeContent', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<StepThreeContent {...defaultProps} />)
-      expect(screen.getByTestId('embedding-process')).toBeInTheDocument()
+      expect(screen.getByTestId('embedding-process'))!.toBeInTheDocument()
     })
 
     it('should render Processing component', () => {
       render(<StepThreeContent {...defaultProps} />)
-      expect(screen.getByTestId('embedding-process')).toBeInTheDocument()
+      expect(screen.getByTestId('embedding-process'))!.toBeInTheDocument()
     })
   })
 
   describe('Props', () => {
     it('should pass batchId to Processing component', () => {
       render(<StepThreeContent {...defaultProps} />)
-      expect(screen.getByTestId('batch-id')).toHaveTextContent('test-batch-id')
+      expect(screen.getByTestId('batch-id'))!.toHaveTextContent('test-batch-id')
     })
 
     it('should pass documents to Processing component', () => {
       render(<StepThreeContent {...defaultProps} />)
-      expect(screen.getByTestId('documents-count')).toHaveTextContent('2')
+      expect(screen.getByTestId('documents-count'))!.toHaveTextContent('2')
     })
 
     it('should handle empty documents array', () => {
       render(<StepThreeContent batchId="test-batch-id" documents={[]} />)
-      expect(screen.getByTestId('documents-count')).toHaveTextContent('0')
+      expect(screen.getByTestId('documents-count'))!.toHaveTextContent('0')
     })
   })
 
   describe('Edge Cases', () => {
     it('should render with different batchId', () => {
       render(<StepThreeContent batchId="another-batch-id" documents={mockDocuments} />)
-      expect(screen.getByTestId('batch-id')).toHaveTextContent('another-batch-id')
+      expect(screen.getByTestId('batch-id'))!.toHaveTextContent('another-batch-id')
     })
 
     it('should render with single document', () => {
-      const singleDocument = [mockDocuments[0]]
+      const singleDocument = [mockDocuments[0]!]
       render(<StepThreeContent batchId="test-batch-id" documents={singleDocument} />)
-      expect(screen.getByTestId('documents-count')).toHaveTextContent('1')
+      expect(screen.getByTestId('documents-count'))!.toHaveTextContent('1')
     })
   })
 })
diff --git a/web/app/components/datasets/documents/detail/__tests__/new-segment.spec.tsx b/web/app/components/datasets/documents/detail/__tests__/new-segment.spec.tsx
index f243f85f29..a46b659f11 100644
--- a/web/app/components/datasets/documents/detail/__tests__/new-segment.spec.tsx
+++ b/web/app/components/datasets/documents/detail/__tests__/new-segment.spec.tsx
@@ -145,37 +145,37 @@ describe('NewSegmentModal', () => {
     it('should render without crashing', () => {
       const { container } = render(<NewSegmentModal {...defaultProps} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render title text', () => {
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByText(/segment\.addChunk/i)).toBeInTheDocument()
+      expect(screen.getByText(/segment\.addChunk/i))!.toBeInTheDocument()
     })
 
     it('should render chunk content component', () => {
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('chunk-content')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-content'))!.toBeInTheDocument()
     })
 
     it('should render image uploader', () => {
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('image-uploader')).toBeInTheDocument()
+      expect(screen.getByTestId('image-uploader'))!.toBeInTheDocument()
     })
 
     it('should render segment index tag', () => {
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('segment-index-tag')).toBeInTheDocument()
+      expect(screen.getByTestId('segment-index-tag'))!.toBeInTheDocument()
     })
 
     it('should render dot separator', () => {
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('dot')).toBeInTheDocument()
+      expect(screen.getByTestId('dot'))!.toBeInTheDocument()
     })
   })
 
@@ -186,7 +186,7 @@ describe('NewSegmentModal', () => {
 
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('keywords')).toBeInTheDocument()
+      expect(screen.getByTestId('keywords'))!.toBeInTheDocument()
     })
 
     it('should not show keywords when indexing is QUALIFIED', () => {
@@ -207,7 +207,7 @@ describe('NewSegmentModal', () => {
       const closeButtons = container.querySelectorAll('.cursor-pointer')
       // The close button is the second cursor-pointer element
       if (closeButtons.length > 1)
-        fireEvent.click(closeButtons[1])
+        fireEvent.click(closeButtons[1]!)
 
       expect(mockOnCancel).toHaveBeenCalled()
     })
@@ -218,7 +218,7 @@ describe('NewSegmentModal', () => {
 
       fireEvent.change(questionInput, { target: { value: 'New question content' } })
 
-      expect(questionInput).toHaveValue('New question content')
+      expect(questionInput)!.toHaveValue('New question content')
     })
 
     it('should update answer when docForm is QA and typing', () => {
@@ -227,7 +227,7 @@ describe('NewSegmentModal', () => {
 
       fireEvent.change(answerInput, { target: { value: 'New answer content' } })
 
-      expect(answerInput).toHaveValue('New answer content')
+      expect(answerInput)!.toHaveValue('New answer content')
     })
 
     it('should toggle add another checkbox', () => {
@@ -237,7 +237,8 @@ describe('NewSegmentModal', () => {
       fireEvent.click(checkbox)
 
       // Assert - checkbox state should toggle
-      expect(checkbox).toBeInTheDocument()
+      // Assert - checkbox state should toggle
+      expect(checkbox)!.toBeInTheDocument()
     })
   })
 
@@ -329,7 +330,7 @@ describe('NewSegmentModal', () => {
       const { container } = render(<NewSegmentModal {...defaultProps} />)
 
       const header = container.querySelector('.border-divider-subtle')
-      expect(header).toBeInTheDocument()
+      expect(header)!.toBeInTheDocument()
     })
 
     it('should show action buttons in header when fullScreen', () => {
@@ -337,7 +338,7 @@ describe('NewSegmentModal', () => {
 
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('action-buttons')).toBeInTheDocument()
+      expect(screen.getByTestId('action-buttons'))!.toBeInTheDocument()
     })
 
     it('should show add another in header when fullScreen', () => {
@@ -345,7 +346,7 @@ describe('NewSegmentModal', () => {
 
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('add-another')).toBeInTheDocument()
+      expect(screen.getByTestId('add-another'))!.toBeInTheDocument()
     })
 
     it('should call toggleFullScreen when expand button is clicked', () => {
@@ -354,7 +355,7 @@ describe('NewSegmentModal', () => {
       // Act - click the expand button (first cursor-pointer)
       const expandButtons = container.querySelectorAll('.cursor-pointer')
       if (expandButtons.length > 0)
-        fireEvent.click(expandButtons[0])
+        fireEvent.click(expandButtons[0]!)
 
       expect(mockToggleFullScreen).toHaveBeenCalled()
     })
@@ -365,13 +366,13 @@ describe('NewSegmentModal', () => {
     it('should pass actionType add to ActionButtons', () => {
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('action-type')).toHaveTextContent('add')
+      expect(screen.getByTestId('action-type'))!.toHaveTextContent('add')
     })
 
     it('should pass isEditMode true to ChunkContent', () => {
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('edit-mode')).toHaveTextContent('editing')
+      expect(screen.getByTestId('edit-mode'))!.toHaveTextContent('editing')
     })
   })
 
@@ -384,7 +385,7 @@ describe('NewSegmentModal', () => {
         target: { value: 'keyword1,keyword2' },
       })
 
-      expect(screen.getByTestId('keywords-input')).toHaveValue('keyword1,keyword2')
+      expect(screen.getByTestId('keywords-input'))!.toHaveValue('keyword1,keyword2')
     })
 
     it('should handle image upload', () => {
@@ -393,7 +394,8 @@ describe('NewSegmentModal', () => {
       fireEvent.click(screen.getByTestId('upload-image-btn'))
 
       // Assert - image uploader should be rendered
-      expect(screen.getByTestId('image-uploader')).toBeInTheDocument()
+      // Assert - image uploader should be rendered
+      expect(screen.getByTestId('image-uploader'))!.toBeInTheDocument()
     })
 
     it('should maintain structure when rerendered with different docForm', () => {
@@ -401,7 +403,7 @@ describe('NewSegmentModal', () => {
 
       rerender(<NewSegmentModal {...defaultProps} docForm={ChunkingMode.qa} />)
 
-      expect(screen.getByTestId('answer-input')).toBeInTheDocument()
+      expect(screen.getByTestId('answer-input'))!.toBeInTheDocument()
     })
   })
 
@@ -591,7 +593,9 @@ describe('NewSegmentModal', () => {
 
       // Assert - should show count of 5 (3 + 2)
       // The component uses formatNumber and shows "X characters"
-      expect(screen.getByText(/5/)).toBeInTheDocument()
+      // Assert - should show count of 5 (3 + 2)
+      // The component uses formatNumber and shows "X characters"
+      expect(screen.getByText(/5/))!.toBeInTheDocument()
     })
   })
 
@@ -602,8 +606,9 @@ describe('NewSegmentModal', () => {
       render(<NewSegmentModal {...defaultProps} />)
 
       // Assert - footer should have both AddAnother and ActionButtons
-      expect(screen.getByTestId('add-another')).toBeInTheDocument()
-      expect(screen.getByTestId('action-buttons')).toBeInTheDocument()
+      // Assert - footer should have both AddAnother and ActionButtons
+      expect(screen.getByTestId('add-another'))!.toBeInTheDocument()
+      expect(screen.getByTestId('action-buttons'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/documents/detail/completed/__tests__/child-segment-detail.spec.tsx b/web/app/components/datasets/documents/detail/completed/__tests__/child-segment-detail.spec.tsx
index 4e3c7acd2b..b3bec1b0b8 100644
--- a/web/app/components/datasets/documents/detail/completed/__tests__/child-segment-detail.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/__tests__/child-segment-detail.spec.tsx
@@ -92,37 +92,37 @@ describe('ChildSegmentDetail', () => {
     it('should render without crashing', () => {
       const { container } = render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render edit child chunk title', () => {
       render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(screen.getByText(/segment\.editChildChunk/i)).toBeInTheDocument()
+      expect(screen.getByText(/segment\.editChildChunk/i))!.toBeInTheDocument()
     })
 
     it('should render chunk content component', () => {
       render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('chunk-content')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-content'))!.toBeInTheDocument()
     })
 
     it('should render segment index tag', () => {
       render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('segment-index-tag')).toBeInTheDocument()
+      expect(screen.getByTestId('segment-index-tag'))!.toBeInTheDocument()
     })
 
     it('should render word count', () => {
       render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(screen.getByText(/segment\.characters/i)).toBeInTheDocument()
+      expect(screen.getByText(/segment\.characters/i))!.toBeInTheDocument()
     })
 
     it('should render edit time', () => {
       render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(screen.getByText(/segment\.editedAt/i)).toBeInTheDocument()
+      expect(screen.getByText(/segment\.editedAt/i))!.toBeInTheDocument()
     })
   })
 
@@ -135,7 +135,7 @@ describe('ChildSegmentDetail', () => {
 
       const closeButtons = container.querySelectorAll('.cursor-pointer')
       if (closeButtons.length > 1)
-        fireEvent.click(closeButtons[1])
+        fireEvent.click(closeButtons[1]!)
 
       expect(mockOnCancel).toHaveBeenCalled()
     })
@@ -145,7 +145,7 @@ describe('ChildSegmentDetail', () => {
 
       const expandButtons = container.querySelectorAll('.cursor-pointer')
       if (expandButtons.length > 0)
-        fireEvent.click(expandButtons[0])
+        fireEvent.click(expandButtons[0]!)
 
       expect(mockToggleFullScreen).toHaveBeenCalled()
     })
@@ -170,7 +170,7 @@ describe('ChildSegmentDetail', () => {
         target: { value: 'Updated content' },
       })
 
-      expect(screen.getByTestId('content-input')).toHaveValue('Updated content')
+      expect(screen.getByTestId('content-input'))!.toHaveValue('Updated content')
     })
   })
 
@@ -181,7 +181,7 @@ describe('ChildSegmentDetail', () => {
 
       render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('action-buttons')).toBeInTheDocument()
+      expect(screen.getByTestId('action-buttons'))!.toBeInTheDocument()
     })
 
     it('should not show footer action buttons when fullScreen is true', () => {
@@ -200,7 +200,7 @@ describe('ChildSegmentDetail', () => {
 
       render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('action-buttons')).toBeInTheDocument()
+      expect(screen.getByTestId('action-buttons'))!.toBeInTheDocument()
     })
   })
 
@@ -209,13 +209,13 @@ describe('ChildSegmentDetail', () => {
     it('should pass isChildChunk true to ActionButtons', () => {
       render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('is-child-chunk')).toHaveTextContent('true')
+      expect(screen.getByTestId('is-child-chunk'))!.toHaveTextContent('true')
     })
 
     it('should pass isEditMode true to ChunkContent', () => {
       render(<ChildSegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('edit-mode')).toHaveTextContent('editing')
+      expect(screen.getByTestId('edit-mode'))!.toHaveTextContent('editing')
     })
   })
 
@@ -225,7 +225,7 @@ describe('ChildSegmentDetail', () => {
         <ChildSegmentDetail {...defaultProps} childChunkInfo={undefined} />,
       )
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should handle empty content', () => {
@@ -233,7 +233,7 @@ describe('ChildSegmentDetail', () => {
 
       render(<ChildSegmentDetail {...defaultProps} childChunkInfo={emptyChildChunkInfo} />)
 
-      expect(screen.getByTestId('content-input')).toHaveValue('')
+      expect(screen.getByTestId('content-input'))!.toHaveValue('')
     })
 
     it('should maintain structure when rerendered', () => {
@@ -242,7 +242,7 @@ describe('ChildSegmentDetail', () => {
       const updatedInfo = { ...defaultChildChunkInfo, content: 'New content' }
       rerender(<ChildSegmentDetail {...defaultProps} childChunkInfo={updatedInfo} />)
 
-      expect(screen.getByTestId('content-input')).toBeInTheDocument()
+      expect(screen.getByTestId('content-input'))!.toBeInTheDocument()
     })
   })
 
@@ -258,6 +258,37 @@ describe('ChildSegmentDetail', () => {
     it('should have save button enabled by default', () => {
       render(<ChildSegmentDetail {...defaultProps} />)
 
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
+      // Assert - save button should be enabled initially
       // Assert - save button should be enabled initially
       expect(screen.getByTestId('save-btn')).not.toBeDisabled()
     })
diff --git a/web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx b/web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx
index aae0b226db..b7344d7a0f 100644
--- a/web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx
@@ -287,10 +287,10 @@ describe('SegmentListContext', () => {
 
       render(<TestComponent />)
 
-      expect(screen.getByTestId('isCollapsed')).toHaveTextContent('true')
-      expect(screen.getByTestId('fullScreen')).toHaveTextContent('false')
-      expect(screen.getByTestId('currSegmentShowModal')).toHaveTextContent('false')
-      expect(screen.getByTestId('currChildChunkShowModal')).toHaveTextContent('false')
+      expect(screen.getByTestId('isCollapsed'))!.toHaveTextContent('true')
+      expect(screen.getByTestId('fullScreen'))!.toHaveTextContent('false')
+      expect(screen.getByTestId('currSegmentShowModal'))!.toHaveTextContent('false')
+      expect(screen.getByTestId('currChildChunkShowModal'))!.toHaveTextContent('false')
     })
   })
 
@@ -324,9 +324,9 @@ describe('SegmentListContext', () => {
         </SegmentListContext.Provider>,
       )
 
-      expect(screen.getByTestId('isCollapsed')).toHaveTextContent('false')
-      expect(screen.getByTestId('fullScreen')).toHaveTextContent('true')
-      expect(screen.getByTestId('currSegmentShowModal')).toHaveTextContent('true')
+      expect(screen.getByTestId('isCollapsed'))!.toHaveTextContent('false')
+      expect(screen.getByTestId('fullScreen'))!.toHaveTextContent('true')
+      expect(screen.getByTestId('currSegmentShowModal'))!.toHaveTextContent('true')
     })
   })
 
@@ -356,8 +356,8 @@ describe('SegmentListContext', () => {
         </SegmentListContext.Provider>,
       )
 
-      expect(screen.getByTestId('isCollapsed')).toHaveTextContent('true')
-      expect(screen.getByTestId('fullScreen')).toHaveTextContent('false')
+      expect(screen.getByTestId('isCollapsed'))!.toHaveTextContent('true')
+      expect(screen.getByTestId('fullScreen'))!.toHaveTextContent('false')
 
       // Rerender with changed values
       rerender(
@@ -373,8 +373,8 @@ describe('SegmentListContext', () => {
         </SegmentListContext.Provider>,
       )
 
-      expect(screen.getByTestId('isCollapsed')).toHaveTextContent('false')
-      expect(screen.getByTestId('fullScreen')).toHaveTextContent('true')
+      expect(screen.getByTestId('isCollapsed'))!.toHaveTextContent('false')
+      expect(screen.getByTestId('fullScreen'))!.toHaveTextContent('true')
     })
   })
 })
@@ -400,7 +400,7 @@ describe('Completed Component', () => {
     it('should render MenuBar when not in full-doc mode', () => {
       render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('menu-bar')).toBeInTheDocument()
+      expect(screen.getByTestId('menu-bar'))!.toBeInTheDocument()
     })
 
     it('should not render MenuBar when in full-doc mode', () => {
@@ -415,7 +415,7 @@ describe('Completed Component', () => {
     it('should render GeneralModeContent when not in full-doc mode', () => {
       render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
+      expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
     })
 
     it('should render FullDocModeContent when in full-doc mode', () => {
@@ -424,25 +424,25 @@ describe('Completed Component', () => {
 
       render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('full-doc-mode-content')).toBeInTheDocument()
+      expect(screen.getByTestId('full-doc-mode-content'))!.toBeInTheDocument()
     })
 
     it('should render Pagination component', () => {
       render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('pagination')).toBeInTheDocument()
+      expect(screen.getByTestId('pagination'))!.toBeInTheDocument()
     })
 
     it('should render Divider component', () => {
       render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('divider')).toBeInTheDocument()
+      expect(screen.getByTestId('divider'))!.toBeInTheDocument()
     })
 
     it('should render DrawerGroup when docForm is available', () => {
       render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('drawer-group')).toBeInTheDocument()
+      expect(screen.getByTestId('drawer-group'))!.toBeInTheDocument()
     })
 
     it('should not render DrawerGroup when docForm is undefined', () => {
@@ -458,7 +458,7 @@ describe('Completed Component', () => {
     it('should start with page 0 (current - 1)', () => {
       render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('current-page')).toHaveTextContent('0')
+      expect(screen.getByTestId('current-page'))!.toHaveTextContent('0')
     })
 
     it('should update page when pagination changes', async () => {
@@ -468,7 +468,7 @@ describe('Completed Component', () => {
       fireEvent.click(nextPageButton)
 
       await waitFor(() => {
-        expect(screen.getByTestId('current-page')).toHaveTextContent('1')
+        expect(screen.getByTestId('current-page'))!.toHaveTextContent('1')
       })
     })
 
@@ -479,7 +479,8 @@ describe('Completed Component', () => {
       fireEvent.click(changeLimitButton)
 
       // Limit change is handled internally
-      expect(changeLimitButton).toBeInTheDocument()
+      // Limit change is handled internally
+      expect(changeLimitButton)!.toBeInTheDocument()
     })
   })
 
@@ -495,19 +496,19 @@ describe('Completed Component', () => {
     it('should handle archived prop', () => {
       render(<Completed {...defaultProps} archived={true} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
+      expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
     })
 
     it('should handle embeddingAvailable prop', () => {
       render(<Completed {...defaultProps} embeddingAvailable={false} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
+      expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
     })
 
     it('should handle showNewSegmentModal prop', () => {
       render(<Completed {...defaultProps} showNewSegmentModal={true} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('drawer-group')).toBeInTheDocument()
+      expect(screen.getByTestId('drawer-group'))!.toBeInTheDocument()
     })
   })
 
@@ -517,7 +518,8 @@ describe('Completed Component', () => {
       render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
       // Context is provided, components should render without errors
-      expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
+      // Context is provided, components should render without errors
+      expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
     })
   })
 })
@@ -544,7 +546,7 @@ describe('Edge Cases', () => {
 
     render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-    expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
+    expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
   })
 
   it('should handle empty documentId', () => {
@@ -552,19 +554,19 @@ describe('Edge Cases', () => {
 
     render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-    expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
+    expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
   })
 
   it('should handle undefined importStatus', () => {
     render(<Completed {...defaultProps} importStatus={undefined} />, { wrapper: createWrapper() })
 
-    expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
+    expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
   })
 
   it('should handle ProcessStatus.COMPLETED importStatus', () => {
     render(<Completed {...defaultProps} importStatus="completed" />, { wrapper: createWrapper() })
 
-    expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
+    expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
   })
 
   it('should handle all ChunkingMode values', () => {
@@ -575,7 +577,7 @@ describe('Edge Cases', () => {
 
       const { unmount } = render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('pagination')).toBeInTheDocument()
+      expect(screen.getByTestId('pagination'))!.toBeInTheDocument()
 
       unmount()
     })
@@ -591,7 +593,7 @@ describe('Edge Cases', () => {
 
       const { unmount } = render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-      expect(screen.getByTestId('pagination')).toBeInTheDocument()
+      expect(screen.getByTestId('pagination'))!.toBeInTheDocument()
 
       unmount()
     })
@@ -617,33 +619,34 @@ describe('Integration Tests', () => {
     render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
     // All components should render without errors
-    expect(screen.getByTestId('menu-bar')).toBeInTheDocument()
-    expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
-    expect(screen.getByTestId('pagination')).toBeInTheDocument()
-    expect(screen.getByTestId('drawer-group')).toBeInTheDocument()
+    // All components should render without errors
+    expect(screen.getByTestId('menu-bar'))!.toBeInTheDocument()
+    expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
+    expect(screen.getByTestId('pagination'))!.toBeInTheDocument()
+    expect(screen.getByTestId('drawer-group'))!.toBeInTheDocument()
   })
 
   it('should update UI when mode changes', () => {
     const { rerender } = render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-    expect(screen.getByTestId('general-mode-content')).toBeInTheDocument()
+    expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
 
     mockDocForm.current = ChunkingModeEnum.parentChild
     mockParentMode.current = 'full-doc'
 
     rerender(<Completed {...defaultProps} />)
 
-    expect(screen.getByTestId('full-doc-mode-content')).toBeInTheDocument()
+    expect(screen.getByTestId('full-doc-mode-content'))!.toBeInTheDocument()
   })
 
   it('should handle prop updates correctly', () => {
     const { rerender } = render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-    expect(screen.getByTestId('drawer-group')).toBeInTheDocument()
+    expect(screen.getByTestId('drawer-group'))!.toBeInTheDocument()
 
     rerender(<Completed {...defaultProps} showNewSegmentModal={true} />)
 
-    expect(screen.getByTestId('drawer-group')).toBeInTheDocument()
+    expect(screen.getByTestId('drawer-group'))!.toBeInTheDocument()
   })
 })
 
@@ -696,6 +699,37 @@ describe('Batch Action Callbacks', () => {
   it('should not render batch actions when no segments are selected initially', async () => {
     render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
+    // Initially no segments are selected, so batch action should not be visible
     // Initially no segments are selected, so batch action should not be visible
     expect(screen.queryByTestId('batch-action')).not.toBeInTheDocument()
   })
@@ -708,7 +742,7 @@ describe('Batch Action Callbacks', () => {
 
     // Now batch actions should be visible
     await waitFor(() => {
-      expect(screen.getByTestId('batch-action')).toBeInTheDocument()
+      expect(screen.getByTestId('batch-action'))!.toBeInTheDocument()
     })
   })
 
@@ -721,7 +755,7 @@ describe('Batch Action Callbacks', () => {
 
     // Wait for batch actions to appear
     await waitFor(() => {
-      expect(screen.getByTestId('batch-action')).toBeInTheDocument()
+      expect(screen.getByTestId('batch-action'))!.toBeInTheDocument()
     })
 
     const enableButton = screen.getByTestId('batch-enable')
@@ -739,7 +773,7 @@ describe('Batch Action Callbacks', () => {
 
     // Wait for batch actions to appear
     await waitFor(() => {
-      expect(screen.getByTestId('batch-action')).toBeInTheDocument()
+      expect(screen.getByTestId('batch-action'))!.toBeInTheDocument()
     })
 
     const disableButton = screen.getByTestId('batch-disable')
@@ -757,7 +791,7 @@ describe('Batch Action Callbacks', () => {
 
     // Wait for batch actions to appear
     await waitFor(() => {
-      expect(screen.getByTestId('batch-action')).toBeInTheDocument()
+      expect(screen.getByTestId('batch-action'))!.toBeInTheDocument()
     })
 
     const deleteButton = screen.getByTestId('batch-delete')
@@ -887,14 +921,15 @@ describe('refreshChunkListDataWithDetailChanged branch coverage', () => {
 
     // Create a refreshMap similar to the component
     const refreshMap: Record<string, () => void> = {
-      true: () => {
+      true: (() => {
         mockInvalidAll()
         mockInvalidDisabled()
-      },
+      })!,
     }
 
     // Execute the 'true' branch
-    refreshMap.true()
+    // Execute the 'true' branch
+    refreshMap.true!()
 
     expect(mockInvalidAll).toHaveBeenCalled()
     expect(mockInvalidDisabled).toHaveBeenCalled()
@@ -907,14 +942,15 @@ describe('refreshChunkListDataWithDetailChanged branch coverage', () => {
 
     // Create a refreshMap similar to the component
     const refreshMap: Record<string, () => void> = {
-      false: () => {
+      false: (() => {
         mockInvalidAll()
         mockInvalidEnabled()
-      },
+      })!,
     }
 
     // Execute the 'false' branch
-    refreshMap.false()
+    // Execute the 'false' branch
+    refreshMap.false!()
 
     expect(mockInvalidAll).toHaveBeenCalled()
     expect(mockInvalidEnabled).toHaveBeenCalled()
@@ -989,13 +1025,13 @@ describe('Inline callback and hook initialization coverage', () => {
 
     fireEvent.click(screen.getByTestId('next-page'))
     await waitFor(() => {
-      expect(screen.getByTestId('current-page')).toHaveTextContent('1')
+      expect(screen.getByTestId('current-page'))!.toHaveTextContent('1')
     })
 
     fireEvent.click(screen.getByTestId('status-enabled'))
 
     await waitFor(() => {
-      expect(screen.getByTestId('current-page')).toHaveTextContent('0')
+      expect(screen.getByTestId('current-page'))!.toHaveTextContent('0')
     })
   })
 
@@ -1006,7 +1042,7 @@ describe('Inline callback and hook initialization coverage', () => {
       <Completed {...defaultProps} onNewSegmentModalChange={mockOnChange} />,
       { wrapper: createWrapper() },
     )
-    expect(screen.getByTestId('drawer-group')).toBeInTheDocument()
+    expect(screen.getByTestId('drawer-group'))!.toBeInTheDocument()
   })
 
   // Covers lines 74-90: refreshChunkListDataWithDetailChanged with status true
@@ -1056,7 +1092,7 @@ describe('Inline callback and hook initialization coverage', () => {
     fireEvent.click(screen.getByTestId('select-all-button'))
 
     await waitFor(() => {
-      expect(screen.getByTestId('batch-action')).toBeInTheDocument()
+      expect(screen.getByTestId('batch-action'))!.toBeInTheDocument()
     })
 
     fireEvent.click(screen.getByTestId('cancel-batch'))
@@ -1072,7 +1108,7 @@ describe('Inline callback and hook initialization coverage', () => {
 
     fireEvent.click(screen.getByTestId('select-all-button'))
     await waitFor(() => {
-      expect(screen.getByTestId('batch-action')).toBeInTheDocument()
+      expect(screen.getByTestId('batch-action'))!.toBeInTheDocument()
     })
 
     fireEvent.click(screen.getByTestId('batch-enable'))
@@ -1086,7 +1122,7 @@ describe('Inline callback and hook initialization coverage', () => {
 
     fireEvent.click(screen.getByTestId('select-all-button'))
     await waitFor(() => {
-      expect(screen.getByTestId('batch-action')).toBeInTheDocument()
+      expect(screen.getByTestId('batch-action'))!.toBeInTheDocument()
     })
 
     fireEvent.click(screen.getByTestId('batch-disable'))
@@ -1100,7 +1136,7 @@ describe('Inline callback and hook initialization coverage', () => {
 
     fireEvent.click(screen.getByTestId('select-all-button'))
     await waitFor(() => {
-      expect(screen.getByTestId('batch-action')).toBeInTheDocument()
+      expect(screen.getByTestId('batch-action'))!.toBeInTheDocument()
     })
 
     fireEvent.click(screen.getByTestId('batch-delete'))
@@ -1115,12 +1151,12 @@ describe('Inline callback and hook initialization coverage', () => {
 
     fireEvent.click(screen.getByTestId('next-page'))
     await waitFor(() => {
-      expect(screen.getByTestId('current-page')).toHaveTextContent('1')
+      expect(screen.getByTestId('current-page'))!.toHaveTextContent('1')
     })
 
     fireEvent.click(screen.getByTestId('next-page'))
     await waitFor(() => {
-      expect(screen.getByTestId('current-page')).toHaveTextContent('2')
+      expect(screen.getByTestId('current-page'))!.toHaveTextContent('2')
     })
   })
 
@@ -1132,7 +1168,7 @@ describe('Inline callback and hook initialization coverage', () => {
 
     render(<Completed {...defaultProps} />, { wrapper: createWrapper() })
 
-    expect(screen.getByTestId('total-items')).toHaveTextContent('42')
+    expect(screen.getByTestId('total-items'))!.toHaveTextContent('42')
   })
 
   // Covers search input change
@@ -1142,6 +1178,6 @@ describe('Inline callback and hook initialization coverage', () => {
     const searchInput = screen.getByTestId('search-input')
     fireEvent.change(searchInput, { target: { value: 'test query' } })
 
-    expect(searchInput).toHaveValue('test query')
+    expect(searchInput)!.toHaveValue('test query')
   })
 })
diff --git a/web/app/components/datasets/documents/detail/completed/__tests__/new-child-segment.spec.tsx b/web/app/components/datasets/documents/detail/completed/__tests__/new-child-segment.spec.tsx
index 150d399a5d..ff9fb4c524 100644
--- a/web/app/components/datasets/documents/detail/completed/__tests__/new-child-segment.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/__tests__/new-child-segment.spec.tsx
@@ -110,31 +110,31 @@ describe('NewChildSegmentModal', () => {
     it('should render without crashing', () => {
       const { container } = render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render add child chunk title', () => {
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByText(/segment\.addChildChunk/i)).toBeInTheDocument()
+      expect(screen.getByText(/segment\.addChildChunk/i))!.toBeInTheDocument()
     })
 
     it('should render chunk content component', () => {
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('chunk-content')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-content'))!.toBeInTheDocument()
     })
 
     it('should render segment index tag with new child chunk label', () => {
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('segment-index-tag')).toBeInTheDocument()
+      expect(screen.getByTestId('segment-index-tag'))!.toBeInTheDocument()
     })
 
     it('should render add another checkbox', () => {
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('add-another')).toBeInTheDocument()
+      expect(screen.getByTestId('add-another'))!.toBeInTheDocument()
     })
   })
 
@@ -147,7 +147,7 @@ describe('NewChildSegmentModal', () => {
 
       const closeButtons = container.querySelectorAll('.cursor-pointer')
       if (closeButtons.length > 1)
-        fireEvent.click(closeButtons[1])
+        fireEvent.click(closeButtons[1]!)
 
       expect(mockOnCancel).toHaveBeenCalled()
     })
@@ -157,7 +157,7 @@ describe('NewChildSegmentModal', () => {
 
       const expandButtons = container.querySelectorAll('.cursor-pointer')
       if (expandButtons.length > 0)
-        fireEvent.click(expandButtons[0])
+        fireEvent.click(expandButtons[0]!)
 
       expect(mockToggleFullScreen).toHaveBeenCalled()
     })
@@ -169,7 +169,7 @@ describe('NewChildSegmentModal', () => {
         target: { value: 'New content' },
       })
 
-      expect(screen.getByTestId('content-input')).toHaveValue('New content')
+      expect(screen.getByTestId('content-input'))!.toHaveValue('New content')
     })
 
     it('should toggle add another checkbox', () => {
@@ -178,7 +178,7 @@ describe('NewChildSegmentModal', () => {
 
       fireEvent.click(checkbox)
 
-      expect(checkbox).toBeInTheDocument()
+      expect(checkbox)!.toBeInTheDocument()
     })
   })
 
@@ -253,7 +253,7 @@ describe('NewChildSegmentModal', () => {
 
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('action-buttons')).toBeInTheDocument()
+      expect(screen.getByTestId('action-buttons'))!.toBeInTheDocument()
     })
 
     it('should show add another in header when fullScreen', () => {
@@ -261,7 +261,7 @@ describe('NewChildSegmentModal', () => {
 
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('add-another')).toBeInTheDocument()
+      expect(screen.getByTestId('add-another'))!.toBeInTheDocument()
     })
   })
 
@@ -270,19 +270,19 @@ describe('NewChildSegmentModal', () => {
     it('should pass actionType add to ActionButtons', () => {
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('action-type')).toHaveTextContent('add')
+      expect(screen.getByTestId('action-type'))!.toHaveTextContent('add')
     })
 
     it('should pass isChildChunk true to ActionButtons', () => {
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('is-child-chunk')).toHaveTextContent('true')
+      expect(screen.getByTestId('is-child-chunk'))!.toHaveTextContent('true')
     })
 
     it('should pass isEditMode true to ChunkContent', () => {
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('edit-mode')).toHaveTextContent('editing')
+      expect(screen.getByTestId('edit-mode'))!.toHaveTextContent('editing')
     })
   })
 
@@ -292,7 +292,7 @@ describe('NewChildSegmentModal', () => {
 
       const { container } = render(<NewChildSegmentModal {...props} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should maintain structure when rerendered', () => {
@@ -300,7 +300,7 @@ describe('NewChildSegmentModal', () => {
 
       rerender(<NewChildSegmentModal {...defaultProps} chunkId="chunk-2" />)
 
-      expect(screen.getByTestId('chunk-content')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-content'))!.toBeInTheDocument()
     })
   })
 
@@ -351,7 +351,7 @@ describe('NewChildSegmentModal', () => {
 
       // Assert - modal should not close, only content cleared
       await waitFor(() => {
-        expect(screen.getByTestId('content-input')).toHaveValue('')
+        expect(screen.getByTestId('content-input'))!.toHaveValue('')
       })
     })
   })
diff --git a/web/app/components/datasets/documents/detail/completed/__tests__/segment-detail.spec.tsx b/web/app/components/datasets/documents/detail/completed/__tests__/segment-detail.spec.tsx
index dbce9b7f22..4e17cd39b3 100644
--- a/web/app/components/datasets/documents/detail/completed/__tests__/segment-detail.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/__tests__/segment-detail.spec.tsx
@@ -174,37 +174,37 @@ describe('SegmentDetail', () => {
     it('should render without crashing', () => {
       const { container } = render(<SegmentDetail {...defaultProps} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render title for view mode', () => {
       render(<SegmentDetail {...defaultProps} isEditMode={false} />)
 
-      expect(screen.getByText(/segment\.chunkDetail/i)).toBeInTheDocument()
+      expect(screen.getByText(/segment\.chunkDetail/i))!.toBeInTheDocument()
     })
 
     it('should render title for edit mode', () => {
       render(<SegmentDetail {...defaultProps} isEditMode={true} />)
 
-      expect(screen.getByText(/segment\.editChunk/i)).toBeInTheDocument()
+      expect(screen.getByText(/segment\.editChunk/i))!.toBeInTheDocument()
     })
 
     it('should render chunk content component', () => {
       render(<SegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('chunk-content')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-content'))!.toBeInTheDocument()
     })
 
     it('should render image uploader', () => {
       render(<SegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('image-uploader')).toBeInTheDocument()
+      expect(screen.getByTestId('image-uploader'))!.toBeInTheDocument()
     })
 
     it('should render segment index tag', () => {
       render(<SegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('segment-index-tag')).toBeInTheDocument()
+      expect(screen.getByTestId('segment-index-tag'))!.toBeInTheDocument()
     })
   })
 
@@ -213,25 +213,25 @@ describe('SegmentDetail', () => {
     it('should pass isEditMode to ChunkContent', () => {
       render(<SegmentDetail {...defaultProps} isEditMode={true} />)
 
-      expect(screen.getByTestId('edit-mode')).toHaveTextContent('editing')
+      expect(screen.getByTestId('edit-mode'))!.toHaveTextContent('editing')
     })
 
     it('should disable image uploader in view mode', () => {
       render(<SegmentDetail {...defaultProps} isEditMode={false} />)
 
-      expect(screen.getByTestId('uploader-disabled')).toHaveTextContent('disabled')
+      expect(screen.getByTestId('uploader-disabled'))!.toHaveTextContent('disabled')
     })
 
     it('should enable image uploader in edit mode', () => {
       render(<SegmentDetail {...defaultProps} isEditMode={true} />)
 
-      expect(screen.getByTestId('uploader-disabled')).toHaveTextContent('enabled')
+      expect(screen.getByTestId('uploader-disabled'))!.toHaveTextContent('enabled')
     })
 
     it('should show action buttons in edit mode', () => {
       render(<SegmentDetail {...defaultProps} isEditMode={true} />)
 
-      expect(screen.getByTestId('action-buttons')).toBeInTheDocument()
+      expect(screen.getByTestId('action-buttons'))!.toBeInTheDocument()
     })
 
     it('should not show action buttons in view mode (non-fullscreen)', () => {
@@ -248,7 +248,7 @@ describe('SegmentDetail', () => {
 
       render(<SegmentDetail {...defaultProps} />)
 
-      expect(screen.getByTestId('keywords')).toBeInTheDocument()
+      expect(screen.getByTestId('keywords'))!.toBeInTheDocument()
     })
 
     it('should not show keywords when indexing is QUALIFIED', () => {
@@ -264,7 +264,7 @@ describe('SegmentDetail', () => {
 
       render(<SegmentDetail {...defaultProps} isEditMode={false} />)
 
-      expect(screen.getByTestId('keywords-action')).toHaveTextContent('view')
+      expect(screen.getByTestId('keywords-action'))!.toHaveTextContent('view')
     })
 
     it('should pass edit action type when in edit mode', () => {
@@ -272,7 +272,7 @@ describe('SegmentDetail', () => {
 
       render(<SegmentDetail {...defaultProps} isEditMode={true} />)
 
-      expect(screen.getByTestId('keywords-action')).toHaveTextContent('edit')
+      expect(screen.getByTestId('keywords-action'))!.toHaveTextContent('edit')
     })
   })
 
@@ -283,7 +283,7 @@ describe('SegmentDetail', () => {
 
       const closeButtons = container.querySelectorAll('.cursor-pointer')
       if (closeButtons.length > 1)
-        fireEvent.click(closeButtons[1])
+        fireEvent.click(closeButtons[1]!)
 
       expect(mockOnCancel).toHaveBeenCalled()
     })
@@ -293,7 +293,7 @@ describe('SegmentDetail', () => {
 
       const expandButtons = container.querySelectorAll('.cursor-pointer')
       if (expandButtons.length > 0)
-        fireEvent.click(expandButtons[0])
+        fireEvent.click(expandButtons[0]!)
 
       expect(mockToggleFullScreen).toHaveBeenCalled()
     })
@@ -322,7 +322,7 @@ describe('SegmentDetail', () => {
         target: { value: 'Updated content' },
       })
 
-      expect(screen.getByTestId('question-input')).toHaveValue('Updated content')
+      expect(screen.getByTestId('question-input'))!.toHaveValue('Updated content')
     })
   })
 
@@ -333,7 +333,7 @@ describe('SegmentDetail', () => {
 
       render(<SegmentDetail {...defaultProps} isEditMode={true} />)
 
-      expect(screen.getByTestId('regenerate-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('regenerate-btn'))!.toBeInTheDocument()
     })
 
     it('should not show regeneration button when runtimeMode is not general', () => {
@@ -349,7 +349,7 @@ describe('SegmentDetail', () => {
 
       fireEvent.click(screen.getByTestId('regenerate-btn'))
 
-      expect(screen.getByTestId('regeneration-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('regeneration-modal'))!.toBeInTheDocument()
     })
 
     it('should call onModalStateChange when regeneration modal opens', () => {
@@ -392,7 +392,7 @@ describe('SegmentDetail', () => {
 
       render(<SegmentDetail {...defaultProps} isEditMode={true} />)
 
-      expect(screen.getByTestId('action-buttons')).toBeInTheDocument()
+      expect(screen.getByTestId('action-buttons'))!.toBeInTheDocument()
     })
 
     it('should apply full screen styling when fullScreen is true', () => {
@@ -401,7 +401,7 @@ describe('SegmentDetail', () => {
       const { container } = render(<SegmentDetail {...defaultProps} />)
 
       const header = container.querySelector('.border-divider-subtle')
-      expect(header).toBeInTheDocument()
+      expect(header)!.toBeInTheDocument()
     })
   })
 
@@ -415,7 +415,7 @@ describe('SegmentDetail', () => {
 
       const { container } = render(<SegmentDetail {...defaultProps} segInfo={minimalSegInfo} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should handle empty keywords array', () => {
@@ -424,7 +424,7 @@ describe('SegmentDetail', () => {
 
       render(<SegmentDetail {...defaultProps} segInfo={segInfo} />)
 
-      expect(screen.getByTestId('keywords-input')).toHaveValue('')
+      expect(screen.getByTestId('keywords-input'))!.toHaveValue('')
     })
 
     it('should maintain structure when rerendered', () => {
@@ -432,7 +432,7 @@ describe('SegmentDetail', () => {
 
       rerender(<SegmentDetail {...defaultProps} isEditMode={true} />)
 
-      expect(screen.getByTestId('action-buttons')).toBeInTheDocument()
+      expect(screen.getByTestId('action-buttons'))!.toBeInTheDocument()
     })
   })
 
@@ -443,7 +443,7 @@ describe('SegmentDetail', () => {
 
       fireEvent.click(screen.getByTestId('add-attachment-btn'))
 
-      expect(screen.getByTestId('attachments-count')).toHaveTextContent('1')
+      expect(screen.getByTestId('attachments-count'))!.toHaveTextContent('1')
     })
 
     it('should pass attachments to onUpdate when save is clicked', () => {
@@ -476,7 +476,7 @@ describe('SegmentDetail', () => {
 
       render(<SegmentDetail {...defaultProps} segInfo={segInfoWithAttachments} isEditMode={true} />)
 
-      expect(screen.getByTestId('attachments-count')).toHaveTextContent('1')
+      expect(screen.getByTestId('attachments-count'))!.toHaveTextContent('1')
     })
   })
 
@@ -529,7 +529,7 @@ describe('SegmentDetail', () => {
     it('should render answer input in QA mode', () => {
       render(<SegmentDetail {...defaultProps} docForm={ChunkingMode.qa} isEditMode={true} />)
 
-      expect(screen.getByTestId('answer-input')).toBeInTheDocument()
+      expect(screen.getByTestId('answer-input'))!.toBeInTheDocument()
     })
 
     it('should update answer when input changes', () => {
@@ -539,14 +539,15 @@ describe('SegmentDetail', () => {
         target: { value: 'Updated answer' },
       })
 
-      expect(screen.getByTestId('answer-input')).toHaveValue('Updated answer')
+      expect(screen.getByTestId('answer-input'))!.toHaveValue('Updated answer')
     })
 
     it('should calculate word count correctly in QA mode', () => {
       render(<SegmentDetail {...defaultProps} docForm={ChunkingMode.qa} isEditMode={true} />)
 
       // Assert - should show combined length of question and answer
-      expect(screen.getByText(/segment\.characters/i)).toBeInTheDocument()
+      // Assert - should show combined length of question and answer
+      expect(screen.getByText(/segment\.characters/i))!.toBeInTheDocument()
     })
   })
 
@@ -557,7 +558,7 @@ describe('SegmentDetail', () => {
 
       render(<SegmentDetail {...defaultProps} docForm={ChunkingMode.parentChild} />)
 
-      expect(screen.getByTestId('segment-index-tag')).toBeInTheDocument()
+      expect(screen.getByTestId('segment-index-tag'))!.toBeInTheDocument()
     })
   })
 
@@ -571,7 +572,7 @@ describe('SegmentDetail', () => {
         target: { value: 'new,keywords' },
       })
 
-      expect(screen.getByTestId('keywords-input')).toHaveValue('new,keywords')
+      expect(screen.getByTestId('keywords-input'))!.toHaveValue('new,keywords')
     })
   })
 })
diff --git a/web/app/components/datasets/documents/detail/completed/common/__tests__/action-buttons.spec.tsx b/web/app/components/datasets/documents/detail/completed/common/__tests__/action-buttons.spec.tsx
index edf4b30922..c8500e3769 100644
--- a/web/app/components/datasets/documents/detail/completed/common/__tests__/action-buttons.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/__tests__/action-buttons.spec.tsx
@@ -63,7 +63,7 @@ describe('ActionButtons', () => {
         { wrapper: createWrapper({}) },
       )
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render cancel button', () => {
@@ -76,7 +76,7 @@ describe('ActionButtons', () => {
         { wrapper: createWrapper({}) },
       )
 
-      expect(screen.getByText(/operation\.cancel/i)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.cancel/i))!.toBeInTheDocument()
     })
 
     it('should render save button', () => {
@@ -89,7 +89,7 @@ describe('ActionButtons', () => {
         { wrapper: createWrapper({}) },
       )
 
-      expect(screen.getByText(/operation\.save/i)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.save/i))!.toBeInTheDocument()
     })
 
     it('should render ESC keyboard hint on cancel button', () => {
@@ -102,7 +102,7 @@ describe('ActionButtons', () => {
         { wrapper: createWrapper({}) },
       )
 
-      expect(screen.getByText('ESC')).toBeInTheDocument()
+      expect(screen.getByText('ESC'))!.toBeInTheDocument()
     })
 
     it('should render S keyboard hint on save button', () => {
@@ -115,7 +115,7 @@ describe('ActionButtons', () => {
         { wrapper: createWrapper({}) },
       )
 
-      expect(screen.getByText('S')).toBeInTheDocument()
+      expect(screen.getByText('S'))!.toBeInTheDocument()
     })
   })
 
@@ -132,7 +132,7 @@ describe('ActionButtons', () => {
       )
 
       const cancelButton = screen.getAllByRole('button')[0]
-      fireEvent.click(cancelButton)
+      fireEvent.click(cancelButton!)
 
       expect(mockHandleCancel).toHaveBeenCalledTimes(1)
     })
@@ -150,7 +150,7 @@ describe('ActionButtons', () => {
 
       const buttons = screen.getAllByRole('button')
       const saveButton = buttons[buttons.length - 1] // Save button is last
-      fireEvent.click(saveButton)
+      fireEvent.click(saveButton!)
 
       expect(mockHandleSave).toHaveBeenCalledTimes(1)
     })
@@ -167,7 +167,7 @@ describe('ActionButtons', () => {
 
       const buttons = screen.getAllByRole('button')
       const saveButton = buttons[buttons.length - 1]
-      expect(saveButton).toBeDisabled()
+      expect(saveButton)!.toBeDisabled()
     })
   })
 
@@ -187,7 +187,7 @@ describe('ActionButtons', () => {
         { wrapper: createWrapper({ docForm: ChunkingMode.parentChild, parentMode: 'paragraph' }) },
       )
 
-      expect(screen.getByText(/operation\.saveAndRegenerate/i)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.saveAndRegenerate/i))!.toBeInTheDocument()
     })
 
     it('should not show regeneration button when isChildChunk is true', () => {
@@ -278,7 +278,7 @@ describe('ActionButtons', () => {
       )
 
       const regenerationButton = screen.getByText(/operation\.saveAndRegenerate/i).closest('button')
-      expect(regenerationButton).toBeDisabled()
+      expect(regenerationButton)!.toBeDisabled()
     })
   })
 
@@ -298,7 +298,8 @@ describe('ActionButtons', () => {
       )
 
       // Assert - regeneration button should show with default actionType='edit'
-      expect(screen.getByText(/operation\.saveAndRegenerate/i)).toBeInTheDocument()
+      // Assert - regeneration button should show with default actionType='edit'
+      expect(screen.getByText(/operation\.saveAndRegenerate/i))!.toBeInTheDocument()
     })
 
     it('should use default isChildChunk of false', () => {
@@ -316,7 +317,8 @@ describe('ActionButtons', () => {
       )
 
       // Assert - regeneration button should show with default isChildChunk=false
-      expect(screen.getByText(/operation\.saveAndRegenerate/i)).toBeInTheDocument()
+      // Assert - regeneration button should show with default isChildChunk=false
+      expect(screen.getByText(/operation\.saveAndRegenerate/i))!.toBeInTheDocument()
     })
 
     it('should use default showRegenerationButton of true', () => {
@@ -334,7 +336,8 @@ describe('ActionButtons', () => {
       )
 
       // Assert - regeneration button should show with default showRegenerationButton=true
-      expect(screen.getByText(/operation\.saveAndRegenerate/i)).toBeInTheDocument()
+      // Assert - regeneration button should show with default showRegenerationButton=true
+      expect(screen.getByText(/operation\.saveAndRegenerate/i))!.toBeInTheDocument()
     })
   })
 
@@ -373,8 +376,8 @@ describe('ActionButtons', () => {
         </DocumentContext.Provider>,
       )
 
-      expect(screen.getByText(/operation\.cancel/i)).toBeInTheDocument()
-      expect(screen.getByText(/operation\.save/i)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.cancel/i))!.toBeInTheDocument()
+      expect(screen.getByText(/operation\.save/i))!.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/datasets/documents/detail/completed/common/__tests__/chunk-content.spec.tsx b/web/app/components/datasets/documents/detail/completed/common/__tests__/chunk-content.spec.tsx
index 115db9ad61..a92cc9d350 100644
--- a/web/app/components/datasets/documents/detail/completed/common/__tests__/chunk-content.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/__tests__/chunk-content.spec.tsx
@@ -34,19 +34,50 @@ describe('ChunkContent', () => {
     it('should render without crashing', () => {
       const { container } = render(<ChunkContent {...defaultProps} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render textarea in edit mode with text docForm', () => {
       render(<ChunkContent {...defaultProps} isEditMode={true} />)
 
       const textarea = screen.getByRole('textbox')
-      expect(textarea).toBeInTheDocument()
+      expect(textarea)!.toBeInTheDocument()
     })
 
     it('should render Markdown content in view mode with text docForm', () => {
       const { container } = render(<ChunkContent {...defaultProps} isEditMode={false} />)
 
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
+      // Assert - In view mode, textarea should not be present, Markdown renders instead
       // Assert - In view mode, textarea should not be present, Markdown renders instead
       expect(container.querySelector('textarea')).not.toBeInTheDocument()
     })
@@ -66,8 +97,9 @@ describe('ChunkContent', () => {
       )
 
       // Assert - QA mode has QUESTION and ANSWER labels
-      expect(screen.getByText('QUESTION')).toBeInTheDocument()
-      expect(screen.getByText('ANSWER')).toBeInTheDocument()
+      // Assert - QA mode has QUESTION and ANSWER labels
+      expect(screen.getByText('QUESTION'))!.toBeInTheDocument()
+      expect(screen.getByText('ANSWER'))!.toBeInTheDocument()
     })
 
     it('should display question value in QA mode', () => {
@@ -83,7 +115,7 @@ describe('ChunkContent', () => {
       )
 
       const textareas = screen.getAllByRole('textbox')
-      expect(textareas[0]).toHaveValue('My question')
+      expect(textareas[0])!.toHaveValue('My question')
     })
 
     it('should display answer value in QA mode', () => {
@@ -99,7 +131,7 @@ describe('ChunkContent', () => {
       )
 
       const textareas = screen.getAllByRole('textbox')
-      expect(textareas[1]).toHaveValue('My answer')
+      expect(textareas[1])!.toHaveValue('My answer')
     })
   })
 
@@ -133,7 +165,7 @@ describe('ChunkContent', () => {
       )
 
       const textareas = screen.getAllByRole('textbox')
-      fireEvent.change(textareas[0], { target: { value: 'New question' } })
+      fireEvent.change(textareas[0]!, { target: { value: 'New question' } })
 
       expect(mockOnQuestionChange).toHaveBeenCalledWith('New question')
     })
@@ -151,7 +183,7 @@ describe('ChunkContent', () => {
       )
 
       const textareas = screen.getAllByRole('textbox')
-      fireEvent.change(textareas[1], { target: { value: 'New answer' } })
+      fireEvent.change(textareas[1]!, { target: { value: 'New answer' } })
 
       expect(mockOnAnswerChange).toHaveBeenCalledWith('New answer')
     })
@@ -161,6 +193,37 @@ describe('ChunkContent', () => {
         <ChunkContent {...defaultProps} isEditMode={false} />,
       )
 
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
+      // Assert - In view mode, Markdown is rendered instead of textarea
       // Assert - In view mode, Markdown is rendered instead of textarea
       expect(container.querySelector('textarea')).not.toBeInTheDocument()
     })
@@ -178,7 +241,7 @@ describe('ChunkContent', () => {
 
       const textareas = screen.getAllByRole('textbox')
       textareas.forEach((textarea) => {
-        expect(textarea).toBeDisabled()
+        expect(textarea)!.toBeDisabled()
       })
     })
   })
@@ -188,7 +251,7 @@ describe('ChunkContent', () => {
     it('should handle ChunkingMode.text', () => {
       render(<ChunkContent {...defaultProps} docForm={ChunkingMode.text} isEditMode={true} />)
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should handle ChunkingMode.qa', () => {
@@ -203,8 +266,9 @@ describe('ChunkContent', () => {
       )
 
       // Assert - QA mode should show both question and answer
-      expect(screen.getByText('QUESTION')).toBeInTheDocument()
-      expect(screen.getByText('ANSWER')).toBeInTheDocument()
+      // Assert - QA mode should show both question and answer
+      expect(screen.getByText('QUESTION'))!.toBeInTheDocument()
+      expect(screen.getByText('ANSWER'))!.toBeInTheDocument()
     })
 
     it('should handle ChunkingMode.parentChild similar to text mode', () => {
@@ -217,7 +281,8 @@ describe('ChunkContent', () => {
       )
 
       // Assert - parentChild should render like text mode
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      // Assert - parentChild should render like text mode
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
   })
 
@@ -232,7 +297,7 @@ describe('ChunkContent', () => {
       )
 
       const textarea = screen.getByRole('textbox')
-      expect(textarea).toHaveValue('')
+      expect(textarea)!.toHaveValue('')
     })
 
     it('should handle empty answer in QA mode', () => {
@@ -248,7 +313,7 @@ describe('ChunkContent', () => {
       )
 
       const textareas = screen.getAllByRole('textbox')
-      expect(textareas[1]).toHaveValue('')
+      expect(textareas[1])!.toHaveValue('')
     })
 
     it('should handle undefined answer in QA mode', () => {
@@ -261,7 +326,8 @@ describe('ChunkContent', () => {
       )
 
       // Assert - should render without crashing
-      expect(screen.getByText('QUESTION')).toBeInTheDocument()
+      // Assert - should render without crashing
+      expect(screen.getByText('QUESTION'))!.toBeInTheDocument()
     })
 
     it('should maintain structure when rerendered', () => {
@@ -274,7 +340,7 @@ describe('ChunkContent', () => {
       )
 
       const textarea = screen.getByRole('textbox')
-      expect(textarea).toHaveValue('Updated')
+      expect(textarea)!.toHaveValue('Updated')
     })
   })
 })
diff --git a/web/app/components/datasets/documents/detail/completed/components/segment-list-content.tsx b/web/app/components/datasets/documents/detail/completed/components/segment-list-content.tsx
index 116ba38856..d675763843 100644
--- a/web/app/components/datasets/documents/detail/completed/components/segment-list-content.tsx
+++ b/web/app/components/datasets/documents/detail/completed/components/segment-list-content.tsx
@@ -49,7 +49,7 @@ export const FullDocModeContent: FC<FullDocModeContentProps> = ({
     >
       <SegmentCard
         detail={firstSegment}
-        onClick={() => onClickCard(firstSegment)}
+        onClick={() => onClickCard(firstSegment!)}
         loading={isLoadingSegmentList}
         focused={{
           segmentIndex: currSegmentId === firstSegment?.id,
@@ -57,7 +57,7 @@ export const FullDocModeContent: FC<FullDocModeContentProps> = ({
         }}
       />
       <ChildSegmentList
-        parentChunkId={firstSegment?.id}
+        parentChunkId={firstSegment?.id!}
         onDelete={onDeleteChildChunk}
         childChunks={childSegments}
         handleInputChange={handleInputChange}
diff --git a/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-child-segment-data.spec.ts b/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-child-segment-data.spec.ts
index 2dd99abcb9..7817a3b2aa 100644
--- a/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-child-segment-data.spec.ts
+++ b/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-child-segment-data.spec.ts
@@ -452,7 +452,7 @@ describe('useChildSegmentData', () => {
       expect(updateSegmentInCache).toHaveBeenCalledWith('seg-1', expect.any(Function))
 
       // Verify the updater function filters correctly
-      const updaterFn = updateSegmentInCache.mock.calls[0][1]
+      const updaterFn = updateSegmentInCache.mock.calls[0]![1]
       const testSegment = createMockSegment({
         child_chunks: [
           createMockChildChunk({ id: 'child-1' }),
@@ -499,7 +499,7 @@ describe('useChildSegmentData', () => {
       expect(updateSegmentInCache).toHaveBeenCalledWith('seg-1', expect.any(Function))
 
       // Verify the updater function maps correctly
-      const updaterFn = updateSegmentInCache.mock.calls[0][1]
+      const updaterFn = updateSegmentInCache.mock.calls[0]![1]
       const testSegment = createMockSegment({
         child_chunks: [
           createMockChildChunk({ id: 'child-1', content: 'old content' }),
@@ -564,8 +564,8 @@ describe('useChildSegmentData', () => {
             total: 2,
             total_pages: 1,
           }) as ChildSegmentsResponse
-          expect(resultWithData.data[0].content).toBe('new content')
-          expect(resultWithData.data[1].content).toBe('other')
+          expect(resultWithData.data[0]!.content).toBe('new content')
+          expect(resultWithData.data[1]!.content).toBe('other')
         }
       })
 
diff --git a/web/app/components/datasets/documents/detail/completed/segment-list.tsx b/web/app/components/datasets/documents/detail/completed/segment-list.tsx
index 9e5f0ab2fe..3a554fc0b6 100644
--- a/web/app/components/datasets/documents/detail/completed/segment-list.tsx
+++ b/web/app/components/datasets/documents/detail/completed/segment-list.tsx
@@ -71,7 +71,7 @@ const SegmentList = (
     <div ref={ref} className="flex grow flex-col overflow-y-auto">
       {
         items.map((segItem) => {
-          const isLast = items[items.length - 1].id === segItem.id
+          const isLast = items[items.length - 1]!.id === segItem.id
           const segmentIndexFocused
             = currSegment?.segInfo?.id === segItem.id
               || (!currSegment && currChildChunk?.childChunkInfo?.segment_id === segItem.id)
diff --git a/web/app/components/datasets/documents/detail/embedding/hooks/__tests__/use-embedding-status.spec.tsx b/web/app/components/datasets/documents/detail/embedding/hooks/__tests__/use-embedding-status.spec.tsx
index 893484afeb..149d0a60ea 100644
--- a/web/app/components/datasets/documents/detail/embedding/hooks/__tests__/use-embedding-status.spec.tsx
+++ b/web/app/components/datasets/documents/detail/embedding/hooks/__tests__/use-embedding-status.spec.tsx
@@ -342,7 +342,7 @@ describe('use-embedding-status', () => {
 
       await waitFor(() => {
         expect(onError).toHaveBeenCalled()
-        expect(onError.mock.calls[0][0]).toEqual(error)
+        expect(onError.mock.calls[0]![0]).toEqual(error)
       })
     })
   })
diff --git a/web/app/components/datasets/documents/detail/metadata/__tests__/index.spec.tsx b/web/app/components/datasets/documents/detail/metadata/__tests__/index.spec.tsx
index 2d60e5f322..5b268e554c 100644
--- a/web/app/components/datasets/documents/detail/metadata/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/detail/metadata/__tests__/index.spec.tsx
@@ -181,24 +181,55 @@ describe('Metadata', () => {
     it('should render without crashing', () => {
       const { container } = render(<Metadata {...defaultProps} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render metadata title', () => {
       render(<Metadata {...defaultProps} />)
 
-      expect(screen.getByText(/metadata\.title/i)).toBeInTheDocument()
+      expect(screen.getByText(/metadata\.title/i))!.toBeInTheDocument()
     })
 
     it('should render edit button', () => {
       render(<Metadata {...defaultProps} />)
 
-      expect(screen.getByText(/operation\.edit/i)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.edit/i))!.toBeInTheDocument()
     })
 
     it('should show loading state', () => {
       render(<Metadata {...defaultProps} loading={true} />)
 
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
+      // Assert - Loading component should be rendered, title should not
       // Assert - Loading component should be rendered, title should not
       expect(screen.queryByText(/metadata\.title/i)).not.toBeInTheDocument()
     })
@@ -206,7 +237,7 @@ describe('Metadata', () => {
     it('should display document type icon and text', () => {
       render(<Metadata {...defaultProps} />)
 
-      expect(screen.getByText('Book')).toBeInTheDocument()
+      expect(screen.getByText('Book'))!.toBeInTheDocument()
     })
   })
 
@@ -217,8 +248,8 @@ describe('Metadata', () => {
 
       fireEvent.click(screen.getByText(/operation\.edit/i))
 
-      expect(screen.getByText(/operation\.cancel/i)).toBeInTheDocument()
-      expect(screen.getByText(/operation\.save/i)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.cancel/i))!.toBeInTheDocument()
+      expect(screen.getByText(/operation\.save/i))!.toBeInTheDocument()
     })
 
     it('should show change link in edit mode', () => {
@@ -226,7 +257,7 @@ describe('Metadata', () => {
 
       fireEvent.click(screen.getByText(/operation\.edit/i))
 
-      expect(screen.getByText(/operation\.change/i)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.change/i))!.toBeInTheDocument()
     })
 
     it('should cancel edit and restore values when cancel is clicked', () => {
@@ -238,7 +269,8 @@ describe('Metadata', () => {
       fireEvent.click(screen.getByText(/operation\.cancel/i))
 
       // Assert - should be back to view mode
-      expect(screen.getByText(/operation\.edit/i)).toBeInTheDocument()
+      // Assert - should be back to view mode
+      expect(screen.getByText(/operation\.edit/i))!.toBeInTheDocument()
     })
 
     it('should save metadata when save button is clicked', async () => {
@@ -299,7 +331,7 @@ describe('Metadata', () => {
 
       render(<Metadata {...defaultProps} docDetail={docDetail} />)
 
-      expect(screen.getByText(/metadata\.docTypeSelectTitle/i)).toBeInTheDocument()
+      expect(screen.getByText(/metadata\.docTypeSelectTitle/i))!.toBeInTheDocument()
     })
 
     it('should show description when no doc_type exists', () => {
@@ -307,7 +339,7 @@ describe('Metadata', () => {
 
       render(<Metadata {...defaultProps} docDetail={docDetail} />)
 
-      expect(screen.getByText(/metadata\.desc/i)).toBeInTheDocument()
+      expect(screen.getByText(/metadata\.desc/i))!.toBeInTheDocument()
     })
 
     it('should show change link in edit mode when doc_type exists', () => {
@@ -316,7 +348,7 @@ describe('Metadata', () => {
       // Enter edit mode
       fireEvent.click(screen.getByText(/operation\.edit/i))
 
-      expect(screen.getByText(/operation\.change/i)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.change/i))!.toBeInTheDocument()
     })
 
     it('should show doc type change title after clicking change', () => {
@@ -327,7 +359,7 @@ describe('Metadata', () => {
 
       fireEvent.click(screen.getByText(/operation\.change/i))
 
-      expect(screen.getByText(/metadata\.docTypeChangeTitle/i)).toBeInTheDocument()
+      expect(screen.getByText(/metadata\.docTypeChangeTitle/i))!.toBeInTheDocument()
     })
   })
 
@@ -337,14 +369,15 @@ describe('Metadata', () => {
       render(<Metadata {...defaultProps} />)
 
       // Assert
-      expect(screen.getByText('Data Source Type')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Data Source Type'))!.toBeInTheDocument()
     })
 
     it('should render technical parameters fields', () => {
       render(<Metadata {...defaultProps} />)
 
-      expect(screen.getByText('Segment Count')).toBeInTheDocument()
-      expect(screen.getByText('Hit Count')).toBeInTheDocument()
+      expect(screen.getByText('Segment Count'))!.toBeInTheDocument()
+      expect(screen.getByText('Hit Count'))!.toBeInTheDocument()
     })
   })
 
@@ -355,27 +388,30 @@ describe('Metadata', () => {
       const { container } = render(<Metadata {...defaultProps} docDetail={docDetail} />)
 
       // Assert
-      expect(container.firstChild).toBeInTheDocument()
+      // Assert
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should handle undefined docDetail gracefully', () => {
       const { container } = render(<Metadata {...defaultProps} docDetail={undefined} loading={false} />)
 
       // Assert
-      expect(container.firstChild).toBeInTheDocument()
+      // Assert
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should update document type display when docDetail changes', () => {
       const { rerender } = render(<Metadata {...defaultProps} />)
 
       // Act - verify initial state shows Book
-      expect(screen.getByText('Book')).toBeInTheDocument()
+      // Act - verify initial state shows Book
+      expect(screen.getByText('Book'))!.toBeInTheDocument()
 
       // Update with new doc type
       const updatedDocDetail = createMockDocDetail({ doc_type: 'paper' })
       rerender(<Metadata {...defaultProps} docDetail={updatedDocDetail} />)
 
-      expect(screen.getByText('Paper')).toBeInTheDocument()
+      expect(screen.getByText('Paper'))!.toBeInTheDocument()
     })
   })
 
@@ -386,7 +422,7 @@ describe('Metadata', () => {
 
       render(<Metadata {...defaultProps} docDetail={docDetail} />)
 
-      expect(screen.getByText(/metadata\.firstMetaAction/i)).toBeInTheDocument()
+      expect(screen.getByText(/metadata\.firstMetaAction/i))!.toBeInTheDocument()
     })
   })
 })
@@ -407,19 +443,19 @@ describe('FieldInfo', () => {
     it('should render without crashing', () => {
       const { container } = render(<FieldInfo {...defaultFieldInfoProps} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render label', () => {
       render(<FieldInfo {...defaultFieldInfoProps} />)
 
-      expect(screen.getByText('Test Label')).toBeInTheDocument()
+      expect(screen.getByText('Test Label'))!.toBeInTheDocument()
     })
 
     it('should render displayed value in view mode', () => {
       render(<FieldInfo {...defaultFieldInfoProps} showEdit={false} />)
 
-      expect(screen.getByText('Test Display Value')).toBeInTheDocument()
+      expect(screen.getByText('Test Display Value'))!.toBeInTheDocument()
     })
   })
 
@@ -428,7 +464,7 @@ describe('FieldInfo', () => {
     it('should render input when showEdit is true and inputType is input', () => {
       render(<FieldInfo {...defaultFieldInfoProps} showEdit={true} inputType="input" onUpdate={vi.fn()} />)
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should render select when showEdit is true and inputType is select', () => {
@@ -443,13 +479,14 @@ describe('FieldInfo', () => {
       )
 
       // Assert - SimpleSelect should be rendered
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      // Assert - SimpleSelect should be rendered
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
 
     it('should render textarea when showEdit is true and inputType is textarea', () => {
       render(<FieldInfo {...defaultFieldInfoProps} showEdit={true} inputType="textarea" onUpdate={vi.fn()} />)
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should call onUpdate when input value changes', () => {
@@ -476,14 +513,14 @@ describe('FieldInfo', () => {
     it('should render value icon when provided', () => {
       render(<FieldInfo {...defaultFieldInfoProps} valueIcon={<span data-testid="value-icon">Icon</span>} />)
 
-      expect(screen.getByTestId('value-icon')).toBeInTheDocument()
+      expect(screen.getByTestId('value-icon'))!.toBeInTheDocument()
     })
 
     it('should use defaultValue when provided', () => {
       render(<FieldInfo {...defaultFieldInfoProps} showEdit={true} inputType="input" defaultValue="Default" onUpdate={vi.fn()} />)
 
       const input = screen.getByRole('textbox')
-      expect(input).toHaveAttribute('placeholder')
+      expect(input)!.toHaveAttribute('placeholder')
     })
   })
 })
@@ -510,13 +547,15 @@ describe('useMetadataState coverage', () => {
       fireEvent.click(screen.getByText(/operation\.change/i))
 
       // Now in doc type selector mode — should show cancel button
-      expect(screen.getByText(/operation\.cancel/i)).toBeInTheDocument()
+      // Now in doc type selector mode — should show cancel button
+      expect(screen.getByText(/operation\.cancel/i))!.toBeInTheDocument()
 
       // Act — cancel the doc type change
       fireEvent.click(screen.getByText(/operation\.cancel/i))
 
       // Assert — should be back to edit mode (cancel + save buttons visible)
-      expect(screen.getByText(/operation\.save/i)).toBeInTheDocument()
+      // Assert — should be back to edit mode (cancel + save buttons visible)
+      expect(screen.getByText(/operation\.save/i))!.toBeInTheDocument()
     })
   })
 
@@ -530,14 +569,16 @@ describe('useMetadataState coverage', () => {
       fireEvent.click(screen.getByText(/operation\.change/i))
 
       // DocTypeSelector shows save/cancel buttons
-      expect(screen.getByText(/metadata\.docTypeChangeTitle/i)).toBeInTheDocument()
+      // DocTypeSelector shows save/cancel buttons
+      expect(screen.getByText(/metadata\.docTypeChangeTitle/i))!.toBeInTheDocument()
 
       // Act — click save to confirm same doc type (tempDocType='book')
       fireEvent.click(screen.getByText(/operation\.save/i))
 
       // Assert — should return to edit mode with metadata fields visible
-      expect(screen.getByText(/operation\.cancel/i)).toBeInTheDocument()
-      expect(screen.getByText(/operation\.save/i)).toBeInTheDocument()
+      // Assert — should return to edit mode with metadata fields visible
+      expect(screen.getByText(/operation\.cancel/i))!.toBeInTheDocument()
+      expect(screen.getByText(/operation\.save/i))!.toBeInTheDocument()
     })
   })
 
@@ -551,17 +592,20 @@ describe('useMetadataState coverage', () => {
 
       // 'others' is normalized to '' → useEffect fires (doc_type truthy) → view mode
       // The rendered type uses default 'book' fallback for display
-      expect(screen.getByText(/operation\.edit/i)).toBeInTheDocument()
+      // 'others' is normalized to '' → useEffect fires (doc_type truthy) → view mode
+      // The rendered type uses default 'book' fallback for display
+      expect(screen.getByText(/operation\.edit/i))!.toBeInTheDocument()
 
       // Enter edit mode
       fireEvent.click(screen.getByText(/operation\.edit/i))
-      expect(screen.getByText(/operation\.cancel/i)).toBeInTheDocument()
+      expect(screen.getByText(/operation\.cancel/i))!.toBeInTheDocument()
 
       // Act — cancel edit; internally docType is '' so cancelEdit goes to showDocTypes
       fireEvent.click(screen.getByText(/operation\.cancel/i))
 
       // Assert — should show doc type selection since normalized docType was ''
-      expect(screen.getByText(/metadata\.docTypeSelectTitle/i)).toBeInTheDocument()
+      // Assert — should show doc type selection since normalized docType was ''
+      expect(screen.getByText(/metadata\.docTypeSelectTitle/i))!.toBeInTheDocument()
     })
   })
 
@@ -576,10 +620,11 @@ describe('useMetadataState coverage', () => {
       // Act — find an input and change its value (Title field)
       const inputs = screen.getAllByRole('textbox')
       expect(inputs.length).toBeGreaterThan(0)
-      fireEvent.change(inputs[0], { target: { value: 'Updated Title' } })
+      fireEvent.change(inputs[0]!, { target: { value: 'Updated Title' } })
 
       // Assert — the input should have the new value
-      expect(inputs[0]).toHaveValue('Updated Title')
+      // Assert — the input should have the new value
+      expect(inputs[0])!.toHaveValue('Updated Title')
     })
   })
 
@@ -629,7 +674,8 @@ describe('useMetadataState coverage', () => {
       )
 
       // Assert — should render without crashing, showing Paper type
-      expect(screen.getByText('Paper')).toBeInTheDocument()
+      // Assert — should render without crashing, showing Paper type
+      expect(screen.getByText('Paper'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/documents/detail/metadata/components/__tests__/metadata-field-list.spec.tsx b/web/app/components/datasets/documents/detail/metadata/components/__tests__/metadata-field-list.spec.tsx
index cc5b16fc3e..9f07c06d77 100644
--- a/web/app/components/datasets/documents/detail/metadata/components/__tests__/metadata-field-list.spec.tsx
+++ b/web/app/components/datasets/documents/detail/metadata/components/__tests__/metadata-field-list.spec.tsx
@@ -42,9 +42,9 @@ describe('MetadataFieldList', () => {
         />,
       )
 
-      expect(screen.getByText('Title')).toBeInTheDocument()
-      expect(screen.getByText('Language')).toBeInTheDocument()
-      expect(screen.getByText('Author')).toBeInTheDocument()
+      expect(screen.getByText('Title'))!.toBeInTheDocument()
+      expect(screen.getByText('Language'))!.toBeInTheDocument()
+      expect(screen.getByText('Author'))!.toBeInTheDocument()
     })
 
     it('should return null when mainField is empty', () => {
@@ -76,7 +76,7 @@ describe('MetadataFieldList', () => {
         />,
       )
 
-      expect(screen.getByText('English')).toBeInTheDocument()
+      expect(screen.getByText('English'))!.toBeInTheDocument()
     })
   })
 
@@ -109,7 +109,7 @@ describe('MetadataFieldList', () => {
 
       // Find the first textbox and type in it
       const inputs = screen.getAllByRole('textbox')
-      fireEvent.change(inputs[0], { target: { value: 'New Title' } })
+      fireEvent.change(inputs[0]!, { target: { value: 'New Title' } })
 
       expect(onUpdate).toHaveBeenCalled()
     })
@@ -128,8 +128,8 @@ describe('MetadataFieldList', () => {
         />,
       )
 
-      expect(screen.getByText('Source')).toBeInTheDocument()
-      expect(screen.getByText('Web')).toBeInTheDocument()
+      expect(screen.getByText('Source'))!.toBeInTheDocument()
+      expect(screen.getByText('Web'))!.toBeInTheDocument()
     })
 
     it('should render custom render function output for fields with render', () => {
@@ -143,7 +143,7 @@ describe('MetadataFieldList', () => {
         />,
       )
 
-      expect(screen.getByText('15 / 5')).toBeInTheDocument()
+      expect(screen.getByText('15 / 5'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/documents/detail/metadata/components/metadata-field-list.tsx b/web/app/components/datasets/documents/detail/metadata/components/metadata-field-list.tsx
index 9f452279ed..03af49359d 100644
--- a/web/app/components/datasets/documents/detail/metadata/components/metadata-field-list.tsx
+++ b/web/app/components/datasets/documents/detail/metadata/components/metadata-field-list.tsx
@@ -7,7 +7,7 @@ import { useBookCategories, useBusinessDocCategories, useLanguages, useMetadataM
 import FieldInfo from './field-info'
 
 const map2Options = (map: Record<string, string>) => {
-  return Object.keys(map).map(key => ({ value: key, name: map[key] }))
+  return Object.keys(map).map(key => ({ value: key, name: map[key]! }))
 }
 
 function useCategoryMapResolver(mainField: metadataType | '') {
@@ -72,7 +72,7 @@ const MetadataFieldList: FC<MetadataFieldListProps> = ({
       {Object.keys(fieldMap).map(field => (
         <FieldInfo
           key={fieldMap[field]?.label}
-          label={fieldMap[field]?.label}
+          label={fieldMap[field]?.label!}
           displayedValue={getDisplayValue(field)}
           value={get(sourceData, field, '')}
           inputType={fieldMap[field]?.inputType || 'input'}
diff --git a/web/app/components/datasets/documents/hooks/__tests__/use-document-list-query-state.spec.tsx b/web/app/components/datasets/documents/hooks/__tests__/use-document-list-query-state.spec.tsx
index 5879e72782..dda78bd068 100644
--- a/web/app/components/datasets/documents/hooks/__tests__/use-document-list-query-state.spec.tsx
+++ b/web/app/components/datasets/documents/hooks/__tests__/use-document-list-query-state.spec.tsx
@@ -164,7 +164,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('page')).toBe('2')
       expect(update.options.history).toBe('push')
     })
@@ -177,7 +177,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('status')).toBe('error')
     })
 
@@ -189,7 +189,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('status')).toBe(false)
     })
 
@@ -201,7 +201,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('sort')).toBe('hit_count')
     })
 
@@ -213,7 +213,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('sort')).toBe(false)
     })
 
@@ -225,7 +225,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('keyword')).toBe('test query')
       expect(update.options.history).toBe('replace')
     })
@@ -238,7 +238,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('keyword')).toBe('hello')
       expect(update.searchParams.has('page')).toBe(false)
       expect(update.options.history).toBe('replace')
@@ -252,7 +252,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('keyword')).toBe(false)
       expect(update.options.history).toBe('replace')
     })
@@ -265,7 +265,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('keyword')).toBe(false)
       expect(result.current.query.keyword).toBe('')
     })
@@ -278,7 +278,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('keyword')).toBe('%2F')
       expect(result.current.query.keyword).toBe('%2F')
     })
@@ -302,7 +302,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('status')).toBe(false)
     })
 
@@ -314,7 +314,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('sort')).toBe(false)
     })
 
@@ -326,7 +326,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('page')).toBe(false)
     })
 
@@ -338,7 +338,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('page')).toBe('2')
     })
 
@@ -350,7 +350,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('limit')).toBe('25')
     })
 
@@ -362,7 +362,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('page')).toBe(false)
       expect(result.current.query.page).toBe(1)
     })
@@ -375,7 +375,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('limit')).toBe(false)
       expect(result.current.query.limit).toBe(10)
     })
@@ -406,7 +406,7 @@ describe('useDocumentListQueryState', () => {
       })
 
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('page')).toBe(false)
       expect(update.searchParams.has('status')).toBe(false)
     })
diff --git a/web/app/components/datasets/external-api/external-api-modal/__tests__/index.spec.tsx b/web/app/components/datasets/external-api/external-api-modal/__tests__/index.spec.tsx
index 73579db413..e24712887a 100644
--- a/web/app/components/datasets/external-api/external-api-modal/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/external-api/external-api-modal/__tests__/index.spec.tsx
@@ -46,42 +46,42 @@ describe('AddExternalAPIModal', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<AddExternalAPIModal {...defaultProps} />)
-      expect(screen.getByText('dataset.createExternalAPI')).toBeInTheDocument()
+      expect(screen.getByText('dataset.createExternalAPI'))!.toBeInTheDocument()
     })
 
     it('should render create title when not in edit mode', () => {
       render(<AddExternalAPIModal {...defaultProps} isEditMode={false} />)
-      expect(screen.getByText('dataset.createExternalAPI')).toBeInTheDocument()
+      expect(screen.getByText('dataset.createExternalAPI'))!.toBeInTheDocument()
     })
 
     it('should render edit title when in edit mode', () => {
       render(<AddExternalAPIModal {...defaultProps} isEditMode={true} data={initialData} />)
-      expect(screen.getByText('dataset.editExternalAPIFormTitle')).toBeInTheDocument()
+      expect(screen.getByText('dataset.editExternalAPIFormTitle'))!.toBeInTheDocument()
     })
 
     it('should render form fields', () => {
       render(<AddExternalAPIModal {...defaultProps} />)
-      expect(screen.getByLabelText(/name/i)).toBeInTheDocument()
-      expect(screen.getByLabelText(/api endpoint/i)).toBeInTheDocument()
-      expect(screen.getByLabelText(/api key/i)).toBeInTheDocument()
+      expect(screen.getByLabelText(/name/i))!.toBeInTheDocument()
+      expect(screen.getByLabelText(/api endpoint/i))!.toBeInTheDocument()
+      expect(screen.getByLabelText(/api key/i))!.toBeInTheDocument()
     })
 
     it('should render cancel and save buttons', () => {
       render(<AddExternalAPIModal {...defaultProps} />)
-      expect(screen.getByText('dataset.externalAPIForm.cancel')).toBeInTheDocument()
-      expect(screen.getByText('dataset.externalAPIForm.save')).toBeInTheDocument()
+      expect(screen.getByText('dataset.externalAPIForm.cancel'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.externalAPIForm.save'))!.toBeInTheDocument()
     })
 
     it('should render encryption notice', () => {
       render(<AddExternalAPIModal {...defaultProps} />)
-      expect(screen.getByText('PKCS1_OAEP')).toBeInTheDocument()
+      expect(screen.getByText('PKCS1_OAEP'))!.toBeInTheDocument()
     })
 
     it('should render close button', () => {
       render(<AddExternalAPIModal {...defaultProps} />)
       // Close button is rendered in a portal
       const closeButton = document.body.querySelector('.action-btn')
-      expect(closeButton).toBeInTheDocument()
+      expect(closeButton)!.toBeInTheDocument()
     })
   })
 
@@ -99,7 +99,7 @@ describe('AddExternalAPIModal', () => {
           datasetBindings={datasetBindings}
         />,
       )
-      expect(screen.getByText('dataset.editExternalAPIFormWarning.front')).toBeInTheDocument()
+      expect(screen.getByText('dataset.editExternalAPIFormWarning.front'))!.toBeInTheDocument()
       // Verify the count is displayed in the warning section
       const warningElement = screen.getByText('dataset.editExternalAPIFormWarning.front').parentElement
       expect(warningElement?.textContent).toContain('2')
@@ -124,22 +124,22 @@ describe('AddExternalAPIModal', () => {
 
       const nameInput = screen.getByLabelText(/name/i)
       fireEvent.change(nameInput, { target: { value: 'New API Name' } })
-      expect(nameInput).toHaveValue('New API Name')
+      expect(nameInput)!.toHaveValue('New API Name')
     })
 
     it('should initialize form with data in edit mode', () => {
       render(<AddExternalAPIModal {...defaultProps} isEditMode={true} data={initialData} />)
 
-      expect(screen.getByLabelText(/name/i)).toHaveValue('Test API')
-      expect(screen.getByLabelText(/api endpoint/i)).toHaveValue('https://api.example.com')
-      expect(screen.getByLabelText(/api key/i)).toHaveValue('test-key-12345')
+      expect(screen.getByLabelText(/name/i))!.toHaveValue('Test API')
+      expect(screen.getByLabelText(/api endpoint/i))!.toHaveValue('https://api.example.com')
+      expect(screen.getByLabelText(/api key/i))!.toHaveValue('test-key-12345')
     })
 
     it('should disable save button when form has empty inputs', () => {
       render(<AddExternalAPIModal {...defaultProps} />)
 
       const saveButton = screen.getByText('dataset.externalAPIForm.save').closest('button')
-      expect(saveButton).toBeDisabled()
+      expect(saveButton)!.toBeDisabled()
     })
 
     it('should enable save button when all fields are filled', () => {
@@ -302,7 +302,7 @@ describe('AddExternalAPIModal', () => {
       fireEvent.click(saveButton)
 
       await waitFor(() => {
-        expect(screen.getByRole('button', { name: /confirm/i })).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: /confirm/i }))!.toBeInTheDocument()
       })
     })
 
@@ -334,7 +334,7 @@ describe('AddExternalAPIModal', () => {
       fireEvent.click(saveButton)
 
       await waitFor(() => {
-        expect(screen.getByRole('button', { name: /confirm/i })).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: /confirm/i }))!.toBeInTheDocument()
       })
 
       const confirmButton = screen.getByRole('button', { name: /confirm/i })
@@ -363,13 +363,13 @@ describe('AddExternalAPIModal', () => {
       fireEvent.click(saveButton)
 
       await waitFor(() => {
-        expect(screen.getByRole('button', { name: /confirm/i })).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: /confirm/i }))!.toBeInTheDocument()
       })
 
       // There are multiple cancel buttons, find the one in the confirm dialog
       const cancelButtons = screen.getAllByRole('button', { name: /cancel/i })
       const confirmDialogCancelButton = cancelButtons[cancelButtons.length - 1]
-      fireEvent.click(confirmDialogCancelButton)
+      fireEvent.click(confirmDialogCancelButton!)
 
       await waitFor(() => {
         // Confirm button should be gone after canceling
@@ -404,7 +404,7 @@ describe('AddExternalAPIModal', () => {
   describe('Edge Cases', () => {
     it('should handle undefined data in edit mode', () => {
       render(<AddExternalAPIModal {...defaultProps} isEditMode={true} data={undefined} />)
-      expect(screen.getByLabelText(/name/i)).toHaveValue('')
+      expect(screen.getByLabelText(/name/i))!.toHaveValue('')
     })
 
     it('should handle null datasetBindings', () => {
@@ -422,8 +422,8 @@ describe('AddExternalAPIModal', () => {
     it('should render documentation link in encryption notice', () => {
       render(<AddExternalAPIModal {...defaultProps} />)
       const link = screen.getByRole('link', { name: 'PKCS1_OAEP' })
-      expect(link).toHaveAttribute('href', 'https://pycryptodome.readthedocs.io/en/latest/src/cipher/oaep.html')
-      expect(link).toHaveAttribute('target', '_blank')
+      expect(link)!.toHaveAttribute('href', 'https://pycryptodome.readthedocs.io/en/latest/src/cipher/oaep.html')
+      expect(link)!.toHaveAttribute('target', '_blank')
     })
   })
 })
diff --git a/web/app/components/datasets/external-api/external-api-panel/__tests__/index.spec.tsx b/web/app/components/datasets/external-api/external-api-panel/__tests__/index.spec.tsx
index eb7c0558ac..964b8fe344 100644
--- a/web/app/components/datasets/external-api/external-api-panel/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/external-api/external-api-panel/__tests__/index.spec.tsx
@@ -50,31 +50,31 @@ describe('ExternalAPIPanel', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<ExternalAPIPanel {...defaultProps} />)
-      expect(screen.getByText('dataset.externalAPIPanelTitle')).toBeInTheDocument()
+      expect(screen.getByText('dataset.externalAPIPanelTitle'))!.toBeInTheDocument()
     })
 
     it('should render panel title and description', () => {
       render(<ExternalAPIPanel {...defaultProps} />)
-      expect(screen.getByText('dataset.externalAPIPanelTitle')).toBeInTheDocument()
-      expect(screen.getByText('dataset.externalAPIPanelDescription')).toBeInTheDocument()
+      expect(screen.getByText('dataset.externalAPIPanelTitle'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.externalAPIPanelDescription'))!.toBeInTheDocument()
     })
 
     it('should render documentation link', () => {
       render(<ExternalAPIPanel {...defaultProps} />)
       const docLink = screen.getByText('dataset.externalAPIPanelDocumentation')
-      expect(docLink).toBeInTheDocument()
-      expect(docLink.closest('a')).toHaveAttribute('href', 'https://docs.example.com/use-dify/knowledge/external-knowledge-api')
+      expect(docLink)!.toBeInTheDocument()
+      expect(docLink.closest('a'))!.toHaveAttribute('href', 'https://docs.example.com/use-dify/knowledge/external-knowledge-api')
     })
 
     it('should render create button', () => {
       render(<ExternalAPIPanel {...defaultProps} />)
-      expect(screen.getByText('dataset.createExternalAPI')).toBeInTheDocument()
+      expect(screen.getByText('dataset.createExternalAPI'))!.toBeInTheDocument()
     })
 
     it('should render close button', () => {
       const { container } = render(<ExternalAPIPanel {...defaultProps} />)
       const closeButton = container.querySelector('[class*="action-button"]') || screen.getAllByRole('button')[0]
-      expect(closeButton).toBeInTheDocument()
+      expect(closeButton)!.toBeInTheDocument()
     })
   })
 
@@ -121,10 +121,10 @@ describe('ExternalAPIPanel', () => {
         },
       ]
       render(<ExternalAPIPanel {...defaultProps} />)
-      expect(screen.getByTestId('api-card-api-1')).toBeInTheDocument()
-      expect(screen.getByTestId('api-card-api-2')).toBeInTheDocument()
-      expect(screen.getByText('Test API 1')).toBeInTheDocument()
-      expect(screen.getByText('Test API 2')).toBeInTheDocument()
+      expect(screen.getByTestId('api-card-api-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('api-card-api-2'))!.toBeInTheDocument()
+      expect(screen.getByText('Test API 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Test API 2'))!.toBeInTheDocument()
     })
   })
 
@@ -136,7 +136,7 @@ describe('ExternalAPIPanel', () => {
       const buttons = screen.getAllByRole('button')
       const closeButton = buttons.find(btn => btn.querySelector('svg[class*="ri-close"]'))
         || buttons[0]
-      fireEvent.click(closeButton)
+      fireEvent.click(closeButton!)
       expect(onClose).toHaveBeenCalledTimes(1)
     })
 
@@ -162,7 +162,7 @@ describe('ExternalAPIPanel', () => {
       const createButton = screen.getByText('dataset.createExternalAPI').closest('button')!
       fireEvent.click(createButton)
 
-      const callArgs = mockSetShowExternalKnowledgeAPIModal.mock.calls[0][0]
+      const callArgs = mockSetShowExternalKnowledgeAPIModal.mock.calls[0]![0]
       callArgs.onSaveCallback()
 
       expect(mockMutateExternalKnowledgeApis).toHaveBeenCalled()
@@ -173,7 +173,7 @@ describe('ExternalAPIPanel', () => {
       const createButton = screen.getByText('dataset.createExternalAPI').closest('button')!
       fireEvent.click(createButton)
 
-      const callArgs = mockSetShowExternalKnowledgeAPIModal.mock.calls[0][0]
+      const callArgs = mockSetShowExternalKnowledgeAPIModal.mock.calls[0]![0]
       callArgs.onCancelCallback()
 
       expect(mockMutateExternalKnowledgeApis).toHaveBeenCalled()
@@ -195,13 +195,13 @@ describe('ExternalAPIPanel', () => {
         },
       ]
       render(<ExternalAPIPanel {...defaultProps} />)
-      expect(screen.getByTestId('api-card-single-api')).toBeInTheDocument()
+      expect(screen.getByTestId('api-card-single-api'))!.toBeInTheDocument()
     })
 
     it('should render documentation link with correct target', () => {
       render(<ExternalAPIPanel {...defaultProps} />)
       const docLink = screen.getByText('dataset.externalAPIPanelDocumentation').closest('a')
-      expect(docLink).toHaveAttribute('target', '_blank')
+      expect(docLink)!.toHaveAttribute('target', '_blank')
     })
   })
 })
diff --git a/web/app/components/datasets/external-api/external-knowledge-api-card/__tests__/index.spec.tsx b/web/app/components/datasets/external-api/external-knowledge-api-card/__tests__/index.spec.tsx
index bc1c923876..6dfd8ff13d 100644
--- a/web/app/components/datasets/external-api/external-knowledge-api-card/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/external-api/external-knowledge-api-card/__tests__/index.spec.tsx
@@ -56,17 +56,17 @@ describe('ExternalKnowledgeAPICard', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<ExternalKnowledgeAPICard {...defaultProps} />)
-      expect(screen.getByText('Test External API')).toBeInTheDocument()
+      expect(screen.getByText('Test External API'))!.toBeInTheDocument()
     })
 
     it('should render API name', () => {
       render(<ExternalKnowledgeAPICard {...defaultProps} />)
-      expect(screen.getByText('Test External API')).toBeInTheDocument()
+      expect(screen.getByText('Test External API'))!.toBeInTheDocument()
     })
 
     it('should render API endpoint', () => {
       render(<ExternalKnowledgeAPICard {...defaultProps} />)
-      expect(screen.getByText('https://api.example.com/knowledge')).toBeInTheDocument()
+      expect(screen.getByText('https://api.example.com/knowledge'))!.toBeInTheDocument()
     })
 
     it('should render edit and delete buttons', () => {
@@ -78,7 +78,7 @@ describe('ExternalKnowledgeAPICard', () => {
     it('should render API connection icon', () => {
       const { container } = render(<ExternalKnowledgeAPICard {...defaultProps} />)
       const icon = container.querySelector('svg')
-      expect(icon).toBeInTheDocument()
+      expect(icon)!.toBeInTheDocument()
     })
   })
 
@@ -103,7 +103,7 @@ describe('ExternalKnowledgeAPICard', () => {
       const buttons = container.querySelectorAll('button')
       const editButton = buttons[0]
 
-      fireEvent.click(editButton)
+      fireEvent.click(editButton!)
 
       await waitFor(() => {
         expect(fetchExternalAPI).toHaveBeenCalledWith({ apiTemplateId: 'api-123' })
@@ -131,7 +131,7 @@ describe('ExternalKnowledgeAPICard', () => {
       const buttons = container.querySelectorAll('button')
       const editButton = buttons[0]
 
-      fireEvent.click(editButton)
+      fireEvent.click(editButton!)
 
       await waitFor(() => {
         expect(consoleSpy).toHaveBeenCalledWith(
@@ -162,14 +162,14 @@ describe('ExternalKnowledgeAPICard', () => {
       const { container } = render(<ExternalKnowledgeAPICard {...defaultProps} />)
       const editButton = container.querySelectorAll('button')[0]
 
-      fireEvent.click(editButton)
+      fireEvent.click(editButton!)
 
       await waitFor(() => {
         expect(mockSetShowExternalKnowledgeAPIModal).toHaveBeenCalled()
       })
 
       // Simulate save callback
-      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0][0]
+      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0]![0]
       modalCall.onSaveCallback()
 
       expect(mockMutateExternalKnowledgeApis).toHaveBeenCalled()
@@ -194,14 +194,14 @@ describe('ExternalKnowledgeAPICard', () => {
       const { container } = render(<ExternalKnowledgeAPICard {...defaultProps} />)
       const editButton = container.querySelectorAll('button')[0]
 
-      fireEvent.click(editButton)
+      fireEvent.click(editButton!)
 
       await waitFor(() => {
         expect(mockSetShowExternalKnowledgeAPIModal).toHaveBeenCalled()
       })
 
       // Simulate cancel callback
-      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0][0]
+      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0]![0]
       modalCall.onCancelCallback()
 
       expect(mockMutateExternalKnowledgeApis).toHaveBeenCalled()
@@ -216,7 +216,7 @@ describe('ExternalKnowledgeAPICard', () => {
       const buttons = container.querySelectorAll('button')
       const deleteButton = buttons[1]
 
-      fireEvent.click(deleteButton)
+      fireEvent.click(deleteButton!)
 
       await waitFor(() => {
         expect(checkUsageExternalAPI).toHaveBeenCalledWith({ apiTemplateId: 'api-123' })
@@ -224,7 +224,7 @@ describe('ExternalKnowledgeAPICard', () => {
 
       // Confirm dialog should be shown
       await waitFor(() => {
-        expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: /cancel/i }))!.toBeInTheDocument()
       })
     })
 
@@ -234,10 +234,10 @@ describe('ExternalKnowledgeAPICard', () => {
       const { container } = render(<ExternalKnowledgeAPICard {...defaultProps} />)
       const deleteButton = container.querySelectorAll('button')[1]
 
-      fireEvent.click(deleteButton)
+      fireEvent.click(deleteButton!)
 
       await waitFor(() => {
-        expect(screen.getByText(/3/)).toBeInTheDocument()
+        expect(screen.getByText(/3/))!.toBeInTheDocument()
       })
     })
 
@@ -248,10 +248,10 @@ describe('ExternalKnowledgeAPICard', () => {
       const { container } = render(<ExternalKnowledgeAPICard {...defaultProps} />)
       const deleteButton = container.querySelectorAll('button')[1]
 
-      fireEvent.click(deleteButton)
+      fireEvent.click(deleteButton!)
 
       await waitFor(() => {
-        expect(screen.getByRole('button', { name: /confirm/i })).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: /confirm/i }))!.toBeInTheDocument()
       })
 
       const confirmButton = screen.getByRole('button', { name: /confirm/i })
@@ -269,10 +269,10 @@ describe('ExternalKnowledgeAPICard', () => {
       const { container } = render(<ExternalKnowledgeAPICard {...defaultProps} />)
       const deleteButton = container.querySelectorAll('button')[1]
 
-      fireEvent.click(deleteButton)
+      fireEvent.click(deleteButton!)
 
       await waitFor(() => {
-        expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: /cancel/i }))!.toBeInTheDocument()
       })
 
       const cancelButton = screen.getByRole('button', { name: /cancel/i })
@@ -291,10 +291,10 @@ describe('ExternalKnowledgeAPICard', () => {
       const { container } = render(<ExternalKnowledgeAPICard {...defaultProps} />)
       const deleteButton = container.querySelectorAll('button')[1]
 
-      fireEvent.click(deleteButton)
+      fireEvent.click(deleteButton!)
 
       await waitFor(() => {
-        expect(screen.getByRole('button', { name: /confirm/i })).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: /confirm/i }))!.toBeInTheDocument()
       })
 
       const confirmButton = screen.getByRole('button', { name: /confirm/i })
@@ -317,7 +317,7 @@ describe('ExternalKnowledgeAPICard', () => {
       const { container } = render(<ExternalKnowledgeAPICard {...defaultProps} />)
       const deleteButton = container.querySelectorAll('button')[1]
 
-      fireEvent.click(deleteButton)
+      fireEvent.click(deleteButton!)
 
       await waitFor(() => {
         expect(consoleSpy).toHaveBeenCalledWith(
@@ -336,11 +336,11 @@ describe('ExternalKnowledgeAPICard', () => {
       const deleteButton = container.querySelectorAll('button')[1]
       const cardContainer = container.querySelector('[class*="shadows-shadow"]')
 
-      fireEvent.mouseEnter(deleteButton)
-      expect(cardContainer).toHaveClass('border-state-destructive-border')
-      expect(cardContainer).toHaveClass('bg-state-destructive-hover')
+      fireEvent.mouseEnter(deleteButton!)
+      expect(cardContainer)!.toHaveClass('border-state-destructive-border')
+      expect(cardContainer)!.toHaveClass('bg-state-destructive-hover')
 
-      fireEvent.mouseLeave(deleteButton)
+      fireEvent.mouseLeave(deleteButton!)
       expect(cardContainer).not.toHaveClass('border-state-destructive-border')
     })
   })
@@ -352,7 +352,7 @@ describe('ExternalKnowledgeAPICard', () => {
         settings: { endpoint: '', api_key: 'key' },
       }
       render(<ExternalKnowledgeAPICard api={apiWithEmptyEndpoint} />)
-      expect(screen.getByText('Test External API')).toBeInTheDocument()
+      expect(screen.getByText('Test External API'))!.toBeInTheDocument()
     })
 
     it('should handle delete response with unsuccessful result', async () => {
@@ -363,10 +363,10 @@ describe('ExternalKnowledgeAPICard', () => {
       const { container } = render(<ExternalKnowledgeAPICard {...defaultProps} />)
       const deleteButton = container.querySelectorAll('button')[1]
 
-      fireEvent.click(deleteButton)
+      fireEvent.click(deleteButton!)
 
       await waitFor(() => {
-        expect(screen.getByRole('button', { name: /confirm/i })).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: /confirm/i }))!.toBeInTheDocument()
       })
 
       const confirmButton = screen.getByRole('button', { name: /confirm/i })
diff --git a/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelection.tsx b/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelection.tsx
index 387bf9843c..fea71a7e78 100644
--- a/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelection.tsx
+++ b/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelection.tsx
@@ -33,7 +33,7 @@ const ExternalApiSelection: React.FC<ExternalApiSelectionProps> = ({ external_kn
 
   useEffect(() => {
     if (apiItems.length > 0) {
-      const newSelectedId = external_knowledge_api_id || apiItems[0].value
+      const newSelectedId = external_knowledge_api_id || apiItems[0]!.value
       setSelectedApiId(newSelectedId)
       if (newSelectedId !== external_knowledge_api_id)
         onChange({ external_knowledge_api_id: newSelectedId, external_knowledge_id })
@@ -56,7 +56,7 @@ const ExternalApiSelection: React.FC<ExternalApiSelectionProps> = ({ external_kn
 
   useEffect(() => {
     if (!external_knowledge_api_id && apiItems.length > 0)
-      onChange({ external_knowledge_api_id: apiItems[0].value, external_knowledge_id })
+      onChange({ external_knowledge_api_id: apiItems[0]!.value, external_knowledge_id })
   }, [])
 
   return (
diff --git a/web/app/components/datasets/external-knowledge-base/create/__tests__/index.spec.tsx b/web/app/components/datasets/external-knowledge-base/create/__tests__/index.spec.tsx
index a3282e441c..f132def602 100644
--- a/web/app/components/datasets/external-knowledge-base/create/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/external-knowledge-base/create/__tests__/index.spec.tsx
@@ -90,64 +90,68 @@ describe('ExternalKnowledgeBaseCreate', () => {
     it('should render without crashing', () => {
       renderComponent()
 
-      expect(screen.getByText('dataset.connectDataset')).toBeInTheDocument()
+      expect(screen.getByText('dataset.connectDataset'))!.toBeInTheDocument()
     })
 
     it('should render KnowledgeBaseInfo component with correct labels', () => {
       renderComponent()
 
       // KnowledgeBaseInfo renders these labels
-      expect(screen.getByText('dataset.externalKnowledgeName')).toBeInTheDocument()
-      expect(screen.getByText('dataset.externalKnowledgeDescription')).toBeInTheDocument()
+      // KnowledgeBaseInfo renders these labels
+      expect(screen.getByText('dataset.externalKnowledgeName'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.externalKnowledgeDescription'))!.toBeInTheDocument()
     })
 
     it('should render ExternalApiSelection component', () => {
       renderComponent()
 
       // ExternalApiSelection renders this label
-      expect(screen.getByText('dataset.externalAPIPanelTitle')).toBeInTheDocument()
-      expect(screen.getByText('dataset.externalKnowledgeId')).toBeInTheDocument()
+      // ExternalApiSelection renders this label
+      expect(screen.getByText('dataset.externalAPIPanelTitle'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.externalKnowledgeId'))!.toBeInTheDocument()
     })
 
     it('should render RetrievalSettings component', () => {
       renderComponent()
 
       // RetrievalSettings renders this label
-      expect(screen.getByText('dataset.retrievalSettings')).toBeInTheDocument()
+      // RetrievalSettings renders this label
+      expect(screen.getByText('dataset.retrievalSettings'))!.toBeInTheDocument()
     })
 
     it('should render InfoPanel component', () => {
       renderComponent()
 
       // InfoPanel renders these texts
-      expect(screen.getByText('dataset.connectDatasetIntro.title')).toBeInTheDocument()
-      expect(screen.getByText('dataset.connectDatasetIntro.learnMore')).toBeInTheDocument()
+      // InfoPanel renders these texts
+      expect(screen.getByText('dataset.connectDatasetIntro.title'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.connectDatasetIntro.learnMore'))!.toBeInTheDocument()
     })
 
     it('should render helper text with translation keys', () => {
       renderComponent()
 
-      expect(screen.getByText('dataset.connectHelper.helper1')).toBeInTheDocument()
-      expect(screen.getByText('dataset.connectHelper.helper2')).toBeInTheDocument()
-      expect(screen.getByText('dataset.connectHelper.helper3')).toBeInTheDocument()
-      expect(screen.getByText('dataset.connectHelper.helper4')).toBeInTheDocument()
-      expect(screen.getByText('dataset.connectHelper.helper5')).toBeInTheDocument()
+      expect(screen.getByText('dataset.connectHelper.helper1'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.connectHelper.helper2'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.connectHelper.helper3'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.connectHelper.helper4'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.connectHelper.helper5'))!.toBeInTheDocument()
     })
 
     it('should render cancel and connect buttons', () => {
       renderComponent()
 
-      expect(screen.getByText('dataset.externalKnowledgeForm.cancel')).toBeInTheDocument()
-      expect(screen.getByText('dataset.externalKnowledgeForm.connect')).toBeInTheDocument()
+      expect(screen.getByText('dataset.externalKnowledgeForm.cancel'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.externalKnowledgeForm.connect'))!.toBeInTheDocument()
     })
 
     it('should render documentation link with correct href', () => {
       renderComponent()
 
       const docLink = screen.getByText('dataset.connectHelper.helper4')
-      expect(docLink).toHaveAttribute('href', 'https://docs.dify.ai/en/use-dify/knowledge/connect-external-knowledge-base')
-      expect(docLink).toHaveAttribute('target', '_blank')
-      expect(docLink).toHaveAttribute('rel', 'noopener noreferrer')
+      expect(docLink)!.toHaveAttribute('href', 'https://docs.dify.ai/en/use-dify/knowledge/connect-external-knowledge-base')
+      expect(docLink)!.toHaveAttribute('target', '_blank')
+      expect(docLink)!.toHaveAttribute('rel', 'noopener noreferrer')
     })
   })
 
@@ -157,7 +161,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       renderComponent({ loading: true })
 
       const connectButton = screen.getByText('dataset.externalKnowledgeForm.connect').closest('button')
-      expect(connectButton).toBeInTheDocument()
+      expect(connectButton)!.toBeInTheDocument()
     })
 
     it('should call onConnect with form data when connect button is clicked', async () => {
@@ -198,7 +202,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       renderComponent({ onConnect })
 
       const connectButton = screen.getByText('dataset.externalKnowledgeForm.connect').closest('button')
-      expect(connectButton).toBeDisabled()
+      expect(connectButton)!.toBeDisabled()
 
       await user.click(connectButton!)
       expect(onConnect).not.toHaveBeenCalled()
@@ -280,7 +284,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       fireEvent.change(knowledgeIdInput, { target: { value: 'knowledge-456' } })
 
       const connectButton = screen.getByText('dataset.externalKnowledgeForm.connect').closest('button')
-      expect(connectButton).toBeDisabled()
+      expect(connectButton)!.toBeDisabled()
     })
 
     it('should disable connect button when name is only whitespace', async () => {
@@ -293,7 +297,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       fireEvent.change(knowledgeIdInput, { target: { value: 'knowledge-456' } })
 
       const connectButton = screen.getByText('dataset.externalKnowledgeForm.connect').closest('button')
-      expect(connectButton).toBeDisabled()
+      expect(connectButton)!.toBeDisabled()
     })
 
     it('should disable connect button when external_knowledge_id is empty', () => {
@@ -303,7 +307,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       fireEvent.change(nameInput, { target: { value: 'Test Name' } })
 
       const connectButton = screen.getByText('dataset.externalKnowledgeForm.connect').closest('button')
-      expect(connectButton).toBeDisabled()
+      expect(connectButton)!.toBeDisabled()
     })
 
     it('should enable connect button when all required fields are filled', async () => {
@@ -429,7 +433,8 @@ describe('ExternalKnowledgeBaseCreate', () => {
       renderComponent()
 
       // The ExternalApiSelect should show the first selected API name
-      expect(screen.getByText('Test API 1')).toBeInTheDocument()
+      // The ExternalApiSelect should show the first selected API name
+      expect(screen.getByText('Test API 1'))!.toBeInTheDocument()
     })
 
     it('should allow selecting different API from dropdown', async () => {
@@ -473,7 +478,8 @@ describe('ExternalKnowledgeBaseCreate', () => {
       renderComponent()
 
       // Should show "no external knowledge" button
-      expect(screen.getByText('dataset.noExternalKnowledge')).toBeInTheDocument()
+      // Should show "no external knowledge" button
+      expect(screen.getByText('dataset.noExternalKnowledge'))!.toBeInTheDocument()
     })
 
     it('should open add API modal when add button is clicked', async () => {
@@ -504,7 +510,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       await user.click(addButton!)
 
       // Get the callback and invoke it
-      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0][0]
+      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0]![0]
       await modalCall.onSaveCallback()
 
       expect(mockMutateExternalKnowledgeApis).toHaveBeenCalled()
@@ -521,7 +527,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       await user.click(addButton!)
 
       // Get the callback and invoke it
-      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0][0]
+      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0]![0]
       modalCall.onCancelCallback()
 
       expect(mockMutateExternalKnowledgeApis).toHaveBeenCalled()
@@ -535,8 +541,9 @@ describe('ExternalKnowledgeBaseCreate', () => {
       await user.click(apiSelector)
 
       // Should show API URLs
-      expect(screen.getByText('https://api1.example.com')).toBeInTheDocument()
-      expect(screen.getByText('https://api2.example.com')).toBeInTheDocument()
+      // Should show API URLs
+      expect(screen.getByText('https://api1.example.com'))!.toBeInTheDocument()
+      expect(screen.getByText('https://api2.example.com'))!.toBeInTheDocument()
     })
 
     it('should show create new API option in dropdown', async () => {
@@ -547,7 +554,8 @@ describe('ExternalKnowledgeBaseCreate', () => {
       await user.click(apiSelector)
 
       // Should show create new API option
-      expect(screen.getByText('dataset.createNewExternalAPI')).toBeInTheDocument()
+      // Should show create new API option
+      expect(screen.getByText('dataset.createNewExternalAPI'))!.toBeInTheDocument()
     })
 
     it('should open add API modal when clicking create new API in dropdown', async () => {
@@ -580,7 +588,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       await user.click(createNewApiOption)
 
       // Get the callback from the modal call and invoke it
-      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0][0]
+      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0]![0]
       await modalCall.onSaveCallback()
 
       expect(mockMutateExternalKnowledgeApis).toHaveBeenCalled()
@@ -598,7 +606,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       await user.click(createNewApiOption)
 
       // Get the callback from the modal call and invoke it
-      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0][0]
+      const modalCall = mockSetShowExternalKnowledgeAPIModal.mock.calls[0]![0]
       modalCall.onCancelCallback()
 
       expect(mockMutateExternalKnowledgeApis).toHaveBeenCalled()
@@ -612,12 +620,44 @@ describe('ExternalKnowledgeBaseCreate', () => {
       await user.click(apiSelector)
 
       // Dropdown should be open - API URLs visible
-      expect(screen.getByText('https://api1.example.com')).toBeInTheDocument()
+      // Dropdown should be open - API URLs visible
+      expect(screen.getByText('https://api1.example.com'))!.toBeInTheDocument()
 
       // Select the second API
       const secondApi = screen.getByText('Test API 2')
       await user.click(secondApi)
 
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
+      // Dropdown should be closed - API URLs not visible
       // Dropdown should be closed - API URLs not visible
       expect(screen.queryByText('https://api1.example.com')).not.toBeInTheDocument()
     })
@@ -628,7 +668,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
 
       const apiSelector = screen.getByText('Test API 1')
       await user.click(apiSelector)
-      expect(screen.getByText('https://api1.example.com')).toBeInTheDocument()
+      expect(screen.getByText('https://api1.example.com'))!.toBeInTheDocument()
 
       await user.click(apiSelector)
       expect(screen.queryByText('https://api1.example.com')).not.toBeInTheDocument()
@@ -783,14 +823,14 @@ describe('ExternalKnowledgeBaseCreate', () => {
       renderComponent({ loading: true })
 
       const connectButton = screen.getByText('dataset.externalKnowledgeForm.connect').closest('button')
-      expect(connectButton).toBeInTheDocument()
+      expect(connectButton)!.toBeInTheDocument()
     })
 
     it('should render correctly when not loading', () => {
       renderComponent({ loading: false })
 
       const connectButton = screen.getByText('dataset.externalKnowledgeForm.connect').closest('button')
-      expect(connectButton).toBeInTheDocument()
+      expect(connectButton)!.toBeInTheDocument()
     })
   })
 
@@ -804,7 +844,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       // Find and click the switch for score threshold
       const switches = screen.getAllByRole('switch')
       const scoreThresholdSwitch = switches[0] // The score threshold switch
-      await user.click(scoreThresholdSwitch)
+      await user.click(scoreThresholdSwitch!)
 
       // Fill required fields
       const nameInput = screen.getByPlaceholderText('dataset.externalKnowledgeNamePlaceholder')
@@ -834,10 +874,12 @@ describe('ExternalKnowledgeBaseCreate', () => {
       renderComponent()
 
       // Should show the retrieval settings section title
-      expect(screen.getByText('dataset.retrievalSettings')).toBeInTheDocument()
+      // Should show the retrieval settings section title
+      expect(screen.getByText('dataset.retrievalSettings'))!.toBeInTheDocument()
       // Should show Top K and Score Threshold labels
-      expect(screen.getByText('appDebug.datasetConfig.top_k')).toBeInTheDocument()
-      expect(screen.getByText('appDebug.datasetConfig.score_threshold')).toBeInTheDocument()
+      // Should show Top K and Score Threshold labels
+      expect(screen.getByText('appDebug.datasetConfig.top_k'))!.toBeInTheDocument()
+      expect(screen.getByText('appDebug.datasetConfig.score_threshold'))!.toBeInTheDocument()
     })
   })
 
@@ -855,6 +897,37 @@ describe('ExternalKnowledgeBaseCreate', () => {
         />,
       )
 
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
+      // In hit testing mode, the title should not be shown
       // In hit testing mode, the title should not be shown
       expect(screen.queryByText('dataset.retrievalSettings')).not.toBeInTheDocument()
     })
@@ -871,6 +944,37 @@ describe('ExternalKnowledgeBaseCreate', () => {
         />,
       )
 
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
+      // In retrieval setting mode, the title should not be shown
       // In retrieval setting mode, the title should not be shown
       expect(screen.queryByText('dataset.retrievalSettings')).not.toBeInTheDocument()
     })
@@ -889,7 +993,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
 
       // Find and click the switch
       const switches = screen.getAllByRole('switch')
-      await user.click(switches[0])
+      await user.click(switches[0]!)
 
       expect(onChange).toHaveBeenCalledWith({ score_threshold_enabled: true })
     })
@@ -908,7 +1012,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       // The TopKItem renders the visible number-field input as a textbox.
       const inputs = screen.getAllByRole('textbox')
       const topKInput = inputs[0]
-      fireEvent.change(topKInput, { target: { value: '8' } })
+      fireEvent.change(topKInput!, { target: { value: '8' } })
 
       expect(onChange).toHaveBeenCalledWith({ top_k: 8 })
     })
@@ -927,7 +1031,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       // The ScoreThresholdItem renders the visible number-field input as a textbox.
       const inputs = screen.getAllByRole('textbox')
       const scoreThresholdInput = inputs[1]
-      fireEvent.change(scoreThresholdInput, { target: { value: '0.8' } })
+      fireEvent.change(scoreThresholdInput!, { target: { value: '0.8' } })
 
       expect(onChange).toHaveBeenCalledWith({ score_threshold: 0.8 })
     })
@@ -976,7 +1080,7 @@ describe('ExternalKnowledgeBaseCreate', () => {
       // Toggle score threshold switch
       const switches = screen.getAllByRole('switch')
       const scoreThresholdSwitch = switches[0]
-      await user.click(scoreThresholdSwitch)
+      await user.click(scoreThresholdSwitch!)
 
       // Fill required fields
       const nameInput = screen.getByPlaceholderText('dataset.externalKnowledgeNamePlaceholder')
@@ -1018,17 +1122,18 @@ describe('ExternalKnowledgeBaseCreate', () => {
 
       const externalLink = screen.getByText('dataset.connectHelper.helper4')
       expect(externalLink.tagName).toBe('A')
-      expect(externalLink).toHaveAttribute('target', '_blank')
-      expect(externalLink).toHaveAttribute('rel', 'noopener noreferrer')
+      expect(externalLink)!.toHaveAttribute('target', '_blank')
+      expect(externalLink)!.toHaveAttribute('rel', 'noopener noreferrer')
     })
 
     it('should have labels for form inputs', () => {
       renderComponent()
 
       // Check labels exist
-      expect(screen.getByText('dataset.externalKnowledgeName')).toBeInTheDocument()
-      expect(screen.getByText('dataset.externalKnowledgeDescription')).toBeInTheDocument()
-      expect(screen.getByText('dataset.externalKnowledgeId')).toBeInTheDocument()
+      // Check labels exist
+      expect(screen.getByText('dataset.externalKnowledgeName'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.externalKnowledgeDescription'))!.toBeInTheDocument()
+      expect(screen.getByText('dataset.externalKnowledgeId'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/hit-testing/__tests__/index.spec.tsx b/web/app/components/datasets/hit-testing/__tests__/index.spec.tsx
index 2dda6ecaae..df0e39554a 100644
--- a/web/app/components/datasets/hit-testing/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/hit-testing/__tests__/index.spec.tsx
@@ -309,25 +309,26 @@ describe('HitTestingPage', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render page title', () => {
       renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
       // Look for heading element
       const heading = screen.getByRole('heading', { level: 1 })
-      expect(heading).toBeInTheDocument()
+      expect(heading)!.toBeInTheDocument()
     })
 
     it('should render records section', () => {
       const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
       // The records section should be present
-      expect(container.querySelector('.flex-col')).toBeInTheDocument()
+      // The records section should be present
+      expect(container.querySelector('.flex-col'))!.toBeInTheDocument()
     })
 
     it('should render query input', () => {
       renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
   })
 
@@ -343,7 +344,7 @@ describe('HitTestingPage', () => {
       const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
       // Loading component should be visible - look for the loading animation
       const loadingElement = container.querySelector('[class*="animate"]') || container.querySelector('.flex-1')
-      expect(loadingElement).toBeInTheDocument()
+      expect(loadingElement)!.toBeInTheDocument()
     })
   })
 
@@ -353,7 +354,7 @@ describe('HitTestingPage', () => {
       // EmptyRecords component should be rendered - check that the component is mounted
       // The EmptyRecords has a specific structure with bg-workflow-process-bg class
       const mainContainer = container.querySelector('.flex.h-full')
-      expect(mainContainer).toBeInTheDocument()
+      expect(mainContainer)!.toBeInTheDocument()
     })
   })
 
@@ -373,7 +374,7 @@ describe('HitTestingPage', () => {
       } as unknown as ReturnType<typeof useDatasetTestingRecords>)
 
       renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
-      expect(screen.getByText('Test query')).toBeInTheDocument()
+      expect(screen.getByText('Test query'))!.toBeInTheDocument()
     })
   })
 
@@ -404,7 +405,7 @@ describe('HitTestingPage', () => {
       const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
       // The right panel should be present (on non-mobile)
       const rightPanel = container.querySelector('.rounded-tl-2xl')
-      expect(rightPanel).toBeInTheDocument()
+      expect(rightPanel)!.toBeInTheDocument()
     })
   })
 
@@ -423,7 +424,8 @@ describe('HitTestingPage', () => {
         fireEvent.click(methodSelector)
 
       // The component should still be functional after the click
-      expect(container.firstChild).toBeInTheDocument()
+      // The component should still be functional after the click
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 
@@ -445,7 +447,8 @@ describe('HitTestingPage', () => {
       const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
 
       // The right panel should show empty state initially
-      expect(container.querySelector('.rounded-tl-2xl')).toBeInTheDocument()
+      // The right panel should show empty state initially
+      expect(container.querySelector('.rounded-tl-2xl'))!.toBeInTheDocument()
     })
 
     it('should render loading skeleton when retrieval is in progress', async () => {
@@ -458,7 +461,8 @@ describe('HitTestingPage', () => {
       const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
 
       // Component should render without crashing
-      expect(container.firstChild).toBeInTheDocument()
+      // Component should render without crashing
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render results when hit testing returns data', async () => {
@@ -479,7 +483,8 @@ describe('HitTestingPage', () => {
       const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
 
       // The component should render the result display area
-      expect(container.querySelector('.bg-background-body')).toBeInTheDocument()
+      // The component should render the result display area
+      expect(container.querySelector('.bg-background-body'))!.toBeInTheDocument()
     })
   })
 
@@ -513,7 +518,8 @@ describe('HitTestingPage', () => {
         fireEvent.click(row)
 
       // The query input should be updated - this causes re-render with new key
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      // The query input should be updated - this causes re-render with new key
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
   })
 
@@ -536,7 +542,8 @@ describe('HitTestingPage', () => {
       const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
 
       // Component should render
-      expect(container.firstChild).toBeInTheDocument()
+      // Component should render
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 
@@ -549,7 +556,8 @@ describe('HitTestingPage', () => {
       const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
 
       // Component should still render
-      expect(container.firstChild).toBeInTheDocument()
+      // Component should still render
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 
@@ -562,7 +570,7 @@ describe('HitTestingPage', () => {
 
       const { rerender, container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
 
       // Re-render with mobile
       vi.mocked(useBreakpoints.default).mockReturnValue('mobile' as unknown as ReturnType<typeof useBreakpoints.default>)
@@ -573,7 +581,7 @@ describe('HitTestingPage', () => {
         </QueryClientProvider>,
       )
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 })
@@ -638,7 +646,8 @@ describe('Integration: Hit Testing Flow', () => {
     fireEvent.change(textarea, { target: { value: 'Test query' } })
 
     // Component should still be functional - check for the main container
-    expect(container.firstChild).toBeInTheDocument()
+    // Component should still be functional - check for the main container
+    expect(container.firstChild)!.toBeInTheDocument()
   })
 
   it('should render hit results after successful submission', async () => {
@@ -762,7 +771,8 @@ describe('Integration: Hit Testing Flow', () => {
     const { container } = renderWithProviders(<HitTestingPage datasetId="dataset-1" />)
 
     // Component should render
-    expect(container.firstChild).toBeInTheDocument()
+    // Component should render
+    expect(container.firstChild)!.toBeInTheDocument()
 
     // Wait for textbox with timeout for CI
     const textarea = await waitFor(
@@ -781,7 +791,7 @@ describe('Integration: Hit Testing Flow', () => {
     // Verify component is still functional after submission
     await waitFor(
       () => {
-        expect(screen.getByRole('textbox')).toBeInTheDocument()
+        expect(screen.getByRole('textbox'))!.toBeInTheDocument()
       },
       { timeout: 3000 },
     )
@@ -819,12 +829,14 @@ describe('Drawer and Modal Interactions', () => {
 
       await waitFor(() => {
         // The drawer should open - verify container is still there
-        expect(container.firstChild).toBeInTheDocument()
+        // The drawer should open - verify container is still there
+        expect(container.firstChild)!.toBeInTheDocument()
       })
     }
 
     // Component should still be functional - verify main container
-    expect(container.querySelector('.overflow-y-auto')).toBeInTheDocument()
+    // Component should still be functional - verify main container
+    expect(container.querySelector('.overflow-y-auto'))!.toBeInTheDocument()
   })
 
   it('should close retrieval modal when onHide is called', async () => {
@@ -841,7 +853,8 @@ describe('Drawer and Modal Interactions', () => {
     }
 
     // Component should still be functional
-    expect(container.firstChild).toBeInTheDocument()
+    // Component should still be functional
+    expect(container.firstChild)!.toBeInTheDocument()
   })
 })
 
@@ -901,7 +914,7 @@ describe('renderHitResults Coverage', () => {
 
     // Verify component is functional
     await waitFor(() => {
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 
@@ -928,7 +941,7 @@ describe('renderHitResults Coverage', () => {
       fireEvent.click(submitButton)
 
     await waitFor(() => {
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 })
@@ -954,12 +967,13 @@ describe('ModifyRetrievalModal onSave Coverage', () => {
 
       // Wait for drawer to open
       await waitFor(() => {
-        expect(container.firstChild).toBeInTheDocument()
+        expect(container.firstChild)!.toBeInTheDocument()
       })
     }
 
     // Verify component renders correctly
-    expect(container.querySelector('.overflow-y-auto')).toBeInTheDocument()
+    // Verify component renders correctly
+    expect(container.querySelector('.overflow-y-auto'))!.toBeInTheDocument()
   })
 
   it('should close modal after saving', async () => {
@@ -975,7 +989,8 @@ describe('ModifyRetrievalModal onSave Coverage', () => {
       fireEvent.click(methodSelector)
 
     // Component should still be rendered
-    expect(container.firstChild).toBeInTheDocument()
+    // Component should still be rendered
+    expect(container.firstChild)!.toBeInTheDocument()
   })
 })
 
@@ -1038,7 +1053,7 @@ describe('HitTestingPage Internal Functions Coverage', () => {
 
     // Wait for state updates
     await waitFor(() => {
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     }, { timeout: 3000 })
 
     // Verify mutation was called
@@ -1059,18 +1074,19 @@ describe('HitTestingPage Internal Functions Coverage', () => {
 
       // Wait for drawer content
       await waitFor(() => {
-        expect(container.firstChild).toBeInTheDocument()
+        expect(container.firstChild)!.toBeInTheDocument()
       })
 
       // Try to find save button in the drawer
       const saveButtons = screen.queryAllByText(/save/i)
       if (saveButtons.length > 0) {
-        fireEvent.click(saveButtons[0])
+        fireEvent.click(saveButtons[0]!)
       }
     }
 
     // Component should still work
-    expect(container.firstChild).toBeInTheDocument()
+    // Component should still work
+    expect(container.firstChild)!.toBeInTheDocument()
   })
 
   it('should show hit count in results panel after successful query', async () => {
@@ -1101,7 +1117,7 @@ describe('HitTestingPage Internal Functions Coverage', () => {
 
     // Verify the component renders
     await waitFor(() => {
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     }, { timeout: 3000 })
   })
 })
diff --git a/web/app/components/datasets/hit-testing/components/query-input/__tests__/index.spec.tsx b/web/app/components/datasets/hit-testing/components/query-input/__tests__/index.spec.tsx
index 25b7abe7ea..d9427f5117 100644
--- a/web/app/components/datasets/hit-testing/components/query-input/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/hit-testing/components/query-input/__tests__/index.spec.tsx
@@ -79,17 +79,17 @@ describe('QueryInput', () => {
 
   it('should render title', () => {
     render(<QueryInput {...defaultProps} />)
-    expect(screen.getByText('datasetHitTesting.input.title')).toBeInTheDocument()
+    expect(screen.getByText('datasetHitTesting.input.title'))!.toBeInTheDocument()
   })
 
   it('should render textarea with query text', () => {
     render(<QueryInput {...defaultProps} />)
-    expect(screen.getByTestId('textarea')).toBeInTheDocument()
+    expect(screen.getByTestId('textarea'))!.toBeInTheDocument()
   })
 
   it('should render submit button', () => {
     render(<QueryInput {...defaultProps} />)
-    expect(screen.getByRole('button', { name: /input\.testing/ })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: /input\.testing/ }))!.toBeInTheDocument()
   })
 
   it('should disable submit button when text is empty', () => {
@@ -98,17 +98,17 @@ describe('QueryInput', () => {
       queries: [{ content: '', content_type: 'text_query', file_info: null }] satisfies Query[],
     }
     render(<QueryInput {...props} />)
-    expect(screen.getByRole('button', { name: /input\.testing/ })).toBeDisabled()
+    expect(screen.getByRole('button', { name: /input\.testing/ }))!.toBeDisabled()
   })
 
   it('should render retrieval method for non-external mode', () => {
     render(<QueryInput {...defaultProps} />)
-    expect(screen.getByText('dataset.retrieval.semantic_search.title')).toBeInTheDocument()
+    expect(screen.getByText('dataset.retrieval.semantic_search.title'))!.toBeInTheDocument()
   })
 
   it('should render settings button for external mode', () => {
     render(<QueryInput {...defaultProps} isExternal={true} />)
-    expect(screen.getByText('datasetHitTesting.settingTitle')).toBeInTheDocument()
+    expect(screen.getByText('datasetHitTesting.settingTitle'))!.toBeInTheDocument()
   })
 
   it('should disable submit button when text exceeds 200 characters', () => {
@@ -117,15 +117,15 @@ describe('QueryInput', () => {
       queries: [{ content: 'a'.repeat(201), content_type: 'text_query', file_info: null }] satisfies Query[],
     }
     render(<QueryInput {...props} />)
-    expect(screen.getByRole('button', { name: /input\.testing/ })).toBeDisabled()
+    expect(screen.getByRole('button', { name: /input\.testing/ }))!.toBeDisabled()
   })
 
   it('should show loading state on submit button when loading', () => {
     render(<QueryInput {...defaultProps} loading={true} />)
     const submitButton = screen.getByRole('button', { name: /input\.testing/ })
-    expect(submitButton).toBeDisabled()
-    expect(submitButton).toHaveAttribute('aria-busy', 'true')
-    expect(submitButton.querySelector('.animate-spin')).toBeInTheDocument()
+    expect(submitButton)!.toBeDisabled()
+    expect(submitButton)!.toHaveAttribute('aria-busy', 'true')
+    expect(submitButton.querySelector('.animate-spin'))!.toBeInTheDocument()
   })
 
   // Cover line 83: images useMemo with image_query data
@@ -141,6 +141,37 @@ describe('QueryInput', () => {
       ]
       render(<QueryInput {...defaultProps} queries={queries} />)
 
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
+      // Submit should be enabled since we have text + uploaded image
       // Submit should be enabled since we have text + uploaded image
       expect(screen.getByRole('button', { name: /input\.testing/ })).not.toBeDisabled()
     })
@@ -153,7 +184,7 @@ describe('QueryInput', () => {
 
       // Click settings button to open modal
       fireEvent.click(screen.getByRole('button', { name: /settingTitle/ }))
-      expect(screen.getByTestId('external-retrieval-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('external-retrieval-modal'))!.toBeInTheDocument()
 
       // Close modal
       fireEvent.click(screen.getByTestId('modal-close'))
@@ -165,7 +196,7 @@ describe('QueryInput', () => {
 
       // Open modal
       fireEvent.click(screen.getByRole('button', { name: /settingTitle/ }))
-      expect(screen.getByTestId('external-retrieval-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('external-retrieval-modal'))!.toBeInTheDocument()
 
       // Save settings
       fireEvent.click(screen.getByTestId('modal-save'))
@@ -274,7 +305,7 @@ describe('QueryInput', () => {
         ]),
       )
       // Should not contain image_query
-      const calledWith = defaultProps.setQueries.mock.calls[0][0] as Query[]
+      const calledWith = defaultProps.setQueries.mock.calls[0]![0] as Query[]
       expect(calledWith.filter(q => q.content_type === 'image_query')).toHaveLength(0)
     })
   })
@@ -412,7 +443,7 @@ describe('QueryInput', () => {
     it('should show keyword_search when isEconomy is true', () => {
       render(<QueryInput {...defaultProps} isEconomy={true} />)
 
-      expect(screen.getByText('dataset.retrieval.keyword_search.title')).toBeInTheDocument()
+      expect(screen.getByText('dataset.retrieval.keyword_search.title'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/list/datasets.tsx b/web/app/components/datasets/list/datasets.tsx
index 817b927e6b..8d7006a08a 100644
--- a/web/app/components/datasets/list/datasets.tsx
+++ b/web/app/components/datasets/list/datasets.tsx
@@ -45,7 +45,7 @@ const Datasets = ({
   useEffect(() => {
     if (anchorRef.current) {
       observerRef.current = new IntersectionObserver((entries) => {
-        if (entries[0].isIntersecting && hasNextPage && !isFetching)
+        if (entries[0]!.isIntersecting && hasNextPage && !isFetching)
           fetchNextPage()
       }, {
         rootMargin: '100px',
diff --git a/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/modal.spec.tsx b/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/modal.spec.tsx
index d9b88e20bb..40c925222c 100644
--- a/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/modal.spec.tsx
+++ b/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/modal.spec.tsx
@@ -120,14 +120,14 @@ describe('EditMetadataBatchModal', () => {
     it('should render without crashing', async () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
     })
 
     it('should render document count', async () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByText(/5/)).toBeInTheDocument()
+        expect(screen.getByText(/5/))!.toBeInTheDocument()
       })
     })
 
@@ -142,8 +142,8 @@ describe('EditMetadataBatchModal', () => {
     it('should render field names for existing items', async () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByText('field_one')).toBeInTheDocument()
-        expect(screen.getByText('field_two')).toBeInTheDocument()
+        expect(screen.getByText('field_one'))!.toBeInTheDocument()
+        expect(screen.getByText('field_two'))!.toBeInTheDocument()
       })
     })
 
@@ -158,7 +158,7 @@ describe('EditMetadataBatchModal', () => {
     it('should render select metadata modal', async () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByTestId('select-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('select-modal'))!.toBeInTheDocument()
       })
     })
   })
@@ -169,7 +169,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} onHide={onHide} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       const cancelButton = screen.getByText(/cancel/i)
@@ -183,7 +183,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} onSave={onSave} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Find the primary save button (not the one in SelectMetadataModal)
@@ -196,17 +196,17 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       const checkboxContainer = document.querySelector('[data-testid*="checkbox"]')
-      expect(checkboxContainer).toBeInTheDocument()
+      expect(checkboxContainer)!.toBeInTheDocument()
 
       if (checkboxContainer) {
         fireEvent.click(checkboxContainer)
         await waitFor(() => {
           const checkIcon = screen.getByTestId('check-icon-apply-to-all')
-          expect(checkIcon).toBeInTheDocument()
+          expect(checkIcon)!.toBeInTheDocument()
         })
       }
     })
@@ -216,7 +216,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} onHide={onHide} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
     })
   })
@@ -226,7 +226,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('change-1'))
@@ -239,7 +239,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('remove-1'))
@@ -252,7 +252,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // First change the item
@@ -269,14 +269,14 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('select-metadata'))
 
       // Should now have add-row for the new item
       await waitFor(() => {
-        expect(screen.getByTestId('add-row')).toBeInTheDocument()
+        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
       })
     })
 
@@ -284,14 +284,14 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // First add an item
       fireEvent.click(screen.getByTestId('select-metadata'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('add-row')).toBeInTheDocument()
+        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
       })
 
       // Then remove it
@@ -306,20 +306,20 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // First add an item
       fireEvent.click(screen.getByTestId('select-metadata'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('add-row')).toBeInTheDocument()
+        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
       })
 
       // Then change it
       fireEvent.click(screen.getByTestId('add-change-new-1'))
 
-      expect(screen.getByTestId('add-row')).toBeInTheDocument()
+      expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
     })
 
     it('should call doAddMetaData when saving new metadata with valid name', async () => {
@@ -328,7 +328,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('save-metadata'))
@@ -344,7 +344,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('save-metadata'))
@@ -368,7 +368,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('save-metadata'))
@@ -388,7 +388,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} onShowManage={onShowManage} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('manage-metadata'))
@@ -401,14 +401,14 @@ describe('EditMetadataBatchModal', () => {
     it('should pass correct datasetId', async () => {
       render(<EditMetadataBatchModal {...defaultProps} datasetId="custom-ds" />)
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
     })
 
     it('should display correct document number', async () => {
       render(<EditMetadataBatchModal {...defaultProps} documentNum={10} />)
       await waitFor(() => {
-        expect(screen.getByText(/10/)).toBeInTheDocument()
+        expect(screen.getByText(/10/))!.toBeInTheDocument()
       })
     })
 
@@ -427,7 +427,7 @@ describe('EditMetadataBatchModal', () => {
       ]
       render(<EditMetadataBatchModal {...defaultProps} list={multipleValueList} />)
       await waitFor(() => {
-        expect(screen.getByTestId('edit-row')).toBeInTheDocument()
+        expect(screen.getByTestId('edit-row'))!.toBeInTheDocument()
       })
     })
 
@@ -436,7 +436,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} onSave={onSave} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Find the primary save button
@@ -453,7 +453,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} onSave={onSave} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
@@ -470,7 +470,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} onSave={onSave} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       const checkboxContainer = document.querySelector('[data-testid*="checkbox"]')
@@ -493,7 +493,7 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} onSave={onSave} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Remove an item
@@ -503,7 +503,7 @@ describe('EditMetadataBatchModal', () => {
 
       expect(onSave).toHaveBeenCalled()
       // The first argument should not contain the deleted item (id '1')
-      const savedList = onSave.mock.calls[0][0] as MetadataItemInBatchEdit[]
+      const savedList = onSave.mock.calls[0]![0] as MetadataItemInBatchEdit[]
       const hasDeletedItem = savedList.some(item => item.id === '1')
       expect(hasDeletedItem).toBe(false)
     })
@@ -512,13 +512,13 @@ describe('EditMetadataBatchModal', () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Add first item
       fireEvent.click(screen.getByTestId('select-metadata'))
       await waitFor(() => {
-        expect(screen.getByTestId('add-row')).toBeInTheDocument()
+        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
       })
 
       // Remove it
@@ -531,7 +531,7 @@ describe('EditMetadataBatchModal', () => {
       // Add again
       fireEvent.click(screen.getByTestId('select-metadata'))
       await waitFor(() => {
-        expect(screen.getByTestId('add-row')).toBeInTheDocument()
+        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
       })
     })
   })
diff --git a/web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx b/web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
index 2dfff611ed..974ce977e7 100644
--- a/web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
+++ b/web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
@@ -47,8 +47,8 @@ const EditMetadataBatchModal: FC<Props> = ({ datasetId, documentNum, list, onSav
     const newTempleList = produce(templeList, (draft) => {
       const index = draft.findIndex(i => i.id === id)
       if (index !== -1) {
-        draft[index].isUpdated = true
-        draft[index].updateType = UpdateType.delete
+        draft[index]!.isUpdated = true
+        draft[index]!.updateType = UpdateType.delete
       }
     })
     setTempleList(newTempleList)
@@ -57,9 +57,9 @@ const EditMetadataBatchModal: FC<Props> = ({ datasetId, documentNum, list, onSav
     const newTempleList = produce(templeList, (draft) => {
       const index = draft.findIndex(i => i.id === id)
       if (index !== -1) {
-        draft[index] = { ...list[index] }
-        draft[index].isUpdated = false
-        delete draft[index].updateType
+        draft[index] = { ...list[index]! }
+        draft[index]!.isUpdated = false
+        delete draft[index]!.updateType
       }
     })
     setTempleList(newTempleList)
diff --git a/web/app/components/datasets/metadata/hooks/__tests__/use-batch-edit-document-metadata.spec.ts b/web/app/components/datasets/metadata/hooks/__tests__/use-batch-edit-document-metadata.spec.ts
index 05088cabec..a4650bac43 100644
--- a/web/app/components/datasets/metadata/hooks/__tests__/use-batch-edit-document-metadata.spec.ts
+++ b/web/app/components/datasets/metadata/hooks/__tests__/use-batch-edit-document-metadata.spec.ts
@@ -239,7 +239,7 @@ describe('useBatchEditDocumentMetadata', () => {
       // Should only have one item for field '1', marked as multiple
       const fieldItems = result.current.originalList.filter(item => item.id === '1')
       expect(fieldItems.length).toBe(1)
-      expect(fieldItems[0].isMultipleValue).toBe(true)
+      expect(fieldItems[0]!.isMultipleValue).toBe(true)
     })
   })
 
@@ -458,7 +458,7 @@ describe('useBatchEditDocumentMetadata', () => {
 
       // Both documents should have the field after applying to all
       expect(mockMutateAsync).toHaveBeenCalled()
-      const callArgs = mockMutateAsync.mock.calls[0][0]
+      const callArgs = mockMutateAsync.mock.calls[0]![0]
       expect(callArgs.metadata_list.length).toBe(2)
     })
 
@@ -651,7 +651,7 @@ describe('useBatchEditDocumentMetadata', () => {
         await result.current.handleSave(editedList, [], false)
       })
 
-      const callArgs = mockMutateAsync.mock.calls[0][0]
+      const callArgs = mockMutateAsync.mock.calls[0]![0]
       const sentItem = callArgs.metadata_list[0].metadata_list[0]
 
       // Only id, name, type, value should be present
@@ -693,7 +693,7 @@ describe('useBatchEditDocumentMetadata', () => {
         await result.current.handleSave(editedList, [], false)
       })
 
-      const callArgs = mockMutateAsync.mock.calls[0][0]
+      const callArgs = mockMutateAsync.mock.calls[0]![0]
       const sentItem = callArgs.metadata_list[0].metadata_list[0]
 
       // value should be null, not undefined
diff --git a/web/app/components/datasets/metadata/hooks/__tests__/use-metadata-document.spec.ts b/web/app/components/datasets/metadata/hooks/__tests__/use-metadata-document.spec.ts
index 67c8ffe3b3..9d8b73aaaa 100644
--- a/web/app/components/datasets/metadata/hooks/__tests__/use-metadata-document.spec.ts
+++ b/web/app/components/datasets/metadata/hooks/__tests__/use-metadata-document.spec.ts
@@ -262,7 +262,7 @@ describe('useMetadataDocument', () => {
       // Try to add existing item
       if (result.current.tempList.length > 0) {
         act(() => {
-          result.current.handleSelectMetaData(result.current.tempList[0])
+          result.current.handleSelectMetaData(result.current.tempList[0]!)
         })
 
         expect(result.current.tempList.length).toBe(initialLength)
diff --git a/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts b/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts
index b0feea8c56..16252909a2 100644
--- a/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts
+++ b/web/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata.ts
@@ -45,7 +45,7 @@ const useBatchEditDocumentMetadata = ({ datasetId, docList, selectedDocumentIds,
           }
         }
         if (itemInRes && itemInRes.value !== item.value) {
-          idNameValue[item.id].isMultipleValue = true
+          idNameValue[item.id]!.isMultipleValue = true
           itemInRes.isMultipleValue = true
           itemInRes.value = null
           return
@@ -82,7 +82,7 @@ const useBatchEditDocumentMetadata = ({ datasetId, docList, selectedDocumentIds,
       // Find the document in docList to get its metadata
       const docIndex = docList.findIndex(doc => doc.id === documentId)
       const oldMetadataList = docIndex >= 0 ? metaDataList[docIndex] : []
-      let newMetadataList: MetadataItemWithValue[] = [...oldMetadataList, ...addedList]
+      let newMetadataList: MetadataItemWithValue[] = [...(oldMetadataList ?? []), ...addedList]
         .filter((item) => {
           return !removedList.find(removedItem => removedItem.id === item.id)
         })
diff --git a/web/app/components/datasets/metadata/hooks/use-metadata-document.ts b/web/app/components/datasets/metadata/hooks/use-metadata-document.ts
index 2e9edbfa75..d70870690a 100644
--- a/web/app/components/datasets/metadata/hooks/use-metadata-document.ts
+++ b/web/app/components/datasets/metadata/hooks/use-metadata-document.ts
@@ -95,9 +95,9 @@ const useMetadataDocument = ({ datasetId, documentId, docDetail }: Props) => {
     const fieldList = Object.keys(fieldMap).map((key) => {
       const field = fieldMap[key]
       return {
-        id: field?.label,
+        id: field?.label!,
         type: DataType.string,
-        name: field?.label,
+        name: field?.label!,
         value: getTargetValue(key),
       }
     })
@@ -120,8 +120,8 @@ const useMetadataDocument = ({ datasetId, documentId, docDetail }: Props) => {
     startToEdit,
     handleSave,
     handleCancel,
-    originInfo,
-    technicalParameters,
+    originInfo: originInfo!,
+    technicalParameters: technicalParameters!,
   }
 }
 export default useMetadataDocument
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
index 353a39450e..95e9c130ed 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
@@ -90,23 +90,23 @@ describe('DatasetMetadataDrawer', () => {
     it('should render without crashing', async () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
     })
 
     it('should render user metadata items', async () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByText('field_one')).toBeInTheDocument()
-        expect(screen.getByText('field_two')).toBeInTheDocument()
+        expect(screen.getByText('field_one'))!.toBeInTheDocument()
+        expect(screen.getByText('field_two'))!.toBeInTheDocument()
       })
     })
 
     it('should render built-in metadata items', async () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByText('created_at')).toBeInTheDocument()
-        expect(screen.getByText('modified_at')).toBeInTheDocument()
+        expect(screen.getByText('created_at'))!.toBeInTheDocument()
+        expect(screen.getByText('modified_at'))!.toBeInTheDocument()
       })
     })
 
@@ -121,7 +121,7 @@ describe('DatasetMetadataDrawer', () => {
     it('should render add metadata button', async () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByTestId('create-trigger')).toBeInTheDocument()
+        expect(screen.getByTestId('create-trigger'))!.toBeInTheDocument()
       })
     })
 
@@ -129,7 +129,7 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
       await waitFor(() => {
         const switchBtn = screen.getByRole('switch')
-        expect(switchBtn).toBeInTheDocument()
+        expect(switchBtn)!.toBeInTheDocument()
       })
     })
   })
@@ -145,7 +145,7 @@ describe('DatasetMetadataDrawer', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       const switchBtn = screen.getByRole('switch')
@@ -160,14 +160,14 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       const trigger = screen.getByTestId('create-trigger')
       fireEvent.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByTestId('create-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('create-modal'))!.toBeInTheDocument()
       })
     })
 
@@ -176,7 +176,7 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} onAdd={onAdd} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Open create modal
@@ -184,7 +184,7 @@ describe('DatasetMetadataDrawer', () => {
       fireEvent.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByTestId('create-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('create-modal'))!.toBeInTheDocument()
       })
 
       // Save new metadata
@@ -208,14 +208,14 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} onAdd={onAdd} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Open create modal
       fireEvent.click(screen.getByTestId('create-trigger'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('create-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('create-modal'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('create-save'))
@@ -231,7 +231,7 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Find user metadata items with group/item class (these have edit/delete icons)
@@ -240,14 +240,14 @@ describe('DatasetMetadataDrawer', () => {
       expect(items.length).toBe(2) // 2 user metadata items
 
       // Find the hidden container with edit/delete icons
-      const actionsContainer = items[0].querySelector('.hidden.items-center')
+      const actionsContainer = items[0]!.querySelector('.hidden.items-center')
       expect(actionsContainer).toBeTruthy()
 
       // Find and click the first SVG (edit icon)
       if (actionsContainer) {
         const svgs = actionsContainer.querySelectorAll('svg')
         expect(svgs.length).toBeGreaterThan(0)
-        fireEvent.click(svgs[0])
+        fireEvent.click(svgs[0]!)
       }
 
       // Wait for rename modal (contains input)
@@ -262,16 +262,16 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} onRename={onRename} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Find and click edit icon
       const dialog = screen.getByRole('dialog')
       const items = dialog.querySelectorAll('.group\\/item')
-      const actionsContainer = items[0].querySelector('.hidden.items-center')
+      const actionsContainer = items[0]!.querySelector('.hidden.items-center')
       if (actionsContainer) {
         const svgs = actionsContainer.querySelectorAll('svg')
-        fireEvent.click(svgs[0])
+        fireEvent.click(svgs[0]!)
       }
 
       // Change name and save
@@ -281,7 +281,7 @@ describe('DatasetMetadataDrawer', () => {
       })
 
       const inputs = document.querySelectorAll('input')
-      fireEvent.change(inputs[0], { target: { value: 'renamed_field' } })
+      fireEvent.change(inputs[0]!, { target: { value: 'renamed_field' } })
 
       // Find and click save button
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
@@ -303,16 +303,16 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Find and click edit icon
       const dialog = screen.getByRole('dialog')
       const items = dialog.querySelectorAll('.group\\/item')
-      const actionsContainer = items[0].querySelector('.hidden.items-center')
+      const actionsContainer = items[0]!.querySelector('.hidden.items-center')
       if (actionsContainer) {
         const svgs = actionsContainer.querySelectorAll('svg')
-        fireEvent.click(svgs[0])
+        fireEvent.click(svgs[0]!)
       }
 
       // Wait for modal and click cancel
@@ -323,7 +323,7 @@ describe('DatasetMetadataDrawer', () => {
 
       // Change name first
       const inputs = document.querySelectorAll('input')
-      fireEvent.change(inputs[0], { target: { value: 'changed_name' } })
+      fireEvent.change(inputs[0]!, { target: { value: 'changed_name' } })
 
       // Find and click cancel button
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
@@ -339,16 +339,16 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Find and click edit icon
       const dialog = screen.getByRole('dialog')
       const items = dialog.querySelectorAll('.group\\/item')
-      const actionsContainer = items[0].querySelector('.hidden.items-center')
+      const actionsContainer = items[0]!.querySelector('.hidden.items-center')
       if (actionsContainer) {
         const svgs = actionsContainer.querySelectorAll('svg')
-        fireEvent.click(svgs[0])
+        fireEvent.click(svgs[0]!)
       }
 
       // Wait for rename modal
@@ -382,7 +382,7 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Find user metadata items
@@ -390,7 +390,7 @@ describe('DatasetMetadataDrawer', () => {
       const items = dialog.querySelectorAll('.group\\/item')
 
       // Find the delete container
-      const deleteContainer = items[0].querySelector('.hover\\:text-text-destructive')
+      const deleteContainer = items[0]!.querySelector('.hover\\:text-text-destructive')
       expect(deleteContainer).toBeTruthy()
 
       if (deleteContainer) {
@@ -414,13 +414,13 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} onRemove={onRemove} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Find and click delete icon
       const dialog = screen.getByRole('dialog')
       const items = dialog.querySelectorAll('.group\\/item')
-      const deleteContainer = items[0].querySelector('.hover\\:text-text-destructive')
+      const deleteContainer = items[0]!.querySelector('.hover\\:text-text-destructive')
       if (deleteContainer) {
         const deleteIcon = deleteContainer.querySelector('svg')
         if (deleteIcon)
@@ -460,13 +460,13 @@ describe('DatasetMetadataDrawer', () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       // Find and click delete icon
       const dialog = screen.getByRole('dialog')
       const items = dialog.querySelectorAll('.group\\/item')
-      const deleteContainer = items[0].querySelector('.hover\\:text-text-destructive')
+      const deleteContainer = items[0]!.querySelector('.hover\\:text-text-destructive')
       if (deleteContainer) {
         const deleteIcon = deleteContainer.querySelector('svg')
         if (deleteIcon)
@@ -495,14 +495,14 @@ describe('DatasetMetadataDrawer', () => {
     it('should handle empty userMetadata', async () => {
       render(<DatasetMetadataDrawer {...defaultProps} userMetadata={[]} />)
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
     })
 
     it('should handle empty builtInMetadata', async () => {
       render(<DatasetMetadataDrawer {...defaultProps} builtInMetadata={[]} />)
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
     })
   })
@@ -514,7 +514,7 @@ describe('DatasetMetadataDrawer', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
       const dialog = screen.getByRole('dialog')
@@ -528,7 +528,7 @@ describe('DatasetMetadataDrawer', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByRole('dialog')).toBeInTheDocument()
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
     })
   })
@@ -540,7 +540,7 @@ describe('DatasetMetadataDrawer', () => {
       ]
       render(<DatasetMetadataDrawer {...defaultProps} userMetadata={specialMetadata} />)
       await waitFor(() => {
-        expect(screen.getByText('field_with_underscore')).toBeInTheDocument()
+        expect(screen.getByText('field_with_underscore'))!.toBeInTheDocument()
       })
     })
 
@@ -550,7 +550,7 @@ describe('DatasetMetadataDrawer', () => {
       ]
       render(<DatasetMetadataDrawer {...defaultProps} userMetadata={singleMetadata} />)
       await waitFor(() => {
-        expect(screen.getByText('only_field')).toBeInTheDocument()
+        expect(screen.getByText('only_field'))!.toBeInTheDocument()
       })
     })
 
@@ -560,7 +560,7 @@ describe('DatasetMetadataDrawer', () => {
       ]
       render(<DatasetMetadataDrawer {...defaultProps} builtInMetadata={singleBuiltIn} />)
       await waitFor(() => {
-        expect(screen.getByText('created_at')).toBeInTheDocument()
+        expect(screen.getByText('created_at'))!.toBeInTheDocument()
       })
     })
 
@@ -570,7 +570,7 @@ describe('DatasetMetadataDrawer', () => {
       ]
       render(<DatasetMetadataDrawer {...defaultProps} userMetadata={zeroCountMetadata} />)
       await waitFor(() => {
-        expect(screen.getByText('empty_field')).toBeInTheDocument()
+        expect(screen.getByText('empty_field'))!.toBeInTheDocument()
       })
     })
   })
diff --git a/web/app/components/datasets/metadata/metadata-document/__tests__/index.spec.tsx b/web/app/components/datasets/metadata/metadata-document/__tests__/index.spec.tsx
index ddd624a076..71f23324f6 100644
--- a/web/app/components/datasets/metadata/metadata-document/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-document/__tests__/index.spec.tsx
@@ -99,7 +99,7 @@ describe('MetadataDocument', () => {
           docDetail={mockDocDetail as Parameters<typeof MetadataDocument>[0]['docDetail']}
         />,
       )
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render metadata fields when hasData is true', () => {
@@ -110,8 +110,8 @@ describe('MetadataDocument', () => {
           docDetail={mockDocDetail as Parameters<typeof MetadataDocument>[0]['docDetail']}
         />,
       )
-      expect(screen.getByText('field_one')).toBeInTheDocument()
-      expect(screen.getByText('field_two')).toBeInTheDocument()
+      expect(screen.getByText('field_one'))!.toBeInTheDocument()
+      expect(screen.getByText('field_two'))!.toBeInTheDocument()
     })
 
     it('should render no-data state when hasData is false and not in edit mode', () => {
@@ -147,8 +147,8 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText(/save/i)).toBeInTheDocument()
-      expect(screen.getByText(/cancel/i)).toBeInTheDocument()
+      expect(screen.getByText(/save/i))!.toBeInTheDocument()
+      expect(screen.getByText(/cancel/i))!.toBeInTheDocument()
     })
 
     it('should render built-in section when builtInEnabled is true', () => {
@@ -166,7 +166,7 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText('created_at')).toBeInTheDocument()
+      expect(screen.getByText('created_at'))!.toBeInTheDocument()
     })
 
     it('should render divider when builtInEnabled is true', () => {
@@ -185,7 +185,7 @@ describe('MetadataDocument', () => {
       )
 
       const divider = container.querySelector('.bg-linear-to-r')
-      expect(divider).toBeInTheDocument()
+      expect(divider)!.toBeInTheDocument()
     })
 
     it('should render origin info section', () => {
@@ -202,7 +202,7 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText('source')).toBeInTheDocument()
+      expect(screen.getByText('source'))!.toBeInTheDocument()
     })
 
     it('should render technical parameters section', () => {
@@ -219,7 +219,7 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText('word_count')).toBeInTheDocument()
+      expect(screen.getByText('word_count'))!.toBeInTheDocument()
     })
 
     it('should render all sections together', () => {
@@ -239,10 +239,10 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText('field_one')).toBeInTheDocument()
-      expect(screen.getByText('created_at')).toBeInTheDocument()
-      expect(screen.getByText('source')).toBeInTheDocument()
-      expect(screen.getByText('word_count')).toBeInTheDocument()
+      expect(screen.getByText('field_one'))!.toBeInTheDocument()
+      expect(screen.getByText('created_at'))!.toBeInTheDocument()
+      expect(screen.getByText('source'))!.toBeInTheDocument()
+      expect(screen.getByText('word_count'))!.toBeInTheDocument()
     })
   })
 
@@ -255,7 +255,7 @@ describe('MetadataDocument', () => {
           docDetail={mockDocDetail as Parameters<typeof MetadataDocument>[0]['docDetail']}
         />,
       )
-      expect(screen.getByText(/edit/i)).toBeInTheDocument()
+      expect(screen.getByText(/edit/i))!.toBeInTheDocument()
     })
 
     it('should call startToEdit when edit button is clicked', () => {
@@ -362,8 +362,9 @@ describe('MetadataDocument', () => {
       )
 
       // Should show save/cancel buttons
-      expect(screen.getByText(/save/i)).toBeInTheDocument()
-      expect(screen.getByText(/cancel/i)).toBeInTheDocument()
+      // Should show save/cancel buttons
+      expect(screen.getByText(/save/i))!.toBeInTheDocument()
+      expect(screen.getByText(/cancel/i))!.toBeInTheDocument()
     })
   })
 
@@ -386,7 +387,7 @@ describe('MetadataDocument', () => {
 
       const inputs = container.querySelectorAll('input')
       if (inputs.length > 0) {
-        fireEvent.change(inputs[0], { target: { value: 'new value' } })
+        fireEvent.change(inputs[0]!, { target: { value: 'new value' } })
 
         await waitFor(() => {
           expect(setTempList).toHaveBeenCalled()
@@ -454,7 +455,7 @@ describe('MetadataDocument', () => {
 
       const inputs = container.querySelectorAll('input')
       if (inputs.length > 0) {
-        fireEvent.change(inputs[0], { target: { value: 'updated' } })
+        fireEvent.change(inputs[0]!, { target: { value: 'updated' } })
         await waitFor(() => {
           expect(setTempList).toHaveBeenCalled()
         })
@@ -483,7 +484,7 @@ describe('MetadataDocument', () => {
       expect(deleteContainers.length).toBeGreaterThan(0)
 
       if (deleteContainers.length > 0) {
-        const deleteIcon = deleteContainers[0].querySelector('svg')
+        const deleteIcon = deleteContainers[0]!.querySelector('svg')
         if (deleteIcon)
           fireEvent.click(deleteIcon)
 
@@ -504,7 +505,7 @@ describe('MetadataDocument', () => {
           className="custom-class"
         />,
       )
-      expect(container.firstChild).toHaveClass('custom-class')
+      expect(container.firstChild)!.toHaveClass('custom-class')
     })
 
     it('should use tempList when in edit mode', () => {
@@ -524,7 +525,7 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText('temp_field')).toBeInTheDocument()
+      expect(screen.getByText('temp_field'))!.toBeInTheDocument()
     })
 
     it('should use list when not in edit mode', () => {
@@ -536,8 +537,8 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText('field_one')).toBeInTheDocument()
-      expect(screen.getByText('field_two')).toBeInTheDocument()
+      expect(screen.getByText('field_one'))!.toBeInTheDocument()
+      expect(screen.getByText('field_two'))!.toBeInTheDocument()
     })
 
     it('should pass datasetId to child components', () => {
@@ -549,7 +550,8 @@ describe('MetadataDocument', () => {
         />,
       )
       // Component should render without errors
-      expect(screen.getByText('field_one')).toBeInTheDocument()
+      // Component should render without errors
+      expect(screen.getByText('field_one'))!.toBeInTheDocument()
     })
   })
 
@@ -588,6 +590,37 @@ describe('MetadataDocument', () => {
         />,
       )
 
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
+      // NoData component should not be rendered
       // NoData component should not be rendered
       expect(screen.queryByText(/start/i)).not.toBeInTheDocument()
     })
@@ -607,6 +640,37 @@ describe('MetadataDocument', () => {
         />,
       )
 
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
+      // headerRight should be null/undefined
       // headerRight should be null/undefined
       expect(screen.queryByText(/^edit$/i)).not.toBeInTheDocument()
     })
@@ -628,7 +692,7 @@ describe('MetadataDocument', () => {
           docDetail={mockDocDetail as Parameters<typeof MetadataDocument>[0]['docDetail']}
         />,
       )
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render correctly with minimal props', () => {
@@ -639,7 +703,7 @@ describe('MetadataDocument', () => {
           docDetail={mockDocDetail as Parameters<typeof MetadataDocument>[0]['docDetail']}
         />,
       )
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should handle switching between view and edit mode', () => {
@@ -651,7 +715,7 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText(/edit/i)).toBeInTheDocument()
+      expect(screen.getByText(/edit/i))!.toBeInTheDocument()
 
       unmount()
 
@@ -668,8 +732,8 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText(/save/i)).toBeInTheDocument()
-      expect(screen.getByText(/cancel/i)).toBeInTheDocument()
+      expect(screen.getByText(/save/i))!.toBeInTheDocument()
+      expect(screen.getByText(/cancel/i))!.toBeInTheDocument()
     })
 
     it('should handle multiple items in all sections', () => {
@@ -702,11 +766,11 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText('user_field_1')).toBeInTheDocument()
-      expect(screen.getByText('user_field_2')).toBeInTheDocument()
-      expect(screen.getByText('created_at')).toBeInTheDocument()
-      expect(screen.getByText('source')).toBeInTheDocument()
-      expect(screen.getByText('word_count')).toBeInTheDocument()
+      expect(screen.getByText('user_field_1'))!.toBeInTheDocument()
+      expect(screen.getByText('user_field_2'))!.toBeInTheDocument()
+      expect(screen.getByText('created_at'))!.toBeInTheDocument()
+      expect(screen.getByText('source'))!.toBeInTheDocument()
+      expect(screen.getByText('word_count'))!.toBeInTheDocument()
     })
 
     it('should handle null values in metadata', () => {
@@ -725,7 +789,7 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText('null_field')).toBeInTheDocument()
+      expect(screen.getByText('null_field'))!.toBeInTheDocument()
     })
 
     it('should handle undefined values in metadata', () => {
@@ -744,7 +808,7 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      expect(screen.getByText('undefined_field')).toBeInTheDocument()
+      expect(screen.getByText('undefined_field'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/metadata/metadata-document/__tests__/info-group.spec.tsx b/web/app/components/datasets/metadata/metadata-document/__tests__/info-group.spec.tsx
index d783b882a8..c176979a5a 100644
--- a/web/app/components/datasets/metadata/metadata-document/__tests__/info-group.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-document/__tests__/info-group.spec.tsx
@@ -90,14 +90,14 @@ describe('InfoGroup', () => {
       const { container } = render(
         <InfoGroup dataSetId="ds-1" list={mockList} />,
       )
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should render title when provided', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={mockList} title="Test Title" />,
       )
-      expect(screen.getByText('Test Title')).toBeInTheDocument()
+      expect(screen.getByText('Test Title'))!.toBeInTheDocument()
     })
 
     it('should not render header when noHeader is true', () => {
@@ -126,7 +126,7 @@ describe('InfoGroup', () => {
       )
       // Tooltip icon should be present
       const tooltipIcon = screen.getByText('Test').closest('.flex')?.querySelector('svg')
-      expect(tooltipIcon).toBeInTheDocument()
+      expect(tooltipIcon)!.toBeInTheDocument()
     })
 
     it('should render headerRight content', () => {
@@ -138,7 +138,7 @@ describe('InfoGroup', () => {
           headerRight={<button data-testid="header-right-btn">Action</button>}
         />,
       )
-      expect(screen.getByTestId('header-right-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('header-right-btn'))!.toBeInTheDocument()
     })
   })
 
@@ -147,7 +147,7 @@ describe('InfoGroup', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit />,
       )
-      expect(screen.getByTestId('add-metadata-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('add-metadata-btn'))!.toBeInTheDocument()
     })
 
     it('should not render add metadata button when isEdit is false', () => {
@@ -182,7 +182,7 @@ describe('InfoGroup', () => {
       )
 
       const inputs = screen.getAllByTestId('input-combined')
-      fireEvent.change(inputs[0], { target: { value: 'New Value' } })
+      fireEvent.change(inputs[0]!, { target: { value: 'New Value' } })
 
       expect(handleChange).toHaveBeenCalled()
     })
@@ -196,7 +196,7 @@ describe('InfoGroup', () => {
       // Find delete icons (RiDeleteBinLine SVGs inside cursor-pointer divs)
       const deleteButtons = container.querySelectorAll('svg.size-4')
       if (deleteButtons.length > 0)
-        fireEvent.click(deleteButtons[0])
+        fireEvent.click(deleteButtons[0]!)
 
       expect(handleDelete).toHaveBeenCalled()
     })
@@ -239,7 +239,8 @@ describe('InfoGroup', () => {
       fireEvent.click(screen.getByTestId('manage-action'))
 
       // The onManage callback triggers the navigation
-      expect(screen.getByTestId('manage-action')).toBeInTheDocument()
+      // The onManage callback triggers the navigation
+      expect(screen.getByTestId('manage-action'))!.toBeInTheDocument()
     })
   })
 
@@ -248,7 +249,7 @@ describe('InfoGroup', () => {
       const { container } = render(
         <InfoGroup dataSetId="ds-1" list={mockList} className="custom-class" />,
       )
-      expect(container.firstChild).toHaveClass('custom-class')
+      expect(container.firstChild)!.toHaveClass('custom-class')
     })
 
     it('should apply contentClassName', () => {
@@ -256,7 +257,7 @@ describe('InfoGroup', () => {
         <InfoGroup dataSetId="ds-1" list={mockList} contentClassName="content-custom" />,
       )
       const contentDiv = container.querySelector('.content-custom')
-      expect(contentDiv).toBeInTheDocument()
+      expect(contentDiv)!.toBeInTheDocument()
     })
 
     it('should use uppercase title by default', () => {
@@ -264,7 +265,7 @@ describe('InfoGroup', () => {
         <InfoGroup dataSetId="ds-1" list={mockList} title="Test Title" />,
       )
       const titleElement = screen.getByText('Test Title')
-      expect(titleElement).toHaveClass('system-xs-semibold-uppercase')
+      expect(titleElement)!.toHaveClass('system-xs-semibold-uppercase')
     })
 
     it('should not use uppercase when uppercaseTitle is false', () => {
@@ -272,7 +273,7 @@ describe('InfoGroup', () => {
         <InfoGroup dataSetId="ds-1" list={mockList} title="Test Title" uppercaseTitle={false} />,
       )
       const titleElement = screen.getByText('Test Title')
-      expect(titleElement).toHaveClass('system-md-semibold')
+      expect(titleElement)!.toHaveClass('system-md-semibold')
     })
   })
 
@@ -284,7 +285,7 @@ describe('InfoGroup', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={stringList} />,
       )
-      expect(screen.getByText('Test Value')).toBeInTheDocument()
+      expect(screen.getByText('Test Value'))!.toBeInTheDocument()
     })
 
     it('should display number value', () => {
@@ -294,7 +295,7 @@ describe('InfoGroup', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={numberList} />,
       )
-      expect(screen.getByText('123')).toBeInTheDocument()
+      expect(screen.getByText('123'))!.toBeInTheDocument()
     })
 
     it('should format time value', () => {
@@ -305,7 +306,8 @@ describe('InfoGroup', () => {
         <InfoGroup dataSetId="ds-1" list={timeList} />,
       )
       // The mock formatTime returns formatted date
-      expect(screen.getByTestId('field-content')).toBeInTheDocument()
+      // The mock formatTime returns formatted date
+      expect(screen.getByTestId('field-content'))!.toBeInTheDocument()
     })
   })
 
@@ -314,7 +316,7 @@ describe('InfoGroup', () => {
       const { container } = render(
         <InfoGroup dataSetId="ds-1" list={[]} />,
       )
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should handle null value in list', () => {
@@ -324,7 +326,7 @@ describe('InfoGroup', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={nullList} />,
       )
-      expect(screen.getByTestId('field')).toBeInTheDocument()
+      expect(screen.getByTestId('field'))!.toBeInTheDocument()
     })
 
     it('should handle items with built-in id', () => {
@@ -334,7 +336,7 @@ describe('InfoGroup', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={builtInList} />,
       )
-      expect(screen.getByTestId('field')).toBeInTheDocument()
+      expect(screen.getByTestId('field'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/preview/__tests__/container.spec.tsx b/web/app/components/datasets/preview/__tests__/container.spec.tsx
index 86f6e3f85b..473d91f857 100644
--- a/web/app/components/datasets/preview/__tests__/container.spec.tsx
+++ b/web/app/components/datasets/preview/__tests__/container.spec.tsx
@@ -12,16 +12,16 @@ describe('PreviewContainer', () => {
     it('should render header content in a header element', () => {
       render(<PreviewContainer header={<span>Header Title</span>}>Body</PreviewContainer>)
 
-      expect(screen.getByText('Header Title')).toBeInTheDocument()
+      expect(screen.getByText('Header Title'))!.toBeInTheDocument()
       const headerEl = screen.getByText('Header Title').closest('header')
-      expect(headerEl).toBeInTheDocument()
+      expect(headerEl)!.toBeInTheDocument()
     })
 
     it('should render children in a main element', () => {
       render(<PreviewContainer header="Header">Main content</PreviewContainer>)
 
       const mainEl = screen.getByRole('main')
-      expect(mainEl).toHaveTextContent('Main content')
+      expect(mainEl)!.toHaveTextContent('Main content')
     })
 
     it('should render both header and children simultaneously', () => {
@@ -31,14 +31,14 @@ describe('PreviewContainer', () => {
         </PreviewContainer>,
       )
 
-      expect(screen.getByText('My Header')).toBeInTheDocument()
-      expect(screen.getByText('Body paragraph')).toBeInTheDocument()
+      expect(screen.getByText('My Header'))!.toBeInTheDocument()
+      expect(screen.getByText('Body paragraph'))!.toBeInTheDocument()
     })
 
     it('should render without children', () => {
       render(<PreviewContainer header="Header" />)
 
-      expect(screen.getByRole('main')).toBeInTheDocument()
+      expect(screen.getByRole('main'))!.toBeInTheDocument()
       expect(screen.getByRole('main').childElementCount).toBe(0)
     })
   })
@@ -49,7 +49,7 @@ describe('PreviewContainer', () => {
         <PreviewContainer header="Header" className="outer-class">Content</PreviewContainer>,
       )
 
-      expect(container.firstElementChild).toHaveClass('outer-class')
+      expect(container.firstElementChild)!.toHaveClass('outer-class')
     })
 
     it('should apply mainClassName to the main element', () => {
@@ -58,9 +58,10 @@ describe('PreviewContainer', () => {
       )
 
       const mainEl = screen.getByRole('main')
-      expect(mainEl).toHaveClass('custom-main')
+      expect(mainEl)!.toHaveClass('custom-main')
       // Default classes should still be present
-      expect(mainEl).toHaveClass('w-full', 'grow', 'overflow-y-auto', 'px-6', 'py-5')
+      // Default classes should still be present
+      expect(mainEl)!.toHaveClass('w-full', 'grow', 'overflow-y-auto', 'px-6', 'py-5')
     })
 
     it('should forward ref to the inner container div', () => {
@@ -70,7 +71,7 @@ describe('PreviewContainer', () => {
       )
 
       expect(ref).toHaveBeenCalled()
-      const refArg = ref.mock.calls[0][0]
+      const refArg = ref.mock.calls[0]![0]
       expect(refArg).toBeInstanceOf(HTMLDivElement)
     })
 
@@ -82,7 +83,7 @@ describe('PreviewContainer', () => {
       )
 
       const inner = screen.getByTestId('inner-container')
-      expect(inner).toHaveAttribute('id', 'container-1')
+      expect(inner)!.toHaveAttribute('id', 'container-1')
     })
 
     it('should render ReactNode as header', () => {
@@ -92,8 +93,8 @@ describe('PreviewContainer', () => {
         </PreviewContainer>,
       )
 
-      expect(screen.getByTestId('complex-header')).toBeInTheDocument()
-      expect(screen.getByText('Complex')).toBeInTheDocument()
+      expect(screen.getByTestId('complex-header'))!.toBeInTheDocument()
+      expect(screen.getByText('Complex'))!.toBeInTheDocument()
     })
   })
 
@@ -103,7 +104,7 @@ describe('PreviewContainer', () => {
       render(<PreviewContainer header="Header">Content</PreviewContainer>)
 
       const headerEl = screen.getByText('Header').closest('header')
-      expect(headerEl).toHaveClass('border-b', 'border-divider-subtle')
+      expect(headerEl)!.toHaveClass('border-b', 'border-divider-subtle')
     })
 
     it('should have inner div with flex column layout', () => {
@@ -112,13 +113,13 @@ describe('PreviewContainer', () => {
       )
 
       const inner = screen.getByTestId('inner')
-      expect(inner).toHaveClass('flex', 'h-full', 'w-full', 'flex-col')
+      expect(inner)!.toHaveClass('flex', 'h-full', 'w-full', 'flex-col')
     })
 
     it('should have main with overflow-y-auto for scrolling', () => {
       render(<PreviewContainer header="Header">Content</PreviewContainer>)
 
-      expect(screen.getByRole('main')).toHaveClass('overflow-y-auto')
+      expect(screen.getByRole('main'))!.toHaveClass('overflow-y-auto')
     })
   })
 
@@ -134,13 +135,13 @@ describe('PreviewContainer', () => {
       render(<PreviewContainer header="">Content</PreviewContainer>)
 
       const headerEl = screen.getByRole('banner')
-      expect(headerEl).toBeInTheDocument()
+      expect(headerEl)!.toBeInTheDocument()
     })
 
     it('should render with null children', () => {
       render(<PreviewContainer header="Header">{null}</PreviewContainer>)
 
-      expect(screen.getByRole('main')).toBeInTheDocument()
+      expect(screen.getByRole('main'))!.toBeInTheDocument()
     })
 
     it('should render with multiple children', () => {
@@ -152,9 +153,9 @@ describe('PreviewContainer', () => {
         </PreviewContainer>,
       )
 
-      expect(screen.getByText('Child 1')).toBeInTheDocument()
-      expect(screen.getByText('Child 2')).toBeInTheDocument()
-      expect(screen.getByText('Child 3')).toBeInTheDocument()
+      expect(screen.getByText('Child 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Child 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Child 3'))!.toBeInTheDocument()
     })
 
     it('should not crash on re-render with different props', () => {
@@ -166,8 +167,8 @@ describe('PreviewContainer', () => {
         <PreviewContainer header="Second" className="b" mainClassName="new-main">Content B</PreviewContainer>,
       )
 
-      expect(screen.getByText('Second')).toBeInTheDocument()
-      expect(screen.getByText('Content B')).toBeInTheDocument()
+      expect(screen.getByText('Second'))!.toBeInTheDocument()
+      expect(screen.getByText('Content B'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx b/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx
index dbae959d8d..600e6c3434 100644
--- a/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx
@@ -138,43 +138,46 @@ describe('RenameDatasetModal', () => {
     it('should render without crashing', () => {
       render(<RenameDatasetModal {...defaultProps} />)
       // Check title is rendered (translation mock returns 'datasetSettings.title')
-      expect(screen.getByText('datasetSettings.title')).toBeInTheDocument()
+      // Check title is rendered (translation mock returns 'datasetSettings.title')
+      expect(screen.getByText('datasetSettings.title'))!.toBeInTheDocument()
     })
 
     it('should render modal when show is true', () => {
       render(<RenameDatasetModal {...defaultProps} show={true} />)
-      expect(screen.getByText('datasetSettings.title')).toBeInTheDocument()
+      expect(screen.getByText('datasetSettings.title'))!.toBeInTheDocument()
     })
 
     it('should render name input with dataset name', () => {
       render(<RenameDatasetModal {...defaultProps} />)
       const nameInput = screen.getByDisplayValue('Test Dataset')
-      expect(nameInput).toBeInTheDocument()
+      expect(nameInput)!.toBeInTheDocument()
     })
 
     it('should render description textarea with dataset description', () => {
       render(<RenameDatasetModal {...defaultProps} />)
       const descriptionTextarea = screen.getByDisplayValue('Test description')
-      expect(descriptionTextarea).toBeInTheDocument()
+      expect(descriptionTextarea)!.toBeInTheDocument()
     })
 
     it('should render cancel and save buttons', () => {
       render(<RenameDatasetModal {...defaultProps} />)
-      expect(screen.getByText('common.operation.cancel')).toBeInTheDocument()
-      expect(screen.getByText('common.operation.save')).toBeInTheDocument()
+      expect(screen.getByText('common.operation.cancel'))!.toBeInTheDocument()
+      expect(screen.getByText('common.operation.save'))!.toBeInTheDocument()
     })
 
     it('should render close icon button', () => {
       render(<RenameDatasetModal {...defaultProps} />)
       // The modal renders with title and other elements
       // The close functionality is tested in user interactions
-      expect(screen.getByText('datasetSettings.title')).toBeInTheDocument()
+      // The modal renders with title and other elements
+      // The close functionality is tested in user interactions
+      expect(screen.getByText('datasetSettings.title'))!.toBeInTheDocument()
     })
 
     it('should render form labels', () => {
       render(<RenameDatasetModal {...defaultProps} />)
-      expect(screen.getByText('datasetSettings.form.name')).toBeInTheDocument()
-      expect(screen.getByText('datasetSettings.form.desc')).toBeInTheDocument()
+      expect(screen.getByText('datasetSettings.form.name'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetSettings.form.desc'))!.toBeInTheDocument()
     })
   })
 
@@ -182,13 +185,13 @@ describe('RenameDatasetModal', () => {
     it('should render with emoji icon dataset', () => {
       const dataset = createMockDataset()
       render(<RenameDatasetModal {...defaultProps} dataset={dataset} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
 
     it('should render with image icon dataset', () => {
       const dataset = createMockDatasetWithImageIcon()
       render(<RenameDatasetModal {...defaultProps} dataset={dataset} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
 
     it('should render with empty description', () => {
@@ -196,30 +199,30 @@ describe('RenameDatasetModal', () => {
       render(<RenameDatasetModal {...defaultProps} dataset={dataset} />)
       // Find the textarea by its placeholder
       const descriptionTextarea = screen.getByPlaceholderText('datasetSettings.form.descPlaceholder')
-      expect(descriptionTextarea).toHaveValue('')
+      expect(descriptionTextarea)!.toHaveValue('')
     })
 
     it('should render with external knowledge dataset', () => {
       const dataset = createMockExternalDataset()
       render(<RenameDatasetModal {...defaultProps} dataset={dataset} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
 
     it('should handle undefined onSuccess callback', () => {
       render(<RenameDatasetModal {...defaultProps} onSuccess={undefined} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
   })
 
   describe('State Management', () => {
     it('should initialize name state with dataset name', () => {
       render(<RenameDatasetModal {...defaultProps} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
 
     it('should initialize description state with dataset description', () => {
       render(<RenameDatasetModal {...defaultProps} />)
-      expect(screen.getByDisplayValue('Test description')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test description'))!.toBeInTheDocument()
     })
 
     it('should update name state when input changes', () => {
@@ -228,7 +231,7 @@ describe('RenameDatasetModal', () => {
 
       fireEvent.change(nameInput, { target: { value: 'New Dataset Name' } })
 
-      expect(screen.getByDisplayValue('New Dataset Name')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('New Dataset Name'))!.toBeInTheDocument()
     })
 
     it('should update description state when textarea changes', () => {
@@ -237,7 +240,7 @@ describe('RenameDatasetModal', () => {
 
       fireEvent.change(descriptionTextarea, { target: { value: 'New description' } })
 
-      expect(screen.getByDisplayValue('New description')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('New description'))!.toBeInTheDocument()
     })
 
     it('should clear name when input is cleared', () => {
@@ -246,7 +249,7 @@ describe('RenameDatasetModal', () => {
 
       fireEvent.change(nameInput, { target: { value: '' } })
 
-      expect(nameInput).toHaveValue('')
+      expect(nameInput)!.toHaveValue('')
     })
 
     it('should handle special characters in name', () => {
@@ -255,7 +258,7 @@ describe('RenameDatasetModal', () => {
 
       fireEvent.change(nameInput, { target: { value: 'Dataset <script>alert("xss")</script>' } })
 
-      expect(screen.getByDisplayValue('Dataset <script>alert("xss")</script>')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Dataset <script>alert("xss")</script>'))!.toBeInTheDocument()
     })
 
     it('should handle very long name input', () => {
@@ -265,7 +268,7 @@ describe('RenameDatasetModal', () => {
 
       fireEvent.change(nameInput, { target: { value: longName } })
 
-      expect(screen.getByDisplayValue(longName)).toBeInTheDocument()
+      expect(screen.getByDisplayValue(longName))!.toBeInTheDocument()
     })
 
     it('should handle multiline description', () => {
@@ -276,7 +279,8 @@ describe('RenameDatasetModal', () => {
       fireEvent.change(descriptionTextarea, { target: { value: multilineDesc } })
 
       // Verify the textarea contains the multiline value
-      expect(descriptionTextarea).toHaveValue(multilineDesc)
+      // Verify the textarea contains the multiline value
+      expect(descriptionTextarea)!.toHaveValue(multilineDesc)
     })
   })
 
@@ -338,7 +342,7 @@ describe('RenameDatasetModal', () => {
       })
 
       await waitFor(() => {
-        expect(saveButton).toBeDisabled()
+        expect(saveButton)!.toBeDisabled()
       })
 
       // Resolve the promise to clean up
@@ -354,6 +358,37 @@ describe('RenameDatasetModal', () => {
       // Verify the input can receive focus
       nameInput.focus()
 
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
+      // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
       // Just verify the element is focusable (don't check activeElement as it may differ in test environment)
       expect(nameInput).not.toBeDisabled()
     })
@@ -365,6 +400,37 @@ describe('RenameDatasetModal', () => {
       // Verify the textarea can receive focus
       descriptionTextarea.focus()
 
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
+      // Just verify the element is focusable
       // Just verify the element is focusable
       expect(descriptionTextarea).not.toBeDisabled()
     })
@@ -429,7 +495,7 @@ describe('RenameDatasetModal', () => {
 
       await waitFor(() => {
         expect(mockUpdateDatasetSetting).toHaveBeenCalled()
-        const callArgs = mockUpdateDatasetSetting.mock.calls[0][0]
+        const callArgs = mockUpdateDatasetSetting.mock.calls[0]![0]
         expect(callArgs.body.external_knowledge_id).toBeUndefined()
         expect(callArgs.body.external_knowledge_api_id).toBeUndefined()
       })
@@ -604,6 +670,37 @@ describe('RenameDatasetModal', () => {
         expect(mockToast.error).toHaveBeenCalled()
       })
 
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
+      // Save button should be enabled again
       // Save button should be enabled again
       expect(saveButton).not.toBeDisabled()
     })
@@ -660,8 +757,10 @@ describe('RenameDatasetModal', () => {
       render(<RenameDatasetModal {...defaultProps} />)
       // The modal should render with name label and input
       // AppIcon is rendered alongside the name input
-      expect(screen.getByText('datasetSettings.form.name')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      // The modal should render with name label and input
+      // AppIcon is rendered alongside the name input
+      expect(screen.getByText('datasetSettings.form.name'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
 
     it('should initialize icon state from dataset', () => {
@@ -669,14 +768,16 @@ describe('RenameDatasetModal', () => {
       render(<RenameDatasetModal {...defaultProps} />)
       // The component initializes with the dataset's icon_info
       // This is verified by checking the form renders correctly
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      // The component initializes with the dataset's icon_info
+      // This is verified by checking the form renders correctly
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
 
     it('should initialize icon state from image icon dataset', () => {
       // Test with image icon - this triggers the icon_type === 'image' branch
       const imageDataset = createMockDatasetWithImageIcon()
       render(<RenameDatasetModal {...defaultProps} dataset={imageDataset} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
       // The component should render successfully with image icon dataset
     })
 
@@ -734,6 +835,37 @@ describe('RenameDatasetModal', () => {
     it('should open icon picker when app icon is clicked (handleOpenAppIconPicker)', async () => {
       render(<RenameDatasetModal {...defaultProps} />)
 
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
+      // Initially picker should not be visible
       // Initially picker should not be visible
       expect(screen.queryByTestId('app-icon-picker')).not.toBeInTheDocument()
 
@@ -743,7 +875,8 @@ describe('RenameDatasetModal', () => {
       })
 
       // Picker should now be visible
-      expect(screen.getByTestId('app-icon-picker')).toBeInTheDocument()
+      // Picker should now be visible
+      expect(screen.getByTestId('app-icon-picker'))!.toBeInTheDocument()
     })
 
     it('should select emoji icon and close picker (handleSelectAppIcon)', async () => {
@@ -761,6 +894,37 @@ describe('RenameDatasetModal', () => {
         fireEvent.click(selectEmojiBtn)
       })
 
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
       // Picker should close after selection
       expect(screen.queryByTestId('app-icon-picker')).not.toBeInTheDocument()
 
@@ -800,6 +964,37 @@ describe('RenameDatasetModal', () => {
         fireEvent.click(selectImageBtn)
       })
 
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
+      // Picker should close after selection
       // Picker should close after selection
       expect(screen.queryByTestId('app-icon-picker')).not.toBeInTheDocument()
 
@@ -839,6 +1034,37 @@ describe('RenameDatasetModal', () => {
         fireEvent.click(closeBtn)
       })
 
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
+      // Picker should close
       // Picker should close
       expect(screen.queryByTestId('app-icon-picker')).not.toBeInTheDocument()
 
@@ -876,7 +1102,7 @@ describe('RenameDatasetModal', () => {
       })
 
       render(<RenameDatasetModal {...defaultProps} dataset={dataset} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
 
     it('should handle image icon with empty icon_url', async () => {
@@ -891,7 +1117,7 @@ describe('RenameDatasetModal', () => {
       })
 
       render(<RenameDatasetModal {...defaultProps} dataset={dataset} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
 
       // Save and verify the icon_url is handled correctly
       const saveButton = screen.getByText('common.operation.save')
@@ -925,7 +1151,7 @@ describe('RenameDatasetModal', () => {
       })
 
       render(<RenameDatasetModal {...defaultProps} dataset={dataset} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
 
       // Save and verify the icon is handled correctly
       const saveButton = screen.getByText('common.operation.save')
@@ -958,7 +1184,7 @@ describe('RenameDatasetModal', () => {
       })
 
       render(<RenameDatasetModal {...defaultProps} dataset={dataset} />)
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
 
     it('should handle rapid input changes', async () => {
@@ -975,7 +1201,7 @@ describe('RenameDatasetModal', () => {
       fireEvent.change(nameInput, { target: { value: 'New Nam' } })
       fireEvent.change(nameInput, { target: { value: 'New Name' } })
 
-      expect(screen.getByDisplayValue('New Name')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('New Name'))!.toBeInTheDocument()
     })
 
     it('should handle double click on save button', async () => {
@@ -995,7 +1221,8 @@ describe('RenameDatasetModal', () => {
       })
 
       // Button should be disabled now
-      expect(saveButton).toBeDisabled()
+      // Button should be disabled now
+      expect(saveButton)!.toBeDisabled()
 
       // Second click should not trigger another API call because button is disabled
       await act(async () => {
@@ -1017,7 +1244,7 @@ describe('RenameDatasetModal', () => {
 
       fireEvent.change(nameInput, { target: { value: '数据集 🎉 Dataset' } })
 
-      expect(screen.getByDisplayValue('数据集 🎉 Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('数据集 🎉 Dataset'))!.toBeInTheDocument()
     })
 
     it('should handle unicode characters in description', () => {
@@ -1026,7 +1253,7 @@ describe('RenameDatasetModal', () => {
 
       fireEvent.change(descriptionTextarea, { target: { value: '这是一个测试描述 🚀' } })
 
-      expect(screen.getByDisplayValue('这是一个测试描述 🚀')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('这是一个测试描述 🚀'))!.toBeInTheDocument()
     })
 
     it('should preserve whitespace in description', () => {
@@ -1036,7 +1263,7 @@ describe('RenameDatasetModal', () => {
       const testValue = 'Leading spaces with content'
       fireEvent.change(descriptionTextarea, { target: { value: testValue } })
 
-      expect(descriptionTextarea).toHaveValue(testValue)
+      expect(descriptionTextarea)!.toHaveValue(testValue)
     })
   })
 
@@ -1044,20 +1271,22 @@ describe('RenameDatasetModal', () => {
     it('should update when dataset prop changes', () => {
       const { rerender } = render(<RenameDatasetModal {...defaultProps} />)
 
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
 
       const newDataset = createMockDataset({ name: 'Different Dataset', description: 'Different description' })
       rerender(<RenameDatasetModal {...defaultProps} dataset={newDataset} />)
 
       // Note: The component uses useState with initial value, so it won't update
       // This tests that the initial render works correctly with different props
-      expect(screen.getByDisplayValue('Test Dataset')).toBeInTheDocument()
+      // Note: The component uses useState with initial value, so it won't update
+      // This tests that the initial render works correctly with different props
+      expect(screen.getByDisplayValue('Test Dataset'))!.toBeInTheDocument()
     })
 
     it('should handle show prop toggle', () => {
       const { rerender } = render(<RenameDatasetModal {...defaultProps} show={true} />)
 
-      expect(screen.getByText('datasetSettings.title')).toBeInTheDocument()
+      expect(screen.getByText('datasetSettings.title'))!.toBeInTheDocument()
 
       rerender(<RenameDatasetModal {...defaultProps} show={false} />)
 
@@ -1084,8 +1313,8 @@ describe('RenameDatasetModal', () => {
       const cancelButton = screen.getByText('common.operation.cancel')
       const saveButton = screen.getByText('common.operation.save')
 
-      expect(cancelButton).toBeEnabled()
-      expect(saveButton).toBeEnabled()
+      expect(cancelButton)!.toBeEnabled()
+      expect(saveButton)!.toBeEnabled()
     })
   })
 
@@ -1105,7 +1334,7 @@ describe('RenameDatasetModal', () => {
 
       // Button should be disabled during loading
       await waitFor(() => {
-        expect(saveButton).toBeDisabled()
+        expect(saveButton)!.toBeDisabled()
       })
 
       // Resolve promise to complete the test
@@ -1148,6 +1377,37 @@ describe('RenameDatasetModal', () => {
         expect(mockToast.error).toHaveBeenCalledWith('common.actionMsg.modifiedUnsuccessfully')
       })
 
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
+      // Button should be re-enabled after error
       // Button should be re-enabled after error
       expect(saveButton).not.toBeDisabled()
     })
diff --git a/web/app/components/datasets/settings/chunk-structure/__tests__/hooks.spec.tsx b/web/app/components/datasets/settings/chunk-structure/__tests__/hooks.spec.tsx
index 8d44d19d09..518c74d0e1 100644
--- a/web/app/components/datasets/settings/chunk-structure/__tests__/hooks.spec.tsx
+++ b/web/app/components/datasets/settings/chunk-structure/__tests__/hooks.spec.tsx
@@ -23,49 +23,49 @@ describe('useChunkStructure', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const generalOption = result.current.options[0]
-      expect(generalOption.id).toBe('text_model')
+      expect(generalOption!.id).toBe('text_model')
     })
 
     it('should have icon for General option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const generalOption = result.current.options[0]
-      expect(generalOption.icon).toBeDefined()
+      expect(generalOption!.icon).toBeDefined()
     })
 
     it('should have correct iconActiveColor for General option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const generalOption = result.current.options[0]
-      expect(generalOption.iconActiveColor).toBe('text-util-colors-indigo-indigo-600')
+      expect(generalOption!.iconActiveColor).toBe('text-util-colors-indigo-indigo-600')
     })
 
     it('should have title for General option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const generalOption = result.current.options[0]
-      expect(generalOption.title).toBe('General')
+      expect(generalOption!.title).toBe('General')
     })
 
     it('should have description for General option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const generalOption = result.current.options[0]
-      expect(generalOption.description).toBeDefined()
+      expect(generalOption!.description).toBeDefined()
     })
 
     it('should have indigo effectColor for General option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const generalOption = result.current.options[0]
-      expect(generalOption.effectColor).toBe(EffectColor.indigo)
+      expect(generalOption!.effectColor).toBe(EffectColor.indigo)
     })
 
     it('should have showEffectColor true for General option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const generalOption = result.current.options[0]
-      expect(generalOption.showEffectColor).toBe(true)
+      expect(generalOption!.showEffectColor).toBe(true)
     })
   })
 
@@ -74,49 +74,49 @@ describe('useChunkStructure', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const parentChildOption = result.current.options[1]
-      expect(parentChildOption.id).toBe('hierarchical_model')
+      expect(parentChildOption!.id).toBe('hierarchical_model')
     })
 
     it('should have icon for Parent-Child option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const parentChildOption = result.current.options[1]
-      expect(parentChildOption.icon).toBeDefined()
+      expect(parentChildOption!.icon).toBeDefined()
     })
 
     it('should have correct iconActiveColor for Parent-Child option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const parentChildOption = result.current.options[1]
-      expect(parentChildOption.iconActiveColor).toBe('text-util-colors-blue-light-blue-light-500')
+      expect(parentChildOption!.iconActiveColor).toBe('text-util-colors-blue-light-blue-light-500')
     })
 
     it('should have title for Parent-Child option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const parentChildOption = result.current.options[1]
-      expect(parentChildOption.title).toBe('Parent-Child')
+      expect(parentChildOption!.title).toBe('Parent-Child')
     })
 
     it('should have description for Parent-Child option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const parentChildOption = result.current.options[1]
-      expect(parentChildOption.description).toBeDefined()
+      expect(parentChildOption!.description).toBeDefined()
     })
 
     it('should have blueLight effectColor for Parent-Child option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const parentChildOption = result.current.options[1]
-      expect(parentChildOption.effectColor).toBe(EffectColor.blueLight)
+      expect(parentChildOption!.effectColor).toBe(EffectColor.blueLight)
     })
 
     it('should have showEffectColor true for Parent-Child option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const parentChildOption = result.current.options[1]
-      expect(parentChildOption.showEffectColor).toBe(true)
+      expect(parentChildOption!.showEffectColor).toBe(true)
     })
   })
 
@@ -125,49 +125,49 @@ describe('useChunkStructure', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const qaOption = result.current.options[2]
-      expect(qaOption.id).toBe('qa_model')
+      expect(qaOption!.id).toBe('qa_model')
     })
 
     it('should have icon for Q&A option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const qaOption = result.current.options[2]
-      expect(qaOption.icon).toBeDefined()
+      expect(qaOption!.icon).toBeDefined()
     })
 
     it('should have title for Q&A option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const qaOption = result.current.options[2]
-      expect(qaOption.title).toBe('Q&A')
+      expect(qaOption!.title).toBe('Q&A')
     })
 
     it('should have description for Q&A option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const qaOption = result.current.options[2]
-      expect(qaOption.description).toBeDefined()
+      expect(qaOption!.description).toBeDefined()
     })
 
     it('should not have effectColor for Q&A option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const qaOption = result.current.options[2]
-      expect(qaOption.effectColor).toBeUndefined()
+      expect(qaOption!.effectColor).toBeUndefined()
     })
 
     it('should not have showEffectColor for Q&A option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const qaOption = result.current.options[2]
-      expect(qaOption.showEffectColor).toBeUndefined()
+      expect(qaOption!.showEffectColor).toBeUndefined()
     })
 
     it('should not have iconActiveColor for Q&A option', () => {
       const { result } = renderHook(() => useChunkStructure())
 
       const qaOption = result.current.options[2]
-      expect(qaOption.iconActiveColor).toBeUndefined()
+      expect(qaOption!.iconActiveColor).toBeUndefined()
     })
   })
 
diff --git a/web/app/components/datasets/settings/form/components/__tests__/basic-info-section.spec.tsx b/web/app/components/datasets/settings/form/components/__tests__/basic-info-section.spec.tsx
index 618a28d498..f34269f058 100644
--- a/web/app/components/datasets/settings/form/components/__tests__/basic-info-section.spec.tsx
+++ b/web/app/components/datasets/settings/form/components/__tests__/basic-info-section.spec.tsx
@@ -142,42 +142,43 @@ describe('BasicInfoSection', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<BasicInfoSection {...defaultProps} />)
-      expect(screen.getByText(/form\.nameAndIcon/i)).toBeInTheDocument()
+      expect(screen.getByText(/form\.nameAndIcon/i))!.toBeInTheDocument()
     })
 
     it('should render name and icon section', () => {
       render(<BasicInfoSection {...defaultProps} />)
-      expect(screen.getByText(/form\.nameAndIcon/i)).toBeInTheDocument()
+      expect(screen.getByText(/form\.nameAndIcon/i))!.toBeInTheDocument()
     })
 
     it('should render description section', () => {
       render(<BasicInfoSection {...defaultProps} />)
-      expect(screen.getByText(/form\.desc/i)).toBeInTheDocument()
+      expect(screen.getByText(/form\.desc/i))!.toBeInTheDocument()
     })
 
     it('should render permissions section', () => {
       render(<BasicInfoSection {...defaultProps} />)
       // Use exact match to avoid matching "permissionsOnlyMe"
-      expect(screen.getByText('datasetSettings.form.permissions')).toBeInTheDocument()
+      // Use exact match to avoid matching "permissionsOnlyMe"
+      expect(screen.getByText('datasetSettings.form.permissions'))!.toBeInTheDocument()
     })
 
     it('should render name input with correct value', () => {
       render(<BasicInfoSection {...defaultProps} />)
       const nameInput = screen.getByDisplayValue('Test Dataset')
-      expect(nameInput).toBeInTheDocument()
+      expect(nameInput)!.toBeInTheDocument()
     })
 
     it('should render description textarea with correct value', () => {
       render(<BasicInfoSection {...defaultProps} />)
       const descriptionTextarea = screen.getByDisplayValue('Test description')
-      expect(descriptionTextarea).toBeInTheDocument()
+      expect(descriptionTextarea)!.toBeInTheDocument()
     })
 
     it('should render app icon with emoji', () => {
       const { container } = render(<BasicInfoSection {...defaultProps} />)
       // The icon section should be rendered (emoji may be in a span or SVG)
       const iconSection = container.querySelector('[class*="cursor-pointer"]')
-      expect(iconSection).toBeInTheDocument()
+      expect(iconSection)!.toBeInTheDocument()
     })
   })
 
@@ -197,7 +198,7 @@ describe('BasicInfoSection', () => {
       render(<BasicInfoSection {...defaultProps} currentDataset={datasetWithoutEmbedding} />)
 
       const nameInput = screen.getByDisplayValue('Test Dataset')
-      expect(nameInput).toBeDisabled()
+      expect(nameInput)!.toBeDisabled()
     })
 
     it('should enable name input when embedding is available', () => {
@@ -212,7 +213,7 @@ describe('BasicInfoSection', () => {
 
       // Find the name input by its structure - may be type=text or just input
       const nameInput = container.querySelector('input')
-      expect(nameInput).toHaveValue('')
+      expect(nameInput)!.toHaveValue('')
     })
   })
 
@@ -232,14 +233,14 @@ describe('BasicInfoSection', () => {
       render(<BasicInfoSection {...defaultProps} currentDataset={datasetWithoutEmbedding} />)
 
       const descriptionTextarea = screen.getByDisplayValue('Test description')
-      expect(descriptionTextarea).toBeDisabled()
+      expect(descriptionTextarea)!.toBeDisabled()
     })
 
     it('should render placeholder', () => {
       render(<BasicInfoSection {...defaultProps} description="" />)
 
       const descriptionTextarea = screen.getByPlaceholderText(/form\.descPlaceholder/i)
-      expect(descriptionTextarea).toBeInTheDocument()
+      expect(descriptionTextarea)!.toBeInTheDocument()
     })
   })
 
@@ -261,12 +262,45 @@ describe('BasicInfoSection', () => {
 
       // AppIconPicker renders a modal with emoji tabs and options via portal
       // We just verify the component renders without crashing when picker is shown
-      expect(baseElement).toBeInTheDocument()
+      // AppIconPicker renders a modal with emoji tabs and options via portal
+      // We just verify the component renders without crashing when picker is shown
+      expect(baseElement)!.toBeInTheDocument()
     })
 
     it('should not render AppIconPicker when showAppIconPicker is false', () => {
       const { container } = render(<BasicInfoSection {...defaultProps} showAppIconPicker={false} />)
 
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
+      // Check that AppIconPicker is not rendered
       // Check that AppIconPicker is not rendered
       expect(container.querySelector('[data-testid="app-icon-picker"]')).not.toBeInTheDocument()
     })
@@ -283,7 +317,7 @@ describe('BasicInfoSection', () => {
       // For image type, it renders an img element
       const img = screen.queryByRole('img')
       if (img) {
-        expect(img).toHaveAttribute('src', expect.stringContaining('icon.png'))
+        expect(img)!.toHaveAttribute('src', expect.stringContaining('icon.png'))
       }
     })
   })
@@ -292,13 +326,13 @@ describe('BasicInfoSection', () => {
     it('should render with correct permission value', () => {
       render(<BasicInfoSection {...defaultProps} permission={DatasetPermission.onlyMe} />)
 
-      expect(screen.getByText(/form\.permissionsOnlyMe/i)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsOnlyMe/i))!.toBeInTheDocument()
     })
 
     it('should render all team members permission', () => {
       render(<BasicInfoSection {...defaultProps} permission={DatasetPermission.allTeamMembers} />)
 
-      expect(screen.getByText(/form\.permissionsAllMember/i)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsAllMember/i))!.toBeInTheDocument()
     })
 
     it('should be disabled when embedding is not available', () => {
@@ -309,7 +343,7 @@ describe('BasicInfoSection', () => {
 
       // Check for disabled state via cursor-not-allowed class
       const disabledElement = container.querySelector('[class*="cursor-not-allowed"]')
-      expect(disabledElement).toBeInTheDocument()
+      expect(disabledElement)!.toBeInTheDocument()
     })
 
     it('should be disabled when user is dataset operator', () => {
@@ -318,7 +352,7 @@ describe('BasicInfoSection', () => {
       )
 
       const disabledElement = container.querySelector('[class*="cursor-not-allowed"]')
-      expect(disabledElement).toBeInTheDocument()
+      expect(disabledElement)!.toBeInTheDocument()
     })
 
     it('should call setPermission when permission changes', async () => {
@@ -330,7 +364,7 @@ describe('BasicInfoSection', () => {
 
       await waitFor(() => {
         const allMemberOptions = screen.getAllByText(/form\.permissionsAllMember/i)
-        fireEvent.click(allMemberOptions[0])
+        fireEvent.click(allMemberOptions[0]!)
       })
 
       expect(setPermission).toHaveBeenCalledWith(DatasetPermission.allTeamMembers)
@@ -349,7 +383,10 @@ describe('BasicInfoSection', () => {
       // For partial members permission, the member selector should be visible
       // The exact interaction depends on the MemberSelector component
       // We verify the component renders without crashing
-      expect(container).toBeInTheDocument()
+      // For partial members permission, the member selector should be visible
+      // The exact interaction depends on the MemberSelector component
+      // We verify the component renders without crashing
+      expect(container)!.toBeInTheDocument()
     })
   })
 
@@ -358,7 +395,8 @@ describe('BasicInfoSection', () => {
       render(<BasicInfoSection {...defaultProps} currentDataset={undefined} />)
 
       // Should still render but inputs might behave differently
-      expect(screen.getByText(/form\.nameAndIcon/i)).toBeInTheDocument()
+      // Should still render but inputs might behave differently
+      expect(screen.getByText(/form\.nameAndIcon/i))!.toBeInTheDocument()
     })
   })
 
@@ -366,31 +404,31 @@ describe('BasicInfoSection', () => {
     it('should update when name prop changes', () => {
       const { rerender } = render(<BasicInfoSection {...defaultProps} name="Initial Name" />)
 
-      expect(screen.getByDisplayValue('Initial Name')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Initial Name'))!.toBeInTheDocument()
 
       rerender(<BasicInfoSection {...defaultProps} name="Updated Name" />)
 
-      expect(screen.getByDisplayValue('Updated Name')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Updated Name'))!.toBeInTheDocument()
     })
 
     it('should update when description prop changes', () => {
       const { rerender } = render(<BasicInfoSection {...defaultProps} description="Initial Description" />)
 
-      expect(screen.getByDisplayValue('Initial Description')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Initial Description'))!.toBeInTheDocument()
 
       rerender(<BasicInfoSection {...defaultProps} description="Updated Description" />)
 
-      expect(screen.getByDisplayValue('Updated Description')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Updated Description'))!.toBeInTheDocument()
     })
 
     it('should update when permission prop changes', () => {
       const { rerender } = render(<BasicInfoSection {...defaultProps} permission={DatasetPermission.onlyMe} />)
 
-      expect(screen.getByText(/form\.permissionsOnlyMe/i)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsOnlyMe/i))!.toBeInTheDocument()
 
       rerender(<BasicInfoSection {...defaultProps} permission={DatasetPermission.allTeamMembers} />)
 
-      expect(screen.getByText(/form\.permissionsAllMember/i)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsAllMember/i))!.toBeInTheDocument()
     })
   })
 
@@ -406,7 +444,9 @@ describe('BasicInfoSection', () => {
 
       // For partial members, a member selector component should be rendered
       // We verify it renders without crashing
-      expect(container).toBeInTheDocument()
+      // For partial members, a member selector component should be rendered
+      // We verify it renders without crashing
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should handle empty member list', () => {
@@ -417,7 +457,7 @@ describe('BasicInfoSection', () => {
         />,
       )
 
-      expect(screen.getByText(/form\.permissionsOnlyMe/i)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsOnlyMe/i))!.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/datasets/settings/form/hooks/__tests__/use-form-state.spec.ts b/web/app/components/datasets/settings/form/hooks/__tests__/use-form-state.spec.ts
index 00462619aa..ece275c433 100644
--- a/web/app/components/datasets/settings/form/hooks/__tests__/use-form-state.spec.ts
+++ b/web/app/components/datasets/settings/form/hooks/__tests__/use-form-state.spec.ts
@@ -174,7 +174,7 @@ describe('useFormState', () => {
       const { result } = renderHook(() => useFormState())
 
       expect(result.current.memberList).toHaveLength(2)
-      expect(result.current.memberList[0].name).toBe('User 1')
+      expect(result.current.memberList[0]!.name).toBe('User 1')
     })
 
     it('should return currentDataset from context', () => {
diff --git a/web/app/components/datasets/settings/index-method/__tests__/index.spec.tsx b/web/app/components/datasets/settings/index-method/__tests__/index.spec.tsx
index 7441274155..5e81611fc4 100644
--- a/web/app/components/datasets/settings/index-method/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/settings/index-method/__tests__/index.spec.tsx
@@ -19,12 +19,12 @@ describe('IndexMethod', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<IndexMethod {...defaultProps} />)
-      expect(screen.getByText(/stepTwo\.qualified/)).toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.qualified/))!.toBeInTheDocument()
     })
 
     it('should render High Quality option', () => {
       render(<IndexMethod {...defaultProps} />)
-      expect(screen.getByText(/stepTwo\.qualified/)).toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.qualified/))!.toBeInTheDocument()
     })
 
     it('should render Economy option', () => {
@@ -34,17 +34,17 @@ describe('IndexMethod', () => {
 
     it('should render High Quality description', () => {
       render(<IndexMethod {...defaultProps} />)
-      expect(screen.getByText(/form\.indexMethodHighQualityTip/)).toBeInTheDocument()
+      expect(screen.getByText(/form\.indexMethodHighQualityTip/))!.toBeInTheDocument()
     })
 
     it('should render Economy description', () => {
       render(<IndexMethod {...defaultProps} />)
-      expect(screen.getByText(/form\.indexMethodEconomyTip/)).toBeInTheDocument()
+      expect(screen.getByText(/form\.indexMethodEconomyTip/))!.toBeInTheDocument()
     })
 
     it('should render recommended badge on High Quality', () => {
       render(<IndexMethod {...defaultProps} />)
-      expect(screen.getByText(/stepTwo\.recommend/)).toBeInTheDocument()
+      expect(screen.getByText(/stepTwo\.recommend/))!.toBeInTheDocument()
     })
   })
 
@@ -82,7 +82,7 @@ describe('IndexMethod', () => {
       // Find and click Economy option - use getAllByText and get the first one (title)
       const economyTitles = screen.getAllByText(/form\.indexMethodEconomy/)
       const economyTitle = economyTitles[0]
-      const card = economyTitle.closest('div')?.parentElement?.parentElement?.parentElement
+      const card = economyTitle!.closest('div')?.parentElement?.parentElement?.parentElement
       fireEvent.click(card!)
 
       expect(handleChange).toHaveBeenCalledWith(IndexingType.ECONOMICAL)
@@ -114,7 +114,7 @@ describe('IndexMethod', () => {
       // Try to click Economy option - use getAllByText and get the first one (title)
       const economyTitles = screen.getAllByText(/form\.indexMethodEconomy/)
       const economyTitle = economyTitles[0]
-      const card = economyTitle.closest('div')?.parentElement?.parentElement?.parentElement
+      const card = economyTitle!.closest('div')?.parentElement?.parentElement?.parentElement
       fireEvent.click(card!)
 
       // Should not call onChange because Economy is disabled when current is QUALIFIED
@@ -125,13 +125,13 @@ describe('IndexMethod', () => {
   describe('KeywordNumber', () => {
     it('should render KeywordNumber component inside Economy option', () => {
       render(<IndexMethod {...defaultProps} />)
-      expect(getKeywordSlider()).toBeInTheDocument()
+      expect(getKeywordSlider())!.toBeInTheDocument()
     })
 
     it('should pass keywordNumber to KeywordNumber component', () => {
       render(<IndexMethod {...defaultProps} keywordNumber={25} />)
       const input = screen.getByRole('textbox')
-      expect(input).toHaveValue('25')
+      expect(input)!.toHaveValue('25')
     })
 
     it('should call onKeywordNumberChange when KeywordNumber changes', () => {
@@ -160,13 +160,13 @@ describe('IndexMethod', () => {
     it('should show orange effect color for High Quality option', () => {
       const { container } = render(<IndexMethod {...defaultProps} />)
       const orangeEffect = container.querySelector('.bg-util-colors-orange-orange-500')
-      expect(orangeEffect).toBeInTheDocument()
+      expect(orangeEffect)!.toBeInTheDocument()
     })
 
     it('should show indigo effect color for Economy option', () => {
       const { container } = render(<IndexMethod {...defaultProps} />)
       const indigoEffect = container.querySelector('.bg-util-colors-indigo-indigo-600')
-      expect(indigoEffect).toBeInTheDocument()
+      expect(indigoEffect)!.toBeInTheDocument()
     })
   })
 
@@ -188,19 +188,20 @@ describe('IndexMethod', () => {
     it('should handle undefined currentValue', () => {
       render(<IndexMethod {...defaultProps} currentValue={undefined} />)
       // Should render without error
-      expect(screen.getByText(/stepTwo\.qualified/)).toBeInTheDocument()
+      // Should render without error
+      expect(screen.getByText(/stepTwo\.qualified/))!.toBeInTheDocument()
     })
 
     it('should handle minimum keywordNumber', () => {
       render(<IndexMethod {...defaultProps} keywordNumber={0} />)
       const input = screen.getByRole('textbox')
-      expect(input).toHaveValue('0')
+      expect(input)!.toHaveValue('0')
     })
 
     it('should handle max keywordNumber', () => {
       render(<IndexMethod {...defaultProps} keywordNumber={50} />)
       const input = screen.getByRole('textbox')
-      expect(input).toHaveValue('50')
+      expect(input)!.toHaveValue('50')
     })
   })
 })
diff --git a/web/app/components/datasets/settings/permission-selector/__tests__/index.spec.tsx b/web/app/components/datasets/settings/permission-selector/__tests__/index.spec.tsx
index b17b1c9b11..355946402b 100644
--- a/web/app/components/datasets/settings/permission-selector/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/settings/permission-selector/__tests__/index.spec.tsx
@@ -16,15 +16,15 @@ vi.mock('@/context/app-context', () => ({
 
 describe('PermissionSelector', () => {
   const mockMemberList: Member[] = [
-    { id: 'user-1', name: 'Current User', email: 'current@example.com', avatar: '', avatar_url: '', role: 'owner', last_login_at: '', created_at: '', status: 'active' },
-    { id: 'user-2', name: 'John Doe', email: 'john@example.com', avatar: '', avatar_url: '', role: 'admin', last_login_at: '', created_at: '', status: 'active' },
-    { id: 'user-3', name: 'Jane Smith', email: 'jane@example.com', avatar: '', avatar_url: '', role: 'editor', last_login_at: '', created_at: '', status: 'active' },
-    { id: 'user-4', name: 'Dataset Operator', email: 'operator@example.com', avatar: '', avatar_url: '', role: 'dataset_operator', last_login_at: '', created_at: '', status: 'active' },
+    { id: 'user-1', name: 'Current User', email: 'current@example.com', avatar: '', avatar_url: '', role: 'owner', last_login_at: '', created_at: '', status: 'active' }!,
+    { id: 'user-2', name: 'John Doe', email: 'john@example.com', avatar: '', avatar_url: '', role: 'admin', last_login_at: '', created_at: '', status: 'active' }!,
+    { id: 'user-3', name: 'Jane Smith', email: 'jane@example.com', avatar: '', avatar_url: '', role: 'editor', last_login_at: '', created_at: '', status: 'active' }!,
+    { id: 'user-4', name: 'Dataset Operator', email: 'operator@example.com', avatar: '', avatar_url: '', role: 'dataset_operator', last_login_at: '', created_at: '', status: 'active' }!,
   ]
 
   const defaultProps = {
     permission: DatasetPermission.onlyMe,
-    value: ['user-1'],
+    value: ['user-1'!],
     memberList: mockMemberList,
     onChange: vi.fn(),
     onMemberSelect: vi.fn(),
@@ -37,17 +37,17 @@ describe('PermissionSelector', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<PermissionSelector {...defaultProps} />)
-      expect(screen.getByText(/form\.permissionsOnlyMe/)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsOnlyMe/))!.toBeInTheDocument()
     })
 
     it('should render Only Me option when permission is onlyMe', () => {
       render(<PermissionSelector {...defaultProps} permission={DatasetPermission.onlyMe} />)
-      expect(screen.getByText(/form\.permissionsOnlyMe/)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsOnlyMe/))!.toBeInTheDocument()
     })
 
     it('should render All Team Members option when permission is allTeamMembers', () => {
       render(<PermissionSelector {...defaultProps} permission={DatasetPermission.allTeamMembers} />)
-      expect(screen.getByText(/form\.permissionsAllMember/)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsAllMember/))!.toBeInTheDocument()
     })
 
     it('should render selected member names when permission is partialMembers', () => {
@@ -59,7 +59,8 @@ describe('PermissionSelector', () => {
         />,
       )
       // Should show member names
-      expect(screen.getByTitle(/Current User/)).toBeInTheDocument()
+      // Should show member names
+      expect(screen.getByTitle(/Current User/))!.toBeInTheDocument()
     })
   })
 
@@ -97,7 +98,7 @@ describe('PermissionSelector', () => {
 
       await waitFor(() => {
         const onlyMeOptions = screen.getAllByText(/form\.permissionsOnlyMe/)
-        fireEvent.click(onlyMeOptions[0])
+        fireEvent.click(onlyMeOptions[0]!)
       })
 
       expect(handleChange).toHaveBeenCalledWith(DatasetPermission.onlyMe)
@@ -112,7 +113,7 @@ describe('PermissionSelector', () => {
 
       await waitFor(() => {
         const allMemberOptions = screen.getAllByText(/form\.permissionsAllMember/)
-        fireEvent.click(allMemberOptions[0])
+        fireEvent.click(allMemberOptions[0]!)
       })
 
       expect(handleChange).toHaveBeenCalledWith(DatasetPermission.allTeamMembers)
@@ -134,7 +135,7 @@ describe('PermissionSelector', () => {
 
       await waitFor(() => {
         const invitedOptions = screen.getAllByText(/form\.permissionsInvitedMembers/)
-        fireEvent.click(invitedOptions[0])
+        fireEvent.click(invitedOptions[0]!)
       })
 
       expect(handleChange).toHaveBeenCalledWith(DatasetPermission.partialMembers)
@@ -156,8 +157,9 @@ describe('PermissionSelector', () => {
 
       await waitFor(() => {
         // Should show member list
-        expect(screen.getByText('John Doe')).toBeInTheDocument()
-        expect(screen.getByText('Jane Smith')).toBeInTheDocument()
+        // Should show member list
+        expect(screen.getByText('John Doe'))!.toBeInTheDocument()
+        expect(screen.getByText('Jane Smith'))!.toBeInTheDocument()
       })
     })
 
@@ -222,7 +224,7 @@ describe('PermissionSelector', () => {
 
       // Type in search
       fireEvent.change(searchInput, { target: { value: 'John' } })
-      expect(searchInput).toHaveValue('John')
+      expect(searchInput)!.toHaveValue('John')
     })
 
     it('should render search input in partial members mode', async () => {
@@ -238,7 +240,7 @@ describe('PermissionSelector', () => {
 
       // Wait for dropdown to open and search input to be available
       const searchInput = await screen.findByRole('textbox')
-      expect(searchInput).toBeInTheDocument()
+      expect(searchInput)!.toBeInTheDocument()
     })
 
     it('should filter members after debounce completes', async () => {
@@ -261,7 +263,7 @@ describe('PermissionSelector', () => {
       // Wait for debounce (500ms) + buffer
       await waitFor(
         () => {
-          expect(screen.getByText('John Doe')).toBeInTheDocument()
+          expect(screen.getByText('John Doe'))!.toBeInTheDocument()
         },
         { timeout: 1000 },
       )
@@ -283,14 +285,14 @@ describe('PermissionSelector', () => {
 
       // Type in search
       fireEvent.change(searchInput, { target: { value: 'test' } })
-      expect(searchInput).toHaveValue('test')
+      expect(searchInput)!.toHaveValue('test')
 
       const clearButton = screen.getByTestId('input-clear')
       fireEvent.click(clearButton)
 
       // After clicking clear, input should be empty
       await waitFor(() => {
-        expect(searchInput).toHaveValue('')
+        expect(searchInput)!.toHaveValue('')
       })
     })
 
@@ -314,7 +316,7 @@ describe('PermissionSelector', () => {
       // Wait for debounce
       await waitFor(
         () => {
-          expect(screen.getByText('John Doe')).toBeInTheDocument()
+          expect(screen.getByText('John Doe'))!.toBeInTheDocument()
         },
         { timeout: 1000 },
       )
@@ -340,7 +342,7 @@ describe('PermissionSelector', () => {
       // Wait for debounce and no results message
       await waitFor(
         () => {
-          expect(screen.getByText(/form\.onSearchResults/)).toBeInTheDocument()
+          expect(screen.getByText(/form\.onSearchResults/))!.toBeInTheDocument()
         },
         { timeout: 1000 },
       )
@@ -365,7 +367,9 @@ describe('PermissionSelector', () => {
 
       // Current user (showMe) should remain visible based on name match
       // The component uses useMemo to check if userProfile.name.includes(searchKeywords)
-      expect(searchInput).toHaveValue('Current')
+      // Current user (showMe) should remain visible based on name match
+      // The component uses useMemo to check if userProfile.name.includes(searchKeywords)
+      expect(searchInput)!.toHaveValue('Current')
       // Current User label appears multiple times (trigger + member list)
       expect(screen.getAllByText('Current User').length).toBeGreaterThanOrEqual(1)
     })
@@ -388,7 +392,8 @@ describe('PermissionSelector', () => {
       fireEvent.change(searchInput, { target: { value: 'current@' } })
 
       // The component checks userProfile.email.includes(searchKeywords)
-      expect(searchInput).toHaveValue('current@')
+      // The component checks userProfile.email.includes(searchKeywords)
+      expect(searchInput)!.toHaveValue('current@')
       // Current User should remain visible based on email match
       expect(screen.getAllByText('Current User').length).toBeGreaterThanOrEqual(1)
     })
@@ -399,7 +404,7 @@ describe('PermissionSelector', () => {
       const { container } = render(<PermissionSelector {...defaultProps} disabled={true} />)
       // When disabled, the component has cursor-not-allowed! class (escaped in Tailwind)
       const triggerElement = container.querySelector('[class*="cursor-not-allowed"]')
-      expect(triggerElement).toBeInTheDocument()
+      expect(triggerElement)!.toBeInTheDocument()
     })
   })
 
@@ -414,7 +419,8 @@ describe('PermissionSelector', () => {
       )
 
       // Should display single avatar
-      expect(screen.getByTitle(/Current User/)).toBeInTheDocument()
+      // Should display single avatar
+      expect(screen.getByTitle(/Current User/))!.toBeInTheDocument()
     })
 
     it('should display two avatars when two or more members selected', () => {
@@ -427,7 +433,8 @@ describe('PermissionSelector', () => {
       )
 
       // Should display member names
-      expect(screen.getByTitle(/Current User, John Doe/)).toBeInTheDocument()
+      // Should display member names
+      expect(screen.getByTitle(/Current User, John Doe/))!.toBeInTheDocument()
     })
   })
 
@@ -440,18 +447,18 @@ describe('PermissionSelector', () => {
         />,
       )
 
-      expect(screen.getByText(/form\.permissionsOnlyMe/)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsOnlyMe/))!.toBeInTheDocument()
     })
 
     it('should handle member list with only current user', () => {
       render(
         <PermissionSelector
           {...defaultProps}
-          memberList={[mockMemberList[0]]}
+          memberList={[mockMemberList[0]!]}
         />,
       )
 
-      expect(screen.getByText(/form\.permissionsOnlyMe/)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsOnlyMe/))!.toBeInTheDocument()
     })
 
     it('should only show members with allowed roles', () => {
@@ -472,7 +479,8 @@ describe('PermissionSelector', () => {
       )
 
       // The component renders - the filtering logic is internal
-      expect(screen.getByTitle(/Current User/)).toBeInTheDocument()
+      // The component renders - the filtering logic is internal
+      expect(screen.getByTitle(/Current User/))!.toBeInTheDocument()
     })
   })
 
@@ -480,11 +488,11 @@ describe('PermissionSelector', () => {
     it('should update when permission prop changes', () => {
       const { rerender } = render(<PermissionSelector {...defaultProps} permission={DatasetPermission.onlyMe} />)
 
-      expect(screen.getByText(/form\.permissionsOnlyMe/)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsOnlyMe/))!.toBeInTheDocument()
 
       rerender(<PermissionSelector {...defaultProps} permission={DatasetPermission.allTeamMembers} />)
 
-      expect(screen.getByText(/form\.permissionsAllMember/)).toBeInTheDocument()
+      expect(screen.getByText(/form\.permissionsAllMember/))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/settings/permission-selector/index.tsx b/web/app/components/datasets/settings/permission-selector/index.tsx
index a7182d8f79..8c31799add 100644
--- a/web/app/components/datasets/settings/permission-selector/index.tsx
+++ b/web/app/components/datasets/settings/permission-selector/index.tsx
@@ -133,8 +133,8 @@ const PermissionSelector = ({
                     {
                       selectedMembers.length === 1 && (
                         <Avatar
-                          avatar={selectedMembers[0].avatar_url}
-                          name={selectedMembers[0].name}
+                          avatar={selectedMembers[0]!.avatar_url}
+                          name={selectedMembers[0]!.name}
                           size="xs"
                         />
                       )
@@ -143,14 +143,14 @@ const PermissionSelector = ({
                       selectedMembers.length >= 2 && (
                         <>
                           <Avatar
-                            avatar={selectedMembers[0].avatar_url}
-                            name={selectedMembers[0].name}
+                            avatar={selectedMembers[0]!.avatar_url}
+                            name={selectedMembers[0]!.name}
                             className="absolute top-0 left-0 z-0"
                             size="xxs"
                           />
                           <Avatar
-                            avatar={selectedMembers[1].avatar_url}
-                            name={selectedMembers[1].name}
+                            avatar={selectedMembers[1]!.avatar_url}
+                            name={selectedMembers[1]!.name}
                             className="absolute right-0 bottom-0 z-10"
                             size="xxs"
                           />
diff --git a/web/app/components/develop/code.tsx b/web/app/components/develop/code.tsx
index 59d6c94e5d..86d57c806d 100644
--- a/web/app/components/develop/code.tsx
+++ b/web/app/components/develop/code.tsx
@@ -226,7 +226,7 @@ function useTabGroupProps(availableLanguages: string[]) {
   const activeLanguage = [...(availableLanguages || [])].sort(
     (a, z) => preferredLanguages.indexOf(z) - preferredLanguages.indexOf(a),
   )[0]
-  const languageIndex = availableLanguages?.indexOf(activeLanguage) || 0
+  const languageIndex = availableLanguages?.indexOf(activeLanguage!) || 0
   const newSelectedIndex = languageIndex === -1 ? selectedIndex : languageIndex
   if (newSelectedIndex !== selectedIndex)
     setSelectedIndex(newSelectedIndex)
diff --git a/web/app/components/develop/hooks/use-doc-toc.ts b/web/app/components/develop/hooks/use-doc-toc.ts
index d42cb68b00..1eba8ca8e3 100644
--- a/web/app/components/develop/hooks/use-doc-toc.ts
+++ b/web/app/components/develop/hooks/use-doc-toc.ts
@@ -57,7 +57,7 @@ export const useDocToc = ({ appDetail, locale }: UseDocTocOptions) => {
       const tocItems = extractTocFromArticle()
       setToc(tocItems)
       if (tocItems.length > 0)
-        setActiveSection(getTargetId(tocItems[0].href))
+        setActiveSection(getTargetId(tocItems[0]!.href))
     }, 0)
     return () => clearTimeout(timer)
   }, [appDetail, locale])
diff --git a/web/app/components/develop/secret-key/__tests__/secret-key-button.spec.tsx b/web/app/components/develop/secret-key/__tests__/secret-key-button.spec.tsx
index e5134b995d..b4f5c139e0 100644
--- a/web/app/components/develop/secret-key/__tests__/secret-key-button.spec.tsx
+++ b/web/app/components/develop/secret-key/__tests__/secret-key-button.spec.tsx
@@ -19,18 +19,18 @@ describe('SecretKeyButton', () => {
   describe('rendering', () => {
     it('should render the button', () => {
       render(<SecretKeyButton />)
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
 
     it('should render the API key text', () => {
       render(<SecretKeyButton />)
-      expect(screen.getByText('appApi.apiKey')).toBeInTheDocument()
+      expect(screen.getByText('appApi.apiKey'))!.toBeInTheDocument()
     })
 
     it('should render the key icon', () => {
       const { container } = render(<SecretKeyButton />)
       const svg = container.querySelector('svg')
-      expect(svg).toBeInTheDocument()
+      expect(svg)!.toBeInTheDocument()
     })
 
     it('should not show modal initially', () => {
@@ -49,7 +49,7 @@ describe('SecretKeyButton', () => {
         await user.click(button)
       })
 
-      expect(screen.getByTestId('secret-key-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('secret-key-modal'))!.toBeInTheDocument()
     })
 
     it('should close modal when onClose is called', async () => {
@@ -61,7 +61,7 @@ describe('SecretKeyButton', () => {
         await user.click(button)
       })
 
-      expect(screen.getByTestId('secret-key-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('secret-key-modal'))!.toBeInTheDocument()
 
       const closeButton = screen.getByTestId('close-modal')
       await act(async () => {
@@ -80,7 +80,7 @@ describe('SecretKeyButton', () => {
       await act(async () => {
         await user.click(button)
       })
-      expect(screen.getByTestId('secret-key-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('secret-key-modal'))!.toBeInTheDocument()
 
       const closeButton = screen.getByTestId('close-modal')
       await act(async () => {
@@ -91,7 +91,7 @@ describe('SecretKeyButton', () => {
       await act(async () => {
         await user.click(button)
       })
-      expect(screen.getByTestId('secret-key-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('secret-key-modal'))!.toBeInTheDocument()
     })
   })
 
@@ -111,7 +111,7 @@ describe('SecretKeyButton', () => {
         await user.click(button)
       })
 
-      expect(screen.getByText('Modal for app-123')).toBeInTheDocument()
+      expect(screen.getByText('Modal for app-123'))!.toBeInTheDocument()
     })
 
     it('should handle undefined appId', async () => {
@@ -123,7 +123,7 @@ describe('SecretKeyButton', () => {
         await user.click(button)
       })
 
-      expect(screen.getByText('Modal for no-app')).toBeInTheDocument()
+      expect(screen.getByText('Modal for no-app'))!.toBeInTheDocument()
     })
 
     it('should apply custom textCls', () => {
@@ -145,19 +145,19 @@ describe('SecretKeyButton', () => {
     it('should have icon container with flex layout', () => {
       const { container } = render(<SecretKeyButton />)
       const iconContainer = container.querySelector('.flex.items-center.justify-center')
-      expect(iconContainer).toBeInTheDocument()
+      expect(iconContainer)!.toBeInTheDocument()
     })
 
     it('should have correct icon dimensions', () => {
       const { container } = render(<SecretKeyButton />)
       const iconContainer = container.querySelector('.h-3\\.5.w-3\\.5')
-      expect(iconContainer).toBeInTheDocument()
+      expect(iconContainer)!.toBeInTheDocument()
     })
 
     it('should have tertiary text color on icon', () => {
       const { container } = render(<SecretKeyButton />)
       const icon = container.querySelector('.text-text-tertiary')
-      expect(icon).toBeInTheDocument()
+      expect(icon)!.toBeInTheDocument()
     })
   })
 
@@ -193,7 +193,7 @@ describe('SecretKeyButton', () => {
         await user.click(button)
       })
 
-      expect(screen.getByTestId('secret-key-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('secret-key-modal'))!.toBeInTheDocument()
     })
 
     it('should pass onClose callback to modal', async () => {
@@ -218,7 +218,7 @@ describe('SecretKeyButton', () => {
     it('should have accessible button', () => {
       render(<SecretKeyButton />)
       const button = screen.getByRole('button')
-      expect(button).toBeInTheDocument()
+      expect(button)!.toBeInTheDocument()
     })
 
     it('should be keyboard accessible', async () => {
@@ -233,7 +233,7 @@ describe('SecretKeyButton', () => {
         await user.keyboard('{Enter}')
       })
 
-      expect(screen.getByTestId('secret-key-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('secret-key-modal'))!.toBeInTheDocument()
     })
   })
 
@@ -251,10 +251,10 @@ describe('SecretKeyButton', () => {
       expect(buttons).toHaveLength(2)
 
       await act(async () => {
-        await user.click(buttons[0])
+        await user.click(buttons[0]!)
       })
 
-      expect(screen.getByText('Modal for app-1')).toBeInTheDocument()
+      expect(screen.getByText('Modal for app-1'))!.toBeInTheDocument()
 
       const closeButton = screen.getByTestId('close-modal')
       await act(async () => {
@@ -262,10 +262,10 @@ describe('SecretKeyButton', () => {
       })
 
       await act(async () => {
-        await user.click(buttons[1])
+        await user.click(buttons[1]!)
       })
 
-      expect(screen.getByText('Modal for app-2')).toBeInTheDocument()
+      expect(screen.getByText('Modal for app-2'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/develop/tag.tsx b/web/app/components/develop/tag.tsx
index 3178046338..082d63a798 100644
--- a/web/app/components/develop/tag.tsx
+++ b/web/app/components/develop/tag.tsx
@@ -53,7 +53,7 @@ export function Tag({
 }: ITagProps) {
   return (
     <span
-      className={cn('font-mono text-[0.625rem] leading-6 font-semibold', variantStyles[variant], colorStyles[color][variant])}
+      className={cn('font-mono text-[0.625rem] leading-6 font-semibold', variantStyles[variant], colorStyles[color]![variant])}
     >
       {children}
     </span>
diff --git a/web/app/components/explore/create-app-modal/__tests__/index.spec.tsx b/web/app/components/explore/create-app-modal/__tests__/index.spec.tsx
index fd6877d421..5a14807478 100644
--- a/web/app/components/explore/create-app-modal/__tests__/index.spec.tsx
+++ b/web/app/components/explore/create-app-modal/__tests__/index.spec.tsx
@@ -106,24 +106,24 @@ describe('CreateAppModal', () => {
     it('should render create title and actions when creating', async () => {
       await setup({ appName: 'My App', isEditModal: false })
 
-      expect(screen.getByText('explore.appCustomize.title:{"name":"My App"}')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: /common\.operation\.create/ })).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: 'common.operation.cancel' })).toBeInTheDocument()
+      expect(screen.getByText('explore.appCustomize.title:{"name":"My App"}'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /common\.operation\.create/ }))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.cancel' }))!.toBeInTheDocument()
     })
 
     it('should render edit-only fields when editing a chat app', async () => {
       await setup({ isEditModal: true, appMode: AppModeEnum.CHAT, max_active_requests: 5 })
 
-      expect(screen.getByText('app.editAppTitle')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: /common\.operation\.save/ })).toBeInTheDocument()
-      expect(screen.getByRole('switch')).toBeInTheDocument()
+      expect(screen.getByText('app.editAppTitle'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /common\.operation\.save/ }))!.toBeInTheDocument()
+      expect(screen.getByRole('switch'))!.toBeInTheDocument()
       expect((screen.getByRole('spinbutton') as HTMLInputElement).value).toBe('5')
     })
 
     it.each([AppModeEnum.ADVANCED_CHAT, AppModeEnum.AGENT_CHAT])('should render answer icon switch when editing %s app', async (mode) => {
       await setup({ isEditModal: true, appMode: mode })
 
-      expect(screen.getByRole('switch')).toBeInTheDocument()
+      expect(screen.getByRole('switch'))!.toBeInTheDocument()
     })
 
     it('should not render answer icon switch when editing a non-chat app', async () => {
@@ -143,13 +143,13 @@ describe('CreateAppModal', () => {
     it('should disable confirm action when confirmDisabled is true', async () => {
       await setup({ confirmDisabled: true })
 
-      expect(screen.getByRole('button', { name: /common\.operation\.create/ })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /common\.operation\.create/ }))!.toBeDisabled()
     })
 
     it('should disable confirm action when appName is empty', async () => {
       await setup({ appName: '   ' })
 
-      expect(screen.getByRole('button', { name: /common\.operation\.create/ })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /common\.operation\.create/ }))!.toBeDisabled()
     })
   })
 
@@ -204,8 +204,8 @@ describe('CreateAppModal', () => {
 
       await setup({ isEditModal: false })
 
-      expect(screen.getByText('billing.apps.fullTip2')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: /common\.operation\.create/ })).toBeDisabled()
+      expect(screen.getByText('billing.apps.fullTip2'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /common\.operation\.create/ }))!.toBeDisabled()
     })
 
     it('should allow saving when apps quota is reached in edit mode', async () => {
@@ -217,7 +217,7 @@ describe('CreateAppModal', () => {
       await setup({ isEditModal: true })
 
       expect(screen.queryByText('billing.apps.fullTip2')).not.toBeInTheDocument()
-      expect(screen.getByRole('button', { name: /common\.operation\.save/ })).toBeEnabled()
+      expect(screen.getByRole('button', { name: /common\.operation\.save/ }))!.toBeEnabled()
     })
   })
 
@@ -314,7 +314,7 @@ describe('CreateAppModal', () => {
 
       fireEvent.click(getAppIconTrigger())
 
-      expect(screen.getByRole('button', { name: 'app.iconPicker.cancel' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'app.iconPicker.cancel' }))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByRole('button', { name: 'app.iconPicker.cancel' }))
 
@@ -347,7 +347,7 @@ describe('CreateAppModal', () => {
         })
 
         expect(onConfirm).toHaveBeenCalledTimes(1)
-        const payload = onConfirm.mock.calls[0][0]
+        const payload = onConfirm.mock.calls[0]![0]
         expect(payload).toMatchObject({
           icon_type: 'emoji',
           icon: '😀',
@@ -392,7 +392,7 @@ describe('CreateAppModal', () => {
         })
 
         expect(onConfirm).toHaveBeenCalledTimes(1)
-        const payload = onConfirm.mock.calls[0][0]
+        const payload = onConfirm.mock.calls[0]![0]
         expect(payload).toMatchObject({
           icon_type: 'emoji',
           icon: '🤖',
@@ -431,7 +431,7 @@ describe('CreateAppModal', () => {
       expect(onConfirm).toHaveBeenCalledTimes(1)
       expect(onHide).toHaveBeenCalledTimes(1)
 
-      const payload = onConfirm.mock.calls[0][0]
+      const payload = onConfirm.mock.calls[0]![0]
       expect(payload).toMatchObject({
         name: 'My App',
         icon_type: 'emoji',
@@ -453,7 +453,7 @@ describe('CreateAppModal', () => {
       })
 
       expect(onConfirm).toHaveBeenCalledTimes(1)
-      expect(onConfirm.mock.calls[0][0]).toMatchObject({ description: 'Updated description' })
+      expect(onConfirm.mock.calls[0]![0]).toMatchObject({ description: 'Updated description' })
     })
 
     it('should omit icon_background when submitting with image icon', async () => {
@@ -469,7 +469,7 @@ describe('CreateAppModal', () => {
         vi.advanceTimersByTime(300)
       })
 
-      const payload = onConfirm.mock.calls[0][0]
+      const payload = onConfirm.mock.calls[0]![0]
       expect(payload).toMatchObject({
         icon_type: 'image',
         icon: 'file-123',
@@ -493,7 +493,7 @@ describe('CreateAppModal', () => {
         vi.advanceTimersByTime(300)
       })
 
-      const payload = onConfirm.mock.calls[0][0]
+      const payload = onConfirm.mock.calls[0]![0]
       expect(payload).toMatchObject({
         use_icon_as_answer_icon: true,
         max_active_requests: 12,
@@ -508,7 +508,7 @@ describe('CreateAppModal', () => {
         vi.advanceTimersByTime(300)
       })
 
-      const payload = onConfirm.mock.calls[0][0]
+      const payload = onConfirm.mock.calls[0]![0]
       expect(payload.max_active_requests).toBeUndefined()
     })
 
@@ -521,7 +521,7 @@ describe('CreateAppModal', () => {
         vi.advanceTimersByTime(300)
       })
 
-      const payload = onConfirm.mock.calls[0][0]
+      const payload = onConfirm.mock.calls[0]![0]
       expect(payload.max_active_requests).toBeUndefined()
     })
 
diff --git a/web/app/components/explore/try-app/app-info/__tests__/use-get-requirements.spec.ts b/web/app/components/explore/try-app/app-info/__tests__/use-get-requirements.spec.ts
index c6c3353a57..076278b3ed 100644
--- a/web/app/components/explore/try-app/app-info/__tests__/use-get-requirements.spec.ts
+++ b/web/app/components/explore/try-app/app-info/__tests__/use-get-requirements.spec.ts
@@ -59,8 +59,8 @@ describe('useGetRequirements', () => {
       )
 
       expect(result.current.requirements).toHaveLength(1)
-      expect(result.current.requirements[0].name).toBe('openai')
-      expect(result.current.requirements[0].iconUrl).toBe('https://marketplace.api/plugins/langgenius/openai/icon')
+      expect(result.current.requirements[0]!.name).toBe('openai')
+      expect(result.current.requirements[0]!.iconUrl).toBe('https://marketplace.api/plugins/langgenius/openai/icon')
     })
 
     it('returns model provider for completion mode', () => {
@@ -84,7 +84,7 @@ describe('useGetRequirements', () => {
       )
 
       expect(result.current.requirements).toHaveLength(1)
-      expect(result.current.requirements[0].name).toBe('claude')
+      expect(result.current.requirements[0]!.name).toBe('claude')
     })
 
     it('returns model provider and tools for agent-chat mode', () => {
@@ -166,7 +166,7 @@ describe('useGetRequirements', () => {
       )
 
       expect(result.current.requirements).toHaveLength(1)
-      expect(result.current.requirements[0].name).toBe('openai')
+      expect(result.current.requirements[0]!.name).toBe('openai')
     })
   })
 
@@ -232,7 +232,7 @@ describe('useGetRequirements', () => {
       )
 
       expect(result.current.requirements).toHaveLength(1)
-      expect(result.current.requirements[0].name).toBe('claude-3-opus')
+      expect(result.current.requirements[0]!.name).toBe('claude-3-opus')
     })
 
     it('returns empty requirements when flow data has no nodes', () => {
@@ -373,7 +373,7 @@ describe('useGetRequirements', () => {
       )
 
       expect(result.current.requirements).toHaveLength(1)
-      expect(result.current.requirements[0].name).toBe('gpt-4')
+      expect(result.current.requirements[0]!.name).toBe('gpt-4')
     })
   })
 
@@ -398,7 +398,7 @@ describe('useGetRequirements', () => {
         useGetRequirements({ appDetail, appId: 'test-app-id' }),
       )
 
-      expect(result.current.requirements[0].iconUrl).toBe('https://marketplace.api/plugins/org/plugin/icon')
+      expect(result.current.requirements[0]!.iconUrl).toBe('https://marketplace.api/plugins/org/plugin/icon')
     })
 
     it('maps google model provider to gemini plugin icon URL', () => {
@@ -421,7 +421,7 @@ describe('useGetRequirements', () => {
         useGetRequirements({ appDetail, appId: 'test-app-id' }),
       )
 
-      expect(result.current.requirements[0].iconUrl).toBe('https://marketplace.api/plugins/langgenius/gemini/icon')
+      expect(result.current.requirements[0]!.iconUrl).toBe('https://marketplace.api/plugins/langgenius/gemini/icon')
     })
 
     it('maps special builtin tool providers to *_tool plugin icon URL', () => {
diff --git a/web/app/components/explore/try-app/app-info/use-get-requirements.ts b/web/app/components/explore/try-app/app-info/use-get-requirements.ts
index 6458c76037..3ad89eee7e 100644
--- a/web/app/components/explore/try-app/app-info/use-get-requirements.ts
+++ b/web/app/components/explore/try-app/app-info/use-get-requirements.ts
@@ -44,13 +44,13 @@ const parseProviderId = (providerId: string): ProviderInfo | null => {
   if (segments.length === 1) {
     return {
       organization: 'langgenius',
-      providerName: segments[0],
+      providerName: segments[0]!,
     }
   }
 
   return {
-    organization: segments[0],
-    providerName: segments[1],
+    organization: segments[0]!,
+    providerName: segments[1]!,
   }
 }
 
diff --git a/web/app/components/explore/try-app/preview/basic-app-preview.tsx b/web/app/components/explore/try-app/preview/basic-app-preview.tsx
index 6954546b2e..43fb00600f 100644
--- a/web/app/components/explore/try-app/preview/basic-app-preview.tsx
+++ b/web/app/components/explore/try-app/preview/basic-app-preview.tsx
@@ -238,7 +238,7 @@ const BasicAppPreview: FC<Props> = ({
         },
         enabled: !!(modelConfig.file_upload?.enabled || modelConfig.file_upload?.image?.enabled),
         allowed_file_types: modelConfig.file_upload?.allowed_file_types || [],
-        allowed_file_extensions: modelConfig.file_upload?.allowed_file_extensions || [...FILE_EXTS[SupportUploadFileTypes.image], ...FILE_EXTS[SupportUploadFileTypes.video]].map(ext => `.${ext}`),
+        allowed_file_extensions: modelConfig.file_upload?.allowed_file_extensions || [...(FILE_EXTS[SupportUploadFileTypes.image] ?? []), ...(FILE_EXTS[SupportUploadFileTypes.video] ?? [])].map(ext => `.${ext}`),
         allowed_file_upload_methods: modelConfig.file_upload?.allowed_file_upload_methods || modelConfig.file_upload?.image?.transfer_methods || ['local_file', 'remote_url'],
         number_limits: modelConfig.file_upload?.number_limits || modelConfig.file_upload?.image?.number_limits || 3,
         fileUploadConfig: {},
diff --git a/web/app/components/goto-anything/actions/__tests__/index.spec.ts b/web/app/components/goto-anything/actions/__tests__/index.spec.ts
index 12bdb192f2..ff7ab1e575 100644
--- a/web/app/components/goto-anything/actions/__tests__/index.spec.ts
+++ b/web/app/components/goto-anything/actions/__tests__/index.spec.ts
@@ -81,20 +81,20 @@ describe('createActions', () => {
     const actions = createActions(true, false) as Record<string, ActionItem>
 
     expect(actions).toHaveProperty('node')
-    expect(actions.node.title).toBe('Workflow Nodes')
+    expect(actions.node!.title).toBe('Workflow Nodes')
   })
 
   it('includes rag-pipeline nodes action on rag-pipeline pages', () => {
     const actions = createActions(false, true) as Record<string, ActionItem>
 
     expect(actions).toHaveProperty('node')
-    expect(actions.node.title).toBe('RAG Pipeline Nodes')
+    expect(actions.node!.title).toBe('RAG Pipeline Nodes')
   })
 
   it('rag-pipeline page takes priority over workflow page', () => {
     const actions = createActions(true, true) as Record<string, ActionItem>
 
-    expect(actions.node.title).toBe('RAG Pipeline Nodes')
+    expect(actions.node!.title).toBe('RAG Pipeline Nodes')
   })
 })
 
@@ -180,7 +180,7 @@ describe('searchAnything', () => {
 
     const results = await searchAnything('en', 'my query', undefined, dynamicActions)
 
-    expect(dynamicActions.slash.search).not.toHaveBeenCalled()
+    expect(dynamicActions.slash!.search).not.toHaveBeenCalled()
     expect(results).toHaveLength(2)
     expect(results).toEqual(expect.arrayContaining([
       expect.objectContaining({ id: 'a1' }),
@@ -206,7 +206,7 @@ describe('searchAnything', () => {
     const results = await searchAnything('en', 'query', undefined, dynamicActions)
 
     expect(results).toHaveLength(1)
-    expect(results[0].id).toBe('k1')
+    expect(results[0]!.id).toBe('k1')
     expect(warnSpy).toHaveBeenCalled()
     warnSpy.mockRestore()
   })
diff --git a/web/app/components/goto-anything/actions/__tests__/knowledge.spec.ts b/web/app/components/goto-anything/actions/__tests__/knowledge.spec.ts
index 55592cd487..2124eccd81 100644
--- a/web/app/components/goto-anything/actions/__tests__/knowledge.spec.ts
+++ b/web/app/components/goto-anything/actions/__tests__/knowledge.spec.ts
@@ -59,7 +59,7 @@ describe('knowledgeAction', () => {
 
     const results = await knowledgeAction.search('@knowledge', '', 'en')
 
-    expect(results[0].path).toBe('/datasets/ds-ext/hitTesting')
+    expect(results[0]!.path).toBe('/datasets/ds-ext/hitTesting')
   })
 
   it('generates correct path for non-external provider', async () => {
@@ -76,7 +76,7 @@ describe('knowledgeAction', () => {
 
     const results = await knowledgeAction.search('@knowledge', '', 'en')
 
-    expect(results[0].path).toBe('/datasets/ds-2/documents')
+    expect(results[0]!.path).toBe('/datasets/ds-2/documents')
   })
 
   it('returns empty array on API failure', async () => {
diff --git a/web/app/components/goto-anything/actions/__tests__/recent-store.spec.ts b/web/app/components/goto-anything/actions/__tests__/recent-store.spec.ts
index d2fb346286..da1dc86124 100644
--- a/web/app/components/goto-anything/actions/__tests__/recent-store.spec.ts
+++ b/web/app/components/goto-anything/actions/__tests__/recent-store.spec.ts
@@ -51,7 +51,7 @@ describe('recent-store', () => {
 
       const stored = getRecentItems()
       expect(stored.map(i => i.id)).toEqual(['a', 'b'])
-      expect(stored[0].title).toBe('A updated')
+      expect(stored[0]!.title).toBe('A updated')
     })
 
     it('caps the list at 8 items, evicting the oldest', () => {
@@ -60,8 +60,8 @@ describe('recent-store', () => {
 
       const stored = getRecentItems()
       expect(stored).toHaveLength(8)
-      expect(stored[0].id).toBe('item-9')
-      expect(stored[7].id).toBe('item-2')
+      expect(stored[0]!.id).toBe('item-9')
+      expect(stored[7]!.id).toBe('item-2')
     })
 
     it('silently swallows storage errors', () => {
diff --git a/web/app/components/goto-anything/actions/commands/__tests__/direct-commands.spec.ts b/web/app/components/goto-anything/actions/commands/__tests__/direct-commands.spec.ts
index 88bd8b1045..f14098e970 100644
--- a/web/app/components/goto-anything/actions/commands/__tests__/direct-commands.spec.ts
+++ b/web/app/components/goto-anything/actions/commands/__tests__/direct-commands.spec.ts
@@ -70,7 +70,7 @@ describe('docsCommand', () => {
 
     const results = await docsCommand.search('', 'en')
 
-    expect(results[0].description).toBe('Open help documentation')
+    expect(results[0]!.description).toBe('Open help documentation')
     mockT.mockImplementation((key: string) => key)
   })
 
@@ -82,8 +82,8 @@ describe('docsCommand', () => {
   it('registered handler opens doc URL with correct locale', async () => {
     docsCommand.register?.({} as Record<string, never>)
     const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
-    const handlers = vi.mocked(registerCommands).mock.calls[0][0]
-    await handlers['navigation.doc']()
+    const handlers = vi.mocked(registerCommands).mock.calls[0]![0]
+    await handlers['navigation.doc']!()
 
     expect(openSpy).toHaveBeenCalledWith('https://docs.dify.ai/en', '_blank', 'noopener,noreferrer')
     openSpy.mockRestore()
@@ -183,7 +183,7 @@ describe('communityCommand', () => {
 
     const results = await communityCommand.search('', 'en')
 
-    expect(results[0].description).toBe('Open Discord community')
+    expect(results[0]!.description).toBe('Open Discord community')
     mockT.mockImplementation((key: string) => key)
   })
 
@@ -195,8 +195,8 @@ describe('communityCommand', () => {
   it('registered handler opens URL from args', async () => {
     communityCommand.register?.({} as Record<string, never>)
     const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
-    const handlers = vi.mocked(registerCommands).mock.calls[0][0]
-    await handlers['navigation.community']({ url: 'https://custom-url.com' })
+    const handlers = vi.mocked(registerCommands).mock.calls[0]![0]
+    await handlers['navigation.community']!({ url: 'https://custom-url.com' })
 
     expect(openSpy).toHaveBeenCalledWith('https://custom-url.com', '_blank', 'noopener,noreferrer')
     openSpy.mockRestore()
@@ -205,8 +205,8 @@ describe('communityCommand', () => {
   it('registered handler falls back to default URL when no args', async () => {
     communityCommand.register?.({} as Record<string, never>)
     const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
-    const handlers = vi.mocked(registerCommands).mock.calls[0][0]
-    await handlers['navigation.community']()
+    const handlers = vi.mocked(registerCommands).mock.calls[0]![0]
+    await handlers['navigation.community']!()
 
     expect(openSpy).toHaveBeenCalledWith('https://discord.gg/5AEfbxcd9k', '_blank', 'noopener,noreferrer')
     openSpy.mockRestore()
@@ -260,7 +260,7 @@ describe('forumCommand', () => {
 
     const results = await forumCommand.search('', 'en')
 
-    expect(results[0].description).toBe('Open community feedback discussions')
+    expect(results[0]!.description).toBe('Open community feedback discussions')
     mockT.mockImplementation((key: string) => key)
   })
 
@@ -272,8 +272,8 @@ describe('forumCommand', () => {
   it('registered handler opens URL from args', async () => {
     forumCommand.register?.({} as Record<string, never>)
     const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
-    const handlers = vi.mocked(registerCommands).mock.calls[0][0]
-    await handlers['navigation.forum']({ url: 'https://custom-forum.com' })
+    const handlers = vi.mocked(registerCommands).mock.calls[0]![0]
+    await handlers['navigation.forum']!({ url: 'https://custom-forum.com' })
 
     expect(openSpy).toHaveBeenCalledWith('https://custom-forum.com', '_blank', 'noopener,noreferrer')
     openSpy.mockRestore()
@@ -282,8 +282,8 @@ describe('forumCommand', () => {
   it('registered handler falls back to default URL when no args', async () => {
     forumCommand.register?.({} as Record<string, never>)
     const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
-    const handlers = vi.mocked(registerCommands).mock.calls[0][0]
-    await handlers['navigation.forum']()
+    const handlers = vi.mocked(registerCommands).mock.calls[0]![0]
+    await handlers['navigation.forum']!()
 
     expect(openSpy).toHaveBeenCalledWith('https://forum.dify.ai', '_blank', 'noopener,noreferrer')
     openSpy.mockRestore()
diff --git a/web/app/components/goto-anything/actions/commands/__tests__/go.spec.tsx b/web/app/components/goto-anything/actions/commands/__tests__/go.spec.tsx
index 719eddf77b..82cdfa330c 100644
--- a/web/app/components/goto-anything/actions/commands/__tests__/go.spec.tsx
+++ b/web/app/components/goto-anything/actions/commands/__tests__/go.spec.tsx
@@ -40,15 +40,15 @@ describe('goCommand', () => {
       const results = await goCommand.search('plugins', 'en')
 
       expect(results).toHaveLength(1)
-      expect(results[0].id).toBe('go-plugins')
+      expect(results[0]!.id).toBe('go-plugins')
     })
 
     it('filters by label match (case-insensitive)', async () => {
       const results = await goCommand.search('Knowledge', 'en')
 
       expect(results).toHaveLength(1)
-      expect(results[0].id).toBe('go-datasets')
-      expect(results[0].title).toBe('Knowledge')
+      expect(results[0]!.id).toBe('go-datasets')
+      expect(results[0]!.title).toBe('Knowledge')
     })
 
     it('returns command results with navigation.go data', async () => {
@@ -85,9 +85,9 @@ describe('goCommand', () => {
     it('registered handler navigates to the provided path', async () => {
       Object.defineProperty(window, 'location', { value: { href: '' }, writable: true })
       goCommand.register?.({} as Record<string, never>)
-      const handlers = vi.mocked(registerCommands).mock.calls[0][0]
+      const handlers = vi.mocked(registerCommands).mock.calls[0]![0]
 
-      await handlers['navigation.go']({ path: '/datasets' })
+      await handlers['navigation.go']!({ path: '/datasets' })
 
       expect(window.location.href).toBe('/datasets')
     })
@@ -95,10 +95,10 @@ describe('goCommand', () => {
     it('registered handler does nothing when path is missing', async () => {
       Object.defineProperty(window, 'location', { value: { href: '/current' }, writable: true })
       goCommand.register?.({} as Record<string, never>)
-      const handlers = vi.mocked(registerCommands).mock.calls[0][0]
+      const handlers = vi.mocked(registerCommands).mock.calls[0]![0]
 
-      await handlers['navigation.go']()
-      await handlers['navigation.go']({})
+      await handlers['navigation.go']!()
+      await handlers['navigation.go']!({})
 
       expect(window.location.href).toBe('/current')
     })
diff --git a/web/app/components/goto-anything/actions/commands/__tests__/language.spec.ts b/web/app/components/goto-anything/actions/commands/__tests__/language.spec.ts
index 54aa28d24a..da6ede6a3a 100644
--- a/web/app/components/goto-anything/actions/commands/__tests__/language.spec.ts
+++ b/web/app/components/goto-anything/actions/commands/__tests__/language.spec.ts
@@ -42,14 +42,14 @@ describe('languageCommand', () => {
       const results = await languageCommand.search('english', 'en')
 
       expect(results).toHaveLength(1)
-      expect(results[0].id).toBe('lang-en-US')
+      expect(results[0]!.id).toBe('lang-en-US')
     })
 
     it('filters languages by value query', async () => {
       const results = await languageCommand.search('zh', 'en')
 
       expect(results).toHaveLength(1)
-      expect(results[0].id).toBe('lang-zh-Hans')
+      expect(results[0]!.id).toBe('lang-zh-Hans')
     })
 
     it('returns command data with i18n.set command', async () => {
diff --git a/web/app/components/goto-anything/actions/commands/__tests__/registry.spec.ts b/web/app/components/goto-anything/actions/commands/__tests__/registry.spec.ts
index 2a13ffd1ea..d2623be434 100644
--- a/web/app/components/goto-anything/actions/commands/__tests__/registry.spec.ts
+++ b/web/app/components/goto-anything/actions/commands/__tests__/registry.spec.ts
@@ -202,7 +202,7 @@ describe('SlashCommandRegistry', () => {
       const results = await registry.search('/hem')
 
       expect(results).toHaveLength(1)
-      expect(results[0].title).toBe('/theme')
+      expect(results[0]!.title).toBe('/theme')
     })
 
     it('fuzzy search also matches aliases', async () => {
@@ -236,7 +236,7 @@ describe('SlashCommandRegistry', () => {
 
       const results = await registry.search('/')
       expect(results).toHaveLength(1)
-      expect(results[0].title).toBe('/docs')
+      expect(results[0]!.title).toBe('/docs')
     })
 
     it('skips unavailable handler in exact match', async () => {
diff --git a/web/app/components/goto-anything/actions/commands/__tests__/theme.spec.ts b/web/app/components/goto-anything/actions/commands/__tests__/theme.spec.ts
index 3dd45aad11..4a79da5518 100644
--- a/web/app/components/goto-anything/actions/commands/__tests__/theme.spec.ts
+++ b/web/app/components/goto-anything/actions/commands/__tests__/theme.spec.ts
@@ -41,7 +41,7 @@ describe('themeCommand', () => {
       const results = await themeCommand.search('dark', 'en')
 
       expect(results).toHaveLength(1)
-      expect(results[0].id).toBe('dark')
+      expect(results[0]!.id).toBe('dark')
     })
   })
 
diff --git a/web/app/components/goto-anything/command-selector.tsx b/web/app/components/goto-anything/command-selector.tsx
index 96385abd0a..93430eafc4 100644
--- a/web/app/components/goto-anything/command-selector.tsx
+++ b/web/app/components/goto-anything/command-selector.tsx
@@ -64,7 +64,7 @@ const CommandSelector: FC<Props> = ({ actions, onCommandSelect, searchFilter, co
     if (allItems.length > 0 && onCommandValueChange) {
       const currentValueExists = allItems.some(item => item.shortcut === commandValue)
       if (!currentValueExists)
-        onCommandValueChange(allItems[0].shortcut)
+        onCommandValueChange(allItems[0]!.shortcut)
     }
   }, [searchFilter, allItems.length])
 
diff --git a/web/app/components/goto-anything/hooks/__tests__/use-goto-anything-results.spec.ts b/web/app/components/goto-anything/hooks/__tests__/use-goto-anything-results.spec.ts
index b1b543d35a..e5393a05a9 100644
--- a/web/app/components/goto-anything/hooks/__tests__/use-goto-anything-results.spec.ts
+++ b/web/app/components/goto-anything/hooks/__tests__/use-goto-anything-results.spec.ts
@@ -111,8 +111,8 @@ describe('useGotoAnythingResults', () => {
       const { result } = renderHook(() => useGotoAnythingResults(createMockOptions()))
 
       expect(result.current.dedupedResults).toHaveLength(2)
-      expect(result.current.dedupedResults[0].id).toBe('1')
-      expect(result.current.dedupedResults[1].id).toBe('2')
+      expect(result.current.dedupedResults[0]!.id).toBe('1')
+      expect(result.current.dedupedResults[1]!.id).toBe('2')
     })
 
     it('should keep first occurrence when duplicates exist', () => {
@@ -129,7 +129,7 @@ describe('useGotoAnythingResults', () => {
       const { result } = renderHook(() => useGotoAnythingResults(createMockOptions()))
 
       expect(result.current.dedupedResults).toHaveLength(1)
-      expect(result.current.dedupedResults[0].title).toBe('First')
+      expect(result.current.dedupedResults[0]!.title).toBe('First')
     })
 
     it('should handle different types with same id', () => {
diff --git a/web/app/components/goto-anything/hooks/use-goto-anything-results.ts b/web/app/components/goto-anything/hooks/use-goto-anything-results.ts
index 36e8397b6f..2f9174fc53 100644
--- a/web/app/components/goto-anything/hooks/use-goto-anything-results.ts
+++ b/web/app/components/goto-anything/hooks/use-goto-anything-results.ts
@@ -110,7 +110,7 @@ export const useGotoAnythingResults = (
     if (!acc[result.type])
       acc[result.type] = []
 
-    acc[result.type].push(result)
+    acc[result.type]!.push(result)
     return acc
   }, {} as Record<string, SearchResult[]>), [dedupedResults])
 
@@ -125,7 +125,7 @@ export const useGotoAnythingResults = (
     const currentValueExists = dedupedResults.some(result => `${result.type}-${result.id}` === cmdVal)
 
     if (!currentValueExists)
-      setCmdVal(`${dedupedResults[0].type}-${dedupedResults[0].id}`)
+      setCmdVal(`${dedupedResults[0]!.type}-${dedupedResults[0]!.id}`)
   }, [isCommandsMode, dedupedResults, cmdVal, setCmdVal])
 
   return {
diff --git a/web/app/components/goto-anything/index.tsx b/web/app/components/goto-anything/index.tsx
index 829a95f7e7..f3bf40f62a 100644
--- a/web/app/components/goto-anything/index.tsx
+++ b/web/app/components/goto-anything/index.tsx
@@ -111,7 +111,7 @@ const GotoAnything: FC<Props> = ({
       // Check if it's a complete slash command
       if (query.startsWith('/')) {
         const commandName = query.substring(1).split(' ')[0]
-        const handler = slashCommandRegistry.findCommand(commandName)
+        const handler = slashCommandRegistry.findCommand(commandName!)
 
         // If it's a direct mode command, execute immediately
         const isAvailable = handler?.isAvailable?.() ?? true
diff --git a/web/app/components/header/account-dropdown/__tests__/compliance.spec.tsx b/web/app/components/header/account-dropdown/__tests__/compliance.spec.tsx
index 8165434b3a..15439b157f 100644
--- a/web/app/components/header/account-dropdown/__tests__/compliance.spec.tsx
+++ b/web/app/components/header/account-dropdown/__tests__/compliance.spec.tsx
@@ -99,7 +99,8 @@ describe('Compliance', () => {
       renderCompliance()
 
       // Assert
-      expect(screen.getByText('common.userProfile.compliance')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('common.userProfile.compliance'))!.toBeInTheDocument()
     })
 
     it('should show SOC2, ISO, GDPR items when opened', () => {
@@ -107,10 +108,11 @@ describe('Compliance', () => {
       openMenuAndRender()
 
       // Assert
-      expect(screen.getByText('common.compliance.soc2Type1')).toBeInTheDocument()
-      expect(screen.getByText('common.compliance.soc2Type2')).toBeInTheDocument()
-      expect(screen.getByText('common.compliance.iso27001')).toBeInTheDocument()
-      expect(screen.getByText('common.compliance.gdpr')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('common.compliance.soc2Type1'))!.toBeInTheDocument()
+      expect(screen.getByText('common.compliance.soc2Type2'))!.toBeInTheDocument()
+      expect(screen.getByText('common.compliance.iso27001'))!.toBeInTheDocument()
+      expect(screen.getByText('common.compliance.gdpr'))!.toBeInTheDocument()
     })
   })
 
@@ -158,7 +160,7 @@ describe('Compliance', () => {
       // Act
       openMenuAndRender()
       const downloadButtons = screen.getAllByText('common.operation.download')
-      fireEvent.click(downloadButtons[0])
+      fireEvent.click(downloadButtons[0]!)
 
       // Assert
       await waitFor(() => {
@@ -183,7 +185,7 @@ describe('Compliance', () => {
       // Act
       openMenuAndRender()
       const downloadButtons = screen.getAllByText('common.operation.download')
-      fireEvent.click(downloadButtons[0])
+      fireEvent.click(downloadButtons[0]!)
 
       // Assert
       await waitFor(() => {
@@ -198,7 +200,7 @@ describe('Compliance', () => {
       // Act
       openMenuAndRender()
       const upgradeBadges = screen.getAllByText('billing.upgradeBtn.encourageShort')
-      fireEvent.click(upgradeBadges[0])
+      fireEvent.click(upgradeBadges[0]!)
 
       // Assert
       expect(mockSetShowPricingModal).toHaveBeenCalled()
@@ -218,7 +220,7 @@ describe('Compliance', () => {
       openMenuAndRender()
       // SOC2 Type II is restricted for professional
       const upgradeBadges = screen.getAllByText('billing.upgradeBtn.encourageShort')
-      fireEvent.click(upgradeBadges[0])
+      fireEvent.click(upgradeBadges[0]!)
 
       // Assert
       expect(mockSetShowAccountSettingModal).toHaveBeenCalledWith({
@@ -251,7 +253,7 @@ describe('Compliance', () => {
       await waitFor(() => {
         const busyButton = menuItem!.querySelector('button[aria-busy="true"]')
         expect(busyButton).not.toBeNull()
-        expect(busyButton).toBeDisabled()
+        expect(busyButton)!.toBeDisabled()
         expect(busyButton!.querySelector('.animate-spin')).not.toBeNull()
       }, { timeout: 10000 })
 
@@ -286,7 +288,7 @@ describe('Compliance', () => {
       await waitFor(() => {
         const busyButton = menuItem!.querySelector('button[aria-busy="true"]')
         expect(busyButton).not.toBeNull()
-        expect(busyButton).toBeDisabled()
+        expect(busyButton)!.toBeDisabled()
         expect(getDocDownloadUrl).toHaveBeenCalledTimes(1)
       }, { timeout: 10000 })
 
diff --git a/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx b/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
index 338096a9e1..e1d5216555 100644
--- a/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
@@ -115,11 +115,11 @@ describe('WorkplaceSelector', () => {
     it('should render current workspace and available workspace options', () => {
       renderComponent()
 
-      expect(screen.getByTestId('workplace-selector-trigger')).toHaveTextContent('Workspace 1')
-      expect(screen.getByTestId('workspace-option-1')).toBeInTheDocument()
-      expect(screen.getByTestId('workspace-option-2')).toBeInTheDocument()
-      expect(screen.getByTestId('workspace-option-1')).toHaveTextContent('Workspace 1')
-      expect(screen.getByTestId('workspace-option-2')).toHaveTextContent('Workspace 2')
+      expect(screen.getByTestId('workplace-selector-trigger'))!.toHaveTextContent('Workspace 1')
+      expect(screen.getByTestId('workspace-option-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('workspace-option-2'))!.toBeInTheDocument()
+      expect(screen.getByTestId('workspace-option-1'))!.toHaveTextContent('Workspace 1')
+      expect(screen.getByTestId('workspace-option-2'))!.toHaveTextContent('Workspace 2')
     })
   })
 
@@ -127,7 +127,7 @@ describe('WorkplaceSelector', () => {
     it('should switch workspace successfully', async () => {
       vi.mocked(switchWorkspace).mockResolvedValue({
         result: 'success',
-        new_tenant: mockWorkspaces[1],
+        new_tenant: mockWorkspaces[1]!,
       })
 
       renderComponent()
diff --git a/web/app/components/header/account-setting/__tests__/index.spec.tsx b/web/app/components/header/account-setting/__tests__/index.spec.tsx
index d4e093bd30..d37b0bbcf2 100644
--- a/web/app/components/header/account-setting/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/__tests__/index.spec.tsx
@@ -200,13 +200,14 @@ describe('AccountSetting', () => {
       renderAccountSetting()
 
       // Assert
-      expect(screen.getByText('common.userProfile.settings')).toBeInTheDocument()
-      expect(screen.getByText('common.settings.provider')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('common.userProfile.settings'))!.toBeInTheDocument()
+      expect(screen.getByText('common.settings.provider'))!.toBeInTheDocument()
       expect(screen.getAllByText('common.settings.members').length).toBeGreaterThan(0)
-      expect(screen.getByText('common.settings.billing')).toBeInTheDocument()
-      expect(screen.getByText('common.settings.dataSource')).toBeInTheDocument()
-      expect(screen.getByText('common.settings.apiBasedExtension')).toBeInTheDocument()
-      expect(screen.getByText('custom.custom')).toBeInTheDocument()
+      expect(screen.getByText('common.settings.billing'))!.toBeInTheDocument()
+      expect(screen.getByText('common.settings.dataSource'))!.toBeInTheDocument()
+      expect(screen.getByText('common.settings.apiBasedExtension'))!.toBeInTheDocument()
+      expect(screen.getByText('custom.custom'))!.toBeInTheDocument()
       expect(screen.getAllByText('common.settings.language').length).toBeGreaterThan(0)
     })
 
@@ -228,6 +229,68 @@ describe('AccountSetting', () => {
       // Act
       renderAccountSetting()
 
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
+      // Assert
+      // On mobile, the labels should not be rendered as per the implementation
       // Assert
       // On mobile, the labels should not be rendered as per the implementation
       expect(screen.queryByText('common.settings.provider')).not.toBeInTheDocument()
@@ -243,10 +306,41 @@ describe('AccountSetting', () => {
       // Act
       renderAccountSetting()
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByText('common.settings.provider')).not.toBeInTheDocument()
       expect(screen.queryByText('common.settings.members')).not.toBeInTheDocument()
-      expect(screen.getByText('common.settings.language')).toBeInTheDocument()
+      expect(screen.getByText('common.settings.language'))!.toBeInTheDocument()
     })
 
     it('should hide billing and custom tabs when disabled', () => {
@@ -260,6 +354,37 @@ describe('AccountSetting', () => {
       // Act
       renderAccountSetting()
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByText('common.settings.billing')).not.toBeInTheDocument()
       expect(screen.queryByText('custom.custom')).not.toBeInTheDocument()
@@ -277,7 +402,8 @@ describe('AccountSetting', () => {
       // Assert
       expect(mockOnTabChange).toHaveBeenCalledWith(ACCOUNT_SETTING_TAB.PROVIDER)
       // Check for content from ModelProviderPage
-      expect(screen.getByText('common.modelProvider.models')).toBeInTheDocument()
+      // Check for content from ModelProviderPage
+      expect(screen.getByText('common.modelProvider.models'))!.toBeInTheDocument()
     })
 
     it('should navigate through various tabs and show correct details', () => {
@@ -304,11 +430,11 @@ describe('AccountSetting', () => {
       expect(screen.getAllByText('custom.custom').length).toBeGreaterThan(1)
 
       // Language
-      fireEvent.click(screen.getAllByText('common.settings.language')[0])
+      fireEvent.click(screen.getAllByText('common.settings.language')[0]!)
       expect(screen.getAllByText('common.settings.language').length).toBeGreaterThan(1)
 
       // Members
-      fireEvent.click(screen.getAllByText('common.settings.members')[0])
+      fireEvent.click(screen.getAllByText('common.settings.members')[0]!)
       expect(screen.getAllByText('common.settings.members').length).toBeGreaterThan(1)
     })
   })
@@ -344,8 +470,9 @@ describe('AccountSetting', () => {
       fireEvent.change(input, { target: { value: 'test-search' } })
 
       // Assert
-      expect(input).toHaveValue('test-search')
-      expect(screen.getByText('common.modelProvider.models')).toBeInTheDocument()
+      // Assert
+      expect(input)!.toHaveValue('test-search')
+      expect(screen.getByText('common.modelProvider.models'))!.toBeInTheDocument()
     })
 
     it('should handle scroll event in panel', () => {
@@ -354,11 +481,12 @@ describe('AccountSetting', () => {
       const scrollContainer = screen.getByRole('dialog').querySelector('.overscroll-contain')
 
       // Assert
-      expect(scrollContainer).toBeInTheDocument()
+      // Assert
+      expect(scrollContainer)!.toBeInTheDocument()
       if (scrollContainer) {
         // Scroll down
         fireEvent.scroll(scrollContainer, { target: { scrollTop: 100 } })
-        expect(scrollContainer).toHaveClass('overscroll-contain')
+        expect(scrollContainer)!.toHaveClass('overscroll-contain')
 
         // Scroll back up
         fireEvent.scroll(scrollContainer, { target: { scrollTop: 0 } })
diff --git a/web/app/components/header/account-setting/api-based-extension-page/__tests__/index.spec.tsx b/web/app/components/header/account-setting/api-based-extension-page/__tests__/index.spec.tsx
index 58b694e44e..adac0f7c6c 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/__tests__/index.spec.tsx
@@ -38,7 +38,8 @@ describe('ApiBasedExtensionPage', () => {
       render(<ApiBasedExtensionPage />)
 
       // Assert
-      expect(screen.getByText('common.apiBasedExtension.title')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('common.apiBasedExtension.title'))!.toBeInTheDocument()
     })
 
     it('should render list of extensions when data exists', () => {
@@ -58,10 +59,11 @@ describe('ApiBasedExtensionPage', () => {
       render(<ApiBasedExtensionPage />)
 
       // Assert
-      expect(screen.getByText('Extension 1')).toBeInTheDocument()
-      expect(screen.getByText('url1')).toBeInTheDocument()
-      expect(screen.getByText('Extension 2')).toBeInTheDocument()
-      expect(screen.getByText('url2')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Extension 1'))!.toBeInTheDocument()
+      expect(screen.getByText('url1'))!.toBeInTheDocument()
+      expect(screen.getByText('Extension 2'))!.toBeInTheDocument()
+      expect(screen.getByText('url2'))!.toBeInTheDocument()
     })
 
     it('should handle loading state', () => {
@@ -75,9 +77,40 @@ describe('ApiBasedExtensionPage', () => {
       // Act
       render(<ApiBasedExtensionPage />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByText('common.apiBasedExtension.title')).not.toBeInTheDocument()
-      expect(screen.getByText('common.apiBasedExtension.add')).toBeInTheDocument()
+      expect(screen.getByText('common.apiBasedExtension.add'))!.toBeInTheDocument()
     })
   })
 
@@ -113,7 +146,7 @@ describe('ApiBasedExtensionPage', () => {
       fireEvent.click(screen.getByText('common.apiBasedExtension.add'))
 
       // Trigger callback manually from the mock call
-      const callArgs = mockSetShowApiBasedExtensionModal.mock.calls[0][0]
+      const callArgs = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
       if (typeof callArgs === 'object' && callArgs !== null && 'onSaveCallback' in callArgs) {
         if (callArgs.onSaveCallback) {
           callArgs.onSaveCallback()
@@ -138,7 +171,7 @@ describe('ApiBasedExtensionPage', () => {
       fireEvent.click(screen.getByText('common.operation.edit'))
 
       // Retrieve the onSaveCallback from the modal call and execute it
-      const callArgs = mockSetShowApiBasedExtensionModal.mock.calls[0][0]
+      const callArgs = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
       if (typeof callArgs === 'object' && callArgs !== null && 'onSaveCallback' in callArgs) {
         if (callArgs.onSaveCallback)
           callArgs.onSaveCallback()
diff --git a/web/app/components/header/account-setting/api-based-extension-page/__tests__/item.spec.tsx b/web/app/components/header/account-setting/api-based-extension-page/__tests__/item.spec.tsx
index cf5c46a509..38dcf9dec5 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/__tests__/item.spec.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/__tests__/item.spec.tsx
@@ -39,8 +39,9 @@ describe('Item Component', () => {
       render(<Item data={mockData} onUpdate={mockOnUpdate} />)
 
       // Assert
-      expect(screen.getByText('Test Extension')).toBeInTheDocument()
-      expect(screen.getByText('https://api.example.com')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Test Extension'))!.toBeInTheDocument()
+      expect(screen.getByText('https://api.example.com'))!.toBeInTheDocument()
     })
 
     it('should render with minimal extension data', () => {
@@ -51,8 +52,9 @@ describe('Item Component', () => {
       render(<Item data={minimalData} onUpdate={mockOnUpdate} />)
 
       // Assert
-      expect(screen.getByText('common.operation.edit')).toBeInTheDocument()
-      expect(screen.getByText('common.operation.delete')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('common.operation.edit'))!.toBeInTheDocument()
+      expect(screen.getByText('common.operation.delete'))!.toBeInTheDocument()
     })
   })
 
@@ -66,7 +68,7 @@ describe('Item Component', () => {
       expect(mockSetShowApiBasedExtensionModal).toHaveBeenCalledWith(expect.objectContaining({
         payload: mockData,
       }))
-      const lastCall = mockSetShowApiBasedExtensionModal.mock.calls[0][0]
+      const lastCall = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
       if (typeof lastCall === 'object' && lastCall !== null && 'onSaveCallback' in lastCall)
         expect(lastCall.onSaveCallback).toBeInstanceOf(Function)
     })
@@ -77,7 +79,7 @@ describe('Item Component', () => {
       fireEvent.click(screen.getByText('common.operation.edit'))
 
       // Assert
-      const modalCallArg = mockSetShowApiBasedExtensionModal.mock.calls[0][0]
+      const modalCallArg = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
       if (typeof modalCallArg === 'object' && modalCallArg !== null && 'onSaveCallback' in modalCallArg) {
         const onSaveCallback = modalCallArg.onSaveCallback
         if (onSaveCallback) {
@@ -95,7 +97,8 @@ describe('Item Component', () => {
       fireEvent.click(screen.getByText('common.operation.delete'))
 
       // Assert
-      expect(screen.getByText(/common\.operation\.delete.*Test Extension.*\?/i)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/common\.operation\.delete.*Test Extension.*\?/i))!.toBeInTheDocument()
     })
 
     it('should call delete API and triggers onUpdate when confirming deletion', async () => {
@@ -188,7 +191,8 @@ describe('Item Component', () => {
         fireEvent.click(deleteBtn)
 
       // Assert
-      expect(screen.getByText(/.*Test Extension.*\?/i)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/.*Test Extension.*\?/i))!.toBeInTheDocument()
 
       useTranslationSpy.mockRestore()
     })
diff --git a/web/app/components/header/account-setting/api-based-extension-page/__tests__/selector.spec.tsx b/web/app/components/header/account-setting/api-based-extension-page/__tests__/selector.spec.tsx
index 3e16528ff0..82acd22d97 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/__tests__/selector.spec.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/__tests__/selector.spec.tsx
@@ -46,7 +46,8 @@ describe('ApiBasedExtensionSelector', () => {
       render(<ApiBasedExtensionSelector value="" onChange={mockOnChange} />)
 
       // Assert
-      expect(screen.getByText('common.apiBasedExtension.selector.placeholder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('common.apiBasedExtension.selector.placeholder'))!.toBeInTheDocument()
     })
 
     it('should render selected item name', async () => {
@@ -54,7 +55,8 @@ describe('ApiBasedExtensionSelector', () => {
       render(<ApiBasedExtensionSelector value="1" onChange={mockOnChange} />)
 
       // Assert
-      expect(screen.getByText('Extension 1')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Extension 1'))!.toBeInTheDocument()
     })
   })
 
@@ -66,7 +68,8 @@ describe('ApiBasedExtensionSelector', () => {
       fireEvent.click(trigger)
 
       // Assert
-      expect(await screen.findByText('common.apiBasedExtension.selector.title')).toBeInTheDocument()
+      // Assert
+      expect(await screen.findByText('common.apiBasedExtension.selector.title'))!.toBeInTheDocument()
     })
 
     it('should call onChange and closes dropdown when an extension is selected', async () => {
@@ -111,7 +114,7 @@ describe('ApiBasedExtensionSelector', () => {
       }))
 
       // Trigger callback
-      const lastCall = mockSetShowApiBasedExtensionModal.mock.calls[0][0]
+      const lastCall = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
       if (typeof lastCall === 'object' && lastCall !== null && 'onSaveCallback' in lastCall) {
         if (lastCall.onSaveCallback) {
           lastCall.onSaveCallback()
diff --git a/web/app/components/header/account-setting/data-source-page-new/__tests__/card.spec.tsx b/web/app/components/header/account-setting/data-source-page-new/__tests__/card.spec.tsx
index 12e37553fc..fedb7d8a4e 100644
--- a/web/app/components/header/account-setting/data-source-page-new/__tests__/card.spec.tsx
+++ b/web/app/components/header/account-setting/data-source-page-new/__tests__/card.spec.tsx
@@ -110,7 +110,7 @@ describe('Card Component', () => {
         type: CredentialTypeEnum.API_KEY,
         is_default: true,
         avatar_url: 'avatar1',
-      },
+      }!,
     ],
   }
 
@@ -144,11 +144,12 @@ describe('Card Component', () => {
       render(<Card item={mockItem} />)
 
       // Assert
-      expect(screen.getByText('Test Label')).toBeInTheDocument()
-      expect(screen.getByText(/Test Author/)).toBeInTheDocument()
-      expect(screen.getByText(/test-name/)).toBeInTheDocument()
-      expect(screen.getByRole('img')).toHaveAttribute('src', 'test-icon-url')
-      expect(screen.getByText('Credential 1')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Test Label'))!.toBeInTheDocument()
+      expect(screen.getByText(/Test Author/))!.toBeInTheDocument()
+      expect(screen.getByText(/test-name/))!.toBeInTheDocument()
+      expect(screen.getByRole('img'))!.toHaveAttribute('src', 'test-icon-url')
+      expect(screen.getByText('Credential 1'))!.toBeInTheDocument()
 
       expect(usePluginAuthAction).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -168,7 +169,8 @@ describe('Card Component', () => {
       render(<Card item={emptyItem} />)
 
       // Assert
-      expect(screen.getByText(/plugin.auth.emptyAuth/)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/plugin.auth.emptyAuth/))!.toBeInTheDocument()
     })
   })
 
@@ -218,7 +220,7 @@ describe('Card Component', () => {
       const oAuthItem = {
         ...mockItem,
         credentials_list: [{
-          ...mockItem.credentials_list[0],
+          ...mockItem.credentials_list[0]!,
           type: CredentialTypeEnum.OAUTH2,
         }],
       }
@@ -245,7 +247,7 @@ describe('Card Component', () => {
       const oAuthItem = {
         ...mockItem,
         credentials_list: [{
-          ...mockItem.credentials_list[0],
+          ...mockItem.credentials_list[0]!,
           type: CredentialTypeEnum.OAUTH2,
         }],
       }
@@ -268,7 +270,7 @@ describe('Card Component', () => {
       const oAuthItem = {
         ...mockItem,
         credentials_list: [{
-          ...mockItem.credentials_list[0],
+          ...mockItem.credentials_list[0]!,
           type: CredentialTypeEnum.OAUTH2,
         }],
       }
@@ -297,9 +299,10 @@ describe('Card Component', () => {
       render(<Card item={mockItem} />)
 
       // Assert
-      expect(screen.getByText(/list.delete.title/)).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText(/list.delete.title/))!.toBeInTheDocument()
       const confirmButton = screen.getByText(/operation.confirm/).closest('button')
-      expect(confirmButton).toBeEnabled()
+      expect(confirmButton)!.toBeEnabled()
 
       // Act - Cancel
       fireEvent.click(screen.getByText(/operation.cancel/))
@@ -317,8 +320,9 @@ describe('Card Component', () => {
       render(<Card item={mockItem} disabled={false} />)
 
       // Assert
-      expect(screen.getByTestId('mock-api-key-modal')).toBeInTheDocument()
-      expect(screen.getByTestId('mock-api-key-modal')).toHaveAttribute('data-disabled', 'false')
+      // Assert
+      expect(screen.getByTestId('mock-api-key-modal'))!.toBeInTheDocument()
+      expect(screen.getByTestId('mock-api-key-modal'))!.toHaveAttribute('data-disabled', 'false')
 
       // Act
       fireEvent.click(screen.getByTestId('modal-close'))
@@ -337,7 +341,8 @@ describe('Card Component', () => {
       render(<Card item={mockItem} disabled={false} />)
 
       // Assert
-      expect(screen.getByTestId('mock-api-key-modal')).toHaveAttribute('data-disabled', 'true')
+      // Assert
+      expect(screen.getByTestId('mock-api-key-modal'))!.toHaveAttribute('data-disabled', 'true')
     })
   })
 
diff --git a/web/app/components/header/account-setting/data-source-page-new/hooks/use-marketplace-all-plugins.ts b/web/app/components/header/account-setting/data-source-page-new/hooks/use-marketplace-all-plugins.ts
index 90ef6e78a4..7e2dc572fc 100644
--- a/web/app/components/header/account-setting/data-source-page-new/hooks/use-marketplace-all-plugins.ts
+++ b/web/app/components/header/account-setting/data-source-page-new/hooks/use-marketplace-all-plugins.ts
@@ -54,8 +54,8 @@ export const useMarketplaceAllPlugins = (providers: any[], searchText: string) =
       for (let i = 0; i < plugins.length; i++) {
         const plugin = plugins[i]
 
-        if (plugin.type !== 'bundle' && !allPlugins.find(p => p.plugin_id === plugin.plugin_id))
-          allPlugins.push(plugin)
+        if (plugin!.type !== 'bundle' && !allPlugins.find(p => p.plugin_id === plugin!.plugin_id))
+          allPlugins.push(plugin!)
       }
     }
 
diff --git a/web/app/components/header/account-setting/index.tsx b/web/app/components/header/account-setting/index.tsx
index 64dff27cf6..3ec6dea315 100644
--- a/web/app/components/header/account-setting/index.tsx
+++ b/web/app/components/header/account-setting/index.tsx
@@ -130,7 +130,7 @@ export default function AccountSetting({
       ],
     },
   ]
-  const activeItem = [...menuItems[0].items, ...menuItems[1].items].find(item => item.key === activeMenu)
+  const activeItem = [...menuItems[0]!.items, ...menuItems[1]!.items].find(item => item.key === activeMenu)
 
   const [searchValue, setSearchValue] = useState<string>('')
 
diff --git a/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx
index 9513eeee02..b50073b1f2 100644
--- a/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx
@@ -129,9 +129,9 @@ describe('MembersPage', () => {
   it('should render workspace and member information', () => {
     render(<MembersPage />)
 
-    expect(screen.getByText('Test Workspace')).toBeInTheDocument()
-    expect(screen.getByText('Owner User')).toBeInTheDocument()
-    expect(screen.getByText('Admin User')).toBeInTheDocument()
+    expect(screen.getByText('Test Workspace'))!.toBeInTheDocument()
+    expect(screen.getByText('Owner User'))!.toBeInTheDocument()
+    expect(screen.getByText('Admin User'))!.toBeInTheDocument()
   })
 
   it('should open and close invite modal', async () => {
@@ -140,7 +140,7 @@ describe('MembersPage', () => {
     render(<MembersPage />)
 
     await user.click(screen.getByRole('button', { name: /invite/i }))
-    expect(screen.getByText('Invite Modal')).toBeInTheDocument()
+    expect(screen.getByText('Invite Modal'))!.toBeInTheDocument()
 
     await user.click(screen.getByRole('button', { name: 'Close Invite Modal' }))
     expect(screen.queryByText('Invite Modal')).not.toBeInTheDocument()
@@ -154,7 +154,7 @@ describe('MembersPage', () => {
     await user.click(screen.getByRole('button', { name: /invite/i }))
     await user.click(screen.getByRole('button', { name: 'Send Invite Results' }))
 
-    expect(screen.getByText('Invited Modal')).toBeInTheDocument()
+    expect(screen.getByText('Invited Modal'))!.toBeInTheDocument()
     expect(mockRefetch).toHaveBeenCalled()
 
     await user.click(screen.getByRole('button', { name: 'Close Invited Modal' }))
@@ -167,7 +167,7 @@ describe('MembersPage', () => {
     render(<MembersPage />)
 
     await user.click(screen.getByRole('button', { name: /transfer ownership/i }))
-    expect(screen.getByText('Transfer Ownership Modal')).toBeInTheDocument()
+    expect(screen.getByText('Transfer Ownership Modal'))!.toBeInTheDocument()
   })
 
   it('should show non-interactive owner role when transfer ownership is not allowed', () => {
@@ -178,7 +178,7 @@ describe('MembersPage', () => {
 
     render(<MembersPage />)
 
-    expect(screen.getByText('common.members.owner')).toBeInTheDocument()
+    expect(screen.getByText('common.members.owner'))!.toBeInTheDocument()
     expect(screen.queryByRole('button', { name: /transfer ownership/i })).not.toBeInTheDocument()
   })
 
@@ -202,7 +202,7 @@ describe('MembersPage', () => {
     render(<MembersPage />)
 
     await user.click(screen.getByTestId('edit-workspace-pencil'))
-    expect(screen.getByText('Edit Workspace Modal')).toBeInTheDocument()
+    expect(screen.getByText('Edit Workspace Modal'))!.toBeInTheDocument()
 
     await user.click(screen.getByRole('button', { name: 'Close Edit Workspace' }))
     expect(screen.queryByText('Edit Workspace Modal')).not.toBeInTheDocument()
@@ -214,7 +214,7 @@ describe('MembersPage', () => {
     render(<MembersPage />)
 
     await user.click(screen.getByRole('button', { name: /transfer ownership/i }))
-    expect(screen.getByText('Transfer Ownership Modal')).toBeInTheDocument()
+    expect(screen.getByText('Transfer Ownership Modal'))!.toBeInTheDocument()
 
     await user.click(screen.getByRole('button', { name: 'Close Transfer Modal' }))
     expect(screen.queryByText('Transfer Ownership Modal')).not.toBeInTheDocument()
@@ -222,7 +222,7 @@ describe('MembersPage', () => {
 
   it('should show pending status and you indicator', () => {
     const pendingAccount: Member = {
-      ...mockAccounts[1],
+      ...mockAccounts[1]!,
       status: 'pending',
     }
     vi.mocked(useMembers).mockReturnValue({
@@ -232,8 +232,8 @@ describe('MembersPage', () => {
 
     render(<MembersPage />)
 
-    expect(screen.getByText(/members\.pending/i)).toBeInTheDocument()
-    expect(screen.getByText(/members\.you/i)).toBeInTheDocument() // Current user is owner@example.com
+    expect(screen.getByText(/members\.pending/i))!.toBeInTheDocument()
+    expect(screen.getByText(/members\.you/i))!.toBeInTheDocument() // Current user is owner@example.com
   })
 
   it('should show billing information for limited plan', () => {
@@ -247,10 +247,10 @@ describe('MembersPage', () => {
 
     render(<MembersPage />)
 
-    expect(screen.getByText(/plansCommon\.member/i)).toBeInTheDocument()
-    expect(screen.getByText('2')).toBeInTheDocument() // accounts.length
-    expect(screen.getByText('/')).toBeInTheDocument()
-    expect(screen.getByText('5')).toBeInTheDocument() // plan.total.teamMembers
+    expect(screen.getByText(/plansCommon\.member/i))!.toBeInTheDocument()
+    expect(screen.getByText('2'))!.toBeInTheDocument() // accounts.length
+    expect(screen.getByText('/'))!.toBeInTheDocument()
+    expect(screen.getByText('5'))!.toBeInTheDocument() // plan.total.teamMembers
   })
 
   it('should show unlimited billing information', () => {
@@ -264,7 +264,7 @@ describe('MembersPage', () => {
 
     render(<MembersPage />)
 
-    expect(screen.getByText(/plansCommon\.unlimited/i)).toBeInTheDocument()
+    expect(screen.getByText(/plansCommon\.unlimited/i))!.toBeInTheDocument()
   })
 
   it('should show non-billing member format for team plan even when billing is enabled', () => {
@@ -279,7 +279,8 @@ describe('MembersPage', () => {
     render(<MembersPage />)
 
     // Plan.team is an unlimited member plan → isNotUnlimitedMemberPlan=false → non-billing layout
-    expect(screen.getByText(/plansCommon\.memberAfter/i)).toBeInTheDocument()
+    // Plan.team is an unlimited member plan → isNotUnlimitedMemberPlan=false → non-billing layout
+    expect(screen.getByText(/plansCommon\.memberAfter/i))!.toBeInTheDocument()
   })
 
   it('should show invite button when user is manager but not owner', () => {
@@ -292,13 +293,13 @@ describe('MembersPage', () => {
 
     render(<MembersPage />)
 
-    expect(screen.getByRole('button', { name: /invite/i })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: /invite/i }))!.toBeInTheDocument()
     expect(screen.queryByRole('button', { name: /transfer ownership/i })).not.toBeInTheDocument()
   })
 
   it('should use created_at as fallback when last_active_at is empty', () => {
     const memberNoLastActive: Member = {
-      ...mockAccounts[1],
+      ...mockAccounts[1]!,
       last_active_at: '',
       created_at: '1700000000',
     }
@@ -327,8 +328,8 @@ describe('MembersPage', () => {
 
     render(<MembersPage />)
 
-    expect(screen.getByText(/plansCommon\.member/i)).toBeInTheDocument()
-    expect(screen.getByText('1')).toBeInTheDocument()
+    expect(screen.getByText(/plansCommon\.member/i))!.toBeInTheDocument()
+    expect(screen.getByText('1'))!.toBeInTheDocument()
   })
 
   it('should not show plural s when only one account in non-billing layout', () => {
@@ -339,8 +340,8 @@ describe('MembersPage', () => {
 
     render(<MembersPage />)
 
-    expect(screen.getByText(/plansCommon\.memberAfter/i)).toBeInTheDocument()
-    expect(screen.getByText('1')).toBeInTheDocument()
+    expect(screen.getByText(/plansCommon\.memberAfter/i))!.toBeInTheDocument()
+    expect(screen.getByText('1'))!.toBeInTheDocument()
   })
 
   it('should show normal role as fallback for unknown role', () => {
@@ -357,7 +358,7 @@ describe('MembersPage', () => {
 
     render(<MembersPage />)
 
-    expect(screen.getByText('common.members.normal')).toBeInTheDocument()
+    expect(screen.getByText('common.members.normal'))!.toBeInTheDocument()
   })
 
   it('should show upgrade button when member limit is full', () => {
@@ -371,6 +372,6 @@ describe('MembersPage', () => {
 
     render(<MembersPage />)
 
-    expect(screen.getByText('Upgrade Button')).toBeInTheDocument()
+    expect(screen.getByText('Upgrade Button'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/header/account-setting/model-provider-page/__tests__/hooks.spec.ts b/web/app/components/header/account-setting/model-provider-page/__tests__/hooks.spec.ts
index 1d50ee43b0..9b592e9fff 100644
--- a/web/app/components/header/account-setting/model-provider-page/__tests__/hooks.spec.ts
+++ b/web/app/components/header/account-setting/model-provider-page/__tests__/hooks.spec.ts
@@ -758,7 +758,7 @@ describe('hooks', () => {
 
       expect(result.current.textGenerationModelList).toEqual(modelList)
       expect(result.current.activeTextGenerationModelList).toHaveLength(1)
-      expect(result.current.activeTextGenerationModelList[0].provider).toBe('openai')
+      expect(result.current.activeTextGenerationModelList[0]!.provider).toBe('openai')
     })
 
     it('should filter active models correctly', () => {
@@ -770,7 +770,7 @@ describe('hooks', () => {
       const { result } = renderHook(() => useTextGenerationCurrentProviderAndModelAndModelList())
 
       expect(result.current.activeTextGenerationModelList).toHaveLength(1)
-      expect(result.current.activeTextGenerationModelList[0].status).toBe(ModelStatusEnum.active)
+      expect(result.current.activeTextGenerationModelList[0]!.status).toBe(ModelStatusEnum.active)
     })
 
     it('should find current provider and model', () => {
@@ -1145,7 +1145,7 @@ describe('hooks', () => {
       const { result } = renderHook(() => useMarketplaceAllPlugins(providers, ''))
 
       expect(result.current.plugins!).toHaveLength(1)
-      expect(result.current.plugins![0].plugin_id).toBe('other')
+      expect(result.current.plugins![0]!.plugin_id).toBe('other')
     })
 
     it('should use search when searchText is provided', () => {
@@ -1186,7 +1186,7 @@ describe('hooks', () => {
       const { result } = renderHook(() => useMarketplaceAllPlugins([], ''))
 
       expect(result.current.plugins!).toHaveLength(1)
-      expect(result.current.plugins![0].plugin_id).toBe('plugin1')
+      expect(result.current.plugins![0]!.plugin_id).toBe('plugin1')
     })
 
     it('should deduplicate plugins that exist in both collections and regular plugins', () => {
@@ -1613,7 +1613,7 @@ describe('hooks', () => {
         )
       })
 
-      const callArgs = setShowModelModal.mock.calls[0][0]
+      const callArgs = setShowModelModal.mock.calls[0]![0]
       const newPayload = { test: 'data' }
       const formValues = { field: 'value' }
 
@@ -1636,7 +1636,7 @@ describe('hooks', () => {
         result.current(provider, ConfigurationMethodEnum.predefinedModel)
       })
 
-      const callArgs = setShowModelModal.mock.calls[0][0]
+      const callArgs = setShowModelModal.mock.calls[0]![0]
 
       // Should not throw when onUpdate is not provided
       expect(() => {
diff --git a/web/app/components/header/account-setting/model-provider-page/__tests__/utils.spec.ts b/web/app/components/header/account-setting/model-provider-page/__tests__/utils.spec.ts
index d49343e0c6..e2a2aea22c 100644
--- a/web/app/components/header/account-setting/model-provider-page/__tests__/utils.spec.ts
+++ b/web/app/components/header/account-setting/model-provider-page/__tests__/utils.spec.ts
@@ -277,7 +277,7 @@ describe('utils', () => {
       const schema = genModelTypeFormSchema([ModelTypeEnum.textGeneration])
       expect(schema.type).toBe(FormTypeEnum.select)
       expect(schema.variable).toBe('__model_type')
-      expect(schema.options[0].value).toBe(ModelTypeEnum.textGeneration)
+      expect(schema.options[0]!.value).toBe(ModelTypeEnum.textGeneration)
     })
   })
 
diff --git a/web/app/components/header/account-setting/model-provider-page/hooks.ts b/web/app/components/header/account-setting/model-provider-page/hooks.ts
index 791a42deb5..27b84f81bb 100644
--- a/web/app/components/header/account-setting/model-provider-page/hooks.ts
+++ b/web/app/components/header/account-setting/model-provider-page/hooks.ts
@@ -313,8 +313,8 @@ export const useMarketplaceAllPlugins = (providers: ModelProvider[], searchText:
       for (let i = 0; i < plugins.length; i++) {
         const plugin = plugins[i]
 
-        if (plugin.type !== 'bundle' && !allPlugins.find(p => p.plugin_id === plugin.plugin_id))
-          allPlugins.push(plugin)
+        if (plugin!.type !== 'bundle' && !allPlugins.find(p => p.plugin_id === plugin!.plugin_id))
+          allPlugins.push(plugin!)
       }
     }
 
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/add-credential-in-load-balancing.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/add-credential-in-load-balancing.spec.tsx
index bf26880a8b..c72264dd7a 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/add-credential-in-load-balancing.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/add-credential-in-load-balancing.spec.tsx
@@ -18,7 +18,7 @@ vi.mock('@/app/components/header/account-setting/model-provider-page/model-auth'
     <div>
       {renderTrigger(false)}
       <button onClick={() => authParams?.onUpdate?.({ provider: 'x' }, { key: 'value' })}>Run update</button>
-      <button onClick={() => onItemClick?.(items[0].credentials[0])}>Select first</button>
+      <button onClick={() => onItemClick?.(items[0]!.credentials[0]!)}>Select first</button>
     </div>
   ),
 }))
@@ -57,7 +57,7 @@ describe('AddCredentialInLoadBalancing', () => {
       />,
     )
 
-    expect(screen.getByText(/modelProvider.auth.addCredential/i)).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider.auth.addCredential/i))!.toBeInTheDocument()
   })
 
   it('should forward update payload when update action happens', () => {
@@ -127,7 +127,7 @@ describe('AddCredentialInLoadBalancing', () => {
       // The trigger div rendered by renderTrigger(true) should have bg-state-base-hover
       // (the static class applied when open=true via cn())
       const triggerDiv = container.querySelector('[data-testid="open-trigger"] > div')
-      expect(triggerDiv).toBeInTheDocument()
+      expect(triggerDiv)!.toBeInTheDocument()
       expect(triggerDiv!.className).toContain('bg-state-base-hover')
     }
     finally {
@@ -148,7 +148,7 @@ describe('AddCredentialInLoadBalancing', () => {
       />,
     )
 
-    expect(screen.getByText(/modelProvider.auth.addCredential/i)).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider.auth.addCredential/i))!.toBeInTheDocument()
   })
 
   it('should handle undefined available_credentials gracefully using nullish coalescing', () => {
@@ -169,7 +169,8 @@ describe('AddCredentialInLoadBalancing', () => {
     )
 
     // Component should render without error - the ?? [] fallback is used
-    expect(screen.getByText(/modelProvider.auth.addCredential/i)).toBeInTheDocument()
+    // Component should render without error - the ?? [] fallback is used
+    expect(screen.getByText(/modelProvider.auth.addCredential/i))!.toBeInTheDocument()
   })
 
   it('should not throw when update action fires without onUpdate prop', () => {
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/switch-credential-in-load-balancing.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/switch-credential-in-load-balancing.spec.tsx
index 9b58984af9..0232adcf4a 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/switch-credential-in-load-balancing.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/switch-credential-in-load-balancing.spec.tsx
@@ -7,7 +7,7 @@ import SwitchCredentialInLoadBalancing from '../switch-credential-in-load-balanc
 vi.mock('../authorized', () => ({
   default: ({ renderTrigger, onItemClick, items }: { renderTrigger: () => React.ReactNode, onItemClick: (c: unknown) => void, items: { credentials: unknown[] }[] }) => (
     <div data-testid="authorized-mock">
-      <div data-testid="trigger-container" onClick={() => onItemClick(items[0].credentials[0])}>
+      <div data-testid="trigger-container" onClick={() => onItemClick(items[0]!.credentials[0])}>
         {renderTrigger()}
       </div>
     </div>
@@ -55,8 +55,8 @@ describe('SwitchCredentialInLoadBalancing', () => {
       />,
     )
 
-    expect(screen.getByText('Key 1')).toBeInTheDocument()
-    expect(screen.getByTestId('indicator-green')).toBeInTheDocument()
+    expect(screen.getByText('Key 1'))!.toBeInTheDocument()
+    expect(screen.getByTestId('indicator-green'))!.toBeInTheDocument()
   })
 
   it('should render auth removed status when selected credential is not in list', () => {
@@ -70,8 +70,8 @@ describe('SwitchCredentialInLoadBalancing', () => {
       />,
     )
 
-    expect(screen.getByText(/modelProvider.auth.authRemoved/)).toBeInTheDocument()
-    expect(screen.getByTestId('indicator-red')).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider.auth.authRemoved/))!.toBeInTheDocument()
+    expect(screen.getByTestId('indicator-red'))!.toBeInTheDocument()
   })
 
   it('should render unavailable status when credentials list is empty', () => {
@@ -85,7 +85,7 @@ describe('SwitchCredentialInLoadBalancing', () => {
       />,
     )
 
-    expect(screen.getByText(/auth.credentialUnavailableInButton/)).toBeInTheDocument()
+    expect(screen.getByText(/auth.credentialUnavailableInButton/))!.toBeInTheDocument()
     expect(screen.queryByTestId(/indicator-/)).not.toBeInTheDocument()
   })
 
@@ -117,7 +117,7 @@ describe('SwitchCredentialInLoadBalancing', () => {
     )
 
     fireEvent.mouseEnter(screen.getByText(/auth.credentialUnavailableInButton/))
-    expect(screen.getByText('plugin.auth.credentialUnavailable')).toBeInTheDocument()
+    expect(screen.getByText('plugin.auth.credentialUnavailable'))!.toBeInTheDocument()
   })
 
   // Empty credentials with allowed custom: no tooltip but still shows unavailable text
@@ -134,7 +134,8 @@ describe('SwitchCredentialInLoadBalancing', () => {
     )
 
     // Assert
-    expect(screen.getByText(/auth.credentialUnavailableInButton/)).toBeInTheDocument()
+    // Assert
+    expect(screen.getByText(/auth.credentialUnavailableInButton/))!.toBeInTheDocument()
     expect(screen.queryByText('plugin.auth.credentialUnavailable')).not.toBeInTheDocument()
   })
 
@@ -152,8 +153,8 @@ describe('SwitchCredentialInLoadBalancing', () => {
       />,
     )
 
-    expect(screen.getByTestId('indicator-red')).toBeInTheDocument()
-    expect(screen.getByText(/auth.credentialUnavailableInButton/)).toBeInTheDocument()
+    expect(screen.getByTestId('indicator-red'))!.toBeInTheDocument()
+    expect(screen.getByText(/auth.credentialUnavailableInButton/))!.toBeInTheDocument()
   })
 
   // from_enterprise=true on the selected credential: Enterprise badge appears in the trigger
@@ -170,7 +171,7 @@ describe('SwitchCredentialInLoadBalancing', () => {
       />,
     )
 
-    expect(screen.getByText('Enterprise')).toBeInTheDocument()
+    expect(screen.getByText('Enterprise'))!.toBeInTheDocument()
   })
 
   // non-empty credentials with allow_custom_token=false: no tooltip (tooltip only for empty+notAllowCustom)
@@ -189,7 +190,7 @@ describe('SwitchCredentialInLoadBalancing', () => {
 
     fireEvent.mouseEnter(screen.getByText('Key 1'))
     expect(screen.queryByText('plugin.auth.credentialUnavailable')).not.toBeInTheDocument()
-    expect(screen.getByText('Key 1')).toBeInTheDocument()
+    expect(screen.getByText('Key 1'))!.toBeInTheDocument()
   })
 
   it('should pass undefined currentCustomConfigurationModelFixedFields when model is undefined', () => {
@@ -205,8 +206,9 @@ describe('SwitchCredentialInLoadBalancing', () => {
     )
 
     // Component still renders (Authorized receives undefined currentCustomConfigurationModelFixedFields)
-    expect(screen.getByTestId('authorized-mock')).toBeInTheDocument()
-    expect(screen.getByText('Key 1')).toBeInTheDocument()
+    // Component still renders (Authorized receives undefined currentCustomConfigurationModelFixedFields)
+    expect(screen.getByTestId('authorized-mock'))!.toBeInTheDocument()
+    expect(screen.getByText('Key 1'))!.toBeInTheDocument()
   })
 
   it('should treat undefined credentials as empty list', () => {
@@ -221,7 +223,8 @@ describe('SwitchCredentialInLoadBalancing', () => {
     )
 
     // credentials is undefined → empty=true → unavailable text shown
-    expect(screen.getByText(/auth.credentialUnavailableInButton/)).toBeInTheDocument()
+    // credentials is undefined → empty=true → unavailable text shown
+    expect(screen.getByText(/auth.credentialUnavailableInButton/))!.toBeInTheDocument()
     expect(screen.queryByTestId(/indicator-/)).not.toBeInTheDocument()
   })
 
@@ -239,7 +242,39 @@ describe('SwitchCredentialInLoadBalancing', () => {
     )
 
     // indicator-green shown (not authRemoved, not unavailable, not empty)
-    expect(screen.getByTestId('indicator-green')).toBeInTheDocument()
+    // indicator-green shown (not authRemoved, not unavailable, not empty)
+    expect(screen.getByTestId('indicator-green'))!.toBeInTheDocument()
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
+    // credential_name is empty so nothing printed for name
     // credential_name is empty so nothing printed for name
     expect(screen.queryByText('Key 1')).not.toBeInTheDocument()
   })
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/__tests__/authorized-item.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/__tests__/authorized-item.spec.tsx
index 57e80fa989..c0ce70a5d0 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/__tests__/authorized-item.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/__tests__/authorized-item.spec.tsx
@@ -51,10 +51,10 @@ describe('AuthorizedItem', () => {
         />,
       )
 
-      expect(screen.getByTestId('credential-item-cred-1')).toBeInTheDocument()
-      expect(screen.getByTestId('credential-item-cred-2')).toBeInTheDocument()
-      expect(screen.getByText('API Key 1')).toBeInTheDocument()
-      expect(screen.getByText('API Key 2')).toBeInTheDocument()
+      expect(screen.getByTestId('credential-item-cred-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('credential-item-cred-2'))!.toBeInTheDocument()
+      expect(screen.getByText('API Key 1'))!.toBeInTheDocument()
+      expect(screen.getByText('API Key 2'))!.toBeInTheDocument()
     })
 
     it('should render model title when showModelTitle is true', () => {
@@ -67,7 +67,7 @@ describe('AuthorizedItem', () => {
         />,
       )
 
-      expect(screen.getByTestId('model-icon')).toBeInTheDocument()
+      expect(screen.getByTestId('model-icon'))!.toBeInTheDocument()
       expect(screen.getAllByText('gpt-4')).toHaveLength(2)
     })
 
@@ -94,7 +94,7 @@ describe('AuthorizedItem', () => {
         />,
       )
 
-      expect(screen.getByText('Custom Title')).toBeInTheDocument()
+      expect(screen.getByText('Custom Title'))!.toBeInTheDocument()
     })
 
     it('should handle empty credentials array', () => {
@@ -122,7 +122,7 @@ describe('AuthorizedItem', () => {
         />,
       )
 
-      screen.getAllByText('Edit')[0].click()
+      screen.getAllByText('Edit')[0]!.click()
 
       expect(onEdit).toHaveBeenCalledWith(mockCredentials[0], mockModel)
     })
@@ -139,7 +139,7 @@ describe('AuthorizedItem', () => {
         />,
       )
 
-      screen.getAllByText('Delete')[0].click()
+      screen.getAllByText('Delete')[0]!.click()
 
       expect(onDelete).toHaveBeenCalledWith(mockCredentials[0], mockModel)
     })
@@ -156,7 +156,7 @@ describe('AuthorizedItem', () => {
         />,
       )
 
-      screen.getAllByText('Click')[0].click()
+      screen.getAllByText('Click')[0]!.click()
 
       expect(onItemClick).toHaveBeenCalledWith(mockCredentials[0], mockModel)
     })
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/__tests__/index.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/__tests__/index.spec.tsx
index e1d9a611f9..a331181619 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/__tests__/index.spec.tsx
@@ -90,8 +90,8 @@ describe('Authorized', () => {
     )
 
     fireEvent.click(screen.getByRole('button', { name: /trigger\s*closed/i }))
-    expect(screen.getByTestId('authorized-item')).toBeInTheDocument()
-    expect(screen.getByRole('button', { name: /addApiKey/i })).toBeInTheDocument()
+    expect(screen.getByTestId('authorized-item'))!.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: /addApiKey/i }))!.toBeInTheDocument()
   })
 
   it('should call handleOpenModal when triggerOnlyOpenModal is true', () => {
@@ -123,9 +123,9 @@ describe('Authorized', () => {
     )
 
     fireEvent.click(screen.getByRole('button', { name: /trigger\s*closed/i }))
-    fireEvent.click(screen.getAllByRole('button', { name: 'Select' })[0])
+    fireEvent.click(screen.getAllByRole('button', { name: 'Select' })[0]!)
 
-    expect(onItemClick).toHaveBeenCalledWith(mockCredentials[0], mockItems[0].model)
+    expect(onItemClick).toHaveBeenCalledWith(mockCredentials[0], mockItems[0]!.model)
   })
 
   it('should call handleActiveCredential when onItemClick is not provided', () => {
@@ -139,9 +139,9 @@ describe('Authorized', () => {
     )
 
     fireEvent.click(screen.getByRole('button', { name: /trigger\s*closed/i }))
-    fireEvent.click(screen.getAllByRole('button', { name: 'Select' })[0])
+    fireEvent.click(screen.getAllByRole('button', { name: 'Select' })[0]!)
 
-    expect(mockHandleActiveCredential).toHaveBeenCalledWith(mockCredentials[0], mockItems[0].model)
+    expect(mockHandleActiveCredential).toHaveBeenCalledWith(mockCredentials[0], mockItems[0]!.model)
   })
 
   it('should call handleOpenModal with fixed model fields when adding model credential', () => {
@@ -231,6 +231,6 @@ describe('Authorized', () => {
     )
 
     const dialog = screen.getByRole('alertdialog')
-    expect(within(dialog).getByRole('button', { name: /common.operation.confirm/i })).toBeDisabled()
+    expect(within(dialog).getByRole('button', { name: /common.operation.confirm/i }))!.toBeDisabled()
   })
 })
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-auth-service.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-auth-service.spec.tsx
index bd4f857047..7cc1445041 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-auth-service.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-auth-service.spec.tsx
@@ -80,15 +80,15 @@ describe('useAuthService hooks', () => {
     const { result } = renderHook(() => useAuthService('openai'), { wrapper })
 
     // Provider services
-    expect(result.current.getAddCredentialService(false)).toBe(vi.mocked(useAddProviderCredential).mock.results[0].value.mutateAsync)
-    expect(result.current.getEditCredentialService(false)).toBe(vi.mocked(useEditProviderCredential).mock.results[0].value.mutateAsync)
-    expect(result.current.getDeleteCredentialService(false)).toBe(vi.mocked(useDeleteProviderCredential).mock.results[0].value.mutateAsync)
-    expect(result.current.getActiveCredentialService(false)).toBe(vi.mocked(useActiveProviderCredential).mock.results[0].value.mutateAsync)
+    expect(result.current.getAddCredentialService(false)).toBe(vi.mocked(useAddProviderCredential).mock.results[0]!.value.mutateAsync)
+    expect(result.current.getEditCredentialService(false)).toBe(vi.mocked(useEditProviderCredential).mock.results[0]!.value.mutateAsync)
+    expect(result.current.getDeleteCredentialService(false)).toBe(vi.mocked(useDeleteProviderCredential).mock.results[0]!.value.mutateAsync)
+    expect(result.current.getActiveCredentialService(false)).toBe(vi.mocked(useActiveProviderCredential).mock.results[0]!.value.mutateAsync)
 
     // Model services
-    expect(result.current.getAddCredentialService(true)).toBe(vi.mocked(useAddModelCredential).mock.results[0].value.mutateAsync)
-    expect(result.current.getEditCredentialService(true)).toBe(vi.mocked(useEditModelCredential).mock.results[0].value.mutateAsync)
-    expect(result.current.getDeleteCredentialService(true)).toBe(vi.mocked(useDeleteModelCredential).mock.results[0].value.mutateAsync)
-    expect(result.current.getActiveCredentialService(true)).toBe(vi.mocked(useActiveModelCredential).mock.results[0].value.mutateAsync)
+    expect(result.current.getAddCredentialService(true)).toBe(vi.mocked(useAddModelCredential).mock.results[0]!.value.mutateAsync)
+    expect(result.current.getEditCredentialService(true)).toBe(vi.mocked(useEditModelCredential).mock.results[0]!.value.mutateAsync)
+    expect(result.current.getDeleteCredentialService(true)).toBe(vi.mocked(useDeleteModelCredential).mock.results[0]!.value.mutateAsync)
+    expect(result.current.getActiveCredentialService(true)).toBe(vi.mocked(useActiveModelCredential).mock.results[0]!.value.mutateAsync)
   })
 })
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-custom-models.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-custom-models.spec.tsx
index 2b5804c3f1..c98ead095f 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-custom-models.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-custom-models.spec.tsx
@@ -15,7 +15,7 @@ describe('useCustomModels and useCanAddedModels', () => {
 
     const { result } = renderHook(() => useCustomModels(mockProvider))
     expect(result.current).toHaveLength(2)
-    expect(result.current[0].model).toBe('gpt-4')
+    expect(result.current[0]!.model).toBe('gpt-4')
 
     const { result: emptyRes } = renderHook(() => useCustomModels({ custom_configuration: {} } as unknown as ModelProvider))
     expect(emptyRes.current).toEqual([])
@@ -30,7 +30,7 @@ describe('useCustomModels and useCanAddedModels', () => {
 
     const { result } = renderHook(() => useCanAddedModels(mockProvider))
     expect(result.current).toHaveLength(1)
-    expect(result.current[0].model).toBe('gpt-4-turbo')
+    expect(result.current[0]!.model).toBe('gpt-4-turbo')
 
     const { result: emptyRes } = renderHook(() => useCanAddedModels({ custom_configuration: {} } as unknown as ModelProvider))
     expect(emptyRes.current).toEqual([])
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-model-form-schemas.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-model-form-schemas.spec.tsx
index 237d99c7e7..dbe513163b 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-model-form-schemas.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/hooks/__tests__/use-model-form-schemas.spec.tsx
@@ -69,7 +69,7 @@ describe('useModelFormSchemas', () => {
 
     const { result: custom } = renderHook(() => useModelFormSchemas(mockProvider, false))
     expect(custom.current.modelNameAndTypeFormSchemas).toHaveLength(2)
-    expect(custom.current.modelNameAndTypeFormSchemas[0].variable).toBe('__model_name')
+    expect(custom.current.modelNameAndTypeFormSchemas[0]!.variable).toBe('__model_name')
 
     const mockModel = { model: 'custom', model_type: 'text' } as unknown as CustomModelCredential
     const { result: customWithVal } = renderHook(() => useModelFormSchemas(mockProvider, false, undefined, undefined, mockModel))
diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/Form.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/Form.spec.tsx
index 14120ec08c..bf1623fbef 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/Form.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/Form.spec.tsx
@@ -192,9 +192,9 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByPlaceholderText('API Key')).toHaveValue('default-key')
-      expect(screen.getByPlaceholderText('Secret')).toHaveValue('top-secret')
-      expect(screen.getByPlaceholderText('Limit')).toHaveValue(5)
+      expect(screen.getByPlaceholderText('API Key'))!.toHaveValue('default-key')
+      expect(screen.getByPlaceholderText('Secret'))!.toHaveValue('top-secret')
+      expect(screen.getByPlaceholderText('Limit'))!.toHaveValue(5)
       expect(screen.queryByText('Hidden')).not.toBeInTheDocument()
       expect(screen.getAllByText('*')).toHaveLength(1)
     })
@@ -234,7 +234,7 @@ describe('Form', () => {
 
       await waitFor(() => {
         expect(onChange).toHaveBeenCalledWith({ api_key: 'new-key', dependent: 'reset' })
-        expect(screen.getByText('Validating...')).toBeInTheDocument()
+        expect(screen.getByText('Validating...'))!.toBeInTheDocument()
       })
     })
 
@@ -279,7 +279,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('EU')).toBeInTheDocument()
+      expect(screen.getByText('EU'))!.toBeInTheDocument()
       expect(screen.queryByText('Hidden Region')).not.toBeInTheDocument()
       fireEvent.click(screen.getByText('EU'))
       fireEvent.click(screen.getByText('Locked A'))
@@ -338,7 +338,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Select A')).toBeInTheDocument()
+      expect(screen.getByText('Select A'))!.toBeInTheDocument()
       fireEvent.click(screen.getByText('Select A'))
       fireEvent.click(screen.getByText('Select B'))
 
@@ -459,12 +459,12 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Override Field')).toBeInTheDocument()
-      expect(screen.getByText(/Custom Render:.*custom_field/)).toBeInTheDocument()
+      expect(screen.getByText('Override Field'))!.toBeInTheDocument()
+      expect(screen.getByText(/Custom Render:.*custom_field/))!.toBeInTheDocument()
       expect(screen.getAllByText('allowed')).toHaveLength(3)
       expect(screen.getAllByText('blocked')).toHaveLength(1)
 
-      fireEvent.click(screen.getAllByText('Pick Variable')[0])
+      fireEvent.click(screen.getAllByText('Pick Variable')[0]!)
 
       expect(onChange).toHaveBeenCalledWith({ override: '', any_var: [{ name: 'var-1' }], any_without_scope: [], custom_field: '' })
       expect(screen.getAllByText('Extra Info')).toHaveLength(2)
@@ -497,7 +497,8 @@ describe('Form', () => {
       )
 
       // Assert
-      expect(screen.getByPlaceholderText('API Key')).toBeDisabled()
+      // Assert
+      expect(screen.getByPlaceholderText('API Key'))!.toBeDisabled()
     })
 
     // Override returns null: falls through to default renderer
@@ -528,7 +529,8 @@ describe('Form', () => {
       )
 
       // Assert - should fall through to default textInput renderer
-      expect(screen.getByPlaceholderText('Field 1')).toBeInTheDocument()
+      // Assert - should fall through to default textInput renderer
+      expect(screen.getByPlaceholderText('Field 1'))!.toBeInTheDocument()
     })
 
     // isShowDefaultValue=true, value is null → default shown
@@ -559,7 +561,8 @@ describe('Form', () => {
       )
 
       // Assert
-      expect(screen.getByPlaceholderText('Nullable')).toHaveValue('default-val')
+      // Assert
+      expect(screen.getByPlaceholderText('Nullable'))!.toHaveValue('default-val')
     })
 
     // isShowDefaultValue=true, value is undefined → default shown
@@ -590,7 +593,8 @@ describe('Form', () => {
       )
 
       // Assert
-      expect(screen.getByPlaceholderText('Undef')).toHaveValue('default-undef')
+      // Assert
+      expect(screen.getByPlaceholderText('Undef'))!.toHaveValue('default-undef')
     })
 
     // isEditMode=true, variable=__model_type → textInput disabled
@@ -619,7 +623,8 @@ describe('Form', () => {
       )
 
       // Assert
-      expect(screen.getByPlaceholderText('Model Type')).toBeDisabled()
+      // Assert
+      expect(screen.getByPlaceholderText('Model Type'))!.toBeDisabled()
     })
 
     // Label with missing language key → en_US fallback used
@@ -649,7 +654,8 @@ describe('Form', () => {
       )
 
       // Assert
-      expect(screen.getByText('English Label')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('English Label'))!.toBeInTheDocument()
     })
 
     // Select field with isShowDefaultValue=true
@@ -680,7 +686,8 @@ describe('Form', () => {
       )
 
       // Assert - Select B should be the rendered default
-      expect(screen.getByText('Select B')).toBeInTheDocument()
+      // Assert - Select B should be the rendered default
+      expect(screen.getByText('Select B'))!.toBeInTheDocument()
     })
 
     // Radio option with show_on condition not met → option filtered out
@@ -712,7 +719,8 @@ describe('Form', () => {
       )
 
       // Assert
-      expect(screen.getByText('Always Visible')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Always Visible'))!.toBeInTheDocument()
       expect(screen.queryByText('Conditional')).not.toBeInTheDocument()
     })
 
@@ -804,8 +812,9 @@ describe('Form', () => {
       )
 
       // Both rendered successfully
-      expect(screen.getByPlaceholderText('Secret')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('Number')).toBeInTheDocument()
+      // Both rendered successfully
+      expect(screen.getByPlaceholderText('Secret'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Number'))!.toBeInTheDocument()
     })
 
     // Placeholder fallback: null placeholder
@@ -830,7 +839,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('No Placeholder')).toBeInTheDocument()
+      expect(screen.getByText('No Placeholder'))!.toBeInTheDocument()
     })
 
     // validating=true + changeKey matches variable: ValidatingTip shown
@@ -866,7 +875,8 @@ describe('Form', () => {
       fireEvent.change(screen.getByPlaceholderText('API Key'), { target: { value: 'new' } })
 
       // ValidatingTip should appear for api_key
-      expect(screen.getByText('Validating...')).toBeInTheDocument()
+      // ValidatingTip should appear for api_key
+      expect(screen.getByText('Validating...'))!.toBeInTheDocument()
     })
 
     // Select with show_on not met: hidden
@@ -923,7 +933,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Always')).toBeInTheDocument()
+      expect(screen.getByText('Always'))!.toBeInTheDocument()
       expect(screen.queryByText('Conditional')).not.toBeInTheDocument()
     })
 
@@ -1009,7 +1019,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByPlaceholderText('Field')).toHaveValue('')
+      expect(screen.getByPlaceholderText('Field'))!.toHaveValue('')
     })
 
     // Radio with disabled=true in edit mode for __model_type
@@ -1066,7 +1076,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Select Tools')).toBeInTheDocument()
+      expect(screen.getByText('Select Tools'))!.toBeInTheDocument()
     })
 
     // Override with non-matching type: falls through to default
@@ -1095,7 +1105,7 @@ describe('Form', () => {
       )
 
       expect(screen.queryByText('Override Hit')).not.toBeInTheDocument()
-      expect(screen.getByPlaceholderText('Secret Field')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Secret Field'))!.toBeInTheDocument()
     })
 
     // Select with isShowDefaultValue: null value shows default
@@ -1123,7 +1133,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Select B')).toBeInTheDocument()
+      expect(screen.getByText('Select B'))!.toBeInTheDocument()
     })
 
     // Select with isShowDefaultValue: undefined value shows default
@@ -1151,7 +1161,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Select A')).toBeInTheDocument()
+      expect(screen.getByText('Select A'))!.toBeInTheDocument()
     })
 
     // No fieldMoreInfo: should not crash
@@ -1177,7 +1187,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByPlaceholderText('Field 1')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Field 1'))!.toBeInTheDocument()
     })
 
     it('should render tooltip when schema has tooltip property', () => {
@@ -1220,10 +1230,10 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('API Key')).toBeInTheDocument()
-      expect(screen.getByText('Region')).toBeInTheDocument()
-      expect(screen.getByText('Model')).toBeInTheDocument()
-      expect(screen.getByText('Agree')).toBeInTheDocument()
+      expect(screen.getByText('API Key'))!.toBeInTheDocument()
+      expect(screen.getByText('Region'))!.toBeInTheDocument()
+      expect(screen.getByText('Model'))!.toBeInTheDocument()
+      expect(screen.getByText('Agree'))!.toBeInTheDocument()
     })
 
     it('should render required asterisk for radio, select, checkbox, and other field types', () => {
@@ -1319,7 +1329,7 @@ describe('Form', () => {
       )
 
       fireEvent.click(screen.getByText('Option B'))
-      expect(screen.getByText('Validating...')).toBeInTheDocument()
+      expect(screen.getByText('Validating...'))!.toBeInTheDocument()
     })
 
     it('should render textInput with show_on condition met', () => {
@@ -1345,7 +1355,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByPlaceholderText('Conditional')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Conditional'))!.toBeInTheDocument()
     })
 
     it('should render radio with show_on condition met', () => {
@@ -1370,7 +1380,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Cond Radio')).toBeInTheDocument()
+      expect(screen.getByText('Cond Radio'))!.toBeInTheDocument()
     })
 
     it('should proceed with onChange when isEditMode is true but key is not locked', () => {
@@ -1424,6 +1434,37 @@ describe('Form', () => {
         />,
       )
 
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
+      // Should not crash - the field simply doesn't render
       // Should not crash - the field simply doesn't render
       expect(screen.queryByText('Unknown')).not.toBeInTheDocument()
     })
@@ -1452,7 +1493,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Check Extra')).toBeInTheDocument()
+      expect(screen.getByText('Check Extra'))!.toBeInTheDocument()
     })
   })
 
@@ -1497,10 +1538,10 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('API Key Fallback')).toBeInTheDocument()
-      expect(screen.getByText('Region Fallback')).toBeInTheDocument()
-      expect(screen.getByText('Model Fallback')).toBeInTheDocument()
-      expect(screen.getByText('Agree Fallback')).toBeInTheDocument()
+      expect(screen.getByText('API Key Fallback'))!.toBeInTheDocument()
+      expect(screen.getByText('Region Fallback'))!.toBeInTheDocument()
+      expect(screen.getByText('Model Fallback'))!.toBeInTheDocument()
+      expect(screen.getByText('Agree Fallback'))!.toBeInTheDocument()
     })
 
     it('should fallback to en_US for modelSelector, toolSelector, and appSelector labels', () => {
@@ -1542,10 +1583,10 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('ModelSel Fallback')).toBeInTheDocument()
-      expect(screen.getByText('ToolSel Fallback')).toBeInTheDocument()
-      expect(screen.getByText('AppSel Fallback')).toBeInTheDocument()
-      expect(screen.getByText('Any Fallback')).toBeInTheDocument()
+      expect(screen.getByText('ModelSel Fallback'))!.toBeInTheDocument()
+      expect(screen.getByText('ToolSel Fallback'))!.toBeInTheDocument()
+      expect(screen.getByText('AppSel Fallback'))!.toBeInTheDocument()
+      expect(screen.getByText('Any Fallback'))!.toBeInTheDocument()
     })
 
     it('should not change value when __model_type is edited in edit mode', () => {
@@ -1602,7 +1643,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByDisplayValue('actual-value')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('actual-value'))!.toBeInTheDocument()
     })
 
     it('should pass nodeOutputVars and availableNodes to toolSelector', () => {
@@ -1632,7 +1673,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Select Tool')).toBeInTheDocument()
+      expect(screen.getByText('Select Tool'))!.toBeInTheDocument()
       expect(toolSelectorPropsSpy).toHaveBeenCalledWith(expect.objectContaining({
         nodeOutputVars,
         availableNodes,
@@ -1663,7 +1704,7 @@ describe('Form', () => {
         />,
       )
 
-      expect(screen.getByText('Select Model')).toBeInTheDocument()
+      expect(screen.getByText('Select Model'))!.toBeInTheDocument()
       expect(modelSelectorPropsSpy).toHaveBeenCalledWith(expect.objectContaining({
         isAgentStrategy: true,
       }))
@@ -1695,7 +1736,8 @@ describe('Form', () => {
       )
 
       // Assert - should render without crash (value[variable] || [] path taken)
-      expect(screen.getByText('Select Tools')).toBeInTheDocument()
+      // Assert - should render without crash (value[variable] || [] path taken)
+      expect(screen.getByText('Select Tools'))!.toBeInTheDocument()
     })
 
     it('should show ValidatingTip for multiToolSelector field being validated', () => {
@@ -1726,7 +1768,8 @@ describe('Form', () => {
       fireEvent.click(screen.getByText('Select Tools'))
 
       // Assert
-      expect(screen.getByText('Validating...')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Validating...'))!.toBeInTheDocument()
     })
 
     it('should show ValidatingTip for appSelector field being validated', () => {
@@ -1757,7 +1800,8 @@ describe('Form', () => {
       fireEvent.click(screen.getByText('Select App'))
 
       // Assert
-      expect(screen.getByText('Validating...')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Validating...'))!.toBeInTheDocument()
     })
 
     it('should show ValidatingTip for any-type field being validated', () => {
@@ -1789,7 +1833,8 @@ describe('Form', () => {
       fireEvent.click(screen.getByText('Pick Variable'))
 
       // Assert
-      expect(screen.getByText('Validating...')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Validating...'))!.toBeInTheDocument()
     })
 
     it('should use empty string fallback for nodeId in any-type when nodeId is not provided', () => {
@@ -1818,7 +1863,8 @@ describe('Form', () => {
       )
 
       // Assert - should render without crash
-      expect(screen.getByText('Any Field')).toBeInTheDocument()
+      // Assert - should render without crash
+      expect(screen.getByText('Any Field'))!.toBeInTheDocument()
     })
 
     it('should use en_US label fallback for multiToolSelector when language key is missing', () => {
@@ -1849,7 +1895,8 @@ describe('Form', () => {
       )
 
       // Assert - MultipleToolSelector mock renders with the label prop
-      expect(screen.getByText('Select Tools')).toBeInTheDocument()
+      // Assert - MultipleToolSelector mock renders with the label prop
+      expect(screen.getByText('Select Tools'))!.toBeInTheDocument()
     })
 
     it('should show ValidatingTip for select field being validated', () => {
@@ -1882,7 +1929,8 @@ describe('Form', () => {
       fireEvent.click(screen.getByText('Select B'))
 
       // Assert: ValidatingTip shows for the select field
-      expect(screen.getByText('Validating...')).toBeInTheDocument()
+      // Assert: ValidatingTip shows for the select field
+      expect(screen.getByText('Validating...'))!.toBeInTheDocument()
     })
 
     it('should show ValidatingTip for toolSelector field being validated', () => {
@@ -1914,7 +1962,8 @@ describe('Form', () => {
       fireEvent.click(screen.getByText('Select Tool'))
 
       // Assert
-      expect(screen.getByText('Validating...')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Validating...'))!.toBeInTheDocument()
     })
 
     it('should not render customRenderField for a FormTypeEnum value that is unhandled by Form', () => {
diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/index.spec.tsx
index a47b5eb170..a7e85bd9eb 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/index.spec.tsx
@@ -196,10 +196,10 @@ describe('ModelModal', () => {
 
     const predefined = renderModal()
 
-    expect(screen.getByText('common.modelProvider.auth.apiKeyModal.title')).toBeInTheDocument()
-    expect(screen.getByText('common.modelProvider.auth.apiKeyModal.desc')).toBeInTheDocument()
-    expect(screen.getByRole('status')).toBeInTheDocument()
-    expect(screen.getByRole('button', { name: 'common.operation.save' })).toBeDisabled()
+    expect(screen.getByText('common.modelProvider.auth.apiKeyModal.title'))!.toBeInTheDocument()
+    expect(screen.getByText('common.modelProvider.auth.apiKeyModal.desc'))!.toBeInTheDocument()
+    expect(screen.getByRole('status'))!.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.save' }))!.toBeDisabled()
 
     predefined.unmount()
     const customizable = renderModal({ configurateMethod: ConfigurationMethodEnum.customizableModel })
@@ -208,7 +208,7 @@ describe('ModelModal', () => {
 
     mockState.credentialData = { credentials: {}, available_credentials: [] }
     renderModal({ mode: ModelModalModeEnum.configModelCredential, model: { model: 'gpt-4', model_type: ModelTypeEnum.textGeneration } })
-    expect(screen.getByText('common.modelProvider.auth.addModelCredential')).toBeInTheDocument()
+    expect(screen.getByText('common.modelProvider.auth.addModelCredential'))!.toBeInTheDocument()
   })
 
   it('should reveal the credential label when adding a new credential', () => {
@@ -218,7 +218,7 @@ describe('ModelModal', () => {
 
     fireEvent.click(screen.getByText('Add New'))
 
-    expect(screen.getByText('common.modelProvider.auth.modelCredential')).toBeInTheDocument()
+    expect(screen.getByText('common.modelProvider.auth.modelCredential'))!.toBeInTheDocument()
   })
 
   it('should call onCancel when the cancel button is clicked', () => {
@@ -245,7 +245,7 @@ describe('ModelModal', () => {
     const { onCancel } = renderModal({ credential })
 
     const alertDialog = screen.getByRole('alertdialog', { hidden: true })
-    expect(alertDialog).toHaveTextContent('common.modelProvider.confirmDelete')
+    expect(alertDialog)!.toHaveTextContent('common.modelProvider.confirmDelete')
 
     fireEvent.click(within(alertDialog).getByRole('button', { hidden: true, name: 'common.operation.confirm' }))
 
@@ -261,7 +261,7 @@ describe('ModelModal', () => {
       { isCheckValidated: true, values: { __authorization_name__: 'Auth Name', api_key: 'secret' } },
     ]
     const configCustomModel = renderModal({ mode: ModelModalModeEnum.configCustomModel })
-    fireEvent.click(screen.getAllByText('Model Name Change')[0])
+    fireEvent.click(screen.getAllByText('Model Name Change')[0]!)
     fireEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
 
     expect(mockFormState.setFieldValue).toHaveBeenCalledWith('__model_name', 'updated-model')
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/parameter-item.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/parameter-item.spec.tsx
index 8a923d065c..2e928c36cc 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/parameter-item.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/parameter-item.spec.tsx
@@ -68,7 +68,7 @@ describe('ParameterItem', () => {
     const input = screen.getByRole('spinbutton')
     fireEvent.change(input, { target: { value: '1.4' } })
     expect(onChange).toHaveBeenCalledWith(1)
-    expect(screen.getByTestId('slider-btn')).toBeInTheDocument()
+    expect(screen.getByTestId('slider-btn'))!.toBeInTheDocument()
   })
 
   it('should clamp float numeric input to min', () => {
@@ -91,19 +91,19 @@ describe('ParameterItem', () => {
 
   it('should adjust step based on max for int type', () => {
     const { rerender } = render(<ParameterItem parameterRule={createRule({ type: 'int', min: 0, max: 50 })} value={5} />)
-    expect(screen.getByRole('spinbutton')).toHaveAttribute('step', '1')
+    expect(screen.getByRole('spinbutton'))!.toHaveAttribute('step', '1')
 
     rerender(<ParameterItem parameterRule={createRule({ type: 'int', min: 0, max: 500 })} value={50} />)
-    expect(screen.getByRole('spinbutton')).toHaveAttribute('step', '10')
+    expect(screen.getByRole('spinbutton'))!.toHaveAttribute('step', '10')
 
     rerender(<ParameterItem parameterRule={createRule({ type: 'int', min: 0, max: 2000 })} value={50} />)
-    expect(screen.getByRole('spinbutton')).toHaveAttribute('step', '100')
+    expect(screen.getByRole('spinbutton'))!.toHaveAttribute('step', '100')
   })
 
   it('should render int input without slider if min or max is missing', () => {
     render(<ParameterItem parameterRule={createRule({ type: 'int', min: 0 })} value={5} />)
     expect(screen.queryByRole('slider')).not.toBeInTheDocument()
-    expect(screen.getByRole('spinbutton')).toHaveAttribute('step', '0')
+    expect(screen.getByRole('spinbutton'))!.toHaveAttribute('step', '0')
   })
 
   it('should handle slide change and clamp values', () => {
@@ -125,20 +125,20 @@ describe('ParameterItem', () => {
     const onChange = vi.fn()
     const { container } = render(<ParameterItem parameterRule={createRule({ type: 'text' })} value="long text" onChange={onChange} />)
     const textarea = container.querySelector('textarea')!
-    expect(textarea).toBeInTheDocument()
+    expect(textarea)!.toBeInTheDocument()
     fireEvent.change(textarea, { target: { value: 'new long text' } })
     expect(onChange).toHaveBeenCalledWith('new long text')
   })
 
   it('should render select for string with options', () => {
     render(<ParameterItem parameterRule={createRule({ type: 'string', options: ['a', 'b'] })} value="a" />)
-    expect(screen.getByText('a')).toBeInTheDocument()
+    expect(screen.getByText('a'))!.toBeInTheDocument()
   })
 
   it('should render tag input for tag type', () => {
     const onChange = vi.fn()
     render(<ParameterItem parameterRule={createRule({ type: 'tag', tagPlaceholder: { en_US: 'placeholder', zh_Hans: 'placeholder' } })} value={['a']} onChange={onChange} />)
-    expect(screen.getByText('placeholder')).toBeInTheDocument()
+    expect(screen.getByText('placeholder'))!.toBeInTheDocument()
     fireEvent.click(screen.getByTestId('tag-input'))
     expect(onChange).toHaveBeenCalledWith(['tag1', 'tag2'])
   })
@@ -166,17 +166,17 @@ describe('ParameterItem', () => {
 
   it('should use default values if value is undefined', () => {
     const { rerender } = render(<ParameterItem parameterRule={createRule({ type: 'float', default: 0.5 })} />)
-    expect(screen.getByRole('spinbutton')).toHaveValue(0.5)
+    expect(screen.getByRole('spinbutton'))!.toHaveValue(0.5)
 
     rerender(<ParameterItem parameterRule={createRule({ type: 'string', default: 'hello' })} />)
-    expect(screen.getByRole('textbox')).toHaveValue('hello')
+    expect(screen.getByRole('textbox'))!.toHaveValue('hello')
 
     rerender(<ParameterItem parameterRule={createRule({ type: 'boolean', default: true })} />)
-    expect(screen.getByText('True')).toBeInTheDocument()
-    expect(screen.getByText('False')).toBeInTheDocument()
+    expect(screen.getByText('True'))!.toBeInTheDocument()
+    expect(screen.getByText('False'))!.toBeInTheDocument()
 
     rerender(<ParameterItem parameterRule={createRule({ type: 'float' })} />)
-    expect(screen.getByRole('spinbutton')).toHaveValue(0)
+    expect(screen.getByRole('spinbutton'))!.toHaveValue(0)
   })
 
   it('should reset input to actual bound value on blur-sm', () => {
@@ -184,7 +184,7 @@ describe('ParameterItem', () => {
     const input = screen.getByRole('spinbutton')
     fireEvent.change(input, { target: { value: '5' } })
     fireEvent.blur(input)
-    expect(input).toHaveValue(1)
+    expect(input)!.toHaveValue(1)
   })
 
   it('should render no input for unsupported parameter type', () => {
@@ -216,12 +216,12 @@ describe('ParameterItem', () => {
       )
 
       const editor = screen.getByTestId('prompt-editor')
-      expect(editor).toBeInTheDocument()
-      expect(editor).toHaveAttribute('data-has-workflow-vars', 'true')
+      expect(editor)!.toBeInTheDocument()
+      expect(editor)!.toHaveAttribute('data-has-workflow-vars', 'true')
       expect(capturedWorkflowNodesMap).toBeDefined()
-      expect(capturedWorkflowNodesMap!.node1.title).toBe('LLM Node')
-      expect(capturedWorkflowNodesMap!.sys.title).toBe('workflow.blocks.start')
-      expect(capturedWorkflowNodesMap!.sys.type).toBe(BlockEnum.Start)
+      expect(capturedWorkflowNodesMap!.node1!.title).toBe('LLM Node')
+      expect(capturedWorkflowNodesMap!.sys!.title).toBe('workflow.blocks.start')
+      expect(capturedWorkflowNodesMap!.sys!.type).toBe(BlockEnum.Start)
 
       promptEditorOnChange?.('updated text')
       expect(onChange).toHaveBeenCalledWith('updated text')
@@ -241,8 +241,8 @@ describe('ParameterItem', () => {
       )
 
       const editor = screen.getByTestId('prompt-editor')
-      expect(editor).toBeInTheDocument()
-      expect(editor).toHaveAttribute('data-has-workflow-vars', 'true')
+      expect(editor)!.toBeInTheDocument()
+      expect(editor)!.toHaveAttribute('data-has-workflow-vars', 'true')
       expect(capturedWorkflowNodesMap).toBeDefined()
 
       promptEditorOnChange?.('new long text')
@@ -258,7 +258,7 @@ describe('ParameterItem', () => {
       )
 
       expect(screen.queryByTestId('prompt-editor')).not.toBeInTheDocument()
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should return undefined workflowNodesMap when not in workflow mode', () => {
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup-item.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup-item.spec.tsx
index 050bb099d8..6728791120 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup-item.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup-item.spec.tsx
@@ -185,7 +185,7 @@ describe('PopupItem', () => {
 
     expect(mockSetShowModelModal).toHaveBeenCalled()
 
-    const call = mockSetShowModelModal.mock.calls[0][0] as { onSaveCallback?: () => void }
+    const call = mockSetShowModelModal.mock.calls[0]![0] as { onSaveCallback?: () => void }
     call.onSaveCallback?.()
 
     expect(mockUpdateModelProviders).toHaveBeenCalled()
@@ -220,7 +220,7 @@ describe('PopupItem', () => {
       />,
     )
 
-    expect(screen.getByText('GPT-4')).toBeInTheDocument()
+    expect(screen.getByText('GPT-4'))!.toBeInTheDocument()
   })
 
   it('should fall back to english labels when the current language is unavailable', () => {
@@ -237,14 +237,14 @@ describe('PopupItem', () => {
       />,
     )
 
-    expect(screen.getByText('OpenAI only')).toBeInTheDocument()
-    expect(screen.getByText('GPT-4 only')).toBeInTheDocument()
+    expect(screen.getByText('OpenAI only'))!.toBeInTheDocument()
+    expect(screen.getByText('GPT-4 only'))!.toBeInTheDocument()
   })
 
   it('should toggle collapsed state when clicking provider header', () => {
     render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
 
-    expect(screen.getByText('GPT-4')).toBeInTheDocument()
+    expect(screen.getByText('GPT-4'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText('OpenAI'))
 
@@ -252,13 +252,13 @@ describe('PopupItem', () => {
 
     fireEvent.click(screen.getByText('OpenAI'))
 
-    expect(screen.getByText('GPT-4')).toBeInTheDocument()
+    expect(screen.getByText('GPT-4'))!.toBeInTheDocument()
   })
 
   it('should show credential name when using custom provider', () => {
     render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
 
-    expect(screen.getByText('my-api-key')).toBeInTheDocument()
+    expect(screen.getByText('my-api-key'))!.toBeInTheDocument()
   })
 
   it('should render the inactive credential badge when the api key is not active', () => {
@@ -275,7 +275,7 @@ describe('PopupItem', () => {
 
     render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
 
-    expect(screen.getByText('stale-key')).toBeInTheDocument()
+    expect(screen.getByText('stale-key'))!.toBeInTheDocument()
     expect(document.querySelector('.bg-components-badge-status-light-error-bg')).not.toBeNull()
   })
 
@@ -301,7 +301,7 @@ describe('PopupItem', () => {
 
     render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
 
-    expect(screen.getByText(/modelProvider\.selector\.configureRequired/)).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.selector\.configureRequired/))!.toBeInTheDocument()
   })
 
   it('should show credits info when using system provider with remaining credits', () => {
@@ -323,7 +323,7 @@ describe('PopupItem', () => {
 
     render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
 
-    expect(screen.getByText(/modelProvider\.selector\.aiCredits/)).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.selector\.aiCredits/))!.toBeInTheDocument()
   })
 
   it('should show credits exhausted when system provider has no credits', () => {
@@ -348,7 +348,7 @@ describe('PopupItem', () => {
 
     render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
 
-    expect(screen.getByText(/modelProvider\.selector\.creditsExhausted/)).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.selector\.creditsExhausted/))!.toBeInTheDocument()
   })
 
   it('should close the dropdown through dropdown content callbacks', () => {
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup.spec.tsx
index dee16e394e..61d6bb4466 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup.spec.tsx
@@ -191,14 +191,14 @@ describe('Popup', () => {
       />,
     )
 
-    expect(screen.getByText('openai')).toBeInTheDocument()
+    expect(screen.getByText('openai'))!.toBeInTheDocument()
 
     const input = screen.getByPlaceholderText('datasetSettings.form.searchModel')
     fireEvent.change(input, { target: { value: 'not-found' } })
-    expect(screen.getByText('No model found for \u201Cnot-found\u201D')).toBeInTheDocument()
+    expect(screen.getByText('No model found for \u201Cnot-found\u201D'))!.toBeInTheDocument()
 
     const clearIcon = container.querySelector('.i-custom-vender-solid-general-x-circle')
-    expect(clearIcon).toBeInTheDocument()
+    expect(clearIcon)!.toBeInTheDocument()
     fireEvent.click(clearIcon!)
     expect((input as HTMLInputElement).value).toBe('')
   })
@@ -225,9 +225,9 @@ describe('Popup', () => {
       />,
     )
 
-    expect(screen.getByTestId('compatible-models-banner')).toBeInTheDocument()
-    expect(screen.getByText('common.modelProvider.selector.onlyCompatibleModelsShown')).toBeInTheDocument()
-    expect(container.querySelector('.i-ri-information-2-fill')).toBeInTheDocument()
+    expect(screen.getByTestId('compatible-models-banner'))!.toBeInTheDocument()
+    expect(screen.getByText('common.modelProvider.selector.onlyCompatibleModelsShown'))!.toBeInTheDocument()
+    expect(container.querySelector('.i-ri-information-2-fill'))!.toBeInTheDocument()
   })
 
   it('should filter by scope features including toolCall and non-toolCall checks', () => {
@@ -244,7 +244,7 @@ describe('Popup', () => {
         scopeFeatures={[ModelFeatureEnum.toolCall, ModelFeatureEnum.vision]}
       />,
     )
-    expect(screen.getByText('No model found for \u201C\u201D')).toBeInTheDocument()
+    expect(screen.getByText('No model found for \u201C\u201D'))!.toBeInTheDocument()
 
     unmount()
     mockSupportFunctionCall.mockReturnValue(true)
@@ -256,7 +256,7 @@ describe('Popup', () => {
         scopeFeatures={[ModelFeatureEnum.toolCall, ModelFeatureEnum.vision]}
       />,
     )
-    expect(screen.getByText('openai')).toBeInTheDocument()
+    expect(screen.getByText('openai'))!.toBeInTheDocument()
 
     unmount2()
     const { unmount: unmount3 } = render(
@@ -267,7 +267,7 @@ describe('Popup', () => {
         scopeFeatures={[ModelFeatureEnum.vision]}
       />,
     )
-    expect(screen.getByText('openai')).toBeInTheDocument()
+    expect(screen.getByText('openai'))!.toBeInTheDocument()
 
     unmount3()
     render(
@@ -278,7 +278,7 @@ describe('Popup', () => {
         scopeFeatures={[ModelFeatureEnum.vision]}
       />,
     )
-    expect(screen.getByText('No model found for \u201C\u201D')).toBeInTheDocument()
+    expect(screen.getByText('No model found for \u201C\u201D'))!.toBeInTheDocument()
   })
 
   it('should match model labels from fallback languages when current language key is missing', () => {
@@ -305,7 +305,7 @@ describe('Popup', () => {
       { target: { value: 'openai' } },
     )
 
-    expect(screen.getByText('openai')).toBeInTheDocument()
+    expect(screen.getByText('openai'))!.toBeInTheDocument()
   })
 
   it('should show credits exhausted alert when an exhausted provider supports credits', () => {
@@ -331,7 +331,7 @@ describe('Popup', () => {
       />,
     )
 
-    expect(screen.getByTestId('credits-exhausted-alert')).toHaveAttribute('data-has-api-key-fallback', 'false')
+    expect(screen.getByTestId('credits-exhausted-alert'))!.toHaveAttribute('data-has-api-key-fallback', 'false')
   })
 
   it('should not show credits exhausted alert when only non-trial system providers are exhausted', () => {
@@ -419,8 +419,8 @@ describe('Popup', () => {
       />,
     )
 
-    expect(screen.getByText(/modelProvider\.selector\.noProviderConfigured(?!Desc)/)).toBeInTheDocument()
-    expect(screen.getByText(/modelProvider\.selector\.noProviderConfiguredDesc/)).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.selector\.noProviderConfigured(?!Desc)/))!.toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.selector\.noProviderConfiguredDesc/))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText(/modelProvider\.selector\.configure/))
     expect(onHide).toHaveBeenCalled()
@@ -441,9 +441,9 @@ describe('Popup', () => {
     )
 
     expect(screen.queryByText('TestOpenAI')).not.toBeInTheDocument()
-    expect(screen.getByText('TestAnthropic')).toBeInTheDocument()
-    expect(screen.getByText(/modelProvider\.selector\.fromMarketplace/)).toBeInTheDocument()
-    expect(screen.getByText(/modelProvider\.selector\.discoverMoreInMarketplace/)).toBeInTheDocument()
+    expect(screen.getByText('TestAnthropic'))!.toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.selector\.fromMarketplace/))!.toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.selector\.discoverMoreInMarketplace/))!.toBeInTheDocument()
   })
 
   it('should show installed marketplace providers without models when AI credits are available', () => {
@@ -462,8 +462,8 @@ describe('Popup', () => {
       />,
     )
 
-    expect(screen.getByText('test-anthropic')).toBeInTheDocument()
-    expect(screen.getByText('TestOpenAI')).toBeInTheDocument()
+    expect(screen.getByText('test-anthropic'))!.toBeInTheDocument()
+    expect(screen.getByText('TestOpenAI'))!.toBeInTheDocument()
   })
 
   it('should hide installed marketplace providers without models when AI credits are exhausted', () => {
@@ -489,7 +489,7 @@ describe('Popup', () => {
 
     expect(screen.queryByText('test-anthropic')).not.toBeInTheDocument()
     expect(screen.queryByText('TestAnthropic')).not.toBeInTheDocument()
-    expect(screen.getByText('TestOpenAI')).toBeInTheDocument()
+    expect(screen.getByText('TestOpenAI'))!.toBeInTheDocument()
   })
 
   it('should toggle marketplace section collapse', () => {
@@ -501,7 +501,7 @@ describe('Popup', () => {
       />,
     )
 
-    expect(screen.getByText('TestOpenAI')).toBeInTheDocument()
+    expect(screen.getByText('TestOpenAI'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText(/modelProvider\.selector\.fromMarketplace/))
 
@@ -509,7 +509,7 @@ describe('Popup', () => {
 
     fireEvent.click(screen.getByText(/modelProvider\.selector\.fromMarketplace/))
 
-    expect(screen.getByText('TestOpenAI')).toBeInTheDocument()
+    expect(screen.getByText('TestOpenAI'))!.toBeInTheDocument()
   })
 
   it('should install plugin when clicking install button', async () => {
@@ -527,7 +527,7 @@ describe('Popup', () => {
     )
 
     const installButtons = screen.getAllByText(/common\.modelProvider\.selector\.install/)
-    fireEvent.click(installButtons[0])
+    fireEvent.click(installButtons[0]!)
 
     await waitFor(() => {
       expect(mockInstallMutateAsync).toHaveBeenCalledWith('langgenius/openai:1.0.0')
@@ -550,7 +550,7 @@ describe('Popup', () => {
     )
 
     const installButtons = screen.getAllByText(/common\.modelProvider\.selector\.install/)
-    fireEvent.click(installButtons[0])
+    fireEvent.click(installButtons[0]!)
 
     await waitFor(() => {
       expect(mockInstallMutateAsync).toHaveBeenCalled()
@@ -576,7 +576,7 @@ describe('Popup', () => {
     )
 
     const installButtons = screen.getAllByText(/common\.modelProvider\.selector\.install/)
-    fireEvent.click(installButtons[0])
+    fireEvent.click(installButtons[0]!)
 
     await waitFor(() => {
       expect(mockCheck).toHaveBeenCalledWith({
@@ -601,7 +601,7 @@ describe('Popup', () => {
       />,
     )
 
-    fireEvent.click(screen.getAllByText(/common\.modelProvider\.selector\.install/)[0])
+    fireEvent.click(screen.getAllByText(/common\.modelProvider\.selector\.install/)[0]!)
 
     await waitFor(() => {
       expect(mockInstallMutateAsync).not.toHaveBeenCalled()
@@ -619,7 +619,7 @@ describe('Popup', () => {
       />,
     )
 
-    fireEvent.click(screen.getAllByText(/common\.modelProvider\.selector\.install/)[0])
+    fireEvent.click(screen.getAllByText(/common\.modelProvider\.selector\.install/)[0]!)
 
     await waitFor(() => {
       expect(mockInstallMutateAsync).not.toHaveBeenCalled()
@@ -640,6 +640,6 @@ describe('Popup', () => {
     )
 
     const providerLabels = screen.getAllByText(/openai|anthropic/)
-    expect(providerLabels[0]).toHaveTextContent('anthropic')
+    expect(providerLabels[0])!.toHaveTextContent('anthropic')
   })
 })
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx
index d1ad017455..e38cc07ca2 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx
@@ -77,7 +77,7 @@ const PopupItem: FC<PopupItemProps> = ({
       onSaveCallback: () => {
         updateModelProviders()
 
-        const modelType = model.models[0].model_type
+        const modelType = model.models[0]!.model_type
 
         if (modelType)
           updateModelList(modelType)
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-list.spec.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-list.spec.tsx
index 70a0cb985a..e435835807 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-list.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-list.spec.tsx
@@ -59,8 +59,8 @@ describe('ModelList', () => {
       />,
     )
     expect(screen.getAllByText(/modelProvider\.modelsNum/).length).toBeGreaterThan(0)
-    expect(screen.getByRole('button', { name: 'gpt-4' })).toBeInTheDocument()
-    expect(screen.getByRole('button', { name: 'gpt-3.5' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'gpt-4' }))!.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'gpt-3.5' }))!.toBeInTheDocument()
   })
 
   it('should trigger collapse when collapsed label is clicked', () => {
@@ -74,7 +74,7 @@ describe('ModelList', () => {
     )
 
     const countElements = screen.getAllByText(/modelProvider\.modelsNum/)
-    fireEvent.click(countElements[1])
+    fireEvent.click(countElements[1]!)
     expect(mockOnCollapse).toHaveBeenCalled()
   })
 
@@ -125,6 +125,37 @@ describe('ModelList', () => {
       />,
     )
 
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
     // Assert
     expect(screen.queryByTestId('manage-credentials')).not.toBeInTheDocument()
     expect(screen.queryByTestId('add-custom-model')).not.toBeInTheDocument()
@@ -143,7 +174,7 @@ describe('ModelList', () => {
     fireEvent.click(screen.getByRole('button', { name: 'gpt-4' }))
     expect(mockSetShowModelLoadBalancingModal).toHaveBeenCalled()
 
-    const callArg = mockSetShowModelLoadBalancingModal.mock.calls[0][0]
+    const callArg = mockSetShowModelLoadBalancingModal.mock.calls[0]![0]
 
     callArg.onSave('test-provider')
     expect(mockOnChange).toHaveBeenCalledWith('test-provider')
@@ -170,6 +201,37 @@ describe('ModelList', () => {
       />,
     )
 
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
+    // Assert
     // Assert
     expect(screen.queryByTestId('manage-credentials')).not.toBeInTheDocument()
     expect(screen.queryByTestId('add-custom-model')).not.toBeInTheDocument()
@@ -195,8 +257,9 @@ describe('ModelList', () => {
     )
 
     // Assert: custom model actions are shown (isConfigurable=true && isCurrentWorkspaceManager=true)
-    expect(screen.getByTestId('manage-credentials')).toBeInTheDocument()
-    expect(screen.getByTestId('add-custom-model')).toBeInTheDocument()
+    // Assert: custom model actions are shown (isConfigurable=true && isCurrentWorkspaceManager=true)
+    expect(screen.getByTestId('manage-credentials'))!.toBeInTheDocument()
+    expect(screen.getByTestId('add-custom-model'))!.toBeInTheDocument()
   })
 
   it('should hide custom model actions when provider is configurable but user is not workspace manager', () => {
@@ -218,6 +281,37 @@ describe('ModelList', () => {
       />,
     )
 
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
+    // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
     // Assert: custom model actions are hidden (isCurrentWorkspaceManager=false covers the && short-circuit)
     expect(screen.queryByTestId('manage-credentials')).not.toBeInTheDocument()
     expect(screen.queryByTestId('add-custom-model')).not.toBeInTheDocument()
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-load-balancing-modal.spec.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-load-balancing-modal.spec.tsx
index c7368a2a54..eedc04115c 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-load-balancing-modal.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-load-balancing-modal.spec.tsx
@@ -180,7 +180,7 @@ describe('ModelLoadBalancingModal', () => {
       />,
     )
 
-    expect(screen.getByRole('status')).toBeInTheDocument()
+    expect(screen.getByRole('status'))!.toBeInTheDocument()
   })
 
   it('should render predefined model content', () => {
@@ -193,9 +193,9 @@ describe('ModelLoadBalancingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/modelProvider\.auth\.configLoadBalancing/)).toBeInTheDocument()
-    expect(screen.getByText(/modelProvider\.auth\.providerManaged$/)).toBeInTheDocument()
-    expect(screen.getByText(/operation\.save/)).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.auth\.configLoadBalancing/))!.toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.auth\.providerManaged$/))!.toBeInTheDocument()
+    expect(screen.getByText(/operation\.save/))!.toBeInTheDocument()
   })
 
   it('should render custom model actions and close when update has no credentials', async () => {
@@ -211,8 +211,8 @@ describe('ModelLoadBalancingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/modelProvider\.auth\.removeModel/)).toBeInTheDocument()
-    expect(screen.getByRole('button', { name: 'switch credential' })).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.auth\.removeModel/))!.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'switch credential' }))!.toBeInTheDocument()
     await user.click(screen.getByRole('button', { name: 'config add credential' }))
     await waitFor(() => {
       expect(onClose).toHaveBeenCalled()
@@ -241,8 +241,8 @@ describe('ModelLoadBalancingModal', () => {
     await waitFor(() => {
       expect(mockRefetch).toHaveBeenCalled()
       expect(mockMutateAsync).toHaveBeenCalled()
-      const payload = mockMutateAsync.mock.calls[0][0] as { load_balancing: { configs: Array<{ credentials: { api_key: string } }> } }
-      expect(payload.load_balancing.configs[0].credentials.api_key).toBe('[__HIDDEN__]')
+      const payload = mockMutateAsync.mock.calls[0]![0] as { load_balancing: { configs: Array<{ credentials: { api_key: string } }> } }
+      expect(payload.load_balancing.configs[0]!.credentials.api_key).toBe('[__HIDDEN__]')
       expect(mockNotify).toHaveBeenCalled()
       expect(mockHandleRefreshModel).toHaveBeenCalled()
       expect(onSave).toHaveBeenCalledWith('test-provider')
@@ -313,7 +313,7 @@ describe('ModelLoadBalancingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/modelProvider\.auth\.configModel/)).toBeInTheDocument()
+    expect(screen.getByText(/modelProvider\.auth\.configModel/))!.toBeInTheDocument()
   })
 
   // Modal hidden when open=false
@@ -409,7 +409,7 @@ describe('ModelLoadBalancingModal', () => {
       />,
     )
 
-    expect(screen.getByRole('button', { name: 'switch credential' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'switch credential' }))!.toBeInTheDocument()
   })
 
   it('should disable save button when less than 2 configs are enabled', () => {
@@ -433,7 +433,7 @@ describe('ModelLoadBalancingModal', () => {
       />,
     )
 
-    expect(screen.getByText(/operation\.save/)).toBeDisabled()
+    expect(screen.getByText(/operation\.save/))!.toBeDisabled()
   })
 
   it('should encode config entry without id as non-hidden value', async () => {
@@ -463,9 +463,9 @@ describe('ModelLoadBalancingModal', () => {
 
     await waitFor(() => {
       expect(mockMutateAsync).toHaveBeenCalled()
-      const payload = mockMutateAsync.mock.calls[0][0] as { load_balancing: { configs: Array<{ credentials: { api_key: string } }> } }
+      const payload = mockMutateAsync.mock.calls[0]![0] as { load_balancing: { configs: Array<{ credentials: { api_key: string } }> } }
       // Entry without id should NOT be encoded as hidden
-      expect(payload.load_balancing.configs[0].credentials.api_key).toBe('new-key')
+      expect(payload.load_balancing.configs[0]!.credentials.api_key).toBe('new-key')
     })
   })
 
@@ -536,7 +536,7 @@ describe('ModelLoadBalancingModal', () => {
     await waitFor(() => {
       expect(mockMutateAsync).toHaveBeenCalled()
       // The payload configs should only have the original 2 entries (no new one added)
-      const payload = mockMutateAsync.mock.calls[0][0] as { load_balancing: { configs: unknown[] } }
+      const payload = mockMutateAsync.mock.calls[0]![0] as { load_balancing: { configs: unknown[] } }
       expect(payload.load_balancing.configs).toHaveLength(2)
     })
   })
@@ -552,14 +552,16 @@ describe('ModelLoadBalancingModal', () => {
     )
 
     // draftConfig.enabled=true → title shows configLoadBalancing
-    expect(screen.getByText(/modelProvider\.auth\.configLoadBalancing/)).toBeInTheDocument()
+    // draftConfig.enabled=true → title shows configLoadBalancing
+    expect(screen.getByText(/modelProvider\.auth\.configLoadBalancing/))!.toBeInTheDocument()
 
     // Clicking the card when enabled=true toggles to disabled
     const card = screen.getByText(/modelProvider\.auth\.providerManaged$/).closest('div[class]')!.closest('div[class]')!
     await user.click(card)
 
     // After toggling, title should show configModel (disabled state)
-    expect(screen.getByText(/modelProvider\.auth\.configModel/)).toBeInTheDocument()
+    // After toggling, title should show configModel (disabled state)
+    expect(screen.getByText(/modelProvider\.auth\.configModel/))!.toBeInTheDocument()
   })
 
   it('should use customModelCredential credential_id when present in handleSave', async () => {
@@ -589,7 +591,7 @@ describe('ModelLoadBalancingModal', () => {
 
     await waitFor(() => {
       expect(mockMutateAsync).toHaveBeenCalled()
-      const payload = mockMutateAsync.mock.calls[0][0] as { credential_id: string }
+      const payload = mockMutateAsync.mock.calls[0]![0] as { credential_id: string }
       // credential_id should come from customModelCredential
       expect(payload.credential_id).toBe('cred-1')
     })
@@ -665,7 +667,8 @@ describe('ModelLoadBalancingModal', () => {
     )
 
     // Assert: component renders without error (extendedSecretFormSchemas = [])
-    expect(screen.getByText(/modelProvider\.auth\.configLoadBalancing/)).toBeInTheDocument()
+    // Assert: component renders without error (extendedSecretFormSchemas = [])
+    expect(screen.getByText(/modelProvider\.auth\.configLoadBalancing/))!.toBeInTheDocument()
   })
 
   it('should use custom model credential schema without fallback when credential_form_schemas is undefined', () => {
@@ -727,7 +730,7 @@ describe('ModelLoadBalancingModal', () => {
 
     await waitFor(() => {
       expect(mockMutateAsync).toHaveBeenCalled()
-      const payload = mockMutateAsync.mock.calls[0][0] as { load_balancing: { configs: unknown[] } }
+      const payload = mockMutateAsync.mock.calls[0]![0] as { load_balancing: { configs: unknown[] } }
       // Config count unchanged (still 2 from original)
       expect(payload.load_balancing.configs).toHaveLength(2)
     })
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/usage-priority-section.spec.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/usage-priority-section.spec.tsx
index 20ef9cf066..c400d05f22 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/usage-priority-section.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/usage-priority-section.spec.tsx
@@ -14,7 +14,7 @@ describe('UsagePrioritySection', () => {
     it('should render title and both option buttons', () => {
       render(<UsagePrioritySection value="credits" onSelect={onSelect} />)
 
-      expect(screen.getByText(/usagePriority/)).toBeInTheDocument()
+      expect(screen.getByText(/usagePriority/))!.toBeInTheDocument()
       expect(screen.getAllByRole('button')).toHaveLength(2)
     })
   })
@@ -25,23 +25,23 @@ describe('UsagePrioritySection', () => {
       render(<UsagePrioritySection value="credits" onSelect={onSelect} />)
 
       const buttons = screen.getAllByRole('button')
-      expect(buttons[0].className).toContain('border-components-option-card-option-selected-border')
-      expect(buttons[1].className).not.toContain('border-components-option-card-option-selected-border')
+      expect(buttons[0]!.className).toContain('border-components-option-card-option-selected-border')
+      expect(buttons[1]!.className).not.toContain('border-components-option-card-option-selected-border')
     })
 
     it('should highlight API key option when value is apiKey', () => {
       render(<UsagePrioritySection value="apiKey" onSelect={onSelect} />)
 
       const buttons = screen.getAllByRole('button')
-      expect(buttons[0].className).not.toContain('border-components-option-card-option-selected-border')
-      expect(buttons[1].className).toContain('border-components-option-card-option-selected-border')
+      expect(buttons[0]!.className).not.toContain('border-components-option-card-option-selected-border')
+      expect(buttons[1]!.className).toContain('border-components-option-card-option-selected-border')
     })
 
     it('should highlight API key option when value is apiKeyOnly', () => {
       render(<UsagePrioritySection value="apiKeyOnly" onSelect={onSelect} />)
 
       const buttons = screen.getAllByRole('button')
-      expect(buttons[1].className).toContain('border-components-option-card-option-selected-border')
+      expect(buttons[1]!.className).toContain('border-components-option-card-option-selected-border')
     })
   })
 
@@ -50,7 +50,7 @@ describe('UsagePrioritySection', () => {
     it('should call onSelect with system when clicking AI credits option', () => {
       render(<UsagePrioritySection value="apiKey" onSelect={onSelect} />)
 
-      fireEvent.click(screen.getAllByRole('button')[0])
+      fireEvent.click(screen.getAllByRole('button')[0]!)
 
       expect(onSelect).toHaveBeenCalledWith(PreferredProviderTypeEnum.system)
     })
@@ -58,7 +58,7 @@ describe('UsagePrioritySection', () => {
     it('should call onSelect with custom when clicking API key option', () => {
       render(<UsagePrioritySection value="credits" onSelect={onSelect} />)
 
-      fireEvent.click(screen.getAllByRole('button')[1])
+      fireEvent.click(screen.getAllByRole('button')[1]!)
 
       expect(onSelect).toHaveBeenCalledWith(PreferredProviderTypeEnum.custom)
     })
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/use-activate-credential.spec.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/use-activate-credential.spec.tsx
index c38d783e73..12acf479c0 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/use-activate-credential.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/use-activate-credential.spec.tsx
@@ -92,7 +92,7 @@ describe('useActivateCredential', () => {
       }),
     )
 
-    const [, callbacks] = mockMutate.mock.calls[0]
+    const [, callbacks] = (mockMutate.mock.calls[0] ?? []) as [unknown, any]
 
     act(() => {
       callbacks.onSuccess()
@@ -113,7 +113,7 @@ describe('useActivateCredential', () => {
 
     expect(result.current.selectedCredentialId).toBe('cred-2')
 
-    const [, callbacks] = mockMutate.mock.calls[0]
+    const [, callbacks] = (mockMutate.mock.calls[0] ?? []) as [unknown, any]
 
     act(() => {
       callbacks.onError()
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx
index 7fd1618d64..ea4edace30 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx
@@ -64,7 +64,7 @@ const ModelLoadBalancingConfigs = ({
         if (!prev)
           return prev
         const newConfigs = [...prev.configs]
-        const modifiedConfig = modifier(newConfigs[index])
+        const modifiedConfig = modifier(newConfigs[index]!)
         if (modifiedConfig)
           newConfigs[index] = modifiedConfig
         else
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx
index 3556777395..652630be67 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx
@@ -164,7 +164,7 @@ const ModelLoadBalancingModal = ({ provider, configurateMethod, currentCustomCon
         const prevIndex = newConfigs.findIndex(item => item.credential_id === modelCredential.credential_id && item.name !== '__inherit__')
         const newIndex = available_credentials.findIndex(c => c.credential_id === modelCredential.credential_id)
         if (newIndex > -1 && prevIndex > -1)
-          newConfigs[prevIndex].name = available_credentials[newIndex].credential_name || ''
+          newConfigs[prevIndex]!.name = available_credentials[newIndex]!.credential_name || ''
         return {
           ...prev,
           configs: newConfigs,
diff --git a/web/app/components/header/account-setting/plugin-page/index.tsx b/web/app/components/header/account-setting/plugin-page/index.tsx
index a71c3ee072..7f8e9a32f7 100644
--- a/web/app/components/header/account-setting/plugin-page/index.tsx
+++ b/web/app/components/header/account-setting/plugin-page/index.tsx
@@ -16,7 +16,7 @@ const PluginPage = () => {
   return (
     <div className="pb-7">
       <div>
-        {plugins?.map(plugin => Plugin_MAP[plugin.tool_name](plugin))}
+        {plugins?.map(plugin => Plugin_MAP[plugin.tool_name]!(plugin))}
       </div>
       <div className="fixed bottom-0 flex h-[42px] w-[472px] items-center bg-white text-xs text-gray-500">
         <LockClosedIcon className="mr-1 h-3 w-3" />
diff --git a/web/app/components/header/app-nav/index.tsx b/web/app/components/header/app-nav/index.tsx
index 54ddf75711..2e7a77a891 100644
--- a/web/app/components/header/app-nav/index.tsx
+++ b/web/app/components/header/app-nav/index.tsx
@@ -93,7 +93,7 @@ const AppNav = () => {
       const newNavItems = produce(navItems, (draft: NavItem[]) => {
         navItems.forEach((app, index) => {
           if (app.id === appDetail.id)
-            draft[index].name = appDetail.name
+            draft[index]!.name = appDetail.name
         })
       })
       setNavItems(newNavItems)
diff --git a/web/app/components/header/app-selector/__tests__/index.spec.tsx b/web/app/components/header/app-selector/__tests__/index.spec.tsx
index eddb7e52aa..2d255c006e 100644
--- a/web/app/components/header/app-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/app-selector/__tests__/index.spec.tsx
@@ -32,7 +32,7 @@ describe('AppSelector Component', () => {
     { id: '1', name: 'App 1' },
     { id: '2', name: 'App 2' },
   ] as unknown as AppDetailResponse[]
-  const mockCurApp = mockAppItems[0]
+  const mockCurApp = mockAppItems[0]!
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -47,7 +47,7 @@ describe('AppSelector Component', () => {
   describe('Rendering', () => {
     it('should render current app name', () => {
       render(<AppSelector appItems={mockAppItems} curApp={mockCurApp} />)
-      expect(screen.getByText('App 1')).toBeInTheDocument()
+      expect(screen.getByText('App 1'))!.toBeInTheDocument()
     })
   })
 
@@ -60,7 +60,7 @@ describe('AppSelector Component', () => {
         fireEvent.click(button)
       })
 
-      expect(screen.getByText('App 2')).toBeInTheDocument()
+      expect(screen.getByText('App 2'))!.toBeInTheDocument()
     })
 
     it('should navigate to configuration when an app is clicked and user is editor', async () => {
@@ -114,7 +114,7 @@ describe('AppSelector Component', () => {
         fireEvent.click(newAppBtn)
       })
 
-      expect(screen.getByTestId('create-app-dialog')).toBeInTheDocument()
+      expect(screen.getByTestId('create-app-dialog'))!.toBeInTheDocument()
     })
 
     it('should not show "New App" button for non-editor', async () => {
@@ -165,7 +165,8 @@ describe('AppSelector Component', () => {
 
       expect(screen.queryByText('App 2')).not.toBeInTheDocument()
       // "New App" should still be there if editor
-      expect(screen.getByText('common.menus.newApp')).toBeInTheDocument()
+      // "New App" should still be there if editor
+      expect(screen.getByText('common.menus.newApp'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/header/nav/nav-selector/__tests__/index.spec.tsx b/web/app/components/header/nav/nav-selector/__tests__/index.spec.tsx
index 152901b79c..97443bb759 100644
--- a/web/app/components/header/nav/nav-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/nav/nav-selector/__tests__/index.spec.tsx
@@ -105,7 +105,7 @@ describe('NavSelector Component', () => {
     },
   ]
 
-  const { link: _link, ...curNavWithoutLink } = navigationItems[0]
+  const { link: _link, ...curNavWithoutLink } = navigationItems[0]!
 
   const defaultProps: INavSelectorProps = {
     curNav: curNavWithoutLink,
@@ -131,7 +131,7 @@ describe('NavSelector Component', () => {
   describe('Rendering', () => {
     it('should render current nav name', () => {
       render(<NavSelector {...defaultProps} />)
-      expect(screen.getByText('Item 1')).toBeInTheDocument()
+      expect(screen.getByText('Item 1'))!.toBeInTheDocument()
     })
 
     it('should show loading indicator when isLoadingMore is true', async () => {
@@ -140,7 +140,7 @@ describe('NavSelector Component', () => {
       await act(async () => {
         fireEvent.click(button)
       })
-      expect(screen.getByRole('status')).toBeInTheDocument()
+      expect(screen.getByRole('status'))!.toBeInTheDocument()
     })
   })
 
@@ -151,7 +151,7 @@ describe('NavSelector Component', () => {
       await act(async () => {
         fireEvent.click(button)
       })
-      expect(screen.getByText('Item 2')).toBeInTheDocument()
+      expect(screen.getByText('Item 2'))!.toBeInTheDocument()
     })
 
     it('should navigate and call setAppDetail when an item is clicked', async () => {
diff --git a/web/app/components/plugins/__tests__/hooks.spec.ts b/web/app/components/plugins/__tests__/hooks.spec.ts
index b12121d626..1e4f18ec5d 100644
--- a/web/app/components/plugins/__tests__/hooks.spec.ts
+++ b/web/app/components/plugins/__tests__/hooks.spec.ts
@@ -86,15 +86,15 @@ describe('useCategories', () => {
     it('should use plural labels by default', () => {
       const { result } = renderHook(() => useCategories())
 
-      expect(result.current.categoriesMap.tool.label).toBe('plugin.category.tools')
-      expect(result.current.categoriesMap['agent-strategy'].label).toBe('plugin.category.agents')
+      expect(result.current.categoriesMap.tool!.label).toBe('plugin.category.tools')
+      expect(result.current.categoriesMap['agent-strategy']!.label).toBe('plugin.category.agents')
     })
 
     it('should use singular labels when isSingle is true', () => {
       const { result } = renderHook(() => useCategories(true))
 
-      expect(result.current.categoriesMap.tool.label).toBe('plugin.categorySingle.tool')
-      expect(result.current.categoriesMap['agent-strategy'].label).toBe('plugin.categorySingle.agent')
+      expect(result.current.categoriesMap.tool!.label).toBe('plugin.categorySingle.tool')
+      expect(result.current.categoriesMap['agent-strategy']!.label).toBe('plugin.categorySingle.agent')
     })
   })
 
diff --git a/web/app/components/plugins/card/index.tsx b/web/app/components/plugins/card/index.tsx
index 9f9b89cbbf..dd7f92184d 100644
--- a/web/app/components/plugins/card/index.tsx
+++ b/web/app/components/plugins/card/index.tsx
@@ -77,7 +77,7 @@ const Card = ({
   return (
     <div className={wrapClassName}>
       <div className={cn('p-4 pb-3', limitedInstall && 'pb-1')}>
-        {!hideCornerMark && <CornerMark text={categoriesMap[type === 'bundle' ? type : category]?.label} />}
+        {!hideCornerMark && <CornerMark text={categoriesMap[type === 'bundle' ? type : category]?.label!} />}
         {/* Header */}
         <div className="flex">
           <Icon src={iconSrc} installed={installed} installFailed={installFailed} />
diff --git a/web/app/components/plugins/install-plugin/hooks.ts b/web/app/components/plugins/install-plugin/hooks.ts
index f86e6ad672..4759953e30 100644
--- a/web/app/components/plugins/install-plugin/hooks.ts
+++ b/web/app/components/plugins/install-plugin/hooks.ts
@@ -52,7 +52,7 @@ export const checkForUpdates = (fetchedReleases: GitHubRepoReleaseResponse[], cu
   const versions = fetchedReleases.map(release => release.tag_name)
   const latestVersion = getLatestVersion(versions)
   try {
-    needUpdate = compareVersion(latestVersion, currentVersion) === 1
+    needUpdate = compareVersion(latestVersion!, currentVersion) === 1
     if (needUpdate)
       toastProps.message = `New version available: ${latestVersion}`
   }
diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install-multi.spec.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install-multi.spec.tsx
index 4507c1295b..d45b05bfd1 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install-multi.spec.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install-multi.spec.tsx
@@ -260,14 +260,14 @@ describe('InstallMulti Component', () => {
     it('should render without crashing', () => {
       render(<InstallMulti {...defaultProps} />)
 
-      expect(screen.getByTestId('package-item')).toBeInTheDocument()
+      expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
     })
 
     it('should render PackageItem for package type dependency', () => {
       render(<InstallMulti {...defaultProps} />)
 
-      expect(screen.getByTestId('package-item')).toBeInTheDocument()
-      expect(screen.getByTestId('package-item-name')).toHaveTextContent('Package Plugin 0')
+      expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
+      expect(screen.getByTestId('package-item-name'))!.toHaveTextContent('Package Plugin 0')
     })
 
     it('should render GithubItem for github type dependency', async () => {
@@ -279,9 +279,9 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...githubProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('github-item')).toBeInTheDocument()
+        expect(screen.getByTestId('github-item'))!.toBeInTheDocument()
       })
-      expect(screen.getByTestId('github-item-repo')).toHaveTextContent('test-org/plugin-0')
+      expect(screen.getByTestId('github-item-repo'))!.toHaveTextContent('test-org/plugin-0')
     })
 
     it('should render MarketplaceItem for marketplace type dependency', async () => {
@@ -293,7 +293,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...marketplaceProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('marketplace-item')).toBeInTheDocument()
+        expect(screen.getByTestId('marketplace-item'))!.toBeInTheDocument()
       })
     })
 
@@ -309,8 +309,8 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...mixedProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('package-item')).toBeInTheDocument()
-        expect(screen.getByTestId('github-item')).toBeInTheDocument()
+        expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
+        expect(screen.getByTestId('github-item'))!.toBeInTheDocument()
       })
     })
 
@@ -328,7 +328,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...githubProps} />)
 
       await waitFor(() => {
-        expect(screen.queryByTestId('github-item')).toBeInTheDocument()
+        expect(screen.queryByTestId('github-item'))!.toBeInTheDocument()
       })
     })
   })
@@ -355,13 +355,13 @@ describe('InstallMulti Component', () => {
 
       render(<InstallMulti {...propsWithSelected} />)
 
-      expect(screen.getByTestId('package-item-checked')).toHaveTextContent('checked')
+      expect(screen.getByTestId('package-item-checked'))!.toHaveTextContent('checked')
     })
 
     it('should show unchecked state when plugin is not selected', () => {
       render(<InstallMulti {...defaultProps} />)
 
-      expect(screen.getByTestId('package-item-checked')).toHaveTextContent('unchecked')
+      expect(screen.getByTestId('package-item-checked'))!.toHaveTextContent('unchecked')
     })
   })
 
@@ -427,7 +427,7 @@ describe('InstallMulti Component', () => {
       // The getVersionInfo function returns hasInstalled, installedVersion, toInstallVersion
       // These are passed to child components
       await waitFor(() => {
-        expect(screen.getByTestId('package-item')).toBeInTheDocument()
+        expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
       })
     })
   })
@@ -443,7 +443,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...githubProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('github-item')).toBeInTheDocument()
+        expect(screen.getByTestId('github-item'))!.toBeInTheDocument()
       })
 
       // The onFetchedPayload callback should have been called by the mock
@@ -462,7 +462,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...marketplaceProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('marketplace-item')).toBeInTheDocument()
+        expect(screen.getByTestId('marketplace-item'))!.toBeInTheDocument()
       })
     })
   })
@@ -485,7 +485,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('package-item')).toBeInTheDocument()
+        expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
       })
     })
 
@@ -498,7 +498,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...propsWithMarketplace} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('package-item')).toBeInTheDocument()
+        expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
       })
     })
   })
@@ -509,7 +509,8 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...defaultProps} />)
 
       // Package plugins are initialized immediately
-      expect(screen.getByTestId('package-item')).toBeInTheDocument()
+      // Package plugins are initialized immediately
+      expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
     })
 
     it('should update plugins when GitHub plugin is fetched', async () => {
@@ -521,7 +522,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...githubProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('github-item')).toBeInTheDocument()
+        expect(screen.getByTestId('github-item'))!.toBeInTheDocument()
       })
     })
   })
@@ -553,7 +554,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('package-item')).toBeInTheDocument()
+        expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
       })
     })
 
@@ -613,11 +614,12 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...marketplaceProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('marketplace-item')).toBeInTheDocument()
+        expect(screen.getByTestId('marketplace-item'))!.toBeInTheDocument()
       })
 
       // Version should be displayed
-      expect(screen.getByTestId('marketplace-item-version')).toBeInTheDocument()
+      // Version should be displayed
+      expect(screen.getByTestId('marketplace-item-version'))!.toBeInTheDocument()
     })
   })
 
@@ -706,7 +708,8 @@ describe('InstallMulti Component', () => {
 
       await waitFor(() => {
         // Component should render
-        expect(document.body).toBeInTheDocument()
+        // Component should render
+        expect(document.body)!.toBeInTheDocument()
       })
     })
   })
@@ -717,7 +720,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('package-item')).toBeInTheDocument()
+        expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
       })
 
       // The getVersionInfo callback should return correct structure
@@ -738,10 +741,10 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...propsWithSelected} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('github-item')).toBeInTheDocument()
+        expect(screen.getByTestId('github-item'))!.toBeInTheDocument()
       })
 
-      expect(screen.getByTestId('github-item-checked')).toHaveTextContent('checked')
+      expect(screen.getByTestId('github-item-checked'))!.toHaveTextContent('checked')
     })
 
     it('should show checked state for marketplace item when selected', async () => {
@@ -755,7 +758,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...propsWithSelected} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('marketplace-item')).toBeInTheDocument()
+        expect(screen.getByTestId('marketplace-item'))!.toBeInTheDocument()
       })
 
       // The checked prop should be passed to the item
@@ -771,10 +774,10 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...propsWithoutSelected} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('github-item')).toBeInTheDocument()
+        expect(screen.getByTestId('github-item'))!.toBeInTheDocument()
       })
 
-      expect(screen.getByTestId('github-item-checked')).toHaveTextContent('unchecked')
+      expect(screen.getByTestId('github-item-checked'))!.toHaveTextContent('unchecked')
     })
   })
 
@@ -823,7 +826,7 @@ describe('InstallMulti Component', () => {
 
       const packageItems = screen.getAllByTestId('package-item')
       await act(async () => {
-        fireEvent.click(packageItems[0])
+        fireEvent.click(packageItems[0]!)
       })
 
       // onSelect should be called with filtered plugin count
@@ -842,11 +845,12 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...marketplaceProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('marketplace-item')).toBeInTheDocument()
+        expect(screen.getByTestId('marketplace-item'))!.toBeInTheDocument()
       })
 
       // The version should be displayed (from dependency or plugin)
-      expect(screen.getByTestId('marketplace-item-version')).toBeInTheDocument()
+      // The version should be displayed (from dependency or plugin)
+      expect(screen.getByTestId('marketplace-item-version'))!.toBeInTheDocument()
     })
   })
 
@@ -856,7 +860,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('package-item')).toBeInTheDocument()
+        expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
       })
 
       // The component should pass versionInfo to items
@@ -868,7 +872,7 @@ describe('InstallMulti Component', () => {
       render(<InstallMulti {...defaultProps} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('package-item')).toBeInTheDocument()
+        expect(screen.getByTestId('package-item'))!.toBeInTheDocument()
         expect(defaultProps.onLoadedAllPlugin).toHaveBeenCalled()
       })
     })
diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/hooks/use-install-multi-state.ts b/web/app/components/plugins/install-plugin/install-bundle/steps/hooks/use-install-multi-state.ts
index 86dd287c99..ca06f33c16 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/steps/hooks/use-install-multi-state.ts
+++ b/web/app/components/plugins/install-plugin/install-bundle/steps/hooks/use-install-multi-state.ts
@@ -35,7 +35,7 @@ function parseMarketplaceIdentifier(identifier?: string): MarketplacePluginInfo
     return null
 
   const withoutHash = identifier.split('@')[0]
-  const [organization, nameAndVersionPart] = withoutHash.split('/')
+  const [organization, nameAndVersionPart] = withoutHash!.split('/')
   if (!organization || !nameAndVersionPart)
     return null
 
diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx
index 9eb4db7a27..df94331d58 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx
@@ -83,7 +83,7 @@ const Install: FC<Props> = ({
         onInstalled(selectedPlugins, res.map((r, i) => {
           return ({
             success: r.status === TaskStatus.success,
-            isFromMarketPlace: allPlugins[selectedIndexes[i]].type === 'marketplace',
+            isFromMarketPlace: allPlugins[selectedIndexes[i]!]!.type === 'marketplace',
           })
         }))
         const hasInstallSuccess = res.some(r => r.status === TaskStatus.success)
@@ -101,7 +101,7 @@ const Install: FC<Props> = ({
         if (item.status !== TaskStatus.running) {
           return {
             success: item.status === TaskStatus.success,
-            isFromMarketPlace: allPlugins[selectedIndexes[index]].type === 'marketplace',
+            isFromMarketPlace: allPlugins[selectedIndexes[index]!]!.type === 'marketplace',
           }
         }
         const { status } = await check({
@@ -110,7 +110,7 @@ const Install: FC<Props> = ({
         })
         return {
           success: status === TaskStatus.success,
-          isFromMarketPlace: allPlugins[selectedIndexes[index]].type === 'marketplace',
+          isFromMarketPlace: allPlugins[selectedIndexes[index]!]!.type === 'marketplace',
         }
       }))
       onInstalled(selectedPlugins, installStatus)
diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/installed.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/installed.tsx
index a7808736e9..1c64e73d62 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/steps/installed.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/steps/installed.tsx
@@ -36,10 +36,10 @@ const Installed: FC<Props> = ({
                 className="w-full"
                 payload={{
                   ...plugin,
-                  icon: installStatus[index].isFromMarketPlace ? `${MARKETPLACE_API_PREFIX}/plugins/${plugin.org}/${plugin.name}/icon` : getIconUrl(plugin.icon),
+                  icon: installStatus[index]!.isFromMarketPlace ? `${MARKETPLACE_API_PREFIX}/plugins/${plugin.org}/${plugin.name}/icon` : getIconUrl(plugin.icon),
                 }}
-                installed={installStatus[index].success}
-                installFailed={!installStatus[index].success}
+                installed={installStatus[index]!.success}
+                installFailed={!installStatus[index]!.success}
                 titleLeft={plugin.version ? <Badge className="mx-1" size="s" state={BadgeState.Default}>{plugin.version}</Badge> : null}
               />
             )
diff --git a/web/app/components/plugins/marketplace/__tests__/query.spec.tsx b/web/app/components/plugins/marketplace/__tests__/query.spec.tsx
index 80d8e6a932..5353cdba91 100644
--- a/web/app/components/plugins/marketplace/__tests__/query.spec.tsx
+++ b/web/app/components/plugins/marketplace/__tests__/query.spec.tsx
@@ -143,7 +143,7 @@ describe('useMarketplacePlugins', () => {
     })
 
     expect(result.current.data?.pages).toHaveLength(1)
-    expect(result.current.data?.pages[0].plugins).toHaveLength(1)
+    expect(result.current.data?.pages[0]!.plugins).toHaveLength(1)
   })
 
   it('should handle bundle type in query params', async () => {
@@ -185,8 +185,8 @@ describe('useMarketplacePlugins', () => {
       expect(result.current.data).toBeDefined()
     })
 
-    expect(result.current.data?.pages[0].plugins).toEqual([])
-    expect(result.current.data?.pages[0].total).toBe(0)
+    expect(result.current.data?.pages[0]!.plugins).toEqual([])
+    expect(result.current.data?.pages[0]!.total).toBe(0)
   })
 
   it('should determine next page correctly via getNextPageParam', async () => {
diff --git a/web/app/components/plugins/marketplace/__tests__/utils.spec.ts b/web/app/components/plugins/marketplace/__tests__/utils.spec.ts
index 92bed9be62..972a9ba913 100644
--- a/web/app/components/plugins/marketplace/__tests__/utils.spec.ts
+++ b/web/app/components/plugins/marketplace/__tests__/utils.spec.ts
@@ -264,7 +264,7 @@ describe('getMarketplacePluginsByCollectionId', () => {
 
     expect(mockCollectionPlugins).toHaveBeenCalled()
     const call = mockCollectionPlugins.mock.calls[0]
-    expect(call[1]).toMatchObject({ signal: controller.signal })
+    expect(call![1]).toMatchObject({ signal: controller.signal })
   })
 })
 
@@ -313,7 +313,7 @@ describe('getMarketplaceCollectionsAndPlugins', () => {
 
     expect(mockCollections).toHaveBeenCalled()
     const call = mockCollections.mock.calls[0]
-    expect(call[0]).toMatchObject({ query: expect.objectContaining({ condition: 'category=tool', type: 'bundle' }) })
+    expect(call![0]).toMatchObject({ query: expect.objectContaining({ condition: 'category=tool', type: 'bundle' }) })
   })
 })
 
@@ -393,7 +393,7 @@ describe('getMarketplacePlugins', () => {
 
     expect(result.plugins).toHaveLength(1)
     const call = mockSearchAdvanced.mock.calls[0]
-    expect(call[0].params.kind).toBe('bundles')
+    expect(call![0].params.kind).toBe('bundles')
   })
 
   it('should use empty category when category is all', async () => {
@@ -408,7 +408,7 @@ describe('getMarketplacePlugins', () => {
     }, 1)
 
     const call = mockSearchAdvanced.mock.calls[0]
-    expect(call[0].body.category).toBe('')
+    expect(call![0].body.category).toBe('')
   })
 
   it('should handle API error and return empty result', async () => {
@@ -437,7 +437,7 @@ describe('getMarketplacePlugins', () => {
     await getMarketplacePlugins({ query: 'test' }, 1, controller.signal)
 
     const call = mockSearchAdvanced.mock.calls[0]
-    expect(call[1]).toMatchObject({ signal: controller.signal })
+    expect(call![1]).toMatchObject({ signal: controller.signal })
   })
 
   it('should default page_size to 40 when not provided', async () => {
diff --git a/web/app/components/plugins/marketplace/list/list-with-collection.tsx b/web/app/components/plugins/marketplace/list/list-with-collection.tsx
index 21094f39a5..744885ae09 100644
--- a/web/app/components/plugins/marketplace/list/list-with-collection.tsx
+++ b/web/app/components/plugins/marketplace/list/list-with-collection.tsx
@@ -60,7 +60,7 @@ const ListWithCollection = ({
             )}
             >
               {
-                marketplaceCollectionPluginsMap[collection.name].map((plugin) => {
+                marketplaceCollectionPluginsMap[collection.name]!.map((plugin) => {
                   if (cardRender)
                     return cardRender(plugin)
 
diff --git a/web/app/components/plugins/marketplace/search-box/__tests__/index.spec.tsx b/web/app/components/plugins/marketplace/search-box/__tests__/index.spec.tsx
index 31cb5d8445..8609ba5539 100644
--- a/web/app/components/plugins/marketplace/search-box/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/marketplace/search-box/__tests__/index.spec.tsx
@@ -124,7 +124,7 @@ describe('SearchBox', () => {
     it('should render without crashing', () => {
       render(<SearchBox {...defaultProps} />)
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should render with marketplace mode styling', () => {
@@ -133,7 +133,8 @@ describe('SearchBox', () => {
       )
 
       // In marketplace mode, TagsFilter comes before input
-      expect(container.querySelector('.rounded-xl')).toBeInTheDocument()
+      // In marketplace mode, TagsFilter comes before input
+      expect(container.querySelector('.rounded-xl'))!.toBeInTheDocument()
     })
 
     it('should render with non-marketplace mode styling', () => {
@@ -142,25 +143,26 @@ describe('SearchBox', () => {
       )
 
       // In non-marketplace mode, search icon appears first
-      expect(container.querySelector('.rounded-lg')).toBeInTheDocument()
+      // In non-marketplace mode, search icon appears first
+      expect(container.querySelector('.rounded-lg'))!.toBeInTheDocument()
     })
 
     it('should render placeholder correctly', () => {
       render(<SearchBox {...defaultProps} placeholder="Search here..." />)
 
-      expect(screen.getByPlaceholderText('Search here...')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Search here...'))!.toBeInTheDocument()
     })
 
     it('should render search input with current value', () => {
       render(<SearchBox {...defaultProps} search="test query" />)
 
-      expect(screen.getByDisplayValue('test query')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('test query'))!.toBeInTheDocument()
     })
 
     it('should render TagsFilter component', () => {
       render(<SearchBox {...defaultProps} />)
 
-      expect(screen.getByTestId('portal-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-elem'))!.toBeInTheDocument()
     })
   })
 
@@ -175,8 +177,9 @@ describe('SearchBox', () => {
       const input = screen.getByRole('textbox')
 
       // Both should be rendered
-      expect(portalElem).toBeInTheDocument()
-      expect(input).toBeInTheDocument()
+      // Both should be rendered
+      expect(portalElem)!.toBeInTheDocument()
+      expect(input)!.toBeInTheDocument()
     })
 
     it('should render clear button when search has value in marketplace mode', () => {
@@ -207,7 +210,8 @@ describe('SearchBox', () => {
       )
 
       // Search icon should be present
-      expect(container.querySelector('.text-components-input-text-placeholder')).toBeInTheDocument()
+      // Search icon should be present
+      expect(container.querySelector('.text-components-input-text-placeholder'))!.toBeInTheDocument()
     })
 
     it('should render clear button when search has value', () => {
@@ -223,8 +227,8 @@ describe('SearchBox', () => {
       const portalElem = screen.getByTestId('portal-elem')
       const input = screen.getByRole('textbox')
 
-      expect(portalElem).toBeInTheDocument()
-      expect(input).toBeInTheDocument()
+      expect(portalElem)!.toBeInTheDocument()
+      expect(input)!.toBeInTheDocument()
     })
 
     it('should set autoFocus when prop is true', () => {
@@ -232,7 +236,8 @@ describe('SearchBox', () => {
 
       const input = screen.getByRole('textbox')
       // autoFocus is a boolean attribute that React handles specially
-      expect(input).toBeInTheDocument()
+      // autoFocus is a boolean attribute that React handles specially
+      expect(input)!.toBeInTheDocument()
     })
   })
 
@@ -264,7 +269,7 @@ describe('SearchBox', () => {
       const buttons = screen.getAllByRole('button')
       // Find the clear button (the one in the search area)
       const clearButton = buttons[buttons.length - 1]
-      fireEvent.click(clearButton)
+      fireEvent.click(clearButton!)
 
       expect(onSearchChange).toHaveBeenCalledWith('')
     })
@@ -282,7 +287,7 @@ describe('SearchBox', () => {
 
       const buttons = screen.getAllByRole('button')
       // First button should be the clear button in non-marketplace mode
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
 
       expect(onSearchChange).toHaveBeenCalledWith('')
     })
@@ -356,7 +361,7 @@ describe('SearchBox', () => {
         <SearchBox {...defaultProps} wrapperClassName="custom-wrapper-class" />,
       )
 
-      expect(container.querySelector('.custom-wrapper-class')).toBeInTheDocument()
+      expect(container.querySelector('.custom-wrapper-class'))!.toBeInTheDocument()
     })
 
     it('should apply inputClassName correctly', () => {
@@ -364,19 +369,19 @@ describe('SearchBox', () => {
         <SearchBox {...defaultProps} inputClassName="custom-input-class" />,
       )
 
-      expect(container.querySelector('.custom-input-class')).toBeInTheDocument()
+      expect(container.querySelector('.custom-input-class'))!.toBeInTheDocument()
     })
 
     it('should handle empty placeholder', () => {
       render(<SearchBox {...defaultProps} placeholder="" />)
 
-      expect(screen.getByRole('textbox')).toHaveAttribute('placeholder', '')
+      expect(screen.getByRole('textbox'))!.toHaveAttribute('placeholder', '')
     })
 
     it('should use default placeholder when not provided', () => {
       render(<SearchBox {...defaultProps} />)
 
-      expect(screen.getByRole('textbox')).toHaveAttribute('placeholder', '')
+      expect(screen.getByRole('textbox'))!.toHaveAttribute('placeholder', '')
     })
   })
 
@@ -387,14 +392,14 @@ describe('SearchBox', () => {
     it('should handle empty search value', () => {
       render(<SearchBox {...defaultProps} search="" />)
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
-      expect(screen.getByRole('textbox')).toHaveValue('')
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toHaveValue('')
     })
 
     it('should handle empty tags array', () => {
       render(<SearchBox {...defaultProps} tags={[]} />)
 
-      expect(screen.getByTestId('portal-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-elem'))!.toBeInTheDocument()
     })
 
     it('should handle special characters in search', () => {
@@ -411,7 +416,7 @@ describe('SearchBox', () => {
       const longString = 'a'.repeat(1000)
       render(<SearchBox {...defaultProps} search={longString} />)
 
-      expect(screen.getByDisplayValue(longString)).toBeInTheDocument()
+      expect(screen.getByDisplayValue(longString))!.toBeInTheDocument()
     })
 
     it('should handle whitespace-only search', () => {
@@ -439,20 +444,21 @@ describe('SearchBoxWrapper', () => {
     it('should render without crashing', () => {
       render(<SearchBoxWrapper />)
 
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
     it('should render in marketplace mode', () => {
       const { container } = render(<SearchBoxWrapper />)
 
-      expect(container.querySelector('.rounded-xl')).toBeInTheDocument()
+      expect(container.querySelector('.rounded-xl'))!.toBeInTheDocument()
     })
 
     it('should apply correct wrapper classes', () => {
       const { container } = render(<SearchBoxWrapper />)
 
       // Check for z-11 class from wrapper
-      expect(container.querySelector('.z-11')).toBeInTheDocument()
+      // Check for z-11 class from wrapper
+      expect(container.querySelector('.z-11'))!.toBeInTheDocument()
     })
   })
 
@@ -471,7 +477,7 @@ describe('SearchBoxWrapper', () => {
     it('should use translation for placeholder', () => {
       render(<SearchBoxWrapper />)
 
-      expect(screen.getByPlaceholderText('Search plugins')).toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Search plugins'))!.toBeInTheDocument()
     })
   })
 })
@@ -496,13 +502,13 @@ describe('MarketplaceTrigger', () => {
     it('should render without crashing', () => {
       render(<MarketplaceTrigger {...defaultProps} />)
 
-      expect(screen.getByText('All Tags')).toBeInTheDocument()
+      expect(screen.getByText('All Tags'))!.toBeInTheDocument()
     })
 
     it('should show "All Tags" when no tags selected', () => {
       render(<MarketplaceTrigger {...defaultProps} selectedTagsLength={0} />)
 
-      expect(screen.getByText('All Tags')).toBeInTheDocument()
+      expect(screen.getByText('All Tags'))!.toBeInTheDocument()
     })
 
     it('should show arrow down icon when no tags selected', () => {
@@ -511,7 +517,8 @@ describe('MarketplaceTrigger', () => {
       )
 
       // Arrow down icon should be present
-      expect(container.querySelector('.size-4')).toBeInTheDocument()
+      // Arrow down icon should be present
+      expect(container.querySelector('.size-4'))!.toBeInTheDocument()
     })
   })
 
@@ -525,7 +532,7 @@ describe('MarketplaceTrigger', () => {
         />,
       )
 
-      expect(screen.getByText('Agent')).toBeInTheDocument()
+      expect(screen.getByText('Agent'))!.toBeInTheDocument()
     })
 
     it('should show multiple tag labels separated by comma', () => {
@@ -537,7 +544,7 @@ describe('MarketplaceTrigger', () => {
         />,
       )
 
-      expect(screen.getByText('Agent,RAG')).toBeInTheDocument()
+      expect(screen.getByText('Agent,RAG'))!.toBeInTheDocument()
     })
 
     it('should show +N indicator when more than 2 tags selected', () => {
@@ -549,7 +556,7 @@ describe('MarketplaceTrigger', () => {
         />,
       )
 
-      expect(screen.getByText('+2')).toBeInTheDocument()
+      expect(screen.getByText('+2'))!.toBeInTheDocument()
     })
 
     it('should only show first 2 tags in label', () => {
@@ -561,7 +568,7 @@ describe('MarketplaceTrigger', () => {
         />,
       )
 
-      expect(screen.getByText('Agent,RAG')).toBeInTheDocument()
+      expect(screen.getByText('Agent,RAG'))!.toBeInTheDocument()
       expect(screen.queryByText('Search')).not.toBeInTheDocument()
     })
   })
@@ -577,7 +584,8 @@ describe('MarketplaceTrigger', () => {
       )
 
       // RiCloseCircleFill icon should be present
-      expect(container.querySelector('.text-text-quaternary')).toBeInTheDocument()
+      // RiCloseCircleFill icon should be present
+      expect(container.querySelector('.text-text-quaternary'))!.toBeInTheDocument()
     })
 
     it('should not show clear button when no tags selected', () => {
@@ -585,6 +593,37 @@ describe('MarketplaceTrigger', () => {
         <MarketplaceTrigger {...defaultProps} selectedTagsLength={0} />,
       )
 
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
+      // Clear button should not be present
       // Clear button should not be present
       expect(container.querySelector('.text-text-quaternary')).not.toBeInTheDocument()
     })
@@ -614,7 +653,7 @@ describe('MarketplaceTrigger', () => {
         <MarketplaceTrigger {...defaultProps} open selectedTagsLength={0} />,
       )
 
-      expect(container.querySelector('.bg-state-base-hover')).toBeInTheDocument()
+      expect(container.querySelector('.bg-state-base-hover'))!.toBeInTheDocument()
     })
 
     it('should apply border styling when tags are selected', () => {
@@ -626,7 +665,7 @@ describe('MarketplaceTrigger', () => {
         />,
       )
 
-      expect(container.querySelector('.border-components-button-secondary-border')).toBeInTheDocument()
+      expect(container.querySelector('.border-components-button-secondary-border'))!.toBeInTheDocument()
     })
   })
 
@@ -636,7 +675,7 @@ describe('MarketplaceTrigger', () => {
         <MarketplaceTrigger {...defaultProps} tagsMap={{}} tags={[]} />,
       )
 
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
   })
 })
@@ -661,13 +700,13 @@ describe('ToolSelectorTrigger', () => {
     it('should render without crashing', () => {
       const { container } = render(<ToolSelectorTrigger {...defaultProps} />)
 
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should render price tag icon', () => {
       const { container } = render(<ToolSelectorTrigger {...defaultProps} />)
 
-      expect(container.querySelector('.size-4')).toBeInTheDocument()
+      expect(container.querySelector('.size-4'))!.toBeInTheDocument()
     })
   })
 
@@ -681,7 +720,7 @@ describe('ToolSelectorTrigger', () => {
         />,
       )
 
-      expect(screen.getByText('Agent')).toBeInTheDocument()
+      expect(screen.getByText('Agent'))!.toBeInTheDocument()
     })
 
     it('should show multiple tag labels separated by comma', () => {
@@ -693,7 +732,7 @@ describe('ToolSelectorTrigger', () => {
         />,
       )
 
-      expect(screen.getByText('Agent,RAG')).toBeInTheDocument()
+      expect(screen.getByText('Agent,RAG'))!.toBeInTheDocument()
     })
 
     it('should show +N indicator when more than 2 tags selected', () => {
@@ -705,7 +744,7 @@ describe('ToolSelectorTrigger', () => {
         />,
       )
 
-      expect(screen.getByText('+2')).toBeInTheDocument()
+      expect(screen.getByText('+2'))!.toBeInTheDocument()
     })
 
     it('should not show tag labels when no tags selected', () => {
@@ -725,7 +764,7 @@ describe('ToolSelectorTrigger', () => {
         />,
       )
 
-      expect(container.querySelector('.text-text-quaternary')).toBeInTheDocument()
+      expect(container.querySelector('.text-text-quaternary'))!.toBeInTheDocument()
     })
 
     it('should not show clear button when no tags selected', () => {
@@ -785,7 +824,7 @@ describe('ToolSelectorTrigger', () => {
         <ToolSelectorTrigger {...defaultProps} open selectedTagsLength={0} />,
       )
 
-      expect(container.querySelector('.bg-state-base-hover')).toBeInTheDocument()
+      expect(container.querySelector('.bg-state-base-hover'))!.toBeInTheDocument()
     })
 
     it('should apply border styling when tags are selected', () => {
@@ -797,7 +836,7 @@ describe('ToolSelectorTrigger', () => {
         />,
       )
 
-      expect(container.querySelector('.border-components-button-secondary-border')).toBeInTheDocument()
+      expect(container.querySelector('.border-components-button-secondary-border'))!.toBeInTheDocument()
     })
 
     it('should not apply hover styling when open but has tags', () => {
@@ -811,7 +850,8 @@ describe('ToolSelectorTrigger', () => {
       )
 
       // Should have border styling, not hover
-      expect(container.querySelector('.border-components-button-secondary-border')).toBeInTheDocument()
+      // Should have border styling, not hover
+      expect(container.querySelector('.border-components-button-secondary-border'))!.toBeInTheDocument()
     })
   })
 
@@ -826,7 +866,7 @@ describe('ToolSelectorTrigger', () => {
         />,
       )
 
-      expect(screen.getByText('Agent')).toBeInTheDocument()
+      expect(screen.getByText('Agent'))!.toBeInTheDocument()
     })
   })
 })
@@ -854,7 +894,7 @@ describe('TagsFilter', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-elem'))!.toBeInTheDocument()
     })
 
     it('should pass usedInMarketplace prop to TagsFilter', () => {
@@ -869,7 +909,8 @@ describe('TagsFilter', () => {
       )
 
       // MarketplaceTrigger should show "All Tags"
-      expect(screen.getByText('All Tags')).toBeInTheDocument()
+      // MarketplaceTrigger should show "All Tags"
+      expect(screen.getByText('All Tags'))!.toBeInTheDocument()
     })
 
     it('should show selected tags count in TagsFilter trigger', () => {
@@ -883,7 +924,7 @@ describe('TagsFilter', () => {
         />,
       )
 
-      expect(screen.getByText('+1')).toBeInTheDocument()
+      expect(screen.getByText('+1'))!.toBeInTheDocument()
     })
   })
 
@@ -902,7 +943,7 @@ describe('TagsFilter', () => {
       fireEvent.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+        expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
       })
     })
 
@@ -921,7 +962,7 @@ describe('TagsFilter', () => {
       // Open
       fireEvent.click(trigger)
       await waitFor(() => {
-        expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+        expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
       })
 
       // Close
@@ -947,8 +988,8 @@ describe('TagsFilter', () => {
       fireEvent.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText('Agent')).toBeInTheDocument()
-        expect(screen.getByText('RAG')).toBeInTheDocument()
+        expect(screen.getByText('Agent'))!.toBeInTheDocument()
+        expect(screen.getByText('RAG'))!.toBeInTheDocument()
       })
     })
 
@@ -967,7 +1008,7 @@ describe('TagsFilter', () => {
       fireEvent.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText('Agent')).toBeInTheDocument()
+        expect(screen.getByText('Agent'))!.toBeInTheDocument()
       })
 
       const agentOption = screen.getByText('Agent')
@@ -1018,7 +1059,7 @@ describe('TagsFilter', () => {
       fireEvent.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText('RAG')).toBeInTheDocument()
+        expect(screen.getByText('RAG'))!.toBeInTheDocument()
       })
 
       const ragOption = screen.getByText('RAG')
@@ -1061,7 +1102,7 @@ describe('TagsFilter', () => {
       fireEvent.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText('Agent')).toBeInTheDocument()
+        expect(screen.getByText('Agent'))!.toBeInTheDocument()
       })
 
       const inputs = screen.getAllByRole('textbox')
@@ -1071,7 +1112,7 @@ describe('TagsFilter', () => {
 
       if (searchInput) {
         fireEvent.change(searchInput, { target: { value: 'agent' } })
-        expect(screen.getByText('Agent')).toBeInTheDocument()
+        expect(screen.getByText('Agent'))!.toBeInTheDocument()
       }
     })
   })
@@ -1097,7 +1138,8 @@ describe('TagsFilter', () => {
       })
 
       // Verify dropdown content is rendered
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      // Verify dropdown content is rendered
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should render tag options when dropdown is open', async () => {
@@ -1114,13 +1156,14 @@ describe('TagsFilter', () => {
       fireEvent.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+        expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
       })
 
       // When no tags selected, these should appear once each in dropdown
-      expect(screen.getByText('Agent')).toBeInTheDocument()
-      expect(screen.getByText('RAG')).toBeInTheDocument()
-      expect(screen.getByText('Search')).toBeInTheDocument()
+      // When no tags selected, these should appear once each in dropdown
+      expect(screen.getByText('Agent'))!.toBeInTheDocument()
+      expect(screen.getByText('RAG'))!.toBeInTheDocument()
+      expect(screen.getByText('Search'))!.toBeInTheDocument()
     })
   })
 })
@@ -1146,8 +1189,8 @@ describe('Accessibility', () => {
     )
 
     const input = screen.getByRole('textbox')
-    expect(input).toBeInTheDocument()
-    expect(input).toHaveAttribute('placeholder', 'Search plugins')
+    expect(input)!.toBeInTheDocument()
+    expect(input)!.toHaveAttribute('placeholder', 'Search plugins')
   })
 
   it('should have clickable tag options in dropdown', async () => {
@@ -1156,7 +1199,7 @@ describe('Accessibility', () => {
     fireEvent.click(screen.getByTestId('portal-trigger'))
 
     await waitFor(() => {
-      expect(screen.getByText('Agent')).toBeInTheDocument()
+      expect(screen.getByText('Agent'))!.toBeInTheDocument()
     })
   })
 })
@@ -1192,7 +1235,7 @@ describe('Combined Workflows', () => {
     fireEvent.click(trigger)
 
     await waitFor(() => {
-      expect(screen.getByText('Agent')).toBeInTheDocument()
+      expect(screen.getByText('Agent'))!.toBeInTheDocument()
     })
 
     const agentOption = screen.getByText('Agent')
@@ -1217,9 +1260,9 @@ describe('Combined Workflows', () => {
       />,
     )
 
-    expect(screen.getByDisplayValue('test')).toBeInTheDocument()
-    expect(screen.getByText('Agent,RAG')).toBeInTheDocument()
-    expect(screen.getByTestId('portal-elem')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('test'))!.toBeInTheDocument()
+    expect(screen.getByText('Agent,RAG'))!.toBeInTheDocument()
+    expect(screen.getByTestId('portal-elem'))!.toBeInTheDocument()
   })
 
   it('should handle prop changes correctly', () => {
@@ -1234,7 +1277,7 @@ describe('Combined Workflows', () => {
       />,
     )
 
-    expect(screen.getByDisplayValue('initial')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('initial'))!.toBeInTheDocument()
 
     rerender(
       <SearchBox
@@ -1245,6 +1288,6 @@ describe('Combined Workflows', () => {
       />,
     )
 
-    expect(screen.getByDisplayValue('updated')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('updated'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/plugins/marketplace/search-box/trigger/marketplace.tsx b/web/app/components/plugins/marketplace/search-box/trigger/marketplace.tsx
index 414216c532..167d6fcd70 100644
--- a/web/app/components/plugins/marketplace/search-box/trigger/marketplace.tsx
+++ b/web/app/components/plugins/marketplace/search-box/trigger/marketplace.tsx
@@ -39,7 +39,7 @@ const MarketplaceTrigger = ({
         {
           !!selectedTagsLength && (
             <span className="text-text-secondary">
-              {tags.map(tag => tagsMap[tag].label).slice(0, 2).join(',')}
+              {tags.map(tag => tagsMap[tag]!.label).slice(0, 2).join(',')}
             </span>
           )
         }
diff --git a/web/app/components/plugins/marketplace/search-box/trigger/tool-selector.tsx b/web/app/components/plugins/marketplace/search-box/trigger/tool-selector.tsx
index 6c733ea546..d351414ee8 100644
--- a/web/app/components/plugins/marketplace/search-box/trigger/tool-selector.tsx
+++ b/web/app/components/plugins/marketplace/search-box/trigger/tool-selector.tsx
@@ -33,7 +33,7 @@ const ToolSelectorTrigger = ({
         !!selectedTagsLength && (
           <div className="flex items-center gap-x-0.5 px-0.5 py-1 system-sm-medium">
             <span className="text-text-secondary">
-              {tags.map(tag => tagsMap[tag].label).slice(0, 2).join(',')}
+              {tags.map(tag => tagsMap[tag]!.label).slice(0, 2).join(',')}
             </span>
             {
               selectedTagsLength > 2 && (
diff --git a/web/app/components/plugins/marketplace/sort-dropdown/index.tsx b/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
index dddfab5402..d8b6939d1a 100644
--- a/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
+++ b/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
@@ -56,7 +56,7 @@ const SortDropdown = () => {
             {t('marketplace.sortBy', { ns: 'plugin' })}
           </span>
           <span className="system-sm-medium mr-1 text-text-primary">
-            {selectedOption.text}
+            {selectedOption!.text}
           </span>
           <RiArrowDownSLine className="h-4 w-4 text-text-tertiary" />
         </div>
diff --git a/web/app/components/plugins/plugin-auth/__tests__/authorized-in-node.spec.tsx b/web/app/components/plugins/plugin-auth/__tests__/authorized-in-node.spec.tsx
index f4eb9462fc..cba8dc96c9 100644
--- a/web/app/components/plugins/plugin-auth/__tests__/authorized-in-node.spec.tsx
+++ b/web/app/components/plugins/plugin-auth/__tests__/authorized-in-node.spec.tsx
@@ -111,7 +111,7 @@ describe('AuthorizedInNode Component', () => {
       <AuthorizedInNode pluginPayload={pluginPayload} onAuthorizationItemClick={vi.fn()} />,
       { wrapper: createWrapper() },
     )
-    expect(screen.getByText('plugin.auth.workspaceDefault')).toBeInTheDocument()
+    expect(screen.getByText('plugin.auth.workspaceDefault'))!.toBeInTheDocument()
   })
 
   it('should render credential name when credentialId matches', async () => {
@@ -127,7 +127,7 @@ describe('AuthorizedInNode Component', () => {
       <AuthorizedInNode pluginPayload={pluginPayload} onAuthorizationItemClick={vi.fn()} credentialId="selected-id" />,
       { wrapper: createWrapper() },
     )
-    expect(screen.getByText('My Credential')).toBeInTheDocument()
+    expect(screen.getByText('My Credential'))!.toBeInTheDocument()
   })
 
   it('should show auth removed when credentialId not found', async () => {
@@ -142,7 +142,7 @@ describe('AuthorizedInNode Component', () => {
       <AuthorizedInNode pluginPayload={pluginPayload} onAuthorizationItemClick={vi.fn()} credentialId="non-existent" />,
       { wrapper: createWrapper() },
     )
-    expect(screen.getByText('plugin.auth.authRemoved')).toBeInTheDocument()
+    expect(screen.getByText('plugin.auth.authRemoved'))!.toBeInTheDocument()
   })
 
   it('should show unavailable when credential is not allowed', async () => {
@@ -195,7 +195,7 @@ describe('AuthorizedInNode Component', () => {
       { wrapper: createWrapper() },
     )
     const buttons = screen.getAllByRole('button')
-    fireEvent.click(buttons[0])
+    fireEvent.click(buttons[0]!)
     expect(screen.getAllByRole('button').length).toBeGreaterThan(0)
   })
 
diff --git a/web/app/components/plugins/plugin-auth/__tests__/plugin-auth-in-agent.spec.tsx b/web/app/components/plugins/plugin-auth/__tests__/plugin-auth-in-agent.spec.tsx
index 4c26712fdc..6afe1ae334 100644
--- a/web/app/components/plugins/plugin-auth/__tests__/plugin-auth-in-agent.spec.tsx
+++ b/web/app/components/plugins/plugin-auth/__tests__/plugin-auth-in-agent.spec.tsx
@@ -116,7 +116,7 @@ describe('PluginAuthInAgent Component', () => {
       <PluginAuthInAgent pluginPayload={pluginPayload} />,
       { wrapper: createWrapper() },
     )
-    expect(screen.getByRole('button')).toBeInTheDocument()
+    expect(screen.getByRole('button'))!.toBeInTheDocument()
   })
 
   it('should render Authorized with workspace default when authorized', async () => {
@@ -126,8 +126,8 @@ describe('PluginAuthInAgent Component', () => {
       <PluginAuthInAgent pluginPayload={pluginPayload} />,
       { wrapper: createWrapper() },
     )
-    expect(screen.getByRole('button')).toBeInTheDocument()
-    expect(screen.getByText('plugin.auth.workspaceDefault')).toBeInTheDocument()
+    expect(screen.getByRole('button'))!.toBeInTheDocument()
+    expect(screen.getByText('plugin.auth.workspaceDefault'))!.toBeInTheDocument()
   })
 
   it('should show credential name when credentialId is provided', async () => {
@@ -143,7 +143,7 @@ describe('PluginAuthInAgent Component', () => {
       <PluginAuthInAgent pluginPayload={pluginPayload} credentialId="selected-id" />,
       { wrapper: createWrapper() },
     )
-    expect(screen.getByText('Selected Credential')).toBeInTheDocument()
+    expect(screen.getByText('Selected Credential'))!.toBeInTheDocument()
   })
 
   it('should show auth removed when credential not found', async () => {
@@ -158,7 +158,7 @@ describe('PluginAuthInAgent Component', () => {
       <PluginAuthInAgent pluginPayload={pluginPayload} credentialId="non-existent-id" />,
       { wrapper: createWrapper() },
     )
-    expect(screen.getByText('plugin.auth.authRemoved')).toBeInTheDocument()
+    expect(screen.getByText('plugin.auth.authRemoved'))!.toBeInTheDocument()
   })
 
   it('should show unavailable when credential is not allowed to use', async () => {
@@ -192,7 +192,7 @@ describe('PluginAuthInAgent Component', () => {
       { wrapper: createWrapper() },
     )
     const buttons = screen.getAllByRole('button')
-    fireEvent.click(buttons[0])
+    fireEvent.click(buttons[0]!)
     expect(screen.getAllByRole('button').length).toBeGreaterThan(0)
   })
 
@@ -214,7 +214,7 @@ describe('PluginAuthInAgent Component', () => {
     fireEvent.click(triggerButton)
     const workspaceDefaultItems = screen.getAllByText('plugin.auth.workspaceDefault')
     const popupItem = workspaceDefaultItems.length > 1 ? workspaceDefaultItems[1] : workspaceDefaultItems[0]
-    fireEvent.click(popupItem)
+    fireEvent.click(popupItem!)
     expect(onAuthorizationItemClick).toHaveBeenCalledWith('')
   })
 
@@ -240,7 +240,7 @@ describe('PluginAuthInAgent Component', () => {
     fireEvent.click(triggerButton)
     const credentialItems = screen.getAllByText('Specific Credential')
     const popupItem = credentialItems[credentialItems.length - 1]
-    fireEvent.click(popupItem)
+    fireEvent.click(popupItem!)
     expect(onAuthorizationItemClick).toHaveBeenCalledWith('specific-cred-id')
   })
 
diff --git a/web/app/components/plugins/plugin-auth/authorized/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-auth/authorized/__tests__/index.spec.tsx
index f911dcd4e0..a127067526 100644
--- a/web/app/components/plugins/plugin-auth/authorized/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-auth/authorized/__tests__/index.spec.tsx
@@ -147,7 +147,7 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
 
     it('should render with custom trigger when renderTrigger is provided', () => {
@@ -163,8 +163,8 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
-      expect(screen.getByText('Closed')).toBeInTheDocument()
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
+      expect(screen.getByText('Closed'))!.toBeInTheDocument()
     })
 
     it('should show singular authorization text for 1 credential', () => {
@@ -180,7 +180,8 @@ describe('Authorized Component', () => {
       )
 
       // Text is split by elements, use regex to find partial match
-      expect(screen.getByText(/plugin\.auth\.authorization/)).toBeInTheDocument()
+      // Text is split by elements, use regex to find partial match
+      expect(screen.getByText(/plugin\.auth\.authorization/))!.toBeInTheDocument()
     })
 
     it('should show plural authorizations text for multiple credentials', () => {
@@ -199,7 +200,8 @@ describe('Authorized Component', () => {
       )
 
       // Text is split by elements, use regex to find partial match
-      expect(screen.getByText(/plugin\.auth\.authorizations/)).toBeInTheDocument()
+      // Text is split by elements, use regex to find partial match
+      expect(screen.getByText(/plugin\.auth\.authorizations/))!.toBeInTheDocument()
     })
 
     it('should show unavailable count when there are unavailable credentials', () => {
@@ -217,7 +219,7 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText(/plugin\.auth\.unavailable/)).toBeInTheDocument()
+      expect(screen.getByText(/plugin\.auth\.unavailable/))!.toBeInTheDocument()
     })
 
     it('should show gray indicator when default credential is unavailable', () => {
@@ -235,7 +237,8 @@ describe('Authorized Component', () => {
       )
 
       // The indicator should be rendered
-      expect(container.querySelector('[data-testid="status-indicator"]')).toBeInTheDocument()
+      // The indicator should be rendered
+      expect(container.querySelector('[data-testid="status-indicator"]'))!.toBeInTheDocument()
     })
   })
 
@@ -257,7 +260,8 @@ describe('Authorized Component', () => {
       fireEvent.click(trigger)
 
       // Popup should be open - check for popup content
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Popup should be open - check for popup content
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
     })
 
     it('should use controlled open state when isOpen and onOpenChange are provided', () => {
@@ -276,11 +280,12 @@ describe('Authorized Component', () => {
       )
 
       // Popup should be open since isOpen is true
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Popup should be open since isOpen is true
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
 
       // Click trigger to close - get all buttons and click the first one (trigger)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
 
       expect(onOpenChange).toHaveBeenCalledWith(false)
     })
@@ -301,7 +306,7 @@ describe('Authorized Component', () => {
 
       // Open
       fireEvent.click(trigger)
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
 
       // Close
       fireEvent.click(trigger)
@@ -326,8 +331,8 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('OAuth')).toBeInTheDocument()
-      expect(screen.getByText('OAuth Cred')).toBeInTheDocument()
+      expect(screen.getByText('OAuth'))!.toBeInTheDocument()
+      expect(screen.getByText('OAuth Cred'))!.toBeInTheDocument()
     })
 
     it('should render API Key credentials section when apiKeyCredentials exist', () => {
@@ -345,8 +350,8 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
-      expect(screen.getByText('API Key Cred')).toBeInTheDocument()
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
+      expect(screen.getByText('API Key Cred'))!.toBeInTheDocument()
     })
 
     it('should render both OAuth and API Key sections when both exist', () => {
@@ -365,8 +370,8 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('OAuth')).toBeInTheDocument()
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      expect(screen.getByText('OAuth'))!.toBeInTheDocument()
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
     })
 
     it('should render extra authorization items when provided', () => {
@@ -386,7 +391,7 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByText('Extra Item')).toBeInTheDocument()
+      expect(screen.getByText('Extra Item'))!.toBeInTheDocument()
     })
 
     it('should pass showSelectedIcon and selectedCredentialId to items', () => {
@@ -405,7 +410,8 @@ describe('Authorized Component', () => {
       )
 
       // Selected icon should be visible
-      expect(document.querySelector('.text-text-accent')).toBeInTheDocument()
+      // Selected icon should be visible
+      expect(document.querySelector('.text-text-accent'))!.toBeInTheDocument()
     })
   })
 
@@ -431,7 +437,7 @@ describe('Authorized Component', () => {
 
         // Confirm dialog should appear
         await waitFor(() => {
-          expect(screen.getByText('datasetDocuments.list.delete.title')).toBeInTheDocument()
+          expect(screen.getByText('datasetDocuments.list.delete.title'))!.toBeInTheDocument()
         })
       }
     })
@@ -451,7 +457,7 @@ describe('Authorized Component', () => {
 
       // Wait for OAuth section to render
       await waitFor(() => {
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       })
 
       // Find all SVG icons in the action area and try to find delete button
@@ -482,7 +488,8 @@ describe('Authorized Component', () => {
       }
 
       // Component should render correctly regardless of button finding
-      expect(screen.getByText('OAuth')).toBeInTheDocument()
+      // Component should render correctly regardless of button finding
+      expect(screen.getByText('OAuth'))!.toBeInTheDocument()
     })
 
     it('should call deletePluginCredential when confirm is clicked', async () => {
@@ -506,7 +513,7 @@ describe('Authorized Component', () => {
         fireEvent.click(deleteButton)
 
         await waitFor(() => {
-          expect(screen.getByText('datasetDocuments.list.delete.title')).toBeInTheDocument()
+          expect(screen.getByText('datasetDocuments.list.delete.title'))!.toBeInTheDocument()
         })
 
         // Click confirm button
@@ -693,7 +700,8 @@ describe('Authorized Component', () => {
       }
       else {
         // Verify component renders properly
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        // Verify component renders properly
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       }
     })
 
@@ -716,7 +724,8 @@ describe('Authorized Component', () => {
       )
 
       // Verify component renders
-      expect(screen.getByText('OAuth')).toBeInTheDocument()
+      // Verify component renders
+      expect(screen.getByText('OAuth'))!.toBeInTheDocument()
     })
 
     it('should execute handleRename function body when saving', async () => {
@@ -745,8 +754,9 @@ describe('Authorized Component', () => {
       )
 
       // Wait for component to render
-      expect(screen.getByText('OAuth')).toBeInTheDocument()
-      expect(screen.getByText('Execute Rename Test')).toBeInTheDocument()
+      // Wait for component to render
+      expect(screen.getByText('OAuth'))!.toBeInTheDocument()
+      expect(screen.getByText('Execute Rename Test'))!.toBeInTheDocument()
 
       // The handleRename is tested through the "should call updatePluginCredential when rename is confirmed" test
       // This test verifies the component properly renders OAuth credentials
@@ -778,7 +788,8 @@ describe('Authorized Component', () => {
       )
 
       // Verify OAuth section renders
-      expect(screen.getByText('OAuth')).toBeInTheDocument()
+      // Verify OAuth section renders
+      expect(screen.getByText('OAuth'))!.toBeInTheDocument()
 
       // Find all action buttons in the credential item
       // The rename button should be present for OAuth credentials
@@ -857,7 +868,8 @@ describe('Authorized Component', () => {
         // ApiKeyModal should appear - look for modal content
         await waitFor(() => {
           // The modal should be rendered
-          expect(document.querySelector('.fixed')).toBeInTheDocument()
+          // The modal should be rendered
+          expect(document.querySelector('.fixed'))!.toBeInTheDocument()
         })
       }
     })
@@ -887,7 +899,7 @@ describe('Authorized Component', () => {
         fireEvent.click(editButton)
 
         await waitFor(() => {
-          expect(document.querySelector('.fixed')).toBeInTheDocument()
+          expect(document.querySelector('.fixed'))!.toBeInTheDocument()
         })
 
         // Find and click close/cancel button in the modal
@@ -907,7 +919,8 @@ describe('Authorized Component', () => {
 
           await waitFor(() => {
             // Verify component state is cleared by checking we can open again
-            expect(screen.getByText('API Keys')).toBeInTheDocument()
+            // Verify component state is cleared by checking we can open again
+            expect(screen.getByText('API Keys'))!.toBeInTheDocument()
           })
         }
       }
@@ -971,13 +984,14 @@ describe('Authorized Component', () => {
 
           // Verify state was reset - we should be able to see the credential list again
           await waitFor(() => {
-            expect(screen.getByText('API Keys')).toBeInTheDocument()
+            expect(screen.getByText('API Keys'))!.toBeInTheDocument()
           })
         }
       }
       else {
         // Verify component renders
-        expect(screen.getByText('API Keys')).toBeInTheDocument()
+        // Verify component renders
+        expect(screen.getByText('API Keys'))!.toBeInTheDocument()
       }
     })
 
@@ -1002,12 +1016,13 @@ describe('Authorized Component', () => {
       )
 
       // Wait for component to render
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Wait for component to render
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
 
       // Find edit button by looking for settings icon
       const settingsIcons = document.querySelectorAll('svg.ri-equalizer-2-line')
       if (settingsIcons.length > 0) {
-        const editButton = settingsIcons[0].closest('button')
+        const editButton = settingsIcons[0]!.closest('button')
         if (editButton) {
           // Click to open edit modal
           await act(async () => {
@@ -1033,7 +1048,7 @@ describe('Authorized Component', () => {
               // Verify the modal is closed and state is reset
               // The component should render normally after close
               await waitFor(() => {
-                expect(screen.getByText('API Keys')).toBeInTheDocument()
+                expect(screen.getByText('API Keys'))!.toBeInTheDocument()
               })
               break
             }
@@ -1063,12 +1078,13 @@ describe('Authorized Component', () => {
       )
 
       // Wait for component to render
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Wait for component to render
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
 
       // Find and click edit button to open ApiKeyModal
       const settingsIcons = document.querySelectorAll('svg.ri-equalizer-2-line')
       if (settingsIcons.length > 0) {
-        const editButton = settingsIcons[0].closest('button')
+        const editButton = settingsIcons[0]!.closest('button')
         if (editButton) {
           await act(async () => {
             fireEvent.click(editButton)
@@ -1093,7 +1109,7 @@ describe('Authorized Component', () => {
             await waitFor(() => {
               const confirmDialog = screen.queryByText('datasetDocuments.list.delete.title')
               if (confirmDialog) {
-                expect(confirmDialog).toBeInTheDocument()
+                expect(confirmDialog)!.toBeInTheDocument()
               }
             }, { timeout: 1000 })
           }
@@ -1122,7 +1138,8 @@ describe('Authorized Component', () => {
       )
 
       // Verify API Keys section is shown
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Verify API Keys section is shown
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
 
       // Find edit button - look for buttons in the action area
       const actionAreaButtons = Array.from(document.querySelectorAll('.group-hover\\:flex button, .hidden button'))
@@ -1149,7 +1166,8 @@ describe('Authorized Component', () => {
       }
 
       // Verify component renders correctly
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Verify component renders correctly
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
     })
 
     it('should trigger handleRemove when remove button is clicked in ApiKeyModal', async () => {
@@ -1173,7 +1191,8 @@ describe('Authorized Component', () => {
       )
 
       // Verify component renders
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Verify component renders
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
 
       // Find edit button by looking for action buttons (not in the confirm dialog)
       // These are grouped in hidden elements that show on hover
@@ -1203,7 +1222,8 @@ describe('Authorized Component', () => {
       }
 
       // Verify component still works
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Verify component still works
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
     })
 
     it('should show confirm dialog when remove is clicked from edit modal', async () => {
@@ -1230,7 +1250,7 @@ describe('Authorized Component', () => {
         fireEvent.click(editButton)
 
         await waitFor(() => {
-          expect(document.querySelector('.fixed')).toBeInTheDocument()
+          expect(document.querySelector('.fixed'))!.toBeInTheDocument()
         })
 
         // Find remove button in modal (usually has delete/remove text)
@@ -1242,7 +1262,7 @@ describe('Authorized Component', () => {
 
           // Confirm dialog should appear
           await waitFor(() => {
-            expect(screen.getByText('datasetDocuments.list.delete.title')).toBeInTheDocument()
+            expect(screen.getByText('datasetDocuments.list.delete.title'))!.toBeInTheDocument()
           })
         }
       }
@@ -1284,7 +1304,7 @@ describe('Authorized Component', () => {
         // Wait for modal to open
         await waitFor(() => {
           const modal = document.querySelector('.fixed')
-          expect(modal).toBeInTheDocument()
+          expect(modal)!.toBeInTheDocument()
         })
 
         // Find the close/cancel button
@@ -1304,13 +1324,14 @@ describe('Authorized Component', () => {
 
           // Verify component still works after closing
           await waitFor(() => {
-            expect(screen.getByText('API Keys')).toBeInTheDocument()
+            expect(screen.getByText('API Keys'))!.toBeInTheDocument()
           })
         }
       }
       else {
         // If no edit button found, just verify the component renders
-        expect(screen.getByText('API Keys')).toBeInTheDocument()
+        // If no edit button found, just verify the component renders
+        expect(screen.getByText('API Keys'))!.toBeInTheDocument()
       }
     })
   })
@@ -1359,7 +1380,8 @@ describe('Authorized Component', () => {
       )
 
       // Should have divider and authorize buttons
-      expect(document.querySelector('.bg-divider-subtle')).toBeInTheDocument()
+      // Should have divider and authorize buttons
+      expect(document.querySelector('.bg-divider-subtle'))!.toBeInTheDocument()
     })
 
     it('should not render Authorize component when notAllowCustomCredential is true', () => {
@@ -1400,7 +1422,7 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(document.querySelector('.custom-popup-class')).toBeInTheDocument()
+      expect(document.querySelector('.custom-popup-class'))!.toBeInTheDocument()
     })
 
     it('should pass placement to PortalToFollowElem', () => {
@@ -1419,7 +1441,8 @@ describe('Authorized Component', () => {
       )
 
       // Component should render without error
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Component should render without error
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
     })
 
     it('should pass disabled to Item components', () => {
@@ -1441,11 +1464,12 @@ describe('Authorized Component', () => {
       const setDefaultButton = screen.queryByText('plugin.auth.setDefault')
       if (setDefaultButton) {
         const button = setDefaultButton.closest('button')
-        expect(button).toBeDisabled()
+        expect(button)!.toBeDisabled()
       }
       else {
         // If no set default button, verify the component rendered
-        expect(screen.getByText('API Keys')).toBeInTheDocument()
+        // If no set default button, verify the component rendered
+        expect(screen.getByText('API Keys'))!.toBeInTheDocument()
       }
     })
 
@@ -1463,6 +1487,37 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
+      // Set default button should not be visible
       // Set default button should not be visible
       expect(screen.queryByText('plugin.auth.setDefault')).not.toBeInTheDocument()
     })
@@ -1492,7 +1547,7 @@ describe('Authorized Component', () => {
         fireEvent.click(deleteButton)
 
         await waitFor(() => {
-          expect(screen.getByText('datasetDocuments.list.delete.title')).toBeInTheDocument()
+          expect(screen.getByText('datasetDocuments.list.delete.title'))!.toBeInTheDocument()
         })
 
         const confirmButton = screen.getByText('common.operation.confirm')
@@ -1623,7 +1678,8 @@ describe('Authorized Component', () => {
       )
 
       // Component should render without error
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Component should render without error
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
     })
   })
 
@@ -1663,7 +1719,7 @@ describe('Authorized Component', () => {
 
       // Wait for component to render
       await waitFor(() => {
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       })
 
       // Find all buttons in the credential item's action area
@@ -1698,7 +1754,7 @@ describe('Authorized Component', () => {
 
         // Verify confirm dialog appears
         await waitFor(() => {
-          expect(screen.getByText('datasetDocuments.list.delete.title')).toBeInTheDocument()
+          expect(screen.getByText('datasetDocuments.list.delete.title'))!.toBeInTheDocument()
         })
 
         // Click confirm - this calls handleConfirm
@@ -1730,7 +1786,8 @@ describe('Authorized Component', () => {
       }
       else {
         // Component should still render correctly
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        // Component should still render correctly
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       }
     })
 
@@ -1753,7 +1810,8 @@ describe('Authorized Component', () => {
       )
 
       // Verify component renders
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Verify component renders
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
     })
 
     it('should prevent handleConfirm when doingAction is true', async () => {
@@ -1812,7 +1870,8 @@ describe('Authorized Component', () => {
 
       if (!foundDeleteButton) {
         // Verify component renders
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        // Verify component renders
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       }
     })
 
@@ -1831,6 +1890,99 @@ describe('Authorized Component', () => {
         { wrapper: createWrapper() },
       )
 
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
+      // With no credentials, there's no way to trigger openConfirm,
+      // so pendingOperationCredentialId stays null
+      // This edge case is handled by the component's internal logic
       // With no credentials, there's no way to trigger openConfirm,
       // so pendingOperationCredentialId stays null
       // This edge case is handled by the component's internal logic
@@ -1859,7 +2011,7 @@ describe('Authorized Component', () => {
 
       // Wait for component to render
       await waitFor(() => {
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       })
 
       // Find delete button in action area
@@ -1908,7 +2060,7 @@ describe('Authorized Component', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       })
 
       // Find and trigger delete to open confirm dialog
@@ -1921,7 +2073,7 @@ describe('Authorized Component', () => {
 
         const confirmTitle = screen.queryByText('datasetDocuments.list.delete.title')
         if (confirmTitle) {
-          expect(confirmTitle).toBeInTheDocument()
+          expect(confirmTitle)!.toBeInTheDocument()
 
           // Now click cancel to execute closeConfirm
           const cancelBtn = screen.getByText('common.operation.cancel')
@@ -1940,7 +2092,7 @@ describe('Authorized Component', () => {
           })
 
           await waitFor(() => {
-            expect(screen.getByText('datasetDocuments.list.delete.title')).toBeInTheDocument()
+            expect(screen.getByText('datasetDocuments.list.delete.title'))!.toBeInTheDocument()
           })
           break
         }
@@ -1966,7 +2118,7 @@ describe('Authorized Component', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       })
 
       // Find and trigger delete to open confirm dialog
@@ -2012,7 +2164,7 @@ describe('Authorized Component', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       })
 
       // Find and trigger delete to open confirm dialog
@@ -2066,7 +2218,7 @@ describe('Authorized Component', () => {
 
       // Wait for component to render
       await waitFor(() => {
-        expect(screen.getByText('API Keys')).toBeInTheDocument()
+        expect(screen.getByText('API Keys'))!.toBeInTheDocument()
       })
 
       // Find edit button in action area
@@ -2093,7 +2245,7 @@ describe('Authorized Component', () => {
               await waitFor(() => {
                 const confirmTitle = screen.queryByText('datasetDocuments.list.delete.title')
                 if (confirmTitle) {
-                  expect(confirmTitle).toBeInTheDocument()
+                  expect(confirmTitle)!.toBeInTheDocument()
                 }
               }, { timeout: 2000 })
             }
@@ -2103,7 +2255,8 @@ describe('Authorized Component', () => {
       }
 
       // Verify component renders correctly
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Verify component renders correctly
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
     })
 
     it('should execute handleRemove to set deleteCredentialId from pendingOperationCredentialId', async () => {
@@ -2127,7 +2280,7 @@ describe('Authorized Component', () => {
 
       // Wait for component to render
       await waitFor(() => {
-        expect(screen.getByText('API Keys')).toBeInTheDocument()
+        expect(screen.getByText('API Keys'))!.toBeInTheDocument()
       })
 
       // Find and click edit button to open ApiKeyModal
@@ -2155,7 +2308,7 @@ describe('Authorized Component', () => {
                 const confirmTitle = screen.queryByText('datasetDocuments.list.delete.title')
                 // If confirm dialog appears, handleRemove was called
                 if (confirmTitle) {
-                  expect(confirmTitle).toBeInTheDocument()
+                  expect(confirmTitle)!.toBeInTheDocument()
                 }
               }, { timeout: 1000 })
             }
@@ -2165,7 +2318,8 @@ describe('Authorized Component', () => {
       }
 
       // Verify component still renders correctly
-      expect(screen.getByText('API Keys')).toBeInTheDocument()
+      // Verify component still renders correctly
+      expect(screen.getByText('API Keys'))!.toBeInTheDocument()
     })
   })
 
@@ -2195,7 +2349,7 @@ describe('Authorized Component', () => {
 
       // Wait for component to render
       await waitFor(() => {
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       })
 
       // Find rename button in action area
@@ -2259,7 +2413,7 @@ describe('Authorized Component', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByText('OAuth')).toBeInTheDocument()
+        expect(screen.getByText('OAuth'))!.toBeInTheDocument()
       })
 
       // Find rename button
@@ -2324,7 +2478,7 @@ describe('Authorized Component', () => {
 
       // Wait for component to render
       await waitFor(() => {
-        expect(screen.getByText('API Keys')).toBeInTheDocument()
+        expect(screen.getByText('API Keys'))!.toBeInTheDocument()
       })
 
       // Find and click edit button to open modal
@@ -2346,12 +2500,12 @@ describe('Authorized Component', () => {
             if (cancelBtns.length > 0) {
               // Click the first cancel button (modal's cancel)
               await act(async () => {
-                fireEvent.click(cancelBtns[0])
+                fireEvent.click(cancelBtns[0]!)
               })
 
               // Modal should be closed
               await waitFor(() => {
-                expect(screen.getByText('API Keys')).toBeInTheDocument()
+                expect(screen.getByText('API Keys'))!.toBeInTheDocument()
               })
             }
             break
@@ -2380,7 +2534,7 @@ describe('Authorized Component', () => {
       )
 
       await waitFor(() => {
-        expect(screen.getByText('API Keys')).toBeInTheDocument()
+        expect(screen.getByText('API Keys'))!.toBeInTheDocument()
       })
 
       // Open edit modal by clicking edit button
@@ -2398,12 +2552,12 @@ describe('Authorized Component', () => {
           const cancelButtons = screen.queryAllByText('common.operation.cancel')
           if (cancelButtons.length > 0) {
             await act(async () => {
-              fireEvent.click(cancelButtons[0])
+              fireEvent.click(cancelButtons[0]!)
             })
 
             // After onClose, editValues should be null so modal won't render
             await waitFor(() => {
-              expect(screen.getByText('API Keys')).toBeInTheDocument()
+              expect(screen.getByText('API Keys'))!.toBeInTheDocument()
             })
 
             // Try opening modal again to verify state was properly reset
@@ -2413,7 +2567,7 @@ describe('Authorized Component', () => {
 
             await waitFor(() => {
               const newModal = document.querySelector('.fixed')
-              expect(newModal).toBeInTheDocument()
+              expect(newModal)!.toBeInTheDocument()
             })
           }
           break
@@ -2451,7 +2605,7 @@ describe('Authorized Component', () => {
 
         // Wait for modal
         await waitFor(() => {
-          expect(document.querySelector('.fixed')).toBeInTheDocument()
+          expect(document.querySelector('.fixed'))!.toBeInTheDocument()
         })
 
         // Close the modal via cancel
@@ -2468,7 +2622,7 @@ describe('Authorized Component', () => {
 
         // Verify component can render again normally
         await waitFor(() => {
-          expect(screen.getByText('API Keys')).toBeInTheDocument()
+          expect(screen.getByText('API Keys'))!.toBeInTheDocument()
         })
 
         // Verify we can open the modal again (state was properly reset)
@@ -2481,7 +2635,7 @@ describe('Authorized Component', () => {
           })
 
           await waitFor(() => {
-            expect(document.querySelector('.fixed')).toBeInTheDocument()
+            expect(document.querySelector('.fixed'))!.toBeInTheDocument()
           })
         }
       }
@@ -2518,7 +2672,7 @@ describe('Authorized Component', () => {
 
         // Confirm dialog should appear with the correct credential id
         await waitFor(() => {
-          expect(screen.getByText('datasetDocuments.list.delete.title')).toBeInTheDocument()
+          expect(screen.getByText('datasetDocuments.list.delete.title'))!.toBeInTheDocument()
         })
 
         // Now click confirm to verify the correct id is used
diff --git a/web/app/components/plugins/plugin-auth/hooks/__tests__/use-credential.spec.ts b/web/app/components/plugins/plugin-auth/hooks/__tests__/use-credential.spec.ts
index 7777fbff97..e0e241cbbe 100644
--- a/web/app/components/plugins/plugin-auth/hooks/__tests__/use-credential.spec.ts
+++ b/web/app/components/plugins/plugin-auth/hooks/__tests__/use-credential.spec.ts
@@ -90,7 +90,7 @@ describe('use-credential hooks', () => {
 
       result.current()
 
-      const invalidFn = mockUseInvalidPluginCredentialInfo.mock.results[0].value
+      const invalidFn = mockUseInvalidPluginCredentialInfo.mock.results[0]!.value
       expect(invalidFn).toHaveBeenCalled()
       expect(mockInvalidToolsByType).toHaveBeenCalled()
     })
diff --git a/web/app/components/plugins/plugin-detail-panel/__tests__/agent-strategy-list.spec.tsx b/web/app/components/plugins/plugin-detail-panel/__tests__/agent-strategy-list.spec.tsx
index 34015c0487..02a2431ead 100644
--- a/web/app/components/plugins/plugin-detail-panel/__tests__/agent-strategy-list.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/__tests__/agent-strategy-list.spec.tsx
@@ -81,15 +81,15 @@ describe('AgentStrategyList', () => {
     it('should render strategy items when data is available', () => {
       render(<AgentStrategyList detail={createPluginDetail()} />)
 
-      expect(screen.getByText('plugin.detailPanel.strategyNum:{"num":1,"strategy":"strategy"}')).toBeInTheDocument()
-      expect(screen.getByTestId('strategy-item')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.strategyNum:{"num":1,"strategy":"strategy"}'))!.toBeInTheDocument()
+      expect(screen.getByTestId('strategy-item'))!.toBeInTheDocument()
     })
 
     it('should return null when no strategy provider detail', () => {
       mockStrategyProviderDetail = undefined
       const { container } = render(<AgentStrategyList detail={createPluginDetail()} />)
 
-      expect(container).toBeEmptyDOMElement()
+      expect(container)!.toBeEmptyDOMElement()
     })
 
     it('should render multiple strategies', () => {
@@ -98,13 +98,13 @@ describe('AgentStrategyList', () => {
           identity: { author: 'test', name: 'test' },
           strategies: [
             ...mockStrategies,
-            { ...mockStrategies[0], identity: { ...mockStrategies[0].identity, name: 'strategy-2' } },
+            { ...mockStrategies[0]!, identity: { ...mockStrategies[0]!.identity, name: 'strategy-2' } },
           ],
         },
       }
       render(<AgentStrategyList detail={createPluginDetail()} />)
 
-      expect(screen.getByText('plugin.detailPanel.strategyNum:{"num":2,"strategy":"strategies"}')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.strategyNum:{"num":2,"strategy":"strategies"}'))!.toBeInTheDocument()
       expect(screen.getAllByTestId('strategy-item')).toHaveLength(2)
     })
   })
@@ -115,7 +115,7 @@ describe('AgentStrategyList', () => {
       detail.tenant_id = 'custom-tenant'
       render(<AgentStrategyList detail={detail} />)
 
-      expect(screen.getByTestId('strategy-item')).toBeInTheDocument()
+      expect(screen.getByTestId('strategy-item'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/plugins/plugin-detail-panel/__tests__/detail-header.spec.tsx b/web/app/components/plugins/plugin-detail-panel/__tests__/detail-header.spec.tsx
index 74ce8525a9..0eacbf3bd3 100644
--- a/web/app/components/plugins/plugin-detail-panel/__tests__/detail-header.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/__tests__/detail-header.spec.tsx
@@ -297,13 +297,13 @@ describe('DetailHeader', () => {
     it('should render plugin title', () => {
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should render plugin icon with correct src', () => {
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('card-icon')).toBeInTheDocument()
+      expect(screen.getByTestId('card-icon'))!.toBeInTheDocument()
     })
 
     it('should render icon with http url directly', () => {
@@ -315,13 +315,13 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('card-icon')).toHaveAttribute('data-src', 'https://example.com/icon.png')
+      expect(screen.getByTestId('card-icon'))!.toHaveAttribute('data-src', 'https://example.com/icon.png')
     })
 
     it('should render description when not in readme view', () => {
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('description')).toBeInTheDocument()
+      expect(screen.getByTestId('description'))!.toBeInTheDocument()
     })
 
     it('should not render description in readme view', () => {
@@ -333,7 +333,7 @@ describe('DetailHeader', () => {
     it('should render verified badge when verified', () => {
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('verified-badge')).toBeInTheDocument()
+      expect(screen.getByTestId('verified-badge'))!.toBeInTheDocument()
     })
   })
 
@@ -346,7 +346,8 @@ describe('DetailHeader', () => {
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
       // Badge component should render with the version
-      expect(screen.getByText('1.0.0')).toBeInTheDocument()
+      // Badge component should render with the version
+      expect(screen.getByText('1.0.0'))!.toBeInTheDocument()
     })
 
     it('should not show new version indicator when versions match', () => {
@@ -357,7 +358,8 @@ describe('DetailHeader', () => {
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
       // Badge component should render with the version
-      expect(screen.getByText('1.0.0')).toBeInTheDocument()
+      // Badge component should render with the version
+      expect(screen.getByText('1.0.0'))!.toBeInTheDocument()
     })
 
     it('should show update button when new version is available', () => {
@@ -367,7 +369,7 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByText('plugin.detailPanel.operation.update')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.operation.update'))!.toBeInTheDocument()
     })
 
     it('should show update button for GitHub source', () => {
@@ -377,7 +379,7 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByText('plugin.detailPanel.operation.update')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.operation.update'))!.toBeInTheDocument()
     })
   })
 
@@ -393,7 +395,7 @@ describe('DetailHeader', () => {
 
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should render component when strategy is disabled', () => {
@@ -407,7 +409,7 @@ describe('DetailHeader', () => {
 
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should enable auto upgrade for update_all mode', () => {
@@ -422,7 +424,8 @@ describe('DetailHeader', () => {
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
       // Auto upgrade badge should be rendered
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      // Auto upgrade badge should be rendered
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should enable auto upgrade for partial mode when plugin is included', () => {
@@ -436,7 +439,7 @@ describe('DetailHeader', () => {
 
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should not enable auto upgrade for partial mode when plugin is not included', () => {
@@ -450,7 +453,7 @@ describe('DetailHeader', () => {
 
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should enable auto upgrade for exclude mode when plugin is not excluded', () => {
@@ -464,7 +467,7 @@ describe('DetailHeader', () => {
 
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should not enable auto upgrade for exclude mode when plugin is excluded', () => {
@@ -478,7 +481,7 @@ describe('DetailHeader', () => {
 
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should not enable auto upgrade for non-marketplace plugins', () => {
@@ -496,7 +499,7 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should not enable auto upgrade when marketplace feature is disabled', () => {
@@ -512,7 +515,8 @@ describe('DetailHeader', () => {
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
       // Component should still render but auto upgrade should be disabled
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      // Component should still render but auto upgrade should be disabled
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
   })
 
@@ -522,7 +526,7 @@ describe('DetailHeader', () => {
 
       // Find the close button (ActionButton with action-btn class)
       const actionButtons = screen.getAllByRole('button').filter(btn => btn.classList.contains('action-btn'))
-      fireEvent.click(actionButtons[actionButtons.length - 1])
+      fireEvent.click(actionButtons[actionButtons.length - 1]!)
 
       expect(mockOnHide).toHaveBeenCalled()
     })
@@ -533,7 +537,7 @@ describe('DetailHeader', () => {
       const infoBtn = screen.getByTestId('info-btn')
       fireEvent.click(infoBtn)
 
-      expect(infoBtn).toBeInTheDocument()
+      expect(infoBtn)!.toBeInTheDocument()
     })
 
     it('should have check version button available', () => {
@@ -542,7 +546,7 @@ describe('DetailHeader', () => {
       const checkBtn = screen.getByTestId('check-version-btn')
       fireEvent.click(checkBtn)
 
-      expect(checkBtn).toBeInTheDocument()
+      expect(checkBtn)!.toBeInTheDocument()
     })
   })
 
@@ -557,7 +561,7 @@ describe('DetailHeader', () => {
       const updateBtn = screen.getByText('plugin.detailPanel.operation.update')
       fireEvent.click(updateBtn)
 
-      expect(updateBtn).toBeInTheDocument()
+      expect(updateBtn)!.toBeInTheDocument()
     })
 
     it('should have version picker select button', () => {
@@ -566,7 +570,7 @@ describe('DetailHeader', () => {
       const selectBtn = screen.getByTestId('select-version-btn')
       fireEvent.click(selectBtn)
 
-      expect(selectBtn).toBeInTheDocument()
+      expect(selectBtn)!.toBeInTheDocument()
     })
 
     it('should have downgrade button', () => {
@@ -575,7 +579,7 @@ describe('DetailHeader', () => {
       const downgradeBtn = screen.getByTestId('select-downgrade-btn')
       fireEvent.click(downgradeBtn)
 
-      expect(downgradeBtn).toBeInTheDocument()
+      expect(downgradeBtn)!.toBeInTheDocument()
     })
   })
 
@@ -651,7 +655,7 @@ describe('DetailHeader', () => {
       const removeBtn = screen.getByTestId('remove-btn')
       fireEvent.click(removeBtn)
 
-      expect(removeBtn).toBeInTheDocument()
+      expect(removeBtn)!.toBeInTheDocument()
     })
 
     it('should have uninstallPlugin mock defined', () => {
@@ -671,13 +675,13 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('remove-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('remove-btn'))!.toBeInTheDocument()
     })
 
     it('should render correctly for tool plugin delete', () => {
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('remove-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('remove-btn'))!.toBeInTheDocument()
     })
   })
 
@@ -689,21 +693,21 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should render local source icon', () => {
       const detail = createPluginDetail({ source: PluginSource.local })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should render debugging source icon', () => {
       const detail = createPluginDetail({ source: PluginSource.debugging })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should not render deprecation notice for non-marketplace source', () => {
@@ -722,20 +726,20 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('operation-dropdown')).toBeInTheDocument()
+      expect(screen.getByTestId('operation-dropdown'))!.toBeInTheDocument()
     })
 
     it('should render marketplace source correctly', () => {
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('operation-dropdown')).toBeInTheDocument()
+      expect(screen.getByTestId('operation-dropdown'))!.toBeInTheDocument()
     })
 
     it('should render local source correctly', () => {
       const detail = createPluginDetail({ source: PluginSource.local })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('operation-dropdown')).toBeInTheDocument()
+      expect(screen.getByTestId('operation-dropdown'))!.toBeInTheDocument()
     })
   })
 
@@ -743,7 +747,7 @@ describe('DetailHeader', () => {
     it('should render plugin auth for tool category', () => {
       render(<DetailHeader detail={createPluginDetail()} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('plugin-auth')).toBeInTheDocument()
+      expect(screen.getByTestId('plugin-auth'))!.toBeInTheDocument()
     })
 
     it('should not render plugin auth for non-tool category', () => {
@@ -770,7 +774,7 @@ describe('DetailHeader', () => {
       const detail = createPluginDetail({ version: '' })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('title')).toBeInTheDocument()
+      expect(screen.getByTestId('title'))!.toBeInTheDocument()
     })
 
     it('should handle plugin with name containing slash', () => {
@@ -782,7 +786,7 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('org-info')).toBeInTheDocument()
+      expect(screen.getByTestId('org-info'))!.toBeInTheDocument()
     })
 
     it('should handle empty icon', () => {
@@ -794,7 +798,7 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('card-icon')).toHaveAttribute('data-src', '')
+      expect(screen.getByTestId('card-icon'))!.toHaveAttribute('data-src', '')
     })
   })
 
@@ -805,7 +809,7 @@ describe('DetailHeader', () => {
       fireEvent.click(screen.getByTestId('remove-btn'))
 
       await waitFor(() => {
-        expect(screen.getByRole('alertdialog')).toBeInTheDocument()
+        expect(screen.getByRole('alertdialog'))!.toBeInTheDocument()
       })
     })
 
@@ -814,7 +818,7 @@ describe('DetailHeader', () => {
 
       fireEvent.click(screen.getByTestId('remove-btn'))
       await waitFor(() => {
-        expect(screen.getByRole('alertdialog')).toBeInTheDocument()
+        expect(screen.getByRole('alertdialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
@@ -829,7 +833,7 @@ describe('DetailHeader', () => {
 
       fireEvent.click(screen.getByTestId('remove-btn'))
       await waitFor(() => {
-        expect(screen.getByRole('alertdialog')).toBeInTheDocument()
+        expect(screen.getByRole('alertdialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
@@ -844,7 +848,7 @@ describe('DetailHeader', () => {
 
       fireEvent.click(screen.getByTestId('remove-btn'))
       await waitFor(() => {
-        expect(screen.getByRole('alertdialog')).toBeInTheDocument()
+        expect(screen.getByRole('alertdialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
@@ -865,7 +869,7 @@ describe('DetailHeader', () => {
 
       fireEvent.click(screen.getByTestId('remove-btn'))
       await waitFor(() => {
-        expect(screen.getByRole('alertdialog')).toBeInTheDocument()
+        expect(screen.getByRole('alertdialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
@@ -880,7 +884,7 @@ describe('DetailHeader', () => {
 
       fireEvent.click(screen.getByTestId('remove-btn'))
       await waitFor(() => {
-        expect(screen.getByRole('alertdialog')).toBeInTheDocument()
+        expect(screen.getByRole('alertdialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
@@ -895,7 +899,7 @@ describe('DetailHeader', () => {
 
       fireEvent.click(screen.getByTestId('remove-btn'))
       await waitFor(() => {
-        expect(screen.getByRole('alertdialog')).toBeInTheDocument()
+        expect(screen.getByRole('alertdialog'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
@@ -917,7 +921,7 @@ describe('DetailHeader', () => {
       fireEvent.click(screen.getByText('plugin.detailPanel.operation.update'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('update-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('update-modal'))!.toBeInTheDocument()
       })
     })
 
@@ -930,7 +934,7 @@ describe('DetailHeader', () => {
 
       fireEvent.click(screen.getByText('plugin.detailPanel.operation.update'))
       await waitFor(() => {
-        expect(screen.getByTestId('update-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('update-modal'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('update-modal-save'))
@@ -949,7 +953,7 @@ describe('DetailHeader', () => {
 
       fireEvent.click(screen.getByText('plugin.detailPanel.operation.update'))
       await waitFor(() => {
-        expect(screen.getByTestId('update-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('update-modal'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('update-modal-cancel'))
@@ -967,7 +971,7 @@ describe('DetailHeader', () => {
       fireEvent.click(screen.getByTestId('info-btn'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('plugin-info')).toBeInTheDocument()
+        expect(screen.getByTestId('plugin-info'))!.toBeInTheDocument()
       })
     })
 
@@ -976,7 +980,7 @@ describe('DetailHeader', () => {
 
       fireEvent.click(screen.getByTestId('info-btn'))
       await waitFor(() => {
-        expect(screen.getByTestId('plugin-info')).toBeInTheDocument()
+        expect(screen.getByTestId('plugin-info'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('plugin-info-close'))
@@ -993,7 +997,7 @@ describe('DetailHeader', () => {
       })
       render(<DetailHeader detail={detail} onUpdate={mockOnUpdate} onHide={mockOnHide} />)
 
-      expect(screen.getByTestId('info-btn')).toBeInTheDocument()
+      expect(screen.getByTestId('info-btn'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-card.spec.tsx b/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-card.spec.tsx
index 3b87fdccb6..15c231cb17 100644
--- a/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-card.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-card.spec.tsx
@@ -161,30 +161,30 @@ describe('EndpointCard', () => {
     it('should render endpoint name', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
-      expect(screen.getByText('Test Endpoint')).toBeInTheDocument()
+      expect(screen.getByText('Test Endpoint'))!.toBeInTheDocument()
     })
 
     it('should render visible endpoints only', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
-      expect(screen.getByText('GET')).toBeInTheDocument()
-      expect(screen.getByText('https://api.example.com/api/test')).toBeInTheDocument()
+      expect(screen.getByText('GET'))!.toBeInTheDocument()
+      expect(screen.getByText('https://api.example.com/api/test'))!.toBeInTheDocument()
       expect(screen.queryByText('POST')).not.toBeInTheDocument()
     })
 
     it('should show active status when enabled', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
-      expect(screen.getByText('plugin.detailPanel.serviceOk')).toBeInTheDocument()
-      expect(screen.getByTestId('indicator')).toHaveAttribute('data-color', 'green')
+      expect(screen.getByText('plugin.detailPanel.serviceOk'))!.toBeInTheDocument()
+      expect(screen.getByTestId('indicator'))!.toHaveAttribute('data-color', 'green')
     })
 
     it('should show disabled status when not enabled', () => {
       const disabledData = { ...mockEndpointData, enabled: false }
       render(<EndpointCard pluginDetail={mockPluginDetail} data={disabledData} handleChange={mockHandleChange} />)
 
-      expect(screen.getByText('plugin.detailPanel.disabled')).toBeInTheDocument()
-      expect(screen.getByTestId('indicator')).toHaveAttribute('data-color', 'gray')
+      expect(screen.getByText('plugin.detailPanel.disabled'))!.toBeInTheDocument()
+      expect(screen.getByTestId('indicator'))!.toHaveAttribute('data-color', 'gray')
     })
   })
 
@@ -194,7 +194,7 @@ describe('EndpointCard', () => {
 
       fireEvent.click(screen.getByRole('switch'))
 
-      expect(screen.getByText('plugin.detailPanel.endpointDisableTip')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.endpointDisableTip'))!.toBeInTheDocument()
     })
 
     it('should call disableEndpoint when confirm disable', () => {
@@ -211,16 +211,16 @@ describe('EndpointCard', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[1])
+      fireEvent.click(allButtons[1]!)
 
-      expect(screen.getByText('plugin.detailPanel.endpointDeleteTip')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.endpointDeleteTip'))!.toBeInTheDocument()
     })
 
     it('should call deleteEndpoint when confirm delete', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[1])
+      fireEvent.click(allButtons[1]!)
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
 
       expect(mockDeleteEndpoint).toHaveBeenCalledWith('ep-1')
@@ -230,16 +230,16 @@ describe('EndpointCard', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[0])
+      fireEvent.click(allButtons[0]!)
 
-      expect(screen.getByTestId('endpoint-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('endpoint-modal'))!.toBeInTheDocument()
     })
 
     it('should call updateEndpoint when save in modal', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[0])
+      fireEvent.click(allButtons[0]!)
       fireEvent.click(screen.getByTestId('modal-save'))
 
       expect(mockUpdateEndpoint).toHaveBeenCalled()
@@ -252,13 +252,13 @@ describe('EndpointCard', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[2])
+      fireEvent.click(allButtons[2]!)
 
       act(() => {
         vi.advanceTimersByTime(2000)
       })
 
-      expect(screen.getByText('Test Endpoint')).toBeInTheDocument()
+      expect(screen.getByText('Test Endpoint'))!.toBeInTheDocument()
     })
   })
 
@@ -270,7 +270,7 @@ describe('EndpointCard', () => {
       }
       render(<EndpointCard pluginDetail={mockPluginDetail} data={dataWithNoEndpoints} handleChange={mockHandleChange} />)
 
-      expect(screen.getByText('Test Endpoint')).toBeInTheDocument()
+      expect(screen.getByText('Test Endpoint'))!.toBeInTheDocument()
     })
 
     it('should call handleChange after enable', () => {
@@ -286,20 +286,20 @@ describe('EndpointCard', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       fireEvent.click(screen.getByRole('switch'))
-      expect(screen.getByText('plugin.detailPanel.endpointDisableTip')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.endpointDisableTip'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
       await waitForAlertDialogToClose()
 
-      expect(screen.getByRole('switch')).toHaveAttribute('aria-checked', 'true')
+      expect(screen.getByRole('switch'))!.toHaveAttribute('aria-checked', 'true')
     })
 
     it('should hide delete confirm when cancel clicked', async () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[1])
-      expect(screen.getByText('plugin.detailPanel.endpointDeleteTip')).toBeInTheDocument()
+      fireEvent.click(allButtons[1]!)
+      expect(screen.getByText('plugin.detailPanel.endpointDeleteTip'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
       await waitForAlertDialogToClose()
@@ -309,8 +309,8 @@ describe('EndpointCard', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[0])
-      expect(screen.getByTestId('endpoint-modal')).toBeInTheDocument()
+      fireEvent.click(allButtons[0]!)
+      expect(screen.getByTestId('endpoint-modal'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('modal-cancel'))
 
@@ -344,7 +344,7 @@ describe('EndpointCard', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[1])
+      fireEvent.click(allButtons[1]!)
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
 
       expect(mockDeleteEndpoint).toHaveBeenCalled()
@@ -354,9 +354,9 @@ describe('EndpointCard', () => {
       render(<EndpointCard pluginDetail={mockPluginDetail} data={mockEndpointData} handleChange={mockHandleChange} />)
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[0])
+      fireEvent.click(allButtons[0]!)
 
-      expect(screen.getByTestId('endpoint-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('endpoint-modal'))!.toBeInTheDocument()
 
       failureFlags.update = true
       fireEvent.click(screen.getByTestId('modal-save'))
diff --git a/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-list.spec.tsx b/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-list.spec.tsx
index 50d63742ac..e31afc7cb2 100644
--- a/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-list.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-list.spec.tsx
@@ -85,28 +85,28 @@ describe('EndpointList', () => {
     it('should render endpoint list', () => {
       render(<EndpointList detail={createPluginDetail()} />)
 
-      expect(screen.getByText('plugin.detailPanel.endpoints')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.endpoints'))!.toBeInTheDocument()
     })
 
     it('should render endpoint cards', () => {
       render(<EndpointList detail={createPluginDetail()} />)
 
-      expect(screen.getByTestId('endpoint-card')).toBeInTheDocument()
-      expect(screen.getByText('Endpoint 1')).toBeInTheDocument()
+      expect(screen.getByTestId('endpoint-card'))!.toBeInTheDocument()
+      expect(screen.getByText('Endpoint 1'))!.toBeInTheDocument()
     })
 
     it('should return null when no data', () => {
       mockEndpointListData = undefined
       const { container } = render(<EndpointList detail={createPluginDetail()} />)
 
-      expect(container).toBeEmptyDOMElement()
+      expect(container)!.toBeEmptyDOMElement()
     })
 
     it('should show empty message when no endpoints', () => {
       mockEndpointListData = { endpoints: [] }
       render(<EndpointList detail={createPluginDetail()} />)
 
-      expect(screen.getByText('plugin.detailPanel.endpointsEmpty')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.endpointsEmpty'))!.toBeInTheDocument()
     })
 
     it('should render add button', () => {
@@ -121,17 +121,17 @@ describe('EndpointList', () => {
       render(<EndpointList detail={createPluginDetail()} />)
 
       const addButton = screen.getAllByRole('button')[0]
-      fireEvent.click(addButton)
+      fireEvent.click(addButton!)
 
-      expect(screen.getByTestId('endpoint-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('endpoint-modal'))!.toBeInTheDocument()
     })
 
     it('should hide modal when cancel clicked', () => {
       render(<EndpointList detail={createPluginDetail()} />)
 
       const addButton = screen.getAllByRole('button')[0]
-      fireEvent.click(addButton)
-      expect(screen.getByTestId('endpoint-modal')).toBeInTheDocument()
+      fireEvent.click(addButton!)
+      expect(screen.getByTestId('endpoint-modal'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('modal-cancel'))
       expect(screen.queryByTestId('endpoint-modal')).not.toBeInTheDocument()
@@ -141,7 +141,7 @@ describe('EndpointList', () => {
       render(<EndpointList detail={createPluginDetail()} />)
 
       const addButton = screen.getAllByRole('button')[0]
-      fireEvent.click(addButton)
+      fireEvent.click(addButton!)
       fireEvent.click(screen.getByTestId('modal-save'))
 
       expect(mockCreateEndpoint).toHaveBeenCalled()
@@ -154,7 +154,7 @@ describe('EndpointList', () => {
       detail.declaration.tool = {} as PluginDetail['declaration']['tool']
       render(<EndpointList detail={detail} />)
 
-      expect(screen.getByText('plugin.detailPanel.endpoints')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.endpoints'))!.toBeInTheDocument()
     })
   })
 
@@ -177,7 +177,7 @@ describe('EndpointList', () => {
       render(<EndpointList detail={createPluginDetail()} />)
 
       const addButton = screen.getAllByRole('button')[0]
-      fireEvent.click(addButton)
+      fireEvent.click(addButton!)
       fireEvent.click(screen.getByTestId('modal-save'))
 
       expect(mockInvalidateEndpointList).toHaveBeenCalledWith('test-plugin')
@@ -187,7 +187,7 @@ describe('EndpointList', () => {
       render(<EndpointList detail={createPluginDetail()} />)
 
       const addButton = screen.getAllByRole('button')[0]
-      fireEvent.click(addButton)
+      fireEvent.click(addButton!)
       fireEvent.click(screen.getByTestId('modal-save'))
 
       expect(mockCreateEndpoint).toHaveBeenCalledWith({
diff --git a/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-modal.spec.tsx b/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-modal.spec.tsx
index a467de7142..0be17f07d4 100644
--- a/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-modal.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/__tests__/endpoint-modal.spec.tsx
@@ -101,7 +101,7 @@ describe('EndpointModal', () => {
         />,
       )
 
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
+      expect(screen.getByRole('dialog'))!.toBeInTheDocument()
     })
 
     it('should render title and description', () => {
@@ -114,8 +114,8 @@ describe('EndpointModal', () => {
         />,
       )
 
-      expect(screen.getByText('plugin.detailPanel.endpointModalTitle')).toBeInTheDocument()
-      expect(screen.getByText('plugin.detailPanel.endpointModalDesc')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.endpointModalTitle'))!.toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.endpointModalDesc'))!.toBeInTheDocument()
     })
 
     it('should render form with fieldMoreInfo url link', () => {
@@ -128,8 +128,8 @@ describe('EndpointModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('field-more-info')).toBeInTheDocument()
-      expect(screen.getByText('tools.howToGet')).toBeInTheDocument()
+      expect(screen.getByTestId('field-more-info'))!.toBeInTheDocument()
+      expect(screen.getByText('tools.howToGet'))!.toBeInTheDocument()
     })
 
     it('should render readme entrance', () => {
@@ -142,7 +142,7 @@ describe('EndpointModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('readme-entrance')).toBeInTheDocument()
+      expect(screen.getByTestId('readme-entrance'))!.toBeInTheDocument()
     })
   })
 
@@ -173,7 +173,7 @@ describe('EndpointModal', () => {
       )
 
       const allButtons = screen.getAllByRole('button')
-      fireEvent.click(allButtons[0])
+      fireEvent.click(allButtons[0]!)
 
       expect(mockOnCancel).toHaveBeenCalledTimes(1)
     })
@@ -191,7 +191,7 @@ describe('EndpointModal', () => {
       const input = screen.getByTestId('form-input')
       fireEvent.change(input, { target: { value: 'Test Name' } })
 
-      expect(input).toHaveValue('Test Name')
+      expect(input)!.toHaveValue('Test Name')
     })
   })
 
@@ -207,7 +207,7 @@ describe('EndpointModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('form-input')).toHaveValue('Default Name')
+      expect(screen.getByTestId('form-input'))!.toHaveValue('Default Name')
     })
 
     it('should extract default values from schemas when no defaultValues', () => {
@@ -224,7 +224,7 @@ describe('EndpointModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('form-input')).toHaveValue('Schema Default')
+      expect(screen.getByTestId('form-input'))!.toHaveValue('Schema Default')
     })
 
     it('should handle schemas without default values', () => {
@@ -241,7 +241,7 @@ describe('EndpointModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('form')).toBeInTheDocument()
+      expect(screen.getByTestId('form'))!.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/plugins/plugin-detail-panel/__tests__/strategy-detail.spec.tsx b/web/app/components/plugins/plugin-detail-panel/__tests__/strategy-detail.spec.tsx
index 350bf6956b..b5fbc03b45 100644
--- a/web/app/components/plugins/plugin-detail-panel/__tests__/strategy-detail.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/__tests__/strategy-detail.spec.tsx
@@ -69,40 +69,40 @@ describe('StrategyDetail', () => {
     it('should render drawer', () => {
       render(<StrategyDetail provider={mockProvider} detail={mockDetail} onHide={mockOnHide} />)
 
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
+      expect(screen.getByRole('dialog'))!.toBeInTheDocument()
     })
 
     it('should render provider label', () => {
       render(<StrategyDetail provider={mockProvider} detail={mockDetail} onHide={mockOnHide} />)
 
-      expect(screen.getByText('Test Provider')).toBeInTheDocument()
+      expect(screen.getByText('Test Provider'))!.toBeInTheDocument()
     })
 
     it('should render strategy label', () => {
       render(<StrategyDetail provider={mockProvider} detail={mockDetail} onHide={mockOnHide} />)
 
-      expect(screen.getByText('Strategy Label')).toBeInTheDocument()
+      expect(screen.getByText('Strategy Label'))!.toBeInTheDocument()
     })
 
     it('should render parameters section', () => {
       render(<StrategyDetail provider={mockProvider} detail={mockDetail} onHide={mockOnHide} />)
 
-      expect(screen.getByText('tools.setBuiltInTools.parameters')).toBeInTheDocument()
-      expect(screen.getByText('Parameter 1')).toBeInTheDocument()
+      expect(screen.getByText('tools.setBuiltInTools.parameters'))!.toBeInTheDocument()
+      expect(screen.getByText('Parameter 1'))!.toBeInTheDocument()
     })
 
     it('should render output schema section', () => {
       render(<StrategyDetail provider={mockProvider} detail={mockDetail} onHide={mockOnHide} />)
 
-      expect(screen.getByText('OUTPUT')).toBeInTheDocument()
-      expect(screen.getByText('result')).toBeInTheDocument()
-      expect(screen.getByText('String')).toBeInTheDocument()
+      expect(screen.getByText('OUTPUT'))!.toBeInTheDocument()
+      expect(screen.getByText('result'))!.toBeInTheDocument()
+      expect(screen.getByText('String'))!.toBeInTheDocument()
     })
 
     it('should render BACK button', () => {
       render(<StrategyDetail provider={mockProvider} detail={mockDetail} onHide={mockOnHide} />)
 
-      expect(screen.getByText('BACK')).toBeInTheDocument()
+      expect(screen.getByText('BACK'))!.toBeInTheDocument()
     })
   })
 
@@ -131,51 +131,51 @@ describe('StrategyDetail', () => {
     it('should display correct type for number-input', () => {
       const detailWithNumber = {
         ...mockDetail,
-        parameters: [{ ...mockDetail.parameters[0], type: 'number-input' }],
+        parameters: [{ ...mockDetail.parameters[0]!, type: 'number-input' }],
       }
       render(<StrategyDetail provider={mockProvider} detail={detailWithNumber} onHide={mockOnHide} />)
 
-      expect(screen.getByText('tools.setBuiltInTools.number')).toBeInTheDocument()
+      expect(screen.getByText('tools.setBuiltInTools.number'))!.toBeInTheDocument()
     })
 
     it('should display correct type for checkbox', () => {
       const detailWithCheckbox = {
         ...mockDetail,
-        parameters: [{ ...mockDetail.parameters[0], type: 'checkbox' }],
+        parameters: [{ ...mockDetail.parameters[0]!, type: 'checkbox' }],
       }
       render(<StrategyDetail provider={mockProvider} detail={detailWithCheckbox} onHide={mockOnHide} />)
 
-      expect(screen.getByText('boolean')).toBeInTheDocument()
+      expect(screen.getByText('boolean'))!.toBeInTheDocument()
     })
 
     it('should display correct type for file', () => {
       const detailWithFile = {
         ...mockDetail,
-        parameters: [{ ...mockDetail.parameters[0], type: 'file' }],
+        parameters: [{ ...mockDetail.parameters[0]!, type: 'file' }],
       }
       render(<StrategyDetail provider={mockProvider} detail={detailWithFile} onHide={mockOnHide} />)
 
-      expect(screen.getByText('tools.setBuiltInTools.file')).toBeInTheDocument()
+      expect(screen.getByText('tools.setBuiltInTools.file'))!.toBeInTheDocument()
     })
 
     it('should display correct type for array[tools]', () => {
       const detailWithArrayTools = {
         ...mockDetail,
-        parameters: [{ ...mockDetail.parameters[0], type: 'array[tools]' }],
+        parameters: [{ ...mockDetail.parameters[0]!, type: 'array[tools]' }],
       }
       render(<StrategyDetail provider={mockProvider} detail={detailWithArrayTools} onHide={mockOnHide} />)
 
-      expect(screen.getByText('multiple-tool-select')).toBeInTheDocument()
+      expect(screen.getByText('multiple-tool-select'))!.toBeInTheDocument()
     })
 
     it('should display original type for unknown types', () => {
       const detailWithUnknown = {
         ...mockDetail,
-        parameters: [{ ...mockDetail.parameters[0], type: 'custom-type' }],
+        parameters: [{ ...mockDetail.parameters[0]!, type: 'custom-type' }],
       }
       render(<StrategyDetail provider={mockProvider} detail={detailWithUnknown} onHide={mockOnHide} />)
 
-      expect(screen.getByText('custom-type')).toBeInTheDocument()
+      expect(screen.getByText('custom-type'))!.toBeInTheDocument()
     })
   })
 
@@ -184,7 +184,7 @@ describe('StrategyDetail', () => {
       const detailEmpty = { ...mockDetail, parameters: [] }
       render(<StrategyDetail provider={mockProvider} detail={detailEmpty} onHide={mockOnHide} />)
 
-      expect(screen.getByText('tools.setBuiltInTools.parameters')).toBeInTheDocument()
+      expect(screen.getByText('tools.setBuiltInTools.parameters'))!.toBeInTheDocument()
     })
 
     it('should handle no output schema', () => {
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/index.spec.tsx
index 4dd604a03e..f7dd1921e4 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/index.spec.tsx
@@ -393,19 +393,20 @@ describe('AppTrigger', () => {
     it('should render placeholder when no app is selected', () => {
       render(<AppTrigger open={false} />)
       // i18n mock returns key with namespace in dot format
-      expect(screen.getByText('app.appSelector.placeholder')).toBeInTheDocument()
+      // i18n mock returns key with namespace in dot format
+      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
     })
 
     it('should render app details when app is selected', () => {
       const app = createMockApp({ name: 'My Test App' })
       render(<AppTrigger open={false} appDetail={app} />)
-      expect(screen.getByText('My Test App')).toBeInTheDocument()
+      expect(screen.getByText('My Test App'))!.toBeInTheDocument()
     })
 
     it('should apply open state styling', () => {
       const { container } = render(<AppTrigger open={true} />)
       const trigger = container.querySelector('.bg-state-base-hover-alt')
-      expect(trigger).toBeInTheDocument()
+      expect(trigger)!.toBeInTheDocument()
     })
 
     it('should render AppIcon when app is provided', () => {
@@ -413,21 +414,21 @@ describe('AppTrigger', () => {
       const { container } = render(<AppTrigger open={false} appDetail={app} />)
       // AppIcon renders with a specific class when app is provided
       const iconContainer = container.querySelector('.mr-2')
-      expect(iconContainer).toBeInTheDocument()
+      expect(iconContainer)!.toBeInTheDocument()
     })
   })
 
   describe('Props', () => {
     it('should handle undefined appDetail gracefully', () => {
       render(<AppTrigger open={false} appDetail={undefined} />)
-      expect(screen.getByText('app.appSelector.placeholder')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
     })
 
     it('should display app name with title attribute', () => {
       const app = createMockApp({ name: 'Long App Name For Testing' })
       render(<AppTrigger open={false} appDetail={app} />)
       const nameElement = screen.getByTitle('Long App Name For Testing')
-      expect(nameElement).toBeInTheDocument()
+      expect(nameElement)!.toBeInTheDocument()
     })
   })
 
@@ -435,14 +436,14 @@ describe('AppTrigger', () => {
     it('should have correct base classes', () => {
       const { container } = render(<AppTrigger open={false} />)
       const trigger = container.firstChild as HTMLElement
-      expect(trigger).toHaveClass('group', 'flex', 'cursor-pointer')
+      expect(trigger)!.toHaveClass('group', 'flex', 'cursor-pointer')
     })
 
     it('should apply different padding when app is provided', () => {
       const app = createMockApp()
       const { container } = render(<AppTrigger open={false} appDetail={app} />)
       const trigger = container.firstChild as HTMLElement
-      expect(trigger).toHaveClass('py-1.5', 'pl-1.5')
+      expect(trigger)!.toHaveClass('py-1.5', 'pl-1.5')
     })
   })
 })
@@ -479,18 +480,18 @@ describe('AppPicker', () => {
   describe('Rendering', () => {
     it('should render trigger element', () => {
       render(<AppPicker {...defaultProps} />)
-      expect(screen.getByText('Select App')).toBeInTheDocument()
+      expect(screen.getByText('Select App'))!.toBeInTheDocument()
     })
 
     it('should render app list when open', () => {
       render(<AppPicker {...defaultProps} isShow={true} />)
-      expect(screen.getByText('App 1')).toBeInTheDocument()
-      expect(screen.getByText('App 2')).toBeInTheDocument()
+      expect(screen.getByText('App 1'))!.toBeInTheDocument()
+      expect(screen.getByText('App 2'))!.toBeInTheDocument()
     })
 
     it('should show loading indicator when isLoading is true', () => {
       render(<AppPicker {...defaultProps} isShow={true} isLoading={true} />)
-      expect(screen.getByText('common.loading')).toBeInTheDocument()
+      expect(screen.getByText('common.loading'))!.toBeInTheDocument()
     })
 
     it('should not render content when isShow is false', () => {
@@ -538,31 +539,31 @@ describe('AppPicker', () => {
     it('should display correct app type for CHAT', () => {
       const apps = [createMockApp({ id: 'chat-app', name: 'Chat App', mode: AppModeEnum.CHAT })]
       render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('chat')).toBeInTheDocument()
+      expect(screen.getByText('chat'))!.toBeInTheDocument()
     })
 
     it('should display correct app type for WORKFLOW', () => {
       const apps = [createMockApp({ id: 'workflow-app', name: 'Workflow App', mode: AppModeEnum.WORKFLOW })]
       render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('workflow')).toBeInTheDocument()
+      expect(screen.getByText('workflow'))!.toBeInTheDocument()
     })
 
     it('should display correct app type for ADVANCED_CHAT', () => {
       const apps = [createMockApp({ id: 'chatflow-app', name: 'Chatflow App', mode: AppModeEnum.ADVANCED_CHAT })]
       render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('chatflow')).toBeInTheDocument()
+      expect(screen.getByText('chatflow'))!.toBeInTheDocument()
     })
 
     it('should display correct app type for AGENT_CHAT', () => {
       const apps = [createMockApp({ id: 'agent-app', name: 'Agent App', mode: AppModeEnum.AGENT_CHAT })]
       render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('agent')).toBeInTheDocument()
+      expect(screen.getByText('agent'))!.toBeInTheDocument()
     })
 
     it('should display correct app type for COMPLETION', () => {
       const apps = [createMockApp({ id: 'completion-app', name: 'Completion App', mode: AppModeEnum.COMPLETION })]
       render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('completion')).toBeInTheDocument()
+      expect(screen.getByText('completion'))!.toBeInTheDocument()
     })
   })
 
@@ -575,7 +576,7 @@ describe('AppPicker', () => {
     it('should handle search text with value', () => {
       render(<AppPicker {...defaultProps} isShow={true} searchText="test search" />)
       const input = screen.getByTestId('input')
-      expect(input).toHaveValue('test search')
+      expect(input)!.toHaveValue('test search')
     })
   })
 
@@ -641,7 +642,8 @@ describe('AppPicker', () => {
       render(<AppPicker {...defaultProps} isShow={true} hasMore={true} />)
 
       // The component should render without errors
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // The component should render without errors
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle isShow toggle correctly', () => {
@@ -654,7 +656,8 @@ describe('AppPicker', () => {
       rerender(<AppPicker {...defaultProps} isShow={false} />)
 
       // Should not crash
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // Should not crash
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should setup intersection observer when isShow is true', () => {
@@ -674,7 +677,8 @@ describe('AppPicker', () => {
       rerender(<AppPicker {...defaultProps} isShow={false} />)
 
       // Component should render without errors
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // Component should render without errors
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should cleanup observer on component unmount', () => {
@@ -691,7 +695,8 @@ describe('AppPicker', () => {
       triggerMutationObserver()
 
       // Component should still work correctly
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // Component should still work correctly
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should not setup IntersectionObserver when observerTarget is null', () => {
@@ -699,7 +704,8 @@ describe('AppPicker', () => {
       render(<AppPicker {...defaultProps} isShow={false} />)
 
       // The guard at line 84 should prevent setup
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // The guard at line 84 should prevent setup
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should debounce onLoadMore calls using loadingRef', () => {
@@ -798,8 +804,8 @@ describe('AppInputsForm', () => {
         { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
       ]
       render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Name')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('Name')).toBeInTheDocument()
+      expect(screen.getByText('Name'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('Name'))!.toBeInTheDocument()
     })
 
     it('should render number input field', () => {
@@ -807,7 +813,7 @@ describe('AppInputsForm', () => {
         { type: InputVarType.number, label: 'Count', variable: 'count', required: false },
       ]
       render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Count')).toBeInTheDocument()
+      expect(screen.getByText('Count'))!.toBeInTheDocument()
     })
 
     it('should render paragraph (textarea) field', () => {
@@ -815,7 +821,7 @@ describe('AppInputsForm', () => {
         { type: InputVarType.paragraph, label: 'Description', variable: 'desc', required: false },
       ]
       render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Description')).toBeInTheDocument()
+      expect(screen.getByText('Description'))!.toBeInTheDocument()
     })
 
     it('should render select field', () => {
@@ -840,8 +846,8 @@ describe('AppInputsForm', () => {
         },
       ]
       render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Single File Upload')).toBeInTheDocument()
-      expect(screen.getByTestId('file-uploader')).toBeInTheDocument()
+      expect(screen.getByText('Single File Upload'))!.toBeInTheDocument()
+      expect(screen.getByTestId('file-uploader'))!.toBeInTheDocument()
     })
 
     it('should render file uploader for single file with existing value', () => {
@@ -859,7 +865,8 @@ describe('AppInputsForm', () => {
       ]
       render(<AppInputsForm {...defaultProps} inputsForms={forms} inputs={{ singleFile: existingFile }} />)
       // The file uploader should receive the existing file as an array
-      expect(screen.getByTestId('file-value')).toHaveTextContent(JSON.stringify([existingFile]))
+      // The file uploader should receive the existing file as an array
+      expect(screen.getByTestId('file-value'))!.toHaveTextContent(JSON.stringify([existingFile]))
     })
 
     it('should render file uploader for multi files', () => {
@@ -876,7 +883,7 @@ describe('AppInputsForm', () => {
         },
       ]
       render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Attachments')).toBeInTheDocument()
+      expect(screen.getByText('Attachments'))!.toBeInTheDocument()
     })
 
     it('should show optional label for non-required fields', () => {
@@ -884,7 +891,7 @@ describe('AppInputsForm', () => {
         { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
       ]
       render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('workflow.panel.optional')).toBeInTheDocument()
+      expect(screen.getByText('workflow.panel.optional'))!.toBeInTheDocument()
     })
 
     it('should not show optional label for required fields', () => {
@@ -1026,7 +1033,7 @@ describe('AppInputsForm', () => {
       render(<AppInputsForm {...defaultProps} inputsForms={forms} inputs={{ name: 'existing' }} />)
 
       const input = screen.getByPlaceholderText('Name')
-      expect(input).toHaveValue('existing')
+      expect(input)!.toHaveValue('existing')
     })
 
     it('should handle empty string value', () => {
@@ -1036,7 +1043,7 @@ describe('AppInputsForm', () => {
       render(<AppInputsForm {...defaultProps} inputsForms={forms} inputs={{ name: '' }} />)
 
       const input = screen.getByPlaceholderText('Name')
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
     })
 
     it('should handle undefined variable value', () => {
@@ -1046,7 +1053,7 @@ describe('AppInputsForm', () => {
       render(<AppInputsForm {...defaultProps} inputsForms={forms} inputs={{}} />)
 
       const input = screen.getByPlaceholderText('Name')
-      expect(input).toHaveValue('')
+      expect(input)!.toHaveValue('')
     })
 
     it('should handle multiple form fields', () => {
@@ -1057,9 +1064,9 @@ describe('AppInputsForm', () => {
       ]
       render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
 
-      expect(screen.getByText('Name')).toBeInTheDocument()
-      expect(screen.getByText('Age')).toBeInTheDocument()
-      expect(screen.getByText('Bio')).toBeInTheDocument()
+      expect(screen.getByText('Name'))!.toBeInTheDocument()
+      expect(screen.getByText('Age'))!.toBeInTheDocument()
+      expect(screen.getByText('Bio'))!.toBeInTheDocument()
     })
 
     it('should handle unknown form type gracefully', () => {
@@ -1068,7 +1075,7 @@ describe('AppInputsForm', () => {
       ]
       // Should not throw error, just not render the field
       render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Unknown')).toBeInTheDocument()
+      expect(screen.getByText('Unknown'))!.toBeInTheDocument()
     })
   })
 })
@@ -1093,18 +1100,49 @@ describe('AppInputsPanel', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should show no params message when form schema is empty', () => {
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.noParams')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.noParams'))!.toBeInTheDocument()
     })
 
     it('should show loading state when app is loading', () => {
       mockAppDetailLoading = true
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
       // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
+      // Loading component should be rendered
       expect(screen.queryByText('app.appSelector.params')).not.toBeInTheDocument()
     })
 
@@ -1119,19 +1157,19 @@ describe('AppInputsPanel', () => {
   describe('Props', () => {
     it('should handle undefined value', () => {
       renderWithQueryClient(<AppInputsPanel {...defaultProps} value={undefined} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should handle different app modes', () => {
       const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should handle advanced chat mode', () => {
       const advancedChatApp = createMockApp({ mode: AppModeEnum.ADVANCED_CHAT })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={advancedChatApp} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
   })
 
@@ -1147,7 +1185,7 @@ describe('AppInputsPanel', () => {
         },
       })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should generate schema for number input', () => {
@@ -1161,7 +1199,7 @@ describe('AppInputsPanel', () => {
         },
       })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should generate schema for checkbox input', () => {
@@ -1175,7 +1213,7 @@ describe('AppInputsPanel', () => {
         },
       })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should generate schema for select input', () => {
@@ -1189,7 +1227,7 @@ describe('AppInputsPanel', () => {
         },
       })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should generate schema for file-list input', () => {
@@ -1203,7 +1241,7 @@ describe('AppInputsPanel', () => {
         },
       })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should generate schema for file input', () => {
@@ -1217,7 +1255,7 @@ describe('AppInputsPanel', () => {
         },
       })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should generate schema for json_object input', () => {
@@ -1231,7 +1269,7 @@ describe('AppInputsPanel', () => {
         },
       })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should generate schema for text-input (default)', () => {
@@ -1245,7 +1283,7 @@ describe('AppInputsPanel', () => {
         },
       })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should filter external_data_tool items', () => {
@@ -1260,7 +1298,7 @@ describe('AppInputsPanel', () => {
         },
       })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
   })
 
@@ -1283,7 +1321,7 @@ describe('AppInputsPanel', () => {
       }
       const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should generate schema for workflow with singleFile variable', () => {
@@ -1304,7 +1342,7 @@ describe('AppInputsPanel', () => {
       }
       const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should generate schema for workflow with regular variable', () => {
@@ -1325,7 +1363,7 @@ describe('AppInputsPanel', () => {
       }
       const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
   })
 
@@ -1344,7 +1382,7 @@ describe('AppInputsPanel', () => {
       })
       const completionApp = createMockApp({ mode: AppModeEnum.COMPLETION })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={completionApp} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should add image upload schema for WORKFLOW mode with file upload enabled', () => {
@@ -1364,7 +1402,7 @@ describe('AppInputsPanel', () => {
       }
       const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
   })
 
@@ -1372,7 +1410,7 @@ describe('AppInputsPanel', () => {
     it('should call onFormChange when form is updated', () => {
       const onFormChange = vi.fn()
       renderWithQueryClient(<AppInputsPanel {...defaultProps} onFormChange={onFormChange} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
 
     it('should call onFormChange with updated values when text input changes', () => {
@@ -1424,7 +1462,7 @@ describe('AppInputsPanel', () => {
           <AppInputsPanel {...defaultProps} />
         </QueryClientProvider>,
       )
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
   })
 
@@ -1432,7 +1470,7 @@ describe('AppInputsPanel', () => {
     it('should return empty schema when currentApp is null', () => {
       mockAppDetailData = null
       renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.noParams')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.noParams'))!.toBeInTheDocument()
     })
 
     it('should handle workflow without start node', () => {
@@ -1442,7 +1480,7 @@ describe('AppInputsPanel', () => {
       }
       const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
       renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
     })
   })
 })
@@ -1477,12 +1515,12 @@ describe('AppSelector', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should render trigger component', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.placeholder')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
     })
 
     it('should show selected app info when value is provided', () => {
@@ -1493,19 +1531,20 @@ describe('AppSelector', () => {
         />,
       )
       // Should show the app trigger with app info
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // Should show the app trigger with app info
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
   })
 
   describe('Props', () => {
     it('should handle different placement values', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} placement="top" />)
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle different offset values', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} offset={10} />)
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle disabled state', () => {
@@ -1513,12 +1552,13 @@ describe('AppSelector', () => {
       const trigger = screen.getByTestId('portal-trigger')
       fireEvent.click(trigger)
       // Portal should remain closed when disabled
-      expect(screen.getByTestId('portal-to-follow-elem')).toHaveAttribute('data-open', 'false')
+      // Portal should remain closed when disabled
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toHaveAttribute('data-open', 'false')
     })
 
     it('should handle scope prop', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} scope="workflow" />)
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle value with inputs', () => {
@@ -1528,7 +1568,7 @@ describe('AppSelector', () => {
           value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [] }}
         />,
       )
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle value with files', () => {
@@ -1538,7 +1578,7 @@ describe('AppSelector', () => {
           value={{ app_id: 'app-1', inputs: {}, files: [{ id: 'file-1' }] }}
         />,
       )
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
   })
 
@@ -1547,10 +1587,11 @@ describe('AppSelector', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
 
       const trigger = screen.getAllByTestId('portal-trigger')[0]
-      fireEvent.click(trigger)
+      fireEvent.click(trigger!)
 
       // The portal state should update synchronously - get the first one (outer portal)
-      expect(screen.getAllByTestId('portal-to-follow-elem')[0]).toHaveAttribute('data-open', 'true')
+      // The portal state should update synchronously - get the first one (outer portal)
+      expect(screen.getAllByTestId('portal-to-follow-elem')[0])!.toHaveAttribute('data-open', 'true')
     })
 
     it('should not toggle isShow when disabled', () => {
@@ -1559,7 +1600,7 @@ describe('AppSelector', () => {
       const trigger = screen.getByTestId('portal-trigger')
       fireEvent.click(trigger)
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toHaveAttribute('data-open', 'false')
     })
 
     it('should manage search text state', () => {
@@ -1569,7 +1610,8 @@ describe('AppSelector', () => {
       fireEvent.click(trigger)
 
       // Portal content should be visible after click
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      // Portal content should be visible after click
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should render correctly during load more setup', () => {
@@ -1579,7 +1621,8 @@ describe('AppSelector', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
 
       // Trigger should be rendered
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
+      // Trigger should be rendered
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -1592,7 +1635,7 @@ describe('AppSelector', () => {
       // Open the portal
       fireEvent.click(screen.getByTestId('portal-trigger'))
 
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should call onSelect with correct value structure', () => {
@@ -1606,7 +1649,8 @@ describe('AppSelector', () => {
       )
 
       // The component should maintain the correct value structure
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // The component should maintain the correct value structure
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should clear inputs when selecting different app', () => {
@@ -1620,7 +1664,8 @@ describe('AppSelector', () => {
       )
 
       // Component renders with existing value
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // Component renders with existing value
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should preserve inputs when selecting same app', () => {
@@ -1633,7 +1678,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
   })
 
@@ -1647,7 +1692,7 @@ describe('AppSelector', () => {
       }
 
       renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should memoize currentAppInfo correctly', () => {
@@ -1662,7 +1707,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should memoize formattedValue correctly', () => {
@@ -1673,7 +1718,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should be wrapped with React.memo', () => {
@@ -1690,7 +1735,7 @@ describe('AppSelector', () => {
         </QueryClientProvider>,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
   })
 
@@ -1698,7 +1743,7 @@ describe('AppSelector', () => {
     it('should handle load more when hasMore is true', async () => {
       mockHasNextPage = true
       renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should not trigger load more when already loading', async () => {
@@ -1724,7 +1769,7 @@ describe('AppSelector', () => {
         vi.advanceTimersByTime(500)
       })
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should render load more area when hasMore is true', () => {
@@ -1735,10 +1780,11 @@ describe('AppSelector', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
 
       // Open the portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // Should render without errors
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      // Should render without errors
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should handle fetchNextPage rejection gracefully in handleLoadMore', async () => {
@@ -1748,7 +1794,8 @@ describe('AppSelector', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
 
       // Should not crash even if fetchNextPage rejects
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // Should not crash even if fetchNextPage rejects
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should call fetchNextPage when intersection observer triggers handleLoadMore', async () => {
@@ -1759,11 +1806,11 @@ describe('AppSelector', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
 
       // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // Open the inner app picker portal
       const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[1])
+      fireEvent.click(triggers[1]!)
 
       // Simulate intersection to trigger handleLoadMore
       triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
@@ -1780,9 +1827,9 @@ describe('AppSelector', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
 
       // Open portals
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
       const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[1])
+      fireEvent.click(triggers[1]!)
 
       // Trigger first intersection
       triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
@@ -1806,9 +1853,9 @@ describe('AppSelector', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
 
       // Open portals
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
       const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[1])
+      fireEvent.click(triggers[1]!)
 
       // Trigger intersection
       triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
@@ -1825,9 +1872,9 @@ describe('AppSelector', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
 
       // Open portals
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
       const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[1])
+      fireEvent.click(triggers[1]!)
 
       // Trigger intersection
       triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
@@ -1847,7 +1894,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle form change without image file', () => {
@@ -1860,7 +1907,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should extract #image# from inputs and add to files array', () => {
@@ -1874,7 +1921,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should preserve existing files when no #image# in inputs', () => {
@@ -1887,7 +1934,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
   })
 
@@ -1907,9 +1954,9 @@ describe('AppSelector', () => {
       )
 
       // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should preserve inputs when selecting the same app', () => {
@@ -1926,7 +1973,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle app selection with empty value', () => {
@@ -1944,34 +1991,34 @@ describe('AppSelector', () => {
       )
 
       // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
   })
 
   describe('Edge Cases', () => {
     it('should handle undefined value', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} value={undefined} />)
-      expect(screen.getByText('app.appSelector.placeholder')).toBeInTheDocument()
+      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
     })
 
     it('should handle empty pages array', () => {
       mockAppListData = { pages: [] }
       renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle undefined data', () => {
       mockAppListData = undefined
       renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle loading state', () => {
       mockIsLoading = true
       renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle app not found in displayedApps', () => {
@@ -1986,7 +2033,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle value with empty inputs and files', () => {
@@ -1997,7 +2044,7 @@ describe('AppSelector', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
   })
 
@@ -2009,7 +2056,8 @@ describe('AppSelector', () => {
       renderWithQueryClient(<AppSelector {...defaultProps} />)
 
       // Should not crash
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      // Should not crash
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
   })
 })
@@ -2043,10 +2091,11 @@ describe('AppSelector Integration', () => {
       renderWithQueryClient(<AppSelector onSelect={onSelect} />)
 
       // 1. Click trigger to open picker - get first trigger (outer portal)
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // Get the first portal element (outer portal)
-      expect(screen.getAllByTestId('portal-to-follow-elem')[0]).toHaveAttribute('data-open', 'true')
+      // Get the first portal element (outer portal)
+      expect(screen.getAllByTestId('portal-to-follow-elem')[0])!.toHaveAttribute('data-open', 'true')
     })
 
     it('should handle app change with input preservation logic', () => {
@@ -2058,7 +2107,7 @@ describe('AppSelector Integration', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
   })
 
@@ -2067,7 +2116,8 @@ describe('AppSelector Integration', () => {
       renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
 
       // AppTrigger should show placeholder when no app selected
-      expect(screen.getByText('app.appSelector.placeholder')).toBeInTheDocument()
+      // AppTrigger should show placeholder when no app selected
+      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
     })
 
     it('should pass correct props to AppPicker', () => {
@@ -2075,7 +2125,7 @@ describe('AppSelector Integration', () => {
 
       fireEvent.click(screen.getByTestId('portal-trigger'))
 
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
   })
 
@@ -2088,7 +2138,7 @@ describe('AppSelector Integration', () => {
         />,
       )
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
     })
 
     it('should handle search filtering through app list', () => {
@@ -2096,7 +2146,7 @@ describe('AppSelector Integration', () => {
 
       fireEvent.click(screen.getByTestId('portal-trigger'))
 
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
   })
 
@@ -2115,13 +2165,13 @@ describe('AppSelector Integration', () => {
       )
 
       // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // The inner AppPicker portal is closed by default (isShowChooseApp = false)
       // We need to click on the inner trigger to open it
       const innerTriggers = screen.getAllByTestId('portal-trigger')
       // The second trigger is the inner AppPicker trigger
-      fireEvent.click(innerTriggers[1])
+      fireEvent.click(innerTriggers[1]!)
 
       // Now the inner portal should be open and show the app list
       // Find and click on app-2
@@ -2150,16 +2200,16 @@ describe('AppSelector Integration', () => {
       )
 
       // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // Click on the inner trigger to open app picker
       const innerTriggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(innerTriggers[1])
+      fireEvent.click(innerTriggers[1]!)
 
       // Click on the same app - need to get the one in the app list, not the trigger
       const appItems = screen.getAllByText('App 1')
       // The last one should be in the dropdown list
-      fireEvent.click(appItems[appItems.length - 1])
+      fireEvent.click(appItems[appItems.length - 1]!)
 
       // onSelect should be called with preserved inputs since it's the same app
       expect(onSelect).toHaveBeenCalledWith({
@@ -2183,15 +2233,15 @@ describe('AppSelector Integration', () => {
       )
 
       // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // Click on inner trigger to open app picker
       const innerTriggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(innerTriggers[1])
+      fireEvent.click(innerTriggers[1]!)
 
       // Click on an app from the dropdown
       const app1Elements = screen.getAllByText('App 1')
-      fireEvent.click(app1Elements[app1Elements.length - 1])
+      fireEvent.click(app1Elements[app1Elements.length - 1]!)
 
       // onSelect should be called with new app and empty inputs/files
       expect(onSelect).toHaveBeenCalledWith({
@@ -2211,9 +2261,9 @@ describe('AppSelector Integration', () => {
       renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
 
       // Open the portal to render the app picker
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should stay stable after fetchNextPage completes', async () => {
@@ -2223,9 +2273,9 @@ describe('AppSelector Integration', () => {
 
       renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
 
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should not call fetchNextPage when conditions prevent it', () => {
@@ -2234,7 +2284,7 @@ describe('AppSelector Integration', () => {
 
       renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
 
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // fetchNextPage should not be called
       expect(mockFetchNextPage).not.toHaveBeenCalled()
@@ -2256,7 +2306,7 @@ describe('AppSelector Integration', () => {
       )
 
       // Open portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // formattedValue should include #image# from files
       expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
@@ -2275,7 +2325,7 @@ describe('AppSelector Integration', () => {
         />,
       )
 
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
     })
@@ -2293,7 +2343,7 @@ describe('AppSelector Integration', () => {
         />,
       )
 
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
     })
@@ -2324,12 +2374,12 @@ describe('AppSelector Integration', () => {
       )
 
       // Open portal to render AppInputsPanel
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // Find and interact with the form input (may not exist if schema is empty)
       const formInputs = screen.queryAllByPlaceholderText('FormInputField')
       if (formInputs.length > 0) {
-        fireEvent.change(formInputs[0], { target: { value: 'test value' } })
+        fireEvent.change(formInputs[0]!, { target: { value: 'test value' } })
 
         // handleFormChange in index.tsx should have been called
         expect(onSelect).toHaveBeenCalledWith({
@@ -2376,12 +2426,12 @@ describe('AppSelector Integration', () => {
         />,
       )
 
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // Find file uploader and trigger upload - the #image# field will be extracted
       const uploadBtns = screen.queryAllByTestId('upload-file-btn')
       if (uploadBtns.length > 0) {
-        fireEvent.click(uploadBtns[0])
+        fireEvent.click(uploadBtns[0]!)
         // handleFormChange should extract #image# and convert to files
         expect(onSelect).toHaveBeenCalled()
       }
@@ -2414,12 +2464,12 @@ describe('AppSelector Integration', () => {
         />,
       )
 
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // Find form input (may not exist if schema is empty)
       const inputs = screen.queryAllByPlaceholderText('PreserveField')
       if (inputs.length > 0) {
-        fireEvent.change(inputs[0], { target: { value: 'updated name' } })
+        fireEvent.change(inputs[0]!, { target: { value: 'updated name' } })
 
         // onSelect should be called preserving existing files (no #image# in inputs)
         expect(onSelect).toHaveBeenCalledWith({
@@ -2465,7 +2515,7 @@ describe('AppSelector Integration', () => {
         />,
       )
 
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       // Try to find and click the upload button which triggers #image# form change
       const uploadBtn = screen.queryByTestId('upload-file-btn')
@@ -2499,11 +2549,11 @@ describe('AppSelector Integration', () => {
         />,
       )
 
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0])
+      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
 
       const inputs = screen.queryAllByPlaceholderText('SimpleInput')
       if (inputs.length > 0) {
-        fireEvent.change(inputs[0], { target: { value: 'changed' } })
+        fireEvent.change(inputs[0]!, { target: { value: 'changed' } })
         // handleFormChange should preserve existing files when no #image# in inputs
         expect(onSelect).toHaveBeenCalledWith({
           app_id: 'app-1',
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx
index c4cb4f4da8..4c96b69beb 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx
@@ -78,7 +78,7 @@ const AppPicker: FC<Props> = ({
 
   const handleIntersection = useCallback((entries: IntersectionObserverEntry[]) => {
     const target = entries[0]
-    if (!target.isIntersecting || loadingRef.current || !hasMore || isLoading)
+    if (!target!.isIntersecting || loadingRef.current || !hasMore || isLoading)
       return
 
     loadingRef.current = true
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/hooks/use-app-inputs-form-schema.ts b/web/app/components/plugins/plugin-detail-panel/app-selector/hooks/use-app-inputs-form-schema.ts
index 51bbcde18d..8f3d5f0249 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/hooks/use-app-inputs-form-schema.ts
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/hooks/use-app-inputs-form-schema.ts
@@ -53,7 +53,7 @@ function buildFileConfig(fileConfig: FileUpload | undefined) {
     enabled: !!(fileConfig?.enabled || fileConfig?.image?.enabled),
     allowed_file_types: fileConfig?.allowed_file_types || [SupportUploadFileTypes.image],
     allowed_file_extensions: fileConfig?.allowed_file_extensions
-      || [...FILE_EXTS[SupportUploadFileTypes.image]].map(ext => `.${ext}`),
+      || [...(FILE_EXTS[SupportUploadFileTypes.image] ?? [])].map(ext => `.${ext}`),
     allowed_file_upload_methods: fileConfig?.allowed_file_upload_methods
       || fileConfig?.image?.transfer_methods
       || ['local_file', 'remote_url'],
diff --git a/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/tts-params-panel.spec.tsx b/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/tts-params-panel.spec.tsx
index c3f7f221b5..e423359872 100644
--- a/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/tts-params-panel.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/tts-params-panel.spec.tsx
@@ -161,7 +161,8 @@ describe('TTSParamsPanel', () => {
       const { container } = render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(container).toBeInTheDocument()
+      // Assert
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should render language label', () => {
@@ -172,7 +173,8 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(screen.getByText('appDebug.voice.voiceSettings.language')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appDebug.voice.voiceSettings.language'))!.toBeInTheDocument()
     })
 
     it('should render voice label', () => {
@@ -183,7 +185,8 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(screen.getByText('appDebug.voice.voiceSettings.voice')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('appDebug.voice.voiceSettings.voice'))!.toBeInTheDocument()
     })
 
     it('should render two Select components', () => {
@@ -207,7 +210,7 @@ describe('TTSParamsPanel', () => {
 
       // Assert
       const values = screen.getAllByTestId('selected-value')
-      expect(values[0]).toHaveTextContent('zh-Hans')
+      expect(values[0])!.toHaveTextContent('zh-Hans')
     })
 
     it('should render voice select with correct value', () => {
@@ -219,7 +222,7 @@ describe('TTSParamsPanel', () => {
 
       // Assert
       const values = screen.getAllByTestId('selected-value')
-      expect(values[1]).toHaveTextContent('echo')
+      expect(values[1])!.toHaveTextContent('echo')
     })
 
     it('should only show supported languages in language select', () => {
@@ -230,9 +233,10 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(screen.getByTestId('select-item-en-US')).toBeInTheDocument()
-      expect(screen.getByTestId('select-item-zh-Hans')).toBeInTheDocument()
-      expect(screen.getByTestId('select-item-ja-JP')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('select-item-en-US'))!.toBeInTheDocument()
+      expect(screen.getByTestId('select-item-zh-Hans'))!.toBeInTheDocument()
+      expect(screen.getByTestId('select-item-ja-JP'))!.toBeInTheDocument()
       expect(screen.queryByTestId('select-item-unsupported-lang')).not.toBeInTheDocument()
     })
 
@@ -244,9 +248,10 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(screen.getByTestId('select-item-alloy')).toBeInTheDocument()
-      expect(screen.getByTestId('select-item-echo')).toBeInTheDocument()
-      expect(screen.getByTestId('select-item-fable')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('select-item-alloy'))!.toBeInTheDocument()
+      expect(screen.getByTestId('select-item-echo'))!.toBeInTheDocument()
+      expect(screen.getByTestId('select-item-fable'))!.toBeInTheDocument()
     })
   })
 
@@ -260,8 +265,9 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(screen.getByTestId('tts-language-select-trigger')).toHaveAttribute('data-class', 'w-full')
-      expect(screen.getByTestId('tts-voice-select-trigger')).toHaveAttribute('data-class', 'w-full')
+      // Assert
+      expect(screen.getByTestId('tts-language-select-trigger'))!.toHaveAttribute('data-class', 'w-full')
+      expect(screen.getByTestId('tts-voice-select-trigger'))!.toHaveAttribute('data-class', 'w-full')
     })
 
     it('should apply popup className to SelectContent', () => {
@@ -273,8 +279,8 @@ describe('TTSParamsPanel', () => {
 
       // Assert
       const contents = screen.getAllByTestId('select-content')
-      expect(contents[0]).toHaveAttribute('data-popup-class', 'w-[354px]')
-      expect(contents[1]).toHaveAttribute('data-popup-class', 'w-[354px]')
+      expect(contents[0])!.toHaveAttribute('data-popup-class', 'w-[354px]')
+      expect(contents[1])!.toHaveAttribute('data-popup-class', 'w-[354px]')
     })
   })
 
@@ -396,6 +402,37 @@ describe('TTSParamsPanel', () => {
       // Act
       render(<TTSParamsPanel {...props} />)
 
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
+      // Assert - no voice items should be rendered
       // Assert - no voice items should be rendered
       expect(screen.queryByTestId('select-item-alloy')).not.toBeInTheDocument()
       expect(screen.queryByTestId('select-item-echo')).not.toBeInTheDocument()
@@ -413,6 +450,37 @@ describe('TTSParamsPanel', () => {
       // Act
       render(<TTSParamsPanel {...props} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByTestId('select-item-alloy')).not.toBeInTheDocument()
     })
@@ -430,8 +498,9 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(screen.getByTestId('select-item-voice-1')).toBeInTheDocument()
-      expect(screen.getByTestId('select-item-voice-2')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('select-item-voice-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('select-item-voice-2'))!.toBeInTheDocument()
     })
 
     it('should handle currentModel with empty voices array', () => {
@@ -444,7 +513,7 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert - no voice items (except language items)
-      expect(screen.getAllByTestId('select-content')[1].children).toHaveLength(0)
+      expect(screen.getAllByTestId('select-content')[1]!.children).toHaveLength(0)
       expect(screen.queryByTestId('select-item-alloy')).not.toBeInTheDocument()
     })
 
@@ -460,7 +529,8 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(screen.getByTestId('select-item-single-voice')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('select-item-single-voice'))!.toBeInTheDocument()
     })
   })
 
@@ -475,7 +545,7 @@ describe('TTSParamsPanel', () => {
 
       // Assert
       const values = screen.getAllByTestId('selected-value')
-      expect(values[0]).toHaveTextContent('')
+      expect(values[0])!.toHaveTextContent('')
     })
 
     it('should handle empty voice value', () => {
@@ -487,7 +557,7 @@ describe('TTSParamsPanel', () => {
 
       // Assert
       const values = screen.getAllByTestId('selected-value')
-      expect(values[1]).toHaveTextContent('')
+      expect(values[1])!.toHaveTextContent('')
     })
 
     it('should handle many voices', () => {
@@ -504,8 +574,9 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(screen.getByTestId('select-item-voice-0')).toBeInTheDocument()
-      expect(screen.getByTestId('select-item-voice-19')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('select-item-voice-0'))!.toBeInTheDocument()
+      expect(screen.getByTestId('select-item-voice-19'))!.toBeInTheDocument()
     })
 
     it('should handle voice with special characters in mode', () => {
@@ -520,7 +591,8 @@ describe('TTSParamsPanel', () => {
       render(<TTSParamsPanel {...props} />)
 
       // Assert
-      expect(screen.getByTestId('select-item-voice-with_special.chars')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('select-item-voice-with_special.chars'))!.toBeInTheDocument()
     })
 
     it('should handle onChange not being called multiple times', () => {
@@ -546,13 +618,13 @@ describe('TTSParamsPanel', () => {
       // Act
       const { rerender } = render(<TTSParamsPanel {...props} />)
       const values = screen.getAllByTestId('selected-value')
-      expect(values[0]).toHaveTextContent('en-US')
+      expect(values[0])!.toHaveTextContent('en-US')
 
       rerender(<TTSParamsPanel {...props} language="zh-Hans" />)
 
       // Assert
       const updatedValues = screen.getAllByTestId('selected-value')
-      expect(updatedValues[0]).toHaveTextContent('zh-Hans')
+      expect(updatedValues[0])!.toHaveTextContent('zh-Hans')
     })
 
     it('should update when voice prop changes', () => {
@@ -562,13 +634,13 @@ describe('TTSParamsPanel', () => {
       // Act
       const { rerender } = render(<TTSParamsPanel {...props} />)
       const values = screen.getAllByTestId('selected-value')
-      expect(values[1]).toHaveTextContent('alloy')
+      expect(values[1])!.toHaveTextContent('alloy')
 
       rerender(<TTSParamsPanel {...props} voice="echo" />)
 
       // Assert
       const updatedValues = screen.getAllByTestId('selected-value')
-      expect(updatedValues[1]).toHaveTextContent('echo')
+      expect(updatedValues[1])!.toHaveTextContent('echo')
     })
 
     it('should update voice list when currentModel changes', () => {
@@ -580,7 +652,7 @@ describe('TTSParamsPanel', () => {
 
       // Act
       const { rerender } = render(<TTSParamsPanel {...props} />)
-      expect(screen.getByTestId('select-item-alloy')).toBeInTheDocument()
+      expect(screen.getByTestId('select-item-alloy'))!.toBeInTheDocument()
       expect(screen.queryByTestId('select-item-nova')).not.toBeInTheDocument()
 
       const newModel = createCurrentModel([
@@ -590,8 +662,9 @@ describe('TTSParamsPanel', () => {
       rerender(<TTSParamsPanel {...props} currentModel={newModel} />)
 
       // Assert
-      expect(screen.getByTestId('select-item-alloy')).toBeInTheDocument()
-      expect(screen.getByTestId('select-item-nova')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('select-item-alloy'))!.toBeInTheDocument()
+      expect(screen.getByTestId('select-item-nova'))!.toBeInTheDocument()
     })
 
     it('should handle currentModel becoming null', () => {
@@ -600,10 +673,41 @@ describe('TTSParamsPanel', () => {
 
       // Act
       const { rerender } = render(<TTSParamsPanel {...props} />)
-      expect(screen.getByTestId('select-item-alloy')).toBeInTheDocument()
+      expect(screen.getByTestId('select-item-alloy'))!.toBeInTheDocument()
 
       rerender(<TTSParamsPanel {...props} currentModel={null} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByTestId('select-item-alloy')).not.toBeInTheDocument()
     })
@@ -636,7 +740,7 @@ describe('TTSParamsPanel', () => {
 
       // Assert
       const languageLabel = screen.getByText('appDebug.voice.voiceSettings.language')
-      expect(languageLabel).toHaveClass('system-sm-semibold')
+      expect(languageLabel)!.toHaveClass('system-sm-semibold')
     })
 
     it('should have proper label structure for voice select', () => {
@@ -648,7 +752,7 @@ describe('TTSParamsPanel', () => {
 
       // Assert
       const voiceLabel = screen.getByText('appDebug.voice.voiceSettings.voice')
-      expect(voiceLabel).toHaveClass('system-sm-semibold')
+      expect(voiceLabel)!.toHaveClass('system-sm-semibold')
     })
   })
 })
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/__tests__/index.spec.tsx
index d41dfaa7d0..19a2d5a9f1 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/__tests__/index.spec.tsx
@@ -100,8 +100,8 @@ describe('SubscriptionList', () => {
     it('should render list view by default', () => {
       render(<SubscriptionList />)
 
-      expect(screen.getByText(/pluginTrigger\.subscription\.listNum/)).toBeInTheDocument()
-      expect(screen.getByText('Subscription One')).toBeInTheDocument()
+      expect(screen.getByText(/pluginTrigger\.subscription\.listNum/))!.toBeInTheDocument()
+      expect(screen.getByText('Subscription One'))!.toBeInTheDocument()
     })
 
     it('should render loading state when subscriptions are loading', () => {
@@ -112,7 +112,7 @@ describe('SubscriptionList', () => {
 
       render(<SubscriptionList />)
 
-      expect(screen.getByRole('status')).toBeInTheDocument()
+      expect(screen.getByRole('status'))!.toBeInTheDocument()
       expect(screen.queryByText('Subscription One')).not.toBeInTheDocument()
     })
 
@@ -121,7 +121,7 @@ describe('SubscriptionList', () => {
 
       render(<SubscriptionList pluginDetail={pluginDetail} />)
 
-      expect(screen.getByText('Subscription One')).toBeInTheDocument()
+      expect(screen.getByText('Subscription One'))!.toBeInTheDocument()
     })
 
     it('should render without list entries when subscriptions are empty', () => {
@@ -141,7 +141,7 @@ describe('SubscriptionList', () => {
     it('should render selector view when mode is selector', () => {
       render(<SubscriptionList mode={SubscriptionListMode.SELECTOR} />)
 
-      expect(screen.getByText('Subscription One')).toBeInTheDocument()
+      expect(screen.getByText('Subscription One'))!.toBeInTheDocument()
     })
 
     it('should visually distinguish selected subscription from unselected', () => {
@@ -182,7 +182,7 @@ describe('SubscriptionList', () => {
       fireEvent.click(screen.getByRole('button', { name: 'Subscription One' }))
 
       expect(onSelect).toHaveBeenCalledTimes(1)
-      const [selectedSubscription, callback] = onSelect.mock.calls[0]
+      const [selectedSubscription, callback] = (onSelect.mock.calls[0] ?? []) as [any, any]
       expect(selectedSubscription).toMatchObject({ id: 'sub-1', name: 'Subscription One' })
       expect(typeof callback).toBe('function')
 
@@ -212,7 +212,7 @@ describe('SubscriptionList', () => {
       fireEvent.click(deleteButton)
 
       expect(onSelect).not.toHaveBeenCalled()
-      expect(screen.getByText(/pluginTrigger\.subscription\.list\.item\.actions\.deleteConfirm\.title/)).toBeInTheDocument()
+      expect(screen.getByText(/pluginTrigger\.subscription\.list\.item\.actions\.deleteConfirm\.title/))!.toBeInTheDocument()
     })
   })
 
@@ -222,7 +222,7 @@ describe('SubscriptionList', () => {
 
       render(<SubscriptionList />)
 
-      expect(await screen.findByText('Something went wrong')).toBeInTheDocument()
+      expect(await screen.findByText('Something went wrong'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/__tests__/subscription-card.spec.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/__tests__/subscription-card.spec.tsx
index 4665c921ca..19edb65dfb 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/__tests__/subscription-card.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/__tests__/subscription-card.spec.tsx
@@ -62,14 +62,14 @@ describe('SubscriptionCard', () => {
   it('should render subscription name and endpoint', () => {
     render(<SubscriptionCard data={createSubscription()} />)
 
-    expect(screen.getByText('Subscription One')).toBeInTheDocument()
-    expect(screen.getByText('https://example.com')).toBeInTheDocument()
+    expect(screen.getByText('Subscription One'))!.toBeInTheDocument()
+    expect(screen.getByText('https://example.com'))!.toBeInTheDocument()
   })
 
   it('should render used-by text when workflows are present', () => {
     render(<SubscriptionCard data={createSubscription({ workflows_in_use: 2 })} />)
 
-    expect(screen.getByText(/pluginTrigger\.subscription\.list\.item\.usedByNum/)).toBeInTheDocument()
+    expect(screen.getByText(/pluginTrigger\.subscription\.list\.item\.usedByNum/))!.toBeInTheDocument()
   })
 
   it('should open delete confirmation when delete action is clicked', () => {
@@ -79,15 +79,15 @@ describe('SubscriptionCard', () => {
     expect(deleteButton).toBeTruthy()
     fireEvent.click(deleteButton)
 
-    expect(screen.getByText(/pluginTrigger\.subscription\.list\.item\.actions\.deleteConfirm\.title/)).toBeInTheDocument()
+    expect(screen.getByText(/pluginTrigger\.subscription\.list\.item\.actions\.deleteConfirm\.title/))!.toBeInTheDocument()
   })
 
   it('should open edit modal when edit action is clicked', () => {
     const { container } = render(<SubscriptionCard data={createSubscription()} />)
 
     const editButton = container.querySelectorAll('button')[0]
-    fireEvent.click(editButton)
+    fireEvent.click(editButton!)
 
-    expect(screen.getByText(/pluginTrigger\.subscription\.list\.item\.actions\.edit\.title/)).toBeInTheDocument()
+    expect(screen.getByText(/pluginTrigger\.subscription\.list\.item\.actions\.edit\.title/))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/index.spec.tsx
index a36c108160..0714fbf554 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/index.spec.tsx
@@ -246,7 +246,8 @@ describe('CreateSubscriptionButton', () => {
       const { container } = render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(container).toBeEmptyDOMElement()
+      // Assert
+      expect(container)!.toBeEmptyDOMElement()
     })
 
     it('should render without crashing when supportedMethods is provided', () => {
@@ -260,6 +261,37 @@ describe('CreateSubscriptionButton', () => {
       // Act
       const { container } = render(<CreateSubscriptionButton {...props} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(container).not.toBeEmptyDOMElement()
     })
@@ -276,7 +308,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
 
     it('should render icon button when buttonType is ICON_BUTTON', () => {
@@ -292,7 +325,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       const actionButton = screen.getByTestId('custom-trigger')
-      expect(actionButton).toBeInTheDocument()
+      expect(actionButton)!.toBeInTheDocument()
     })
   })
 
@@ -309,7 +342,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
     })
 
     it('should apply shape prop correctly', () => {
@@ -324,7 +358,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -348,8 +383,8 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByTestId('common-create-modal')).toBeInTheDocument()
-        expect(screen.getByTestId('common-create-modal')).toHaveAttribute('data-create-type', SupportedCreationMethods.MANUAL)
+        expect(screen.getByTestId('common-create-modal'))!.toBeInTheDocument()
+        expect(screen.getByTestId('common-create-modal'))!.toHaveAttribute('data-create-type', SupportedCreationMethods.MANUAL)
       })
     })
 
@@ -371,7 +406,7 @@ describe('CreateSubscriptionButton', () => {
       fireEvent.click(manualOption)
 
       await waitFor(() => {
-        expect(screen.getByTestId('common-create-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('common-create-modal'))!.toBeInTheDocument()
       })
 
       // Close modal
@@ -403,7 +438,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByTestId('oauth-client-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('oauth-client-modal'))!.toBeInTheDocument()
       })
     })
 
@@ -432,7 +467,7 @@ describe('CreateSubscriptionButton', () => {
       fireEvent.click(oauthOption)
 
       await waitFor(() => {
-        expect(screen.getByTestId('oauth-client-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('oauth-client-modal'))!.toBeInTheDocument()
       })
 
       // Close modal
@@ -463,7 +498,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert - OAuth mode renders with settings button, use getAllByRole
       const buttons = screen.getAllByRole('button')
-      expect(buttons[0]).toHaveTextContent('pluginTrigger.subscription.createButton.oauth')
+      expect(buttons[0])!.toHaveTextContent('pluginTrigger.subscription.createButton.oauth')
     })
 
     it('should display correct button text for APIKEY method', () => {
@@ -480,7 +515,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(screen.getByRole('button')).toHaveTextContent('pluginTrigger.subscription.createButton.apiKey')
+      // Assert
+      expect(screen.getByRole('button'))!.toHaveTextContent('pluginTrigger.subscription.createButton.apiKey')
     })
 
     it('should display correct button text for MANUAL method', () => {
@@ -497,7 +533,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(screen.getByRole('button')).toHaveTextContent('pluginTrigger.subscription.createButton.manual')
+      // Assert
+      expect(screen.getByRole('button'))!.toHaveTextContent('pluginTrigger.subscription.createButton.manual')
     })
 
     it('should display default button text when multiple methods are supported', () => {
@@ -514,7 +551,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(screen.getByRole('button')).toHaveTextContent('pluginTrigger.subscription.empty.button')
+      // Assert
+      expect(screen.getByRole('button'))!.toHaveTextContent('pluginTrigger.subscription.empty.button')
     })
   })
 
@@ -535,7 +573,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       const customSelect = screen.getByTestId('custom-select')
-      expect(customSelect).toHaveAttribute('data-options-count', '1')
+      expect(customSelect)!.toHaveAttribute('data-options-count', '1')
     })
 
     it('should show all options when all methods are supported', () => {
@@ -558,7 +596,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       const customSelect = screen.getByTestId('custom-select')
-      expect(customSelect).toHaveAttribute('data-options-count', '3')
+      expect(customSelect)!.toHaveAttribute('data-options-count', '3')
     })
 
     it('should show custom badge when OAuth custom is enabled and configured', () => {
@@ -581,7 +619,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert - Custom badge should appear in the button
       const buttons = screen.getAllByRole('button')
-      expect(buttons[0]).toHaveTextContent('plugin.auth.custom')
+      expect(buttons[0])!.toHaveTextContent('plugin.auth.custom')
     })
 
     it('should not show custom badge when OAuth custom is not configured', () => {
@@ -624,7 +662,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       const customSelect = screen.getByTestId('custom-select')
-      expect(customSelect).toHaveAttribute('data-value', DEFAULT_METHOD)
+      expect(customSelect)!.toHaveAttribute('data-value', DEFAULT_METHOD)
     })
 
     it('should set methodType to single method when only one supported', () => {
@@ -642,7 +680,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       const customSelect = screen.getByTestId('custom-select')
-      expect(customSelect).toHaveAttribute('data-value', SupportedCreationMethods.MANUAL)
+      expect(customSelect)!.toHaveAttribute('data-value', SupportedCreationMethods.MANUAL)
     })
   })
 
@@ -669,6 +707,37 @@ describe('CreateSubscriptionButton', () => {
       const button = screen.getByRole('button')
       fireEvent.click(button)
 
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
+      // Assert - modal should not open
       // Assert - modal should not open
       expect(screen.queryByTestId('common-create-modal')).not.toBeInTheDocument()
     })
@@ -689,7 +758,8 @@ describe('CreateSubscriptionButton', () => {
       fireEvent.click(button)
 
       // Assert - modal should open
-      expect(screen.getByTestId('common-create-modal')).toBeInTheDocument()
+      // Assert - modal should open
+      expect(screen.getByTestId('common-create-modal'))!.toBeInTheDocument()
     })
 
     it('should not call onChooseCreateType for DEFAULT_METHOD or single OAuth', () => {
@@ -707,8 +777,70 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
       // For OAuth mode, there are multiple buttons; get the primary button (first one)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
 
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
+      // Assert - For single OAuth, should not directly create but wait for dropdown
+      // The modal should not immediately open
       // Assert - For single OAuth, should not directly create but wait for dropdown
       // The modal should not immediately open
       expect(screen.queryByTestId('common-create-modal')).not.toBeInTheDocument()
@@ -736,7 +868,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByTestId('oauth-client-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('oauth-client-modal'))!.toBeInTheDocument()
       })
     })
 
@@ -783,8 +915,8 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByTestId('common-create-modal')).toBeInTheDocument()
-        expect(screen.getByTestId('common-create-modal')).toHaveAttribute('data-create-type', SupportedCreationMethods.APIKEY)
+        expect(screen.getByTestId('common-create-modal'))!.toBeInTheDocument()
+        expect(screen.getByTestId('common-create-modal'))!.toHaveAttribute('data-create-type', SupportedCreationMethods.APIKEY)
       })
     })
 
@@ -807,8 +939,8 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByTestId('common-create-modal')).toBeInTheDocument()
-        expect(screen.getByTestId('common-create-modal')).toHaveAttribute('data-create-type', SupportedCreationMethods.MANUAL)
+        expect(screen.getByTestId('common-create-modal'))!.toBeInTheDocument()
+        expect(screen.getByTestId('common-create-modal'))!.toHaveAttribute('data-create-type', SupportedCreationMethods.MANUAL)
       })
     })
   })
@@ -831,16 +963,17 @@ describe('CreateSubscriptionButton', () => {
       // Find the settings div inside the button (p-2 class)
       const buttons = screen.getAllByRole('button')
       const primaryButton = buttons[0]
-      const settingsDiv = primaryButton.querySelector('.p-2')
+      const settingsDiv = primaryButton!.querySelector('.p-2')
 
       // Assert that settings div exists and click it
-      expect(settingsDiv).toBeInTheDocument()
+      // Assert that settings div exists and click it
+      expect(settingsDiv)!.toBeInTheDocument()
       if (settingsDiv) {
         fireEvent.click(settingsDiv)
 
         // Assert
         await waitFor(() => {
-          expect(screen.getByTestId('oauth-client-modal')).toBeInTheDocument()
+          expect(screen.getByTestId('oauth-client-modal'))!.toBeInTheDocument()
         })
       }
     })
@@ -860,7 +993,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert - Component renders, which means hook was called
-      expect(screen.getByTestId('custom-select')).toBeInTheDocument()
+      // Assert - Component renders, which means hook was called
+      expect(screen.getByTestId('custom-select'))!.toBeInTheDocument()
     })
 
     it('should handle OAuth initiation success', async () => {
@@ -908,8 +1042,8 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert - modal should open with OAuth type and builder
       await waitFor(() => {
-        expect(screen.getByTestId('common-create-modal')).toBeInTheDocument()
-        expect(screen.getByTestId('common-create-modal')).toHaveAttribute('data-has-builder', 'true')
+        expect(screen.getByTestId('common-create-modal'))!.toBeInTheDocument()
+        expect(screen.getByTestId('common-create-modal'))!.toHaveAttribute('data-has-builder', 'true')
       })
     })
 
@@ -956,6 +1090,37 @@ describe('CreateSubscriptionButton', () => {
       // Act
       const { container } = render(<CreateSubscriptionButton {...props} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(container).not.toBeEmptyDOMElement()
     })
@@ -972,7 +1137,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert - component should still render
-      expect(screen.getByTestId('custom-select')).toBeInTheDocument()
+      // Assert - component should still render
+      expect(screen.getByTestId('custom-select'))!.toBeInTheDocument()
     })
 
     it('should handle empty oauthConfig gracefully', () => {
@@ -990,7 +1156,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(screen.getByTestId('custom-select')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('custom-select'))!.toBeInTheDocument()
     })
 
     it('should show max count tooltip when subscriptions reach limit', () => {
@@ -1010,7 +1177,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert - ActionButton should be in disabled state
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      // Assert - ActionButton should be in disabled state
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
 
     it('should handle showOAuthCreateModal callback from OAuthClientSettingsModal', async () => {
@@ -1032,7 +1200,7 @@ describe('CreateSubscriptionButton', () => {
       fireEvent.click(oauthOption)
 
       await waitFor(() => {
-        expect(screen.getByTestId('oauth-client-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('oauth-client-modal'))!.toBeInTheDocument()
       })
 
       // Click show create modal button
@@ -1040,9 +1208,9 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert - CommonCreateModal should be shown with OAuth type and builder
       await waitFor(() => {
-        expect(screen.getByTestId('common-create-modal')).toBeInTheDocument()
-        expect(screen.getByTestId('common-create-modal')).toHaveAttribute('data-create-type', SupportedCreationMethods.OAUTH)
-        expect(screen.getByTestId('common-create-modal')).toHaveAttribute('data-has-builder', 'true')
+        expect(screen.getByTestId('common-create-modal'))!.toBeInTheDocument()
+        expect(screen.getByTestId('common-create-modal'))!.toHaveAttribute('data-create-type', SupportedCreationMethods.OAUTH)
+        expect(screen.getByTestId('common-create-modal'))!.toHaveAttribute('data-has-builder', 'true')
       })
     })
   })
@@ -1066,8 +1234,8 @@ describe('CreateSubscriptionButton', () => {
       // Assert - settings icon should be present in button, OAuth mode has multiple buttons
       const buttons = screen.getAllByRole('button')
       const primaryButton = buttons[0]
-      const settingsDiv = primaryButton.querySelector('.p-2')
-      expect(settingsDiv).toBeInTheDocument()
+      const settingsDiv = primaryButton!.querySelector('.p-2')
+      expect(settingsDiv)!.toBeInTheDocument()
     })
 
     it('should not render settings icon for non-OAuth methods', () => {
@@ -1106,7 +1274,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert - icon button should exist
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      // Assert - icon button should exist
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
 
     it('should apply circle shape class when shape is circle', () => {
@@ -1123,7 +1292,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -1181,7 +1351,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert - for single non-OAuth, dropdown should be disabled (open = false)
       const customSelect = screen.getByTestId('custom-select')
-      expect(customSelect).toHaveAttribute('data-container-open', 'false')
+      expect(customSelect)!.toHaveAttribute('data-container-open', 'false')
     })
   })
 
@@ -1202,7 +1372,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       const button = screen.getByRole('button')
-      expect(button).toHaveClass('w-full')
+      expect(button)!.toHaveClass('w-full')
     })
 
     it('should render icon button with float-right class', () => {
@@ -1219,7 +1389,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -1265,7 +1436,7 @@ describe('CreateSubscriptionButton', () => {
       // Assert
       await waitFor(() => {
         const modal = screen.getByTestId('common-create-modal')
-        expect(modal).toHaveAttribute('data-create-type', SupportedCreationMethods.MANUAL)
+        expect(modal)!.toHaveAttribute('data-create-type', SupportedCreationMethods.MANUAL)
       })
     })
 
@@ -1289,7 +1460,7 @@ describe('CreateSubscriptionButton', () => {
       // Assert
       await waitFor(() => {
         const modal = screen.getByTestId('common-create-modal')
-        expect(modal).toHaveAttribute('data-create-type', SupportedCreationMethods.APIKEY)
+        expect(modal)!.toHaveAttribute('data-create-type', SupportedCreationMethods.APIKEY)
       })
     })
 
@@ -1339,7 +1510,7 @@ describe('CreateSubscriptionButton', () => {
       // Assert
       await waitFor(() => {
         const modal = screen.getByTestId('common-create-modal')
-        expect(modal).toHaveAttribute('data-has-builder', 'true')
+        expect(modal)!.toHaveAttribute('data-has-builder', 'true')
       })
     })
   })
@@ -1368,7 +1539,7 @@ describe('CreateSubscriptionButton', () => {
       // Assert
       await waitFor(() => {
         const modal = screen.getByTestId('oauth-client-modal')
-        expect(modal).toHaveAttribute('data-has-config', 'true')
+        expect(modal)!.toHaveAttribute('data-has-config', 'true')
       })
     })
 
@@ -1397,7 +1568,7 @@ describe('CreateSubscriptionButton', () => {
       fireEvent.click(oauthOption)
 
       await waitFor(() => {
-        expect(screen.getByTestId('oauth-client-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('oauth-client-modal'))!.toBeInTheDocument()
       })
 
       // Close modal
@@ -1428,7 +1599,7 @@ describe('CreateSubscriptionButton', () => {
       fireEvent.click(oauthOption)
 
       await waitFor(() => {
-        expect(screen.getByTestId('oauth-client-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('oauth-client-modal'))!.toBeInTheDocument()
       })
 
       // Click showOAuthCreateModal button
@@ -1436,9 +1607,9 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert - CommonCreateModal should appear with OAuth type and builder
       await waitFor(() => {
-        expect(screen.getByTestId('common-create-modal')).toBeInTheDocument()
-        expect(screen.getByTestId('common-create-modal')).toHaveAttribute('data-create-type', SupportedCreationMethods.OAUTH)
-        expect(screen.getByTestId('common-create-modal')).toHaveAttribute('data-has-builder', 'true')
+        expect(screen.getByTestId('common-create-modal'))!.toBeInTheDocument()
+        expect(screen.getByTestId('common-create-modal'))!.toHaveAttribute('data-create-type', SupportedCreationMethods.OAUTH)
+        expect(screen.getByTestId('common-create-modal'))!.toHaveAttribute('data-has-builder', 'true')
       })
     })
   })
@@ -1513,7 +1684,9 @@ describe('CreateSubscriptionButton', () => {
 
       // The methodType will be DEFAULT_METHOD since multiple methods
       // This verifies the render doesn't crash with multiple methods
-      expect(screen.getByTestId('custom-select')).toHaveAttribute('data-value', 'default')
+      // The methodType will be DEFAULT_METHOD since multiple methods
+      // This verifies the render doesn't crash with multiple methods
+      expect(screen.getByTestId('custom-select'))!.toHaveAttribute('data-value', 'default')
     })
   })
 
@@ -1534,7 +1707,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert - tooltip should be enabled (disabled prop = false for single method)
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      // Assert - tooltip should be enabled (disabled prop = false for single method)
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
 
     it('should disable tooltip when multiple methods and not at max count', () => {
@@ -1552,7 +1726,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert - tooltip should be disabled (neither single method nor at max)
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      // Assert - tooltip should be disabled (neither single method nor at max)
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -1574,7 +1749,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert - component renders with max subscriptions
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      // Assert - component renders with max subscriptions
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
 
     it('should show method description when not at max', () => {
@@ -1592,7 +1768,8 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert - component renders without max subscriptions
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      // Assert - component renders without max subscriptions
+      expect(screen.getByTestId('custom-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -1613,7 +1790,8 @@ describe('CreateSubscriptionButton', () => {
       const { container } = render(<CreateSubscriptionButton {...props} />)
 
       // Assert - should render null when supported methods fallback to empty
-      expect(container).toBeEmptyDOMElement()
+      // Assert - should render null when supported methods fallback to empty
+      expect(container)!.toBeEmptyDOMElement()
     })
 
     it('should handle providerInfo with null supported_creation_methods', () => {
@@ -1627,7 +1805,8 @@ describe('CreateSubscriptionButton', () => {
       const { container } = render(<CreateSubscriptionButton {...props} />)
 
       // Assert - should render null
-      expect(container).toBeEmptyDOMElement()
+      // Assert - should render null
+      expect(container)!.toBeEmptyDOMElement()
     })
   })
 
@@ -1648,7 +1827,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       const customSelect = screen.getByTestId('custom-select')
-      expect(customSelect).toHaveAttribute('data-value', SupportedCreationMethods.APIKEY)
+      expect(customSelect)!.toHaveAttribute('data-value', SupportedCreationMethods.APIKEY)
     })
   })
 })
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/__tests__/use-oauth-client-state.spec.ts b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/__tests__/use-oauth-client-state.spec.ts
index 68864b0b80..cebfc947e7 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/__tests__/use-oauth-client-state.spec.ts
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/__tests__/use-oauth-client-state.spec.ts
@@ -194,8 +194,8 @@ describe('useOAuthClientState', () => {
       }))
 
       expect(result.current.oauthClientSchema).toHaveLength(2)
-      expect(result.current.oauthClientSchema[0].default).toBe('my-client-id')
-      expect(result.current.oauthClientSchema[1].default).toBe('my-secret')
+      expect(result.current.oauthClientSchema[0]!.default).toBe('my-client-id')
+      expect(result.current.oauthClientSchema[1]!.default).toBe('my-secret')
     })
 
     it('should return empty array when oauth_client_schema is empty', () => {
@@ -239,9 +239,9 @@ describe('useOAuthClientState', () => {
       }))
 
       // client_id should be overridden
-      expect(result.current.oauthClientSchema[0].default).toBe('only-client-id')
+      expect(result.current.oauthClientSchema[0]!.default).toBe('only-client-id')
       // extra_field should keep original default since key not in params
-      expect(result.current.oauthClientSchema[1].default).toBe('extra-default')
+      expect(result.current.oauthClientSchema[1]!.default).toBe('extra-default')
     })
   })
 
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-common-modal-state.ts b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-common-modal-state.ts
index e55f9525fe..29613c6f4f 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-common-modal-state.ts
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-common-modal-state.ts
@@ -202,7 +202,7 @@ export const useCommonModalState = ({
     if (!apiKeyCredentialsSchema.length)
       return
     apiKeyCredentialsFormRef.current?.setFields([{
-      name: apiKeyCredentialsSchema[0].name,
+      name: apiKeyCredentialsSchema[0]!.name,
       errors: [],
     }])
   }, [apiKeyCredentialsSchema])
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx
index 73b28bd60e..4861f30934 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx
@@ -137,7 +137,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
 
     e.stopPropagation()
     e.preventDefault()
-    onChooseCreateType(methodType)
+    onChooseCreateType(methodType!)
   }
 
   if (!supportedMethods.length)
@@ -172,7 +172,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
                 >
                   <div className="flex flex-1 items-center justify-center">
                     <RiAddLine className="mr-2 size-4" />
-                    {buttonTextMap[methodType]}
+                    {buttonTextMap[methodType!]}
                     {methodType === SupportedCreationMethods.OAUTH && oauthConfig?.custom_enabled && oauthConfig?.custom_configured && (
                       <Badge
                         className="mr-0.5 ml-1 border-text-primary-on-surface bg-components-badge-bg-dimm text-text-primary-on-surface"
@@ -196,7 +196,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
               )
             : (
                 <Tooltip
-                  popupContent={subscriptionCount >= MAX_COUNT ? t('subscription.maxCount', { ns: 'pluginTrigger', num: MAX_COUNT }) : t(`subscription.addType.options.${methodType.toLowerCase() as Lowercase<SupportedCreationMethods>}.description`, { ns: 'pluginTrigger' })}
+                  popupContent={subscriptionCount >= MAX_COUNT ? t('subscription.maxCount', { ns: 'pluginTrigger', num: MAX_COUNT }) : t(`subscription.addType.options.${methodType!.toLowerCase() as Lowercase<SupportedCreationMethods>}.description`, { ns: 'pluginTrigger' })}
                   disabled={!(supportedMethods?.length === 1 || subscriptionCount >= MAX_COUNT)}
                 >
                   <ActionButton
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.helpers.ts b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.helpers.ts
index 86e42aab6b..6316441f1c 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.helpers.ts
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.helpers.ts
@@ -112,7 +112,7 @@ export const updateVariableTypeValue = (
   defaultValue: unknown,
 ) => {
   return produce(value, (draft) => {
-    draft[variable].value = {
+    draft[variable]!.value = {
       type: newType,
       value: newType === VarKindType.variable ? '' : defaultValue,
     }
@@ -126,7 +126,7 @@ export const updateReasoningValue = (
   newValue: unknown,
 ) => {
   return produce(value, (draft) => {
-    draft[variable].value = {
+    draft[variable]!.value = {
       type: getVarKindType(type),
       value: newValue,
     }
@@ -139,8 +139,8 @@ export const mergeReasoningValue = (
   newValue: Record<string, unknown>,
 ) => {
   return produce(value, (draft) => {
-    const currentValue = draft[variable].value as Record<string, unknown> | undefined
-    draft[variable].value = {
+    const currentValue = draft[variable]!.value as Record<string, unknown> | undefined
+    draft[variable]!.value = {
       ...currentValue,
       ...newValue,
     }
@@ -153,7 +153,7 @@ export const updateVariableSelectorValue = (
   newValue: ValueSelector | string,
 ) => {
   return produce(value, (draft) => {
-    draft[variable].value = {
+    draft[variable]!.value = {
       type: VarKindType.variable,
       value: newValue,
     }
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx
index 8a3642d043..4e6be7d81c 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx
@@ -137,7 +137,7 @@ const ReasoningConfigForm: React.FC<Props> = ({
         asChild={false}
       />
     ))
-    const varInput = value[variable].value
+    const varInput = value[variable]!.value
     const {
       isString,
       isNumber,
@@ -179,7 +179,7 @@ const ReasoningConfigForm: React.FC<Props> = ({
               >
                 <div
                   className="ml-0.5 cursor-pointer rounded-sm p-px text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary"
-                  onClick={() => showSchema(input_schema as SchemaRoot, fieldTitle)}
+                  onClick={() => showSchema(input_schema as SchemaRoot, fieldTitle!)}
                 >
                   <RiBracesLine className="size-3.5" />
                 </div>
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/hooks/__tests__/use-tool-selector-state.spec.ts b/web/app/components/plugins/plugin-detail-panel/tool-selector/hooks/__tests__/use-tool-selector-state.spec.ts
index 5af624649c..dff369c969 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/hooks/__tests__/use-tool-selector-state.spec.ts
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/hooks/__tests__/use-tool-selector-state.spec.ts
@@ -112,11 +112,11 @@ describe('useToolSelectorState', () => {
 
     // param2 has form='form' (not 'llm'), so it goes to settings
     expect(result.current.currentToolSettings).toHaveLength(1)
-    expect(result.current.currentToolSettings[0].name).toBe('param2')
+    expect(result.current.currentToolSettings[0]!.name).toBe('param2')
 
     // param1 has form='llm', so it goes to params
     expect(result.current.currentToolParams).toHaveLength(1)
-    expect(result.current.currentToolParams[0].name).toBe('param1')
+    expect(result.current.currentToolParams[0]!.name).toBe('param1')
   })
 
   it('should show tab slider when both settings and params exist', () => {
diff --git a/web/app/components/plugins/plugin-detail-panel/trigger/__tests__/event-detail-drawer.spec.tsx b/web/app/components/plugins/plugin-detail-panel/trigger/__tests__/event-detail-drawer.spec.tsx
index a04aba3e57..77b77c0302 100644
--- a/web/app/components/plugins/plugin-detail-panel/trigger/__tests__/event-detail-drawer.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/trigger/__tests__/event-detail-drawer.spec.tsx
@@ -91,45 +91,45 @@ describe('EventDetailDrawer', () => {
     it('should render drawer', () => {
       render(<EventDetailDrawer eventInfo={mockEventInfo} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
+      expect(screen.getByRole('dialog'))!.toBeInTheDocument()
     })
 
     it('should render event title', () => {
       render(<EventDetailDrawer eventInfo={mockEventInfo} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('Test Event')).toBeInTheDocument()
+      expect(screen.getByText('Test Event'))!.toBeInTheDocument()
     })
 
     it('should render event description', () => {
       render(<EventDetailDrawer eventInfo={mockEventInfo} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByTestId('description')).toHaveTextContent('Test event description')
+      expect(screen.getByTestId('description'))!.toHaveTextContent('Test event description')
     })
 
     it('should render org info', () => {
       render(<EventDetailDrawer eventInfo={mockEventInfo} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByTestId('org-info')).toBeInTheDocument()
+      expect(screen.getByTestId('org-info'))!.toBeInTheDocument()
     })
 
     it('should render parameters section', () => {
       render(<EventDetailDrawer eventInfo={mockEventInfo} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('tools.setBuiltInTools.parameters')).toBeInTheDocument()
-      expect(screen.getByText('Parameter 1')).toBeInTheDocument()
+      expect(screen.getByText('tools.setBuiltInTools.parameters'))!.toBeInTheDocument()
+      expect(screen.getByText('Parameter 1'))!.toBeInTheDocument()
     })
 
     it('should render output section', () => {
       render(<EventDetailDrawer eventInfo={mockEventInfo} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('pluginTrigger.events.output')).toBeInTheDocument()
-      expect(screen.getByTestId('output-field')).toHaveTextContent('result')
+      expect(screen.getByText('pluginTrigger.events.output'))!.toBeInTheDocument()
+      expect(screen.getByTestId('output-field'))!.toHaveTextContent('result')
     })
 
     it('should render back button', () => {
       render(<EventDetailDrawer eventInfo={mockEventInfo} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('plugin.detailPanel.operation.back')).toBeInTheDocument()
+      expect(screen.getByText('plugin.detailPanel.operation.back'))!.toBeInTheDocument()
     })
   })
 
@@ -159,14 +159,14 @@ describe('EventDetailDrawer', () => {
       const eventWithNoParams = { ...mockEventInfo, parameters: [] }
       render(<EventDetailDrawer eventInfo={eventWithNoParams} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('pluginTrigger.events.item.noParameters')).toBeInTheDocument()
+      expect(screen.getByText('pluginTrigger.events.item.noParameters'))!.toBeInTheDocument()
     })
 
     it('should handle no output schema', () => {
       const eventWithNoOutput = { ...mockEventInfo, output_schema: {} }
       render(<EventDetailDrawer eventInfo={eventWithNoOutput} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('pluginTrigger.events.output')).toBeInTheDocument()
+      expect(screen.getByText('pluginTrigger.events.output'))!.toBeInTheDocument()
       expect(screen.queryByTestId('output-field')).not.toBeInTheDocument()
     })
   })
@@ -175,41 +175,41 @@ describe('EventDetailDrawer', () => {
     it('should display correct type for number-input', () => {
       const eventWithNumber = {
         ...mockEventInfo,
-        parameters: [{ ...mockEventInfo.parameters[0], type: 'number-input' }],
+        parameters: [{ ...mockEventInfo.parameters[0]!, type: 'number-input' }],
       }
       render(<EventDetailDrawer eventInfo={eventWithNumber} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('tools.setBuiltInTools.number')).toBeInTheDocument()
+      expect(screen.getByText('tools.setBuiltInTools.number'))!.toBeInTheDocument()
     })
 
     it('should display correct type for checkbox', () => {
       const eventWithCheckbox = {
         ...mockEventInfo,
-        parameters: [{ ...mockEventInfo.parameters[0], type: 'checkbox' }],
+        parameters: [{ ...mockEventInfo.parameters[0]!, type: 'checkbox' }],
       }
       render(<EventDetailDrawer eventInfo={eventWithCheckbox} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('boolean')).toBeInTheDocument()
+      expect(screen.getByText('boolean'))!.toBeInTheDocument()
     })
 
     it('should display correct type for file', () => {
       const eventWithFile = {
         ...mockEventInfo,
-        parameters: [{ ...mockEventInfo.parameters[0], type: 'file' }],
+        parameters: [{ ...mockEventInfo.parameters[0]!, type: 'file' }],
       }
       render(<EventDetailDrawer eventInfo={eventWithFile} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('tools.setBuiltInTools.file')).toBeInTheDocument()
+      expect(screen.getByText('tools.setBuiltInTools.file'))!.toBeInTheDocument()
     })
 
     it('should display original type for unknown types', () => {
       const eventWithUnknown = {
         ...mockEventInfo,
-        parameters: [{ ...mockEventInfo.parameters[0], type: 'custom-type' }],
+        parameters: [{ ...mockEventInfo.parameters[0]!, type: 'custom-type' }],
       }
       render(<EventDetailDrawer eventInfo={eventWithUnknown} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('custom-type')).toBeInTheDocument()
+      expect(screen.getByText('custom-type'))!.toBeInTheDocument()
     })
   })
 
@@ -226,7 +226,7 @@ describe('EventDetailDrawer', () => {
       }
       render(<EventDetailDrawer eventInfo={eventWithArrayOutput} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('pluginTrigger.events.output')).toBeInTheDocument()
+      expect(screen.getByText('pluginTrigger.events.output'))!.toBeInTheDocument()
     })
 
     it('should handle nested properties in output schema', () => {
@@ -245,7 +245,7 @@ describe('EventDetailDrawer', () => {
       }
       render(<EventDetailDrawer eventInfo={eventWithNestedOutput} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('pluginTrigger.events.output')).toBeInTheDocument()
+      expect(screen.getByText('pluginTrigger.events.output'))!.toBeInTheDocument()
     })
 
     it('should handle enum in output schema', () => {
@@ -260,7 +260,7 @@ describe('EventDetailDrawer', () => {
       }
       render(<EventDetailDrawer eventInfo={eventWithEnumOutput} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('pluginTrigger.events.output')).toBeInTheDocument()
+      expect(screen.getByText('pluginTrigger.events.output'))!.toBeInTheDocument()
     })
 
     it('should handle array type schema', () => {
@@ -275,7 +275,7 @@ describe('EventDetailDrawer', () => {
       }
       render(<EventDetailDrawer eventInfo={eventWithArrayType} providerInfo={mockProviderInfo} onClose={mockOnClose} />)
 
-      expect(screen.getByText('pluginTrigger.events.output')).toBeInTheDocument()
+      expect(screen.getByText('pluginTrigger.events.output'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx b/web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx
index bacb7bbd66..eb56a0178c 100644
--- a/web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx
@@ -112,7 +112,7 @@ export const EventDetailDrawer: FC<EventDetailDrawerProps> = (props) => {
           />
         </div>
         <div className="mt-1 system-md-semibold text-text-primary">{eventInfo?.identity?.label[language]}</div>
-        <Description className="mt-3 mb-2 h-auto" text={eventInfo.description[language]} descriptionLineRows={2}></Description>
+        <Description className="mt-3 mb-2 h-auto" text={eventInfo.description[language]!} descriptionLineRows={2}></Description>
       </div>
       <div className="flex h-full flex-col gap-2 overflow-y-auto px-4 pt-4 pb-2">
         <div className="system-sm-semibold-uppercase text-text-secondary">{t('setBuiltInTools.parameters', { ns: 'tools' })}</div>
diff --git a/web/app/components/plugins/plugin-item/__tests__/action.spec.tsx b/web/app/components/plugins/plugin-item/__tests__/action.spec.tsx
index 82c4d69d1b..0b0d9c7fc8 100644
--- a/web/app/components/plugins/plugin-item/__tests__/action.spec.tsx
+++ b/web/app/components/plugins/plugin-item/__tests__/action.spec.tsx
@@ -253,10 +253,11 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert
-      expect(screen.getByText('plugin.action.delete')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('plugin.action.delete'))!.toBeInTheDocument()
     })
 
     it('should display plugin name in delete confirm content', () => {
@@ -270,10 +271,11 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert
-      expect(screen.getByText('my-awesome-plugin')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('my-awesome-plugin'))!.toBeInTheDocument()
     })
 
     it('should hide confirm modal when cancel is clicked', () => {
@@ -286,8 +288,8 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
-      expect(screen.getByText('plugin.action.delete')).toBeInTheDocument()
+      fireEvent.click(getActionButtons()[0]!)
+      expect(screen.getByText('plugin.action.delete'))!.toBeInTheDocument()
 
       fireEvent.click(getDeleteCancelButton())
 
@@ -308,7 +310,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       // Assert
@@ -330,7 +332,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       // Assert
@@ -352,7 +354,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       // Assert
@@ -374,7 +376,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       // Assert
@@ -401,12 +403,12 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       // Assert - Loading state
       await waitFor(() => {
-        expect(getDeleteConfirmButton()).toBeDisabled()
+        expect(getDeleteConfirmButton())!.toBeDisabled()
       })
 
       // Resolve and check modal closes
@@ -434,13 +436,14 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert
-      expect(screen.getByTestId('plugin-info-modal')).toBeInTheDocument()
-      expect(screen.getByTestId('plugin-info-modal')).toHaveAttribute('data-repo', 'owner/repo-name')
-      expect(screen.getByTestId('plugin-info-modal')).toHaveAttribute('data-release', '2.0.0')
-      expect(screen.getByTestId('plugin-info-modal')).toHaveAttribute('data-package', 'my-package.difypkg')
+      // Assert
+      expect(screen.getByTestId('plugin-info-modal'))!.toBeInTheDocument()
+      expect(screen.getByTestId('plugin-info-modal'))!.toHaveAttribute('data-repo', 'owner/repo-name')
+      expect(screen.getByTestId('plugin-info-modal'))!.toHaveAttribute('data-release', '2.0.0')
+      expect(screen.getByTestId('plugin-info-modal'))!.toHaveAttribute('data-package', 'my-package.difypkg')
     })
 
     it('should hide plugin info modal when close is clicked', () => {
@@ -453,11 +456,42 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
-      expect(screen.getByTestId('plugin-info-modal')).toBeInTheDocument()
+      fireEvent.click(getActionButtons()[0]!)
+      expect(screen.getByTestId('plugin-info-modal'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('close-plugin-info'))
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByTestId('plugin-info-modal')).not.toBeInTheDocument()
     })
@@ -481,7 +515,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert
       await waitFor(() => {
@@ -507,7 +541,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert
       await waitFor(() => {
@@ -526,7 +560,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert
       await waitFor(() => {
@@ -550,7 +584,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert - toast is called with the translated payload
       await waitFor(() => {
@@ -581,7 +615,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert
       await waitFor(() => {
@@ -621,7 +655,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Wait for modal to be called
       await waitFor(() => {
@@ -629,7 +663,7 @@ describe('Action Component', () => {
       })
 
       // Invoke the callback
-      const call = mockSetShowUpdatePluginModal.mock.calls[0][0]
+      const call = mockSetShowUpdatePluginModal.mock.calls[0]![0]
       call.onSaveCallback()
 
       // Assert
@@ -653,7 +687,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert
       await waitFor(() => {
@@ -678,7 +712,7 @@ describe('Action Component', () => {
 
       // Act - First render and delete
       const { rerender } = render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       await waitFor(() => {
@@ -688,7 +722,7 @@ describe('Action Component', () => {
       // Re-render with same props
       mockUninstallPlugin.mockClear()
       rerender(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       await waitFor(() => {
@@ -714,7 +748,7 @@ describe('Action Component', () => {
 
       // Act
       const { rerender } = render(<Action {...props1} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       await waitFor(() => {
@@ -723,7 +757,7 @@ describe('Action Component', () => {
 
       mockUninstallPlugin.mockClear()
       rerender(<Action {...props2} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       await waitFor(() => {
@@ -751,7 +785,7 @@ describe('Action Component', () => {
 
       // Act
       const { rerender } = render(<Action {...props1} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       await waitFor(() => {
@@ -760,7 +794,7 @@ describe('Action Component', () => {
       expect(onDelete2).not.toHaveBeenCalled()
 
       rerender(<Action {...props2} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       await waitFor(() => {
@@ -802,7 +836,7 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert - Should use author and pluginName as fallback
       await waitFor(() => {
@@ -826,11 +860,12 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
       fireEvent.click(getDeleteConfirmButton())
 
       // The confirm button should be disabled during deletion
-      expect(getDeleteConfirmButton()).toBeDisabled()
+      // The confirm button should be disabled during deletion
+      expect(getDeleteConfirmButton())!.toBeDisabled()
 
       // Resolve the deletion
       resolveFirst!({ success: true })
@@ -851,10 +886,11 @@ describe('Action Component', () => {
 
       // Act
       render(<Action {...props} />)
-      fireEvent.click(getActionButtons()[0])
+      fireEvent.click(getActionButtons()[0]!)
 
       // Assert
-      expect(screen.getByText('plugin-with-special@chars#123')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('plugin-with-special@chars#123'))!.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/plugins/plugin-item/index.tsx b/web/app/components/plugins/plugin-item/index.tsx
index ad03c002d8..0f19db81e6 100644
--- a/web/app/components/plugins/plugin-item/index.tsx
+++ b/web/app/components/plugins/plugin-item/index.tsx
@@ -105,7 +105,7 @@ const PluginItem: FC<Props> = ({
       }}
     >
       <div className={cn('hover-bg-components-panel-on-panel-item-bg relative z-10 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-on-panel-item-bg p-4 pb-3 shadow-xs', className)}>
-        <CornerMark text={categoriesMap[category].label} />
+        <CornerMark text={categoriesMap[category]!.label} />
         {/* Header */}
         <div className="flex">
           <div className="flex h-10 w-10 items-center justify-center overflow-hidden rounded-xl border border-components-panel-border-subtle">
diff --git a/web/app/components/plugins/plugin-page/filter-management/__tests__/category-filter.spec.tsx b/web/app/components/plugins/plugin-page/filter-management/__tests__/category-filter.spec.tsx
index 051d16792a..e4b698a5f8 100644
--- a/web/app/components/plugins/plugin-page/filter-management/__tests__/category-filter.spec.tsx
+++ b/web/app/components/plugins/plugin-page/filter-management/__tests__/category-filter.spec.tsx
@@ -47,7 +47,7 @@ describe('CategoriesFilter', () => {
   it('should show "allCategories" when no categories selected', () => {
     render(<CategoriesFilter value={[]} onChange={vi.fn()} />)
 
-    expect(screen.getByText('plugin.allCategories')).toBeInTheDocument()
+    expect(screen.getByText('plugin.allCategories'))!.toBeInTheDocument()
   })
 
   it('should show selected category labels', () => {
@@ -60,7 +60,7 @@ describe('CategoriesFilter', () => {
   it('should show +N when more than 2 selected', () => {
     render(<CategoriesFilter value={['tool', 'model', 'extension']} onChange={vi.fn()} />)
 
-    expect(screen.getByText('+1')).toBeInTheDocument()
+    expect(screen.getByText('+1'))!.toBeInTheDocument()
   })
 
   it('should clear all selections when clear button clicked', () => {
@@ -76,9 +76,9 @@ describe('CategoriesFilter', () => {
   it('should render category options in dropdown', () => {
     render(<CategoriesFilter value={[]} onChange={vi.fn()} />)
 
-    expect(screen.getByText('Tool')).toBeInTheDocument()
-    expect(screen.getByText('Model')).toBeInTheDocument()
-    expect(screen.getByText('Extension')).toBeInTheDocument()
+    expect(screen.getByText('Tool'))!.toBeInTheDocument()
+    expect(screen.getByText('Model'))!.toBeInTheDocument()
+    expect(screen.getByText('Extension'))!.toBeInTheDocument()
   })
 
   it('should toggle category on option click', () => {
@@ -94,7 +94,7 @@ describe('CategoriesFilter', () => {
     render(<CategoriesFilter value={['tool']} onChange={mockOnChange} />)
 
     const toolElements = screen.getAllByText('Tool')
-    fireEvent.click(toolElements[toolElements.length - 1])
+    fireEvent.click(toolElements[toolElements.length - 1]!)
     expect(mockOnChange).toHaveBeenCalledWith([])
   })
 })
diff --git a/web/app/components/plugins/plugin-page/filter-management/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-page/filter-management/__tests__/index.spec.tsx
index 95f0c5c120..f30b5fb5fa 100644
--- a/web/app/components/plugins/plugin-page/filter-management/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-page/filter-management/__tests__/index.spec.tsx
@@ -338,7 +338,8 @@ describe('SearchBox Component', () => {
       render(<SearchBox searchQuery="" onChange={vi.fn()} />)
 
       // Assert
-      expect(screen.getByPlaceholderText('plugin.search')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByPlaceholderText('plugin.search'))!.toBeInTheDocument()
     })
 
     it('should render with provided searchQuery value', () => {
@@ -346,7 +347,8 @@ describe('SearchBox Component', () => {
       render(<SearchBox searchQuery="test query" onChange={vi.fn()} />)
 
       // Assert
-      expect(screen.getByDisplayValue('test query')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByDisplayValue('test query'))!.toBeInTheDocument()
     })
 
     it('should render search icon', () => {
@@ -355,7 +357,7 @@ describe('SearchBox Component', () => {
 
       // Assert - Input should have showLeftIcon which renders search icon
       const wrapper = container.querySelector('.w-\\[200px\\]')
-      expect(wrapper).toBeInTheDocument()
+      expect(wrapper)!.toBeInTheDocument()
     })
   })
 
@@ -464,7 +466,8 @@ describe('CategoriesFilter Component', () => {
       render(<CategoriesFilter value={[]} onChange={vi.fn()} />)
 
       // Assert
-      expect(screen.getByText('plugin.allCategories')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('plugin.allCategories'))!.toBeInTheDocument()
     })
 
     it('should render dropdown arrow when no selection', () => {
@@ -473,7 +476,7 @@ describe('CategoriesFilter Component', () => {
 
       // Assert - Arrow icon should be visible
       const arrowIcon = container.querySelector('svg')
-      expect(arrowIcon).toBeInTheDocument()
+      expect(arrowIcon)!.toBeInTheDocument()
     })
 
     it('should render selected category labels', () => {
@@ -481,7 +484,8 @@ describe('CategoriesFilter Component', () => {
       render(<CategoriesFilter value={['model']} onChange={vi.fn()} />)
 
       // Assert
-      expect(screen.getByText('Models')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Models'))!.toBeInTheDocument()
     })
 
     it('should show clear button when categories are selected', () => {
@@ -490,7 +494,7 @@ describe('CategoriesFilter Component', () => {
 
       // Assert - Close icon should be visible
       const closeIcon = container.querySelector('[class*="cursor-pointer"]')
-      expect(closeIcon).toBeInTheDocument()
+      expect(closeIcon)!.toBeInTheDocument()
     })
 
     it('should show count badge for more than 2 selections', () => {
@@ -498,7 +502,8 @@ describe('CategoriesFilter Component', () => {
       render(<CategoriesFilter value={['model', 'tool', 'extension']} onChange={vi.fn()} />)
 
       // Assert
-      expect(screen.getByText('+1')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('+1'))!.toBeInTheDocument()
     })
   })
 
@@ -512,7 +517,7 @@ describe('CategoriesFilter Component', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+        expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
       })
     })
 
@@ -525,10 +530,10 @@ describe('CategoriesFilter Component', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByText('Models')).toBeInTheDocument()
-        expect(screen.getByText('Tools')).toBeInTheDocument()
-        expect(screen.getByText('Extensions')).toBeInTheDocument()
-        expect(screen.getByText('Agents')).toBeInTheDocument()
+        expect(screen.getByText('Models'))!.toBeInTheDocument()
+        expect(screen.getByText('Tools'))!.toBeInTheDocument()
+        expect(screen.getByText('Extensions'))!.toBeInTheDocument()
+        expect(screen.getByText('Agents'))!.toBeInTheDocument()
       })
     })
 
@@ -541,7 +546,7 @@ describe('CategoriesFilter Component', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByPlaceholderText('plugin.searchCategories')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('plugin.searchCategories'))!.toBeInTheDocument()
       })
     })
   })
@@ -555,7 +560,7 @@ describe('CategoriesFilter Component', () => {
       // Act - Open dropdown and click category
       fireEvent.click(screen.getByTestId('portal-trigger'))
       await waitFor(() => {
-        expect(screen.getByText('Models')).toBeInTheDocument()
+        expect(screen.getByText('Models'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('Models'))
 
@@ -592,7 +597,7 @@ describe('CategoriesFilter Component', () => {
       // Act
       fireEvent.click(screen.getByTestId('portal-trigger'))
       await waitFor(() => {
-        expect(screen.getByText('Tools')).toBeInTheDocument()
+        expect(screen.getByText('Tools'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('Tools'))
 
@@ -607,7 +612,7 @@ describe('CategoriesFilter Component', () => {
 
       // Act - Find and click the close icon
       const closeIcon = container.querySelector('.text-text-quaternary')
-      expect(closeIcon).toBeInTheDocument()
+      expect(closeIcon)!.toBeInTheDocument()
       fireEvent.click(closeIcon!)
 
       // Assert
@@ -623,14 +628,15 @@ describe('CategoriesFilter Component', () => {
       // Act
       fireEvent.click(screen.getByTestId('portal-trigger'))
       await waitFor(() => {
-        expect(screen.getByPlaceholderText('plugin.searchCategories')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('plugin.searchCategories'))!.toBeInTheDocument()
       })
       fireEvent.change(screen.getByPlaceholderText('plugin.searchCategories'), {
         target: { value: 'mod' },
       })
 
       // Assert
-      expect(screen.getByText('Models')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Models'))!.toBeInTheDocument()
       expect(screen.queryByText('Extensions')).not.toBeInTheDocument()
     })
 
@@ -641,14 +647,15 @@ describe('CategoriesFilter Component', () => {
       // Act
       fireEvent.click(screen.getByTestId('portal-trigger'))
       await waitFor(() => {
-        expect(screen.getByPlaceholderText('plugin.searchCategories')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('plugin.searchCategories'))!.toBeInTheDocument()
       })
       fireEvent.change(screen.getByPlaceholderText('plugin.searchCategories'), {
         target: { value: 'MOD' },
       })
 
       // Assert
-      expect(screen.getByText('Models')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Models'))!.toBeInTheDocument()
     })
   })
 
@@ -696,7 +703,8 @@ describe('TagFilter Component', () => {
       render(<TagFilter value={[]} onChange={vi.fn()} />)
 
       // Assert
-      expect(screen.getByText('pluginTags.allTags')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('pluginTags.allTags'))!.toBeInTheDocument()
     })
 
     it('should render selected tag labels', () => {
@@ -704,7 +712,8 @@ describe('TagFilter Component', () => {
       render(<TagFilter value={['agent']} onChange={vi.fn()} />)
 
       // Assert
-      expect(screen.getByText('Agent')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Agent'))!.toBeInTheDocument()
     })
 
     it('should show count badge for more than 2 selections', () => {
@@ -712,7 +721,8 @@ describe('TagFilter Component', () => {
       render(<TagFilter value={['agent', 'rag', 'search']} onChange={vi.fn()} />)
 
       // Assert
-      expect(screen.getByText('+1')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('+1'))!.toBeInTheDocument()
     })
 
     it('should show clear button when tags are selected', () => {
@@ -721,7 +731,7 @@ describe('TagFilter Component', () => {
 
       // Assert
       const closeIcon = container.querySelector('.text-text-quaternary')
-      expect(closeIcon).toBeInTheDocument()
+      expect(closeIcon)!.toBeInTheDocument()
     })
   })
 
@@ -735,7 +745,7 @@ describe('TagFilter Component', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+        expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
       })
     })
 
@@ -748,10 +758,10 @@ describe('TagFilter Component', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByText('Agent')).toBeInTheDocument()
-        expect(screen.getByText('RAG')).toBeInTheDocument()
-        expect(screen.getByText('Search')).toBeInTheDocument()
-        expect(screen.getByText('Image')).toBeInTheDocument()
+        expect(screen.getByText('Agent'))!.toBeInTheDocument()
+        expect(screen.getByText('RAG'))!.toBeInTheDocument()
+        expect(screen.getByText('Search'))!.toBeInTheDocument()
+        expect(screen.getByText('Image'))!.toBeInTheDocument()
       })
     })
   })
@@ -765,7 +775,7 @@ describe('TagFilter Component', () => {
       // Act
       fireEvent.click(screen.getByTestId('portal-trigger'))
       await waitFor(() => {
-        expect(screen.getByText('Agent')).toBeInTheDocument()
+        expect(screen.getByText('Agent'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('Agent'))
 
@@ -783,7 +793,7 @@ describe('TagFilter Component', () => {
       await waitFor(() => {
         // Find the Agent option in dropdown
         const agentOptions = screen.getAllByText('Agent')
-        fireEvent.click(agentOptions[agentOptions.length - 1])
+        fireEvent.click(agentOptions[agentOptions.length - 1]!)
       })
 
       // Assert
@@ -798,7 +808,7 @@ describe('TagFilter Component', () => {
       // Act
       fireEvent.click(screen.getByTestId('portal-trigger'))
       await waitFor(() => {
-        expect(screen.getByText('RAG')).toBeInTheDocument()
+        expect(screen.getByText('RAG'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('RAG'))
 
@@ -828,14 +838,15 @@ describe('TagFilter Component', () => {
       // Act
       fireEvent.click(screen.getByTestId('portal-trigger'))
       await waitFor(() => {
-        expect(screen.getByPlaceholderText('pluginTags.searchTags')).toBeInTheDocument()
+        expect(screen.getByPlaceholderText('pluginTags.searchTags'))!.toBeInTheDocument()
       })
       fireEvent.change(screen.getByPlaceholderText('pluginTags.searchTags'), {
         target: { value: 'rag' },
       })
 
       // Assert
-      expect(screen.getByText('RAG')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('RAG'))!.toBeInTheDocument()
       expect(screen.queryByText('Image')).not.toBeInTheDocument()
     })
   })
@@ -855,9 +866,10 @@ describe('FilterManagement Component', () => {
       renderFilterManagement()
 
       // Assert - All three filters should be present
-      expect(screen.getByText('plugin.allCategories')).toBeInTheDocument()
-      expect(screen.getByText('pluginTags.allTags')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('plugin.search')).toBeInTheDocument()
+      // Assert - All three filters should be present
+      expect(screen.getByText('plugin.allCategories'))!.toBeInTheDocument()
+      expect(screen.getByText('pluginTags.allTags'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('plugin.search'))!.toBeInTheDocument()
     })
 
     it('should render with correct container classes', () => {
@@ -866,7 +878,7 @@ describe('FilterManagement Component', () => {
 
       // Assert
       const wrapper = container.firstChild as HTMLElement
-      expect(wrapper).toHaveClass('flex', 'items-center', 'gap-2', 'self-stretch')
+      expect(wrapper)!.toHaveClass('flex', 'items-center', 'gap-2', 'self-stretch')
     })
   })
 
@@ -879,9 +891,10 @@ describe('FilterManagement Component', () => {
       renderFilterManagement()
 
       // Assert
-      expect(screen.getByText('plugin.allCategories')).toBeInTheDocument()
-      expect(screen.getByText('pluginTags.allTags')).toBeInTheDocument()
-      expect(screen.getByPlaceholderText('plugin.search')).toHaveValue('')
+      // Assert
+      expect(screen.getByText('plugin.allCategories'))!.toBeInTheDocument()
+      expect(screen.getByText('pluginTags.allTags'))!.toBeInTheDocument()
+      expect(screen.getByPlaceholderText('plugin.search'))!.toHaveValue('')
     })
 
     it('should initialize with pre-selected categories', () => {
@@ -892,7 +905,8 @@ describe('FilterManagement Component', () => {
       renderFilterManagement()
 
       // Assert
-      expect(screen.getByText('Models')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Models'))!.toBeInTheDocument()
     })
 
     it('should initialize with pre-selected tags', () => {
@@ -903,7 +917,8 @@ describe('FilterManagement Component', () => {
       renderFilterManagement()
 
       // Assert
-      expect(screen.getByText('Agent')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Agent'))!.toBeInTheDocument()
     })
 
     it('should initialize with search query', () => {
@@ -914,7 +929,8 @@ describe('FilterManagement Component', () => {
       renderFilterManagement()
 
       // Assert
-      expect(screen.getByDisplayValue('initial search')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByDisplayValue('initial search'))!.toBeInTheDocument()
     })
   })
 
@@ -926,10 +942,10 @@ describe('FilterManagement Component', () => {
 
       // Act - Open categories dropdown and select
       const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[0]) // Categories filter trigger
+      fireEvent.click(triggers[0]!) // Categories filter trigger
 
       await waitFor(() => {
-        expect(screen.getByText('Models')).toBeInTheDocument()
+        expect(screen.getByText('Models'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('Models'))
 
@@ -948,10 +964,10 @@ describe('FilterManagement Component', () => {
 
       // Act - Open tags dropdown and select
       const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[1]) // Tags filter trigger
+      fireEvent.click(triggers[1]!) // Tags filter trigger
 
       await waitFor(() => {
-        expect(screen.getByText('Agent')).toBeInTheDocument()
+        expect(screen.getByText('Agent'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('Agent'))
 
@@ -990,9 +1006,9 @@ describe('FilterManagement Component', () => {
 
       // Act 1 - Select a category
       const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[0])
+      fireEvent.click(triggers[0]!)
       await waitFor(() => {
-        expect(screen.getByText('Models')).toBeInTheDocument()
+        expect(screen.getByText('Models'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('Models'))
 
@@ -1003,12 +1019,12 @@ describe('FilterManagement Component', () => {
       })
 
       // Close dropdown by clicking trigger again
-      fireEvent.click(triggers[0])
+      fireEvent.click(triggers[0]!)
 
       // Act 2 - Select a tag (state should include previous category)
-      fireEvent.click(triggers[1])
+      fireEvent.click(triggers[1]!)
       await waitFor(() => {
-        expect(screen.getByText('Agent')).toBeInTheDocument()
+        expect(screen.getByText('Agent'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('Agent'))
 
@@ -1051,20 +1067,20 @@ describe('FilterManagement Component', () => {
 
       // Act 1 - Select categories
       const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[0])
+      fireEvent.click(triggers[0]!)
       await waitFor(() => {
-        expect(screen.getByText('Models')).toBeInTheDocument()
+        expect(screen.getByText('Models'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('Models'))
-      fireEvent.click(triggers[0]) // Close
+      fireEvent.click(triggers[0]!) // Close
 
       // Act 2 - Select tags
-      fireEvent.click(triggers[1])
+      fireEvent.click(triggers[1]!)
       await waitFor(() => {
-        expect(screen.getByText('RAG')).toBeInTheDocument()
+        expect(screen.getByText('RAG'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('RAG'))
-      fireEvent.click(triggers[1]) // Close
+      fireEvent.click(triggers[1]!) // Close
 
       // Act 3 - Enter search
       fireEvent.change(screen.getByPlaceholderText('plugin.search'), {
@@ -1103,7 +1119,7 @@ describe('FilterManagement Component', () => {
 
       // Act - Clear categories (click clear button)
       const closeIcons = container.querySelectorAll('.text-text-quaternary')
-      fireEvent.click(closeIcons[0]) // First close icon is for categories
+      fireEvent.click(closeIcons[0]!) // First close icon is for categories
 
       // Assert
       expect(onFilterChange).toHaveBeenLastCalledWith({
@@ -1124,7 +1140,8 @@ describe('FilterManagement Component', () => {
       render(<FilterManagement onFilterChange={onFilterChange} />)
 
       // Assert - Should render without errors
-      expect(screen.getByText('plugin.allCategories')).toBeInTheDocument()
+      // Assert - Should render without errors
+      expect(screen.getByText('plugin.allCategories'))!.toBeInTheDocument()
     })
 
     it('should handle multiple rapid filter changes', () => {
diff --git a/web/app/components/plugins/plugin-page/filter-management/category-filter.tsx b/web/app/components/plugins/plugin-page/filter-management/category-filter.tsx
index f6ace774e8..8dbef5395d 100644
--- a/web/app/components/plugins/plugin-page/filter-management/category-filter.tsx
+++ b/web/app/components/plugins/plugin-page/filter-management/category-filter.tsx
@@ -61,7 +61,7 @@ const CategoriesFilter = ({
               !selectedTagsLength && t('allCategories', { ns: 'plugin' })
             }
             {
-              !!selectedTagsLength && value.map(val => categoriesMap[val].label).slice(0, 2).join(',')
+              !!selectedTagsLength && value.map(val => categoriesMap[val]!.label).slice(0, 2).join(',')
             }
             {
               selectedTagsLength > 2 && (
diff --git a/web/app/components/plugins/plugin-page/list/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-page/list/__tests__/index.spec.tsx
index c6326461d4..6537237839 100644
--- a/web/app/components/plugins/plugin-page/list/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-page/list/__tests__/index.spec.tsx
@@ -113,7 +113,8 @@ describe('PluginList', () => {
       const { container } = render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(container).toBeInTheDocument()
+      // Assert
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should render container with correct structure', () => {
@@ -125,10 +126,10 @@ describe('PluginList', () => {
 
       // Assert
       const outerDiv = container.firstChild as HTMLElement
-      expect(outerDiv).toHaveClass('pb-3')
+      expect(outerDiv)!.toHaveClass('pb-3')
 
       const gridDiv = outerDiv.firstChild as HTMLElement
-      expect(gridDiv).toHaveClass('grid', 'grid-cols-2', 'gap-3')
+      expect(gridDiv)!.toHaveClass('grid', 'grid-cols-2', 'gap-3')
     })
 
     it('should render single plugin correctly', () => {
@@ -141,7 +142,7 @@ describe('PluginList', () => {
       // Assert
       const pluginItems = screen.getAllByTestId('plugin-item')
       expect(pluginItems).toHaveLength(1)
-      expect(pluginItems[0]).toHaveAttribute('data-plugin-name', 'single-plugin')
+      expect(pluginItems[0])!.toHaveAttribute('data-plugin-name', 'single-plugin')
     })
 
     it('should render multiple plugins correctly', () => {
@@ -169,9 +170,9 @@ describe('PluginList', () => {
 
       // Assert
       const pluginItems = screen.getAllByTestId('plugin-item')
-      expect(pluginItems[0]).toHaveAttribute('data-plugin-id', 'first')
-      expect(pluginItems[1]).toHaveAttribute('data-plugin-id', 'second')
-      expect(pluginItems[2]).toHaveAttribute('data-plugin-id', 'third')
+      expect(pluginItems[0])!.toHaveAttribute('data-plugin-id', 'first')
+      expect(pluginItems[1])!.toHaveAttribute('data-plugin-id', 'second')
+      expect(pluginItems[2])!.toHaveAttribute('data-plugin-id', 'third')
     })
 
     it('should pass plugin prop to each PluginItem', () => {
@@ -185,8 +186,9 @@ describe('PluginList', () => {
       render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(screen.getByText('Plugin A')).toBeInTheDocument()
-      expect(screen.getByText('Plugin B')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Plugin A'))!.toBeInTheDocument()
+      expect(screen.getByText('Plugin B'))!.toBeInTheDocument()
     })
   })
 
@@ -198,7 +200,7 @@ describe('PluginList', () => {
 
       // Assert
       const gridDiv = container.querySelector('.grid')
-      expect(gridDiv).toBeEmptyDOMElement()
+      expect(gridDiv)!.toBeEmptyDOMElement()
     })
 
     it('should handle pluginList with various categories', () => {
@@ -250,6 +252,37 @@ describe('PluginList', () => {
       // Arrange & Act
       render(<PluginList pluginList={[]} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByTestId('plugin-item')).not.toBeInTheDocument()
     })
@@ -303,7 +336,8 @@ describe('PluginList', () => {
       render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(screen.getByTestId('plugin-item')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('plugin-item'))!.toBeInTheDocument()
     })
 
     it('should handle plugin with minimal data', () => {
@@ -317,7 +351,8 @@ describe('PluginList', () => {
       render(<PluginList pluginList={[minimalPlugin]} />)
 
       // Assert
-      expect(screen.getByTestId('plugin-item')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('plugin-item'))!.toBeInTheDocument()
     })
 
     it('should handle plugins with undefined optional fields', () => {
@@ -333,7 +368,8 @@ describe('PluginList', () => {
       render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(screen.getByTestId('plugin-item')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('plugin-item'))!.toBeInTheDocument()
     })
   })
 
@@ -348,7 +384,7 @@ describe('PluginList', () => {
 
       // Assert
       const gridDiv = container.querySelector('.grid')
-      expect(gridDiv).toHaveClass('grid-cols-2')
+      expect(gridDiv)!.toHaveClass('grid-cols-2')
     })
 
     it('should have proper gap between items', () => {
@@ -360,7 +396,7 @@ describe('PluginList', () => {
 
       // Assert
       const gridDiv = container.querySelector('.grid')
-      expect(gridDiv).toHaveClass('gap-3')
+      expect(gridDiv)!.toHaveClass('gap-3')
     })
 
     it('should have bottom padding on container', () => {
@@ -372,7 +408,7 @@ describe('PluginList', () => {
 
       // Assert
       const outerDiv = container.firstChild as HTMLElement
-      expect(outerDiv).toHaveClass('pb-3')
+      expect(outerDiv)!.toHaveClass('pb-3')
     })
   })
 
@@ -404,6 +440,37 @@ describe('PluginList', () => {
 
       rerender(<PluginList pluginList={emptyList} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByTestId('plugin-item')).not.toBeInTheDocument()
     })
@@ -430,12 +497,13 @@ describe('PluginList', () => {
 
       // Act
       const { rerender } = render(<PluginList pluginList={initialList} />)
-      expect(screen.getByText('Original Name')).toBeInTheDocument()
+      expect(screen.getByText('Original Name'))!.toBeInTheDocument()
 
       rerender(<PluginList pluginList={updatedList} />)
 
       // Assert
-      expect(screen.getByText('Updated Name')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Updated Name'))!.toBeInTheDocument()
       expect(screen.queryByText('Original Name')).not.toBeInTheDocument()
     })
   })
@@ -454,15 +522,15 @@ describe('PluginList', () => {
       const { rerender } = render(<PluginList pluginList={pluginList} />)
 
       // Reorder the list
-      const reorderedList = [pluginList[2], pluginList[0], pluginList[1]]
+      const reorderedList = [pluginList[2]!, pluginList[0]!, pluginList[1]!]
       rerender(<PluginList pluginList={reorderedList} />)
 
       // Assert - All items should still be present
       const items = screen.getAllByTestId('plugin-item')
       expect(items).toHaveLength(3)
-      expect(items[0]).toHaveAttribute('data-plugin-id', 'stable-key-3')
-      expect(items[1]).toHaveAttribute('data-plugin-id', 'stable-key-1')
-      expect(items[2]).toHaveAttribute('data-plugin-id', 'stable-key-2')
+      expect(items[0])!.toHaveAttribute('data-plugin-id', 'stable-key-3')
+      expect(items[1])!.toHaveAttribute('data-plugin-id', 'stable-key-1')
+      expect(items[2])!.toHaveAttribute('data-plugin-id', 'stable-key-2')
     })
   })
 
@@ -476,7 +544,8 @@ describe('PluginList', () => {
       render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(screen.getByTestId('plugin-item')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('plugin-item'))!.toBeInTheDocument()
     })
 
     it('should render deleted/deprecated plugins', () => {
@@ -492,7 +561,8 @@ describe('PluginList', () => {
       render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(screen.getByTestId('plugin-item')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('plugin-item'))!.toBeInTheDocument()
     })
 
     it('should render mixed status plugins', () => {
@@ -529,7 +599,8 @@ describe('PluginList', () => {
       render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(screen.getByTestId('plugin-item')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('plugin-item'))!.toBeInTheDocument()
     })
 
     it('should render plugins with outdated version', () => {
@@ -545,7 +616,8 @@ describe('PluginList', () => {
       render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(screen.getByTestId('plugin-item')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('plugin-item'))!.toBeInTheDocument()
     })
   })
 
@@ -607,9 +679,10 @@ describe('PluginList', () => {
       render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(screen.getByText('Marketplace Plugin')).toBeInTheDocument()
-      expect(screen.getByText('GitHub Plugin')).toBeInTheDocument()
-      expect(screen.getByText('Local Plugin')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Marketplace Plugin'))!.toBeInTheDocument()
+      expect(screen.getByText('GitHub Plugin'))!.toBeInTheDocument()
+      expect(screen.getByText('Local Plugin'))!.toBeInTheDocument()
     })
 
     it('should render plugins of different categories together', () => {
@@ -636,9 +709,10 @@ describe('PluginList', () => {
       render(<PluginList pluginList={pluginList} />)
 
       // Assert
-      expect(screen.getByText('Tool Plugin')).toBeInTheDocument()
-      expect(screen.getByText('Model Plugin')).toBeInTheDocument()
-      expect(screen.getByText('Agent Plugin')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Tool Plugin'))!.toBeInTheDocument()
+      expect(screen.getByText('Model Plugin'))!.toBeInTheDocument()
+      expect(screen.getByText('Agent Plugin'))!.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/plugins/plugin-page/plugin-tasks/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-page/plugin-tasks/__tests__/index.spec.tsx
index 56992b377f..15b4429de8 100644
--- a/web/app/components/plugins/plugin-page/plugin-tasks/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-page/plugin-tasks/__tests__/index.spec.tsx
@@ -83,8 +83,8 @@ describe('usePluginTaskStatus Hook', () => {
 
       render(<TestComponent />)
 
-      expect(screen.getByTestId('running-count')).toHaveTextContent('1')
-      expect(screen.getByTestId('running-id')).toHaveTextContent(runningPlugin.plugin_unique_identifier)
+      expect(screen.getByTestId('running-count'))!.toHaveTextContent('1')
+      expect(screen.getByTestId('running-id'))!.toHaveTextContent(runningPlugin.plugin_unique_identifier)
     })
 
     it('should categorize success plugins correctly', () => {
@@ -103,8 +103,8 @@ describe('usePluginTaskStatus Hook', () => {
 
       render(<TestComponent />)
 
-      expect(screen.getByTestId('success-count')).toHaveTextContent('1')
-      expect(screen.getByTestId('success-id')).toHaveTextContent(successPlugin.plugin_unique_identifier)
+      expect(screen.getByTestId('success-count'))!.toHaveTextContent('1')
+      expect(screen.getByTestId('success-id'))!.toHaveTextContent(successPlugin.plugin_unique_identifier)
     })
 
     it('should categorize error plugins correctly', () => {
@@ -123,8 +123,8 @@ describe('usePluginTaskStatus Hook', () => {
 
       render(<TestComponent />)
 
-      expect(screen.getByTestId('error-count')).toHaveTextContent('1')
-      expect(screen.getByTestId('error-id')).toHaveTextContent(errorPlugin.plugin_unique_identifier)
+      expect(screen.getByTestId('error-count'))!.toHaveTextContent('1')
+      expect(screen.getByTestId('error-id'))!.toHaveTextContent(errorPlugin.plugin_unique_identifier)
     })
 
     it('should categorize mixed plugins correctly', () => {
@@ -149,10 +149,10 @@ describe('usePluginTaskStatus Hook', () => {
 
       render(<TestComponent />)
 
-      expect(screen.getByTestId('running')).toHaveTextContent('1')
-      expect(screen.getByTestId('success')).toHaveTextContent('1')
-      expect(screen.getByTestId('error')).toHaveTextContent('1')
-      expect(screen.getByTestId('total')).toHaveTextContent('3')
+      expect(screen.getByTestId('running'))!.toHaveTextContent('1')
+      expect(screen.getByTestId('success'))!.toHaveTextContent('1')
+      expect(screen.getByTestId('error'))!.toHaveTextContent('1')
+      expect(screen.getByTestId('total'))!.toHaveTextContent('3')
     })
   })
 
@@ -175,11 +175,11 @@ describe('usePluginTaskStatus Hook', () => {
 
       render(<TestComponent />)
 
-      expect(screen.getByTestId('isInstalling')).toHaveTextContent('true')
-      expect(screen.getByTestId('isInstallingWithSuccess')).toHaveTextContent('false')
-      expect(screen.getByTestId('isInstallingWithError')).toHaveTextContent('false')
-      expect(screen.getByTestId('isSuccess')).toHaveTextContent('false')
-      expect(screen.getByTestId('isFailed')).toHaveTextContent('false')
+      expect(screen.getByTestId('isInstalling'))!.toHaveTextContent('true')
+      expect(screen.getByTestId('isInstallingWithSuccess'))!.toHaveTextContent('false')
+      expect(screen.getByTestId('isInstallingWithError'))!.toHaveTextContent('false')
+      expect(screen.getByTestId('isSuccess'))!.toHaveTextContent('false')
+      expect(screen.getByTestId('isFailed'))!.toHaveTextContent('false')
     })
 
     it('should set isInstallingWithSuccess when running and success plugins exist', () => {
@@ -194,7 +194,7 @@ describe('usePluginTaskStatus Hook', () => {
       }
 
       render(<TestComponent />)
-      expect(screen.getByTestId('flag')).toHaveTextContent('true')
+      expect(screen.getByTestId('flag'))!.toHaveTextContent('true')
     })
 
     it('should set isInstallingWithError when running and error plugins exist', () => {
@@ -209,7 +209,7 @@ describe('usePluginTaskStatus Hook', () => {
       }
 
       render(<TestComponent />)
-      expect(screen.getByTestId('flag')).toHaveTextContent('true')
+      expect(screen.getByTestId('flag'))!.toHaveTextContent('true')
     })
 
     it('should set isSuccess when all plugins succeeded', () => {
@@ -224,7 +224,7 @@ describe('usePluginTaskStatus Hook', () => {
       }
 
       render(<TestComponent />)
-      expect(screen.getByTestId('flag')).toHaveTextContent('true')
+      expect(screen.getByTestId('flag'))!.toHaveTextContent('true')
     })
 
     it('should set isFailed when no running plugins and some failed', () => {
@@ -239,7 +239,7 @@ describe('usePluginTaskStatus Hook', () => {
       }
 
       render(<TestComponent />)
-      expect(screen.getByTestId('flag')).toHaveTextContent('true')
+      expect(screen.getByTestId('flag'))!.toHaveTextContent('true')
     })
   })
 
@@ -296,12 +296,12 @@ describe('TaskStatusIndicator Component', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<TaskStatusIndicator {...defaultProps} />)
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should render with correct id', () => {
       render(<TaskStatusIndicator {...defaultProps} />)
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -309,17 +309,18 @@ describe('TaskStatusIndicator Component', () => {
     it('should show downloading icon when installing', () => {
       render(<TaskStatusIndicator {...defaultProps} isInstalling />)
       // DownloadingIcon is rendered when isInstalling is true
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      // DownloadingIcon is rendered when isInstalling is true
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should show downloading icon when installing with error', () => {
       render(<TaskStatusIndicator {...defaultProps} isInstallingWithError />)
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should show install icon when not installing', () => {
       render(<TaskStatusIndicator {...defaultProps} isSuccess />)
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -333,7 +334,7 @@ describe('TaskStatusIndicator Component', () => {
           totalPluginsLength={3}
         />,
       )
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should show progress circle when installing with success', () => {
@@ -345,7 +346,7 @@ describe('TaskStatusIndicator Component', () => {
           totalPluginsLength={3}
         />,
       )
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should show error progress circle when installing with error', () => {
@@ -357,7 +358,7 @@ describe('TaskStatusIndicator Component', () => {
           totalPluginsLength={3}
         />,
       )
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should show success icon when all completed successfully', () => {
@@ -370,12 +371,12 @@ describe('TaskStatusIndicator Component', () => {
           totalPluginsLength={3}
         />,
       )
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should show error icon when failed', () => {
       render(<TaskStatusIndicator {...defaultProps} isFailed />)
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -383,19 +384,19 @@ describe('TaskStatusIndicator Component', () => {
     it('should apply error styles when installing with error', () => {
       render(<TaskStatusIndicator {...defaultProps} isInstallingWithError />)
       const trigger = document.getElementById('plugin-task-trigger')
-      expect(trigger).toHaveClass('bg-state-destructive-hover')
+      expect(trigger)!.toHaveClass('bg-state-destructive-hover')
     })
 
     it('should apply error styles when failed', () => {
       render(<TaskStatusIndicator {...defaultProps} isFailed />)
       const trigger = document.getElementById('plugin-task-trigger')
-      expect(trigger).toHaveClass('bg-state-destructive-hover')
+      expect(trigger)!.toHaveClass('bg-state-destructive-hover')
     })
 
     it('should apply cursor-pointer when clickable', () => {
       render(<TaskStatusIndicator {...defaultProps} isInstalling />)
       const trigger = document.getElementById('plugin-task-trigger')
-      expect(trigger).toHaveClass('cursor-pointer')
+      expect(trigger)!.toHaveClass('cursor-pointer')
     })
   })
 
@@ -429,7 +430,7 @@ describe('PluginTaskList Component', () => {
   describe('Rendering', () => {
     it('should render without crashing with empty lists', () => {
       render(<PluginTaskList {...defaultProps} />)
-      expect(document.querySelector('.w-\\[360px\\]')).toBeInTheDocument()
+      expect(document.querySelector('.w-\\[360px\\]'))!.toBeInTheDocument()
     })
 
     it('should render running plugins section when plugins exist', () => {
@@ -439,7 +440,8 @@ describe('PluginTaskList Component', () => {
       // Translation key is returned as text in tests, multiple matches expected (title + status)
       expect(screen.getAllByText(/task\.installing/i).length).toBeGreaterThan(0)
       // Verify section container is rendered
-      expect(document.querySelector('.max-h-\\[300px\\]')).toBeInTheDocument()
+      // Verify section container is rendered
+      expect(document.querySelector('.max-h-\\[300px\\]'))!.toBeInTheDocument()
     })
 
     it('should render success plugins section when plugins exist', () => {
@@ -454,7 +456,7 @@ describe('PluginTaskList Component', () => {
       const errorPlugins = [createMockPlugin({ status: TaskStatus.failed, message: 'Error occurred' })]
       render(<PluginTaskList {...defaultProps} errorPlugins={errorPlugins} />)
 
-      expect(screen.getByText('Error occurred')).toBeInTheDocument()
+      expect(screen.getByText('Error occurred'))!.toBeInTheDocument()
     })
 
     it('should render all sections when all types exist', () => {
@@ -541,7 +543,7 @@ describe('PluginTaskList Component', () => {
 
       render(<PluginTaskList {...defaultProps} runningPlugins={[plugin]} />)
 
-      expect(screen.getByText('My Test Plugin')).toBeInTheDocument()
+      expect(screen.getByText('My Test Plugin'))!.toBeInTheDocument()
     })
 
     it('should display plugin message when available', () => {
@@ -552,7 +554,7 @@ describe('PluginTaskList Component', () => {
 
       render(<PluginTaskList {...defaultProps} successPlugins={[plugin]} />)
 
-      expect(screen.getByText('Successfully installed!')).toBeInTheDocument()
+      expect(screen.getByText('Successfully installed!'))!.toBeInTheDocument()
     })
 
     it('should display multiple plugins in each section', () => {
@@ -563,8 +565,8 @@ describe('PluginTaskList Component', () => {
 
       render(<PluginTaskList {...defaultProps} runningPlugins={runningPlugins} />)
 
-      expect(screen.getByText('Plugin A')).toBeInTheDocument()
-      expect(screen.getByText('Plugin B')).toBeInTheDocument()
+      expect(screen.getByText('Plugin A'))!.toBeInTheDocument()
+      expect(screen.getByText('Plugin B'))!.toBeInTheDocument()
       // Count is rendered, verify multiple items are in list
       expect(document.querySelectorAll('.hover\\:bg-state-base-hover').length).toBe(2)
     })
@@ -593,7 +595,7 @@ describe('PluginTasks Component', () => {
 
       render(<PluginTasks />)
 
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -604,7 +606,8 @@ describe('PluginTasks Component', () => {
       render(<PluginTasks />)
 
       // The component renders with a tooltip, we verify it exists
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      // The component renders with a tooltip, we verify it exists
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should show success tip when all succeeded', () => {
@@ -612,7 +615,7 @@ describe('PluginTasks Component', () => {
 
       render(<PluginTasks />)
 
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should show error tip when some failed', () => {
@@ -623,7 +626,7 @@ describe('PluginTasks Component', () => {
 
       render(<PluginTasks />)
 
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -637,7 +640,8 @@ describe('PluginTasks Component', () => {
       fireEvent.click(document.getElementById('plugin-task-trigger')!)
 
       // The popover content should be visible (PluginTaskList)
-      expect(document.querySelector('.w-\\[360px\\]')).toBeInTheDocument()
+      // The popover content should be visible (PluginTaskList)
+      expect(document.querySelector('.w-\\[360px\\]'))!.toBeInTheDocument()
     })
 
     it('should not toggle when status does not allow', () => {
@@ -647,7 +651,8 @@ describe('PluginTasks Component', () => {
       render(<PluginTasks />)
 
       // Component should still render
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      // Component should still render
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -665,7 +670,7 @@ describe('PluginTasks Component', () => {
 
       // Wait for popover content to render
       await waitFor(() => {
-        expect(document.querySelector('.w-\\[360px\\]')).toBeInTheDocument()
+        expect(document.querySelector('.w-\\[360px\\]'))!.toBeInTheDocument()
       })
 
       // Find and click clear all button
@@ -691,13 +696,13 @@ describe('PluginTasks Component', () => {
       fireEvent.click(document.getElementById('plugin-task-trigger')!)
 
       await waitFor(() => {
-        expect(document.querySelector('.w-\\[360px\\]')).toBeInTheDocument()
+        expect(document.querySelector('.w-\\[360px\\]'))!.toBeInTheDocument()
       })
 
       // Find and click the clear all button in error section
       const clearButtons = screen.getAllByRole('button')
       if (clearButtons.length > 0)
-        fireEvent.click(clearButtons[0])
+        fireEvent.click(clearButtons[0]!)
 
       await waitFor(() => {
         expect(mockMutateAsync).toHaveBeenCalled()
@@ -719,13 +724,13 @@ describe('PluginTasks Component', () => {
       fireEvent.click(document.getElementById('plugin-task-trigger')!)
 
       await waitFor(() => {
-        expect(document.querySelector('.w-\\[360px\\]')).toBeInTheDocument()
+        expect(document.querySelector('.w-\\[360px\\]'))!.toBeInTheDocument()
       })
 
       // Find and click individual clear button (usually the last one)
       const clearButtons = screen.getAllByRole('button')
       const individualClearButton = clearButtons[clearButtons.length - 1]
-      fireEvent.click(individualClearButton)
+      fireEvent.click(individualClearButton!)
 
       await waitFor(() => {
         expect(mockMutateAsync).toHaveBeenCalledWith({
@@ -750,7 +755,7 @@ describe('PluginTasks Component', () => {
 
       render(<PluginTasks />)
 
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should handle many plugins', () => {
@@ -763,7 +768,7 @@ describe('PluginTasks Component', () => {
 
       render(<PluginTasks />)
 
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should handle plugins with empty labels', () => {
@@ -775,7 +780,7 @@ describe('PluginTasks Component', () => {
 
       render(<PluginTasks />)
 
-      expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+      expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
     })
 
     it('should handle plugins with long messages', () => {
@@ -790,7 +795,7 @@ describe('PluginTasks Component', () => {
       // Open popover
       fireEvent.click(document.getElementById('plugin-task-trigger')!)
 
-      expect(document.querySelector('.w-\\[360px\\]')).toBeInTheDocument()
+      expect(document.querySelector('.w-\\[360px\\]'))!.toBeInTheDocument()
     })
   })
 })
@@ -809,13 +814,13 @@ describe('PluginTasks Integration', () => {
 
     const { rerender } = render(<PluginTasks />)
 
-    expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+    expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
 
     // Simulate completion by re-rendering with success
     setupMocks([createMockPlugin({ status: TaskStatus.success })])
     rerender(<PluginTasks />)
 
-    expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+    expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
   })
 
   it('should show correct UI flow from installing to failure', async () => {
@@ -824,13 +829,13 @@ describe('PluginTasks Integration', () => {
 
     const { rerender } = render(<PluginTasks />)
 
-    expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+    expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
 
     // Simulate failure by re-rendering with failed
     setupMocks([createMockPlugin({ status: TaskStatus.failed, message: 'Network error' })])
     rerender(<PluginTasks />)
 
-    expect(document.getElementById('plugin-task-trigger')).toBeInTheDocument()
+    expect(document.getElementById('plugin-task-trigger'))!.toBeInTheDocument()
   })
 
   it('should handle mixed status during installation', () => {
diff --git a/web/app/components/plugins/plugin-page/plugin-tasks/components/__tests__/plugin-section.spec.tsx b/web/app/components/plugins/plugin-page/plugin-tasks/components/__tests__/plugin-section.spec.tsx
index fb7429e9be..0c724000dd 100644
--- a/web/app/components/plugins/plugin-page/plugin-tasks/components/__tests__/plugin-section.spec.tsx
+++ b/web/app/components/plugins/plugin-page/plugin-tasks/components/__tests__/plugin-section.spec.tsx
@@ -41,15 +41,15 @@ describe('PluginSection', () => {
     it('should render title and count', () => {
       render(<PluginSection {...defaultProps} />)
 
-      expect(screen.getByText(/installing plugins/i)).toBeInTheDocument()
+      expect(screen.getByText(/installing plugins/i))!.toBeInTheDocument()
       expect(screen.getByText(/installing plugins/i).textContent).toContain('2')
     })
 
     it('should render all plugin items', () => {
       render(<PluginSection {...defaultProps} />)
 
-      expect(screen.getByText('PluginA')).toBeInTheDocument()
-      expect(screen.getByText('PluginB')).toBeInTheDocument()
+      expect(screen.getByText('PluginA'))!.toBeInTheDocument()
+      expect(screen.getByText('PluginB'))!.toBeInTheDocument()
     })
 
     it('should render status icons for each plugin', () => {
@@ -72,14 +72,14 @@ describe('PluginSection', () => {
       const plugins = [createPlugin('p1', 'PluginA', 'Custom message')]
       render(<PluginSection {...defaultProps} plugins={plugins} count={1} />)
 
-      expect(screen.getByText('Custom message')).toBeInTheDocument()
+      expect(screen.getByText('Custom message'))!.toBeInTheDocument()
     })
 
     it('should use defaultStatusText when plugin has no message', () => {
       const plugins = [createPlugin('p1', 'PluginA', '')]
       render(<PluginSection {...defaultProps} plugins={plugins} count={1} />)
 
-      expect(screen.getByText('Default status')).toBeInTheDocument()
+      expect(screen.getByText('Default status'))!.toBeInTheDocument()
     })
 
     it('should apply statusClassName to items', () => {
@@ -104,7 +104,7 @@ describe('PluginSection', () => {
         />,
       )
 
-      expect(screen.getByRole('button', { name: /clear all/i })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /clear all/i }))!.toBeInTheDocument()
     })
 
     it('should not render headerAction when not provided', () => {
@@ -123,8 +123,8 @@ describe('PluginSection', () => {
         />,
       )
 
-      expect(screen.getByRole('button', { name: /action plugina/i })).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: /action pluginb/i })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /action plugina/i }))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /action pluginb/i }))!.toBeInTheDocument()
     })
   })
 
@@ -140,7 +140,7 @@ describe('PluginSection', () => {
 
       // Clear buttons are rendered when onClearSingle is provided
       const clearButtons = screen.getAllByRole('button')
-      fireEvent.click(clearButtons[0])
+      fireEvent.click(clearButtons[0]!)
 
       expect(onClearSingle).toHaveBeenCalledWith('task-1', 'p1')
     })
@@ -157,8 +157,8 @@ describe('PluginSection', () => {
       const plugins = [createPlugin('p1', 'Solo')]
       render(<PluginSection {...defaultProps} plugins={plugins} count={1} />)
 
-      expect(screen.getByText('Solo')).toBeInTheDocument()
-      expect(screen.getByText(/solo/i).closest('.max-h-\\[300px\\]')).toBeInTheDocument()
+      expect(screen.getByText('Solo'))!.toBeInTheDocument()
+      expect(screen.getByText(/solo/i).closest('.max-h-\\[300px\\]'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/plugins/plugin-page/plugin-tasks/components/__tests__/plugin-task-list.spec.tsx b/web/app/components/plugins/plugin-page/plugin-tasks/components/__tests__/plugin-task-list.spec.tsx
index 2d0d3f7fd6..07a651e2c5 100644
--- a/web/app/components/plugins/plugin-page/plugin-tasks/components/__tests__/plugin-task-list.spec.tsx
+++ b/web/app/components/plugins/plugin-page/plugin-tasks/components/__tests__/plugin-task-list.spec.tsx
@@ -67,7 +67,7 @@ describe('PluginTaskList', () => {
     it('should render empty container when no plugins', () => {
       const { container } = render(<PluginTaskList {...defaultProps} />)
       const wrapper = container.firstElementChild!
-      expect(wrapper).toBeInTheDocument()
+      expect(wrapper)!.toBeInTheDocument()
       expect(wrapper.children).toHaveLength(0)
     })
 
@@ -77,9 +77,9 @@ describe('PluginTaskList', () => {
       // Header contains the title text
       const headers = container.querySelectorAll('.system-sm-semibold-uppercase')
       expect(headers).toHaveLength(1)
-      expect(headers[0].textContent).toContain('plugin.task.installing')
-      expect(screen.getByText('OpenAI')).toBeInTheDocument()
-      expect(screen.getByText('Anthropic')).toBeInTheDocument()
+      expect(headers[0]!.textContent).toContain('plugin.task.installing')
+      expect(screen.getByText('OpenAI'))!.toBeInTheDocument()
+      expect(screen.getByText('Anthropic'))!.toBeInTheDocument()
     })
 
     it('should render success section when success plugins exist', () => {
@@ -87,8 +87,8 @@ describe('PluginTaskList', () => {
 
       const headers = container.querySelectorAll('.system-sm-semibold-uppercase')
       expect(headers).toHaveLength(1)
-      expect(headers[0].textContent).toContain('plugin.task.installed')
-      expect(screen.getByText('Google')).toBeInTheDocument()
+      expect(headers[0]!.textContent).toContain('plugin.task.installed')
+      expect(screen.getByText('Google'))!.toBeInTheDocument()
     })
 
     it('should render error section when error plugins exist', () => {
@@ -96,8 +96,8 @@ describe('PluginTaskList', () => {
 
       const headers = container.querySelectorAll('.system-sm-semibold-uppercase')
       expect(headers).toHaveLength(1)
-      expect(headers[0].textContent).toContain('plugin.task.installedError')
-      expect(screen.getByText('DALLE')).toBeInTheDocument()
+      expect(headers[0]!.textContent).toContain('plugin.task.installedError')
+      expect(screen.getByText('DALLE'))!.toBeInTheDocument()
     })
 
     it('should render all three sections simultaneously', () => {
@@ -110,9 +110,9 @@ describe('PluginTaskList', () => {
         />,
       )
 
-      expect(screen.getByText('OpenAI')).toBeInTheDocument()
-      expect(screen.getByText('Google')).toBeInTheDocument()
-      expect(screen.getByText('DALLE')).toBeInTheDocument()
+      expect(screen.getByText('OpenAI'))!.toBeInTheDocument()
+      expect(screen.getByText('Google'))!.toBeInTheDocument()
+      expect(screen.getByText('DALLE'))!.toBeInTheDocument()
     })
   })
 
@@ -183,6 +183,37 @@ describe('PluginTaskList', () => {
     it('should not render clear buttons for running plugins', () => {
       render(<PluginTaskList {...defaultProps} runningPlugins={runningPlugins} />)
 
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
+      // Running section has no headerAction and no onClearSingle
       // Running section has no headerAction and no onClearSingle
       expect(screen.queryByText(/plugin\.task\.clearAll/)).not.toBeInTheDocument()
     })
@@ -243,9 +274,9 @@ describe('PluginTaskList', () => {
 
       render(<PluginTaskList {...defaultProps} errorPlugins={multipleErrors} />)
 
-      expect(screen.getByText('PluginA')).toBeInTheDocument()
-      expect(screen.getByText('PluginB')).toBeInTheDocument()
-      expect(screen.getByText('PluginC')).toBeInTheDocument()
+      expect(screen.getByText('PluginA'))!.toBeInTheDocument()
+      expect(screen.getByText('PluginB'))!.toBeInTheDocument()
+      expect(screen.getByText('PluginC'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/plugins/plugin-page/plugin-tasks/components/error-plugin-item.tsx b/web/app/components/plugins/plugin-page/plugin-tasks/components/error-plugin-item.tsx
index 81f559c9aa..ef857cb6c6 100644
--- a/web/app/components/plugins/plugin-page/plugin-tasks/components/error-plugin-item.tsx
+++ b/web/app/components/plugins/plugin-page/plugin-tasks/components/error-plugin-item.tsx
@@ -30,14 +30,14 @@ const ErrorPluginItem: FC<ErrorPluginItemProps> = ({ plugin, getIconUrl, languag
     const [org, name] = parts
     setIsFetching(true)
     try {
-      const response = await fetchPluginInfoFromMarketPlace({ org, name })
+      const response = await fetchPluginInfoFromMarketPlace({ org: org!, name: name! })
       const info = response.data.plugin
       const manifest: Plugin = {
         plugin_id: plugin.plugin_id,
         type: info.category as Plugin['type'],
         category: info.category,
-        name,
-        org,
+        name: name!,
+        org: org!,
         version: info.latest_version,
         latest_version: info.latest_version,
         latest_package_identifier: info.latest_package_identifier,
diff --git a/web/app/components/plugins/plugin-page/use-uploader.ts b/web/app/components/plugins/plugin-page/use-uploader.ts
index 7df1cb95e3..17699e7b9d 100644
--- a/web/app/components/plugins/plugin-page/use-uploader.ts
+++ b/web/app/components/plugins/plugin-page/use-uploader.ts
@@ -38,7 +38,7 @@ export const useUploader = ({ onFileChange, containerRef, enabled = true }: Uplo
       return
     const files = Array.from(e.dataTransfer.files)
     if (files.length > 0)
-      onFileChange(files[0])
+      onFileChange(files[0]!)
   }
 
   const fileChangeHandle = enabled
diff --git a/web/app/components/plugins/reference-setting-modal/__tests__/index.spec.tsx b/web/app/components/plugins/reference-setting-modal/__tests__/index.spec.tsx
index 26eeb7fe03..f71780e2df 100644
--- a/web/app/components/plugins/reference-setting-modal/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/reference-setting-modal/__tests__/index.spec.tsx
@@ -148,7 +148,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} />)
 
         // Assert
-        expect(screen.getByText('plugin.privilege.title')).toBeInTheDocument()
+        // Assert
+        expect(screen.getByText('plugin.privilege.title'))!.toBeInTheDocument()
       })
 
       it('should render install permission section', () => {
@@ -156,7 +157,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} />)
 
         // Assert
-        expect(screen.getByText('plugin.privilege.whoCanInstall')).toBeInTheDocument()
+        // Assert
+        expect(screen.getByText('plugin.privilege.whoCanInstall'))!.toBeInTheDocument()
       })
 
       it('should render debug permission section', () => {
@@ -164,7 +166,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} />)
 
         // Assert
-        expect(screen.getByText('plugin.privilege.whoCanDebug')).toBeInTheDocument()
+        // Assert
+        expect(screen.getByText('plugin.privilege.whoCanDebug'))!.toBeInTheDocument()
       })
 
       it('should render all permission options for install', () => {
@@ -180,8 +183,9 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} />)
 
         // Assert
-        expect(screen.getByText('common.operation.cancel')).toBeInTheDocument()
-        expect(screen.getByText('common.operation.save')).toBeInTheDocument()
+        // Assert
+        expect(screen.getByText('common.operation.cancel'))!.toBeInTheDocument()
+        expect(screen.getByText('common.operation.save'))!.toBeInTheDocument()
       })
 
       it('should render AutoUpdateSetting when marketplace is enabled', () => {
@@ -192,7 +196,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} />)
 
         // Assert
-        expect(screen.getByTestId('auto-update-setting')).toBeInTheDocument()
+        // Assert
+        expect(screen.getByTestId('auto-update-setting'))!.toBeInTheDocument()
       })
 
       it('should not render AutoUpdateSetting when marketplace is disabled', () => {
@@ -202,6 +207,37 @@ describe('reference-setting-modal', () => {
         // Act
         render(<ReferenceSettingModal {...defaultProps} />)
 
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
+        // Assert
         // Assert
         expect(screen.queryByTestId('auto-update-setting')).not.toBeInTheDocument()
       })
@@ -211,7 +247,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} />)
 
         // Assert
-        expect(screen.getByTestId('modal-close')).toBeInTheDocument()
+        // Assert
+        expect(screen.getByTestId('modal-close'))!.toBeInTheDocument()
       })
     })
 
@@ -230,11 +267,11 @@ describe('reference-setting-modal', () => {
 
         // Assert - admin option should be selected for install (first one)
         const adminOptions = screen.getAllByTestId('option-card-plugin.privilege.admins')
-        expect(adminOptions[0]).toHaveAttribute('aria-pressed', 'true') // Install permission
+        expect(adminOptions[0])!.toHaveAttribute('aria-pressed', 'true') // Install permission
 
         // Assert - noOne option should be selected for debug (second one)
         const noOneOptions = screen.getAllByTestId('option-card-plugin.privilege.noone')
-        expect(noOneOptions[1]).toHaveAttribute('aria-pressed', 'true') // Debug permission
+        expect(noOneOptions[1])!.toHaveAttribute('aria-pressed', 'true') // Debug permission
       })
 
       it('should update tempPrivilege when permission option is clicked', () => {
@@ -243,10 +280,11 @@ describe('reference-setting-modal', () => {
 
         // Act - click on "No One" for install permission
         const noOneOptions = screen.getAllByTestId('option-card-plugin.privilege.noone')
-        fireEvent.click(noOneOptions[0]) // First one is for install permission
+        fireEvent.click(noOneOptions[0]!) // First one is for install permission
 
         // Assert - the option should now be selected
-        expect(noOneOptions[0]).toHaveAttribute('aria-pressed', 'true')
+        // Assert - the option should now be selected
+        expect(noOneOptions[0])!.toHaveAttribute('aria-pressed', 'true')
       })
 
       it('should initialize with payload auto_upgrade values', () => {
@@ -261,7 +299,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} payload={payload} />)
 
         // Assert
-        expect(screen.getByTestId('auto-update-strategy')).toHaveTextContent('latest')
+        // Assert
+        expect(screen.getByTestId('auto-update-strategy'))!.toHaveTextContent('latest')
       })
 
       it('should use default auto_upgrade when payload.auto_upgrade is undefined', () => {
@@ -275,7 +314,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} payload={payload} />)
 
         // Assert - should use default value (disabled)
-        expect(screen.getByTestId('auto-update-strategy')).toHaveTextContent('disabled')
+        // Assert - should use default value (disabled)
+        expect(screen.getByTestId('auto-update-strategy'))!.toHaveTextContent('disabled')
       })
     })
 
@@ -351,10 +391,11 @@ describe('reference-setting-modal', () => {
 
         // Click Everyone for install permission
         const everyoneOptions = screen.getAllByTestId('option-card-plugin.privilege.everyone')
-        fireEvent.click(everyoneOptions[0])
+        fireEvent.click(everyoneOptions[0]!)
 
         // Assert
-        expect(everyoneOptions[0]).toHaveAttribute('aria-pressed', 'true')
+        // Assert
+        expect(everyoneOptions[0])!.toHaveAttribute('aria-pressed', 'true')
       })
 
       it('should update debug permission when Admins Only option is clicked', () => {
@@ -371,10 +412,11 @@ describe('reference-setting-modal', () => {
 
         // Click Admins Only for debug permission (second set of options)
         const adminOptions = screen.getAllByTestId('option-card-plugin.privilege.admins')
-        fireEvent.click(adminOptions[1]) // Second one is for debug permission
+        fireEvent.click(adminOptions[1]!) // Second one is for debug permission
 
         // Assert
-        expect(adminOptions[1]).toHaveAttribute('aria-pressed', 'true')
+        // Assert
+        expect(adminOptions[1])!.toHaveAttribute('aria-pressed', 'true')
       })
 
       it('should update auto_upgrade config when changed in AutoUpdateSetting', async () => {
@@ -410,7 +452,8 @@ describe('reference-setting-modal', () => {
         rerender(<ReferenceSettingModal {...defaultProps} />)
 
         // Assert - component should render without issues
-        expect(screen.getByText('plugin.privilege.title')).toBeInTheDocument()
+        // Assert - component should render without issues
+        expect(screen.getByText('plugin.privilege.title'))!.toBeInTheDocument()
       })
 
       it('handleSave should be memoized with useCallback', async () => {
@@ -434,10 +477,11 @@ describe('reference-setting-modal', () => {
 
         // Act - click install permission option
         const everyoneOptions = screen.getAllByTestId('option-card-plugin.privilege.everyone')
-        fireEvent.click(everyoneOptions[0])
+        fireEvent.click(everyoneOptions[0]!)
 
         // Assert - install permission should be updated
-        expect(everyoneOptions[0]).toHaveAttribute('aria-pressed', 'true')
+        // Assert - install permission should be updated
+        expect(everyoneOptions[0])!.toHaveAttribute('aria-pressed', 'true')
       })
     })
 
@@ -456,7 +500,7 @@ describe('reference-setting-modal', () => {
 
         // Act & Assert - should not crash
         render(<ReferenceSettingModal {...defaultProps} payload={payload} />)
-        expect(screen.getByText('plugin.privilege.title')).toBeInTheDocument()
+        expect(screen.getByText('plugin.privilege.title'))!.toBeInTheDocument()
       })
 
       it('should handle undefined permission values', () => {
@@ -471,7 +515,7 @@ describe('reference-setting-modal', () => {
 
         // Assert - should use default PermissionType.noOne
         const noOneOptions = screen.getAllByTestId('option-card-plugin.privilege.noone')
-        expect(noOneOptions[0]).toHaveAttribute('aria-pressed', 'true')
+        expect(noOneOptions[0])!.toHaveAttribute('aria-pressed', 'true')
       })
 
       it('should handle missing install_permission', () => {
@@ -487,7 +531,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} payload={payload} />)
 
         // Assert - should fall back to PermissionType.noOne
-        expect(screen.getByText('plugin.privilege.title')).toBeInTheDocument()
+        // Assert - should fall back to PermissionType.noOne
+        expect(screen.getByText('plugin.privilege.title'))!.toBeInTheDocument()
       })
 
       it('should handle missing debug_permission', () => {
@@ -503,7 +548,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} payload={payload} />)
 
         // Assert - should fall back to PermissionType.noOne
-        expect(screen.getByText('plugin.privilege.title')).toBeInTheDocument()
+        // Assert - should fall back to PermissionType.noOne
+        expect(screen.getByText('plugin.privilege.title'))!.toBeInTheDocument()
       })
 
       it('should handle slow async onSave gracefully', async () => {
@@ -555,7 +601,8 @@ describe('reference-setting-modal', () => {
             const { unmount } = render(<ReferenceSettingModal {...defaultProps} payload={payload} />)
 
             // Assert - should render without crashing
-            expect(screen.getByText('plugin.privilege.title')).toBeInTheDocument()
+            // Assert - should render without crashing
+            expect(screen.getByText('plugin.privilege.title'))!.toBeInTheDocument()
 
             unmount()
           })
@@ -582,7 +629,8 @@ describe('reference-setting-modal', () => {
           const { unmount } = render(<ReferenceSettingModal {...defaultProps} payload={payload} />)
 
           // Assert
-          expect(screen.getByTestId('auto-update-strategy')).toHaveTextContent(strategy)
+          // Assert
+          expect(screen.getByTestId('auto-update-strategy'))!.toHaveTextContent(strategy)
 
           unmount()
         })
@@ -608,7 +656,8 @@ describe('reference-setting-modal', () => {
           const { unmount } = render(<ReferenceSettingModal {...defaultProps} payload={payload} />)
 
           // Assert
-          expect(screen.getByTestId('auto-update-mode')).toHaveTextContent(mode)
+          // Assert
+          expect(screen.getByTestId('auto-update-mode'))!.toHaveTextContent(mode)
 
           unmount()
         })
@@ -631,7 +680,7 @@ describe('reference-setting-modal', () => {
 
         // Change install permission to noOne
         const noOneOptions = screen.getAllByTestId('option-card-plugin.privilege.noone')
-        fireEvent.click(noOneOptions[0])
+        fireEvent.click(noOneOptions[0]!)
 
         // Save
         fireEvent.click(screen.getByText('common.operation.save'))
@@ -662,7 +711,7 @@ describe('reference-setting-modal', () => {
 
         // Change debug permission to noOne
         const noOneOptions = screen.getAllByTestId('option-card-plugin.privilege.noone')
-        fireEvent.click(noOneOptions[1]) // Second one is for debug
+        fireEvent.click(noOneOptions[1]!) // Second one is for debug
 
         // Save
         fireEvent.click(screen.getByText('common.operation.save'))
@@ -691,7 +740,7 @@ describe('reference-setting-modal', () => {
 
         // Change install permission
         const everyoneOptions = screen.getAllByTestId('option-card-plugin.privilege.everyone')
-        fireEvent.click(everyoneOptions[0])
+        fireEvent.click(everyoneOptions[0]!)
 
         // Save
         fireEvent.click(screen.getByText('common.operation.save'))
@@ -717,7 +766,7 @@ describe('reference-setting-modal', () => {
 
         // Assert
         const modal = screen.getByTestId('modal')
-        expect(modal).toHaveClass('w-[620px]', 'max-w-[620px]', 'p-0!')
+        expect(modal)!.toHaveClass('w-[620px]', 'max-w-[620px]', 'p-0!')
       })
 
       it('should pass isShow=true to Modal', () => {
@@ -725,7 +774,8 @@ describe('reference-setting-modal', () => {
         render(<ReferenceSettingModal {...defaultProps} />)
 
         // Assert - modal should be visible
-        expect(screen.getByTestId('modal')).toBeInTheDocument()
+        // Assert - modal should be visible
+        expect(screen.getByTestId('modal'))!.toBeInTheDocument()
       })
     })
 
@@ -736,8 +786,8 @@ describe('reference-setting-modal', () => {
 
         // Assert - check order by getting all section labels
         const labels = screen.getAllByText(/plugin\.privilege\.whoCan/)
-        expect(labels[0]).toHaveTextContent('plugin.privilege.whoCanInstall')
-        expect(labels[1]).toHaveTextContent('plugin.privilege.whoCanDebug')
+        expect(labels[0])!.toHaveTextContent('plugin.privilege.whoCanInstall')
+        expect(labels[1])!.toHaveTextContent('plugin.privilege.whoCanDebug')
       })
 
       it('should render three options per permission section', () => {
@@ -762,8 +812,8 @@ describe('reference-setting-modal', () => {
         const cancelButton = screen.getByText('common.operation.cancel')
         const saveButton = screen.getByText('common.operation.save')
 
-        expect(cancelButton).toBeInTheDocument()
-        expect(saveButton).toBeInTheDocument()
+        expect(cancelButton)!.toBeInTheDocument()
+        expect(saveButton)!.toBeInTheDocument()
       })
     })
   })
@@ -797,11 +847,11 @@ describe('reference-setting-modal', () => {
 
       // Change install permission to Everyone
       const everyoneOptions = screen.getAllByTestId('option-card-plugin.privilege.everyone')
-      fireEvent.click(everyoneOptions[0])
+      fireEvent.click(everyoneOptions[0]!)
 
       // Change debug permission to Admins Only
       const adminOptions = screen.getAllByTestId('option-card-plugin.privilege.admins')
-      fireEvent.click(adminOptions[1])
+      fireEvent.click(adminOptions[1]!)
 
       // Change auto-update strategy
       fireEvent.click(screen.getByTestId('auto-update-change'))
@@ -841,7 +891,7 @@ describe('reference-setting-modal', () => {
 
       // Make some changes
       const noOneOptions = screen.getAllByTestId('option-card-plugin.privilege.noone')
-      fireEvent.click(noOneOptions[0])
+      fireEvent.click(noOneOptions[0]!)
 
       // Cancel
       fireEvent.click(screen.getByText('common.operation.cancel'))
@@ -863,8 +913,9 @@ describe('reference-setting-modal', () => {
       render(<ReferenceSettingModal {...props} />)
 
       // Assert - Labels are rendered correctly
-      expect(screen.getByText('plugin.privilege.whoCanInstall')).toBeInTheDocument()
-      expect(screen.getByText('plugin.privilege.whoCanDebug')).toBeInTheDocument()
+      // Assert - Labels are rendered correctly
+      expect(screen.getByText('plugin.privilege.whoCanInstall'))!.toBeInTheDocument()
+      expect(screen.getByText('plugin.privilege.whoCanDebug'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/plugins/update-plugin/plugin-version-picker.tsx b/web/app/components/plugins/update-plugin/plugin-version-picker.tsx
index 0266c05069..d590f0c9eb 100644
--- a/web/app/components/plugins/update-plugin/plugin-version-picker.tsx
+++ b/web/app/components/plugins/update-plugin/plugin-version-picker.tsx
@@ -107,7 +107,7 @@ const PluginVersionPicker: FC<Props> = ({
                 <div className="system-sm-medium text-text-secondary">{version.version}</div>
                 {currentVersion === version.version && <Badge className="ml-1" text="CURRENT" />}
               </div>
-              <div className="shrink-0 system-xs-regular text-text-tertiary">{formatDate(version.created_at, format)}</div>
+              <div className="shrink-0 system-xs-regular text-text-tertiary">{formatDate(version.created_at, format!)}</div>
             </div>
           ))}
         </div>
diff --git a/web/app/components/rag-pipeline/components/chunk-card-list/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/chunk-card-list/__tests__/index.spec.tsx
index 2fab56f0ea..4827481579 100644
--- a/web/app/components/rag-pipeline/components/chunk-card-list/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/chunk-card-list/__tests__/index.spec.tsx
@@ -61,15 +61,15 @@ describe('QAItem', () => {
     it('should render question type with Q prefix', () => {
       render(<QAItem type={QAItemType.Question} text="What is this?" />)
 
-      expect(screen.getByText('Q')).toBeInTheDocument()
-      expect(screen.getByText('What is this?')).toBeInTheDocument()
+      expect(screen.getByText('Q'))!.toBeInTheDocument()
+      expect(screen.getByText('What is this?'))!.toBeInTheDocument()
     })
 
     it('should render answer type with A prefix', () => {
       render(<QAItem type={QAItemType.Answer} text="This is the answer." />)
 
-      expect(screen.getByText('A')).toBeInTheDocument()
-      expect(screen.getByText('This is the answer.')).toBeInTheDocument()
+      expect(screen.getByText('A'))!.toBeInTheDocument()
+      expect(screen.getByText('This is the answer.'))!.toBeInTheDocument()
     })
   })
 
@@ -77,7 +77,7 @@ describe('QAItem', () => {
     it('should render with empty text', () => {
       render(<QAItem type={QAItemType.Question} text="" />)
 
-      expect(screen.getByText('Q')).toBeInTheDocument()
+      expect(screen.getByText('Q'))!.toBeInTheDocument()
     })
 
     it('should render with long text content', () => {
@@ -85,7 +85,7 @@ describe('QAItem', () => {
 
       render(<QAItem type={QAItemType.Answer} text={longText} />)
 
-      expect(screen.getByText(longText)).toBeInTheDocument()
+      expect(screen.getByText(longText))!.toBeInTheDocument()
     })
 
     it('should render with special characters in text', () => {
@@ -93,7 +93,7 @@ describe('QAItem', () => {
 
       render(<QAItem type={QAItemType.Question} text={specialText} />)
 
-      expect(screen.getByText(specialText)).toBeInTheDocument()
+      expect(screen.getByText(specialText))!.toBeInTheDocument()
     })
   })
 
@@ -101,11 +101,11 @@ describe('QAItem', () => {
     it('should be memoized with React.memo', () => {
       const { rerender } = render(<QAItem type={QAItemType.Question} text="Test" />)
 
-      expect(screen.getByText('Q')).toBeInTheDocument()
-      expect(screen.getByText('Test')).toBeInTheDocument()
+      expect(screen.getByText('Q'))!.toBeInTheDocument()
+      expect(screen.getByText('Test'))!.toBeInTheDocument()
 
       rerender(<QAItem type={QAItemType.Question} text="Test" />)
-      expect(screen.getByText('Q')).toBeInTheDocument()
+      expect(screen.getByText('Q'))!.toBeInTheDocument()
     })
   })
 })
@@ -120,14 +120,14 @@ describe('ChunkCard', () => {
       render(
         <ChunkCard
           chunkType={ChunkingMode.text}
-          content={createGeneralChunks()[0]}
+          content={createGeneralChunks()[0]!}
           wordCount={27}
           positionId={1}
         />,
       )
 
-      expect(screen.getByText('This is the first chunk of text content.')).toBeInTheDocument()
-      expect(screen.getByText(/Chunk-01/)).toBeInTheDocument()
+      expect(screen.getByText('This is the first chunk of text content.'))!.toBeInTheDocument()
+      expect(screen.getByText(/Chunk-01/))!.toBeInTheDocument()
     })
 
     it('should render QA chunk type with question and answer', () => {
@@ -145,10 +145,10 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText('Q')).toBeInTheDocument()
-      expect(screen.getByText('What is React?')).toBeInTheDocument()
-      expect(screen.getByText('A')).toBeInTheDocument()
-      expect(screen.getByText('React is a JavaScript library.')).toBeInTheDocument()
+      expect(screen.getByText('Q'))!.toBeInTheDocument()
+      expect(screen.getByText('What is React?'))!.toBeInTheDocument()
+      expect(screen.getByText('A'))!.toBeInTheDocument()
+      expect(screen.getByText('React is a JavaScript library.'))!.toBeInTheDocument()
     })
 
     it('should render parent-child chunk type with child contents', () => {
@@ -164,10 +164,10 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText('Child 1 content')).toBeInTheDocument()
-      expect(screen.getByText('Child 2 content')).toBeInTheDocument()
-      expect(screen.getByText('C-1')).toBeInTheDocument()
-      expect(screen.getByText('C-2')).toBeInTheDocument()
+      expect(screen.getByText('Child 1 content'))!.toBeInTheDocument()
+      expect(screen.getByText('Child 2 content'))!.toBeInTheDocument()
+      expect(screen.getByText('C-1'))!.toBeInTheDocument()
+      expect(screen.getByText('C-2'))!.toBeInTheDocument()
     })
   })
 
@@ -183,7 +183,7 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText(/Parent-Chunk-01/)).toBeInTheDocument()
+      expect(screen.getByText(/Parent-Chunk-01/))!.toBeInTheDocument()
     })
 
     it('should hide segment index tag for full-doc mode', () => {
@@ -205,13 +205,13 @@ describe('ChunkCard', () => {
       render(
         <ChunkCard
           chunkType={ChunkingMode.text}
-          content={createGeneralChunks()[0]}
+          content={createGeneralChunks()[0]!}
           wordCount={12}
           positionId={5}
         />,
       )
 
-      expect(screen.getByText(/Chunk-05/)).toBeInTheDocument()
+      expect(screen.getByText(/Chunk-05/))!.toBeInTheDocument()
     })
   })
 
@@ -220,26 +220,26 @@ describe('ChunkCard', () => {
       render(
         <ChunkCard
           chunkType={ChunkingMode.text}
-          content={createGeneralChunks()[0]}
+          content={createGeneralChunks()[0]!}
           wordCount={1234}
           positionId={1}
         />,
       )
 
-      expect(screen.getByText(/1,234/)).toBeInTheDocument()
+      expect(screen.getByText(/1,234/))!.toBeInTheDocument()
     })
 
     it('should display word count with character translation key', () => {
       render(
         <ChunkCard
           chunkType={ChunkingMode.text}
-          content={createGeneralChunks()[0]}
+          content={createGeneralChunks()[0]!}
           wordCount={100}
           positionId={1}
         />,
       )
 
-      expect(screen.getByText(/100\s+(?:\S.*)?characters/)).toBeInTheDocument()
+      expect(screen.getByText(/100\s+(?:\S.*)?characters/))!.toBeInTheDocument()
     })
 
     it('should not display word count info for full-doc mode', () => {
@@ -262,39 +262,39 @@ describe('ChunkCard', () => {
       render(
         <ChunkCard
           chunkType={ChunkingMode.text}
-          content={createGeneralChunks()[0]}
+          content={createGeneralChunks()[0]!}
           wordCount={7}
           positionId={42}
         />,
       )
 
-      expect(screen.getByText(/Chunk-42/)).toBeInTheDocument()
+      expect(screen.getByText(/Chunk-42/))!.toBeInTheDocument()
     })
 
     it('should handle string position ID', () => {
       render(
         <ChunkCard
           chunkType={ChunkingMode.text}
-          content={createGeneralChunks()[0]}
+          content={createGeneralChunks()[0]!}
           wordCount={7}
           positionId="99"
         />,
       )
 
-      expect(screen.getByText(/Chunk-99/)).toBeInTheDocument()
+      expect(screen.getByText(/Chunk-99/))!.toBeInTheDocument()
     })
 
     it('should pad single digit position ID', () => {
       render(
         <ChunkCard
           chunkType={ChunkingMode.text}
-          content={createGeneralChunks()[0]}
+          content={createGeneralChunks()[0]!}
           wordCount={7}
           positionId={3}
         />,
       )
 
-      expect(screen.getByText(/Chunk-03/)).toBeInTheDocument()
+      expect(screen.getByText(/Chunk-03/))!.toBeInTheDocument()
     })
   })
 
@@ -310,7 +310,7 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText(/Parent-Chunk/)).toBeInTheDocument()
+      expect(screen.getByText(/Parent-Chunk/))!.toBeInTheDocument()
 
       rerender(
         <ChunkCard
@@ -338,7 +338,7 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText('Initial content')).toBeInTheDocument()
+      expect(screen.getByText('Initial content'))!.toBeInTheDocument()
 
       rerender(
         <ChunkCard
@@ -349,7 +349,7 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText('Updated content')).toBeInTheDocument()
+      expect(screen.getByText('Updated content'))!.toBeInTheDocument()
       expect(screen.queryByText('Initial content')).not.toBeInTheDocument()
     })
 
@@ -364,7 +364,7 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText('Text content')).toBeInTheDocument()
+      expect(screen.getByText('Text content'))!.toBeInTheDocument()
 
       const qaContent: QAChunk = { question: 'Q?', answer: 'A.' }
       rerender(
@@ -376,8 +376,8 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText('Q')).toBeInTheDocument()
-      expect(screen.getByText('Q?')).toBeInTheDocument()
+      expect(screen.getByText('Q'))!.toBeInTheDocument()
+      expect(screen.getByText('Q?'))!.toBeInTheDocument()
     })
   })
 
@@ -393,7 +393,7 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText(/Parent-Chunk-01/)).toBeInTheDocument()
+      expect(screen.getByText(/Parent-Chunk-01/))!.toBeInTheDocument()
     })
 
     it('should handle QA chunk with empty strings', () => {
@@ -408,8 +408,8 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText('Q')).toBeInTheDocument()
-      expect(screen.getByText('A')).toBeInTheDocument()
+      expect(screen.getByText('Q'))!.toBeInTheDocument()
+      expect(screen.getByText('A'))!.toBeInTheDocument()
     })
 
     it('should handle very long content', () => {
@@ -425,20 +425,20 @@ describe('ChunkCard', () => {
         />,
       )
 
-      expect(screen.getByText(longContent)).toBeInTheDocument()
+      expect(screen.getByText(longContent))!.toBeInTheDocument()
     })
 
     it('should handle zero word count', () => {
       render(
         <ChunkCard
           chunkType={ChunkingMode.text}
-          content={createGeneralChunks()[0]}
+          content={createGeneralChunks()[0]!}
           wordCount={0}
           positionId={1}
         />,
       )
 
-      expect(screen.getByText(/0\s+(?:\S.*)?characters/)).toBeInTheDocument()
+      expect(screen.getByText(/0\s+(?:\S.*)?characters/))!.toBeInTheDocument()
     })
   })
 })
@@ -459,9 +459,9 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText(chunks[0].content)).toBeInTheDocument()
-      expect(screen.getByText(chunks[1].content)).toBeInTheDocument()
-      expect(screen.getByText(chunks[2].content)).toBeInTheDocument()
+      expect(screen.getByText(chunks[0]!.content))!.toBeInTheDocument()
+      expect(screen.getByText(chunks[1]!.content))!.toBeInTheDocument()
+      expect(screen.getByText(chunks[2]!.content))!.toBeInTheDocument()
     })
 
     it('should render parent-child chunks correctly', () => {
@@ -475,9 +475,9 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText('Child content 1')).toBeInTheDocument()
-      expect(screen.getByText('Child content 2')).toBeInTheDocument()
-      expect(screen.getByText('Another child 1')).toBeInTheDocument()
+      expect(screen.getByText('Child content 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Child content 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Another child 1'))!.toBeInTheDocument()
     })
 
     it('should render QA chunks correctly', () => {
@@ -490,10 +490,10 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText('What is the answer to life?')).toBeInTheDocument()
-      expect(screen.getByText('The answer is 42.')).toBeInTheDocument()
-      expect(screen.getByText('How does this work?')).toBeInTheDocument()
-      expect(screen.getByText('It works by processing data.')).toBeInTheDocument()
+      expect(screen.getByText('What is the answer to life?'))!.toBeInTheDocument()
+      expect(screen.getByText('The answer is 42.'))!.toBeInTheDocument()
+      expect(screen.getByText('How does this work?'))!.toBeInTheDocument()
+      expect(screen.getByText('It works by processing data.'))!.toBeInTheDocument()
     })
   })
 
@@ -511,8 +511,8 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText('Chunk 1')).toBeInTheDocument()
-      expect(screen.getByText('Chunk 2')).toBeInTheDocument()
+      expect(screen.getByText('Chunk 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Chunk 2'))!.toBeInTheDocument()
     })
 
     it('should extract parent_child_chunks from ParentChildChunks for parentChild mode', () => {
@@ -530,7 +530,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText('Specific child')).toBeInTheDocument()
+      expect(screen.getByText('Specific child'))!.toBeInTheDocument()
     })
 
     it('should extract qa_chunks from QAChunks for qa mode', () => {
@@ -547,8 +547,8 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText('Specific Q')).toBeInTheDocument()
-      expect(screen.getByText('Specific A')).toBeInTheDocument()
+      expect(screen.getByText('Specific Q'))!.toBeInTheDocument()
+      expect(screen.getByText('Specific A'))!.toBeInTheDocument()
     })
 
     it('should update chunkList when chunkInfo changes', () => {
@@ -561,7 +561,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText('Initial chunk')).toBeInTheDocument()
+      expect(screen.getByText('Initial chunk'))!.toBeInTheDocument()
 
       const updatedChunks = createGeneralChunks([{ content: 'Updated chunk' }])
       rerender(
@@ -571,7 +571,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText('Updated chunk')).toBeInTheDocument()
+      expect(screen.getByText('Updated chunk'))!.toBeInTheDocument()
       expect(screen.queryByText('Initial chunk')).not.toBeInTheDocument()
     })
   })
@@ -587,7 +587,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText(/5\s+(?:\S.*)?characters/)).toBeInTheDocument()
+      expect(screen.getByText(/5\s+(?:\S.*)?characters/))!.toBeInTheDocument()
     })
 
     it('should calculate word count for parent-child chunks using parent_content length', () => {
@@ -608,7 +608,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText(/6\s+(?:\S.*)?characters/)).toBeInTheDocument()
+      expect(screen.getByText(/6\s+(?:\S.*)?characters/))!.toBeInTheDocument()
     })
 
     it('should calculate word count for QA chunks using question + answer length', () => {
@@ -625,7 +625,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText(/5\s+(?:\S.*)?characters/)).toBeInTheDocument()
+      expect(screen.getByText(/5\s+(?:\S.*)?characters/))!.toBeInTheDocument()
     })
   })
 
@@ -644,9 +644,9 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText(/Chunk-01/)).toBeInTheDocument()
-      expect(screen.getByText(/Chunk-02/)).toBeInTheDocument()
-      expect(screen.getByText(/Chunk-03/)).toBeInTheDocument()
+      expect(screen.getByText(/Chunk-01/))!.toBeInTheDocument()
+      expect(screen.getByText(/Chunk-02/))!.toBeInTheDocument()
+      expect(screen.getByText(/Chunk-03/))!.toBeInTheDocument()
     })
   })
 
@@ -662,7 +662,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(container.firstChild).toHaveClass('custom-class')
+      expect(container.firstChild)!.toHaveClass('custom-class')
     })
 
     it('should merge custom className with default classes', () => {
@@ -676,10 +676,10 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(container.firstChild).toHaveClass('flex')
-      expect(container.firstChild).toHaveClass('w-full')
-      expect(container.firstChild).toHaveClass('flex-col')
-      expect(container.firstChild).toHaveClass('my-custom-class')
+      expect(container.firstChild)!.toHaveClass('flex')
+      expect(container.firstChild)!.toHaveClass('w-full')
+      expect(container.firstChild)!.toHaveClass('flex-col')
+      expect(container.firstChild)!.toHaveClass('my-custom-class')
     })
 
     it('should render without className prop', () => {
@@ -692,8 +692,8 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(container.firstChild).toHaveClass('flex')
-      expect(container.firstChild).toHaveClass('w-full')
+      expect(container.firstChild)!.toHaveClass('flex')
+      expect(container.firstChild)!.toHaveClass('w-full')
     })
   })
 
@@ -738,7 +738,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText(/Chunk-01/)).toBeInTheDocument()
+      expect(screen.getByText(/Chunk-01/))!.toBeInTheDocument()
     })
   })
 
@@ -753,7 +753,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
       expect(container.firstChild?.childNodes.length).toBe(0)
     })
 
@@ -771,7 +771,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
       expect(container.firstChild?.childNodes.length).toBe(0)
     })
 
@@ -787,7 +787,7 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
       expect(container.firstChild?.childNodes.length).toBe(0)
     })
 
@@ -801,8 +801,8 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText('Single chunk')).toBeInTheDocument()
-      expect(screen.getByText(/Chunk-01/)).toBeInTheDocument()
+      expect(screen.getByText('Single chunk'))!.toBeInTheDocument()
+      expect(screen.getByText(/Chunk-01/))!.toBeInTheDocument()
     })
 
     it('should handle large number of chunks', () => {
@@ -815,9 +815,9 @@ describe('ChunkCardList', () => {
         />,
       )
 
-      expect(screen.getByText('Chunk number 1')).toBeInTheDocument()
-      expect(screen.getByText('Chunk number 100')).toBeInTheDocument()
-      expect(screen.getByText(/Chunk-100/)).toBeInTheDocument()
+      expect(screen.getByText('Chunk number 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Chunk number 100'))!.toBeInTheDocument()
+      expect(screen.getByText(/Chunk-100/))!.toBeInTheDocument()
     })
   })
 
@@ -861,15 +861,15 @@ describe('ChunkCardList Integration', () => {
         />,
       )
 
-      expect(screen.getByText('First paragraph of the document.')).toBeInTheDocument()
-      expect(screen.getByText(/Chunk-01/)).toBeInTheDocument()
-      expect(screen.getByText(/32\s+(?:\S.*)?characters/)).toBeInTheDocument()
+      expect(screen.getByText('First paragraph of the document.'))!.toBeInTheDocument()
+      expect(screen.getByText(/Chunk-01/))!.toBeInTheDocument()
+      expect(screen.getByText(/32\s+(?:\S.*)?characters/))!.toBeInTheDocument()
 
-      expect(screen.getByText('Second paragraph with more information.')).toBeInTheDocument()
-      expect(screen.getByText(/Chunk-02/)).toBeInTheDocument()
+      expect(screen.getByText('Second paragraph with more information.'))!.toBeInTheDocument()
+      expect(screen.getByText(/Chunk-02/))!.toBeInTheDocument()
 
-      expect(screen.getByText('Final paragraph concluding the content.')).toBeInTheDocument()
-      expect(screen.getByText(/Chunk-03/)).toBeInTheDocument()
+      expect(screen.getByText('Final paragraph concluding the content.'))!.toBeInTheDocument()
+      expect(screen.getByText(/Chunk-03/))!.toBeInTheDocument()
     })
 
     it('should render complete parent-child chunking workflow', () => {
@@ -894,11 +894,11 @@ describe('ChunkCardList Integration', () => {
         />,
       )
 
-      expect(screen.getByText('React components are building blocks.')).toBeInTheDocument()
-      expect(screen.getByText('Lifecycle methods control component behavior.')).toBeInTheDocument()
-      expect(screen.getByText('C-1')).toBeInTheDocument()
-      expect(screen.getByText('C-2')).toBeInTheDocument()
-      expect(screen.getByText(/Parent-Chunk-01/)).toBeInTheDocument()
+      expect(screen.getByText('React components are building blocks.'))!.toBeInTheDocument()
+      expect(screen.getByText('Lifecycle methods control component behavior.'))!.toBeInTheDocument()
+      expect(screen.getByText('C-1'))!.toBeInTheDocument()
+      expect(screen.getByText('C-2'))!.toBeInTheDocument()
+      expect(screen.getByText(/Parent-Chunk-01/))!.toBeInTheDocument()
     })
 
     it('should render complete QA chunking workflow', () => {
@@ -927,10 +927,10 @@ describe('ChunkCardList Integration', () => {
       expect(qLabels.length).toBe(2)
       expect(aLabels.length).toBe(2)
 
-      expect(screen.getByText('What is Dify?')).toBeInTheDocument()
-      expect(screen.getByText('Dify is an open-source LLM application development platform.')).toBeInTheDocument()
-      expect(screen.getByText('How do I get started?')).toBeInTheDocument()
-      expect(screen.getByText('You can start by installing the platform using Docker.')).toBeInTheDocument()
+      expect(screen.getByText('What is Dify?'))!.toBeInTheDocument()
+      expect(screen.getByText('Dify is an open-source LLM application development platform.'))!.toBeInTheDocument()
+      expect(screen.getByText('How do I get started?'))!.toBeInTheDocument()
+      expect(screen.getByText('You can start by installing the platform using Docker.'))!.toBeInTheDocument()
     })
   })
 
@@ -946,7 +946,7 @@ describe('ChunkCardList Integration', () => {
         />,
       )
 
-      expect(screen.getByText('Text content')).toBeInTheDocument()
+      expect(screen.getByText('Text content'))!.toBeInTheDocument()
 
       rerender(
         <ChunkCardList
@@ -956,7 +956,7 @@ describe('ChunkCardList Integration', () => {
       )
 
       expect(screen.queryByText('Text content')).not.toBeInTheDocument()
-      expect(screen.getByText('What is the answer to life?')).toBeInTheDocument()
+      expect(screen.getByText('What is the answer to life?'))!.toBeInTheDocument()
     })
 
     it('should handle switching from text to parent-child type', () => {
@@ -970,8 +970,8 @@ describe('ChunkCardList Integration', () => {
         />,
       )
 
-      expect(screen.getByText('Simple text')).toBeInTheDocument()
-      expect(screen.getByText(/Chunk-01/)).toBeInTheDocument()
+      expect(screen.getByText('Simple text'))!.toBeInTheDocument()
+      expect(screen.getByText(/Chunk-01/))!.toBeInTheDocument()
 
       rerender(
         <ChunkCardList
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/panel/input-field/__tests__/index.spec.tsx
index ab99a1eeef..3146695cae 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/__tests__/index.spec.tsx
@@ -195,61 +195,51 @@ describe('InputFieldPanel', () => {
     it('should render panel without crashing', () => {
       render(<InputFieldPanel />)
 
-      expect(
-        screen.getByText('datasetPipeline.inputFieldPanel.title'),
-      ).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.inputFieldPanel.title'))!.toBeInTheDocument()
     })
 
     it('should render panel title correctly', () => {
       render(<InputFieldPanel />)
 
-      expect(
-        screen.getByText('datasetPipeline.inputFieldPanel.title'),
-      ).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.inputFieldPanel.title'))!.toBeInTheDocument()
     })
 
     it('should render panel description', () => {
       render(<InputFieldPanel />)
 
-      expect(
-        screen.getByText('datasetPipeline.inputFieldPanel.description'),
-      ).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.inputFieldPanel.description'))!.toBeInTheDocument()
     })
 
     it('should render preview button', () => {
       render(<InputFieldPanel />)
 
-      expect(
-        screen.getByText('datasetPipeline.operations.preview'),
-      ).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.operations.preview'))!.toBeInTheDocument()
     })
 
     it('should render close button', () => {
       render(<InputFieldPanel />)
 
       const closeButton = screen.getByRole('button', { name: '' })
-      expect(closeButton).toBeInTheDocument()
+      expect(closeButton)!.toBeInTheDocument()
     })
 
     it('should render footer tip component', () => {
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('footer-tip')).toBeInTheDocument()
+      expect(screen.getByTestId('footer-tip'))!.toBeInTheDocument()
     })
 
     it('should render unique inputs section title', () => {
       render(<InputFieldPanel />)
 
-      expect(
-        screen.getByText('datasetPipeline.inputFieldPanel.uniqueInputs.title'),
-      ).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.inputFieldPanel.uniqueInputs.title'))!.toBeInTheDocument()
     })
 
     it('should render global inputs field list', () => {
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-shared')).toBeInTheDocument()
-      expect(screen.getByTestId('global-inputs-label')).toBeInTheDocument()
+      expect(screen.getByTestId('field-list-shared'))!.toBeInTheDocument()
+      expect(screen.getByTestId('global-inputs-label'))!.toBeInTheDocument()
     })
   })
 
@@ -263,8 +253,8 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-node-1')).toBeInTheDocument()
-      expect(screen.getByTestId('field-list-node-2')).toBeInTheDocument()
+      expect(screen.getByTestId('field-list-node-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('field-list-node-2'))!.toBeInTheDocument()
     })
 
     it('should render datasource label for each node', () => {
@@ -273,9 +263,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(
-        screen.getByTestId('datasource-label-My DataSource'),
-      ).toBeInTheDocument()
+      expect(screen.getByTestId('datasource-label-My DataSource'))!.toBeInTheDocument()
     })
 
     it('should not render any datasource field lists when no nodes exist', () => {
@@ -284,7 +272,7 @@ describe('InputFieldPanel', () => {
       render(<InputFieldPanel />)
 
       expect(screen.queryByTestId('field-list-node-1')).not.toBeInTheDocument()
-      expect(screen.getByTestId('field-list-shared')).toBeInTheDocument()
+      expect(screen.getByTestId('field-list-shared'))!.toBeInTheDocument()
     })
 
     it('should filter only DataSource type nodes', () => {
@@ -303,10 +291,8 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-ds-node')).toBeInTheDocument()
-      expect(
-        screen.queryByTestId('field-list-other-node'),
-      ).not.toBeInTheDocument()
+      expect(screen.getByTestId('field-list-ds-node'))!.toBeInTheDocument()
+      expect(screen.queryByTestId('field-list-other-node')).not.toBeInTheDocument()
     })
   })
 
@@ -322,8 +308,8 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-fields-count-node-1')).toHaveTextContent('2')
-      expect(screen.getByTestId('field-list-fields-count-shared')).toHaveTextContent('1')
+      expect(screen.getByTestId('field-list-fields-count-node-1'))!.toHaveTextContent('2')
+      expect(screen.getByTestId('field-list-fields-count-shared'))!.toHaveTextContent('1')
     })
 
     it('should show zero fields for nodes without variables', () => {
@@ -332,7 +318,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-fields-count-node-1')).toHaveTextContent('0')
+      expect(screen.getByTestId('field-list-fields-count-node-1'))!.toHaveTextContent('0')
     })
 
     it('should pass all variable names to field lists', () => {
@@ -345,10 +331,10 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-all-vars-node-1')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-all-vars-node-1'))!.toHaveTextContent(
         'var1,var2',
       )
-      expect(screen.getByTestId('field-list-all-vars-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-all-vars-shared'))!.toHaveTextContent(
         'var1,var2',
       )
     })
@@ -386,7 +372,7 @@ describe('InputFieldPanel', () => {
       const previewButton = screen
         .getByText('datasetPipeline.operations.preview')
         .closest('button')
-      expect(previewButton).toBeDisabled()
+      expect(previewButton)!.toBeDisabled()
     })
 
     it('should not disable preview button when not editing', () => {
@@ -410,8 +396,8 @@ describe('InputFieldPanel', () => {
       const previewButton = screen
         .getByText('datasetPipeline.operations.preview')
         .closest('button')
-      expect(previewButton).toHaveClass('bg-state-accent-active')
-      expect(previewButton).toHaveClass('text-text-accent')
+      expect(previewButton)!.toHaveClass('bg-state-accent-active')
+      expect(previewButton)!.toHaveClass('text-text-accent')
     })
 
     it('should set readonly to true when previewing', () => {
@@ -419,7 +405,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-readonly-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-readonly-shared'))!.toHaveTextContent(
         'true',
       )
     })
@@ -429,7 +415,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-readonly-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-readonly-shared'))!.toHaveTextContent(
         'true',
       )
     })
@@ -439,7 +425,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-readonly-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-readonly-shared'))!.toHaveTextContent(
         'false',
       )
     })
@@ -484,15 +470,15 @@ describe('InputFieldPanel', () => {
         expect(mockSetRagPipelineVariables).toHaveBeenCalled()
       })
 
-      const setVarsCall = mockSetRagPipelineVariables.mock.calls[0][0] as RAGPipelineVariables
+      const setVarsCall = mockSetRagPipelineVariables.mock.calls[0]![0] as RAGPipelineVariables
       const isNotShared = (v: RAGPipelineVariable) => v.belong_to_node_id !== 'shared'
       const isShared = (v: RAGPipelineVariable) => v.belong_to_node_id === 'shared'
       const dsFields = setVarsCall.filter(isNotShared)
       const sharedFields = setVarsCall.filter(isShared)
 
       if (dsFields.length > 0 && sharedFields.length > 0) {
-        const firstDsIndex = setVarsCall.indexOf(dsFields[0])
-        const firstSharedIndex = setVarsCall.indexOf(sharedFields[0])
+        const firstDsIndex = setVarsCall.indexOf(dsFields[0]!)
+        const firstSharedIndex = setVarsCall.indexOf(sharedFields[0]!)
         expect(firstDsIndex).toBeLessThan(firstSharedIndex)
       }
     })
@@ -523,7 +509,7 @@ describe('InputFieldPanel', () => {
         expect(mockSetRagPipelineVariables).toHaveBeenCalled()
       })
 
-      const setVarsCall = mockSetRagPipelineVariables.mock.calls[0][0] as RAGPipelineVariables
+      const setVarsCall = mockSetRagPipelineVariables.mock.calls[0]![0] as RAGPipelineVariables
       const isSharedField = (v: RAGPipelineVariable) => v.belong_to_node_id === 'shared'
       const hasSharedField = setVarsCall.some(isSharedField)
       expect(hasSharedField).toBe(true)
@@ -537,15 +523,13 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(
-        screen.getByTestId('field-list-classname-node-1'),
-      ).toHaveTextContent('pt-1 pb-1')
+      expect(screen.getByTestId('field-list-classname-node-1'))!.toHaveTextContent('pt-1 pb-1')
     })
 
     it('should pass correct className to global inputs field list', () => {
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-classname-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-classname-shared'))!.toHaveTextContent(
         'pt-2 pb-1',
       )
     })
@@ -559,7 +543,7 @@ describe('InputFieldPanel', () => {
 
       rerender(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-node-1')).toBeInTheDocument()
+      expect(screen.getByTestId('field-list-node-1'))!.toBeInTheDocument()
     })
 
     it('should compute allVariableNames correctly', () => {
@@ -572,7 +556,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-all-vars-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-all-vars-shared'))!.toHaveTextContent(
         'alpha,beta,gamma',
       )
     })
@@ -621,7 +605,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-all-vars-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-all-vars-shared'))!.toHaveTextContent(
         '',
       )
     })
@@ -632,7 +616,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-shared')).toBeInTheDocument()
+      expect(screen.getByTestId('field-list-shared'))!.toBeInTheDocument()
     })
 
     it('should handle null variable names in allVariableNames', () => {
@@ -644,7 +628,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-shared')).toBeInTheDocument()
+      expect(screen.getByTestId('field-list-shared'))!.toBeInTheDocument()
     })
 
     it('should handle large number of datasource nodes', () => {
@@ -655,7 +639,7 @@ describe('InputFieldPanel', () => {
       render(<InputFieldPanel />)
 
       nodes.forEach((_, i) => {
-        expect(screen.getByTestId(`field-list-node-${i}`)).toBeInTheDocument()
+        expect(screen.getByTestId(`field-list-node-${i}`))!.toBeInTheDocument()
       })
     })
 
@@ -666,7 +650,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-fields-count-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-fields-count-shared'))!.toHaveTextContent(
         '100',
       )
     })
@@ -680,7 +664,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-all-vars-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-all-vars-shared'))!.toHaveTextContent(
         'var_with_underscore,varWithCamelCase',
       )
     })
@@ -717,8 +701,8 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-fields-count-node-1')).toHaveTextContent('1')
-      expect(screen.getByTestId('field-list-fields-count-node-2')).toHaveTextContent('2')
+      expect(screen.getByTestId('field-list-fields-count-node-1'))!.toHaveTextContent('1')
+      expect(screen.getByTestId('field-list-fields-count-node-2'))!.toHaveTextContent('2')
     })
   })
 
@@ -727,25 +711,21 @@ describe('InputFieldPanel', () => {
       const { container } = render(<InputFieldPanel />)
 
       const panel = container.firstChild as HTMLElement
-      expect(panel).toHaveClass('w-[400px]')
+      expect(panel)!.toHaveClass('w-[400px]')
     })
 
     it('should have overflow scroll on content area', () => {
       const { container } = render(<InputFieldPanel />)
 
       const scrollContainer = container.querySelector('.overflow-y-auto')
-      expect(scrollContainer).toBeInTheDocument()
+      expect(scrollContainer)!.toBeInTheDocument()
     })
 
     it('should render header section with proper spacing', () => {
       render(<InputFieldPanel />)
 
-      expect(
-        screen.getByText('datasetPipeline.inputFieldPanel.title'),
-      ).toBeInTheDocument()
-      expect(
-        screen.getByText('datasetPipeline.inputFieldPanel.description'),
-      ).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.inputFieldPanel.title'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.inputFieldPanel.description'))!.toBeInTheDocument()
     })
   })
 
@@ -763,9 +743,9 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-node-1')).toBeInTheDocument()
-      expect(screen.getByTestId('field-list-readonly-node-1')).toHaveTextContent('true')
-      expect(screen.getByTestId('field-list-fields-count-node-1')).toHaveTextContent('1')
+      expect(screen.getByTestId('field-list-node-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('field-list-readonly-node-1'))!.toHaveTextContent('true')
+      expect(screen.getByTestId('field-list-fields-count-node-1'))!.toHaveTextContent('1')
     })
 
     it('should pass correct props to FieldList for shared node', () => {
@@ -776,9 +756,9 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-shared')).toBeInTheDocument()
-      expect(screen.getByTestId('field-list-readonly-shared')).toHaveTextContent('true')
-      expect(screen.getByTestId('field-list-fields-count-shared')).toHaveTextContent('1')
+      expect(screen.getByTestId('field-list-shared'))!.toBeInTheDocument()
+      expect(screen.getByTestId('field-list-readonly-shared'))!.toHaveTextContent('true')
+      expect(screen.getByTestId('field-list-fields-count-shared'))!.toHaveTextContent('1')
     })
   })
 
@@ -793,7 +773,7 @@ describe('InputFieldPanel', () => {
 
       render(<InputFieldPanel />)
 
-      expect(screen.getByTestId('field-list-all-vars-shared')).toHaveTextContent(
+      expect(screen.getByTestId('field-list-all-vars-shared'))!.toHaveTextContent(
         'first,second,third',
       )
     })
@@ -810,7 +790,7 @@ describe('useFloatingRight Hook Integration', () => {
 
   it('should render panel correctly with default floating state', () => {
     render(<InputFieldPanel />)
-    expect(screen.getByTestId('field-list-shared')).toBeInTheDocument()
+    expect(screen.getByTestId('field-list-shared'))!.toBeInTheDocument()
   })
 })
 
@@ -823,7 +803,7 @@ describe('FooterTip Integration', () => {
   it('should render footer tip at the bottom of the panel', () => {
     render(<InputFieldPanel />)
 
-    expect(screen.getByTestId('footer-tip')).toBeInTheDocument()
+    expect(screen.getByTestId('footer-tip'))!.toBeInTheDocument()
   })
 })
 
@@ -836,7 +816,7 @@ describe('Label Components Integration', () => {
   it('should render GlobalInputs label for shared field list', () => {
     render(<InputFieldPanel />)
 
-    expect(screen.getByTestId('global-inputs-label')).toBeInTheDocument()
+    expect(screen.getByTestId('global-inputs-label'))!.toBeInTheDocument()
   })
 
   it('should render Datasource label for each datasource node', () => {
@@ -848,12 +828,8 @@ describe('Label Components Integration', () => {
 
     render(<InputFieldPanel />)
 
-    expect(
-      screen.getByTestId('datasource-label-First DataSource'),
-    ).toBeInTheDocument()
-    expect(
-      screen.getByTestId('datasource-label-Second DataSource'),
-    ).toBeInTheDocument()
+    expect(screen.getByTestId('datasource-label-First DataSource'))!.toBeInTheDocument()
+    expect(screen.getByTestId('datasource-label-Second DataSource'))!.toBeInTheDocument()
   })
 })
 
@@ -868,10 +844,8 @@ describe('Component Memo Behavior', () => {
 
     rerender(<InputFieldPanel />)
 
-    expect(screen.getByTestId('field-list-shared')).toBeInTheDocument()
-    expect(
-      screen.getByText('datasetPipeline.inputFieldPanel.title'),
-    ).toBeInTheDocument()
+    expect(screen.getByTestId('field-list-shared'))!.toBeInTheDocument()
+    expect(screen.getByText('datasetPipeline.inputFieldPanel.title'))!.toBeInTheDocument()
   })
 
   it('should handle state updates correctly with memo', async () => {
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/index.tsx b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/index.tsx
index de003e78ba..3854b6561a 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/index.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/index.tsx
@@ -28,7 +28,7 @@ const InputFieldForm = ({ initialData, supportFile = false, onCancel, onSubmit,
         if (!result.success) {
           const issues = result.error.issues
           const firstIssue = issues[0]
-          const errorMessage = `"${firstIssue.path.join('.')}" ${firstIssue.message}`
+          const errorMessage = `"${firstIssue!.path.join('.')}" ${firstIssue!.message}`
           toast.error(errorMessage)
           return errorMessage
         }
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/field-item.spec.tsx b/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/field-item.spec.tsx
index 4a738761d0..8f5d9b5386 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/field-item.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/field-item.spec.tsx
@@ -35,9 +35,9 @@ describe('FieldItem', () => {
       />,
     )
 
-    expect(screen.getByText('field_name')).toBeInTheDocument()
-    expect(screen.getByText('Field Label')).toBeInTheDocument()
-    expect(screen.getByText('workflow.nodes.start.required')).toBeInTheDocument()
+    expect(screen.getByText('field_name'))!.toBeInTheDocument()
+    expect(screen.getByText('Field Label'))!.toBeInTheDocument()
+    expect(screen.getByText('workflow.nodes.start.required'))!.toBeInTheDocument()
   })
 
   it('should show edit and delete controls on hover and trigger both callbacks', () => {
@@ -54,8 +54,8 @@ describe('FieldItem', () => {
 
     fireEvent.mouseEnter(container.firstChild!)
     const buttons = screen.getAllByRole('button')
-    fireEvent.click(buttons[0])
-    fireEvent.click(buttons[1])
+    fireEvent.click(buttons[0]!)
+    fireEvent.click(buttons[1]!)
 
     expect(onClickEdit).toHaveBeenCalledWith('custom_field')
     expect(onRemove).toHaveBeenCalledWith(2)
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/hooks.spec.ts b/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/hooks.spec.ts
index c7f5a11ce3..376751e58f 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/hooks.spec.ts
+++ b/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/hooks.spec.ts
@@ -141,7 +141,7 @@ describe('useFieldList', () => {
         ])
       })
 
-      const updatedFields = onInputFieldsChange.mock.calls[0][0]
+      const updatedFields = onInputFieldsChange.mock.calls[0]![0]
       expect(updatedFields[0]).not.toHaveProperty('id')
       expect(updatedFields[0]).not.toHaveProperty('chosen')
       expect(updatedFields[0]).not.toHaveProperty('selected')
@@ -282,7 +282,7 @@ describe('useFieldList', () => {
         result.current.handleOpenInputFieldEditor()
       })
 
-      const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+      const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
       const newField = createInputVar({ variable: 'new_var', label: 'New' })
 
       act(() => {
@@ -307,7 +307,7 @@ describe('useFieldList', () => {
         result.current.handleOpenInputFieldEditor()
       })
 
-      const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+      const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
       const duplicateField = createInputVar({ variable: 'existing_var' })
 
       act(() => {
@@ -336,7 +336,7 @@ describe('useFieldList', () => {
         result.current.handleOpenInputFieldEditor('old_name')
       })
 
-      const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+      const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
       const updatedField = createInputVar({ variable: 'new_name' })
 
       act(() => {
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/index.spec.tsx
index e44301e252..b2dbc35601 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/index.spec.tsx
@@ -110,7 +110,7 @@ describe('FieldItem', () => {
         />,
       )
 
-      expect(screen.getByText('my_field')).toBeInTheDocument()
+      expect(screen.getByText('my_field'))!.toBeInTheDocument()
     })
 
     it('should render field item with label when provided', () => {
@@ -125,7 +125,7 @@ describe('FieldItem', () => {
         />,
       )
 
-      expect(screen.getByText('Field Label')).toBeInTheDocument()
+      expect(screen.getByText('Field Label'))!.toBeInTheDocument()
     })
 
     it('should not render label when empty', () => {
@@ -155,7 +155,7 @@ describe('FieldItem', () => {
         />,
       )
 
-      expect(screen.getByText(/required/i)).toBeInTheDocument()
+      expect(screen.getByText(/required/i))!.toBeInTheDocument()
     })
 
     it('should not render required badge when required is false', () => {
@@ -259,7 +259,7 @@ describe('FieldItem', () => {
       )
       fireEvent.mouseEnter(container.firstChild!)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0]) // Edit button
+      fireEvent.click(buttons[0]!) // Edit button
 
       expect(onClickEdit).toHaveBeenCalledWith('test_var')
     })
@@ -278,7 +278,7 @@ describe('FieldItem', () => {
       )
       fireEvent.mouseEnter(container.firstChild!)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[1]) // Delete button
+      fireEvent.click(buttons[1]!) // Delete button
 
       expect(onRemove).toHaveBeenCalledWith(5)
     })
@@ -328,7 +328,7 @@ describe('FieldItem', () => {
       )
       fireEvent.mouseEnter(container.querySelector('.handle')!)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
 
       expect(onClickEdit).toHaveBeenCalled()
       expect(parentClick).not.toHaveBeenCalled()
@@ -351,7 +351,7 @@ describe('FieldItem', () => {
       )
       fireEvent.mouseEnter(container.querySelector('.handle')!)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[1])
+      fireEvent.click(buttons[1]!)
 
       expect(onRemove).toHaveBeenCalled()
       expect(parentClick).not.toHaveBeenCalled()
@@ -373,7 +373,7 @@ describe('FieldItem', () => {
       )
       fireEvent.mouseEnter(container.firstChild!)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
 
       rerender(
         <FieldItem
@@ -385,7 +385,7 @@ describe('FieldItem', () => {
       )
       fireEvent.mouseEnter(container.firstChild!)
       const buttonsAfterRerender = screen.getAllByRole('button')
-      fireEvent.click(buttonsAfterRerender[0])
+      fireEvent.click(buttonsAfterRerender[0]!)
 
       expect(onClickEdit).toHaveBeenCalledTimes(2)
     })
@@ -406,7 +406,7 @@ describe('FieldItem', () => {
       )
 
       const varElement = screen.getByTitle(longVariable)
-      expect(varElement).toHaveClass('truncate')
+      expect(varElement)!.toHaveClass('truncate')
     })
 
     it('should handle very long label names with truncation', () => {
@@ -423,7 +423,7 @@ describe('FieldItem', () => {
       )
 
       const labelElement = screen.getByTitle(longLabel)
-      expect(labelElement).toHaveClass('truncate')
+      expect(labelElement)!.toHaveClass('truncate')
     })
 
     it('should handle special characters in variable and label', () => {
@@ -441,8 +441,8 @@ describe('FieldItem', () => {
         />,
       )
 
-      expect(screen.getByText('<test>&"var\'')).toBeInTheDocument()
-      expect(screen.getByText('<label>&"test\'')).toBeInTheDocument()
+      expect(screen.getByText('<test>&"var\''))!.toBeInTheDocument()
+      expect(screen.getByText('<label>&"test\''))!.toBeInTheDocument()
     })
 
     it('should handle unicode characters', () => {
@@ -460,8 +460,8 @@ describe('FieldItem', () => {
         />,
       )
 
-      expect(screen.getByText('变量_🎉')).toBeInTheDocument()
-      expect(screen.getByText('标签_😀')).toBeInTheDocument()
+      expect(screen.getByText('变量_🎉'))!.toBeInTheDocument()
+      expect(screen.getByText('标签_😀'))!.toBeInTheDocument()
     })
 
     it('should render different input types correctly', () => {
@@ -487,7 +487,7 @@ describe('FieldItem', () => {
           />,
         )
 
-        expect(screen.getByText('test_variable')).toBeInTheDocument()
+        expect(screen.getByText('test_variable'))!.toBeInTheDocument()
         unmount()
       })
     })
@@ -517,7 +517,7 @@ describe('FieldItem', () => {
         />,
       )
 
-      expect(screen.getByText('test_variable')).toBeInTheDocument()
+      expect(screen.getByText('test_variable'))!.toBeInTheDocument()
     })
   })
 
@@ -553,7 +553,7 @@ describe('FieldItem', () => {
       )
       fireEvent.mouseEnter(container.firstChild!)
 
-      expect(screen.getByText(/required/i)).toBeInTheDocument()
+      expect(screen.getByText(/required/i))!.toBeInTheDocument()
     })
 
     it('should apply cursor-default class when readonly', () => {
@@ -611,8 +611,8 @@ describe('FieldListContainer', () => {
         />,
       )
 
-      expect(screen.getByText('var_0')).toBeInTheDocument()
-      expect(screen.getByText('var_1')).toBeInTheDocument()
+      expect(screen.getByText('var_0'))!.toBeInTheDocument()
+      expect(screen.getByText('var_1'))!.toBeInTheDocument()
     })
 
     it('should render all field items', () => {
@@ -627,9 +627,9 @@ describe('FieldListContainer', () => {
         />,
       )
 
-      expect(screen.getByText('var_0')).toBeInTheDocument()
-      expect(screen.getByText('var_1')).toBeInTheDocument()
-      expect(screen.getByText('var_2')).toBeInTheDocument()
+      expect(screen.getByText('var_0'))!.toBeInTheDocument()
+      expect(screen.getByText('var_1'))!.toBeInTheDocument()
+      expect(screen.getByText('var_2'))!.toBeInTheDocument()
     })
 
     it('should render empty list without errors', () => {
@@ -643,7 +643,8 @@ describe('FieldListContainer', () => {
       )
 
       // ReactSortable renders a wrapper div even for empty lists
-      expect(container.firstChild).toBeInTheDocument()
+      // ReactSortable renders a wrapper div even for empty lists
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should apply custom className', () => {
@@ -698,7 +699,7 @@ describe('FieldListContainer', () => {
       )
       fireEvent.mouseEnter(container.querySelector('.handle')!)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0]) // Edit button
+      fireEvent.click(buttons[0]!) // Edit button
 
       expect(onEditField).toHaveBeenCalledWith('var_0')
     })
@@ -717,7 +718,7 @@ describe('FieldListContainer', () => {
       )
       fireEvent.mouseEnter(container.querySelector('.handle')!)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[1]) // Delete button
+      fireEvent.click(buttons[1]!) // Delete button
 
       expect(onRemoveField).toHaveBeenCalledWith(0)
     })
@@ -735,12 +736,12 @@ describe('FieldListContainer', () => {
       }))
 
       expect(converted).toHaveLength(2)
-      expect(converted[0].id).toBe('var_0')
-      expect(converted[0].chosen).toBe(false)
-      expect(converted[0].selected).toBe(false)
-      expect(converted[0].variable).toBe('var_0')
-      expect(converted[0].type).toBe(PipelineInputVarType.textInput)
-      expect(converted[1].id).toBe('var_1')
+      expect(converted[0]!.id).toBe('var_0')
+      expect(converted[0]!.chosen).toBe(false)
+      expect(converted[0]!.selected).toBe(false)
+      expect(converted[0]!.variable).toBe('var_0')
+      expect(converted[0]!.type).toBe(PipelineInputVarType.textInput)
+      expect(converted[1]!.id).toBe('var_1')
     })
   })
 
@@ -767,7 +768,7 @@ describe('FieldListContainer', () => {
         />,
       )
 
-      expect(screen.getByText('var_0')).toBeInTheDocument()
+      expect(screen.getByText('var_0'))!.toBeInTheDocument()
     })
 
     it('should be memoized with React.memo', () => {
@@ -791,7 +792,7 @@ describe('FieldListContainer', () => {
         />,
       )
 
-      expect(screen.getByText('var_0')).toBeInTheDocument()
+      expect(screen.getByText('var_0'))!.toBeInTheDocument()
     })
   })
 
@@ -808,8 +809,8 @@ describe('FieldListContainer', () => {
         />,
       )
 
-      expect(screen.getByText('var_0')).toBeInTheDocument()
-      expect(screen.getByText('var_99')).toBeInTheDocument()
+      expect(screen.getByText('var_0'))!.toBeInTheDocument()
+      expect(screen.getByText('var_99'))!.toBeInTheDocument()
     })
 
     it('should throw error when inputFields is undefined', () => {
@@ -847,8 +848,8 @@ describe('FieldList', () => {
         />,
       )
 
-      expect(screen.getByText('Label Content')).toBeInTheDocument()
-      expect(screen.getByText('var_0')).toBeInTheDocument()
+      expect(screen.getByText('Label Content'))!.toBeInTheDocument()
+      expect(screen.getByText('var_0'))!.toBeInTheDocument()
     })
 
     it('should render add button', () => {
@@ -867,7 +868,7 @@ describe('FieldList', () => {
       const addButton = screen.getAllByRole('button').find(btn =>
         btn.querySelector('svg'),
       )
-      expect(addButton).toBeInTheDocument()
+      expect(addButton)!.toBeInTheDocument()
     })
 
     it('should disable add button when readonly', () => {
@@ -887,7 +888,7 @@ describe('FieldList', () => {
       const addButton = screen.getAllByRole('button').find(btn =>
         btn.querySelector('svg'),
       )
-      expect(addButton).toBeDisabled()
+      expect(addButton)!.toBeDisabled()
     })
 
     it('should apply custom labelClassName', () => {
@@ -905,7 +906,7 @@ describe('FieldList', () => {
       )
 
       const labelContainer = container.querySelector('.custom-label-class')
-      expect(labelContainer).toBeInTheDocument()
+      expect(labelContainer)!.toBeInTheDocument()
     })
   })
 
@@ -974,7 +975,7 @@ describe('FieldList', () => {
       fireEvent.mouseEnter(container.querySelector('.handle')!)
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       expect(handleInputFieldsChange).toHaveBeenCalledWith('node-1', expect.any(Array))
     })
@@ -998,10 +999,10 @@ describe('FieldList', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       await waitFor(() => {
-        expect(screen.getByTestId('remove-var-confirm')).toBeInTheDocument()
+        expect(screen.getByTestId('remove-var-confirm'))!.toBeInTheDocument()
       })
     })
 
@@ -1022,10 +1023,10 @@ describe('FieldList', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       await waitFor(() => {
-        expect(screen.getByTestId('remove-var-confirm')).toBeInTheDocument()
+        expect(screen.getByTestId('remove-var-confirm'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('confirm-cancel'))
@@ -1053,10 +1054,10 @@ describe('FieldList', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       await waitFor(() => {
-        expect(screen.getByTestId('remove-var-confirm')).toBeInTheDocument()
+        expect(screen.getByTestId('remove-var-confirm'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('confirm-ok'))
@@ -1085,7 +1086,7 @@ describe('FieldList', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       expect(screen.queryByTestId('remove-var-confirm')).not.toBeInTheDocument()
       expect(handleInputFieldsChange).toHaveBeenCalled()
@@ -1105,7 +1106,8 @@ describe('FieldList', () => {
       )
 
       // Component renders without errors even with no fields
-      expect(container.firstChild).toBeInTheDocument()
+      // Component renders without errors even with no fields
+      expect(container.firstChild)!.toBeInTheDocument()
     })
 
     it('should handle null LabelRightContent', () => {
@@ -1119,7 +1121,7 @@ describe('FieldList', () => {
         />,
       )
 
-      expect(screen.getByText('var_0')).toBeInTheDocument()
+      expect(screen.getByText('var_0'))!.toBeInTheDocument()
     })
 
     it('should handle complex LabelRightContent', () => {
@@ -1140,8 +1142,8 @@ describe('FieldList', () => {
         />,
       )
 
-      expect(screen.getByTestId('complex-content')).toBeInTheDocument()
-      expect(screen.getByText('Part 1')).toBeInTheDocument()
+      expect(screen.getByTestId('complex-content'))!.toBeInTheDocument()
+      expect(screen.getByText('Part 1'))!.toBeInTheDocument()
     })
   })
 
@@ -1170,7 +1172,7 @@ describe('FieldList', () => {
         />,
       )
 
-      expect(screen.getByText('var_0')).toBeInTheDocument()
+      expect(screen.getByText('var_0'))!.toBeInTheDocument()
     })
 
     it('should maintain stable onInputFieldsChange callback', () => {
@@ -1203,7 +1205,7 @@ describe('FieldList', () => {
       fireEvent.mouseEnter(container.querySelector('.handle')!)
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       expect(handleInputFieldsChange).toHaveBeenCalledWith('node-1', expect.any(Array))
     })
@@ -1230,8 +1232,8 @@ describe('useFieldList Hook', () => {
         />,
       )
 
-      expect(screen.getByText('var_0')).toBeInTheDocument()
-      expect(screen.getByText('var_1')).toBeInTheDocument()
+      expect(screen.getByText('var_0'))!.toBeInTheDocument()
+      expect(screen.getByText('var_1'))!.toBeInTheDocument()
     })
 
     it('should initialize with empty inputFields', () => {
@@ -1246,7 +1248,8 @@ describe('useFieldList Hook', () => {
       )
 
       // Component renders without errors even with no fields
-      expect(container.firstChild).toBeInTheDocument()
+      // Component renders without errors even with no fields
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 
@@ -1264,8 +1267,8 @@ describe('useFieldList Hook', () => {
 
       // Simulate sort change by calling handleListSortChange directly
       const reorderedList: SortableItem[] = [
-        createSortableItem(initialFields[1]),
-        createSortableItem(initialFields[0]),
+        createSortableItem(initialFields[1]!),
+        createSortableItem(initialFields[0]!),
       ]
 
       act(() => {
@@ -1290,14 +1293,14 @@ describe('useFieldList Hook', () => {
       }))
 
       const sortableList: SortableItem[] = [
-        createSortableItem(initialFields[0], { chosen: true, selected: true }),
+        createSortableItem(initialFields[0]!, { chosen: true, selected: true }),
       ]
 
       act(() => {
         result.current.handleListSortChange(sortableList)
       })
 
-      const updatedFields = onInputFieldsChange.mock.calls[0][0]
+      const updatedFields = onInputFieldsChange.mock.calls[0]![0]
       expect(updatedFields[0]).not.toHaveProperty('id')
       expect(updatedFields[0]).not.toHaveProperty('chosen')
       expect(updatedFields[0]).not.toHaveProperty('selected')
@@ -1323,10 +1326,10 @@ describe('useFieldList Hook', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       await waitFor(() => {
-        expect(screen.getByTestId('remove-var-confirm')).toBeInTheDocument()
+        expect(screen.getByTestId('remove-var-confirm'))!.toBeInTheDocument()
       })
     })
 
@@ -1348,7 +1351,7 @@ describe('useFieldList Hook', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       expect(screen.queryByTestId('remove-var-confirm')).not.toBeInTheDocument()
       expect(handleInputFieldsChange).toHaveBeenCalled()
@@ -1372,10 +1375,10 @@ describe('useFieldList Hook', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       await waitFor(() => {
-        expect(screen.getByTestId('remove-var-confirm')).toBeInTheDocument()
+        expect(screen.getByTestId('remove-var-confirm'))!.toBeInTheDocument()
       })
       expect(handleInputFieldsChange).not.toHaveBeenCalled()
     })
@@ -1397,7 +1400,7 @@ describe('useFieldList Hook', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       expect(mockIsVarUsedInNodes).toHaveBeenCalledWith(['rag', 'test-node-123', 'my_test_var'])
     })
@@ -1420,7 +1423,7 @@ describe('useFieldList Hook', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       expect(mockIsVarUsedInNodes).toHaveBeenCalledWith(['rag', 'node-1', ''])
     })
@@ -1444,10 +1447,10 @@ describe('useFieldList Hook', () => {
 
       const allFieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (allFieldItemButtons.length >= 4)
-        fireEvent.click(allFieldItemButtons[3])
+        fireEvent.click(allFieldItemButtons[3]!)
 
       await waitFor(() => {
-        expect(screen.getByTestId('remove-var-confirm')).toBeInTheDocument()
+        expect(screen.getByTestId('remove-var-confirm'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('confirm-ok'))
@@ -1455,7 +1458,7 @@ describe('useFieldList Hook', () => {
       await waitFor(() => {
         expect(handleInputFieldsChange).toHaveBeenCalled()
       })
-      const calledFields = handleInputFieldsChange.mock.calls[0][1]
+      const calledFields = handleInputFieldsChange.mock.calls[0]![1]
       expect(calledFields.length).toBe(2) // 3 - 1 = 2 items remaining
       expect(calledFields.map((f: InputVar) => f.variable)).toEqual(['var_0', 'var_2'])
     })
@@ -1503,7 +1506,7 @@ describe('useFieldList Hook', () => {
       fireEvent.mouseEnter(container.querySelector('.handle')!)
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 1)
-        fireEvent.click(fieldItemButtons[0])
+        fireEvent.click(fieldItemButtons[0]!)
 
       expect(mockToggleInputFieldEditPanel).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -1535,10 +1538,10 @@ describe('useFieldList Hook', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       await waitFor(() => {
-        expect(screen.getByTestId('remove-var-confirm')).toBeInTheDocument()
+        expect(screen.getByTestId('remove-var-confirm'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByTestId('confirm-ok'))
@@ -1574,7 +1577,7 @@ describe('handleSubmitField', () => {
     fireEvent.click(screen.getByTestId('field-list-add-btn'))
 
     expect(mockToggleInputFieldEditPanel).toHaveBeenCalled()
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
     expect(editorProps).toHaveProperty('onSubmit')
 
     const newFieldData = createInputVar({ variable: 'new_var', label: 'New Label' })
@@ -1606,9 +1609,9 @@ describe('handleSubmitField', () => {
 
     const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
     if (fieldItemButtons.length >= 1)
-      fireEvent.click(fieldItemButtons[0])
+      fireEvent.click(fieldItemButtons[0]!)
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
     const updatedFieldData = createInputVar({ variable: 'var_0', label: 'Updated Label' })
     editorProps.onSubmit(updatedFieldData)
@@ -1619,7 +1622,7 @@ describe('handleSubmitField', () => {
         expect.objectContaining({ variable: 'var_0', label: 'Updated Label' }),
       ]),
     )
-    const calledFields = handleInputFieldsChange.mock.calls[0][1]
+    const calledFields = handleInputFieldsChange.mock.calls[0]![1]
     expect(calledFields.length).toBe(1) // Should still be 1, not 2
   })
 
@@ -1640,9 +1643,9 @@ describe('handleSubmitField', () => {
 
     const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
     if (fieldItemButtons.length >= 1)
-      fireEvent.click(fieldItemButtons[0])
+      fireEvent.click(fieldItemButtons[0]!)
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
     const updatedFieldData = createInputVar({ variable: 'new_var_name', label: 'Label 0' })
     editorProps.onSubmit(updatedFieldData, {
@@ -1674,9 +1677,9 @@ describe('handleSubmitField', () => {
 
     const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
     if (fieldItemButtons.length >= 1)
-      fireEvent.click(fieldItemButtons[0])
+      fireEvent.click(fieldItemButtons[0]!)
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
     const updatedFieldData = createInputVar({ variable: 'var_0', label: 'Updated Label' })
     editorProps.onSubmit(updatedFieldData)
@@ -1702,9 +1705,9 @@ describe('handleSubmitField', () => {
 
     const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
     if (fieldItemButtons.length >= 1)
-      fireEvent.click(fieldItemButtons[0])
+      fireEvent.click(fieldItemButtons[0]!)
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
     const updatedFieldData = createInputVar({ variable: 'var_0', label: 'Updated Label' })
     editorProps.onSubmit(updatedFieldData, { type: 'otherType' as never })
@@ -1730,9 +1733,9 @@ describe('handleSubmitField', () => {
 
     const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
     if (fieldItemButtons.length >= 1)
-      fireEvent.click(fieldItemButtons[0])
+      fireEvent.click(fieldItemButtons[0]!)
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
     const updatedFieldData = createInputVar({ variable: 'new_var' })
     editorProps.onSubmit(updatedFieldData, {
@@ -1764,9 +1767,9 @@ describe('handleSubmitField', () => {
 
     const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
     if (fieldItemButtons.length >= 1)
-      fireEvent.click(fieldItemButtons[0])
+      fireEvent.click(fieldItemButtons[0]!)
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
     const updatedFieldData = createInputVar({ variable: 'new_var' })
     editorProps.onSubmit(updatedFieldData, {
@@ -1797,7 +1800,7 @@ describe('handleSubmitField', () => {
 
     fireEvent.click(screen.getByTestId('field-list-add-btn'))
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
     const newFieldData = createInputVar({ variable: 'new_var' })
     editorProps.onSubmit(newFieldData)
@@ -1821,7 +1824,7 @@ describe('handleSubmitField', () => {
 
     fireEvent.click(screen.getByTestId('field-list-add-btn'))
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
     expect(editorProps).toHaveProperty('onClose')
 
     editorProps.onClose()
@@ -1852,7 +1855,7 @@ describe('Duplicate Variable Name Handling', () => {
 
     fireEvent.click(screen.getByTestId('field-list-add-btn'))
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
     const duplicateFieldData = createInputVar({ variable: 'existing_var' })
     editorProps.onSubmit(duplicateFieldData)
@@ -1878,9 +1881,9 @@ describe('Duplicate Variable Name Handling', () => {
 
     const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
     if (fieldItemButtons.length >= 1)
-      fireEvent.click(fieldItemButtons[0])
+      fireEvent.click(fieldItemButtons[0]!)
 
-    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0][0]
+    const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
     const updatedFieldData = createInputVar({ variable: 'var_0', label: 'New Label' })
     editorProps.onSubmit(updatedFieldData)
@@ -1941,12 +1944,12 @@ describe('Integration Tests', () => {
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
       if (fieldItemButtons.length >= 1) {
-        fireEvent.click(fieldItemButtons[0])
+        fireEvent.click(fieldItemButtons[0]!)
         expect(mockToggleInputFieldEditPanel).toHaveBeenCalledTimes(2)
       }
 
       if (fieldItemButtons.length >= 2)
-        fireEvent.click(fieldItemButtons[1])
+        fireEvent.click(fieldItemButtons[1]!)
 
       expect(handleInputFieldsChange).toHaveBeenCalled()
     })
@@ -1970,7 +1973,7 @@ describe('Integration Tests', () => {
       const addButton = screen.getAllByRole('button').find(btn =>
         btn.querySelector('svg'),
       )
-      expect(addButton).toBeDisabled()
+      expect(addButton)!.toBeDisabled()
     })
   })
 })
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/field-list/hooks.ts b/web/app/components/rag-pipeline/components/panel/input-field/field-list/hooks.ts
index 1fb5ea9218..1301074d51 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/field-list/hooks.ts
+++ b/web/app/components/rag-pipeline/components/panel/input-field/field-list/hooks.ts
@@ -46,9 +46,9 @@ export const useFieldList = ({ initialInputFields, onInputFieldsChange, nodeId,
   const handleRemoveField = useCallback((index: number) => {
     const itemToRemove = inputFieldsRef.current[index]
     // Check if the variable is used in other nodes
-    if (isVarUsedInNodes([VARIABLE_PREFIX, nodeId, itemToRemove.variable || ''])) {
+    if (isVarUsedInNodes([VARIABLE_PREFIX, nodeId, itemToRemove!.variable || ''])) {
       showRemoveVarConfirm()
-      setRemovedVar([VARIABLE_PREFIX, nodeId, itemToRemove.variable || ''])
+      setRemovedVar([VARIABLE_PREFIX, nodeId, itemToRemove!.variable || ''])
       setRemoveIndex(index as number)
       return
     }
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/index.tsx b/web/app/components/rag-pipeline/components/panel/input-field/index.tsx
index 3939413c80..2be8051003 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/index.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/index.tsx
@@ -66,7 +66,7 @@ const InputFieldPanel = () => {
     const globalInputFields: RAGPipelineVariables = []
     Object.keys(inputFieldsMap.current).forEach((key) => {
       const inputFields = inputFieldsMap.current[key]
-      inputFields.forEach((inputField) => {
+      inputFields!.forEach((inputField) => {
         if (key === 'shared') {
           globalInputFields.push({
             ...inputField,
@@ -149,7 +149,7 @@ const InputFieldPanel = () => {
                 <FieldList
                   key={key}
                   nodeId={key}
-                  LabelRightContent={<Datasource nodeData={datasourceNodeDataMap[key]} />}
+                  LabelRightContent={<Datasource nodeData={datasourceNodeDataMap[key]!} />}
                   inputFields={inputFields}
                   readonly={isPreviewing || isEditing}
                   labelClassName="pt-1 pb-1"
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/__tests__/hooks.spec.ts b/web/app/components/rag-pipeline/components/panel/test-run/preparation/__tests__/hooks.spec.ts
index 64279a2d7d..35d42fc269 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/__tests__/hooks.spec.ts
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/__tests__/hooks.spec.ts
@@ -56,8 +56,8 @@ describe('useTestRunSteps', () => {
     const { result } = renderHook(() => useTestRunSteps())
 
     expect(result.current.steps).toHaveLength(2)
-    expect(result.current.steps[0].value).toBe('dataSource')
-    expect(result.current.steps[1].value).toBe('documentProcessing')
+    expect(result.current.steps[0]!.value).toBe('dataSource')
+    expect(result.current.steps[1]!.value).toBe('documentProcessing')
   })
 
   it('should increment step on handleNextStep', () => {
@@ -87,8 +87,8 @@ describe('useTestRunSteps', () => {
   it('should have translated step labels', () => {
     const { result } = renderHook(() => useTestRunSteps())
 
-    expect(result.current.steps[0].label).toBeDefined()
-    expect(typeof result.current.steps[0].label).toBe('string')
+    expect(result.current.steps[0]!.label).toBeDefined()
+    expect(typeof result.current.steps[0]!.label).toBe('string')
   })
 })
 
@@ -137,7 +137,7 @@ describe('useDatasourceOptions', () => {
     const { result } = renderHook(() => useDatasourceOptions())
 
     expect(result.current).toHaveLength(1)
-    expect(result.current[0].value).toBe('ds-1')
+    expect(result.current[0]!.value).toBe('ds-1')
   })
 })
 
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/panel/test-run/preparation/__tests__/index.spec.tsx
index a7956927c1..0ec5a4d166 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/__tests__/index.spec.tsx
@@ -253,9 +253,9 @@ describe('StepIndicator', () => {
     it('should render without crashing', () => {
       render(<StepIndicator steps={defaultSteps} currentStep={1} />)
 
-      expect(screen.getByText('Step 1')).toBeInTheDocument()
-      expect(screen.getByText('Step 2')).toBeInTheDocument()
-      expect(screen.getByText('Step 3')).toBeInTheDocument()
+      expect(screen.getByText('Step 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Step 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Step 3'))!.toBeInTheDocument()
     })
 
     it('should render all step labels', () => {
@@ -266,8 +266,8 @@ describe('StepIndicator', () => {
 
       render(<StepIndicator steps={steps} currentStep={1} />)
 
-      expect(screen.getByText('Data Source')).toBeInTheDocument()
-      expect(screen.getByText('Processing')).toBeInTheDocument()
+      expect(screen.getByText('Data Source'))!.toBeInTheDocument()
+      expect(screen.getByText('Processing'))!.toBeInTheDocument()
     })
 
     it('should render container with correct classes', () => {
@@ -337,7 +337,7 @@ describe('StepIndicator', () => {
     it('should handle empty steps array', () => {
       const { container } = render(<StepIndicator steps={[]} currentStep={1} />)
 
-      expect(container.firstChild).toBeInTheDocument()
+      expect(container.firstChild)!.toBeInTheDocument()
     })
   })
 
@@ -347,7 +347,7 @@ describe('StepIndicator', () => {
 
       rerender(<StepIndicator steps={defaultSteps} currentStep={1} />)
 
-      expect(screen.getByText('Step 1')).toBeInTheDocument()
+      expect(screen.getByText('Step 1'))!.toBeInTheDocument()
     })
 
     it('should update when currentStep changes', () => {
@@ -373,8 +373,8 @@ describe('StepIndicator', () => {
       ]
       rerender(<StepIndicator steps={newSteps} currentStep={1} />)
 
-      expect(screen.getByText('New Step 1')).toBeInTheDocument()
-      expect(screen.getByText('New Step 2')).toBeInTheDocument()
+      expect(screen.getByText('New Step 1'))!.toBeInTheDocument()
+      expect(screen.getByText('New Step 2'))!.toBeInTheDocument()
       expect(screen.queryByText('Step 3')).not.toBeInTheDocument()
     })
   })
@@ -402,7 +402,7 @@ describe('StepIndicator', () => {
 
       render(<StepIndicator steps={stepsWithEmpty} currentStep={1} />)
 
-      expect(screen.getByText('Valid')).toBeInTheDocument()
+      expect(screen.getByText('Valid'))!.toBeInTheDocument()
     })
 
     it('should handle steps with very long labels', () => {
@@ -411,7 +411,7 @@ describe('StepIndicator', () => {
 
       render(<StepIndicator steps={stepsWithLong} currentStep={1} />)
 
-      expect(screen.getByText(longLabel)).toBeInTheDocument()
+      expect(screen.getByText(longLabel))!.toBeInTheDocument()
     })
 
     it('should handle special characters in labels', () => {
@@ -419,7 +419,7 @@ describe('StepIndicator', () => {
 
       render(<StepIndicator steps={specialSteps} currentStep={1} />)
 
-      expect(screen.getByText('<Test> & "Label"')).toBeInTheDocument()
+      expect(screen.getByText('<Test> & "Label"'))!.toBeInTheDocument()
     })
 
     it('should handle unicode characters in labels', () => {
@@ -427,7 +427,7 @@ describe('StepIndicator', () => {
 
       render(<StepIndicator steps={unicodeSteps} currentStep={1} />)
 
-      expect(screen.getByText('数据源 🎉')).toBeInTheDocument()
+      expect(screen.getByText('数据源 🎉'))!.toBeInTheDocument()
     })
 
     it('should handle negative currentStep', () => {
@@ -448,7 +448,7 @@ describe('FooterTips', () => {
     it('should render without crashing', () => {
       render(<FooterTips />)
 
-      expect(screen.getByText('datasetPipeline.testRun.tooltip')).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.testRun.tooltip'))!.toBeInTheDocument()
     })
 
     it('should render with correct container classes', () => {
@@ -472,7 +472,7 @@ describe('FooterTips', () => {
 
       rerender(<FooterTips />)
 
-      expect(screen.getByText('datasetPipeline.testRun.tooltip')).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.testRun.tooltip'))!.toBeInTheDocument()
     })
 
     it('should render consistently across multiple rerenders', () => {
@@ -481,7 +481,7 @@ describe('FooterTips', () => {
       for (let i = 0; i < 5; i++)
         rerender(<FooterTips />)
 
-      expect(screen.getByText('datasetPipeline.testRun.tooltip')).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.testRun.tooltip'))!.toBeInTheDocument()
     })
   })
 
@@ -510,15 +510,15 @@ describe('useTestRunSteps', () => {
       const { result } = renderHook(() => useTestRunSteps())
 
       expect(result.current.steps).toHaveLength(2)
-      expect(result.current.steps[0].value).toBe('dataSource')
-      expect(result.current.steps[1].value).toBe('documentProcessing')
+      expect(result.current.steps[0]!.value).toBe('dataSource')
+      expect(result.current.steps[1]!.value).toBe('documentProcessing')
     })
 
     it('should provide translated step labels', () => {
       const { result } = renderHook(() => useTestRunSteps())
 
-      expect(result.current.steps[0].label).toContain('testRun.steps.dataSource')
-      expect(result.current.steps[1].label).toContain('testRun.steps.documentProcessing')
+      expect(result.current.steps[0]!.label).toContain('testRun.steps.dataSource')
+      expect(result.current.steps[1]!.label).toContain('testRun.steps.documentProcessing')
     })
   })
 
@@ -714,7 +714,7 @@ describe('useDatasourceOptions', () => {
 
       const { result } = renderHook(() => useDatasourceOptions())
 
-      expect(result.current[0].value).toBe('unique-node-id-123')
+      expect(result.current[0]!.value).toBe('unique-node-id-123')
     })
 
     it('should map node title to option label', () => {
@@ -730,7 +730,7 @@ describe('useDatasourceOptions', () => {
 
       const { result } = renderHook(() => useDatasourceOptions())
 
-      expect(result.current[0].label).toBe('Custom Data Source Title')
+      expect(result.current[0]!.label).toBe('Custom Data Source Title')
     })
 
     it('should include full node data in option', () => {
@@ -752,7 +752,7 @@ describe('useDatasourceOptions', () => {
 
       const { result } = renderHook(() => useDatasourceOptions())
 
-      expect(result.current[0].data).toEqual(nodeData)
+      expect(result.current[0]!.data).toEqual(nodeData)
     })
   })
 
@@ -773,7 +773,7 @@ describe('useDatasourceOptions', () => {
       rerender()
 
       expect(result.current).toHaveLength(1)
-      expect(result.current[0].label).toBe('Test')
+      expect(result.current[0]!.label).toBe('Test')
     })
 
     it('should update options when nodes change', () => {
@@ -789,7 +789,7 @@ describe('useDatasourceOptions', () => {
 
       const { result, rerender } = renderHook(() => useDatasourceOptions())
       expect(result.current).toHaveLength(1)
-      expect(result.current[0].label).toBe('First')
+      expect(result.current[0]!.label).toBe('First')
 
       mockNodes = [
         {
@@ -810,8 +810,8 @@ describe('useDatasourceOptions', () => {
       rerender()
 
       expect(result.current).toHaveLength(2)
-      expect(result.current[0].label).toBe('Second')
-      expect(result.current[1].label).toBe('Third')
+      expect(result.current[0]!.label).toBe('Second')
+      expect(result.current[1]!.label).toBe('Third')
     })
   })
 
@@ -829,7 +829,7 @@ describe('useDatasourceOptions', () => {
 
       const { result } = renderHook(() => useDatasourceOptions())
 
-      expect(result.current[0].label).toBe('')
+      expect(result.current[0]!.label).toBe('')
     })
 
     it('should handle multiple DataSource nodes', () => {
@@ -1054,32 +1054,32 @@ describe('Preparation', () => {
     it('should render without crashing', () => {
       render(<Preparation />)
 
-      expect(screen.getByTestId('data-source-options')).toBeInTheDocument()
+      expect(screen.getByTestId('data-source-options'))!.toBeInTheDocument()
     })
 
     it('should render StepIndicator', () => {
       render(<Preparation />)
 
-      expect(screen.getByText('datasetPipeline.testRun.steps.dataSource')).toBeInTheDocument()
-      expect(screen.getByText('datasetPipeline.testRun.steps.documentProcessing')).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.testRun.steps.dataSource'))!.toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.testRun.steps.documentProcessing'))!.toBeInTheDocument()
     })
 
     it('should render DataSourceOptions on step 1', () => {
       render(<Preparation />)
 
-      expect(screen.getByTestId('data-source-options')).toBeInTheDocument()
+      expect(screen.getByTestId('data-source-options'))!.toBeInTheDocument()
     })
 
     it('should render Actions on step 1', () => {
       render(<Preparation />)
 
-      expect(screen.getByText('datasetCreation.stepOne.button')).toBeInTheDocument()
+      expect(screen.getByText('datasetCreation.stepOne.button'))!.toBeInTheDocument()
     })
 
     it('should render FooterTips on step 1', () => {
       render(<Preparation />)
 
-      expect(screen.getByText('datasetPipeline.testRun.tooltip')).toBeInTheDocument()
+      expect(screen.getByText('datasetPipeline.testRun.tooltip'))!.toBeInTheDocument()
     })
 
     it('should not render DocumentProcessing on step 1', () => {
@@ -1095,7 +1095,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-local-file'))
 
-      expect(screen.getByTestId('local-file')).toBeInTheDocument()
+      expect(screen.getByTestId('local-file'))!.toBeInTheDocument()
     })
 
     it('should render OnlineDocuments component when online document datasource is selected', () => {
@@ -1103,7 +1103,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-online-document'))
 
-      expect(screen.getByTestId('online-documents')).toBeInTheDocument()
+      expect(screen.getByTestId('online-documents'))!.toBeInTheDocument()
     })
 
     it('should render WebsiteCrawl component when website crawl datasource is selected', () => {
@@ -1111,7 +1111,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-website-crawl'))
 
-      expect(screen.getByTestId('website-crawl')).toBeInTheDocument()
+      expect(screen.getByTestId('website-crawl'))!.toBeInTheDocument()
     })
 
     it('should render OnlineDrive component when online drive datasource is selected', () => {
@@ -1119,7 +1119,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-online-drive'))
 
-      expect(screen.getByTestId('online-drive')).toBeInTheDocument()
+      expect(screen.getByTestId('online-drive'))!.toBeInTheDocument()
     })
 
     it('should pass correct props to LocalFile component', () => {
@@ -1128,8 +1128,8 @@ describe('Preparation', () => {
       fireEvent.click(screen.getByTestId('select-local-file'))
 
       const localFile = screen.getByTestId('local-file')
-      expect(localFile).toHaveAttribute('data-extensions', '["txt","pdf"]')
-      expect(localFile).toHaveAttribute('data-batch', 'false')
+      expect(localFile)!.toHaveAttribute('data-extensions', '["txt","pdf"]')
+      expect(localFile)!.toHaveAttribute('data-batch', 'false')
     })
 
     it('should pass isInPipeline=true to OnlineDocuments', () => {
@@ -1138,7 +1138,7 @@ describe('Preparation', () => {
       fireEvent.click(screen.getByTestId('select-online-document'))
 
       const onlineDocs = screen.getByTestId('online-documents')
-      expect(onlineDocs).toHaveAttribute('data-in-pipeline', 'true')
+      expect(onlineDocs)!.toHaveAttribute('data-in-pipeline', 'true')
     })
 
     it('should pass supportBatchUpload=false to all data source components', () => {
@@ -1146,7 +1146,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-online-document'))
 
-      expect(screen.getByTestId('online-documents')).toHaveAttribute('data-batch', 'false')
+      expect(screen.getByTestId('online-documents'))!.toHaveAttribute('data-batch', 'false')
     })
 
     it('should update dataSourceNodeId when selecting different datasources', () => {
@@ -1154,11 +1154,11 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-local-file'))
 
-      expect(screen.getByTestId('data-source-options')).toHaveAttribute('data-selected', 'local-file-node')
+      expect(screen.getByTestId('data-source-options'))!.toHaveAttribute('data-selected', 'local-file-node')
 
       fireEvent.click(screen.getByTestId('select-online-document'))
 
-      expect(screen.getByTestId('data-source-options')).toHaveAttribute('data-selected', 'online-doc-node')
+      expect(screen.getByTestId('data-source-options'))!.toHaveAttribute('data-selected', 'online-doc-node')
     })
   })
 
@@ -1166,7 +1166,7 @@ describe('Preparation', () => {
     it('should disable next button when no datasource is selected', () => {
       render(<Preparation />)
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
     })
 
     it('should disable next button for local file when file list is empty', () => {
@@ -1175,7 +1175,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-local-file'))
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
     })
 
     it('should disable next button for local file when file has no id', () => {
@@ -1186,7 +1186,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-local-file'))
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
     })
 
     it('should enable next button for local file when file has valid id', () => {
@@ -1206,7 +1206,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-online-document'))
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
     })
 
     it('should enable next button for online document when documents exist', () => {
@@ -1224,7 +1224,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-website-crawl'))
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
     })
 
     it('should enable next button for website crawl when pages exist', () => {
@@ -1242,7 +1242,7 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-online-drive'))
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
     })
 
     it('should enable next button for online drive when files are selected', () => {
@@ -1265,7 +1265,7 @@ describe('Preparation', () => {
       fireEvent.click(screen.getByTestId('select-local-file'))
       fireEvent.click(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))
 
-      expect(screen.getByTestId('document-processing')).toBeInTheDocument()
+      expect(screen.getByTestId('document-processing'))!.toBeInTheDocument()
       expect(screen.queryByTestId('data-source-options')).not.toBeInTheDocument()
     })
 
@@ -1278,7 +1278,7 @@ describe('Preparation', () => {
       fireEvent.click(screen.getByTestId('select-local-file'))
       fireEvent.click(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))
 
-      expect(screen.getByTestId('document-processing')).toHaveAttribute('data-node-id', 'local-file-node')
+      expect(screen.getByTestId('document-processing'))!.toHaveAttribute('data-node-id', 'local-file-node')
     })
 
     it('should navigate back to step 1 when back button is clicked', () => {
@@ -1289,11 +1289,11 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-local-file'))
       fireEvent.click(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))
-      expect(screen.getByTestId('document-processing')).toBeInTheDocument()
+      expect(screen.getByTestId('document-processing'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('back-btn'))
 
-      expect(screen.getByTestId('data-source-options')).toBeInTheDocument()
+      expect(screen.getByTestId('data-source-options'))!.toBeInTheDocument()
       expect(screen.queryByTestId('document-processing')).not.toBeInTheDocument()
     })
   })
@@ -1479,7 +1479,7 @@ describe('Preparation', () => {
       const { rerender } = render(<Preparation />)
       rerender(<Preparation />)
 
-      expect(screen.getByTestId('data-source-options')).toBeInTheDocument()
+      expect(screen.getByTestId('data-source-options'))!.toBeInTheDocument()
     })
 
     it('should maintain state across rerenders', () => {
@@ -1493,7 +1493,7 @@ describe('Preparation', () => {
 
       rerender(<Preparation />)
 
-      expect(screen.getByTestId('document-processing')).toBeInTheDocument()
+      expect(screen.getByTestId('document-processing'))!.toBeInTheDocument()
     })
   })
 
@@ -1538,7 +1538,7 @@ describe('Preparation', () => {
       fireEvent.click(screen.getByTestId('select-online-drive'))
       fireEvent.click(screen.getByTestId('select-local-file'))
 
-      expect(screen.getByTestId('local-file')).toBeInTheDocument()
+      expect(screen.getByTestId('local-file'))!.toBeInTheDocument()
     })
 
     it('should handle rapid step navigation', () => {
@@ -1553,7 +1553,7 @@ describe('Preparation', () => {
       fireEvent.click(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))
       fireEvent.click(screen.getByTestId('back-btn'))
 
-      expect(screen.getByTestId('data-source-options')).toBeInTheDocument()
+      expect(screen.getByTestId('data-source-options'))!.toBeInTheDocument()
     })
   })
 
@@ -1565,10 +1565,10 @@ describe('Preparation', () => {
       render(<Preparation />)
 
       fireEvent.click(screen.getByTestId('select-local-file'))
-      expect(screen.getByTestId('local-file')).toBeInTheDocument()
+      expect(screen.getByTestId('local-file'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))
-      expect(screen.getByTestId('document-processing')).toBeInTheDocument()
+      expect(screen.getByTestId('document-processing'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('process-btn'))
 
@@ -1586,15 +1586,15 @@ describe('Preparation', () => {
 
       fireEvent.click(screen.getByTestId('select-local-file'))
       fireEvent.click(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))
-      expect(screen.getByTestId('document-processing')).toBeInTheDocument()
+      expect(screen.getByTestId('document-processing'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('back-btn'))
       fireEvent.click(screen.getByTestId('select-online-document'))
-      expect(screen.getByTestId('online-documents')).toBeInTheDocument()
+      expect(screen.getByTestId('online-documents'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))
 
-      expect(screen.getByTestId('document-processing')).toHaveAttribute('data-node-id', 'online-doc-node')
+      expect(screen.getByTestId('document-processing'))!.toHaveAttribute('data-node-id', 'online-doc-node')
     })
   })
 })
@@ -1610,7 +1610,7 @@ describe('Callback Dependencies', () => {
       const { rerender } = render(<Preparation />)
       fireEvent.click(screen.getByTestId('select-local-file'))
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
 
       mockDataSourceStoreState.localFileList = [
         { file: { id: 'file-123', name: 'test.txt', type: 'text/plain', size: 100, extension: 'txt', mime_type: 'text/plain' } },
@@ -1625,7 +1625,7 @@ describe('Callback Dependencies', () => {
       const { rerender } = render(<Preparation />)
       fireEvent.click(screen.getByTestId('select-online-document'))
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
 
       mockDataSourceStoreState.onlineDocuments = [{ workspace_id: 'ws-1' }]
       rerender(<Preparation />)
@@ -1638,7 +1638,7 @@ describe('Callback Dependencies', () => {
       const { rerender } = render(<Preparation />)
       fireEvent.click(screen.getByTestId('select-website-crawl'))
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
 
       mockDataSourceStoreState.websitePages = [{ url: 'https://example.com' }]
       rerender(<Preparation />)
@@ -1651,7 +1651,7 @@ describe('Callback Dependencies', () => {
       const { rerender } = render(<Preparation />)
       fireEvent.click(screen.getByTestId('select-online-drive'))
 
-      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i })).toBeDisabled()
+      expect(screen.getByRole('button', { name: /datasetCreation.stepOne.button/i }))!.toBeDisabled()
 
       mockDataSourceStoreState.selectedFileIds = ['file-1']
       rerender(<Preparation />)
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/__tests__/index.spec.tsx
index b159455cb6..66e4d47021 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/__tests__/index.spec.tsx
@@ -62,7 +62,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByText('Test Label')).toBeInTheDocument()
+      expect(screen.getByText('Test Label'))!.toBeInTheDocument()
     })
 
     it('should render label text', () => {
@@ -77,7 +77,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByText('My Data Source')).toBeInTheDocument()
+      expect(screen.getByText('My Data Source'))!.toBeInTheDocument()
     })
 
     it('should render BlockIcon component', () => {
@@ -92,7 +92,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByTestId('block-icon')).toBeInTheDocument()
+      expect(screen.getByTestId('block-icon'))!.toBeInTheDocument()
     })
 
     it('should pass correct type to BlockIcon', () => {
@@ -108,7 +108,7 @@ describe('OptionCard', () => {
       )
 
       const blockIcon = screen.getByTestId('block-icon')
-      expect(blockIcon).toHaveAttribute('data-type', 'datasource')
+      expect(blockIcon)!.toHaveAttribute('data-type', 'datasource')
     })
 
     it('should set title attribute on label element', () => {
@@ -123,7 +123,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByTitle('Long Label Text')).toBeInTheDocument()
+      expect(screen.getByTitle('Long Label Text'))!.toBeInTheDocument()
     })
   })
 
@@ -225,7 +225,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByText('Website Crawler')).toBeInTheDocument()
+      expect(screen.getByText('Website Crawler'))!.toBeInTheDocument()
     })
   })
 
@@ -439,7 +439,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByText('Test')).toBeInTheDocument()
+      expect(screen.getByText('Test'))!.toBeInTheDocument()
     })
 
     it('should re-render when selected prop changes', () => {
@@ -484,7 +484,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByTestId('block-icon')).toBeInTheDocument()
+      expect(screen.getByTestId('block-icon'))!.toBeInTheDocument()
     })
 
     it('should handle very long label', () => {
@@ -500,8 +500,8 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByText(longLabel)).toBeInTheDocument()
-      expect(screen.getByTitle(longLabel)).toBeInTheDocument()
+      expect(screen.getByText(longLabel))!.toBeInTheDocument()
+      expect(screen.getByTitle(longLabel))!.toBeInTheDocument()
     })
 
     it('should handle special characters in label', () => {
@@ -517,7 +517,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByText(specialLabel)).toBeInTheDocument()
+      expect(screen.getByText(specialLabel))!.toBeInTheDocument()
     })
 
     it('should handle unicode characters in label', () => {
@@ -532,7 +532,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByText('数据源 🎉 データソース')).toBeInTheDocument()
+      expect(screen.getByText('数据源 🎉 データソース'))!.toBeInTheDocument()
     })
 
     it('should handle empty value', () => {
@@ -584,7 +584,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByText('Minimal')).toBeInTheDocument()
+      expect(screen.getByText('Minimal'))!.toBeInTheDocument()
     })
   })
 
@@ -618,7 +618,7 @@ describe('OptionCard', () => {
         />,
       )
 
-      expect(screen.getByTitle(label)).toBeInTheDocument()
+      expect(screen.getByTitle(label))!.toBeInTheDocument()
     })
   })
 })
@@ -640,7 +640,7 @@ describe('DataSourceOptions', () => {
         />,
       )
 
-      expect(container.querySelector('.grid')).toBeInTheDocument()
+      expect(container.querySelector('.grid'))!.toBeInTheDocument()
     })
 
     it('should render OptionCard for each option', () => {
@@ -657,9 +657,9 @@ describe('DataSourceOptions', () => {
         />,
       )
 
-      expect(screen.getByText('Option 1')).toBeInTheDocument()
-      expect(screen.getByText('Option 2')).toBeInTheDocument()
-      expect(screen.getByText('Option 3')).toBeInTheDocument()
+      expect(screen.getByText('Option 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Option 2'))!.toBeInTheDocument()
+      expect(screen.getByText('Option 3'))!.toBeInTheDocument()
     })
 
     it('should render empty grid when no options', () => {
@@ -673,7 +673,7 @@ describe('DataSourceOptions', () => {
       )
 
       const grid = container.querySelector('.grid')
-      expect(grid).toBeInTheDocument()
+      expect(grid)!.toBeInTheDocument()
       expect(grid?.children.length).toBe(0)
     })
 
@@ -726,8 +726,8 @@ describe('DataSourceOptions', () => {
       )
 
       const cards = container.querySelectorAll('.flex.cursor-pointer')
-      expect(cards[0].className).toContain('border-components-option-card-option-selected-border')
-      expect(cards[1].className).not.toContain('border-components-option-card-option-selected-border')
+      expect(cards[0]!.className).toContain('border-components-option-card-option-selected-border')
+      expect(cards[1]!.className).not.toContain('border-components-option-card-option-selected-border')
     })
 
     it('should mark second option as selected when matching', () => {
@@ -744,8 +744,8 @@ describe('DataSourceOptions', () => {
       )
 
       const cards = container.querySelectorAll('.flex.cursor-pointer')
-      expect(cards[0].className).not.toContain('border-components-option-card-option-selected-border')
-      expect(cards[1].className).toContain('border-components-option-card-option-selected-border')
+      expect(cards[0]!.className).not.toContain('border-components-option-card-option-selected-border')
+      expect(cards[1]!.className).toContain('border-components-option-card-option-selected-border')
     })
 
     it('should mark none as selected when dataSourceNodeId does not match', () => {
@@ -777,7 +777,7 @@ describe('DataSourceOptions', () => {
         />,
       )
 
-      expect(container.querySelector('.grid')).toBeInTheDocument()
+      expect(container.querySelector('.grid'))!.toBeInTheDocument()
     })
   })
 
@@ -1101,7 +1101,7 @@ describe('DataSourceOptions', () => {
         />,
       )
 
-      expect(screen.getByText('Only Option')).toBeInTheDocument()
+      expect(screen.getByText('Only Option'))!.toBeInTheDocument()
     })
 
     it('should handle many options', () => {
@@ -1115,8 +1115,8 @@ describe('DataSourceOptions', () => {
         />,
       )
 
-      expect(screen.getByText('Option 0')).toBeInTheDocument()
-      expect(screen.getByText('Option 19')).toBeInTheDocument()
+      expect(screen.getByText('Option 0'))!.toBeInTheDocument()
+      expect(screen.getByText('Option 19'))!.toBeInTheDocument()
     })
 
     it('should handle options with duplicate labels but different values', () => {
@@ -1135,7 +1135,7 @@ describe('DataSourceOptions', () => {
         />,
       )
       const labels = screen.getAllByText('Same Label')
-      fireEvent.click(labels[1]) // Click second one
+      fireEvent.click(labels[1]!) // Click second one
 
       expect(onSelect).toHaveBeenLastCalledWith({ nodeId: 'id-2', nodeData: data2 })
     })
@@ -1176,7 +1176,7 @@ describe('DataSourceOptions', () => {
         />,
       )
 
-      expect(container.querySelector('.grid')).toBeInTheDocument()
+      expect(container.querySelector('.grid'))!.toBeInTheDocument()
     })
 
     it('should handle options with empty string values', () => {
@@ -1289,7 +1289,7 @@ describe('DataSourceOptions Integration', () => {
       )
 
       let cards = container.querySelectorAll('.flex.cursor-pointer')
-      expect(cards[1].className).toContain('border-components-option-card-option-selected-border')
+      expect(cards[1]!.className).toContain('border-components-option-card-option-selected-border')
 
       rerender(
         <DataSourceOptions
@@ -1299,8 +1299,8 @@ describe('DataSourceOptions Integration', () => {
       )
 
       cards = container.querySelectorAll('.flex.cursor-pointer')
-      expect(cards[2].className).toContain('border-components-option-card-option-selected-border')
-      expect(cards[1].className).not.toContain('border-components-option-card-option-selected-border')
+      expect(cards[2]!.className).toContain('border-components-option-card-option-selected-border')
+      expect(cards[1]!.className).not.toContain('border-components-option-card-option-selected-border')
     })
 
     it('should handle rapid option switching', async () => {
@@ -1344,8 +1344,8 @@ describe('DataSourceOptions Integration', () => {
         />,
       )
 
-      expect(screen.getByText('Test Label')).toBeInTheDocument()
-      expect(screen.getByTestId('block-icon')).toBeInTheDocument()
+      expect(screen.getByText('Test Label'))!.toBeInTheDocument()
+      expect(screen.getByTestId('block-icon'))!.toBeInTheDocument()
       const card = container.querySelector('.flex.cursor-pointer')
       expect(card?.className).toContain('border-components-option-card-option-selected-border')
     })
@@ -1397,8 +1397,8 @@ describe('DataSourceOptions Integration', () => {
       }
 
       const cards = container.querySelectorAll('.flex.cursor-pointer')
-      expect(cards[0].className).toContain('border-components-option-card-option-selected-border')
-      expect(cards[1].className).not.toContain('border-components-option-card-option-selected-border')
+      expect(cards[0]!.className).toContain('border-components-option-card-option-selected-border')
+      expect(cards[1]!.className).not.toContain('border-components-option-card-option-selected-border')
     })
 
     it('should handle options array reference change with same content', () => {
@@ -1490,7 +1490,7 @@ describe('handleSelect Early Return Coverage', () => {
       />,
     )
 
-    expect(container.querySelector('.grid')).toBeInTheDocument()
+    expect(container.querySelector('.grid'))!.toBeInTheDocument()
     expect(onSelect).not.toHaveBeenCalled()
   })
 
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/index.tsx b/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/index.tsx
index 159887a825..82194e2e8d 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/index.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/data-source-options/index.tsx
@@ -27,7 +27,7 @@ const DataSourceOptions = ({
 
   useEffect(() => {
     if (options.length > 0 && !dataSourceNodeId)
-      handelSelect(options[0].value)
+      handelSelect(options[0]!.value)
   }, [])
 
   return (
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx b/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx
index 49a1b9a284..0e904dae7a 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx
@@ -21,7 +21,7 @@ const Options = ({ initialData, configurations, schema, CustomActions, onSubmit
         if (!result.success) {
           const issues = result.error.issues
           const firstIssue = issues[0]
-          const errorMessage = `Path: ${firstIssue.path.join('.')} Error: ${firstIssue.message}`
+          const errorMessage = `Path: ${firstIssue!.path.join('.')} Error: ${firstIssue!.message}`
           toast.error(errorMessage)
           return errorMessage
         }
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/index.tsx b/web/app/components/rag-pipeline/components/panel/test-run/preparation/index.tsx
index bf4f74493b..a65770f01d 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/index.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/index.tsx
@@ -76,7 +76,7 @@ const Preparation = () => {
     const credentialId = dataSourceStore.getState().currentCredentialId
     if (datasourceType === DatasourceType.localFile) {
       const { localFileList } = dataSourceStore.getState()
-      const { id, name, type, size, extension, mime_type } = localFileList[0].file
+      const { id, name, type, size, extension, mime_type } = localFileList[0]!.file
       const documentInfo = {
         related_id: id,
         name,
@@ -91,7 +91,7 @@ const Preparation = () => {
     }
     if (datasourceType === DatasourceType.onlineDocument) {
       const { onlineDocuments } = dataSourceStore.getState()
-      const { workspace_id, ...rest } = onlineDocuments[0]
+      const { workspace_id, ...rest } = onlineDocuments[0]!
       const documentInfo = {
         workspace_id,
         page: rest,
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/result/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/panel/test-run/result/__tests__/index.spec.tsx
index 249a13023c..d08c87fdf0 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/result/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/result/__tests__/index.spec.tsx
@@ -188,7 +188,7 @@ describe('Tab', () => {
         />,
       )
 
-      expect(screen.getByRole('button')).toHaveTextContent('Test Tab')
+      expect(screen.getByRole('button'))!.toHaveTextContent('Test Tab')
     })
 
     it('should apply active styles when isActive is true', () => {
@@ -205,8 +205,8 @@ describe('Tab', () => {
       )
 
       const button = screen.getByRole('button')
-      expect(button).toHaveClass('border-util-colors-blue-brand-blue-brand-600')
-      expect(button).toHaveClass('text-text-primary')
+      expect(button)!.toHaveClass('border-util-colors-blue-brand-blue-brand-600')
+      expect(button)!.toHaveClass('text-text-primary')
     })
 
     it('should apply inactive styles when isActive is false', () => {
@@ -223,8 +223,8 @@ describe('Tab', () => {
       )
 
       const button = screen.getByRole('button')
-      expect(button).toHaveClass('border-transparent')
-      expect(button).toHaveClass('text-text-tertiary')
+      expect(button)!.toHaveClass('border-transparent')
+      expect(button)!.toHaveClass('text-text-tertiary')
     })
 
     it('should apply disabled styles when workflowRunningData is undefined', () => {
@@ -241,8 +241,8 @@ describe('Tab', () => {
       )
 
       const button = screen.getByRole('button')
-      expect(button).toBeDisabled()
-      expect(button).toHaveClass('opacity-30')
+      expect(button)!.toBeDisabled()
+      expect(button)!.toHaveClass('opacity-30')
     })
   })
 
@@ -328,12 +328,12 @@ describe('Tab', () => {
       rerender(
         <Tab isActive={true} label="Tab" value="tab" workflowRunningData={undefined} onClick={mockOnClick} />,
       )
-      expect(screen.getByRole('button')).toBeDisabled()
+      expect(screen.getByRole('button'))!.toBeDisabled()
 
       rerender(
         <Tab isActive={false} label="Tab" value="tab" workflowRunningData={undefined} onClick={mockOnClick} />,
       )
-      expect(screen.getByRole('button')).toBeDisabled()
+      expect(screen.getByRole('button'))!.toBeDisabled()
     })
   })
 })
@@ -353,9 +353,9 @@ describe('Tabs', () => {
         />,
       )
 
-      expect(screen.getByText('runLog.result')).toBeInTheDocument()
-      expect(screen.getByText('runLog.detail')).toBeInTheDocument()
-      expect(screen.getByText('runLog.tracing')).toBeInTheDocument()
+      expect(screen.getByText('runLog.result'))!.toBeInTheDocument()
+      expect(screen.getByText('runLog.detail'))!.toBeInTheDocument()
+      expect(screen.getByText('runLog.tracing'))!.toBeInTheDocument()
     })
 
     it('should render tabs container with correct styling', () => {
@@ -368,9 +368,9 @@ describe('Tabs', () => {
       )
 
       const tabsContainer = container.firstChild as HTMLElement
-      expect(tabsContainer).toHaveClass('flex')
-      expect(tabsContainer).toHaveClass('shrink-0')
-      expect(tabsContainer).toHaveClass('border-b-[0.5px]')
+      expect(tabsContainer)!.toHaveClass('flex')
+      expect(tabsContainer)!.toHaveClass('shrink-0')
+      expect(tabsContainer)!.toHaveClass('border-b-[0.5px]')
     })
 
     it('should highlight the current tab', () => {
@@ -383,9 +383,9 @@ describe('Tabs', () => {
       )
 
       const buttons = screen.getAllByRole('button')
-      expect(buttons[0]).toHaveClass('border-transparent')
-      expect(buttons[1]).toHaveClass('border-util-colors-blue-brand-blue-brand-600')
-      expect(buttons[2]).toHaveClass('border-transparent')
+      expect(buttons[0])!.toHaveClass('border-transparent')
+      expect(buttons[1])!.toHaveClass('border-util-colors-blue-brand-blue-brand-600')
+      expect(buttons[2])!.toHaveClass('border-transparent')
     })
   })
 
@@ -451,10 +451,10 @@ describe('Tabs', () => {
 
       const buttons = screen.getAllByRole('button')
       buttons.forEach((button) => {
-        expect(button).toBeDisabled()
+        expect(button)!.toBeDisabled()
       })
 
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
       expect(mockSwitchTab).not.toHaveBeenCalled()
     })
   })
@@ -469,21 +469,21 @@ describe('Tabs', () => {
       )
 
       let buttons = screen.getAllByRole('button')
-      expect(buttons[0]).toHaveClass('border-util-colors-blue-brand-blue-brand-600')
+      expect(buttons[0])!.toHaveClass('border-util-colors-blue-brand-blue-brand-600')
 
       rerender(
         <Tabs currentTab="DETAIL" workflowRunningData={workflowData} switchTab={mockSwitchTab} />,
       )
 
       buttons = screen.getAllByRole('button')
-      expect(buttons[1]).toHaveClass('border-util-colors-blue-brand-blue-brand-600')
+      expect(buttons[1])!.toHaveClass('border-util-colors-blue-brand-blue-brand-600')
 
       rerender(
         <Tabs currentTab="TRACING" workflowRunningData={workflowData} switchTab={mockSwitchTab} />,
       )
 
       buttons = screen.getAllByRole('button')
-      expect(buttons[2]).toHaveClass('border-util-colors-blue-brand-blue-brand-600')
+      expect(buttons[2])!.toHaveClass('border-util-colors-blue-brand-blue-brand-600')
     })
   })
 })
@@ -514,9 +514,9 @@ describe('formatPreviewChunks', () => {
       const result = formatPreviewChunks(outputs) as GeneralChunks
 
       expect(result).toHaveLength(3)
-      expect((result as GeneralChunks)[0].content).toBe('General chunk content 1')
-      expect((result as GeneralChunks)[1].content).toBe('General chunk content 2')
-      expect((result as GeneralChunks)[2].content).toBe('General chunk content 3')
+      expect((result as GeneralChunks)[0]!.content).toBe('General chunk content 1')
+      expect((result as GeneralChunks)[1]!.content).toBe('General chunk content 2')
+      expect((result as GeneralChunks)[2]!.content).toBe('General chunk content 3')
     })
 
     it('should limit chunks to RAG_PIPELINE_PREVIEW_CHUNK_NUM', () => {
@@ -544,8 +544,8 @@ describe('formatPreviewChunks', () => {
 
       expect(result.parent_mode).toBe('paragraph')
       expect(result.parent_child_chunks).toHaveLength(3)
-      expect(result.parent_child_chunks[0].parent_content).toBe('Parent content 1')
-      expect(result.parent_child_chunks[0].child_contents).toEqual([
+      expect(result.parent_child_chunks[0]!.parent_content).toBe('Parent content 1')
+      expect(result.parent_child_chunks[0]!.child_contents).toEqual([
         'Child 1 of parent 1',
         'Child 2 of parent 1',
       ])
@@ -582,7 +582,7 @@ describe('formatPreviewChunks', () => {
       }
       const result = formatPreviewChunks(outputs) as ParentChildChunks
 
-      expect(result.parent_child_chunks[0].child_contents).toHaveLength(
+      expect(result.parent_child_chunks[0]!.child_contents).toHaveLength(
         RAG_PIPELINE_PREVIEW_CHUNK_NUM,
       )
     })
@@ -605,8 +605,8 @@ describe('formatPreviewChunks', () => {
       const result = formatPreviewChunks(outputs) as QAChunks
 
       expect(result.qa_chunks).toHaveLength(3)
-      expect(result.qa_chunks[0].question).toBe('Question 1')
-      expect(result.qa_chunks[0].answer).toBe('Answer 1')
+      expect(result.qa_chunks[0]!.question).toBe('Question 1')
+      expect(result.qa_chunks[0]!.answer).toBe('Answer 1')
     })
 
     it('should limit QA chunks to RAG_PIPELINE_PREVIEW_CHUNK_NUM', () => {
@@ -644,7 +644,7 @@ describe('ResultPreview', () => {
         />,
       )
 
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
     })
 
     it('should render error state when not running and has error', () => {
@@ -657,8 +657,8 @@ describe('ResultPreview', () => {
         />,
       )
 
-      expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
-      expect(screen.getByText('pipeline.result.resultPreview.viewDetails')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.viewDetails'))!.toBeInTheDocument()
     })
 
     it('should render ChunkCardList when outputs are available', () => {
@@ -673,7 +673,7 @@ describe('ResultPreview', () => {
         />,
       )
 
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
 
     it('should render footer tip with correct count', () => {
@@ -688,9 +688,7 @@ describe('ResultPreview', () => {
         />,
       )
 
-      expect(
-        screen.getByText(`pipeline.result.resultPreview.footerTip:{"count":${RAG_PIPELINE_PREVIEW_CHUNK_NUM}}`),
-      ).toBeInTheDocument()
+      expect(screen.getByText(`pipeline.result.resultPreview.footerTip:{"count":${RAG_PIPELINE_PREVIEW_CHUNK_NUM}}`))!.toBeInTheDocument()
     })
 
     it('should not show loading when isRunning but outputs exist', () => {
@@ -706,7 +704,7 @@ describe('ResultPreview', () => {
       )
 
       expect(screen.queryByText('pipeline.result.resultPreview.loading')).not.toBeInTheDocument()
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
   })
 
@@ -743,7 +741,7 @@ describe('ResultPreview', () => {
       )
 
       const chunkCardList = screen.getByTestId('chunk-card-list')
-      expect(chunkCardList).toHaveAttribute('data-chunk-type', ChunkingMode.text)
+      expect(chunkCardList)!.toHaveAttribute('data-chunk-type', ChunkingMode.text)
     })
 
     it('should render with parent-child chunks output', () => {
@@ -759,7 +757,7 @@ describe('ResultPreview', () => {
       )
 
       const chunkCardList = screen.getByTestId('chunk-card-list')
-      expect(chunkCardList).toHaveAttribute('data-chunk-type', ChunkingMode.parentChild)
+      expect(chunkCardList)!.toHaveAttribute('data-chunk-type', ChunkingMode.parentChild)
     })
 
     it('should render with QA chunks output', () => {
@@ -775,7 +773,7 @@ describe('ResultPreview', () => {
       )
 
       const chunkCardList = screen.getByTestId('chunk-card-list')
-      expect(chunkCardList).toHaveAttribute('data-chunk-type', ChunkingMode.qa)
+      expect(chunkCardList)!.toHaveAttribute('data-chunk-type', ChunkingMode.qa)
     })
   })
 
@@ -833,7 +831,7 @@ describe('ResultPreview', () => {
         />,
       )
 
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
   })
 })
@@ -856,9 +854,9 @@ describe('Result', () => {
 
       render(<Result />)
 
-      expect(screen.getByText('runLog.result')).toBeInTheDocument()
-      expect(screen.getByText('runLog.detail')).toBeInTheDocument()
-      expect(screen.getByText('runLog.tracing')).toBeInTheDocument()
+      expect(screen.getByText('runLog.result'))!.toBeInTheDocument()
+      expect(screen.getByText('runLog.detail'))!.toBeInTheDocument()
+      expect(screen.getByText('runLog.tracing'))!.toBeInTheDocument()
     })
 
     it('should render loading state for RESULT tab when running without outputs', () => {
@@ -872,7 +870,7 @@ describe('Result', () => {
 
       render(<Result />)
 
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
     })
 
     it('should render result preview when result has outputs', () => {
@@ -887,7 +885,7 @@ describe('Result', () => {
 
       render(<Result />)
 
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
   })
 
@@ -900,7 +898,7 @@ describe('Result', () => {
       fireEvent.click(screen.getByText('runLog.detail'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('result-panel')).toBeInTheDocument()
+        expect(screen.getByTestId('result-panel'))!.toBeInTheDocument()
       })
     })
 
@@ -912,7 +910,7 @@ describe('Result', () => {
       fireEvent.click(screen.getByText('runLog.tracing'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('tracing-panel')).toBeInTheDocument()
+        expect(screen.getByTestId('tracing-panel'))!.toBeInTheDocument()
       })
     })
 
@@ -929,12 +927,12 @@ describe('Result', () => {
 
       fireEvent.click(screen.getByText('runLog.detail'))
       await waitFor(() => {
-        expect(screen.getByTestId('result-panel')).toBeInTheDocument()
+        expect(screen.getByTestId('result-panel'))!.toBeInTheDocument()
       })
 
       fireEvent.click(screen.getByText('runLog.result'))
       await waitFor(() => {
-        expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+        expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
       })
     })
   })
@@ -963,13 +961,13 @@ describe('Result', () => {
 
       await waitFor(() => {
         const resultPanel = screen.getByTestId('result-panel')
-        expect(resultPanel).toHaveAttribute('data-inputs', '{"key": "value"}')
-        expect(resultPanel).toHaveAttribute('data-outputs', '{"result": "success"}')
-        expect(resultPanel).toHaveAttribute('data-status', WorkflowRunningStatus.Succeeded)
-        expect(resultPanel).toHaveAttribute('data-elapsed-time', '1500')
-        expect(resultPanel).toHaveAttribute('data-total-tokens', '200')
-        expect(resultPanel).toHaveAttribute('data-steps', '10')
-        expect(resultPanel).toHaveAttribute('data-exception-counts', '2')
+        expect(resultPanel)!.toHaveAttribute('data-inputs', '{"key": "value"}')
+        expect(resultPanel)!.toHaveAttribute('data-outputs', '{"result": "success"}')
+        expect(resultPanel)!.toHaveAttribute('data-status', WorkflowRunningStatus.Succeeded)
+        expect(resultPanel)!.toHaveAttribute('data-elapsed-time', '1500')
+        expect(resultPanel)!.toHaveAttribute('data-total-tokens', '200')
+        expect(resultPanel)!.toHaveAttribute('data-steps', '10')
+        expect(resultPanel)!.toHaveAttribute('data-exception-counts', '2')
       })
     })
 
@@ -984,7 +982,7 @@ describe('Result', () => {
       fireEvent.click(screen.getByText('runLog.detail'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('result-panel')).toBeInTheDocument()
+        expect(screen.getByTestId('result-panel'))!.toBeInTheDocument()
       })
     })
   })
@@ -999,8 +997,8 @@ describe('Result', () => {
 
       await waitFor(() => {
         const tracingPanel = screen.getByTestId('tracing-panel')
-        expect(tracingPanel).toHaveAttribute('data-list-length', '1')
-        expect(tracingPanel).toHaveAttribute('data-classname', 'bg-background-section-burn')
+        expect(tracingPanel)!.toHaveAttribute('data-list-length', '1')
+        expect(tracingPanel)!.toHaveAttribute('data-classname', 'bg-background-section-burn')
       })
     })
 
@@ -1014,7 +1012,7 @@ describe('Result', () => {
       fireEvent.click(screen.getByText('runLog.tracing'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('tracing-panel')).toBeInTheDocument()
+        expect(screen.getByTestId('tracing-panel'))!.toBeInTheDocument()
       })
     })
   })
@@ -1035,7 +1033,7 @@ describe('Result', () => {
       fireEvent.click(screen.getByText('pipeline.result.resultPreview.viewDetails'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('result-panel')).toBeInTheDocument()
+        expect(screen.getByTestId('result-panel'))!.toBeInTheDocument()
       })
     })
   })
@@ -1048,7 +1046,7 @@ describe('Result', () => {
 
       const buttons = screen.getAllByRole('button')
       buttons.forEach((button) => {
-        expect(button).toBeDisabled()
+        expect(button)!.toBeDisabled()
       })
     })
 
@@ -1061,7 +1059,7 @@ describe('Result', () => {
 
       render(<Result />)
 
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
     })
 
     it('should handle result with Running status', () => {
@@ -1075,7 +1073,7 @@ describe('Result', () => {
 
       render(<Result />)
 
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
     })
 
     it('should handle result with Stopped status', () => {
@@ -1090,7 +1088,7 @@ describe('Result', () => {
 
       render(<Result />)
 
-      expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
     })
   })
 
@@ -1103,12 +1101,12 @@ describe('Result', () => {
       fireEvent.click(screen.getByText('runLog.detail'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('result-panel')).toBeInTheDocument()
+        expect(screen.getByTestId('result-panel'))!.toBeInTheDocument()
       })
 
       rerender(<Result />)
 
-      expect(screen.getByTestId('result-panel')).toBeInTheDocument()
+      expect(screen.getByTestId('result-panel'))!.toBeInTheDocument()
     })
 
     it('should render different states based on workflowRunningData', () => {
@@ -1121,7 +1119,7 @@ describe('Result', () => {
       })
 
       const { unmount } = render(<Result />)
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
       unmount()
 
       const outputs = createGeneralChunkOutputs(3)
@@ -1134,7 +1132,7 @@ describe('Result', () => {
       })
 
       render(<Result />)
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
   })
 
@@ -1146,7 +1144,7 @@ describe('Result', () => {
 
       rerender(<Result />)
 
-      expect(screen.getByText('runLog.result')).toBeInTheDocument()
+      expect(screen.getByText('runLog.result'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/__tests__/index.spec.tsx
index ac7d525423..3a3c18eb44 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/__tests__/index.spec.tsx
@@ -119,8 +119,8 @@ describe('formatPreviewChunks', () => {
       const result = formatPreviewChunks(outputs) as GeneralChunks
 
       expect(result).toHaveLength(20)
-      expect((result as GeneralChunks)[0].content).toBe('Chunk content 1')
-      expect((result as GeneralChunks)[19].content).toBe('Chunk content 20')
+      expect((result as GeneralChunks)[0]!.content).toBe('Chunk content 1')
+      expect((result as GeneralChunks)[19]!.content).toBe('Chunk content 20')
     })
 
     it('should handle empty preview array for general chunks', () => {
@@ -167,7 +167,7 @@ describe('formatPreviewChunks', () => {
 
       const result = formatPreviewChunks(outputs) as GeneralChunks
 
-      expect((result as GeneralChunks)[0].content).toHaveLength(10000)
+      expect((result as GeneralChunks)[0]!.content).toHaveLength(10000)
     })
   })
 
@@ -210,7 +210,7 @@ describe('formatPreviewChunks', () => {
 
         const result = formatPreviewChunks(outputs) as ParentChildChunks
 
-        expect(result.parent_child_chunks[0].child_contents).toHaveLength(50)
+        expect(result.parent_child_chunks[0]!.child_contents).toHaveLength(50)
       })
 
       it('should handle empty child_chunks in paragraph mode', () => {
@@ -220,7 +220,7 @@ describe('formatPreviewChunks', () => {
 
         const result = formatPreviewChunks(outputs) as ParentChildChunks
 
-        expect(result.parent_child_chunks[0].child_contents).toEqual([])
+        expect(result.parent_child_chunks[0]!.child_contents).toEqual([])
       })
     })
 
@@ -234,8 +234,8 @@ describe('formatPreviewChunks', () => {
 
         expect(result.parent_mode).toBe('full-doc')
         expect(result.parent_child_chunks).toHaveLength(1)
-        expect(result.parent_child_chunks[0].parent_content).toBe('Full Doc Parent')
-        expect(result.parent_child_chunks[0].child_contents).toEqual(['Child 1', 'Child 2', 'Child 3'])
+        expect(result.parent_child_chunks[0]!.parent_content).toBe('Full Doc Parent')
+        expect(result.parent_child_chunks[0]!.child_contents).toEqual(['Child 1', 'Child 2', 'Child 3'])
       })
 
       it('should NOT limit parent chunks in full-doc mode', () => {
@@ -253,9 +253,9 @@ describe('formatPreviewChunks', () => {
 
         const result = formatPreviewChunks(outputs) as ParentChildChunks
 
-        expect(result.parent_child_chunks[0].child_contents).toHaveLength(20)
-        expect(result.parent_child_chunks[0].child_contents[0]).toBe('Child 1')
-        expect(result.parent_child_chunks[0].child_contents[19]).toBe('Child 20')
+        expect(result.parent_child_chunks[0]!.child_contents).toHaveLength(20)
+        expect(result.parent_child_chunks[0]!.child_contents[0]).toBe('Child 1')
+        expect(result.parent_child_chunks[0]!.child_contents[19]).toBe('Child 20')
       })
 
       it('should handle multiple parents with many children in full-doc mode', () => {
@@ -266,8 +266,8 @@ describe('formatPreviewChunks', () => {
 
         const result = formatPreviewChunks(outputs) as ParentChildChunks
 
-        expect(result.parent_child_chunks[0].child_contents).toHaveLength(20)
-        expect(result.parent_child_chunks[1].child_contents).toHaveLength(20)
+        expect(result.parent_child_chunks[0]!.child_contents).toHaveLength(20)
+        expect(result.parent_child_chunks[1]!.child_contents).toHaveLength(20)
       })
     })
 
@@ -324,10 +324,10 @@ describe('formatPreviewChunks', () => {
 
       const result = formatPreviewChunks(outputs) as QAChunks
 
-      expect(result.qa_chunks[0].question).toBe('')
-      expect(result.qa_chunks[0].answer).toBe('Answer without question')
-      expect(result.qa_chunks[1].question).toBe('Question without answer')
-      expect(result.qa_chunks[1].answer).toBe('')
+      expect(result.qa_chunks[0]!.question).toBe('')
+      expect(result.qa_chunks[0]!.answer).toBe('Answer without question')
+      expect(result.qa_chunks[1]!.question).toBe('Question without answer')
+      expect(result.qa_chunks[1]!.answer).toBe('')
     })
 
     it('should preserve all properties when spreading chunk', () => {
@@ -406,27 +406,27 @@ describe('ResultPreview', () => {
     it('should render without crashing with minimal props', () => {
       render(<ResultPreview onSwitchToDetail={vi.fn()} />)
 
-      expect(document.body).toBeInTheDocument()
+      expect(document.body)!.toBeInTheDocument()
     })
 
     it('should render loading state when isRunning and no outputs', () => {
       render(<ResultPreview {...defaultProps} isRunning={true} outputs={undefined} />)
 
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
     })
 
     it('should render loading spinner icon when loading', () => {
       const { container } = render(<ResultPreview {...defaultProps} isRunning={true} outputs={undefined} />)
 
       const spinner = container.querySelector('.animate-spin')
-      expect(spinner).toBeInTheDocument()
+      expect(spinner)!.toBeInTheDocument()
     })
 
     it('should render error state when not running and error exists', () => {
       render(<ResultPreview {...defaultProps} isRunning={false} error="Something went wrong" />)
 
-      expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: /pipeline\.result\.resultPreview\.viewDetails/i })).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /pipeline\.result\.resultPreview\.viewDetails/i }))!.toBeInTheDocument()
     })
 
     it('should render outputs when available', () => {
@@ -434,7 +434,7 @@ describe('ResultPreview', () => {
 
       render(<ResultPreview {...defaultProps} outputs={outputs} />)
 
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
 
     it('should render footer tip when outputs available', () => {
@@ -442,7 +442,7 @@ describe('ResultPreview', () => {
 
       render(<ResultPreview {...defaultProps} outputs={outputs} />)
 
-      expect(screen.getByText(/pipeline\.result\.resultPreview\.footerTip/)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline\.result\.resultPreview\.footerTip/))!.toBeInTheDocument()
     })
 
     it('should not render loading when outputs exist even if isRunning', () => {
@@ -451,13 +451,13 @@ describe('ResultPreview', () => {
       render(<ResultPreview {...defaultProps} isRunning={true} outputs={outputs} />)
 
       expect(screen.queryByText('pipeline.result.resultPreview.loading')).not.toBeInTheDocument()
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
 
     it('should not render error when isRunning is true', () => {
       render(<ResultPreview {...defaultProps} isRunning={true} error="Error message" outputs={undefined} />)
 
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
       expect(screen.queryByText('pipeline.result.resultPreview.error')).not.toBeInTheDocument()
     })
   })
@@ -467,7 +467,7 @@ describe('ResultPreview', () => {
       it('should show loading when isRunning=true and no outputs', () => {
         render(<ResultPreview {...defaultProps} isRunning={true} />)
 
-        expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+        expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
       })
 
       it('should not show loading when isRunning=false', () => {
@@ -482,7 +482,7 @@ describe('ResultPreview', () => {
         render(<ResultPreview {...defaultProps} isRunning={true} outputs={outputs} />)
 
         expect(screen.queryByText('pipeline.result.resultPreview.loading')).not.toBeInTheDocument()
-        expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+        expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
       })
     })
 
@@ -493,7 +493,7 @@ describe('ResultPreview', () => {
         render(<ResultPreview {...defaultProps} outputs={outputs} />)
 
         const chunkList = screen.getByTestId('chunk-card-list')
-        expect(chunkList).toHaveAttribute('data-chunk-type', ChunkingMode.text)
+        expect(chunkList)!.toHaveAttribute('data-chunk-type', ChunkingMode.text)
       })
 
       it('should format and pass previewChunks to ChunkCardList', () => {
@@ -520,7 +520,7 @@ describe('ResultPreview', () => {
         render(<ResultPreview {...defaultProps} outputs={outputs} />)
 
         const chunkList = screen.getByTestId('chunk-card-list')
-        expect(chunkList).toHaveAttribute('data-chunk-type', ChunkingMode.parentChild)
+        expect(chunkList)!.toHaveAttribute('data-chunk-type', ChunkingMode.parentChild)
       })
 
       it('should handle QA outputs', () => {
@@ -531,7 +531,7 @@ describe('ResultPreview', () => {
         render(<ResultPreview {...defaultProps} outputs={outputs} />)
 
         const chunkList = screen.getByTestId('chunk-card-list')
-        expect(chunkList).toHaveAttribute('data-chunk-type', ChunkingMode.qa)
+        expect(chunkList)!.toHaveAttribute('data-chunk-type', ChunkingMode.qa)
       })
     })
 
@@ -539,7 +539,7 @@ describe('ResultPreview', () => {
       it('should show error state when error is a non-empty string', () => {
         render(<ResultPreview {...defaultProps} error="Network error" />)
 
-        expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
+        expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
       })
 
       it('should show error state when error is an empty string', () => {
@@ -553,8 +553,8 @@ describe('ResultPreview', () => {
 
         render(<ResultPreview {...defaultProps} outputs={outputs} error="Error" />)
 
-        expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
-        expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+        expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
+        expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
       })
     })
 
@@ -584,7 +584,7 @@ describe('ResultPreview', () => {
         const { rerender } = render(<ResultPreview {...defaultProps} />)
         rerender(<ResultPreview {...defaultProps} />)
 
-        expect(document.body).toBeInTheDocument()
+        expect(document.body)!.toBeInTheDocument()
       })
 
       it('should update when props change', () => {
@@ -592,7 +592,7 @@ describe('ResultPreview', () => {
 
         rerender(<ResultPreview {...defaultProps} isRunning={true} />)
 
-        expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+        expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
       })
 
       it('should update when outputs change', () => {
@@ -744,45 +744,45 @@ describe('ResultPreview', () => {
   describe('Integration', () => {
     it('should transition from loading to output state', () => {
       const { rerender } = render(<ResultPreview {...defaultProps} isRunning={true} />)
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
 
       const outputs = createGeneralChunkOutputs([{ content: 'Loaded data' }])
       rerender(<ResultPreview {...defaultProps} isRunning={false} outputs={outputs} />)
 
       expect(screen.queryByText('pipeline.result.resultPreview.loading')).not.toBeInTheDocument()
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
 
     it('should transition from loading to error state', () => {
       const { rerender } = render(<ResultPreview {...defaultProps} isRunning={true} />)
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
 
       rerender(<ResultPreview {...defaultProps} isRunning={false} error="Failed to load" />)
 
       expect(screen.queryByText('pipeline.result.resultPreview.loading')).not.toBeInTheDocument()
-      expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
     })
 
     it('should render both error and outputs when both props provided', () => {
       const { rerender } = render(<ResultPreview {...defaultProps} error="Initial error" />)
-      expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
 
       const outputs = createGeneralChunkOutputs([{ content: 'Success data' }])
       rerender(<ResultPreview {...defaultProps} error="Initial error" outputs={outputs} />)
 
-      expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
 
     it('should hide error when error prop is cleared', () => {
       const { rerender } = render(<ResultPreview {...defaultProps} error="Initial error" />)
-      expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
 
       const outputs = createGeneralChunkOutputs([{ content: 'Success data' }])
       rerender(<ResultPreview {...defaultProps} outputs={outputs} />)
 
       expect(screen.queryByText('pipeline.result.resultPreview.error')).not.toBeInTheDocument()
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
 
     it('should handle complete flow: empty -> loading -> outputs', () => {
@@ -790,12 +790,12 @@ describe('ResultPreview', () => {
       expect(container.firstChild).toBeNull()
 
       rerender(<ResultPreview {...defaultProps} isRunning={true} />)
-      expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+      expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
 
       const outputs = createGeneralChunkOutputs([{ content: 'Final data' }])
       rerender(<ResultPreview {...defaultProps} isRunning={false} outputs={outputs} />)
 
-      expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+      expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
     })
   })
 
@@ -804,14 +804,14 @@ describe('ResultPreview', () => {
       const { container } = render(<ResultPreview {...defaultProps} isRunning={true} />)
 
       const loadingContainer = container.querySelector('.flex.grow.flex-col.items-center.justify-center')
-      expect(loadingContainer).toBeInTheDocument()
+      expect(loadingContainer)!.toBeInTheDocument()
     })
 
     it('should have correct container classes for error state', () => {
       const { container } = render(<ResultPreview {...defaultProps} error="Error" />)
 
       const errorContainer = container.querySelector('.flex.grow.flex-col.items-center.justify-center')
-      expect(errorContainer).toBeInTheDocument()
+      expect(errorContainer)!.toBeInTheDocument()
     })
 
     it('should have correct container classes for outputs state', () => {
@@ -820,7 +820,7 @@ describe('ResultPreview', () => {
       const { container } = render(<ResultPreview {...defaultProps} outputs={outputs} />)
 
       const outputContainer = container.querySelector('.flex.grow.flex-col.bg-background-body')
-      expect(outputContainer).toBeInTheDocument()
+      expect(outputContainer)!.toBeInTheDocument()
     })
 
     it('should have gradient dividers in footer', () => {
@@ -838,7 +838,7 @@ describe('ResultPreview', () => {
       render(<ResultPreview {...defaultProps} error="Error" />)
 
       const button = screen.getByRole('button')
-      expect(button).toBeInTheDocument()
+      expect(button)!.toBeInTheDocument()
     })
 
     it('should have title attribute on footer tip for long text', () => {
@@ -847,7 +847,7 @@ describe('ResultPreview', () => {
       const { container } = render(<ResultPreview {...defaultProps} outputs={outputs} />)
 
       const footerTip = container.querySelector('[title]')
-      expect(footerTip).toBeInTheDocument()
+      expect(footerTip)!.toBeInTheDocument()
     })
   })
 })
@@ -884,17 +884,17 @@ describe('State Transition Matrix', () => {
           expect(container.firstChild).toBeNull()
           break
         case 'loading':
-          expect(screen.getByText('pipeline.result.resultPreview.loading')).toBeInTheDocument()
+          expect(screen.getByText('pipeline.result.resultPreview.loading'))!.toBeInTheDocument()
           break
         case 'error':
-          expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
+          expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
           break
         case 'outputs':
-          expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+          expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
           break
         case 'both':
-          expect(screen.getByText('pipeline.result.resultPreview.error')).toBeInTheDocument()
-          expect(screen.getByTestId('chunk-card-list')).toBeInTheDocument()
+          expect(screen.getByText('pipeline.result.resultPreview.error'))!.toBeInTheDocument()
+          expect(screen.getByTestId('chunk-card-list'))!.toBeInTheDocument()
           break
       }
     },
diff --git a/web/app/components/rag-pipeline/components/rag-pipeline-header/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/rag-pipeline-header/__tests__/index.spec.tsx
index 9ba034ebf8..b9c0de5f50 100644
--- a/web/app/components/rag-pipeline/components/rag-pipeline-header/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/rag-pipeline-header/__tests__/index.spec.tsx
@@ -246,18 +246,18 @@ describe('RagPipelineHeader', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<RagPipelineHeader />)
-      expect(screen.getByTestId('workflow-header')).toBeInTheDocument()
+      expect(screen.getByTestId('workflow-header'))!.toBeInTheDocument()
     })
 
     it('should render InputFieldButton in left slot', () => {
       render(<RagPipelineHeader />)
-      expect(screen.getByTestId('header-left')).toBeInTheDocument()
-      expect(screen.getByText(/inputField/i)).toBeInTheDocument()
+      expect(screen.getByTestId('header-left'))!.toBeInTheDocument()
+      expect(screen.getByText(/inputField/i))!.toBeInTheDocument()
     })
 
     it('should render Publisher in middle slot', () => {
       render(<RagPipelineHeader />)
-      expect(screen.getByTestId('header-middle')).toBeInTheDocument()
+      expect(screen.getByTestId('header-middle'))!.toBeInTheDocument()
     })
 
     it('should pass correct viewHistoryProps with pipelineId', () => {
@@ -299,14 +299,14 @@ describe('InputFieldButton', () => {
   describe('Rendering', () => {
     it('should render button with correct text', () => {
       render(<InputFieldButton />)
-      expect(screen.getByRole('button')).toBeInTheDocument()
-      expect(screen.getByText(/inputField/i)).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
+      expect(screen.getByText(/inputField/i))!.toBeInTheDocument()
     })
 
     it('should render with secondary variant style', () => {
       render(<InputFieldButton />)
       const button = screen.getByRole('button')
-      expect(button).toHaveClass('flex', 'gap-x-0.5')
+      expect(button)!.toHaveClass('flex', 'gap-x-0.5')
     })
   })
 
@@ -357,19 +357,19 @@ describe('Publisher', () => {
   describe('Rendering', () => {
     it('should render publish button', () => {
       render(<Publisher />)
-      expect(screen.getByRole('button')).toBeInTheDocument()
-      expect(screen.getByText(/workflow.common.publish/i)).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
+      expect(screen.getByText(/workflow.common.publish/i))!.toBeInTheDocument()
     })
 
     it('should render with primary variant', () => {
       render(<Publisher />)
       const button = screen.getByRole('button')
-      expect(button).toHaveClass('px-2')
+      expect(button)!.toHaveClass('px-2')
     })
 
     it('should render portal trigger element', () => {
       render(<Publisher />)
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -386,7 +386,7 @@ describe('Publisher', () => {
       render(<Publisher />)
 
       const portal = screen.getByTestId('portal-elem')
-      expect(portal).toHaveAttribute('data-open', 'false')
+      expect(portal)!.toHaveAttribute('data-open', 'false')
 
       fireEvent.click(screen.getByTestId('portal-trigger'))
 
@@ -409,7 +409,7 @@ describe('Popup', () => {
   describe('Rendering', () => {
     it('should render popup container', () => {
       render(<Popup />)
-      expect(screen.getByText(/workflow.common.publishUpdate/i)).toBeInTheDocument()
+      expect(screen.getByText(/workflow.common.publishUpdate/i))!.toBeInTheDocument()
     })
 
     it('should show unpublished state when publishedAt is 0', () => {
@@ -417,7 +417,7 @@ describe('Popup', () => {
 
       render(<Popup />)
 
-      expect(screen.getByText(/workflow.common.currentDraftUnpublished/i)).toBeInTheDocument()
+      expect(screen.getByText(/workflow.common.currentDraftUnpublished/i))!.toBeInTheDocument()
     })
 
     it('should show published state when publishedAt is set', () => {
@@ -425,33 +425,33 @@ describe('Popup', () => {
 
       render(<Popup />)
 
-      expect(screen.getByText(/workflow.common.latestPublished/i)).toBeInTheDocument()
+      expect(screen.getByText(/workflow.common.latestPublished/i))!.toBeInTheDocument()
     })
 
     it('should render keyboard shortcuts', () => {
       render(<Popup />)
 
-      expect(screen.getByText('ctrl')).toBeInTheDocument()
-      expect(screen.getByText('⇧')).toBeInTheDocument()
-      expect(screen.getByText('P')).toBeInTheDocument()
+      expect(screen.getByText('ctrl'))!.toBeInTheDocument()
+      expect(screen.getByText('⇧'))!.toBeInTheDocument()
+      expect(screen.getByText('P'))!.toBeInTheDocument()
     })
 
     it('should render goToAddDocuments button', () => {
       render(<Popup />)
 
-      expect(screen.getByText(/pipeline.common.goToAddDocuments/i)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.goToAddDocuments/i))!.toBeInTheDocument()
     })
 
     it('should render API reference link', () => {
       render(<Popup />)
 
-      expect(screen.getByText(/workflow.common.accessAPIReference/i)).toBeInTheDocument()
+      expect(screen.getByText(/workflow.common.accessAPIReference/i))!.toBeInTheDocument()
     })
 
     it('should render publish as template button', () => {
       render(<Popup />)
 
-      expect(screen.getByText(/pipeline.common.publishAs/i)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.publishAs/i))!.toBeInTheDocument()
     })
   })
 
@@ -462,7 +462,7 @@ describe('Popup', () => {
       render(<Popup />)
 
       const button = screen.getByText(/pipeline.common.goToAddDocuments/i).closest('button')
-      expect(button).toBeDisabled()
+      expect(button)!.toBeDisabled()
     })
 
     it('should enable goToAddDocuments when published', () => {
@@ -480,7 +480,7 @@ describe('Popup', () => {
       render(<Popup />)
 
       const button = screen.getByText(/pipeline.common.publishAs/i).closest('button')
-      expect(button).toBeDisabled()
+      expect(button)!.toBeDisabled()
     })
   })
 
@@ -492,7 +492,7 @@ describe('Popup', () => {
 
       render(<Popup />)
 
-      expect(screen.getByText(/billing.upgradeBtn.encourageShort/i)).toBeInTheDocument()
+      expect(screen.getByText(/billing.upgradeBtn.encourageShort/i))!.toBeInTheDocument()
     })
 
     it('should not show premium badge when allowed to publish as template', () => {
@@ -551,7 +551,7 @@ describe('Popup', () => {
 
       render(<Popup />)
 
-      expect(screen.getByText(/workflow.common.autoSaved/i)).toBeInTheDocument()
+      expect(screen.getByText(/workflow.common.autoSaved/i))!.toBeInTheDocument()
     })
 
     it('should show published time when published', () => {
@@ -559,7 +559,7 @@ describe('Popup', () => {
 
       render(<Popup />)
 
-      expect(screen.getByText(/workflow.common.publishedAt/i)).toBeInTheDocument()
+      expect(screen.getByText(/workflow.common.publishedAt/i))!.toBeInTheDocument()
     })
   })
 })
@@ -576,21 +576,21 @@ describe('RunMode', () => {
     it('should render run button with default text', () => {
       render(<RunMode />)
 
-      expect(screen.getByRole('button')).toBeInTheDocument()
-      expect(screen.getByText(/pipeline.common.testRun/i)).toBeInTheDocument()
+      expect(screen.getByRole('button'))!.toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.testRun/i))!.toBeInTheDocument()
     })
 
     it('should render with custom text prop', () => {
       render(<RunMode text="Custom Run" />)
 
-      expect(screen.getByText('Custom Run')).toBeInTheDocument()
+      expect(screen.getByText('Custom Run'))!.toBeInTheDocument()
     })
 
     it('should render keyboard shortcuts when not disabled', () => {
       render(<RunMode />)
 
-      expect(screen.getByText('alt')).toBeInTheDocument()
-      expect(screen.getByText('R')).toBeInTheDocument()
+      expect(screen.getByText('alt'))!.toBeInTheDocument()
+      expect(screen.getByText('R'))!.toBeInTheDocument()
     })
   })
 
@@ -603,7 +603,7 @@ describe('RunMode', () => {
 
       render(<RunMode />)
 
-      expect(screen.getByText(/pipeline.common.processing/i)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.processing/i))!.toBeInTheDocument()
     })
 
     it('should show stop button when running', () => {
@@ -626,7 +626,7 @@ describe('RunMode', () => {
 
       render(<RunMode />)
 
-      expect(screen.getByText(/pipeline.common.reRun/i)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.reRun/i))!.toBeInTheDocument()
     })
 
     it('should show preparing data source state', () => {
@@ -634,7 +634,7 @@ describe('RunMode', () => {
 
       render(<RunMode />)
 
-      expect(screen.getByText(/pipeline.common.preparingDataSource/i)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.preparingDataSource/i))!.toBeInTheDocument()
     })
 
     it('should show cancel button when preparing data source', () => {
@@ -654,7 +654,7 @@ describe('RunMode', () => {
 
       render(<RunMode />)
 
-      expect(screen.getByText(/pipeline.common.reRun/i)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.reRun/i))!.toBeInTheDocument()
     })
 
     it('should show reRun text when workflow status is Stopped', () => {
@@ -665,7 +665,7 @@ describe('RunMode', () => {
 
       render(<RunMode />)
 
-      expect(screen.getByText(/pipeline.common.reRun/i)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.reRun/i))!.toBeInTheDocument()
     })
 
     it('should show reRun text when workflow status is Waiting', () => {
@@ -676,7 +676,7 @@ describe('RunMode', () => {
 
       render(<RunMode />)
 
-      expect(screen.getByText(/pipeline.common.reRun/i)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.reRun/i))!.toBeInTheDocument()
     })
 
     it('should not show stop button when status is not Running', () => {
@@ -726,7 +726,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const runButton = screen.getAllByRole('button')[0]
-      expect(runButton).toBeDisabled()
+      expect(runButton)!.toBeDisabled()
     })
 
     it('should be disabled when preparing data source', () => {
@@ -735,7 +735,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const runButton = screen.getAllByRole('button')[0]
-      expect(runButton).toBeDisabled()
+      expect(runButton)!.toBeDisabled()
     })
 
     it('should not show keyboard shortcuts when disabled', () => {
@@ -768,7 +768,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[1])
+      fireEvent.click(buttons[1]!)
 
       expect(mockHandleStopRun).toHaveBeenCalledWith('task-123')
     })
@@ -779,7 +779,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[1])
+      fireEvent.click(buttons[1]!)
 
       expect(mockSetIsPreparingDataSource).toHaveBeenCalledWith(false)
       expect(mockSetShowDebugAndPreviewPanel).toHaveBeenCalledWith(false)
@@ -794,7 +794,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[1]) // Click stop button
+      fireEvent.click(buttons[1]!) // Click stop button
 
       expect(mockHandleStopRun).toHaveBeenCalledWith('')
     })
@@ -808,7 +808,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const runButton = screen.getAllByRole('button')[0]
-      fireEvent.click(runButton)
+      fireEvent.click(runButton!)
 
       expect(mockHandleWorkflowStartRunInWorkflow).not.toHaveBeenCalled()
     })
@@ -879,7 +879,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const button = screen.getByRole('button')
-      expect(button).toHaveClass('rounded-md')
+      expect(button)!.toHaveClass('rounded-md')
     })
 
     it('should have rounded-l-md class when disabled', () => {
@@ -891,7 +891,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const runButton = screen.getAllByRole('button')[0]
-      expect(runButton).toHaveClass('rounded-l-md')
+      expect(runButton)!.toHaveClass('rounded-l-md')
     })
 
     it('should have cursor-not-allowed when disabled', () => {
@@ -900,7 +900,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const runButton = screen.getAllByRole('button')[0]
-      expect(runButton).toHaveClass('cursor-not-allowed')
+      expect(runButton)!.toHaveClass('cursor-not-allowed')
     })
 
     it('should have bg-state-accent-hover when disabled', () => {
@@ -909,7 +909,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const runButton = screen.getAllByRole('button')[0]
-      expect(runButton).toHaveClass('bg-state-accent-hover')
+      expect(runButton)!.toHaveClass('bg-state-accent-hover')
     })
 
     it('should have bg-state-accent-active on stop button', () => {
@@ -921,7 +921,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const stopButton = screen.getAllByRole('button')[1]
-      expect(stopButton).toHaveClass('bg-state-accent-active')
+      expect(stopButton)!.toHaveClass('bg-state-accent-active')
     })
 
     it('should have rounded-r-md on stop button', () => {
@@ -933,7 +933,7 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const stopButton = screen.getAllByRole('button')[1]
-      expect(stopButton).toHaveClass('rounded-r-md')
+      expect(stopButton)!.toHaveClass('rounded-r-md')
     })
 
     it('should have size-7 on stop button', () => {
@@ -945,26 +945,26 @@ describe('RunMode', () => {
       render(<RunMode />)
 
       const stopButton = screen.getAllByRole('button')[1]
-      expect(stopButton).toHaveClass('size-7')
+      expect(stopButton)!.toHaveClass('size-7')
     })
 
     it('should have correct base classes on run button', () => {
       render(<RunMode />)
 
       const runButton = screen.getByRole('button')
-      expect(runButton).toHaveClass('system-xs-medium')
-      expect(runButton).toHaveClass('h-7')
-      expect(runButton).toHaveClass('px-1.5')
-      expect(runButton).toHaveClass('text-text-accent')
+      expect(runButton)!.toHaveClass('system-xs-medium')
+      expect(runButton)!.toHaveClass('h-7')
+      expect(runButton)!.toHaveClass('px-1.5')
+      expect(runButton)!.toHaveClass('text-text-accent')
     })
 
     it('should have gap-x-px on container', () => {
       const { container } = render(<RunMode />)
 
       const wrapper = container.firstChild as HTMLElement
-      expect(wrapper).toHaveClass('gap-x-px')
-      expect(wrapper).toHaveClass('flex')
-      expect(wrapper).toHaveClass('items-center')
+      expect(wrapper)!.toHaveClass('gap-x-px')
+      expect(wrapper)!.toHaveClass('flex')
+      expect(wrapper)!.toHaveClass('items-center')
     })
   })
 
@@ -994,9 +994,9 @@ describe('Integration', () => {
   it('should render all child components in RagPipelineHeader', () => {
     render(<RagPipelineHeader />)
 
-    expect(screen.getByText(/inputField/i)).toBeInTheDocument()
+    expect(screen.getByText(/inputField/i))!.toBeInTheDocument()
 
-    expect(screen.getByTestId('header-middle')).toBeInTheDocument()
+    expect(screen.getByTestId('header-middle'))!.toBeInTheDocument()
   })
 
   it('should pass correct history URL based on pipelineId', () => {
@@ -1020,7 +1020,7 @@ describe('Edge Cases', () => {
 
       render(<RunMode />)
 
-      expect(screen.getByText(/pipeline.common.testRun/i)).toBeInTheDocument()
+      expect(screen.getByText(/pipeline.common.testRun/i))!.toBeInTheDocument()
     })
 
     it('should handle empty pipelineId', () => {
@@ -1058,7 +1058,7 @@ describe('Edge Cases', () => {
       render(<RunMode />)
 
       const runButton = screen.getAllByRole('button')[0]
-      expect(runButton).toBeDisabled()
+      expect(runButton)!.toBeDisabled()
     })
 
     it('should show testRun text when workflowRunningData is null', () => {
@@ -1078,7 +1078,7 @@ describe('Edge Cases', () => {
 
       render(<RunMode text="Start Pipeline" />)
 
-      expect(screen.getByText('Start Pipeline')).toBeInTheDocument()
+      expect(screen.getByText('Start Pipeline'))!.toBeInTheDocument()
     })
 
     it('should show reRun instead of custom text when workflowRunningData exists', () => {
@@ -1101,8 +1101,8 @@ describe('Edge Cases', () => {
 
       render(<RunMode />)
 
-      expect(screen.getByText('alt')).toBeInTheDocument()
-      expect(screen.getByText('R')).toBeInTheDocument()
+      expect(screen.getByText('alt'))!.toBeInTheDocument()
+      expect(screen.getByText('R'))!.toBeInTheDocument()
     })
 
     it('should have correct structure with play icon when not disabled', () => {
@@ -1112,7 +1112,7 @@ describe('Edge Cases', () => {
       render(<RunMode />)
 
       const button = screen.getByRole('button')
-      expect(button.querySelector('svg')).toBeInTheDocument()
+      expect(button.querySelector('svg'))!.toBeInTheDocument()
     })
 
     it('should have correct structure with loader icon when running', () => {
@@ -1124,8 +1124,8 @@ describe('Edge Cases', () => {
       render(<RunMode />)
 
       const runButton = screen.getAllByRole('button')[0]
-      const spinningIcon = runButton.querySelector('.animate-spin')
-      expect(spinningIcon).toBeInTheDocument()
+      const spinningIcon = runButton!.querySelector('.animate-spin')
+      expect(spinningIcon)!.toBeInTheDocument()
     })
 
     it('should have correct structure with database icon when preparing data source', () => {
@@ -1134,7 +1134,7 @@ describe('Edge Cases', () => {
       render(<RunMode />)
 
       const runButton = screen.getAllByRole('button')[0]
-      expect(runButton.querySelector('svg')).toBeInTheDocument()
+      expect(runButton!.querySelector('svg'))!.toBeInTheDocument()
     })
   })
 
@@ -1145,7 +1145,7 @@ describe('Edge Cases', () => {
 
       render(<Popup />)
 
-      expect(screen.getByText(/workflow.common.autoSaved/i)).toBeInTheDocument()
+      expect(screen.getByText(/workflow.common.autoSaved/i))!.toBeInTheDocument()
     })
 
     it('should handle very old publishedAt timestamp', () => {
@@ -1153,7 +1153,7 @@ describe('Edge Cases', () => {
 
       render(<Popup />)
 
-      expect(screen.getByText(/workflow.common.latestPublished/i)).toBeInTheDocument()
+      expect(screen.getByText(/workflow.common.latestPublished/i))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/index.spec.ts b/web/app/components/rag-pipeline/hooks/__tests__/index.spec.ts
index 136f0bfc62..a83c44faf4 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/index.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/__tests__/index.spec.ts
@@ -388,12 +388,12 @@ describe('useConfigurations', () => {
     const { result } = renderHook(() => useConfigurations(variables))
 
     expect(result.current.length).toBe(1)
-    expect(result.current[0].variable).toBe('textVar')
-    expect(result.current[0].label).toBe('Text Label')
-    expect(result.current[0].required).toBe(true)
-    expect(result.current[0].maxLength).toBe(100)
-    expect(result.current[0].placeholder).toBe('Enter text')
-    expect(result.current[0].tooltip).toBe('Help text')
+    expect(result.current[0]!.variable).toBe('textVar')
+    expect(result.current[0]!.label).toBe('Text Label')
+    expect(result.current[0]!.required).toBe(true)
+    expect(result.current[0]!.maxLength).toBe(100)
+    expect(result.current[0]!.placeholder).toBe('Enter text')
+    expect(result.current[0]!.tooltip).toBe('Help text')
   })
 
   it('should transform options correctly', () => {
@@ -410,7 +410,7 @@ describe('useConfigurations', () => {
 
     const { result } = renderHook(() => useConfigurations(variables))
 
-    expect(result.current[0].options).toEqual([
+    expect(result.current[0]!.options).toEqual([
       { label: 'option1', value: 'option1' },
       { label: 'option2', value: 'option2' },
       { label: 'option3', value: 'option3' },
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/use-input-fields.spec.ts b/web/app/components/rag-pipeline/hooks/__tests__/use-input-fields.spec.ts
index ad6f97a2f4..c81f230252 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/use-input-fields.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/__tests__/use-input-fields.spec.ts
@@ -154,7 +154,7 @@ describe('useConfigurations', () => {
     ] as unknown as RAGPipelineVariables
     const { result } = renderHook(() => useConfigurations(variables))
 
-    expect(result.current[0].options).toEqual([
+    expect(result.current[0]!.options).toEqual([
       { label: 'red', value: 'red' },
       { label: 'green', value: 'green' },
       { label: 'blue', value: 'blue' },
@@ -167,7 +167,7 @@ describe('useConfigurations', () => {
     ] as unknown as RAGPipelineVariables
     const { result } = renderHook(() => useConfigurations(variables))
 
-    expect(result.current[0].options).toBeUndefined()
+    expect(result.current[0]!.options).toBeUndefined()
   })
 
   it('should include file-related fields for file type', () => {
@@ -182,9 +182,9 @@ describe('useConfigurations', () => {
     ] as unknown as RAGPipelineVariables
     const { result } = renderHook(() => useConfigurations(variables))
 
-    expect(result.current[0].allowedFileTypes).toEqual(['pdf', 'docx'])
-    expect(result.current[0].allowedFileExtensions).toEqual(['.pdf', '.docx'])
-    expect(result.current[0].allowedFileUploadMethods).toEqual(['local', 'remote'])
+    expect(result.current[0]!.allowedFileTypes).toEqual(['pdf', 'docx'])
+    expect(result.current[0]!.allowedFileExtensions).toEqual(['.pdf', '.docx'])
+    expect(result.current[0]!.allowedFileUploadMethods).toEqual(['local', 'remote'])
   })
 
   it('should include showConditions as empty array', () => {
@@ -193,7 +193,7 @@ describe('useConfigurations', () => {
     ] as unknown as RAGPipelineVariables
     const { result } = renderHook(() => useConfigurations(variables))
 
-    expect(result.current[0].showConditions).toEqual([])
+    expect(result.current[0]!.showConditions).toEqual([])
   })
 
   it('should handle multiple variables', () => {
@@ -205,9 +205,9 @@ describe('useConfigurations', () => {
     const { result } = renderHook(() => useConfigurations(variables))
 
     expect(result.current).toHaveLength(3)
-    expect(result.current[0].variable).toBe('a')
-    expect(result.current[1].variable).toBe('b')
-    expect(result.current[2].variable).toBe('c')
+    expect(result.current[0]!.variable).toBe('a')
+    expect(result.current[1]!.variable).toBe('b')
+    expect(result.current[2]!.variable).toBe('c')
   })
 
   it('should include unit field', () => {
@@ -216,6 +216,6 @@ describe('useConfigurations', () => {
     ] as unknown as RAGPipelineVariables
     const { result } = renderHook(() => useConfigurations(variables))
 
-    expect(result.current[0].unit).toBe('px')
+    expect(result.current[0]!.unit).toBe('px')
   })
 })
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/use-nodes-sync-draft.spec.ts b/web/app/components/rag-pipeline/hooks/__tests__/use-nodes-sync-draft.spec.ts
index 6d807565d9..0f68a8ea4f 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/use-nodes-sync-draft.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/__tests__/use-nodes-sync-draft.spec.ts
@@ -198,7 +198,7 @@ describe('useNodesSyncDraft', () => {
       })
 
       expect(mockPostWithKeepalive).toHaveBeenCalled()
-      const sentParams = mockPostWithKeepalive.mock.calls[0][1]
+      const sentParams = mockPostWithKeepalive.mock.calls[0]![1]
       expect(sentParams.graph.nodes[0].data._privateData).toBeUndefined()
     })
   })
@@ -390,7 +390,7 @@ describe('useNodesSyncDraft', () => {
         result.current.syncWorkflowDraftWhenPageClose()
       })
 
-      const sentParams = mockPostWithKeepalive.mock.calls[0][1]
+      const sentParams = mockPostWithKeepalive.mock.calls[0]![1]
       expect(sentParams.graph.viewport).toEqual({ x: 100, y: 200, zoom: 1.5 })
     })
 
@@ -413,7 +413,7 @@ describe('useNodesSyncDraft', () => {
         result.current.syncWorkflowDraftWhenPageClose()
       })
 
-      const sentParams = mockPostWithKeepalive.mock.calls[0][1]
+      const sentParams = mockPostWithKeepalive.mock.calls[0]![1]
       expect(sentParams.environment_variables).toEqual([{ key: 'API_KEY', value: 'secret' }])
     })
 
@@ -436,7 +436,7 @@ describe('useNodesSyncDraft', () => {
         result.current.syncWorkflowDraftWhenPageClose()
       })
 
-      const sentParams = mockPostWithKeepalive.mock.calls[0][1]
+      const sentParams = mockPostWithKeepalive.mock.calls[0]![1]
       expect(sentParams.rag_pipeline_variables).toEqual([{ variable: 'input', type: 'text-input' }])
     })
 
@@ -451,7 +451,7 @@ describe('useNodesSyncDraft', () => {
         result.current.syncWorkflowDraftWhenPageClose()
       })
 
-      const sentParams = mockPostWithKeepalive.mock.calls[0][1]
+      const sentParams = mockPostWithKeepalive.mock.calls[0]![1]
       expect(sentParams.source_workflow_id).toBeUndefined()
     })
 
@@ -471,7 +471,7 @@ describe('useNodesSyncDraft', () => {
         result.current.syncWorkflowDraftWhenPageClose()
       })
 
-      const sentParams = mockPostWithKeepalive.mock.calls[0][1]
+      const sentParams = mockPostWithKeepalive.mock.calls[0]![1]
       expect(sentParams.graph.edges[0].data._hidden).toBeUndefined()
       expect(sentParams.graph.edges[0].data.visible).toBe(false)
     })
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-config.spec.ts b/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-config.spec.ts
index 0b2c68bf68..412fd299d1 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-config.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-config.spec.ts
@@ -223,7 +223,7 @@ describe('usePipelineConfig', () => {
 
       capturedCallback?.(dataSourceList)
 
-      expect(dataSourceList[0].declaration.identity.icon).toBe('/base/icon.png')
+      expect(dataSourceList[0]!.declaration.identity.icon).toBe('/base/icon.png')
     })
 
     it('should not modify icon if it already includes basePath', () => {
@@ -240,7 +240,7 @@ describe('usePipelineConfig', () => {
 
       capturedCallback?.(dataSourceList)
 
-      expect(dataSourceList[0].declaration.identity.icon).toBe('/base/icon.png')
+      expect(dataSourceList[0]!.declaration.identity.icon).toBe('/base/icon.png')
     })
 
     it('should handle non-string icon', () => {
@@ -257,7 +257,7 @@ describe('usePipelineConfig', () => {
 
       capturedCallback?.(dataSourceList)
 
-      expect(dataSourceList[0].declaration.identity.icon).toEqual({ url: '/icon.png' })
+      expect(dataSourceList[0]!.declaration.identity.icon).toEqual({ url: '/icon.png' })
     })
   })
 
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-template.spec.ts b/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-template.spec.ts
index 1214ea84c0..58ee642500 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-template.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-template.spec.ts
@@ -25,7 +25,7 @@ describe('usePipelineTemplate', () => {
     const { result } = renderHook(() => usePipelineTemplate())
 
     expect(result.current.nodes).toHaveLength(1)
-    expect(result.current.nodes[0].id).toBe('knowledgeBase')
+    expect(result.current.nodes[0]!.id).toBe('knowledgeBase')
   })
 
   it('should return empty edges array', () => {
@@ -37,25 +37,25 @@ describe('usePipelineTemplate', () => {
   it('should set node type from knowledge-base default', () => {
     const { result } = renderHook(() => usePipelineTemplate())
 
-    expect(result.current.nodes[0].data.type).toBe('knowledge-base')
+    expect(result.current.nodes[0]!.data.type).toBe('knowledge-base')
   })
 
   it('should set node as selected', () => {
     const { result } = renderHook(() => usePipelineTemplate())
 
-    expect(result.current.nodes[0].data.selected).toBe(true)
+    expect(result.current.nodes[0]!.data.selected).toBe(true)
   })
 
   it('should position node offset from START_INITIAL_POSITION', () => {
     const { result } = renderHook(() => usePipelineTemplate())
 
-    expect(result.current.nodes[0].position.x).toBe(600)
-    expect(result.current.nodes[0].position.y).toBe(200)
+    expect(result.current.nodes[0]!.position.x).toBe(600)
+    expect(result.current.nodes[0]!.position.y).toBe(200)
   })
 
   it('should translate node title', () => {
     const { result } = renderHook(() => usePipelineTemplate())
 
-    expect(result.current.nodes[0].data.title).toBe('workflow.blocks.knowledge-base')
+    expect(result.current.nodes[0]!.data.title).toBe('workflow.blocks.knowledge-base')
   })
 })
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline.spec.ts b/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline.spec.ts
index bca23fa602..80a9d5b7c6 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline.spec.ts
@@ -213,7 +213,7 @@ describe('usePipeline', () => {
         )
       })
 
-      const setNodesArg = mockSetNodes.mock.calls[0][0]
+      const setNodesArg = mockSetNodes.mock.calls[0]![0]
       expect(setNodesArg).toContain(dsNode)
       expect(setNodesArg).toContain(updatedNode2)
       expect(setNodesArg).toContain(node3)
@@ -277,7 +277,7 @@ describe('usePipeline', () => {
       const isUsed = result.current.isVarUsedInNodes(['rag', 'ds-1', 'var1'])
       expect(isUsed).toBe(true)
 
-      const nodesArg = mockFindUsedVarNodes.mock.calls[0][1] as Array<{ id: string }>
+      const nodesArg = mockFindUsedVarNodes.mock.calls[0]![1] as Array<{ id: string }>
       const nodeIds = nodesArg.map(n => n.id)
       expect(nodeIds).toContain('ds-1')
       expect(nodeIds).toContain('node-2')
@@ -312,7 +312,7 @@ describe('usePipeline', () => {
 
       result.current.isVarUsedInNodes(['rag', 'ds-1', 'var1'])
 
-      const nodesArg = mockFindUsedVarNodes.mock.calls[0][1] as Array<{ id: string }>
+      const nodesArg = mockFindUsedVarNodes.mock.calls[0]![1] as Array<{ id: string }>
       const nodeIds = nodesArg.map(n => n.id)
       const uniqueIds = [...new Set(nodeIds)]
       expect(nodeIds.length).toBe(uniqueIds.length)
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/use-rag-pipeline-search.spec.tsx b/web/app/components/rag-pipeline/hooks/__tests__/use-rag-pipeline-search.spec.tsx
index a06d1ba334..b49960c5a4 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/use-rag-pipeline-search.spec.tsx
+++ b/web/app/components/rag-pipeline/hooks/__tests__/use-rag-pipeline-search.spec.tsx
@@ -129,7 +129,7 @@ describe('useRagPipelineSearch', () => {
       const results = searchFn('GPT')
 
       expect(results.length).toBeGreaterThan(0)
-      expect(results[0].title).toBe('GPT Model')
+      expect(results[0]!.title).toBe('GPT Model')
     })
 
     it('should find nodes by type', () => {
@@ -176,7 +176,7 @@ describe('useRagPipelineSearch', () => {
       const searchFn = mockRagPipelineNodesAction.searchFn!
       const results = searchFn('Search')
 
-      expect(results[0].title).toBe('Web Search')
+      expect(results[0]!.title).toBe('Web Search')
     })
 
     it('should return empty array when no nodes match', () => {
@@ -215,7 +215,7 @@ describe('useRagPipelineSearch', () => {
       const searchFn = mockRagPipelineNodesAction.searchFn!
       const results = searchFn('Start')
 
-      expect(results[0].type).toBe('workflow-node')
+      expect(results[0]!.type).toBe('workflow-node')
     })
   })
 })
diff --git a/web/app/components/rag-pipeline/hooks/use-pipeline.tsx b/web/app/components/rag-pipeline/hooks/use-pipeline.tsx
index c84bba660d..8cca8f63ea 100644
--- a/web/app/components/rag-pipeline/hooks/use-pipeline.tsx
+++ b/web/app/components/rag-pipeline/hooks/use-pipeline.tsx
@@ -72,7 +72,7 @@ export const usePipeline = () => {
 
   const isVarUsedInNodes = useCallback((varSelector: ValueSelector) => {
     const nodeId = varSelector[1] // Assuming the first element is always 'VARIABLE_PREFIX'(rag)
-    const afterNodes = getAllNodesInSameBranch(nodeId)
+    const afterNodes = getAllNodesInSameBranch(nodeId!)
     const effectNodes = findUsedVarNodes(varSelector, afterNodes)
     return effectNodes.length > 0
   }, [getAllNodesInSameBranch])
@@ -95,7 +95,7 @@ export const usePipeline = () => {
   const removeUsedVarInNodes = useCallback((varSelector: ValueSelector) => {
     const nodeId = varSelector[1] // Assuming the first element is always 'VARIABLE_PREFIX'(rag)
     const { getNodes, setNodes } = store.getState()
-    const afterNodes = getAllNodesInSameBranch(nodeId)
+    const afterNodes = getAllNodesInSameBranch(nodeId!)
     const effectNodes = findUsedVarNodes(varSelector, afterNodes)
     if (effectNodes.length > 0) {
       const newNodes = getNodes().map((node) => {
diff --git a/web/app/components/rag-pipeline/store/__tests__/index.spec.ts b/web/app/components/rag-pipeline/store/__tests__/index.spec.ts
index c978332a71..18d1da4597 100644
--- a/web/app/components/rag-pipeline/store/__tests__/index.spec.ts
+++ b/web/app/components/rag-pipeline/store/__tests__/index.spec.ts
@@ -89,7 +89,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       expect(mockSet).toHaveBeenCalledWith(expect.any(Function))
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ showInputFieldPanel: true })
     })
@@ -100,7 +100,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setShowInputFieldPanel(false)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ showInputFieldPanel: false })
     })
@@ -113,7 +113,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setShowInputFieldPreviewPanel(true)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ showInputFieldPreviewPanel: true })
     })
@@ -124,7 +124,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setShowInputFieldPreviewPanel(false)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ showInputFieldPreviewPanel: false })
     })
@@ -138,7 +138,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setInputFieldEditPanelProps(props)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ inputFieldEditPanelProps: props })
     })
@@ -149,7 +149,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setInputFieldEditPanelProps(null)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ inputFieldEditPanelProps: null })
     })
@@ -163,7 +163,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setNodesDefaultConfigs(configs)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ nodesDefaultConfigs: configs })
     })
@@ -174,7 +174,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setNodesDefaultConfigs({})
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ nodesDefaultConfigs: {} })
     })
@@ -190,7 +190,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setRagPipelineVariables(variables)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ ragPipelineVariables: variables })
     })
@@ -201,7 +201,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setRagPipelineVariables([])
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ ragPipelineVariables: [] })
     })
@@ -218,7 +218,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setDataSourceList(dataSourceList)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result.dataSourceList).toHaveLength(2)
       expect(result.dataSourceList![0]).toEqual({ name: 'source1', key: 'key1', transformed: true })
@@ -231,7 +231,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setDataSourceList([])
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result.dataSourceList).toEqual([])
     })
@@ -244,7 +244,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setIsPreparingDataSource(true)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ isPreparingDataSource: true })
     })
@@ -255,7 +255,7 @@ describe('createRagPipelineSliceSlice', () => {
 
       slice.setIsPreparingDataSource(false)
 
-      const setterFn = mockSet.mock.calls[0][0] as () => Partial<RagPipelineSliceShape>
+      const setterFn = mockSet.mock.calls[0]![0] as () => Partial<RagPipelineSliceShape>
       const result = setterFn()
       expect(result).toEqual({ isPreparingDataSource: false })
     })
diff --git a/web/app/components/rag-pipeline/utils/__tests__/index.spec.ts b/web/app/components/rag-pipeline/utils/__tests__/index.spec.ts
index 787cc018b9..3136c61443 100644
--- a/web/app/components/rag-pipeline/utils/__tests__/index.spec.ts
+++ b/web/app/components/rag-pipeline/utils/__tests__/index.spec.ts
@@ -90,8 +90,8 @@ describe('processNodesWithoutDataSource', () => {
       const result = processNodesWithoutDataSource(nodes, viewport)
 
       expect(result.nodes.length).toBe(3)
-      expect(result.nodes[0].id).toBe('data-source-empty')
-      expect(result.nodes[1].id).toBe('note')
+      expect(result.nodes[0]!.id).toBe('data-source-empty')
+      expect(result.nodes[1]!.id).toBe('note')
       expect(result.nodes[2]).toBe(nodes[0])
     })
 
@@ -120,8 +120,8 @@ describe('processNodesWithoutDataSource', () => {
 
       const result = processNodesWithoutDataSource(nodes, viewport)
 
-      expect(result.nodes[0].position.x).toBe(-200)
-      expect(result.nodes[0].position.y).toBe(100)
+      expect(result.nodes[0]!.position.x).toBe(-200)
+      expect(result.nodes[0]!.position.y).toBe(100)
     })
 
     it('should adjust viewport based on new node position', () => {
@@ -195,8 +195,8 @@ describe('processNodesWithoutDataSource', () => {
       const noteNode = result.nodes[1]
 
       // Note node should be 100px below data source empty node
-      expect(noteNode.position.x).toBe(dataSourceEmptyNode.position.x)
-      expect(noteNode.position.y).toBe(dataSourceEmptyNode.position.y + 100)
+      expect(noteNode!.position.x).toBe(dataSourceEmptyNode!.position.x)
+      expect(noteNode!.position.y).toBe(dataSourceEmptyNode!.position.y + 100)
     })
 
     it('should set correct data for data source empty node', () => {
@@ -211,9 +211,9 @@ describe('processNodesWithoutDataSource', () => {
 
       const result = processNodesWithoutDataSource(nodes)
 
-      expect(result.nodes[0].data.type).toBe(BlockEnum.DataSourceEmpty)
-      expect(result.nodes[0].data._isTempNode).toBe(true)
-      expect(result.nodes[0].data.width).toBe(240)
+      expect(result.nodes[0]!.data.type).toBe(BlockEnum.DataSourceEmpty)
+      expect(result.nodes[0]!.data._isTempNode).toBe(true)
+      expect(result.nodes[0]!.data.width).toBe(240)
     })
 
     it('should set correct data for note node', () => {
@@ -229,7 +229,7 @@ describe('processNodesWithoutDataSource', () => {
       const result = processNodesWithoutDataSource(nodes)
 
       const noteNode = result.nodes[1]
-      const noteData = noteNode.data as Record<string, unknown>
+      const noteData = noteNode!.data as Record<string, unknown>
       expect(noteData._isTempNode).toBe(true)
       expect(noteData.theme).toBe('blue')
       expect(noteData.width).toBe(240)
@@ -303,8 +303,8 @@ describe('processNodesWithoutDataSource', () => {
 
       const result = processNodesWithoutDataSource(nodes)
 
-      expect(result.nodes[0].position.x).toBe(-500)
-      expect(result.nodes[0].position.y).toBe(-50)
+      expect(result.nodes[0]!.position.x).toBe(-500)
+      expect(result.nodes[0]!.position.y).toBe(-50)
     })
 
     it('should handle undefined viewport gracefully', () => {
diff --git a/web/app/components/rag-pipeline/utils/nodes.ts b/web/app/components/rag-pipeline/utils/nodes.ts
index 001c14dd3c..00c3d831b8 100644
--- a/web/app/components/rag-pipeline/utils/nodes.ts
+++ b/web/app/components/rag-pipeline/utils/nodes.ts
@@ -17,17 +17,17 @@ export const processNodesWithoutDataSource = (nodes: Node[], viewport?: Viewport
   for (let i = 0; i < nodes.length; i++) {
     const node = nodes[i]
 
-    if (node.data.type === BlockEnum.DataSource) {
+    if (node!.data.type === BlockEnum.DataSource) {
       return {
         nodes,
         viewport,
       }
     }
 
-    if (node.type === CUSTOM_NODE && !leftNode)
+    if (node!.type === CUSTOM_NODE && !leftNode)
       leftNode = node
 
-    if (node.type === CUSTOM_NODE && leftNode && node.position.x < leftNode.position.x)
+    if (node!.type === CUSTOM_NODE && leftNode && node!.position.x < leftNode.position.x)
       leftNode = node
   }
 
diff --git a/web/app/components/share/text-generation/__tests__/text-generation-result-panel.spec.tsx b/web/app/components/share/text-generation/__tests__/text-generation-result-panel.spec.tsx
index 60c109feec..e0d361eefb 100644
--- a/web/app/components/share/text-generation/__tests__/text-generation-result-panel.spec.tsx
+++ b/web/app/components/share/text-generation/__tests__/text-generation-result-panel.spec.tsx
@@ -50,12 +50,12 @@ const batchTasks = [
     id: 1,
     status: TaskStatus.completed,
     params: { inputs: { name: 'Alpha' } },
-  },
+  }!,
   {
     id: 2,
     status: TaskStatus.failed,
     params: { inputs: { name: 'Beta' } },
-  },
+  }!,
 ]
 
 const baseProps = {
@@ -68,7 +68,7 @@ const baseProps = {
   controlRetry: 88,
   controlSend: 77,
   controlStopResponding: 66,
-  exportRes: [{ 'Name': 'Alpha', 'share.generation.completionResult': 'Done' }],
+  exportRes: [{ 'Name': 'Alpha', 'share.generation.completionResult': 'Done' }!],
   handleCompleted: vi.fn(),
   handleRetryAllFailedTask: vi.fn(),
   handleSaveMessage: vi.fn(async () => {}),
@@ -99,7 +99,7 @@ describe('TextGenerationResultPanel', () => {
   it('should render a single result in run-once mode and pass non-batch props', () => {
     render(<TextGenerationResultPanel {...baseProps} />)
 
-    expect(screen.getByTestId('res-single')).toBeInTheDocument()
+    expect(screen.getByTestId('res-single'))!.toBeInTheDocument()
     expect(resPropsSpy).toHaveBeenCalledWith(expect.objectContaining({
       appId: 'app-123',
       appSourceType: AppSourceType.webApp,
@@ -121,16 +121,16 @@ describe('TextGenerationResultPanel', () => {
     render(
       <TextGenerationResultPanel
         {...baseProps}
-        allFailedTaskList={[batchTasks[1]]}
-        allSuccessTaskList={[batchTasks[0]]}
+        allFailedTaskList={[batchTasks[1]!]}
+        allSuccessTaskList={[batchTasks[0]!]}
         isCallBatchAPI
         noPendingTask={false}
         handleRetryAllFailedTask={handleRetryAllFailedTask}
       />,
     )
 
-    expect(screen.getByTestId('res-1')).toBeInTheDocument()
-    expect(screen.getByTestId('res-2')).toBeInTheDocument()
+    expect(screen.getByTestId('res-1'))!.toBeInTheDocument()
+    expect(screen.getByTestId('res-2'))!.toBeInTheDocument()
     expect(resPropsSpy).toHaveBeenNthCalledWith(1, expect.objectContaining({
       inputs: { name: 'Alpha' },
       isError: false,
@@ -144,15 +144,15 @@ describe('TextGenerationResultPanel', () => {
       controlRetry: 88,
       taskId: 2,
     }))
-    expect(screen.getByText('share.generation.executions:{"num":2}')).toBeInTheDocument()
-    expect(screen.getByTestId('res-download-mock')).toBeInTheDocument()
+    expect(screen.getByText('share.generation.executions:{"num":2}'))!.toBeInTheDocument()
+    expect(screen.getByTestId('res-download-mock'))!.toBeInTheDocument()
     expect(resDownloadPropsSpy).toHaveBeenCalledWith(expect.objectContaining({
       isMobile: false,
       values: baseProps.exportRes,
     }))
-    expect(screen.getByText('share.generation.batchFailed.info:{"num":1}')).toBeInTheDocument()
-    expect(screen.getByText('share.generation.batchFailed.retry')).toBeInTheDocument()
-    expect(screen.getByRole('status', { name: 'appApi.loading' })).toBeInTheDocument()
+    expect(screen.getByText('share.generation.batchFailed.info:{"num":1}'))!.toBeInTheDocument()
+    expect(screen.getByText('share.generation.batchFailed.retry'))!.toBeInTheDocument()
+    expect(screen.getByRole('status', { name: 'appApi.loading' }))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText('share.generation.batchFailed.retry'))
     expect(handleRetryAllFailedTask).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/share/text-generation/hooks/use-text-generation-batch.ts b/web/app/components/share/text-generation/hooks/use-text-generation-batch.ts
index 65ef4d775a..a0259f33db 100644
--- a/web/app/components/share/text-generation/hooks/use-text-generation-batch.ts
+++ b/web/app/components/share/text-generation/hooks/use-text-generation-batch.ts
@@ -61,7 +61,7 @@ export const useTextGenerationBatch = ({
       if (!isMapVarName)
         return
 
-      if (item.name !== headerData[index])
+      if (item.name !== headerData![index])
         isMapVarName = false
     })
 
@@ -81,7 +81,7 @@ export const useTextGenerationBatch = ({
       .map(item => payloadData.indexOf(item))
     if (emptyLineIndexes.length > 0) {
       let hasMiddleEmptyLine = false
-      let startIndex = emptyLineIndexes[0] - 1
+      let startIndex = emptyLineIndexes[0]! - 1
       emptyLineIndexes.forEach((index) => {
         if (hasMiddleEmptyLine)
           return
diff --git a/web/app/components/share/text-generation/result/__tests__/workflow-stream-handlers.spec.ts b/web/app/components/share/text-generation/result/__tests__/workflow-stream-handlers.spec.ts
index 45d5ded302..63c0f43de0 100644
--- a/web/app/components/share/text-generation/result/__tests__/workflow-stream-handlers.spec.ts
+++ b/web/app/components/share/text-generation/result/__tests__/workflow-stream-handlers.spec.ts
@@ -192,8 +192,8 @@ describe('workflow-stream-handlers helpers', () => {
     markNodesStopped(stoppedWorkflow.tracing)
 
     expect(stoppedWorkflow.status).toBe(WorkflowRunningStatus.Stopped)
-    expect(stoppedWorkflow.tracing[0].status).toBe(NodeRunningStatus.Stopped)
-    expect(stoppedWorkflow.tracing[0].details?.[0][0].status).toBe(NodeRunningStatus.Stopped)
+    expect(stoppedWorkflow.tracing[0]!.status).toBe(NodeRunningStatus.Stopped)
+    expect(stoppedWorkflow.tracing[0]!.details?.[0]![0]!.status).toBe(NodeRunningStatus.Stopped)
   })
 
   it('should cover unmatched and replacement helper branches', () => {
@@ -291,7 +291,7 @@ describe('workflow-stream-handlers helpers', () => {
 
     markNodesStopped(undefined)
 
-    expect(parallelMatched.tracing[0].details).toHaveLength(2)
+    expect(parallelMatched.tracing[0]!.details).toHaveLength(2)
     expect(notFinished).toEqual(expect.objectContaining({
       expand: true,
       tracing: process.tracing,
@@ -311,7 +311,7 @@ describe('workflow-stream-handlers helpers', () => {
     }))
     expect(succeededWorkflow.status).toBe(WorkflowRunningStatus.Succeeded)
     expect(outputlessWorkflow.files).toEqual([])
-    expect(updatedHumanInput.humanInputFormDataList?.[0].expiration_time).toBe(300)
+    expect(updatedHumanInput.humanInputFormDataList?.[0]!.expiration_time).toBe(300)
     expect(appendedHumanInput.humanInputFormDataList).toHaveLength(2)
     expect(noListFilled.humanInputFilledFormDataList).toHaveLength(1)
     expect(appendedFilled.humanInputFilledFormDataList).toHaveLength(2)
@@ -319,7 +319,7 @@ describe('workflow-stream-handlers helpers', () => {
       status: WorkflowRunningStatus.Running,
       tracing: [],
     }))
-    expect(timeoutWithMatch.humanInputFormDataList?.[0].expiration_time).toBe(400)
+    expect(timeoutWithMatch.humanInputFormDataList?.[0]!.expiration_time).toBe(400)
   })
 })
 
@@ -717,7 +717,7 @@ describe('createWorkflowStreamHandlers', () => {
     })
 
     expect(existingProcess.status).toBe(WorkflowRunningStatus.Stopped)
-    expect(existingProcess.tracing[0].status).toBe(NodeRunningStatus.Stopped)
+    expect(existingProcess.tracing[0]!.status).toBe(NodeRunningStatus.Stopped)
     expect(setup.onCompleted).toHaveBeenCalledWith('', 5, false)
 
     const noOutputSetup = setupHandlers()
diff --git a/web/app/components/share/text-generation/result/result-request.ts b/web/app/components/share/text-generation/result/result-request.ts
index 95b2353dff..aa26b75eee 100644
--- a/web/app/components/share/text-generation/result/result-request.ts
+++ b/web/app/components/share/text-generation/result/result-request.ts
@@ -132,7 +132,7 @@ export const buildResultRequestData = ({
   promptConfig?.prompt_variables.forEach((variable) => {
     const value = processedInputs[variable.key]
     if (variable.type === 'file' && value && typeof value === 'object' && !Array.isArray(value)) {
-      processedInputs[variable.key] = getProcessedFiles([value as FileEntity])[0]
+      processedInputs[variable.key] = getProcessedFiles([value as FileEntity])[0]!
       return
     }
 
diff --git a/web/app/components/share/text-generation/result/workflow-stream-handlers.ts b/web/app/components/share/text-generation/result/workflow-stream-handlers.ts
index 48b132587e..f7db4c6b24 100644
--- a/web/app/components/share/text-generation/result/workflow-stream-handlers.ts
+++ b/web/app/components/share/text-generation/result/workflow-stream-handlers.ts
@@ -118,8 +118,8 @@ const finishWorkflowNode = (current: WorkflowProcess | undefined, data: NodeTrac
     const currentIndex = draft.tracing.findIndex(trace => matchParallelTrace(trace, data))
     if (currentIndex > -1) {
       draft.tracing[currentIndex] = {
-        ...(draft.tracing[currentIndex].extras
-          ? { extras: draft.tracing[currentIndex].extras }
+        ...(draft.tracing[currentIndex]!.extras
+          ? { extras: draft.tracing[currentIndex]!.extras }
           : {}),
         ...data,
         expand: !!data.error,
@@ -195,7 +195,7 @@ const updateHumanInputRequired = (
 
     const currentIndex = draft.tracing.findIndex(item => item.node_id === data.node_id)
     if (currentIndex > -1)
-      draft.tracing[currentIndex].status = NodeRunningStatus.Paused
+      draft.tracing[currentIndex]!.status = NodeRunningStatus.Paused
   })
 }
 
@@ -227,7 +227,7 @@ const updateHumanInputTimeout = (
 
     const currentFormIndex = draft.humanInputFormDataList.findIndex(item => item.node_id === data.node_id)
     if (currentFormIndex > -1)
-      draft.humanInputFormDataList[currentFormIndex].expiration_time = data.expiration_time
+      draft.humanInputFormDataList[currentFormIndex]!.expiration_time = data.expiration_time
   })
 }
 
@@ -354,10 +354,10 @@ export const createWorkflowStreamHandlers = ({
       setCompletionRes(serializedOutputs)
       if (data.outputs) {
         const outputKeys = Object.keys(data.outputs)
-        const isStringOutput = outputKeys.length === 1 && typeof data.outputs[outputKeys[0]] === 'string'
+        const isStringOutput = outputKeys.length === 1 && typeof data.outputs[outputKeys[0]!] === 'string'
         if (isStringOutput) {
           setWorkflowProcessData(updateWorkflowProcess(getWorkflowProcessData(), (draft) => {
-            draft.resultText = data.outputs[outputKeys[0]]
+            draft.resultText = data.outputs[outputKeys[0]!]
           }))
         }
       }
diff --git a/web/app/components/share/text-generation/run-batch/csv-download/__tests__/index.spec.tsx b/web/app/components/share/text-generation/run-batch/csv-download/__tests__/index.spec.tsx
index 6a9bb21797..c622278bc2 100644
--- a/web/app/components/share/text-generation/run-batch/csv-download/__tests__/index.spec.tsx
+++ b/web/app/components/share/text-generation/run-batch/csv-download/__tests__/index.spec.tsx
@@ -29,10 +29,10 @@ describe('CSVDownload', () => {
   it('should render table headers and sample row for each variable', () => {
     render(<CSVDownload vars={vars} />)
 
-    expect(screen.getByText('share.generation.csvStructureTitle')).toBeInTheDocument()
-    expect(screen.getAllByRole('row')[0].children).toHaveLength(2)
-    expect(screen.getByText('prompt share.generation.field')).toBeInTheDocument()
-    expect(screen.getByText('context share.generation.field')).toBeInTheDocument()
+    expect(screen.getByText('share.generation.csvStructureTitle'))!.toBeInTheDocument()
+    expect(screen.getAllByRole('row')[0]!.children).toHaveLength(2)
+    expect(screen.getByText('prompt share.generation.field'))!.toBeInTheDocument()
+    expect(screen.getByText('context share.generation.field'))!.toBeInTheDocument()
   })
 
   it('should configure CSV downloader with template data', () => {
@@ -44,6 +44,6 @@ describe('CSVDownload', () => {
     expect(capturedProps?.data).toEqual([
       { prompt: '', context: '' },
     ])
-    expect(screen.getByText('share.generation.downloadTemplate')).toBeInTheDocument()
+    expect(screen.getByText('share.generation.downloadTemplate'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/share/text-generation/run-once/__tests__/index.spec.tsx b/web/app/components/share/text-generation/run-once/__tests__/index.spec.tsx
index 65043ce0c2..628bf9bd85 100644
--- a/web/app/components/share/text-generation/run-once/__tests__/index.spec.tsx
+++ b/web/app/components/share/text-generation/run-once/__tests__/index.spec.tsx
@@ -161,7 +161,7 @@ describe('RunOnce', () => {
       expect(onVisionFilesChange).toHaveBeenCalledWith([])
     })
 
-    expect(screen.getByText('common.imageUploader.imageUpload')).toBeInTheDocument()
+    expect(screen.getByText('common.imageUploader.imageUpload'))!.toBeInTheDocument()
   })
 
   it('should update inputs when user edits fields', async () => {
@@ -187,7 +187,7 @@ describe('RunOnce', () => {
     expect(checkbox).toBeTruthy()
     fireEvent.click(checkbox as HTMLElement)
 
-    const latest = onInputsChange.mock.calls[onInputsChange.mock.calls.length - 1][0]
+    const latest = onInputsChange.mock.calls[onInputsChange.mock.calls.length - 1]![0]
     expect(latest).toEqual({
       textInput: 'new text',
       paragraphInput: 'paragraph value',
@@ -248,7 +248,7 @@ describe('RunOnce', () => {
       expect(onInputsChange).toHaveBeenCalled()
     })
     const stopButton = screen.getByTestId('stop-button')
-    expect(stopButton).toBeDisabled()
+    expect(stopButton)!.toBeDisabled()
   })
 
   describe('select input type', () => {
@@ -271,7 +271,7 @@ describe('RunOnce', () => {
           selectInput: 'Option A',
         })
       })
-      expect(screen.getByText('Select Input')).toBeInTheDocument()
+      expect(screen.getByText('Select Input'))!.toBeInTheDocument()
     })
   })
 
@@ -293,7 +293,7 @@ describe('RunOnce', () => {
           fileInput: undefined,
         })
       })
-      expect(screen.getByText('File Input')).toBeInTheDocument()
+      expect(screen.getByText('File Input'))!.toBeInTheDocument()
     })
 
     it('should render file uploader for file-list input', async () => {
@@ -313,7 +313,7 @@ describe('RunOnce', () => {
           fileListInput: [],
         })
       })
-      expect(screen.getByText('File List Input')).toBeInTheDocument()
+      expect(screen.getByText('File List Input'))!.toBeInTheDocument()
     })
   })
 
@@ -336,8 +336,8 @@ describe('RunOnce', () => {
           jsonInput: undefined,
         })
       })
-      expect(screen.getByText('JSON Input')).toBeInTheDocument()
-      expect(screen.getByTestId('code-editor-mock')).toBeInTheDocument()
+      expect(screen.getByText('JSON Input'))!.toBeInTheDocument()
+      expect(screen.getByTestId('code-editor-mock'))!.toBeInTheDocument()
     })
 
     it('should update json_object input when code editor changes', async () => {
@@ -391,7 +391,7 @@ describe('RunOnce', () => {
         expect(onInputsChange).toHaveBeenCalled()
       })
       expect(screen.queryByText('Hidden Input')).not.toBeInTheDocument()
-      expect(screen.getByText('Visible Input')).toBeInTheDocument()
+      expect(screen.getByText('Visible Input'))!.toBeInTheDocument()
     })
 
     it('should show optional label for non-required fields', async () => {
@@ -410,7 +410,7 @@ describe('RunOnce', () => {
       await waitFor(() => {
         expect(onInputsChange).toHaveBeenCalled()
       })
-      expect(screen.getByText('workflow.panel.optional')).toBeInTheDocument()
+      expect(screen.getByText('workflow.panel.optional'))!.toBeInTheDocument()
     })
   })
 
@@ -489,7 +489,7 @@ describe('RunOnce', () => {
         expect(onInputsChange).toHaveBeenCalled()
       })
       const input = screen.getByPlaceholderText('Text Input')
-      expect(input).toHaveAttribute('maxLength', '100')
+      expect(input)!.toHaveAttribute('maxLength', '100')
     })
   })
 })
diff --git a/web/app/components/tools/edit-custom-collection-modal/__tests__/index.spec.tsx b/web/app/components/tools/edit-custom-collection-modal/__tests__/index.spec.tsx
index 7cd1c8cd53..1ab1bc428c 100644
--- a/web/app/components/tools/edit-custom-collection-modal/__tests__/index.spec.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/__tests__/index.spec.tsx
@@ -120,7 +120,7 @@ describe('EditCustomCollectionModal', () => {
     it('should render add mode title when no payload', () => {
       renderModal()
 
-      expect(screen.getByText('tools.createTool.title')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.title'))!.toBeInTheDocument()
     })
 
     it('should show error when provider name is missing', async () => {
@@ -232,13 +232,13 @@ describe('EditCustomCollectionModal', () => {
     it('should render edit mode title when payload is provided', () => {
       renderModal({ payload: editPayload })
 
-      expect(screen.getByText('tools.createTool.editTitle')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.editTitle'))!.toBeInTheDocument()
     })
 
     it('should show delete button in edit mode', () => {
       renderModal({ payload: editPayload })
 
-      expect(screen.getByText('common.operation.delete')).toBeInTheDocument()
+      expect(screen.getByText('common.operation.delete'))!.toBeInTheDocument()
     })
 
     it('should call onRemove when delete button is clicked', () => {
@@ -272,22 +272,22 @@ describe('EditCustomCollectionModal', () => {
       renderModal({ payload: editPayload })
 
       const providerInput = screen.getByPlaceholderText('tools.createTool.toolNamePlaceHolder')
-      expect(providerInput).toHaveValue('existing-provider')
+      expect(providerInput)!.toHaveValue('existing-provider')
     })
 
     it('should display existing schema', () => {
       renderModal({ payload: editPayload })
 
       const schemaInput = screen.getByPlaceholderText('tools.createTool.schemaPlaceHolder')
-      expect(schemaInput).toHaveValue('{"openapi": "3.0.0"}')
+      expect(schemaInput)!.toHaveValue('{"openapi": "3.0.0"}')
     })
 
     it('should display available tools table', () => {
       renderModal({ payload: editPayload })
 
-      expect(screen.getByText('getUsers')).toBeInTheDocument()
-      expect(screen.getByText('Get all users')).toBeInTheDocument()
-      expect(screen.getByText('GET')).toBeInTheDocument()
+      expect(screen.getByText('getUsers'))!.toBeInTheDocument()
+      expect(screen.getByText('Get all users'))!.toBeInTheDocument()
+      expect(screen.getByText('GET'))!.toBeInTheDocument()
     })
 
     it('should strip credential fields when auth_type is none on save', async () => {
@@ -314,7 +314,7 @@ describe('EditCustomCollectionModal', () => {
           },
         }))
         // These fields should NOT be present
-        const callArg = mockOnEdit.mock.calls[0][0]
+        const callArg = mockOnEdit.mock.calls[0]![0]
         expect(callArg.credentials.api_key_header).toBeUndefined()
         expect(callArg.credentials.api_key_header_prefix).toBeUndefined()
         expect(callArg.credentials.api_key_value).toBeUndefined()
@@ -346,7 +346,7 @@ describe('EditCustomCollectionModal', () => {
       })
 
       await waitFor(() => {
-        expect(screen.getByText('newOp')).toBeInTheDocument()
+        expect(screen.getByText('newOp'))!.toBeInTheDocument()
       })
     })
 
@@ -363,7 +363,8 @@ describe('EditCustomCollectionModal', () => {
       })
 
       // The table should still be visible but empty (no tools)
-      expect(screen.getByText('tools.createTool.availableTools.title')).toBeInTheDocument()
+      // The table should still be visible but empty (no tools)
+      expect(screen.getByText('tools.createTool.availableTools.title'))!.toBeInTheDocument()
     })
 
     it('should not parse schema when empty', async () => {
@@ -388,14 +389,15 @@ describe('EditCustomCollectionModal', () => {
 
       // The name input should be present
       const nameInput = screen.getByPlaceholderText('tools.createTool.toolNamePlaceHolder')
-      expect(nameInput).toBeInTheDocument()
+      expect(nameInput)!.toBeInTheDocument()
     })
 
     it('should render name input section', () => {
       renderModal()
 
       // Name label should be present
-      expect(screen.getByText('tools.createTool.name')).toBeInTheDocument()
+      // Name label should be present
+      expect(screen.getByText('tools.createTool.name'))!.toBeInTheDocument()
     })
   })
 
@@ -404,14 +406,15 @@ describe('EditCustomCollectionModal', () => {
     it('should show auth method section title', () => {
       renderModal()
 
-      expect(screen.getByText('tools.createTool.authMethod.title')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.authMethod.title'))!.toBeInTheDocument()
     })
 
     it('should display current auth type', () => {
       renderModal()
 
       // The default auth type is 'none'
-      expect(screen.getByText('tools.createTool.authMethod.types.none')).toBeInTheDocument()
+      // The default auth type is 'none'
+      expect(screen.getByText('tools.createTool.authMethod.types.none'))!.toBeInTheDocument()
     })
   })
 
@@ -437,15 +440,15 @@ describe('EditCustomCollectionModal', () => {
 
       // Find the test button
       const testButton = screen.getByText('tools.createTool.availableTools.test')
-      expect(testButton).toBeInTheDocument()
+      expect(testButton)!.toBeInTheDocument()
     })
 
     it('should display tool information in the table', () => {
       renderModal({ payload: payloadWithTools })
 
-      expect(screen.getByText('testOp')).toBeInTheDocument()
-      expect(screen.getByText('Test operation')).toBeInTheDocument()
-      expect(screen.getByText('POST')).toBeInTheDocument()
+      expect(screen.getByText('testOp'))!.toBeInTheDocument()
+      expect(screen.getByText('Test operation'))!.toBeInTheDocument()
+      expect(screen.getByText('POST'))!.toBeInTheDocument()
     })
   })
 
@@ -457,7 +460,7 @@ describe('EditCustomCollectionModal', () => {
       const privacyInput = screen.getByPlaceholderText('tools.createTool.privacyPolicyPlaceholder')
       fireEvent.change(privacyInput, { target: { value: 'https://example.com/privacy' } })
 
-      expect(privacyInput).toHaveValue('https://example.com/privacy')
+      expect(privacyInput)!.toHaveValue('https://example.com/privacy')
     })
 
     it('should update custom disclaimer input', () => {
@@ -466,7 +469,7 @@ describe('EditCustomCollectionModal', () => {
       const disclaimerInput = screen.getByPlaceholderText('tools.createTool.customDisclaimerPlaceholder')
       fireEvent.change(disclaimerInput, { target: { value: 'Custom disclaimer text' } })
 
-      expect(disclaimerInput).toHaveValue('Custom disclaimer text')
+      expect(disclaimerInput)!.toHaveValue('Custom disclaimer text')
     })
 
     it('should include privacy policy and custom disclaimer in save payload', async () => {
@@ -506,13 +509,13 @@ describe('EditCustomCollectionModal', () => {
     it('should render with positionLeft prop', () => {
       renderModal({ positionLeft: true })
 
-      expect(screen.getByText('tools.createTool.title')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.title'))!.toBeInTheDocument()
     })
 
     it('should render with dialogClassName prop', () => {
       renderModal({ dialogClassName: 'custom-dialog-class' })
 
-      expect(screen.getByText('tools.createTool.title')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.title'))!.toBeInTheDocument()
     })
   })
 
@@ -536,34 +539,37 @@ describe('EditCustomCollectionModal', () => {
     it('should extract path from full URL', () => {
       renderModal({ payload: payloadWithVariousUrls('https://api.example.com/users/list') })
 
-      expect(screen.getByText('/users/list')).toBeInTheDocument()
+      expect(screen.getByText('/users/list'))!.toBeInTheDocument()
     })
 
     it('should handle URL with encoded characters', () => {
       renderModal({ payload: payloadWithVariousUrls('https://api.example.com/users%20list') })
 
-      expect(screen.getByText('/users list')).toBeInTheDocument()
+      expect(screen.getByText('/users list'))!.toBeInTheDocument()
     })
 
     it('should handle empty URL', () => {
       renderModal({ payload: payloadWithVariousUrls('') })
 
       // Should not crash and show the row
-      expect(screen.getByText('testOp')).toBeInTheDocument()
+      // Should not crash and show the row
+      expect(screen.getByText('testOp'))!.toBeInTheDocument()
     })
 
     it('should handle invalid URL by returning the original string', () => {
       renderModal({ payload: payloadWithVariousUrls('not-a-valid-url') })
 
       // Should show the original string
-      expect(screen.getByText('not-a-valid-url')).toBeInTheDocument()
+      // Should show the original string
+      expect(screen.getByText('not-a-valid-url'))!.toBeInTheDocument()
     })
 
     it('should handle URL with only domain', () => {
       renderModal({ payload: payloadWithVariousUrls('https://api.example.com') })
 
       // Path would be empty or "/"
-      expect(screen.getByText('testOp')).toBeInTheDocument()
+      // Path would be empty or "/"
+      expect(screen.getByText('testOp'))!.toBeInTheDocument()
     })
   })
 
@@ -573,8 +579,8 @@ describe('EditCustomCollectionModal', () => {
       renderModal()
 
       const link = screen.getByText('tools.createTool.viewSchemaSpec')
-      expect(link.closest('a')).toHaveAttribute('href', 'https://swagger.io/specification/')
-      expect(link.closest('a')).toHaveAttribute('target', '_blank')
+      expect(link.closest('a'))!.toHaveAttribute('href', 'https://swagger.io/specification/')
+      expect(link.closest('a'))!.toHaveAttribute('target', '_blank')
     })
   })
 })
diff --git a/web/app/components/tools/edit-custom-collection-modal/__tests__/test-api.spec.tsx b/web/app/components/tools/edit-custom-collection-modal/__tests__/test-api.spec.tsx
index df35ace68d..4efe7e2dae 100644
--- a/web/app/components/tools/edit-custom-collection-modal/__tests__/test-api.spec.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/__tests__/test-api.spec.tsx
@@ -73,7 +73,7 @@ describe('TestApi', () => {
         renderTestApi()
       })
 
-      expect(screen.getByText('tools.test.testResult')).toBeInTheDocument()
+      expect(screen.getByText('tools.test.testResult'))!.toBeInTheDocument()
     })
 
     it('should display tool name in the title', async () => {
@@ -81,7 +81,7 @@ describe('TestApi', () => {
         renderTestApi()
       })
 
-      expect(screen.getByText(/testOp/)).toBeInTheDocument()
+      expect(screen.getByText(/testOp/))!.toBeInTheDocument()
     })
 
     it('should render parameters table', async () => {
@@ -89,9 +89,9 @@ describe('TestApi', () => {
         renderTestApi()
       })
 
-      expect(screen.getByText('tools.test.parameters')).toBeInTheDocument()
-      expect(screen.getByText('tools.test.value')).toBeInTheDocument()
-      expect(screen.getByText('Limit')).toBeInTheDocument()
+      expect(screen.getByText('tools.test.parameters'))!.toBeInTheDocument()
+      expect(screen.getByText('tools.test.value'))!.toBeInTheDocument()
+      expect(screen.getByText('Limit'))!.toBeInTheDocument()
     })
 
     it('should render test result placeholder', async () => {
@@ -99,7 +99,7 @@ describe('TestApi', () => {
         renderTestApi()
       })
 
-      expect(screen.getByText('tools.test.testResultPlaceholder')).toBeInTheDocument()
+      expect(screen.getByText('tools.test.testResultPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should render with positionCenter prop', async () => {
@@ -107,7 +107,7 @@ describe('TestApi', () => {
         renderTestApi({ positionCenter: true })
       })
 
-      expect(screen.getByText('tools.test.testResult')).toBeInTheDocument()
+      expect(screen.getByText('tools.test.testResult'))!.toBeInTheDocument()
     })
   })
 
@@ -118,7 +118,7 @@ describe('TestApi', () => {
       renderTestApi()
 
       const parameterInput = screen.getAllByRole('textbox')[0]
-      fireEvent.change(parameterInput, { target: { value: '5' } })
+      fireEvent.change(parameterInput!, { target: { value: '5' } })
       fireEvent.click(screen.getByRole('button', { name: 'tools.test.title' }))
 
       await waitFor(() => {
@@ -134,7 +134,7 @@ describe('TestApi', () => {
             limit: '5',
           },
         })
-        expect(screen.getByText('ok')).toBeInTheDocument()
+        expect(screen.getByText('ok'))!.toBeInTheDocument()
       })
     })
 
@@ -145,7 +145,7 @@ describe('TestApi', () => {
       fireEvent.click(screen.getByRole('button', { name: 'tools.test.title' }))
 
       await waitFor(() => {
-        expect(screen.getByText('API Error occurred')).toBeInTheDocument()
+        expect(screen.getByText('API Error occurred'))!.toBeInTheDocument()
       })
     })
 
@@ -164,7 +164,7 @@ describe('TestApi', () => {
       // API should have been called
       await waitFor(() => {
         expect(testAPIAvailableMock).toHaveBeenCalledTimes(1)
-        expect(screen.getByText('test completed')).toBeInTheDocument()
+        expect(screen.getByText('test completed'))!.toBeInTheDocument()
       })
     })
 
@@ -204,7 +204,8 @@ describe('TestApi', () => {
       })
 
       // Check that the auth method is displayed
-      expect(screen.getByText('tools.createTool.authMethod.types.none')).toBeInTheDocument()
+      // Check that the auth method is displayed
+      expect(screen.getByText('tools.createTool.authMethod.types.none'))!.toBeInTheDocument()
     })
 
     it('should display current auth type in the button', async () => {
@@ -223,7 +224,8 @@ describe('TestApi', () => {
       })
 
       // Check that the auth method display shows the correct type
-      expect(screen.getByText('tools.createTool.authMethod.types.api_key_header')).toBeInTheDocument()
+      // Check that the auth method display shows the correct type
+      expect(screen.getByText('tools.createTool.authMethod.types.api_key_header'))!.toBeInTheDocument()
     })
   })
 
@@ -248,8 +250,8 @@ describe('TestApi', () => {
       renderTestApi({ tool: toolWithMultipleParams })
 
       const inputs = screen.getAllByRole('textbox')
-      fireEvent.change(inputs[0], { target: { value: '10' } })
-      fireEvent.change(inputs[1], { target: { value: '20' } })
+      fireEvent.change(inputs[0]!, { target: { value: '10' } })
+      fireEvent.change(inputs[1]!, { target: { value: '20' } })
 
       fireEvent.click(screen.getByRole('button', { name: 'tools.test.title' }))
 
diff --git a/web/app/components/tools/mcp/__tests__/mcp-server-modal.spec.tsx b/web/app/components/tools/mcp/__tests__/mcp-server-modal.spec.tsx
index 6f5c548ec3..9029ee56a2 100644
--- a/web/app/components/tools/mcp/__tests__/mcp-server-modal.spec.tsx
+++ b/web/app/components/tools/mcp/__tests__/mcp-server-modal.spec.tsx
@@ -41,12 +41,12 @@ describe('MCPServerModal', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.server.modal.addTitle')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.server.modal.addTitle'))!.toBeInTheDocument()
     })
 
     it('should render add title when no data is provided', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.server.modal.addTitle')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.server.modal.addTitle'))!.toBeInTheDocument()
     })
 
     it('should render edit title when data is provided', () => {
@@ -57,33 +57,33 @@ describe('MCPServerModal', () => {
       } as unknown as MCPServerDetail
 
       render(<MCPServerModal {...defaultProps} data={mockData} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.server.modal.editTitle')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.server.modal.editTitle'))!.toBeInTheDocument()
     })
 
     it('should render description label', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.server.modal.description')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.server.modal.description'))!.toBeInTheDocument()
     })
 
     it('should render required indicator', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('*')).toBeInTheDocument()
+      expect(screen.getByText('*'))!.toBeInTheDocument()
     })
 
     it('should render description textarea', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
       const textarea = screen.getByPlaceholderText('tools.mcp.server.modal.descriptionPlaceholder')
-      expect(textarea).toBeInTheDocument()
+      expect(textarea)!.toBeInTheDocument()
     })
 
     it('should render cancel button', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.cancel')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.cancel'))!.toBeInTheDocument()
     })
 
     it('should render confirm button in add mode', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.server.modal.confirm')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.server.modal.confirm'))!.toBeInTheDocument()
     })
 
     it('should render save button in edit mode', () => {
@@ -94,13 +94,13 @@ describe('MCPServerModal', () => {
       } as unknown as MCPServerDetail
 
       render(<MCPServerModal {...defaultProps} data={mockData} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.save')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.save'))!.toBeInTheDocument()
     })
 
     it('should render close icon', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
       const closeButton = document.querySelector('.cursor-pointer svg')
-      expect(closeButton).toBeInTheDocument()
+      expect(closeButton)!.toBeInTheDocument()
     })
   })
 
@@ -115,7 +115,7 @@ describe('MCPServerModal', () => {
         { variable: 'param1', label: 'Parameter 1', type: 'string' },
       ]
       render(<MCPServerModal {...defaultProps} latestParams={latestParams} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.server.modal.parameters')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.server.modal.parameters'))!.toBeInTheDocument()
     })
 
     it('should render parameters tip', () => {
@@ -123,7 +123,7 @@ describe('MCPServerModal', () => {
         { variable: 'param1', label: 'Parameter 1', type: 'string' },
       ]
       render(<MCPServerModal {...defaultProps} latestParams={latestParams} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.server.modal.parametersTip')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.server.modal.parametersTip'))!.toBeInTheDocument()
     })
 
     it('should render parameter items', () => {
@@ -132,8 +132,8 @@ describe('MCPServerModal', () => {
         { variable: 'param2', label: 'Parameter 2', type: 'number' },
       ]
       render(<MCPServerModal {...defaultProps} latestParams={latestParams} />, { wrapper: createWrapper() })
-      expect(screen.getByText('Parameter 1')).toBeInTheDocument()
-      expect(screen.getByText('Parameter 2')).toBeInTheDocument()
+      expect(screen.getByText('Parameter 1'))!.toBeInTheDocument()
+      expect(screen.getByText('Parameter 2'))!.toBeInTheDocument()
     })
   })
 
@@ -144,7 +144,7 @@ describe('MCPServerModal', () => {
       const textarea = screen.getByPlaceholderText('tools.mcp.server.modal.descriptionPlaceholder')
       fireEvent.change(textarea, { target: { value: 'New description' } })
 
-      expect(textarea).toHaveValue('New description')
+      expect(textarea)!.toHaveValue('New description')
     })
 
     it('should call onHide when cancel button is clicked', () => {
@@ -172,7 +172,7 @@ describe('MCPServerModal', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
 
       const confirmButton = screen.getByText('tools.mcp.server.modal.confirm')
-      expect(confirmButton).toBeDisabled()
+      expect(confirmButton)!.toBeDisabled()
     })
 
     it('should enable confirm button when description is filled', () => {
@@ -197,7 +197,7 @@ describe('MCPServerModal', () => {
       render(<MCPServerModal {...defaultProps} data={mockData} />, { wrapper: createWrapper() })
 
       const textarea = screen.getByPlaceholderText('tools.mcp.server.modal.descriptionPlaceholder')
-      expect(textarea).toHaveValue('Existing description')
+      expect(textarea)!.toHaveValue('Existing description')
     })
 
     it('should populate parameters with existing values', () => {
@@ -210,7 +210,7 @@ describe('MCPServerModal', () => {
       )
 
       const paramInput = screen.getByPlaceholderText('tools.mcp.server.modal.parametersPlaceholder')
-      expect(paramInput).toHaveValue('existing value')
+      expect(paramInput)!.toHaveValue('existing value')
     })
   })
 
@@ -237,7 +237,7 @@ describe('MCPServerModal', () => {
       render(<MCPServerModal {...defaultProps} appInfo={appInfo} />, { wrapper: createWrapper() })
 
       const textarea = screen.getByPlaceholderText('tools.mcp.server.modal.descriptionPlaceholder')
-      expect(textarea).toHaveValue('App default description')
+      expect(textarea)!.toHaveValue('App default description')
     })
 
     it('should prefer data description over appInfo description', () => {
@@ -254,7 +254,7 @@ describe('MCPServerModal', () => {
       )
 
       const textarea = screen.getByPlaceholderText('tools.mcp.server.modal.descriptionPlaceholder')
-      expect(textarea).toHaveValue('Data description')
+      expect(textarea)!.toHaveValue('Data description')
     })
   })
 
@@ -313,9 +313,9 @@ describe('MCPServerModal', () => {
       const paramInputs = screen.getAllByPlaceholderText('tools.mcp.server.modal.parametersPlaceholder')
 
       // Change the first parameter value
-      fireEvent.change(paramInputs[0], { target: { value: 'new param value' } })
+      fireEvent.change(paramInputs[0]!, { target: { value: 'new param value' } })
 
-      expect(paramInputs[0]).toHaveValue('new param value')
+      expect(paramInputs[0])!.toHaveValue('new param value')
     })
 
     it('should submit with parameter values', async () => {
@@ -355,7 +355,7 @@ describe('MCPServerModal', () => {
 
       // Button should be disabled
       const confirmButton = screen.getByText('tools.mcp.server.modal.confirm')
-      expect(confirmButton).toBeDisabled()
+      expect(confirmButton)!.toBeDisabled()
     })
   })
 })
diff --git a/web/app/components/tools/mcp/__tests__/modal.spec.tsx b/web/app/components/tools/mcp/__tests__/modal.spec.tsx
index 3eaf66453e..5b561e7f30 100644
--- a/web/app/components/tools/mcp/__tests__/modal.spec.tsx
+++ b/web/app/components/tools/mcp/__tests__/modal.spec.tsx
@@ -81,7 +81,7 @@ describe('MCPModal', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.title')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.title'))!.toBeInTheDocument()
     })
 
     it('should not render when show is false', () => {
@@ -91,7 +91,7 @@ describe('MCPModal', () => {
 
     it('should render create title when no data is provided', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.title')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.title'))!.toBeInTheDocument()
     })
 
     it('should render edit title when data is provided', () => {
@@ -104,31 +104,31 @@ describe('MCPModal', () => {
       } as unknown as ToolWithProvider
 
       render(<MCPModal {...defaultProps} data={mockData} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.editTitle')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.editTitle'))!.toBeInTheDocument()
     })
   })
 
   describe('Form Fields', () => {
     it('should render server URL input', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.serverUrl')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.serverUrl'))!.toBeInTheDocument()
     })
 
     it('should render name input', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.name')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.name'))!.toBeInTheDocument()
     })
 
     it('should render server identifier input', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.serverIdentifier')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.serverIdentifier'))!.toBeInTheDocument()
     })
 
     it('should render auth method tabs', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.authentication')).toBeInTheDocument()
-      expect(screen.getByText('tools.mcp.modal.headers')).toBeInTheDocument()
-      expect(screen.getByText('tools.mcp.modal.configurations')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.authentication'))!.toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.headers'))!.toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.configurations'))!.toBeInTheDocument()
     })
   })
 
@@ -139,7 +139,7 @@ describe('MCPModal', () => {
       const urlInput = screen.getByPlaceholderText('tools.mcp.modal.serverUrlPlaceholder')
       fireEvent.change(urlInput, { target: { value: 'https://test.com/mcp' } })
 
-      expect(urlInput).toHaveValue('https://test.com/mcp')
+      expect(urlInput)!.toHaveValue('https://test.com/mcp')
     })
 
     it('should update name input value', () => {
@@ -148,7 +148,7 @@ describe('MCPModal', () => {
       const nameInput = screen.getByPlaceholderText('tools.mcp.modal.namePlaceholder')
       fireEvent.change(nameInput, { target: { value: 'My Server' } })
 
-      expect(nameInput).toHaveValue('My Server')
+      expect(nameInput)!.toHaveValue('My Server')
     })
 
     it('should update server identifier input value', () => {
@@ -157,14 +157,14 @@ describe('MCPModal', () => {
       const identifierInput = screen.getByPlaceholderText('tools.mcp.modal.serverIdentifierPlaceholder')
       fireEvent.change(identifierInput, { target: { value: 'my-server' } })
 
-      expect(identifierInput).toHaveValue('my-server')
+      expect(identifierInput)!.toHaveValue('my-server')
     })
   })
 
   describe('Tab Navigation', () => {
     it('should show authentication section by default', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.useDynamicClientRegistration')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.useDynamicClientRegistration'))!.toBeInTheDocument()
     })
 
     it('should switch to headers section when clicked', async () => {
@@ -174,7 +174,7 @@ describe('MCPModal', () => {
       fireEvent.click(headersTab)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.modal.headersTip')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.modal.headersTip'))!.toBeInTheDocument()
       })
     })
 
@@ -185,8 +185,8 @@ describe('MCPModal', () => {
       fireEvent.click(configTab)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.modal.timeout')).toBeInTheDocument()
-        expect(screen.getByText('tools.mcp.modal.sseReadTimeout')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.modal.timeout'))!.toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.modal.sseReadTimeout'))!.toBeInTheDocument()
       })
     })
   })
@@ -194,7 +194,7 @@ describe('MCPModal', () => {
   describe('Action Buttons', () => {
     it('should render confirm button', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.confirm')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.confirm'))!.toBeInTheDocument()
     })
 
     it('should render save button in edit mode', () => {
@@ -205,12 +205,12 @@ describe('MCPModal', () => {
       } as unknown as ToolWithProvider
 
       render(<MCPModal {...defaultProps} data={mockData} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.save')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.save'))!.toBeInTheDocument()
     })
 
     it('should render cancel button', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('tools.mcp.modal.cancel')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.cancel'))!.toBeInTheDocument()
     })
 
     it('should call onHide when cancel is clicked', () => {
@@ -243,7 +243,7 @@ describe('MCPModal', () => {
       render(<MCPModal {...defaultProps} />, { wrapper: createWrapper() })
 
       const confirmButton = screen.getByText('tools.mcp.modal.confirm')
-      expect(confirmButton).toBeDisabled()
+      expect(confirmButton)!.toBeDisabled()
     })
 
     it('should enable confirm button when required fields are filled', () => {
@@ -360,9 +360,9 @@ describe('MCPModal', () => {
     it('should populate form with existing data', () => {
       render(<MCPModal {...defaultProps} data={mockData} />, { wrapper: createWrapper() })
 
-      expect(screen.getByDisplayValue('https://existing.com/mcp')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('Existing Server')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('existing-server')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('https://existing.com/mcp'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('Existing Server'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('existing-server'))!.toBeInTheDocument()
     })
 
     it('should show warning when URL is changed', () => {
@@ -371,7 +371,7 @@ describe('MCPModal', () => {
       const urlInput = screen.getByDisplayValue('https://existing.com/mcp')
       fireEvent.change(urlInput, { target: { value: 'https://new.com/mcp' } })
 
-      expect(screen.getByText('tools.mcp.modal.serverUrlWarning')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.serverUrlWarning'))!.toBeInTheDocument()
     })
 
     it('should show warning when server identifier is changed', () => {
@@ -380,7 +380,7 @@ describe('MCPModal', () => {
       const identifierInput = screen.getByDisplayValue('existing-server')
       fireEvent.change(identifierInput, { target: { value: 'new-server' } })
 
-      expect(screen.getByText('tools.mcp.modal.serverIdentifierWarning')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.serverIdentifierWarning'))!.toBeInTheDocument()
     })
   })
 
@@ -402,7 +402,8 @@ describe('MCPModal', () => {
       rerender(<MCPModal {...defaultProps} data={mockData} />)
 
       // Should show edit mode data
-      expect(screen.getByDisplayValue('Edit Server')).toBeInTheDocument()
+      // Should show edit mode data
+      expect(screen.getByDisplayValue('Edit Server'))!.toBeInTheDocument()
     })
   })
 
@@ -415,7 +416,8 @@ describe('MCPModal', () => {
       fireEvent.blur(urlInput)
 
       // The blur handler trims the value
-      expect(urlInput).toHaveValue('  https://test.com/mcp  ')
+      // The blur handler trims the value
+      expect(urlInput)!.toHaveValue('  https://test.com/mcp  ')
     })
 
     it('should handle URL blur-sm with empty value', () => {
@@ -425,7 +427,7 @@ describe('MCPModal', () => {
       fireEvent.change(urlInput, { target: { value: '' } })
       fireEvent.blur(urlInput)
 
-      expect(urlInput).toHaveValue('')
+      expect(urlInput)!.toHaveValue('')
     })
   })
 
@@ -474,7 +476,7 @@ describe('MCPModal', () => {
       fireEvent.click(headersTab)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.modal.headersTip')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.modal.headersTip'))!.toBeInTheDocument()
       })
 
       const confirmButton = screen.getByText('tools.mcp.modal.confirm')
@@ -541,7 +543,7 @@ describe('MCPModal', () => {
       fireEvent.click(headersTab)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.modal.headersTip')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.modal.headersTip'))!.toBeInTheDocument()
       })
 
       // Submit form
@@ -662,7 +664,7 @@ describe('MCPModal', () => {
       fireEvent.click(configTab)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.modal.timeout')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.modal.timeout'))!.toBeInTheDocument()
       })
 
       const confirmButton = screen.getByText('tools.mcp.modal.confirm')
@@ -683,10 +685,11 @@ describe('MCPModal', () => {
       expect(switchElements.length).toBeGreaterThan(0)
 
       // Click the first switch (dynamic registration)
-      fireEvent.click(switchElements[0])
+      fireEvent.click(switchElements[0]!)
 
       // The switch should toggle
-      expect(switchElements[0]).toBeInTheDocument()
+      // The switch should toggle
+      expect(switchElements[0])!.toBeInTheDocument()
     })
   })
 
@@ -702,7 +705,7 @@ describe('MCPModal', () => {
 
         // The mocked AppIconPicker should now be visible
         await waitFor(() => {
-          expect(screen.getByTestId('app-icon-picker')).toBeInTheDocument()
+          expect(screen.getByTestId('app-icon-picker'))!.toBeInTheDocument()
         })
       }
     })
@@ -717,7 +720,7 @@ describe('MCPModal', () => {
         fireEvent.click(appIconContainer)
 
         await waitFor(() => {
-          expect(screen.getByTestId('app-icon-picker')).toBeInTheDocument()
+          expect(screen.getByTestId('app-icon-picker'))!.toBeInTheDocument()
         })
 
         // Click the select emoji button
@@ -741,7 +744,7 @@ describe('MCPModal', () => {
         fireEvent.click(appIconContainer)
 
         await waitFor(() => {
-          expect(screen.getByTestId('app-icon-picker')).toBeInTheDocument()
+          expect(screen.getByTestId('app-icon-picker'))!.toBeInTheDocument()
         })
 
         // Click the close button
diff --git a/web/app/components/tools/mcp/detail/__tests__/content.spec.tsx b/web/app/components/tools/mcp/detail/__tests__/content.spec.tsx
index 584c9d211a..5216e9eede 100644
--- a/web/app/components/tools/mcp/detail/__tests__/content.spec.tsx
+++ b/web/app/components/tools/mcp/detail/__tests__/content.spec.tsx
@@ -199,22 +199,22 @@ describe('MCPDetailContent', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<MCPDetailContent {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('Test MCP Server')).toBeInTheDocument()
+      expect(screen.getByText('Test MCP Server'))!.toBeInTheDocument()
     })
 
     it('should display MCP name', () => {
       render(<MCPDetailContent {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('Test MCP Server')).toBeInTheDocument()
+      expect(screen.getByText('Test MCP Server'))!.toBeInTheDocument()
     })
 
     it('should display server identifier', () => {
       render(<MCPDetailContent {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('test-mcp')).toBeInTheDocument()
+      expect(screen.getByText('test-mcp'))!.toBeInTheDocument()
     })
 
     it('should display server URL', () => {
       render(<MCPDetailContent {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByText('https://example.com/mcp')).toBeInTheDocument()
+      expect(screen.getByText('https://example.com/mcp'))!.toBeInTheDocument()
     })
 
     it('should render close button', () => {
@@ -227,7 +227,8 @@ describe('MCPDetailContent', () => {
     it('should render operation dropdown', () => {
       render(<MCPDetailContent {...defaultProps} />, { wrapper: createWrapper() })
       // Operation dropdown trigger should be present
-      expect(document.querySelector('button')).toBeInTheDocument()
+      // Operation dropdown trigger should be present
+      expect(document.querySelector('button'))!.toBeInTheDocument()
     })
   })
 
@@ -238,7 +239,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.mcp.authorize')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.authorize'))!.toBeInTheDocument()
     })
 
     it('should show authorized button when authorized', () => {
@@ -247,7 +248,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.auth.authorized')).toBeInTheDocument()
+      expect(screen.getByText('tools.auth.authorized'))!.toBeInTheDocument()
     })
 
     it('should show authorization required message when not authorized', () => {
@@ -256,7 +257,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.mcp.authorizingRequired')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.authorizingRequired'))!.toBeInTheDocument()
     })
 
     it('should show authorization tip', () => {
@@ -265,7 +266,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.mcp.authorizeTip')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.authorizeTip'))!.toBeInTheDocument()
     })
   })
 
@@ -276,7 +277,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.mcp.toolsEmpty')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.toolsEmpty'))!.toBeInTheDocument()
     })
 
     it('should show get tools button when empty', () => {
@@ -285,7 +286,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.mcp.getTools')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.getTools'))!.toBeInTheDocument()
     })
   })
 
@@ -294,7 +295,7 @@ describe('MCPDetailContent', () => {
       render(<MCPDetailContent {...defaultProps} />, { wrapper: createWrapper() })
       // Icon container should be present
       const iconContainer = document.querySelector('[class*="rounded-xl"][class*="border"]')
-      expect(iconContainer).toBeInTheDocument()
+      expect(iconContainer)!.toBeInTheDocument()
     })
   })
 
@@ -305,7 +306,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('Test MCP Server')).toBeInTheDocument()
+      expect(screen.getByText('Test MCP Server'))!.toBeInTheDocument()
     })
 
     it('should handle long MCP name', () => {
@@ -315,7 +316,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText(longName)).toBeInTheDocument()
+      expect(screen.getByText(longName))!.toBeInTheDocument()
     })
   })
 
@@ -332,8 +333,8 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tool1')).toBeInTheDocument()
-      expect(screen.getByText('tool2')).toBeInTheDocument()
+      expect(screen.getByText('tool1'))!.toBeInTheDocument()
+      expect(screen.getByText('tool2'))!.toBeInTheDocument()
     })
 
     it('should show single tool label when only one tool', () => {
@@ -345,7 +346,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.mcp.onlyTool')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.onlyTool'))!.toBeInTheDocument()
     })
 
     it('should show tools count when multiple tools', () => {
@@ -360,7 +361,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText(/tools.mcp.toolsNum/)).toBeInTheDocument()
+      expect(screen.getByText(/tools.mcp.toolsNum/))!.toBeInTheDocument()
     })
   })
 
@@ -375,7 +376,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.mcp.gettingTools')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.gettingTools'))!.toBeInTheDocument()
     })
 
     it('should show updating state when updating tools', () => {
@@ -388,7 +389,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.mcp.updateTools')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.updateTools'))!.toBeInTheDocument()
     })
 
     it('should show authorizing button when authorizing', () => {
@@ -464,7 +465,7 @@ describe('MCPDetailContent', () => {
       )
 
       const authorizeBtn = screen.getByText('tools.mcp.authorize')
-      expect(authorizeBtn.closest('button')).toBeDisabled()
+      expect(authorizeBtn.closest('button'))!.toBeDisabled()
     })
   })
 
@@ -483,7 +484,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(updateBtn)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.toolUpdateConfirmTitle')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.toolUpdateConfirmTitle'))!.toBeInTheDocument()
       })
     })
 
@@ -503,7 +504,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(updateBtn)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.toolUpdateConfirmTitle')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.toolUpdateConfirmTitle'))!.toBeInTheDocument()
       })
 
       // Confirm the update
@@ -541,7 +542,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(editBtn)
 
       await waitFor(() => {
-        expect(screen.getByTestId('mcp-update-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('mcp-update-modal'))!.toBeInTheDocument()
       })
     })
 
@@ -553,7 +554,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(editBtn)
 
       await waitFor(() => {
-        expect(screen.getByTestId('mcp-update-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('mcp-update-modal'))!.toBeInTheDocument()
       })
 
       // Close modal
@@ -574,7 +575,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(editBtn)
 
       await waitFor(() => {
-        expect(screen.getByTestId('mcp-update-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('mcp-update-modal'))!.toBeInTheDocument()
       })
 
       // Confirm form
@@ -601,7 +602,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(editBtn)
 
       await waitFor(() => {
-        expect(screen.getByTestId('mcp-update-modal')).toBeInTheDocument()
+        expect(screen.getByTestId('mcp-update-modal'))!.toBeInTheDocument()
       })
 
       // Confirm form
@@ -624,7 +625,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(removeBtn)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.delete')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.delete'))!.toBeInTheDocument()
       })
     })
 
@@ -636,7 +637,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(removeBtn)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.delete')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.delete'))!.toBeInTheDocument()
       })
 
       // Cancel
@@ -656,7 +657,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(removeBtn)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.delete')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.delete'))!.toBeInTheDocument()
       })
 
       // Confirm delete
@@ -678,7 +679,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(removeBtn)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.delete')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.delete'))!.toBeInTheDocument()
       })
 
       // Confirm delete
@@ -743,7 +744,7 @@ describe('MCPDetailContent', () => {
       })
 
       // Get the callback function and call it
-      const oauthCallback = mockOpenOAuthPopup.mock.calls[0][1]
+      const oauthCallback = mockOpenOAuthPopup.mock.calls[0]![1]
       oauthCallback()
 
       await waitFor(() => {
@@ -765,7 +766,7 @@ describe('MCPDetailContent', () => {
 
       // Button should be disabled
       const authorizeBtn = screen.getByText('tools.mcp.authorize')
-      expect(authorizeBtn.closest('button')).toBeDisabled()
+      expect(authorizeBtn.closest('button'))!.toBeDisabled()
     })
   })
 
@@ -776,7 +777,7 @@ describe('MCPDetailContent', () => {
         <MCPDetailContent {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByText('tools.auth.authorized')).toBeInTheDocument()
+      expect(screen.getByText('tools.auth.authorized'))!.toBeInTheDocument()
     })
 
     it('should call handleAuthorize when authorized button is clicked', async () => {
@@ -805,7 +806,7 @@ describe('MCPDetailContent', () => {
       )
 
       const authorizedBtn = screen.getByText('tools.auth.authorized')
-      expect(authorizedBtn.closest('button')).toBeDisabled()
+      expect(authorizedBtn.closest('button'))!.toBeDisabled()
     })
   })
 
@@ -825,7 +826,7 @@ describe('MCPDetailContent', () => {
       fireEvent.click(updateBtn)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.mcp.toolUpdateConfirmTitle')).toBeInTheDocument()
+        expect(screen.getByText('tools.mcp.toolUpdateConfirmTitle'))!.toBeInTheDocument()
       })
 
       // Cancel the update
diff --git a/web/app/components/tools/mcp/headers-input.tsx b/web/app/components/tools/mcp/headers-input.tsx
index bfaf6bd5d2..05cc464bfb 100644
--- a/web/app/components/tools/mcp/headers-input.tsx
+++ b/web/app/components/tools/mcp/headers-input.tsx
@@ -31,7 +31,7 @@ const HeadersInput = ({
 
   const handleItemChange = (index: number, field: 'key' | 'value', value: string) => {
     const newItems = [...headersItems]
-    newItems[index] = { ...newItems[index], [field]: value }
+    newItems[index] = { ...newItems[index]!, [field]: value }
 
     onChange(newItems)
   }
diff --git a/web/app/components/tools/mcp/hooks/__tests__/use-mcp-modal-form.spec.ts b/web/app/components/tools/mcp/hooks/__tests__/use-mcp-modal-form.spec.ts
index f44e14d608..fe3dde2cb6 100644
--- a/web/app/components/tools/mcp/hooks/__tests__/use-mcp-modal-form.spec.ts
+++ b/web/app/components/tools/mcp/hooks/__tests__/use-mcp-modal-form.spec.ts
@@ -160,10 +160,10 @@ describe('useMCPModalForm', () => {
         const { result } = renderHook(() => useMCPModalForm(mockData))
 
         expect(result.current.state.headers).toHaveLength(2)
-        expect(result.current.state.headers[0].key).toBe('Authorization')
-        expect(result.current.state.headers[0].value).toBe('***')
-        expect(result.current.state.headers[1].key).toBe('X-Custom')
-        expect(result.current.state.headers[1].value).toBe('value')
+        expect(result.current.state.headers[0]!.key).toBe('Authorization')
+        expect(result.current.state.headers[0]!.value).toBe('***')
+        expect(result.current.state.headers[1]!.key).toBe('X-Custom')
+        expect(result.current.state.headers[1]!.value).toBe('value')
       })
 
       it('should initialize emoji icon from data', () => {
diff --git a/web/app/components/tools/mcp/hooks/use-mcp-service-card.ts b/web/app/components/tools/mcp/hooks/use-mcp-service-card.ts
index dfb1c75a2a..8547b7f7ba 100644
--- a/web/app/components/tools/mcp/hooks/use-mcp-service-card.ts
+++ b/web/app/components/tools/mcp/hooks/use-mcp-service-card.ts
@@ -87,7 +87,7 @@ export const useMCPServiceCardState = (
     return (basicAppConfig.user_input_form as Array<Record<string, unknown>>).map((item) => {
       const type = Object.keys(item)[0]
       return {
-        ...(item[type] as object),
+        ...(item[type!] as object),
         type: type || 'text-input',
       }
     })
diff --git a/web/app/components/tools/mcp/sections/__tests__/authentication-section.spec.tsx b/web/app/components/tools/mcp/sections/__tests__/authentication-section.spec.tsx
index f5ed16f21d..213a58b6f8 100644
--- a/web/app/components/tools/mcp/sections/__tests__/authentication-section.spec.tsx
+++ b/web/app/components/tools/mcp/sections/__tests__/authentication-section.spec.tsx
@@ -15,29 +15,29 @@ describe('AuthenticationSection', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<AuthenticationSection {...defaultProps} />)
-      expect(screen.getByText('tools.mcp.modal.useDynamicClientRegistration')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.useDynamicClientRegistration'))!.toBeInTheDocument()
     })
 
     it('should render switch for dynamic registration', () => {
       render(<AuthenticationSection {...defaultProps} />)
-      expect(screen.getByRole('switch')).toBeInTheDocument()
+      expect(screen.getByRole('switch'))!.toBeInTheDocument()
     })
 
     it('should render client ID input', () => {
       render(<AuthenticationSection {...defaultProps} clientID="test-client-id" />)
-      expect(screen.getByDisplayValue('test-client-id')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('test-client-id'))!.toBeInTheDocument()
     })
 
     it('should render credentials input', () => {
       render(<AuthenticationSection {...defaultProps} credentials="test-secret" />)
-      expect(screen.getByDisplayValue('test-secret')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('test-secret'))!.toBeInTheDocument()
     })
 
     it('should render labels for all fields', () => {
       render(<AuthenticationSection {...defaultProps} />)
-      expect(screen.getByText('tools.mcp.modal.useDynamicClientRegistration')).toBeInTheDocument()
-      expect(screen.getByText('tools.mcp.modal.clientID')).toBeInTheDocument()
-      expect(screen.getByText('tools.mcp.modal.clientSecret')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.useDynamicClientRegistration'))!.toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.clientID'))!.toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.clientSecret'))!.toBeInTheDocument()
     })
   })
 
@@ -49,19 +49,19 @@ describe('AuthenticationSection', () => {
 
     it('should show warning when isDynamicRegistration is false', () => {
       render(<AuthenticationSection {...defaultProps} isDynamicRegistration={false} />)
-      expect(screen.getByText('tools.mcp.modal.redirectUrlWarning')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.redirectUrlWarning'))!.toBeInTheDocument()
     })
 
     it('should show OAuth callback URL in warning', () => {
       render(<AuthenticationSection {...defaultProps} isDynamicRegistration={false} />)
-      expect(screen.getByText(/\/mcp\/oauth\/callback/)).toBeInTheDocument()
+      expect(screen.getByText(/\/mcp\/oauth\/callback/))!.toBeInTheDocument()
     })
 
     it('should disable inputs when isDynamicRegistration is true', () => {
       render(<AuthenticationSection {...defaultProps} isDynamicRegistration={true} />)
       const inputs = screen.getAllByRole('textbox')
       inputs.forEach((input) => {
-        expect(input).toBeDisabled()
+        expect(input)!.toBeDisabled()
       })
     })
 
@@ -102,7 +102,7 @@ describe('AuthenticationSection', () => {
 
       const inputs = screen.getAllByRole('textbox')
       const clientIDInput = inputs[0]
-      fireEvent.change(clientIDInput, { target: { value: 'new-client-id' } })
+      fireEvent.change(clientIDInput!, { target: { value: 'new-client-id' } })
 
       expect(onClientIDChange).toHaveBeenCalledWith('new-client-id')
     })
@@ -119,7 +119,7 @@ describe('AuthenticationSection', () => {
 
       const inputs = screen.getAllByRole('textbox')
       const credentialsInput = inputs[1]
-      fireEvent.change(credentialsInput, { target: { value: 'new-secret' } })
+      fireEvent.change(credentialsInput!, { target: { value: 'new-secret' } })
 
       expect(onCredentialsChange).toHaveBeenCalledWith('new-secret')
     })
@@ -128,12 +128,12 @@ describe('AuthenticationSection', () => {
   describe('Props', () => {
     it('should display provided clientID value', () => {
       render(<AuthenticationSection {...defaultProps} clientID="my-client-123" />)
-      expect(screen.getByDisplayValue('my-client-123')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('my-client-123'))!.toBeInTheDocument()
     })
 
     it('should display provided credentials value', () => {
       render(<AuthenticationSection {...defaultProps} credentials="secret-456" />)
-      expect(screen.getByDisplayValue('secret-456')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('secret-456'))!.toBeInTheDocument()
     })
   })
 
@@ -143,7 +143,7 @@ describe('AuthenticationSection', () => {
       const inputs = screen.getAllByRole('textbox')
       expect(inputs).toHaveLength(2)
       inputs.forEach((input) => {
-        expect(input).toHaveValue('')
+        expect(input)!.toHaveValue('')
       })
     })
 
@@ -155,8 +155,8 @@ describe('AuthenticationSection', () => {
           credentials="secret&*()_+"
         />,
       )
-      expect(screen.getByDisplayValue('client@123!#$')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('secret&*()_+')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('client@123!#$'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('secret&*()_+'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/tools/mcp/sections/__tests__/headers-section.spec.tsx b/web/app/components/tools/mcp/sections/__tests__/headers-section.spec.tsx
index b71ba0ca04..aeec35385e 100644
--- a/web/app/components/tools/mcp/sections/__tests__/headers-section.spec.tsx
+++ b/web/app/components/tools/mcp/sections/__tests__/headers-section.spec.tsx
@@ -12,27 +12,27 @@ describe('HeadersSection', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<HeadersSection {...defaultProps} />)
-      expect(screen.getByText('tools.mcp.modal.headers')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.headers'))!.toBeInTheDocument()
     })
 
     it('should render headers label', () => {
       render(<HeadersSection {...defaultProps} />)
-      expect(screen.getByText('tools.mcp.modal.headers')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.headers'))!.toBeInTheDocument()
     })
 
     it('should render headers tip', () => {
       render(<HeadersSection {...defaultProps} />)
-      expect(screen.getByText('tools.mcp.modal.headersTip')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.headersTip'))!.toBeInTheDocument()
     })
 
     it('should render empty state when no headers', () => {
       render(<HeadersSection {...defaultProps} headers={[]} />)
-      expect(screen.getByText('tools.mcp.modal.noHeaders')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.noHeaders'))!.toBeInTheDocument()
     })
 
     it('should render add header button when empty', () => {
       render(<HeadersSection {...defaultProps} headers={[]} />)
-      expect(screen.getByText('tools.mcp.modal.addHeader')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.addHeader'))!.toBeInTheDocument()
     })
   })
 
@@ -44,16 +44,16 @@ describe('HeadersSection', () => {
 
     it('should render header items', () => {
       render(<HeadersSection {...defaultProps} headers={headersWithItems} />)
-      expect(screen.getByDisplayValue('Authorization')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('Bearer token123')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('Content-Type')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('application/json')).toBeInTheDocument()
+      expect(screen.getByDisplayValue('Authorization'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('Bearer token123'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('Content-Type'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('application/json'))!.toBeInTheDocument()
     })
 
     it('should render table headers', () => {
       render(<HeadersSection {...defaultProps} headers={headersWithItems} />)
-      expect(screen.getByText('tools.mcp.modal.headerKey')).toBeInTheDocument()
-      expect(screen.getByText('tools.mcp.modal.headerValue')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.headerKey'))!.toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.headerValue'))!.toBeInTheDocument()
     })
 
     it('should show masked tip when not isCreate and has headers with content', () => {
@@ -64,7 +64,7 @@ describe('HeadersSection', () => {
           headers={headersWithItems}
         />,
       )
-      expect(screen.getByText('tools.mcp.modal.maskedHeadersTip')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.maskedHeadersTip'))!.toBeInTheDocument()
     })
 
     it('should not show masked tip when isCreate is true', () => {
@@ -88,7 +88,7 @@ describe('HeadersSection', () => {
       fireEvent.click(addButton)
 
       expect(onHeadersChange).toHaveBeenCalled()
-      const calledWithHeaders = onHeadersChange.mock.calls[0][0]
+      const calledWithHeaders = onHeadersChange.mock.calls[0]![0]
       expect(calledWithHeaders).toHaveLength(1)
       expect(calledWithHeaders[0]).toHaveProperty('id')
       expect(calledWithHeaders[0]).toHaveProperty('key', '')
@@ -108,7 +108,7 @@ describe('HeadersSection', () => {
 
       const inputs = screen.getAllByRole('textbox')
       const keyInput = inputs[0]
-      fireEvent.change(keyInput, { target: { value: 'X-Custom-Header' } })
+      fireEvent.change(keyInput!, { target: { value: 'X-Custom-Header' } })
 
       expect(onHeadersChange).toHaveBeenCalled()
     })
@@ -126,7 +126,7 @@ describe('HeadersSection', () => {
 
       const inputs = screen.getAllByRole('textbox')
       const valueInput = inputs[1]
-      fireEvent.change(valueInput, { target: { value: 'custom-value' } })
+      fireEvent.change(valueInput!, { target: { value: 'custom-value' } })
 
       expect(onHeadersChange).toHaveBeenCalled()
     })
@@ -160,7 +160,7 @@ describe('HeadersSection', () => {
     it('should pass isCreate=false correctly (with masking)', () => {
       const headers = [{ id: '1', key: 'Header', value: 'Value' }]
       render(<HeadersSection {...defaultProps} isCreate={false} headers={headers} />)
-      expect(screen.getByText('tools.mcp.modal.maskedHeadersTip')).toBeInTheDocument()
+      expect(screen.getByText('tools.mcp.modal.maskedHeadersTip'))!.toBeInTheDocument()
     })
   })
 
@@ -169,6 +169,37 @@ describe('HeadersSection', () => {
       const headers = [{ id: '1', key: '', value: 'Value' }]
       render(<HeadersSection {...defaultProps} isCreate={false} headers={headers} />)
       // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
+      // Empty key headers don't trigger masking
       expect(screen.queryByText('tools.mcp.modal.maskedHeadersTip')).not.toBeInTheDocument()
     })
 
@@ -176,6 +207,37 @@ describe('HeadersSection', () => {
       const headers = [{ id: '1', key: '   ', value: 'Value' }]
       render(<HeadersSection {...defaultProps} isCreate={false} headers={headers} />)
       // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
+      // Whitespace-only key doesn't count as having content
       expect(screen.queryByText('tools.mcp.modal.maskedHeadersTip')).not.toBeInTheDocument()
     })
 
@@ -186,7 +248,8 @@ describe('HeadersSection', () => {
       ]
       render(<HeadersSection {...defaultProps} isCreate={false} headers={headers} />)
       // At least one header has a non-empty key, so masking should apply
-      expect(screen.getByText('tools.mcp.modal.maskedHeadersTip')).toBeInTheDocument()
+      // At least one header has a non-empty key, so masking should apply
+      expect(screen.getByText('tools.mcp.modal.maskedHeadersTip'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/tools/provider/__tests__/detail.spec.tsx b/web/app/components/tools/provider/__tests__/detail.spec.tsx
index 1e3327232c..870e8adab1 100644
--- a/web/app/components/tools/provider/__tests__/detail.spec.tsx
+++ b/web/app/components/tools/provider/__tests__/detail.spec.tsx
@@ -187,9 +187,9 @@ describe('ProviderDetail', () => {
           onRefreshData={mockOnRefreshData}
         />,
       )
-      expect(screen.getByTestId('title')).toHaveTextContent('Test Collection')
-      expect(screen.getByTestId('org-info')).toHaveTextContent('Test Author')
-      expect(screen.getByTestId('description')).toHaveTextContent('A test collection')
+      expect(screen.getByTestId('title'))!.toHaveTextContent('Test Collection')
+      expect(screen.getByTestId('org-info'))!.toHaveTextContent('Test Author')
+      expect(screen.getByTestId('description'))!.toHaveTextContent('A test collection')
     })
 
     it('shows loading state initially', () => {
@@ -200,7 +200,7 @@ describe('ProviderDetail', () => {
           onRefreshData={mockOnRefreshData}
         />,
       )
-      expect(screen.getByRole('status')).toBeInTheDocument()
+      expect(screen.getByRole('status'))!.toBeInTheDocument()
     })
 
     it('renders tool list after loading for builtIn type', async () => {
@@ -212,8 +212,8 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByTestId('tool-tool-1')).toBeInTheDocument()
-        expect(screen.getByTestId('tool-tool-2')).toBeInTheDocument()
+        expect(screen.getByTestId('tool-tool-1'))!.toBeInTheDocument()
+        expect(screen.getByTestId('tool-tool-2'))!.toBeInTheDocument()
       })
     })
 
@@ -239,7 +239,7 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.auth.unauthorized')).toBeInTheDocument()
+        expect(screen.getByText('tools.auth.unauthorized'))!.toBeInTheDocument()
       })
     })
 
@@ -252,7 +252,7 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.auth.authorized')).toBeInTheDocument()
+        expect(screen.getByText('tools.auth.authorized'))!.toBeInTheDocument()
       })
     })
   })
@@ -273,7 +273,7 @@ describe('ProviderDetail', () => {
         expect(mockFetchCustomCollection).toHaveBeenCalledWith('test-collection')
       })
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
     })
   })
@@ -291,8 +291,8 @@ describe('ProviderDetail', () => {
         expect(mockFetchWorkflowToolDetail).toHaveBeenCalledWith('test-id')
       })
       await waitFor(() => {
-        expect(screen.getByText('tools.openInStudio')).toBeInTheDocument()
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.openInStudio'))!.toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
     })
   })
@@ -315,7 +315,7 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.auth.unauthorized')).toBeInTheDocument()
+        expect(screen.getByText('tools.auth.unauthorized'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.auth.unauthorized'))
       expect(mockSetShowModelModal).toHaveBeenCalled()
@@ -332,7 +332,7 @@ describe('ProviderDetail', () => {
         />,
       )
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[0])
+      fireEvent.click(buttons[0]!)
       expect(mockOnHide).toHaveBeenCalled()
     })
   })
@@ -388,10 +388,10 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.auth.unauthorized')).toBeInTheDocument()
+        expect(screen.getByText('tools.auth.unauthorized'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.auth.unauthorized'))
-      expect(screen.getByTestId('config-credential')).toBeInTheDocument()
+      expect(screen.getByTestId('config-credential'))!.toBeInTheDocument()
     })
 
     it('saves credentials and refreshes data', async () => {
@@ -403,7 +403,7 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.auth.unauthorized')).toBeInTheDocument()
+        expect(screen.getByText('tools.auth.unauthorized'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.auth.unauthorized'))
       await act(async () => {
@@ -424,7 +424,7 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.auth.unauthorized')).toBeInTheDocument()
+        expect(screen.getByText('tools.auth.unauthorized'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.auth.unauthorized'))
       await act(async () => {
@@ -445,10 +445,10 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.auth.authorized')).toBeInTheDocument()
+        expect(screen.getByText('tools.auth.authorized'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.auth.authorized'))
-      expect(screen.getByTestId('config-credential')).toBeInTheDocument()
+      expect(screen.getByTestId('config-credential'))!.toBeInTheDocument()
     })
   })
 
@@ -467,10 +467,10 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.auth.unauthorized')).toBeInTheDocument()
+        expect(screen.getByText('tools.auth.unauthorized'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.auth.unauthorized'))
-      const call = mockSetShowModelModal.mock.calls[0][0]
+      const call = mockSetShowModelModal.mock.calls[0]![0]
       act(() => {
         call.onSaveCallback()
       })
@@ -497,7 +497,7 @@ describe('ProviderDetail', () => {
         expect(mockFetchCustomCollection).toHaveBeenCalled()
       })
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
     })
 
@@ -513,10 +513,10 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
-      expect(screen.getByTestId('edit-custom-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('edit-custom-modal'))!.toBeInTheDocument()
       await act(async () => {
         fireEvent.click(screen.getByTestId('edit-save'))
       })
@@ -538,11 +538,11 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
       fireEvent.click(screen.getByTestId('edit-remove'))
-      expect(screen.getByText('tools.createTool.deleteToolConfirmTitle')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.deleteToolConfirmTitle'))!.toBeInTheDocument()
       await act(async () => {
         fireEvent.click(getDeleteConfirmButton())
       })
@@ -574,10 +574,10 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('query')).toBeInTheDocument()
-        expect(screen.getByText('string')).toBeInTheDocument()
-        expect(screen.getByText('Search query')).toBeInTheDocument()
-        expect(screen.getByText('limit')).toBeInTheDocument()
+        expect(screen.getByText('query'))!.toBeInTheDocument()
+        expect(screen.getByText('string'))!.toBeInTheDocument()
+        expect(screen.getByText('Search query'))!.toBeInTheDocument()
+        expect(screen.getByText('limit'))!.toBeInTheDocument()
       })
     })
 
@@ -590,10 +590,10 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
-      expect(screen.getByTestId('workflow-tool-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('workflow-tool-modal'))!.toBeInTheDocument()
       await act(async () => {
         fireEvent.click(screen.getByTestId('wf-save'))
       })
@@ -612,11 +612,11 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
       fireEvent.click(screen.getByTestId('wf-remove'))
-      expect(screen.getByText('tools.createTool.deleteToolConfirmTitle')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.deleteToolConfirmTitle'))!.toBeInTheDocument()
       await act(async () => {
         fireEvent.click(getDeleteConfirmButton())
       })
@@ -637,10 +637,10 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.auth.unauthorized')).toBeInTheDocument()
+        expect(screen.getByText('tools.auth.unauthorized'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.auth.unauthorized'))
-      expect(screen.getByTestId('config-credential')).toBeInTheDocument()
+      expect(screen.getByTestId('config-credential'))!.toBeInTheDocument()
       fireEvent.click(screen.getByTestId('credential-cancel'))
       expect(screen.queryByTestId('config-credential')).not.toBeInTheDocument()
     })
@@ -657,10 +657,10 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
-      expect(screen.getByTestId('edit-custom-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('edit-custom-modal'))!.toBeInTheDocument()
       fireEvent.click(screen.getByTestId('edit-close'))
       expect(screen.queryByTestId('edit-custom-modal')).not.toBeInTheDocument()
     })
@@ -674,10 +674,10 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
-      expect(screen.getByTestId('workflow-tool-modal')).toBeInTheDocument()
+      expect(screen.getByTestId('workflow-tool-modal'))!.toBeInTheDocument()
       fireEvent.click(screen.getByTestId('wf-close'))
       expect(screen.queryByTestId('workflow-tool-modal')).not.toBeInTheDocument()
     })
@@ -696,11 +696,11 @@ describe('ProviderDetail', () => {
         />,
       )
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.editAction')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
       fireEvent.click(screen.getByTestId('edit-remove'))
-      expect(screen.getByText('tools.createTool.deleteToolConfirmTitle')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.deleteToolConfirmTitle'))!.toBeInTheDocument()
       fireEvent.click(getDeleteCancelButton())
       await waitFor(() => {
         expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()
diff --git a/web/app/components/tools/provider/detail.tsx b/web/app/components/tools/provider/detail.tsx
index 7f24a6ec52..7480d11485 100644
--- a/web/app/components/tools/provider/detail.tsx
+++ b/web/app/components/tools/provider/detail.tsx
@@ -244,7 +244,7 @@ const ProviderDetail = ({
             <Icon src={collection.icon} />
             <div className="ml-3 w-0 grow">
               <div className="flex h-5 items-center">
-                <Title title={collection.label[language]} />
+                <Title title={collection.label[language]!} />
               </div>
               <div className="mt-0.5 mb-1 flex h-4 items-center justify-between">
                 <OrgInfo
diff --git a/web/app/components/tools/utils/__tests__/to-form-schema.spec.ts b/web/app/components/tools/utils/__tests__/to-form-schema.spec.ts
index 19ae318b84..5a97f41bc7 100644
--- a/web/app/components/tools/utils/__tests__/to-form-schema.spec.ts
+++ b/web/app/components/tools/utils/__tests__/to-form-schema.spec.ts
@@ -54,9 +54,9 @@ describe('to-form-schema utilities', () => {
       ] as unknown as TriggerEventParameter[]
       const result = triggerEventParametersToFormSchemas(params)
       expect(result).toHaveLength(1)
-      expect(result[0].type).toBe('text-input')
-      expect(result[0]._type).toBe('string')
-      expect(result[0].tooltip).toEqual({ en_US: 'Search query', zh_Hans: '搜索查询' })
+      expect(result[0]!.type).toBe('text-input')
+      expect(result[0]!._type).toBe('string')
+      expect(result[0]!.tooltip).toEqual({ en_US: 'Search query', zh_Hans: '搜索查询' })
     })
 
     it('preserves all original fields via spread', () => {
@@ -71,9 +71,9 @@ describe('to-form-schema utilities', () => {
         },
       ] as unknown as TriggerEventParameter[]
       const result = triggerEventParametersToFormSchemas(params)
-      expect(result[0].name).toBe('count')
-      expect(result[0].label).toEqual({ en_US: 'Count', zh_Hans: '数量' })
-      expect(result[0].required).toBe(false)
+      expect(result[0]!.name).toBe('count')
+      expect(result[0]!.label).toEqual({ en_US: 'Count', zh_Hans: '数量' })
+      expect(result[0]!.required).toBe(false)
     })
   })
 
@@ -98,11 +98,11 @@ describe('to-form-schema utilities', () => {
       ]
       const result = toolParametersToFormSchemas(params)
       expect(result).toHaveLength(1)
-      expect(result[0].variable).toBe('input_text')
-      expect(result[0].type).toBe('text-input')
-      expect(result[0]._type).toBe('string')
-      expect(result[0].show_on).toEqual([])
-      expect(result[0].tooltip).toEqual({ en_US: 'Enter text', zh_Hans: '输入文本' })
+      expect(result[0]!.variable).toBe('input_text')
+      expect(result[0]!.type).toBe('text-input')
+      expect(result[0]!._type).toBe('string')
+      expect(result[0]!.show_on).toEqual([])
+      expect(result[0]!.tooltip).toEqual({ en_US: 'Enter text', zh_Hans: '输入文本' })
     })
 
     it('maps options with show_on = []', () => {
@@ -124,9 +124,9 @@ describe('to-form-schema utilities', () => {
         },
       ]
       const result = toolParametersToFormSchemas(params)
-      expect(result[0].options).toHaveLength(2)
-      expect(result[0].options![0].show_on).toEqual([])
-      expect(result[0].options![1].show_on).toEqual([])
+      expect(result[0]!.options).toHaveLength(2)
+      expect(result[0]!.options![0]!.show_on).toEqual([])
+      expect(result[0]!.options![1]!.show_on).toEqual([])
     })
 
     it('handles parameters without options', () => {
@@ -144,7 +144,7 @@ describe('to-form-schema utilities', () => {
         },
       ]
       const result = toolParametersToFormSchemas(params)
-      expect(result[0].options).toBeUndefined()
+      expect(result[0]!.options).toBeUndefined()
     })
   })
 
@@ -167,10 +167,10 @@ describe('to-form-schema utilities', () => {
       ]
       const result = toolCredentialToFormSchemas(creds)
       expect(result).toHaveLength(1)
-      expect(result[0].variable).toBe('api_key')
-      expect(result[0].type).toBe('secret-input')
-      expect(result[0].tooltip).toEqual({ en_US: 'Enter your API key', zh_Hans: '输入你的 API 密钥' })
-      expect(result[0].show_on).toEqual([])
+      expect(result[0]!.variable).toBe('api_key')
+      expect(result[0]!.type).toBe('secret-input')
+      expect(result[0]!.tooltip).toEqual({ en_US: 'Enter your API key', zh_Hans: '输入你的 API 密钥' })
+      expect(result[0]!.show_on).toEqual([])
     })
 
     it('handles null help field → tooltip becomes undefined', () => {
@@ -186,7 +186,7 @@ describe('to-form-schema utilities', () => {
         },
       ]
       const result = toolCredentialToFormSchemas(creds)
-      expect(result[0].tooltip).toBeUndefined()
+      expect(result[0]!.tooltip).toBeUndefined()
     })
 
     it('maps credential options with show_on = []', () => {
@@ -206,8 +206,8 @@ describe('to-form-schema utilities', () => {
         },
       ]
       const result = toolCredentialToFormSchemas(creds)
-      expect(result[0].options).toHaveLength(2)
-      result[0].options!.forEach(opt => expect(opt.show_on).toEqual([]))
+      expect(result[0]!.options).toHaveLength(2)
+      result[0]!.options!.forEach(opt => expect(opt.show_on).toEqual([]))
     })
   })
 
@@ -364,8 +364,8 @@ describe('to-form-schema utilities', () => {
       const schemas = [{ variable: 'name', type: 'text-input', default: 'hello' }]
       const value = { name: { value: 'world' } }
       const result = generateAgentToolValue(value, schemas)
-      expect(result.name.value).toBeDefined()
-      expect(result.name.value!.type).toBe('mixed')
+      expect(result.name!.value).toBeDefined()
+      expect(result.name!.value!.type).toBe('mixed')
     })
 
     it('generates auto:1 for auto-mode parameters in reasoning mode', () => {
@@ -379,30 +379,30 @@ describe('to-form-schema utilities', () => {
       const schemas = [{ variable: 'name', type: 'text-input' }]
       const value = { name: { auto: 0 as const, value: { type: 'constant', value: 'manual' } } }
       const result = generateAgentToolValue(value, schemas, true)
-      expect(result.name.auto).toBe(0)
-      expect(result.name.value).toEqual({ type: 'constant', value: 'manual' })
+      expect(result.name!.auto).toBe(0)
+      expect(result.name!.value).toEqual({ type: 'constant', value: 'manual' })
     })
 
     it('handles undefined value in reasoning mode with fallback', () => {
       const schemas = [{ variable: 'name', type: 'select' }]
       const value = { name: { auto: 0 as const, value: undefined } }
       const result = generateAgentToolValue(value, schemas, true)
-      expect(result.name.auto).toBe(0)
-      expect(result.name.value).toEqual({ type: 'constant', value: null })
+      expect(result.name!.auto).toBe(0)
+      expect(result.name!.value).toEqual({ type: 'constant', value: null })
     })
 
     it('applies correctInitialData for text-input type', () => {
       const schemas = [{ variable: 'query', type: 'text-input' }]
       const value = { query: { value: 'search term' } }
       const result = generateAgentToolValue(value, schemas)
-      expect(result.query.value!.type).toBe('mixed')
+      expect(result.query!.value!.type).toBe('mixed')
     })
 
     it('applies correctInitialData for boolean type conversion', () => {
       const schemas = [{ variable: 'flag', type: 'boolean' }]
       const value = { flag: { value: 'true' } }
       const result = generateAgentToolValue(value, schemas)
-      expect(result.flag.value!.value).toBe(true)
+      expect(result.flag!.value!.value).toBe(true)
     })
   })
 })
diff --git a/web/app/components/tools/utils/to-form-schema.ts b/web/app/components/tools/utils/to-form-schema.ts
index 4171590375..0d88b1424d 100644
--- a/web/app/components/tools/utils/to-form-schema.ts
+++ b/web/app/components/tools/utils/to-form-schema.ts
@@ -208,7 +208,7 @@ export const getPlainValue = (value: Record<string, { value: unknown }>) => {
   const plainValue: Record<string, unknown> = {}
   Object.keys(value).forEach((key) => {
     plainValue[key] = {
-      ...(value[key].value as object),
+      ...(value[key]!.value as object),
     }
   })
   return plainValue
@@ -260,7 +260,7 @@ export const generateAgentToolValue = (value: Record<string, { value?: unknown,
           value: itemValue?.value,
         },
       }
-      newValues[formSchema.variable].value = correctInitialData(formSchema.type, newValues[formSchema.variable].value!, itemValue?.value)
+      newValues[formSchema.variable]!.value = correctInitialData(formSchema.type, newValues[formSchema.variable]!.value!, itemValue?.value)
     })
   }
   else {
diff --git a/web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx b/web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx
index 5deed8174d..8240def485 100644
--- a/web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx
+++ b/web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx
@@ -263,7 +263,8 @@ describe('WorkflowToolConfigureButton', () => {
       render(<WorkflowToolConfigureButton {...props} />)
 
       // Assert
-      expect(screen.getByText('workflow.common.workflowAsTool')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('workflow.common.workflowAsTool'))!.toBeInTheDocument()
     })
 
     it('should render configure required badge when not published', () => {
@@ -274,7 +275,8 @@ describe('WorkflowToolConfigureButton', () => {
       render(<WorkflowToolConfigureButton {...props} />)
 
       // Assert
-      expect(screen.getByText('workflow.common.configureRequired')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('workflow.common.configureRequired'))!.toBeInTheDocument()
     })
 
     it('should not render configure required badge when published', async () => {
@@ -299,7 +301,7 @@ describe('WorkflowToolConfigureButton', () => {
 
       // Assert
       const container = document.querySelector('.cursor-not-allowed')
-      expect(container).toBeInTheDocument()
+      expect(container)!.toBeInTheDocument()
     })
 
     it('should render disabledReason when provided', () => {
@@ -312,7 +314,8 @@ describe('WorkflowToolConfigureButton', () => {
       render(<WorkflowToolConfigureButton {...props} />)
 
       // Assert
-      expect(screen.getByText('Please save the workflow first')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Please save the workflow first'))!.toBeInTheDocument()
     })
 
     it('should render loading state when published and fetching details', () => {
@@ -325,7 +328,7 @@ describe('WorkflowToolConfigureButton', () => {
 
       // Assert
       const loadingElement = document.querySelector('.pt-2')
-      expect(loadingElement).toBeInTheDocument()
+      expect(loadingElement)!.toBeInTheDocument()
     })
 
     it('should render configure and manage buttons when published', async () => {
@@ -337,8 +340,8 @@ describe('WorkflowToolConfigureButton', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByText('workflow.common.configure')).toBeInTheDocument()
-        expect(screen.getByText('workflow.common.manageInTools')).toBeInTheDocument()
+        expect(screen.getByText('workflow.common.configure'))!.toBeInTheDocument()
+        expect(screen.getByText('workflow.common.manageInTools'))!.toBeInTheDocument()
       })
     })
 
@@ -352,7 +355,7 @@ describe('WorkflowToolConfigureButton', () => {
 
       // Assert
       const textElement = screen.getByText('workflow.common.workflowAsTool')
-      expect(textElement).toHaveClass('text-text-tertiary')
+      expect(textElement)!.toHaveClass('text-text-tertiary')
     })
   })
 
@@ -405,7 +408,7 @@ describe('WorkflowToolConfigureButton', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByTestId('drawer')).toBeInTheDocument()
+        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
       })
     })
 
@@ -420,6 +423,37 @@ describe('WorkflowToolConfigureButton', () => {
       const triggerArea = screen.getByText('workflow.common.workflowAsTool').closest('.flex')
       await user.click(triggerArea!)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByTestId('drawer')).not.toBeInTheDocument()
     })
@@ -433,13 +467,44 @@ describe('WorkflowToolConfigureButton', () => {
       render(<WorkflowToolConfigureButton {...props} />)
 
       await waitFor(() => {
-        expect(screen.getByText('workflow.common.configure')).toBeInTheDocument()
+        expect(screen.getByText('workflow.common.configure'))!.toBeInTheDocument()
       })
 
       // Click the main area (should not open modal)
       const mainArea = screen.getByText('workflow.common.workflowAsTool').closest('.flex')
       await user.click(mainArea!)
 
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
+      // Should not open modal from main click
       // Should not open modal from main click
       expect(screen.queryByTestId('drawer')).not.toBeInTheDocument()
 
@@ -448,7 +513,7 @@ describe('WorkflowToolConfigureButton', () => {
 
       // Assert
       await waitFor(() => {
-        expect(screen.getByTestId('drawer')).toBeInTheDocument()
+        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
       })
     })
   })
@@ -464,7 +529,7 @@ describe('WorkflowToolConfigureButton', () => {
       render(<WorkflowToolConfigureButton {...props} />)
 
       await waitFor(() => {
-        expect(screen.getByText('workflow.common.manageInTools')).toBeInTheDocument()
+        expect(screen.getByText('workflow.common.manageInTools'))!.toBeInTheDocument()
       })
 
       await user.click(screen.getByText('workflow.common.manageInTools'))
@@ -495,7 +560,8 @@ describe('WorkflowToolConfigureButton', () => {
       })
 
       // Assert - should not crash
-      expect(screen.getByText('workflow.common.workflowAsTool')).toBeInTheDocument()
+      // Assert - should not crash
+      expect(screen.getByText('workflow.common.workflowAsTool'))!.toBeInTheDocument()
     })
 
     it('should handle paragraph type input conversion', async () => {
@@ -513,7 +579,7 @@ describe('WorkflowToolConfigureButton', () => {
 
       // Assert - should render without error
       await waitFor(() => {
-        expect(screen.getByTestId('drawer')).toBeInTheDocument()
+        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
       })
     })
   })
@@ -545,7 +611,7 @@ describe('WorkflowToolConfigureButton', () => {
       // Assert
       await waitFor(() => {
         const configureButton = screen.getByText('workflow.common.configure')
-        expect(configureButton).toBeDisabled()
+        expect(configureButton)!.toBeDisabled()
       })
     })
   })
@@ -574,7 +640,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByTestId('drawer-title')).toHaveTextContent('workflow.common.workflowAsTool')
+      // Assert
+      expect(screen.getByTestId('drawer-title'))!.toHaveTextContent('workflow.common.workflowAsTool')
     })
 
     it('should render name input field', () => {
@@ -589,7 +656,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByPlaceholderText('tools.createTool.toolNamePlaceHolder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByPlaceholderText('tools.createTool.toolNamePlaceHolder'))!.toBeInTheDocument()
     })
 
     it('should render name for tool call input', () => {
@@ -604,7 +672,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByPlaceholderText('tools.createTool.nameForToolCallPlaceHolder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByPlaceholderText('tools.createTool.nameForToolCallPlaceHolder'))!.toBeInTheDocument()
     })
 
     it('should render description textarea', () => {
@@ -619,7 +688,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByPlaceholderText('tools.createTool.descriptionPlaceholder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByPlaceholderText('tools.createTool.descriptionPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should render tool input table', () => {
@@ -634,7 +704,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByText('tools.createTool.toolInput.title')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('tools.createTool.toolInput.title'))!.toBeInTheDocument()
     })
 
     it('should render tool output table', () => {
@@ -649,7 +720,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByText('tools.createTool.toolOutput.title')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('tools.createTool.toolOutput.title'))!.toBeInTheDocument()
     })
 
     it('should render reserved output parameters', () => {
@@ -664,9 +736,10 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByText('text')).toBeInTheDocument()
-      expect(screen.getByText('files')).toBeInTheDocument()
-      expect(screen.getByText('json')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('text'))!.toBeInTheDocument()
+      expect(screen.getByText('files'))!.toBeInTheDocument()
+      expect(screen.getByText('json'))!.toBeInTheDocument()
     })
 
     it('should render label selector', () => {
@@ -681,7 +754,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByTestId('label-selector')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('label-selector'))!.toBeInTheDocument()
     })
 
     it('should render privacy policy input', () => {
@@ -696,7 +770,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByPlaceholderText('tools.createTool.privacyPolicyPlaceholder')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByPlaceholderText('tools.createTool.privacyPolicyPlaceholder'))!.toBeInTheDocument()
     })
 
     it('should render delete button when editing and onRemove provided', () => {
@@ -712,7 +787,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByText('common.operation.delete')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('common.operation.delete'))!.toBeInTheDocument()
     })
 
     it('should not render delete button when adding', () => {
@@ -727,6 +803,37 @@ describe('WorkflowToolAsModal', () => {
       // Act
       render(<WorkflowToolAsModal {...props} />)
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByText('common.operation.delete')).not.toBeInTheDocument()
     })
@@ -751,9 +858,10 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByDisplayValue('Custom Label')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('custom_name')).toBeInTheDocument()
-      expect(screen.getByDisplayValue('Custom description')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByDisplayValue('Custom Label'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('custom_name'))!.toBeInTheDocument()
+      expect(screen.getByDisplayValue('Custom description'))!.toBeInTheDocument()
     })
 
     it('should pass labels to label selector', () => {
@@ -769,7 +877,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert
-      expect(screen.getByTestId('label-values')).toHaveTextContent('tag1,tag2')
+      // Assert
+      expect(screen.getByTestId('label-values'))!.toHaveTextContent('tag1,tag2')
     })
   })
 
@@ -790,7 +899,8 @@ describe('WorkflowToolAsModal', () => {
       await user.type(labelInput, 'New Label')
 
       // Assert
-      expect(labelInput).toHaveValue('New Label')
+      // Assert
+      expect(labelInput)!.toHaveValue('New Label')
     })
 
     it('should update name state on input change', async () => {
@@ -808,7 +918,8 @@ describe('WorkflowToolAsModal', () => {
       await user.type(nameInput, 'new_name')
 
       // Assert
-      expect(nameInput).toHaveValue('new_name')
+      // Assert
+      expect(nameInput)!.toHaveValue('new_name')
     })
 
     it('should update description state on textarea change', async () => {
@@ -826,7 +937,8 @@ describe('WorkflowToolAsModal', () => {
       await user.type(descInput, 'New description')
 
       // Assert
-      expect(descInput).toHaveValue('New description')
+      // Assert
+      expect(descInput)!.toHaveValue('New description')
     })
 
     it('should show emoji picker on icon click', async () => {
@@ -844,7 +956,8 @@ describe('WorkflowToolAsModal', () => {
       await user.click(iconButton)
 
       // Assert
-      expect(screen.getByTestId('emoji-picker')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('emoji-picker'))!.toBeInTheDocument()
     })
 
     it('should update emoji on selection', async () => {
@@ -868,8 +981,8 @@ describe('WorkflowToolAsModal', () => {
 
       // Assert
       const updatedIcon = screen.getByTestId('app-icon')
-      expect(updatedIcon).toHaveAttribute('data-icon', '🚀')
-      expect(updatedIcon).toHaveAttribute('data-background', '#f0f0f0')
+      expect(updatedIcon)!.toHaveAttribute('data-icon', '🚀')
+      expect(updatedIcon)!.toHaveAttribute('data-background', '#f0f0f0')
     })
 
     it('should close emoji picker on close button', async () => {
@@ -887,10 +1000,41 @@ describe('WorkflowToolAsModal', () => {
       const iconButton = screen.getByTestId('app-icon')
       await user.click(iconButton)
 
-      expect(screen.getByTestId('emoji-picker')).toBeInTheDocument()
+      expect(screen.getByTestId('emoji-picker'))!.toBeInTheDocument()
 
       await user.click(screen.getByTestId('close-emoji-picker'))
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByTestId('emoji-picker')).not.toBeInTheDocument()
     })
@@ -909,7 +1053,8 @@ describe('WorkflowToolAsModal', () => {
       await user.click(screen.getByTestId('add-label'))
 
       // Assert
-      expect(screen.getByTestId('label-values')).toHaveTextContent('initial,new-label')
+      // Assert
+      expect(screen.getByTestId('label-values'))!.toHaveTextContent('initial,new-label')
     })
 
     it('should update privacy policy on input change', async () => {
@@ -927,7 +1072,8 @@ describe('WorkflowToolAsModal', () => {
       await user.type(privacyInput, 'https://example.com/privacy')
 
       // Assert
-      expect(privacyInput).toHaveValue('https://example.com/privacy')
+      // Assert
+      expect(privacyInput)!.toHaveValue('https://example.com/privacy')
     })
   })
 
@@ -1025,7 +1171,8 @@ describe('WorkflowToolAsModal', () => {
       await user.click(screen.getByText('common.operation.save'))
 
       // Assert
-      expect(screen.getByText('tools.createTool.confirmTitle')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('tools.createTool.confirmTitle'))!.toBeInTheDocument()
     })
 
     it('should call onSave after confirm in edit mode', async () => {
@@ -1073,7 +1220,8 @@ describe('WorkflowToolAsModal', () => {
       await user.type(descInput, 'New parameter description')
 
       // Assert
-      expect(descInput).toHaveValue('New parameter description')
+      // Assert
+      expect(descInput)!.toHaveValue('New parameter description')
     })
   })
 
@@ -1136,7 +1284,8 @@ describe('WorkflowToolAsModal', () => {
       await user.type(nameInput, 'invalid name with spaces')
 
       // Assert
-      expect(screen.getByText('tools.createTool.nameForToolCallTip')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('tools.createTool.nameForToolCallTip'))!.toBeInTheDocument()
     })
 
     it('should accept valid name format', async () => {
@@ -1153,6 +1302,37 @@ describe('WorkflowToolAsModal', () => {
       const nameInput = screen.getByPlaceholderText('tools.createTool.nameForToolCallPlaceHolder')
       await user.type(nameInput, 'valid_name_123')
 
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
+      // Assert
       // Assert
       expect(screen.queryByText('tools.createTool.nameForToolCallTip')).not.toBeInTheDocument()
     })
@@ -1204,7 +1384,8 @@ describe('WorkflowToolAsModal', () => {
       render(<WorkflowToolAsModal {...props} />)
 
       // Assert - __image should show method as text, not selector
-      expect(screen.getByText('tools.createTool.toolInput.methodParameter')).toBeInTheDocument()
+      // Assert - __image should show method as text, not selector
+      expect(screen.getByText('tools.createTool.toolInput.methodParameter'))!.toBeInTheDocument()
     })
 
     it('should show warning for reserved output parameter name collision', () => {
@@ -1245,7 +1426,7 @@ describe('WorkflowToolAsModal', () => {
 
       // Show confirm modal
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.confirmTitle')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.confirmTitle'))!.toBeInTheDocument()
       })
 
       // Assert - should not crash
@@ -1282,12 +1463,12 @@ describe('WorkflowToolAsModal', () => {
       await user.click(screen.getByText('common.operation.save'))
 
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.confirmTitle')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.confirmTitle'))!.toBeInTheDocument()
       })
 
       // Click cancel in confirm modal
       const cancelButtons = screen.getAllByText('common.operation.cancel')
-      await user.click(cancelButtons[cancelButtons.length - 1])
+      await user.click(cancelButtons[cancelButtons.length - 1]!)
 
       // Assert
       await waitFor(() => {
@@ -1319,7 +1500,8 @@ describe('MethodSelector', () => {
       render(<MethodSelector {...props} />)
 
       // Assert
-      expect(screen.getByTestId('portal-trigger')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
     })
 
     it('should display parameter method text when value is llm', () => {
@@ -1333,7 +1515,8 @@ describe('MethodSelector', () => {
       render(<MethodSelector {...props} />)
 
       // Assert
-      expect(screen.getByText('tools.createTool.toolInput.methodParameter')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('tools.createTool.toolInput.methodParameter'))!.toBeInTheDocument()
     })
 
     it('should display setting method text when value is form', () => {
@@ -1347,7 +1530,8 @@ describe('MethodSelector', () => {
       render(<MethodSelector {...props} />)
 
       // Assert
-      expect(screen.getByText('tools.createTool.toolInput.methodSetting')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('tools.createTool.toolInput.methodSetting'))!.toBeInTheDocument()
     })
 
     it('should display setting method text when value is undefined', () => {
@@ -1361,7 +1545,8 @@ describe('MethodSelector', () => {
       render(<MethodSelector {...props} />)
 
       // Assert
-      expect(screen.getByText('tools.createTool.toolInput.methodSetting')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('tools.createTool.toolInput.methodSetting'))!.toBeInTheDocument()
     })
   })
 
@@ -1380,7 +1565,8 @@ describe('MethodSelector', () => {
       await user.click(screen.getByTestId('portal-trigger'))
 
       // Assert
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      // Assert
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
     })
 
     it('should call onChange with llm when parameter option clicked', async () => {
@@ -1397,7 +1583,7 @@ describe('MethodSelector', () => {
       await user.click(screen.getByTestId('portal-trigger'))
 
       const paramOption = screen.getAllByText('tools.createTool.toolInput.methodParameter')[0]
-      await user.click(paramOption)
+      await user.click(paramOption!)
 
       // Assert
       expect(onChange).toHaveBeenCalledWith('llm')
@@ -1436,7 +1622,7 @@ describe('MethodSelector', () => {
 
       // First click - open
       await user.click(screen.getByTestId('portal-trigger'))
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
 
       // Second click - close
       await user.click(screen.getByTestId('portal-trigger'))
@@ -1460,7 +1646,7 @@ describe('MethodSelector', () => {
 
       // Assert - the first option (llm) should have a check icon container
       const content = screen.getByTestId('portal-content')
-      expect(content).toBeInTheDocument()
+      expect(content)!.toBeInTheDocument()
     })
 
     it('should show check icon for selected form value', async () => {
@@ -1477,7 +1663,7 @@ describe('MethodSelector', () => {
 
       // Assert
       const content = screen.getByTestId('portal-content')
-      expect(content).toBeInTheDocument()
+      expect(content)!.toBeInTheDocument()
     })
   })
 
@@ -1498,7 +1684,8 @@ describe('MethodSelector', () => {
       rerender(<MethodSelector {...props} value="form" />)
 
       // Assert - should not crash
-      expect(screen.getByText('tools.createTool.toolInput.methodSetting')).toBeInTheDocument()
+      // Assert - should not crash
+      expect(screen.getByText('tools.createTool.toolInput.methodSetting'))!.toBeInTheDocument()
     })
 
     it('should handle empty string value', () => {
@@ -1545,7 +1732,7 @@ describe('Integration Tests', () => {
       await user.click(triggerArea!)
 
       await waitFor(() => {
-        expect(screen.getByTestId('drawer')).toBeInTheDocument()
+        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
       })
 
       // Fill form
@@ -1594,14 +1781,14 @@ describe('Integration Tests', () => {
 
       // Wait for detail to load
       await waitFor(() => {
-        expect(screen.getByText('workflow.common.configure')).toBeInTheDocument()
+        expect(screen.getByText('workflow.common.configure'))!.toBeInTheDocument()
       })
 
       // Open modal
       await user.click(screen.getByText('workflow.common.configure'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('drawer')).toBeInTheDocument()
+        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
       })
 
       // Modify description
@@ -1614,7 +1801,7 @@ describe('Integration Tests', () => {
 
       // Confirm
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.confirmTitle')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.confirmTitle'))!.toBeInTheDocument()
       })
       await user.click(screen.getByText('common.operation.confirm'))
 
@@ -1643,7 +1830,8 @@ describe('Integration Tests', () => {
       rerender(<WorkflowToolConfigureButton {...props} />)
 
       // Assert - component should not crash and callbacks should be stable
-      expect(screen.getByText('workflow.common.workflowAsTool')).toBeInTheDocument()
+      // Assert - component should not crash and callbacks should be stable
+      expect(screen.getByText('workflow.common.workflowAsTool'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/tools/workflow-tool/__tests__/method-selector.spec.tsx b/web/app/components/tools/workflow-tool/__tests__/method-selector.spec.tsx
index 4379bec035..d1126bf762 100644
--- a/web/app/components/tools/workflow-tool/__tests__/method-selector.spec.tsx
+++ b/web/app/components/tools/workflow-tool/__tests__/method-selector.spec.tsx
@@ -26,26 +26,28 @@ describe('MethodSelector', () => {
       renderComponent()
 
       // Should display the current method text
-      expect(screen.getByText('tools.createTool.toolInput.methodParameter')).toBeInTheDocument()
+      // Should display the current method text
+      expect(screen.getByText('tools.createTool.toolInput.methodParameter'))!.toBeInTheDocument()
     })
 
     it('should render with llm value selected', () => {
       renderComponent({ value: 'llm' })
 
-      expect(screen.getByText('tools.createTool.toolInput.methodParameter')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.toolInput.methodParameter'))!.toBeInTheDocument()
     })
 
     it('should render with form value selected', () => {
       renderComponent({ value: 'form' })
 
-      expect(screen.getByText('tools.createTool.toolInput.methodSetting')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.toolInput.methodSetting'))!.toBeInTheDocument()
     })
 
     it('should render with undefined value', () => {
       renderComponent({ value: undefined })
 
       // When value is undefined, it should show the form method text (else branch)
-      expect(screen.getByText('tools.createTool.toolInput.methodSetting')).toBeInTheDocument()
+      // When value is undefined, it should show the form method text (else branch)
+      expect(screen.getByText('tools.createTool.toolInput.methodSetting'))!.toBeInTheDocument()
     })
 
     it('should render arrow down icon', () => {
@@ -53,7 +55,7 @@ describe('MethodSelector', () => {
 
       // The arrow icon is rendered with remixicon
       const arrowIcon = document.querySelector('.remixicon')
-      expect(arrowIcon).toBeInTheDocument()
+      expect(arrowIcon)!.toBeInTheDocument()
     })
   })
 
@@ -62,19 +64,19 @@ describe('MethodSelector', () => {
     it('should display methodParameter when value is llm', () => {
       renderComponent({ value: 'llm' })
 
-      expect(screen.getByText('tools.createTool.toolInput.methodParameter')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.toolInput.methodParameter'))!.toBeInTheDocument()
     })
 
     it('should display methodSetting when value is form', () => {
       renderComponent({ value: 'form' })
 
-      expect(screen.getByText('tools.createTool.toolInput.methodSetting')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.toolInput.methodSetting'))!.toBeInTheDocument()
     })
 
     it('should handle empty string value as non-llm', () => {
       renderComponent({ value: '' })
 
-      expect(screen.getByText('tools.createTool.toolInput.methodSetting')).toBeInTheDocument()
+      expect(screen.getByText('tools.createTool.toolInput.methodSetting'))!.toBeInTheDocument()
     })
   })
 
@@ -90,8 +92,8 @@ describe('MethodSelector', () => {
 
       // Dropdown should now show both options with tips
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip')).toBeInTheDocument()
-        expect(screen.getByText('tools.createTool.toolInput.methodSettingTip')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip'))!.toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.toolInput.methodSettingTip'))!.toBeInTheDocument()
       })
     })
 
@@ -106,12 +108,12 @@ describe('MethodSelector', () => {
 
       // Wait for dropdown to open
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip'))!.toBeInTheDocument()
       })
 
       // Click the llm option (by finding the method parameter option in dropdown)
       const llmOption = screen.getAllByText('tools.createTool.toolInput.methodParameter')[0]
-      await user.click(llmOption)
+      await user.click(llmOption!)
 
       expect(onChange).toHaveBeenCalledWith('llm')
     })
@@ -127,12 +129,12 @@ describe('MethodSelector', () => {
 
       // Wait for dropdown to open
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.toolInput.methodSettingTip')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.toolInput.methodSettingTip'))!.toBeInTheDocument()
       })
 
       // Click the form option (by finding the method setting option in dropdown)
       const formOption = screen.getAllByText('tools.createTool.toolInput.methodSetting')[0]
-      await user.click(formOption)
+      await user.click(formOption!)
 
       expect(onChange).toHaveBeenCalledWith('form')
     })
@@ -146,7 +148,7 @@ describe('MethodSelector', () => {
       // First click - open
       await user.click(trigger)
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip'))!.toBeInTheDocument()
       })
 
       // Second click - close
@@ -163,7 +165,7 @@ describe('MethodSelector', () => {
       renderComponent()
 
       const trigger = document.querySelector('.hover\\:bg-background-section-burn')
-      expect(trigger).toBeInTheDocument()
+      expect(trigger)!.toBeInTheDocument()
     })
 
     it('should apply open state styles when dropdown is open', async () => {
@@ -175,7 +177,7 @@ describe('MethodSelector', () => {
 
       await waitFor(() => {
         const openTrigger = document.querySelector('.bg-background-section-burn\\!')
-        expect(openTrigger).toBeInTheDocument()
+        expect(openTrigger)!.toBeInTheDocument()
       })
     })
 
@@ -189,7 +191,7 @@ describe('MethodSelector', () => {
       await waitFor(() => {
         // Check icon should be visible for llm option
         const checkIcon = document.querySelector('.text-text-accent')
-        expect(checkIcon).toBeInTheDocument()
+        expect(checkIcon)!.toBeInTheDocument()
       })
     })
 
@@ -203,7 +205,7 @@ describe('MethodSelector', () => {
       await waitFor(() => {
         // Check icon should be visible for form option
         const checkIcon = document.querySelector('.text-text-accent')
-        expect(checkIcon).toBeInTheDocument()
+        expect(checkIcon)!.toBeInTheDocument()
       })
     })
   })
@@ -219,8 +221,9 @@ describe('MethodSelector', () => {
 
       await waitFor(() => {
         // Should show both option titles and descriptions
-        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip')).toBeInTheDocument()
-        expect(screen.getByText('tools.createTool.toolInput.methodSettingTip')).toBeInTheDocument()
+        // Should show both option titles and descriptions
+        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip'))!.toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.toolInput.methodSettingTip'))!.toBeInTheDocument()
       })
     })
 
@@ -233,9 +236,9 @@ describe('MethodSelector', () => {
 
       await waitFor(() => {
         const dropdown = document.querySelector('.w-\\[320px\\]')
-        expect(dropdown).toBeInTheDocument()
-        expect(dropdown).toHaveClass('rounded-lg')
-        expect(dropdown).toHaveClass('shadow-lg')
+        expect(dropdown)!.toBeInTheDocument()
+        expect(dropdown)!.toHaveClass('rounded-lg')
+        expect(dropdown)!.toHaveClass('shadow-lg')
       })
     })
 
@@ -267,7 +270,8 @@ describe('MethodSelector', () => {
       await user.click(trigger)
 
       // Should not crash and should be in a consistent state
-      expect(trigger).toBeInTheDocument()
+      // Should not crash and should be in a consistent state
+      expect(trigger)!.toBeInTheDocument()
     })
 
     it('should handle selecting the already selected value', async () => {
@@ -279,12 +283,12 @@ describe('MethodSelector', () => {
       await user.click(trigger)
 
       await waitFor(() => {
-        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip')).toBeInTheDocument()
+        expect(screen.getByText('tools.createTool.toolInput.methodParameterTip'))!.toBeInTheDocument()
       })
 
       // Click the llm option in the dropdown (the one with the tip text nearby)
       const llmOptionContainer = screen.getByText('tools.createTool.toolInput.methodParameterTip').closest('.cursor-pointer')
-      expect(llmOptionContainer).toBeInTheDocument()
+      expect(llmOptionContainer)!.toBeInTheDocument()
       await user.click(llmOptionContainer!)
 
       // Should call onChange
@@ -298,7 +302,7 @@ describe('MethodSelector', () => {
       renderComponent()
 
       const trigger = document.querySelector('.cursor-pointer')
-      expect(trigger).toBeInTheDocument()
+      expect(trigger)!.toBeInTheDocument()
     })
 
     it('should have clickable dropdown options', async () => {
diff --git a/web/app/components/tools/workflow-tool/hooks/__tests__/use-configure-button.spec.ts b/web/app/components/tools/workflow-tool/hooks/__tests__/use-configure-button.spec.ts
index ac61872a18..6f9017bbea 100644
--- a/web/app/components/tools/workflow-tool/hooks/__tests__/use-configure-button.spec.ts
+++ b/web/app/components/tools/workflow-tool/hooks/__tests__/use-configure-button.spec.ts
@@ -150,14 +150,14 @@ describe('isParametersOutdated', () => {
 
   it('should return true when paragraph type does not match string', () => {
     const detail = createMockDetail()
-    detail.tool.parameters[0].type = 'number'
+    detail.tool.parameters[0]!.type = 'number'
     const inputs = [createMockInputVar({ variable: 'test_var', type: InputVarType.paragraph })]
     expect(isParametersOutdated(detail, inputs)).toBe(true)
   })
 
   it('should return true when text-input type does not match string', () => {
     const detail = createMockDetail()
-    detail.tool.parameters[0].type = 'number'
+    detail.tool.parameters[0]!.type = 'number'
     const inputs = [createMockInputVar({ variable: 'test_var', type: InputVarType.textInput })]
     expect(isParametersOutdated(detail, inputs)).toBe(true)
   })
@@ -344,7 +344,7 @@ describe('useConfigureButton', () => {
         inputs: [createMockInputVar({ variable: 'test_var', type: InputVarType.paragraph })],
       })))
 
-      expect(result.current.payload.parameters[0].type).toBe('string')
+      expect(result.current.payload.parameters[0]!.type).toBe('string')
     })
   })
 
diff --git a/web/app/components/tools/workflow-tool/index.tsx b/web/app/components/tools/workflow-tool/index.tsx
index c9f1989139..fd18bf5fa7 100644
--- a/web/app/components/tools/workflow-tool/index.tsx
+++ b/web/app/components/tools/workflow-tool/index.tsx
@@ -84,9 +84,9 @@ const WorkflowToolAsModal: FC<Props> = ({
   const handleParameterChange = (key: string, value: string, index: number) => {
     const newData = produce(parameters, (draft: WorkflowToolProviderParameter[]) => {
       if (key === 'description')
-        draft[index].description = value
+        draft[index]!.description = value
       else
-        draft[index].form = value
+        draft[index]!.form = value
     })
     setParameters(newData)
   }
diff --git a/web/app/components/workflow-app/components/workflow-main.tsx b/web/app/components/workflow-app/components/workflow-main.tsx
index 957344a1da..6114d7b657 100644
--- a/web/app/components/workflow-app/components/workflow-main.tsx
+++ b/web/app/components/workflow-app/components/workflow-main.tsx
@@ -102,7 +102,7 @@ const WorkflowMain = ({
           },
           enabled: !!(features.file_upload?.enabled || features.file_upload?.image?.enabled),
           allowed_file_types: features.file_upload?.allowed_file_types || [SupportUploadFileTypes.image],
-          allowed_file_extensions: features.file_upload?.allowed_file_extensions || FILE_EXTS[SupportUploadFileTypes.image].map(ext => `.${ext}`),
+          allowed_file_extensions: features.file_upload?.allowed_file_extensions || FILE_EXTS[SupportUploadFileTypes.image]!.map(ext => `.${ext}`),
           allowed_file_upload_methods: features.file_upload?.allowed_file_upload_methods || features.file_upload?.image?.transfer_methods || ['local_file', 'remote_url'],
           number_limits: features.file_upload?.number_limits || features.file_upload?.image?.number_limits || 3,
         },
diff --git a/web/app/components/workflow-app/hooks/__tests__/use-workflow-template.spec.ts b/web/app/components/workflow-app/hooks/__tests__/use-workflow-template.spec.ts
index 5d492a3b35..3e9934df74 100644
--- a/web/app/components/workflow-app/hooks/__tests__/use-workflow-template.spec.ts
+++ b/web/app/components/workflow-app/hooks/__tests__/use-workflow-template.spec.ts
@@ -65,15 +65,15 @@ describe('useWorkflowTemplate', () => {
       },
     ])
     expect(generateNewNodeCalls).toHaveLength(3)
-    expect(generateNewNodeCalls[0].data).toMatchObject({
+    expect(generateNewNodeCalls[0]!.data).toMatchObject({
       type: 'start',
       title: 'workflow.blocks.start',
     })
-    expect(generateNewNodeCalls[1].data).toMatchObject({
+    expect(generateNewNodeCalls[1]!.data).toMatchObject({
       type: 'llm',
       title: 'workflow.blocks.llm',
     })
-    expect(generateNewNodeCalls[2].data).toMatchObject({
+    expect(generateNewNodeCalls[2]!.data).toMatchObject({
       type: 'answer',
       title: 'workflow.blocks.answer',
       answer: '{{#llm.text#}}',
diff --git a/web/app/components/workflow-app/utils.ts b/web/app/components/workflow-app/utils.ts
index 1284c612ef..df344e333b 100644
--- a/web/app/components/workflow-app/utils.ts
+++ b/web/app/components/workflow-app/utils.ts
@@ -88,7 +88,7 @@ export const buildInitialFeatures = (
       },
       enabled: !!(fileUpload?.enabled || imageUpload?.enabled),
       allowed_file_types: fileUpload?.allowed_file_types || [SupportUploadFileTypes.image],
-      allowed_file_extensions: fileUpload?.allowed_file_extensions || FILE_EXTS[SupportUploadFileTypes.image].map(ext => `.${ext}`),
+      allowed_file_extensions: fileUpload?.allowed_file_extensions || FILE_EXTS[SupportUploadFileTypes.image]!.map(ext => `.${ext}`),
       allowed_file_upload_methods: fileUpload?.allowed_file_upload_methods || imageUpload?.transfer_methods || [TransferMethod.local_file, TransferMethod.remote_url],
       number_limits: fileUpload?.number_limits || imageUpload?.number_limits || 3,
       fileUploadConfig: fileUploadConfigResponse,
diff --git a/web/app/components/workflow/__tests__/candidate-node-main.spec.tsx b/web/app/components/workflow/__tests__/candidate-node-main.spec.tsx
index 61e5410aac..2e465c6df2 100644
--- a/web/app/components/workflow/__tests__/candidate-node-main.spec.tsx
+++ b/web/app/components/workflow/__tests__/candidate-node-main.spec.tsx
@@ -154,8 +154,8 @@ describe('CandidateNodeMain', () => {
 
     const { container } = render(<CandidateNodeMain candidateNode={candidateNode} />)
 
-    expect(screen.getByTestId('candidate-custom-node')).toHaveTextContent('candidate-webhook')
-    expect(container.firstChild).toHaveStyle({
+    expect(screen.getByTestId('candidate-custom-node'))!.toHaveTextContent('candidate-webhook')
+    expect(container.firstChild)!.toHaveStyle({
       left: '30px',
       top: '40px',
       transform: 'scale(1.5)',
@@ -193,7 +193,7 @@ describe('CandidateNodeMain', () => {
 
     render(<CandidateNodeMain candidateNode={candidateNode} />)
 
-    expect(screen.getByTestId('candidate-note-node')).toHaveTextContent('candidate-note')
+    expect(screen.getByTestId('candidate-note-node'))!.toHaveTextContent('candidate-note')
 
     eventHandlers.click?.({ preventDefault: vi.fn() })
 
@@ -225,7 +225,7 @@ describe('CandidateNodeMain', () => {
 
     eventHandlers.click?.({ preventDefault: vi.fn() })
     expect(mockGetIterationStartNode).toHaveBeenCalledWith('candidate-iteration')
-    expect(mockSetNodes.mock.calls[0][0]).toEqual(expect.arrayContaining([
+    expect(mockSetNodes.mock.calls[0]![0]).toEqual(expect.arrayContaining([
       expect.objectContaining({ id: 'candidate-iteration' }),
       expect.objectContaining({ id: 'iteration-start' }),
     ]))
@@ -234,7 +234,7 @@ describe('CandidateNodeMain', () => {
     eventHandlers.click?.({ preventDefault: vi.fn() })
 
     expect(mockGetLoopStartNode).toHaveBeenCalledWith('candidate-loop')
-    expect(mockSetNodes.mock.calls[1][0]).toEqual(expect.arrayContaining([
+    expect(mockSetNodes.mock.calls[1]![0]).toEqual(expect.arrayContaining([
       expect.objectContaining({ id: 'candidate-loop' }),
       expect.objectContaining({ id: 'loop-start' }),
     ]))
diff --git a/web/app/components/workflow/__tests__/custom-edge-linear-gradient-render.spec.tsx b/web/app/components/workflow/__tests__/custom-edge-linear-gradient-render.spec.tsx
index 973dfacbc8..0b406dac94 100644
--- a/web/app/components/workflow/__tests__/custom-edge-linear-gradient-render.spec.tsx
+++ b/web/app/components/workflow/__tests__/custom-edge-linear-gradient-render.spec.tsx
@@ -20,12 +20,12 @@ describe('CustomEdgeLinearGradientRender', () => {
     )
 
     const gradient = container.querySelector('linearGradient')
-    expect(gradient).toHaveAttribute('id', 'edge-gradient')
-    expect(gradient).toHaveAttribute('gradientUnits', 'userSpaceOnUse')
-    expect(gradient).toHaveAttribute('x1', '10')
-    expect(gradient).toHaveAttribute('y1', '20')
-    expect(gradient).toHaveAttribute('x2', '30')
-    expect(gradient).toHaveAttribute('y2', '40')
+    expect(gradient)!.toHaveAttribute('id', 'edge-gradient')
+    expect(gradient)!.toHaveAttribute('gradientUnits', 'userSpaceOnUse')
+    expect(gradient)!.toHaveAttribute('x1', '10')
+    expect(gradient)!.toHaveAttribute('y1', '20')
+    expect(gradient)!.toHaveAttribute('x2', '30')
+    expect(gradient)!.toHaveAttribute('y2', '40')
   })
 
   it('should render start and stop colors at both ends of the gradient', () => {
@@ -47,11 +47,11 @@ describe('CustomEdgeLinearGradientRender', () => {
 
     const stops = container.querySelectorAll('stop')
     expect(stops).toHaveLength(2)
-    expect(stops[0]).toHaveAttribute('offset', '0%')
-    expect(stops[0].getAttribute('style')).toContain('stop-color: #111111')
-    expect(stops[0].getAttribute('style')).toContain('stop-opacity: 1')
-    expect(stops[1]).toHaveAttribute('offset', '100%')
-    expect(stops[1].getAttribute('style')).toContain('stop-color: #222222')
-    expect(stops[1].getAttribute('style')).toContain('stop-opacity: 1')
+    expect(stops[0])!.toHaveAttribute('offset', '0%')
+    expect(stops[0]!.getAttribute('style')).toContain('stop-color: #111111')
+    expect(stops[0]!.getAttribute('style')).toContain('stop-opacity: 1')
+    expect(stops[1])!.toHaveAttribute('offset', '100%')
+    expect(stops[1]!.getAttribute('style')).toContain('stop-color: #222222')
+    expect(stops[1]!.getAttribute('style')).toContain('stop-opacity: 1')
   })
 })
diff --git a/web/app/components/workflow/__tests__/edge-contextmenu.spec.tsx b/web/app/components/workflow/__tests__/edge-contextmenu.spec.tsx
index 7156495a59..5767409dbe 100644
--- a/web/app/components/workflow/__tests__/edge-contextmenu.spec.tsx
+++ b/web/app/components/workflow/__tests__/edge-contextmenu.spec.tsx
@@ -218,14 +218,14 @@ describe('EdgeContextmenu', () => {
     })
 
     const deleteAction = await screen.findByRole('menuitem', { name: /common:operation\.delete/i })
-    expect(screen.getByText(/^del$/i)).toBeInTheDocument()
+    expect(screen.getByText(/^del$/i))!.toBeInTheDocument()
 
     await user.click(deleteAction)
 
     await waitFor(() => {
       expect(latestEdges).toHaveLength(1)
-      expect(latestEdges[0].id).toBe('e1')
-      expect(latestEdges[0].selected).toBe(true)
+      expect(latestEdges[0]!.id).toBe('e1')
+      expect(latestEdges[0]!.selected).toBe(true)
       expect(store.getState().edgeMenu).toBeUndefined()
       expect(screen.queryByRole('menu')).not.toBeInTheDocument()
     })
@@ -260,8 +260,8 @@ describe('EdgeContextmenu', () => {
       clientY: 180,
     })
 
-    expect(await screen.findByRole('menu')).toBeInTheDocument()
-    expect(screen.getByRole('menuitem', { name: /common:operation\.delete/i })).toBeInTheDocument()
+    expect(await screen.findByRole('menu'))!.toBeInTheDocument()
+    expect(screen.getByRole('menuitem', { name: /common:operation\.delete/i }))!.toBeInTheDocument()
     expect(fromRectSpy).toHaveBeenLastCalledWith(expect.objectContaining({
       x: 320,
       y: 180,
@@ -312,7 +312,7 @@ describe('EdgeContextmenu', () => {
       clientY: 120,
     })
 
-    expect(await screen.findByRole('menu')).toBeInTheDocument()
+    expect(await screen.findByRole('menu'))!.toBeInTheDocument()
 
     fireEvent.keyDown(document.body, { key })
 
@@ -346,7 +346,7 @@ describe('EdgeContextmenu', () => {
       clientY: 100,
     })
 
-    expect(await screen.findByRole('menu')).toBeInTheDocument()
+    expect(await screen.findByRole('menu'))!.toBeInTheDocument()
 
     fireEvent.keyDown(document.body, { key: 'Delete' })
 
@@ -373,7 +373,7 @@ describe('EdgeContextmenu', () => {
       clientX: 80,
       clientY: 60,
     })
-    expect(await screen.findByRole('menu')).toBeInTheDocument()
+    expect(await screen.findByRole('menu'))!.toBeInTheDocument()
 
     fireEvent.contextMenu(edgeTwoButton, {
       clientX: 360,
@@ -399,7 +399,7 @@ describe('EdgeContextmenu', () => {
       clientX: 160,
       clientY: 100,
     })
-    expect(await screen.findByRole('menu')).toBeInTheDocument()
+    expect(await screen.findByRole('menu'))!.toBeInTheDocument()
 
     fireEvent.click(container.querySelector('button[aria-label="Remove edge e1"]') as HTMLButtonElement)
 
diff --git a/web/app/components/workflow/__tests__/workflow-history-store.spec.tsx b/web/app/components/workflow/__tests__/workflow-history-store.spec.tsx
index 931cd97c02..bc2495748a 100644
--- a/web/app/components/workflow/__tests__/workflow-history-store.spec.tsx
+++ b/web/app/components/workflow/__tests__/workflow-history-store.spec.tsx
@@ -59,10 +59,10 @@ describe('WorkflowHistoryProvider', () => {
       </WorkflowHistoryProvider>,
     )
 
-    expect(screen.getByRole('button', { name: 'nodes:1 shortcuts:true' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'nodes:1 shortcuts:true' }))!.toBeInTheDocument()
 
     await user.click(screen.getByRole('button', { name: 'nodes:1 shortcuts:true' }))
-    expect(screen.getByRole('button', { name: 'nodes:1 shortcuts:false' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'nodes:1 shortcuts:false' }))!.toBeInTheDocument()
   })
 
   it('sanitizes selected flags when history state is replaced through the exposed store api', () => {
@@ -85,8 +85,8 @@ describe('WorkflowHistoryProvider', () => {
 
     result.current.store.setState(nextState)
 
-    expect(result.current.store.getState().nodes[0].data.selected).toBe(false)
-    expect(result.current.store.getState().edges[0].selected).toBe(false)
+    expect(result.current.store.getState().nodes[0]!.data.selected).toBe(false)
+    expect(result.current.store.getState().edges[0]!.selected).toBe(false)
   })
 
   it('throws when consumed outside the provider', () => {
diff --git a/web/app/components/workflow/__tests__/workflow-test-env.spec.tsx b/web/app/components/workflow/__tests__/workflow-test-env.spec.tsx
index de13828f2a..f47da870bb 100644
--- a/web/app/components/workflow/__tests__/workflow-test-env.spec.tsx
+++ b/web/app/components/workflow/__tests__/workflow-test-env.spec.tsx
@@ -63,14 +63,14 @@ function FlowReader() {
 describe('renderWorkflowComponent', () => {
   it('should provide WorkflowContext with default store', () => {
     renderWorkflowComponent(React.createElement(StoreReader))
-    expect(screen.getByTestId('store-reader')).toHaveTextContent('no-confirm')
+    expect(screen.getByTestId('store-reader'))!.toHaveTextContent('no-confirm')
   })
 
   it('should apply initialStoreState', () => {
     renderWorkflowComponent(React.createElement(StoreReader), {
       initialStoreState: { showConfirm: { title: 'Hey', onConfirm: () => {} } },
     })
-    expect(screen.getByTestId('store-reader')).toHaveTextContent('has-confirm')
+    expect(screen.getByTestId('store-reader'))!.toHaveTextContent('has-confirm')
   })
 
   it('should return a live store that components can mutate', () => {
@@ -85,14 +85,14 @@ describe('renderWorkflowComponent', () => {
     })
 
     expect(store.getState().showConfirm).toBeDefined()
-    expect(screen.getByTestId('store-reader')).toHaveTextContent('has-confirm')
+    expect(screen.getByTestId('store-reader'))!.toHaveTextContent('has-confirm')
   })
 
   it('should provide HooksStoreContext when hooksStoreProps given', () => {
     renderWorkflowComponent(React.createElement(HooksStoreReader), {
       hooksStoreProps: { configsMap: { flowId: 'test-123', flowType: FlowType.appFlow, fileSettings: {} } },
     })
-    expect(screen.getByTestId('hooks-reader')).toHaveTextContent('test-123')
+    expect(screen.getByTestId('hooks-reader'))!.toHaveTextContent('test-123')
   })
 
   it('should throw when HooksStoreContext is not provided', () => {
@@ -124,7 +124,7 @@ describe('renderWorkflowComponent', () => {
 describe('renderNodeComponent', () => {
   it('should render node with default id and selected=false', () => {
     renderNodeComponent(NodeRenderer, { title: 'Hello' })
-    expect(screen.getByTestId('node-render')).toHaveTextContent('test-node-1:Hello:nosel')
+    expect(screen.getByTestId('node-render'))!.toHaveTextContent('test-node-1:Hello:nosel')
   })
 
   it('should accept custom nodeId and selected', () => {
@@ -132,7 +132,7 @@ describe('renderNodeComponent', () => {
       nodeId: 'custom-42',
       selected: true,
     })
-    expect(screen.getByTestId('node-render')).toHaveTextContent('custom-42:World:sel')
+    expect(screen.getByTestId('node-render'))!.toHaveTextContent('custom-42:World:sel')
   })
 
   it('should provide WorkflowContext to node components', () => {
@@ -144,7 +144,7 @@ describe('renderNodeComponent', () => {
     renderNodeComponent(NodeWithStore, {}, {
       initialStoreState: { controlMode: 'hand' as Shape['controlMode'] },
     })
-    expect(screen.getByTestId('node-store')).toHaveTextContent('test-node-1:hand')
+    expect(screen.getByTestId('node-store'))!.toHaveTextContent('test-node-1:hand')
   })
 })
 
@@ -158,7 +158,7 @@ describe('renderWorkflowFlowComponent', () => {
       initialStoreState: { showConfirm: { title: 'Hey', onConfirm: () => {} } },
     })
 
-    expect(screen.getByTestId('flow-reader')).toHaveTextContent('2:confirm')
+    expect(screen.getByTestId('flow-reader'))!.toHaveTextContent('2:confirm')
   })
 })
 
@@ -171,6 +171,6 @@ describe('renderWorkflowFlowHook', () => {
     })
 
     expect(result.current).toHaveLength(1)
-    expect(result.current[0].id).toBe('flow-1')
+    expect(result.current[0]!.id).toBe('flow-1')
   })
 })
diff --git a/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx b/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx
index 91b158344b..cdf2e2afd4 100644
--- a/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx
@@ -64,10 +64,10 @@ describe('IndexBar', () => {
       const result = groupItems(items, item => item.label.zh_Hans[0] || item.label.en_US[0] || '')
 
       expect(result.letters).toEqual(['J', 'S', 'Z', '#'])
-      expect(result.groups.J.Builtin).toHaveLength(1)
-      expect(result.groups.Z[WORKFLOW_GROUP_NAME]).toHaveLength(1)
-      expect(result.groups.S[DATA_SOURCE_GROUP_NAME]).toHaveLength(1)
-      expect(result.groups['#'][CUSTOM_GROUP_NAME]).toHaveLength(1)
+      expect(result.groups.J!.Builtin).toHaveLength(1)
+      expect(result.groups.Z![WORKFLOW_GROUP_NAME]).toHaveLength(1)
+      expect(result.groups.S![DATA_SOURCE_GROUP_NAME]).toHaveLength(1)
+      expect(result.groups['#']![CUSTOM_GROUP_NAME]).toHaveLength(1)
     })
   })
 
diff --git a/web/app/components/workflow/block-selector/__tests__/tabs.spec.tsx b/web/app/components/workflow/block-selector/__tests__/tabs.spec.tsx
index 7e73e1debd..3ee21f9999 100644
--- a/web/app/components/workflow/block-selector/__tests__/tabs.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/tabs.spec.tsx
@@ -126,8 +126,8 @@ describe('Tabs', () => {
   it('should render start content and disabled tab tooltip text', () => {
     render(<Tabs {...baseProps} />)
 
-    expect(screen.getByText('start-content')).toBeInTheDocument()
-    expect(screen.getByText('workflow.tabs.startDisabledTip')).toBeInTheDocument()
+    expect(screen.getByText('start-content'))!.toBeInTheDocument()
+    expect(screen.getByText('workflow.tabs.startDisabledTip'))!.toBeInTheDocument()
   })
 
   it('should switch tabs through click handlers and render tools content with normalized icons', () => {
@@ -144,10 +144,10 @@ describe('Tabs', () => {
     fireEvent.click(screen.getByText('Start'))
 
     expect(onActiveTabChange).toHaveBeenCalledWith(TabsEnum.Start)
-    expect(screen.getByText('tools-content')).toBeInTheDocument()
-    expect(screen.getByText('/console/tool.svg')).toBeInTheDocument()
-    expect(screen.getByText('featured-on')).toBeInTheDocument()
-    expect(screen.getByText('featured-idle')).toBeInTheDocument()
+    expect(screen.getByText('tools-content'))!.toBeInTheDocument()
+    expect(screen.getByText('/console/tool.svg'))!.toBeInTheDocument()
+    expect(screen.getByText('featured-on'))!.toBeInTheDocument()
+    expect(screen.getByText('featured-idle'))!.toBeInTheDocument()
   })
 
   it('should sync normalized tools into workflow store state', () => {
@@ -183,7 +183,7 @@ describe('Tabs', () => {
       />,
     )
 
-    expect(screen.getByText('sources-content')).toBeInTheDocument()
+    expect(screen.getByText('sources-content'))!.toBeInTheDocument()
   })
 
   it('should keep the previous workflow store state when tool references do not change', () => {
@@ -197,7 +197,7 @@ describe('Tabs', () => {
       workflowTools: mockToolsState.workflowTools,
       mcpTools: mockToolsState.mcpTools,
     }
-    const updateState = mockSetState.mock.calls[0][0] as (state: typeof previousState) => typeof previousState
+    const updateState = mockSetState.mock.calls[0]![0] as (state: typeof previousState) => typeof previousState
 
     expect(updateState(previousState)).toBe(previousState)
   })
@@ -210,9 +210,9 @@ describe('Tabs', () => {
 
     render(<Tabs {...baseProps} activeTab={TabsEnum.Tools} />)
 
-    expect(screen.getByText('object-icon')).toBeInTheDocument()
+    expect(screen.getByText('object-icon'))!.toBeInTheDocument()
 
-    const updateState = mockSetState.mock.calls[0][0] as (state: {
+    const updateState = mockSetState.mock.calls[0]![0] as (state: {
       buildInTools?: Array<{ icon: string | Record<string, string>, name: string }>
       customTools?: Array<{ icon: string | Record<string, string>, name: string }>
       workflowTools?: Array<{ icon: string | Record<string, string>, name: string }>
@@ -242,7 +242,7 @@ describe('Tabs', () => {
 
     render(<Tabs {...baseProps} activeTab={TabsEnum.Tools} />)
 
-    expect(screen.getByText('tools-content')).toBeInTheDocument()
+    expect(screen.getByText('tools-content'))!.toBeInTheDocument()
   })
 
   it('should force start content to render and invalidate built-in tools after featured installs', async () => {
@@ -257,7 +257,7 @@ describe('Tabs', () => {
 
     await user.click(screen.getByRole('button', { name: 'Install featured tool' }))
 
-    expect(screen.getByText('tools-content')).toBeInTheDocument()
+    expect(screen.getByText('tools-content'))!.toBeInTheDocument()
     expect(mockInvalidateBuiltInTools).toHaveBeenCalledTimes(1)
   })
 
@@ -271,6 +271,6 @@ describe('Tabs', () => {
       />,
     )
 
-    expect(screen.getByText('start-content')).toBeInTheDocument()
+    expect(screen.getByText('start-content'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/block-selector/__tests__/view-type-select.spec.tsx b/web/app/components/workflow/block-selector/__tests__/view-type-select.spec.tsx
index 40e5bacd83..b6a9cb20d7 100644
--- a/web/app/components/workflow/block-selector/__tests__/view-type-select.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/view-type-select.spec.tsx
@@ -20,8 +20,8 @@ describe('ViewTypeSelect', () => {
 
     const [flatOption, treeOption] = getViewOptions(container)
 
-    expect(flatOption).toHaveClass('bg-components-segmented-control-item-active-bg')
-    expect(treeOption).toHaveClass('cursor-pointer')
+    expect(flatOption)!.toHaveClass('bg-components-segmented-control-item-active-bg')
+    expect(treeOption)!.toHaveClass('cursor-pointer')
   })
 
   it('should call onChange when switching to a different view type', () => {
@@ -34,7 +34,7 @@ describe('ViewTypeSelect', () => {
     )
 
     const [, treeOption] = getViewOptions(container)
-    fireEvent.click(treeOption)
+    fireEvent.click(treeOption!)
 
     expect(onChange).toHaveBeenCalledWith(ViewType.tree)
     expect(onChange).toHaveBeenCalledTimes(1)
@@ -50,7 +50,7 @@ describe('ViewTypeSelect', () => {
     )
 
     const [, treeOption] = getViewOptions(container)
-    fireEvent.click(treeOption)
+    fireEvent.click(treeOption!)
 
     expect(onChange).not.toHaveBeenCalled()
   })
diff --git a/web/app/components/workflow/block-selector/blocks.tsx b/web/app/components/workflow/block-selector/blocks.tsx
index 2425112335..97792afd92 100644
--- a/web/app/components/workflow/block-selector/blocks.tsx
+++ b/web/app/components/workflow/block-selector/blocks.tsx
@@ -69,7 +69,7 @@ const Blocks = ({
   const isEmpty = Object.values(groups).every(list => !list.length)
 
   const renderGroup = useCallback((classification: BlockClassificationEnum) => {
-    const list = groups[classification].sort((a, b) => (a.metaData.sort || 0) - (b.metaData.sort || 0))
+    const list = groups[classification]!.sort((a, b) => (a.metaData.sort || 0) - (b.metaData.sort || 0))
     const { getNodes } = store.getState()
     const nodes = getNodes()
     const hasKnowledgeBaseNode = nodes.some(node => node.data.type === BlockEnum.KnowledgeBase)
diff --git a/web/app/components/workflow/block-selector/data-sources.tsx b/web/app/components/workflow/block-selector/data-sources.tsx
index 71003ed5f3..447442818a 100644
--- a/web/app/components/workflow/block-selector/data-sources.tsx
+++ b/web/app/components/workflow/block-selector/data-sources.tsx
@@ -51,7 +51,7 @@ const DataSources = ({
 
     return dataSources.filter((toolWithProvider) => {
       return isMatchingKeywords(toolWithProvider.name, searchText) || toolWithProvider.tools.some((tool) => {
-        return tool.label[language].toLowerCase().includes(searchText.toLowerCase()) || tool.name.toLowerCase().includes(searchText.toLowerCase())
+        return tool.label[language]!.toLowerCase().includes(searchText.toLowerCase()) || tool.name.toLowerCase().includes(searchText.toLowerCase())
       })
     })
   }, [searchText, dataSources, language])
diff --git a/web/app/components/workflow/block-selector/index-bar.tsx b/web/app/components/workflow/block-selector/index-bar.tsx
index ec03223238..7565c087c3 100644
--- a/web/app/components/workflow/block-selector/index-bar.tsx
+++ b/web/app/components/workflow/block-selector/index-bar.tsx
@@ -33,7 +33,7 @@ export const groupItems = (items: ToolWithProvider[], getFirstChar: (item: ToolW
 
     // transform Chinese to pinyin
     if (/[\u4E00-\u9FA5]/.test(firstChar))
-      letter = pinyin(firstChar, { pattern: 'first', toneType: 'none' })[0].toUpperCase()
+      letter = pinyin(firstChar, { pattern: 'first', toneType: 'none' })[0]!.toUpperCase()
     else
       letter = firstChar.toUpperCase()
 
@@ -55,10 +55,10 @@ export const groupItems = (items: ToolWithProvider[], getFirstChar: (item: ToolW
     else
       groupName = AGENT_GROUP_NAME
 
-    if (!acc[letter][groupName])
-      acc[letter][groupName] = []
+    if (!acc[letter]![groupName])
+      acc[letter]![groupName] = []
 
-    acc[letter][groupName].push(item)
+    acc[letter]![groupName]!.push(item)
 
     return acc
   }, {})
diff --git a/web/app/components/workflow/block-selector/rag-tool-recommendations/list.tsx b/web/app/components/workflow/block-selector/rag-tool-recommendations/list.tsx
index 87e4863414..d5873ddc1f 100644
--- a/web/app/components/workflow/block-selector/rag-tool-recommendations/list.tsx
+++ b/web/app/components/workflow/block-selector/rag-tool-recommendations/list.tsx
@@ -29,14 +29,14 @@ const List = ({
   const language = useGetLanguage()
   const isFlatView = viewType === ViewType.flat
 
-  const { letters, groups: withLetterAndGroupViewToolsData } = groupItems(tools, tool => tool.label[language][0])
+  const { letters, groups: withLetterAndGroupViewToolsData } = groupItems(tools, tool => tool.label[language]![0]!)
   const treeViewToolsData = useMemo(() => {
     const result: Record<string, ToolWithProvider[]> = {}
     Object.keys(withLetterAndGroupViewToolsData).forEach((letter) => {
-      Object.keys(withLetterAndGroupViewToolsData[letter]).forEach((groupName) => {
+      Object.keys(withLetterAndGroupViewToolsData[letter]!).forEach((groupName) => {
         if (!result[groupName])
           result[groupName] = []
-        result[groupName].push(...withLetterAndGroupViewToolsData[letter][groupName])
+        result[groupName].push(...(withLetterAndGroupViewToolsData[letter]![groupName] ?? []))
       })
     })
     return result
@@ -45,8 +45,8 @@ const List = ({
   const listViewToolData = useMemo(() => {
     const result: ToolWithProvider[] = []
     letters.forEach((letter) => {
-      Object.keys(withLetterAndGroupViewToolsData[letter]).forEach((groupName) => {
-        result.push(...withLetterAndGroupViewToolsData[letter][groupName].map((item) => {
+      Object.keys(withLetterAndGroupViewToolsData[letter]!).forEach((groupName) => {
+        result.push(...withLetterAndGroupViewToolsData[letter]![groupName]!.map((item) => {
           return {
             ...item,
             letter,
diff --git a/web/app/components/workflow/block-selector/tool/action-item.tsx b/web/app/components/workflow/block-selector/tool/action-item.tsx
index 723bcf5434..4afe1b1da3 100644
--- a/web/app/components/workflow/block-selector/tool/action-item.tsx
+++ b/web/app/components/workflow/block-selector/tool/action-item.tsx
@@ -97,9 +97,9 @@ const ToolItem: FC<Props> = ({
             provider_icon: normalizedIcon,
             provider_icon_dark: normalizedIconDark,
             tool_name: payload.name,
-            tool_label: payload.label[language],
+            tool_label: payload.label[language]!,
             tool_description: payload.description[language],
-            title: payload.label[language],
+            title: payload.label[language]!,
             is_team_authorization: provider.is_team_authorization,
             paramSchemas: payload.parameters,
             params,
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
index 944cc28547..56e306895f 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
@@ -48,7 +48,7 @@ const ToolListTreeView: FC<Props> = ({
         <Item
           key={groupName}
           groupName={getI18nGroupName(groupName)}
-          toolList={payload[groupName]}
+          toolList={payload[groupName]!}
           hasSearchText={hasSearchText}
           onSelect={onSelect}
           canNotSelectMultiple={canNotSelectMultiple}
diff --git a/web/app/components/workflow/block-selector/tool/tool.tsx b/web/app/components/workflow/block-selector/tool/tool.tsx
index 5abc750fed..9a25d10208 100644
--- a/web/app/components/workflow/block-selector/tool/tool.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool.tsx
@@ -24,7 +24,7 @@ import ActionItem from './action-item'
 
 const normalizeProviderIcon = (icon?: ToolWithProvider['icon']) => {
   if (!icon)
-    return icon
+    return icon!
   if (typeof icon === 'string' && basePath && icon.startsWith('/') && !icon.startsWith(`${basePath}/`))
     return `${basePath}${icon}`
   return icon
@@ -70,7 +70,7 @@ const Tool: FC<Props> = ({
   }, [payload.icon])
   const normalizedIconDark = useMemo(() => {
     if (!payload.icon_dark)
-      return undefined
+      return undefined!
     return normalizeProviderIcon(payload.icon_dark) ?? payload.icon_dark
   }, [payload.icon_dark])
   const providerIcon = useMemo<ToolWithProvider['icon']>(() => {
@@ -114,14 +114,14 @@ const Tool: FC<Props> = ({
                 provider_id: payload.id,
                 provider_type: payload.type,
                 provider_name: payload.name,
-                plugin_id: payload.plugin_id,
-                plugin_unique_identifier: payload.plugin_unique_identifier,
+                plugin_id: payload.plugin_id!,
+                plugin_unique_identifier: payload.plugin_unique_identifier!,
                 provider_icon: normalizedIcon,
                 provider_icon_dark: normalizedIconDark,
                 tool_name: tool.name,
-                tool_label: tool.label[language],
+                tool_label: tool.label[language]!,
                 tool_description: tool.description[language],
-                title: tool.label[language],
+                title: tool.label[language]!,
                 is_team_authorization: payload.is_team_authorization,
                 paramSchemas: tool.parameters,
                 params,
@@ -187,8 +187,8 @@ const Tool: FC<Props> = ({
 
             const tool = actions[0]
             const params: Record<string, string> = {}
-            if (tool.parameters) {
-              tool.parameters.forEach((item) => {
+            if (tool!.parameters) {
+              tool!.parameters.forEach((item) => {
                 params[item.name] = ''
               })
             }
@@ -200,12 +200,12 @@ const Tool: FC<Props> = ({
               plugin_unique_identifier: payload.plugin_unique_identifier,
               provider_icon: normalizedIcon,
               provider_icon_dark: normalizedIconDark,
-              tool_name: tool.name,
-              tool_label: tool.label[language],
-              tool_description: tool.description[language],
-              title: tool.label[language],
+              tool_name: tool!.name,
+              tool_label: tool!.label[language]!,
+              tool_description: tool!.description[language],
+              title: tool!.label[language]!,
               is_team_authorization: payload.is_team_authorization,
-              paramSchemas: tool.parameters,
+              paramSchemas: tool!.parameters,
               params,
             })
           }}
diff --git a/web/app/components/workflow/block-selector/tools.tsx b/web/app/components/workflow/block-selector/tools.tsx
index 8c281e3529..cabc079750 100644
--- a/web/app/components/workflow/block-selector/tools.tsx
+++ b/web/app/components/workflow/block-selector/tools.tsx
@@ -56,14 +56,14 @@ const Tools = ({
     }
   }
   */
-  const { letters, groups: withLetterAndGroupViewToolsData } = groupItems(tools, tool => tool.label[language][0])
+  const { letters, groups: withLetterAndGroupViewToolsData } = groupItems(tools, tool => tool.label[language]![0]!)
   const treeViewToolsData = useMemo(() => {
     const result: Record<string, ToolWithProvider[]> = {}
     Object.keys(withLetterAndGroupViewToolsData).forEach((letter) => {
-      Object.keys(withLetterAndGroupViewToolsData[letter]).forEach((groupName) => {
+      Object.keys(withLetterAndGroupViewToolsData[letter]!).forEach((groupName) => {
         if (!result[groupName])
           result[groupName] = []
-        result[groupName].push(...withLetterAndGroupViewToolsData[letter][groupName])
+        result[groupName].push(...(withLetterAndGroupViewToolsData[letter]![groupName] ?? []))
       })
     })
     return result
@@ -72,8 +72,8 @@ const Tools = ({
   const listViewToolData = useMemo(() => {
     const result: ToolWithProvider[] = []
     letters.forEach((letter) => {
-      Object.keys(withLetterAndGroupViewToolsData[letter]).forEach((groupName) => {
-        result.push(...withLetterAndGroupViewToolsData[letter][groupName].map((item) => {
+      Object.keys(withLetterAndGroupViewToolsData[letter]!).forEach((groupName) => {
+        result.push(...withLetterAndGroupViewToolsData[letter]![groupName]!.map((item) => {
           return {
             ...item,
             letter,
diff --git a/web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx b/web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
index 34ee744414..4ffb84e1b8 100644
--- a/web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
+++ b/web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
@@ -65,10 +65,10 @@ const TriggerPluginActionItem: FC<Props> = ({
             provider_type: provider.type as string,
             provider_name: provider.name,
             event_name: payload.name,
-            event_label: payload.label[language],
-            event_description: payload.description[language],
+            event_label: payload.label[language]!,
+            event_description: payload.description[language]!,
             plugin_unique_identifier: provider.plugin_unique_identifier,
-            title: payload.label[language],
+            title: payload.label[language]!,
             is_team_authorization: provider.is_team_authorization,
             output_schema: payload.output_schema || {},
             paramSchemas: payload.parameters,
diff --git a/web/app/components/workflow/block-selector/trigger-plugin/item.tsx b/web/app/components/workflow/block-selector/trigger-plugin/item.tsx
index 35230810b8..9e6c315506 100644
--- a/web/app/components/workflow/block-selector/trigger-plugin/item.tsx
+++ b/web/app/components/workflow/block-selector/trigger-plugin/item.tsx
@@ -103,8 +103,8 @@ const TriggerPluginItem: FC<Props> = ({
 
             const event = actions[0]
             const params: Record<string, string> = {}
-            if (event.parameters) {
-              event.parameters.forEach((item: any) => {
+            if (event!.parameters) {
+              event!.parameters.forEach((item: any) => {
                 params[item.name] = ''
               })
             }
@@ -113,14 +113,14 @@ const TriggerPluginItem: FC<Props> = ({
               provider_id: payload.name,
               provider_type: payload.type,
               provider_name: payload.name,
-              event_name: event.name,
-              event_label: event.label[language],
-              event_description: event.description[language],
-              title: event.label[language],
+              event_name: event!.name,
+              event_label: event!.label[language]!,
+              event_description: event!.description[language]!,
+              title: event!.label[language]!,
               plugin_unique_identifier: payload.plugin_unique_identifier,
               is_team_authorization: payload.is_team_authorization,
-              output_schema: event.output_schema || {},
-              paramSchemas: event.parameters,
+              output_schema: event!.output_schema || {},
+              paramSchemas: event!.parameters,
               params,
             })
           }}
diff --git a/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.test.ts b/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.test.ts
index 957ef76e86..c04c9f127d 100644
--- a/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.test.ts
+++ b/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.test.ts
@@ -325,7 +325,7 @@ describe('CollaborationManager syncNodes', () => {
 
   it('reflects the last writer when concurrent removal and edits happen', () => {
     const base = [createNodeSnapshot(['a', 'b'])]
-    internals.syncNodes([], [deepClone(base[0])])
+    internals.syncNodes([], [deepClone(base[0])!])
     const userA = [
       {
         ...createNodeSnapshot(['a']),
@@ -407,7 +407,7 @@ describe('CollaborationManager syncNodes', () => {
     const final = (promptManager.getNodes() as Node[]).find(node => node.id === LLM_NODE_ID)
     const finalTemplates = getPromptTemplates(final!)
     expect(finalTemplates).toHaveLength(1)
-    expect(finalTemplates[0].text).toBe('updated system prompt')
+    expect(finalTemplates[0]!.text).toBe('updated system prompt')
   })
 
   it('keeps parameter list in sync when nodes add, edit, or remove parameters', () => {
@@ -500,7 +500,7 @@ describe('CollaborationManager syncNodes', () => {
 
     const stored = parameterManager.getNodes().find(n => n.id === PARAM_NODE_ID) as Node<ParameterExtractorNodeData>
     const mutatedNode = deepClone(stored)
-    mutatedNode.data.parameters[0].description = 'updated'
+    mutatedNode.data.parameters[0]!.description = 'updated'
 
     parameterInternals.syncNodes([stored], [mutatedNode])
 
@@ -509,7 +509,7 @@ describe('CollaborationManager syncNodes', () => {
       | undefined
     const params = storedAfter?.data.parameters ?? []
     expect(params).toHaveLength(1)
-    expect(params[0].description).toBe('updated')
+    expect(params[0]!.description).toBe('updated')
   })
 
   it('filters out transient/private data keys while keeping allowlisted ones', () => {
diff --git a/web/app/components/workflow/collaboration/core/__tests__/crdt-provider.test.ts b/web/app/components/workflow/collaboration/core/__tests__/crdt-provider.test.ts
index 613c2d1b75..d6a9e35228 100644
--- a/web/app/components/workflow/collaboration/core/__tests__/crdt-provider.test.ts
+++ b/web/app/components/workflow/collaboration/core/__tests__/crdt-provider.test.ts
@@ -100,7 +100,7 @@ describe('CRDTProvider', () => {
     socket.trigger('graph_update', payload)
 
     expect(doc.import).toHaveBeenCalledWith(expect.any(Uint8Array))
-    expect(Array.from(doc.import.mock.calls[0][0])).toEqual([9, 9, 9])
+    expect(Array.from(doc.import.mock.calls[0]![0])).toEqual([9, 9, 9])
     provider.destroy()
   })
 
diff --git a/web/app/components/workflow/collaboration/utils/user-color.ts b/web/app/components/workflow/collaboration/utils/user-color.ts
index 51aee6a038..a25e87dbe2 100644
--- a/web/app/components/workflow/collaboration/utils/user-color.ts
+++ b/web/app/components/workflow/collaboration/utils/user-color.ts
@@ -8,5 +8,5 @@ export const getUserColor = (id: string): string => {
     a = ((a << 5) - a) + b.charCodeAt(0)
     return a & a
   }, 0)
-  return colors[Math.abs(hash) % colors.length]
+  return colors[Math.abs(hash) % colors.length]!
 }
diff --git a/web/app/components/workflow/comment/mention-input.tsx b/web/app/components/workflow/comment/mention-input.tsx
index ac708b979d..b5d75d6734 100644
--- a/web/app/components/workflow/comment/mention-input.tsx
+++ b/web/app/components/workflow/comment/mention-input.tsx
@@ -111,7 +111,7 @@ const MentionInputInner = forwardRef<HTMLTextAreaElement, MentionInputProps>(({
           continue
 
         const previousChar = searchStart > 0 ? value[searchStart - 1] : ''
-        if (searchStart > 0 && !/\s/.test(previousChar))
+        if (searchStart > 0 && !/\s/.test(previousChar!))
           continue
 
         if (
@@ -332,7 +332,7 @@ const MentionInputInner = forwardRef<HTMLTextAreaElement, MentionInputProps>(({
       const mentionMatch = textBeforeCursor.match(/@(\w*)$/)
 
       if (mentionMatch) {
-        setMentionQuery(mentionMatch[1])
+        setMentionQuery(mentionMatch[1]!)
         setMentionPosition(cursorPosition - mentionMatch[0].length)
         setShowMentionDropdown(true)
         setSelectedMentionIndex(0)
@@ -398,7 +398,7 @@ const MentionInputInner = forwardRef<HTMLTextAreaElement, MentionInputProps>(({
     const beforeMention = value.slice(0, mentionPosition)
     const afterMention = value.slice(textarea.selectionStart || 0)
 
-    const needsSpaceBefore = mentionPosition > 0 && !/\s/.test(value[mentionPosition - 1])
+    const needsSpaceBefore = mentionPosition > 0 && !/\s/.test(value[mentionPosition - 1]!)
     const prefix = needsSpaceBefore ? ' ' : ''
     const newContent = `${beforeMention}${prefix}@${user.name} ${afterMention}`
 
diff --git a/web/app/components/workflow/comment/thread.tsx b/web/app/components/workflow/comment/thread.tsx
index 3e449b66e5..a23ac4241d 100644
--- a/web/app/components/workflow/comment/thread.tsx
+++ b/web/app/components/workflow/comment/thread.tsx
@@ -84,7 +84,7 @@ const ThreadMessage: FC<{
           continue
 
         const previousChar = searchStart > 0 ? content[searchStart - 1] : ''
-        if (searchStart > 0 && !/\s/.test(previousChar))
+        if (searchStart > 0 && !/\s/.test(previousChar!))
           continue
 
         if (
diff --git a/web/app/components/workflow/features.tsx b/web/app/components/workflow/features.tsx
index 56b8b79ced..eb0ec02612 100644
--- a/web/app/components/workflow/features.tsx
+++ b/web/app/components/workflow/features.tsx
@@ -33,11 +33,11 @@ const Features = () => {
   const handleAddOpeningStatementVariable = (variables: PromptVariable[]) => {
     const newVariable = variables[0]
     const startNodeVariable: InputVar = {
-      variable: newVariable.key,
-      label: newVariable.name,
+      variable: newVariable!.key,
+      label: newVariable!.name,
       type: InputVarType.textInput,
-      max_length: newVariable.max_length,
-      required: newVariable.required || false,
+      max_length: newVariable!.max_length,
+      required: newVariable!.required || false,
       options: [],
     }
     handleAddVariable(startNodeVariable)
diff --git a/web/app/components/workflow/header/__tests__/run-mode.spec.tsx b/web/app/components/workflow/header/__tests__/run-mode.spec.tsx
index 74dc529a62..7bc5ef1b0c 100644
--- a/web/app/components/workflow/header/__tests__/run-mode.spec.tsx
+++ b/web/app/components/workflow/header/__tests__/run-mode.spec.tsx
@@ -85,7 +85,7 @@ vi.mock('../test-run-menu', async (importOriginal) => {
       }))
       return (
         <div>
-          <button data-testid="trigger-option" onClick={() => onSelect(options[0])}>
+          <button data-testid="trigger-option" onClick={() => onSelect(options[0]!)}>
             Trigger option
           </button>
           {children}
@@ -109,7 +109,7 @@ describe('RunMode', () => {
   it('should render the run trigger and start the workflow when a valid trigger is selected', () => {
     render(<RunMode />)
 
-    expect(screen.getByText(/run/i)).toBeInTheDocument()
+    expect(screen.getByText(/run/i))!.toBeInTheDocument()
     fireEvent.click(screen.getByTestId('trigger-option'))
 
     expect(mockHandleWorkflowStartRunInWorkflow).toHaveBeenCalledTimes(1)
@@ -137,7 +137,7 @@ describe('RunMode', () => {
 
     render(<RunMode />)
 
-    expect(screen.getByText(/running/i)).toBeInTheDocument()
+    expect(screen.getByText(/running/i))!.toBeInTheDocument()
     fireEvent.click(screen.getByTestId('stop-circle').closest('button') as HTMLButtonElement)
 
     expect(mockHandleStopRun).toHaveBeenCalledWith('task-1')
@@ -148,6 +148,6 @@ describe('RunMode', () => {
 
     render(<RunMode />)
 
-    expect(screen.getByText(/listening/i)).toBeInTheDocument()
+    expect(screen.getByText(/listening/i))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/header/checklist/node-group.tsx b/web/app/components/workflow/header/checklist/node-group.tsx
index e914fd38f7..5cbddcc12a 100644
--- a/web/app/components/workflow/header/checklist/node-group.tsx
+++ b/web/app/components/workflow/header/checklist/node-group.tsx
@@ -26,7 +26,7 @@ export const ChecklistNodeGroup = memo(({
   const subItems = useMemo(() => {
     const items: ChecklistSubItem[] = []
     for (let i = 0; i < item.errorMessages.length; i++)
-      items.push({ key: `error-${i}`, message: item.errorMessages[i] })
+      items.push({ key: `error-${i}`, message: item.errorMessages[i]! })
     if (item.unConnected)
       items.push({ key: 'unconnected', message: t('common.needConnectTip', { ns: 'workflow' }) })
     return items
diff --git a/web/app/components/workflow/header/checklist/plugin-group.tsx b/web/app/components/workflow/header/checklist/plugin-group.tsx
index 2c532f1ac4..f74b314a10 100644
--- a/web/app/components/workflow/header/checklist/plugin-group.tsx
+++ b/web/app/components/workflow/header/checklist/plugin-group.tsx
@@ -11,7 +11,7 @@ import { ItemIndicator } from './item-indicator'
 
 function getVersionFromMarketplaceIdentifier(identifier: string): string | undefined {
   const withoutHash = identifier.split('@')[0]
-  const [, version] = withoutHash.split(':')
+  const [, version] = withoutHash!.split(':')
   return version || undefined
 }
 
diff --git a/web/app/components/workflow/hooks/__tests__/use-edges-interactions.helpers.spec.ts b/web/app/components/workflow/hooks/__tests__/use-edges-interactions.helpers.spec.ts
index 3741bcc653..1608cc18ce 100644
--- a/web/app/components/workflow/hooks/__tests__/use-edges-interactions.helpers.spec.ts
+++ b/web/app/components/workflow/hooks/__tests__/use-edges-interactions.helpers.spec.ts
@@ -38,8 +38,8 @@ describe('use-edges-interactions.helpers', () => {
 
     const result = applyConnectedHandleNodeData(nodes, edgeChanges)
 
-    expect(result[0].data._connectedSourceHandleIds).toEqual(['branch-a'])
-    expect(result[1].data._connectedSourceHandleIds).toEqual([])
+    expect(result[0]!.data._connectedSourceHandleIds).toEqual(['branch-a'])
+    expect(result[1]!.data._connectedSourceHandleIds).toEqual([])
     expect(mockGetNodesConnectedSourceOrTargetHandleIdsMap).toHaveBeenCalledWith(edgeChanges, nodes)
   })
 
diff --git a/web/app/components/workflow/hooks/__tests__/use-node-data-update.spec.ts b/web/app/components/workflow/hooks/__tests__/use-node-data-update.spec.ts
index 7fcb10ff0e..231c5afc0e 100644
--- a/web/app/components/workflow/hooks/__tests__/use-node-data-update.spec.ts
+++ b/web/app/components/workflow/hooks/__tests__/use-node-data-update.spec.ts
@@ -28,7 +28,7 @@ describe('useNodeDataUpdate', () => {
       })
 
       expect(rfState.setNodes).toHaveBeenCalledOnce()
-      const updatedNodes = rfState.setNodes.mock.calls[0][0]
+      const updatedNodes = rfState.setNodes.mock.calls[0]![0]
       expect(updatedNodes.find((n: { id: string }) => n.id === 'node-1').data).toEqual({
         title: 'Node 1',
         value: 'updated',
diff --git a/web/app/components/workflow/hooks/__tests__/use-nodes-interactions.spec.ts b/web/app/components/workflow/hooks/__tests__/use-nodes-interactions.spec.ts
index 2310df53b7..4117c85abd 100644
--- a/web/app/components/workflow/hooks/__tests__/use-nodes-interactions.spec.ts
+++ b/web/app/components/workflow/hooks/__tests__/use-nodes-interactions.spec.ts
@@ -122,7 +122,7 @@ describe('useNodesInteractions', () => {
   })
 
   it('persists node drags only when the node position actually changes', () => {
-    const node = currentNodes[0]
+    const node = currentNodes[0]!
     const movedNode = {
       ...node,
       position: { x: 120, y: 80 },
@@ -136,7 +136,7 @@ describe('useNodesInteractions', () => {
     })
 
     act(() => {
-      result.current.handleNodeDragStart({} as never, node, currentNodes)
+      result.current.handleNodeDragStart({} as never, node!, currentNodes)
       result.current.handleNodeDragStop({} as never, movedNode, currentNodes)
     })
 
diff --git a/web/app/components/workflow/hooks/__tests__/use-workflow-interactions.spec.tsx b/web/app/components/workflow/hooks/__tests__/use-workflow-interactions.spec.tsx
index 8038fc528d..a8f78cfec4 100644
--- a/web/app/components/workflow/hooks/__tests__/use-workflow-interactions.spec.tsx
+++ b/web/app/components/workflow/hooks/__tests__/use-workflow-interactions.spec.tsx
@@ -224,7 +224,7 @@ describe('use-workflow-interactions exports', () => {
     })
 
     expect(mockSetNodes).toHaveBeenCalledTimes(1)
-    const nextNodes = mockSetNodes.mock.calls[0][0]
+    const nextNodes = mockSetNodes.mock.calls[0]![0]
     expect(nextNodes.find((node: { id: string }) => node.id === 'loop-node')).toEqual(expect.objectContaining({
       width: expect.any(Number),
       height: expect.any(Number),
diff --git a/web/app/components/workflow/hooks/__tests__/use-workflow-organize.helpers.spec.ts b/web/app/components/workflow/hooks/__tests__/use-workflow-organize.helpers.spec.ts
index 8346d7f977..688c2724c9 100644
--- a/web/app/components/workflow/hooks/__tests__/use-workflow-organize.helpers.spec.ts
+++ b/web/app/components/workflow/hooks/__tests__/use-workflow-organize.helpers.spec.ts
@@ -88,7 +88,7 @@ describe('use-workflow-organize helpers', () => {
     const laidOut = applyLayoutToNodes({
       nodes: rootNodes,
       layout,
-      parentNodes: [rootNodes[2]],
+      parentNodes: [rootNodes[2]!],
       childLayoutsMap,
     })
     expect(laidOut.find(node => node.id === 'root-b')?.position).toEqual({ x: 210, y: 100 })
@@ -112,7 +112,7 @@ describe('use-workflow-organize helpers', () => {
     const laidOut = applyLayoutToNodes({
       nodes,
       layout,
-      parentNodes: [nodes[2]],
+      parentNodes: [nodes[2]!],
       childLayoutsMap: {},
     })
 
diff --git a/web/app/components/workflow/hooks/__tests__/use-workflow-organize.spec.tsx b/web/app/components/workflow/hooks/__tests__/use-workflow-organize.spec.tsx
index 424ad96630..b3b4baa21c 100644
--- a/web/app/components/workflow/hooks/__tests__/use-workflow-organize.spec.tsx
+++ b/web/app/components/workflow/hooks/__tests__/use-workflow-organize.spec.tsx
@@ -120,7 +120,7 @@ describe('useWorkflowOrganize', () => {
     })
 
     expect(mockSetNodes).toHaveBeenCalledTimes(1)
-    const nextNodes = mockSetNodes.mock.calls[0][0]
+    const nextNodes = mockSetNodes.mock.calls[0]![0]
     expect(nextNodes.find((node: { id: string }) => node.id === 'loop-node')).toEqual(expect.objectContaining({
       width: expect.any(Number),
       height: expect.any(Number),
diff --git a/web/app/components/workflow/hooks/__tests__/use-workflow-variables.spec.ts b/web/app/components/workflow/hooks/__tests__/use-workflow-variables.spec.ts
index 685df81864..70079d724e 100644
--- a/web/app/components/workflow/hooks/__tests__/use-workflow-variables.spec.ts
+++ b/web/app/components/workflow/hooks/__tests__/use-workflow-variables.spec.ts
@@ -48,7 +48,7 @@ describe('useWorkflowVariables', () => {
       })
 
       expect(mockToNodeAvailableVars).toHaveBeenCalledOnce()
-      const args = mockToNodeAvailableVars.mock.calls[0][0]
+      const args = mockToNodeAvailableVars.mock.calls[0]![0]
       expect(args.isChatMode).toBe(true)
       expect(args.conversationVariables).toHaveLength(1)
       expect(args.environmentVariables).toHaveLength(1)
@@ -68,7 +68,7 @@ describe('useWorkflowVariables', () => {
         hideEnv: true,
       })
 
-      const args = mockToNodeAvailableVars.mock.calls[0][0]
+      const args = mockToNodeAvailableVars.mock.calls[0]![0]
       expect(args.environmentVariables).toEqual([])
     })
 
@@ -85,7 +85,7 @@ describe('useWorkflowVariables', () => {
         filterVar: () => true,
       })
 
-      const args = mockToNodeAvailableVars.mock.calls[0][0]
+      const args = mockToNodeAvailableVars.mock.calls[0]![0]
       expect(args.conversationVariables).toEqual([])
     })
   })
@@ -141,7 +141,7 @@ describe('useWorkflowVariableType', () => {
     const { result } = renderWorkflowHook(() => useWorkflowVariableType())
     result.current({ nodeId: 'n2', valueSelector: ['n2', 'item'] })
 
-    const args = mockGetVarType.mock.calls[0][0]
+    const args = mockGetVarType.mock.calls[0]![0]
     expect(args.parentNode).toBeDefined()
     expect((args.parentNode as { id: string }).id).toBe('iter-1')
   })
diff --git a/web/app/components/workflow/hooks/use-checklist.ts b/web/app/components/workflow/hooks/use-checklist.ts
index 99536653ce..abafcfd8eb 100644
--- a/web/app/components/workflow/hooks/use-checklist.ts
+++ b/web/app/components/workflow/hooks/use-checklist.ts
@@ -187,18 +187,18 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
       let moreDataForCheckValid
       let usedVars: ValueSelector[] = []
 
-      if (node.data.type === BlockEnum.Tool)
-        moreDataForCheckValid = getToolCheckParams(node.data as ToolNodeType, buildInTools || [], customTools || [], workflowTools || [], language)
+      if (node!.data.type === BlockEnum.Tool)
+        moreDataForCheckValid = getToolCheckParams(node!.data as ToolNodeType, buildInTools || [], customTools || [], workflowTools || [], language)
 
-      if (node.data.type === BlockEnum.DataSource)
-        moreDataForCheckValid = getDataSourceCheckParams(node.data as DataSourceNodeType, dataSourceList || [], language)
+      if (node!.data.type === BlockEnum.DataSource)
+        moreDataForCheckValid = getDataSourceCheckParams(node!.data as DataSourceNodeType, dataSourceList || [], language)
 
-      if (node.data.type === BlockEnum.TriggerPlugin)
-        moreDataForCheckValid = getTriggerCheckParams(node.data as PluginTriggerNodeType, triggerPlugins, language)
+      if (node!.data.type === BlockEnum.TriggerPlugin)
+        moreDataForCheckValid = getTriggerCheckParams(node!.data as PluginTriggerNodeType, triggerPlugins, language)
 
-      const toolIcon = getToolIcon(node.data)
-      if (node.data.type === BlockEnum.Agent) {
-        const data = node.data as AgentNodeType
+      const toolIcon = getToolIcon(node!.data)
+      if (node!.data.type === BlockEnum.Agent) {
+        const data = node!.data as AgentNodeType
         const isReadyForCheckValid = !!strategyProviders
         const provider = strategyProviders?.find(provider => provider.declaration.identity.name === data.agent_strategy_provider_name)
         const strategy = provider?.declaration.strategies?.find(s => s.identity.name === data.agent_strategy_name)
@@ -210,13 +210,13 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
         }
       }
       else {
-        usedVars = getNodeUsedVars(node).filter(v => v.length > 0)
+        usedVars = getNodeUsedVars(node!).filter(v => v.length > 0)
       }
 
-      if (node.type === CUSTOM_NODE) {
-        const checkData = getCheckData(node.data)
-        const validator = nodesExtraData?.[node.data.type as BlockEnum]?.checkValid
-        const isPluginMissing = isNodePluginMissing(node.data, { builtInTools: buildInTools, customTools, workflowTools, mcpTools, triggerPlugins, dataSourceList })
+      if (node!.type === CUSTOM_NODE) {
+        const checkData = getCheckData(node!.data)
+        const validator = nodesExtraData?.[node!.data.type as BlockEnum]?.checkValid
+        const isPluginMissing = isNodePluginMissing(node!.data, { builtInTools: buildInTools, customTools, workflowTools, mcpTools, triggerPlugins, dataSourceList })
 
         const errorMessages: string[] = []
 
@@ -224,8 +224,8 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
           errorMessages.push(t('nodes.common.pluginNotInstalled', { ns: 'workflow' }))
         }
         else {
-          if (node.data.type === BlockEnum.LLM) {
-            const modelProvider = (node.data as CommonNodeType<{ model?: ModelConfig }>).model?.provider
+          if (node!.data.type === BlockEnum.LLM) {
+            const modelProvider = (node!.data as CommonNodeType<{ model?: ModelConfig }>).model?.provider
             const modelIssue = getLLMModelIssue({
               modelProvider,
               isModelProviderInstalled: isLLMModelProviderInstalled(modelProvider, installedPluginIds),
@@ -240,12 +240,12 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
               errorMessages.push(validationError)
           }
 
-          const availableVars = map[node.id].availableVars
+          const availableVars = map[node!.id]!.availableVars
           let hasInvalidVar = false
           for (const variable of usedVars) {
             if (hasInvalidVar)
               break
-            if (isSpecialVar(variable[0]))
+            if (isSpecialVar(variable[0]!))
               continue
             const usedNode = availableVars.find(v => v.nodeId === variable?.[0])
             if (!usedNode || !usedNode.vars.some(v => v.variable === variable?.[1]))
@@ -255,17 +255,17 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
             errorMessages.push(t('errorMsg.invalidVariable', { ns: 'workflow' }))
         }
 
-        const isStartNodeMeta = nodesExtraData?.[node.data.type as BlockEnum]?.metaData.isStart ?? false
+        const isStartNodeMeta = nodesExtraData?.[node!.data.type as BlockEnum]?.metaData.isStart ?? false
         const canSkipConnectionCheck = shouldCheckStartNode ? isStartNodeMeta : true
 
-        const isUnconnected = !validNodes.some(n => n.id === node.id)
+        const isUnconnected = !validNodes.some(n => n.id === node!.id)
         const shouldShowError = errorMessages.length > 0 || (isUnconnected && !canSkipConnectionCheck)
 
         if (shouldShowError) {
           list.push({
-            id: node.id,
-            type: node.data.type,
-            title: node.data.title,
+            id: node!.id,
+            type: node!.data.type,
+            title: node!.data.title,
             toolIcon,
             unConnected: isUnconnected && !canSkipConnectionCheck,
             errorMessages,
@@ -273,7 +273,7 @@ export const useChecklist = (nodes: Node[], edges: Edge[]) => {
             disableGoTo: isPluginMissing,
             isPluginMissing,
             pluginUniqueIdentifier: isPluginMissing
-              ? (node.data as { plugin_unique_identifier?: string }).plugin_unique_identifier
+              ? (node!.data as { plugin_unique_identifier?: string }).plugin_unique_identifier
               : undefined,
           })
         }
@@ -458,14 +458,14 @@ export const useChecklistBeforePublish = () => {
       const node = filteredNodes[i]
       let moreDataForCheckValid
       let usedVars: ValueSelector[] = []
-      if (node.data.type === BlockEnum.Tool)
-        moreDataForCheckValid = getToolCheckParams(node.data as ToolNodeType, buildInTools || [], customTools || [], workflowTools || [], language)
+      if (node!.data.type === BlockEnum.Tool)
+        moreDataForCheckValid = getToolCheckParams(node!.data as ToolNodeType, buildInTools || [], customTools || [], workflowTools || [], language)
 
-      if (node.data.type === BlockEnum.DataSource)
-        moreDataForCheckValid = getDataSourceCheckParams(node.data as DataSourceNodeType, dataSourceList || [], language)
+      if (node!.data.type === BlockEnum.DataSource)
+        moreDataForCheckValid = getDataSourceCheckParams(node!.data as DataSourceNodeType, dataSourceList || [], language)
 
-      if (node.data.type === BlockEnum.Agent) {
-        const data = node.data as AgentNodeType
+      if (node!.data.type === BlockEnum.Agent) {
+        const data = node!.data as AgentNodeType
         const isReadyForCheckValid = !!strategyProviders
         const provider = strategyProviders?.find(provider => provider.declaration.identity.name === data.agent_strategy_provider_name)
         const strategy = provider?.declaration.strategies?.find(s => s.identity.name === data.agent_strategy_name)
@@ -477,55 +477,55 @@ export const useChecklistBeforePublish = () => {
         }
       }
       else {
-        usedVars = getNodeUsedVars(node).filter(v => v.length > 0)
+        usedVars = getNodeUsedVars(node!).filter(v => v.length > 0)
       }
 
-      if (node.data.type === BlockEnum.LLM) {
-        const modelProvider = (node.data as CommonNodeType<{ model?: ModelConfig }>).model?.provider
+      if (node!.data.type === BlockEnum.LLM) {
+        const modelProvider = (node!.data as CommonNodeType<{ model?: ModelConfig }>).model?.provider
         const modelIssue = getLLMModelIssue({
           modelProvider,
           isModelProviderInstalled: isLLMModelProviderInstalled(modelProvider, installedPluginIds),
         })
         if (modelIssue === LLMModelIssueCode.providerPluginUnavailable) {
-          toast.error(`[${node.data.title}] ${t('errorMsg.configureModel', { ns: 'workflow' })}`)
+          toast.error(`[${node!.data.title}] ${t('errorMsg.configureModel', { ns: 'workflow' })}`)
           return false
         }
       }
 
-      const checkData = getCheckData(node.data, datasets, embeddingProviderModelMap)
-      const { errorMessage } = nodesExtraData![node.data.type as BlockEnum].checkValid(checkData, t, moreDataForCheckValid)
+      const checkData = getCheckData(node!.data, datasets, embeddingProviderModelMap)
+      const { errorMessage } = nodesExtraData![node!.data.type as BlockEnum].checkValid(checkData, t, moreDataForCheckValid)
 
       if (errorMessage) {
-        toast.error(`[${node.data.title}] ${errorMessage}`)
+        toast.error(`[${node!.data.title}] ${errorMessage}`)
         return false
       }
 
-      const availableVars = map[node.id].availableVars
+      const availableVars = map[node!.id]!.availableVars
 
       for (const variable of usedVars) {
-        const isSpecialVars = isSpecialVar(variable[0])
+        const isSpecialVars = isSpecialVar(variable[0]!)
         if (!isSpecialVars) {
           const usedNode = availableVars.find(v => v.nodeId === variable?.[0])
           if (usedNode) {
             const usedVar = usedNode.vars.find(v => v.variable === variable?.[1])
             if (!usedVar) {
-              toast.error(`[${node.data.title}] ${t('errorMsg.invalidVariable', { ns: 'workflow' })}`)
+              toast.error(`[${node!.data.title}] ${t('errorMsg.invalidVariable', { ns: 'workflow' })}`)
               return false
             }
           }
           else {
-            toast.error(`[${node.data.title}] ${t('errorMsg.invalidVariable', { ns: 'workflow' })}`)
+            toast.error(`[${node!.data.title}] ${t('errorMsg.invalidVariable', { ns: 'workflow' })}`)
             return false
           }
         }
       }
 
-      const isStartNodeMeta = nodesExtraData?.[node.data.type as BlockEnum]?.metaData.isStart ?? false
+      const isStartNodeMeta = nodesExtraData?.[node!.data.type as BlockEnum]?.metaData.isStart ?? false
       const canSkipConnectionCheck = shouldCheckStartNode ? isStartNodeMeta : true
-      const isUnconnected = !validNodes.some(n => n.id === node.id)
+      const isUnconnected = !validNodes.some(n => n.id === node!.id)
 
       if (isUnconnected && !canSkipConnectionCheck) {
-        toast.error(`[${node.data.title}] ${t('common.needConnectTip', { ns: 'workflow' })}`)
+        toast.error(`[${node!.data.title}] ${t('common.needConnectTip', { ns: 'workflow' })}`)
         return false
       }
     }
diff --git a/web/app/components/workflow/hooks/use-edges-interactions.ts b/web/app/components/workflow/hooks/use-edges-interactions.ts
index 75486608dc..4f24c36a16 100644
--- a/web/app/components/workflow/hooks/use-edges-interactions.ts
+++ b/web/app/components/workflow/hooks/use-edges-interactions.ts
@@ -38,14 +38,14 @@ export const useEdgesInteractions = () => {
 
     if (currentEdgeIndex < 0)
       return
-    const currentEdge = edges[currentEdgeIndex]
+    const currentEdge = edges[currentEdgeIndex]!
     const newNodes = applyConnectedHandleNodeData(nodes, [{ type: 'remove', edge: currentEdge }])
     setNodes(newNodes)
     const newEdges = produce(edges, (draft) => {
       draft.splice(currentEdgeIndex, 1)
     })
     setEdges(newEdges)
-    if (clearEdgeMenuIfNeeded({ edgeMenu: workflowStore.getState().edgeMenu, edgeIds: [currentEdge.id] }))
+    if (clearEdgeMenuIfNeeded({ edgeMenu: workflowStore.getState().edgeMenu, edgeIds: [currentEdge!.id] }))
       workflowStore.setState({ edgeMenu: undefined })
     handleSyncWorkflowDraft()
     saveStateToHistory(WorkflowHistoryEvent.EdgeDelete)
diff --git a/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts b/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
index f013402cd3..eef710ef70 100644
--- a/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
+++ b/web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
@@ -64,17 +64,17 @@ export const useSetWorkflowVarsWithValue = ({
     inspectVars.forEach((varItem) => {
       const nodeId = varItem.selector[0]
 
-      const node = nodesKeyValue[nodeId]
+      const node = nodesKeyValue[nodeId!]
       if (!node)
         return
-      withValueNodeIds[nodeId] = true
+      withValueNodeIds[nodeId!] = true
     })
     const withValueNodes = Object.keys(withValueNodeIds).map((nodeId) => {
       return nodesKeyValue[nodeId]
     })
 
     const res: NodeWithVar[] = withValueNodes.map((node) => {
-      const nodeId = node.id
+      const nodeId = node!.id
       const varsUnderTheNode = inspectVars.filter((varItem) => {
         return varItem.selector[0] === nodeId
       })
@@ -82,9 +82,9 @@ export const useSetWorkflowVarsWithValue = ({
 
       const nodeWithVar = {
         nodeId,
-        nodePayload: node.data,
-        nodeType: node.data.type,
-        title: node.data.title,
+        nodePayload: node!.data,
+        nodeType: node!.data.type,
+        title: node!.data.title,
         vars: varsUnderTheNode.map((item) => {
           const schemaType = nodeVar ? nodeVar.vars.find(v => v.variable === item.name)?.schemaType : ''
           return {
diff --git a/web/app/components/workflow/hooks/use-helpline.ts b/web/app/components/workflow/hooks/use-helpline.ts
index d039d10128..3fda2528c1 100644
--- a/web/app/components/workflow/hooks/use-helpline.ts
+++ b/web/app/components/workflow/hooks/use-helpline.ts
@@ -82,17 +82,17 @@ const buildHorizontalHelpLine = ({
 
   const first = alignedNodes[0]
   const last = alignedNodes[alignedNodes.length - 1]
-  const firstPos = getNodeAlignPosition(first)
-  const lastPos = getNodeAlignPosition(last)
+  const firstPos = getNodeAlignPosition(first!)
+  const lastPos = getNodeAlignPosition(last!)
   const helpLine = {
     top: firstPos.y,
     left: firstPos.x,
-    width: lastPos.x + (isEntryNode(last) ? getEntryNodeDimension(last, 'width') : last.width ?? 0) - firstPos.x,
+    width: lastPos.x + (isEntryNode(last!) ? getEntryNodeDimension(last!, 'width') : last!.width ?? 0) - firstPos.x,
   }
 
   if (nodeAlignPos.x < firstPos.x) {
     helpLine.left = nodeAlignPos.x
-    helpLine.width = firstPos.x + (isEntryNode(first) ? getEntryNodeDimension(first, 'width') : first.width ?? 0) - nodeAlignPos.x
+    helpLine.width = firstPos.x + (isEntryNode(first!) ? getEntryNodeDimension(first!, 'width') : first!.width ?? 0) - nodeAlignPos.x
   }
 
   if (nodeAlignPos.x > lastPos.x)
@@ -119,17 +119,17 @@ const buildVerticalHelpLine = ({
 
   const first = alignedNodes[0]
   const last = alignedNodes[alignedNodes.length - 1]
-  const firstPos = getNodeAlignPosition(first)
-  const lastPos = getNodeAlignPosition(last)
+  const firstPos = getNodeAlignPosition(first!)
+  const lastPos = getNodeAlignPosition(last!)
   const helpLine = {
     top: firstPos.y,
     left: firstPos.x,
-    height: lastPos.y + (isEntryNode(last) ? getEntryNodeDimension(last, 'height') : last.height ?? 0) - firstPos.y,
+    height: lastPos.y + (isEntryNode(last!) ? getEntryNodeDimension(last!, 'height') : last!.height ?? 0) - firstPos.y,
   }
 
   if (nodeAlignPos.y < firstPos.y) {
     helpLine.top = nodeAlignPos.y
-    helpLine.height = firstPos.y + (isEntryNode(first) ? getEntryNodeDimension(first, 'height') : first.height ?? 0) - nodeAlignPos.y
+    helpLine.height = firstPos.y + (isEntryNode(first!) ? getEntryNodeDimension(first!, 'height') : first!.height ?? 0) - nodeAlignPos.y
   }
 
   if (nodeAlignPos.y > lastPos.y)
diff --git a/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts b/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
index 316da71d9d..2bacef7028 100644
--- a/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
+++ b/web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
@@ -132,7 +132,7 @@ export const useInspectVarsCrudCommon = ({
       dataSourceList: dataSourceList || [],
     }
     const currentNodeOutputVars = toNodeOutputVars([currentNode], false, () => true, [], [], [], allPluginInfoList, schemaTypeDefinitions)
-    const vars = await fetchNodeInspectVars(flowType, flowId, nodeId)
+    const vars = await fetchNodeInspectVars(flowType, flowId, nodeId!)
     const varsWithSchemaType = vars.map((varItem) => {
       const schemaType = currentNodeOutputVars[0]?.vars.find(v => v.variable === varItem.name)?.schemaType || ''
       return {
@@ -140,7 +140,7 @@ export const useInspectVarsCrudCommon = ({
         schemaType,
       }
     })
-    setNodeInspectVars(nodeId, varsWithSchemaType)
+    setNodeInspectVars(nodeId!, varsWithSchemaType)
   }, [workflowStore, flowType, flowId, invalidateSysVarValues, invalidateConversationVarValues, buildInTools, customTools, workflowTools, mcpTools])
 
   // after last run would call this
@@ -163,9 +163,9 @@ export const useInspectVarsCrudCommon = ({
           })
         }
         else {
-          draft[index].vars = payload
+          draft[index]!.vars = payload
           // put the node to the topAdd commentMore actions
-          draft.unshift(draft.splice(index, 1)[0])
+          draft.unshift(draft.splice(index, 1)[0]!)
         }
       }
     })
diff --git a/web/app/components/workflow/hooks/use-nodes-interactions.ts b/web/app/components/workflow/hooks/use-nodes-interactions.ts
index 7c97025fd6..27b13bb42c 100644
--- a/web/app/components/workflow/hooks/use-nodes-interactions.ts
+++ b/web/app/components/workflow/hooks/use-nodes-interactions.ts
@@ -166,7 +166,7 @@ export const useNodesInteractions = () => {
         // X-axis alignment with offset consideration
         if (showVerticalHelpLineNodesLength > 0) {
           const targetNode = showVerticalHelpLineNodes[0]
-          const isTargetEntryNode = isTriggerNode(targetNode.data.type as any) || targetNode.data.type === BlockEnum.Start
+          const isTargetEntryNode = isTriggerNode(targetNode!.data.type as any) || targetNode!.data.type === BlockEnum.Start
 
           // Calculate the wrapper position needed to align the inner nodes
           // Target inner position = target.position + target.offset
@@ -175,7 +175,7 @@ export const useNodesInteractions = () => {
           // Therefore: current.position = target.position + target.offset - current.offset
           const targetOffset = isTargetEntryNode ? ENTRY_NODE_WRAPPER_OFFSET.x : 0
           const currentOffset = isCurrentEntryNode ? ENTRY_NODE_WRAPPER_OFFSET.x : 0
-          currentNode.position.x = targetNode.position.x + targetOffset - currentOffset
+          currentNode.position.x = targetNode!.position.x + targetOffset - currentOffset
         }
         else if (restrictPosition.x !== undefined) {
           currentNode.position.x = restrictPosition.x
@@ -190,11 +190,11 @@ export const useNodesInteractions = () => {
         // Y-axis alignment with offset consideration
         if (showHorizontalHelpLineNodesLength > 0) {
           const targetNode = showHorizontalHelpLineNodes[0]
-          const isTargetEntryNode = isTriggerNode(targetNode.data.type as any) || targetNode.data.type === BlockEnum.Start
+          const isTargetEntryNode = isTriggerNode(targetNode!.data.type as any) || targetNode!.data.type === BlockEnum.Start
 
           const targetOffset = isTargetEntryNode ? ENTRY_NODE_WRAPPER_OFFSET.y : 0
           const currentOffset = isCurrentEntryNode ? ENTRY_NODE_WRAPPER_OFFSET.y : 0
-          currentNode.position.y = targetNode.position.y + targetOffset - currentOffset
+          currentNode.position.y = targetNode!.position.y + targetOffset - currentOffset
         }
         else if (restrictPosition.y !== undefined) {
           currentNode.position.y = restrictPosition.y
@@ -661,7 +661,7 @@ export const useNodesInteractions = () => {
           }
           else {
             if (iterationChildren.length === 1) {
-              handleNodeDelete(iterationChildren[0].id)
+              handleNodeDelete(iterationChildren[0]!.id)
               handleNodeDelete(nodeId)
 
               return
@@ -701,7 +701,7 @@ export const useNodesInteractions = () => {
           }
           else {
             if (loopChildren.length === 1) {
-              handleNodeDelete(loopChildren[0].id)
+              handleNodeDelete(loopChildren[0]!.id)
               handleNodeDelete(nodeId)
 
               return
@@ -846,7 +846,7 @@ export const useNodesInteractions = () => {
       if (prevNodeId && !nextNodeId) {
         const prevNodeIndex = nodes.findIndex(node => node.id === prevNodeId)
         const prevNode = nodes[prevNodeIndex]
-        const outgoers = getOutgoers(prevNode, nodes, edges).sort(
+        const outgoers = getOutgoers(prevNode!, nodes, edges).sort(
           (a, b) => a.position.y - b.position.y,
         )
         const lastOutgoer = outgoers[outgoers.length - 1]
@@ -857,22 +857,22 @@ export const useNodesInteractions = () => {
         newNode.position = {
           x: lastOutgoer
             ? lastOutgoer.position.x
-            : prevNode.position.x + prevNode.width! + X_OFFSET,
+            : prevNode!.position.x + prevNode!.width! + X_OFFSET,
           y: lastOutgoer
             ? lastOutgoer.position.y + lastOutgoer.height! + Y_OFFSET
-            : prevNode.position.y,
+            : prevNode!.position.y,
         }
-        newNode.parentId = prevNode.parentId
-        newNode.extent = prevNode.extent
+        newNode.parentId = prevNode!.parentId
+        newNode.extent = prevNode!.extent
 
         const parentNode
-          = nodes.find(node => node.id === prevNode.parentId) || null
+          = nodes.find(node => node.id === prevNode!.parentId) || null
         const isInIteration
           = !!parentNode && parentNode.data.type === BlockEnum.Iteration
         const isInLoop
           = !!parentNode && parentNode.data.type === BlockEnum.Loop
 
-        if (prevNode.parentId) {
+        if (prevNode!.parentId) {
           newNode.data.isInIteration = isInIteration
           newNode.data.isInLoop = isInLoop
           if (isInIteration) {
@@ -913,15 +913,15 @@ export const useNodesInteractions = () => {
             target: newNode.id,
             targetHandle,
             data: {
-              sourceType: prevNode.data.type,
+              sourceType: prevNode!.data.type,
               targetType: newNode.data.type,
               isInIteration,
               isInLoop,
-              iteration_id: isInIteration ? prevNode.parentId : undefined,
-              loop_id: isInLoop ? prevNode.parentId : undefined,
+              iteration_id: isInIteration ? prevNode!.parentId : undefined,
+              loop_id: isInLoop ? prevNode!.parentId : undefined,
               _connectedNodeIsSelected: true,
             },
-            zIndex: prevNode.parentId
+            zIndex: prevNode!.parentId
               ? isInIteration
                 ? ITERATION_CHILDREN_Z_INDEX
                 : LOOP_CHILDREN_Z_INDEX
@@ -947,7 +947,7 @@ export const useNodesInteractions = () => {
 
             if (
               node.data.type === BlockEnum.Iteration
-              && prevNode.parentId === node.id
+              && prevNode!.parentId === node.id
             ) {
               node.data._children?.push({
                 nodeId: newNode.id,
@@ -957,7 +957,7 @@ export const useNodesInteractions = () => {
 
             if (
               node.data.type === BlockEnum.Loop
-              && prevNode.parentId === node.id
+              && prevNode!.parentId === node.id
             ) {
               node.data._children?.push({
                 nodeId: newNode.id,
@@ -981,8 +981,8 @@ export const useNodesInteractions = () => {
           const { setShowAssignVariablePopup } = workflowStore.getState()
 
           setShowAssignVariablePopup({
-            nodeId: prevNode.id,
-            nodeData: prevNode.data,
+            nodeId: prevNode!.id,
+            nodeData: prevNode!.data,
             variableAssignerNodeId: newNode.id,
             variableAssignerNodeData: newNode.data as VariableAssignerNodeType,
             variableAssignerNodeHandleId: targetHandle,
@@ -1271,7 +1271,7 @@ export const useNodesInteractions = () => {
         const nodesConnectedSourceOrTargetHandleIdsMap
           = getNodesConnectedSourceOrTargetHandleIdsMap(
             [
-              { type: 'remove', edge: edges[currentEdgeIndex] },
+              { type: 'remove', edge: edges[currentEdgeIndex]! },
               ...(newPrevEdge ? [{ type: 'add', edge: newPrevEdge }] : []),
               ...(newNextEdge ? [{ type: 'add', edge: newNextEdge }] : []),
             ],
@@ -2182,7 +2182,7 @@ export const useNodesInteractions = () => {
     const outgoers = getOutgoers(selectedNode as Node, nodes as Node[], edges)
     for (let currIdx = 0; currIdx < outgoers.length; currIdx++) {
       const node = outgoers[currIdx]
-      const outgoersForNode = getOutgoers(node, nodes as Node[], edges)
+      const outgoersForNode = getOutgoers(node!, nodes as Node[], edges)
       outgoersForNode.forEach((item) => {
         const existed = outgoers.some(v => v.id === item.id)
         if (!existed)
diff --git a/web/app/components/workflow/hooks/use-workflow-comment.ts b/web/app/components/workflow/hooks/use-workflow-comment.ts
index be50654fd3..5b3f2e17b0 100644
--- a/web/app/components/workflow/hooks/use-workflow-comment.ts
+++ b/web/app/components/workflow/hooks/use-workflow-comment.ts
@@ -237,7 +237,7 @@ export const useWorkflowComment = () => {
     activeCommentIdRef.current = comment.id
     setActiveCommentId(comment.id)
 
-    const cachedDetail = commentDetailCacheRef.current[comment.id]
+    const cachedDetail = commentDetailCacheRef.current[comment.id]!
     setActiveComment(cachedDetail || comment)
 
     const hasSelectedNode = reactflow.getNodes().some(node => node.data?.selected)
@@ -341,7 +341,7 @@ export const useWorkflowComment = () => {
       }
       else if (currentComments.length > 0) {
         const nextComment = currentComments[0]
-        handleCommentIconClick(nextComment)
+        handleCommentIconClick(nextComment!)
       }
       else {
         setActiveComment(null)
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-agent-log.spec.ts b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-agent-log.spec.ts
index cabfc0f6d1..cae785546a 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-agent-log.spec.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-agent-log.spec.ts
@@ -21,8 +21,8 @@ describe('useWorkflowAgentLog', () => {
     } as AgentLogResponse)
 
     const trace = store.getState().workflowRunningData!.tracing![0]
-    expect(trace.execution_metadata!.agent_log).toHaveLength(1)
-    expect(trace.execution_metadata!.agent_log![0].message_id).toBe('m1')
+    expect(trace!.execution_metadata!.agent_log).toHaveLength(1)
+    expect(trace!.execution_metadata!.agent_log![0]!.message_id).toBe('m1')
   })
 
   it('appends to existing agent_log', () => {
@@ -41,7 +41,7 @@ describe('useWorkflowAgentLog', () => {
       data: { node_id: 'n1', message_id: 'm2' },
     } as AgentLogResponse)
 
-    expect(store.getState().workflowRunningData!.tracing![0].execution_metadata!.agent_log).toHaveLength(2)
+    expect(store.getState().workflowRunningData!.tracing![0]!.execution_metadata!.agent_log).toHaveLength(2)
   })
 
   it('updates an existing log entry by message_id', () => {
@@ -60,7 +60,7 @@ describe('useWorkflowAgentLog', () => {
       data: { node_id: 'n1', message_id: 'm1', text: 'new' },
     } as unknown as AgentLogResponse)
 
-    const log = store.getState().workflowRunningData!.tracing![0].execution_metadata!.agent_log!
+    const log = store.getState().workflowRunningData!.tracing![0]!.execution_metadata!.agent_log!
     expect(log).toHaveLength(1)
     expect((log[0] as unknown as { text: string }).text).toBe('new')
   })
@@ -78,6 +78,6 @@ describe('useWorkflowAgentLog', () => {
       data: { node_id: 'n1', message_id: 'm1' },
     } as AgentLogResponse)
 
-    expect(store.getState().workflowRunningData!.tracing![0].execution_metadata!.agent_log).toHaveLength(1)
+    expect(store.getState().workflowRunningData!.tracing![0]!.execution_metadata!.agent_log).toHaveLength(1)
   })
 })
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-finished.spec.ts b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-finished.spec.ts
index efcdc15d88..1a1aa03eff 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-finished.spec.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-finished.spec.ts
@@ -31,7 +31,7 @@ describe('useWorkflowNodeFinished', () => {
     })
 
     const trace = store.getState().workflowRunningData!.tracing![0]
-    expect(trace.status).toBe(NodeRunningStatus.Succeeded)
+    expect(trace!.status).toBe(NodeRunningStatus.Succeeded)
 
     await waitFor(() => {
       expect(getNodeRuntimeState(result.current.nodes[0])._runningStatus).toBe(NodeRunningStatus.Succeeded)
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-form-filled.spec.ts b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-form-filled.spec.ts
index aa8e89327b..f3fe206eb1 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-form-filled.spec.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-form-filled.spec.ts
@@ -21,7 +21,7 @@ describe('useWorkflowNodeHumanInputFormFilled', () => {
     const state = store.getState().workflowRunningData!
     expect(state.humanInputFormDataList).toHaveLength(0)
     expect(state.humanInputFilledFormDataList).toHaveLength(1)
-    expect(state.humanInputFilledFormDataList![0].node_id).toBe('n1')
+    expect(state.humanInputFilledFormDataList![0]!.node_id).toBe('n1')
   })
 
   it('creates humanInputFilledFormDataList when it does not exist', () => {
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-form-timeout.spec.ts b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-form-timeout.spec.ts
index e528b49846..1b09cabf59 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-form-timeout.spec.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-form-timeout.spec.ts
@@ -18,6 +18,6 @@ describe('useWorkflowNodeHumanInputFormTimeout', () => {
       data: { node_id: 'n1', node_title: 'Node 1', expiration_time: 1000 },
     } as HumanInputFormTimeoutResponse)
 
-    expect(store.getState().workflowRunningData!.humanInputFormDataList![0].expiration_time).toBe(1000)
+    expect(store.getState().workflowRunningData!.humanInputFormDataList![0]!.expiration_time).toBe(1000)
   })
 })
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-required.spec.ts b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-required.spec.ts
index 23fdf8a3c3..45fe510246 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-required.spec.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-human-input-required.spec.ts
@@ -32,8 +32,8 @@ describe('useWorkflowNodeHumanInputRequired', () => {
 
     const state = store.getState().workflowRunningData!
     expect(state.humanInputFormDataList).toHaveLength(1)
-    expect(state.humanInputFormDataList![0].form_id).toBe('f1')
-    expect(state.tracing![0].status).toBe(NodeRunningStatus.Paused)
+    expect(state.humanInputFormDataList![0]!.form_id).toBe('f1')
+    expect(state.tracing![0]!.status).toBe(NodeRunningStatus.Paused)
 
     await waitFor(() => {
       expect(getNodeRuntimeState(result.current.nodes.find(item => item.id === 'n1'))._runningStatus).toBe(NodeRunningStatus.Paused)
@@ -65,7 +65,7 @@ describe('useWorkflowNodeHumanInputRequired', () => {
 
     const formList = store.getState().workflowRunningData!.humanInputFormDataList!
     expect(formList).toHaveLength(1)
-    expect(formList[0].form_id).toBe('new')
+    expect(formList[0]!.form_id).toBe('new')
   })
 
   it('appends a new form entry for a different node_id', () => {
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-iteration-started.spec.ts b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-iteration-started.spec.ts
index ccff1b288b..9472c0cafa 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-iteration-started.spec.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-iteration-started.spec.ts
@@ -30,7 +30,7 @@ describe('useWorkflowNodeIterationStarted', () => {
     })
 
     const tracing = store.getState().workflowRunningData!.tracing!
-    expect(tracing[0].status).toBe(NodeRunningStatus.Running)
+    expect(tracing[0]!.status).toBe(NodeRunningStatus.Running)
     expect(store.getState().iterTimes).toBe(DEFAULT_ITER_TIMES)
 
     await waitFor(() => {
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-loop-finished.spec.ts b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-loop-finished.spec.ts
index 7acd9897ed..86e3d9cdc3 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-loop-finished.spec.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-loop-finished.spec.ts
@@ -30,7 +30,7 @@ describe('useWorkflowNodeLoopFinished', () => {
       result.current.handleWorkflowNodeLoopFinished(createLoopFinishedResponse())
     })
 
-    expect(store.getState().workflowRunningData!.tracing![0].status).toBe(NodeRunningStatus.Succeeded)
+    expect(store.getState().workflowRunningData!.tracing![0]!.status).toBe(NodeRunningStatus.Succeeded)
 
     await waitFor(() => {
       expect(getNodeRuntimeState(result.current.nodes[0])._runningStatus).toBe(NodeRunningStatus.Succeeded)
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-loop-started.spec.ts b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-loop-started.spec.ts
index b0e8bf2cc5..d164896862 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-loop-started.spec.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-loop-started.spec.ts
@@ -25,7 +25,7 @@ describe('useWorkflowNodeLoopStarted', () => {
       )
     })
 
-    expect(store.getState().workflowRunningData!.tracing![0].status).toBe(NodeRunningStatus.Running)
+    expect(store.getState().workflowRunningData!.tracing![0]!.status).toBe(NodeRunningStatus.Running)
 
     await waitFor(() => {
       const transform = result.current.reactFlowStore.getState().transform
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-started.spec.ts b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-started.spec.ts
index a8a52e0a84..60a17207bc 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-started.spec.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/__tests__/use-workflow-node-started.spec.ts
@@ -22,7 +22,7 @@ describe('useWorkflowNodeStarted', () => {
 
     const tracing = store.getState().workflowRunningData!.tracing!
     expect(tracing).toHaveLength(1)
-    expect(tracing[0].status).toBe(NodeRunningStatus.Running)
+    expect(tracing[0]!.status).toBe(NodeRunningStatus.Running)
 
     await waitFor(() => {
       const transform = result.current.reactFlowStore.getState().transform
@@ -75,6 +75,6 @@ describe('useWorkflowNodeStarted', () => {
 
     const tracing = store.getState().workflowRunningData!.tracing!
     expect(tracing).toHaveLength(2)
-    expect(tracing[1].status).toBe(NodeRunningStatus.Running)
+    expect(tracing[1]!.status).toBe(NodeRunningStatus.Running)
   })
 })
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts
index 08fb526000..3d6e655c73 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts
@@ -18,25 +18,25 @@ export const useWorkflowAgentLog = () => {
       if (currentIndex > -1) {
         const current = draft.tracing![currentIndex]
 
-        if (current.execution_metadata) {
-          if (current.execution_metadata.agent_log) {
-            const currentLogIndex = current.execution_metadata.agent_log.findIndex(log => log.message_id === data.message_id)
+        if (current!.execution_metadata) {
+          if (current!.execution_metadata.agent_log) {
+            const currentLogIndex = current!.execution_metadata.agent_log.findIndex(log => log.message_id === data.message_id)
             if (currentLogIndex > -1) {
-              current.execution_metadata.agent_log[currentLogIndex] = {
-                ...current.execution_metadata.agent_log[currentLogIndex],
+              current!.execution_metadata.agent_log[currentLogIndex] = {
+                ...current!.execution_metadata.agent_log[currentLogIndex],
                 ...data,
               }
             }
             else {
-              current.execution_metadata.agent_log.push(data)
+              current!.execution_metadata.agent_log.push(data)
             }
           }
           else {
-            current.execution_metadata.agent_log = [data]
+            current!.execution_metadata.agent_log = [data]
           }
         }
         else {
-          current.execution_metadata = {
+          current!.execution_metadata = {
             agent_log: [data],
           } as any
         }
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-finished.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-finished.ts
index 5fc8807873..3858b1eed8 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-finished.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-finished.ts
@@ -14,7 +14,7 @@ export const useWorkflowFinished = () => {
       setWorkflowRunningData,
     } = workflowStore.getState()
 
-    const isStringOutput = data.outputs && Object.keys(data.outputs).length === 1 && typeof data.outputs[Object.keys(data.outputs)[0]] === 'string'
+    const isStringOutput = data.outputs && Object.keys(data.outputs).length === 1 && typeof data.outputs[Object.keys(data.outputs)[0]!] === 'string'
 
     setWorkflowRunningData(produce(workflowRunningData!, (draft) => {
       draft.result = {
@@ -24,7 +24,7 @@ export const useWorkflowFinished = () => {
       } as any
       if (isStringOutput) {
         draft.resultTabActive = true
-        draft.resultText = data.outputs[Object.keys(data.outputs)[0]]
+        draft.resultText = data.outputs[Object.keys(data.outputs)[0]!]
       }
     }))
   }, [workflowStore])
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-human-input-form-timeout.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-human-input-form-timeout.ts
index d3016eeb1d..7e636e0eed 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-human-input-form-timeout.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-human-input-form-timeout.ts
@@ -16,7 +16,7 @@ export const useWorkflowNodeHumanInputFormTimeout = () => {
     const newWorkflowRunningData = produce(workflowRunningData!, (draft) => {
       if (draft.humanInputFormDataList?.length) {
         const currentFormIndex = draft.humanInputFormDataList.findIndex(item => item.node_id === data.node_id)
-        draft.humanInputFormDataList[currentFormIndex].expiration_time = data.expiration_time
+        draft.humanInputFormDataList[currentFormIndex]!.expiration_time = data.expiration_time
       }
     })
     setWorkflowRunningData(newWorkflowRunningData)
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-human-input-required.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-human-input-required.ts
index 87f82c69f2..b14e7bdb21 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-human-input-required.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-human-input-required.ts
@@ -35,7 +35,7 @@ export const useWorkflowNodeHumanInputRequired = () => {
       const currentIndex = draft.tracing!.findIndex(item => item.node_id === data.node_id)
       if (currentIndex > -1) {
         draft.tracing![currentIndex] = {
-          ...draft.tracing![currentIndex],
+          ...draft.tracing![currentIndex]!,
           status: NodeRunningStatus.Paused,
         }
       }
@@ -49,7 +49,7 @@ export const useWorkflowNodeHumanInputRequired = () => {
     const nodes = getNodes()
     const currentNodeIndex = nodes.findIndex(node => node.id === data.node_id)
     const newNodes = produce(nodes, (draft) => {
-      draft[currentNodeIndex].data._runningStatus = NodeRunningStatus.Paused
+      draft[currentNodeIndex]!.data._runningStatus = NodeRunningStatus.Paused
     })
     setNodes(newNodes)
   }, [store, workflowStore])
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-iteration-started.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-iteration-started.ts
index 388d3936ed..b6f254db14 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-iteration-started.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-iteration-started.ts
@@ -48,20 +48,20 @@ export const useWorkflowNodeIterationStarted = () => {
     } = reactflow
     const currentNodeIndex = nodes.findIndex(node => node.id === data.node_id)
     const currentNode = nodes[currentNodeIndex]
-    const position = currentNode.position
+    const position = currentNode!.position
     const zoom = transform[2]
 
-    if (!currentNode.parentId) {
+    if (!currentNode!.parentId) {
       setViewport({
-        x: (containerParams.clientWidth - 400 - currentNode.width! * zoom) / 2 - position.x * zoom,
-        y: (containerParams.clientHeight - currentNode.height! * zoom) / 2 - position.y * zoom,
+        x: (containerParams.clientWidth - 400 - currentNode!.width! * zoom) / 2 - position.x * zoom,
+        y: (containerParams.clientHeight - currentNode!.height! * zoom) / 2 - position.y * zoom,
         zoom: transform[2],
       })
     }
     const newNodes = produce(nodes, (draft) => {
-      draft[currentNodeIndex].data._runningStatus = NodeRunningStatus.Running
-      draft[currentNodeIndex].data._iterationLength = data.metadata.iterator_length
-      draft[currentNodeIndex].data._waitingRun = false
+      draft[currentNodeIndex]!.data._runningStatus = NodeRunningStatus.Running
+      draft[currentNodeIndex]!.data._iterationLength = data.metadata.iterator_length
+      draft[currentNodeIndex]!.data._waitingRun = false
     })
     setNodes(newNodes)
     const newEdges = produce(edges, (draft) => {
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-loop-started.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-loop-started.ts
index c5ace9c692..dcdf651967 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-loop-started.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-loop-started.ts
@@ -45,20 +45,20 @@ export const useWorkflowNodeLoopStarted = () => {
     } = reactflow
     const currentNodeIndex = nodes.findIndex(node => node.id === data.node_id)
     const currentNode = nodes[currentNodeIndex]
-    const position = currentNode.position
+    const position = currentNode!.position
     const zoom = transform[2]
 
-    if (!currentNode.parentId) {
+    if (!currentNode!.parentId) {
       setViewport({
-        x: (containerParams.clientWidth - 400 - currentNode.width! * zoom) / 2 - position.x * zoom,
-        y: (containerParams.clientHeight - currentNode.height! * zoom) / 2 - position.y * zoom,
+        x: (containerParams.clientWidth - 400 - currentNode!.width! * zoom) / 2 - position.x * zoom,
+        y: (containerParams.clientHeight - currentNode!.height! * zoom) / 2 - position.y * zoom,
         zoom: transform[2],
       })
     }
     const newNodes = produce(nodes, (draft) => {
-      draft[currentNodeIndex].data._runningStatus = NodeRunningStatus.Running
-      draft[currentNodeIndex].data._loopLength = data.metadata.loop_length
-      draft[currentNodeIndex].data._waitingRun = false
+      draft[currentNodeIndex]!.data._runningStatus = NodeRunningStatus.Running
+      draft[currentNodeIndex]!.data._loopLength = data.metadata.loop_length
+      draft[currentNodeIndex]!.data._waitingRun = false
     })
     setNodes(newNodes)
     const newEdges = produce(edges, (draft) => {
diff --git a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts
index 01f60e12e9..a435bbdda6 100644
--- a/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts
+++ b/web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-node-started.ts
@@ -56,19 +56,19 @@ export const useWorkflowNodeStarted = () => {
     } = reactflow
     const currentNodeIndex = nodes.findIndex(node => node.id === data.node_id)
     const currentNode = nodes[currentNodeIndex]
-    const position = currentNode.position
+    const position = currentNode!.position
     const zoom = transform[2]
 
-    if (!currentNode.parentId) {
+    if (!currentNode!.parentId) {
       setViewport({
-        x: (containerParams.clientWidth - 400 - currentNode.width! * zoom) / 2 - position.x * zoom,
-        y: (containerParams.clientHeight - currentNode.height! * zoom) / 2 - position.y * zoom,
+        x: (containerParams.clientWidth - 400 - currentNode!.width! * zoom) / 2 - position.x * zoom,
+        y: (containerParams.clientHeight - currentNode!.height! * zoom) / 2 - position.y * zoom,
         zoom: transform[2],
       })
     }
     const newNodes = produce(nodes, (draft) => {
-      draft[currentNodeIndex].data._runningStatus = NodeRunningStatus.Running
-      draft[currentNodeIndex].data._waitingRun = false
+      draft[currentNodeIndex]!.data._runningStatus = NodeRunningStatus.Running
+      draft[currentNodeIndex]!.data._waitingRun = false
     })
     setNodes(newNodes)
     const newEdges = produce(edges, (draft) => {
diff --git a/web/app/components/workflow/hooks/use-workflow.ts b/web/app/components/workflow/hooks/use-workflow.ts
index 02353bb951..7344496984 100644
--- a/web/app/components/workflow/hooks/use-workflow.ts
+++ b/web/app/components/workflow/hooks/use-workflow.ts
@@ -253,7 +253,7 @@ export const useWorkflow = () => {
 
   const isVarUsedInNodes = useCallback((varSelector: ValueSelector) => {
     const nodeId = varSelector[0]
-    const afterNodes = getAfterNodesInSameBranch(nodeId)
+    const afterNodes = getAfterNodesInSameBranch(nodeId!)
     const effectNodes = findUsedVarNodes(varSelector, afterNodes)
     return effectNodes.length > 0
   }, [getAfterNodesInSameBranch])
@@ -261,7 +261,7 @@ export const useWorkflow = () => {
   const removeUsedVarInNodes = useCallback((varSelector: ValueSelector) => {
     const nodeId = varSelector[0]
     const { nodes, setNodes } = collaborativeWorkflow.getState()
-    const afterNodes = getAfterNodesInSameBranch(nodeId)
+    const afterNodes = getAfterNodesInSameBranch(nodeId!)
     const effectNodes = findUsedVarNodes(varSelector, afterNodes)
     if (effectNodes.length > 0) {
       const newNodes = nodes.map((node) => {
diff --git a/web/app/components/workflow/index.tsx b/web/app/components/workflow/index.tsx
index 71d9366552..12122c5b72 100644
--- a/web/app/components/workflow/index.tsx
+++ b/web/app/components/workflow/index.tsx
@@ -226,7 +226,7 @@ export const Workflow: FC<WorkflowProps> = memo(({
     if (workflowContainerRef.current) {
       const resizeContainerObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
-          const { inlineSize, blockSize } = entry.borderBoxSize[0]
+          const { inlineSize, blockSize } = entry.borderBoxSize[0]!
           setWorkflowCanvasWidth(inlineSize)
           setWorkflowCanvasHeight(blockSize)
         }
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 595b38c7e2..e3fd96e3c1 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
@@ -236,10 +236,10 @@ const FormItem: FC<Props> = ({
                 : payload.allowed_file_types,
               allowed_file_extensions: inStepRun && (!payload.allowed_file_extensions || payload.allowed_file_extensions.length === 0)
                 ? [
-                    ...FILE_EXTS[SupportUploadFileTypes.image],
-                    ...FILE_EXTS[SupportUploadFileTypes.document],
-                    ...FILE_EXTS[SupportUploadFileTypes.audio],
-                    ...FILE_EXTS[SupportUploadFileTypes.video],
+                    ...(FILE_EXTS[SupportUploadFileTypes.image] ?? []),
+                    ...(FILE_EXTS[SupportUploadFileTypes.document] ?? []),
+                    ...(FILE_EXTS[SupportUploadFileTypes.audio] ?? []),
+                    ...(FILE_EXTS[SupportUploadFileTypes.video] ?? []),
                   ]
                 : payload.allowed_file_extensions,
               allowed_file_upload_methods: inStepRun ? [TransferMethod.local_file, TransferMethod.remote_url] : payload.allowed_file_upload_methods,
@@ -263,10 +263,10 @@ const FormItem: FC<Props> = ({
                 : payload.allowed_file_types,
               allowed_file_extensions: (inStepRun || isIteratorItemFile) && (!payload.allowed_file_extensions || payload.allowed_file_extensions.length === 0)
                 ? [
-                    ...FILE_EXTS[SupportUploadFileTypes.image],
-                    ...FILE_EXTS[SupportUploadFileTypes.document],
-                    ...FILE_EXTS[SupportUploadFileTypes.audio],
-                    ...FILE_EXTS[SupportUploadFileTypes.video],
+                    ...(FILE_EXTS[SupportUploadFileTypes.image] ?? []),
+                    ...(FILE_EXTS[SupportUploadFileTypes.document] ?? []),
+                    ...(FILE_EXTS[SupportUploadFileTypes.audio] ?? []),
+                    ...(FILE_EXTS[SupportUploadFileTypes.video] ?? []),
                   ]
                 : payload.allowed_file_extensions,
               allowed_file_upload_methods: (inStepRun || isIteratorItemFile) ? [TransferMethod.local_file, TransferMethod.remote_url] : payload.allowed_file_upload_methods,
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/form.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/form.tsx
index a57428e79c..55732ff1cb 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/form.tsx
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/form.tsx
@@ -60,13 +60,13 @@ const Form: FC<Props> = ({
       onChange(newValues)
     }
   }, [valuesRef, onChange, mapKeysWithSameValueSelector])
-  const isArrayLikeType = [InputVarType.contexts, InputVarType.iterator].includes(inputs[0]?.type)
+  const isArrayLikeType = [InputVarType.contexts, InputVarType.iterator].includes(inputs[0]?.type!)
   const isIteratorItemFile = inputs[0]?.type === InputVarType.iterator && inputs[0]?.isFileItem
 
   const isContext = inputs[0]?.type === InputVarType.contexts
   const handleAddContext = useCallback(() => {
     const newValues = produce(values, (draft: any) => {
-      const key = inputs[0].variable
+      const key = inputs[0]!.variable
       if (!draft[key])
         draft[key] = []
       draft[key].push(isContext ? RETRIEVAL_OUTPUT_STRUCT : '')
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/helpers.ts b/web/app/components/workflow/nodes/_base/components/before-run-form/helpers.ts
index c0e08f64ec..35a9b559c3 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/helpers.ts
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/helpers.ts
@@ -55,7 +55,7 @@ export const getFormErrorMessage = (
       const value = form.values[input.variable] as unknown
       const missingRequired = input.required
         && input.type !== InputVarType.checkbox
-        && !(input.variable in existVarValuesInForm)
+        && !(input.variable in existVarValuesInForm!)
         && (
           value === '' || value === undefined || value === null
           || (
diff --git a/web/app/components/workflow/nodes/_base/components/editor/code-editor/editor-support-vars.tsx b/web/app/components/workflow/nodes/_base/components/editor/code-editor/editor-support-vars.tsx
index 7e79738b10..4944b079de 100644
--- a/web/app/components/workflow/nodes/_base/components/editor/code-editor/editor-support-vars.tsx
+++ b/web/app/components/workflow/nodes/_base/components/editor/code-editor/editor-support-vars.tsx
@@ -110,7 +110,7 @@ const CodeEditor: FC<Props> = ({
     }
     const varName = varValue.slice(-1)[0]
     return {
-      name: getUniqVarName(varName),
+      name: getUniqVarName(varName!),
       isExist: false,
     }
   }
diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/utils.ts b/web/app/components/workflow/nodes/_base/components/error-handle/utils.ts
index ac48407c03..4c8c6898e2 100644
--- a/web/app/components/workflow/nodes/_base/components/error-handle/utils.ts
+++ b/web/app/components/workflow/nodes/_base/components/error-handle/utils.ts
@@ -73,8 +73,8 @@ export const getDefaultValue = (data: CommonNodeType) => {
     return Object.keys(outputs).map((key) => {
       return {
         key,
-        type: outputs[key].type,
-        value: getDefaultValueByType(outputs[key].type),
+        type: outputs[key]!.type,
+        value: getDefaultValueByType(outputs[key]!.type),
       }
     })
   }
diff --git a/web/app/components/workflow/nodes/_base/components/file-type-item.tsx b/web/app/components/workflow/nodes/_base/components/file-type-item.tsx
index e4e1f53fc9..0f1fd9bafa 100644
--- a/web/app/components/workflow/nodes/_base/components/file-type-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/file-type-item.tsx
@@ -66,7 +66,7 @@ const FileTypeItem: FC<Props> = ({
               <FileTypeIcon className="shrink-0" type={type} size="lg" />
               <div className="mx-2 grow">
                 <div className="system-sm-medium text-text-primary">{t(`variableConfig.file.${type}.name`, { ns: 'appDebug' })}</div>
-                <div className="mt-1 system-2xs-regular-uppercase text-text-tertiary">{type !== SupportUploadFileTypes.custom ? FILE_EXTS[type].join(', ') : t('variableConfig.file.custom.description', { ns: 'appDebug' })}</div>
+                <div className="mt-1 system-2xs-regular-uppercase text-text-tertiary">{type !== SupportUploadFileTypes.custom ? FILE_EXTS[type]!.join(', ') : t('variableConfig.file.custom.description', { ns: 'appDebug' })}</div>
               </div>
               <Checkbox className="shrink-0" checked={selected} />
             </div>
diff --git a/web/app/components/workflow/nodes/_base/components/next-step/line.tsx b/web/app/components/workflow/nodes/_base/components/next-step/line.tsx
index 862657e34b..cc61120c3c 100644
--- a/web/app/components/workflow/nodes/_base/components/next-step/line.tsx
+++ b/web/app/components/workflow/nodes/_base/components/next-step/line.tsx
@@ -16,14 +16,14 @@ const Line = ({
     return listHeight.slice(0, index).reduce((acc, cur) => acc + cur, 0) + item
   })
   const processedListLength = processedList.length
-  const svgHeight = processedList[processedListLength - 1] + (processedListLength - 1) * 8
+  const svgHeight = processedList[processedListLength - 1]! + (processedListLength - 1) * 8
 
   return (
     <svg className="w-6 shrink-0" style={{ height: svgHeight }}>
       {
         processedList.map((item, index) => {
           const prevItem = index > 0 ? processedList[index - 1] : 0
-          const space = prevItem + index * 8 + 16
+          const space = prevItem! + index * 8 + 16
           return (
             <g key={index}>
               {
diff --git a/web/app/components/workflow/nodes/_base/components/readonly-input-with-select-var.tsx b/web/app/components/workflow/nodes/_base/components/readonly-input-with-select-var.tsx
index bba7cfa7fc..fb6e0e4211 100644
--- a/web/app/components/workflow/nodes/_base/components/readonly-input-with-select-var.tsx
+++ b/web/app/components/workflow/nodes/_base/components/readonly-input-with-select-var.tsx
@@ -41,7 +41,7 @@ const ReadonlyInputWithSelectVar: FC<Props> = ({
 
       const value = vars[index].split('.')
       const isSystem = isSystemVar(value)
-      const node = (isSystem ? startNode : getNodeInfoById(availableNodes, value[0]))?.data
+      const node = (isSystem ? startNode : getNodeInfoById(availableNodes, value[0]!))?.data
       const isShowAPart = value.length > 2
 
       return (
diff --git a/web/app/components/workflow/nodes/_base/components/support-var-input/index.tsx b/web/app/components/workflow/nodes/_base/components/support-var-input/index.tsx
index 77dd9d4c37..6a7d3ff246 100644
--- a/web/app/components/workflow/nodes/_base/components/support-var-input/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/support-var-input/index.tsx
@@ -32,7 +32,7 @@ const SupportVarInput: FC<Props> = ({
         return (
           <VarHighlight
             key={`var-${index}`}
-            name={variableMatch[1]}
+            name={variableMatch[1]!}
           />
         )
       }
diff --git a/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx b/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
index f279b55d03..ccd92f7296 100644
--- a/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
+++ b/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
@@ -35,7 +35,7 @@ export const SwitchPluginVersion: FC<SwitchPluginVersionProps> = (props) => {
     pluginUniqueIden: string
   }>()
   const pluginDetails = useCheckInstalled({
-    pluginIds: [pluginId],
+    pluginIds: [pluginId!],
     enabled: true,
   })
   const pluginDetail = pluginDetails.data?.plugins.at(0)
diff --git a/web/app/components/workflow/nodes/_base/components/variable-tag.tsx b/web/app/components/workflow/nodes/_base/components/variable-tag.tsx
index a72e9b1da1..be2d8ed0aa 100644
--- a/web/app/components/workflow/nodes/_base/components/variable-tag.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable-tag.tsx
@@ -34,7 +34,7 @@ const VariableTag = ({
       if (startNode)
         return startNode
     }
-    return getNodeInfoById(availableNodes || nodes, isRagVar ? valueSelector[1] : valueSelector[0])
+    return getNodeInfoById(availableNodes || nodes, isRagVar ? valueSelector[1]! : valueSelector[0]!)
   }, [nodes, valueSelector, availableNodes, isRagVar])
 
   const isEnv = isENV(valueSelector)
diff --git a/web/app/components/workflow/nodes/_base/components/variable/__tests__/output-var-list.spec.tsx b/web/app/components/workflow/nodes/_base/components/variable/__tests__/output-var-list.spec.tsx
index 24464e4f08..e83fee6c55 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/__tests__/output-var-list.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/__tests__/output-var-list.spec.tsx
@@ -49,7 +49,7 @@ describe('OutputVarList', () => {
     )
 
     const inputs = screen.getAllByRole('textbox')
-    fireEvent.change(inputs[renameIndex], { target: { value: newName } })
+    fireEvent.change(inputs[renameIndex]!, { target: { value: newName } })
 
     return captured!
   }
@@ -119,7 +119,7 @@ describe('OutputVarList', () => {
 
       // The second remove button (index 1 in the row)
       const buttons = screen.getAllByRole('button')
-      fireEvent.click(buttons[1])
+      fireEvent.click(buttons[1]!)
 
       expect(onRemove).toHaveBeenCalledWith(1)
     })
@@ -142,8 +142,8 @@ describe('OutputVarList', () => {
 
       const inputs = screen.getAllByRole('textbox')
       expect(inputs).toHaveLength(2)
-      expect(inputs[0]).toHaveValue('a')
-      expect(inputs[1]).toHaveValue('b')
+      expect(inputs[0])!.toHaveValue('a')
+      expect(inputs[1])!.toHaveValue('b')
     })
 
     it('should call onChange with updated outputs when renaming', () => {
@@ -203,7 +203,7 @@ describe('OutputVarList', () => {
         />,
       )
 
-      expect(screen.getByRole('textbox')).toHaveAttribute('readonly')
+      expect(screen.getByRole('textbox'))!.toHaveAttribute('readonly')
     })
   })
 })
diff --git a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.trigger.spec.tsx b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.trigger.spec.tsx
index 60b7e34f29..f7264bcc99 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.trigger.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.trigger.spec.tsx
@@ -55,7 +55,7 @@ describe('VarReferencePickerTrigger', () => {
       />,
     )
 
-    expect(screen.getByText('Pick variable')).toBeInTheDocument()
+    expect(screen.getByText('Pick variable'))!.toBeInTheDocument()
     fireEvent.click(screen.getByTestId('var-reference-picker-trigger'))
     expect(setOpen).toHaveBeenCalledWith(true)
   })
@@ -79,8 +79,8 @@ describe('VarReferencePickerTrigger', () => {
       />,
     )
 
-    expect(screen.getByText('Source Node')).toBeInTheDocument()
-    expect(screen.getByText('answer')).toBeInTheDocument()
+    expect(screen.getByText('Source Node'))!.toBeInTheDocument()
+    expect(screen.getByText('answer'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText('Source Node'), { ctrlKey: true })
     expect(handleVariableJump).toHaveBeenCalledWith('node-a')
@@ -128,7 +128,7 @@ describe('VarReferencePickerTrigger', () => {
       />,
     )
 
-    expect(document.querySelector('button')).toBeInTheDocument()
+    expect(document.querySelector('button'))!.toBeInTheDocument()
   })
 
   it('should stay inert in readonly mode and show value type placeholder badge', () => {
@@ -148,8 +148,8 @@ describe('VarReferencePickerTrigger', () => {
 
     fireEvent.click(screen.getByTestId('var-reference-picker-trigger'))
     expect(setOpen).not.toHaveBeenCalled()
-    expect(screen.getByText('string')).toBeInTheDocument()
-    expect(screen.getByText('text')).toBeInTheDocument()
+    expect(screen.getByText('string'))!.toBeInTheDocument()
+    expect(screen.getByText('text'))!.toBeInTheDocument()
   })
 
   it('should show loading placeholder and remove rows in table mode', () => {
@@ -167,10 +167,10 @@ describe('VarReferencePickerTrigger', () => {
       />,
     )
 
-    expect(screen.getByText('Loading variable')).toBeInTheDocument()
+    expect(screen.getByText('Loading variable'))!.toBeInTheDocument()
 
     const buttons = screen.getAllByRole('button')
-    fireEvent.click(buttons[buttons.length - 1])
+    fireEvent.click(buttons[buttons.length - 1]!)
     expect(onRemove).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-vars.helpers.spec.ts b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-vars.helpers.spec.ts
index 5b00464be1..773ecacc39 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-vars.helpers.spec.ts
+++ b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-vars.helpers.spec.ts
@@ -78,7 +78,7 @@ describe('var-reference-vars helpers', () => {
     ] as NodeOutPutVar[], 'another')
 
     expect(vars).toHaveLength(1)
-    expect(vars[0].title).toBe('Node B')
-    expect(vars[0].vars).toEqual([expect.objectContaining({ variable: 'another_value' })])
+    expect(vars[0]!.title).toBe('Node B')
+    expect(vars[0]!.vars).toEqual([expect.objectContaining({ variable: 'another_value' })])
   })
 })
diff --git a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx
index 5cfb96fee4..c9ba9465d9 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/index.tsx
@@ -59,7 +59,7 @@ export const PickerPanelMain: FC<Props> = ({
         <Field
           key={name}
           name={name}
-          payload={schema.properties[name]}
+          payload={schema.properties[name]!}
           readonly={readonly}
           valueSelector={[root.nodeId!, root.attrName]}
           onSelect={onSelect}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/show/index.tsx b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/show/index.tsx
index 310c2dc9cf..ba03c3b17a 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/show/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/show/index.tsx
@@ -28,7 +28,7 @@ const ShowPanel: FC<Props> = ({
         <Field
           key={name}
           name={name}
-          payload={schema.schema.properties![name]}
+          payload={schema.schema.properties![name]!}
           required={!!schema.schema.required?.includes(name)}
           rootClassName={rootClassName}
         />
diff --git a/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx b/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx
index 79238aa6de..d43efc1b30 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx
@@ -33,7 +33,7 @@ const OutputVarList: FC<Props> = ({
   const list = outputKeyOrders.map((key) => {
     return {
       variable: key,
-      variable_type: outputs[key]?.type,
+      variable_type: outputs[key]?.type!,
     }
   })
 
@@ -50,7 +50,7 @@ const OutputVarList: FC<Props> = ({
 
   const handleVarNameChange = useCallback((index: number) => {
     return (e: React.ChangeEvent<HTMLInputElement>) => {
-      const oldKey = list[index].variable
+      const oldKey = list[index]!.variable
 
       replaceSpaceWithUnderscoreInVarNameInput(e.target)
       const newKey = e.target.value
@@ -58,7 +58,7 @@ const OutputVarList: FC<Props> = ({
       validateVarInput(list.toSpliced(index, 1), newKey)
 
       const newOutputs = produce(outputs, (draft) => {
-        draft[newKey] = draft[oldKey]
+        draft[newKey] = draft[oldKey]!
         // Only delete old key if no other entry shares this name
         if (!list.some((item, i) => i !== index && item.variable === oldKey))
           delete draft[oldKey]
@@ -69,9 +69,9 @@ const OutputVarList: FC<Props> = ({
 
   const handleVarTypeChange = useCallback((index: number) => {
     return (value: string) => {
-      const key = list[index].variable
+      const key = list[index]!.variable
       const newOutputs = produce(outputs, (draft) => {
-        draft[key].type = value as VarType
+        draft[key]!.type = value as VarType
       })
       onChange(newOutputs)
     }
diff --git a/web/app/components/workflow/nodes/_base/components/variable/utils.ts b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
index c131427648..3754058b50 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/utils.ts
+++ b/web/app/components/workflow/nodes/_base/components/variable/utils.ts
@@ -79,7 +79,7 @@ export const isGlobalVar = (valueSelector: ValueSelector) => {
     return false
   const second = valueSelector[1]
 
-  if (['query', 'files'].includes(second))
+  if (['query', 'files'].includes(second!))
     return false
   return true
 }
@@ -176,9 +176,9 @@ const findExceptVarInStructuredProperties = (
   const res = produce(properties, (draft) => {
     Object.keys(properties).forEach((key) => {
       const item = properties[key]
-      const isObj = item.type === Type.object
-      const isArray = item.type === Type.array
-      const arrayType = item.items?.type
+      const isObj = item!.type === Type.object
+      const isArray = item!.type === Type.array
+      const arrayType = item!.items?.type
 
       if (
         !isObj
@@ -186,7 +186,7 @@ const findExceptVarInStructuredProperties = (
           {
             variable: key,
             type: structTypeToVarType(
-              isArray ? arrayType! : item.type,
+              isArray ? arrayType! : item!.type,
               isArray,
             ),
           },
@@ -196,9 +196,9 @@ const findExceptVarInStructuredProperties = (
         delete properties[key]
         return
       }
-      if (item.type === Type.object && item.properties) {
-        item.properties = findExceptVarInStructuredProperties(
-          item.properties,
+      if (item!.type === Type.object && item!.properties) {
+        item!.properties = findExceptVarInStructuredProperties(
+          item!.properties,
           filterVar,
         )
       }
@@ -216,16 +216,16 @@ const findExceptVarInStructuredOutput = (
     const properties = draft.schema.properties
     Object.keys(properties).forEach((key) => {
       const item = properties[key]
-      const isObj = item.type === Type.object
-      const isArray = item.type === Type.array
-      const arrayType = item.items?.type
+      const isObj = item!.type === Type.object
+      const isArray = item!.type === Type.array
+      const arrayType = item!.items?.type
       if (
         !isObj
         && !filterVar(
           {
             variable: key,
             type: structTypeToVarType(
-              isArray ? arrayType! : item.type,
+              isArray ? arrayType! : item!.type,
               isArray,
             ),
           },
@@ -235,9 +235,9 @@ const findExceptVarInStructuredOutput = (
         delete properties[key]
         return
       }
-      if (item.type === Type.object && item.properties) {
-        item.properties = findExceptVarInStructuredProperties(
-          item.properties,
+      if (item!.type === Type.object && item!.properties) {
+        item!.properties = findExceptVarInStructuredProperties(
+          item!.properties,
           filterVar,
         )
       }
@@ -427,7 +427,7 @@ const formatItem = (
         ? Object.keys(outputs).map((key) => {
             return {
               variable: key,
-              type: outputs[key].type,
+              type: outputs[key]!.type,
             }
           })
         : []
@@ -711,7 +711,7 @@ const formatItem = (
         (() => {
           const variableArr = v.variable.split('.')
           const [first] = variableArr
-          if (isSpecialVar(first))
+          if (isSpecialVar(first!))
             return variableArr
 
           return [...selector, ...variableArr]
@@ -1435,16 +1435,16 @@ export const getNodeUsedVars = (node: Node): ValueSelector[] => {
       const mixVars = matchNotSystemVars(
         Object.keys(payload.tool_parameters)
           ?.filter(
-            key => payload.tool_parameters[key].type === ToolVarType.mixed,
+            key => payload.tool_parameters[key]!.type === ToolVarType.mixed,
           )
-          .map(key => payload.tool_parameters[key].value) as string[],
+          .map(key => payload.tool_parameters[key]!.value) as string[],
       )
       const vars
         = Object.keys(payload.tool_parameters)
           .filter(
-            key => payload.tool_parameters[key].type === ToolVarType.variable,
+            key => payload.tool_parameters[key]!.type === ToolVarType.variable,
           )
-          .map(key => payload.tool_parameters[key].value as string) || []
+          .map(key => payload.tool_parameters[key]!.value as string) || []
       res = [...(mixVars as ValueSelector[]), ...(vars as any)]
       break
     }
@@ -1454,17 +1454,17 @@ export const getNodeUsedVars = (node: Node): ValueSelector[] => {
         Object.keys(payload.datasource_parameters)
           ?.filter(
             key =>
-              payload.datasource_parameters[key].type === ToolVarType.mixed,
+              payload.datasource_parameters[key]!.type === ToolVarType.mixed,
           )
-          .map(key => payload.datasource_parameters[key].value) as string[],
+          .map(key => payload.datasource_parameters[key]!.value) as string[],
       )
       const vars
         = Object.keys(payload.datasource_parameters)
           .filter(
             key =>
-              payload.datasource_parameters[key].type === ToolVarType.variable,
+              payload.datasource_parameters[key]!.type === ToolVarType.variable,
           )
-          .map(key => payload.datasource_parameters[key].value as string)
+          .map(key => payload.datasource_parameters[key]!.value as string)
           || []
       res = [...(mixVars as ValueSelector[]), ...(vars as any)]
       break
@@ -1514,7 +1514,7 @@ export const getNodeUsedVars = (node: Node): ValueSelector[] => {
         break
 
       Object.keys(payload.agent_parameters || {}).forEach((key) => {
-        const { value } = payload.agent_parameters![key]
+        const { value } = payload.agent_parameters![key]!
         if (typeof value === 'string')
           valueSelectors.push(...matchNotSystemVars([value]))
       })
@@ -1845,15 +1845,15 @@ export const updateNodeVars = (
       case BlockEnum.Tool: {
         const payload = data as ToolNodeType
         const hasShouldRenameVar = Object.keys(payload.tool_parameters)?.filter(
-          key => payload.tool_parameters[key].type !== ToolVarType.constant,
+          key => payload.tool_parameters[key]!.type !== ToolVarType.constant,
         )
         if (hasShouldRenameVar) {
           Object.keys(payload.tool_parameters).forEach((key) => {
-            const value = payload.tool_parameters[key]
-            const { type } = value
+            const value = payload.tool_parameters[key]!
+            const { type } = value!
             if (
               type === ToolVarType.variable
-              && value.value.join('.') === oldVarSelector.join('.')
+              && value!.value.join('.') === oldVarSelector.join('.')
             ) {
               payload.tool_parameters[key] = {
                 ...value,
@@ -1865,7 +1865,7 @@ export const updateNodeVars = (
               payload.tool_parameters[key] = {
                 ...value,
                 value: replaceOldVarInText(
-                  payload.tool_parameters[key].value as string,
+                  payload.tool_parameters[key]!.value as string,
                   oldVarSelector,
                   newVarSelector,
                 ),
@@ -1881,15 +1881,15 @@ export const updateNodeVars = (
           payload.datasource_parameters,
         )?.filter(
           key =>
-            payload.datasource_parameters[key].type !== ToolVarType.constant,
+            payload.datasource_parameters[key]!.type !== ToolVarType.constant,
         )
         if (hasShouldRenameVar) {
           Object.keys(payload.datasource_parameters).forEach((key) => {
-            const value = payload.datasource_parameters[key]
-            const { type } = value
+            const value = payload.datasource_parameters[key]!
+            const { type } = value!
             if (
               type === ToolVarType.variable
-              && value.value.join('.') === oldVarSelector.join('.')
+              && value!.value.join('.') === oldVarSelector.join('.')
             ) {
               payload.datasource_parameters[key] = {
                 ...value,
@@ -1901,7 +1901,7 @@ export const updateNodeVars = (
               payload.datasource_parameters[key] = {
                 ...value,
                 value: replaceOldVarInText(
-                  payload.datasource_parameters[key].value as string,
+                  payload.datasource_parameters[key]!.value as string,
                   oldVarSelector,
                   newVarSelector,
                 ),
@@ -1915,13 +1915,13 @@ export const updateNodeVars = (
         const payload = data as AgentNodeType
         if (payload.agent_parameters) {
           Object.keys(payload.agent_parameters).forEach((key) => {
-            const value = payload.agent_parameters![key]
-            const { type } = value
+            const value = payload.agent_parameters![key]!
+            const { type } = value!
 
             if (
               type === ToolVarType.variable
-              && Array.isArray(value.value)
-              && value.value.join('.') === oldVarSelector.join('.')
+              && Array.isArray(value!.value)
+              && value!.value.join('.') === oldVarSelector.join('.')
             ) {
               payload.agent_parameters![key] = {
                 ...value,
@@ -1929,11 +1929,11 @@ export const updateNodeVars = (
               }
             }
 
-            if (type === ToolVarType.mixed && typeof value.value === 'string') {
+            if (type === ToolVarType.mixed && typeof value!.value === 'string') {
               payload.agent_parameters![key] = {
                 ...value,
                 value: replaceOldVarInText(
-                  value.value,
+                  value!.value,
                   oldVarSelector,
                   newVarSelector,
                 ),
@@ -2059,11 +2059,11 @@ const varToValueSelectorList = (
     Object.keys(
       (v.children as StructuredOutput)?.schema?.properties || {},
     ).forEach((key) => {
-      const type = (v.children as StructuredOutput)?.schema?.properties[key].type
+      const type = (v.children as StructuredOutput)?.schema?.properties[key]!.type
       const isArray = type === Type.array
       const arrayType = (v.children as StructuredOutput)?.schema?.properties[
         key
-      ].items?.type
+      ]!.items?.type
       varToValueSelectorList(
         {
           variable: key,
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx
index b2c63be8b6..1ca54888b6 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx
@@ -31,11 +31,11 @@ const VarFullPathPanel: FC<Props> = ({
     for (let i = 1; i < path.length; i++) {
       const isLast = i === path.length - 1
       const name = path[i]
-      current.properties[name] = {
+      current.properties[name!] = {
         type: isLast ? varType : Type.object,
         properties: {},
       } as Field
-      current = current.properties[name] as { type: Type.object, properties: { [key: string]: Field }, required: never[], additionalProperties: false }
+      current = current.properties[name!] as { type: Type.object, properties: { [key: string]: Field }, required: never[], additionalProperties: false }
     }
     return {
       schema,
@@ -49,7 +49,7 @@ const VarFullPathPanel: FC<Props> = ({
       </div>
       <Panel
         className="px-1 pb-3 pt-2"
-        root={{ attrName: path[0] }}
+        root={{ attrName: path[0]! }}
         payload={schema}
         readonly
       />
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
index 3caf1327c9..a0add3e7fd 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
@@ -69,9 +69,9 @@ const VarList: FC<Props> = ({
 
       validateVarInput(list.toSpliced(index, 1), newKey)
 
-      onVarNameChange?.(list[index].variable, newKey)
+      onVarNameChange?.(list[index]!.variable, newKey)
       const newList = produce(list, (draft) => {
-        draft[index].variable = newKey
+        draft[index]!.variable = newKey
       })
       onChange(newList)
     }
@@ -81,26 +81,26 @@ const VarList: FC<Props> = ({
     return (value: ValueSelector | string, varKindType: VarKindType, varInfo?: Var) => {
       const newList = produce(list, (draft) => {
         if (!isSupportConstantValue || varKindType === VarKindType.variable) {
-          draft[index].value_selector = value as ValueSelector
-          draft[index].value_type = varInfo?.type
+          draft[index]!.value_selector = value as ValueSelector
+          draft[index]!.value_type = varInfo?.type
           if (isSupportConstantValue)
-            draft[index].variable_type = VarKindType.variable
+            draft[index]!.variable_type = VarKindType.variable
 
-          if (!draft[index].variable) {
+          if (!draft[index]!.variable) {
             const variables = draft.map(v => v.variable)
-            let newVarName = value[value.length - 1]
+            let newVarName = value[value.length - 1]!
             let count = 1
-            while (variables.includes(newVarName)) {
+            while (variables.includes(newVarName!)) {
               newVarName = `${value[value.length - 1]}_${count}`
               count++
             }
-            draft[index].variable = newVarName
+            draft[index]!.variable = newVarName
           }
         }
         else {
-          draft[index].variable_type = VarKindType.constant
-          draft[index].value_selector = value as ValueSelector
-          draft[index].value = value as string
+          draft[index]!.variable_type = VarKindType.constant
+          draft[index]!.value_selector = value as ValueSelector
+          draft[index]!.value = value as string
         }
       })
       onChange(newList)
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.helpers.ts b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.helpers.ts
index ae076626f8..6cdcb916e6 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.helpers.ts
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.helpers.ts
@@ -49,7 +49,7 @@ export const getIsIterationVar = (
 ) => {
   if (!isInIteration || !Array.isArray(value))
     return false
-  return value[0] === parentId && ['item', 'index'].includes(value[1])
+  return value[0] === parentId && ['item', 'index'].includes(value[1]!)
 }
 
 export const getIsLoopVar = (
@@ -59,7 +59,7 @@ export const getIsLoopVar = (
 ) => {
   if (!isInLoop || !Array.isArray(value))
     return false
-  return value[0] === parentId && ['item', 'index'].includes(value[1])
+  return value[0] === parentId && ['item', 'index'].includes(value[1]!)
 }
 
 export const getOutputVarNode = ({
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
index 47bc60e22b..1cfccf1622 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
@@ -186,7 +186,7 @@ const VarReferencePicker: FC<Props> = ({
     isLoopVar,
     iterationNode,
     loopNode,
-    outputVarNodeId,
+    outputVarNodeId: outputVarNodeId!,
     startNode,
     value,
   }), [availableNodes, hasValue, isConstant, isIterationVar, isLoopVar, iterationNode, loopNode, outputVarNodeId, startNode, value])
@@ -223,7 +223,7 @@ const VarReferencePicker: FC<Props> = ({
     const newValue = produce(value, (draft) => {
       if (draft[1] && draft[1].startsWith('sys.')) {
         draft.shift()
-        const paths = draft[0].split('.')
+        const paths = draft[0]!.split('.')
         paths.forEach((p, i) => {
           draft[i] = p
         })
@@ -254,10 +254,10 @@ const VarReferencePicker: FC<Props> = ({
     } = reactflow
     const { transform } = store.getState()
     const zoom = transform[2]
-    const position = currentNode.position
+    const position = currentNode!.position
     setViewport({
-      x: (clientWidth - 400 - currentNode.width! * zoom) / 2 - position.x * zoom,
-      y: (clientHeight - currentNode.height! * zoom) / 2 - position.y * zoom,
+      x: (clientWidth - 400 - currentNode!.width! * zoom) / 2 - position.x * zoom,
+      y: (clientHeight - currentNode!.height! * zoom) / 2 - position.y * zoom,
       zoom: transform[2],
     })
   }, [availableNodes, reactflow, store])
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.helpers.ts b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.helpers.ts
index 36418a298d..d36dc807a8 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.helpers.ts
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.helpers.ts
@@ -73,7 +73,7 @@ export const getValueSelector = ({
 }
 
 const getVisibleChildren = (vars: Var[]) => {
-  return vars.filter(variable => checkKeys([variable.variable], false).isValid || isSpecialVar(variable.variable.split('.')[0]))
+  return vars.filter(variable => checkKeys([variable.variable], false).isValid || isSpecialVar(variable.variable.split('.')[0]!))
 }
 
 export const filterReferenceVars = (vars: NodeOutPutVar[], searchText: string) => {
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 4a1019954d..5ebf5ae09b 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
@@ -322,7 +322,7 @@ const BasePanel: FC<BasePanelProps> = ({
   useEffect(() => {
     if (currentTriggerPlugin) {
       setDetail({
-        name: currentTriggerPlugin.label[language],
+        name: currentTriggerPlugin.label[language]!,
         plugin_id: currentTriggerPlugin.plugin_id || '',
         plugin_unique_identifier: currentTriggerPlugin.plugin_unique_identifier || '',
         id: currentTriggerPlugin.id,
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/use-last-run.ts b/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/use-last-run.ts
index d58c787bd8..b1efe258df 100644
--- a/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/use-last-run.ts
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/use-last-run.ts
@@ -209,7 +209,7 @@ const useLastRun = <T>({
     const formattedData: Record<string, any> = {}
     Object.keys(allVarObject).forEach((key) => {
       const [varSectorStr, nodeId] = key.split(DELIMITER)
-      formattedData[`${nodeId}.${allVarObject[key].inSingleRunPassedKey}`] = data[varSectorStr]
+      formattedData[`${nodeId}.${allVarObject[key].inSingleRunPassedKey}`] = data[varSectorStr!]
     })
     if (isIterationNode) {
       const iteratorInputKey = `${id}.input_selector`
@@ -291,7 +291,7 @@ const useLastRun = <T>({
       return true
     return vars.every((varItem) => {
       const [nodeId, varName] = varItem.slice(0, 2)
-      const inspectVarValue = hasSetInspectVar(nodeId, varName, systemVars, conversationVars) // also detect system var , env and  conversation var
+      const inspectVarValue = hasSetInspectVar(nodeId!, varName!, systemVars, conversationVars) // also detect system var , env and  conversation var
       return inspectVarValue
     })
   }
@@ -301,7 +301,7 @@ const useLastRun = <T>({
       return true
     return vars.some((varItem) => {
       const [nodeId, varName] = varItem.slice(0, 2)
-      const inspectVarValue = hasSetInspectVar(nodeId, varName, systemVars, conversationVars) // also detect system var , env and  conversation var
+      const inspectVarValue = hasSetInspectVar(nodeId!, varName!, systemVars, conversationVars) // also detect system var , env and  conversation var
       return inspectVarValue
     })
   }
@@ -315,7 +315,7 @@ const useLastRun = <T>({
       const existVarValuesInForm = existVarValuesInForms[i]
       const newForm = { ...form }
       const inputs = form.inputs.filter((input) => {
-        return !(input.variable in existVarValuesInForm)
+        return !(input.variable in existVarValuesInForm!)
       })
       newForm.inputs = inputs
       return newForm
diff --git a/web/app/components/workflow/nodes/_base/hooks/use-one-step-run.ts b/web/app/components/workflow/nodes/_base/hooks/use-one-step-run.ts
index 1d30948316..a05c765a8e 100644
--- a/web/app/components/workflow/nodes/_base/hooks/use-one-step-run.ts
+++ b/web/app/components/workflow/nodes/_base/hooks/use-one-step-run.ts
@@ -234,10 +234,10 @@ const useOneStepRun = <T>({
       const index = draft.findIndex(node => node.nodeId === nodeId)
       if (index !== -1) {
         const targetNode = draft[index]
-        if (targetNode.isSingRunRunning !== isRunning) {
-          targetNode.isSingRunRunning = isRunning
+        if (targetNode!.isSingRunRunning !== isRunning) {
+          targetNode!.isSingRunRunning = isRunning
           if (isRunning)
-            targetNode.isValueFetched = false
+            targetNode!.isValueFetched = false
           hasChanges = true
         }
       }
@@ -806,7 +806,7 @@ const useOneStepRun = <T>({
               const newIterationRunResult = produce(iterationRunResult, (draft) => {
                 if (currentIndex > -1) {
                   draft[currentIndex] = {
-                    ...draft[currentIndex],
+                    ...draft[currentIndex]!,
                     ...data,
                   }
                 }
@@ -910,7 +910,7 @@ const useOneStepRun = <T>({
               const newLoopRunResult = produce(loopRunResult, (draft) => {
                 if (currentIndex > -1) {
                   draft[currentIndex] = {
-                    ...draft[currentIndex],
+                    ...draft[currentIndex]!,
                     ...data,
                   }
                 }
@@ -1109,13 +1109,13 @@ const useOneStepRun = <T>({
     })
 
     const variables = unionBy(valueSelectors, item => item.join('.')).map((item) => {
-      const varInfo = getNodeInfoById(availableNodesIncludeParent, item[0])?.data
+      const varInfo = getNodeInfoById(availableNodesIncludeParent, item[0]!)?.data
 
       return {
         label: {
           nodeType: varInfo?.type,
           nodeName: varInfo?.title || availableNodesIncludeParent[0]?.data.title, // default start node title
-          variable: isSystemVar(item) ? item.join('.') : item[item.length - 1],
+          variable: isSystemVar(item) ? item.join('.') : item[item.length - 1]!,
           isChatVar: isConversationVar(item),
         },
         variable: `#${item.join('.')}#`,
@@ -1129,7 +1129,7 @@ const useOneStepRun = <T>({
 
   const varSelectorsToVarInputs = (valueSelectors: ValueSelector[] | string[]): InputVar[] => {
     return valueSelectors.filter(item => !!item).map((item) => {
-      return getInputVars([`{{#${typeof item === 'string' ? item : item.join('.')}#}}`])[0]
+      return getInputVars([`{{#${typeof item === 'string' ? item : item.join('.')}#}}`])[0]!
     })
   }
 
diff --git a/web/app/components/workflow/nodes/_base/hooks/use-output-var-list.ts b/web/app/components/workflow/nodes/_base/hooks/use-output-var-list.ts
index a77af2daef..188084345e 100644
--- a/web/app/components/workflow/nodes/_base/hooks/use-output-var-list.ts
+++ b/web/app/components/workflow/nodes/_base/hooks/use-output-var-list.ts
@@ -51,7 +51,7 @@ function useOutputVarList<T>({
   } = useDebounceFn(
     (id: string, newName: string) => {
       const oldName = oldNameRecord.current[id]
-      renameInspectVarName(id, oldName, newName)
+      renameInspectVarName(id, oldName!, newName)
       delete oldNameRecord.current[id]
     },
     { wait: 500 },
@@ -73,9 +73,9 @@ function useOutputVarList<T>({
     }
 
     if (newKey) {
-      handleOutVarRenameChange(id, [id, outputKeyOrders[changedIndex!]], [id, newKey])
+      handleOutVarRenameChange(id, [id, outputKeyOrders[changedIndex!]!], [id, newKey])
       if (!(id in oldNameRecord.current))
-        oldNameRecord.current[id] = outputKeyOrders[changedIndex!]
+        oldNameRecord.current[id] = outputKeyOrders[changedIndex!]!
       renameInspectNameWithDebounce(id, newKey)
     }
     else if (changedIndex === undefined) {
@@ -126,7 +126,7 @@ function useOutputVarList<T>({
     hideRemoveVarConfirm()
   }, [deleteInspectVar, hideRemoveVarConfirm, id, nodesWithInspectVars, removeUsedVarInNodes, removedVar])
   const handleRemoveVariable = useCallback((index: number) => {
-    const key = outputKeyOrders[index]
+    const key = outputKeyOrders[index]!
 
     if (isVarUsedInNodes([id, key])) {
       showRemoveVarConfirm()
@@ -137,15 +137,15 @@ function useOutputVarList<T>({
     const newOutputKeyOrders = outputKeyOrders.filter((_, i) => i !== index)
     const newInputs = produce(inputs, (draft: any) => {
       // Only delete from outputs when no remaining entry shares this name
-      if (!newOutputKeyOrders.includes(key))
-        delete draft[varKey][key]
+      if (!newOutputKeyOrders.includes(key!))
+        delete draft[varKey][key!]
 
       if ((inputs as CodeNodeType).type === BlockEnum.Code && (inputs as CodeNodeType).error_strategy === ErrorHandleTypeEnum.defaultValue && varKey === 'outputs')
         draft.default_value = getDefaultValue(draft as any)
     })
     setInputs(newInputs)
     onOutputKeyOrdersChange(newOutputKeyOrders)
-    if (!newOutputKeyOrders.includes(key)) {
+    if (!newOutputKeyOrders.includes(key!)) {
       const varId = nodesWithInspectVars.find(node => node.nodeId === id)?.vars.find((varItem) => {
         return varItem.name === key
       })?.id
diff --git a/web/app/components/workflow/nodes/agent/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/agent/__tests__/use-single-run-form-params.spec.ts
index 33075e685f..75d356ae6c 100644
--- a/web/app/components/workflow/nodes/agent/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/agent/__tests__/use-single-run-form-params.spec.ts
@@ -110,14 +110,14 @@ describe('agent/use-single-run-form-params', () => {
 
     expect(getInputVars).toHaveBeenCalledWith(['#start.topic#', '#node-2.answer#'])
     expect(result.current.forms).toHaveLength(1)
-    expect(result.current.forms[0].inputs).toHaveLength(2)
-    expect(result.current.forms[0].values).toEqual({ topic: 'finance' })
+    expect(result.current.forms[0]!.inputs).toHaveLength(2)
+    expect(result.current.forms[0]!.values).toEqual({ topic: 'finance' })
     expect(result.current.nodeInfo).toEqual({
       id: 'agent-node',
       status: 'succeeded',
     })
 
-    result.current.forms[0].onChange({ topic: 'updated' })
+    result.current.forms[0]!.onChange({ topic: 'updated' })
 
     expect(setRunInputData).toHaveBeenCalledWith({ topic: 'updated' })
     expect(result.current.getDependentVars()).toEqual([
diff --git a/web/app/components/workflow/nodes/agent/use-config.ts b/web/app/components/workflow/nodes/agent/use-config.ts
index 0231f673c9..7fdb249d1a 100644
--- a/web/app/components/workflow/nodes/agent/use-config.ts
+++ b/web/app/components/workflow/nodes/agent/use-config.ts
@@ -137,9 +137,9 @@ const useConfig = (id: string, payload: AgentNodeType) => {
       Object.keys(draft.agent_parameters || {}).forEach((key) => {
         const targetSchema = schemas.find(schema => schema.name === key)
         if (targetSchema?.type === FormTypeEnum.toolSelector)
-          draft.agent_parameters![key].value = formattingToolData(draft.agent_parameters![key].value)
+          draft.agent_parameters![key]!.value = formattingToolData(draft.agent_parameters![key]!.value)
         if (targetSchema?.type === FormTypeEnum.multiToolSelector)
-          draft.agent_parameters![key].value = draft.agent_parameters![key].value.map((tool: any) => formattingToolData(tool))
+          draft.agent_parameters![key]!.value = draft.agent_parameters![key]!.value.map((tool: any) => formattingToolData(tool))
       })
       draft.tool_node_version = '2'
     })
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 0b814b8b25..5cd378ffa2 100644
--- a/web/app/components/workflow/nodes/assigner/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/assigner/__tests__/integration.spec.tsx
@@ -147,9 +147,9 @@ describe('assigner path', () => {
       )
 
       await user.click(screen.getByText('workflow.nodes.assigner.operations.over-write'))
-      expect(screen.getByText('workflow.nodes.assigner.operations.clear')).toBeInTheDocument()
-      expect(screen.getByText('workflow.nodes.assigner.operations.set')).toBeInTheDocument()
-      expect(screen.getByText('workflow.nodes.assigner.operations.+=')).toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.assigner.operations.clear'))!.toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.assigner.operations.set'))!.toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.assigner.operations.+='))!.toBeInTheDocument()
 
       await user.click(screen.getByText('workflow.nodes.assigner.operations.+='))
       expect(onSelect).toHaveBeenCalledWith({ value: WriteMode.increment, name: WriteMode.increment })
@@ -185,7 +185,7 @@ describe('assigner path', () => {
         />,
       )
 
-      expect(screen.getByText('workflow.nodes.assigner.noVarTip')).toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.assigner.noVarTip'))!.toBeInTheDocument()
 
       rerender(
         <VarList
@@ -232,7 +232,7 @@ describe('assigner path', () => {
         />,
       )
 
-      expect(screen.getByText('filter:false:true')).toBeInTheDocument()
+      expect(screen.getByText('filter:false:true'))!.toBeInTheDocument()
       await user.click(screen.getByText('workflow.nodes.assigner.operations.over-write'))
       await user.click(screen.getByText('workflow.nodes.assigner.operations.set'))
       expect(onChange).toHaveBeenLastCalledWith([
@@ -381,7 +381,7 @@ describe('assigner path', () => {
         },
       )
 
-      expect(screen.getByText('workflow.nodes.assigner.varNotSet')).toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.assigner.varNotSet'))!.toBeInTheDocument()
 
       rerender(
         <Node
@@ -392,9 +392,9 @@ describe('assigner path', () => {
         />,
       )
 
-      expect(screen.getByText('Answer')).toBeInTheDocument()
-      expect(screen.getByText('node-1.count')).toBeInTheDocument()
-      expect(screen.getByText('workflow.nodes.assigner.operations.over-write')).toBeInTheDocument()
+      expect(screen.getByText('Answer'))!.toBeInTheDocument()
+      expect(screen.getByText('node-1.count'))!.toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.assigner.operations.over-write'))!.toBeInTheDocument()
 
       rerender(
         <Node
@@ -409,9 +409,9 @@ describe('assigner path', () => {
         />,
       )
 
-      expect(screen.getByText('Start')).toBeInTheDocument()
-      expect(screen.getByText('sys.query')).toBeInTheDocument()
-      expect(screen.getByText('workflow.nodes.assigner.operations.append')).toBeInTheDocument()
+      expect(screen.getByText('Start'))!.toBeInTheDocument()
+      expect(screen.getByText('sys.query'))!.toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.assigner.operations.append'))!.toBeInTheDocument()
     })
 
     it('should skip empty version 2 items and resolve system variables without an operation badge', () => {
@@ -437,8 +437,8 @@ describe('assigner path', () => {
         },
       )
 
-      expect(screen.getByText('Start')).toBeInTheDocument()
-      expect(screen.getByText('sys.query')).toBeInTheDocument()
+      expect(screen.getByText('Start'))!.toBeInTheDocument()
+      expect(screen.getByText('sys.query'))!.toBeInTheDocument()
       expect(screen.queryByText('workflow.nodes.assigner.operations.over-write')).not.toBeInTheDocument()
     })
 
@@ -479,9 +479,9 @@ describe('assigner path', () => {
         />,
       )
 
-      expect(screen.getByText('Answer')).toBeInTheDocument()
-      expect(screen.getByText('node-1.count')).toBeInTheDocument()
-      expect(screen.getByText('workflow.nodes.assigner.operations.append')).toBeInTheDocument()
+      expect(screen.getByText('Answer'))!.toBeInTheDocument()
+      expect(screen.getByText('node-1.count'))!.toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.assigner.operations.append'))!.toBeInTheDocument()
     })
 
     it('should add panel operations with the real variable list inside the panel', async () => {
@@ -499,7 +499,7 @@ describe('assigner path', () => {
         />,
       )
 
-      await user.click(screen.getAllByRole('button')[0])
+      await user.click(screen.getAllByRole('button')[0]!)
 
       expect(mockHandleAddOperationItem).toHaveBeenCalledWith(createData().items)
       expect(config.handleOperationListChanges).toHaveBeenCalledWith([
@@ -507,8 +507,8 @@ describe('assigner path', () => {
         createOperation({ variable_selector: [] }),
       ])
 
-      expect(screen.getByText('workflow.nodes.assigner.variables')).toBeInTheDocument()
-      expect(screen.getByText('node-1.count')).toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.assigner.variables'))!.toBeInTheDocument()
+      expect(screen.getByText('node-1.count'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/workflow/nodes/assigner/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/assigner/__tests__/use-single-run-form-params.spec.ts
index 0551d1fd30..e386d7718f 100644
--- a/web/app/components/workflow/nodes/assigner/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/assigner/__tests__/use-single-run-form-params.spec.ts
@@ -71,10 +71,10 @@ describe('assigner/use-single-run-form-params', () => {
       ['node-3', 'items'],
     ])
     expect(result.current.forms).toHaveLength(1)
-    expect(result.current.forms[0].inputs).toEqual(varInputs)
-    expect(result.current.forms[0].values).toEqual({ result: 'hello' })
+    expect(result.current.forms[0]!.inputs).toEqual(varInputs)
+    expect(result.current.forms[0]!.values).toEqual({ result: 'hello' })
 
-    result.current.forms[0].onChange({ result: 'updated' })
+    result.current.forms[0]!.onChange({ result: 'updated' })
 
     expect(setRunInputData).toHaveBeenCalledWith({ result: 'updated' })
     expect(result.current.getDependentVars()).toEqual([
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 9c48a08091..24fa999b49 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
@@ -53,10 +53,10 @@ const VarList: FC<Props> = ({
   const handleAssignedVarChange = useCallback((index: number) => {
     return (value: ValueSelector | string) => {
       const newList = produce(list, (draft) => {
-        draft[index].variable_selector = value as ValueSelector
-        draft[index].operation = WriteMode.overwrite
-        draft[index].input_type = AssignerNodeInputType.variable
-        draft[index].value = undefined
+        draft[index]!.variable_selector = value as ValueSelector
+        draft[index]!.operation = WriteMode.overwrite
+        draft[index]!.input_type = AssignerNodeInputType.variable
+        draft[index]!.value = undefined
       })
       onChange(newList, value as ValueSelector)
     }
@@ -65,16 +65,16 @@ const VarList: FC<Props> = ({
   const handleOperationChange = useCallback((index: number, varType: VarType) => {
     return (item: { value: string | number }) => {
       const newList = produce(list, (draft) => {
-        draft[index].operation = item.value as WriteMode
-        draft[index].value = '' // Clear value when operation changes
+        draft[index]!.operation = item.value as WriteMode
+        draft[index]!.value = '' // Clear value when operation changes
         if (item.value === WriteMode.set || item.value === WriteMode.increment || item.value === WriteMode.decrement
           || item.value === WriteMode.multiply || item.value === WriteMode.divide) {
           if (varType === VarType.boolean)
-            draft[index].value = false
-          draft[index].input_type = AssignerNodeInputType.constant
+            draft[index]!.value = false
+          draft[index]!.input_type = AssignerNodeInputType.constant
         }
         else {
-          draft[index].input_type = AssignerNodeInputType.variable
+          draft[index]!.input_type = AssignerNodeInputType.variable
         }
       })
       onChange(newList)
@@ -84,7 +84,7 @@ const VarList: FC<Props> = ({
   const handleToAssignedVarChange = useCallback((index: number) => {
     return (value: ValueSelector | string | number | boolean) => {
       const newList = produce(list, (draft) => {
-        draft[index].value = value as ValueSelector
+        draft[index]!.value = value as ValueSelector
       })
       onChange(newList, value as ValueSelector)
     }
@@ -105,7 +105,7 @@ const VarList: FC<Props> = ({
 
   const handleFilterToAssignedVar = useCallback((index: number) => {
     return (payload: Var) => {
-      const { variable_selector, operation } = list[index]
+      const { variable_selector, operation } = list[index]!
       if (!variable_selector || !operation || !filterToAssignedVar)
         return true
 
diff --git a/web/app/components/workflow/nodes/code/code-parser.ts b/web/app/components/workflow/nodes/code/code-parser.ts
index cdd8a69a26..6e3fa876b7 100644
--- a/web/app/components/workflow/nodes/code/code-parser.ts
+++ b/web/app/components/workflow/nodes/code/code-parser.ts
@@ -17,7 +17,7 @@ export const extractFunctionParams = (code: string, language: CodeLanguage) => {
     params.push(...match[1].split(',')
       .map(p => p.trim())
       .filter(Boolean)
-      .map(p => p.split(':')[0].trim()),
+      .map(p => p.split(':')[0]!.trim()),
     )
   }
 
@@ -74,7 +74,7 @@ export const extractReturnType = (code: string, language: CodeLanguage): OutputV
   for (const match of matches) {
     // console.log(`Found key: "${match[1]}" from match: "${match[0]}"`)
     const key = match[1]
-    result[key] = {
+    result[key!] = {
       type: VarType.string,
       children: null,
     }
diff --git a/web/app/components/workflow/nodes/data-source-empty/hooks.ts b/web/app/components/workflow/nodes/data-source-empty/hooks.ts
index b3c33d699e..9dd66b6b66 100644
--- a/web/app/components/workflow/nodes/data-source-empty/hooks.ts
+++ b/web/app/components/workflow/nodes/data-source-empty/hooks.ts
@@ -32,8 +32,8 @@ export const useReplaceDataSourceNode = (id: string) => {
         ...pluginDefaultValue,
       },
       position: {
-        x: emptyNode.position.x,
-        y: emptyNode.position.y,
+        x: emptyNode!.position.x,
+        y: emptyNode!.position.y,
       },
     })
     const newNodes = produce(nodes, (draft) => {
diff --git a/web/app/components/workflow/nodes/data-source/hooks/use-before-run-form.ts b/web/app/components/workflow/nodes/data-source/hooks/use-before-run-form.ts
index 004da29bf5..13eb0b5194 100644
--- a/web/app/components/workflow/nodes/data-source/hooks/use-before-run-form.ts
+++ b/web/app/components/workflow/nodes/data-source/hooks/use-before-run-form.ts
@@ -106,7 +106,7 @@ const useBeforeRunForm = ({
     const { currentCredentialId: credentialId } = dataSourceStore.getState()
     if (datasourceType === DatasourceType.localFile) {
       const { localFileList } = dataSourceStore.getState()
-      const { id, name, type, size, extension, mime_type } = localFileList[0].file
+      const { id, name, type, size, extension, mime_type } = localFileList[0]!.file
       const documentInfo = {
         related_id: id,
         name,
@@ -121,7 +121,7 @@ const useBeforeRunForm = ({
     }
     if (datasourceType === DatasourceType.onlineDocument) {
       const { onlineDocuments } = dataSourceStore.getState()
-      const { workspace_id, ...rest } = onlineDocuments[0]
+      const { workspace_id, ...rest } = onlineDocuments[0]!
       const documentInfo = {
         workspace_id,
         page: rest,
diff --git a/web/app/components/workflow/nodes/document-extractor/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/document-extractor/__tests__/integration.spec.tsx
index 3bcc58ecf5..593bdd0664 100644
--- a/web/app/components/workflow/nodes/document-extractor/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/document-extractor/__tests__/integration.spec.tsx
@@ -135,7 +135,7 @@ describe('document-extractor path', () => {
       />,
     )
 
-    expect(container).toBeEmptyDOMElement()
+    expect(container)!.toBeEmptyDOMElement()
   })
 
   it('should render the selected input variable on the node', () => {
@@ -146,8 +146,8 @@ describe('document-extractor path', () => {
       />,
     )
 
-    expect(screen.getByText('workflow.nodes.docExtractor.inputVar')).toBeInTheDocument()
-    expect(screen.getByText('Input Files:start:node-1.files')).toBeInTheDocument()
+    expect(screen.getByText('workflow.nodes.docExtractor.inputVar'))!.toBeInTheDocument()
+    expect(screen.getByText('Input Files:start:node-1.files'))!.toBeInTheDocument()
   })
 
   it('should wire panel input changes and format supported file types for english locales', async () => {
@@ -172,16 +172,16 @@ describe('document-extractor path', () => {
     await user.click(screen.getByRole('button', { name: 'pick-file-var' }))
 
     expect(handleVarChanges).toHaveBeenCalledWith(['node-1', 'files'])
-    expect(screen.getByText('workflow.nodes.docExtractor.supportFileTypes:{"types":"pdf, markdown, docx"}')).toBeInTheDocument()
-    expect(screen.getByRole('link', { name: 'workflow.nodes.docExtractor.learnMore' })).toHaveAttribute(
+    expect(screen.getByText('workflow.nodes.docExtractor.supportFileTypes:{"types":"pdf, markdown, docx"}'))!.toBeInTheDocument()
+    expect(screen.getByRole('link', { name: 'workflow.nodes.docExtractor.learnMore' }))!.toHaveAttribute(
       'href',
       'https://docs.example.com/document-extractor',
     )
-    expect(screen.getByText('text:string')).toBeInTheDocument()
+    expect(screen.getByText('text:string'))!.toBeInTheDocument()
   })
 
   it('should use chinese separators and array output types when the input is an array of files', () => {
-    mockLocale = LanguagesSupported[1]
+    mockLocale = LanguagesSupported[1]!
     mockUseConfig.mockReturnValueOnce(createConfigResult({
       inputs: createData({
         is_array_file: true,
@@ -198,7 +198,7 @@ describe('document-extractor path', () => {
       />,
     )
 
-    expect(screen.getByText('workflow.nodes.docExtractor.supportFileTypes:{"types":"pdf、 markdown、 docx"}')).toBeInTheDocument()
-    expect(screen.getByText('text:array[string]')).toBeInTheDocument()
+    expect(screen.getByText('workflow.nodes.docExtractor.supportFileTypes:{"types":"pdf、 markdown、 docx"}'))!.toBeInTheDocument()
+    expect(screen.getByText('text:array[string]'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/nodes/document-extractor/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/document-extractor/__tests__/panel.spec.tsx
index 06512f94c6..7e27c2379f 100644
--- a/web/app/components/workflow/nodes/document-extractor/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/document-extractor/__tests__/panel.spec.tsx
@@ -116,16 +116,16 @@ describe('document-extractor/panel', () => {
     await user.click(screen.getByRole('button', { name: 'pick-file-var' }))
 
     expect(handleVarChanges).toHaveBeenCalledWith(['node-1', 'files'])
-    expect(screen.getByText('workflow.nodes.docExtractor.supportFileTypes:{"types":"pdf, markdown, docx"}')).toBeInTheDocument()
-    expect(screen.getByRole('link', { name: 'workflow.nodes.docExtractor.learnMore' })).toHaveAttribute(
+    expect(screen.getByText('workflow.nodes.docExtractor.supportFileTypes:{"types":"pdf, markdown, docx"}'))!.toBeInTheDocument()
+    expect(screen.getByRole('link', { name: 'workflow.nodes.docExtractor.learnMore' }))!.toHaveAttribute(
       'href',
       'https://docs.example.com/document-extractor',
     )
-    expect(screen.getByText('text:string')).toBeInTheDocument()
+    expect(screen.getByText('text:string'))!.toBeInTheDocument()
   })
 
   it('uses chinese separators and array output types when the input is an array of files', () => {
-    mockLocale = LanguagesSupported[1]
+    mockLocale = LanguagesSupported[1]!
     mockUseConfig.mockReturnValueOnce(createConfigResult({
       inputs: createData({ is_array_file: true }),
     }))
@@ -138,7 +138,7 @@ describe('document-extractor/panel', () => {
       />,
     )
 
-    expect(screen.getByText('workflow.nodes.docExtractor.supportFileTypes:{"types":"pdf、 markdown、 docx"}')).toBeInTheDocument()
-    expect(screen.getByText('text:array[string]')).toBeInTheDocument()
+    expect(screen.getByText('workflow.nodes.docExtractor.supportFileTypes:{"types":"pdf、 markdown、 docx"}'))!.toBeInTheDocument()
+    expect(screen.getByText('text:array[string]'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/nodes/document-extractor/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/document-extractor/__tests__/use-single-run-form-params.spec.ts
index 935118f26e..8c44884e98 100644
--- a/web/app/components/workflow/nodes/document-extractor/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/document-extractor/__tests__/use-single-run-form-params.spec.ts
@@ -27,14 +27,14 @@ describe('document-extractor/use-single-run-form-params', () => {
     }))
 
     expect(result.current.forms).toHaveLength(1)
-    expect(result.current.forms[0].inputs).toEqual([
+    expect(result.current.forms[0]!.inputs).toEqual([
       expect.objectContaining({
         variable: 'files',
         required: true,
       }),
     ])
 
-    result.current.forms[0].onChange({ files: ['new-file'] })
+    result.current.forms[0]!.onChange({ files: ['new-file'] })
 
     expect(setRunInputData).toHaveBeenCalledWith({ files: ['new-file'] })
     expect(result.current.getDependentVars()).toEqual([['start', 'files']])
diff --git a/web/app/components/workflow/nodes/end/__tests__/use-config.spec.ts b/web/app/components/workflow/nodes/end/__tests__/use-config.spec.ts
index 8d0cbff547..a9d7def144 100644
--- a/web/app/components/workflow/nodes/end/__tests__/use-config.spec.ts
+++ b/web/app/components/workflow/nodes/end/__tests__/use-config.spec.ts
@@ -52,7 +52,7 @@ describe('end/use-config', () => {
 
   it('should build var-list handlers against outputs and surface the readonly state', () => {
     const { result } = renderHook(() => useConfig('end-node', currentInputs))
-    const config = mockUseVarList.mock.calls[0][0] as { setInputs: (inputs: EndNodeType) => void }
+    const config = mockUseVarList.mock.calls[0]![0] as { setInputs: (inputs: EndNodeType) => void }
 
     expect(mockUseVarList).toHaveBeenCalledWith(expect.objectContaining({
       inputs: currentInputs,
diff --git a/web/app/components/workflow/nodes/end/node.tsx b/web/app/components/workflow/nodes/end/node.tsx
index f6bace7058..dbcb258a80 100644
--- a/web/app/components/workflow/nodes/end/node.tsx
+++ b/web/app/components/workflow/nodes/end/node.tsx
@@ -38,7 +38,7 @@ const Node: FC<NodeProps<EndNodeType>> = ({
   return (
     <div className="mb-1 space-y-0.5 px-3 py-1">
       {filteredOutputs.map(({ value_selector }, index) => {
-        const node = getNode(value_selector[0])
+        const node = getNode(value_selector[0]!)
         const varType = getCurrentVariableType({
           valueSelector: value_selector,
           availableNodes,
diff --git a/web/app/components/workflow/nodes/http/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/http/__tests__/integration.spec.tsx
index 93a4d08c3d..4389ad1f7b 100644
--- a/web/app/components/workflow/nodes/http/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/http/__tests__/integration.spec.tsx
@@ -289,7 +289,7 @@ describe('http path', () => {
       const inputs = screen.getAllByRole('textbox')
       fireEvent.change(inputs[0] as HTMLInputElement, { target: { value: 'X-Token' } })
       fireEvent.focus(inputs[1] as HTMLInputElement)
-      expect(inputs[1]).toHaveClass('border-components-input-border-active')
+      expect(inputs[1])!.toHaveClass('border-components-input-border-active')
       fireEvent.change(inputs[1] as HTMLInputElement, { target: { value: 'secret-token' } })
       fireEvent.blur(inputs[1] as HTMLInputElement)
       await user.click(screen.getByText('common.operation.save'))
@@ -339,7 +339,7 @@ describe('http path', () => {
       )
 
       expect(container.querySelector('svg')).toBeNull()
-      expect(screen.getByDisplayValue('https://api.example.com')).toHaveAttribute('placeholder', '')
+      expect(screen.getByDisplayValue('https://api.example.com'))!.toHaveAttribute('placeholder', '')
     })
 
     it('should update focus styling for editable inputs and show the remove action again on blur-sm', () => {
@@ -357,7 +357,7 @@ describe('http path', () => {
 
       const input = screen.getByDisplayValue('alice')
       fireEvent.focus(input)
-      expect(input).toHaveClass('bg-components-input-bg-active')
+      expect(input)!.toHaveClass('bg-components-input-bg-active')
       expect(container.querySelector('button')).toBeNull()
       fireEvent.blur(input)
       expect(container.querySelector('button')).not.toBeNull()
@@ -373,7 +373,7 @@ describe('http path', () => {
         />,
       )
 
-      expect(screen.getByText('missing-value')).toBeInTheDocument()
+      expect(screen.getByText('missing-value'))!.toBeInTheDocument()
     })
 
     it('should clamp timeout values and propagate changes', async () => {
@@ -436,8 +436,8 @@ describe('http path', () => {
         </div>,
       )
 
-      fireEvent.change(screen.getAllByDisplayValue('name:alice')[0], { target: { value: 'name:bob' } })
-      fireEvent.blur(screen.getAllByDisplayValue('name:bob')[0])
+      fireEvent.change(screen.getAllByDisplayValue('name:alice')[0]!, { target: { value: 'name:bob' } })
+      fireEvent.blur(screen.getAllByDisplayValue('name:bob')[0]!)
       await user.click(screen.getByText('workflow.nodes.http.keyValueEdit'))
 
       expect(onChange).toHaveBeenCalled()
@@ -455,7 +455,7 @@ describe('http path', () => {
         />,
       )
 
-      expect(container).toBeEmptyDOMElement()
+      expect(container)!.toBeEmptyDOMElement()
     })
 
     it('should edit standalone input items and key-value rows', async () => {
@@ -494,7 +494,7 @@ describe('http path', () => {
         </div>,
       )
 
-      fireEvent.change(screen.getAllByDisplayValue('alice')[0], { target: { value: 'bob' } })
+      fireEvent.change(screen.getAllByDisplayValue('alice')[0]!, { target: { value: 'bob' } })
       await user.click(screen.getAllByRole('combobox', { name: 'workflow.nodes.http.type' })[0]!)
       await user.click(screen.getByRole('option', { name: /file/i }))
 
@@ -550,7 +550,7 @@ describe('http path', () => {
       )
 
       fireEvent.change(screen.getByDisplayValue('attachment'), { target: { value: 'upload' } })
-      expect(screen.getByText('file-filter:true:false')).toBeInTheDocument()
+      expect(screen.getByText('file-filter:true:false'))!.toBeInTheDocument()
       await user.click(screen.getByText('pick-file'))
       await user.click(screen.getByText('remove-file'))
 
@@ -579,7 +579,7 @@ describe('http path', () => {
       await user.click(screen.getByRole('combobox', { name: 'workflow.nodes.http.type' }))
 
       const fileOption = screen.getByRole('option', { name: /file/i })
-      expect(screen.getByRole('option', { name: /text/i })).toBeInTheDocument()
+      expect(screen.getByRole('option', { name: /text/i }))!.toBeInTheDocument()
       expect(fileOption.closest('.h-7')).toBeNull()
 
       await user.click(fileOption)
@@ -630,7 +630,7 @@ describe('http path', () => {
         />,
       )
 
-      expect(screen.getByRole('textbox')).toHaveValue('')
+      expect(screen.getByRole('textbox'))!.toHaveValue('')
     })
 
     it('should switch to key-value body types and propagate key-value edits', () => {
@@ -698,7 +698,7 @@ describe('http path', () => {
         />,
       )
 
-      expect(screen.getByText('file-filter:true:false')).toBeInTheDocument()
+      expect(screen.getByText('file-filter:true:false'))!.toBeInTheDocument()
       await user.click(screen.getByText('pick-file'))
 
       expect(onChange).toHaveBeenCalledWith(expect.objectContaining({
@@ -719,8 +719,8 @@ describe('http path', () => {
         { nodes: [], edges: [] },
       )
 
-      expect(screen.getByText(Method.get)).toBeInTheDocument()
-      expect(screen.getByText('https://api.example.com')).toBeInTheDocument()
+      expect(screen.getByText(Method.get))!.toBeInTheDocument()
+      expect(screen.getByText('https://api.example.com'))!.toBeInTheDocument()
     })
 
     it('should render nothing when the request url is empty', () => {
@@ -739,13 +739,13 @@ describe('http path', () => {
     it('should render the panel sections and output vars', async () => {
       renderPanel()
 
-      expect(screen.getByText('body:string')).toBeInTheDocument()
-      expect(screen.getByText('status_code:number')).toBeInTheDocument()
-      expect(screen.getByText('headers:object')).toBeInTheDocument()
-      expect(screen.getByText('files:Array[File]')).toBeInTheDocument()
+      expect(screen.getByText('body:string'))!.toBeInTheDocument()
+      expect(screen.getByText('status_code:number'))!.toBeInTheDocument()
+      expect(screen.getByText('headers:object'))!.toBeInTheDocument()
+      expect(screen.getByText('files:Array[File]'))!.toBeInTheDocument()
       expect(screen.getAllByText('workflow.nodes.http.authorization.authorization').length).toBeGreaterThan(0)
-      expect(screen.getByText('workflow.nodes.http.curl.title')).toBeInTheDocument()
-      expect(screen.getByText('curl-panel')).toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.http.curl.title'))!.toBeInTheDocument()
+      expect(screen.getByText('curl-panel'))!.toBeInTheDocument()
     })
 
     it('should hide modal overlays when the panel is readonly', () => {
diff --git a/web/app/components/workflow/nodes/http/components/curl-parser.ts b/web/app/components/workflow/nodes/http/components/curl-parser.ts
index ba9319cbf0..0e2aa1f6f0 100644
--- a/web/app/components/workflow/nodes/http/components/curl-parser.ts
+++ b/web/app/components/workflow/nodes/http/components/curl-parser.ts
@@ -37,7 +37,7 @@ const extractUrlParams = (url: string) => {
 
   return {
     url: urlParts[0],
-    params: urlParts[1].replace(/&/g, '\n').replace(/=/g, ': '),
+    params: urlParts[1]!.replace(/&/g, '\n').replace(/=/g, ': '),
   }
 }
 
@@ -46,7 +46,7 @@ const getNextArg = (args: string[], index: number, error: string): { value: stri
     return { value: null, error }
 
   return {
-    value: stripWrappedQuotes(args[index + 1]),
+    value: stripWrappedQuotes(args[index + 1]!),
     error: null,
   }
 }
@@ -97,7 +97,7 @@ const applyFormArg = (node: Partial<HttpNodeType>, args: string[], index: number
   const typeMatch = /^(.+?);type=(.+)$/.exec(value)
   if (typeMatch) {
     const [, actualValue, mimeType] = typeMatch
-    value = actualValue
+    value = actualValue!
     node.headers += `${node.headers ? '\n' : ''}Content-Type: ${mimeType}`
   }
 
@@ -150,7 +150,7 @@ export const parseCurl = (curlCommand: string): { node: HttpNodeType | null, err
   let hasData = false
 
   for (let i = 1; i < args.length; i++) {
-    const result = handleCurlArg(stripWrappedQuotes(args[i]), node, args, i)
+    const result = handleCurlArg(stripWrappedQuotes(args[i]!), node, args, i)
     if (result.error)
       return { node: null, error: result.error }
 
diff --git a/web/app/components/workflow/nodes/http/components/edit-body/index.tsx b/web/app/components/workflow/nodes/http/components/edit-body/index.tsx
index 5f3294903b..76be3ba08a 100644
--- a/web/app/components/workflow/nodes/http/components/edit-body/index.tsx
+++ b/web/app/components/workflow/nodes/http/components/edit-body/index.tsx
@@ -114,7 +114,7 @@ const EditBody: FC<Props> = ({
           value: '',
         })
       }
-      (draft.data as BodyPayload)[0].value = value
+      (draft.data as BodyPayload)[0]!.value = value
     })
     onChange(newBody)
   }, [onChange, payload])
@@ -127,7 +127,7 @@ const EditBody: FC<Props> = ({
           type: BodyPayloadValueType.file,
         })
       }
-      (draft.data as BodyPayload)[0].file = value as ValueSelector
+      (draft.data as BodyPayload)[0]!.file = value as ValueSelector
     })
     onChange(newBody)
   }, [onChange, payload])
diff --git a/web/app/components/workflow/nodes/http/hooks/use-key-value-list.ts b/web/app/components/workflow/nodes/http/hooks/use-key-value-list.ts
index f48738b059..cf749260bd 100644
--- a/web/app/components/workflow/nodes/http/hooks/use-key-value-list.ts
+++ b/web/app/components/workflow/nodes/http/hooks/use-key-value-list.ts
@@ -9,7 +9,7 @@ const strToKeyValueList = (value: string) => {
     const [key, ...others] = item.split(':')
     return {
       id: uniqueId(UNIQUE_ID_PREFIX),
-      key: key.trim(),
+      key: key!.trim(),
       value: others.join(':').trim(),
     }
   })
diff --git a/web/app/components/workflow/nodes/human-input/__tests__/human-input.spec.tsx b/web/app/components/workflow/nodes/human-input/__tests__/human-input.spec.tsx
index 661b856f3f..cbc9cddd4a 100644
--- a/web/app/components/workflow/nodes/human-input/__tests__/human-input.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/__tests__/human-input.spec.tsx
@@ -161,7 +161,7 @@ describe('DSL Import with Human Input Node', () => {
 
       // No extra iteration/loop start nodes should be injected
       expect(result.nodes).toHaveLength(1)
-      expect(result.nodes[0].data.type).toBe(BlockEnum.HumanInput)
+      expect(result.nodes[0]!.data.type).toBe(BlockEnum.HumanInput)
     })
   })
 
@@ -190,7 +190,7 @@ describe('DSL Import with Human Input Node', () => {
       const result = initialNodes(nodes as Node[], [])
 
       const processed = result[0]
-      const nodeData = processed.data as HumanInputNodeType
+      const nodeData = processed!.data as HumanInputNodeType
       expect(nodeData.delivery_methods).toHaveLength(2)
       expect(nodeData.user_actions).toHaveLength(2)
       expect(nodeData.form_content).toBe('# Review Form\nPlease fill in the details below.')
@@ -204,7 +204,7 @@ describe('DSL Import with Human Input Node', () => {
 
       const result = initialNodes([humanInputNode] as Node[], [])
 
-      expect(result[0].type).toBe('custom')
+      expect(result[0]!.type).toBe('custom')
     })
   })
 
@@ -234,8 +234,9 @@ describe('DSL Import with Human Input Node', () => {
       )
 
       // Delivery method type labels are rendered in lowercase
-      expect(screen.getByText('webapp')).toBeInTheDocument()
-      expect(screen.getByText('email')).toBeInTheDocument()
+      // Delivery method type labels are rendered in lowercase
+      expect(screen.getByText('webapp'))!.toBeInTheDocument()
+      expect(screen.getByText('email'))!.toBeInTheDocument()
     })
 
     it('should display user action IDs', () => {
@@ -248,8 +249,8 @@ describe('DSL Import with Human Input Node', () => {
         />,
       )
 
-      expect(screen.getByText('approve')).toBeInTheDocument()
-      expect(screen.getByText('reject')).toBeInTheDocument()
+      expect(screen.getByText('approve'))!.toBeInTheDocument()
+      expect(screen.getByText('reject'))!.toBeInTheDocument()
     })
 
     it('should always display Timeout handle', () => {
@@ -262,7 +263,7 @@ describe('DSL Import with Human Input Node', () => {
         />,
       )
 
-      expect(screen.getByText('Timeout')).toBeInTheDocument()
+      expect(screen.getByText('Timeout'))!.toBeInTheDocument()
     })
 
     it('should render without crashing when delivery_methods is empty', () => {
@@ -277,6 +278,37 @@ describe('DSL Import with Human Input Node', () => {
         )
       }).not.toThrow()
 
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
+      // Delivery method section should not be rendered
       // Delivery method section should not be rendered
       expect(screen.queryByText('webapp')).not.toBeInTheDocument()
       expect(screen.queryByText('email')).not.toBeInTheDocument()
@@ -295,7 +327,8 @@ describe('DSL Import with Human Input Node', () => {
       }).not.toThrow()
 
       // Timeout handle should still exist
-      expect(screen.getByText('Timeout')).toBeInTheDocument()
+      // Timeout handle should still exist
+      expect(screen.getByText('Timeout'))!.toBeInTheDocument()
     })
 
     it('should render without crashing when both delivery_methods and user_actions are empty', () => {
@@ -330,7 +363,7 @@ describe('DSL Import with Human Input Node', () => {
         />,
       )
 
-      expect(screen.getByText('webapp')).toBeInTheDocument()
+      expect(screen.getByText('webapp'))!.toBeInTheDocument()
       expect(screen.queryByText('email')).not.toBeInTheDocument()
     })
 
@@ -350,9 +383,9 @@ describe('DSL Import with Human Input Node', () => {
         />,
       )
 
-      expect(screen.getByText('action_1')).toBeInTheDocument()
-      expect(screen.getByText('action_2')).toBeInTheDocument()
-      expect(screen.getByText('action_3')).toBeInTheDocument()
+      expect(screen.getByText('action_1'))!.toBeInTheDocument()
+      expect(screen.getByText('action_2'))!.toBeInTheDocument()
+      expect(screen.getByText('action_3'))!.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/workflow/nodes/human-input/components/__tests__/button-style-dropdown.spec.tsx b/web/app/components/workflow/nodes/human-input/components/__tests__/button-style-dropdown.spec.tsx
index 1662e88b79..544524110a 100644
--- a/web/app/components/workflow/nodes/human-input/components/__tests__/button-style-dropdown.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/__tests__/button-style-dropdown.spec.tsx
@@ -80,16 +80,16 @@ describe('ButtonStyleDropdown', () => {
     expect(mockButton).toHaveBeenCalledWith(expect.objectContaining({
       variant: 'ghost',
     }))
-    expect(screen.getByTestId('portal')).toHaveAttribute('data-open', 'false')
+    expect(screen.getByTestId('portal'))!.toHaveAttribute('data-open', 'false')
 
     fireEvent.click(screen.getByTestId('portal-trigger'))
-    expect(screen.getByTestId('portal')).toHaveAttribute('data-open', 'true')
-    expect(screen.getByText('nodes.humanInput.userActions.chooseStyle')).toBeInTheDocument()
+    expect(screen.getByTestId('portal'))!.toHaveAttribute('data-open', 'true')
+    expect(screen.getByText('nodes.humanInput.userActions.chooseStyle'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByTestId('button-primary').parentElement as HTMLElement)
     fireEvent.click(screen.getByTestId('button-secondary').parentElement as HTMLElement)
     fireEvent.click(screen.getByTestId('button-secondary-accent').parentElement as HTMLElement)
-    fireEvent.click(screen.getAllByTestId('button-ghost')[1].parentElement as HTMLElement)
+    fireEvent.click(screen.getAllByTestId('button-ghost')[1]!.parentElement as HTMLElement)
 
     expect(onChange).toHaveBeenNthCalledWith(1, UserActionButtonType.Primary)
     expect(onChange).toHaveBeenNthCalledWith(2, UserActionButtonType.Default)
@@ -113,7 +113,7 @@ describe('ButtonStyleDropdown', () => {
 
     fireEvent.click(screen.getByTestId('portal-trigger'))
 
-    expect(screen.getByTestId('portal')).toHaveAttribute('data-open', 'false')
+    expect(screen.getByTestId('portal'))!.toHaveAttribute('data-open', 'false')
     expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
     expect(onChange).not.toHaveBeenCalled()
   })
diff --git a/web/app/components/workflow/nodes/human-input/components/__tests__/form-content-preview.spec.tsx b/web/app/components/workflow/nodes/human-input/components/__tests__/form-content-preview.spec.tsx
index 7dab3e75e9..4e637724fd 100644
--- a/web/app/components/workflow/nodes/human-input/components/__tests__/form-content-preview.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/__tests__/form-content-preview.spec.tsx
@@ -67,7 +67,7 @@ vi.mock('../variable-in-markdown', () => ({
   Note: ({ defaultInput, nodeName }: {
     defaultInput: { selector: string[] }
     nodeName: (nodeId: string) => string
-  }) => <div data-testid="note">{nodeName(defaultInput.selector[0])}</div>,
+  }) => <div data-testid="note">{nodeName(defaultInput.selector[0]!)}</div>,
 }))
 
 describe('FormContentPreview', () => {
@@ -108,13 +108,13 @@ describe('FormContentPreview', () => {
       />,
     )
 
-    expect(container.firstChild).toHaveStyle({ right: '328px' })
-    expect(screen.getByTestId('badge')).toHaveTextContent('nodes.humanInput.formContent.preview')
-    expect(screen.getByTestId('variable-path')).toHaveTextContent('#Classifier.answer#')
-    expect(screen.getByTestId('note')).toHaveTextContent('Classifier')
-    expect(screen.getByText(/Can't find note:/)).toHaveTextContent('missing_field')
-    expect(screen.getByTestId('action-primary')).toHaveTextContent('Approve')
-    expect(screen.getByText('nodes.humanInput.editor.previewTip')).toBeInTheDocument()
+    expect(container.firstChild)!.toHaveStyle({ right: '328px' })
+    expect(screen.getByTestId('badge'))!.toHaveTextContent('nodes.humanInput.formContent.preview')
+    expect(screen.getByTestId('variable-path'))!.toHaveTextContent('#Classifier.answer#')
+    expect(screen.getByTestId('note'))!.toHaveTextContent('Classifier')
+    expect(screen.getByText(/Can't find note:/))!.toHaveTextContent('missing_field')
+    expect(screen.getByTestId('action-primary'))!.toHaveTextContent('Approve')
+    expect(screen.getByText('nodes.humanInput.editor.previewTip'))!.toBeInTheDocument()
   })
 
   it('should close the preview when the close action is clicked', () => {
diff --git a/web/app/components/workflow/nodes/human-input/components/__tests__/user-action.spec.tsx b/web/app/components/workflow/nodes/human-input/components/__tests__/user-action.spec.tsx
index 08b3a30a1f..13f8463676 100644
--- a/web/app/components/workflow/nodes/human-input/components/__tests__/user-action.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/__tests__/user-action.spec.tsx
@@ -123,7 +123,7 @@ describe('UserActionItem', () => {
 
     fireEvent.change(screen.getByTestId('nodes.humanInput.userActions.actionNamePlaceholder'), { target: { value: '   ' } })
     fireEvent.click(screen.getByText('change-style'))
-    fireEvent.click(screen.getAllByRole('button')[1])
+    fireEvent.click(screen.getAllByRole('button')[1]!)
 
     expect(onChange).toHaveBeenNthCalledWith(1, expect.objectContaining({ id: '' }))
     expect(onChange).toHaveBeenNthCalledWith(2, expect.objectContaining({ button_style: UserActionButtonType.Ghost }))
@@ -138,8 +138,8 @@ describe('UserActionItem', () => {
       />,
     )
 
-    expect(screen.getByTestId('nodes.humanInput.userActions.actionNamePlaceholder')).toBeDisabled()
-    expect(screen.getByTestId('nodes.humanInput.userActions.buttonTextPlaceholder')).toBeDisabled()
+    expect(screen.getByTestId('nodes.humanInput.userActions.actionNamePlaceholder'))!.toBeDisabled()
+    expect(screen.getByTestId('nodes.humanInput.userActions.buttonTextPlaceholder'))!.toBeDisabled()
     expect(screen.getAllByRole('button')).toHaveLength(1)
   })
 })
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/method-item.spec.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/method-item.spec.tsx
index 0c2ecac7ed..5f11552c70 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/method-item.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/method-item.spec.tsx
@@ -140,14 +140,14 @@ describe('human-input/delivery-method/method-item', () => {
 
     const row = getMethodRow('webapp')
     const actionButtons = within(row).getAllByRole('button')
-    const deleteButtonWrapper = actionButtons[0].parentElement as HTMLDivElement
+    const deleteButtonWrapper = actionButtons[0]!.parentElement as HTMLDivElement
 
     fireEvent.mouseEnter(deleteButtonWrapper)
-    expect(row).toHaveClass('border-state-destructive-border')
+    expect(row)!.toHaveClass('border-state-destructive-border')
     fireEvent.mouseLeave(deleteButtonWrapper)
     expect(row).not.toHaveClass('border-state-destructive-border')
 
-    fireEvent.click(actionButtons[0])
+    fireEvent.click(actionButtons[0]!)
     expect(handleDelete).toHaveBeenCalledWith(DeliveryMethodType.WebApp)
   })
 
@@ -173,26 +173,26 @@ describe('human-input/delivery-method/method-item', () => {
       />,
     )
 
-    expect(screen.getByText('DEBUG')).toBeInTheDocument()
+    expect(screen.getByText('DEBUG'))!.toBeInTheDocument()
 
     const actionButtons = within(getMethodRow('email')).getAllByRole('button')
 
-    fireEvent.click(actionButtons[0])
-    expect(screen.getByTestId('test-email-sender')).toBeInTheDocument()
+    fireEvent.click(actionButtons[0]!)
+    expect(screen.getByTestId('test-email-sender'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByRole('button', { name: 'close-test-sender' }))
     expect(screen.queryByTestId('test-email-sender')).not.toBeInTheDocument()
 
-    fireEvent.click(actionButtons[0])
+    fireEvent.click(actionButtons[0]!)
     fireEvent.click(screen.getByRole('button', { name: 'jump-to-config' }))
     expect(screen.queryByTestId('test-email-sender')).not.toBeInTheDocument()
-    expect(screen.getByTestId('email-configure-modal')).toBeInTheDocument()
+    expect(screen.getByTestId('email-configure-modal'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByRole('button', { name: 'close-email-config' }))
     expect(screen.queryByTestId('email-configure-modal')).not.toBeInTheDocument()
 
-    fireEvent.click(actionButtons[1])
-    expect(screen.getByTestId('email-configure-modal')).toBeInTheDocument()
+    fireEvent.click(actionButtons[1]!)
+    expect(screen.getByTestId('email-configure-modal'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByRole('button', { name: 'confirm-email-config' }))
     expect(handleChange).toHaveBeenCalledWith(expect.objectContaining({
@@ -203,7 +203,7 @@ describe('human-input/delivery-method/method-item', () => {
       }),
     }))
 
-    fireEvent.click(actionButtons[2])
+    fireEvent.click(actionButtons[2]!)
     expect(handleDelete).toHaveBeenCalledWith(DeliveryMethodType.Email)
   })
 
@@ -226,7 +226,7 @@ describe('human-input/delivery-method/method-item', () => {
     )
 
     fireEvent.click(screen.getByRole('button', { name: /workflow.nodes.humanInput.deliveryMethod.notConfigured/i }))
-    expect(screen.getByTestId('email-configure-modal')).toBeInTheDocument()
+    expect(screen.getByTestId('email-configure-modal'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByRole('button', { name: 'close-email-config' }))
     expect(screen.queryByTestId('email-configure-modal')).not.toBeInTheDocument()
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx
index 99192ae580..1f18ef076d 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx
@@ -113,7 +113,7 @@ const EmailInput = ({
     else if (e.key === 'Backspace') {
       if (searchKey === '' && value.length > 0) {
         e.preventDefault()
-        onDelete(value[value.length - 1])
+        onDelete(value[value.length - 1]!)
         setSearchKey('')
         setOpen(false)
       }
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx
index 7ff44542b3..cef6d1380d 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx
@@ -99,13 +99,13 @@ const EmailSenderModal = ({
     }, [] as ValueSelector[])
     const valueSelectors = doGetInputVars((formContent || '') + (config?.body || ''))
     const variables = unionBy([...valueSelectors, ...defaultValueSelectors], item => item.join('.')).map((item) => {
-      const varInfo = getNodeInfoById(availableNodes, item[0])?.data
+      const varInfo = getNodeInfoById(availableNodes, item[0]!)?.data
 
       return {
         label: {
           nodeType: varInfo?.type,
-          nodeName: varInfo?.title || availableNodes[0]?.data.title, // default start node title
-          variable: isSystemVar(item) ? item.join('.') : item[item.length - 1],
+          nodeName: varInfo?.title || availableNodes[0]?.data.title!, // default start node title
+          variable: isSystemVar(item) ? item.join('.') : item[item.length - 1]!,
           isChatVar: isConversationVar(item),
         },
         variable: `#${item.join('.')}#`,
diff --git a/web/app/components/workflow/nodes/human-input/components/variable-in-markdown.tsx b/web/app/components/workflow/nodes/human-input/components/variable-in-markdown.tsx
index a09dc287b4..d0d20ed5b5 100644
--- a/web/app/components/workflow/nodes/human-input/components/variable-in-markdown.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/variable-in-markdown.tsx
@@ -61,8 +61,8 @@ const visitTextNodes = (
   let index = 0
   while (index < node.children.length) {
     const child = node.children[index]
-    if (child.type === 'text' && typeof child.value === 'string') {
-      const nextNodes = transform(child.value, node)
+    if (child!.type === 'text' && typeof child!.value === 'string') {
+      const nextNodes = transform(child!.value, node)
       if (nextNodes) {
         node.children.splice(index, 1, ...nextNodes)
         index += nextNodes.length
@@ -70,7 +70,7 @@ const visitTextNodes = (
       }
     }
 
-    visitTextNodes(child, transform)
+    visitTextNodes(child!, transform)
     index++
   }
 }
@@ -114,7 +114,7 @@ export function rehypeNotes() {
       noteRegex.lastIndex = 0
       parent.tagName = 'div'
       return splitTextNode(value, noteRegex, (match) => {
-        const name = match[0].split('.').slice(-1)[0].replace('#}}', '')
+        const name = match[0].split('.').slice(-1)[0]!.replace('#}}', '')
         return {
           tagName: 'section',
           properties: { dataName: name },
diff --git a/web/app/components/workflow/nodes/human-input/hooks/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/human-input/hooks/__tests__/use-single-run-form-params.spec.ts
index 571708e87d..fa93c7d87f 100644
--- a/web/app/components/workflow/nodes/human-input/hooks/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/human-input/hooks/__tests__/use-single-run-form-params.spec.ts
@@ -138,7 +138,7 @@ describe('human-input/hooks/use-single-run-form-params', () => {
     }))
 
     act(() => {
-      result.current.forms[0].onChange?.({ topic: 'Updated' })
+      result.current.forms[0]!.onChange?.({ topic: 'Updated' })
     })
 
     expect(mockSetRunInputData).toHaveBeenCalledWith({ topic: 'Updated' })
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-list/index.tsx b/web/app/components/workflow/nodes/if-else/components/condition-list/index.tsx
index 180c72b3e2..5e42502bc0 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-list/index.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-list/index.tsx
@@ -120,7 +120,7 @@ const ConditionList = ({
             availableNodes={availableNodes}
             filterVar={filterVar}
             numberVariables={numberVariables}
-            file={varsIsVarFileAttribute[condition.id] ? { key: (condition.variable_selector || []).slice(-1)[0] } : undefined}
+            file={varsIsVarFileAttribute[condition.id] ? { key: (condition.variable_selector || []).slice(-1)[0]! } : undefined}
             isSubVariableKey={isSubVariable}
           />
         ))
diff --git a/web/app/components/workflow/nodes/if-else/use-config.helpers.ts b/web/app/components/workflow/nodes/if-else/use-config.helpers.ts
index b6ed6af84c..6c1b3ec0a3 100644
--- a/web/app/components/workflow/nodes/if-else/use-config.helpers.ts
+++ b/web/app/components/workflow/nodes/if-else/use-config.helpers.ts
@@ -106,7 +106,7 @@ export const addCondition = ({
     id: uuid4(),
     varType: variable.type,
     variable_selector: valueSelector,
-    comparison_operator: getOperators(variable.type, isVarFileAttribute ? { key: valueSelector.slice(-1)[0] } : undefined)[0],
+    comparison_operator: getOperators(variable.type, isVarFileAttribute ? { key: valueSelector.slice(-1)[0]! } : undefined)[0],
     value: (variable.type === VarType.boolean || variable.type === VarType.arrayBoolean) ? false : '',
   })
 })
diff --git a/web/app/components/workflow/nodes/index.tsx b/web/app/components/workflow/nodes/index.tsx
index 1a5c729fe5..7575a156cf 100644
--- a/web/app/components/workflow/nodes/index.tsx
+++ b/web/app/components/workflow/nodes/index.tsx
@@ -14,7 +14,7 @@ import {
 
 const CustomNode = (props: NodeProps) => {
   const nodeData = props.data
-  const NodeComponent = useMemo(() => NodeComponentMap[nodeData.type], [nodeData.type])
+  const NodeComponent = useMemo(() => NodeComponentMap[nodeData.type], [nodeData.type])!
 
   return (
     <>
@@ -40,9 +40,8 @@ export const Panel = memo((props: PanelProps) => {
   const PanelComponent = useMemo(() => {
     if (nodeClass === CUSTOM_NODE)
       return PanelComponentMap[nodeData.type]
-
     return () => null
-  }, [nodeClass, nodeData.type])
+  }, [nodeClass, nodeData.type])!
 
   if (nodeClass === CUSTOM_NODE) {
     return (
diff --git a/web/app/components/workflow/nodes/iteration/__tests__/use-interactions.spec.tsx b/web/app/components/workflow/nodes/iteration/__tests__/use-interactions.spec.tsx
index 58671a2311..2b846eca36 100644
--- a/web/app/components/workflow/nodes/iteration/__tests__/use-interactions.spec.tsx
+++ b/web/app/components/workflow/nodes/iteration/__tests__/use-interactions.spec.tsx
@@ -75,7 +75,7 @@ describe('useNodeIterationInteractions', () => {
     result.current.handleNodeIterationRerender('iteration-node')
 
     expect(mockSetNodes).toHaveBeenCalledTimes(1)
-    const updatedNodes = mockSetNodes.mock.calls[0][0]
+    const updatedNodes = mockSetNodes.mock.calls[0]![0]
     const updatedIterationNode = updatedNodes.find((node: Node) => node.id === 'iteration-node')
     expect(updatedIterationNode.width).toBe(100 + 60 + ITERATION_PADDING.right)
     expect(updatedIterationNode.height).toBe(90 + 40 + ITERATION_PADDING.bottom)
diff --git a/web/app/components/workflow/nodes/iteration/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/iteration/__tests__/use-single-run-form-params.spec.ts
index 7313b6945e..f1845618cf 100644
--- a/web/app/components/workflow/nodes/iteration/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/iteration/__tests__/use-single-run-form-params.spec.ts
@@ -115,12 +115,12 @@ describe('iteration/use-single-run-form-params', () => {
       }),
     ])
     expect(result.current.forms).toHaveLength(2)
-    expect(result.current.forms[0].inputs).toEqual([createInputVar('#start-node.answer#')])
-    expect(result.current.forms[0].values).toEqual({
+    expect(result.current.forms[0]!.inputs).toEqual([createInputVar('#start-node.answer#')])
+    expect(result.current.forms[0]!.values).toEqual({
       'query': 'hello',
       'iteration-node.input_selector': ['start-node', 'items'],
     })
-    expect(result.current.forms[1].values).toEqual({
+    expect(result.current.forms[1]!.values).toEqual({
       'iteration-node.input_selector': ['start-node', 'items'],
     })
     expect(result.current.allVarObject).toEqual({
@@ -151,8 +151,8 @@ describe('iteration/use-single-run-form-params', () => {
     }))
 
     act(() => {
-      result.current.forms[0].onChange({ query: 'new' })
-      result.current.forms[1].onChange({
+      result.current.forms[0]!.onChange({ query: 'new' })
+      result.current.forms[1]!.onChange({
         'iteration-node.input_selector': ['source-node', 'next'],
       })
     })
diff --git a/web/app/components/workflow/nodes/iteration/use-single-run-form-params.ts b/web/app/components/workflow/nodes/iteration/use-single-run-form-params.ts
index fd53a603a5..9cd5d51a3f 100644
--- a/web/app/components/workflow/nodes/iteration/use-single-run-form-params.ts
+++ b/web/app/components/workflow/nodes/iteration/use-single-run-form-params.ts
@@ -59,7 +59,7 @@ const useSingleRunFormParams = ({
         if (varSelector[0] === id) { // skip iteration node itself variable: item, index
           return
         }
-        const isInIteration = isNodeInIteration(varSelector[0])
+        const isInIteration = isNodeInIteration(varSelector[0]!)
         if (isInIteration) // not pass iteration inner variable
           return
 
@@ -80,12 +80,12 @@ const useSingleRunFormParams = ({
       })
     })
     const res = toVarInputs(vars.map((item) => {
-      const varInfo = getNodeInfoById(canChooseVarNodes, item[0])
+      const varInfo = getNodeInfoById(canChooseVarNodes, item[0]!)
       return {
         label: {
           nodeType: varInfo?.data.type,
           nodeName: varInfo?.data.title || canChooseVarNodes[0]?.data.title, // default start node title
-          variable: isSystemVar(item) ? item.join('.') : item[item.length - 1],
+          variable: isSystemVar(item) ? item.join('.') : item[item.length - 1]!,
         },
         variable: `${item.join('.')}`,
         value_selector: item,
diff --git a/web/app/components/workflow/nodes/knowledge-base/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/knowledge-base/__tests__/use-single-run-form-params.spec.ts
index ce0216b275..7124c05b62 100644
--- a/web/app/components/workflow/nodes/knowledge-base/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/knowledge-base/__tests__/use-single-run-form-params.spec.ts
@@ -42,13 +42,13 @@ describe('useSingleRunFormParams', () => {
       }))
 
       expect(result.current.forms).toHaveLength(1)
-      expect(result.current.forms[0].inputs).toEqual([{
+      expect(result.current.forms[0]!.inputs).toEqual([{
         label: 'workflow.nodes.common.inputVars',
         variable: 'query',
         type: InputVarType.paragraph,
         required: true,
       }])
-      expect(result.current.forms[0].values).toEqual({ query: 'what is dify' })
+      expect(result.current.forms[0]!.values).toEqual({ query: 'what is dify' })
     })
 
     it('should update run input data when the query changes', () => {
@@ -63,7 +63,7 @@ describe('useSingleRunFormParams', () => {
       }))
 
       act(() => {
-        result.current.forms[0].onChange({ query: 'new query' })
+        result.current.forms[0]!.onChange({ query: 'new query' })
       })
 
       expect(setRunInputData).toHaveBeenCalledWith({ query: 'new query' })
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/search-method-option.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/search-method-option.spec.tsx
index 62aa379250..6a7579dfd7 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/search-method-option.spec.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/search-method-option.spec.tsx
@@ -118,13 +118,13 @@ describe('SearchMethodOption', () => {
 
     render(<SearchMethodOption {...props} />)
 
-    expect(screen.getByText('Semantic title')).toBeInTheDocument()
-    expect(screen.getByText('common.modelProvider.rerankModel.key')).toBeInTheDocument()
-    expect(screen.getByText('plugin.detailPanel.configureModel')).toBeInTheDocument()
+    expect(screen.getByText('Semantic title'))!.toBeInTheDocument()
+    expect(screen.getByText('common.modelProvider.rerankModel.key'))!.toBeInTheDocument()
+    expect(screen.getByText('plugin.detailPanel.configureModel'))!.toBeInTheDocument()
     expect(screen.getAllByRole('switch')).toHaveLength(2)
 
     fireEvent.click(screen.getByText('Semantic title'))
-    fireEvent.click(screen.getAllByRole('switch')[0])
+    fireEvent.click(screen.getAllByRole('switch')[0]!)
 
     expect(props.onRetrievalSearchMethodChange).toHaveBeenCalledWith(RetrievalSearchMethodEnum.semantic)
     expect(props.onRerankingModelEnabledChange).toHaveBeenCalledWith(true)
@@ -145,8 +145,8 @@ describe('SearchMethodOption', () => {
       />,
     )
 
-    expect(screen.getByText('Full-text title')).toBeInTheDocument()
-    expect(screen.getByText('common.modelProvider.rerankModel.key')).toBeInTheDocument()
+    expect(screen.getByText('Full-text title'))!.toBeInTheDocument()
+    expect(screen.getByText('common.modelProvider.rerankModel.key'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByText('Full-text title'))
 
@@ -170,10 +170,10 @@ describe('SearchMethodOption', () => {
       />,
     )
 
-    expect(screen.getByText('Weighted mode')).toBeInTheDocument()
-    expect(screen.getByText('Rerank mode')).toBeInTheDocument()
-    expect(screen.getByText('dataset.weightedScore.semantic')).toBeInTheDocument()
-    expect(screen.getByText('dataset.weightedScore.keyword')).toBeInTheDocument()
+    expect(screen.getByText('Weighted mode'))!.toBeInTheDocument()
+    expect(screen.getByText('Rerank mode'))!.toBeInTheDocument()
+    expect(screen.getByText('dataset.weightedScore.semantic'))!.toBeInTheDocument()
+    expect(screen.getByText('dataset.weightedScore.keyword'))!.toBeInTheDocument()
     expect(screen.queryByText('common.modelProvider.rerankModel.key')).not.toBeInTheDocument()
     expect(screen.queryByText('datasetSettings.form.retrievalSetting.multiModalTip')).not.toBeInTheDocument()
 
@@ -199,10 +199,10 @@ describe('SearchMethodOption', () => {
       />,
     )
 
-    expect(screen.getByText('plugin.detailPanel.configureModel')).toBeInTheDocument()
+    expect(screen.getByText('plugin.detailPanel.configureModel'))!.toBeInTheDocument()
     expect(screen.queryByText('common.modelProvider.rerankModel.key')).not.toBeInTheDocument()
     expect(screen.queryByText('dataset.weightedScore.semantic')).not.toBeInTheDocument()
-    expect(screen.getByText('datasetSettings.form.retrievalSetting.multiModalTip')).toBeInTheDocument()
+    expect(screen.getByText('datasetSettings.form.retrievalSetting.multiModalTip'))!.toBeInTheDocument()
   })
 
   it('should hide the score-threshold control for keyword search', () => {
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/top-k-and-score-threshold.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/top-k-and-score-threshold.spec.tsx
index 6de6365c89..47755ec101 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/top-k-and-score-threshold.spec.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/top-k-and-score-threshold.spec.tsx
@@ -19,7 +19,7 @@ describe('TopKAndScoreThreshold', () => {
     render(<TopKAndScoreThreshold {...defaultProps} />)
 
     const [topKInput] = screen.getAllByRole('textbox')
-    fireEvent.change(topKInput, { target: { value: '3.7' } })
+    fireEvent.change(topKInput!, { target: { value: '3.7' } })
 
     expect(defaultProps.onTopKChange).toHaveBeenCalledWith(4)
   })
@@ -28,7 +28,7 @@ describe('TopKAndScoreThreshold', () => {
     render(<TopKAndScoreThreshold {...defaultProps} />)
 
     const [, scoreThresholdInput] = screen.getAllByRole('textbox')
-    fireEvent.change(scoreThresholdInput, { target: { value: '0.456' } })
+    fireEvent.change(scoreThresholdInput!, { target: { value: '0.456' } })
 
     expect(defaultProps.onScoreThresholdChange).toHaveBeenCalledWith(0.46)
   })
@@ -50,10 +50,10 @@ describe('TopKAndScoreThreshold', () => {
     )
 
     const [topKInput, scoreThresholdInput] = screen.getAllByRole('textbox')
-    fireEvent.change(topKInput, { target: { value: '' } })
+    fireEvent.change(topKInput!, { target: { value: '' } })
 
     expect(defaultProps.onTopKChange).toHaveBeenCalledWith(0)
-    expect(scoreThresholdInput).toHaveValue('')
+    expect(scoreThresholdInput)!.toHaveValue('')
   })
 
   it('should default the score-threshold switch to off when the flag is missing', () => {
@@ -64,6 +64,6 @@ describe('TopKAndScoreThreshold', () => {
       />,
     )
 
-    expect(screen.getByRole('switch')).toHaveAttribute('aria-checked', 'false')
+    expect(screen.getByRole('switch'))!.toHaveAttribute('aria-checked', 'false')
   })
 })
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/use-config.spec.ts b/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/use-config.spec.ts
index 0b9c837f54..292b7b57fd 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/use-config.spec.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/use-config.spec.ts
@@ -423,16 +423,16 @@ describe('knowledge-retrieval/use-config', () => {
       expect(result.current.inputs.metadata_filtering_conditions?.conditions).toHaveLength(2)
     })
 
-    const firstCondition = result.current.inputs.metadata_filtering_conditions!.conditions[0]
+    const firstCondition = result.current.inputs.metadata_filtering_conditions!.conditions[0]!
 
     act(() => {
-      result.current.handleUpdateCondition(firstCondition.id, {
+      result.current.handleUpdateCondition(firstCondition!.id, {
         ...firstCondition,
         value: 'agent',
         comparison_operator: ComparisonOperator.contains,
       })
       result.current.handleToggleConditionLogicalOperator()
-      result.current.handleRemoveCondition(firstCondition.id)
+      result.current.handleRemoveCondition(firstCondition!.id)
       result.current.handleMetadataModelChange({ provider: 'openai', modelId: 'gpt-4.1-mini', mode: AppModeEnum.CHAT })
       result.current.handleMetadataCompletionParamsChange({ top_p: 0.3 })
     })
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/__tests__/use-knowledge-metadata-config.spec.ts b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/__tests__/use-knowledge-metadata-config.spec.ts
index 1f81031a78..bb4bfe9147 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/__tests__/use-knowledge-metadata-config.spec.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/__tests__/use-knowledge-metadata-config.spec.ts
@@ -100,8 +100,8 @@ describe('use-knowledge-metadata-config', () => {
       })
     })
 
-    const firstCondition = setInputs.mock.calls[1][0].metadata_filtering_conditions!.conditions[0] as MetadataFilteringCondition
-    const secondCondition = setInputs.mock.calls[2][0].metadata_filtering_conditions!.conditions[1] as MetadataFilteringCondition
+    const firstCondition = setInputs.mock.calls[1]![0].metadata_filtering_conditions!.conditions[0] as MetadataFilteringCondition
+    const secondCondition = setInputs.mock.calls[2]![0].metadata_filtering_conditions!.conditions[1] as MetadataFilteringCondition
 
     act(() => {
       result.current.handleUpdateCondition(secondCondition.id, {
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/utils.ts b/web/app/components/workflow/nodes/knowledge-retrieval/utils.ts
index 65a2b6f010..5f41550fef 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/utils.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/utils.ts
@@ -135,8 +135,8 @@ export const getMultipleRetrievalConfig = (
           : allHighQualityFullTextSearch
             ? DEFAULT_WEIGHTED_SCORE.allHighQualityFullTextSearch.semantic
             : DEFAULT_WEIGHTED_SCORE.other.semantic,
-        embedding_provider_name: selectedDatasets[0].embedding_model_provider,
-        embedding_model_name: selectedDatasets[0].embedding_model,
+        embedding_provider_name: selectedDatasets[0]!.embedding_model_provider,
+        embedding_model_name: selectedDatasets[0]!.embedding_model,
       },
       keyword_setting: {
         keyword_weight: allHighQualityVectorSearch
diff --git a/web/app/components/workflow/nodes/list-operator/components/__tests__/extract-input.spec.tsx b/web/app/components/workflow/nodes/list-operator/components/__tests__/extract-input.spec.tsx
index 72a4ec3ef6..7a5abfd040 100644
--- a/web/app/components/workflow/nodes/list-operator/components/__tests__/extract-input.spec.tsx
+++ b/web/app/components/workflow/nodes/list-operator/components/__tests__/extract-input.spec.tsx
@@ -77,7 +77,7 @@ describe('list-operator/extract-input', () => {
       />,
     )
 
-    expect(mockInput.mock.calls[0][0]).toMatchObject({
+    expect(mockInput.mock.calls[0]![0]).toMatchObject({
       readOnly: false,
       value: '5',
       placeholder: 'workflow.nodes.http.extractListPlaceholder',
@@ -109,7 +109,7 @@ describe('list-operator/extract-input', () => {
       />,
     )
 
-    expect(mockInput.mock.calls[0][0].placeholder).toBe('')
-    expect(mockInput.mock.calls[0][0].readOnly).toBe(true)
+    expect(mockInput.mock.calls[0]![0].placeholder).toBe('')
+    expect(mockInput.mock.calls[0]![0].readOnly).toBe(true)
   })
 })
diff --git a/web/app/components/workflow/nodes/list-operator/components/__tests__/limit-config.spec.tsx b/web/app/components/workflow/nodes/list-operator/components/__tests__/limit-config.spec.tsx
index 0e502381c8..fbc3356b32 100644
--- a/web/app/components/workflow/nodes/list-operator/components/__tests__/limit-config.spec.tsx
+++ b/web/app/components/workflow/nodes/list-operator/components/__tests__/limit-config.spec.tsx
@@ -79,7 +79,7 @@ describe('list-operator/limit-config', () => {
       />,
     )
 
-    expect(screen.getByText('workflow.nodes.listFilter.limit')).toBeInTheDocument()
+    expect(screen.getByText('workflow.nodes.listFilter.limit'))!.toBeInTheDocument()
     expect(screen.queryByRole('button', { name: 'slider:10:false' })).not.toBeInTheDocument()
 
     fireEvent.click(screen.getByRole('button', { name: 'switch:false' }))
@@ -102,8 +102,8 @@ describe('list-operator/limit-config', () => {
       />,
     )
 
-    expect(screen.getByRole('button', { name: 'slider:6:true' })).toBeInTheDocument()
-    expect(mockSlider.mock.calls[0][0]).toMatchObject({
+    expect(screen.getByRole('button', { name: 'slider:6:true' }))!.toBeInTheDocument()
+    expect(mockSlider.mock.calls[0]![0]).toMatchObject({
       value: 6,
       min: 1,
       max: 20,
diff --git a/web/app/components/workflow/nodes/list-operator/components/filter-condition.tsx b/web/app/components/workflow/nodes/list-operator/components/filter-condition.tsx
index 71d6bf2a08..ce577b82ad 100644
--- a/web/app/components/workflow/nodes/list-operator/components/filter-condition.tsx
+++ b/web/app/components/workflow/nodes/list-operator/components/filter-condition.tsx
@@ -217,7 +217,7 @@ const FilterCondition: FC<Props> = ({
 
   const handleSubVariableChange = useCallback((value: string) => {
     const operators = getOperators(expectedVarType ?? VarType.string, { key: value })
-    const newOperator = operators.length > 0 ? operators[0] : ComparisonOperator.equal
+    const newOperator = operators.length > 0 ? operators[0]! : ComparisonOperator.equal
     onChange({
       key: value,
       comparison_operator: newOperator,
diff --git a/web/app/components/workflow/nodes/list-operator/panel.tsx b/web/app/components/workflow/nodes/list-operator/panel.tsx
index e308191e67..365c303086 100644
--- a/web/app/components/workflow/nodes/list-operator/panel.tsx
+++ b/web/app/components/workflow/nodes/list-operator/panel.tsx
@@ -75,7 +75,7 @@ const Panel: FC<NodePanelProps<ListFilterNodeType>> = ({
           {inputs.filter_by?.enabled
             ? (
                 <FilterCondition
-                  condition={inputs.filter_by.conditions[0]}
+                  condition={inputs.filter_by.conditions[0]!}
                   onChange={handleFilterChange}
                   varType={itemVarType}
                   hasSubVariable={hasSubVariable}
diff --git a/web/app/components/workflow/nodes/list-operator/use-config.helpers.ts b/web/app/components/workflow/nodes/list-operator/use-config.helpers.ts
index 114a1f0ac5..d539ea3604 100644
--- a/web/app/components/workflow/nodes/list-operator/use-config.helpers.ts
+++ b/web/app/components/workflow/nodes/list-operator/use-config.helpers.ts
@@ -51,7 +51,7 @@ export const buildFilterCondition = ({
   existingKey?: string
 }): Condition => ({
   key: (isFileArray && !existingKey) ? 'name' : '',
-  comparison_operator: getOperators(itemVarType, isFileArray ? { key: 'name' } : undefined)[0],
+  comparison_operator: getOperators(itemVarType, isFileArray ? { key: 'name' } : undefined)[0]!,
   value: itemVarType === WorkflowVarType.boolean ? false : '',
 })
 
diff --git a/web/app/components/workflow/nodes/llm/__tests__/use-config.spec.ts b/web/app/components/workflow/nodes/llm/__tests__/use-config.spec.ts
index b67d5744cb..363d2fa5aa 100644
--- a/web/app/components/workflow/nodes/llm/__tests__/use-config.spec.ts
+++ b/web/app/components/workflow/nodes/llm/__tests__/use-config.spec.ts
@@ -296,10 +296,10 @@ describe('llm/use-config', () => {
 
     await waitFor(() => {
       expect(appendDefaultPromptConfig).toHaveBeenCalled()
-      expect(appendDefaultPromptConfig.mock.calls[0][1]).toEqual(expect.objectContaining({
+      expect(appendDefaultPromptConfig.mock.calls[0]![1]).toEqual(expect.objectContaining({
         prompt_templates: expect.any(Object),
       }))
-      expect(appendDefaultPromptConfig.mock.calls[0][2]).toBe(true)
+      expect(appendDefaultPromptConfig.mock.calls[0]![2]).toBe(true)
       expect(setInputs).toHaveBeenCalledWith(expect.objectContaining({
         model: expect.objectContaining({
           provider: 'anthropic',
diff --git a/web/app/components/workflow/nodes/llm/components/config-prompt.tsx b/web/app/components/workflow/nodes/llm/components/config-prompt.tsx
index c7fc141113..8665966e3d 100644
--- a/web/app/components/workflow/nodes/llm/components/config-prompt.tsx
+++ b/web/app/components/workflow/nodes/llm/components/config-prompt.tsx
@@ -79,7 +79,7 @@ const ConfigPrompt: FC<Props> = ({
   const handleChatModePromptChange = useCallback((index: number) => {
     return (prompt: string) => {
       const newPrompt = produce(payload as PromptItem[], (draft) => {
-        draft[index][draft[index].edition_type === EditionType.jinja2 ? 'jinja2_text' : 'text'] = prompt
+        draft[index]![draft[index]!.edition_type === EditionType.jinja2 ? 'jinja2_text' : 'text'] = prompt
       })
       onChange(newPrompt)
     }
@@ -88,7 +88,7 @@ const ConfigPrompt: FC<Props> = ({
   const handleChatModeEditionTypeChange = useCallback((index: number) => {
     return (editionType: EditionType) => {
       const newPrompt = produce(payload as PromptItem[], (draft) => {
-        draft[index].edition_type = editionType
+        draft[index]!.edition_type = editionType
       })
       onChange(newPrompt)
     }
@@ -97,7 +97,7 @@ const ConfigPrompt: FC<Props> = ({
   const handleChatModeMessageRoleChange = useCallback((index: number) => {
     return (role: PromptRole) => {
       const newPrompt = produce(payload as PromptItem[], (draft) => {
-        draft[index].role = role
+        draft[index]!.role = role
       })
       onChange(newPrompt)
     }
@@ -110,7 +110,7 @@ const ConfigPrompt: FC<Props> = ({
 
         return
       }
-      const isLastItemUser = draft[draft.length - 1].role === PromptRole.user
+      const isLastItemUser = draft[draft.length - 1]!.role === PromptRole.user
       draft.push({ role: isLastItemUser ? PromptRole.assistant : PromptRole.user, text: '', id: uuid4() })
     })
     onChange(newPrompt)
@@ -160,7 +160,7 @@ const ConfigPrompt: FC<Props> = ({
                   className="space-y-1"
                   list={payloadWithIds}
                   setList={(list) => {
-                    if ((payload as PromptItem[])?.[0]?.role === PromptRole.system && list[0].p?.role !== PromptRole.system)
+                    if ((payload as PromptItem[])?.[0]?.role === PromptRole.system && list[0]!.p?.role !== PromptRole.system)
                       return
 
                     onChange(list.map(item => item.p))
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts
index 4820b5a9dc..cf7ef1571d 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts
@@ -296,28 +296,28 @@ export const useSchemaNodeOperations = (props: VisualEditorProps) => {
 
         // type change
         if (oldType !== newType) {
-          if (schema.type === Type.object) {
-            delete schema.properties
-            delete schema.required
+          if (schema!.type === Type.object) {
+            delete schema!.properties
+            delete schema!.required
           }
-          if (schema.type === Type.array)
-            delete schema.items
+          if (schema!.type === Type.array)
+            delete schema!.items
           switch (newType) {
             case Type.object:
-              schema.type = Type.object
-              schema.properties = {}
-              schema.required = []
-              schema.additionalProperties = false
+              schema!.type = Type.object
+              schema!.properties = {}
+              schema!.required = []
+              schema!.additionalProperties = false
               break
             case ArrayType.string:
-              schema.type = Type.array
-              schema.items = {
+              schema!.type = Type.array
+              schema!.items = {
                 type: Type.string,
               }
               break
             case ArrayType.number:
-              schema.type = Type.array
-              schema.items = {
+              schema!.type = Type.array
+              schema!.items = {
                 type: Type.number,
               }
               break
@@ -328,8 +328,8 @@ export const useSchemaNodeOperations = (props: VisualEditorProps) => {
             //   }
             //   break
             case ArrayType.object:
-              schema.type = Type.array
-              schema.items = {
+              schema!.type = Type.array
+              schema!.items = {
                 type: Type.object,
                 properties: {},
                 required: [],
@@ -337,13 +337,14 @@ export const useSchemaNodeOperations = (props: VisualEditorProps) => {
               }
               break
             default:
-              schema.type = newType as Type
+              schema!.type = newType as Type
           }
         }
 
         // other options change
-        schema.description = fields.description
-        schema.enum = fields.enum
+        // other options change
+        schema!.description = fields.description
+        schema!.enum = fields.enum
       }
 
       if (parentSchema.type === Type.array && parentSchema.items && parentSchema.items.type === Type.object && parentSchema.items.properties) {
@@ -382,28 +383,28 @@ export const useSchemaNodeOperations = (props: VisualEditorProps) => {
         const schema = parentSchema.items.properties[newName]
         // type change
         if (oldType !== newType) {
-          if (schema.type === Type.object) {
-            delete schema.properties
-            delete schema.required
+          if (schema!.type === Type.object) {
+            delete schema!.properties
+            delete schema!.required
           }
-          if (schema.type === Type.array)
-            delete schema.items
+          if (schema!.type === Type.array)
+            delete schema!.items
           switch (newType) {
             case Type.object:
-              schema.type = Type.object
-              schema.properties = {}
-              schema.required = []
-              schema.additionalProperties = false
+              schema!.type = Type.object
+              schema!.properties = {}
+              schema!.required = []
+              schema!.additionalProperties = false
               break
             case ArrayType.string:
-              schema.type = Type.array
-              schema.items = {
+              schema!.type = Type.array
+              schema!.items = {
                 type: Type.string,
               }
               break
             case ArrayType.number:
-              schema.type = Type.array
-              schema.items = {
+              schema!.type = Type.array
+              schema!.items = {
                 type: Type.number,
               }
               break
@@ -414,8 +415,8 @@ export const useSchemaNodeOperations = (props: VisualEditorProps) => {
             //   }
             //   break
             case ArrayType.object:
-              schema.type = Type.array
-              schema.items = {
+              schema!.type = Type.array
+              schema!.items = {
                 type: Type.object,
                 properties: {},
                 required: [],
@@ -423,13 +424,14 @@ export const useSchemaNodeOperations = (props: VisualEditorProps) => {
               }
               break
             default:
-              schema.type = newType as Type
+              schema!.type = newType as Type
           }
         }
 
         // other options change
-        schema.description = fields.description
-        schema.enum = fields.enum
+        // other options change
+        schema!.description = fields.description
+        schema!.enum = fields.enum
       }
     })
     if (samePropertyNameError)
diff --git a/web/app/components/workflow/nodes/llm/hooks/__tests__/use-llm-prompt-config.spec.ts b/web/app/components/workflow/nodes/llm/hooks/__tests__/use-llm-prompt-config.spec.ts
index 67ab2bc461..518fe6e986 100644
--- a/web/app/components/workflow/nodes/llm/hooks/__tests__/use-llm-prompt-config.spec.ts
+++ b/web/app/components/workflow/nodes/llm/hooks/__tests__/use-llm-prompt-config.spec.ts
@@ -226,8 +226,8 @@ describe('use-llm-prompt-config', () => {
     })
 
     expect(handleSetInputs).toHaveBeenCalled()
-    expect(handleSetInputs.mock.calls[0][0].prompt_config?.jinja2_variables).toHaveLength(2)
-    expect(handleSetInputs.mock.calls[1][0].prompt_config?.jinja2_variables).toEqual([
+    expect(handleSetInputs.mock.calls[0]![0].prompt_config?.jinja2_variables).toHaveLength(2)
+    expect(handleSetInputs.mock.calls[1]![0].prompt_config?.jinja2_variables).toEqual([
       {
         variable: 'old_name',
         value_selector: ['start', 'old_name'],
@@ -241,33 +241,35 @@ describe('use-llm-prompt-config', () => {
         value_selector: ['start', 'budget'],
       },
     ])
-    expect(handleSetInputs.mock.calls[2][0].prompt_config?.jinja2_variables).toEqual([{
+    expect(handleSetInputs.mock.calls[2]![0].prompt_config?.jinja2_variables).toEqual([{
       variable: 'city',
       value_selector: ['start', 'city'],
     }])
-    expect((handleSetInputs.mock.calls[3][0].prompt_template as Array<{ jinja2_text?: string }>)[0].jinja2_text).toBe('{{ new_name }}')
-    expect(handleSetInputs.mock.calls[4][0].context).toEqual({
+    expect((handleSetInputs.mock.calls[3]![0].prompt_template as Array<{
+      jinja2_text?: string
+    }>)[0]!.jinja2_text).toBe('{{ new_name }}')
+    expect(handleSetInputs.mock.calls[4]![0].context).toEqual({
       enabled: true,
       variable_selector: ['start', 'sys.query'],
     })
-    expect(handleSetInputs.mock.calls[5][0].context).toEqual({
+    expect(handleSetInputs.mock.calls[5]![0].context).toEqual({
       enabled: false,
       variable_selector: [],
     })
-    expect(handleSetInputs.mock.calls[6][0].prompt_template).toEqual([{
+    expect(handleSetInputs.mock.calls[6]![0].prompt_template).toEqual([{
       role: PromptRole.system,
       text: 'Updated prompt',
       edition_type: EditionType.basic,
     }])
-    expect(handleSetInputs.mock.calls[7][0].memory).toEqual({
+    expect(handleSetInputs.mock.calls[7]![0].memory).toEqual({
       window: {
         enabled: false,
         size: 10,
       },
       query_prompt_template: '{{#sys.query#}}',
     })
-    expect(handleSetInputs.mock.calls[8][0].memory?.query_prompt_template).toBe('custom query')
-    expect(handleSetInputs.mock.calls[9][0].memory).toEqual({
+    expect(handleSetInputs.mock.calls[8]![0].memory?.query_prompt_template).toBe('custom query')
+    expect(handleSetInputs.mock.calls[9]![0].memory).toEqual({
       window: {
         enabled: true,
         size: 6,
diff --git a/web/app/components/workflow/nodes/loop/__tests__/use-config.helpers.spec.ts b/web/app/components/workflow/nodes/loop/__tests__/use-config.helpers.spec.ts
index 33e67f84b7..eaf0eb5113 100644
--- a/web/app/components/workflow/nodes/loop/__tests__/use-config.helpers.spec.ts
+++ b/web/app/components/workflow/nodes/loop/__tests__/use-config.helpers.spec.ts
@@ -154,7 +154,7 @@ describe('loop use-config helpers', () => {
     const unchangedAfterMissingRemove = removeSubVariableCondition(removed, 'missing-condition', 'sub-condition-2')
 
     expect(untouched).toEqual(inputs)
-    expect(withKeyedSubCondition.break_conditions?.[0].sub_variable_condition).toEqual({
+    expect(withKeyedSubCondition.break_conditions?.[0]!.sub_variable_condition).toEqual({
       logical_operator: LogicalOperator.and,
       conditions: [{
         id: 'sub-condition-1',
@@ -164,19 +164,19 @@ describe('loop use-config helpers', () => {
         value: '',
       }],
     })
-    expect(withDefaultKeySubCondition.break_conditions?.[0].sub_variable_condition?.conditions[1]).toEqual({
+    expect(withDefaultKeySubCondition.break_conditions?.[0]!.sub_variable_condition?.conditions[1]).toEqual({
       id: 'sub-condition-2',
       key: '',
       varType: VarType.string,
       comparison_operator: undefined,
       value: '',
     })
-    expect(updated.break_conditions?.[0].sub_variable_condition?.conditions[0]).toEqual(expect.objectContaining({
+    expect(updated.break_conditions?.[0]!.sub_variable_condition?.conditions[0]).toEqual(expect.objectContaining({
       comparison_operator: ComparisonOperator.notIn,
       value: ['remote_url'],
     }))
-    expect(toggled.break_conditions?.[0].sub_variable_condition?.logical_operator).toBe(LogicalOperator.or)
-    expect(removed.break_conditions?.[0].sub_variable_condition?.conditions).toEqual([
+    expect(toggled.break_conditions?.[0]!.sub_variable_condition?.logical_operator).toBe(LogicalOperator.or)
+    expect(removed.break_conditions?.[0]!.sub_variable_condition?.conditions).toEqual([
       expect.objectContaining({ id: 'sub-condition-2' }),
     ])
     expect(unchangedAfterMissingRemove).toEqual(removed)
diff --git a/web/app/components/workflow/nodes/loop/__tests__/use-interactions.spec.tsx b/web/app/components/workflow/nodes/loop/__tests__/use-interactions.spec.tsx
index ac7da5bf2c..e28bd4865f 100644
--- a/web/app/components/workflow/nodes/loop/__tests__/use-interactions.spec.tsx
+++ b/web/app/components/workflow/nodes/loop/__tests__/use-interactions.spec.tsx
@@ -68,7 +68,7 @@ describe('useNodeLoopInteractions', () => {
     result.current.handleNodeLoopRerender('loop-node')
 
     expect(mockSetNodes).toHaveBeenCalledTimes(1)
-    const updatedNodes = mockSetNodes.mock.calls[0][0]
+    const updatedNodes = mockSetNodes.mock.calls[0]![0]
     const updatedLoopNode = updatedNodes.find((node: Node) => node.id === 'loop-node')
     expect(updatedLoopNode.width).toBe(100 + 60 + LOOP_PADDING.right)
     expect(updatedLoopNode.height).toBe(90 + 40 + LOOP_PADDING.bottom)
diff --git a/web/app/components/workflow/nodes/loop/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/loop/__tests__/use-single-run-form-params.spec.ts
index 7ff89492cd..dfe13b79e4 100644
--- a/web/app/components/workflow/nodes/loop/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/loop/__tests__/use-single-run-form-params.spec.ts
@@ -167,12 +167,12 @@ describe('useSingleRunFormParams', () => {
       expect.objectContaining({ variable: 'start-node.answer' }),
     ])
     expect(result.current.forms).toHaveLength(1)
-    expect(result.current.forms[0].inputs).toEqual([
+    expect(result.current.forms[0]!.inputs).toEqual([
       createInputVar('start-node.answer'),
       createInputVar('tool-a.result'),
       createInputVar('start-node.answer'),
     ])
-    expect(result.current.forms[0].values).toEqual({ question: 'hello' })
+    expect(result.current.forms[0]!.values).toEqual({ question: 'hello' })
     expect(result.current.allVarObject).toEqual({
       'start-node.answer@@@tool-a@@@0': {
         inSingleRunPassedKey: 'passed_key',
@@ -201,7 +201,7 @@ describe('useSingleRunFormParams', () => {
     }))
 
     act(() => {
-      result.current.forms[0].onChange({ retry: true })
+      result.current.forms[0]!.onChange({ retry: true })
     })
 
     expect(setRunInputData).toHaveBeenCalledWith({ retry: true })
diff --git a/web/app/components/workflow/nodes/loop/use-config.helpers.ts b/web/app/components/workflow/nodes/loop/use-config.helpers.ts
index edeca0b766..dadd0aa639 100644
--- a/web/app/components/workflow/nodes/loop/use-config.helpers.ts
+++ b/web/app/components/workflow/nodes/loop/use-config.helpers.ts
@@ -41,7 +41,7 @@ export const addBreakCondition = ({
     id: uuid4(),
     varType: variable.type,
     variable_selector: valueSelector,
-    comparison_operator: getOperators(variable.type, isVarFileAttribute ? { key: valueSelector.slice(-1)[0] } : undefined)[0],
+    comparison_operator: getOperators(variable.type, isVarFileAttribute ? { key: valueSelector.slice(-1)[0]! } : undefined)[0],
     value: variable.type === VarType.boolean ? 'false' : '',
   })
 })
@@ -164,7 +164,7 @@ export const updateLoopVariable = (
   const index = draft.loop_variables?.findIndex(item => item.id === id) ?? -1
   if (index > -1) {
     draft.loop_variables![index] = {
-      ...draft.loop_variables![index],
+      ...draft.loop_variables![index]!,
       ...updateData,
     }
   }
diff --git a/web/app/components/workflow/nodes/loop/use-single-run-form-params.helpers.ts b/web/app/components/workflow/nodes/loop/use-single-run-form-params.helpers.ts
index 02db10c173..90df2d5777 100644
--- a/web/app/components/workflow/nodes/loop/use-single-run-form-params.helpers.ts
+++ b/web/app/components/workflow/nodes/loop/use-single-run-form-params.helpers.ts
@@ -68,7 +68,7 @@ export const buildUsedOutVars = ({
     nodeVars.forEach((varSelector) => {
       if (varSelector[0] === currentNodeId)
         return
-      if (isNodeInLoop(varSelector[0]))
+      if (isNodeInLoop(varSelector[0]!))
         return
 
       const varSelectorStr = varSelector.join('.')
@@ -90,12 +90,12 @@ export const buildUsedOutVars = ({
   })
 
   const usedOutVars = toVarInputs(vars.map((valueSelector) => {
-    const varInfo = getNodeInfoById(canChooseVarNodes, valueSelector[0])
+    const varInfo = getNodeInfoById(canChooseVarNodes, valueSelector[0]!)
     return {
       label: {
         nodeType: varInfo?.data.type,
-        nodeName: varInfo?.data.title || canChooseVarNodes[0]?.data.title,
-        variable: isSystemVar(valueSelector) ? valueSelector.join('.') : valueSelector[valueSelector.length - 1],
+        nodeName: varInfo?.data.title || canChooseVarNodes[0]?.data.title!,
+        variable: isSystemVar(valueSelector) ? valueSelector.join('.') : valueSelector[valueSelector.length - 1]!,
       },
       variable: valueSelector.join('.'),
       value_selector: valueSelector,
diff --git a/web/app/components/workflow/nodes/parameter-extractor/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/parameter-extractor/__tests__/use-single-run-form-params.spec.ts
index 9122dd52e0..f3bc4da883 100644
--- a/web/app/components/workflow/nodes/parameter-extractor/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/parameter-extractor/__tests__/use-single-run-form-params.spec.ts
@@ -99,7 +99,7 @@ describe('parameter-extractor/use-single-run-form-params', () => {
     }))
 
     expect(result.current.forms).toHaveLength(2)
-    expect(result.current.forms[0].inputs).toEqual(expect.arrayContaining([
+    expect(result.current.forms[0]!.inputs).toEqual(expect.arrayContaining([
       expect.objectContaining({
         variable: 'query',
         type: InputVarType.paragraph,
@@ -108,15 +108,15 @@ describe('parameter-extractor/use-single-run-form-params', () => {
         variable: '#node-2.answer#',
       }),
     ]))
-    expect(result.current.forms[1].inputs).toEqual([{
+    expect(result.current.forms[1]!.inputs).toEqual([{
       label: 'image',
       variable: '#files#',
       type: InputVarType.singleFile,
       required: false,
     }])
 
-    result.current.forms[0].onChange({ query: 'updated' })
-    result.current.forms[1].onChange({ '#files#': ['file-2'] })
+    result.current.forms[0]!.onChange({ query: 'updated' })
+    result.current.forms[1]!.onChange({ '#files#': ['file-2'] })
 
     expect(setRunInputData).toHaveBeenNthCalledWith(1, {
       'query': 'updated',
@@ -128,7 +128,7 @@ describe('parameter-extractor/use-single-run-form-params', () => {
       '#context#': 'ctx',
       '#files#': ['file-2'],
     })
-    const availableVarOptions = mockUseAvailableVarList.mock.calls[0][1] as { filterVar: (payload: { type: VarType }) => boolean }
+    const availableVarOptions = mockUseAvailableVarList.mock.calls[0]![1] as { filterVar: (payload: { type: VarType }) => boolean }
 
     expect(availableVarOptions.filterVar({ type: VarType.file })).toBe(true)
     expect(availableVarOptions.filterVar({ type: VarType.string })).toBe(false)
diff --git a/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/import-from-tool.spec.tsx b/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/import-from-tool.spec.tsx
index ca7be46511..f1da87bed2 100644
--- a/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/import-from-tool.spec.tsx
+++ b/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/import-from-tool.spec.tsx
@@ -94,7 +94,7 @@ describe('parameter-extractor/extract-parameter/import-from-tool', () => {
         human_description: { en_US: 'Internal', zh_Hans: 'Internal' },
       }),
     ] satisfies ToolWithProvider['tools'][number]['parameters']
-    provider.tools[0].parameters = builtInParameters
+    provider.tools[0]!.parameters = builtInParameters
     mockToolCollections.builtIn = [provider]
 
     renderWorkflowComponent(
@@ -133,7 +133,7 @@ describe('parameter-extractor/extract-parameter/import-from-tool', () => {
         human_description: { en_US: 'Summary', zh_Hans: 'Summary' },
       }),
     ] satisfies ToolWithProvider['tools'][number]['parameters']
-    provider.tools[0].parameters = workflowParameters
+    provider.tools[0]!.parameters = workflowParameters
     mockToolCollections.workflow = [provider]
 
     renderWorkflowComponent(
diff --git a/web/app/components/workflow/nodes/question-classifier/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/question-classifier/__tests__/use-single-run-form-params.spec.ts
index a34bb2e9ad..13fa9f62e6 100644
--- a/web/app/components/workflow/nodes/question-classifier/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/question-classifier/__tests__/use-single-run-form-params.spec.ts
@@ -92,7 +92,7 @@ describe('question-classifier/use-single-run-form-params', () => {
     }))
 
     expect(result.current.forms).toHaveLength(2)
-    expect(result.current.forms[0].inputs).toEqual(expect.arrayContaining([
+    expect(result.current.forms[0]!.inputs).toEqual(expect.arrayContaining([
       expect.objectContaining({
         variable: 'query',
         type: InputVarType.paragraph,
@@ -101,15 +101,15 @@ describe('question-classifier/use-single-run-form-params', () => {
         variable: '#node-2.answer#',
       }),
     ]))
-    expect(result.current.forms[1].inputs).toEqual([{
+    expect(result.current.forms[1]!.inputs).toEqual([{
       label: 'image',
       variable: '#files#',
       type: InputVarType.singleFile,
       required: false,
     }])
 
-    result.current.forms[0].onChange({ query: 'updated' })
-    result.current.forms[1].onChange({ '#files#': ['file-2'] })
+    result.current.forms[0]!.onChange({ query: 'updated' })
+    result.current.forms[1]!.onChange({ '#files#': ['file-2'] })
 
     expect(setRunInputData).toHaveBeenNthCalledWith(1, {
       'query': 'updated',
@@ -119,7 +119,7 @@ describe('question-classifier/use-single-run-form-params', () => {
       'query': 'hello',
       '#files#': ['file-2'],
     })
-    const availableVarOptions = mockUseAvailableVarList.mock.calls[0][1] as { filterVar: (payload: { type: VarType }) => boolean }
+    const availableVarOptions = mockUseAvailableVarList.mock.calls[0]![1] as { filterVar: (payload: { type: VarType }) => boolean }
 
     expect(availableVarOptions.filterVar({ type: VarType.file })).toBe(true)
     expect(availableVarOptions.filterVar({ type: VarType.string })).toBe(false)
diff --git a/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx b/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx
index 55dbb43cc8..8f62c27bb1 100644
--- a/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx
@@ -65,7 +65,7 @@ const ClassList: FC<Props> = ({
 
   const handleRemoveClass = useCallback((index: number) => {
     return () => {
-      handleEdgeDeleteByDeleteBranch(nodeId, list[index].id)
+      handleEdgeDeleteByDeleteBranch(nodeId, list[index]!.id)
       const newList = produce(list, (draft) => {
         draft.splice(index, 1)
       })
@@ -150,7 +150,7 @@ const ClassList: FC<Props> = ({
                         className={cn(canDrag && 'handle')}
                         headerClassName={cn(canDrag && 'cursor-grab group-hover:pl-5')}
                         nodeId={nodeId}
-                        key={list[index].id}
+                        key={list[index]!.id}
                         payload={item}
                         onChange={handleClassChange(index)}
                         onRemove={handleRemoveClass(index)}
diff --git a/web/app/components/workflow/nodes/start/__tests__/use-config.spec.ts b/web/app/components/workflow/nodes/start/__tests__/use-config.spec.ts
index 330b1ac776..16d37a6a8f 100644
--- a/web/app/components/workflow/nodes/start/__tests__/use-config.spec.ts
+++ b/web/app/components/workflow/nodes/start/__tests__/use-config.spec.ts
@@ -143,7 +143,7 @@ describe('start/use-config', () => {
   it('should block removal when the variable is still in use and confirm the deletion later', () => {
     mockIsVarUsedInNodes.mockReturnValue(true)
     const { result } = renderHook(() => useConfig('start-node', currentInputs))
-    const nextList = [currentInputs.variables[1]]
+    const nextList = [currentInputs.variables[1]!]
 
     act(() => {
       result.current.handleVarListChange(nextList, {
@@ -215,7 +215,7 @@ describe('start/use-config', () => {
         variable: 'query',
         type: InputVarType.paragraph,
       }),
-      currentInputs.variables[1],
+      currentInputs.variables[1]!,
     ]
 
     act(() => {
diff --git a/web/app/components/workflow/nodes/start/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/start/__tests__/use-single-run-form-params.spec.ts
index 4372c2a02d..dc6de703e2 100644
--- a/web/app/components/workflow/nodes/start/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/start/__tests__/use-single-run-form-params.spec.ts
@@ -51,14 +51,14 @@ describe('start/use-single-run-form-params', () => {
     }))
 
     expect(result.current.forms).toHaveLength(1)
-    expect(result.current.forms[0].label).toBe('nodes.llm.singleRun.variable')
-    expect(result.current.forms[0].inputs).toEqual(expect.arrayContaining([
+    expect(result.current.forms[0]!.label).toBe('nodes.llm.singleRun.variable')
+    expect(result.current.forms[0]!.inputs).toEqual(expect.arrayContaining([
       expect.objectContaining({ variable: 'query' }),
       expect.objectContaining({ variable: '#sys.query#', required: true }),
       expect.objectContaining({ variable: '#sys.files#', required: false }),
     ]))
 
-    result.current.forms[0].onChange({ query: 'updated' })
+    result.current.forms[0]!.onChange({ query: 'updated' })
 
     expect(setRunInputData).toHaveBeenCalledWith({ query: 'updated' })
     expect(result.current.getDependentVars()).toEqual([
@@ -82,7 +82,7 @@ describe('start/use-single-run-form-params', () => {
       toVarInputs: () => [],
     }))
 
-    expect(result.current.forms[0].inputs).toEqual(expect.not.arrayContaining([
+    expect(result.current.forms[0]!.inputs).toEqual(expect.not.arrayContaining([
       expect.objectContaining({ variable: '#sys.query#' }),
     ]))
     expect(result.current.getDependentVars()).toEqual([
diff --git a/web/app/components/workflow/nodes/start/components/var-list.tsx b/web/app/components/workflow/nodes/start/components/var-list.tsx
index ac29aae3e8..d4f6511cdb 100644
--- a/web/app/components/workflow/nodes/start/components/var-list.tsx
+++ b/web/app/components/workflow/nodes/start/components/var-list.tsx
@@ -61,7 +61,7 @@ const VarList: FC<Props> = ({
         payload: {
           type: ChangeType.remove,
           payload: {
-            beforeKey: list[index].variable,
+            beforeKey: list[index]!.variable,
           },
         },
       })
diff --git a/web/app/components/workflow/nodes/start/use-config.ts b/web/app/components/workflow/nodes/start/use-config.ts
index 12ec1575c9..e954253561 100644
--- a/web/app/components/workflow/nodes/start/use-config.ts
+++ b/web/app/components/workflow/nodes/start/use-config.ts
@@ -63,8 +63,8 @@ const useConfig = (id: string, payload: StartNodeType) => {
     setInputs(newInputs)
     if (moreInfo?.payload?.type === ChangeType.changeVarName) {
       const changedVar = newList[moreInfo.index]
-      handleOutVarRenameChange(id, [id, inputs.variables[moreInfo.index].variable], [id, changedVar.variable])
-      renameInspectVarName(id, inputs.variables[moreInfo.index].variable, changedVar.variable)
+      handleOutVarRenameChange(id, [id, inputs.variables[moreInfo.index]!.variable], [id, changedVar!.variable])
+      renameInspectVarName(id, inputs.variables[moreInfo.index]!.variable, changedVar!.variable)
     }
     else if (moreInfo?.payload?.type !== ChangeType.remove) { // edit var type
       deleteNodeInspectorVars(id)
diff --git a/web/app/components/workflow/nodes/template-transform/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/template-transform/__tests__/use-single-run-form-params.spec.ts
index 260dd9f900..1e3381a13f 100644
--- a/web/app/components/workflow/nodes/template-transform/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/template-transform/__tests__/use-single-run-form-params.spec.ts
@@ -57,10 +57,10 @@ describe('template-transform/use-single-run-form-params', () => {
     }))
 
     expect(result.current.forms).toHaveLength(1)
-    expect(result.current.forms[0].inputs).toEqual(varInputs)
-    expect(result.current.forms[0].values).toEqual({ input_text: 'hello' })
+    expect(result.current.forms[0]!.inputs).toEqual(varInputs)
+    expect(result.current.forms[0]!.values).toEqual({ input_text: 'hello' })
 
-    result.current.forms[0].onChange({ input_text: 'updated' })
+    result.current.forms[0]!.onChange({ input_text: 'updated' })
 
     expect(setRunInputData).toHaveBeenCalledWith({ input_text: 'updated' })
     expect(result.current.getDependentVars()).toEqual([['node-1', 'input_text']])
diff --git a/web/app/components/workflow/nodes/tool/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/tool/__tests__/panel.spec.tsx
index d15c8a4478..e7fc98b58a 100644
--- a/web/app/components/workflow/nodes/tool/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/tool/__tests__/panel.spec.tsx
@@ -192,7 +192,7 @@ describe('ToolPanel', () => {
 
       renderPanel()
 
-      expect(screen.getByRole('status')).toBeInTheDocument()
+      expect(screen.getByRole('status'))!.toBeInTheDocument()
       expect(screen.queryByText('workflow.nodes.tool.inputVars')).not.toBeInTheDocument()
       expect(mockToolForm).not.toHaveBeenCalled()
     })
@@ -213,21 +213,21 @@ describe('ToolPanel', () => {
 
       renderPanel()
 
-      expect(screen.getByText('workflow.nodes.tool.inputVars')).toBeInTheDocument()
-      expect(screen.getByText('workflow.nodes.tool.settings')).toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.tool.inputVars'))!.toBeInTheDocument()
+      expect(screen.getByText('workflow.nodes.tool.settings'))!.toBeInTheDocument()
       expect(screen.getAllByTestId('split')).toHaveLength(2)
 
       fireEvent.click(screen.getByRole('button', { name: 'Manage Input Field' }))
 
       expect(mockToolForm).toHaveBeenCalledTimes(2)
-      expect(mockToolForm.mock.calls[0][0]).toEqual(expect.objectContaining({
+      expect(mockToolForm.mock.calls[0]![0]).toEqual(expect.objectContaining({
         nodeId: 'tool-node-1',
         showManageInputField: true,
       }))
-      expect(mockToolForm.mock.calls[1][0]).toEqual(expect.objectContaining({
+      expect(mockToolForm.mock.calls[1]![0]).toEqual(expect.objectContaining({
         nodeId: 'tool-node-1',
       }))
-      expect(mockToolForm.mock.calls[1][0]).not.toHaveProperty('showManageInputField')
+      expect(mockToolForm.mock.calls[1]![0]).not.toHaveProperty('showManageInputField')
       expect(mockWorkflowStoreState.setShowInputFieldPanel).toHaveBeenCalledWith(true)
     })
 
@@ -242,9 +242,9 @@ describe('ToolPanel', () => {
 
       expect(screen.queryByText('workflow.nodes.tool.inputVars')).not.toBeInTheDocument()
       expect(screen.queryByText('workflow.nodes.tool.settings')).not.toBeInTheDocument()
-      expect(screen.getByText('text')).toBeInTheDocument()
-      expect(screen.getByText('files')).toBeInTheDocument()
-      expect(screen.getByText('json')).toBeInTheDocument()
+      expect(screen.getByText('text'))!.toBeInTheDocument()
+      expect(screen.getByText('files'))!.toBeInTheDocument()
+      expect(screen.getByText('json'))!.toBeInTheDocument()
       expect(mockToolForm).not.toHaveBeenCalled()
     })
   })
@@ -274,10 +274,10 @@ describe('ToolPanel', () => {
 
       renderPanel()
 
-      expect(screen.getByText('summary')).toBeInTheDocument()
-      expect(screen.getByText('string (qa_structured)')).toBeInTheDocument()
-      expect(screen.getByText('Summary field')).toBeInTheDocument()
-      expect(screen.getByTestId('structured-output')).toHaveTextContent('details-object_structured')
+      expect(screen.getByText('summary'))!.toBeInTheDocument()
+      expect(screen.getByText('string (qa_structured)'))!.toBeInTheDocument()
+      expect(screen.getByText('Summary field'))!.toBeInTheDocument()
+      expect(screen.getByTestId('structured-output'))!.toHaveTextContent('details-object_structured')
       expect(mockWrapStructuredVarItem).toHaveBeenCalledWith(expect.objectContaining({
         name: 'details',
       }), 'object_structured')
@@ -301,8 +301,8 @@ describe('ToolPanel', () => {
 
       renderPanel()
 
-      expect(screen.getByTestId('var-item-summary')).toHaveTextContent('summary')
-      expect(screen.getByTestId('var-item-summary')).toHaveTextContent('String'.toLowerCase())
+      expect(screen.getByTestId('var-item-summary'))!.toHaveTextContent('summary')
+      expect(screen.getByTestId('var-item-summary'))!.toHaveTextContent('String'.toLowerCase())
       expect(screen.getByTestId('var-item-summary')).not.toHaveTextContent('qa_structured')
     })
   })
diff --git a/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/__tests__/index.spec.tsx
index 04559b2174..59cdd1264d 100644
--- a/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/__tests__/index.spec.tsx
@@ -84,7 +84,7 @@ describe('tool/mixed-variable-text-input', () => {
     fireEvent.click(screen.getByRole('button', { name: 'prompt-editor' }))
 
     expect(handleChange).toHaveBeenCalledWith('updated value')
-    expect(mockPromptEditor.mock.calls[0][0]).toMatchObject({
+    expect(mockPromptEditor.mock.calls[0]![0]).toMatchObject({
       editable: true,
       value: 'initial value',
       workflowVariableBlock: {
@@ -108,7 +108,7 @@ describe('tool/mixed-variable-text-input', () => {
         },
       },
     })
-    expect(isValidElement(mockPromptEditor.mock.calls[0][0].placeholder)).toBe(true)
+    expect(isValidElement(mockPromptEditor.mock.calls[0]![0].placeholder)).toBe(true)
   })
 
   it('should disable editing and variable insertion when requested', () => {
@@ -119,7 +119,7 @@ describe('tool/mixed-variable-text-input', () => {
       />,
     )
 
-    expect(mockPromptEditor.mock.calls[0][0]).toMatchObject({
+    expect(mockPromptEditor.mock.calls[0]![0]).toMatchObject({
       editable: false,
       value: '',
       workflowVariableBlock: {
@@ -130,6 +130,6 @@ describe('tool/mixed-variable-text-input', () => {
         onManageInputField: undefined,
       },
     })
-    expect(isValidElement(mockPromptEditor.mock.calls[0][0].placeholder)).toBe(true)
+    expect(isValidElement(mockPromptEditor.mock.calls[0]![0].placeholder)).toBe(true)
   })
 })
diff --git a/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/__tests__/placeholder.spec.tsx b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/__tests__/placeholder.spec.tsx
index 366bb0f01f..bf8b91d9c7 100644
--- a/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/__tests__/placeholder.spec.tsx
+++ b/web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/__tests__/placeholder.spec.tsx
@@ -38,16 +38,16 @@ describe('tool/mixed-variable-text-input/placeholder', () => {
 
     const root = screen.getByText('workflow.nodes.tool.insertPlaceholder1').closest('.cursor-text') as HTMLElement
 
-    expect(screen.getByText('workflow.nodes.tool.insertPlaceholder1')).toBeInTheDocument()
-    expect(screen.getByText('workflow.nodes.tool.insertPlaceholder2')).toBeInTheDocument()
-    expect(screen.getByText('String')).toBeInTheDocument()
+    expect(screen.getByText('workflow.nodes.tool.insertPlaceholder1'))!.toBeInTheDocument()
+    expect(screen.getByText('workflow.nodes.tool.insertPlaceholder2'))!.toBeInTheDocument()
+    expect(screen.getByText('String'))!.toBeInTheDocument()
 
     fireEvent.click(root)
-    expect(mockInsertNodes.mock.calls[0][0][0]).toMatchObject({ text: '' })
+    expect(mockInsertNodes.mock.calls[0]![0][0]).toMatchObject({ text: '' })
     expect(mockDispatchCommand).toHaveBeenCalledWith('FOCUS_COMMAND', undefined)
 
     fireEvent.mouseDown(screen.getByText('workflow.nodes.tool.insertPlaceholder2'))
-    expect(mockInsertNodes.mock.calls[1][0][0]).toMatchObject({ text: '/' })
+    expect(mockInsertNodes.mock.calls[1]![0][0]).toMatchObject({ text: '/' })
     expect(mockDispatchCommand).toHaveBeenNthCalledWith(2, 'FOCUS_COMMAND', undefined)
   })
 
@@ -59,10 +59,10 @@ describe('tool/mixed-variable-text-input/placeholder', () => {
       />,
     )
 
-    expect(screen.getByText('workflow.nodes.tool.insertPlaceholder1')).toBeInTheDocument()
+    expect(screen.getByText('workflow.nodes.tool.insertPlaceholder1'))!.toBeInTheDocument()
     expect(screen.queryByText('workflow.nodes.tool.insertPlaceholder2')).not.toBeInTheDocument()
     expect(screen.queryByText('String')).not.toBeInTheDocument()
-    expect(container.firstChild).toHaveClass('items-start')
-    expect(container.firstChild).toHaveClass('py-1')
+    expect(container.firstChild)!.toHaveClass('items-start')
+    expect(container.firstChild)!.toHaveClass('py-1')
   })
 })
diff --git a/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/index.spec.tsx
index 4db6808c14..95c2cdd95d 100644
--- a/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/index.spec.tsx
@@ -79,10 +79,10 @@ describe('tool/tool-form', () => {
       />,
     )
 
-    expect(screen.getByTestId('tool-form-item-api_key')).toBeInTheDocument()
-    expect(screen.getByTestId('tool-form-item-region')).toBeInTheDocument()
+    expect(screen.getByTestId('tool-form-item-api_key'))!.toBeInTheDocument()
+    expect(screen.getByTestId('tool-form-item-region'))!.toBeInTheDocument()
     expect(mockToolFormItem).toHaveBeenCalledTimes(2)
-    expect(mockToolFormItem.mock.calls[0][0]).toMatchObject({
+    expect(mockToolFormItem.mock.calls[0]![0]).toMatchObject({
       readOnly: true,
       nodeId: 'tool-node',
       schema: expect.objectContaining({ variable: 'api_key' }),
@@ -107,7 +107,7 @@ describe('tool/tool-form', () => {
       />,
     )
 
-    expect(container.firstChild).toHaveClass('space-y-1')
+    expect(container.firstChild)!.toHaveClass('space-y-1')
     expect(screen.queryByTestId(/tool-form-item-/)).not.toBeInTheDocument()
     expect(mockToolFormItem).not.toHaveBeenCalled()
   })
diff --git a/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/item.spec.tsx b/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/item.spec.tsx
index 896897a777..e935085fe9 100644
--- a/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/item.spec.tsx
+++ b/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/item.spec.tsx
@@ -103,12 +103,12 @@ describe('tool/tool-form/item', () => {
       />,
     )
 
-    expect(screen.getByText('API Key')).toBeInTheDocument()
-    expect(screen.getByText('*')).toBeInTheDocument()
-    expect(screen.getByText('Enter API key')).toBeInTheDocument()
+    expect(screen.getByText('API Key'))!.toBeInTheDocument()
+    expect(screen.getByText('*'))!.toBeInTheDocument()
+    expect(screen.getByText('Enter API key'))!.toBeInTheDocument()
     expect(screen.queryByRole('button', { name: 'JSON Schema' })).not.toBeInTheDocument()
-    expect(screen.getByTestId('form-input-item')).toHaveAttribute('data-provider-type', 'tool')
-    expect(mockFormInputItem.mock.calls[0][0]).toMatchObject({
+    expect(screen.getByTestId('form-input-item'))!.toHaveAttribute('data-provider-type', 'tool')
+    expect(mockFormInputItem.mock.calls[0]![0]).toMatchObject({
       readOnly: true,
       nodeId: 'tool-node',
       schema: expect.objectContaining({ variable: 'api_key' }),
@@ -140,10 +140,10 @@ describe('tool/tool-form/item', () => {
     )
 
     const link = screen.getByRole('link', { name: 'https://docs.dify.ai/tools' })
-    expect(link).toHaveAttribute('href', 'https://docs.dify.ai/tools')
-    expect(link).toHaveAttribute('target', '_blank')
-    expect(link).toHaveAttribute('rel', 'noopener noreferrer')
-    expect(link.parentElement).toHaveTextContent('Visit https://docs.dify.ai/tools for docs')
+    expect(link)!.toHaveAttribute('href', 'https://docs.dify.ai/tools')
+    expect(link)!.toHaveAttribute('target', '_blank')
+    expect(link)!.toHaveAttribute('rel', 'noopener noreferrer')
+    expect(link.parentElement)!.toHaveTextContent('Visit https://docs.dify.ai/tools for docs')
   })
 
   // Non-text fields keep their descriptions inside the tooltip and support JSON schema preview.
@@ -183,13 +183,13 @@ describe('tool/tool-form/item', () => {
     )
 
     fireEvent.mouseEnter(container.querySelector('svg')?.parentElement as HTMLElement)
-    expect(screen.getByText('Select from tools')).toBeInTheDocument()
+    expect(screen.getByText('Select from tools'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByRole('button', { name: 'JSON Schema' }))
     const schemaModal = screen.getByTestId('schema-modal')
-    expect(schemaModal).toBeInTheDocument()
-    expect(within(schemaModal).getByText('tool_config')).toBeInTheDocument()
-    expect(mockFormInputItem.mock.calls[0][0].providerType).toBe('trigger')
+    expect(schemaModal)!.toBeInTheDocument()
+    expect(within(schemaModal).getByText('tool_config'))!.toBeInTheDocument()
+    expect(mockFormInputItem.mock.calls[0]![0].providerType).toBe('trigger')
 
     fireEvent.click(screen.getByRole('button', { name: 'close-schema' }))
     expect(screen.queryByTestId('schema-modal')).not.toBeInTheDocument()
diff --git a/web/app/components/workflow/nodes/tool/hooks/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/tool/hooks/__tests__/use-single-run-form-params.spec.ts
index 2e0dc13cb3..a0b9a746bf 100644
--- a/web/app/components/workflow/nodes/tool/hooks/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/tool/hooks/__tests__/use-single-run-form-params.spec.ts
@@ -121,12 +121,12 @@ describe('useSingleRunFormParams', () => {
         'prefix {{#tool.result#}}',
       ])
       expect(result.current.forms).toHaveLength(1)
-      expect(result.current.forms[0].inputs).toEqual([
+      expect(result.current.forms[0]!.inputs).toEqual([
         createInputVar('#start.query#'),
         createInputVar(undefined as unknown as string),
         createInputVar('#legacy.answer#'),
       ])
-      expect(result.current.forms[0].values).toEqual({})
+      expect(result.current.forms[0]!.values).toEqual({})
       expect(result.current.toolIcon).toBe('tool-icon')
       expect(result.current.getDependentVars()).toEqual([
         ['start', 'query'],
@@ -159,7 +159,7 @@ describe('useSingleRunFormParams', () => {
       }))
 
       act(() => {
-        result.current.forms[0].onChange({
+        result.current.forms[0]!.onChange({
           query: 'weather',
           tool_parameters: {
             nullable_constant: 'temp-value',
@@ -173,7 +173,7 @@ describe('useSingleRunFormParams', () => {
           nullable_constant: 'temp-value',
         },
       })
-      expect(result.current.forms[0].values).toEqual({
+      expect(result.current.forms[0]!.values).toEqual({
         query: 'weather',
         tool_parameters: {
           nullable_constant: 'temp-value',
diff --git a/web/app/components/workflow/nodes/tool/hooks/use-single-run-form-params.ts b/web/app/components/workflow/nodes/tool/hooks/use-single-run-form-params.ts
index fcef11d578..a7b5687b72 100644
--- a/web/app/components/workflow/nodes/tool/hooks/use-single-run-form-params.ts
+++ b/web/app/components/workflow/nodes/tool/hooks/use-single-run-form-params.ts
@@ -32,7 +32,7 @@ const useSingleRunFormParams = ({
   const { inputs } = useNodeCrud<ToolNodeType>(id, payload)
 
   const hadVarParams = Object.keys(inputs.tool_parameters)
-    .filter(key => inputs.tool_parameters[key].type !== VarType.constant)
+    .filter(key => inputs.tool_parameters[key]!.type !== VarType.constant)
     .map(k => inputs.tool_parameters[k])
 
   const hadVarSettings = Object.keys(inputs.tool_configurations)
@@ -59,7 +59,7 @@ const useSingleRunFormParams = ({
   const inputVarValuesWithConstantValue = useCallback(() => {
     const res = produce(inputVarValues, (draft) => {
       Object.keys(inputs.tool_parameters).forEach((key: string) => {
-        const { type, value } = inputs.tool_parameters[key]
+        const { type, value } = inputs.tool_parameters[key]!
         if (type === VarType.constant && (value === undefined || value === null)) {
           if (!draft.tool_parameters || !draft.tool_parameters[key])
             return
diff --git a/web/app/components/workflow/nodes/tool/output-schema-utils.ts b/web/app/components/workflow/nodes/tool/output-schema-utils.ts
index 630673e3e9..5120aee67b 100644
--- a/web/app/components/workflow/nodes/tool/output-schema-utils.ts
+++ b/web/app/components/workflow/nodes/tool/output-schema-utils.ts
@@ -13,7 +13,7 @@ const resolveDifyCompactTypeString = (typeStr: string): VarType | undefined => {
   const m = /^array\[(string|number|integer|boolean|object|file|any)\]$/i.exec(trimmed)
   if (!m)
     return undefined
-  const inner = m[1].toLowerCase()
+  const inner = m[1]!.toLowerCase()
   const map: Record<string, VarType> = {
     string: VarType.arrayString,
     number: VarType.arrayNumber,
diff --git a/web/app/components/workflow/nodes/trigger-schedule/default.ts b/web/app/components/workflow/nodes/trigger-schedule/default.ts
index 587a125c2d..ba6cd1c686 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/default.ts
+++ b/web/app/components/workflow/nodes/trigger-schedule/default.ts
@@ -12,13 +12,13 @@ const isValidTimeFormat = (time: string): boolean => {
     return false
 
   const [timePart, period] = time.split(' ')
-  const [hour, minute] = timePart.split(':')
-  const hourNum = Number.parseInt(hour, 10)
-  const minuteNum = Number.parseInt(minute, 10)
+  const [hour, minute] = timePart!.split(':')
+  const hourNum = Number.parseInt(hour!, 10)
+  const minuteNum = Number.parseInt(minute!, 10)
 
   return hourNum >= 1 && hourNum <= 12
     && minuteNum >= 0 && minuteNum <= 59
-    && ['AM', 'PM'].includes(period)
+    && ['AM', 'PM'].includes(period!)
 }
 
 const validateHourlyConfig = (config: any, t: any): string => {
diff --git a/web/app/components/workflow/nodes/trigger-schedule/utils/__tests__/integration.spec.ts b/web/app/components/workflow/nodes/trigger-schedule/utils/__tests__/integration.spec.ts
index 9eacc9128d..b4f79b9b97 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/utils/__tests__/integration.spec.ts
+++ b/web/app/components/workflow/nodes/trigger-schedule/utils/__tests__/integration.spec.ts
@@ -49,9 +49,9 @@ describe('cron-parser + execution-time-calculator integration', () => {
         // Results should be identical
         directResult.forEach((directDate, index) => {
           const calcDate = calculatorResult[index]
-          expect(calcDate.getTime()).toBe(directDate.getTime())
-          expect(calcDate.getHours()).toBe(directDate.getHours())
-          expect(calcDate.getMinutes()).toBe(directDate.getMinutes())
+          expect(calcDate!.getTime()).toBe(directDate.getTime())
+          expect(calcDate!.getHours()).toBe(directDate.getHours())
+          expect(calcDate!.getMinutes()).toBe(directDate.getMinutes())
         })
       })
     })
@@ -77,7 +77,7 @@ describe('cron-parser + execution-time-calculator integration', () => {
 
         // Cross-validation: results should be identical
         directResult.forEach((directDate, index) => {
-          expect(calculatorResult[index].getTime()).toBe(directDate.getTime())
+          expect(calculatorResult[index]!.getTime()).toBe(directDate.getTime())
         })
       })
     })
@@ -205,8 +205,8 @@ describe('cron-parser + execution-time-calculator integration', () => {
         expect(calculatorResult.length).toBeGreaterThan(0)
 
         // Results should be consistent
-        expect(calculatorResult[0].getHours()).toBe(directResult[0].getHours())
-        expect(calculatorResult[0].getMinutes()).toBe(directResult[0].getMinutes())
+        expect(calculatorResult[0]!.getHours()).toBe(directResult[0]!.getHours())
+        expect(calculatorResult[0]!.getMinutes()).toBe(directResult[0]!.getMinutes())
       })
     })
   })
@@ -233,7 +233,7 @@ describe('cron-parser + execution-time-calculator integration', () => {
 
       // Results should be identical
       directResult.forEach((directDate, index) => {
-        expect(calculatorResult[index].getTime()).toBe(directDate.getTime())
+        expect(calculatorResult[index]!.getTime()).toBe(directDate.getTime())
       })
     })
 
@@ -264,7 +264,7 @@ describe('cron-parser + execution-time-calculator integration', () => {
         })
 
         // Cross-validate consistency
-        expect(calculatorResult[0].getTime()).toBe(directResult[0].getTime())
+        expect(calculatorResult[0]!.getTime()).toBe(directResult[0]!.getTime())
       })
     })
   })
@@ -293,7 +293,7 @@ describe('cron-parser + execution-time-calculator integration', () => {
 
         // Results should be consistent
         directResult.forEach((directDate, index) => {
-          expect(calculatorResult[index].getTime()).toBe(directDate.getTime())
+          expect(calculatorResult[index]!.getTime()).toBe(directDate.getTime())
         })
       })
     })
@@ -320,7 +320,7 @@ describe('cron-parser + execution-time-calculator integration', () => {
           // Validate consistency where results exist
           const minLength = Math.min(directResult.length, calculatorResult.length)
           for (let i = 0; i < minLength; i++)
-            expect(calculatorResult[i].getTime()).toBe(directResult[i].getTime())
+            expect(calculatorResult[i]!.getTime()).toBe(directResult[i]!.getTime())
         }
       })
     })
diff --git a/web/app/components/workflow/nodes/trigger-schedule/utils/cron-parser.ts b/web/app/components/workflow/nodes/trigger-schedule/utils/cron-parser.ts
index 90f65db0aa..3832f44988 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/utils/cron-parser.ts
+++ b/web/app/components/workflow/nodes/trigger-schedule/utils/cron-parser.ts
@@ -9,12 +9,12 @@ const convertToUserTimezoneRepresentation = (utcDate: Date, timezone: string): D
     hour12: false,
   })
   const [dateStr, timeStr] = userTimeStr.split(', ')
-  const [year, month, day] = dateStr.split('-').map(Number)
-  const [hour, minute, second] = timeStr.split(':').map(Number)
+  const [year, month, day] = dateStr!.split('-').map(Number)
+  const [hour, minute, second] = timeStr!.split(':').map(Number)
 
   // Create a new Date object representing this time as "local" time
   // This matches the behavior expected by the execution-time-calculator
-  return new Date(year, month - 1, day, hour, minute, second)
+  return new Date(year!, month! - 1, day, hour, minute, second)
 }
 
 /**
diff --git a/web/app/components/workflow/nodes/trigger-schedule/utils/execution-time-calculator.ts b/web/app/components/workflow/nodes/trigger-schedule/utils/execution-time-calculator.ts
index c7aaa13f49..72fabae0fc 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/utils/execution-time-calculator.ts
+++ b/web/app/components/workflow/nodes/trigger-schedule/utils/execution-time-calculator.ts
@@ -25,9 +25,9 @@ const getUserTimezoneCurrentTime = (timezone?: string): Date => {
     hour12: false,
   })
   const [dateStr, timeStr] = userTimeStr.split(', ')
-  const [year, month, day] = dateStr.split('-').map(Number)
-  const [hour, minute, second] = timeStr.split(':').map(Number)
-  return new Date(year, month - 1, day, hour, minute, second)
+  const [year, month, day] = dateStr!.split('-').map(Number)
+  const [hour, minute, second] = timeStr!.split(':').map(Number)
+  return new Date(year!, month! - 1, day, hour, minute, second)
 }
 
 // Format date that is already in user timezone, no timezone conversion
@@ -74,7 +74,7 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
   const now = new Date()
   const userTodayStr = now.toLocaleDateString('en-CA', { timeZone: timezone })
   const [year, month, day] = userTodayStr.split('-').map(Number)
-  const userToday = new Date(year, month - 1, day, 0, 0, 0, 0)
+  const userToday = new Date(year!, month! - 1, day, 0, 0, 0, 0)
 
   if (data.frequency === 'hourly') {
     const onMinute = data.visual_config?.on_minute ?? 0
@@ -99,8 +99,8 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
   }
   else if (data.frequency === 'daily') {
     const [time, period] = defaultTime.split(' ')
-    const [hour, minute] = time.split(':')
-    let displayHour = Number.parseInt(hour)
+    const [hour, minute] = time!.split(':')
+    let displayHour = Number.parseInt(hour!)
     if (period === 'PM' && displayHour !== 12)
       displayHour += 12
     if (period === 'AM' && displayHour === 12)
@@ -108,7 +108,7 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
 
     // Check if today's configured time has already passed
     const todayExecution = new Date(userToday)
-    todayExecution.setHours(displayHour, Number.parseInt(minute), 0, 0)
+    todayExecution.setHours(displayHour, Number.parseInt(minute!), 0, 0)
 
     const userCurrentTime = getUserTimezoneCurrentTime(timezone)
 
@@ -117,7 +117,7 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
     for (let i = 0; i < count; i++) {
       const execution = new Date(userToday)
       execution.setDate(userToday.getDate() + startOffset + i)
-      execution.setHours(displayHour, Number.parseInt(minute), 0, 0)
+      execution.setHours(displayHour, Number.parseInt(minute!), 0, 0)
       times.push(execution)
     }
   }
@@ -126,8 +126,8 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
     const dayMap = { sun: 0, mon: 1, tue: 2, wed: 3, thu: 4, fri: 5, sat: 6 }
 
     const [time, period] = defaultTime.split(' ')
-    const [hour, minute] = time.split(':')
-    let displayHour = Number.parseInt(hour)
+    const [hour, minute] = time!.split(':')
+    let displayHour = Number.parseInt(hour!)
     if (period === 'PM' && displayHour !== 12)
       displayHour += 12
     if (period === 'AM' && displayHour === 12)
@@ -157,7 +157,7 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
 
         // Check if today's configured time has already passed
         const todayAtTargetTime = new Date(userToday)
-        todayAtTargetTime.setHours(displayHour, Number.parseInt(minute), 0, 0)
+        todayAtTargetTime.setHours(displayHour, Number.parseInt(minute!), 0, 0)
 
         let adjustedDays = daysUntilTarget
         if (daysUntilTarget === 0 && todayAtTargetTime <= userCurrentTime)
@@ -165,7 +165,7 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
 
         const execution = new Date(userToday)
         execution.setDate(userToday.getDate() + adjustedDays + (weekOffset * 7))
-        execution.setHours(displayHour, Number.parseInt(minute), 0, 0)
+        execution.setHours(displayHour, Number.parseInt(minute!), 0, 0)
 
         // Only add if execution time is in the future
         if (execution > userCurrentTime) {
@@ -191,8 +191,8 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
 
     const selectedDays = [...new Set(getSelectedDays())]
     const [time, period] = defaultTime.split(' ')
-    const [hour, minute] = time.split(':')
-    let displayHour = Number.parseInt(hour)
+    const [hour, minute] = time!.split(':')
+    let displayHour = Number.parseInt(hour!)
     if (period === 'PM' && displayHour !== 12)
       displayHour += 12
     if (period === 'AM' && displayHour === 12)
@@ -230,7 +230,7 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
 
         processedDays.add(targetDay)
 
-        const execution = new Date(targetMonth.getFullYear(), targetMonth.getMonth(), targetDay, displayHour, Number.parseInt(minute), 0, 0)
+        const execution = new Date(targetMonth.getFullYear(), targetMonth.getMonth(), targetDay, displayHour, Number.parseInt(minute!), 0, 0)
 
         // Only add if execution time is in the future
         if (execution > userCurrentTime)
@@ -295,5 +295,5 @@ export const getNextExecutionTime = (data: ScheduleTriggerNodeType): string => {
 
   // Format the first execution time without timezone for node display
   const includeWeekday = data.mode === 'visual' && data.frequency === 'weekly'
-  return formatExecutionTime(times[0], timezone, includeWeekday, false) // Node doesn't show timezone
+  return formatExecutionTime(times[0]!, timezone, includeWeekday, false) // Node doesn't show timezone
 }
diff --git a/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/generic-table.spec.tsx b/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/generic-table.spec.tsx
index 6cb2eb13bb..f191fbb687 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/generic-table.spec.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/generic-table.spec.tsx
@@ -100,8 +100,8 @@ describe('GenericTable', () => {
     expect(inputs).toHaveLength(3)
     expect(screen.getAllByRole('button', { name: 'Delete row' })).toHaveLength(2)
 
-    const blurSpy = vi.spyOn(inputs[0], 'blur')
-    fireEvent.keyDown(inputs[0], { key: 'Enter' })
+    const blurSpy = vi.spyOn(inputs[0]!, 'blur')
+    fireEvent.keyDown(inputs[0]!, { key: 'Enter' })
     expect(blurSpy).toHaveBeenCalledTimes(1)
   })
 
@@ -120,9 +120,9 @@ describe('GenericTable', () => {
       />,
     )
 
-    expect(screen.getByText('Name')).toBeInTheDocument()
+    expect(screen.getByText('Name'))!.toBeInTheDocument()
 
-    await user.click(screen.getAllByRole('checkbox')[0])
+    await user.click(screen.getAllByRole('checkbox')[0]!)
     expect(onChange).toHaveBeenCalledWith([{ name: 'alpha', enabled: true }])
 
     await user.click(screen.getByRole('button', { name: 'Delete row' }))
@@ -158,11 +158,11 @@ describe('GenericTable', () => {
 
     await waitFor(() => {
       expect(onChange).toHaveBeenCalledWith([{ method: 'post', preview: '' }])
-      expect(screen.getByRole('button', { name: 'POST' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'POST' }))!.toBeInTheDocument()
     })
 
     onChange.mockClear()
-    await user.click(screen.getAllByRole('button', { name: 'custom-render' })[0])
+    await user.click(screen.getAllByRole('button', { name: 'custom-render' })[0]!)
 
     await waitFor(() => {
       expect(onChange).toHaveBeenCalledWith([{ method: 'post', preview: '0:post' }])
@@ -202,7 +202,7 @@ describe('GenericTable', () => {
       />,
     )
 
-    expect(screen.getByText('No data')).toBeInTheDocument()
+    expect(screen.getByText('No data'))!.toBeInTheDocument()
     expect(screen.queryByRole('textbox')).not.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/header-table.spec.tsx b/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/header-table.spec.tsx
index 97e3da98d8..22e89b3cf1 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/header-table.spec.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/header-table.spec.tsx
@@ -19,14 +19,14 @@ describe('trigger-webhook/header-table', () => {
       />,
     )
 
-    fireEvent.change(screen.getAllByRole('textbox')[0], { target: { value: 'Auth Token' } })
+    fireEvent.change(screen.getAllByRole('textbox')[0]!, { target: { value: 'Auth Token' } })
     expect(onChange).toHaveBeenLastCalledWith([{
       name: 'Auth_Token',
       required: false,
     }])
 
     onChange.mockClear()
-    await user.click(screen.getAllByRole('checkbox')[0])
+    await user.click(screen.getAllByRole('checkbox')[0]!)
 
     expect(onChange).toHaveBeenCalledWith([{
       name: 'x-request-id',
@@ -43,7 +43,7 @@ describe('trigger-webhook/header-table', () => {
       />,
     )
 
-    expect(screen.getByDisplayValue('authorization')).toBeDisabled()
+    expect(screen.getByDisplayValue('authorization'))!.toBeDisabled()
     expect(screen.getAllByRole('checkbox')).toHaveLength(1)
   })
 })
diff --git a/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/parameter-table.spec.tsx b/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/parameter-table.spec.tsx
index 47da11f650..9e0053b761 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/parameter-table.spec.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/components/__tests__/parameter-table.spec.tsx
@@ -56,7 +56,7 @@ describe('trigger-webhook/parameter-table', () => {
     })
 
     onChange.mockClear()
-    await user.click(screen.getAllByRole('checkbox')[0])
+    await user.click(screen.getAllByRole('checkbox')[0]!)
 
     expect(onChange).toHaveBeenCalledWith([{
       name: 'page',
@@ -82,7 +82,7 @@ describe('trigger-webhook/parameter-table', () => {
       />,
     )
 
-    await user.click(screen.getAllByRole('checkbox')[0])
+    await user.click(screen.getAllByRole('checkbox')[0]!)
 
     expect(onChange).toHaveBeenCalledWith([{
       name: 'message',
diff --git a/web/app/components/workflow/nodes/trigger-webhook/components/parameter-table.tsx b/web/app/components/workflow/nodes/trigger-webhook/components/parameter-table.tsx
index baf5f26d73..11e9265a4b 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/components/parameter-table.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/components/parameter-table.tsx
@@ -58,7 +58,7 @@ const ParameterTable: FC<ParameterTableProps> = ({
   ]
 
   // Choose sensible default type for new rows according to content type
-  const defaultTypeValue: VarType = typeOptions[0]?.value || 'string'
+  const defaultTypeValue: VarType = typeOptions[0]?.value! || 'string'
 
   // Empty row template for new rows
   const emptyRowData: GenericTableRow = {
diff --git a/web/app/components/workflow/nodes/variable-assigner/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/variable-assigner/__tests__/use-single-run-form-params.spec.ts
index daa710a956..acb5c8204f 100644
--- a/web/app/components/workflow/nodes/variable-assigner/__tests__/use-single-run-form-params.spec.ts
+++ b/web/app/components/workflow/nodes/variable-assigner/__tests__/use-single-run-form-params.spec.ts
@@ -70,7 +70,7 @@ describe('variable-assigner/use-single-run-form-params', () => {
       ['source-node', 'uniqueVar'],
       ['source-node', 'sharedVar'],
     ])
-    expect(result.current.forms[0].inputs).toEqual([
+    expect(result.current.forms[0]!.inputs).toEqual([
       {
         label: 'Shared',
         variable: 'sharedVar',
@@ -85,7 +85,7 @@ describe('variable-assigner/use-single-run-form-params', () => {
       },
     ])
 
-    result.current.forms[0].onChange({ sharedVar: 'updated' })
+    result.current.forms[0]!.onChange({ sharedVar: 'updated' })
 
     expect(setRunInputData).toHaveBeenCalledWith({ sharedVar: 'updated' })
     expect(result.current.getDependentVars()).toEqual([
diff --git a/web/app/components/workflow/nodes/variable-assigner/components/__tests__/node-group-item.spec.tsx b/web/app/components/workflow/nodes/variable-assigner/components/__tests__/node-group-item.spec.tsx
index 7fd29a5b38..4f400db572 100644
--- a/web/app/components/workflow/nodes/variable-assigner/components/__tests__/node-group-item.spec.tsx
+++ b/web/app/components/workflow/nodes/variable-assigner/components/__tests__/node-group-item.spec.tsx
@@ -94,8 +94,8 @@ describe('variable-assigner/node-group-item', () => {
       },
     )
 
-    expect(screen.getByText('workflow.nodes.variableAssigner.varNotSet')).toBeInTheDocument()
-    expect(container.querySelector('.relative.rounded-lg')).toHaveClass('border-text-accent!')
+    expect(screen.getByText('workflow.nodes.variableAssigner.varNotSet'))!.toBeInTheDocument()
+    expect(container.querySelector('.relative.rounded-lg'))!.toHaveClass('border-text-accent!')
     expect(mockGetAvailableVars).toHaveBeenCalledWith(
       'assigner-node',
       'group-1',
@@ -103,7 +103,7 @@ describe('variable-assigner/node-group-item', () => {
       true,
     )
 
-    const filter = mockGetAvailableVars.mock.calls[0][2] as (payload: { type: VarType }) => boolean
+    const filter = mockGetAvailableVars.mock.calls[0]![2] as (payload: { type: VarType }) => boolean
     expect(filter({ type: VarType.string })).toBe(true)
     expect(filter({ type: VarType.number })).toBe(false)
 
@@ -142,13 +142,13 @@ describe('variable-assigner/node-group-item', () => {
       },
     )
 
-    expect(container.querySelector('.relative.rounded-lg')).toHaveClass('border-dashed!')
-    expect(screen.getByText('Start')).toBeInTheDocument()
-    expect(screen.getByText('query')).toBeInTheDocument()
-    expect(screen.getByText('Source Node')).toBeInTheDocument()
-    expect(screen.getByText('answer')).toBeInTheDocument()
+    expect(container.querySelector('.relative.rounded-lg'))!.toHaveClass('border-dashed!')
+    expect(screen.getByText('Start'))!.toBeInTheDocument()
+    expect(screen.getByText('query'))!.toBeInTheDocument()
+    expect(screen.getByText('Source Node'))!.toBeInTheDocument()
+    expect(screen.getByText('answer'))!.toBeInTheDocument()
 
-    const filter = mockGetAvailableVars.mock.calls[0][2] as (payload: { type: VarType }) => boolean
+    const filter = mockGetAvailableVars.mock.calls[0]![2] as (payload: { type: VarType }) => boolean
     expect(filter({ type: VarType.number })).toBe(true)
     expect(filter({ type: VarType.string })).toBe(false)
   })
@@ -178,7 +178,7 @@ describe('variable-assigner/node-group-item', () => {
     expect(container.querySelector('.relative.rounded-lg')).not.toHaveClass('border-dashed!')
     expect(container.querySelector('.relative.rounded-lg')).not.toHaveClass('border-text-accent!')
 
-    const filter = mockGetAvailableVars.mock.calls[0][2] as (payload: { type: VarType }) => boolean
+    const filter = mockGetAvailableVars.mock.calls[0]![2] as (payload: { type: VarType }) => boolean
     expect(filter({ type: VarType.boolean })).toBe(true)
     expect(filter({ type: VarType.string })).toBe(false)
   })
diff --git a/web/app/components/workflow/nodes/variable-assigner/components/node-group-item.tsx b/web/app/components/workflow/nodes/variable-assigner/components/node-group-item.tsx
index 32a6af9eef..24621701d1 100644
--- a/web/app/components/workflow/nodes/variable-assigner/components/node-group-item.tsx
+++ b/web/app/components/workflow/nodes/variable-assigner/components/node-group-item.tsx
@@ -64,7 +64,7 @@ const NodeGroupItem = ({
       if (hoveringAssignVariableGroupId)
         return hoveringAssignVariableGroupId !== item.targetHandleId
       else
-        return enteringNodePayload?.nodeData.advanced_settings?.groups[0].groupId !== item.targetHandleId
+        return enteringNodePayload?.nodeData.advanced_settings?.groups[0]!.groupId !== item.targetHandleId
     }
 
     return false
@@ -74,7 +74,7 @@ const NodeGroupItem = ({
       if (hoveringAssignVariableGroupId)
         return hoveringAssignVariableGroupId === item.targetHandleId
       else
-        return enteringNodePayload?.nodeData.advanced_settings?.groups[0].groupId === item.targetHandleId
+        return enteringNodePayload?.nodeData.advanced_settings?.groups[0]!.groupId === item.targetHandleId
     }
 
     return false
diff --git a/web/app/components/workflow/nodes/variable-assigner/use-config.helpers.ts b/web/app/components/workflow/nodes/variable-assigner/use-config.helpers.ts
index 2cc91c65ac..809ba21808 100644
--- a/web/app/components/workflow/nodes/variable-assigner/use-config.helpers.ts
+++ b/web/app/components/workflow/nodes/variable-assigner/use-config.helpers.ts
@@ -34,7 +34,7 @@ export const updateNestedVarGroupItem = (
     return
 
   draft.advanced_settings.groups[index] = {
-    ...draft.advanced_settings.groups[index],
+    ...draft.advanced_settings.groups[index]!,
     ...payload,
   }
 })
@@ -72,8 +72,8 @@ export const toggleGroupEnabled = ({
     }
   }
   else if (draft.advanced_settings.groups.length > 0) {
-    draft.output_type = draft.advanced_settings.groups[0].output_type
-    draft.variables = draft.advanced_settings.groups[0].variables
+    draft.output_type = draft.advanced_settings.groups[0]!.output_type
+    draft.variables = draft.advanced_settings.groups[0]!.variables
   }
 
   draft.advanced_settings.group_enabled = enabled
@@ -85,7 +85,7 @@ export const addGroup = (inputs: VariableAssignerNodeType) => {
   groups.forEach((item) => {
     const match = /(\d+)$/.exec(item.group_name)
     if (match) {
-      const num = Number.parseInt(match[1], 10)
+      const num = Number.parseInt(match[1]!, 10)
       if (num > maxInGroupName)
         maxInGroupName = num
     }
@@ -116,5 +116,5 @@ export const renameGroup = (
   if (index < 0)
     return
 
-  draft.advanced_settings.groups[index].group_name = name
+  draft.advanced_settings.groups[index]!.group_name = name
 })
diff --git a/web/app/components/workflow/nodes/variable-assigner/use-config.ts b/web/app/components/workflow/nodes/variable-assigner/use-config.ts
index cecf185d4f..08ccc3d42f 100644
--- a/web/app/components/workflow/nodes/variable-assigner/use-config.ts
+++ b/web/app/components/workflow/nodes/variable-assigner/use-config.ts
@@ -59,7 +59,7 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => {
       if (index < 0)
         return
 
-      const groupName = groups[index].group_name
+      const groupName = groups[index]!.group_name
       if (isVarUsedInNodes([id, groupName, 'output'])) {
         showRemoveVarConfirm()
         setRemovedVars([[id, groupName, 'output']])
@@ -89,7 +89,7 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => {
         }
       }
 
-      handleOutVarRenameChange(id, [id, groups[0].group_name, 'output'], [id, 'output'])
+      handleOutVarRenameChange(id, [id, groups[0]!.group_name, 'output'], [id, 'output'])
     }
 
     setInputs(toggleGroupEnabled({ inputs, enabled }))
@@ -109,7 +109,7 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => {
   } = useDebounceFn(
     (id: string, newName: string) => {
       const oldName = oldNameRef.current[id]
-      renameInspectVarName(id, oldName, newName)
+      renameInspectVarName(id, oldName!, newName)
       delete oldNameRef.current[id]
     },
     { wait: 500 },
@@ -122,7 +122,7 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => {
       if (index < 0)
         return
 
-      const oldName = groups[index].group_name
+      const oldName = groups[index]!.group_name
       handleOutVarRenameChange(id, [id, oldName, 'output'], [id, name, 'output'])
       setInputs(renameGroup(inputs, groupId, name))
       if (!(id in oldNameRef.current))
diff --git a/web/app/components/workflow/note-node/index.tsx b/web/app/components/workflow/note-node/index.tsx
index bfaadff387..5050041a05 100644
--- a/web/app/components/workflow/note-node/index.tsx
+++ b/web/app/components/workflow/note-node/index.tsx
@@ -60,8 +60,8 @@ const NoteNode = ({
     <div
       className={cn(
         'relative flex flex-col rounded-md border shadow-xs hover:shadow-md',
-        THEME_MAP[theme].bg,
-        data.selected ? THEME_MAP[theme].border : 'border-black/5',
+        THEME_MAP[theme]!.bg,
+        data.selected ? THEME_MAP[theme]!.border : 'border-black/5',
       )}
       style={{
         width: data.width,
@@ -89,7 +89,7 @@ const NoteNode = ({
           <div
             className={cn(
               'h-2 shrink-0 rounded-t-md opacity-50',
-              THEME_MAP[theme].title,
+              THEME_MAP[theme]!.title,
             )}
           >
           </div>
diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx
index da5b1d3b9a..e8c5055962 100644
--- a/web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx
+++ b/web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx
@@ -14,33 +14,33 @@ import { NoteTheme } from '../../types'
 export const COLOR_LIST = [
   {
     key: NoteTheme.blue,
-    inner: THEME_MAP[NoteTheme.blue].title,
-    outer: THEME_MAP[NoteTheme.blue].outer,
+    inner: THEME_MAP[NoteTheme.blue]!.title,
+    outer: THEME_MAP[NoteTheme.blue]!.outer,
   },
   {
     key: NoteTheme.cyan,
-    inner: THEME_MAP[NoteTheme.cyan].title,
-    outer: THEME_MAP[NoteTheme.cyan].outer,
+    inner: THEME_MAP[NoteTheme.cyan]!.title,
+    outer: THEME_MAP[NoteTheme.cyan]!.outer,
   },
   {
     key: NoteTheme.green,
-    inner: THEME_MAP[NoteTheme.green].title,
-    outer: THEME_MAP[NoteTheme.green].outer,
+    inner: THEME_MAP[NoteTheme.green]!.title,
+    outer: THEME_MAP[NoteTheme.green]!.outer,
   },
   {
     key: NoteTheme.yellow,
-    inner: THEME_MAP[NoteTheme.yellow].title,
-    outer: THEME_MAP[NoteTheme.yellow].outer,
+    inner: THEME_MAP[NoteTheme.yellow]!.title,
+    outer: THEME_MAP[NoteTheme.yellow]!.outer,
   },
   {
     key: NoteTheme.pink,
-    inner: THEME_MAP[NoteTheme.pink].title,
-    outer: THEME_MAP[NoteTheme.pink].outer,
+    inner: THEME_MAP[NoteTheme.pink]!.title,
+    outer: THEME_MAP[NoteTheme.pink]!.outer,
   },
   {
     key: NoteTheme.violet,
-    inner: THEME_MAP[NoteTheme.violet].title,
-    outer: THEME_MAP[NoteTheme.violet].outer,
+    inner: THEME_MAP[NoteTheme.violet]!.title,
+    outer: THEME_MAP[NoteTheme.violet]!.outer,
   },
 ]
 
@@ -70,7 +70,7 @@ const ColorPicker = ({
           <div
             className={cn(
               'h-4 w-4 rounded-full border border-black/5',
-              THEME_MAP[theme].title,
+              THEME_MAP[theme]!.title,
             )}
           >
           </div>
diff --git a/web/app/components/workflow/operator/index.tsx b/web/app/components/workflow/operator/index.tsx
index e41d506022..d13758c87d 100644
--- a/web/app/components/workflow/operator/index.tsx
+++ b/web/app/components/workflow/operator/index.tsx
@@ -57,7 +57,7 @@ const Operator = ({ handleUndo, handleRedo }: OperatorProps) => {
     if (bottomPanelRef.current) {
       const resizeContainerObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
-          const { inlineSize, blockSize } = entry.borderBoxSize[0]
+          const { inlineSize, blockSize } = entry.borderBoxSize[0]!
           setBottomPanelWidth(inlineSize)
           setBottomPanelHeight(blockSize)
         }
diff --git a/web/app/components/workflow/panel/__tests__/human-input-filled-form-list.spec.tsx b/web/app/components/workflow/panel/__tests__/human-input-filled-form-list.spec.tsx
index 19edbecf5f..e3d0557180 100644
--- a/web/app/components/workflow/panel/__tests__/human-input-filled-form-list.spec.tsx
+++ b/web/app/components/workflow/panel/__tests__/human-input-filled-form-list.spec.tsx
@@ -31,12 +31,12 @@ describe('HumanInputFilledFormList', () => {
       />,
     )
 
-    expect(screen.getByText('Approval')).toBeInTheDocument()
-    expect(screen.getByText('Review')).toBeInTheDocument()
+    expect(screen.getByText('Approval'))!.toBeInTheDocument()
+    expect(screen.getByText('Review'))!.toBeInTheDocument()
     expect(screen.getAllByTestId('submitted-content')).toHaveLength(2)
     expect(screen.getAllByTestId('executed-action')).toHaveLength(2)
 
-    await user.click(screen.getAllByTestId('expand-icon')[0])
+    await user.click(screen.getAllByTestId('expand-icon')[0]!)
 
     expect(screen.getAllByTestId('submitted-content')).toHaveLength(1)
   })
diff --git a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-resume.spec.ts b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-resume.spec.ts
index 328de5a0af..04c19f50e9 100644
--- a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-resume.spec.ts
+++ b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-resume.spec.ts
@@ -502,8 +502,8 @@ describe('useChat – handleResume', () => {
 
       let answer = result.current.chatList.find(item => item.id === 'msg-resume')
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
-      expect(answer!.workflowProcess!.tracing[0].id).toBe('iter-r1')
-      expect(answer!.workflowProcess!.tracing[0].status).toBe('running')
+      expect(answer!.workflowProcess!.tracing[0]!.id).toBe('iter-r1')
+      expect(answer!.workflowProcess!.tracing[0]!.status).toBe('running')
 
       act(() => {
         capturedResumeOptions.onIterationFinish({
@@ -513,7 +513,7 @@ describe('useChat – handleResume', () => {
 
       answer = result.current.chatList.find(item => item.id === 'msg-resume')
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
-      expect(answer!.workflowProcess!.tracing[0].status).toBe('succeeded')
+      expect(answer!.workflowProcess!.tracing[0]!.status).toBe('succeeded')
     })
 
     it('should handle iteration finish when no match found', async () => {
@@ -539,8 +539,8 @@ describe('useChat – handleResume', () => {
 
       let answer = result.current.chatList.find(item => item.id === 'msg-resume')
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
-      expect(answer!.workflowProcess!.tracing[0].id).toBe('loop-r1')
-      expect(answer!.workflowProcess!.tracing[0].status).toBe('running')
+      expect(answer!.workflowProcess!.tracing[0]!.id).toBe('loop-r1')
+      expect(answer!.workflowProcess!.tracing[0]!.status).toBe('running')
 
       act(() => {
         capturedResumeOptions.onLoopFinish({
@@ -550,7 +550,7 @@ describe('useChat – handleResume', () => {
 
       answer = result.current.chatList.find(item => item.id === 'msg-resume')
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
-      expect(answer!.workflowProcess!.tracing[0].status).toBe('succeeded')
+      expect(answer!.workflowProcess!.tracing[0]!.status).toBe('succeeded')
     })
 
     it('should handle loop finish when no match found', async () => {
@@ -661,8 +661,8 @@ describe('useChat – handleResume', () => {
       const answer = result.current.chatList.find(item => item.id === 'msg-resume')
       const matchingTraces = answer!.workflowProcess!.tracing.filter((t: any) => t.node_id === 'rn-1')
       expect(matchingTraces).toHaveLength(1)
-      expect(matchingTraces[0].id).toBe('rtrace-1-v2')
-      expect(matchingTraces[0].status).toBe('running')
+      expect(matchingTraces[0]!.id).toBe('rtrace-1-v2')
+      expect(matchingTraces[0]!.status).toBe('running')
     })
 
     it('should match nodeFinished with parallel_id', async () => {
@@ -956,9 +956,9 @@ describe('useChat – handleResume with bare prevChatTree (no humanInputFormData
 
     const answer = result.current.chatList.find(item => item.id === 'bare-msg-nt')
     expect(answer!.workflowProcess!.tracing).toHaveLength(1)
-    expect(answer!.workflowProcess!.tracing[0].id).toBe('loop-bare')
-    expect(answer!.workflowProcess!.tracing[0].node_id).toBe('n-loop-bare')
-    expect(answer!.workflowProcess!.tracing[0].status).toBe('running')
+    expect(answer!.workflowProcess!.tracing[0]!.id).toBe('loop-bare')
+    expect(answer!.workflowProcess!.tracing[0]!.node_id).toBe('n-loop-bare')
+    expect(answer!.workflowProcess!.tracing[0]!.status).toBe('running')
   })
 
   it('onLoopFinish should return early when no tracing', () => {
@@ -982,9 +982,9 @@ describe('useChat – handleResume with bare prevChatTree (no humanInputFormData
 
     const answer = result.current.chatList.find(item => item.id === 'bare-msg-nt')
     expect(answer!.workflowProcess!.tracing).toHaveLength(1)
-    expect(answer!.workflowProcess!.tracing[0].id).toBe('iter-bare')
-    expect(answer!.workflowProcess!.tracing[0].node_id).toBe('n-iter-bare')
-    expect(answer!.workflowProcess!.tracing[0].status).toBe('running')
+    expect(answer!.workflowProcess!.tracing[0]!.id).toBe('iter-bare')
+    expect(answer!.workflowProcess!.tracing[0]!.node_id).toBe('n-iter-bare')
+    expect(answer!.workflowProcess!.tracing[0]!.status).toBe('running')
   })
 
   it('onIterationFinish should return early when no tracing', () => {
@@ -1008,9 +1008,9 @@ describe('useChat – handleResume with bare prevChatTree (no humanInputFormData
 
     const answer = result.current.chatList.find(item => item.id === 'bare-msg-nt')
     expect(answer!.workflowProcess!.tracing).toHaveLength(1)
-    expect(answer!.workflowProcess!.tracing[0].id).toBe('rtrace-bare')
-    expect(answer!.workflowProcess!.tracing[0].node_id).toBe('rn-bare')
-    expect(answer!.workflowProcess!.tracing[0].status).toBe('running')
+    expect(answer!.workflowProcess!.tracing[0]!.id).toBe('rtrace-bare')
+    expect(answer!.workflowProcess!.tracing[0]!.node_id).toBe('rn-bare')
+    expect(answer!.workflowProcess!.tracing[0]!.status).toBe('running')
   })
 
   it('onNodeFinished should return early when no tracing', () => {
diff --git a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-send.spec.ts b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-send.spec.ts
index 1acd563622..0f6ae5d713 100644
--- a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-send.spec.ts
+++ b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-send.spec.ts
@@ -83,7 +83,7 @@ describe('useChat – handleSend', () => {
     })
 
     expect(mockHandleRun).toHaveBeenCalledTimes(1)
-    const [bodyParams] = mockHandleRun.mock.calls[0]
+    const [bodyParams] = (mockHandleRun.mock.calls[0] ?? []) as [any]
     expect(bodyParams.query).toBe('hello')
   })
 
@@ -166,7 +166,7 @@ describe('useChat – handleSend', () => {
     })
 
     expect(mockHandleRun).toHaveBeenCalledTimes(1)
-    const [bodyParams] = mockHandleRun.mock.calls[0]
+    const [bodyParams] = (mockHandleRun.mock.calls[0] ?? []) as [any]
     const localFile = bodyParams.files.find((f: any) => f.transfer_method === 'local_file')
     const remoteFile = bodyParams.files.find((f: any) => f.transfer_method === 'remote_url')
     expect(localFile.url).toBe('')
diff --git a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/opening-statement.spec.ts b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/opening-statement.spec.ts
index 9fdfc3bbd4..57db5502b5 100644
--- a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/opening-statement.spec.ts
+++ b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/opening-statement.spec.ts
@@ -88,7 +88,7 @@ describe('workflow debug useChat – opening statement stability', () => {
   it('should use stable id "opening-statement" instead of Date.now()', () => {
     const config = { opening_statement: 'Welcome!' }
     const { result } = renderHook(() => useChat(config))
-    expect(result.current.chatList[0].id).toBe('opening-statement')
+    expect(result.current.chatList[0]!.id).toBe('opening-statement')
   })
 
   it('should preserve reference when inputs change but produce identical content', () => {
@@ -104,7 +104,7 @@ describe('workflow debug useChat – opening statement stability', () => {
     )
 
     const openerBefore = result.current.chatList[0]
-    expect(openerBefore.content).toBe('Hello Alice')
+    expect(openerBefore!.content).toBe('Hello Alice')
 
     rerender({ fs: { inputs: { name: 'Alice' }, inputsForm: [] } })
 
@@ -124,12 +124,12 @@ describe('workflow debug useChat – opening statement stability', () => {
     )
 
     const openerBefore = result.current.chatList[0]
-    expect(openerBefore.content).toBe('Hello Alice')
+    expect(openerBefore!.content).toBe('Hello Alice')
 
     rerender({ fs: { inputs: { name: 'Bob' }, inputsForm: [] } })
 
     const openerAfter = result.current.chatList[0]
-    expect(openerAfter.content).toBe('Hello Bob')
+    expect(openerAfter!.content).toBe('Hello Bob')
     expect(openerAfter).not.toBe(openerBefore)
   })
 
@@ -152,7 +152,7 @@ describe('workflow debug useChat – opening statement stability', () => {
     )
 
     const openerBefore = result.current.chatList[0]
-    expect(openerBefore.content).toBe('Updated welcome')
+    expect(openerBefore!.content).toBe('Updated welcome')
 
     rerender({ cfg: config })
 
@@ -167,13 +167,13 @@ describe('workflow debug useChat – opening statement stability', () => {
     }
     const { result } = renderHook(() => useChat(config))
     const opener = result.current.chatList[0]
-    expect(opener.suggestedQuestions).toEqual(['How are you?', 'What can you do?'])
+    expect(opener!.suggestedQuestions).toEqual(['How are you?', 'What can you do?'])
   })
 
   it('should not include suggestedQuestions when config has none', () => {
     const config = { opening_statement: 'Welcome!' }
     const { result } = renderHook(() => useChat(config))
     const opener = result.current.chatList[0]
-    expect(opener.suggestedQuestions).toBeUndefined()
+    expect(opener!.suggestedQuestions).toBeUndefined()
   })
 })
diff --git a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/sse-callbacks.spec.ts b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/sse-callbacks.spec.ts
index 8ab2a27560..03857ce3d6 100644
--- a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/sse-callbacks.spec.ts
+++ b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/sse-callbacks.spec.ts
@@ -494,9 +494,9 @@ describe('useChat – handleSend SSE callbacks', () => {
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
       const trace = answer!.workflowProcess!.tracing[0]
-      expect(trace.id).toBe('iter-1')
-      expect(trace.node_id).toBe('n-iter')
-      expect(trace.status).toBe('running')
+      expect(trace!.id).toBe('iter-1')
+      expect(trace!.node_id).toBe('n-iter')
+      expect(trace!.status).toBe('running')
     })
 
     it('should update matching tracing on finish', () => {
@@ -558,9 +558,9 @@ describe('useChat – handleSend SSE callbacks', () => {
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
       const trace = answer!.workflowProcess!.tracing[0]
-      expect(trace.id).toBe('loop-1')
-      expect(trace.node_id).toBe('n-loop')
-      expect(trace.status).toBe('running')
+      expect(trace!.id).toBe('loop-1')
+      expect(trace!.node_id).toBe('n-loop')
+      expect(trace!.status).toBe('running')
     })
 
     it('should update matching tracing on finish', () => {
@@ -582,8 +582,8 @@ describe('useChat – handleSend SSE callbacks', () => {
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
       const trace = answer!.workflowProcess!.tracing[0]
-      expect(trace.id).toBe('loop-1')
-      expect(trace.node_id).toBe('n-loop')
+      expect(trace!.id).toBe('loop-1')
+      expect(trace!.node_id).toBe('n-loop')
       expect((trace as any).output).toBe('done')
     })
 
@@ -618,9 +618,9 @@ describe('useChat – handleSend SSE callbacks', () => {
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
       const trace = answer!.workflowProcess!.tracing[0]
-      expect(trace.id).toBe('trace-1')
-      expect(trace.node_id).toBe('node-1')
-      expect(trace.status).toBe('running')
+      expect(trace!.id).toBe('trace-1')
+      expect(trace!.node_id).toBe('node-1')
+      expect(trace!.status).toBe('running')
     })
 
     it('should update existing tracing entry with same node_id', () => {
@@ -632,9 +632,9 @@ describe('useChat – handleSend SSE callbacks', () => {
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
       const trace = answer!.workflowProcess!.tracing[0]
-      expect(trace.id).toBe('trace-1-v2')
-      expect(trace.node_id).toBe('node-1')
-      expect(trace.status).toBe('running')
+      expect(trace!.id).toBe('trace-1-v2')
+      expect(trace!.node_id).toBe('node-1')
+      expect(trace!.status).toBe('running')
     })
 
     it('should push retry data to tracing', () => {
@@ -650,8 +650,8 @@ describe('useChat – handleSend SSE callbacks', () => {
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
       const trace = answer!.workflowProcess!.tracing[0]
-      expect(trace.id).toBe('retry-1')
-      expect(trace.node_id).toBe('node-1')
+      expect(trace!.id).toBe('retry-1')
+      expect(trace!.node_id).toBe('node-1')
       expect((trace as any).retry_index).toBe(1)
     })
 
@@ -669,8 +669,8 @@ describe('useChat – handleSend SSE callbacks', () => {
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
       const trace = answer!.workflowProcess!.tracing[0]
-      expect(trace.id).toBe('trace-1')
-      expect(trace.status).toBe('succeeded')
+      expect(trace!.id).toBe('trace-1')
+      expect(trace!.status).toBe('succeeded')
       expect((trace as any).outputs).toEqual({ text: 'done' })
     })
 
@@ -688,8 +688,8 @@ describe('useChat – handleSend SSE callbacks', () => {
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.workflowProcess!.tracing).toHaveLength(1)
       const trace = answer!.workflowProcess!.tracing[0]
-      expect(trace.id).toBe('trace-1')
-      expect(trace.status).toBe('running')
+      expect(trace!.id).toBe('trace-1')
+      expect(trace!.status).toBe('running')
     })
   })
 
@@ -790,7 +790,7 @@ describe('useChat – handleSend SSE callbacks', () => {
 
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.humanInputFormDataList).toHaveLength(1)
-      expect(answer!.humanInputFormDataList![0].node_id).toBe('human-node')
+      expect(answer!.humanInputFormDataList![0]!.node_id).toBe('human-node')
       expect((answer!.humanInputFormDataList![0] as any).form_token).toBe('token-1')
     })
 
@@ -834,8 +834,8 @@ describe('useChat – handleSend SSE callbacks', () => {
 
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.humanInputFormDataList).toHaveLength(2)
-      expect(answer!.humanInputFormDataList![0].node_id).toBe('human-node-1')
-      expect(answer!.humanInputFormDataList![1].node_id).toBe('human-node-2')
+      expect(answer!.humanInputFormDataList![0]!.node_id).toBe('human-node-1')
+      expect(answer!.humanInputFormDataList![1]!.node_id).toBe('human-node-2')
     })
 
     it('should set tracing node status to Paused when tracing index found', () => {
@@ -875,7 +875,7 @@ describe('useChat – handleSend SSE callbacks', () => {
       const answer = result.current.chatList.find(item => item.isAnswer && !item.isOpeningStatement)
       expect(answer!.humanInputFormDataList).toHaveLength(0)
       expect(answer!.humanInputFilledFormDataList).toHaveLength(1)
-      expect(answer!.humanInputFilledFormDataList![0].node_id).toBe('human-node')
+      expect(answer!.humanInputFilledFormDataList![0]!.node_id).toBe('human-node')
       expect((answer!.humanInputFilledFormDataList![0] as any).form_data).toEqual({ answer: 'yes' })
     })
   })
diff --git a/web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx b/web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx
index f6cfa21ab9..573d3e5642 100644
--- a/web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx
+++ b/web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx
@@ -37,7 +37,7 @@ const ConversationVariableModal = ({
   const { formatTime } = useTimestamp()
   const varList = useStore(s => s.conversationVariables) as ConversationVariable[]
   const appID = useStore(s => s.appId)
-  const [currentVar, setCurrentVar] = React.useState<ConversationVariable>(varList[0])
+  const [currentVar, setCurrentVar] = React.useState<ConversationVariable>(varList[0]!)
   const [latestValueMap, setLatestValueMap] = React.useState<Record<string, string>>({})
   const [latestValueTimestampMap, setLatestValueTimestampMap] = React.useState<Record<string, number>>({})
 
@@ -118,7 +118,7 @@ const ConversationVariableModal = ({
               {!!latestValueTimestampMap[currentVar.id] && (
                 <div className="shrink-0 system-xs-regular text-text-tertiary">
                   {t('chatVariable.updatedAt', { ns: 'workflow' })}
-                  {formatTime(latestValueTimestampMap[currentVar.id], t('dateTimeFormat', { ns: 'appLog' }) as string)}
+                  {formatTime(latestValueTimestampMap[currentVar.id]!, t('dateTimeFormat', { ns: 'appLog' }) as string)}
                 </div>
               )}
             </div>
diff --git a/web/app/components/workflow/panel/debug-and-preview/hooks.ts b/web/app/components/workflow/panel/debug-and-preview/hooks.ts
index 2529d505be..6eef69bfdb 100644
--- a/web/app/components/workflow/panel/debug-and-preview/hooks.ts
+++ b/web/app/components/workflow/panel/debug-and-preview/hooks.ts
@@ -556,27 +556,27 @@ export const useChat = (
         onAgentLog: ({ data }) => {
           const currentNodeIndex = responseItem.workflowProcess!.tracing!.findIndex(item => item.node_id === data.node_id)
           if (currentNodeIndex > -1) {
-            const current = responseItem.workflowProcess!.tracing![currentNodeIndex]
+            const current = responseItem.workflowProcess!.tracing![currentNodeIndex]!
 
-            if (current.execution_metadata) {
-              if (current.execution_metadata.agent_log) {
-                const currentLogIndex = current.execution_metadata.agent_log.findIndex(log => log.message_id === data.message_id)
+            if (current!.execution_metadata) {
+              if (current!.execution_metadata.agent_log) {
+                const currentLogIndex = current!.execution_metadata.agent_log.findIndex(log => log.message_id === data.message_id)
                 if (currentLogIndex > -1) {
-                  current.execution_metadata.agent_log[currentLogIndex] = {
-                    ...current.execution_metadata.agent_log[currentLogIndex],
+                  current!.execution_metadata.agent_log[currentLogIndex] = {
+                    ...current!.execution_metadata.agent_log[currentLogIndex],
                     ...data,
                   }
                 }
                 else {
-                  current.execution_metadata.agent_log.push(data)
+                  current!.execution_metadata.agent_log.push(data)
                 }
               }
               else {
-                current.execution_metadata.agent_log = [data]
+                current!.execution_metadata.agent_log = [data]
               }
             }
             else {
-              current.execution_metadata = {
+              current!.execution_metadata = {
                 agent_log: [data],
               } as any
             }
@@ -608,7 +608,7 @@ export const useChat = (
           }
           const currentTracingIndex = responseItem.workflowProcess!.tracing!.findIndex(item => item.node_id === data.node_id)
           if (currentTracingIndex > -1) {
-            responseItem.workflowProcess!.tracing[currentTracingIndex].status = NodeRunningStatus.Paused
+            responseItem.workflowProcess!.tracing[currentTracingIndex]!.status = NodeRunningStatus.Paused
             updateCurrentQAOnTree({
               placeholderQuestionId,
               questionItem,
@@ -638,7 +638,7 @@ export const useChat = (
         onHumanInputFormTimeout: ({ data }) => {
           if (responseItem.humanInputFormDataList?.length) {
             const currentFormIndex = responseItem.humanInputFormDataList.findIndex(item => item.node_id === data.node_id)
-            responseItem.humanInputFormDataList[currentFormIndex].expiration_time = data.expiration_time
+            responseItem.humanInputFormDataList[currentFormIndex]!.expiration_time = data.expiration_time
           }
           updateCurrentQAOnTree({
             placeholderQuestionId,
@@ -879,7 +879,7 @@ export const useChat = (
           if (responseItem.workflowProcess?.tracing) {
             const currentTracingIndex = responseItem.workflowProcess.tracing.findIndex(item => item.node_id === humanInputRequiredData.node_id)
             if (currentTracingIndex > -1)
-              responseItem.workflowProcess.tracing[currentTracingIndex].status = NodeRunningStatus.Paused
+              responseItem.workflowProcess.tracing[currentTracingIndex]!.status = NodeRunningStatus.Paused
           }
         })
       },
@@ -902,7 +902,7 @@ export const useChat = (
         updateChatTreeNode(messageId, (responseItem) => {
           if (responseItem.humanInputFormDataList?.length) {
             const currentFormIndex = responseItem.humanInputFormDataList.findIndex(item => item.node_id === humanInputFormTimeoutData.node_id)
-            responseItem.humanInputFormDataList[currentFormIndex].expiration_time = humanInputFormTimeoutData.expiration_time
+            responseItem.humanInputFormDataList[currentFormIndex]!.expiration_time = humanInputFormTimeoutData.expiration_time
           }
         })
       },
diff --git a/web/app/components/workflow/panel/index.tsx b/web/app/components/workflow/panel/index.tsx
index 7c8e4e4ed3..89e8419b5f 100644
--- a/web/app/components/workflow/panel/index.tsx
+++ b/web/app/components/workflow/panel/index.tsx
@@ -26,7 +26,7 @@ export type PanelProps = {
  */
 const getEntryWidth = (entry: ResizeObserverEntry, element: HTMLElement): number => {
   if (entry.borderBoxSize?.length > 0)
-    return entry.borderBoxSize[0].inlineSize
+    return entry.borderBoxSize[0]!.inlineSize
 
   if (entry.contentRect.width > 0)
     return entry.contentRect.width
diff --git a/web/app/components/workflow/panel/inputs-panel.tsx b/web/app/components/workflow/panel/inputs-panel.tsx
index 2eb597b5df..4e6255a2c0 100644
--- a/web/app/components/workflow/panel/inputs-panel.tsx
+++ b/web/app/components/workflow/panel/inputs-panel.tsx
@@ -51,7 +51,7 @@ const InputsPanel = ({ onRun }: Props) => {
         if (variable.default)
           result[variable.variable] = variable.default
         if (inputs[variable.variable] !== undefined)
-          result[variable.variable] = inputs[variable.variable]
+          result[variable.variable] = inputs[variable.variable]!
       })
     }
     return result
diff --git a/web/app/components/workflow/panel/version-history-panel/index.tsx b/web/app/components/workflow/panel/version-history-panel/index.tsx
index 22caa14201..10dd0e794a 100644
--- a/web/app/components/workflow/panel/version-history-panel/index.tsx
+++ b/web/app/components/workflow/panel/version-history-panel/index.tsx
@@ -298,7 +298,7 @@ export const VersionHistoryPanel = ({
                       )
                     })
                   ))}
-                  {!isFetching && (!versionHistory?.pages?.length || !versionHistory.pages[0].items.length) && (
+                  {!isFetching && (!versionHistory?.pages?.length || !versionHistory.pages[0]!.items.length) && (
                     <Empty onResetFilter={handleResetFilter} />
                   )}
                 </>
diff --git a/web/app/components/workflow/run/__tests__/tracing-panel.spec.tsx b/web/app/components/workflow/run/__tests__/tracing-panel.spec.tsx
index f5445f5f9f..af584e3df2 100644
--- a/web/app/components/workflow/run/__tests__/tracing-panel.spec.tsx
+++ b/web/app/components/workflow/run/__tests__/tracing-panel.spec.tsx
@@ -105,11 +105,11 @@ describe('TracingPanel', () => {
       </div>,
     )
 
-    expect(screen.getByText('Parallel Group')).toBeInTheDocument()
-    expect(screen.getByText('Branch A')).toBeInTheDocument()
-    expect(screen.getByText('Branch B')).toBeInTheDocument()
-    expect(screen.getByTestId('node-child-1')).toBeInTheDocument()
-    expect(screen.getByTestId('node-node-2')).toBeInTheDocument()
+    expect(screen.getByText('Parallel Group'))!.toBeInTheDocument()
+    expect(screen.getByText('Branch A'))!.toBeInTheDocument()
+    expect(screen.getByText('Branch B'))!.toBeInTheDocument()
+    expect(screen.getByTestId('node-child-1'))!.toBeInTheDocument()
+    expect(screen.getByTestId('node-node-2'))!.toBeInTheDocument()
 
     fireEvent.click(container.querySelector('.py-2') as HTMLElement)
     expect(parentClick).not.toHaveBeenCalled()
@@ -132,9 +132,9 @@ describe('TracingPanel', () => {
 
     fireEvent.mouseLeave(hoverTarget)
 
-    fireEvent.click(screen.getAllByRole('button')[0])
-    expect(container.querySelector('[data-parallel-id="parallel-1"] > div:last-child')).toHaveClass('hidden')
-    fireEvent.click(screen.getAllByRole('button')[0])
+    fireEvent.click(screen.getAllByRole('button')[0]!)
+    expect(container.querySelector('[data-parallel-id="parallel-1"] > div:last-child'))!.toHaveClass('hidden')
+    fireEvent.click(screen.getAllByRole('button')[0]!)
     expect(container.querySelector('[data-parallel-id="parallel-1"] > div:last-child')).not.toHaveClass('hidden')
     expect(mockNodePanel).toHaveBeenCalledWith(expect.objectContaining({
       hideInfo: true,
@@ -170,7 +170,7 @@ describe('TracingPanel', () => {
 
     render(<TracingPanel list={[]} />)
 
-    expect(screen.getByTestId('special-result-panel')).toBeInTheDocument()
+    expect(screen.getByTestId('special-result-panel'))!.toBeInTheDocument()
     expect(mockSpecialResultPanel).toHaveBeenCalledWith(expect.objectContaining({
       showRetryDetail: true,
       retryResultList: [{ id: 'retry-1' }],
diff --git a/web/app/components/workflow/run/agent-log/agent-result-panel.tsx b/web/app/components/workflow/run/agent-log/agent-result-panel.tsx
index 1819696679..50d30d7708 100644
--- a/web/app/components/workflow/run/agent-log/agent-result-panel.tsx
+++ b/web/app/components/workflow/run/agent-log/agent-result-panel.tsx
@@ -16,7 +16,7 @@ const AgentResultPanel = ({
 }: AgentResultPanelProps) => {
   const { t } = useTranslation()
   const top = agentOrToolLogItemStack[agentOrToolLogItemStack.length - 1]
-  const list = agentOrToolLogListMap[top.message_id]
+  const list = agentOrToolLogListMap[top!.message_id]
 
   return (
     <div className="overflow-y-auto bg-background-section">
@@ -26,7 +26,7 @@ const AgentResultPanel = ({
       />
       <div className="space-y-1 p-2">
         {
-          list.map(item => (
+          list!.map(item => (
             <AgentLogItem
               key={item.message_id}
               item={item}
@@ -36,7 +36,7 @@ const AgentResultPanel = ({
         }
       </div>
       {
-        top.hasCircle && (
+        top!.hasCircle && (
           <div className="mt-1 flex items-center rounded-xl border border-components-panel-border bg-components-panel-bg-blur px-3 pr-2 shadow-md">
             <div
               className="absolute inset-0 rounded-xl opacity-[0.4]"
diff --git a/web/app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx b/web/app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx
index 085e680f91..3be1d7f8e2 100644
--- a/web/app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx
+++ b/web/app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx
@@ -77,8 +77,8 @@ describe('LoopLogTrigger', () => {
         </div>,
       )
 
-      expect(screen.getByText(/workflow\.nodes\.loop\.loop/)).toBeInTheDocument()
-      expect(screen.getByText(/workflow\.nodes\.loop\.error/)).toBeInTheDocument()
+      expect(screen.getByText(/workflow\.nodes\.loop\.loop/))!.toBeInTheDocument()
+      expect(screen.getByText(/workflow\.nodes\.loop\.error/))!.toBeInTheDocument()
 
       await user.click(screen.getByRole('button'))
 
@@ -134,7 +134,7 @@ describe('LoopLogTrigger', () => {
       await user.click(screen.getByRole('button'))
 
       expect(onShowLoopResultList).toHaveBeenCalledTimes(1)
-      const [structuredList, durations, variableMap] = onShowLoopResultList.mock.calls[0]
+      const [structuredList, durations, variableMap] = (onShowLoopResultList.mock.calls[0] ?? []) as [any, any, any]
       expect(structuredList).toHaveLength(2)
       expect(structuredList).toEqual(
         expect.arrayContaining([
diff --git a/web/app/components/workflow/run/output-panel.tsx b/web/app/components/workflow/run/output-panel.tsx
index 9f43299059..f40470244e 100644
--- a/web/app/components/workflow/run/output-panel.tsx
+++ b/web/app/components/workflow/run/output-panel.tsx
@@ -26,7 +26,7 @@ const OutputPanel: FC<OutputPanelProps> = ({
     if (!outputs || typeof outputs !== 'object')
       return false
     const keys = Object.keys(outputs)
-    const value = outputs[keys[0]]
+    const value = outputs[keys[0]!]
     return keys.length === 1 && (
       typeof value === 'string'
       || (Array.isArray(value) && value.every(item => typeof item === 'string'))
@@ -74,9 +74,9 @@ const OutputPanel: FC<OutputPanelProps> = ({
         <div className="px-4 py-2">
           <Markdown
             content={
-              Array.isArray(outputs[Object.keys(outputs)[0]])
-                ? outputs[Object.keys(outputs)[0]].join('\n')
-                : (outputs[Object.keys(outputs)[0]] || '')
+              Array.isArray(outputs[Object.keys(outputs)[0]!])
+                ? outputs[Object.keys(outputs)[0]!].join('\n')
+                : (outputs[Object.keys(outputs)[0]!] || '')
             }
           />
         </div>
diff --git a/web/app/components/workflow/run/utils/format-log/__tests__/index.spec.ts b/web/app/components/workflow/run/utils/format-log/__tests__/index.spec.ts
index 53acbb7218..dab7ccdba3 100644
--- a/web/app/components/workflow/run/utils/format-log/__tests__/index.spec.ts
+++ b/web/app/components/workflow/run/utils/format-log/__tests__/index.spec.ts
@@ -118,8 +118,8 @@ describe('formatToTracingNodeList', () => {
       expect.objectContaining({ node_id: 'c' }),
       expect.objectContaining({ node_id: 'b' }),
     ])
-    expect(mockFormatHumanInputNode).toHaveBeenCalledWith(mockFormatAgentNode.mock.results[0].value)
-    expect(mockFormatRetryNode).toHaveBeenCalledWith(mockFormatHumanInputNode.mock.results[0].value)
+    expect(mockFormatHumanInputNode).toHaveBeenCalledWith(mockFormatAgentNode.mock.results[0]!.value)
+    expect(mockFormatRetryNode).toHaveBeenCalledWith(mockFormatHumanInputNode.mock.results[0]!.value)
     expect(mockFormatParallelNode).toHaveBeenLastCalledWith(expect.any(Array), t)
     expect(result).toEqual([
       expect.objectContaining({ node_id: 'a', parallelFormatted: true }),
diff --git a/web/app/components/workflow/run/utils/format-log/graph-to-log-struct.ts b/web/app/components/workflow/run/utils/format-log/graph-to-log-struct.ts
index 55e1c2b406..4f62a6cf6b 100644
--- a/web/app/components/workflow/run/utils/format-log/graph-to-log-struct.ts
+++ b/web/app/components/workflow/run/utils/format-log/graph-to-log-struct.ts
@@ -80,10 +80,10 @@ function parseNode(nodeStr: string, parentIterationId?: string, parentLoopId?: s
 
     // Extract nodeType, nodeId, and params
     const [nodeType, nodeId, ...paramsRaw] = parts
-    const params = parseParams(paramsRaw, nodeType === 'iteration' ? nodeId.trim() : parentIterationId, nodeType === 'loop' ? nodeId.trim() : parentLoopId)
+    const params = parseParams(paramsRaw, nodeType === 'iteration' ? nodeId!.trim() : parentIterationId, nodeType === 'loop' ? nodeId!.trim() : parentLoopId)
     const complexNode = {
-      nodeType: nodeType.trim(),
-      nodeId: nodeId.trim(),
+      nodeType: nodeType!.trim(),
+      nodeId: nodeId!.trim(),
       params,
     }
     if (parentIterationId) {
diff --git a/web/app/components/workflow/run/utils/format-log/iteration/index.ts b/web/app/components/workflow/run/utils/format-log/iteration/index.ts
index 5bd6b822e0..91235dd0fc 100644
--- a/web/app/components/workflow/run/utils/format-log/iteration/index.ts
+++ b/web/app/components/workflow/run/utils/format-log/iteration/index.ts
@@ -27,7 +27,7 @@ export function addChildrenToIterationNode(iterationNode: NodeTracing, childrenN
     if (!details[runIndex])
       details[runIndex] = []
 
-    details[runIndex].push(item)
+    details[runIndex]!.push(item)
     lastResolvedIndex = runIndex
   })
   return {
diff --git a/web/app/components/workflow/selection-contextmenu.tsx b/web/app/components/workflow/selection-contextmenu.tsx
index 06abad65e5..64a6f87c55 100644
--- a/web/app/components/workflow/selection-contextmenu.tsx
+++ b/web/app/components/workflow/selection-contextmenu.tsx
@@ -182,8 +182,8 @@ const distributeNodes = (
   const lastNode = sortedNodes[sortedNodes.length - 1]
 
   const totalGap = isHorizontal
-    ? lastNode.position.x + (lastNode.width || 0) - firstNode.position.x
-    : lastNode.position.y + (lastNode.height || 0) - firstNode.position.y
+    ? lastNode!.position.x + (lastNode!.width || 0) - firstNode!.position.x
+    : lastNode!.position.y + (lastNode!.height || 0) - firstNode!.position.y
 
   const fixedSpace = sortedNodes.reduce((sum, node) =>
     sum + (isHorizontal ? (node.width || 0) : (node.height || 0)), 0)
@@ -194,12 +194,12 @@ const distributeNodes = (
 
   return produce(nodes, (draft) => {
     let currentPosition = isHorizontal
-      ? firstNode.position.x + (firstNode.width || 0)
-      : firstNode.position.y + (firstNode.height || 0)
+      ? firstNode!.position.x + (firstNode!.width || 0)
+      : firstNode!.position.y + (firstNode!.height || 0)
 
     for (let index = 1; index < sortedNodes.length - 1; index++) {
       const nodeToAlign = sortedNodes[index]
-      const currentNode = draft.find(node => node.id === nodeToAlign.id)
+      const currentNode = draft.find(node => node.id === nodeToAlign!.id)
       if (!currentNode)
         continue
 
@@ -208,14 +208,14 @@ const distributeNodes = (
         currentNode.position.x = nextX
         if (currentNode.positionAbsolute)
           currentNode.positionAbsolute.x = nextX
-        currentPosition = nextX + (nodeToAlign.width || 0)
+        currentPosition = nextX + (nodeToAlign!.width || 0)
       }
       else {
         const nextY = currentPosition + spacing
         currentNode.position.y = nextY
         if (currentNode.positionAbsolute)
           currentNode.positionAbsolute.y = nextY
-        currentPosition = nextY + (nodeToAlign.height || 0)
+        currentPosition = nextY + (nodeToAlign!.height || 0)
       }
     }
   })
diff --git a/web/app/components/workflow/store/__tests__/datasets-detail-store.spec.ts b/web/app/components/workflow/store/__tests__/datasets-detail-store.spec.ts
index 3728aeda8e..ad313f05f7 100644
--- a/web/app/components/workflow/store/__tests__/datasets-detail-store.spec.ts
+++ b/web/app/components/workflow/store/__tests__/datasets-detail-store.spec.ts
@@ -48,7 +48,7 @@ describe('DatasetsDetailStore', () => {
       store.getState().updateDatasetsDetail([ds1v1])
       store.getState().updateDatasetsDetail([ds1v2])
 
-      expect(store.getState().datasetsDetail['ds-1'].name).toBe('Version 2')
+      expect(store.getState().datasetsDetail['ds-1']!.name).toBe('Version 2')
     })
 
     it('should handle empty array without errors', () => {
@@ -56,7 +56,7 @@ describe('DatasetsDetailStore', () => {
       store.getState().updateDatasetsDetail([makeDataset('ds-1', 'Test')])
       store.getState().updateDatasetsDetail([])
 
-      expect(store.getState().datasetsDetail['ds-1'].name).toBe('Test')
+      expect(store.getState().datasetsDetail['ds-1']!.name).toBe('Test')
     })
   })
 })
diff --git a/web/app/components/workflow/store/__tests__/inspect-vars-slice.spec.ts b/web/app/components/workflow/store/__tests__/inspect-vars-slice.spec.ts
index 4ecbbda092..5eaf34ebcc 100644
--- a/web/app/components/workflow/store/__tests__/inspect-vars-slice.spec.ts
+++ b/web/app/components/workflow/store/__tests__/inspect-vars-slice.spec.ts
@@ -64,8 +64,8 @@ describe('Inspect Vars Slice', () => {
       store.getState().setNodeInspectVars('n1', [v2])
 
       const node = store.getState().nodesWithInspectVars[0]
-      expect(node.vars).toEqual([v2])
-      expect(node.isValueFetched).toBe(true)
+      expect(node!.vars).toEqual([v2])
+      expect(node!.isValueFetched).toBe(true)
     })
 
     it('should not modify state when node is not found', () => {
@@ -74,7 +74,7 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().setNodeInspectVars('non-existent', [])
 
-      expect(store.getState().nodesWithInspectVars[0].vars).toHaveLength(1)
+      expect(store.getState().nodesWithInspectVars[0]!.vars).toHaveLength(1)
     })
   })
 
@@ -89,7 +89,7 @@ describe('Inspect Vars Slice', () => {
       store.getState().deleteNodeInspectVars('n1')
 
       expect(store.getState().nodesWithInspectVars).toHaveLength(1)
-      expect(store.getState().nodesWithInspectVars[0].nodeId).toBe('n2')
+      expect(store.getState().nodesWithInspectVars[0]!.nodeId).toBe('n2')
     })
   })
 
@@ -101,9 +101,9 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().setInspectVarValue('n1', 'v1', 'new')
 
-      const updated = store.getState().nodesWithInspectVars[0].vars[0]
-      expect(updated.value).toBe('new')
-      expect(updated.edited).toBe(true)
+      const updated = store.getState().nodesWithInspectVars[0]!.vars[0]
+      expect(updated!.value).toBe('new')
+      expect(updated!.edited).toBe(true)
     })
 
     it('should not change state when var is not found', () => {
@@ -113,7 +113,7 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().setInspectVarValue('n1', 'wrong-id', 'new')
 
-      expect(store.getState().nodesWithInspectVars[0].vars[0].value).toBe('old')
+      expect(store.getState().nodesWithInspectVars[0]!.vars[0]!.value).toBe('old')
     })
 
     it('should not change state when node is not found', () => {
@@ -123,7 +123,7 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().setInspectVarValue('wrong-node', 'v1', 'new')
 
-      expect(store.getState().nodesWithInspectVars[0].vars[0].value).toBe('old')
+      expect(store.getState().nodesWithInspectVars[0]!.vars[0]!.value).toBe('old')
     })
   })
 
@@ -135,9 +135,9 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().resetToLastRunVar('n1', 'v1', 'original')
 
-      const updated = store.getState().nodesWithInspectVars[0].vars[0]
-      expect(updated.value).toBe('original')
-      expect(updated.edited).toBe(false)
+      const updated = store.getState().nodesWithInspectVars[0]!.vars[0]
+      expect(updated!.value).toBe('original')
+      expect(updated!.edited).toBe(false)
     })
 
     it('should not change state when node is not found', () => {
@@ -146,7 +146,7 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().resetToLastRunVar('wrong-node', 'v1', 'val')
 
-      expect(store.getState().nodesWithInspectVars[0].vars[0].edited).toBe(false)
+      expect(store.getState().nodesWithInspectVars[0]!.vars[0]!.edited).toBe(false)
     })
 
     it('should not change state when var is not found', () => {
@@ -155,7 +155,7 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().resetToLastRunVar('n1', 'wrong-var', 'val')
 
-      expect(store.getState().nodesWithInspectVars[0].vars[0].edited).toBe(true)
+      expect(store.getState().nodesWithInspectVars[0]!.vars[0]!.edited).toBe(true)
     })
   })
 
@@ -167,9 +167,9 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().renameInspectVarName('n1', 'v1', ['n1', 'new_name'])
 
-      const updated = store.getState().nodesWithInspectVars[0].vars[0]
-      expect(updated.name).toBe('new_name')
-      expect(updated.selector).toEqual(['n1', 'new_name'])
+      const updated = store.getState().nodesWithInspectVars[0]!.vars[0]
+      expect(updated!.name).toBe('new_name')
+      expect(updated!.selector).toEqual(['n1', 'new_name'])
     })
 
     it('should not change state when node is not found', () => {
@@ -179,7 +179,7 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().renameInspectVarName('wrong-node', 'v1', ['x', 'y'])
 
-      expect(store.getState().nodesWithInspectVars[0].vars[0].name).toBe('old')
+      expect(store.getState().nodesWithInspectVars[0]!.vars[0]!.name).toBe('old')
     })
 
     it('should not change state when var is not found', () => {
@@ -189,7 +189,7 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().renameInspectVarName('n1', 'wrong-var', ['x', 'y'])
 
-      expect(store.getState().nodesWithInspectVars[0].vars[0].name).toBe('old')
+      expect(store.getState().nodesWithInspectVars[0]!.vars[0]!.name).toBe('old')
     })
   })
 
@@ -202,9 +202,9 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().deleteInspectVar('n1', 'v1')
 
-      const vars = store.getState().nodesWithInspectVars[0].vars
+      const vars = store.getState().nodesWithInspectVars[0]!.vars
       expect(vars).toHaveLength(1)
-      expect(vars[0].id).toBe('v2')
+      expect(vars[0]!.id).toBe('v2')
     })
 
     it('should not change state when var is not found', () => {
@@ -214,7 +214,7 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().deleteInspectVar('n1', 'wrong-id')
 
-      expect(store.getState().nodesWithInspectVars[0].vars).toHaveLength(1)
+      expect(store.getState().nodesWithInspectVars[0]!.vars).toHaveLength(1)
     })
 
     it('should not change state when node is not found', () => {
@@ -223,7 +223,7 @@ describe('Inspect Vars Slice', () => {
 
       store.getState().deleteInspectVar('wrong-node', 'v1')
 
-      expect(store.getState().nodesWithInspectVars[0].vars).toHaveLength(1)
+      expect(store.getState().nodesWithInspectVars[0]!.vars).toHaveLength(1)
     })
   })
 
diff --git a/web/app/components/workflow/store/workflow/debug/__tests__/inspect-vars-slice.spec.ts b/web/app/components/workflow/store/workflow/debug/__tests__/inspect-vars-slice.spec.ts
index a8aa86850f..0dca4fdde2 100644
--- a/web/app/components/workflow/store/workflow/debug/__tests__/inspect-vars-slice.spec.ts
+++ b/web/app/components/workflow/store/workflow/debug/__tests__/inspect-vars-slice.spec.ts
@@ -61,25 +61,25 @@ describe('createInspectVarsSlice', () => {
     ])
 
     store.getState().setInspectVarValue('node-1', 'var-1', 'edited')
-    expect(store.getState().nodesWithInspectVars[0].vars[0]).toMatchObject({
+    expect(store.getState().nodesWithInspectVars[0]!.vars[0]).toMatchObject({
       value: 'edited',
       edited: true,
     })
 
     store.getState().renameInspectVarName('node-1', 'var-1', ['node-1', 'renamed'])
-    expect(store.getState().nodesWithInspectVars[0].vars[0]).toMatchObject({
+    expect(store.getState().nodesWithInspectVars[0]!.vars[0]).toMatchObject({
       name: 'renamed',
       selector: ['node-1', 'renamed'],
     })
 
     store.getState().resetToLastRunVar('node-1', 'var-1', 'restored')
-    expect(store.getState().nodesWithInspectVars[0].vars[0]).toMatchObject({
+    expect(store.getState().nodesWithInspectVars[0]!.vars[0]).toMatchObject({
       value: 'restored',
       edited: false,
     })
 
     store.getState().deleteInspectVar('node-1', 'var-1')
-    expect(store.getState().nodesWithInspectVars[0].vars).toEqual([])
+    expect(store.getState().nodesWithInspectVars[0]!.vars).toEqual([])
 
     store.getState().deleteNodeInspectVars('node-1')
     expect(store.getState().nodesWithInspectVars).toEqual([])
diff --git a/web/app/components/workflow/store/workflow/debug/inspect-vars-slice.ts b/web/app/components/workflow/store/workflow/debug/inspect-vars-slice.ts
index cb1998befd..5a0f574116 100644
--- a/web/app/components/workflow/store/workflow/debug/inspect-vars-slice.ts
+++ b/web/app/components/workflow/store/workflow/debug/inspect-vars-slice.ts
@@ -49,8 +49,8 @@ export const createInspectVarsSlice: StateCreator<InspectVarsSliceShape> = (set)
         const nodes = produce(prevNodes, (draft) => {
           const index = prevNodes.findIndex(node => node.nodeId === nodeId)
           if (index !== -1) {
-            draft[index].vars = payload
-            draft[index].isValueFetched = true
+            draft[index]!.vars = payload
+            draft[index]!.isValueFetched = true
           }
         })
 
@@ -111,7 +111,7 @@ export const createInspectVarsSlice: StateCreator<InspectVarsSliceShape> = (set)
           const targetVar = targetNode.vars.find(varItem => varItem.id === varId)
           if (!targetVar)
             return
-          targetVar.name = selector[1]
+          targetVar.name = selector[1]!
           targetVar.selector = selector
         })
         return {
diff --git a/web/app/components/workflow/update-dsl-modal.helpers.ts b/web/app/components/workflow/update-dsl-modal.helpers.ts
index fafe22f16b..4d2c2adcda 100644
--- a/web/app/components/workflow/update-dsl-modal.helpers.ts
+++ b/web/app/components/workflow/update-dsl-modal.helpers.ts
@@ -92,7 +92,7 @@ export const normalizeWorkflowFeatures = (features: WorkflowFeatures) => {
       },
       enabled: !!(features.file_upload?.enabled || features.file_upload?.image?.enabled),
       allowed_file_types: features.file_upload?.allowed_file_types || [SupportUploadFileTypes.image],
-      allowed_file_extensions: features.file_upload?.allowed_file_extensions || FILE_EXTS[SupportUploadFileTypes.image].map(ext => `.${ext}`),
+      allowed_file_extensions: features.file_upload?.allowed_file_extensions || FILE_EXTS[SupportUploadFileTypes.image]!.map(ext => `.${ext}`),
       allowed_file_upload_methods: features.file_upload?.allowed_file_upload_methods || features.file_upload?.image?.transfer_methods || ['local_file', 'remote_url'],
       number_limits: features.file_upload?.number_limits || features.file_upload?.image?.number_limits || 3,
     },
diff --git a/web/app/components/workflow/utils/__tests__/elk-layout.spec.ts b/web/app/components/workflow/utils/__tests__/elk-layout.spec.ts
index 54eb289abe..7cbd5478e3 100644
--- a/web/app/components/workflow/utils/__tests__/elk-layout.spec.ts
+++ b/web/app/components/workflow/utils/__tests__/elk-layout.spec.ts
@@ -152,7 +152,7 @@ describe('getLayoutByELK', () => {
     await getLayoutByELK(nodes, edges)
     const ifElkNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'if-1')!
     expect(ifElkNode.ports).toHaveLength(1)
-    expect(ifElkNode.ports![0].layoutOptions!['elk.port.side']).toBe('EAST')
+    expect(ifElkNode.ports![0]!.layoutOptions!['elk.port.side']).toBe('EAST')
   })
 
   it('should build ports for HumanInput nodes with multiple branches', async () => {
@@ -187,7 +187,7 @@ describe('getLayoutByELK', () => {
     await getLayoutByELK(nodes, edges)
     const hiElkNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'hi-1')!
     expect(hiElkNode.ports).toHaveLength(1)
-    expect(hiElkNode.ports![0].layoutOptions!['elk.port.side']).toBe('EAST')
+    expect(hiElkNode.ports![0]!.layoutOptions!['elk.port.side']).toBe('EAST')
   })
 
   it('should normalise bounds so minX and minY start at 0', async () => {
@@ -537,7 +537,7 @@ describe('getLayoutByELK', () => {
     await getLayoutByELK(nodes, edges)
     const qcNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'qc-1')!
     expect(qcNode.ports).toHaveLength(1)
-    expect(qcNode.ports![0].layoutOptions!['elk.port.side']).toBe('EAST')
+    expect(qcNode.ports![0]!.layoutOptions!['elk.port.side']).toBe('EAST')
   })
 
   it('should only create output (EAST) ports, not input (WEST) ports', async () => {
@@ -692,8 +692,8 @@ describe('getLayoutByELK', () => {
     await getLayoutByELK(nodes, edges)
     const elkEdges = layoutCallArgs!.edges as Array<{ sources: string[], targets: string[] }>
     const ifEdges = elkEdges.filter(e => e.sources[0] === 'if-1')
-    expect(ifEdges[0].targets[0]).toBe('a')
-    expect(ifEdges[1].targets[0]).toBe('b')
+    expect(ifEdges[0]!.targets[0]).toBe('a')
+    expect(ifEdges[1]!.targets[0]).toBe('b')
   })
 
   it('should keep edges for components where every node has an incoming edge', async () => {
@@ -918,8 +918,8 @@ describe('getLayoutForChildNodes', () => {
 
     const qcElk = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'qc-child')!
     expect(qcElk.ports).toHaveLength(2)
-    expect(qcElk.ports![0].id).toContain('cls-1')
-    expect(qcElk.ports![1].id).toContain('cls-2')
+    expect(qcElk.ports![0]!.id).toContain('cls-1')
+    expect(qcElk.ports![1]!.id).toContain('cls-2')
 
     const childIds = layoutCallArgs!.children!.map((c: ElkChild) => c.id)
     expect(childIds.indexOf('upper')).toBeLessThan(childIds.indexOf('lower'))
diff --git a/web/app/components/workflow/utils/__tests__/node-navigation.spec.ts b/web/app/components/workflow/utils/__tests__/node-navigation.spec.ts
index 8ccdff0604..012bdf1e18 100644
--- a/web/app/components/workflow/utils/__tests__/node-navigation.spec.ts
+++ b/web/app/components/workflow/utils/__tests__/node-navigation.spec.ts
@@ -13,7 +13,7 @@ describe('selectWorkflowNode', () => {
     selectWorkflowNode('node-1', true)
 
     expect(handler).toHaveBeenCalledTimes(1)
-    const event = handler.mock.calls[0][0] as CustomEvent
+    const event = handler.mock.calls[0]![0] as CustomEvent
     expect(event.detail).toEqual({ nodeId: 'node-1', focus: true })
 
     document.removeEventListener('workflow:select-node', handler)
@@ -25,7 +25,7 @@ describe('selectWorkflowNode', () => {
 
     selectWorkflowNode('node-2')
 
-    const event = handler.mock.calls[0][0] as CustomEvent
+    const event = handler.mock.calls[0]![0] as CustomEvent
     expect(event.detail.focus).toBe(false)
 
     document.removeEventListener('workflow:select-node', handler)
@@ -40,7 +40,7 @@ describe('scrollToWorkflowNode', () => {
     scrollToWorkflowNode('node-5')
 
     expect(handler).toHaveBeenCalledTimes(1)
-    const event = handler.mock.calls[0][0] as CustomEvent
+    const event = handler.mock.calls[0]![0] as CustomEvent
     expect(event.detail).toEqual({ nodeId: 'node-5' })
 
     document.removeEventListener('workflow:scroll-to-node', handler)
@@ -112,7 +112,7 @@ describe('setupScrollToNodeListener', () => {
     scrollToWorkflowNode('n1')
 
     expect(reactflow.setCenter).toHaveBeenCalledTimes(1)
-    const [targetX, targetY, options] = reactflow.setCenter.mock.calls[0]
+    const [targetX, targetY, options] = (reactflow.setCenter.mock.calls[0] ?? []) as [any, any, any]
     expect(targetX).toBeGreaterThan(100)
     expect(targetY).toBeGreaterThan(200)
     expect(options).toEqual({ zoom: 1, duration: 800 })
diff --git a/web/app/components/workflow/utils/__tests__/tool.spec.ts b/web/app/components/workflow/utils/__tests__/tool.spec.ts
index baa61d8a4e..5f5327cc2d 100644
--- a/web/app/components/workflow/utils/__tests__/tool.spec.ts
+++ b/web/app/components/workflow/utils/__tests__/tool.spec.ts
@@ -66,7 +66,7 @@ describe('getToolCheckParams', () => {
       { label: 'Query', variable: 'query', type: 'string', required: true },
     ])
     expect(result.toolSettingSchema).toHaveLength(1)
-    expect(result.toolSettingSchema[0].variable).toBe('api_key')
+    expect(result.toolSettingSchema[0]!.variable).toBe('api_key')
   })
 
   it('should mark notAuthed for builtin tools without team auth', () => {
@@ -157,7 +157,7 @@ describe('getToolCheckParams', () => {
       'ja_JP',
     )
 
-    expect(result.toolInputsSchema[0].label).toBe('Query')
+    expect(result.toolInputsSchema[0]!.label).toBe('Query')
   })
 })
 
diff --git a/web/app/components/workflow/utils/__tests__/trigger.spec.ts b/web/app/components/workflow/utils/__tests__/trigger.spec.ts
index b74126d69f..f3cd2a0c71 100644
--- a/web/app/components/workflow/utils/__tests__/trigger.spec.ts
+++ b/web/app/components/workflow/utils/__tests__/trigger.spec.ts
@@ -79,7 +79,7 @@ describe('getTriggerCheckParams', () => {
       'zh_Hans',
     )
 
-    expect(result.triggerInputsSchema[0].label).toBe('频道')
+    expect(result.triggerInputsSchema[0]!.label).toBe('频道')
   })
 
   it('should fall back to en_US when language label is missing', () => {
@@ -89,7 +89,7 @@ describe('getTriggerCheckParams', () => {
       'ja_JP',
     )
 
-    expect(result.triggerInputsSchema[0].label).toBe('Channel')
+    expect(result.triggerInputsSchema[0]!.label).toBe('Channel')
   })
 
   it('should fall back to parameter name when no labels exist', () => {
@@ -103,7 +103,7 @@ describe('getTriggerCheckParams', () => {
 
     const result = getTriggerCheckParams(createTriggerData(), [provider], 'en_US')
 
-    expect(result.triggerInputsSchema[0].label).toBe('raw_param')
+    expect(result.triggerInputsSchema[0]!.label).toBe('raw_param')
   })
 
   it('should match provider by provider_id', () => {
diff --git a/web/app/components/workflow/utils/__tests__/workflow-init.spec.ts b/web/app/components/workflow/utils/__tests__/workflow-init.spec.ts
index 15aa2a933d..f7c8534111 100644
--- a/web/app/components/workflow/utils/__tests__/workflow-init.spec.ts
+++ b/web/app/components/workflow/utils/__tests__/workflow-init.spec.ts
@@ -22,7 +22,7 @@ vi.mock('reactflow', async (importOriginal) => {
     ...actual,
     getConnectedEdges: vi.fn((_nodes: Node[], edges: Edge[]) => {
       const node = _nodes[0]
-      return edges.filter(e => e.source === node.id || e.target === node.id)
+      return edges.filter(e => e.source === node!.id || e.target === node!.id)
     }),
   }
 })
@@ -57,7 +57,7 @@ describe('preprocessNodesAndEdges', () => {
     const result = preprocessNodesAndEdges(nodes as Node[], [])
     const startNodes = result.nodes.filter(n => n.data.type === BlockEnum.IterationStart)
     expect(startNodes).toHaveLength(1)
-    expect(startNodes[0].parentId).toBe('iter-1')
+    expect(startNodes[0]!.parentId).toBe('iter-1')
   })
 
   it('should add iteration start node when iteration has start_node_id but node type does not match', () => {
@@ -142,9 +142,9 @@ describe('preprocessNodesAndEdges', () => {
     const result = preprocessNodesAndEdges(nodes as Node[], [])
     const newEdges = result.edges
     expect(newEdges).toHaveLength(1)
-    expect(newEdges[0].target).toBe('child-1')
-    expect(newEdges[0].data!.sourceType).toBe(BlockEnum.IterationStart)
-    expect(newEdges[0].data!.isInIteration).toBe(true)
+    expect(newEdges[0]!.target).toBe('child-1')
+    expect(newEdges[0]!.data!.sourceType).toBe(BlockEnum.IterationStart)
+    expect(newEdges[0]!.data!.isInIteration).toBe(true)
   })
 
   it('should create edges for loop nodes with start_node_id', () => {
@@ -162,8 +162,8 @@ describe('preprocessNodesAndEdges', () => {
     const result = preprocessNodesAndEdges(nodes as Node[], [])
     const newEdges = result.edges
     expect(newEdges).toHaveLength(1)
-    expect(newEdges[0].target).toBe('child-1')
-    expect(newEdges[0].data!.isInLoop).toBe(true)
+    expect(newEdges[0]!.target).toBe('child-1')
+    expect(newEdges[0]!.data!.isInLoop).toBe(true)
   })
 
   it('should update start_node_id on iteration and loop nodes', () => {
@@ -194,19 +194,19 @@ describe('initialNodes', () => {
     nodes.forEach(n => Reflect.deleteProperty(n, 'position'))
 
     const result = initialNodes(nodes, [])
-    expect(result[0].position).toBeDefined()
-    expect(result[1].position).toBeDefined()
-    expect(result[1].position.x).toBeGreaterThan(result[0].position.x)
+    expect(result[0]!.position).toBeDefined()
+    expect(result[1]!.position).toBeDefined()
+    expect(result[1]!.position.x).toBeGreaterThan(result[0]!.position.x)
   })
 
   it('should set type to CUSTOM_NODE when type is missing', () => {
     const nodes = [
       createNode({ id: 'n1', data: { type: BlockEnum.Start, title: '', desc: '' } }),
     ]
-    Reflect.deleteProperty(nodes[0], 'type')
+    Reflect.deleteProperty(nodes[0]!, 'type')
 
     const result = initialNodes(nodes, [])
-    expect(result[0].type).toBe(CUSTOM_NODE)
+    expect(result[0]!.type).toBe(CUSTOM_NODE)
   })
 
   it('should set connected source and target handle ids', () => {
@@ -219,8 +219,8 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, edges)
-    expect(result[0].data._connectedSourceHandleIds).toContain('source')
-    expect(result[1].data._connectedTargetHandleIds).toContain('target')
+    expect(result[0]!.data._connectedSourceHandleIds).toContain('source')
+    expect(result[1]!.data._connectedTargetHandleIds).toContain('target')
   })
 
   it('should handle IfElse node with cases', () => {
@@ -239,8 +239,8 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    expect(result[0].data._targetBranches).toBeDefined()
-    expect(result[0].data._targetBranches).toHaveLength(2)
+    expect(result[0]!.data._targetBranches).toBeDefined()
+    expect(result[0]!.data._targetBranches).toHaveLength(2)
   })
 
   it('should migrate legacy IfElse node without cases to cases format', () => {
@@ -259,9 +259,9 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    const data = result[0].data as IfElseNodeType
+    const data = result[0]!.data as IfElseNodeType
     expect(data.cases).toHaveLength(1)
-    expect(data.cases[0].case_id).toBe('true')
+    expect(data.cases[0]!.case_id).toBe('true')
   })
 
   it('should delete legacy conditions/logical_operator when cases exist', () => {
@@ -282,7 +282,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    const data = result[0].data as IfElseNodeType
+    const data = result[0]!.data as IfElseNodeType
     expect(data.conditions).toBeUndefined()
     expect(data.logical_operator).toBeUndefined()
   })
@@ -302,7 +302,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    expect(result[0].data._targetBranches).toHaveLength(1)
+    expect(result[0]!.data._targetBranches).toHaveLength(1)
   })
 
   it('should set iteration node defaults', () => {
@@ -382,7 +382,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    expect((result[0].data as LLMNodeType).model.provider).toBe('corrected/openai')
+    expect((result[0]!.data as LLMNodeType).model.provider).toBe('corrected/openai')
   })
 
   it('should correct model provider for KnowledgeRetrieval reranking_model', () => {
@@ -401,7 +401,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    expect((result[0].data as KnowledgeRetrievalNodeType).multiple_retrieval_config!.reranking_model!.provider).toBe('corrected/cohere')
+    expect((result[0]!.data as KnowledgeRetrievalNodeType).multiple_retrieval_config!.reranking_model!.provider).toBe('corrected/cohere')
   })
 
   it('should correct model provider for ParameterExtractor nodes', () => {
@@ -418,7 +418,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    expect((result[0].data as ParameterExtractorNodeType).model.provider).toBe('corrected/anthropic')
+    expect((result[0]!.data as ParameterExtractorNodeType).model.provider).toBe('corrected/anthropic')
   })
 
   it('should add default retry_config for HttpRequest nodes', () => {
@@ -434,7 +434,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    expect(result[0].data.retry_config).toEqual({
+    expect(result[0]!.data.retry_config).toEqual({
       retry_enabled: true,
       max_retries: DEFAULT_RETRY_MAX,
       retry_interval: DEFAULT_RETRY_INTERVAL,
@@ -456,7 +456,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    expect(result[0].data.retry_config).toEqual(existingConfig)
+    expect(result[0]!.data.retry_config).toEqual(existingConfig)
   })
 
   it('should migrate legacy Tool node configurations', () => {
@@ -476,7 +476,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    const data = result[0].data as ToolNodeType
+    const data = result[0]!.data as ToolNodeType
     expect(data.tool_node_version).toBe('2')
     expect(data.tool_configurations.api_key).toEqual({
       type: 'constant',
@@ -503,7 +503,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    const data = result[0].data as ToolNodeType
+    const data = result[0]!.data as ToolNodeType
     expect(data.tool_configurations).toEqual({ key: 'val' })
   })
 
@@ -522,7 +522,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    const data = result[0].data as ToolNodeType
+    const data = result[0]!.data as ToolNodeType
     expect(data.tool_configurations).toEqual({ key: 'val' })
   })
 
@@ -540,7 +540,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    const data = result[0].data as ToolNodeType
+    const data = result[0]!.data as ToolNodeType
     expect(data.tool_configurations.key).toEqual({ type: 'constant', value: null })
   })
 
@@ -558,7 +558,7 @@ describe('initialNodes', () => {
     ]
 
     const result = initialNodes(nodes, [])
-    const data = result[0].data as ToolNodeType
+    const data = result[0]!.data as ToolNodeType
     expect(data.tool_node_version).toBe('2')
   })
 })
@@ -572,7 +572,7 @@ describe('initialEdges', () => {
     const edges = [createEdge({ source: 'a', target: 'b' })]
 
     const result = initialEdges(edges, nodes)
-    expect(result[0].type).toBe('custom')
+    expect(result[0]!.type).toBe('custom')
   })
 
   it('should set default sourceHandle and targetHandle', () => {
@@ -585,8 +585,8 @@ describe('initialEdges', () => {
     Reflect.deleteProperty(edge, 'targetHandle')
 
     const result = initialEdges([edge], nodes)
-    expect(result[0].sourceHandle).toBe('source')
-    expect(result[0].targetHandle).toBe('target')
+    expect(result[0]!.sourceHandle).toBe('source')
+    expect(result[0]!.targetHandle).toBe('target')
   })
 
   it('should set sourceType and targetType from nodes', () => {
@@ -595,12 +595,12 @@ describe('initialEdges', () => {
       createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
     ]
     const edges = [createEdge({ source: 'a', target: 'b' })]
-    Reflect.deleteProperty(edges[0].data!, 'sourceType')
-    Reflect.deleteProperty(edges[0].data!, 'targetType')
+    Reflect.deleteProperty(edges[0]!.data!, 'sourceType')
+    Reflect.deleteProperty(edges[0]!.data!, 'targetType')
 
     const result = initialEdges(edges, nodes)
-    expect(result[0].data!.sourceType).toBe(BlockEnum.Start)
-    expect(result[0].data!.targetType).toBe(BlockEnum.Code)
+    expect(result[0]!.data!.sourceType).toBe(BlockEnum.Start)
+    expect(result[0]!.data!.targetType).toBe(BlockEnum.Code)
   })
 
   it('should set _connectedNodeIsSelected when a node is selected', () => {
@@ -611,7 +611,7 @@ describe('initialEdges', () => {
     const edges = [createEdge({ source: 'a', target: 'b' })]
 
     const result = initialEdges(edges, nodes)
-    expect(result[0].data!._connectedNodeIsSelected).toBe(true)
+    expect(result[0]!.data!._connectedNodeIsSelected).toBe(true)
   })
 
   it('should filter cycle edges', () => {
@@ -648,8 +648,8 @@ describe('initialEdges', () => {
 
     const result = initialEdges(edges, nodes)
     expect(result).toHaveLength(1)
-    expect(result[0].source).toBe('a')
-    expect(result[0].target).toBe('b')
+    expect(result[0]!.source).toBe('a')
+    expect(result[0]!.target).toBe('b')
   })
 
   it('should handle empty edges', () => {
@@ -678,7 +678,7 @@ describe('initialEdges', () => {
     const edges = [createEdge({ source: 'a', target: 'b' })]
 
     const result = initialEdges(edges, nodes)
-    expect(result[0].data!._connectedNodeIsSelected).toBe(true)
+    expect(result[0]!.data!._connectedNodeIsSelected).toBe(true)
   })
 
   it('should not set default sourceHandle when sourceHandle already exists', () => {
@@ -689,8 +689,8 @@ describe('initialEdges', () => {
     const edges = [createEdge({ source: 'a', target: 'b', sourceHandle: 'custom-src', targetHandle: 'custom-tgt' })]
 
     const result = initialEdges(edges, nodes)
-    expect(result[0].sourceHandle).toBe('custom-src')
-    expect(result[0].targetHandle).toBe('custom-tgt')
+    expect(result[0]!.sourceHandle).toBe('custom-src')
+    expect(result[0]!.targetHandle).toBe('custom-tgt')
   })
 
   it('should handle graph with edges referencing nodes not in the node list', () => {
diff --git a/web/app/components/workflow/utils/__tests__/workflow.spec.ts b/web/app/components/workflow/utils/__tests__/workflow.spec.ts
index 165b4d5ee6..d3a0e9e924 100644
--- a/web/app/components/workflow/utils/__tests__/workflow.spec.ts
+++ b/web/app/components/workflow/utils/__tests__/workflow.spec.ts
@@ -403,10 +403,10 @@ describe('changeNodesAndEdgesId', () => {
 
     const [newNodes, newEdges] = changeNodesAndEdgesId(nodes, edges)
 
-    expect(newNodes[0].id).not.toBe('old-1')
-    expect(newNodes[1].id).not.toBe('old-2')
-    expect(newEdges[0].source).toBe(newNodes[0].id)
-    expect(newEdges[0].target).toBe(newNodes[1].id)
+    expect(newNodes[0]!.id).not.toBe('old-1')
+    expect(newNodes[1]!.id).not.toBe('old-2')
+    expect(newEdges[0]!.source).toBe(newNodes[0]!.id)
+    expect(newEdges[0]!.target).toBe(newNodes[1]!.id)
   })
 
   it('should generate unique ids for all nodes', () => {
diff --git a/web/app/components/workflow/utils/node.ts b/web/app/components/workflow/utils/node.ts
index b26e350b2a..d6163ea1c8 100644
--- a/web/app/components/workflow/utils/node.ts
+++ b/web/app/components/workflow/utils/node.ts
@@ -109,7 +109,7 @@ export const genNewNodeTitleFromOld = (oldTitle: string) => {
 
   if (match) {
     const title = match[1]
-    const num = Number.parseInt(match[2], 10)
+    const num = Number.parseInt(match[2]!, 10)
     return `${title} (${num + 1})`
   }
   else {
diff --git a/web/app/components/workflow/utils/workflow-init.ts b/web/app/components/workflow/utils/workflow-init.ts
index 77a2ccefac..4cfe2ea3f9 100644
--- a/web/app/components/workflow/utils/workflow-init.ts
+++ b/web/app/components/workflow/utils/workflow-init.ts
@@ -40,14 +40,14 @@ const isCyclicUtil = (nodeId: string, color: Record<string, string>, adjList: Re
   color[nodeId] = GRAY
   stack.push(nodeId)
 
-  for (let i = 0; i < adjList[nodeId].length; ++i) {
-    const childId = adjList[nodeId][i]
+  for (let i = 0; i < adjList[nodeId]!.length; ++i) {
+    const childId = adjList[nodeId]![i]
 
-    if (color[childId] === GRAY) {
-      stack.push(childId)
+    if (color[childId!] === GRAY) {
+      stack.push(childId!)
       return true
     }
-    if (color[childId] === WHITE && isCyclicUtil(childId, color, adjList, stack))
+    if (color[childId!] === WHITE && isCyclicUtil(childId!, color, adjList, stack))
       return true
   }
   color[nodeId] = BLACK
@@ -70,8 +70,8 @@ const getCycleEdges = (nodes: Node[], edges: Edge[]) => {
     adjList[edge.source]?.push(edge.target)
 
   for (let i = 0; i < nodes.length; i++) {
-    if (color[nodes[i].id] === WHITE)
-      isCyclicUtil(nodes[i].id, color, adjList, stack)
+    if (color[nodes[i]!.id] === WHITE)
+      isCyclicUtil(nodes[i]!.id, color, adjList, stack)
   }
 
   const cycleEdges = []
@@ -151,12 +151,12 @@ export const preprocessNodesAndEdges = (nodes: Node[], edges: Edge[]) => {
     const isIteration = nodeItem.data.type === BlockEnum.Iteration
     const newNode = (isIteration ? newIterationStartNodesMap : newLoopStartNodesMap)[nodeItem.id]
     const startNode = nodesMap[nodeItem.data.start_node_id]
-    const source = newNode.id
+    const source = newNode!.id
     const sourceHandle = 'source'
-    const target = startNode.id
+    const target = startNode!.id
     const targetHandle = 'target'
 
-    const parentNode = nodes.find(node => node.id === startNode.parentId) || null
+    const parentNode = nodes.find(node => node.id === startNode!.parentId) || null
     const isInIteration = !!parentNode && parentNode.data.type === BlockEnum.Iteration
     const isInLoop = !!parentNode && parentNode.data.type === BlockEnum.Loop
 
@@ -168,12 +168,12 @@ export const preprocessNodesAndEdges = (nodes: Node[], edges: Edge[]) => {
       target,
       targetHandle,
       data: {
-        sourceType: newNode.data.type,
-        targetType: startNode.data.type,
+        sourceType: newNode!.data.type,
+        targetType: startNode!.data.type,
         isInIteration,
-        iteration_id: isInIteration ? startNode.parentId : undefined,
+        iteration_id: isInIteration ? startNode!.parentId : undefined,
         isInLoop,
-        loop_id: isInLoop ? startNode.parentId : undefined,
+        loop_id: isInLoop ? startNode!.parentId : undefined,
         _connectedNodeIsSelected: true,
       },
       zIndex: isIteration ? ITERATION_CHILDREN_Z_INDEX : LOOP_CHILDREN_Z_INDEX,
@@ -181,10 +181,10 @@ export const preprocessNodesAndEdges = (nodes: Node[], edges: Edge[]) => {
   })
   nodes.forEach((node) => {
     if (node.data.type === BlockEnum.Iteration && newIterationStartNodesMap[node.id])
-      (node.data as IterationNodeType).start_node_id = newIterationStartNodesMap[node.id].id
+      (node.data as IterationNodeType).start_node_id = newIterationStartNodesMap[node.id]!.id
 
     if (node.data.type === BlockEnum.Loop && newLoopStartNodesMap[node.id])
-      (node.data as LoopNodeType).start_node_id = newLoopStartNodesMap[node.id].id
+      (node.data as LoopNodeType).start_node_id = newLoopStartNodesMap[node.id]!.id
   })
 
   return {
@@ -209,7 +209,7 @@ export const initialNodes = (originNodes: Node[], originEdges: Edge[]) => {
   const iterationOrLoopNodeMap = nodes.reduce((acc, node) => {
     if (node.parentId) {
       if (acc[node.parentId])
-        acc[node.parentId].push({ nodeId: node.id, nodeType: node.data.type })
+        acc[node.parentId]!.push({ nodeId: node.id, nodeType: node.data.type })
       else
         acc[node.parentId] = [{ nodeId: node.id, nodeType: node.data.type }]
     }
@@ -338,14 +338,14 @@ export const initialEdges = (originEdges: Edge[], originNodes: Node[]) => {
     if (!edge.data?.sourceType && edge.source && nodesMap[edge.source]) {
       edge.data = {
         ...edge.data,
-        sourceType: nodesMap[edge.source].data.type!,
+        sourceType: nodesMap[edge.source]!.data.type!,
       } as any
     }
 
     if (!edge.data?.targetType && edge.target && nodesMap[edge.target]) {
       edge.data = {
         ...edge.data,
-        targetType: nodesMap[edge.target].data.type!,
+        targetType: nodesMap[edge.target]!.data.type!,
       } as any
     }
 
diff --git a/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx
index 9c64466d56..f87bc3b896 100644
--- a/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx
+++ b/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx
@@ -71,7 +71,7 @@ describe('VariableInspect Group', () => {
 
     fireEvent.click(screen.getByText('API_KEY'))
 
-    expect(screen.getByText('workflow.debug.variableInspect.envNode')).toBeInTheDocument()
+    expect(screen.getByText('workflow.debug.variableInspect.envNode'))!.toBeInTheDocument()
     expect(handleSelect).toHaveBeenCalledWith({
       nodeId: VarInInspectType.environment,
       nodeType: VarInInspectType.environment,
@@ -97,7 +97,7 @@ describe('VariableInspect Group', () => {
       />,
     )
 
-    expect(screen.getByText('visible_var')).toBeInTheDocument()
+    expect(screen.getByText('visible_var'))!.toBeInTheDocument()
     expect(screen.queryByText('hidden_var')).not.toBeInTheDocument()
 
     fireEvent.click(screen.getByText('Code'))
@@ -122,8 +122,8 @@ describe('VariableInspect Group', () => {
 
     const actionButtons = screen.getAllByRole('button')
 
-    fireEvent.click(actionButtons[0])
-    fireEvent.click(actionButtons[1])
+    fireEvent.click(actionButtons[0]!)
+    fireEvent.click(actionButtons[1]!)
 
     expect(handleView).toHaveBeenCalledTimes(1)
     expect(handleClear).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/workflow/variable-inspect/__tests__/panel.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/panel.spec.tsx
index cafed9ce4e..0519fc4f94 100644
--- a/web/app/components/workflow/variable-inspect/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/variable-inspect/__tests__/panel.spec.tsx
@@ -139,7 +139,7 @@ describe('VariableInspect Panel', () => {
 
     fireEvent.click(screen.getByRole('button', { name: 'workflow.debug.variableInspect.listening.stopButton' }))
 
-    expect(screen.getByText('workflow.debug.variableInspect.listening.title')).toBeInTheDocument()
+    expect(screen.getByText('workflow.debug.variableInspect.listening.title'))!.toBeInTheDocument()
     expect(mockEmit).toHaveBeenCalledWith({
       type: EVENT_WORKFLOW_STOP,
     })
@@ -150,9 +150,9 @@ describe('VariableInspect Panel', () => {
       showVariableInspectPanel: true,
     })
 
-    fireEvent.click(screen.getAllByRole('button')[0])
+    fireEvent.click(screen.getAllByRole('button')[0]!)
 
-    expect(screen.getByText('workflow.debug.variableInspect.emptyTip')).toBeInTheDocument()
+    expect(screen.getByText('workflow.debug.variableInspect.emptyTip'))!.toBeInTheDocument()
     expect(store.getState().showVariableInspectPanel).toBe(false)
   })
 
@@ -166,8 +166,8 @@ describe('VariableInspect Panel', () => {
 
     await waitFor(() => expect(screen.getAllByText('API_KEY').length).toBeGreaterThan(1))
 
-    expect(screen.getByText('workflow.debug.variableInspect.envNode')).toBeInTheDocument()
+    expect(screen.getByText('workflow.debug.variableInspect.envNode'))!.toBeInTheDocument()
     expect(screen.getAllByText('string').length).toBeGreaterThan(0)
-    expect(screen.getByText('env-value')).toBeInTheDocument()
+    expect(screen.getByText('env-value'))!.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/variable-inspect/__tests__/value-content-sections.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/value-content-sections.spec.tsx
index 52d0c28587..2ebe527104 100644
--- a/web/app/components/workflow/variable-inspect/__tests__/value-content-sections.spec.tsx
+++ b/web/app/components/workflow/variable-inspect/__tests__/value-content-sections.spec.tsx
@@ -98,7 +98,7 @@ describe('value-content sections', () => {
     const onChange = vi.fn()
     render(<BoolArraySection values={[true, false]} onChange={onChange} />)
 
-    fireEvent.click(screen.getAllByText('True')[1])
+    fireEvent.click(screen.getAllByText('True')[1]!)
     expect(onChange).toHaveBeenCalledWith([true, true])
   })
 
@@ -123,8 +123,8 @@ describe('value-content sections', () => {
 
     fireEvent.change(screen.getByTestId('schema-editor'), { target: { value: '{"foo":1}' } })
     expect(onChange).toHaveBeenCalledWith('{"foo":1}')
-    expect(screen.getByText('Broken JSON')).toBeInTheDocument()
-    expect(screen.getByText('Too deep')).toBeInTheDocument()
+    expect(screen.getByText('Broken JSON'))!.toBeInTheDocument()
+    expect(screen.getByText('Too deep'))!.toBeInTheDocument()
   })
 
   it('should render chunk preview when the json editor has chunks', () => {
@@ -140,7 +140,7 @@ describe('value-content sections', () => {
       />,
     )
 
-    expect(screen.getByTestId('schema-editor')).toBeInTheDocument()
+    expect(screen.getByTestId('schema-editor'))!.toBeInTheDocument()
   })
 
   it('should render the file editor section', () => {
diff --git a/web/app/components/workflow/variable-inspect/value-content-sections.tsx b/web/app/components/workflow/variable-inspect/value-content-sections.tsx
index b1682ce990..8d892343cd 100644
--- a/web/app/components/workflow/variable-inspect/value-content-sections.tsx
+++ b/web/app/components/workflow/variable-inspect/value-content-sections.tsx
@@ -155,10 +155,10 @@ export const FileEditorSection = ({
             SupportUploadFileTypes.video,
           ],
           allowed_file_extensions: [
-            ...FILE_EXTS[SupportUploadFileTypes.image],
-            ...FILE_EXTS[SupportUploadFileTypes.document],
-            ...FILE_EXTS[SupportUploadFileTypes.audio],
-            ...FILE_EXTS[SupportUploadFileTypes.video],
+            ...(FILE_EXTS[SupportUploadFileTypes.image] ?? []),
+            ...(FILE_EXTS[SupportUploadFileTypes.document] ?? []),
+            ...(FILE_EXTS[SupportUploadFileTypes.audio] ?? []),
+            ...(FILE_EXTS[SupportUploadFileTypes.video] ?? []),
           ],
           allowed_file_upload_methods: [TransferMethod.local_file, TransferMethod.remote_url],
           number_limits: currentVar.value_type === 'file' ? 1 : fileUploadConfig?.workflow_file_upload_limit || 5,
diff --git a/web/app/components/workflow/variable-inspect/value-content.tsx b/web/app/components/workflow/variable-inspect/value-content.tsx
index aaff853fc6..a87f37e3c2 100644
--- a/web/app/components/workflow/variable-inspect/value-content.tsx
+++ b/web/app/components/workflow/variable-inspect/value-content.tsx
@@ -119,7 +119,7 @@ const ValueContent = ({
     if (contentContainerRef.current && errorMessageRef.current) {
       const errorMessageObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
-          const { inlineSize } = entry.borderBoxSize[0]
+          const { inlineSize } = entry.borderBoxSize[0]!
           const height = (contentContainerRef.current as any).clientHeight - inlineSize
           setEditorHeight(height)
         }
diff --git a/web/app/components/workflow/workflow-preview/components/__tests__/zoom-in-out.spec.tsx b/web/app/components/workflow/workflow-preview/components/__tests__/zoom-in-out.spec.tsx
index 810116f997..4991ae7b04 100644
--- a/web/app/components/workflow/workflow-preview/components/__tests__/zoom-in-out.spec.tsx
+++ b/web/app/components/workflow/workflow-preview/components/__tests__/zoom-in-out.spec.tsx
@@ -35,9 +35,9 @@ const getZoomControls = () => {
     throw new Error('Missing zoom controls')
 
   return {
-    zoomOutTrigger: icons[0].parentElement as HTMLElement,
+    zoomOutTrigger: icons[0]!.parentElement as HTMLElement,
     label,
-    zoomInTrigger: icons[1].parentElement as HTMLElement,
+    zoomInTrigger: icons[1]!.parentElement as HTMLElement,
   }
 }
 
diff --git a/web/app/components/workflow/workflow-preview/components/nodes/loop/__tests__/hooks.spec.tsx b/web/app/components/workflow/workflow-preview/components/nodes/loop/__tests__/hooks.spec.tsx
index 40156711aa..5d93983a4a 100644
--- a/web/app/components/workflow/workflow-preview/components/nodes/loop/__tests__/hooks.spec.tsx
+++ b/web/app/components/workflow/workflow-preview/components/nodes/loop/__tests__/hooks.spec.tsx
@@ -46,7 +46,7 @@ describe('workflow preview loop interactions', () => {
     result.current.handleNodeLoopRerender('loop-node')
 
     expect(mockSetNodes).toHaveBeenCalledTimes(1)
-    const updatedLoopNode = mockSetNodes.mock.calls[0][0].find((node: Node) => node.id === 'loop-node')
+    const updatedLoopNode = mockSetNodes.mock.calls[0]![0].find((node: Node) => node.id === 'loop-node')
     expect(updatedLoopNode.width).toBe(100 + 60 + LOOP_PADDING.right)
     expect(updatedLoopNode.height).toBe(90 + 40 + LOOP_PADDING.bottom)
   })
diff --git a/web/app/components/workflow/workflow-preview/components/note-node/index.tsx b/web/app/components/workflow/workflow-preview/components/note-node/index.tsx
index 38dee9d6d0..c9b2d8cdbe 100644
--- a/web/app/components/workflow/workflow-preview/components/note-node/index.tsx
+++ b/web/app/components/workflow/workflow-preview/components/note-node/index.tsx
@@ -23,8 +23,8 @@ const NoteNode = ({
     <div
       className={cn(
         'relative flex flex-col rounded-md border shadow-xs hover:shadow-md',
-        THEME_MAP[theme].bg,
-        data.selected ? THEME_MAP[theme].border : 'border-black/5',
+        THEME_MAP[theme]!.bg,
+        data.selected ? THEME_MAP[theme]!.border : 'border-black/5',
       )}
       style={{
         width: data.width,
@@ -40,7 +40,7 @@ const NoteNode = ({
           <div
             className={cn(
               'h-2 shrink-0 rounded-t-md opacity-50',
-              THEME_MAP[theme].title,
+              THEME_MAP[theme]!.title,
             )}
           >
           </div>
diff --git a/web/app/signin/invite-settings/page.tsx b/web/app/signin/invite-settings/page.tsx
index fc9bdf6b0a..91973f07f9 100644
--- a/web/app/signin/invite-settings/page.tsx
+++ b/web/app/signin/invite-settings/page.tsx
@@ -55,7 +55,7 @@ export default function InviteSettingsPage() {
       })
       if (res.result === 'success') {
         // Tokens are now stored in cookies by the backend
-        await setLocaleOnClient(language, false)
+        await setLocaleOnClient(language!, false)
         const redirectUrl = resolvePostLoginRedirect()
         router.replace(redirectUrl || '/apps')
       }
diff --git a/web/context/modal-context.test.tsx b/web/context/modal-context.test.tsx
index 6fac2e0cd5..ce5efdb8d9 100644
--- a/web/context/modal-context.test.tsx
+++ b/web/context/modal-context.test.tsx
@@ -112,7 +112,7 @@ describe('ModalContextProvider trigger events limit modal', () => {
 
     renderProvider()
 
-    await waitFor(() => expect(screen.getByTestId('trigger-limit-modal')).toBeInTheDocument())
+    await waitFor(() => expect(screen.getByTestId('trigger-limit-modal'))!.toBeInTheDocument())
     expect(latestTriggerEventsModalProps).toMatchObject({
       usage: 3000,
       total: 3000,
@@ -127,7 +127,7 @@ describe('ModalContextProvider trigger events limit modal', () => {
     await waitFor(() => {
       expect(setItemSpy.mock.calls.length).toBeGreaterThan(0)
     })
-    const [key, value] = setItemSpy.mock.calls[0]
+    const [key, value] = (setItemSpy.mock.calls[0] ?? []) as [any, any]
     expect(key).toContain('trigger-events-limit-dismissed-workspace-1-professional-3000-')
     expect(value).toBe('1')
   })
@@ -150,7 +150,7 @@ describe('ModalContextProvider trigger events limit modal', () => {
 
     renderProvider()
 
-    await waitFor(() => expect(screen.getByTestId('trigger-limit-modal')).toBeInTheDocument())
+    await waitFor(() => expect(screen.getByTestId('trigger-limit-modal'))!.toBeInTheDocument())
 
     act(() => {
       latestTriggerEventsModalProps.onClose()
@@ -178,7 +178,7 @@ describe('ModalContextProvider trigger events limit modal', () => {
 
     renderProvider()
 
-    await waitFor(() => expect(screen.getByTestId('trigger-limit-modal')).toBeInTheDocument())
+    await waitFor(() => expect(screen.getByTestId('trigger-limit-modal'))!.toBeInTheDocument())
 
     act(() => {
       latestTriggerEventsModalProps.onClose()
diff --git a/web/eslint-suppressions.json b/web/eslint-suppressions.json
index a53c1b4de9..db5a22797c 100644
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json
@@ -400,6 +400,11 @@
       "count": 3
     }
   },
+  "app/components/app/configuration/config-var/__tests__/index.spec.tsx": {
+    "ts/no-explicit-any": {
+      "count": 2
+    }
+  },
   "app/components/app/configuration/config-var/config-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -564,6 +569,11 @@
       "count": 1
     }
   },
+  "app/components/app/configuration/dataset-config/params-config/__tests__/config-content.spec.tsx": {
+    "ts/no-explicit-any": {
+      "count": 1
+    }
+  },
   "app/components/app/configuration/dataset-config/params-config/config-content.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -600,6 +610,11 @@
       "count": 1
     }
   },
+  "app/components/app/configuration/debug/__tests__/index.spec.tsx": {
+    "ts/no-explicit-any": {
+      "count": 1
+    }
+  },
   "app/components/app/configuration/debug/chat-user-input.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1158,6 +1173,9 @@
   "app/components/base/chat/chat/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
+    },
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
     }
   },
   "app/components/base/chat/chat/type.ts": {
@@ -1887,6 +1905,11 @@
       "count": 1
     }
   },
+  "app/components/base/image-uploader/__tests__/utils.spec.ts": {
+    "ts/no-explicit-any": {
+      "count": 3
+    }
+  },
   "app/components/base/image-uploader/audio-preview.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
@@ -2368,6 +2391,11 @@
       "count": 2
     }
   },
+  "app/components/base/prompt-editor/utils.ts": {
+    "ts/no-explicit-any": {
+      "count": 4
+    }
+  },
   "app/components/base/prompt-log-modal/card.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
@@ -2534,6 +2562,11 @@
       "count": 1
     }
   },
+  "app/components/base/tag-management/__tests__/panel.spec.tsx": {
+    "ts/no-explicit-any": {
+      "count": 2
+    }
+  },
   "app/components/base/tag-management/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -2600,6 +2633,11 @@
       "count": 1
     }
   },
+  "app/components/base/voice-input/__tests__/index.spec.tsx": {
+    "ts/no-explicit-any": {
+      "count": 3
+    }
+  },
   "app/components/base/voice-input/index.stories.tsx": {
     "no-console": {
       "count": 2
@@ -2642,6 +2680,11 @@
       "count": 1
     }
   },
+  "app/components/billing/billing-page/__tests__/index.spec.tsx": {
+    "ts/no-explicit-any": {
+      "count": 4
+    }
+  },
   "app/components/billing/plan-upgrade-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3242,6 +3285,11 @@
       "count": 1
     }
   },
+  "app/components/datasets/documents/detail/completed/components/segment-list-content.tsx": {
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
+    }
+  },
   "app/components/datasets/documents/detail/completed/display-toggle.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3333,6 +3381,11 @@
       "count": 1
     }
   },
+  "app/components/datasets/documents/detail/metadata/components/metadata-field-list.tsx": {
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
+    }
+  },
   "app/components/datasets/documents/detail/metadata/hooks/use-metadata-state.ts": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 4
@@ -3497,6 +3550,9 @@
   "app/components/datasets/metadata/hooks/use-metadata-document.ts": {
     "ts/no-explicit-any": {
       "count": 1
+    },
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 2
     }
   },
   "app/components/datasets/metadata/metadata-dataset/create-content.tsx": {
@@ -4050,6 +4106,11 @@
       "count": 2
     }
   },
+  "app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/use-activate-credential.spec.tsx": {
+    "ts/no-explicit-any": {
+      "count": 2
+    }
+  },
   "app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/credits-fallback-alert.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
@@ -4163,6 +4224,11 @@
       "count": 2
     }
   },
+  "app/components/plugins/card/index.tsx": {
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
+    }
+  },
   "app/components/plugins/install-plugin/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 4
@@ -4462,6 +4528,11 @@
       "count": 2
     }
   },
+  "app/components/plugins/plugin-detail-panel/subscription-list/__tests__/index.spec.tsx": {
+    "ts/no-explicit-any": {
+      "count": 2
+    }
+  },
   "app/components/plugins/plugin-detail-panel/subscription-list/create/common-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -5570,6 +5641,9 @@
   "app/components/workflow/nodes/_base/components/before-run-form/form.tsx": {
     "ts/no-explicit-any": {
       "count": 3
+    },
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
     }
   },
   "app/components/workflow/nodes/_base/components/before-run-form/index.tsx": {
@@ -5832,6 +5906,11 @@
       "count": 1
     }
   },
+  "app/components/workflow/nodes/_base/components/variable/output-var-list.tsx": {
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
+    }
+  },
   "app/components/workflow/nodes/_base/components/variable/utils.ts": {
     "ts/no-explicit-any": {
       "count": 32
@@ -6282,6 +6361,9 @@
     },
     "ts/no-explicit-any": {
       "count": 2
+    },
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
     }
   },
   "app/components/workflow/nodes/human-input/components/delivery-method/upgrade-modal.tsx": {
@@ -6849,6 +6931,11 @@
       "count": 2
     }
   },
+  "app/components/workflow/nodes/loop/use-single-run-form-params.helpers.ts": {
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
+    }
+  },
   "app/components/workflow/nodes/loop/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 3
@@ -7146,6 +7233,11 @@
       "count": 1
     }
   },
+  "app/components/workflow/nodes/trigger-webhook/components/parameter-table.tsx": {
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
+    }
+  },
   "app/components/workflow/nodes/trigger-webhook/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -7448,6 +7540,11 @@
       "count": 1
     }
   },
+  "app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx": {
+    "ts/no-explicit-any": {
+      "count": 3
+    }
+  },
   "app/components/workflow/run/loop-log/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
@@ -7580,6 +7677,11 @@
       "count": 1
     }
   },
+  "app/components/workflow/utils/__tests__/node-navigation.spec.ts": {
+    "ts/no-explicit-any": {
+      "count": 3
+    }
+  },
   "app/components/workflow/utils/data-source.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -7840,7 +7942,7 @@
   },
   "context/modal-context.test.tsx": {
     "ts/no-explicit-any": {
-      "count": 3
+      "count": 5
     }
   },
   "context/modal-context.ts": {
@@ -8009,6 +8111,11 @@
       "count": 1
     }
   },
+  "plugins/dev-proxy/server.spec.ts": {
+    "ts/no-explicit-any": {
+      "count": 1
+    }
+  },
   "scripts/component-analyzer.js": {
     "regexp/no-unused-capturing-group": {
       "count": 6
@@ -8117,6 +8224,9 @@
     },
     "ts/no-explicit-any": {
       "count": 3
+    },
+    "ts/no-non-null-asserted-optional-chain": {
+      "count": 1
     }
   },
   "service/use-tools.ts": {
diff --git a/web/hooks/use-app-favicon.ts b/web/hooks/use-app-favicon.ts
index 32b8f6893a..6d1ba9979c 100644
--- a/web/hooks/use-app-favicon.ts
+++ b/web/hooks/use-app-favicon.ts
@@ -39,6 +39,6 @@ export function useAppFavicon(options: UseAppFaviconOptions) {
 
     link.rel = 'shortcut icon'
     link.type = 'image/svg'
-    document.getElementsByTagName('head')[0].appendChild(link)
+    document.getElementsByTagName('head')[0]!.appendChild(link)
   }, [enable, icon, icon_background])
 }
diff --git a/web/hooks/use-async-window-open.spec.ts b/web/hooks/use-async-window-open.spec.ts
index 5441481d1f..f51d0c6bef 100644
--- a/web/hooks/use-async-window-open.spec.ts
+++ b/web/hooks/use-async-window-open.spec.ts
@@ -68,7 +68,7 @@ describe('useAsyncWindowOpen', () => {
     })
 
     expect(onError).toHaveBeenCalled()
-    const errArg = onError.mock.calls[0][0] as Error
+    const errArg = onError.mock.calls[0]![0] as Error
     expect(errArg.message).toBe('Failed to open new window')
     expect(getUrl).not.toHaveBeenCalled()
   })
@@ -160,7 +160,7 @@ describe('useAsyncWindowOpen', () => {
 
     expect(close).toHaveBeenCalled()
     expect(onError).toHaveBeenCalled()
-    const errArg = onError.mock.calls[0][0] as Error
+    const errArg = onError.mock.calls[0]![0] as Error
     expect(errArg.message).toBe('No url resolved for new window')
   })
 
@@ -176,7 +176,7 @@ describe('useAsyncWindowOpen', () => {
     })
 
     expect(onError).toHaveBeenCalled()
-    const errArg = onError.mock.calls[0][0] as Error
+    const errArg = onError.mock.calls[0]![0] as Error
     expect(errArg.message).toBe('Failed to open new window')
     expect(getUrl).not.toHaveBeenCalled()
   })
diff --git a/web/hooks/use-query-params.spec.tsx b/web/hooks/use-query-params.spec.tsx
index ef744742cf..8c51bea1e2 100644
--- a/web/hooks/use-query-params.spec.tsx
+++ b/web/hooks/use-query-params.spec.tsx
@@ -79,7 +79,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get(PRICING_MODAL_QUERY_PARAM)).toBe(PRICING_MODAL_QUERY_VALUE)
     })
 
@@ -94,7 +94,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.options.history).toBe('push')
     })
 
@@ -112,7 +112,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has(PRICING_MODAL_QUERY_PARAM)).toBe(false)
     })
 
@@ -130,7 +130,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.options.history).toBe('push')
     })
 
@@ -145,7 +145,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.options.history).toBe('replace')
     })
   })
@@ -205,7 +205,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('action')).toBe(ACCOUNT_SETTING_MODAL_ACTION)
       expect(update.searchParams.get('tab')).toBe('members')
     })
@@ -221,7 +221,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.options.history).toBe('push')
     })
 
@@ -239,7 +239,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('tab')).toBe('provider')
     })
 
@@ -257,7 +257,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.options.history).toBe('replace')
     })
 
@@ -275,7 +275,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('action')).toBe(false)
       expect(update.searchParams.has('tab')).toBe(false)
     })
@@ -294,7 +294,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.options.history).toBe('replace')
     })
   })
@@ -356,7 +356,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('package-ids')).toBe('["org/plugin"]')
     })
 
@@ -372,7 +372,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('bundle-info')).toBe(JSON.stringify(bundleInfo))
     })
 
@@ -391,7 +391,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.has('package-ids')).toBe(false)
       expect(update.searchParams.has('bundle-info')).toBe(false)
     })
@@ -411,7 +411,7 @@ describe('useQueryParams hooks', () => {
 
       // Assert
       await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
+      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
       expect(update.searchParams.get('bundle-info')).toBe(JSON.stringify(bundleInfo))
     })
   })
diff --git a/web/i18n-config/index.ts b/web/i18n-config/index.ts
index e24fd8533d..ff8bd4ff02 100644
--- a/web/i18n-config/index.ts
+++ b/web/i18n-config/index.ts
@@ -26,5 +26,5 @@ export const renderI18nObject = (obj: Record<string, string>, language: string)
     return obj[language]
   if (obj?.en_US)
     return obj.en_US
-  return Object.values(obj)[0]
+  return Object.values(obj)[0]!
 }
diff --git a/web/i18n-config/language.ts b/web/i18n-config/language.ts
index 397c361cda..343a634abc 100644
--- a/web/i18n-config/language.ts
+++ b/web/i18n-config/language.ts
@@ -14,7 +14,7 @@ export const getLanguage = (locale: Locale): Locale => {
   if (['zh-Hans', 'ja-JP'].includes(locale))
     return locale.replace('-', '_') as Locale
 
-  return LanguagesSupported[0].replace('-', '_') as Locale
+  return LanguagesSupported[0]!.replace('-', '_') as Locale
 }
 
 const DOC_LANGUAGE: Record<string, DocLanguage | undefined> = {
diff --git a/web/knip.config.ts b/web/knip.config.ts
index 2700e00717..2a81d06141 100644
--- a/web/knip.config.ts
+++ b/web/knip.config.ts
@@ -17,9 +17,7 @@ const config: KnipConfig = {
   ],
   ignoreDependencies: [
     '@iconify-json/*',
-
     '@storybook/addon-onboarding',
-
   ],
   /// keep-sorted
   rules: {
diff --git a/web/plugins/dev-proxy/cookies.ts b/web/plugins/dev-proxy/cookies.ts
index a744493892..c606322e96 100644
--- a/web/plugins/dev-proxy/cookies.ts
+++ b/web/plugins/dev-proxy/cookies.ts
@@ -57,13 +57,13 @@ export const rewriteCookieHeaderForUpstream = (cookieHeader?: string) => {
 
 const rewriteSetCookieValueForLocal = (setCookieValue: string) => {
   const [rawCookiePair, ...rawAttributes] = setCookieValue.split(';')
-  const separatorIndex = rawCookiePair.indexOf('=')
+  const separatorIndex = rawCookiePair!.indexOf('=')
 
   if (separatorIndex === -1)
     return setCookieValue
 
-  const cookieName = rawCookiePair.slice(0, separatorIndex).trim()
-  const cookieValue = rawCookiePair.slice(separatorIndex + 1)
+  const cookieName = rawCookiePair!.slice(0, separatorIndex).trim()
+  const cookieValue = rawCookiePair!.slice(separatorIndex + 1)
   const rewrittenAttributes = rawAttributes
     .map(attribute => attribute.trim())
     .filter(attribute =>
diff --git a/web/plugins/dev-proxy/server.spec.ts b/web/plugins/dev-proxy/server.spec.ts
index c57ec8b4fe..d9c9ee22ba 100644
--- a/web/plugins/dev-proxy/server.spec.ts
+++ b/web/plugins/dev-proxy/server.spec.ts
@@ -75,7 +75,7 @@ describe('dev proxy server', () => {
       }),
     )
 
-    const [, requestInit] = fetchImpl.mock.calls[0]
+    const [, requestInit] = (fetchImpl.mock.calls[0] ?? []) as [unknown, any]
     const requestHeaders = requestInit?.headers as Headers
     expect(requestHeaders.get('cookie')).toBe('__Host-access_token=abc')
     expect(requestHeaders.get('origin')).toBe('https://cloud.dify.ai')
diff --git a/web/plugins/vite/utils.ts b/web/plugins/vite/utils.ts
index 52bcc5bbbe..67f00074f9 100644
--- a/web/plugins/vite/utils.ts
+++ b/web/plugins/vite/utils.ts
@@ -1,8 +1,8 @@
 export const normalizeViteModuleId = (id: string): string => {
-  const withoutQuery = id.split('?', 1)[0]
+  const withoutQuery = id.split('?', 1)[0]!
 
-  if (withoutQuery.startsWith('/@fs/'))
-    return withoutQuery.slice('/@fs'.length)
+  if (withoutQuery!.startsWith('/@fs/'))
+    return withoutQuery!.slice('/@fs'.length)
 
   return withoutQuery
 }
diff --git a/web/scripts/analyze-i18n-diff.ts b/web/scripts/analyze-i18n-diff.ts
index bd830c5523..44e8c675f9 100644
--- a/web/scripts/analyze-i18n-diff.ts
+++ b/web/scripts/analyze-i18n-diff.ts
@@ -241,11 +241,11 @@ function analyzeFile(baseName: string): AnalysisResult {
 
   // Check for changed values
   for (const [key, oldValue] of Object.entries(mainFlat)) {
-    if (key in currentContent && !valuesEqual(currentContent[key], oldValue)) {
+    if (key in currentContent && !valuesEqual(currentContent[key]!, oldValue)) {
       result.changedValues.push({
         key,
         oldValue,
-        newValue: currentContent[key],
+        newValue: currentContent[key]!,
       })
     }
   }
diff --git a/web/scripts/gen-doc-paths.ts b/web/scripts/gen-doc-paths.ts
index e5cf8aeb58..fd9cdea02a 100644
--- a/web/scripts/gen-doc-paths.ts
+++ b/web/scripts/gen-doc-paths.ts
@@ -227,10 +227,10 @@ function groupPathsBySection(paths: Set<string>): Record<string, Set<string>> {
     const parts = withoutLang.split('/')
     const section = parts[0]
 
-    if (!groups[section])
-      groups[section] = new Set()
+    if (!groups[section!])
+      groups[section!] = new Set()
 
-    groups[section].add(withoutLang)
+    groups[section!]!.add(withoutLang)
   }
 
   return groups
@@ -334,10 +334,10 @@ function generateTypeDefinitions(
   for (const enPath of sortedEnPaths) {
     const translations = apiPathTranslations[enPath]
     const parts: string[] = []
-    if (translations.zh)
-      parts.push(`zh: '${translations.zh}'`)
-    if (translations.ja)
-      parts.push(`ja: '${translations.ja}'`)
+    if (translations!.zh)
+      parts.push(`zh: '${translations!.zh}'`)
+    if (translations!.ja)
+      parts.push(`ja: '${translations!.ja}'`)
     if (parts.length > 0)
       lines.push(`  '${enPath}': { ${parts.join(', ')} },`)
   }
@@ -387,7 +387,7 @@ async function main(): Promise<void> {
 
     console.log(`Fetching OpenAPI spec: ${openapiPath}`)
     const pathMap = await fetchOpenAPIAndExtractPaths(openapiPath)
-    endpointMapsByLang[lang].set(fileKey, pathMap)
+    endpointMapsByLang[lang!]!.set(fileKey, pathMap)
   }
 
   // Build English paths and mapping to other languages
@@ -395,9 +395,9 @@ async function main(): Promise<void> {
   const apiPathTranslations: Record<string, { zh?: string, ja?: string }> = {}
 
   // Iterate through English endpoint maps
-  for (const [fileKey, enPathMap] of endpointMapsByLang.en) {
-    const zhPathMap = endpointMapsByLang.zh.get(fileKey)
-    const jaPathMap = endpointMapsByLang.ja.get(fileKey)
+  for (const [fileKey, enPathMap] of endpointMapsByLang.en!) {
+    const zhPathMap = endpointMapsByLang.zh!.get(fileKey)
+    const jaPathMap = endpointMapsByLang.ja!.get(fileKey)
 
     for (const [endpointKey, enPath] of enPathMap) {
       enApiPaths.push(enPath)
diff --git a/web/service/base.ts b/web/service/base.ts
index ad4f8cef44..2063b5bc37 100644
--- a/web/service/base.ts
+++ b/web/service/base.ts
@@ -360,7 +360,7 @@ export const handleStream = (
             }
           }
         })
-        buffer = lines[lines.length - 1]
+        buffer = lines[lines.length - 1]!
       }
       catch (e) {
         onData('', false, {
@@ -403,7 +403,7 @@ export const upload = async (options: UploadOptions, isPublicAPI?: boolean, url?
     url: (url ? `${urlPrefix}${url}` : `${urlPrefix}/files/upload`) + (searchParams || ''),
     headers: {
       [CSRF_HEADER_NAME]: Cookies.get(CSRF_COOKIE_NAME()) || '',
-      [PASSPORT_HEADER_NAME]: getWebAppPassport(shareCode),
+      [PASSPORT_HEADER_NAME]: getWebAppPassport(shareCode!),
       [WEB_APP_SHARE_CODE_HEADER_NAME]: shareCode,
     },
   }
@@ -417,7 +417,7 @@ export const upload = async (options: UploadOptions, isPublicAPI?: boolean, url?
     const xhr = mergedOptions.xhr
     xhr.open(mergedOptions.method, mergedOptions.url)
     for (const key in mergedOptions.headers)
-      xhr.setRequestHeader(key, mergedOptions.headers[key])
+      xhr.setRequestHeader(key, mergedOptions.headers[key]!)
 
     xhr.withCredentials = true
     xhr.responseType = 'json'
@@ -481,14 +481,14 @@ export const ssePost = async (
   // No need to get token from localStorage, cookies will be sent automatically
 
   const baseOptions = getBaseOptions()
-  const shareCode = globalThis.location.pathname.split('/').slice(-1)[0]
+  const shareCode = globalThis.location.pathname.split('/').slice(-1)[0]!
   const options = Object.assign({}, baseOptions, {
     method: 'POST',
     signal: abortController.signal,
     headers: new Headers({
-      [CSRF_HEADER_NAME]: Cookies.get(CSRF_COOKIE_NAME()) || '',
+      [CSRF_HEADER_NAME]: Cookies.get(CSRF_COOKIE_NAME())! || '',
       [WEB_APP_SHARE_CODE_HEADER_NAME]: shareCode,
-      [PASSPORT_HEADER_NAME]: getWebAppPassport(shareCode),
+      [PASSPORT_HEADER_NAME]: getWebAppPassport(shareCode!),
     }),
   } as RequestInit, fetchOptions)
 
@@ -633,13 +633,13 @@ export const sseGet = async (
   const abortController = new AbortController()
 
   const baseOptions = getBaseOptions()
-  const shareCode = globalThis.location.pathname.split('/').slice(-1)[0]
+  const shareCode = globalThis.location.pathname.split('/').slice(-1)[0]!
   const options = Object.assign({}, baseOptions, {
     signal: abortController.signal,
     headers: new Headers({
-      [CSRF_HEADER_NAME]: Cookies.get(CSRF_COOKIE_NAME()) || '',
+      [CSRF_HEADER_NAME]: Cookies.get(CSRF_COOKIE_NAME())! || '',
       [WEB_APP_SHARE_CODE_HEADER_NAME]: shareCode,
-      [PASSPORT_HEADER_NAME]: getWebAppPassport(shareCode),
+      [PASSPORT_HEADER_NAME]: getWebAppPassport(shareCode!),
     }),
   } as RequestInit, fetchOptions)
 
diff --git a/web/service/knowledge/use-create-dataset.ts b/web/service/knowledge/use-create-dataset.ts
index 297bb44827..9c511b5fd6 100644
--- a/web/service/knowledge/use-create-dataset.ts
+++ b/web/service/knowledge/use-create-dataset.ts
@@ -39,7 +39,7 @@ export const getNotionInfo = (
     return {
       credential_id: credentialId,
       workspace_id: workspace.workspaceId,
-      pages: workspace.pages.map((page) => {
+      pages: workspace.pages!.map((page) => {
         const { page_id, page_name, page_icon, type } = page
         return {
           page_id,
diff --git a/web/service/use-plugins.ts b/web/service/use-plugins.ts
index a4296628f2..6004ecde56 100644
--- a/web/service/use-plugins.ts
+++ b/web/service/use-plugins.ts
@@ -162,7 +162,7 @@ export const useInstalledPluginList = (disable?: boolean, pageSize = 100) => {
   })
 
   const plugins = data?.pages.flatMap(page => page.plugins) ?? []
-  const total = data?.pages[0].total ?? 0
+  const total = data?.pages[0]!.total ?? 0
 
   return {
     data: disable
@@ -336,7 +336,7 @@ export const useInstallOrUpdate = ({
           }
           if (item.type === 'marketplace') {
             const data = item as GitHubItemAndMarketPlaceDependency
-            uniqueIdentifier = data.value.marketplace_plugin_unique_identifier! || plugin[i]?.plugin_id
+            uniqueIdentifier = data.value.marketplace_plugin_unique_identifier! || plugin[i]?.plugin_id!
             if (uniqueIdentifier === installedPayload?.uniqueIdentifier) {
               return {
                 status: TaskStatus.success,
@@ -615,7 +615,7 @@ export const usePluginInfo = (providerName?: string) => {
       const org = parts[0]
       const name = parts[1]
       try {
-        const response = await fetchPluginInfoFromMarketPlace({ org, name })
+        const response = await fetchPluginInfoFromMarketPlace({ org: org!, name: name! })
         return response.data.plugin.category === PluginCategoryEnum.model ? response.data.plugin : null
       }
       catch {
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 6df4f56bf1..003da18aa2 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -25,6 +25,7 @@
     ],
     "allowJs": true,
     "strict": true,
+    "noUncheckedIndexedAccess": true,
     "noEmit": true,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
diff --git a/web/utils/emoji.ts b/web/utils/emoji.ts
index 7d58f12b45..ec961dd69a 100644
--- a/web/utils/emoji.ts
+++ b/web/utils/emoji.ts
@@ -5,7 +5,7 @@ export async function searchEmoji(value: string) {
   const emojis: Emoji[] = await SearchIndex.search(value) || []
 
   const results = emojis.map((emoji) => {
-    return emoji.skins[0].native
+    return emoji.skins[0]!.native
   })
   return results
 }
diff --git a/web/utils/error-parser.ts b/web/utils/error-parser.ts
index f19bad3add..56acdd9cea 100644
--- a/web/utils/error-parser.ts
+++ b/web/utils/error-parser.ts
@@ -35,7 +35,7 @@ export const parsePluginErrorMessage = async (error: any): Promise<string> => {
 
   if (match) {
     try {
-      const errorData = JSON.parse(match[1])
+      const errorData = JSON.parse(match[1]!)
       // Return the inner message if exists
       if (errorData.message)
         return errorData.message
diff --git a/web/utils/format.ts b/web/utils/format.ts
index 804a2c1180..1e6df2ea8c 100644
--- a/web/utils/format.ts
+++ b/web/utils/format.ts
@@ -43,9 +43,9 @@ export const formatNumber = (num: number | string) => {
     let precision: number
     if (match) {
       // Scientific notation: precision is exponent + decimal digits in mantissa
-      const exponent = Number.parseInt(match[1], 10)
+      const exponent = Number.parseInt(match[1]!, 10)
       const mantissa = str.split('e')[0]
-      const mantissaDecimalPart = mantissa.split('.')[1]
+      const mantissaDecimalPart = mantissa!.split('.')[1]
       precision = exponent + (mantissaDecimalPart?.length || 0)
     }
     else {
@@ -60,7 +60,7 @@ export const formatNumber = (num: number | string) => {
   }
 
   const parts = numStr.split('.')
-  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  parts[0] = parts[0]!.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
   return parts.join('.')
 }
 
@@ -125,8 +125,8 @@ export const formatNumberAbbreviated = (num: number) => {
   ]
 
   for (let i = 0; i < units.length; i++) {
-    if (num >= units[i].value) {
-      const value = num / units[i].value
+    if (num >= units[i]!.value) {
+      const value = num / units[i]!.value
       let rounded = Math.round(value * 10) / 10
       let unitIndex = i
 
@@ -138,8 +138,8 @@ export const formatNumberAbbreviated = (num: number) => {
 
       const formatted = rounded.toFixed(1)
       return formatted.endsWith('.0')
-        ? `${Number.parseInt(formatted)}${units[unitIndex].symbol}`
-        : `${formatted}${units[unitIndex].symbol}`
+        ? `${Number.parseInt(formatted)}${units[unitIndex]!.symbol}`
+        : `${formatted}${units[unitIndex]!.symbol}`
     }
   }
   // Fallback: if no threshold matched, return the number string
diff --git a/web/utils/model-config.spec.ts b/web/utils/model-config.spec.ts
index 9e39883e61..f4b6b64278 100644
--- a/web/utils/model-config.spec.ts
+++ b/web/utils/model-config.spec.ts
@@ -322,7 +322,7 @@ describe('Model Config Utilities', () => {
 
       const result = userInputsFormToPromptVariables(userInputs, 'query')
 
-      expect(result[0].is_context_var).toBe(true)
+      expect(result[0]!.is_context_var).toBe(true)
     })
 
     /**
@@ -365,9 +365,9 @@ describe('Model Config Utilities', () => {
       const result = userInputsFormToPromptVariables(userInputs)
 
       expect(result).toHaveLength(3)
-      expect(result[0].type).toBe('string')
-      expect(result[1].type).toBe('number')
-      expect(result[2].type).toBe('select')
+      expect(result[0]!.type).toBe('string')
+      expect(result[1]!.type).toBe('number')
+      expect(result[2]!.type).toBe('select')
     })
   })
 
diff --git a/web/utils/urlValidation.ts b/web/utils/urlValidation.ts
index e78639b15b..196c6105c5 100644
--- a/web/utils/urlValidation.ts
+++ b/web/utils/urlValidation.ts
@@ -46,7 +46,7 @@ export function isPrivateOrLocalAddress(url: string): boolean {
       if (a === 10)
         return true
       // 172.16.0.0/12
-      if (a === 172 && b >= 16 && b <= 31)
+      if (a === 172 && b! >= 16 && b! <= 31)
         return true
       // 192.168.0.0/16
       if (a === 192 && b === 168)
diff --git a/web/utils/var.ts b/web/utils/var.ts
index 1c02440800..8c06c7e8c9 100644
--- a/web/utils/var.ts
+++ b/web/utils/var.ts
@@ -64,7 +64,7 @@ export const checkKey = (key: string, canBeEmpty?: boolean, _keys?: string[]): t
     return 'tooLong'
 
   if (otherAllowedRegex.test(key)) {
-    if (/\d/.test(key[0]))
+    if (/\d/.test(key[0]!))
       return 'notStartWithNumber'
 
     return true
@@ -102,7 +102,7 @@ export const hasDuplicateStr = (strArr: string[]) => {
     else
       strObj[str] = 1
   })
-  return !!Object.keys(strObj).find(key => strObj[key] > 1)
+  return !!Object.keys(strObj).find(key => strObj[key]! > 1)
 }
 
 const varRegex = /\{\{([a-z_]\w*)\}\}/gi

From c966e281d4f2d36f8e3cd85e35e45a90d3ac1785 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Thu, 16 Apr 2026 21:30:12 +0800
Subject: [PATCH 22/36] refactor(web): align UI component APIs with shadcn v4
 best practices (#35328)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 web/app/components/apps/app-card.tsx          |  2 +-
 .../form/components/field/number-input.tsx    |  2 +-
 web/app/components/base/param-item/index.tsx  |  8 ++---
 .../ui/context-menu/__tests__/index.spec.tsx  | 32 +++++++++----------
 .../base/ui/context-menu/index.stories.tsx    | 12 +++----
 .../components/base/ui/context-menu/index.tsx | 29 ++++++++++-------
 .../ui/dropdown-menu/__tests__/index.spec.tsx | 30 ++++++++---------
 .../base/ui/dropdown-menu/index.stories.tsx   | 18 +++++------
 .../base/ui/dropdown-menu/index.tsx           | 29 ++++++++++-------
 .../ui/number-field/__tests__/index.spec.tsx  | 14 ++++----
 .../base/ui/number-field/index.stories.tsx    | 14 ++++----
 .../components/base/ui/number-field/index.tsx | 30 ++++++++---------
 web/app/components/base/ui/overlay-shared.ts  |  5 ++-
 web/app/components/base/ui/select/index.tsx   | 12 +++----
 .../datasets/list/dataset-card/operations.tsx |  2 +-
 .../edit-metadata-batch/input-combined.tsx    |  7 ++--
 .../settings/index-method/keyword-number.tsx  | 10 +++---
 .../__tests__/index.spec.tsx                  |  2 +-
 .../workplace-selector/index.tsx              |  6 ++--
 .../operation-dropdown.tsx                    |  2 +-
 .../components/workflow/edge-contextmenu.tsx  |  2 +-
 .../nodes/_base/components/agent-strategy.tsx |  8 ++---
 .../top-k-and-score-threshold.tsx             | 16 +++++-----
 .../workflow/nodes/trigger-webhook/panel.tsx  | 15 ++++-----
 .../workflow/selection-contextmenu.tsx        |  6 ++--
 web/eslint-suppressions.json                  |  6 ----
 26 files changed, 162 insertions(+), 157 deletions(-)

diff --git a/web/app/components/apps/app-card.tsx b/web/app/components/apps/app-card.tsx
index 6d76d632f7..152dc3c877 100644
--- a/web/app/components/apps/app-card.tsx
+++ b/web/app/components/apps/app-card.tsx
@@ -167,7 +167,7 @@ const AppCardOperationsMenu: React.FC<AppCardOperationsMenuProps> = ({
         </>
       )}
       <DropdownMenuItem
-        destructive
+        variant="destructive"
         className="gap-2 px-3"
         onClick={e => handleMenuAction(e, onDelete)}
       >
diff --git a/web/app/components/base/form/components/field/number-input.tsx b/web/app/components/base/form/components/field/number-input.tsx
index fde6463731..4a1a37ff60 100644
--- a/web/app/components/base/form/components/field/number-input.tsx
+++ b/web/app/components/base/form/components/field/number-input.tsx
@@ -30,7 +30,7 @@ const NumberInputField = ({
   className,
   inputClassName,
   unit,
-  size = 'regular',
+  size = 'medium',
   ...props
 }: NumberInputFieldProps) => {
   const field = useFieldContext<number>()
diff --git a/web/app/components/base/param-item/index.tsx b/web/app/components/base/param-item/index.tsx
index fcd0517630..f5f571f604 100644
--- a/web/app/components/base/param-item/index.tsx
+++ b/web/app/components/base/param-item/index.tsx
@@ -62,11 +62,11 @@ const ParamItem: FC<Props> = ({ className, id, name, noTooltip, tip, step = 0.1,
             value={value}
             onValueChange={nextValue => onChange(id, nextValue ?? min)}
           >
-            <NumberFieldGroup size="regular">
-              <NumberFieldInput size="regular" className="w-[72px]" />
+            <NumberFieldGroup>
+              <NumberFieldInput className="w-[72px]" />
               <NumberFieldControls>
-                <NumberFieldIncrement size="regular" />
-                <NumberFieldDecrement size="regular" />
+                <NumberFieldIncrement />
+                <NumberFieldDecrement />
               </NumberFieldControls>
             </NumberFieldGroup>
           </NumberField>
diff --git a/web/app/components/base/ui/context-menu/__tests__/index.spec.tsx b/web/app/components/base/ui/context-menu/__tests__/index.spec.tsx
index 2f2dacc8ba..7146f3b15e 100644
--- a/web/app/components/base/ui/context-menu/__tests__/index.spec.tsx
+++ b/web/app/components/base/ui/context-menu/__tests__/index.spec.tsx
@@ -112,8 +112,8 @@ describe('context-menu wrapper', () => {
     })
   })
 
-  describe('destructive prop behavior', () => {
-    it.each([true, false])('should remain interactive and not leak destructive prop on item when destructive is %s', (destructive) => {
+  describe('variant prop behavior', () => {
+    it.each(['default', 'destructive'] as const)('should remain interactive and set data-variant on item when variant is %s', (variant) => {
       const handleClick = vi.fn()
 
       render(
@@ -121,9 +121,9 @@ describe('context-menu wrapper', () => {
           <ContextMenuTrigger aria-label="context trigger">Open</ContextMenuTrigger>
           <ContextMenuContent>
             <ContextMenuItem
-              destructive={destructive}
+              variant={variant}
               aria-label="menu action"
-              id={`context-item-${String(destructive)}`}
+              id={`context-item-${variant}`}
               onClick={handleClick}
             >
               Item label
@@ -134,12 +134,12 @@ describe('context-menu wrapper', () => {
 
       const item = screen.getByRole('menuitem', { name: 'menu action' })
       fireEvent.click(item)
-      expect(item).toHaveAttribute('id', `context-item-${String(destructive)}`)
-      expect(item).not.toHaveAttribute('destructive')
+      expect(item).toHaveAttribute('id', `context-item-${variant}`)
+      expect(item).toHaveAttribute('data-variant', variant)
       expect(handleClick).toHaveBeenCalledTimes(1)
     })
 
-    it.each([true, false])('should remain interactive and not leak destructive prop on submenu trigger when destructive is %s', (destructive) => {
+    it.each(['default', 'destructive'] as const)('should remain interactive and set data-variant on submenu trigger when variant is %s', (variant) => {
       const handleClick = vi.fn()
 
       render(
@@ -148,9 +148,9 @@ describe('context-menu wrapper', () => {
           <ContextMenuContent>
             <ContextMenuSub open>
               <ContextMenuSubTrigger
-                destructive={destructive}
+                variant={variant}
                 aria-label="submenu action"
-                id={`context-sub-${String(destructive)}`}
+                id={`context-sub-${variant}`}
                 onClick={handleClick}
               >
                 Trigger item
@@ -162,21 +162,21 @@ describe('context-menu wrapper', () => {
 
       const trigger = screen.getByRole('menuitem', { name: 'submenu action' })
       fireEvent.click(trigger)
-      expect(trigger).toHaveAttribute('id', `context-sub-${String(destructive)}`)
-      expect(trigger).not.toHaveAttribute('destructive')
+      expect(trigger).toHaveAttribute('id', `context-sub-${variant}`)
+      expect(trigger).toHaveAttribute('data-variant', variant)
       expect(handleClick).toHaveBeenCalledTimes(1)
     })
 
-    it.each([true, false])('should remain interactive and not leak destructive prop on link item when destructive is %s', (destructive) => {
+    it.each(['default', 'destructive'] as const)('should remain interactive and set data-variant on link item when variant is %s', (variant) => {
       render(
         <ContextMenu open>
           <ContextMenuTrigger aria-label="context trigger">Open</ContextMenuTrigger>
           <ContextMenuContent>
             <ContextMenuLinkItem
-              destructive={destructive}
+              variant={variant}
               href="https://example.com/docs"
               aria-label="context docs link"
-              id={`context-link-${String(destructive)}`}
+              id={`context-link-${variant}`}
               target="_blank"
               rel="noopener noreferrer"
             >
@@ -188,8 +188,8 @@ describe('context-menu wrapper', () => {
 
       const link = screen.getByRole('menuitem', { name: 'context docs link' })
       expect(link.tagName.toLowerCase()).toBe('a')
-      expect(link).toHaveAttribute('id', `context-link-${String(destructive)}`)
-      expect(link).not.toHaveAttribute('destructive')
+      expect(link).toHaveAttribute('id', `context-link-${variant}`)
+      expect(link).toHaveAttribute('data-variant', variant)
     })
   })
 
diff --git a/web/app/components/base/ui/context-menu/index.stories.tsx b/web/app/components/base/ui/context-menu/index.stories.tsx
index 084d82bd09..60cf4c1377 100644
--- a/web/app/components/base/ui/context-menu/index.stories.tsx
+++ b/web/app/components/base/ui/context-menu/index.stories.tsx
@@ -6,8 +6,8 @@ import {
   ContextMenuCheckboxItemIndicator,
   ContextMenuContent,
   ContextMenuGroup,
-  ContextMenuGroupLabel,
   ContextMenuItem,
+  ContextMenuLabel,
   ContextMenuLinkItem,
   ContextMenuRadioGroup,
   ContextMenuRadioItem,
@@ -85,14 +85,14 @@ export const WithGroupLabel: Story = {
       <TriggerArea />
       <ContextMenuContent>
         <ContextMenuGroup>
-          <ContextMenuGroupLabel>Actions</ContextMenuGroupLabel>
+          <ContextMenuLabel>Actions</ContextMenuLabel>
           <ContextMenuItem>Rename</ContextMenuItem>
           <ContextMenuItem>Duplicate</ContextMenuItem>
         </ContextMenuGroup>
         <ContextMenuSeparator />
         <ContextMenuGroup>
-          <ContextMenuGroupLabel>Danger Zone</ContextMenuGroupLabel>
-          <ContextMenuItem destructive>Delete</ContextMenuItem>
+          <ContextMenuLabel>Danger Zone</ContextMenuLabel>
+          <ContextMenuItem variant="destructive">Delete</ContextMenuItem>
         </ContextMenuGroup>
       </ContextMenuContent>
     </ContextMenu>
@@ -171,7 +171,7 @@ export const WithLinkItems: Story = {
           Product Roadmap
         </ContextMenuLinkItem>
         <ContextMenuSeparator />
-        <ContextMenuLinkItem destructive href="https://example.com/delete" rel="noopener noreferrer" target="_blank">
+        <ContextMenuLinkItem variant="destructive" href="https://example.com/delete" rel="noopener noreferrer" target="_blank">
           Dangerous External Action
         </ContextMenuLinkItem>
       </ContextMenuContent>
@@ -205,7 +205,7 @@ export const Complex: Story = {
           </ContextMenuSubContent>
         </ContextMenuSub>
         <ContextMenuSeparator />
-        <ContextMenuItem destructive>
+        <ContextMenuItem variant="destructive">
           <span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
           Delete
         </ContextMenuItem>
diff --git a/web/app/components/base/ui/context-menu/index.tsx b/web/app/components/base/ui/context-menu/index.tsx
index 2e18af249e..c92c4d6ab9 100644
--- a/web/app/components/base/ui/context-menu/index.tsx
+++ b/web/app/components/base/ui/context-menu/index.tsx
@@ -1,13 +1,15 @@
 'use client'
 
 import type { ReactNode } from 'react'
+import type { OverlayItemVariant } from '@/app/components/base/ui/overlay-shared'
 import type { Placement } from '@/app/components/base/ui/placement'
 import { ContextMenu as BaseContextMenu } from '@base-ui/react/context-menu'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
   overlayBackdropClassName,
-  overlayGroupLabelClassName,
+  overlayDestructiveClassName,
   overlayIndicatorClassName,
+  overlayLabelClassName,
   overlayPopupAnimationClassName,
   overlayPopupBaseClassName,
   overlayRowClassName,
@@ -114,35 +116,37 @@ export function ContextMenuContent({
 }
 
 type ContextMenuItemProps = BaseContextMenu.Item.Props & {
-  destructive?: boolean
+  variant?: OverlayItemVariant
 }
 
 export function ContextMenuItem({
   className,
-  destructive,
+  variant = 'default',
   ...props
 }: ContextMenuItemProps) {
   return (
     <BaseContextMenu.Item
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
+      data-variant={variant}
+      className={cn(overlayRowClassName, overlayDestructiveClassName, className)}
       {...props}
     />
   )
 }
 
 type ContextMenuLinkItemProps = BaseContextMenu.LinkItem.Props & {
-  destructive?: boolean
+  variant?: OverlayItemVariant
 }
 
 export function ContextMenuLinkItem({
   className,
-  destructive,
+  variant = 'default',
   closeOnClick = true,
   ...props
 }: ContextMenuLinkItemProps) {
   return (
     <BaseContextMenu.LinkItem
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
+      data-variant={variant}
+      className={cn(overlayRowClassName, overlayDestructiveClassName, className)}
       closeOnClick={closeOnClick}
       {...props}
     />
@@ -202,18 +206,19 @@ export function ContextMenuRadioItemIndicator({
 }
 
 type ContextMenuSubTriggerProps = BaseContextMenu.SubmenuTrigger.Props & {
-  destructive?: boolean
+  variant?: OverlayItemVariant
 }
 
 export function ContextMenuSubTrigger({
   className,
-  destructive,
+  variant = 'default',
   children,
   ...props
 }: ContextMenuSubTriggerProps) {
   return (
     <BaseContextMenu.SubmenuTrigger
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
+      data-variant={variant}
+      className={cn(overlayRowClassName, overlayDestructiveClassName, className)}
       {...props}
     >
       {children}
@@ -255,13 +260,13 @@ export function ContextMenuSubContent({
   })
 }
 
-export function ContextMenuGroupLabel({
+export function ContextMenuLabel({
   className,
   ...props
 }: BaseContextMenu.GroupLabel.Props) {
   return (
     <BaseContextMenu.GroupLabel
-      className={cn(overlayGroupLabelClassName, className)}
+      className={cn(overlayLabelClassName, className)}
       {...props}
     />
   )
diff --git a/web/app/components/base/ui/dropdown-menu/__tests__/index.spec.tsx b/web/app/components/base/ui/dropdown-menu/__tests__/index.spec.tsx
index 93ceb911e7..89b1ebf100 100644
--- a/web/app/components/base/ui/dropdown-menu/__tests__/index.spec.tsx
+++ b/web/app/components/base/ui/dropdown-menu/__tests__/index.spec.tsx
@@ -177,7 +177,7 @@ describe('dropdown-menu wrapper', () => {
       expect(screen.getByRole('menuitem', { name: 'Trigger item' })).toBeInTheDocument()
     })
 
-    it.each([true, false])('should remain interactive and not leak destructive prop when destructive is %s', (destructive) => {
+    it.each(['default', 'destructive'] as const)('should remain interactive and set data-variant on submenu trigger when variant is %s', (variant) => {
       const handleClick = vi.fn()
 
       render(
@@ -186,9 +186,9 @@ describe('dropdown-menu wrapper', () => {
           <DropdownMenuContent>
             <DropdownMenuSub open>
               <DropdownMenuSubTrigger
-                destructive={destructive}
+                variant={variant}
                 aria-label="submenu action"
-                id={`submenu-trigger-${String(destructive)}`}
+                id={`submenu-trigger-${variant}`}
                 onClick={handleClick}
               >
                 Trigger item
@@ -201,14 +201,14 @@ describe('dropdown-menu wrapper', () => {
       const subTrigger = screen.getByRole('menuitem', { name: 'submenu action' })
       fireEvent.click(subTrigger)
 
-      expect(subTrigger).toHaveAttribute('id', `submenu-trigger-${String(destructive)}`)
-      expect(subTrigger).not.toHaveAttribute('destructive')
+      expect(subTrigger).toHaveAttribute('id', `submenu-trigger-${variant}`)
+      expect(subTrigger).toHaveAttribute('data-variant', variant)
       expect(handleClick).toHaveBeenCalledTimes(1)
     })
   })
 
   describe('DropdownMenuItem', () => {
-    it.each([true, false])('should remain interactive and not leak destructive prop when destructive is %s', (destructive) => {
+    it.each(['default', 'destructive'] as const)('should remain interactive and set data-variant when variant is %s', (variant) => {
       const handleClick = vi.fn()
 
       render(
@@ -216,9 +216,9 @@ describe('dropdown-menu wrapper', () => {
           <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
           <DropdownMenuContent>
             <DropdownMenuItem
-              destructive={destructive}
+              variant={variant}
               aria-label="menu action"
-              id={`menu-item-${String(destructive)}`}
+              id={`menu-item-${variant}`}
               onClick={handleClick}
             >
               Item label
@@ -230,8 +230,8 @@ describe('dropdown-menu wrapper', () => {
       const item = screen.getByRole('menuitem', { name: 'menu action' })
       fireEvent.click(item)
 
-      expect(item).toHaveAttribute('id', `menu-item-${String(destructive)}`)
-      expect(item).not.toHaveAttribute('destructive')
+      expect(item).toHaveAttribute('id', `menu-item-${variant}`)
+      expect(item).toHaveAttribute('data-variant', variant)
       expect(handleClick).toHaveBeenCalledTimes(1)
     })
   })
@@ -299,7 +299,7 @@ describe('dropdown-menu wrapper', () => {
       expect(link).toHaveTextContent('Account settings')
     })
 
-    it.each([true, false])('should remain interactive and not leak destructive prop when destructive is %s', (destructive) => {
+    it.each(['default', 'destructive'] as const)('should remain interactive and set data-variant when variant is %s', (variant) => {
       const handleClick = vi.fn()
 
       render(
@@ -307,10 +307,10 @@ describe('dropdown-menu wrapper', () => {
           <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
           <DropdownMenuContent>
             <DropdownMenuLinkItem
-              destructive={destructive}
+              variant={variant}
               href="https://example.com/docs"
               aria-label="docs link"
-              id={`menu-link-${String(destructive)}`}
+              id={`menu-link-${variant}`}
               onClick={handleClick}
             >
               Docs
@@ -323,8 +323,8 @@ describe('dropdown-menu wrapper', () => {
       fireEvent.click(link)
 
       expect(link.tagName.toLowerCase()).toBe('a')
-      expect(link).toHaveAttribute('id', `menu-link-${String(destructive)}`)
-      expect(link).not.toHaveAttribute('destructive')
+      expect(link).toHaveAttribute('id', `menu-link-${variant}`)
+      expect(link).toHaveAttribute('data-variant', variant)
       expect(handleClick).toHaveBeenCalledTimes(1)
     })
   })
diff --git a/web/app/components/base/ui/dropdown-menu/index.stories.tsx b/web/app/components/base/ui/dropdown-menu/index.stories.tsx
index 0e2f21dd54..e87543f4ff 100644
--- a/web/app/components/base/ui/dropdown-menu/index.stories.tsx
+++ b/web/app/components/base/ui/dropdown-menu/index.stories.tsx
@@ -6,8 +6,8 @@ import {
   DropdownMenuCheckboxItemIndicator,
   DropdownMenuContent,
   DropdownMenuGroup,
-  DropdownMenuGroupLabel,
   DropdownMenuItem,
+  DropdownMenuLabel,
   DropdownMenuLinkItem,
   DropdownMenuRadioGroup,
   DropdownMenuRadioItem,
@@ -80,13 +80,13 @@ export const WithGroupLabel: Story = {
       <TriggerButton />
       <DropdownMenuContent>
         <DropdownMenuGroup>
-          <DropdownMenuGroupLabel>Actions</DropdownMenuGroupLabel>
+          <DropdownMenuLabel>Actions</DropdownMenuLabel>
           <DropdownMenuItem>Edit</DropdownMenuItem>
           <DropdownMenuItem>Duplicate</DropdownMenuItem>
         </DropdownMenuGroup>
         <DropdownMenuSeparator />
         <DropdownMenuGroup>
-          <DropdownMenuGroupLabel>Export</DropdownMenuGroupLabel>
+          <DropdownMenuLabel>Export</DropdownMenuLabel>
           <DropdownMenuItem>Export as PDF</DropdownMenuItem>
           <DropdownMenuItem>Export as CSV</DropdownMenuItem>
         </DropdownMenuGroup>
@@ -103,7 +103,7 @@ export const WithDestructiveItem: Story = {
         <DropdownMenuItem>Edit</DropdownMenuItem>
         <DropdownMenuItem>Duplicate</DropdownMenuItem>
         <DropdownMenuSeparator />
-        <DropdownMenuItem destructive>Delete</DropdownMenuItem>
+        <DropdownMenuItem variant="destructive">Delete</DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
   ),
@@ -202,7 +202,7 @@ export const WithDisabledItems: Story = {
         <DropdownMenuItem>Archive</DropdownMenuItem>
         <DropdownMenuSeparator />
         <DropdownMenuItem disabled>Restore</DropdownMenuItem>
-        <DropdownMenuItem destructive>Delete</DropdownMenuItem>
+        <DropdownMenuItem variant="destructive">Delete</DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
   ),
@@ -226,7 +226,7 @@ export const WithIcons: Story = {
           Archive
         </DropdownMenuItem>
         <DropdownMenuSeparator />
-        <DropdownMenuItem destructive>
+        <DropdownMenuItem variant="destructive">
           <span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
           Delete
         </DropdownMenuItem>
@@ -260,7 +260,7 @@ const ComplexDemo = () => {
       <TriggerButton label="Actions" />
       <DropdownMenuContent>
         <DropdownMenuGroup>
-          <DropdownMenuGroupLabel>Edit</DropdownMenuGroupLabel>
+          <DropdownMenuLabel>Edit</DropdownMenuLabel>
           <DropdownMenuItem>
             <span aria-hidden className="i-ri-pencil-line size-4 shrink-0 text-text-tertiary" />
             Rename
@@ -297,7 +297,7 @@ const ComplexDemo = () => {
         </DropdownMenuSub>
         <DropdownMenuSeparator />
         <DropdownMenuGroup>
-          <DropdownMenuGroupLabel>Sort by</DropdownMenuGroupLabel>
+          <DropdownMenuLabel>Sort by</DropdownMenuLabel>
           <DropdownMenuRadioGroup value={sortOrder} onValueChange={setSortOrder}>
             <DropdownMenuRadioItem value="newest">
               Newest first
@@ -320,7 +320,7 @@ const ComplexDemo = () => {
           <DropdownMenuCheckboxItemIndicator />
         </DropdownMenuCheckboxItem>
         <DropdownMenuSeparator />
-        <DropdownMenuItem destructive>
+        <DropdownMenuItem variant="destructive">
           <span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
           Delete
         </DropdownMenuItem>
diff --git a/web/app/components/base/ui/dropdown-menu/index.tsx b/web/app/components/base/ui/dropdown-menu/index.tsx
index b2b0b01c46..b0c034f3cb 100644
--- a/web/app/components/base/ui/dropdown-menu/index.tsx
+++ b/web/app/components/base/ui/dropdown-menu/index.tsx
@@ -1,12 +1,14 @@
 'use client'
 
 import type { ReactNode } from 'react'
+import type { OverlayItemVariant } from '@/app/components/base/ui/overlay-shared'
 import type { Placement } from '@/app/components/base/ui/placement'
 import { Menu } from '@base-ui/react/menu'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
-  overlayGroupLabelClassName,
+  overlayDestructiveClassName,
   overlayIndicatorClassName,
+  overlayLabelClassName,
   overlayPopupAnimationClassName,
   overlayPopupBaseClassName,
   overlayRowClassName,
@@ -72,13 +74,13 @@ export function DropdownMenuCheckboxItemIndicator({
   )
 }
 
-export function DropdownMenuGroupLabel({
+export function DropdownMenuLabel({
   className,
   ...props
 }: Menu.GroupLabel.Props) {
   return (
     <Menu.GroupLabel
-      className={cn(overlayGroupLabelClassName, className)}
+      className={cn(overlayLabelClassName, className)}
       {...props}
     />
   )
@@ -171,18 +173,19 @@ export function DropdownMenuContent({
 }
 
 type DropdownMenuSubTriggerProps = Menu.SubmenuTrigger.Props & {
-  destructive?: boolean
+  variant?: OverlayItemVariant
 }
 
 export function DropdownMenuSubTrigger({
   className,
-  destructive,
+  variant = 'default',
   children,
   ...props
 }: DropdownMenuSubTriggerProps) {
   return (
     <Menu.SubmenuTrigger
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
+      data-variant={variant}
+      className={cn(overlayRowClassName, overlayDestructiveClassName, className)}
       {...props}
     >
       {children}
@@ -225,35 +228,37 @@ export function DropdownMenuSubContent({
 }
 
 type DropdownMenuItemProps = Menu.Item.Props & {
-  destructive?: boolean
+  variant?: OverlayItemVariant
 }
 
 export function DropdownMenuItem({
   className,
-  destructive,
+  variant = 'default',
   ...props
 }: DropdownMenuItemProps) {
   return (
     <Menu.Item
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
+      data-variant={variant}
+      className={cn(overlayRowClassName, overlayDestructiveClassName, className)}
       {...props}
     />
   )
 }
 
 type DropdownMenuLinkItemProps = Menu.LinkItem.Props & {
-  destructive?: boolean
+  variant?: OverlayItemVariant
 }
 
 export function DropdownMenuLinkItem({
   className,
-  destructive,
+  variant = 'default',
   closeOnClick = true,
   ...props
 }: DropdownMenuLinkItemProps) {
   return (
     <Menu.LinkItem
-      className={cn(overlayRowClassName, destructive && 'text-text-destructive data-highlighted:bg-state-destructive-hover', className)}
+      data-variant={variant}
+      className={cn(overlayRowClassName, overlayDestructiveClassName, className)}
       closeOnClick={closeOnClick}
       {...props}
     />
diff --git a/web/app/components/base/ui/number-field/__tests__/index.spec.tsx b/web/app/components/base/ui/number-field/__tests__/index.spec.tsx
index 003191dd56..4d83075f19 100644
--- a/web/app/components/base/ui/number-field/__tests__/index.spec.tsx
+++ b/web/app/components/base/ui/number-field/__tests__/index.spec.tsx
@@ -68,7 +68,7 @@ const renderNumberField = ({
 describe('NumberField wrapper', () => {
   // Group and input wrappers should preserve the design-system variants and DOM defaults.
   describe('Group and input', () => {
-    it('should apply regular group classes by default and merge custom className', () => {
+    it('should apply medium group classes by default and merge custom className', () => {
       renderNumberField({
         groupProps: {
           className: 'custom-group',
@@ -124,7 +124,7 @@ describe('NumberField wrapper', () => {
   // Unit and controls wrappers should preserve layout tokens and HTML passthrough props.
   describe('Unit and controls', () => {
     it.each([
-      ['regular', 'pr-2'],
+      ['medium', 'pr-2'],
       ['large', 'pr-2.5'],
     ] as const)('should apply the %s unit spacing variant', (size, spacingClass) => {
       renderNumberField({
@@ -215,11 +215,11 @@ describe('NumberField wrapper', () => {
           <span id="increment-label">Increment from label</span>
           <span id="decrement-label">Decrement from label</span>
           <NumberField defaultValue={8}>
-            <NumberFieldGroup size="regular">
-              <NumberFieldInput aria-label="Amount" size="regular" />
+            <NumberFieldGroup size="medium">
+              <NumberFieldInput aria-label="Amount" size="medium" />
               <NumberFieldControls>
-                <NumberFieldIncrement aria-labelledby="increment-label" size="regular" />
-                <NumberFieldDecrement aria-labelledby="decrement-label" size="regular" />
+                <NumberFieldIncrement aria-labelledby="increment-label" size="medium" />
+                <NumberFieldDecrement aria-labelledby="decrement-label" size="medium" />
               </NumberFieldControls>
             </NumberFieldGroup>
           </NumberField>
@@ -234,7 +234,7 @@ describe('NumberField wrapper', () => {
     })
 
     it.each([
-      ['regular', 'pt-1', 'pb-1'],
+      ['medium', 'pt-1', 'pb-1'],
       ['large', 'pt-1.5', 'pb-1.5'],
     ] as const)('should apply the %s control button compound spacing classes', (size, incrementClass, decrementClass) => {
       renderNumberField({
diff --git a/web/app/components/base/ui/number-field/index.stories.tsx b/web/app/components/base/ui/number-field/index.stories.tsx
index f0b55764e4..7fcf41325e 100644
--- a/web/app/components/base/ui/number-field/index.stories.tsx
+++ b/web/app/components/base/ui/number-field/index.stories.tsx
@@ -15,7 +15,7 @@ type DemoFieldProps = {
   label: string
   helperText: string
   placeholder: string
-  size: 'regular' | 'large'
+  size: 'medium' | 'large'
   unit?: string
   defaultValue?: number | null
   min?: number
@@ -131,7 +131,7 @@ export const VariantMatrix: Story = {
         label="Top K"
         helperText="Regular size without suffix. Covers the regular group, input, and control button spacing."
         placeholder="Set top K"
-        size="regular"
+        size="medium"
         defaultValue={3}
         min={1}
         max={10}
@@ -141,7 +141,7 @@ export const VariantMatrix: Story = {
         label="Score threshold"
         helperText="Regular size with a suffix so the regular unit variant is visible."
         placeholder="Set threshold"
-        size="regular"
+        size="medium"
         unit="%"
         defaultValue={85}
         min={0}
@@ -180,7 +180,7 @@ export const DecimalInputs: Story = {
         label="Score threshold"
         helperText="Two-decimal precision with a 0.01 step, like retrieval tuning fields."
         placeholder="0.00"
-        size="regular"
+        size="medium"
         defaultValue={0.82}
         min={0}
         max={1}
@@ -204,7 +204,7 @@ export const DecimalInputs: Story = {
         label="Penalty"
         helperText="Starts empty so the placeholder and empty numeric state are both visible."
         placeholder="Optional"
-        size="regular"
+        size="medium"
         defaultValue={null}
         min={0}
         max={2}
@@ -236,7 +236,7 @@ export const BoundariesAndStates: Story = {
         label="HTTP status code"
         helperText="Integer-only style usage with tighter bounds from 100 to 599."
         placeholder="200"
-        size="regular"
+        size="medium"
         defaultValue={200}
         min={100}
         max={599}
@@ -247,7 +247,7 @@ export const BoundariesAndStates: Story = {
         label="Request timeout"
         helperText="Bounded regular input with suffix, common in system settings."
         placeholder="Set timeout"
-        size="regular"
+        size="medium"
         unit="ms"
         defaultValue={1200}
         min={100}
diff --git a/web/app/components/base/ui/number-field/index.tsx b/web/app/components/base/ui/number-field/index.tsx
index 193e7471c3..944aa52470 100644
--- a/web/app/components/base/ui/number-field/index.tsx
+++ b/web/app/components/base/ui/number-field/index.tsx
@@ -21,12 +21,12 @@ export const numberFieldGroupVariants = cva(
   {
     variants: {
       size: {
-        regular: 'rounded-lg',
+        medium: 'rounded-lg',
         large: 'rounded-[10px]',
       },
     },
     defaultVariants: {
-      size: 'regular',
+      size: 'medium',
     },
   },
 )
@@ -36,7 +36,7 @@ export type NumberFieldGroupProps = BaseNumberField.Group.Props & VariantProps<t
 
 export function NumberFieldGroup({
   className,
-  size = 'regular',
+  size = 'medium',
   ...props
 }: NumberFieldGroupProps) {
   return (
@@ -57,12 +57,12 @@ export const numberFieldInputVariants = cva(
   {
     variants: {
       size: {
-        regular: 'px-3 py-[7px] system-sm-regular',
+        medium: 'px-3 py-[7px] system-sm-regular',
         large: 'px-4 py-2 system-md-regular',
       },
     },
     defaultVariants: {
-      size: 'regular',
+      size: 'medium',
     },
   },
 )
@@ -71,7 +71,7 @@ export type NumberFieldInputProps = Omit<BaseNumberField.Input.Props, 'size'> &
 
 export function NumberFieldInput({
   className,
-  size = 'regular',
+  size = 'medium',
   ...props
 }: NumberFieldInputProps) {
   return (
@@ -87,12 +87,12 @@ export const numberFieldUnitVariants = cva(
   {
     variants: {
       size: {
-        regular: 'pr-2',
+        medium: 'pr-2',
         large: 'pr-2.5',
       },
     },
     defaultVariants: {
-      size: 'regular',
+      size: 'medium',
     },
   },
 )
@@ -101,7 +101,7 @@ export type NumberFieldUnitProps = HTMLAttributes<HTMLSpanElement> & VariantProp
 
 export function NumberFieldUnit({
   className,
-  size = 'regular',
+  size = 'medium',
   ...props
 }: NumberFieldUnitProps) {
   return (
@@ -143,7 +143,7 @@ const numberFieldControlButtonVariants = cva(
   {
     variants: {
       size: {
-        regular: '',
+        medium: '',
         large: '',
       },
       direction: {
@@ -153,12 +153,12 @@ const numberFieldControlButtonVariants = cva(
     },
     compoundVariants: [
       {
-        size: 'regular',
+        size: 'medium',
         direction: 'increment',
         className: 'pt-1',
       },
       {
-        size: 'regular',
+        size: 'medium',
         direction: 'decrement',
         className: 'pb-1',
       },
@@ -174,7 +174,7 @@ const numberFieldControlButtonVariants = cva(
       },
     ],
     defaultVariants: {
-      size: 'regular',
+      size: 'medium',
       direction: 'increment',
     },
   },
@@ -193,7 +193,7 @@ const decrementAriaLabel = 'Decrement value'
 export function NumberFieldIncrement({
   className,
   children,
-  size = 'regular',
+  size = 'medium',
   ...props
 }: NumberFieldButtonProps) {
   return (
@@ -210,7 +210,7 @@ export function NumberFieldIncrement({
 export function NumberFieldDecrement({
   className,
   children,
-  size = 'regular',
+  size = 'medium',
   ...props
 }: NumberFieldButtonProps) {
   return (
diff --git a/web/app/components/base/ui/overlay-shared.ts b/web/app/components/base/ui/overlay-shared.ts
index f21eab44ca..cdff8253a1 100644
--- a/web/app/components/base/ui/overlay-shared.ts
+++ b/web/app/components/base/ui/overlay-shared.ts
@@ -1,6 +1,9 @@
+export type OverlayItemVariant = 'default' | 'destructive'
+
 export const overlayRowClassName = 'mx-1 flex h-8 cursor-pointer select-none items-center gap-1 rounded-lg px-2 outline-hidden data-highlighted:bg-state-base-hover data-disabled:cursor-not-allowed data-disabled:opacity-30'
+export const overlayDestructiveClassName = 'data-[variant=destructive]:text-text-destructive data-[variant=destructive]:data-highlighted:bg-state-destructive-hover'
 export const overlayIndicatorClassName = 'ml-auto flex shrink-0 items-center text-text-accent'
-export const overlayGroupLabelClassName = 'px-3 pb-0.5 pt-1 text-text-tertiary system-xs-medium-uppercase'
+export const overlayLabelClassName = 'px-3 pb-0.5 pt-1 text-text-tertiary system-xs-medium-uppercase'
 export const overlaySeparatorClassName = 'my-1 h-px bg-divider-subtle'
 export const overlayPopupBaseClassName = 'max-h-(--available-height) overflow-y-auto overflow-x-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-1 text-sm text-text-secondary shadow-lg outline-hidden focus:outline-hidden focus-visible:outline-hidden backdrop-blur-[5px]'
 export const overlayPopupAnimationClassName = 'origin-(--transform-origin) transition-[transform,scale,opacity] data-ending-style:scale-95 data-starting-style:scale-95 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none'
diff --git a/web/app/components/base/ui/select/index.tsx b/web/app/components/base/ui/select/index.tsx
index 80a32fca1e..5448379ce6 100644
--- a/web/app/components/base/ui/select/index.tsx
+++ b/web/app/components/base/ui/select/index.tsx
@@ -5,7 +5,7 @@ import type { Placement } from '@/app/components/base/ui/placement'
 import { Select as BaseSelect } from '@base-ui/react/select'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
-  overlayGroupLabelClassName,
+  overlayLabelClassName,
   overlaySeparatorClassName,
 } from '@/app/components/base/ui/overlay-shared'
 import { parsePlacement } from '@/app/components/base/ui/placement'
@@ -17,18 +17,18 @@ export const SelectGroup = BaseSelect.Group
 
 const selectSizeClassName: Record<string, string> = {
   small: 'h-6 gap-px rounded-md px-2 py-1 system-xs-regular',
-  regular: 'h-8 gap-0.5 rounded-lg px-3 py-2 system-sm-regular',
+  medium: 'h-8 gap-0.5 rounded-lg px-3 py-2 system-sm-regular',
   large: 'h-9 gap-0.5 rounded-[10px] px-4 py-2 system-md-regular',
 }
 
 type SelectTriggerProps = BaseSelect.Trigger.Props & {
-  size?: 'small' | 'regular' | 'large'
+  size?: 'small' | 'medium' | 'large'
 }
 
 export function SelectTrigger({
   className,
   children,
-  size = 'regular',
+  size = 'medium',
   ...props
 }: SelectTriggerProps) {
   return (
@@ -55,13 +55,13 @@ export function SelectTrigger({
   )
 }
 
-export function SelectGroupLabel({
+export function SelectLabel({
   className,
   ...props
 }: BaseSelect.GroupLabel.Props) {
   return (
     <BaseSelect.GroupLabel
-      className={cn(overlayGroupLabelClassName, className)}
+      className={cn(overlayLabelClassName, className)}
       {...props}
     />
   )
diff --git a/web/app/components/datasets/list/dataset-card/operations.tsx b/web/app/components/datasets/list/dataset-card/operations.tsx
index 04a5b8aef7..9d11657219 100644
--- a/web/app/components/datasets/list/dataset-card/operations.tsx
+++ b/web/app/components/datasets/list/dataset-card/operations.tsx
@@ -54,7 +54,7 @@ const Operations = ({
       {showDelete && (
         <>
           <DropdownMenuSeparator />
-          <DropdownMenuItem destructive onClick={handleDelete}>
+          <DropdownMenuItem variant="destructive" onClick={handleDelete}>
             <span aria-hidden className="i-ri-delete-bin-line size-4" />
             {t('operation.delete', { ns: 'common' })}
           </DropdownMenuItem>
diff --git a/web/app/components/datasets/metadata/edit-metadata-batch/input-combined.tsx b/web/app/components/datasets/metadata/edit-metadata-batch/input-combined.tsx
index f60f2705a9..f11dba7533 100644
--- a/web/app/components/datasets/metadata/edit-metadata-batch/input-combined.tsx
+++ b/web/app/components/datasets/metadata/edit-metadata-batch/input-combined.tsx
@@ -49,14 +49,13 @@ const InputCombined: FC<Props> = ({
           readOnly={readOnly}
           onValueChange={value => onChange(value ?? 0)}
         >
-          <NumberFieldGroup size="regular">
+          <NumberFieldGroup>
             <NumberFieldInput
-              size="regular"
               className={cn(className, 'rounded-l-md')}
             />
             <NumberFieldControls className="overflow-hidden">
-              <NumberFieldIncrement size="regular" className="pt-0 pb-0" />
-              <NumberFieldDecrement size="regular" className="pt-0 pb-0" />
+              <NumberFieldIncrement className="pt-0 pb-0" />
+              <NumberFieldDecrement className="pt-0 pb-0" />
             </NumberFieldControls>
           </NumberFieldGroup>
         </NumberField>
diff --git a/web/app/components/datasets/settings/index-method/keyword-number.tsx b/web/app/components/datasets/settings/index-method/keyword-number.tsx
index feb63c1d65..03992fb027 100644
--- a/web/app/components/datasets/settings/index-method/keyword-number.tsx
+++ b/web/app/components/datasets/settings/index-method/keyword-number.tsx
@@ -33,7 +33,7 @@ const KeyWordNumber = ({
   return (
     <div className="flex items-center gap-x-1">
       <div className="flex grow items-center gap-x-0.5">
-        <div className="truncate text-text-secondary system-xs-medium">
+        <div className="truncate system-xs-medium text-text-secondary">
           {t('form.numberOfKeywords', { ns: 'datasetSettings' })}
         </div>
         <Tooltip
@@ -57,11 +57,11 @@ const KeyWordNumber = ({
         value={keywordNumber}
         onValueChange={handleInputChange}
       >
-        <NumberFieldGroup size="regular">
-          <NumberFieldInput size="regular" />
+        <NumberFieldGroup>
+          <NumberFieldInput />
           <NumberFieldControls>
-            <NumberFieldIncrement size="regular" />
-            <NumberFieldDecrement size="regular" />
+            <NumberFieldIncrement />
+            <NumberFieldDecrement />
           </NumberFieldControls>
         </NumberFieldGroup>
       </NumberField>
diff --git a/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx b/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
index e1d5216555..7e4a969089 100644
--- a/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-dropdown/workplace-selector/__tests__/index.spec.tsx
@@ -71,7 +71,7 @@ vi.mock('@/app/components/base/ui/select', async (importOriginal) => {
       <div data-testid="workplace-selector-content">{children}</div>
     ),
     SelectGroup: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-    SelectGroupLabel: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+    SelectLabel: ({ children }: { children: ReactNode }) => <div>{children}</div>,
     SelectItem: ({
       children,
       value,
diff --git a/web/app/components/header/account-dropdown/workplace-selector/index.tsx b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
index a155df48d9..bb96137fb3 100644
--- a/web/app/components/header/account-dropdown/workplace-selector/index.tsx
+++ b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
@@ -4,9 +4,9 @@ import {
   Select,
   SelectContent,
   SelectGroup,
-  SelectGroupLabel,
   SelectItem,
   SelectItemText,
+  SelectLabel,
   SelectTrigger,
 } from '@/app/components/base/ui/select'
 import { toast } from '@/app/components/base/ui/toast'
@@ -57,9 +57,9 @@ const WorkplaceSelector = () => {
       </SelectTrigger>
       <SelectContent popupClassName="w-[280px]">
         <SelectGroup>
-          <SelectGroupLabel>
+          <SelectLabel>
             {t('userProfile.workspace', { ns: 'common' })}
-          </SelectGroupLabel>
+          </SelectLabel>
           {workspaces.map(workspace => (
             <SelectItem key={workspace.id} value={workspace.id} className="gap-2 py-1 pr-2 pl-3">
               <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-components-icon-bg-blue-solid text-[13px]">
diff --git a/web/app/components/plugins/plugin-detail-panel/operation-dropdown.tsx b/web/app/components/plugins/plugin-detail-panel/operation-dropdown.tsx
index 6724228313..4b36e4612c 100644
--- a/web/app/components/plugins/plugin-detail-panel/operation-dropdown.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/operation-dropdown.tsx
@@ -73,7 +73,7 @@ const OperationDropdown: FC<Props> = ({
         {(source === PluginSource.marketplace || source === PluginSource.github) && enable_marketplace && (
           <DropdownMenuSeparator />
         )}
-        <DropdownMenuItem destructive onClick={onRemove}>
+        <DropdownMenuItem variant="destructive" onClick={onRemove}>
           {t('detailPanel.operation.remove', { ns: 'plugin' })}
         </DropdownMenuItem>
       </DropdownMenuContent>
diff --git a/web/app/components/workflow/edge-contextmenu.tsx b/web/app/components/workflow/edge-contextmenu.tsx
index be0a9caad4..61b208fcbd 100644
--- a/web/app/components/workflow/edge-contextmenu.tsx
+++ b/web/app/components/workflow/edge-contextmenu.tsx
@@ -48,7 +48,7 @@ const EdgeContextmenu = () => {
         popupClassName="rounded-lg"
       >
         <ContextMenuItem
-          destructive
+          variant="destructive"
           className="justify-between gap-4 px-3"
           onClick={() => handleEdgeDeleteById(edgeMenu.edgeId)}
         >
diff --git a/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx b/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
index 039385fa24..d13488a0b9 100644
--- a/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
+++ b/web/app/components/workflow/nodes/_base/components/agent-strategy.tsx
@@ -159,11 +159,11 @@ export const AgentStrategy = memo((props: AgentStrategyProps) => {
                   max={def.max}
                   onValueChange={nextValue => onChange(nextValue ?? defaultValue)}
                 >
-                  <NumberFieldGroup size="regular">
-                    <NumberFieldInput size="regular" className="w-12" />
+                  <NumberFieldGroup>
+                    <NumberFieldInput className="w-12" />
                     <NumberFieldControls>
-                      <NumberFieldIncrement size="regular" />
-                      <NumberFieldDecrement size="regular" />
+                      <NumberFieldIncrement />
+                      <NumberFieldDecrement />
                     </NumberFieldControls>
                   </NumberFieldGroup>
                 </NumberField>
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx
index 08ead860c7..5136d4897f 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx
@@ -72,11 +72,11 @@ const TopKAndScoreThreshold = ({
           value={topK}
           onValueChange={value => handleTopKChange(value ?? 0)}
         >
-          <NumberFieldGroup size="regular">
-            <NumberFieldInput size="regular" />
+          <NumberFieldGroup>
+            <NumberFieldInput />
             <NumberFieldControls>
-              <NumberFieldIncrement size="regular" />
-              <NumberFieldDecrement size="regular" />
+              <NumberFieldIncrement />
+              <NumberFieldDecrement />
             </NumberFieldControls>
           </NumberFieldGroup>
         </NumberField>
@@ -107,11 +107,11 @@ const TopKAndScoreThreshold = ({
               value={scoreThreshold ?? null}
               onValueChange={value => handleScoreThresholdChange(value ?? 0)}
             >
-              <NumberFieldGroup size="regular">
-                <NumberFieldInput size="regular" />
+              <NumberFieldGroup>
+                <NumberFieldInput />
                 <NumberFieldControls>
-                  <NumberFieldIncrement size="regular" />
-                  <NumberFieldDecrement size="regular" />
+                  <NumberFieldIncrement />
+                  <NumberFieldDecrement />
                 </NumberFieldControls>
               </NumberFieldGroup>
             </NumberField>
diff --git a/web/app/components/workflow/nodes/trigger-webhook/panel.tsx b/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
index 4aea84b5ad..4f276d3535 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
@@ -78,7 +78,7 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({
 
   return (
     <div className="mt-2">
-      <div className="space-y-4 px-4 pb-3 pt-2">
+      <div className="space-y-4 px-4 pt-2 pb-3">
         {/* Webhook URL Section */}
         <Field title={t(`${i18nPrefix}.webhookUrl`, { ns: 'workflow' })}>
           <div className="space-y-1">
@@ -138,7 +138,7 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({
                   </div>
                 </Tooltip>
                 {isPrivateOrLocalAddress(inputs.webhook_debug_url) && (
-                  <div className="mt-1 px-0 py-[2px] text-text-warning system-xs-regular">
+                  <div className="mt-1 px-0 py-[2px] system-xs-regular text-text-warning">
                     {t(`${i18nPrefix}.debugUrlPrivateAddressWarning`, { ns: 'workflow' })}
                   </div>
                 )}
@@ -197,7 +197,7 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({
         <Field title={t(`${i18nPrefix}.responseConfiguration`, { ns: 'workflow' })}>
           <div className="space-y-3">
             <div className="flex items-center justify-between">
-              <label className="text-text-tertiary system-sm-medium">
+              <label className="system-sm-medium text-text-tertiary">
                 {t(`${i18nPrefix}.statusCode`, { ns: 'workflow' })}
               </label>
               <NumberField
@@ -212,20 +212,19 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({
                     handleStatusCodeChange(normalizeStatusCode(value ?? DEFAULT_STATUS_CODE))
                 }}
               >
-                <NumberFieldGroup size="regular">
+                <NumberFieldGroup>
                   <NumberFieldInput
-                    size="regular"
                     className="h-8"
                   />
                   <NumberFieldControls>
-                    <NumberFieldIncrement size="regular" />
-                    <NumberFieldDecrement size="regular" />
+                    <NumberFieldIncrement />
+                    <NumberFieldDecrement />
                   </NumberFieldControls>
                 </NumberFieldGroup>
               </NumberField>
             </div>
             <div>
-              <label className="mb-2 block text-text-tertiary system-sm-medium">
+              <label className="mb-2 block system-sm-medium text-text-tertiary">
                 {t(`${i18nPrefix}.responseBody`, { ns: 'workflow' })}
               </label>
               <ParagraphInput
diff --git a/web/app/components/workflow/selection-contextmenu.tsx b/web/app/components/workflow/selection-contextmenu.tsx
index 64a6f87c55..c82f431ddf 100644
--- a/web/app/components/workflow/selection-contextmenu.tsx
+++ b/web/app/components/workflow/selection-contextmenu.tsx
@@ -12,8 +12,8 @@ import {
   ContextMenu,
   ContextMenuContent,
   ContextMenuGroup,
-  ContextMenuGroupLabel,
   ContextMenuItem,
+  ContextMenuLabel,
   ContextMenuSeparator,
 } from '@/app/components/base/ui/context-menu'
 import { useCollaborativeWorkflow } from '@/app/components/workflow/hooks/use-collaborative-workflow'
@@ -413,9 +413,9 @@ const SelectionContextmenu = () => {
         {menuSections.map((section, sectionIndex) => (
           <ContextMenuGroup key={section.titleKey}>
             {sectionIndex > 0 && <ContextMenuSeparator />}
-            <ContextMenuGroupLabel>
+            <ContextMenuLabel>
               {t(section.titleKey, { defaultValue: section.titleKey, ns: 'workflow' })}
-            </ContextMenuGroupLabel>
+            </ContextMenuLabel>
             {section.items.map((item) => {
               return (
                 <ContextMenuItem
diff --git a/web/eslint-suppressions.json b/web/eslint-suppressions.json
index db5a22797c..19b1aed1dd 100644
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json
@@ -3631,9 +3631,6 @@
   "app/components/datasets/settings/index-method/keyword-number.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "app/components/datasets/settings/permission-selector/index.tsx": {
@@ -7251,9 +7248,6 @@
   "app/components/workflow/nodes/trigger-webhook/panel.tsx": {
     "no-restricted-imports": {
       "count": 2
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
     }
   },
   "app/components/workflow/nodes/trigger-webhook/utils/render-output-vars.tsx": {

From 4289cb2634b80da38030f7a4ca31311962c8c64d Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Thu, 16 Apr 2026 22:42:04 +0800
Subject: [PATCH 23/36] chore: workspace level typecheck (#35329)

---
 .github/workflows/style.yml                   |  4 +-
 .vite-hooks/pre-commit                        | 28 -------
 e2e/package.json                              |  4 +-
 e2e/scripts/run-cucumber.ts                   | 12 +--
 e2e/tsconfig.json                             |  9 +--
 package.json                                  |  3 +-
 packages/dify-ui/package.json                 |  7 +-
 packages/dify-ui/tsconfig.json                |  8 +-
 .../package.json                              |  4 +-
 .../src/cli.ts                                |  3 +-
 .../tsconfig.json                             |  3 +
 packages/tsconfig/base.json                   | 19 +++++
 packages/tsconfig/nextjs.json                 | 10 +++
 packages/tsconfig/node.json                   |  7 ++
 packages/tsconfig/package.json                | 11 +++
 packages/tsconfig/web.json                    |  7 ++
 pnpm-lock.yaml                                | 20 +++++
 sdks/nodejs-client/package.json               |  3 +-
 sdks/nodejs-client/src/http/sse.test.ts       |  8 +-
 sdks/nodejs-client/src/index.test.ts          |  2 +-
 sdks/nodejs-client/tsconfig.json              | 12 +--
 web/__tests__/instrumentation-client.spec.ts  | 78 -------------------
 .../__tests__/index.spec.tsx                  |  6 +-
 .../components/base/error-boundary/index.tsx  |  6 +-
 .../base/markdown/error-boundary.tsx          |  4 +-
 .../plugins/context-block/node.tsx            | 18 ++---
 .../plugins/current-block/node.tsx            | 18 ++---
 .../plugins/custom-text/node.tsx              | 12 +--
 .../plugins/error-message-block/node.tsx      | 18 ++---
 .../plugins/history-block/node.tsx            | 18 ++---
 .../plugins/hitl-input-block/node.tsx         | 20 ++---
 .../plugins/last-run-block/node.tsx           | 18 ++---
 .../plugins/query-block/node.tsx              | 18 ++---
 .../plugins/request-url-block/node.tsx        | 18 ++---
 .../plugins/variable-value-block/node.tsx     | 12 +--
 .../plugins/workflow-variable-block/node.tsx  | 18 ++---
 .../__tests__/update-dsl-modal.spec.tsx       |  2 +-
 .../components/variable/output-var-list.tsx   |  2 +-
 .../_base/components/variable/var-list.tsx    |  2 +-
 .../run/utils/format-log/parallel/index.ts    | 13 +++-
 web/i18n-config/index.ts                      |  2 +-
 web/instrumentation-client.ts                 | 14 ----
 web/package.json                              |  5 +-
 web/tsconfig.json                             | 24 +-----
 44 files changed, 236 insertions(+), 294 deletions(-)
 create mode 100644 packages/migrate-no-unchecked-indexed-access/tsconfig.json
 create mode 100644 packages/tsconfig/base.json
 create mode 100644 packages/tsconfig/nextjs.json
 create mode 100644 packages/tsconfig/node.json
 create mode 100644 packages/tsconfig/package.json
 create mode 100644 packages/tsconfig/web.json
 delete mode 100644 web/__tests__/instrumentation-client.spec.ts

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index c32fc9d0cb..73b1b5c078 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -77,6 +77,8 @@ jobs:
         with:
           files: |
             web/**
+            e2e/**
+            sdks/nodejs-client/**
             packages/**
             package.json
             pnpm-lock.yaml
@@ -112,7 +114,7 @@ jobs:
 
       - name: Web type check
         if: steps.changed-files.outputs.any_changed == 'true'
-        working-directory: ./web
+        working-directory: .
         run: vp run type-check
 
       - name: Web dead code check
diff --git a/.vite-hooks/pre-commit b/.vite-hooks/pre-commit
index 13bbd81cf6..b78fa886e4 100755
--- a/.vite-hooks/pre-commit
+++ b/.vite-hooks/pre-commit
@@ -64,36 +64,8 @@ if $web_modified; then
 
     echo "Running ESLint on web module"
 
-    if git diff --cached --quiet -- 'web/**/*.ts' 'web/**/*.tsx'; then
-        web_ts_modified=false
-    else
-        ts_diff_status=$?
-        if [ $ts_diff_status -eq 1 ]; then
-            web_ts_modified=true
-        else
-            echo "Unable to determine staged TypeScript changes (git exit code: $ts_diff_status)."
-            exit $ts_diff_status
-        fi
-    fi
-
     cd ./web || exit 1
     vp staged
 
-    if $web_ts_modified; then
-        echo "Running TypeScript type-check:tsgo"
-        if ! npm run type-check:tsgo; then
-            echo "Type check failed. Please run 'npm run type-check:tsgo' to fix the errors."
-            exit 1
-        fi
-    else
-        echo "No staged TypeScript changes detected, skipping type-check:tsgo"
-    fi
-
-    echo "Running knip"
-    if ! npm run knip; then
-        echo "Knip check failed. Please run 'npm run knip' to fix the errors."
-        exit 1
-    fi
-
     cd ../
 fi
diff --git a/e2e/package.json b/e2e/package.json
index 925418f223..fb0705ab79 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -11,9 +11,11 @@
     "e2e:install": "playwright install --with-deps chromium",
     "e2e:middleware:down": "tsx ./scripts/setup.ts middleware-down",
     "e2e:middleware:up": "tsx ./scripts/setup.ts middleware-up",
-    "e2e:reset": "tsx ./scripts/setup.ts reset"
+    "e2e:reset": "tsx ./scripts/setup.ts reset",
+    "type-check": "tsc"
   },
   "devDependencies": {
+    "@dify/tsconfig": "workspace:*",
     "@cucumber/cucumber": "catalog:",
     "@playwright/test": "catalog:",
     "@types/node": "catalog:",
diff --git a/e2e/scripts/run-cucumber.ts b/e2e/scripts/run-cucumber.ts
index 39e9157916..1d5229742c 100644
--- a/e2e/scripts/run-cucumber.ts
+++ b/e2e/scripts/run-cucumber.ts
@@ -17,12 +17,10 @@ const parseArgs = (argv: string[]): RunOptions => {
   let headed = false
   const forwardArgs: string[] = []
 
-  for (let index = 0; index < argv.length; index += 1) {
-    const arg = argv[index]
-
+  for (const [index, arg] of argv.entries()) {
     if (arg === '--') {
       forwardArgs.push(...argv.slice(index + 1))
-      break
+      return { forwardArgs, full, headed }
     }
 
     if (arg === '--full') {
@@ -38,11 +36,7 @@ const parseArgs = (argv: string[]): RunOptions => {
     forwardArgs.push(arg)
   }
 
-  return {
-    forwardArgs,
-    full,
-    headed,
-  }
+  return { forwardArgs, full, headed }
 }
 
 const hasCustomTags = (forwardArgs: string[]) =>
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
index 3976c12b66..fc729f0ad0 100644
--- a/e2e/tsconfig.json
+++ b/e2e/tsconfig.json
@@ -1,16 +1,9 @@
 {
+  "extends": "@dify/tsconfig/node.json",
   "compilerOptions": {
-    "target": "ES2023",
     "lib": ["ES2023", "DOM"],
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
     "allowJs": false,
-    "resolveJsonModule": true,
-    "noEmit": true,
-    "strict": true,
-    "skipLibCheck": true,
     "types": ["node", "@playwright/test", "@cucumber/cucumber"],
-    "isolatedModules": true,
     "verbatimModuleSyntax": true
   },
   "include": ["./**/*.ts"],
diff --git a/package.json b/package.json
index 736a354ef7..47c8c170e5 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,8 @@
   "name": "dify",
   "private": true,
   "scripts": {
-    "prepare": "vp config"
+    "prepare": "vp config",
+    "type-check": "vp run -r type-check"
   },
   "devDependencies": {
     "vite": "catalog:",
diff --git a/packages/dify-ui/package.json b/packages/dify-ui/package.json
index d8314a6be3..ef731aec89 100644
--- a/packages/dify-ui/package.json
+++ b/packages/dify-ui/package.json
@@ -19,6 +19,11 @@
     "tailwind-merge": "catalog:"
   },
   "devDependencies": {
-    "tailwindcss": "catalog:"
+    "@dify/tsconfig": "workspace:*",
+    "tailwindcss": "catalog:",
+    "typescript": "catalog:"
+  },
+  "scripts": {
+    "type-check": "tsc"
   }
 }
diff --git a/packages/dify-ui/tsconfig.json b/packages/dify-ui/tsconfig.json
index 3e912baba0..243fc436d2 100644
--- a/packages/dify-ui/tsconfig.json
+++ b/packages/dify-ui/tsconfig.json
@@ -1,11 +1,7 @@
 {
+  "extends": "@dify/tsconfig/base.json",
   "compilerOptions": {
-    "target": "ES2022",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
+    "noEmit": false,
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
diff --git a/packages/migrate-no-unchecked-indexed-access/package.json b/packages/migrate-no-unchecked-indexed-access/package.json
index 781e88b0e8..cea9dcde60 100644
--- a/packages/migrate-no-unchecked-indexed-access/package.json
+++ b/packages/migrate-no-unchecked-indexed-access/package.json
@@ -7,12 +7,14 @@
     "migrate-no-unchecked-indexed-access": "./bin/migrate-no-unchecked-indexed-access.js"
   },
   "scripts": {
-    "build": "vp pack"
+    "build": "vp pack",
+    "type-check": "tsc"
   },
   "dependencies": {
     "typescript": "catalog:"
   },
   "devDependencies": {
+    "@dify/tsconfig": "workspace:*",
     "@types/node": "catalog:",
     "vite": "catalog:",
     "vite-plus": "catalog:"
diff --git a/packages/migrate-no-unchecked-indexed-access/src/cli.ts b/packages/migrate-no-unchecked-indexed-access/src/cli.ts
index fa52510905..99142c388f 100644
--- a/packages/migrate-no-unchecked-indexed-access/src/cli.ts
+++ b/packages/migrate-no-unchecked-indexed-access/src/cli.ts
@@ -34,7 +34,8 @@ let exitCode = 0
 
 try {
   await main()
-  exitCode = process.exitCode ?? 0
+  const currentExitCode = process.exitCode
+  exitCode = typeof currentExitCode === 'number' ? currentExitCode : 0
 }
 catch (error) {
   console.error(error instanceof Error ? error.message : error)
diff --git a/packages/migrate-no-unchecked-indexed-access/tsconfig.json b/packages/migrate-no-unchecked-indexed-access/tsconfig.json
new file mode 100644
index 0000000000..aeb24e1df5
--- /dev/null
+++ b/packages/migrate-no-unchecked-indexed-access/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@dify/tsconfig/node.json"
+}
diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json
new file mode 100644
index 0000000000..707f1aff56
--- /dev/null
+++ b/packages/tsconfig/base.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "target": "es2022",
+    "allowJs": true,
+    "resolveJsonModule": true,
+    "moduleDetection": "force",
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+
+    "strict": true,
+    "noUncheckedIndexedAccess": true,
+    "noImplicitOverride": true,
+
+    "module": "preserve",
+    "noEmit": true
+  }
+}
diff --git a/packages/tsconfig/nextjs.json b/packages/tsconfig/nextjs.json
new file mode 100644
index 0000000000..81c6436a97
--- /dev/null
+++ b/packages/tsconfig/nextjs.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./web.json",
+  "compilerOptions": {
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
+  }
+}
diff --git a/packages/tsconfig/node.json b/packages/tsconfig/node.json
new file mode 100644
index 0000000000..832dab2b09
--- /dev/null
+++ b/packages/tsconfig/node.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./base.json",
+  "compilerOptions": {
+    "lib": ["es2022"],
+    "types": ["node"]
+  }
+}
diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json
new file mode 100644
index 0000000000..52cafc5bb3
--- /dev/null
+++ b/packages/tsconfig/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@dify/tsconfig",
+  "version": "0.0.0-private",
+  "private": true,
+  "exports": {
+    "./base.json": "./base.json",
+    "./nextjs.json": "./nextjs.json",
+    "./node.json": "./node.json",
+    "./web.json": "./web.json"
+  }
+}
diff --git a/packages/tsconfig/web.json b/packages/tsconfig/web.json
new file mode 100644
index 0000000000..9f3ba7c121
--- /dev/null
+++ b/packages/tsconfig/web.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./base.json",
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "lib": ["es2022", "dom", "dom.iterable"]
+  }
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cdf5001e2d..2301b5b281 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -586,6 +586,9 @@ importers:
       '@cucumber/cucumber':
         specifier: 'catalog:'
         version: 12.8.0
+      '@dify/tsconfig':
+        specifier: workspace:*
+        version: link:../packages/tsconfig
       '@playwright/test':
         specifier: 'catalog:'
         version: 1.59.1
@@ -614,9 +617,15 @@ importers:
         specifier: 'catalog:'
         version: 3.5.0
     devDependencies:
+      '@dify/tsconfig':
+        specifier: workspace:*
+        version: link:../tsconfig
       tailwindcss:
         specifier: 'catalog:'
         version: 4.2.2
+      typescript:
+        specifier: 'catalog:'
+        version: 6.0.2
 
   packages/iconify-collections:
     devDependencies:
@@ -630,6 +639,9 @@ importers:
         specifier: 'catalog:'
         version: 6.0.2
     devDependencies:
+      '@dify/tsconfig':
+        specifier: workspace:*
+        version: link:../tsconfig
       '@types/node':
         specifier: 'catalog:'
         version: 25.6.0
@@ -640,8 +652,13 @@ importers:
         specifier: 'catalog:'
         version: 0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)
 
+  packages/tsconfig: {}
+
   sdks/nodejs-client:
     devDependencies:
+      '@dify/tsconfig':
+        specifier: workspace:*
+        version: link:../../packages/tsconfig
       '@eslint/js':
         specifier: 'catalog:'
         version: 10.0.1(eslint@10.2.0(jiti@2.6.1))
@@ -991,6 +1008,9 @@ importers:
       '@dify/iconify-collections':
         specifier: workspace:*
         version: link:../packages/iconify-collections
+      '@dify/tsconfig':
+        specifier: workspace:*
+        version: link:../packages/tsconfig
       '@egoist/tailwindcss-icons':
         specifier: 'catalog:'
         version: 1.9.2(tailwindcss@4.2.2)
diff --git a/sdks/nodejs-client/package.json b/sdks/nodejs-client/package.json
index e058edb0ca..28ebcb89c2 100644
--- a/sdks/nodejs-client/package.json
+++ b/sdks/nodejs-client/package.json
@@ -48,13 +48,14 @@
     "build": "vp pack",
     "lint": "eslint",
     "lint:fix": "eslint --fix",
-    "type-check": "tsc -p tsconfig.json --noEmit",
+    "type-check": "tsc",
     "test": "vp test",
     "test:coverage": "vp test --coverage",
     "publish:check": "./scripts/publish.sh --dry-run",
     "publish:npm": "./scripts/publish.sh"
   },
   "devDependencies": {
+    "@dify/tsconfig": "workspace:*",
     "@eslint/js": "catalog:",
     "@types/node": "catalog:",
     "@typescript-eslint/eslint-plugin": "catalog:",
diff --git a/sdks/nodejs-client/src/http/sse.test.ts b/sdks/nodejs-client/src/http/sse.test.ts
index 70cd11007d..83cde28de3 100644
--- a/sdks/nodejs-client/src/http/sse.test.ts
+++ b/sdks/nodejs-client/src/http/sse.test.ts
@@ -14,8 +14,8 @@ describe("sse parsing", () => {
       events.push(event);
     }
     expect(events).toHaveLength(1);
-    expect(events[0].event).toBe("message");
-    expect(events[0].data).toEqual({ answer: "hi" });
+    expect(events[0]!.event).toBe("message");
+    expect(events[0]!.data).toEqual({ answer: "hi" });
   });
 
   it("handles multi-line data payloads", async () => {
@@ -24,8 +24,8 @@ describe("sse parsing", () => {
     for await (const event of parseSseStream(stream)) {
       events.push(event);
     }
-    expect(events[0].raw).toBe("line1\nline2");
-    expect(events[0].data).toBe("line1\nline2");
+    expect(events[0]!.raw).toBe("line1\nline2");
+    expect(events[0]!.data).toBe("line1\nline2");
   });
 
   it("ignores comments and flushes the last event without a trailing separator", async () => {
diff --git a/sdks/nodejs-client/src/index.test.ts b/sdks/nodejs-client/src/index.test.ts
index d194680379..8d56b994c4 100644
--- a/sdks/nodejs-client/src/index.test.ts
+++ b/sdks/nodejs-client/src/index.test.ts
@@ -99,7 +99,7 @@ describe("File uploads", () => {
         super();
       }
 
-      _read() {}
+      override _read() {}
 
       append() {}
 
diff --git a/sdks/nodejs-client/tsconfig.json b/sdks/nodejs-client/tsconfig.json
index 46055447be..1e55007ed0 100644
--- a/sdks/nodejs-client/tsconfig.json
+++ b/sdks/nodejs-client/tsconfig.json
@@ -1,18 +1,14 @@
 {
+  "extends": "@dify/tsconfig/node.json",
   "compilerOptions": {
-    "target": "ES2022",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
     "rootDir": ".",
     "outDir": "dist",
+    "noEmit": false,
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
-    "strict": true,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "skipLibCheck": true,
     "types": ["node"]
   },
-  "include": ["src/**/*.ts", "tests/**/*.ts"]
+  "include": ["src/**/*.ts", "tests/**/*.ts", "vite.config.ts"]
 }
diff --git a/web/__tests__/instrumentation-client.spec.ts b/web/__tests__/instrumentation-client.spec.ts
deleted file mode 100644
index f767b80826..0000000000
--- a/web/__tests__/instrumentation-client.spec.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Tests for Array.prototype.toSpliced polyfill
- */
-
-describe('toSpliced polyfill', () => {
-  let originalToSpliced: typeof Array.prototype.toSpliced
-
-  beforeEach(() => {
-    // Save original method
-    originalToSpliced = Array.prototype.toSpliced
-  })
-
-  afterEach(() => {
-    // Restore original method
-    // eslint-disable-next-line no-extend-native
-    Array.prototype.toSpliced = originalToSpliced
-  })
-
-  const applyPolyfill = () => {
-    // @ts-expect-error - intentionally deleting for test
-    delete Array.prototype.toSpliced
-
-    if (!Array.prototype.toSpliced) {
-      // eslint-disable-next-line no-extend-native
-      Array.prototype.toSpliced = function <T>(this: T[], start: number, deleteCount?: number, ...items: T[]): T[] {
-        const copy = this.slice()
-        copy.splice(start, deleteCount ?? copy.length - start, ...items)
-        return copy
-      }
-    }
-  }
-
-  it('should add toSpliced method when not available', () => {
-    applyPolyfill()
-    expect(typeof Array.prototype.toSpliced).toBe('function')
-  })
-
-  it('should return a new array without modifying the original', () => {
-    applyPolyfill()
-    const arr = [1, 2, 3, 4, 5]
-    const result = arr.toSpliced(1, 2)
-
-    expect(result).toEqual([1, 4, 5])
-    expect(arr).toEqual([1, 2, 3, 4, 5]) // original unchanged
-  })
-
-  it('should insert items at the specified position', () => {
-    applyPolyfill()
-    const arr: (number | string)[] = [1, 2, 3]
-    const result = arr.toSpliced(1, 0, 'a', 'b')
-
-    expect(result).toEqual([1, 'a', 'b', 2, 3])
-  })
-
-  it('should replace items at the specified position', () => {
-    applyPolyfill()
-    const arr: (number | string)[] = [1, 2, 3, 4, 5]
-    const result = arr.toSpliced(1, 2, 'a', 'b')
-
-    expect(result).toEqual([1, 'a', 'b', 4, 5])
-  })
-
-  it('should handle negative start index', () => {
-    applyPolyfill()
-    const arr = [1, 2, 3, 4, 5]
-    const result = arr.toSpliced(-2, 1)
-
-    expect(result).toEqual([1, 2, 3, 5])
-  })
-
-  it('should delete to end when deleteCount is omitted', () => {
-    applyPolyfill()
-    const arr = [1, 2, 3, 4, 5]
-    const result = arr.toSpliced(2)
-
-    expect(result).toEqual([1, 2])
-  })
-})
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 40c32b7dd6..ae555a872b 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
@@ -258,7 +258,8 @@ describe('CreateFromDSLModal', () => {
       expect(getCreateButton())!.toBeDisabled()
     })
 
-    ahooksMocks.handlers.findLast(item => Array.isArray(item.keys))?.handler()
+    const latestHandlerAfterRemove = [...ahooksMocks.handlers].reverse().find(item => Array.isArray(item.keys))
+    latestHandlerAfterRemove?.handler()
     expect(mockImportDSL).not.toHaveBeenCalled()
   })
 
@@ -387,7 +388,8 @@ describe('CreateFromDSLModal', () => {
     )
 
     expect(screen.getByText('apps-full'))!.toBeInTheDocument()
-    ahooksMocks.handlers.findLast(item => Array.isArray(item.keys))?.handler()
+    const latestPlanLimitHandler = [...ahooksMocks.handlers].reverse().find(item => Array.isArray(item.keys))
+    latestPlanLimitHandler?.handler()
     expect(mockImportDSL).toHaveBeenCalledTimes(1)
   })
 
diff --git a/web/app/components/base/error-boundary/index.tsx b/web/app/components/base/error-boundary/index.tsx
index 607494eab5..21395a57c9 100644
--- a/web/app/components/base/error-boundary/index.tsx
+++ b/web/app/components/base/error-boundary/index.tsx
@@ -67,7 +67,7 @@ class ErrorBoundaryInner extends React.Component<
     }
   }
 
-  componentDidCatch(error: Error, errorInfo: ErrorInfo) {
+  override componentDidCatch(error: Error, errorInfo: ErrorInfo) {
     if (IS_DEV) {
       console.error('ErrorBoundary caught an error:', error)
       console.error('Error Info:', errorInfo)
@@ -82,7 +82,7 @@ class ErrorBoundaryInner extends React.Component<
       this.props.onError(error, errorInfo)
   }
 
-  componentDidUpdate(prevProps: any) {
+  override componentDidUpdate(prevProps: any) {
     const { resetKeys, resetOnPropsChange } = this.props
     const { hasError } = this.state
 
@@ -98,7 +98,7 @@ class ErrorBoundaryInner extends React.Component<
       this.props.onResetKeysChange(prevProps.resetKeys)
   }
 
-  render() {
+  override render() {
     const { hasError, error, errorInfo, errorCount } = this.state
     const {
       fallback,
diff --git a/web/app/components/base/markdown/error-boundary.tsx b/web/app/components/base/markdown/error-boundary.tsx
index fd11af5b1c..8331e72622 100644
--- a/web/app/components/base/markdown/error-boundary.tsx
+++ b/web/app/components/base/markdown/error-boundary.tsx
@@ -17,12 +17,12 @@ export default class ErrorBoundary extends Component {
     this.state = { hasError: false }
   }
 
-  componentDidCatch(error: any, errorInfo: any) {
+  override componentDidCatch(error: any, errorInfo: any) {
     this.setState({ hasError: true })
     console.error(error, errorInfo)
   }
 
-  render() {
+  override render() {
     // eslint-disable-next-line ts/ban-ts-comment
     // @ts-expect-error
     if (this.state.hasError) {
diff --git a/web/app/components/base/prompt-editor/plugins/context-block/node.tsx b/web/app/components/base/prompt-editor/plugins/context-block/node.tsx
index 958415d843..6e67ee0e7d 100644
--- a/web/app/components/base/prompt-editor/plugins/context-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/context-block/node.tsx
@@ -10,15 +10,15 @@ export class ContextBlockNode extends DecoratorNode<React.JSX.Element> {
   __onAddContext: () => void
   __canNotAddContext: boolean
 
-  static getType(): string {
+  static override getType(): string {
     return 'context-block'
   }
 
-  static clone(node: ContextBlockNode): ContextBlockNode {
+  static override clone(node: ContextBlockNode): ContextBlockNode {
     return new ContextBlockNode(node.__datasets, node.__onAddContext, node.getKey(), node.__canNotAddContext)
   }
 
-  isInline(): boolean {
+  override isInline(): boolean {
     return true
   }
 
@@ -30,17 +30,17 @@ export class ContextBlockNode extends DecoratorNode<React.JSX.Element> {
     this.__canNotAddContext = canNotAddContext || false
   }
 
-  createDOM(): HTMLElement {
+  override createDOM(): HTMLElement {
     const div = document.createElement('div')
     div.classList.add('inline-flex', 'items-center', 'align-middle')
     return div
   }
 
-  updateDOM(): false {
+  override updateDOM(): false {
     return false
   }
 
-  decorate(): React.JSX.Element {
+  override decorate(): React.JSX.Element {
     return (
       <ContextBlockComponent
         nodeKey={this.getKey()}
@@ -69,13 +69,13 @@ export class ContextBlockNode extends DecoratorNode<React.JSX.Element> {
     return self.__canNotAddContext
   }
 
-  static importJSON(serializedNode: SerializedNode): ContextBlockNode {
+  static override importJSON(serializedNode: SerializedNode): ContextBlockNode {
     const node = $createContextBlockNode(serializedNode.datasets, serializedNode.onAddContext, serializedNode.canNotAddContext)
 
     return node
   }
 
-  exportJSON(): SerializedNode {
+  override exportJSON(): SerializedNode {
     return {
       type: 'context-block',
       version: 1,
@@ -85,7 +85,7 @@ export class ContextBlockNode extends DecoratorNode<React.JSX.Element> {
     }
   }
 
-  getTextContent(): string {
+  override getTextContent(): string {
     return '{{#context#}}'
   }
 }
diff --git a/web/app/components/base/prompt-editor/plugins/current-block/node.tsx b/web/app/components/base/prompt-editor/plugins/current-block/node.tsx
index 916e3b5169..f206c48cee 100644
--- a/web/app/components/base/prompt-editor/plugins/current-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/current-block/node.tsx
@@ -7,15 +7,15 @@ type SerializedNode = SerializedLexicalNode & { generatorType: GeneratorType }
 
 export class CurrentBlockNode extends DecoratorNode<React.JSX.Element> {
   __generatorType: GeneratorType
-  static getType(): string {
+  static override getType(): string {
     return 'current-block'
   }
 
-  static clone(node: CurrentBlockNode): CurrentBlockNode {
+  static override clone(node: CurrentBlockNode): CurrentBlockNode {
     return new CurrentBlockNode(node.__generatorType, node.getKey())
   }
 
-  isInline(): boolean {
+  override isInline(): boolean {
     return true
   }
 
@@ -25,17 +25,17 @@ export class CurrentBlockNode extends DecoratorNode<React.JSX.Element> {
     this.__generatorType = generatorType
   }
 
-  createDOM(): HTMLElement {
+  override createDOM(): HTMLElement {
     const div = document.createElement('div')
     div.classList.add('inline-flex', 'items-center', 'align-middle')
     return div
   }
 
-  updateDOM(): false {
+  override updateDOM(): false {
     return false
   }
 
-  decorate(): React.JSX.Element {
+  override decorate(): React.JSX.Element {
     return (
       <CurrentBlockComponent
         nodeKey={this.getKey()}
@@ -49,13 +49,13 @@ export class CurrentBlockNode extends DecoratorNode<React.JSX.Element> {
     return self.__generatorType
   }
 
-  static importJSON(serializedNode: SerializedNode): CurrentBlockNode {
+  static override importJSON(serializedNode: SerializedNode): CurrentBlockNode {
     const node = $createCurrentBlockNode(serializedNode.generatorType)
 
     return node
   }
 
-  exportJSON(): SerializedNode {
+  override exportJSON(): SerializedNode {
     return {
       type: 'current-block',
       version: 1,
@@ -63,7 +63,7 @@ export class CurrentBlockNode extends DecoratorNode<React.JSX.Element> {
     }
   }
 
-  getTextContent(): string {
+  override getTextContent(): string {
     return '{{#current#}}'
   }
 }
diff --git a/web/app/components/base/prompt-editor/plugins/custom-text/node.tsx b/web/app/components/base/prompt-editor/plugins/custom-text/node.tsx
index 29c2d4ddb4..e4f774f04e 100644
--- a/web/app/components/base/prompt-editor/plugins/custom-text/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/custom-text/node.tsx
@@ -2,11 +2,11 @@ import type { EditorConfig, SerializedTextNode } from 'lexical'
 import { $createTextNode, TextNode } from 'lexical'
 
 export class CustomTextNode extends TextNode {
-  static getType() {
+  static override getType() {
     return 'custom-text'
   }
 
-  static clone(node: CustomTextNode) {
+  static override clone(node: CustomTextNode) {
     return new CustomTextNode(node.__text, node.__key)
   }
 
@@ -14,12 +14,12 @@ export class CustomTextNode extends TextNode {
   //   super(text, key)
   // }
 
-  createDOM(config: EditorConfig) {
+  override createDOM(config: EditorConfig) {
     const dom = super.createDOM(config)
     return dom
   }
 
-  static importJSON(serializedNode: SerializedTextNode): TextNode {
+  static override importJSON(serializedNode: SerializedTextNode): TextNode {
     const node = $createTextNode(serializedNode.text)
     node.setFormat(serializedNode.format)
     node.setDetail(serializedNode.detail)
@@ -28,7 +28,7 @@ export class CustomTextNode extends TextNode {
     return node
   }
 
-  exportJSON(): SerializedTextNode {
+  override exportJSON(): SerializedTextNode {
     return {
       detail: this.getDetail(),
       format: this.getFormat(),
@@ -40,7 +40,7 @@ export class CustomTextNode extends TextNode {
     }
   }
 
-  isSimpleText() {
+  override isSimpleText() {
     return (
       (this.__type === 'text' || this.__type === 'custom-text') && this.__mode === 0)
   }
diff --git a/web/app/components/base/prompt-editor/plugins/error-message-block/node.tsx b/web/app/components/base/prompt-editor/plugins/error-message-block/node.tsx
index d253cf7ff3..86d5a4103a 100644
--- a/web/app/components/base/prompt-editor/plugins/error-message-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/error-message-block/node.tsx
@@ -5,15 +5,15 @@ import ErrorMessageBlockComponent from './component'
 type SerializedNode = SerializedLexicalNode
 
 export class ErrorMessageBlockNode extends DecoratorNode<React.JSX.Element> {
-  static getType(): string {
+  static override getType(): string {
     return 'error-message-block'
   }
 
-  static clone(node: ErrorMessageBlockNode): ErrorMessageBlockNode {
+  static override clone(node: ErrorMessageBlockNode): ErrorMessageBlockNode {
     return new ErrorMessageBlockNode(node.getKey())
   }
 
-  isInline(): boolean {
+  override isInline(): boolean {
     return true
   }
 
@@ -21,17 +21,17 @@ export class ErrorMessageBlockNode extends DecoratorNode<React.JSX.Element> {
     super(key)
   }
 
-  createDOM(): HTMLElement {
+  override createDOM(): HTMLElement {
     const div = document.createElement('div')
     div.classList.add('inline-flex', 'items-center', 'align-middle')
     return div
   }
 
-  updateDOM(): false {
+  override updateDOM(): false {
     return false
   }
 
-  decorate(): React.JSX.Element {
+  override decorate(): React.JSX.Element {
     return (
       <ErrorMessageBlockComponent
         nodeKey={this.getKey()}
@@ -39,20 +39,20 @@ export class ErrorMessageBlockNode extends DecoratorNode<React.JSX.Element> {
     )
   }
 
-  static importJSON(): ErrorMessageBlockNode {
+  static override importJSON(): ErrorMessageBlockNode {
     const node = $createErrorMessageBlockNode()
 
     return node
   }
 
-  exportJSON(): SerializedNode {
+  override exportJSON(): SerializedNode {
     return {
       type: 'error-message-block',
       version: 1,
     }
   }
 
-  getTextContent(): string {
+  override getTextContent(): string {
     return '{{#error_message#}}'
   }
 }
diff --git a/web/app/components/base/prompt-editor/plugins/history-block/node.tsx b/web/app/components/base/prompt-editor/plugins/history-block/node.tsx
index 85a4de2696..9a363303bf 100644
--- a/web/app/components/base/prompt-editor/plugins/history-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/history-block/node.tsx
@@ -9,11 +9,11 @@ export class HistoryBlockNode extends DecoratorNode<React.JSX.Element> {
   __roleName: RoleName
   __onEditRole: () => void
 
-  static getType(): string {
+  static override getType(): string {
     return 'history-block'
   }
 
-  static clone(node: HistoryBlockNode): HistoryBlockNode {
+  static override clone(node: HistoryBlockNode): HistoryBlockNode {
     return new HistoryBlockNode(node.__roleName, node.__onEditRole, node.__key)
   }
 
@@ -24,21 +24,21 @@ export class HistoryBlockNode extends DecoratorNode<React.JSX.Element> {
     this.__onEditRole = onEditRole
   }
 
-  isInline(): boolean {
+  override isInline(): boolean {
     return true
   }
 
-  createDOM(): HTMLElement {
+  override createDOM(): HTMLElement {
     const div = document.createElement('div')
     div.classList.add('inline-flex', 'items-center', 'align-middle')
     return div
   }
 
-  updateDOM(): false {
+  override updateDOM(): false {
     return false
   }
 
-  decorate(): React.JSX.Element {
+  override decorate(): React.JSX.Element {
     return (
       <HistoryBlockComponent
         nodeKey={this.getKey()}
@@ -60,13 +60,13 @@ export class HistoryBlockNode extends DecoratorNode<React.JSX.Element> {
     return self.__onEditRole
   }
 
-  static importJSON(serializedNode: SerializedNode): HistoryBlockNode {
+  static override importJSON(serializedNode: SerializedNode): HistoryBlockNode {
     const node = $createHistoryBlockNode(serializedNode.roleName, serializedNode.onEditRole)
 
     return node
   }
 
-  exportJSON(): SerializedNode {
+  override exportJSON(): SerializedNode {
     return {
       type: 'history-block',
       version: 1,
@@ -75,7 +75,7 @@ export class HistoryBlockNode extends DecoratorNode<React.JSX.Element> {
     }
   }
 
-  getTextContent(): string {
+  override getTextContent(): string {
     return '{{#histories#}}'
   }
 }
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/node.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/node.tsx
index 9f2d25b446..592ecf1f6c 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/node.tsx
@@ -37,7 +37,7 @@ export class HITLInputNode extends DecoratorNode<React.JSX.Element> {
   __ragVariables?: Var[]
   __readonly?: boolean
 
-  isIsolated(): boolean {
+  override isIsolated(): boolean {
     return true // This is necessary for drag-and-drop to work correctly
   }
 
@@ -45,7 +45,7 @@ export class HITLInputNode extends DecoratorNode<React.JSX.Element> {
     return true // This is necessary for drag-and-drop to work correctly
   }
 
-  static getType(): string {
+  static override getType(): string {
     return 'hitl-input-block'
   }
 
@@ -109,7 +109,7 @@ export class HITLInputNode extends DecoratorNode<React.JSX.Element> {
     return self.__readonly || false
   }
 
-  static clone(node: HITLInputNode): HITLInputNode {
+  static override clone(node: HITLInputNode): HITLInputNode {
     return new HITLInputNode(
       node.__variableName,
       node.__nodeId,
@@ -127,7 +127,7 @@ export class HITLInputNode extends DecoratorNode<React.JSX.Element> {
     )
   }
 
-  isInline(): boolean {
+  override isInline(): boolean {
     return true
   }
 
@@ -162,17 +162,17 @@ export class HITLInputNode extends DecoratorNode<React.JSX.Element> {
     this.__readonly = readonly
   }
 
-  createDOM(): HTMLElement {
+  override createDOM(): HTMLElement {
     const div = document.createElement('div')
     div.classList.add('inline-flex', 'w-[calc(100%-1px)]', 'items-center', 'align-middle', 'support-drag')
     return div
   }
 
-  updateDOM(): false {
+  override updateDOM(): false {
     return false
   }
 
-  decorate(): React.JSX.Element {
+  override decorate(): React.JSX.Element {
     return (
       <HILTInputBlockComponent
         nodeKey={this.getKey()}
@@ -192,7 +192,7 @@ export class HITLInputNode extends DecoratorNode<React.JSX.Element> {
     )
   }
 
-  static importJSON(serializedNode: SerializedNode): HITLInputNode {
+  static override importJSON(serializedNode: SerializedNode): HITLInputNode {
     const node = $createHITLInputNode(
       serializedNode.variableName,
       serializedNode.nodeId,
@@ -211,7 +211,7 @@ export class HITLInputNode extends DecoratorNode<React.JSX.Element> {
     return node
   }
 
-  exportJSON(): SerializedNode {
+  override exportJSON(): SerializedNode {
     return {
       type: 'hitl-input-block',
       version: 1,
@@ -230,7 +230,7 @@ export class HITLInputNode extends DecoratorNode<React.JSX.Element> {
     }
   }
 
-  getTextContent(): string {
+  override getTextContent(): string {
     return `{{#$output.${this.getVariableName()}#}}`
   }
 }
diff --git a/web/app/components/base/prompt-editor/plugins/last-run-block/node.tsx b/web/app/components/base/prompt-editor/plugins/last-run-block/node.tsx
index 0606adbe2e..a968638958 100644
--- a/web/app/components/base/prompt-editor/plugins/last-run-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/last-run-block/node.tsx
@@ -5,15 +5,15 @@ import LastRunBlockComponent from './component'
 type SerializedNode = SerializedLexicalNode
 
 export class LastRunBlockNode extends DecoratorNode<React.JSX.Element> {
-  static getType(): string {
+  static override getType(): string {
     return 'last-run-block'
   }
 
-  static clone(node: LastRunBlockNode): LastRunBlockNode {
+  static override clone(node: LastRunBlockNode): LastRunBlockNode {
     return new LastRunBlockNode(node.getKey())
   }
 
-  isInline(): boolean {
+  override isInline(): boolean {
     return true
   }
 
@@ -21,17 +21,17 @@ export class LastRunBlockNode extends DecoratorNode<React.JSX.Element> {
     super(key)
   }
 
-  createDOM(): HTMLElement {
+  override createDOM(): HTMLElement {
     const div = document.createElement('div')
     div.classList.add('inline-flex', 'items-center', 'align-middle')
     return div
   }
 
-  updateDOM(): false {
+  override updateDOM(): false {
     return false
   }
 
-  decorate(): React.JSX.Element {
+  override decorate(): React.JSX.Element {
     return (
       <LastRunBlockComponent
         nodeKey={this.getKey()}
@@ -39,20 +39,20 @@ export class LastRunBlockNode extends DecoratorNode<React.JSX.Element> {
     )
   }
 
-  static importJSON(): LastRunBlockNode {
+  static override importJSON(): LastRunBlockNode {
     const node = $createLastRunBlockNode()
 
     return node
   }
 
-  exportJSON(): SerializedNode {
+  override exportJSON(): SerializedNode {
     return {
       type: 'last-run-block',
       version: 1,
     }
   }
 
-  getTextContent(): string {
+  override getTextContent(): string {
     return '{{#last_run#}}'
   }
 }
diff --git a/web/app/components/base/prompt-editor/plugins/query-block/node.tsx b/web/app/components/base/prompt-editor/plugins/query-block/node.tsx
index 519d6bab92..394970d625 100644
--- a/web/app/components/base/prompt-editor/plugins/query-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/query-block/node.tsx
@@ -5,46 +5,46 @@ import QueryBlockComponent from './component'
 type SerializedNode = SerializedLexicalNode
 
 export class QueryBlockNode extends DecoratorNode<React.JSX.Element> {
-  static getType(): string {
+  static override getType(): string {
     return 'query-block'
   }
 
-  static clone(): QueryBlockNode {
+  static override clone(): QueryBlockNode {
     return new QueryBlockNode()
   }
 
-  isInline(): boolean {
+  override isInline(): boolean {
     return true
   }
 
-  createDOM(): HTMLElement {
+  override createDOM(): HTMLElement {
     const div = document.createElement('div')
     div.classList.add('inline-flex', 'items-center', 'align-middle')
     return div
   }
 
-  updateDOM(): false {
+  override updateDOM(): false {
     return false
   }
 
-  decorate(): React.JSX.Element {
+  override decorate(): React.JSX.Element {
     return <QueryBlockComponent nodeKey={this.getKey()} />
   }
 
-  static importJSON(): QueryBlockNode {
+  static override importJSON(): QueryBlockNode {
     const node = $createQueryBlockNode()
 
     return node
   }
 
-  exportJSON(): SerializedNode {
+  override exportJSON(): SerializedNode {
     return {
       type: 'query-block',
       version: 1,
     }
   }
 
-  getTextContent(): string {
+  override getTextContent(): string {
     return '{{#query#}}'
   }
 }
diff --git a/web/app/components/base/prompt-editor/plugins/request-url-block/node.tsx b/web/app/components/base/prompt-editor/plugins/request-url-block/node.tsx
index b24e653bbc..e3a8e9dd29 100644
--- a/web/app/components/base/prompt-editor/plugins/request-url-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/request-url-block/node.tsx
@@ -5,46 +5,46 @@ import RequestURLBlockComponent from './component'
 type SerializedNode = SerializedLexicalNode
 
 export class RequestURLBlockNode extends DecoratorNode<React.JSX.Element> {
-  static getType(): string {
+  static override getType(): string {
     return 'request-url-block'
   }
 
-  static clone(node: RequestURLBlockNode): RequestURLBlockNode {
+  static override clone(node: RequestURLBlockNode): RequestURLBlockNode {
     return new RequestURLBlockNode(node.__key)
   }
 
-  isInline(): boolean {
+  override isInline(): boolean {
     return true
   }
 
-  createDOM(): HTMLElement {
+  override createDOM(): HTMLElement {
     const div = document.createElement('div')
     div.classList.add('inline-flex', 'items-center', 'align-middle')
     return div
   }
 
-  updateDOM(): false {
+  override updateDOM(): false {
     return false
   }
 
-  decorate(): React.JSX.Element {
+  override decorate(): React.JSX.Element {
     return <RequestURLBlockComponent nodeKey={this.getKey()} />
   }
 
-  static importJSON(): RequestURLBlockNode {
+  static override importJSON(): RequestURLBlockNode {
     const node = $createRequestURLBlockNode()
 
     return node
   }
 
-  exportJSON(): SerializedNode {
+  override exportJSON(): SerializedNode {
     return {
       type: 'request-url-block',
       version: 1,
     }
   }
 
-  getTextContent(): string {
+  override getTextContent(): string {
     return '{{#url#}}'
   }
 }
diff --git a/web/app/components/base/prompt-editor/plugins/variable-value-block/node.tsx b/web/app/components/base/prompt-editor/plugins/variable-value-block/node.tsx
index e83dd22fd4..4fd2ef7239 100644
--- a/web/app/components/base/prompt-editor/plugins/variable-value-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/variable-value-block/node.tsx
@@ -9,11 +9,11 @@ import {
 } from 'lexical'
 
 export class VariableValueBlockNode extends TextNode {
-  static getType(): string {
+  static override getType(): string {
     return 'variable-value-block'
   }
 
-  static clone(node: VariableValueBlockNode): VariableValueBlockNode {
+  static override clone(node: VariableValueBlockNode): VariableValueBlockNode {
     return new VariableValueBlockNode(node.__text, node.__key)
   }
 
@@ -21,13 +21,13 @@ export class VariableValueBlockNode extends TextNode {
   //   super(text, key)
   // }
 
-  createDOM(config: EditorConfig): HTMLElement {
+  override createDOM(config: EditorConfig): HTMLElement {
     const element = super.createDOM(config)
     element.classList.add('inline-flex', 'items-center', 'px-0.5', 'h-[22px]', 'text-text-accent', 'rounded-[5px]', 'align-middle')
     return element
   }
 
-  static importJSON(serializedNode: SerializedTextNode): TextNode {
+  static override importJSON(serializedNode: SerializedTextNode): TextNode {
     const node = $createVariableValueBlockNode(serializedNode.text)
     node.setFormat(serializedNode.format)
     node.setDetail(serializedNode.detail)
@@ -36,7 +36,7 @@ export class VariableValueBlockNode extends TextNode {
     return node
   }
 
-  exportJSON(): SerializedTextNode {
+  override exportJSON(): SerializedTextNode {
     return {
       detail: this.getDetail(),
       format: this.getFormat(),
@@ -48,7 +48,7 @@ export class VariableValueBlockNode extends TextNode {
     }
   }
 
-  canInsertTextBefore(): boolean {
+  override canInsertTextBefore(): boolean {
     return false
   }
 }
diff --git a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/node.tsx b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/node.tsx
index 2d13627b20..20fc7c6e79 100644
--- a/web/app/components/base/prompt-editor/plugins/workflow-variable-block/node.tsx
+++ b/web/app/components/base/prompt-editor/plugins/workflow-variable-block/node.tsx
@@ -19,11 +19,11 @@ export class WorkflowVariableBlockNode extends DecoratorNode<React.JSX.Element>
   __getVarType?: GetVarType
   __availableVariables?: NodeOutPutVar[]
 
-  static getType(): string {
+  static override getType(): string {
     return 'workflow-variable-block'
   }
 
-  static clone(node: WorkflowVariableBlockNode): WorkflowVariableBlockNode {
+  static override clone(node: WorkflowVariableBlockNode): WorkflowVariableBlockNode {
     return new WorkflowVariableBlockNode(
       node.__variables,
       node.__workflowNodesMap,
@@ -33,7 +33,7 @@ export class WorkflowVariableBlockNode extends DecoratorNode<React.JSX.Element>
     )
   }
 
-  isInline(): boolean {
+  override isInline(): boolean {
     return true
   }
 
@@ -52,17 +52,17 @@ export class WorkflowVariableBlockNode extends DecoratorNode<React.JSX.Element>
     this.__availableVariables = availableVariables
   }
 
-  createDOM(): HTMLElement {
+  override createDOM(): HTMLElement {
     const div = document.createElement('div')
     div.classList.add('inline-flex', 'items-center', 'align-middle')
     return div
   }
 
-  updateDOM(): false {
+  override updateDOM(): false {
     return false
   }
 
-  decorate(): React.JSX.Element {
+  override decorate(): React.JSX.Element {
     return (
       <WorkflowVariableBlockComponent
         nodeKey={this.getKey()}
@@ -74,7 +74,7 @@ export class WorkflowVariableBlockNode extends DecoratorNode<React.JSX.Element>
     )
   }
 
-  static importJSON(serializedNode: SerializedNode): WorkflowVariableBlockNode {
+  static override importJSON(serializedNode: SerializedNode): WorkflowVariableBlockNode {
     const node = $createWorkflowVariableBlockNode(
       serializedNode.variables,
       serializedNode.workflowNodesMap,
@@ -85,7 +85,7 @@ export class WorkflowVariableBlockNode extends DecoratorNode<React.JSX.Element>
     return node
   }
 
-  exportJSON(): SerializedNode {
+  override exportJSON(): SerializedNode {
     const json: SerializedNode = {
       type: 'workflow-variable-block',
       version: 1,
@@ -119,7 +119,7 @@ export class WorkflowVariableBlockNode extends DecoratorNode<React.JSX.Element>
     return self.__availableVariables
   }
 
-  getTextContent(): string {
+  override getTextContent(): string {
     return `{{#${this.getVariables().join('.')}#}}`
   }
 }
diff --git a/web/app/components/workflow/__tests__/update-dsl-modal.spec.tsx b/web/app/components/workflow/__tests__/update-dsl-modal.spec.tsx
index d56cf80779..b435091647 100644
--- a/web/app/components/workflow/__tests__/update-dsl-modal.spec.tsx
+++ b/web/app/components/workflow/__tests__/update-dsl-modal.spec.tsx
@@ -230,7 +230,7 @@ describe('UpdateDSLModal', () => {
 
   it('should show an error when the selected file content is invalid for the current app mode', async () => {
     class InvalidDSLFileReader extends MockFileReader {
-      readAsText(_file: Blob) {
+      override readAsText(_file: Blob) {
         const event = { target: { result: 'workflow:\n  graph:\n    nodes:\n      - data:\n          type: answer\n' } } as unknown as ProgressEvent<FileReader>
         this.onload?.call(this as unknown as FileReader, event)
       }
diff --git a/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx b/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx
index d43efc1b30..a80d0b1ee2 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx
@@ -55,7 +55,7 @@ const OutputVarList: FC<Props> = ({
       replaceSpaceWithUnderscoreInVarNameInput(e.target)
       const newKey = e.target.value
 
-      validateVarInput(list.toSpliced(index, 1), newKey)
+      validateVarInput(list.filter((_, itemIndex) => itemIndex !== index), newKey)
 
       const newOutputs = produce(outputs, (draft) => {
         draft[newKey] = draft[oldKey]!
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
index a0add3e7fd..b8ec03eb93 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
@@ -67,7 +67,7 @@ const VarList: FC<Props> = ({
 
       const newKey = e.target.value
 
-      validateVarInput(list.toSpliced(index, 1), newKey)
+      validateVarInput(list.filter((_, itemIndex) => itemIndex !== index), newKey)
 
       onVarNameChange?.(list[index]!.variable, newKey)
       const newList = produce(list, (draft) => {
diff --git a/web/app/components/workflow/run/utils/format-log/parallel/index.ts b/web/app/components/workflow/run/utils/format-log/parallel/index.ts
index 4ebc6ab60e..588858d576 100644
--- a/web/app/components/workflow/run/utils/format-log/parallel/index.ts
+++ b/web/app/components/workflow/run/utils/format-log/parallel/index.ts
@@ -1,6 +1,15 @@
 import type { NodeTracing } from '@/types/workflow'
 import { BlockEnum } from '@/app/components/workflow/types'
 
+function findLastIndex<T>(list: T[], predicate: (item: T) => boolean): number {
+  for (let index = list.length - 1; index >= 0; index--) {
+    if (predicate(list[index]!))
+      return index
+  }
+
+  return -1
+}
+
 function printNodeStructure(node: NodeTracing, depth: number) {
   const indent = '  '.repeat(depth)
   console.log(`${indent}${node.title}`)
@@ -107,7 +116,7 @@ const format = (list: NodeTracing[], t: any, isPrint?: boolean): NodeTracing[] =
           }
         }
         if (parentParallelStartNode!.parallelDetail.children) {
-          const sameBranchNodesLastIndex = parentParallelStartNode.parallelDetail.children.findLastIndex((node) => {
+          const sameBranchNodesLastIndex = findLastIndex(parentParallelStartNode.parallelDetail.children, (node) => {
             const currStartNodeId = node.parallel_start_node_id ?? node.execution_metadata?.parallel_start_node_id ?? null
             return currStartNodeId === parentParallelBranchStartNodeId
           })
@@ -124,7 +133,7 @@ const format = (list: NodeTracing[], t: any, isPrint?: boolean): NodeTracing[] =
     const parallelStartNode = result.find(item => parallel_start_node_id === item.node_id)
 
     if (parallelStartNode && parallelStartNode.parallelDetail && parallelStartNode!.parallelDetail!.children) {
-      const sameBranchNodesLastIndex = parallelStartNode.parallelDetail.children.findLastIndex((node) => {
+      const sameBranchNodesLastIndex = findLastIndex(parallelStartNode.parallelDetail.children, (node) => {
         const currStartNodeId = node.parallel_start_node_id ?? node.execution_metadata?.parallel_start_node_id ?? null
         return currStartNodeId === branchStartNodeId
       })
diff --git a/web/i18n-config/index.ts b/web/i18n-config/index.ts
index ff8bd4ff02..016cc2ba2d 100644
--- a/web/i18n-config/index.ts
+++ b/web/i18n-config/index.ts
@@ -10,7 +10,7 @@ export const i18n = {
   locales: LanguagesSupported,
 } as const
 
-export { Locale }
+export type { Locale }
 
 export const setLocaleOnClient = async (locale: Locale, reloadPage = true) => {
   Cookies.set(LOCALE_COOKIE_NAME, locale, { expires: 365 })
diff --git a/web/instrumentation-client.ts b/web/instrumentation-client.ts
index 4c9e6a10e7..7d61502bc0 100644
--- a/web/instrumentation-client.ts
+++ b/web/instrumentation-client.ts
@@ -2,20 +2,6 @@ import { IS_DEV } from '@/config'
 import { env } from '@/env'
 
 async function main() {
-  // Polyfill for Array.prototype.toSpliced (ES2023, Chrome 110+)
-  if (!Array.prototype.toSpliced) {
-    // eslint-disable-next-line no-extend-native
-    Array.prototype.toSpliced = function <T>(this: T[], start: number, deleteCount?: number, ...items: T[]): T[] {
-      const copy = this.slice()
-      // When deleteCount is undefined (omitted), delete to end; otherwise let splice handle coercion
-      if (deleteCount === undefined)
-        copy.splice(start, copy.length - start, ...items)
-      else
-        copy.splice(start, deleteCount, ...items)
-      return copy
-    }
-  }
-
   if (!('localStorage' in globalThis) || !('sessionStorage' in globalThis)) {
     class StorageMock {
       data: Record<string, string>
diff --git a/web/package.json b/web/package.json
index 72af940479..eeb3c94460 100644
--- a/web/package.json
+++ b/web/package.json
@@ -48,8 +48,8 @@
     "test": "vp test",
     "test:coverage": "vp test --coverage",
     "test:watch": "vp test --watch",
-    "type-check": "tsc --noEmit",
-    "type-check:tsgo": "tsgo --noEmit",
+    "type-check": "tsc",
+    "type-check:tsgo": "tsgo",
     "uglify-embed": "node ./bin/uglify-embed"
   },
   "dependencies": {
@@ -160,6 +160,7 @@
     "@antfu/eslint-config": "catalog:",
     "@chromatic-com/storybook": "catalog:",
     "@dify/iconify-collections": "workspace:*",
+    "@dify/tsconfig": "workspace:*",
     "@egoist/tailwindcss-icons": "catalog:",
     "@eslint-react/eslint-plugin": "catalog:",
     "@hono/node-server": "catalog:",
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 003da18aa2..cf4110bbb5 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -1,15 +1,7 @@
 {
+  "extends": "@dify/tsconfig/nextjs.json",
   "compilerOptions": {
     "incremental": true,
-    "target": "es2022",
-    "jsx": "react-jsx",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "module": "esnext",
-    "moduleResolution": "bundler",
     "paths": {
       "@/*": [
         "./*"
@@ -23,19 +15,7 @@
       "vitest/globals",
       "node"
     ],
-    "allowJs": true,
-    "strict": true,
-    "noUncheckedIndexedAccess": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "isolatedModules": true,
-    "skipLibCheck": true,
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ]
+    "allowJs": true
   },
   "include": [
     "next-env.d.ts",

From 40e040ca1acab7cf8c400bc5e66148e31f0bc01b Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Fri, 17 Apr 2026 00:47:53 +0800
Subject: [PATCH 24/36] chore: workspace lint (#35331)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 .github/workflows/autofix.yml                 |    1 -
 .github/workflows/style.yml                   |   10 +-
 .gitignore                                    |    3 +
 .vite-hooks/pre-commit                        |   17 +-
 .../.vscode => .vscode}/settings.example.json |   12 +-
 e2e/AGENTS.md                                 |   12 +-
 e2e/README.md                                 |    4 +-
 .../step-definitions/apps/create-app.steps.ts |    2 +-
 .../step-definitions/auth/sign-out.steps.ts   |    2 +-
 .../step-definitions/common/auth.steps.ts     |    2 +-
 .../common/navigation.steps.ts                |    2 +-
 .../step-definitions/smoke/install.steps.ts   |    2 +-
 e2e/features/support/hooks.ts                 |   19 +-
 e2e/features/support/world.ts                 |   12 +-
 e2e/fixtures/auth.ts                          |   14 +-
 e2e/package.json                              |    4 +-
 e2e/scripts/common.ts                         |   28 +-
 e2e/scripts/run-cucumber.ts                   |   19 +-
 e2e/scripts/setup.ts                          |   18 +-
 e2e/support/process.ts                        |   21 +-
 e2e/support/web-server.ts                     |    9 +-
 e2e/tsconfig.json                             |    2 +-
 e2e/vite.config.ts                            |   12 +-
 ...pressions.json => eslint-suppressions.json | 2900 +++++++++--------
 eslint.config.mjs                             |   65 +
 package.json                                  |   28 +-
 packages/dify-ui/AGENTS.md                    |   24 +-
 packages/dify-ui/package.json                 |   16 +-
 packages/dify-ui/tsconfig.json                |    6 +-
 .../custom-public/index.d.ts                  |   15 +-
 .../custom-public/index.js                    |    3 +-
 .../custom-public/index.mjs                   |    5 +-
 .../custom-vender/index.d.ts                  |   15 +-
 .../custom-vender/index.js                    |    3 +-
 .../custom-vender/index.mjs                   |    5 +-
 packages/iconify-collections/package.json     |   10 +-
 .../package.json                              |    4 +-
 pnpm-lock.yaml                                |  265 +-
 pnpm-workspace.yaml                           |  166 +-
 vite.config.ts                                |    4 +-
 web/.gitignore                                |    2 -
 web/README.md                                 |    2 +-
 web/eslint.config.mjs                         |    9 +-
 web/package.json                              |    4 -
 web/vite.config.ts                            |    3 -
 45 files changed, 2089 insertions(+), 1692 deletions(-)
 rename {web/.vscode => .vscode}/settings.example.json (86%)
 rename web/eslint-suppressions.json => eslint-suppressions.json (54%)
 create mode 100644 eslint.config.mjs

diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
index 772ab8dd56..3946834e09 100644
--- a/.github/workflows/autofix.yml
+++ b/.github/workflows/autofix.yml
@@ -120,7 +120,6 @@ jobs:
       - name: ESLint autofix
         if: github.event_name != 'merge_group' && steps.web-changes.outputs.any_changed == 'true'
         run: |
-          cd web
           vp exec eslint --concurrency=2 --prune-suppressions --quiet || true
 
       - if: github.event_name != 'merge_group'
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index 73b1b5c078..29f5b090f8 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -97,14 +97,14 @@ jobs:
         id: eslint-cache-restore
         uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
-          path: web/.eslintcache
-          key: ${{ runner.os }}-web-eslint-${{ hashFiles('web/package.json', 'pnpm-lock.yaml', 'web/eslint.config.mjs', 'web/eslint.constants.mjs', 'web/plugins/eslint/**') }}-${{ github.sha }}
+          path: .eslintcache
+          key: ${{ runner.os }}-eslint-${{ hashFiles('pnpm-lock.yaml', 'eslint.config.mjs', 'web/eslint.config.mjs', 'web/eslint.constants.mjs', 'web/plugins/eslint/**') }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-web-eslint-${{ hashFiles('web/package.json', 'pnpm-lock.yaml', 'web/eslint.config.mjs', 'web/eslint.constants.mjs', 'web/plugins/eslint/**') }}-
+            ${{ runner.os }}-eslint-${{ hashFiles('pnpm-lock.yaml', 'eslint.config.mjs', 'web/eslint.config.mjs', 'web/eslint.constants.mjs', 'web/plugins/eslint/**') }}-
 
       - name: Web style check
         if: steps.changed-files.outputs.any_changed == 'true'
-        working-directory: ./web
+        working-directory: .
         run: vp run lint:ci
 
       - name: Web tsslint
@@ -126,7 +126,7 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true' && success() && steps.eslint-cache-restore.outputs.cache-hit != 'true'
         uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
-          path: web/.eslintcache
+          path: .eslintcache
           key: ${{ steps.eslint-cache-restore.outputs.cache-primary-key }}
 
   superlinter:
diff --git a/.gitignore b/.gitignore
index 53dea88899..3493a7c756 100644
--- a/.gitignore
+++ b/.gitignore
@@ -203,6 +203,7 @@ sdks/python-client/dify_client.egg-info
 
 .vscode/*
 !.vscode/launch.json.template
+!.vscode/settings.example.json
 !.vscode/README.md
 api/.vscode
 # vscode Code History Extension
@@ -242,3 +243,5 @@ scripts/stress-test/reports/
 
 # Code Agent Folder
 .qoder/*
+
+.eslintcache
diff --git a/.vite-hooks/pre-commit b/.vite-hooks/pre-commit
index b78fa886e4..d48381bce2 100755
--- a/.vite-hooks/pre-commit
+++ b/.vite-hooks/pre-commit
@@ -56,16 +56,9 @@ if $api_modified; then
     fi
 fi
 
-if $web_modified; then
-    if $skip_web_checks; then
-        echo "Git operation in progress, skipping web checks"
-        exit 0
-    fi
-
-    echo "Running ESLint on web module"
-
-    cd ./web || exit 1
-    vp staged
-
-    cd ../
+if $skip_web_checks; then
+    echo "Git operation in progress, skipping web checks"
+    exit 0
 fi
+
+vp staged
diff --git a/web/.vscode/settings.example.json b/.vscode/settings.example.json
similarity index 86%
rename from web/.vscode/settings.example.json
rename to .vscode/settings.example.json
index 4b356f5b7a..7cdbc51a3b 100644
--- a/web/.vscode/settings.example.json
+++ b/.vscode/settings.example.json
@@ -1,12 +1,16 @@
 {
-  // Disable the default formatter, use eslint instead
-  "prettier.enable": false,
-  "editor.formatOnSave": false,
+  "cucumber.features": [
+    "e2e/features/**/*.feature",
+  ],
+  "cucumber.glue": [
+    "e2e/features/**/*.ts",
+  ],
+
+  "tailwindCSS.experimental.configFile": "web/app/styles/globals.css",
 
   // Auto fix
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit",
-    "source.organizeImports": "never"
   },
 
   // Silent the stylistic rules in your IDE, but still auto fix them
diff --git a/e2e/AGENTS.md b/e2e/AGENTS.md
index da3d76210d..e56aab20a7 100644
--- a/e2e/AGENTS.md
+++ b/e2e/AGENTS.md
@@ -171,10 +171,10 @@ open cucumber-report/report.html
 ### Workflow
 
 1. Create a `.feature` file under `features/<capability>/`
-2. Add step definitions under `features/step-definitions/<capability>/`
-3. Reuse existing steps from `common/` and other definition files before writing new ones
-4. Run with `pnpm -C e2e e2e -- --tags @your-tag` to verify
-5. Run `pnpm -C e2e check` before committing
+1. Add step definitions under `features/step-definitions/<capability>/`
+1. Reuse existing steps from `common/` and other definition files before writing new ones
+1. Run with `pnpm -C e2e e2e -- --tags @your-tag` to verify
+1. Run `pnpm -C e2e check` before committing
 
 ### Feature file conventions
 
@@ -202,9 +202,9 @@ Keep scenarios short and declarative. Each step should describe **what** the use
 ### Step definition conventions
 
 ```typescript
-import { When, Then } from '@cucumber/cucumber'
-import { expect } from '@playwright/test'
 import type { DifyWorld } from '../../support/world'
+import { Then, When } from '@cucumber/cucumber'
+import { expect } from '@playwright/test'
 
 When('I open the datasets page', async function (this: DifyWorld) {
   await this.getPage().goto('/datasets')
diff --git a/e2e/README.md b/e2e/README.md
index 9b4046eaff..feca0cb419 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -1,3 +1,5 @@
 # E2E
 
-Canonical documentation for this package lives in [AGENTS.md](./AGENTS.md).
+Canonical documentation for this package lives in [AGENTS.md].
+
+[AGENTS.md]: ./AGENTS.md
diff --git a/e2e/features/step-definitions/apps/create-app.steps.ts b/e2e/features/step-definitions/apps/create-app.steps.ts
index 6bc9ae30b6..e444b97dc8 100644
--- a/e2e/features/step-definitions/apps/create-app.steps.ts
+++ b/e2e/features/step-definitions/apps/create-app.steps.ts
@@ -1,6 +1,6 @@
+import type { DifyWorld } from '../../support/world'
 import { Then, When } from '@cucumber/cucumber'
 import { expect } from '@playwright/test'
-import type { DifyWorld } from '../../support/world'
 
 When('I start creating a blank app', async function (this: DifyWorld) {
   const page = this.getPage()
diff --git a/e2e/features/step-definitions/auth/sign-out.steps.ts b/e2e/features/step-definitions/auth/sign-out.steps.ts
index 935b73c3af..0cc5f76ccc 100644
--- a/e2e/features/step-definitions/auth/sign-out.steps.ts
+++ b/e2e/features/step-definitions/auth/sign-out.steps.ts
@@ -1,6 +1,6 @@
+import type { DifyWorld } from '../../support/world'
 import { Then, When } from '@cucumber/cucumber'
 import { expect } from '@playwright/test'
-import type { DifyWorld } from '../../support/world'
 
 When('I open the account menu', async function (this: DifyWorld) {
   const page = this.getPage()
diff --git a/e2e/features/step-definitions/common/auth.steps.ts b/e2e/features/step-definitions/common/auth.steps.ts
index bed35244c5..67c18dfe6c 100644
--- a/e2e/features/step-definitions/common/auth.steps.ts
+++ b/e2e/features/step-definitions/common/auth.steps.ts
@@ -1,5 +1,5 @@
-import { Given } from '@cucumber/cucumber'
 import type { DifyWorld } from '../../support/world'
+import { Given } from '@cucumber/cucumber'
 
 Given('I am signed in as the default E2E admin', async function (this: DifyWorld) {
   const session = await this.getAuthSession()
diff --git a/e2e/features/step-definitions/common/navigation.steps.ts b/e2e/features/step-definitions/common/navigation.steps.ts
index 28e6953d65..9bec34c224 100644
--- a/e2e/features/step-definitions/common/navigation.steps.ts
+++ b/e2e/features/step-definitions/common/navigation.steps.ts
@@ -1,6 +1,6 @@
+import type { DifyWorld } from '../../support/world'
 import { Then, When } from '@cucumber/cucumber'
 import { expect } from '@playwright/test'
-import type { DifyWorld } from '../../support/world'
 
 When('I open the apps console', async function (this: DifyWorld) {
   await this.getPage().goto('/apps')
diff --git a/e2e/features/step-definitions/smoke/install.steps.ts b/e2e/features/step-definitions/smoke/install.steps.ts
index 857e01a971..3f2f8b5199 100644
--- a/e2e/features/step-definitions/smoke/install.steps.ts
+++ b/e2e/features/step-definitions/smoke/install.steps.ts
@@ -1,6 +1,6 @@
+import type { DifyWorld } from '../../support/world'
 import { Given } from '@cucumber/cucumber'
 import { expect } from '@playwright/test'
-import type { DifyWorld } from '../../support/world'
 
 Given(
   'the last authentication bootstrap came from a fresh install',
diff --git a/e2e/features/support/hooks.ts b/e2e/features/support/hooks.ts
index 7a8319463b..33b337fb93 100644
--- a/e2e/features/support/hooks.ts
+++ b/e2e/features/support/hooks.ts
@@ -1,11 +1,12 @@
-import { After, AfterAll, Before, BeforeAll, Status, setDefaultTimeout } from '@cucumber/cucumber'
-import { chromium, type Browser } from '@playwright/test'
+import type { Browser } from '@playwright/test'
+import type { DifyWorld } from './world'
 import { mkdir, writeFile } from 'node:fs/promises'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { After, AfterAll, Before, BeforeAll, setDefaultTimeout, Status } from '@cucumber/cucumber'
+import { chromium } from '@playwright/test'
 import { AUTH_BOOTSTRAP_TIMEOUT_MS, ensureAuthenticatedState } from '../../fixtures/auth'
 import { baseURL, cucumberHeadless, cucumberSlowMo } from '../../test-env'
-import type { DifyWorld } from './world'
 
 const e2eRoot = fileURLToPath(new URL('../..', import.meta.url))
 const artifactsDir = path.join(e2eRoot, 'cucumber-report', 'artifacts')
@@ -15,7 +16,7 @@ let browser: Browser | undefined
 setDefaultTimeout(60_000)
 
 const sanitizeForPath = (value: string) =>
-  value.replaceAll(/[^a-zA-Z0-9_-]+/g, '-').replaceAll(/^-+|-+$/g, '')
+  value.replaceAll(/[^\w-]+/g, '-').replaceAll(/^-+|-+$/g, '')
 
 const writeArtifact = async (
   scenarioName: string,
@@ -44,16 +45,18 @@ BeforeAll({ timeout: AUTH_BOOTSTRAP_TIMEOUT_MS }, async () => {
 })
 
 Before(async function (this: DifyWorld, { pickle }) {
-  if (!browser) throw new Error('Shared Playwright browser is not available.')
+  if (!browser)
+    throw new Error('Shared Playwright browser is not available.')
 
-  const isUnauthenticatedScenario = pickle.tags.some((tag) => tag.name === '@unauthenticated')
+  const isUnauthenticatedScenario = pickle.tags.some(tag => tag.name === '@unauthenticated')
 
-  if (isUnauthenticatedScenario) await this.startUnauthenticatedSession(browser)
+  if (isUnauthenticatedScenario)
+    await this.startUnauthenticatedSession(browser)
   else await this.startAuthenticatedSession(browser)
 
   this.scenarioStartedAt = Date.now()
 
-  const tags = pickle.tags.map((tag) => tag.name).join(' ')
+  const tags = pickle.tags.map(tag => tag.name).join(' ')
   console.log(`[e2e] start ${pickle.name}${tags ? ` ${tags}` : ''}`)
 })
 
diff --git a/e2e/features/support/world.ts b/e2e/features/support/world.ts
index bf63199107..0e9c4b9c84 100644
--- a/e2e/features/support/world.ts
+++ b/e2e/features/support/world.ts
@@ -1,9 +1,11 @@
-import { type IWorldOptions, World, setWorldConstructor } from '@cucumber/cucumber'
+import type { IWorldOptions } from '@cucumber/cucumber'
 import type { Browser, BrowserContext, ConsoleMessage, Page } from '@playwright/test'
+import type { AuthSessionMetadata } from '../../fixtures/auth'
+import { setWorldConstructor, World } from '@cucumber/cucumber'
 import {
+
   authStatePath,
   readAuthSessionMetadata,
-  type AuthSessionMetadata,
 } from '../../fixtures/auth'
 import { baseURL, defaultLocale } from '../../test-env'
 
@@ -37,7 +39,8 @@ export class DifyWorld extends World {
     this.page.setDefaultTimeout(30_000)
 
     this.page.on('console', (message: ConsoleMessage) => {
-      if (message.type() === 'error') this.consoleErrors.push(message.text())
+      if (message.type() === 'error')
+        this.consoleErrors.push(message.text())
     })
     this.page.on('pageerror', (error) => {
       this.pageErrors.push(error.message)
@@ -53,7 +56,8 @@ export class DifyWorld extends World {
   }
 
   getPage() {
-    if (!this.page) throw new Error('Playwright page has not been initialized for this scenario.')
+    if (!this.page)
+      throw new Error('Playwright page has not been initialized for this scenario.')
 
     return this.page
   }
diff --git a/e2e/fixtures/auth.ts b/e2e/fixtures/auth.ts
index 14aee52634..cc54a6d47b 100644
--- a/e2e/fixtures/auth.ts
+++ b/e2e/fixtures/auth.ts
@@ -1,8 +1,8 @@
 import type { Browser, Page } from '@playwright/test'
-import { expect } from '@playwright/test'
 import { mkdir, readFile, writeFile } from 'node:fs/promises'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { expect } from '@playwright/test'
 import { defaultBaseURL, defaultLocale } from '../test-env'
 
 export type AuthSessionMetadata = {
@@ -60,7 +60,8 @@ const waitForPageState = async (page: Page, deadline: number): Promise<AuthPageS
         .waitFor({ state: 'visible', timeout: getRemainingTimeout(deadline) })
         .then(() => 'init'),
     ])
-  } catch {
+  }
+  catch {
     throw new Error(`Unable to determine auth page state for ${page.url()}`)
   }
 }
@@ -73,7 +74,8 @@ const completeInitPasswordIfNeeded = async (page: Page, deadline: number) => {
     .then(() => true)
     .catch(() => false)
 
-  if (!needsInitPassword) return false
+  if (!needsInitPassword)
+    return false
 
   await initPasswordField.fill(initPassword)
   await page.getByRole('button', { name: 'Validate' }).click()
@@ -143,7 +145,8 @@ export const ensureAuthenticatedState = async (browser: Browser, configuredBaseU
       pageState = await waitForPageState(page, deadline)
     }
 
-    if (pageState === 'install') await completeInstall(page, baseURL, deadline)
+    if (pageState === 'install')
+      await completeInstall(page, baseURL, deadline)
     else await completeLogin(page, baseURL, deadline)
 
     await expect(page.getByRole('button', { name: 'Create from Blank' })).toBeVisible({
@@ -160,7 +163,8 @@ export const ensureAuthenticatedState = async (browser: Browser, configuredBaseU
     }
 
     await writeFile(authMetadataPath, `${JSON.stringify(metadata, null, 2)}\n`, 'utf8')
-  } finally {
+  }
+  finally {
     await context.close()
   }
 }
diff --git a/e2e/package.json b/e2e/package.json
index fb0705ab79..94fc857c0b 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dify-e2e",
-  "private": true,
   "type": "module",
+  "private": true,
   "scripts": {
     "check": "vp check --fix",
     "e2e": "tsx ./scripts/run-cucumber.ts",
@@ -15,8 +15,8 @@
     "type-check": "tsc"
   },
   "devDependencies": {
-    "@dify/tsconfig": "workspace:*",
     "@cucumber/cucumber": "catalog:",
+    "@dify/tsconfig": "workspace:*",
     "@playwright/test": "catalog:",
     "@types/node": "catalog:",
     "tsx": "catalog:",
diff --git a/e2e/scripts/common.ts b/e2e/scripts/common.ts
index 5bca7fb4c9..ea6c897b2d 100644
--- a/e2e/scripts/common.ts
+++ b/e2e/scripts/common.ts
@@ -1,4 +1,5 @@
-import { spawn, type ChildProcess } from 'node:child_process'
+import type { ChildProcess } from 'node:child_process'
+import { spawn } from 'node:child_process'
 import { createHash } from 'node:crypto'
 import { access, copyFile, readFile, writeFile } from 'node:fs/promises'
 import net from 'node:net'
@@ -48,7 +49,8 @@ const formatCommand = (command: string, args: string[]) => [command, ...args].jo
 
 export const isMainModule = (metaUrl: string) => {
   const entrypoint = process.argv[1]
-  if (!entrypoint) return false
+  if (!entrypoint)
+    return false
 
   return pathToFileURL(entrypoint).href === metaUrl
 }
@@ -107,7 +109,8 @@ export const runCommandOrThrow = async (options: RunCommandOptions) => {
 
 const forwardSignalsToChild = (childProcess: ChildProcess) => {
   const handleSignal = (signal: NodeJS.Signals) => {
-    if (childProcess.exitCode === null) childProcess.kill(signal)
+    if (childProcess.exitCode === null)
+      childProcess.kill(signal)
   }
 
   const onSigint = () => handleSignal('SIGINT')
@@ -152,7 +155,8 @@ export const runForegroundProcess = async ({
 export const ensureFileExists = async (filePath: string, exampleFilePath: string) => {
   try {
     await access(filePath)
-  } catch {
+  }
+  catch {
     await copyFile(exampleFilePath, filePath)
   }
 }
@@ -162,9 +166,10 @@ export const ensureLineInFile = async (filePath: string, line: string) => {
   const lines = fileContent.split(/\r?\n/)
   const assignmentPrefix = line.includes('=') ? `${line.slice(0, line.indexOf('='))}=` : null
 
-  if (lines.includes(line)) return
+  if (lines.includes(line))
+    return
 
-  if (assignmentPrefix && lines.some((existingLine) => existingLine.startsWith(assignmentPrefix)))
+  if (assignmentPrefix && lines.some(existingLine => existingLine.startsWith(assignmentPrefix)))
     return
 
   const normalizedContent = fileContent.endsWith('\n') ? fileContent : `${fileContent}\n`
@@ -187,16 +192,16 @@ export const readSimpleDotenv = async (filePath: string) => {
   const fileContent = await readFile(filePath, 'utf8')
   const entries = fileContent
     .split(/\r?\n/)
-    .map((line) => line.trim())
-    .filter((line) => line && !line.startsWith('#'))
+    .map(line => line.trim())
+    .filter(line => line && !line.startsWith('#'))
     .map<[string, string]>((line) => {
       const separatorIndex = line.indexOf('=')
       const key = separatorIndex === -1 ? line : line.slice(0, separatorIndex).trim()
       const rawValue = separatorIndex === -1 ? '' : line.slice(separatorIndex + 1).trim()
 
       if (
-        (rawValue.startsWith('"') && rawValue.endsWith('"')) ||
-        (rawValue.startsWith("'") && rawValue.endsWith("'"))
+        (rawValue.startsWith('"') && rawValue.endsWith('"'))
+        || (rawValue.startsWith('\'') && rawValue.endsWith('\''))
       ) {
         return [key, rawValue.slice(1, -1)]
       }
@@ -221,7 +226,8 @@ export const waitForCondition = async ({
   const deadline = Date.now() + timeoutMs
 
   while (Date.now() < deadline) {
-    if (await check()) return
+    if (await check())
+      return
 
     await sleep(intervalMs)
   }
diff --git a/e2e/scripts/run-cucumber.ts b/e2e/scripts/run-cucumber.ts
index 1d5229742c..d7778e65e2 100644
--- a/e2e/scripts/run-cucumber.ts
+++ b/e2e/scripts/run-cucumber.ts
@@ -1,7 +1,7 @@
 import { mkdir, rm } from 'node:fs/promises'
 import path from 'node:path'
+import { startLoggedProcess, stopManagedProcess, waitForUrl } from '../support/process'
 import { startWebServer, stopWebServer } from '../support/web-server'
-import { waitForUrl, startLoggedProcess, stopManagedProcess } from '../support/process'
 import { apiURL, baseURL, reuseExistingWebServer } from '../test-env'
 import { e2eDir, isMainModule, runCommand } from './common'
 import { resetState, startMiddleware, stopMiddleware } from './setup'
@@ -40,16 +40,18 @@ const parseArgs = (argv: string[]): RunOptions => {
 }
 
 const hasCustomTags = (forwardArgs: string[]) =>
-  forwardArgs.some((arg) => arg === '--tags' || arg.startsWith('--tags='))
+  forwardArgs.some(arg => arg === '--tags' || arg.startsWith('--tags='))
 
 const main = async () => {
   const { forwardArgs, full, headed } = parseArgs(process.argv.slice(2))
   const startMiddlewareForRun = full
   const resetStateForRun = full
 
-  if (resetStateForRun) await resetState()
+  if (resetStateForRun)
+    await resetState()
 
-  if (startMiddlewareForRun) await startMiddleware()
+  if (startMiddlewareForRun)
+    await startMiddleware()
 
   const cucumberReportDir = path.join(e2eDir, 'cucumber-report')
   const logDir = path.join(e2eDir, '.logs')
@@ -75,7 +77,8 @@ const main = async () => {
         if (startMiddlewareForRun) {
           try {
             await stopMiddleware()
-          } catch {
+          }
+          catch {
             // Cleanup should continue even if middleware shutdown fails.
           }
         }
@@ -97,7 +100,8 @@ const main = async () => {
   try {
     try {
       await waitForUrl(`${apiURL}/health`, 180_000, 1_000)
-    } catch {
+    }
+    catch {
       throw new Error(`API did not become ready at ${apiURL}/health.`)
     }
 
@@ -133,7 +137,8 @@ const main = async () => {
     })
 
     process.exitCode = result.exitCode
-  } finally {
+  }
+  finally {
     process.off('SIGINT', onTerminate)
     process.off('SIGTERM', onTerminate)
     await cleanup()
diff --git a/e2e/scripts/setup.ts b/e2e/scripts/setup.ts
index 4bd9de09d2..ba4c011b04 100644
--- a/e2e/scripts/setup.ts
+++ b/e2e/scripts/setup.ts
@@ -5,8 +5,8 @@ import {
   apiDir,
   apiEnvExampleFile,
   dockerDir,
-  e2eWebEnvOverrides,
   e2eDir,
+  e2eWebEnvOverrides,
   ensureFileExists,
   ensureLineInFile,
   getWebEnvLocalHash,
@@ -79,7 +79,8 @@ const getContainerHealth = async (containerId: string) => {
     stdio: 'pipe',
   })
 
-  if (result.exitCode !== 0) return ''
+  if (result.exitCode !== 0)
+    return ''
 
   return result.stdout.trim()
 }
@@ -105,7 +106,8 @@ const waitForDependency = async ({
 
   try {
     await wait()
-  } catch (error) {
+  }
+  catch (error) {
     await printComposeLogs(services)
     throw error
   }
@@ -134,7 +136,7 @@ export const ensureWebBuild = async () => {
         .then(() => true)
         .catch(() => false),
       readFile(webBuildEnvStampPath, 'utf8')
-        .then((value) => value.trim())
+        .then(value => value.trim())
         .catch(() => ''),
     ])
 
@@ -142,7 +144,8 @@ export const ensureWebBuild = async () => {
       console.log('Reusing existing web build artifact.')
       return
     }
-  } catch {
+  }
+  catch {
     // Fall through to rebuild when the existing build cannot be verified.
   }
 
@@ -211,7 +214,8 @@ export const resetState = async () => {
   console.log('Stopping middleware services...')
   try {
     await stopMiddleware()
-  } catch {
+  }
+  catch {
     // Reset should continue even if middleware is already stopped.
   }
 
@@ -225,7 +229,7 @@ export const resetState = async () => {
 
   console.log('Removing E2E local state...')
   await Promise.all(
-    e2eStatePaths.map((targetPath) => rm(targetPath, { force: true, recursive: true })),
+    e2eStatePaths.map(targetPath => rm(targetPath, { force: true, recursive: true })),
   )
 
   console.log('E2E state reset complete.')
diff --git a/e2e/support/process.ts b/e2e/support/process.ts
index 96273ef931..4de1161b08 100644
--- a/e2e/support/process.ts
+++ b/e2e/support/process.ts
@@ -1,6 +1,7 @@
 import type { ChildProcess } from 'node:child_process'
+import type { WriteStream } from 'node:fs'
 import { spawn } from 'node:child_process'
-import { createWriteStream, type WriteStream } from 'node:fs'
+import { createWriteStream } from 'node:fs'
 import { mkdir } from 'node:fs/promises'
 import net from 'node:net'
 import { dirname } from 'node:path'
@@ -63,11 +64,14 @@ export const waitForUrl = async (
         const response = await fetch(url, {
           signal: controller.signal,
         })
-        if (response.ok) return
-      } finally {
+        if (response.ok)
+          return
+      }
+      finally {
         clearTimeout(timeout)
       }
-    } catch {
+    }
+    catch {
       // Keep polling until timeout.
     }
 
@@ -138,7 +142,8 @@ const waitForProcessExit = (childProcess: ChildProcess, timeoutMs: number) =>
 
 const signalManagedProcess = (childProcess: ChildProcess, signal: NodeJS.Signals) => {
   const { pid } = childProcess
-  if (!pid) return
+  if (!pid)
+    return
 
   try {
     if (process.platform !== 'win32') {
@@ -147,13 +152,15 @@ const signalManagedProcess = (childProcess: ChildProcess, signal: NodeJS.Signals
     }
 
     childProcess.kill(signal)
-  } catch {
+  }
+  catch {
     // Best-effort shutdown. Cleanup continues even when the process is already gone.
   }
 }
 
 export const stopManagedProcess = async (managedProcess?: ManagedProcess) => {
-  if (!managedProcess) return
+  if (!managedProcess)
+    return
 
   const { childProcess, logStream } = managedProcess
 
diff --git a/e2e/support/web-server.ts b/e2e/support/web-server.ts
index ad5d5d916a..819f7effe3 100644
--- a/e2e/support/web-server.ts
+++ b/e2e/support/web-server.ts
@@ -34,7 +34,8 @@ export const startWebServer = async ({
 }: WebServerStartOptions) => {
   const { host, port } = getUrlHostAndPort(baseURL)
 
-  if (reuseExistingServer && (await isPortReachable(host, port))) return
+  if (reuseExistingServer && (await isPortReachable(host, port)))
+    return
 
   activeProcess = await startLoggedProcess({
     command,
@@ -49,7 +50,8 @@ export const startWebServer = async ({
     startupError = error
   })
   activeProcess.childProcess.once('exit', (code, signal) => {
-    if (startupError) return
+    if (startupError)
+      return
 
     startupError = new Error(
       `Web server exited before readiness (code: ${code ?? 'unknown'}, signal: ${signal ?? 'none'}).`,
@@ -67,7 +69,8 @@ export const startWebServer = async ({
     try {
       await waitForUrl(baseURL, 1_000, 250, 1_000)
       return
-    } catch {
+    }
+    catch {
       // Continue polling until timeout or child exit.
     }
   }
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
index fc729f0ad0..3e72e790cf 100644
--- a/e2e/tsconfig.json
+++ b/e2e/tsconfig.json
@@ -2,8 +2,8 @@
   "extends": "@dify/tsconfig/node.json",
   "compilerOptions": {
     "lib": ["ES2023", "DOM"],
-    "allowJs": false,
     "types": ["node", "@playwright/test", "@cucumber/cucumber"],
+    "allowJs": false,
     "verbatimModuleSyntax": true
   },
   "include": ["./**/*.ts"],
diff --git a/e2e/vite.config.ts b/e2e/vite.config.ts
index 98400d5b9b..2329b534b4 100644
--- a/e2e/vite.config.ts
+++ b/e2e/vite.config.ts
@@ -1,15 +1,5 @@
 import { defineConfig } from 'vite-plus'
 
 export default defineConfig({
-  lint: {
-    options: {
-      typeAware: true,
-      typeCheck: true,
-      denyWarnings: true,
-    },
-  },
-  fmt: {
-    singleQuote: true,
-    semi: false,
-  },
+
 })
diff --git a/web/eslint-suppressions.json b/eslint-suppressions.json
similarity index 54%
rename from web/eslint-suppressions.json
rename to eslint-suppressions.json
index 19b1aed1dd..87d7987dd2 100644
--- a/web/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -1,55 +1,93 @@
 {
-  ".storybook/utils/form-story-wrapper.tsx": {
+  "e2e/features/support/hooks.ts": {
+    "no-console": {
+      "count": 3
+    },
+    "node/prefer-global/buffer": {
+      "count": 1
+    }
+  },
+  "e2e/scripts/common.ts": {
+    "node/prefer-global/buffer": {
+      "count": 2
+    }
+  },
+  "e2e/support/process.ts": {
+    "ts/no-use-before-define": {
+      "count": 2
+    }
+  },
+  "packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/migrate.ts": {
+    "no-console": {
+      "count": 11
+    }
+  },
+  "packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/normalize.ts": {
+    "no-console": {
+      "count": 1
+    }
+  },
+  "packages/migrate-no-unchecked-indexed-access/src/no-unchecked-indexed-access/run.ts": {
+    "no-console": {
+      "count": 9
+    }
+  },
+  "web/.storybook/main.ts": {
+    "storybook/no-uninstalled-addons": {
+      "count": 3
+    }
+  },
+  "web/.storybook/utils/form-story-wrapper.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "__mocks__/zustand.ts": {
+  "web/__mocks__/zustand.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "__tests__/document-detail-navigation-fix.test.tsx": {
+  "web/__tests__/document-detail-navigation-fix.test.tsx": {
     "no-console": {
       "count": 10
     }
   },
-  "__tests__/document-list-sorting.test.tsx": {
+  "web/__tests__/document-list-sorting.test.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "__tests__/embedded-user-id-auth.test.tsx": {
+  "web/__tests__/embedded-user-id-auth.test.tsx": {
     "ts/no-explicit-any": {
       "count": 8
     }
   },
-  "__tests__/embedded-user-id-store.test.tsx": {
+  "web/__tests__/embedded-user-id-store.test.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "__tests__/goto-anything/command-selector.test.tsx": {
+  "web/__tests__/goto-anything/command-selector.test.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "__tests__/i18n-upload-features.test.ts": {
+  "web/__tests__/i18n-upload-features.test.ts": {
     "no-console": {
       "count": 3
     }
   },
-  "__tests__/navigation-utils.test.ts": {
+  "web/__tests__/navigation-utils.test.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "__tests__/plugin-tool-workflow-error.test.tsx": {
+  "web/__tests__/plugin-tool-workflow-error.test.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "__tests__/real-browser-flicker.test.tsx": {
+  "web/__tests__/real-browser-flicker.test.tsx": {
     "no-console": {
       "count": 16
     },
@@ -60,17 +98,17 @@
       "count": 1
     }
   },
-  "__tests__/unified-tags-logic.test.ts": {
+  "web/__tests__/unified-tags-logic.test.ts": {
     "ts/no-explicit-any": {
       "count": 8
     }
   },
-  "__tests__/workflow-onboarding-integration.test.tsx": {
+  "web/__tests__/workflow-onboarding-integration.test.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -78,22 +116,22 @@
       "count": 1
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/long-time-range-picker.tsx": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/long-time-range-picker.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/time-range-picker/range-selector.tsx": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/time-range-picker/range-selector.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/__tests__/svg-attribute-error-reproduction.spec.tsx": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/__tests__/svg-attribute-error-reproduction.spec.tsx": {
     "no-console": {
       "count": 19
     },
@@ -101,52 +139,52 @@
       "count": 3
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-button.tsx": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-button.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-popup.tsx": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/config-popup.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-panel.tsx": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-panel.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/type.ts": {
+  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/type.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx": {
+  "web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/settings/page.tsx": {
+  "web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/settings/page.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/(humanInputLayout)/form/[token]/form.tsx": {
+  "web/app/(humanInputLayout)/form/[token]/form.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/(shareLayout)/components/authenticated-layout.tsx": {
+  "web/app/(shareLayout)/components/authenticated-layout.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/(shareLayout)/components/splash.tsx": {
+  "web/app/(shareLayout)/components/splash.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -154,22 +192,22 @@
       "count": 1
     }
   },
-  "app/(shareLayout)/webapp-reset-password/layout.tsx": {
+  "web/app/(shareLayout)/webapp-reset-password/layout.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx": {
+  "web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/(shareLayout)/webapp-signin/page.tsx": {
+  "web/app/(shareLayout)/webapp-signin/page.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/account/(commonLayout)/account-page/email-change-modal.tsx": {
+  "web/app/account/(commonLayout)/account-page/email-change-modal.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -177,37 +215,37 @@
       "count": 5
     }
   },
-  "app/account/(commonLayout)/account-page/index.tsx": {
+  "web/app/account/(commonLayout)/account-page/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/account/(commonLayout)/delete-account/components/feed-back.tsx": {
+  "web/app/account/(commonLayout)/delete-account/components/feed-back.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/account/(commonLayout)/delete-account/components/verify-email.tsx": {
+  "web/app/account/(commonLayout)/delete-account/components/verify-email.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/account/(commonLayout)/delete-account/index.tsx": {
+  "web/app/account/(commonLayout)/delete-account/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/account/oauth/authorize/layout.tsx": {
+  "web/app/account/oauth/authorize/layout.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/account/oauth/authorize/page.tsx": {
+  "web/app/account/oauth/authorize/page.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app-sidebar/app-info/app-operations.tsx": {
+  "web/app/components/app-sidebar/app-info/app-operations.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -215,12 +253,12 @@
       "count": 4
     }
   },
-  "app/components/app-sidebar/app-sidebar-dropdown.tsx": {
+  "web/app/components/app-sidebar/app-sidebar-dropdown.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app-sidebar/basic.tsx": {
+  "web/app/components/app-sidebar/basic.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -228,7 +266,7 @@
       "count": 4
     }
   },
-  "app/components/app-sidebar/dataset-info/dropdown.tsx": {
+  "web/app/components/app-sidebar/dataset-info/dropdown.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -236,27 +274,27 @@
       "count": 1
     }
   },
-  "app/components/app-sidebar/dataset-info/menu-item.tsx": {
+  "web/app/components/app-sidebar/dataset-info/menu-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/app-sidebar/dataset-sidebar-dropdown.tsx": {
+  "web/app/components/app-sidebar/dataset-sidebar-dropdown.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app-sidebar/index.tsx": {
+  "web/app/components/app-sidebar/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app-sidebar/toggle-button.tsx": {
+  "web/app/components/app-sidebar/toggle-button.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/annotation/add-annotation-modal/edit-item/index.tsx": {
+  "web/app/components/app/annotation/add-annotation-modal/edit-item/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -267,12 +305,12 @@
       "count": 1
     }
   },
-  "app/components/app/annotation/batch-add-annotation-modal/csv-downloader.tsx": {
+  "web/app/components/app/annotation/batch-add-annotation-modal/csv-downloader.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 7
     }
   },
-  "app/components/app/annotation/batch-add-annotation-modal/index.tsx": {
+  "web/app/components/app/annotation/batch-add-annotation-modal/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -289,7 +327,7 @@
       "count": 2
     }
   },
-  "app/components/app/annotation/edit-annotation-modal/edit-item/index.tsx": {
+  "web/app/components/app/annotation/edit-annotation-modal/edit-item/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -300,22 +338,22 @@
       "count": 1
     }
   },
-  "app/components/app/annotation/edit-annotation-modal/index.tsx": {
+  "web/app/components/app/annotation/edit-annotation-modal/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/app/annotation/empty-element.tsx": {
+  "web/app/components/app/annotation/empty-element.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/app/annotation/header-opts/index.tsx": {
+  "web/app/components/app/annotation/header-opts/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app/annotation/index.tsx": {
+  "web/app/components/app/annotation/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -323,12 +361,12 @@
       "count": 5
     }
   },
-  "app/components/app/annotation/type.ts": {
+  "web/app/components/app/annotation/type.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "app/components/app/annotation/view-annotation-modal/index.tsx": {
+  "web/app/components/app/annotation/view-annotation-modal/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -339,7 +377,7 @@
       "count": 1
     }
   },
-  "app/components/app/app-access-control/specific-groups-or-members.tsx": {
+  "web/app/components/app/app-access-control/specific-groups-or-members.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -347,47 +385,47 @@
       "count": 4
     }
   },
-  "app/components/app/app-publisher/features-wrapper.tsx": {
+  "web/app/components/app/app-publisher/features-wrapper.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/app/app-publisher/index.tsx": {
+  "web/app/components/app/app-publisher/index.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/app/app-publisher/publish-with-multiple-model.tsx": {
+  "web/app/components/app/app-publisher/publish-with-multiple-model.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/app-publisher/version-info-modal.tsx": {
+  "web/app/components/app/app-publisher/version-info-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/base/group-name/index.tsx": {
+  "web/app/components/app/configuration/base/group-name/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/app/configuration/base/var-highlight/index.tsx": {
+  "web/app/components/app/configuration/base/var-highlight/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/app/configuration/base/warning-mask/index.tsx": {
+  "web/app/components/app/configuration/base/warning-mask/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config-prompt/advanced-prompt-input.tsx": {
+  "web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/app/configuration/config-prompt/conversation-history/edit-modal.tsx": {
+  "web/app/components/app/configuration/config-prompt/conversation-history/edit-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -395,17 +433,17 @@
       "count": 1
     }
   },
-  "app/components/app/configuration/config-prompt/simple-prompt-input.tsx": {
+  "web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/app/configuration/config-var/__tests__/index.spec.tsx": {
+  "web/app/components/app/configuration/config-var/__tests__/index.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/app/configuration/config-var/config-modal/index.tsx": {
+  "web/app/components/app/configuration/config-var/config-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -413,22 +451,22 @@
       "count": 4
     }
   },
-  "app/components/app/configuration/config-var/config-modal/type-select.tsx": {
+  "web/app/components/app/configuration/config-var/config-modal/type-select.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config-var/index.tsx": {
+  "web/app/components/app/configuration/config-var/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config-var/input-type-icon.tsx": {
+  "web/app/components/app/configuration/config-var/input-type-icon.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config-var/select-var-type.tsx": {
+  "web/app/components/app/configuration/config-var/select-var-type.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -436,12 +474,12 @@
       "count": 1
     }
   },
-  "app/components/app/configuration/config-vision/index.tsx": {
+  "web/app/components/app/configuration/config-vision/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config-vision/param-config-content.tsx": {
+  "web/app/components/app/configuration/config-vision/param-config-content.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -452,7 +490,7 @@
       "count": 1
     }
   },
-  "app/components/app/configuration/config/agent/agent-setting/index.tsx": {
+  "web/app/components/app/configuration/config/agent/agent-setting/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -460,12 +498,12 @@
       "count": 1
     }
   },
-  "app/components/app/configuration/config/agent/agent-setting/item-panel.tsx": {
+  "web/app/components/app/configuration/config/agent/agent-setting/item-panel.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config/agent/agent-tools/index.tsx": {
+  "web/app/components/app/configuration/config/agent/agent-tools/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -473,7 +511,7 @@
       "count": 9
     }
   },
-  "app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx": {
+  "web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx": {
     "react-hooks/exhaustive-deps": {
       "count": 1
     },
@@ -484,7 +522,7 @@
       "count": 4
     }
   },
-  "app/components/app/configuration/config/assistant-type-picker/index.tsx": {
+  "web/app/components/app/configuration/config/assistant-type-picker/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -492,7 +530,7 @@
       "count": 1
     }
   },
-  "app/components/app/configuration/config/automatic/get-automatic-res.tsx": {
+  "web/app/components/app/configuration/config/automatic/get-automatic-res.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -503,37 +541,37 @@
       "count": 1
     }
   },
-  "app/components/app/configuration/config/automatic/instruction-editor.tsx": {
+  "web/app/components/app/configuration/config/automatic/instruction-editor.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/app/configuration/config/automatic/prompt-res-in-workflow.tsx": {
+  "web/app/components/app/configuration/config/automatic/prompt-res-in-workflow.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config/automatic/prompt-res.tsx": {
+  "web/app/components/app/configuration/config/automatic/prompt-res.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config/automatic/res-placeholder.tsx": {
+  "web/app/components/app/configuration/config/automatic/res-placeholder.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config/automatic/types.ts": {
+  "web/app/components/app/configuration/config/automatic/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config/automatic/version-selector.tsx": {
+  "web/app/components/app/configuration/config/automatic/version-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config/code-generator/get-code-generator-res.tsx": {
+  "web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -544,42 +582,42 @@
       "count": 2
     }
   },
-  "app/components/app/configuration/config/config-audio.tsx": {
+  "web/app/components/app/configuration/config/config-audio.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/config/config-document.tsx": {
+  "web/app/components/app/configuration/config/config-document.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/dataset-config/context-var/index.tsx": {
+  "web/app/components/app/configuration/dataset-config/context-var/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/dataset-config/context-var/var-picker.tsx": {
+  "web/app/components/app/configuration/dataset-config/context-var/var-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/dataset-config/index.tsx": {
+  "web/app/components/app/configuration/dataset-config/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app/configuration/dataset-config/params-config/__tests__/config-content.spec.tsx": {
+  "web/app/components/app/configuration/dataset-config/params-config/__tests__/config-content.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app/configuration/dataset-config/params-config/config-content.tsx": {
+  "web/app/components/app/configuration/dataset-config/params-config/config-content.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/dataset-config/params-config/index.tsx": {
+  "web/app/components/app/configuration/dataset-config/params-config/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -587,17 +625,17 @@
       "count": 1
     }
   },
-  "app/components/app/configuration/dataset-config/params-config/weighted-score.tsx": {
+  "web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/app/configuration/dataset-config/select-dataset/index.tsx": {
+  "web/app/components/app/configuration/dataset-config/select-dataset/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/dataset-config/settings-modal/index.tsx": {
+  "web/app/components/app/configuration/dataset-config/settings-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -605,27 +643,27 @@
       "count": 3
     }
   },
-  "app/components/app/configuration/dataset-config/settings-modal/retrieval-section.tsx": {
+  "web/app/components/app/configuration/dataset-config/settings-modal/retrieval-section.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app/configuration/debug/__tests__/index.spec.tsx": {
+  "web/app/components/app/configuration/debug/__tests__/index.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app/configuration/debug/chat-user-input.tsx": {
+  "web/app/components/app/configuration/debug/chat-user-input.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/debug/debug-with-multiple-model/chat-item.tsx": {
+  "web/app/components/app/configuration/debug/debug-with-multiple-model/chat-item.tsx": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx": {
+  "web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -633,7 +671,7 @@
       "count": 1
     }
   },
-  "app/components/app/configuration/debug/debug-with-multiple-model/index.tsx": {
+  "web/app/components/app/configuration/debug/debug-with-multiple-model/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -641,27 +679,27 @@
       "count": 2
     }
   },
-  "app/components/app/configuration/debug/debug-with-multiple-model/model-parameter-trigger.tsx": {
+  "web/app/components/app/configuration/debug/debug-with-multiple-model/model-parameter-trigger.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/configuration/debug/debug-with-multiple-model/text-generation-item.tsx": {
+  "web/app/components/app/configuration/debug/debug-with-multiple-model/text-generation-item.tsx": {
     "ts/no-explicit-any": {
       "count": 8
     }
   },
-  "app/components/app/configuration/debug/debug-with-single-model/index.tsx": {
+  "web/app/components/app/configuration/debug/debug-with-single-model/index.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/app/configuration/debug/hooks.tsx": {
+  "web/app/components/app/configuration/debug/hooks.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/app/configuration/debug/index.tsx": {
+  "web/app/components/app/configuration/debug/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -669,22 +707,22 @@
       "count": 11
     }
   },
-  "app/components/app/configuration/debug/types.ts": {
+  "web/app/components/app/configuration/debug/types.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app/configuration/prompt-value-panel/index.tsx": {
+  "web/app/components/app/configuration/prompt-value-panel/index.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/app/configuration/prompt-value-panel/utils.ts": {
+  "web/app/components/app/configuration/prompt-value-panel/utils.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app/create-app-dialog/app-list/sidebar.tsx": {
+  "web/app/components/app/create-app-dialog/app-list/sidebar.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -692,7 +730,7 @@
       "count": 1
     }
   },
-  "app/components/app/create-app-modal/index.tsx": {
+  "web/app/components/app/create-app-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -700,12 +738,12 @@
       "count": 1
     }
   },
-  "app/components/app/create-from-dsl-modal/dsl-confirm-modal.tsx": {
+  "web/app/components/app/create-from-dsl-modal/dsl-confirm-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/create-from-dsl-modal/index.tsx": {
+  "web/app/components/app/create-from-dsl-modal/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -719,22 +757,22 @@
       "count": 2
     }
   },
-  "app/components/app/duplicate-modal/index.tsx": {
+  "web/app/components/app/duplicate-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/log/empty-element.tsx": {
+  "web/app/components/app/log/empty-element.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/app/log/filter.tsx": {
+  "web/app/components/app/log/filter.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/app/log/index.tsx": {
+  "web/app/components/app/log/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -742,7 +780,7 @@
       "count": 1
     }
   },
-  "app/components/app/log/list.tsx": {
+  "web/app/components/app/log/list.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -756,22 +794,22 @@
       "count": 5
     }
   },
-  "app/components/app/log/model-info.tsx": {
+  "web/app/components/app/log/model-info.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/app/overview/app-card.tsx": {
+  "web/app/components/app/overview/app-card.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/overview/customize/index.tsx": {
+  "web/app/components/app/overview/customize/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/app/overview/embedded/index.tsx": {
+  "web/app/components/app/overview/embedded/index.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -779,7 +817,7 @@
       "count": 1
     }
   },
-  "app/components/app/overview/settings/index.tsx": {
+  "web/app/components/app/overview/settings/index.tsx": {
     "no-restricted-imports": {
       "count": 3
     },
@@ -790,12 +828,12 @@
       "count": 1
     }
   },
-  "app/components/app/overview/trigger-card.tsx": {
+  "web/app/components/app/overview/trigger-card.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app/switch-app-modal/index.tsx": {
+  "web/app/components/app/switch-app-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -803,12 +841,12 @@
       "count": 1
     }
   },
-  "app/components/app/text-generate/item/index.tsx": {
+  "web/app/components/app/text-generate/item/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/app/text-generate/item/result-tab.tsx": {
+  "web/app/components/app/text-generate/item/result-tab.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -819,7 +857,7 @@
       "count": 2
     }
   },
-  "app/components/app/workflow-log/detail.tsx": {
+  "web/app/components/app/workflow-log/detail.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -827,22 +865,22 @@
       "count": 2
     }
   },
-  "app/components/app/workflow-log/filter.tsx": {
+  "web/app/components/app/workflow-log/filter.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/app/workflow-log/list.tsx": {
+  "web/app/components/app/workflow-log/list.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     }
   },
-  "app/components/app/workflow-log/trigger-by-display.tsx": {
+  "web/app/components/app/workflow-log/trigger-by-display.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/apps/app-card.tsx": {
+  "web/app/components/apps/app-card.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -853,12 +891,12 @@
       "count": 2
     }
   },
-  "app/components/apps/footer.tsx": {
+  "web/app/components/apps/footer.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/apps/list.tsx": {
+  "web/app/components/apps/list.tsx": {
     "react-hooks/exhaustive-deps": {
       "count": 1
     },
@@ -869,7 +907,7 @@
       "count": 1
     }
   },
-  "app/components/apps/new-app-card.tsx": {
+  "web/app/components/apps/new-app-card.tsx": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 1
     },
@@ -880,7 +918,7 @@
       "count": 1
     }
   },
-  "app/components/base/action-button/index.tsx": {
+  "web/app/components/base/action-button/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -888,12 +926,12 @@
       "count": 1
     }
   },
-  "app/components/base/agent-log-modal/detail.tsx": {
+  "web/app/components/base/agent-log-modal/detail.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/agent-log-modal/index.stories.tsx": {
+  "web/app/components/base/agent-log-modal/index.stories.tsx": {
     "no-console": {
       "count": 1
     },
@@ -901,12 +939,12 @@
       "count": 1
     }
   },
-  "app/components/base/agent-log-modal/index.tsx": {
+  "web/app/components/base/agent-log-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/base/agent-log-modal/result.tsx": {
+  "web/app/components/base/agent-log-modal/result.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -914,32 +952,32 @@
       "count": 2
     }
   },
-  "app/components/base/agent-log-modal/tool-call.tsx": {
+  "web/app/components/base/agent-log-modal/tool-call.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/amplitude/index.ts": {
+  "web/app/components/base/amplitude/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/amplitude/utils.ts": {
+  "web/app/components/base/amplitude/utils.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/app-icon-picker/ImageInput.tsx": {
+  "web/app/components/base/app-icon-picker/ImageInput.tsx": {
     "react/no-create-ref": {
       "count": 1
     }
   },
-  "app/components/base/app-icon/index.stories.tsx": {
+  "web/app/components/base/app-icon/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/audio-btn/audio.ts": {
+  "web/app/components/base/audio-btn/audio.ts": {
     "node/prefer-global/buffer": {
       "count": 1
     },
@@ -947,17 +985,17 @@
       "count": 3
     }
   },
-  "app/components/base/audio-btn/index.tsx": {
+  "web/app/components/base/audio-btn/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/audio-gallery/AudioPlayer.tsx": {
+  "web/app/components/base/audio-gallery/AudioPlayer.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/auto-height-textarea/index.stories.tsx": {
+  "web/app/components/base/auto-height-textarea/index.stories.tsx": {
     "no-console": {
       "count": 2
     },
@@ -965,7 +1003,7 @@
       "count": 1
     }
   },
-  "app/components/base/auto-height-textarea/index.tsx": {
+  "web/app/components/base/auto-height-textarea/index.tsx": {
     "react-hooks/rules-of-hooks": {
       "count": 1
     },
@@ -973,12 +1011,12 @@
       "count": 1
     }
   },
-  "app/components/base/badge/index.tsx": {
+  "web/app/components/base/badge/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/base/block-input/index.stories.tsx": {
+  "web/app/components/base/block-input/index.stories.tsx": {
     "no-console": {
       "count": 2
     },
@@ -986,7 +1024,7 @@
       "count": 1
     }
   },
-  "app/components/base/block-input/index.tsx": {
+  "web/app/components/base/block-input/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     },
@@ -1000,7 +1038,7 @@
       "count": 1
     }
   },
-  "app/components/base/carousel/index.tsx": {
+  "web/app/components/base/carousel/index.tsx": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 1
     },
@@ -1011,22 +1049,22 @@
       "count": 3
     }
   },
-  "app/components/base/chat/chat-with-history/chat-wrapper.tsx": {
+  "web/app/components/base/chat/chat-with-history/chat-wrapper.tsx": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/base/chat/chat-with-history/context.ts": {
+  "web/app/components/base/chat/chat-with-history/context.ts": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/base/chat/chat-with-history/header-in-mobile.tsx": {
+  "web/app/components/base/chat/chat-with-history/header-in-mobile.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/chat/chat-with-history/header/index.tsx": {
+  "web/app/components/base/chat/chat-with-history/header/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1034,12 +1072,12 @@
       "count": 2
     }
   },
-  "app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx": {
+  "web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/chat/chat-with-history/hooks.tsx": {
+  "web/app/components/base/chat/chat-with-history/hooks.tsx": {
     "react/set-state-in-effect": {
       "count": 4
     },
@@ -1047,12 +1085,12 @@
       "count": 18
     }
   },
-  "app/components/base/chat/chat-with-history/index.tsx": {
+  "web/app/components/base/chat/chat-with-history/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat-with-history/inputs-form/content.tsx": {
+  "web/app/components/base/chat/chat-with-history/inputs-form/content.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1060,27 +1098,27 @@
       "count": 3
     }
   },
-  "app/components/base/chat/chat-with-history/inputs-form/view-form-dropdown.tsx": {
+  "web/app/components/base/chat/chat-with-history/inputs-form/view-form-dropdown.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat-with-history/sidebar/list.tsx": {
+  "web/app/components/base/chat/chat-with-history/sidebar/list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat-with-history/sidebar/operation.tsx": {
+  "web/app/components/base/chat/chat-with-history/sidebar/operation.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat-with-history/sidebar/rename-modal.tsx": {
+  "web/app/components/base/chat/chat-with-history/sidebar/rename-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat/answer/agent-content.tsx": {
+  "web/app/components/base/chat/chat/answer/agent-content.tsx": {
     "style/multiline-ternary": {
       "count": 2
     },
@@ -1088,22 +1126,22 @@
       "count": 1
     }
   },
-  "app/components/base/chat/chat/answer/human-input-content/executed-action.tsx": {
+  "web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/base/chat/chat/answer/human-input-content/tips.tsx": {
+  "web/app/components/base/chat/chat/answer/human-input-content/tips.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/base/chat/chat/answer/human-input-content/utils.ts": {
+  "web/app/components/base/chat/chat/answer/human-input-content/utils.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat/answer/index.tsx": {
+  "web/app/components/base/chat/chat/answer/index.tsx": {
     "react/set-state-in-effect": {
       "count": 3
     },
@@ -1111,32 +1149,32 @@
       "count": 1
     }
   },
-  "app/components/base/chat/chat/answer/more.tsx": {
+  "web/app/components/base/chat/chat/answer/more.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat/answer/operation.tsx": {
+  "web/app/components/base/chat/chat/answer/operation.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/base/chat/chat/answer/workflow-process.tsx": {
+  "web/app/components/base/chat/chat/answer/workflow-process.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat/chat-input-area/index.tsx": {
+  "web/app/components/base/chat/chat/chat-input-area/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/chat/chat/check-input-forms-hooks.ts": {
+  "web/app/components/base/chat/chat/check-input-forms-hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat/citation/index.tsx": {
+  "web/app/components/base/chat/chat/citation/index.tsx": {
     "react-hooks/exhaustive-deps": {
       "count": 1
     },
@@ -1147,22 +1185,22 @@
       "count": 5
     }
   },
-  "app/components/base/chat/chat/citation/popup.tsx": {
+  "web/app/components/base/chat/chat/citation/popup.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 9
     }
   },
-  "app/components/base/chat/chat/citation/progress-tooltip.tsx": {
+  "web/app/components/base/chat/chat/citation/progress-tooltip.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat/citation/tooltip.tsx": {
+  "web/app/components/base/chat/chat/citation/tooltip.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/chat/chat/hooks.ts": {
+  "web/app/components/base/chat/chat/hooks.ts": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -1170,7 +1208,7 @@
       "count": 17
     }
   },
-  "app/components/base/chat/chat/index.tsx": {
+  "web/app/components/base/chat/chat/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     },
@@ -1178,32 +1216,32 @@
       "count": 1
     }
   },
-  "app/components/base/chat/chat/type.ts": {
+  "web/app/components/base/chat/chat/type.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/base/chat/chat/utils.ts": {
+  "web/app/components/base/chat/chat/utils.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/chat/embedded-chatbot/chat-wrapper.tsx": {
+  "web/app/components/base/chat/embedded-chatbot/chat-wrapper.tsx": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/base/chat/embedded-chatbot/context.ts": {
+  "web/app/components/base/chat/embedded-chatbot/context.ts": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/base/chat/embedded-chatbot/header/index.tsx": {
+  "web/app/components/base/chat/embedded-chatbot/header/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/chat/embedded-chatbot/hooks.tsx": {
+  "web/app/components/base/chat/embedded-chatbot/hooks.tsx": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 3
     },
@@ -1211,7 +1249,7 @@
       "count": 6
     }
   },
-  "app/components/base/chat/embedded-chatbot/inputs-form/content.tsx": {
+  "web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1219,17 +1257,17 @@
       "count": 3
     }
   },
-  "app/components/base/chat/types.ts": {
+  "web/app/components/base/chat/types.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/chat/utils.ts": {
+  "web/app/components/base/chat/utils.ts": {
     "ts/no-explicit-any": {
       "count": 10
     }
   },
-  "app/components/base/checkbox/index.stories.tsx": {
+  "web/app/components/base/checkbox/index.stories.tsx": {
     "no-console": {
       "count": 1
     },
@@ -1237,107 +1275,107 @@
       "count": 1
     }
   },
-  "app/components/base/chip/index.tsx": {
+  "web/app/components/base/chip/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/content-dialog/index.stories.tsx": {
+  "web/app/components/base/content-dialog/index.stories.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/base/content-dialog/index.tsx": {
+  "web/app/components/base/content-dialog/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/copy-feedback/index.tsx": {
+  "web/app/components/base/copy-feedback/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/copy-icon/index.tsx": {
+  "web/app/components/base/copy-icon/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/corner-label/index.stories.tsx": {
+  "web/app/components/base/corner-label/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/date-and-time-picker/calendar/days-of-week.tsx": {
+  "web/app/components/base/date-and-time-picker/calendar/days-of-week.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/date-and-time-picker/date-picker/header.tsx": {
+  "web/app/components/base/date-and-time-picker/date-picker/header.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/date-and-time-picker/date-picker/index.tsx": {
+  "web/app/components/base/date-and-time-picker/date-picker/index.tsx": {
     "react/set-state-in-effect": {
       "count": 4
     }
   },
-  "app/components/base/date-and-time-picker/hooks.ts": {
+  "web/app/components/base/date-and-time-picker/hooks.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 2
     }
   },
-  "app/components/base/date-and-time-picker/time-picker/header.tsx": {
+  "web/app/components/base/date-and-time-picker/time-picker/header.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/date-and-time-picker/time-picker/index.tsx": {
+  "web/app/components/base/date-and-time-picker/time-picker/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     }
   },
-  "app/components/base/date-and-time-picker/types.ts": {
+  "web/app/components/base/date-and-time-picker/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "app/components/base/date-and-time-picker/utils/dayjs.ts": {
+  "web/app/components/base/date-and-time-picker/utils/dayjs.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/date-and-time-picker/year-and-month-picker/header.tsx": {
+  "web/app/components/base/date-and-time-picker/year-and-month-picker/header.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/dialog/index.stories.tsx": {
+  "web/app/components/base/dialog/index.stories.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/base/drawer-plus/index.stories.tsx": {
+  "web/app/components/base/drawer-plus/index.stories.tsx": {
     "react/component-hook-factories": {
       "count": 1
     }
   },
-  "app/components/base/effect/index.stories.tsx": {
+  "web/app/components/base/effect/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/emoji-picker/Inner.tsx": {
+  "web/app/components/base/emoji-picker/Inner.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/base/emoji-picker/index.tsx": {
+  "web/app/components/base/emoji-picker/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/error-boundary/index.tsx": {
+  "web/app/components/base/error-boundary/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 3
     },
@@ -1348,27 +1386,27 @@
       "count": 2
     }
   },
-  "app/components/base/features/context.tsx": {
+  "web/app/components/base/features/context.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/base/features/index.tsx": {
+  "web/app/components/base/features/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/annotation-reply/annotation-ctrl-button.tsx": {
+  "web/app/components/base/features/new-feature-panel/annotation-reply/annotation-ctrl-button.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/annotation-reply/config-param-modal.tsx": {
+  "web/app/components/base/features/new-feature-panel/annotation-reply/config-param-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx": {
+  "web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1376,27 +1414,27 @@
       "count": 2
     }
   },
-  "app/components/base/features/new-feature-panel/annotation-reply/index.tsx": {
+  "web/app/components/base/features/new-feature-panel/annotation-reply/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx": {
+  "web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/annotation-reply/type.ts": {
+  "web/app/components/base/features/new-feature-panel/annotation-reply/type.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/annotation-reply/use-annotation-config.ts": {
+  "web/app/components/base/features/new-feature-panel/annotation-reply/use-annotation-config.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/features/new-feature-panel/conversation-opener/modal.tsx": {
+  "web/app/components/base/features/new-feature-panel/conversation-opener/modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1404,12 +1442,12 @@
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/feature-bar.tsx": {
+  "web/app/components/base/features/new-feature-panel/feature-bar.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/feature-card.tsx": {
+  "web/app/components/base/features/new-feature-panel/feature-card.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1417,27 +1455,27 @@
       "count": 5
     }
   },
-  "app/components/base/features/new-feature-panel/file-upload/setting-modal.tsx": {
+  "web/app/components/base/features/new-feature-panel/file-upload/setting-modal.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/index.tsx": {
+  "web/app/components/base/features/new-feature-panel/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/features/new-feature-panel/moderation/form-generation.tsx": {
+  "web/app/components/base/features/new-feature-panel/moderation/form-generation.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/moderation/index.tsx": {
+  "web/app/components/base/features/new-feature-panel/moderation/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx": {
+  "web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1445,17 +1483,17 @@
       "count": 2
     }
   },
-  "app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx": {
+  "web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/base/features/new-feature-panel/text-to-speech/voice-settings.tsx": {
+  "web/app/components/base/features/new-feature-panel/text-to-speech/voice-settings.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/features/types.ts": {
+  "web/app/components/base/features/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     },
@@ -1463,22 +1501,22 @@
       "count": 1
     }
   },
-  "app/components/base/file-icon/index.stories.tsx": {
+  "web/app/components/base/file-icon/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/file-uploader/audio-preview.tsx": {
+  "web/app/components/base/file-uploader/audio-preview.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/file-uploader/dynamic-pdf-preview.tsx": {
+  "web/app/components/base/file-uploader/dynamic-pdf-preview.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/file-uploader/file-list-in-log.tsx": {
+  "web/app/components/base/file-uploader/file-list-in-log.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1486,7 +1524,7 @@
       "count": 1
     }
   },
-  "app/components/base/file-uploader/hooks.ts": {
+  "web/app/components/base/file-uploader/hooks.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 1
     },
@@ -1494,17 +1532,17 @@
       "count": 3
     }
   },
-  "app/components/base/file-uploader/index.ts": {
+  "web/app/components/base/file-uploader/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 5
     }
   },
-  "app/components/base/file-uploader/pdf-highlighter-adapter.tsx": {
+  "web/app/components/base/file-uploader/pdf-highlighter-adapter.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/file-uploader/pdf-preview.tsx": {
+  "web/app/components/base/file-uploader/pdf-preview.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1512,27 +1550,27 @@
       "count": 3
     }
   },
-  "app/components/base/file-uploader/store.tsx": {
+  "web/app/components/base/file-uploader/store.tsx": {
     "react-refresh/only-export-components": {
       "count": 4
     }
   },
-  "app/components/base/file-uploader/types.ts": {
+  "web/app/components/base/file-uploader/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/base/file-uploader/utils.ts": {
+  "web/app/components/base/file-uploader/utils.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/file-uploader/video-preview.tsx": {
+  "web/app/components/base/file-uploader/video-preview.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/form/components/base/base-field.tsx": {
+  "web/app/components/base/form/components/base/base-field.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -1540,17 +1578,17 @@
       "count": 3
     }
   },
-  "app/components/base/form/components/base/base-form.tsx": {
+  "web/app/components/base/form/components/base/base-form.tsx": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "app/components/base/form/components/base/index.tsx": {
+  "web/app/components/base/form/components/base/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/form/components/field/mixed-variable-text-input/placeholder.tsx": {
+  "web/app/components/base/form/components/field/mixed-variable-text-input/placeholder.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -1558,7 +1596,7 @@
       "count": 1
     }
   },
-  "app/components/base/form/components/field/variable-or-constant-input.tsx": {
+  "web/app/components/base/form/components/field/variable-or-constant-input.tsx": {
     "no-console": {
       "count": 2
     },
@@ -1566,12 +1604,12 @@
       "count": 2
     }
   },
-  "app/components/base/form/components/field/variable-selector.tsx": {
+  "web/app/components/base/form/components/field/variable-selector.tsx": {
     "no-console": {
       "count": 1
     }
   },
-  "app/components/base/form/form-scenarios/base/field.tsx": {
+  "web/app/components/base/form/form-scenarios/base/field.tsx": {
     "react/component-hook-factories": {
       "count": 1
     },
@@ -1579,7 +1617,7 @@
       "count": 1
     }
   },
-  "app/components/base/form/form-scenarios/base/types.ts": {
+  "web/app/components/base/form/form-scenarios/base/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -1587,12 +1625,12 @@
       "count": 3
     }
   },
-  "app/components/base/form/form-scenarios/demo/index.tsx": {
+  "web/app/components/base/form/form-scenarios/demo/index.tsx": {
     "no-console": {
       "count": 2
     }
   },
-  "app/components/base/form/form-scenarios/input-field/field.tsx": {
+  "web/app/components/base/form/form-scenarios/input-field/field.tsx": {
     "react/component-hook-factories": {
       "count": 1
     },
@@ -1600,7 +1638,7 @@
       "count": 1
     }
   },
-  "app/components/base/form/form-scenarios/input-field/types.ts": {
+  "web/app/components/base/form/form-scenarios/input-field/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -1608,7 +1646,7 @@
       "count": 2
     }
   },
-  "app/components/base/form/form-scenarios/node-panel/field.tsx": {
+  "web/app/components/base/form/form-scenarios/node-panel/field.tsx": {
     "react/component-hook-factories": {
       "count": 1
     },
@@ -1616,7 +1654,7 @@
       "count": 1
     }
   },
-  "app/components/base/form/form-scenarios/node-panel/types.ts": {
+  "web/app/components/base/form/form-scenarios/node-panel/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -1624,22 +1662,22 @@
       "count": 2
     }
   },
-  "app/components/base/form/hooks/index.ts": {
+  "web/app/components/base/form/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/base/form/hooks/use-check-validated.ts": {
+  "web/app/components/base/form/hooks/use-check-validated.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/form/hooks/use-get-validators.ts": {
+  "web/app/components/base/form/hooks/use-get-validators.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/form/types.ts": {
+  "web/app/components/base/form/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     },
@@ -1647,12 +1685,12 @@
       "count": 15
     }
   },
-  "app/components/base/form/utils/secret-input/index.ts": {
+  "web/app/components/base/form/utils/secret-input/index.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/ga/index.tsx": {
+  "web/app/components/base/ga/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -1660,282 +1698,282 @@
       "count": 1
     }
   },
-  "app/components/base/grid-mask/index.stories.tsx": {
+  "web/app/components/base/grid-mask/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/base/icons/src/public/avatar/index.ts": {
+  "web/app/components/base/icons/src/public/avatar/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/icons/src/public/billing/index.ts": {
+  "web/app/components/base/icons/src/public/billing/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
     }
   },
-  "app/components/base/icons/src/public/common/index.ts": {
+  "web/app/components/base/icons/src/public/common/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 6
     }
   },
-  "app/components/base/icons/src/public/education/index.ts": {
+  "web/app/components/base/icons/src/public/education/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/public/files/index.ts": {
+  "web/app/components/base/icons/src/public/files/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 11
     }
   },
-  "app/components/base/icons/src/public/knowledge/dataset-card/index.ts": {
+  "web/app/components/base/icons/src/public/knowledge/dataset-card/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
     }
   },
-  "app/components/base/icons/src/public/knowledge/index.ts": {
+  "web/app/components/base/icons/src/public/knowledge/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 6
     }
   },
-  "app/components/base/icons/src/public/knowledge/online-drive/index.ts": {
+  "web/app/components/base/icons/src/public/knowledge/online-drive/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/base/icons/src/public/llm/index.ts": {
+  "web/app/components/base/icons/src/public/llm/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 9
     }
   },
-  "app/components/base/icons/src/public/other/index.ts": {
+  "web/app/components/base/icons/src/public/other/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 6
     }
   },
-  "app/components/base/icons/src/public/thought/index.ts": {
+  "web/app/components/base/icons/src/public/thought/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/public/tracing/index.ts": {
+  "web/app/components/base/icons/src/public/tracing/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 21
     }
   },
-  "app/components/base/icons/src/vender/features/index.ts": {
+  "web/app/components/base/icons/src/vender/features/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 10
     }
   },
-  "app/components/base/icons/src/vender/knowledge/index.ts": {
+  "web/app/components/base/icons/src/vender/knowledge/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 15
     }
   },
-  "app/components/base/icons/src/vender/line/alertsAndFeedback/index.ts": {
+  "web/app/components/base/icons/src/vender/line/alertsAndFeedback/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/icons/src/vender/line/arrows/index.ts": {
+  "web/app/components/base/icons/src/vender/line/arrows/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 6
     }
   },
-  "app/components/base/icons/src/vender/line/communication/index.ts": {
+  "web/app/components/base/icons/src/vender/line/communication/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/base/icons/src/vender/line/development/index.ts": {
+  "web/app/components/base/icons/src/vender/line/development/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/icons/src/vender/line/editor/index.ts": {
+  "web/app/components/base/icons/src/vender/line/editor/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/line/education/index.ts": {
+  "web/app/components/base/icons/src/vender/line/education/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/line/files/index.ts": {
+  "web/app/components/base/icons/src/vender/line/files/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 6
     }
   },
-  "app/components/base/icons/src/vender/line/financeAndECommerce/index.ts": {
+  "web/app/components/base/icons/src/vender/line/financeAndECommerce/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
     }
   },
-  "app/components/base/icons/src/vender/line/general/index.ts": {
+  "web/app/components/base/icons/src/vender/line/general/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 12
     }
   },
-  "app/components/base/icons/src/vender/line/images/index.ts": {
+  "web/app/components/base/icons/src/vender/line/images/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/line/layout/index.ts": {
+  "web/app/components/base/icons/src/vender/line/layout/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/line/mediaAndDevices/index.ts": {
+  "web/app/components/base/icons/src/vender/line/mediaAndDevices/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/icons/src/vender/line/others/index.ts": {
+  "web/app/components/base/icons/src/vender/line/others/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 7
     }
   },
-  "app/components/base/icons/src/vender/line/time/index.ts": {
+  "web/app/components/base/icons/src/vender/line/time/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/icons/src/vender/other/index.ts": {
+  "web/app/components/base/icons/src/vender/other/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 8
     }
   },
-  "app/components/base/icons/src/vender/pipeline/index.ts": {
+  "web/app/components/base/icons/src/vender/pipeline/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/base/icons/src/vender/plugin/index.ts": {
+  "web/app/components/base/icons/src/vender/plugin/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/base/icons/src/vender/solid/FinanceAndECommerce/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/FinanceAndECommerce/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/solid/alertsAndFeedback/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/alertsAndFeedback/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/solid/arrows/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/arrows/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/base/icons/src/vender/solid/communication/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/communication/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 6
     }
   },
-  "app/components/base/icons/src/vender/solid/development/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/development/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
     }
   },
-  "app/components/base/icons/src/vender/solid/editor/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/editor/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/solid/education/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/education/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/base/icons/src/vender/solid/files/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/files/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/base/icons/src/vender/solid/general/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/general/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 11
     }
   },
-  "app/components/base/icons/src/vender/solid/mediaAndDevices/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/mediaAndDevices/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/base/icons/src/vender/solid/security/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/security/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/solid/shapes/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/shapes/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/solid/users/index.ts": {
+  "web/app/components/base/icons/src/vender/solid/users/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/system/index.ts": {
+  "web/app/components/base/icons/src/vender/system/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/icons/src/vender/workflow/index.ts": {
+  "web/app/components/base/icons/src/vender/workflow/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 30
     }
   },
-  "app/components/base/icons/utils.ts": {
+  "web/app/components/base/icons/utils.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/image-uploader/__tests__/image-preview.spec.tsx": {
+  "web/app/components/base/image-uploader/__tests__/image-preview.spec.tsx": {
     "erasable-syntax-only/parameter-properties": {
       "count": 1
     }
   },
-  "app/components/base/image-uploader/__tests__/utils.spec.ts": {
+  "web/app/components/base/image-uploader/__tests__/utils.spec.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/image-uploader/audio-preview.tsx": {
+  "web/app/components/base/image-uploader/audio-preview.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/image-uploader/hooks.ts": {
+  "web/app/components/base/image-uploader/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/base/image-uploader/image-link-input.tsx": {
+  "web/app/components/base/image-uploader/image-link-input.tsx": {
     "regexp/no-unused-capturing-group": {
       "count": 1
     }
   },
-  "app/components/base/image-uploader/image-list.stories.tsx": {
+  "web/app/components/base/image-uploader/image-list.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/image-uploader/image-list.tsx": {
+  "web/app/components/base/image-uploader/image-list.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/image-uploader/image-preview.tsx": {
+  "web/app/components/base/image-uploader/image-preview.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -1946,27 +1984,27 @@
       "count": 1
     }
   },
-  "app/components/base/image-uploader/utils.ts": {
+  "web/app/components/base/image-uploader/utils.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/image-uploader/video-preview.tsx": {
+  "web/app/components/base/image-uploader/video-preview.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/inline-delete-confirm/index.stories.tsx": {
+  "web/app/components/base/inline-delete-confirm/index.stories.tsx": {
     "no-console": {
       "count": 2
     }
   },
-  "app/components/base/input-with-copy/index.tsx": {
+  "web/app/components/base/input-with-copy/index.tsx": {
     "react/unsupported-syntax": {
       "count": 1
     }
   },
-  "app/components/base/input/index.stories.tsx": {
+  "web/app/components/base/input/index.stories.tsx": {
     "no-console": {
       "count": 2
     },
@@ -1974,42 +2012,42 @@
       "count": 1
     }
   },
-  "app/components/base/input/index.tsx": {
+  "web/app/components/base/input/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/base/loading/index.stories.tsx": {
+  "web/app/components/base/loading/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/logo/dify-logo.tsx": {
+  "web/app/components/base/logo/dify-logo.tsx": {
     "react-refresh/only-export-components": {
       "count": 2
     }
   },
-  "app/components/base/logo/index.stories.tsx": {
+  "web/app/components/base/logo/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 4
     }
   },
-  "app/components/base/markdown-blocks/audio-block.tsx": {
+  "web/app/components/base/markdown-blocks/audio-block.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/base/markdown-blocks/button.tsx": {
+  "web/app/components/base/markdown-blocks/button.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/markdown-blocks/code-block.stories.tsx": {
+  "web/app/components/base/markdown-blocks/code-block.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/markdown-blocks/code-block.tsx": {
+  "web/app/components/base/markdown-blocks/code-block.tsx": {
     "react/set-state-in-effect": {
       "count": 7
     },
@@ -2017,42 +2055,42 @@
       "count": 9
     }
   },
-  "app/components/base/markdown-blocks/form.tsx": {
+  "web/app/components/base/markdown-blocks/form.tsx": {
     "erasable-syntax-only/enums": {
       "count": 3
     }
   },
-  "app/components/base/markdown-blocks/index.ts": {
+  "web/app/components/base/markdown-blocks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 10
     }
   },
-  "app/components/base/markdown-blocks/link.tsx": {
+  "web/app/components/base/markdown-blocks/link.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/markdown-blocks/paragraph.tsx": {
+  "web/app/components/base/markdown-blocks/paragraph.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/markdown-blocks/plugin-img.tsx": {
+  "web/app/components/base/markdown-blocks/plugin-img.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     }
   },
-  "app/components/base/markdown-blocks/plugin-paragraph.tsx": {
+  "web/app/components/base/markdown-blocks/plugin-paragraph.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     }
   },
-  "app/components/base/markdown-blocks/think-block.stories.tsx": {
+  "web/app/components/base/markdown-blocks/think-block.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/markdown-blocks/think-block.tsx": {
+  "web/app/components/base/markdown-blocks/think-block.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -2060,32 +2098,32 @@
       "count": 4
     }
   },
-  "app/components/base/markdown-blocks/video-block.tsx": {
+  "web/app/components/base/markdown-blocks/video-block.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/base/markdown/error-boundary.tsx": {
+  "web/app/components/base/markdown/error-boundary.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/markdown/index.stories.tsx": {
+  "web/app/components/base/markdown/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/markdown/markdown-utils.ts": {
+  "web/app/components/base/markdown/markdown-utils.ts": {
     "regexp/no-unused-capturing-group": {
       "count": 1
     }
   },
-  "app/components/base/mermaid/index.stories.tsx": {
+  "web/app/components/base/mermaid/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/mermaid/index.tsx": {
+  "web/app/components/base/mermaid/index.tsx": {
     "react/set-state-in-effect": {
       "count": 7
     },
@@ -2096,7 +2134,7 @@
       "count": 1
     }
   },
-  "app/components/base/mermaid/utils.ts": {
+  "web/app/components/base/mermaid/utils.ts": {
     "regexp/no-unused-capturing-group": {
       "count": 1
     },
@@ -2104,7 +2142,7 @@
       "count": 4
     }
   },
-  "app/components/base/message-log-modal/index.stories.tsx": {
+  "web/app/components/base/message-log-modal/index.stories.tsx": {
     "no-console": {
       "count": 1
     },
@@ -2112,7 +2150,7 @@
       "count": 1
     }
   },
-  "app/components/base/message-log-modal/index.tsx": {
+  "web/app/components/base/message-log-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -2120,7 +2158,7 @@
       "count": 1
     }
   },
-  "app/components/base/modal-like-wrap/index.stories.tsx": {
+  "web/app/components/base/modal-like-wrap/index.stories.tsx": {
     "no-console": {
       "count": 3
     },
@@ -2128,12 +2166,12 @@
       "count": 2
     }
   },
-  "app/components/base/modal/index.stories.tsx": {
+  "web/app/components/base/modal/index.stories.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/base/modal/modal.stories.tsx": {
+  "web/app/components/base/modal/modal.stories.tsx": {
     "no-console": {
       "count": 4
     },
@@ -2141,7 +2179,7 @@
       "count": 1
     }
   },
-  "app/components/base/new-audio-button/index.tsx": {
+  "web/app/components/base/new-audio-button/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -2149,7 +2187,7 @@
       "count": 1
     }
   },
-  "app/components/base/node-status/index.tsx": {
+  "web/app/components/base/node-status/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -2157,72 +2195,72 @@
       "count": 1
     }
   },
-  "app/components/base/notion-connector/index.stories.tsx": {
+  "web/app/components/base/notion-connector/index.stories.tsx": {
     "no-console": {
       "count": 1
     }
   },
-  "app/components/base/notion-page-selector/credential-selector/index.tsx": {
+  "web/app/components/base/notion-page-selector/credential-selector/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/notion-page-selector/index.stories.tsx": {
+  "web/app/components/base/notion-page-selector/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/notion-page-selector/index.tsx": {
+  "web/app/components/base/notion-page-selector/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/base/pagination/index.stories.tsx": {
+  "web/app/components/base/pagination/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/pagination/index.tsx": {
+  "web/app/components/base/pagination/index.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 1
     }
   },
-  "app/components/base/pagination/type.ts": {
+  "web/app/components/base/pagination/type.ts": {
     "ts/no-empty-object-type": {
       "count": 1
     }
   },
-  "app/components/base/param-item/index.stories.tsx": {
+  "web/app/components/base/param-item/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/param-item/index.tsx": {
+  "web/app/components/base/param-item/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/portal-to-follow-elem/index.stories.tsx": {
+  "web/app/components/base/portal-to-follow-elem/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/portal-to-follow-elem/index.tsx": {
+  "web/app/components/base/portal-to-follow-elem/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/premium-badge/index.stories.tsx": {
+  "web/app/components/base/premium-badge/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/base/progress-bar/progress-circle.stories.tsx": {
+  "web/app/components/base/progress-bar/progress-circle.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/index.stories.tsx": {
+  "web/app/components/base/prompt-editor/index.stories.tsx": {
     "no-console": {
       "count": 1
     },
@@ -2233,27 +2271,27 @@
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/index.tsx": {
+  "web/app/components/base/prompt-editor/index.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/base/prompt-editor/plugins/component-picker-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/plugins/component-picker-block/menu.tsx": {
+  "web/app/components/base/prompt-editor/plugins/component-picker-block/menu.tsx": {
     "erasable-syntax-only/parameter-properties": {
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/plugins/component-picker-block/prompt-option.tsx": {
+  "web/app/components/base/prompt-editor/plugins/component-picker-block/prompt-option.tsx": {
     "tailwindcss/no-duplicate-classes": {
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/context-block/component.tsx": {
+  "web/app/components/base/prompt-editor/plugins/context-block/component.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -2261,7 +2299,7 @@
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/plugins/context-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/context-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -2269,7 +2307,7 @@
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/current-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/current-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -2277,12 +2315,12 @@
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/draggable-plugin/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/draggable-plugin/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/error-message-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/error-message-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -2290,7 +2328,7 @@
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/history-block/component.tsx": {
+  "web/app/components/base/prompt-editor/plugins/history-block/component.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -2298,7 +2336,7 @@
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/plugins/history-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/history-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -2306,22 +2344,22 @@
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx": {
+  "web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx": {
     "react-hooks/exhaustive-deps": {
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/plugins/hitl-input-block/component.tsx": {
+  "web/app/components/base/prompt-editor/plugins/hitl-input-block/component.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/plugins/hitl-input-block/hitl-input-block-replacement-block.tsx": {
+  "web/app/components/base/prompt-editor/plugins/hitl-input-block/hitl-input-block-replacement-block.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/plugins/hitl-input-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/hitl-input-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -2329,12 +2367,12 @@
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/hitl-input-block/variable-block.tsx": {
+  "web/app/components/base/prompt-editor/plugins/hitl-input-block/variable-block.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/plugins/last-run-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/last-run-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -2342,12 +2380,12 @@
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/query-block/component.tsx": {
+  "web/app/components/base/prompt-editor/plugins/query-block/component.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/prompt-editor/plugins/query-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/query-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -2355,7 +2393,7 @@
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/request-url-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/request-url-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -2363,22 +2401,22 @@
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/update-block.tsx": {
+  "web/app/components/base/prompt-editor/plugins/update-block.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/variable-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/variable-block/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/plugins/workflow-variable-block/index.tsx": {
+  "web/app/components/base/prompt-editor/plugins/workflow-variable-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -2386,27 +2424,27 @@
       "count": 3
     }
   },
-  "app/components/base/prompt-editor/plugins/workflow-variable-block/node.tsx": {
+  "web/app/components/base/prompt-editor/plugins/workflow-variable-block/node.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/prompt-editor/utils.ts": {
+  "web/app/components/base/prompt-editor/utils.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/base/prompt-log-modal/card.tsx": {
+  "web/app/components/base/prompt-log-modal/card.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/prompt-log-modal/index.stories.tsx": {
+  "web/app/components/base/prompt-log-modal/index.stories.tsx": {
     "no-console": {
       "count": 1
     }
   },
-  "app/components/base/prompt-log-modal/index.tsx": {
+  "web/app/components/base/prompt-log-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -2414,12 +2452,12 @@
       "count": 1
     }
   },
-  "app/components/base/qrcode/index.stories.tsx": {
+  "web/app/components/base/qrcode/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/qrcode/index.tsx": {
+  "web/app/components/base/qrcode/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -2427,27 +2465,27 @@
       "count": 1
     }
   },
-  "app/components/base/radio-card/index.stories.tsx": {
+  "web/app/components/base/radio-card/index.stories.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/radio/component/group/index.tsx": {
+  "web/app/components/base/radio/component/group/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/radio/context/index.ts": {
+  "web/app/components/base/radio/context/index.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/radio/index.stories.tsx": {
+  "web/app/components/base/radio/index.stories.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/search-input/index.stories.tsx": {
+  "web/app/components/base/search-input/index.stories.tsx": {
     "no-console": {
       "count": 3
     },
@@ -2455,12 +2493,12 @@
       "count": 1
     }
   },
-  "app/components/base/segmented-control/index.stories.tsx": {
+  "web/app/components/base/segmented-control/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/select/index.stories.tsx": {
+  "web/app/components/base/select/index.stories.tsx": {
     "no-console": {
       "count": 4
     },
@@ -2468,7 +2506,7 @@
       "count": 1
     }
   },
-  "app/components/base/select/index.tsx": {
+  "web/app/components/base/select/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -2479,82 +2517,82 @@
       "count": 1
     }
   },
-  "app/components/base/select/locale-signin.tsx": {
+  "web/app/components/base/select/locale-signin.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/simple-pie-chart/index.stories.tsx": {
+  "web/app/components/base/simple-pie-chart/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/skeleton/index.stories.tsx": {
+  "web/app/components/base/skeleton/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/sort/index.stories.tsx": {
+  "web/app/components/base/sort/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/sort/index.tsx": {
+  "web/app/components/base/sort/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/spinner/index.stories.tsx": {
+  "web/app/components/base/spinner/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/spinner/index.tsx": {
+  "web/app/components/base/spinner/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/svg-gallery/index.tsx": {
+  "web/app/components/base/svg-gallery/index.tsx": {
     "node/prefer-global/buffer": {
       "count": 1
     }
   },
-  "app/components/base/svg/index.stories.tsx": {
+  "web/app/components/base/svg/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/switch/index.stories.tsx": {
+  "web/app/components/base/switch/index.stories.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/tab-header/index.stories.tsx": {
+  "web/app/components/base/tab-header/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/tab-slider-new/index.stories.tsx": {
+  "web/app/components/base/tab-slider-new/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/tab-slider-plain/index.stories.tsx": {
+  "web/app/components/base/tab-slider-plain/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/tab-slider/index.stories.tsx": {
+  "web/app/components/base/tab-slider/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/base/tab-slider/index.tsx": {
+  "web/app/components/base/tab-slider/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     }
   },
-  "app/components/base/tag-input/index.stories.tsx": {
+  "web/app/components/base/tag-input/index.stories.tsx": {
     "no-console": {
       "count": 2
     },
@@ -2562,12 +2600,12 @@
       "count": 1
     }
   },
-  "app/components/base/tag-management/__tests__/panel.spec.tsx": {
+  "web/app/components/base/tag-management/__tests__/panel.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/base/tag-management/index.tsx": {
+  "web/app/components/base/tag-management/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -2575,42 +2613,42 @@
       "count": 2
     }
   },
-  "app/components/base/tag-management/panel.tsx": {
+  "web/app/components/base/tag-management/panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 5
     }
   },
-  "app/components/base/tag-management/tag-item-editor.tsx": {
+  "web/app/components/base/tag-management/tag-item-editor.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/tag-management/tag-remove-modal.tsx": {
+  "web/app/components/base/tag-management/tag-remove-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/base/tag-management/trigger.tsx": {
+  "web/app/components/base/tag-management/trigger.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/tag/index.stories.tsx": {
+  "web/app/components/base/tag/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/text-generation/hooks.ts": {
+  "web/app/components/base/text-generation/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/base/text-generation/types.ts": {
+  "web/app/components/base/text-generation/types.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/base/textarea/index.stories.tsx": {
+  "web/app/components/base/textarea/index.stories.tsx": {
     "no-console": {
       "count": 1
     },
@@ -2618,27 +2656,27 @@
       "count": 1
     }
   },
-  "app/components/base/textarea/index.tsx": {
+  "web/app/components/base/textarea/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/base/tooltip/index.stories.tsx": {
+  "web/app/components/base/tooltip/index.stories.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/base/video-gallery/VideoPlayer.tsx": {
+  "web/app/components/base/video-gallery/VideoPlayer.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/base/voice-input/__tests__/index.spec.tsx": {
+  "web/app/components/base/voice-input/__tests__/index.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/base/voice-input/index.stories.tsx": {
+  "web/app/components/base/voice-input/index.stories.tsx": {
     "no-console": {
       "count": 2
     },
@@ -2649,12 +2687,12 @@
       "count": 1
     }
   },
-  "app/components/base/voice-input/utils.ts": {
+  "web/app/components/base/voice-input/utils.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/base/with-input-validation/index.stories.tsx": {
+  "web/app/components/base/with-input-validation/index.stories.tsx": {
     "no-console": {
       "count": 1
     },
@@ -2662,7 +2700,7 @@
       "count": 1
     }
   },
-  "app/components/base/with-input-validation/index.tsx": {
+  "web/app/components/base/with-input-validation/index.tsx": {
     "react/component-hook-factories": {
       "count": 1
     },
@@ -2670,47 +2708,47 @@
       "count": 1
     }
   },
-  "app/components/base/zendesk/utils.ts": {
+  "web/app/components/base/zendesk/utils.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/billing/annotation-full/modal.tsx": {
+  "web/app/components/billing/annotation-full/modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/billing/billing-page/__tests__/index.spec.tsx": {
+  "web/app/components/billing/billing-page/__tests__/index.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/billing/plan-upgrade-modal/index.tsx": {
+  "web/app/components/billing/plan-upgrade-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/billing/plan/assets/index.tsx": {
+  "web/app/components/billing/plan/assets/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
     }
   },
-  "app/components/billing/plan/index.tsx": {
+  "web/app/components/billing/plan/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/billing/pricing/assets/index.tsx": {
+  "web/app/components/billing/pricing/assets/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 12
     }
   },
-  "app/components/billing/pricing/index.tsx": {
+  "web/app/components/billing/pricing/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/billing/pricing/plan-switcher/plan-range-switcher.tsx": {
+  "web/app/components/billing/pricing/plan-switcher/plan-range-switcher.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -2718,102 +2756,102 @@
       "count": 1
     }
   },
-  "app/components/billing/pricing/plans/cloud-plan-item/index.tsx": {
+  "web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 8
     }
   },
-  "app/components/billing/pricing/plans/cloud-plan-item/list/item/index.tsx": {
+  "web/app/components/billing/pricing/plans/cloud-plan-item/list/item/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/billing/pricing/plans/self-hosted-plan-item/list/item.tsx": {
+  "web/app/components/billing/pricing/plans/self-hosted-plan-item/list/item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/billing/pricing/types.ts": {
+  "web/app/components/billing/pricing/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/billing/priority-label/index.tsx": {
+  "web/app/components/billing/priority-label/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/billing/type.ts": {
+  "web/app/components/billing/type.ts": {
     "erasable-syntax-only/enums": {
       "count": 4
     }
   },
-  "app/components/billing/upgrade-btn/index.tsx": {
+  "web/app/components/billing/upgrade-btn/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/billing/usage-info/index.tsx": {
+  "web/app/components/billing/usage-info/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/custom/custom-page/index.tsx": {
+  "web/app/components/custom/custom-page/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/custom/custom-web-app-brand/components/powered-by-brand.tsx": {
+  "web/app/components/custom/custom-web-app-brand/components/powered-by-brand.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/chunk.tsx": {
+  "web/app/components/datasets/chunk.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/datasets/common/document-picker/index.tsx": {
+  "web/app/components/datasets/common/document-picker/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/common/document-picker/preview-document-picker.tsx": {
+  "web/app/components/datasets/common/document-picker/preview-document-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/common/image-list/more.tsx": {
+  "web/app/components/datasets/common/image-list/more.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/common/image-previewer/index.tsx": {
+  "web/app/components/datasets/common/image-previewer/index.tsx": {
     "no-irregular-whitespace": {
       "count": 1
     }
   },
-  "app/components/datasets/common/image-uploader/__tests__/store.spec.tsx": {
+  "web/app/components/datasets/common/image-uploader/__tests__/store.spec.tsx": {
     "react/error-boundaries": {
       "count": 1
     }
   },
-  "app/components/datasets/common/image-uploader/hooks/use-upload.ts": {
+  "web/app/components/datasets/common/image-uploader/hooks/use-upload.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/datasets/common/image-uploader/image-uploader-in-retrieval-testing/image-input.tsx": {
+  "web/app/components/datasets/common/image-uploader/image-uploader-in-retrieval-testing/image-input.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/common/image-uploader/store.tsx": {
+  "web/app/components/datasets/common/image-uploader/store.tsx": {
     "react-refresh/only-export-components": {
       "count": 3
     }
   },
-  "app/components/datasets/common/retrieval-method-info/index.tsx": {
+  "web/app/components/datasets/common/retrieval-method-info/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     },
@@ -2821,27 +2859,27 @@
       "count": 1
     }
   },
-  "app/components/datasets/common/retrieval-param-config/index.tsx": {
+  "web/app/components/datasets/common/retrieval-param-config/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/dsl-confirm-modal.tsx": {
+  "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/dsl-confirm-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/header.tsx": {
+  "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/header.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/use-dsl-import.ts": {
+  "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/use-dsl-import.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx": {
+  "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     },
@@ -2849,82 +2887,82 @@
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/tab/index.tsx": {
+  "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/tab/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/footer.tsx": {
+  "web/app/components/datasets/create-from-pipeline/footer.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/datasets/create-from-pipeline/index.tsx": {
+  "web/app/components/datasets/create-from-pipeline/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/list/customized-list.tsx": {
+  "web/app/components/datasets/create-from-pipeline/list/customized-list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/list/index.tsx": {
+  "web/app/components/datasets/create-from-pipeline/list/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/list/template-card/content.tsx": {
+  "web/app/components/datasets/create-from-pipeline/list/template-card/content.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/datasets/create-from-pipeline/list/template-card/details/index.tsx": {
+  "web/app/components/datasets/create-from-pipeline/list/template-card/details/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/list/template-card/details/types.ts": {
+  "web/app/components/datasets/create-from-pipeline/list/template-card/details/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/datasets/create-from-pipeline/list/template-card/index.tsx": {
+  "web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create/embedding-process/indexing-progress-item.tsx": {
+  "web/app/components/datasets/create/embedding-process/indexing-progress-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create/empty-dataset-creation-modal/index.tsx": {
+  "web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create/file-preview/index.tsx": {
+  "web/app/components/datasets/create/file-preview/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/datasets/create/notion-page-preview/index.tsx": {
+  "web/app/components/datasets/create/notion-page-preview/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/datasets/create/step-one/components/index.ts": {
+  "web/app/components/datasets/create/step-one/components/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/datasets/create/step-one/hooks/index.ts": {
+  "web/app/components/datasets/create/step-one/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/datasets/create/step-one/upgrade-card.tsx": {
+  "web/app/components/datasets/create/step-one/upgrade-card.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -2932,32 +2970,32 @@
       "count": 1
     }
   },
-  "app/components/datasets/create/step-two/components/general-chunking-options.tsx": {
+  "web/app/components/datasets/create/step-two/components/general-chunking-options.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create/step-two/components/index.ts": {
+  "web/app/components/datasets/create/step-two/components/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 5
     }
   },
-  "app/components/datasets/create/step-two/components/indexing-mode-section.tsx": {
+  "web/app/components/datasets/create/step-two/components/indexing-mode-section.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/datasets/create/step-two/components/inputs.tsx": {
+  "web/app/components/datasets/create/step-two/components/inputs.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create/step-two/hooks/index.ts": {
+  "web/app/components/datasets/create/step-two/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 6
     }
   },
-  "app/components/datasets/create/step-two/hooks/use-indexing-config.ts": {
+  "web/app/components/datasets/create/step-two/hooks/use-indexing-config.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -2965,7 +3003,7 @@
       "count": 3
     }
   },
-  "app/components/datasets/create/step-two/index.tsx": {
+  "web/app/components/datasets/create/step-two/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     },
@@ -2973,7 +3011,7 @@
       "count": 1
     }
   },
-  "app/components/datasets/create/step-two/preview-item/index.tsx": {
+  "web/app/components/datasets/create/step-two/preview-item/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -2984,27 +3022,27 @@
       "count": 1
     }
   },
-  "app/components/datasets/create/stop-embedding-modal/index.tsx": {
+  "web/app/components/datasets/create/stop-embedding-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create/website/base/checkbox-with-label.tsx": {
+  "web/app/components/datasets/create/website/base/checkbox-with-label.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create/website/base/field.tsx": {
+  "web/app/components/datasets/create/website/base/field.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/create/website/base/input.tsx": {
+  "web/app/components/datasets/create/website/base/input.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/create/website/firecrawl/index.tsx": {
+  "web/app/components/datasets/create/website/firecrawl/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -3018,12 +3056,12 @@
       "count": 5
     }
   },
-  "app/components/datasets/create/website/firecrawl/options.tsx": {
+  "web/app/components/datasets/create/website/firecrawl/options.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/datasets/create/website/jina-reader/index.tsx": {
+  "web/app/components/datasets/create/website/jina-reader/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -3037,12 +3075,12 @@
       "count": 3
     }
   },
-  "app/components/datasets/create/website/jina-reader/options.tsx": {
+  "web/app/components/datasets/create/website/jina-reader/options.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/datasets/create/website/watercrawl/index.tsx": {
+  "web/app/components/datasets/create/website/watercrawl/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -3056,152 +3094,152 @@
       "count": 4
     }
   },
-  "app/components/datasets/create/website/watercrawl/options.tsx": {
+  "web/app/components/datasets/create/website/watercrawl/options.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/components/document-list/components/document-table-row.tsx": {
+  "web/app/components/datasets/documents/components/document-list/components/document-table-row.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/components/document-list/components/index.ts": {
+  "web/app/components/datasets/documents/components/document-list/components/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/datasets/documents/components/document-list/hooks/index.ts": {
+  "web/app/components/datasets/documents/components/document-list/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
     }
   },
-  "app/components/datasets/documents/components/documents-header.tsx": {
+  "web/app/components/datasets/documents/components/documents-header.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/components/list.tsx": {
+  "web/app/components/datasets/documents/components/list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/datasets/documents/components/operations.tsx": {
+  "web/app/components/datasets/documents/components/operations.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/components/rename-modal.tsx": {
+  "web/app/components/datasets/documents/components/rename-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/item.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/base/header.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/base/header.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/online-documents/index.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/online-documents/title.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/title.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/bucket.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/bucket.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/index.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/item.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/item.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/online-drive/index.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/index.tsx": {
     "react/set-state-in-effect": {
       "count": 5
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/online-drive/utils.ts": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/utils.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/store/provider.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/store/provider.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/store/slices/online-drive.ts": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/store/slices/online-drive.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/checkbox-with-label.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/checkbox-with-label.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/options/index.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/options/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/index.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/hooks/index.ts": {
+  "web/app/components/datasets/documents/create-from-pipeline/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 5
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/preview/file-preview.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/preview/file-preview.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 5
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 5
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/preview/web-preview.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/preview/web-preview.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 5
     },
@@ -3209,42 +3247,42 @@
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/process-documents/index.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/process-documents/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/steps/index.ts": {
+  "web/app/components/datasets/documents/create-from-pipeline/steps/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/steps/preview-panel.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/steps/preview-panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/datasets/documents/create-from-pipeline/types.tsx": {
+  "web/app/components/datasets/documents/create-from-pipeline/types.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/batch-modal/csv-downloader.tsx": {
+  "web/app/components/datasets/documents/detail/batch-modal/csv-downloader.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 9
     }
   },
-  "app/components/datasets/documents/detail/batch-modal/index.tsx": {
+  "web/app/components/datasets/documents/detail/batch-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -3252,32 +3290,32 @@
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/common/chunk-content.tsx": {
+  "web/app/components/datasets/documents/detail/completed/common/chunk-content.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/common/empty.tsx": {
+  "web/app/components/datasets/documents/detail/completed/common/empty.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 8
     }
   },
-  "app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx": {
+  "web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/common/summary-status.tsx": {
+  "web/app/components/datasets/documents/detail/completed/common/summary-status.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/components/index.ts": {
+  "web/app/components/datasets/documents/detail/completed/components/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/datasets/documents/detail/completed/components/menu-bar.tsx": {
+  "web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -3285,27 +3323,27 @@
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/components/segment-list-content.tsx": {
+  "web/app/components/datasets/documents/detail/completed/components/segment-list-content.tsx": {
     "ts/no-non-null-asserted-optional-chain": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/display-toggle.tsx": {
+  "web/app/components/datasets/documents/detail/completed/display-toggle.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/hooks/index.ts": {
+  "web/app/components/datasets/documents/detail/completed/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 5
     }
   },
-  "app/components/datasets/documents/detail/completed/hooks/use-search-filter.ts": {
+  "web/app/components/datasets/documents/detail/completed/hooks/use-search-filter.ts": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/index.tsx": {
+  "web/app/components/datasets/documents/detail/completed/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     },
@@ -3316,77 +3354,77 @@
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/segment-card/index.tsx": {
+  "web/app/components/datasets/documents/detail/completed/segment-card/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/skeleton/full-doc-list-skeleton.tsx": {
+  "web/app/components/datasets/documents/detail/completed/skeleton/full-doc-list-skeleton.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx": {
+  "web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx": {
+  "web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/datasets/documents/detail/completed/skeleton/parent-chunk-card-skeleton.tsx": {
+  "web/app/components/datasets/documents/detail/completed/skeleton/parent-chunk-card-skeleton.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/completed/status-item.tsx": {
+  "web/app/components/datasets/documents/detail/completed/status-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/context.ts": {
+  "web/app/components/datasets/documents/detail/context.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/embedding/components/index.ts": {
+  "web/app/components/datasets/documents/detail/embedding/components/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
     }
   },
-  "app/components/datasets/documents/detail/embedding/components/status-header.tsx": {
+  "web/app/components/datasets/documents/detail/embedding/components/status-header.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/datasets/documents/detail/embedding/hooks/index.ts": {
+  "web/app/components/datasets/documents/detail/embedding/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/embedding/skeleton/index.tsx": {
+  "web/app/components/datasets/documents/detail/embedding/skeleton/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/metadata/components/doc-type-selector.tsx": {
+  "web/app/components/datasets/documents/detail/metadata/components/doc-type-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/metadata/components/field-info.tsx": {
+  "web/app/components/datasets/documents/detail/metadata/components/field-info.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/metadata/components/metadata-field-list.tsx": {
+  "web/app/components/datasets/documents/detail/metadata/components/metadata-field-list.tsx": {
     "ts/no-non-null-asserted-optional-chain": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/metadata/hooks/use-metadata-state.ts": {
+  "web/app/components/datasets/documents/detail/metadata/hooks/use-metadata-state.ts": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 4
     },
@@ -3394,12 +3432,12 @@
       "count": 4
     }
   },
-  "app/components/datasets/documents/detail/metadata/index.tsx": {
+  "web/app/components/datasets/documents/detail/metadata/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/segment-add/index.tsx": {
+  "web/app/components/datasets/documents/detail/segment-add/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -3407,7 +3445,7 @@
       "count": 1
     }
   },
-  "app/components/datasets/documents/detail/settings/pipeline-settings/index.tsx": {
+  "web/app/components/datasets/documents/detail/settings/pipeline-settings/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -3415,17 +3453,17 @@
       "count": 6
     }
   },
-  "app/components/datasets/documents/detail/settings/pipeline-settings/process-documents/index.tsx": {
+  "web/app/components/datasets/documents/detail/settings/pipeline-settings/process-documents/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/datasets/documents/status-item/index.tsx": {
+  "web/app/components/datasets/documents/status-item/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/external-api/external-api-modal/index.tsx": {
+  "web/app/components/datasets/external-api/external-api-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -3433,7 +3471,7 @@
       "count": 1
     }
   },
-  "app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx": {
+  "web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -3441,17 +3479,17 @@
       "count": 4
     }
   },
-  "app/components/datasets/external-knowledge-base/create/ExternalApiSelection.tsx": {
+  "web/app/components/datasets/external-knowledge-base/create/ExternalApiSelection.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/datasets/external-knowledge-base/create/InfoPanel.tsx": {
+  "web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 4
     }
   },
-  "app/components/datasets/extra-info/statistics.tsx": {
+  "web/app/components/datasets/extra-info/statistics.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -3459,12 +3497,12 @@
       "count": 4
     }
   },
-  "app/components/datasets/formatted-text/flavours/type.ts": {
+  "web/app/components/datasets/formatted-text/flavours/type.ts": {
     "ts/no-empty-object-type": {
       "count": 1
     }
   },
-  "app/components/datasets/hit-testing/components/child-chunks-item.tsx": {
+  "web/app/components/datasets/hit-testing/components/child-chunks-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -3472,82 +3510,82 @@
       "count": 1
     }
   },
-  "app/components/datasets/hit-testing/components/chunk-detail-modal.tsx": {
+  "web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/hit-testing/components/query-input/textarea.tsx": {
+  "web/app/components/datasets/hit-testing/components/query-input/textarea.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/hit-testing/components/result-item-external.tsx": {
+  "web/app/components/datasets/hit-testing/components/result-item-external.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/hit-testing/components/result-item-footer.tsx": {
+  "web/app/components/datasets/hit-testing/components/result-item-footer.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/hit-testing/components/score.tsx": {
+  "web/app/components/datasets/hit-testing/components/score.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 1
     }
   },
-  "app/components/datasets/hit-testing/index.tsx": {
+  "web/app/components/datasets/hit-testing/index.tsx": {
     "react/unsupported-syntax": {
       "count": 1
     }
   },
-  "app/components/datasets/list/dataset-card/components/dataset-card-footer.tsx": {
+  "web/app/components/datasets/list/dataset-card/components/dataset-card-footer.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/list/dataset-card/hooks/use-dataset-card-state.ts": {
+  "web/app/components/datasets/list/dataset-card/hooks/use-dataset-card-state.ts": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/datasets/list/dataset-card/operation-item.tsx": {
+  "web/app/components/datasets/list/dataset-card/operation-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/list/dataset-footer/index.tsx": {
+  "web/app/components/datasets/list/dataset-footer/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/datasets/list/new-dataset-card/option.tsx": {
+  "web/app/components/datasets/list/new-dataset-card/option.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/metadata/edit-metadata-batch/edited-beacon.tsx": {
+  "web/app/components/datasets/metadata/edit-metadata-batch/edited-beacon.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/metadata/edit-metadata-batch/input-combined.tsx": {
+  "web/app/components/datasets/metadata/edit-metadata-batch/input-combined.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/datasets/metadata/edit-metadata-batch/modal.tsx": {
+  "web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/datasets/metadata/hooks/use-edit-dataset-metadata.ts": {
+  "web/app/components/datasets/metadata/hooks/use-edit-dataset-metadata.ts": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/datasets/metadata/hooks/use-metadata-document.ts": {
+  "web/app/components/datasets/metadata/hooks/use-metadata-document.ts": {
     "ts/no-explicit-any": {
       "count": 1
     },
@@ -3555,32 +3593,32 @@
       "count": 2
     }
   },
-  "app/components/datasets/metadata/metadata-dataset/create-content.tsx": {
+  "web/app/components/datasets/metadata/metadata-dataset/create-content.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx": {
+  "web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx": {
+  "web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/datasets/metadata/metadata-dataset/field.tsx": {
+  "web/app/components/datasets/metadata/metadata-dataset/field.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx": {
+  "web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/datasets/metadata/metadata-dataset/select-metadata.tsx": {
+  "web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 4
     },
@@ -3588,52 +3626,52 @@
       "count": 2
     }
   },
-  "app/components/datasets/metadata/metadata-document/field.tsx": {
+  "web/app/components/datasets/metadata/metadata-document/field.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/metadata/metadata-document/info-group.tsx": {
+  "web/app/components/datasets/metadata/metadata-document/info-group.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/metadata/types.ts": {
+  "web/app/components/datasets/metadata/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "app/components/datasets/rename-modal/index.tsx": {
+  "web/app/components/datasets/rename-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/settings/chunk-structure/types.ts": {
+  "web/app/components/datasets/settings/chunk-structure/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/datasets/settings/form/components/external-knowledge-section.tsx": {
+  "web/app/components/datasets/settings/form/components/external-knowledge-section.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/settings/form/components/indexing-section.tsx": {
+  "web/app/components/datasets/settings/form/components/indexing-section.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/datasets/settings/index-method/index.tsx": {
+  "web/app/components/datasets/settings/index-method/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/settings/index-method/keyword-number.tsx": {
+  "web/app/components/datasets/settings/index-method/keyword-number.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/datasets/settings/permission-selector/index.tsx": {
+  "web/app/components/datasets/settings/permission-selector/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -3641,22 +3679,22 @@
       "count": 1
     }
   },
-  "app/components/datasets/settings/permission-selector/permission-item.tsx": {
+  "web/app/components/datasets/settings/permission-selector/permission-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/datasets/settings/summary-index-setting.tsx": {
+  "web/app/components/datasets/settings/summary-index-setting.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/develop/ApiServer.tsx": {
+  "web/app/components/develop/ApiServer.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/develop/code.tsx": {
+  "web/app/components/develop/code.tsx": {
     "ts/no-empty-object-type": {
       "count": 1
     },
@@ -3664,7 +3702,7 @@
       "count": 9
     }
   },
-  "app/components/develop/md.tsx": {
+  "web/app/components/develop/md.tsx": {
     "ts/no-empty-object-type": {
       "count": 1
     },
@@ -3672,7 +3710,7 @@
       "count": 2
     }
   },
-  "app/components/develop/secret-key/input-copy.tsx": {
+  "web/app/components/develop/secret-key/input-copy.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -3680,17 +3718,17 @@
       "count": 1
     }
   },
-  "app/components/develop/secret-key/secret-key-generate.tsx": {
+  "web/app/components/develop/secret-key/secret-key-generate.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/develop/secret-key/secret-key-modal.tsx": {
+  "web/app/components/develop/secret-key/secret-key-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/explore/banner/banner-item.tsx": {
+  "web/app/components/explore/banner/banner-item.tsx": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 1
     },
@@ -3698,7 +3736,7 @@
       "count": 3
     }
   },
-  "app/components/explore/banner/indicator-button.tsx": {
+  "web/app/components/explore/banner/indicator-button.tsx": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 1
     },
@@ -3706,7 +3744,7 @@
       "count": 2
     }
   },
-  "app/components/explore/create-app-modal/index.tsx": {
+  "web/app/components/explore/create-app-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -3717,12 +3755,12 @@
       "count": 1
     }
   },
-  "app/components/explore/installed-app/index.tsx": {
+  "web/app/components/explore/installed-app/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/explore/item-operation/index.tsx": {
+  "web/app/components/explore/item-operation/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -3730,17 +3768,17 @@
       "count": 1
     }
   },
-  "app/components/explore/try-app/app/chat.tsx": {
+  "web/app/components/explore/try-app/app/chat.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/explore/try-app/index.tsx": {
+  "web/app/components/explore/try-app/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/explore/try-app/preview/basic-app-preview.tsx": {
+  "web/app/components/explore/try-app/preview/basic-app-preview.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -3748,7 +3786,7 @@
       "count": 2
     }
   },
-  "app/components/explore/try-app/tab.tsx": {
+  "web/app/components/explore/try-app/tab.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -3756,22 +3794,22 @@
       "count": 1
     }
   },
-  "app/components/goto-anything/actions/commands/command-bus.ts": {
+  "web/app/components/goto-anything/actions/commands/command-bus.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/goto-anything/actions/commands/index.ts": {
+  "web/app/components/goto-anything/actions/commands/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/goto-anything/actions/commands/registry.ts": {
+  "web/app/components/goto-anything/actions/commands/registry.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/goto-anything/actions/commands/slash.tsx": {
+  "web/app/components/goto-anything/actions/commands/slash.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     },
@@ -3779,47 +3817,47 @@
       "count": 1
     }
   },
-  "app/components/goto-anything/actions/commands/types.ts": {
+  "web/app/components/goto-anything/actions/commands/types.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/goto-anything/actions/index.ts": {
+  "web/app/components/goto-anything/actions/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/goto-anything/actions/types.ts": {
+  "web/app/components/goto-anything/actions/types.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/goto-anything/command-selector.tsx": {
+  "web/app/components/goto-anything/command-selector.tsx": {
     "react/unsupported-syntax": {
       "count": 2
     }
   },
-  "app/components/goto-anything/components/footer.tsx": {
+  "web/app/components/goto-anything/components/footer.tsx": {
     "react/unsupported-syntax": {
       "count": 1
     }
   },
-  "app/components/goto-anything/components/index.ts": {
+  "web/app/components/goto-anything/components/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
     }
   },
-  "app/components/goto-anything/components/result-item.tsx": {
+  "web/app/components/goto-anything/components/result-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/goto-anything/components/result-list.tsx": {
+  "web/app/components/goto-anything/components/result-list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/goto-anything/context.tsx": {
+  "web/app/components/goto-anything/context.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     },
@@ -3827,32 +3865,32 @@
       "count": 4
     }
   },
-  "app/components/goto-anything/hooks/index.ts": {
+  "web/app/components/goto-anything/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 4
     }
   },
-  "app/components/goto-anything/hooks/use-goto-anything-results.ts": {
+  "web/app/components/goto-anything/hooks/use-goto-anything-results.ts": {
     "@tanstack/query/exhaustive-deps": {
       "count": 1
     }
   },
-  "app/components/header/account-about/index.tsx": {
+  "web/app/components/header/account-about/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/header/account-dropdown/compliance.tsx": {
+  "web/app/components/header/account-dropdown/compliance.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/api-based-extension-page/modal.tsx": {
+  "web/app/components/header/account-setting/api-based-extension-page/modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/api-based-extension-page/selector.tsx": {
+  "web/app/components/header/account-setting/api-based-extension-page/selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -3860,37 +3898,37 @@
       "count": 3
     }
   },
-  "app/components/header/account-setting/data-source-page-new/card.tsx": {
+  "web/app/components/header/account-setting/data-source-page-new/card.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/data-source-page-new/configure.tsx": {
+  "web/app/components/header/account-setting/data-source-page-new/configure.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/data-source-page-new/hooks/index.ts": {
+  "web/app/components/header/account-setting/data-source-page-new/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/data-source-page-new/hooks/use-marketplace-all-plugins.ts": {
+  "web/app/components/header/account-setting/data-source-page-new/hooks/use-marketplace-all-plugins.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/data-source-page-new/install-from-marketplace.tsx": {
+  "web/app/components/header/account-setting/data-source-page-new/install-from-marketplace.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/data-source-page-new/item.tsx": {
+  "web/app/components/header/account-setting/data-source-page-new/item.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/data-source-page-new/operator.tsx": {
+  "web/app/components/header/account-setting/data-source-page-new/operator.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -3898,17 +3936,17 @@
       "count": 5
     }
   },
-  "app/components/header/account-setting/data-source-page-new/types.ts": {
+  "web/app/components/header/account-setting/data-source-page-new/types.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/key-validator/KeyInput.tsx": {
+  "web/app/components/header/account-setting/key-validator/KeyInput.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/key-validator/declarations.ts": {
+  "web/app/components/header/account-setting/key-validator/declarations.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -3916,32 +3954,32 @@
       "count": 1
     }
   },
-  "app/components/header/account-setting/language-page/index.tsx": {
+  "web/app/components/header/account-setting/language-page/index.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/members-page/index.tsx": {
+  "web/app/components/header/account-setting/members-page/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 14
     }
   },
-  "app/components/header/account-setting/members-page/invite-modal/index.tsx": {
+  "web/app/components/header/account-setting/members-page/invite-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 3
     }
   },
-  "app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx": {
+  "web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/members-page/operation/index.tsx": {
+  "web/app/components/header/account-setting/members-page/operation/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx": {
+  "web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -3952,7 +3990,7 @@
       "count": 3
     }
   },
-  "app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx": {
+  "web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -3960,7 +3998,7 @@
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/declarations.ts": {
+  "web/app/components/header/account-setting/model-provider-page/declarations.ts": {
     "erasable-syntax-only/enums": {
       "count": 11
     },
@@ -3968,7 +4006,7 @@
       "count": 4
     }
   },
-  "app/components/header/account-setting/model-provider-page/hooks.ts": {
+  "web/app/components/header/account-setting/model-provider-page/hooks.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 1
     },
@@ -3976,22 +4014,22 @@
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/add-credential-in-load-balancing.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/add-credential-in-load-balancing.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/add-custom-model.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/add-custom-model.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/authorized/authorized-item.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/authorized/authorized-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/authorized/index.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/authorized/index.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -3999,12 +4037,12 @@
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/config-provider.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/config-provider.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4012,32 +4050,32 @@
       "count": 4
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/hooks/index.ts": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 6
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/hooks/use-auth.ts": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/hooks/use-auth.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/hooks/use-custom-models.ts": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/hooks/use-custom-models.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/hooks/use-model-form-schemas.ts": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/hooks/use-model-form-schemas.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/index.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 7
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-auth/switch-credential-in-load-balancing.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/switch-credential-in-load-balancing.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4045,7 +4083,7 @@
       "count": 3
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-modal/Form.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -4053,7 +4091,7 @@
       "count": 6
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-modal/Input.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -4061,17 +4099,17 @@
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-modal/index.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-modal/index.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-parameter-modal/configuration-button.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-parameter-modal/configuration-button.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-parameter-modal/model-display.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-display.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -4079,7 +4117,7 @@
       "count": 1
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4090,12 +4128,12 @@
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/model-selector/feature-icon.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-selector/feature-icon.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/model-provider-page/provider-added-card/cooldown-timer.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/provider-added-card/cooldown-timer.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4103,32 +4141,32 @@
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/use-activate-credential.spec.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/use-activate-credential.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/credits-fallback-alert.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/credits-fallback-alert.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/dropdown-content.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/dropdown-content.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/model-provider-page/provider-added-card/model-list-item.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/header/account-setting/model-provider-page/provider-added-card/model-list.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4136,7 +4174,7 @@
       "count": 5
     }
   },
-  "app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4147,7 +4185,7 @@
       "count": 3
     }
   },
-  "app/components/header/account-setting/model-provider-page/provider-added-card/priority-use-tip.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-use-tip.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4155,17 +4193,17 @@
       "count": 1
     }
   },
-  "app/components/header/account-setting/model-provider-page/utils.ts": {
+  "web/app/components/header/account-setting/model-provider-page/utils.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/header/account-setting/plugin-page/utils.ts": {
+  "web/app/components/header/account-setting/plugin-page/utils.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/header/app-nav/index.tsx": {
+  "web/app/components/header/app-nav/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -4173,37 +4211,37 @@
       "count": 1
     }
   },
-  "app/components/header/header-wrapper.tsx": {
+  "web/app/components/header/header-wrapper.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/header/index.tsx": {
+  "web/app/components/header/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/header/license-env/index.tsx": {
+  "web/app/components/header/license-env/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/header/plan-badge/index.tsx": {
+  "web/app/components/header/plan-badge/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/plugins/base/badges/icon-with-tooltip.tsx": {
+  "web/app/components/plugins/base/badges/icon-with-tooltip.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/base/key-value-item.tsx": {
+  "web/app/components/plugins/base/key-value-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/card/base/corner-mark.tsx": {
+  "web/app/components/plugins/card/base/corner-mark.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -4211,32 +4249,32 @@
       "count": 1
     }
   },
-  "app/components/plugins/card/base/title.tsx": {
+  "web/app/components/plugins/card/base/title.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/plugins/card/card-more-info.tsx": {
+  "web/app/components/plugins/card/card-more-info.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/plugins/card/index.tsx": {
+  "web/app/components/plugins/card/index.tsx": {
     "ts/no-non-null-asserted-optional-chain": {
       "count": 1
     }
   },
-  "app/components/plugins/install-plugin/hooks.ts": {
+  "web/app/components/plugins/install-plugin/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/plugins/install-plugin/hooks/use-fold-anim-into.ts": {
+  "web/app/components/plugins/install-plugin/hooks/use-fold-anim-into.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 1
     }
   },
-  "app/components/plugins/install-plugin/install-bundle/index.tsx": {
+  "web/app/components/plugins/install-plugin/install-bundle/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -4247,17 +4285,17 @@
       "count": 1
     }
   },
-  "app/components/plugins/install-plugin/install-bundle/item/github-item.tsx": {
+  "web/app/components/plugins/install-plugin/install-bundle/item/github-item.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/plugins/install-plugin/install-bundle/steps/hooks/use-install-multi-state.ts": {
+  "web/app/components/plugins/install-plugin/install-bundle/steps/hooks/use-install-multi-state.ts": {
     "react-hooks/exhaustive-deps": {
       "count": 1
     }
   },
-  "app/components/plugins/install-plugin/install-from-github/index.tsx": {
+  "web/app/components/plugins/install-plugin/install-from-github/index.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -4265,7 +4303,7 @@
       "count": 3
     }
   },
-  "app/components/plugins/install-plugin/install-from-github/steps/selectPackage.tsx": {
+  "web/app/components/plugins/install-plugin/install-from-github/steps/selectPackage.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -4273,37 +4311,37 @@
       "count": 1
     }
   },
-  "app/components/plugins/install-plugin/install-from-local-package/index.tsx": {
+  "web/app/components/plugins/install-plugin/install-from-local-package/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx": {
+  "web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/plugins/install-plugin/install-from-marketplace/index.tsx": {
+  "web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/marketplace/description/index.tsx": {
+  "web/app/components/plugins/marketplace/description/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 9
     }
   },
-  "app/components/plugins/marketplace/hooks.ts": {
+  "web/app/components/plugins/marketplace/hooks.ts": {
     "@tanstack/query/exhaustive-deps": {
       "count": 1
     }
   },
-  "app/components/plugins/marketplace/list/list-wrapper.tsx": {
+  "web/app/components/plugins/marketplace/list/list-wrapper.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/plugins/marketplace/search-box/tags-filter.tsx": {
+  "web/app/components/plugins/marketplace/search-box/tags-filter.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4311,7 +4349,7 @@
       "count": 2
     }
   },
-  "app/components/plugins/marketplace/sort-dropdown/index.tsx": {
+  "web/app/components/plugins/marketplace/sort-dropdown/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4319,12 +4357,12 @@
       "count": 3
     }
   },
-  "app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx": {
+  "web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-auth/authorize/api-key-modal.tsx": {
+  "web/app/components/plugins/plugin-auth/authorize/api-key-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4332,12 +4370,12 @@
       "count": 2
     }
   },
-  "app/components/plugins/plugin-auth/authorize/index.tsx": {
+  "web/app/components/plugins/plugin-auth/authorize/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx": {
+  "web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4345,12 +4383,12 @@
       "count": 2
     }
   },
-  "app/components/plugins/plugin-auth/authorized-in-node.tsx": {
+  "web/app/components/plugins/plugin-auth/authorized-in-node.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-auth/authorized/index.tsx": {
+  "web/app/components/plugins/plugin-auth/authorized/index.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -4358,7 +4396,7 @@
       "count": 2
     }
   },
-  "app/components/plugins/plugin-auth/authorized/item.tsx": {
+  "web/app/components/plugins/plugin-auth/authorized/item.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4366,12 +4404,12 @@
       "count": 1
     }
   },
-  "app/components/plugins/plugin-auth/hooks/use-get-api.ts": {
+  "web/app/components/plugins/plugin-auth/hooks/use-get-api.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-auth/index.tsx": {
+  "web/app/components/plugins/plugin-auth/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 12
     },
@@ -4379,12 +4417,12 @@
       "count": 3
     }
   },
-  "app/components/plugins/plugin-auth/plugin-auth-in-agent.tsx": {
+  "web/app/components/plugins/plugin-auth/plugin-auth-in-agent.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-auth/types.ts": {
+  "web/app/components/plugins/plugin-auth/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     },
@@ -4395,17 +4433,17 @@
       "count": 1
     }
   },
-  "app/components/plugins/plugin-auth/utils.ts": {
+  "web/app/components/plugins/plugin-auth/utils.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/action-list.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/action-list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/agent-strategy-list.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/agent-strategy-list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -4413,7 +4451,7 @@
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4424,7 +4462,7 @@
       "count": 8
     }
   },
-  "app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4432,7 +4470,7 @@
       "count": 3
     }
   },
-  "app/components/plugins/plugin-detail-panel/app-selector/index.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4440,27 +4478,27 @@
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/datasource-action-list.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/datasource-action-list.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/detail-header.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/detail-header.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/detail-header/components/header-modals.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/detail-header/components/header-modals.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 4
     }
   },
-  "app/components/plugins/plugin-detail-panel/detail-header/components/index.ts": {
+  "web/app/components/plugins/plugin-detail-panel/detail-header/components/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/detail-header/components/plugin-source-badge.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/detail-header/components/plugin-source-badge.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4468,12 +4506,12 @@
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/detail-header/hooks/index.ts": {
+  "web/app/components/plugins/plugin-detail-panel/detail-header/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/plugins/plugin-detail-panel/endpoint-card.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/endpoint-card.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4481,7 +4519,7 @@
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/endpoint-list.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/endpoint-list.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4489,12 +4527,12 @@
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/endpoint-modal.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/plugins/plugin-detail-panel/model-list.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/model-list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -4502,17 +4540,17 @@
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/model-selector/index.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/model-selector/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/plugins/plugin-detail-panel/model-selector/tts-params-panel.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/model-selector/tts-params-panel.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4520,37 +4558,37 @@
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/strategy-detail.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/strategy-detail.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/__tests__/index.spec.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/__tests__/index.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/create/common-modal.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/common-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/create/components/modal-steps.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/components/modal-steps.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-common-modal-state.ts": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-common-modal-state.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-oauth-client-state.ts": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-oauth-client-state.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     },
@@ -4558,17 +4596,17 @@
       "count": 3
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/create/oauth-client.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/oauth-client.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/create/types.ts": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/edit/apikey-edit-modal.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/edit/apikey-edit-modal.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -4576,27 +4614,27 @@
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/edit/manual-edit-modal.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/edit/manual-edit-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/edit/oauth-edit-modal.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/edit/oauth-edit-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/index.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/list-view.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/list-view.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/log-viewer.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/log-viewer.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -4604,37 +4642,37 @@
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/selector-entry.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/selector-entry.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/selector-view.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/selector-view.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/subscription-card.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/subscription-card.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/subscription-list/types.ts": {
+  "web/app/components/plugins/plugin-detail-panel/subscription-list/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/tool-selector/components/index.ts": {
+  "web/app/components/plugins/plugin-detail-panel/tool-selector/components/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 7
     }
   },
-  "app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4642,37 +4680,37 @@
       "count": 3
     }
   },
-  "app/components/plugins/plugin-detail-panel/tool-selector/components/tool-base-form.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-base-form.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/tool-selector/hooks/index.ts": {
+  "web/app/components/plugins/plugin-detail-panel/tool-selector/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-detail-panel/tool-selector/index.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/plugins/plugin-item/action.tsx": {
+  "web/app/components/plugins/plugin-item/action.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-item/index.tsx": {
+  "web/app/components/plugins/plugin-item/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4680,42 +4718,42 @@
       "count": 1
     }
   },
-  "app/components/plugins/plugin-mutation-model/index.tsx": {
+  "web/app/components/plugins/plugin-mutation-model/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-page/context.ts": {
+  "web/app/components/plugins/plugin-page/context.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-page/debug-info.tsx": {
+  "web/app/components/plugins/plugin-page/debug-info.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-page/empty/index.tsx": {
+  "web/app/components/plugins/plugin-page/empty/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     }
   },
-  "app/components/plugins/plugin-page/filter-management/category-filter.tsx": {
+  "web/app/components/plugins/plugin-page/filter-management/category-filter.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-page/filter-management/tag-filter.tsx": {
+  "web/app/components/plugins/plugin-page/filter-management/tag-filter.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-page/index.tsx": {
+  "web/app/components/plugins/plugin-page/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-page/install-plugin-dropdown.tsx": {
+  "web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -4723,47 +4761,47 @@
       "count": 2
     }
   },
-  "app/components/plugins/plugin-page/plugin-info.tsx": {
+  "web/app/components/plugins/plugin-page/plugin-info.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-page/plugin-tasks/components/plugin-item.tsx": {
+  "web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/plugins/plugin-page/plugin-tasks/components/plugin-section.tsx": {
+  "web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-section.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-page/plugin-tasks/components/task-status-indicator.tsx": {
+  "web/app/components/plugins/plugin-page/plugin-tasks/components/task-status-indicator.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/plugin-page/plugin-tasks/index.tsx": {
+  "web/app/components/plugins/plugin-page/plugin-tasks/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/readme-panel/index.tsx": {
+  "web/app/components/plugins/readme-panel/index.tsx": {
     "react/unsupported-syntax": {
       "count": 1
     }
   },
-  "app/components/plugins/readme-panel/store.ts": {
+  "web/app/components/plugins/readme-panel/store.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/plugins/reference-setting-modal/auto-update-setting/strategy-picker.tsx": {
+  "web/app/components/plugins/reference-setting-modal/auto-update-setting/strategy-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx": {
+  "web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 4
     },
@@ -4771,22 +4809,22 @@
       "count": 1
     }
   },
-  "app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx": {
+  "web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/reference-setting-modal/auto-update-setting/types.ts": {
+  "web/app/components/plugins/reference-setting-modal/auto-update-setting/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "app/components/plugins/reference-setting-modal/index.tsx": {
+  "web/app/components/plugins/reference-setting-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/plugins/types.ts": {
+  "web/app/components/plugins/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 7
     },
@@ -4794,17 +4832,17 @@
       "count": 25
     }
   },
-  "app/components/plugins/update-plugin/from-market-place.tsx": {
+  "web/app/components/plugins/update-plugin/from-market-place.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/chunk-card-list/q-a-item.tsx": {
+  "web/app/components/rag-pipeline/components/chunk-card-list/q-a-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/editor/form/hidden-fields.tsx": {
+  "web/app/components/rag-pipeline/components/panel/input-field/editor/form/hidden-fields.tsx": {
     "react/component-hook-factories": {
       "count": 1
     },
@@ -4812,12 +4850,12 @@
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/editor/form/hooks.ts": {
+  "web/app/components/rag-pipeline/components/panel/input-field/editor/form/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/editor/form/initial-fields.tsx": {
+  "web/app/components/rag-pipeline/components/panel/input-field/editor/form/initial-fields.tsx": {
     "react/component-hook-factories": {
       "count": 1
     },
@@ -4825,7 +4863,7 @@
       "count": 2
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx": {
+  "web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx": {
     "react/component-hook-factories": {
       "count": 1
     },
@@ -4836,47 +4874,47 @@
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/editor/form/types.ts": {
+  "web/app/components/rag-pipeline/components/panel/input-field/editor/form/types.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/hooks.ts": {
+  "web/app/components/rag-pipeline/components/panel/input-field/hooks.ts": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/index.tsx": {
+  "web/app/components/rag-pipeline/components/panel/input-field/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/label-right-content/global-inputs.tsx": {
+  "web/app/components/rag-pipeline/components/panel/input-field/label-right-content/global-inputs.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/preview/data-source.tsx": {
+  "web/app/components/rag-pipeline/components/panel/input-field/preview/data-source.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/input-field/preview/process-documents.tsx": {
+  "web/app/components/rag-pipeline/components/panel/input-field/preview/process-documents.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/test-run/header.tsx": {
+  "web/app/components/rag-pipeline/components/panel/test-run/header.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/index.tsx": {
+  "web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx": {
+  "web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -4884,132 +4922,132 @@
       "count": 2
     }
   },
-  "app/components/rag-pipeline/components/panel/test-run/preparation/footer-tips.tsx": {
+  "web/app/components/rag-pipeline/components/panel/test-run/preparation/footer-tips.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/test-run/preparation/index.tsx": {
+  "web/app/components/rag-pipeline/components/panel/test-run/preparation/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/components/panel/test-run/result/index.tsx": {
+  "web/app/components/rag-pipeline/components/panel/test-run/result/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/test-run/result/result-preview/index.tsx": {
+  "web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/panel/test-run/result/result-preview/utils.ts": {
+  "web/app/components/rag-pipeline/components/panel/test-run/result/result-preview/utils.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/rag-pipeline/components/publish-as-knowledge-pipeline-modal.tsx": {
+  "web/app/components/rag-pipeline/components/publish-as-knowledge-pipeline-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/publish-toast.tsx": {
+  "web/app/components/rag-pipeline/components/publish-toast.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/components/rag-pipeline-children.tsx": {
+  "web/app/components/rag-pipeline/components/rag-pipeline-children.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/rag-pipeline-header/publisher/index.tsx": {
+  "web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/rag-pipeline-header/run-mode.tsx": {
+  "web/app/components/rag-pipeline/components/rag-pipeline-header/run-mode.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/rag-pipeline-main.tsx": {
+  "web/app/components/rag-pipeline/components/rag-pipeline-main.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/components/update-dsl-modal.tsx": {
+  "web/app/components/rag-pipeline/components/update-dsl-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/components/version-mismatch-modal.tsx": {
+  "web/app/components/rag-pipeline/components/version-mismatch-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/hooks/index.ts": {
+  "web/app/components/rag-pipeline/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 9
     }
   },
-  "app/components/rag-pipeline/hooks/use-DSL.ts": {
+  "web/app/components/rag-pipeline/hooks/use-DSL.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/hooks/use-input-fields.ts": {
+  "web/app/components/rag-pipeline/hooks/use-input-fields.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/hooks/use-nodes-sync-draft.ts": {
+  "web/app/components/rag-pipeline/hooks/use-nodes-sync-draft.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/hooks/use-pipeline-config.ts": {
+  "web/app/components/rag-pipeline/hooks/use-pipeline-config.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/rag-pipeline/hooks/use-pipeline-init.ts": {
+  "web/app/components/rag-pipeline/hooks/use-pipeline-init.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/hooks/use-pipeline-run.ts": {
+  "web/app/components/rag-pipeline/hooks/use-pipeline-run.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/store/index.ts": {
+  "web/app/components/rag-pipeline/store/index.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/rag-pipeline/utils/index.ts": {
+  "web/app/components/rag-pipeline/utils/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/rag-pipeline/utils/nodes.ts": {
+  "web/app/components/rag-pipeline/utils/nodes.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/share/text-generation/index.tsx": {
+  "web/app/components/share/text-generation/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/share/text-generation/info-modal.tsx": {
+  "web/app/components/share/text-generation/info-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/share/text-generation/menu-dropdown.tsx": {
+  "web/app/components/share/text-generation/menu-dropdown.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5017,7 +5055,7 @@
       "count": 1
     }
   },
-  "app/components/share/text-generation/no-data/index.tsx": {
+  "web/app/components/share/text-generation/no-data/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -5025,22 +5063,22 @@
       "count": 1
     }
   },
-  "app/components/share/text-generation/result/index.tsx": {
+  "web/app/components/share/text-generation/result/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/share/text-generation/run-batch/csv-download/index.tsx": {
+  "web/app/components/share/text-generation/run-batch/csv-download/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/share/text-generation/run-batch/csv-reader/index.tsx": {
+  "web/app/components/share/text-generation/run-batch/csv-reader/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/share/text-generation/run-once/index.tsx": {
+  "web/app/components/share/text-generation/run-once/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5051,32 +5089,32 @@
       "count": 3
     }
   },
-  "app/components/share/text-generation/types.ts": {
+  "web/app/components/share/text-generation/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/share/utils.ts": {
+  "web/app/components/share/utils.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/signin/countdown.tsx": {
+  "web/app/components/signin/countdown.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/tools/edit-custom-collection-modal/config-credentials.tsx": {
+  "web/app/components/tools/edit-custom-collection-modal/config-credentials.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/tools/edit-custom-collection-modal/get-schema.tsx": {
+  "web/app/components/tools/edit-custom-collection-modal/get-schema.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/tools/edit-custom-collection-modal/index.tsx": {
+  "web/app/components/tools/edit-custom-collection-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 4
     },
@@ -5084,22 +5122,22 @@
       "count": 2
     }
   },
-  "app/components/tools/edit-custom-collection-modal/test-api.tsx": {
+  "web/app/components/tools/edit-custom-collection-modal/test-api.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/tools/labels/selector.tsx": {
+  "web/app/components/tools/labels/selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/tools/marketplace/index.tsx": {
+  "web/app/components/tools/marketplace/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 14
     }
   },
-  "app/components/tools/mcp/create-card.tsx": {
+  "web/app/components/tools/mcp/create-card.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -5107,7 +5145,7 @@
       "count": 1
     }
   },
-  "app/components/tools/mcp/detail/content.tsx": {
+  "web/app/components/tools/mcp/detail/content.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5115,17 +5153,17 @@
       "count": 3
     }
   },
-  "app/components/tools/mcp/detail/operation-dropdown.tsx": {
+  "web/app/components/tools/mcp/detail/operation-dropdown.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/tools/mcp/detail/tool-item.tsx": {
+  "web/app/components/tools/mcp/detail/tool-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/tools/mcp/mcp-server-modal.tsx": {
+  "web/app/components/tools/mcp/mcp-server-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5133,52 +5171,52 @@
       "count": 5
     }
   },
-  "app/components/tools/mcp/mcp-server-param-item.tsx": {
+  "web/app/components/tools/mcp/mcp-server-param-item.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/tools/mcp/mcp-service-card.tsx": {
+  "web/app/components/tools/mcp/mcp-service-card.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/tools/mcp/modal.tsx": {
+  "web/app/components/tools/mcp/modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/tools/mcp/provider-card.tsx": {
+  "web/app/components/tools/mcp/provider-card.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/tools/mcp/sections/headers-section.tsx": {
+  "web/app/components/tools/mcp/sections/headers-section.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/tools/provider-list.tsx": {
+  "web/app/components/tools/provider-list.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/tools/provider/custom-create-card.tsx": {
+  "web/app/components/tools/provider/custom-create-card.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/tools/provider/empty.tsx": {
+  "web/app/components/tools/provider/empty.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/tools/setting/build-in/config-credentials.tsx": {
+  "web/app/components/tools/setting/build-in/config-credentials.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/tools/types.ts": {
+  "web/app/components/tools/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 4
     },
@@ -5186,82 +5224,82 @@
       "count": 4
     }
   },
-  "app/components/tools/workflow-tool/confirm-modal/index.tsx": {
+  "web/app/components/tools/workflow-tool/confirm-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/tools/workflow-tool/index.tsx": {
+  "web/app/components/tools/workflow-tool/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/tools/workflow-tool/method-selector.tsx": {
+  "web/app/components/tools/workflow-tool/method-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow-app/components/workflow-children.tsx": {
+  "web/app/components/workflow-app/components/workflow-children.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow-app/components/workflow-onboarding-modal/start-node-option.tsx": {
+  "web/app/components/workflow-app/components/workflow-onboarding-modal/start-node-option.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow-app/hooks/index.ts": {
+  "web/app/components/workflow-app/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 13
     }
   },
-  "app/components/workflow-app/hooks/use-DSL.ts": {
+  "web/app/components/workflow-app/hooks/use-DSL.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow-app/hooks/use-nodes-sync-draft.ts": {
+  "web/app/components/workflow-app/hooks/use-nodes-sync-draft.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow-app/hooks/use-workflow-init.ts": {
+  "web/app/components/workflow-app/hooks/use-workflow-init.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow-app/hooks/use-workflow-refresh-draft.ts": {
+  "web/app/components/workflow-app/hooks/use-workflow-refresh-draft.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow-app/hooks/use-workflow-run.ts": {
+  "web/app/components/workflow-app/hooks/use-workflow-run.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/workflow-app/hooks/use-workflow-template.ts": {
+  "web/app/components/workflow-app/hooks/use-workflow-template.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow-app/index.tsx": {
+  "web/app/components/workflow-app/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow-app/store/workflow/workflow-slice.ts": {
+  "web/app/components/workflow-app/store/workflow/workflow-slice.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/block-selector/all-start-blocks.tsx": {
+  "web/app/components/workflow/block-selector/all-start-blocks.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/blocks.tsx": {
+  "web/app/components/workflow/block-selector/blocks.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5269,7 +5307,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/featured-tools.tsx": {
+  "web/app/components/workflow/block-selector/featured-tools.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5286,7 +5324,7 @@
       "count": 2
     }
   },
-  "app/components/workflow/block-selector/featured-triggers.tsx": {
+  "web/app/components/workflow/block-selector/featured-triggers.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5303,22 +5341,22 @@
       "count": 2
     }
   },
-  "app/components/workflow/block-selector/hooks.ts": {
+  "web/app/components/workflow/block-selector/hooks.ts": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/index-bar.tsx": {
+  "web/app/components/workflow/block-selector/index-bar.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/main.tsx": {
+  "web/app/components/workflow/block-selector/main.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/market-place-plugin/action.tsx": {
+  "web/app/components/workflow/block-selector/market-place-plugin/action.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5326,12 +5364,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/market-place-plugin/item.tsx": {
+  "web/app/components/workflow/block-selector/market-place-plugin/item.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/rag-tool-recommendations/index.tsx": {
+  "web/app/components/workflow/block-selector/rag-tool-recommendations/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -5339,12 +5377,12 @@
       "count": 3
     }
   },
-  "app/components/workflow/block-selector/rag-tool-recommendations/uninstalled-item.tsx": {
+  "web/app/components/workflow/block-selector/rag-tool-recommendations/uninstalled-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/workflow/block-selector/start-blocks.tsx": {
+  "web/app/components/workflow/block-selector/start-blocks.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5352,32 +5390,32 @@
       "count": 3
     }
   },
-  "app/components/workflow/block-selector/tabs.tsx": {
+  "web/app/components/workflow/block-selector/tabs.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/tool-picker.tsx": {
+  "web/app/components/workflow/block-selector/tool-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/tool/action-item.tsx": {
+  "web/app/components/workflow/block-selector/tool/action-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx": {
+  "web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/tool/tool.tsx": {
+  "web/app/components/workflow/block-selector/tool/tool.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     }
   },
-  "app/components/workflow/block-selector/trigger-plugin/action-item.tsx": {
+  "web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5385,7 +5423,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/trigger-plugin/item.tsx": {
+  "web/app/components/workflow/block-selector/trigger-plugin/item.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -5393,22 +5431,22 @@
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/types.ts": {
+  "web/app/components/workflow/block-selector/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 4
     }
   },
-  "app/components/workflow/block-selector/use-check-vertical-scrollbar.ts": {
+  "web/app/components/workflow/block-selector/use-check-vertical-scrollbar.ts": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/use-sticky-scroll.ts": {
+  "web/app/components/workflow/block-selector/use-sticky-scroll.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/workflow/block-selector/view-type-select.tsx": {
+  "web/app/components/workflow/block-selector/view-type-select.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -5416,52 +5454,52 @@
       "count": 1
     }
   },
-  "app/components/workflow/candidate-node-main.tsx": {
+  "web/app/components/workflow/candidate-node-main.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/comment/mention-input.tsx": {
+  "web/app/components/workflow/comment/mention-input.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/comment/thread.tsx": {
+  "web/app/components/workflow/comment/thread.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/context.tsx": {
+  "web/app/components/workflow/context.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/workflow/datasets-detail-store/provider.tsx": {
+  "web/app/components/workflow/datasets-detail-store/provider.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/workflow/dsl-export-confirm-modal.tsx": {
+  "web/app/components/workflow/dsl-export-confirm-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/header/editing-title.tsx": {
+  "web/app/components/workflow/header/editing-title.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/header/index.tsx": {
+  "web/app/components/workflow/header/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/header/restoring-title.tsx": {
+  "web/app/components/workflow/header/restoring-title.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/header/run-mode.tsx": {
+  "web/app/components/workflow/header/run-mode.tsx": {
     "no-console": {
       "count": 1
     },
@@ -5469,17 +5507,17 @@
       "count": 1
     }
   },
-  "app/components/workflow/header/running-title.tsx": {
+  "web/app/components/workflow/header/running-title.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/header/test-run-menu-helpers.tsx": {
+  "web/app/components/workflow/header/test-run-menu-helpers.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/header/test-run-menu.tsx": {
+  "web/app/components/workflow/header/test-run-menu.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -5490,17 +5528,17 @@
       "count": 1
     }
   },
-  "app/components/workflow/header/version-history-button.tsx": {
+  "web/app/components/workflow/header/version-history-button.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/header/view-history.tsx": {
+  "web/app/components/workflow/header/view-history.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/workflow/header/view-workflow-history.tsx": {
+  "web/app/components/workflow/header/view-workflow-history.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5508,32 +5546,32 @@
       "count": 1
     }
   },
-  "app/components/workflow/hooks-store/index.ts": {
+  "web/app/components/workflow/hooks-store/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/workflow/hooks-store/provider.tsx": {
+  "web/app/components/workflow/hooks-store/provider.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/workflow/hooks-store/store.ts": {
+  "web/app/components/workflow/hooks-store/store.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "app/components/workflow/hooks/__tests__/use-checklist.spec.ts": {
+  "web/app/components/workflow/hooks/__tests__/use-checklist.spec.ts": {
     "react/error-boundaries": {
       "count": 1
     }
   },
-  "app/components/workflow/hooks/index.ts": {
+  "web/app/components/workflow/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 27
     }
   },
-  "app/components/workflow/hooks/use-checklist.ts": {
+  "web/app/components/workflow/hooks/use-checklist.ts": {
     "ts/no-empty-object-type": {
       "count": 1
     },
@@ -5541,72 +5579,72 @@
       "count": 4
     }
   },
-  "app/components/workflow/hooks/use-dynamic-test-run-options.tsx": {
+  "web/app/components/workflow/hooks/use-dynamic-test-run-options.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/hooks/use-helpline.ts": {
+  "web/app/components/workflow/hooks/use-helpline.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/hooks/use-inspect-vars-crud-common.ts": {
+  "web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/hooks/use-nodes-interactions.ts": {
+  "web/app/components/workflow/hooks/use-nodes-interactions.ts": {
     "ts/no-explicit-any": {
       "count": 8
     }
   },
-  "app/components/workflow/hooks/use-serial-async-callback.ts": {
+  "web/app/components/workflow/hooks/use-serial-async-callback.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/hooks/use-workflow-interactions.ts": {
+  "web/app/components/workflow/hooks/use-workflow-interactions.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 5
     }
   },
-  "app/components/workflow/hooks/use-workflow-run-event/index.ts": {
+  "web/app/components/workflow/hooks/use-workflow-run-event/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 19
     }
   },
-  "app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts": {
+  "web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-agent-log.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/hooks/use-workflow-run-event/use-workflow-finished.ts": {
+  "web/app/components/workflow/hooks/use-workflow-run-event/use-workflow-finished.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/hooks/use-workflow-search.tsx": {
+  "web/app/components/workflow/hooks/use-workflow-search.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/hooks/use-workflow-variables.ts": {
+  "web/app/components/workflow/hooks/use-workflow-variables.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/index.tsx": {
+  "web/app/components/workflow/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/add-variable-popup-with-position.tsx": {
+  "web/app/components/workflow/nodes/_base/components/add-variable-popup-with-position.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx": {
+  "web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx": {
     "no-restricted-imports": {
       "count": 3
     },
@@ -5614,7 +5652,7 @@
       "count": 4
     }
   },
-  "app/components/workflow/nodes/_base/components/agent-strategy.tsx": {
+  "web/app/components/workflow/nodes/_base/components/agent-strategy.tsx": {
     "ts/no-empty-object-type": {
       "count": 1
     },
@@ -5622,12 +5660,12 @@
       "count": 3
     }
   },
-  "app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx": {
+  "web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx": {
+  "web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5635,7 +5673,7 @@
       "count": 11
     }
   },
-  "app/components/workflow/nodes/_base/components/before-run-form/form.tsx": {
+  "web/app/components/workflow/nodes/_base/components/before-run-form/form.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     },
@@ -5643,12 +5681,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/before-run-form/index.tsx": {
+  "web/app/components/workflow/nodes/_base/components/before-run-form/index.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx": {
+  "web/app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -5656,22 +5694,22 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/collapse/field-collapse.tsx": {
+  "web/app/components/workflow/nodes/_base/components/collapse/field-collapse.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/collapse/index.tsx": {
+  "web/app/components/workflow/nodes/_base/components/collapse/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/config-vision.tsx": {
+  "web/app/components/workflow/nodes/_base/components/config-vision.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/editor/code-editor/editor-support-vars.tsx": {
+  "web/app/components/workflow/nodes/_base/components/editor/code-editor/editor-support-vars.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -5679,7 +5717,7 @@
       "count": 6
     }
   },
-  "app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx": {
+  "web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     },
@@ -5687,12 +5725,12 @@
       "count": 6
     }
   },
-  "app/components/workflow/nodes/_base/components/editor/text-editor.tsx": {
+  "web/app/components/workflow/nodes/_base/components/editor/text-editor.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/entry-node-container.tsx": {
+  "web/app/components/workflow/nodes/_base/components/entry-node-container.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -5703,7 +5741,7 @@
       "count": 2
     }
   },
-  "app/components/workflow/nodes/_base/components/error-handle/default-value.tsx": {
+  "web/app/components/workflow/nodes/_base/components/error-handle/default-value.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -5711,7 +5749,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/error-handle/error-handle-on-panel.tsx": {
+  "web/app/components/workflow/nodes/_base/components/error-handle/error-handle-on-panel.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5719,17 +5757,17 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/error-handle/error-handle-tip.tsx": {
+  "web/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx": {
+  "web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/error-handle/types.ts": {
+  "web/app/components/workflow/nodes/_base/components/error-handle/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -5737,17 +5775,17 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/field.tsx": {
+  "web/app/components/workflow/nodes/_base/components/field.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/file-upload-setting.tsx": {
+  "web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/form-input-item.tsx": {
+  "web/app/components/workflow/nodes/_base/components/form-input-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5755,22 +5793,22 @@
       "count": 4
     }
   },
-  "app/components/workflow/nodes/_base/components/form-input-type-switch.tsx": {
+  "web/app/components/workflow/nodes/_base/components/form-input-type-switch.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/help-link.tsx": {
+  "web/app/components/workflow/nodes/_base/components/help-link.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/info-panel.tsx": {
+  "web/app/components/workflow/nodes/_base/components/info-panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/input-support-select-var.tsx": {
+  "web/app/components/workflow/nodes/_base/components/input-support-select-var.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5778,12 +5816,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/input-var-type-icon.tsx": {
+  "web/app/components/workflow/nodes/_base/components/input-var-type-icon.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/layout/index.tsx": {
+  "web/app/components/workflow/nodes/_base/components/layout/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 7
     },
@@ -5791,27 +5829,27 @@
       "count": 7
     }
   },
-  "app/components/workflow/nodes/_base/components/mcp-tool-availability.tsx": {
+  "web/app/components/workflow/nodes/_base/components/mcp-tool-availability.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx": {
+  "web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/memory-config.tsx": {
+  "web/app/components/workflow/nodes/_base/components/memory-config.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/mixed-variable-text-input/index.tsx": {
+  "web/app/components/workflow/nodes/_base/components/mixed-variable-text-input/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/mixed-variable-text-input/placeholder.tsx": {
+  "web/app/components/workflow/nodes/_base/components/mixed-variable-text-input/placeholder.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -5819,32 +5857,32 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/next-step/operator.tsx": {
+  "web/app/components/workflow/nodes/_base/components/next-step/operator.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/node-control.tsx": {
+  "web/app/components/workflow/nodes/_base/components/node-control.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/node-handle.tsx": {
+  "web/app/components/workflow/nodes/_base/components/node-handle.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/option-card.tsx": {
+  "web/app/components/workflow/nodes/_base/components/option-card.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/panel-operator/index.tsx": {
+  "web/app/components/workflow/nodes/_base/components/panel-operator/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/prompt/editor.tsx": {
+  "web/app/components/workflow/nodes/_base/components/prompt/editor.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5852,17 +5890,17 @@
       "count": 4
     }
   },
-  "app/components/workflow/nodes/_base/components/readonly-input-with-select-var.tsx": {
+  "web/app/components/workflow/nodes/_base/components/readonly-input-with-select-var.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/selector.tsx": {
+  "web/app/components/workflow/nodes/_base/components/selector.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/_base/components/setting-item.tsx": {
+  "web/app/components/workflow/nodes/_base/components/setting-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5870,17 +5908,17 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/switch-plugin-version.tsx": {
+  "web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/title-description-input.tsx": {
+  "web/app/components/workflow/nodes/_base/components/title-description-input.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/constant-field.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5888,32 +5926,32 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/manage-input-field.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/manage-input-field.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/match-schema-type.ts": {
+  "web/app/components/workflow/nodes/_base/components/variable/match-schema-type.ts": {
     "ts/no-explicit-any": {
       "count": 8
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/output-var-list.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/output-var-list.tsx": {
     "ts/no-non-null-asserted-optional-chain": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/utils.ts": {
+  "web/app/components/workflow/nodes/_base/components/variable/utils.ts": {
     "ts/no-explicit-any": {
       "count": 32
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -5921,12 +5959,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/var-list.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/var-list.tsx": {
     "react/unsupported-syntax": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5937,32 +5975,32 @@
       "count": 3
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/var-type-picker.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/var-type-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-node-label.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-node-label.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/variable-label/hooks.ts": {
+  "web/app/components/workflow/nodes/_base/components/variable/variable-label/hooks.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/_base/components/variable/variable-label/index.tsx": {
+  "web/app/components/workflow/nodes/_base/components/variable/variable-label/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/_base/components/workflow-panel/index.tsx": {
+  "web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -5973,7 +6011,7 @@
       "count": 6
     }
   },
-  "app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx": {
+  "web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/index.tsx": {
     "react/set-state-in-effect": {
       "count": 7
     },
@@ -5981,7 +6019,7 @@
       "count": 5
     }
   },
-  "app/components/workflow/nodes/_base/components/workflow-panel/last-run/use-last-run.ts": {
+  "web/app/components/workflow/nodes/_base/components/workflow-panel/last-run/use-last-run.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 2
     },
@@ -5992,7 +6030,7 @@
       "count": 7
     }
   },
-  "app/components/workflow/nodes/_base/components/workflow-panel/tab.tsx": {
+  "web/app/components/workflow/nodes/_base/components/workflow-panel/tab.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -6003,7 +6041,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/hooks/use-one-step-run.ts": {
+  "web/app/components/workflow/nodes/_base/hooks/use-one-step-run.ts": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -6011,32 +6049,32 @@
       "count": 22
     }
   },
-  "app/components/workflow/nodes/_base/hooks/use-output-var-list.ts": {
+  "web/app/components/workflow/nodes/_base/hooks/use-output-var-list.ts": {
     "ts/no-explicit-any": {
       "count": 8
     }
   },
-  "app/components/workflow/nodes/_base/hooks/use-toggle-expend.ts": {
+  "web/app/components/workflow/nodes/_base/hooks/use-toggle-expend.ts": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/hooks/use-var-list.ts": {
+  "web/app/components/workflow/nodes/_base/hooks/use-var-list.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/_base/node-sections.tsx": {
+  "web/app/components/workflow/nodes/_base/node-sections.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/_base/node.tsx": {
+  "web/app/components/workflow/nodes/_base/node.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/_base/types.ts": {
+  "web/app/components/workflow/nodes/_base/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -6044,7 +6082,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/agent/components/model-bar.tsx": {
+  "web/app/components/workflow/nodes/agent/components/model-bar.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6055,7 +6093,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/agent/components/tool-icon.tsx": {
+  "web/app/components/workflow/nodes/agent/components/tool-icon.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6063,22 +6101,22 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/agent/default.ts": {
+  "web/app/components/workflow/nodes/agent/default.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/agent/node.tsx": {
+  "web/app/components/workflow/nodes/agent/node.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/agent/panel.tsx": {
+  "web/app/components/workflow/nodes/agent/panel.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/agent/types.ts": {
+  "web/app/components/workflow/nodes/agent/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -6086,52 +6124,52 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/agent/use-config.ts": {
+  "web/app/components/workflow/nodes/agent/use-config.ts": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/workflow/nodes/agent/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/agent/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/answer/default.ts": {
+  "web/app/components/workflow/nodes/answer/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/answer/panel.tsx": {
+  "web/app/components/workflow/nodes/answer/panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/assigner/components/operation-selector.tsx": {
+  "web/app/components/workflow/nodes/assigner/components/operation-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/assigner/default.ts": {
+  "web/app/components/workflow/nodes/assigner/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/assigner/hooks.ts": {
+  "web/app/components/workflow/nodes/assigner/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/assigner/node.tsx": {
+  "web/app/components/workflow/nodes/assigner/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/assigner/panel.tsx": {
+  "web/app/components/workflow/nodes/assigner/panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/assigner/types.ts": {
+  "web/app/components/workflow/nodes/assigner/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     },
@@ -6139,22 +6177,22 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/assigner/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/assigner/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/assigner/utils.ts": {
+  "web/app/components/workflow/nodes/assigner/utils.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/code/default.ts": {
+  "web/app/components/workflow/nodes/code/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/code/dependency-picker.tsx": {
+  "web/app/components/workflow/nodes/code/dependency-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6162,12 +6200,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/code/types.ts": {
+  "web/app/components/workflow/nodes/code/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/code/use-config.ts": {
+  "web/app/components/workflow/nodes/code/use-config.ts": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -6178,47 +6216,47 @@
       "count": 6
     }
   },
-  "app/components/workflow/nodes/code/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/code/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/components.ts": {
+  "web/app/components/workflow/nodes/components.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/data-source-empty/hooks.ts": {
+  "web/app/components/workflow/nodes/data-source-empty/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/data-source/default.ts": {
+  "web/app/components/workflow/nodes/data-source/default.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/data-source/hooks/use-before-run-form.ts": {
+  "web/app/components/workflow/nodes/data-source/hooks/use-before-run-form.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/data-source/hooks/use-config.ts": {
+  "web/app/components/workflow/nodes/data-source/hooks/use-config.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "app/components/workflow/nodes/data-source/node.tsx": {
+  "web/app/components/workflow/nodes/data-source/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/data-source/panel.tsx": {
+  "web/app/components/workflow/nodes/data-source/panel.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/data-source/types.ts": {
+  "web/app/components/workflow/nodes/data-source/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -6229,82 +6267,82 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/data-source/utils.ts": {
+  "web/app/components/workflow/nodes/data-source/utils.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/document-extractor/default.ts": {
+  "web/app/components/workflow/nodes/document-extractor/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/document-extractor/node.tsx": {
+  "web/app/components/workflow/nodes/document-extractor/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/document-extractor/panel.tsx": {
+  "web/app/components/workflow/nodes/document-extractor/panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/document-extractor/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/document-extractor/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/workflow/nodes/end/default.ts": {
+  "web/app/components/workflow/nodes/end/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/end/node.tsx": {
+  "web/app/components/workflow/nodes/end/node.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/http/components/authorization/index.tsx": {
+  "web/app/components/workflow/nodes/http/components/authorization/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/http/components/curl-panel.tsx": {
+  "web/app/components/workflow/nodes/http/components/curl-panel.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/http/components/key-value/bulk-edit/index.tsx": {
+  "web/app/components/workflow/nodes/http/components/key-value/bulk-edit/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx": {
+  "web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/http/components/key-value/key-value-edit/item.tsx": {
+  "web/app/components/workflow/nodes/http/components/key-value/key-value-edit/item.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/http/default.ts": {
+  "web/app/components/workflow/nodes/http/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/http/node.tsx": {
+  "web/app/components/workflow/nodes/http/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/http/types.ts": {
+  "web/app/components/workflow/nodes/http/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/http/use-config.ts": {
+  "web/app/components/workflow/nodes/http/use-config.ts": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -6312,47 +6350,47 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/http/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/http/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/human-input/components/button-style-dropdown.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/button-style-dropdown.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/delivery-method/email-configure-modal.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/delivery-method/email-configure-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/delivery-method/index.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/delivery-method/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/delivery-method/method-item.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/delivery-method/method-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/delivery-method/method-selector.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/delivery-method/method-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/delivery-method/recipient/member-selector.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/member-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6363,17 +6401,17 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/delivery-method/upgrade-modal.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/delivery-method/upgrade-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/form-content-preview.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/form-content-preview.tsx": {
     "react/unsupported-syntax": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/components/form-content.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/form-content.tsx": {
     "react/component-hook-factories": {
       "count": 1
     },
@@ -6387,27 +6425,27 @@
       "count": 3
     }
   },
-  "app/components/workflow/nodes/human-input/components/variable-in-markdown.tsx": {
+  "web/app/components/workflow/nodes/human-input/components/variable-in-markdown.tsx": {
     "react-refresh/only-export-components": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/human-input/panel.tsx": {
+  "web/app/components/workflow/nodes/human-input/panel.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/human-input/types.ts": {
+  "web/app/components/workflow/nodes/human-input/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/if-else/components/condition-add.tsx": {
+  "web/app/components/workflow/nodes/if-else/components/condition-add.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/components/condition-files-list-value.tsx": {
+  "web/app/components/workflow/nodes/if-else/components/condition-files-list-value.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -6415,57 +6453,57 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/components/condition-list/condition-input.tsx": {
+  "web/app/components/workflow/nodes/if-else/components/condition-list/condition-input.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx": {
+  "web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx": {
+  "web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/components/condition-list/condition-var-selector.tsx": {
+  "web/app/components/workflow/nodes/if-else/components/condition-list/condition-var-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/components/condition-number-input.tsx": {
+  "web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/components/condition-wrap.tsx": {
+  "web/app/components/workflow/nodes/if-else/components/condition-wrap.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/default.ts": {
+  "web/app/components/workflow/nodes/if-else/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/node.tsx": {
+  "web/app/components/workflow/nodes/if-else/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/if-else/types.ts": {
+  "web/app/components/workflow/nodes/if-else/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/if-else/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/if-else/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/iteration-start/index.tsx": {
+  "web/app/components/workflow/nodes/iteration-start/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6473,67 +6511,67 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/iteration/default.ts": {
+  "web/app/components/workflow/nodes/iteration/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/iteration/node.tsx": {
+  "web/app/components/workflow/nodes/iteration/node.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/iteration/panel.tsx": {
+  "web/app/components/workflow/nodes/iteration/panel.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/iteration/use-config.ts": {
+  "web/app/components/workflow/nodes/iteration/use-config.ts": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/iteration/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/iteration/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "app/components/workflow/nodes/knowledge-base/components/chunk-structure/selector.tsx": {
+  "web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-base/components/index-method.tsx": {
+  "web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-base/components/retrieval-setting/hooks.tsx": {
+  "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/hooks.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/workflow/nodes/knowledge-base/components/retrieval-setting/index.tsx": {
+  "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-base/components/retrieval-setting/search-method-option.tsx": {
+  "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/search-method-option.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx": {
+  "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/top-k-and-score-threshold.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-base/components/retrieval-setting/type.ts": {
+  "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/type.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/knowledge-base/types.ts": {
+  "web/app/components/workflow/nodes/knowledge-base/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -6541,17 +6579,17 @@
       "count": 8
     }
   },
-  "app/components/workflow/nodes/knowledge-base/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/knowledge-base/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/knowledge-base/utils.ts": {
+  "web/app/components/workflow/nodes/knowledge-base/utils.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -6559,17 +6597,17 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/dataset-list.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6577,32 +6615,32 @@
       "count": 4
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-operator.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-operator.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-value-method.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-value-method.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6610,7 +6648,7 @@
       "count": 2
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6618,32 +6656,32 @@
       "count": 2
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-panel.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-trigger.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-trigger.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/components/retrieval-config.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/components/retrieval-config.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/default.ts": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/node.tsx": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/node.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -6651,7 +6689,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/types.ts": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 4
     },
@@ -6659,12 +6697,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/knowledge-retrieval/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/knowledge-retrieval/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/list-operator/components/filter-condition.tsx": {
+  "web/app/components/workflow/nodes/list-operator/components/filter-condition.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6672,7 +6710,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/list-operator/components/sub-variable-picker.tsx": {
+  "web/app/components/workflow/nodes/list-operator/components/sub-variable-picker.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -6680,22 +6718,22 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/list-operator/default.ts": {
+  "web/app/components/workflow/nodes/list-operator/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/list-operator/node.tsx": {
+  "web/app/components/workflow/nodes/list-operator/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/list-operator/types.ts": {
+  "web/app/components/workflow/nodes/list-operator/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/config-prompt-item.tsx": {
+  "web/app/components/workflow/nodes/llm/components/config-prompt-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6706,7 +6744,7 @@
       "count": 3
     }
   },
-  "app/components/workflow/nodes/llm/components/config-prompt.tsx": {
+  "web/app/components/workflow/nodes/llm/components/config-prompt.tsx": {
     "react/unsupported-syntax": {
       "count": 1
     },
@@ -6714,7 +6752,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/code-editor.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/code-editor.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6722,32 +6760,32 @@
       "count": 4
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/index.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-config.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-config.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/assets/index.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/assets/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/generated-result.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/generated-result.tsx": {
     "style/multiline-ternary": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/index.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -6758,67 +6796,67 @@
       "count": 2
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/card.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/card.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/context.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/context.tsx": {
     "react-refresh/only-export-components": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/actions.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/actions.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/advanced-options.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/advanced-options.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/auto-width-input.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/auto-width-input.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/type-selector.tsx": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/type-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts": {
+  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/resolution-picker.tsx": {
+  "web/app/components/workflow/nodes/llm/components/resolution-picker.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/components/structure-output.tsx": {
+  "web/app/components/workflow/nodes/llm/components/structure-output.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/llm/default.ts": {
+  "web/app/components/workflow/nodes/llm/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/types.ts": {
+  "web/app/components/workflow/nodes/llm/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/llm/use-config.ts": {
+  "web/app/components/workflow/nodes/llm/use-config.ts": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -6826,12 +6864,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/llm/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/llm/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 9
     }
   },
-  "app/components/workflow/nodes/llm/utils.ts": {
+  "web/app/components/workflow/nodes/llm/utils.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -6839,7 +6877,7 @@
       "count": 7
     }
   },
-  "app/components/workflow/nodes/loop-start/index.tsx": {
+  "web/app/components/workflow/nodes/loop-start/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -6847,12 +6885,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/condition-add.tsx": {
+  "web/app/components/workflow/nodes/loop/components/condition-add.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/condition-files-list-value.tsx": {
+  "web/app/components/workflow/nodes/loop/components/condition-files-list-value.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -6860,62 +6898,62 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/condition-list/condition-input.tsx": {
+  "web/app/components/workflow/nodes/loop/components/condition-list/condition-input.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/condition-list/condition-item.tsx": {
+  "web/app/components/workflow/nodes/loop/components/condition-list/condition-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx": {
+  "web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/condition-list/condition-var-selector.tsx": {
+  "web/app/components/workflow/nodes/loop/components/condition-list/condition-var-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/condition-number-input.tsx": {
+  "web/app/components/workflow/nodes/loop/components/condition-number-input.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/condition-wrap.tsx": {
+  "web/app/components/workflow/nodes/loop/components/condition-wrap.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/loop-variables/form-item.tsx": {
+  "web/app/components/workflow/nodes/loop/components/loop-variables/form-item.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/loop/components/loop-variables/input-mode-selec.tsx": {
+  "web/app/components/workflow/nodes/loop/components/loop-variables/input-mode-selec.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/components/loop-variables/item.tsx": {
+  "web/app/components/workflow/nodes/loop/components/loop-variables/item.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/workflow/nodes/loop/components/loop-variables/variable-type-select.tsx": {
+  "web/app/components/workflow/nodes/loop/components/loop-variables/variable-type-select.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/default.ts": {
+  "web/app/components/workflow/nodes/loop/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/types.ts": {
+  "web/app/components/workflow/nodes/loop/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     },
@@ -6923,32 +6961,32 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/use-config.ts": {
+  "web/app/components/workflow/nodes/loop/use-config.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/loop/use-single-run-form-params.helpers.ts": {
+  "web/app/components/workflow/nodes/loop/use-single-run-form-params.helpers.ts": {
     "ts/no-non-null-asserted-optional-chain": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/loop/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/loop/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/list.spec.tsx": {
+  "web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/list.spec.tsx": {
     "unused-imports/no-unused-vars": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/parameter-extractor/components/extract-parameter/item.tsx": {
+  "web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 4
     }
   },
-  "app/components/workflow/nodes/parameter-extractor/components/extract-parameter/update.tsx": {
+  "web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/update.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -6956,22 +6994,22 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/parameter-extractor/default.ts": {
+  "web/app/components/workflow/nodes/parameter-extractor/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/parameter-extractor/panel.tsx": {
+  "web/app/components/workflow/nodes/parameter-extractor/panel.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/parameter-extractor/types.ts": {
+  "web/app/components/workflow/nodes/parameter-extractor/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/parameter-extractor/use-config.ts": {
+  "web/app/components/workflow/nodes/parameter-extractor/use-config.ts": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -6979,22 +7017,22 @@
       "count": 2
     }
   },
-  "app/components/workflow/nodes/parameter-extractor/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/parameter-extractor/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 9
     }
   },
-  "app/components/workflow/nodes/question-classifier/components/advanced-setting.tsx": {
+  "web/app/components/workflow/nodes/question-classifier/components/advanced-setting.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/question-classifier/components/class-item.tsx": {
+  "web/app/components/workflow/nodes/question-classifier/components/class-item.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/question-classifier/components/class-list.tsx": {
+  "web/app/components/workflow/nodes/question-classifier/components/class-list.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -7002,12 +7040,12 @@
       "count": 2
     }
   },
-  "app/components/workflow/nodes/question-classifier/default.ts": {
+  "web/app/components/workflow/nodes/question-classifier/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/question-classifier/node.tsx": {
+  "web/app/components/workflow/nodes/question-classifier/node.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7015,7 +7053,7 @@
       "count": 2
     }
   },
-  "app/components/workflow/nodes/question-classifier/use-config.ts": {
+  "web/app/components/workflow/nodes/question-classifier/use-config.ts": {
     "react/set-state-in-effect": {
       "count": 2
     },
@@ -7023,12 +7061,12 @@
       "count": 2
     }
   },
-  "app/components/workflow/nodes/question-classifier/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/question-classifier/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 8
     }
   },
-  "app/components/workflow/nodes/start/node.tsx": {
+  "web/app/components/workflow/nodes/start/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -7036,37 +7074,37 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/start/panel.tsx": {
+  "web/app/components/workflow/nodes/start/panel.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/start/use-config.ts": {
+  "web/app/components/workflow/nodes/start/use-config.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/start/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/start/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/template-transform/default.ts": {
+  "web/app/components/workflow/nodes/template-transform/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/template-transform/use-config.ts": {
+  "web/app/components/workflow/nodes/template-transform/use-config.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/workflow/nodes/template-transform/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/template-transform/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/workflow/nodes/tool/components/copy-id.tsx": {
+  "web/app/components/workflow/nodes/tool/components/copy-id.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7077,27 +7115,27 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/tool/components/input-var-list.tsx": {
+  "web/app/components/workflow/nodes/tool/components/input-var-list.tsx": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx": {
+  "web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/tool/components/mixed-variable-text-input/placeholder.tsx": {
+  "web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/placeholder.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/tool/components/tool-form/index.tsx": {
+  "web/app/components/workflow/nodes/tool/components/tool-form/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/tool/components/tool-form/item.tsx": {
+  "web/app/components/workflow/nodes/tool/components/tool-form/item.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7105,32 +7143,32 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/tool/default.ts": {
+  "web/app/components/workflow/nodes/tool/default.ts": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/workflow/nodes/tool/hooks/use-config.ts": {
+  "web/app/components/workflow/nodes/tool/hooks/use-config.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "app/components/workflow/nodes/tool/hooks/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/tool/hooks/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "app/components/workflow/nodes/tool/output-schema-utils.ts": {
+  "web/app/components/workflow/nodes/tool/output-schema-utils.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/workflow/nodes/tool/panel.tsx": {
+  "web/app/components/workflow/nodes/tool/panel.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/tool/types.ts": {
+  "web/app/components/workflow/nodes/tool/types.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     },
@@ -7138,12 +7176,12 @@
       "count": 3
     }
   },
-  "app/components/workflow/nodes/trigger-plugin/components/trigger-form/index.tsx": {
+  "web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx": {
+  "web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7151,12 +7189,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-plugin/default.ts": {
+  "web/app/components/workflow/nodes/trigger-plugin/default.ts": {
     "ts/no-explicit-any": {
       "count": 11
     }
   },
-  "app/components/workflow/nodes/trigger-plugin/node.tsx": {
+  "web/app/components/workflow/nodes/trigger-plugin/node.tsx": {
     "react/unsupported-syntax": {
       "count": 1
     },
@@ -7167,47 +7205,47 @@
       "count": 2
     }
   },
-  "app/components/workflow/nodes/trigger-plugin/panel.tsx": {
+  "web/app/components/workflow/nodes/trigger-plugin/panel.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/nodes/trigger-plugin/types.ts": {
+  "web/app/components/workflow/nodes/trigger-plugin/types.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/workflow/nodes/trigger-plugin/use-config.ts": {
+  "web/app/components/workflow/nodes/trigger-plugin/use-config.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-plugin/utils/form-helpers.ts": {
+  "web/app/components/workflow/nodes/trigger-plugin/utils/form-helpers.ts": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx": {
+  "web/app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx": {
+  "web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx": {
+  "web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx": {
+  "web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/trigger-schedule/default.ts": {
+  "web/app/components/workflow/nodes/trigger-schedule/default.ts": {
     "regexp/no-unused-capturing-group": {
       "count": 2
     },
@@ -7215,52 +7253,52 @@
       "count": 10
     }
   },
-  "app/components/workflow/nodes/trigger-schedule/node.tsx": {
+  "web/app/components/workflow/nodes/trigger-schedule/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-schedule/panel.tsx": {
+  "web/app/components/workflow/nodes/trigger-schedule/panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-webhook/components/generic-table.tsx": {
+  "web/app/components/workflow/nodes/trigger-webhook/components/generic-table.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-webhook/components/parameter-table.tsx": {
+  "web/app/components/workflow/nodes/trigger-webhook/components/parameter-table.tsx": {
     "ts/no-non-null-asserted-optional-chain": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-webhook/default.ts": {
+  "web/app/components/workflow/nodes/trigger-webhook/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-webhook/node.tsx": {
+  "web/app/components/workflow/nodes/trigger-webhook/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/trigger-webhook/panel.tsx": {
+  "web/app/components/workflow/nodes/trigger-webhook/panel.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/trigger-webhook/utils/render-output-vars.tsx": {
+  "web/app/components/workflow/nodes/trigger-webhook/utils/render-output-vars.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/utils.ts": {
+  "web/app/components/workflow/nodes/utils.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/nodes/variable-assigner/components/var-group-item.tsx": {
+  "web/app/components/workflow/nodes/variable-assigner/components/var-group-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     },
@@ -7271,27 +7309,27 @@
       "count": 1
     }
   },
-  "app/components/workflow/nodes/variable-assigner/default.ts": {
+  "web/app/components/workflow/nodes/variable-assigner/default.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/nodes/variable-assigner/use-single-run-form-params.ts": {
+  "web/app/components/workflow/nodes/variable-assigner/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/components/workflow/note-node/note-editor/index.tsx": {
+  "web/app/components/workflow/note-node/note-editor/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
     }
   },
-  "app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/component.tsx": {
+  "web/app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/component.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx": {
+  "web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7299,52 +7337,52 @@
       "count": 1
     }
   },
-  "app/components/workflow/note-node/note-editor/toolbar/command.tsx": {
+  "web/app/components/workflow/note-node/note-editor/toolbar/command.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/note-node/note-editor/toolbar/font-size-selector.tsx": {
+  "web/app/components/workflow/note-node/note-editor/toolbar/font-size-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/note-node/note-editor/toolbar/operator.tsx": {
+  "web/app/components/workflow/note-node/note-editor/toolbar/operator.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/note-node/note-editor/utils.ts": {
+  "web/app/components/workflow/note-node/note-editor/utils.ts": {
     "regexp/no-useless-quantifier": {
       "count": 1
     }
   },
-  "app/components/workflow/operator/add-block.tsx": {
+  "web/app/components/workflow/operator/add-block.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/operator/hooks.ts": {
+  "web/app/components/workflow/operator/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/operator/index.tsx": {
+  "web/app/components/workflow/operator/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/operator/more-actions.tsx": {
+  "web/app/components/workflow/operator/more-actions.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/operator/tip-popup.tsx": {
+  "web/app/components/workflow/operator/tip-popup.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/operator/zoom-in-out.tsx": {
+  "web/app/components/workflow/operator/zoom-in-out.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -7352,12 +7390,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/panel/chat-record/index.tsx": {
+  "web/app/components/workflow/panel/chat-record/index.tsx": {
     "ts/no-explicit-any": {
       "count": 8
     }
   },
-  "app/components/workflow/panel/chat-record/user-input.tsx": {
+  "web/app/components/workflow/panel/chat-record/user-input.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -7365,17 +7403,17 @@
       "count": 1
     }
   },
-  "app/components/workflow/panel/chat-variable-panel/components/array-bool-list.tsx": {
+  "web/app/components/workflow/panel/chat-variable-panel/components/array-bool-list.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/panel/chat-variable-panel/components/array-value-list.tsx": {
+  "web/app/components/workflow/panel/chat-variable-panel/components/array-value-list.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/workflow/panel/chat-variable-panel/components/object-value-item.tsx": {
+  "web/app/components/workflow/panel/chat-variable-panel/components/object-value-item.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     },
@@ -7389,7 +7427,7 @@
       "count": 2
     }
   },
-  "app/components/workflow/panel/chat-variable-panel/components/object-value-list.tsx": {
+  "web/app/components/workflow/panel/chat-variable-panel/components/object-value-list.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -7397,7 +7435,7 @@
       "count": 2
     }
   },
-  "app/components/workflow/panel/chat-variable-panel/components/variable-type-select.tsx": {
+  "web/app/components/workflow/panel/chat-variable-panel/components/variable-type-select.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7405,22 +7443,22 @@
       "count": 4
     }
   },
-  "app/components/workflow/panel/chat-variable-panel/type.ts": {
+  "web/app/components/workflow/panel/chat-variable-panel/type.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/comments-panel/index.tsx": {
+  "web/app/components/workflow/panel/comments-panel/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     }
   },
-  "app/components/workflow/panel/debug-and-preview/chat-wrapper.tsx": {
+  "web/app/components/workflow/panel/debug-and-preview/chat-wrapper.tsx": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx": {
+  "web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7428,22 +7466,22 @@
       "count": 2
     }
   },
-  "app/components/workflow/panel/debug-and-preview/empty.tsx": {
+  "web/app/components/workflow/panel/debug-and-preview/empty.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/debug-and-preview/hooks.ts": {
+  "web/app/components/workflow/panel/debug-and-preview/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 12
     }
   },
-  "app/components/workflow/panel/debug-and-preview/index.tsx": {
+  "web/app/components/workflow/panel/debug-and-preview/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/env-panel/variable-modal.tsx": {
+  "web/app/components/workflow/panel/env-panel/variable-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7454,107 +7492,107 @@
       "count": 1
     }
   },
-  "app/components/workflow/panel/human-input-form-list.tsx": {
+  "web/app/components/workflow/panel/human-input-form-list.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/inputs-panel.tsx": {
+  "web/app/components/workflow/panel/inputs-panel.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "app/components/workflow/panel/record.tsx": {
+  "web/app/components/workflow/panel/record.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/version-history-panel/context-menu/index.tsx": {
+  "web/app/components/workflow/panel/version-history-panel/context-menu/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/version-history-panel/delete-confirm-modal.tsx": {
+  "web/app/components/workflow/panel/version-history-panel/delete-confirm-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/version-history-panel/filter/filter-item.tsx": {
+  "web/app/components/workflow/panel/version-history-panel/filter/filter-item.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/version-history-panel/filter/index.tsx": {
+  "web/app/components/workflow/panel/version-history-panel/filter/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/version-history-panel/loading/index.tsx": {
+  "web/app/components/workflow/panel/version-history-panel/loading/index.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx": {
+  "web/app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/panel/workflow-preview.tsx": {
+  "web/app/components/workflow/panel/workflow-preview.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/run/agent-log/agent-log-nav-more.tsx": {
+  "web/app/components/workflow/run/agent-log/agent-log-nav-more.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/run/agent-log/index.tsx": {
+  "web/app/components/workflow/run/agent-log/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/workflow/run/hooks.ts": {
+  "web/app/components/workflow/run/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/run/index.tsx": {
+  "web/app/components/workflow/run/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
     }
   },
-  "app/components/workflow/run/iteration-log/index.tsx": {
+  "web/app/components/workflow/run/iteration-log/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/workflow/run/iteration-log/iteration-log-trigger.tsx": {
+  "web/app/components/workflow/run/iteration-log/iteration-log-trigger.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 1
     }
   },
-  "app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx": {
+  "web/app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/run/loop-log/index.tsx": {
+  "web/app/components/workflow/run/loop-log/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/workflow/run/loop-log/loop-log-trigger.tsx": {
+  "web/app/components/workflow/run/loop-log/loop-log-trigger.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 1
     }
   },
-  "app/components/workflow/run/meta.tsx": {
+  "web/app/components/workflow/run/meta.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 13
     }
   },
-  "app/components/workflow/run/node.tsx": {
+  "web/app/components/workflow/run/node.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7562,7 +7600,7 @@
       "count": 1
     }
   },
-  "app/components/workflow/run/output-panel.tsx": {
+  "web/app/components/workflow/run/output-panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     },
@@ -7570,7 +7608,7 @@
       "count": 3
     }
   },
-  "app/components/workflow/run/result-panel.tsx": {
+  "web/app/components/workflow/run/result-panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 3
     },
@@ -7578,7 +7616,7 @@
       "count": 4
     }
   },
-  "app/components/workflow/run/result-text.tsx": {
+  "web/app/components/workflow/run/result-text.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 2
     },
@@ -7589,42 +7627,42 @@
       "count": 2
     }
   },
-  "app/components/workflow/run/retry-log/index.tsx": {
+  "web/app/components/workflow/run/retry-log/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/workflow/run/retry-log/retry-result-panel.tsx": {
+  "web/app/components/workflow/run/retry-log/retry-result-panel.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/run/utils/format-log/agent/index.ts": {
+  "web/app/components/workflow/run/utils/format-log/agent/index.ts": {
     "ts/no-explicit-any": {
       "count": 11
     }
   },
-  "app/components/workflow/run/utils/format-log/graph-to-log-struct.ts": {
+  "web/app/components/workflow/run/utils/format-log/graph-to-log-struct.ts": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/components/workflow/run/utils/format-log/index.ts": {
+  "web/app/components/workflow/run/utils/format-log/index.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/run/utils/format-log/iteration/index.ts": {
+  "web/app/components/workflow/run/utils/format-log/iteration/index.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/run/utils/format-log/loop/index.ts": {
+  "web/app/components/workflow/run/utils/format-log/loop/index.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/run/utils/format-log/parallel/index.ts": {
+  "web/app/components/workflow/run/utils/format-log/parallel/index.ts": {
     "no-console": {
       "count": 4
     },
@@ -7632,27 +7670,27 @@
       "count": 2
     }
   },
-  "app/components/workflow/store/index.ts": {
+  "web/app/components/workflow/store/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "app/components/workflow/store/workflow/debug/inspect-vars-slice.ts": {
+  "web/app/components/workflow/store/workflow/debug/inspect-vars-slice.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/store/workflow/workflow-draft-slice.ts": {
+  "web/app/components/workflow/store/workflow/workflow-draft-slice.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/store/workflow/workflow-slice.ts": {
+  "web/app/components/workflow/store/workflow/workflow-slice.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/types.ts": {
+  "web/app/components/workflow/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 16
     },
@@ -7663,7 +7701,7 @@
       "count": 8
     }
   },
-  "app/components/workflow/update-dsl-modal.tsx": {
+  "web/app/components/workflow/update-dsl-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7671,57 +7709,57 @@
       "count": 1
     }
   },
-  "app/components/workflow/utils/__tests__/node-navigation.spec.ts": {
+  "web/app/components/workflow/utils/__tests__/node-navigation.spec.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "app/components/workflow/utils/data-source.ts": {
+  "web/app/components/workflow/utils/data-source.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/utils/debug.ts": {
+  "web/app/components/workflow/utils/debug.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/utils/index.ts": {
+  "web/app/components/workflow/utils/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 9
     }
   },
-  "app/components/workflow/utils/node-navigation.ts": {
+  "web/app/components/workflow/utils/node-navigation.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/utils/node.ts": {
+  "web/app/components/workflow/utils/node.ts": {
     "regexp/no-super-linear-backtracking": {
       "count": 1
     }
   },
-  "app/components/workflow/utils/tool.ts": {
+  "web/app/components/workflow/utils/tool.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/utils/workflow-init.ts": {
+  "web/app/components/workflow/utils/workflow-init.ts": {
     "ts/no-explicit-any": {
       "count": 12
     }
   },
-  "app/components/workflow/utils/workflow.ts": {
+  "web/app/components/workflow/utils/workflow.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/variable-inspect/display-content.tsx": {
+  "web/app/components/workflow/variable-inspect/display-content.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/variable-inspect/group.tsx": {
+  "web/app/components/workflow/variable-inspect/group.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7729,12 +7767,12 @@
       "count": 2
     }
   },
-  "app/components/workflow/variable-inspect/left.tsx": {
+  "web/app/components/workflow/variable-inspect/left.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/variable-inspect/listening.tsx": {
+  "web/app/components/workflow/variable-inspect/listening.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7742,12 +7780,12 @@
       "count": 2
     }
   },
-  "app/components/workflow/variable-inspect/panel.tsx": {
+  "web/app/components/workflow/variable-inspect/panel.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/variable-inspect/right.tsx": {
+  "web/app/components/workflow/variable-inspect/right.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7755,7 +7793,7 @@
       "count": 3
     }
   },
-  "app/components/workflow/variable-inspect/trigger.tsx": {
+  "web/app/components/workflow/variable-inspect/trigger.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7763,12 +7801,12 @@
       "count": 1
     }
   },
-  "app/components/workflow/variable-inspect/utils.tsx": {
+  "web/app/components/workflow/variable-inspect/utils.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "app/components/workflow/variable-inspect/value-content.tsx": {
+  "web/app/components/workflow/variable-inspect/value-content.tsx": {
     "react/set-state-in-effect": {
       "count": 5
     },
@@ -7782,37 +7820,37 @@
       "count": 5
     }
   },
-  "app/components/workflow/workflow-history-store.tsx": {
+  "web/app/components/workflow/workflow-history-store.tsx": {
     "react-refresh/only-export-components": {
       "count": 2
     }
   },
-  "app/components/workflow/workflow-preview/components/nodes/base.tsx": {
+  "web/app/components/workflow/workflow-preview/components/nodes/base.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/workflow-preview/components/nodes/constants.ts": {
+  "web/app/components/workflow/workflow-preview/components/nodes/constants.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/workflow/workflow-preview/components/nodes/if-else/node.tsx": {
+  "web/app/components/workflow/workflow-preview/components/nodes/if-else/node.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "app/components/workflow/workflow-preview/components/nodes/iteration-start/index.tsx": {
+  "web/app/components/workflow/workflow-preview/components/nodes/iteration-start/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/workflow-preview/components/nodes/loop-start/index.tsx": {
+  "web/app/components/workflow/workflow-preview/components/nodes/loop-start/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/components/workflow/workflow-preview/components/zoom-in-out.tsx": {
+  "web/app/components/workflow/workflow-preview/components/zoom-in-out.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -7820,17 +7858,17 @@
       "count": 1
     }
   },
-  "app/education-apply/expire-notice-modal.tsx": {
+  "web/app/education-apply/expire-notice-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/education-apply/hooks.ts": {
+  "web/app/education-apply/hooks.ts": {
     "react/set-state-in-effect": {
       "count": 5
     }
   },
-  "app/education-apply/search-input.tsx": {
+  "web/app/education-apply/search-input.tsx": {
     "no-restricted-imports": {
       "count": 1
     },
@@ -7841,52 +7879,57 @@
       "count": 1
     }
   },
-  "app/education-apply/verify-state-modal.tsx": {
+  "web/app/education-apply/verify-state-modal.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "app/forgot-password/ForgotPasswordForm.spec.tsx": {
+  "web/app/forgot-password/ForgotPasswordForm.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "app/init/InitPasswordPopup.tsx": {
+  "web/app/init/InitPasswordPopup.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/install/installForm.spec.tsx": {
+  "web/app/install/installForm.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "app/reset-password/layout.tsx": {
+  "web/app/layout.tsx": {
+    "react-refresh/only-export-components": {
+      "count": 1
+    }
+  },
+  "web/app/reset-password/layout.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/signin/_header.tsx": {
+  "web/app/signin/_header.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/signin/components/mail-and-password-auth.tsx": {
+  "web/app/signin/components/mail-and-password-auth.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/signin/invite-settings/page.tsx": {
+  "web/app/signin/invite-settings/page.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "app/signin/layout.tsx": {
+  "web/app/signin/layout.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/signin/one-more-step.tsx": {
+  "web/app/signin/one-more-step.tsx": {
     "no-restricted-imports": {
       "count": 2
     },
@@ -7894,72 +7937,72 @@
       "count": 1
     }
   },
-  "app/signup/layout.tsx": {
+  "web/app/signup/layout.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/signup/page.tsx": {
+  "web/app/signup/page.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "context/app-context-provider.tsx": {
+  "web/context/app-context-provider.tsx": {
     "tailwindcss/enforce-consistent-class-order": {
       "count": 1
     }
   },
-  "context/external-api-panel-context.tsx": {
+  "web/context/external-api-panel-context.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "context/external-knowledge-api-context.tsx": {
+  "web/context/external-knowledge-api-context.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "context/global-public-context.tsx": {
+  "web/context/global-public-context.tsx": {
     "react-refresh/only-export-components": {
       "count": 3
     }
   },
-  "context/hooks/use-trigger-events-limit-modal.ts": {
+  "web/context/hooks/use-trigger-events-limit-modal.ts": {
     "react/set-state-in-effect": {
       "count": 3
     }
   },
-  "context/modal-context-provider.tsx": {
+  "web/context/modal-context-provider.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "context/modal-context.test.tsx": {
+  "web/context/modal-context.test.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "context/modal-context.ts": {
+  "web/context/modal-context.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "context/provider-context-provider.tsx": {
+  "web/context/provider-context-provider.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "context/web-app-context.tsx": {
+  "web/context/web-app-context.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "hooks/use-async-window-open.spec.ts": {
+  "web/hooks/use-async-window-open.spec.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "hooks/use-format-time-from-now.spec.ts": {
+  "web/hooks/use-format-time-from-now.spec.ts": {
     "regexp/no-dupe-disjunctions": {
       "count": 5
     },
@@ -7967,12 +8010,12 @@
       "count": 1
     }
   },
-  "hooks/use-metadata.ts": {
+  "web/hooks/use-metadata.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "hooks/use-mitt.ts": {
+  "web/hooks/use-mitt.ts": {
     "react/component-hook-factories": {
       "count": 1
     },
@@ -7980,87 +8023,87 @@
       "count": 2
     }
   },
-  "hooks/use-oauth.ts": {
+  "web/hooks/use-oauth.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "hooks/use-pay.tsx": {
+  "web/hooks/use-pay.tsx": {
     "react/set-state-in-effect": {
       "count": 4
     }
   },
-  "i18n-config/index.ts": {
+  "web/i18n-config/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "i18n-config/lib.client.ts": {
+  "web/i18n-config/lib.client.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "i18n/de-DE/billing.json": {
+  "web/i18n/de-DE/billing.json": {
     "no-irregular-whitespace": {
       "count": 1
     }
   },
-  "i18n/en-US/app-debug.json": {
+  "web/i18n/en-US/app-debug.json": {
     "no-irregular-whitespace": {
       "count": 1
     }
   },
-  "i18n/fr-FR/app-debug.json": {
+  "web/i18n/fr-FR/app-debug.json": {
     "no-irregular-whitespace": {
       "count": 1
     }
   },
-  "i18n/fr-FR/app.json": {
+  "web/i18n/fr-FR/app.json": {
     "no-irregular-whitespace": {
       "count": 1
     }
   },
-  "i18n/fr-FR/plugin-trigger.json": {
+  "web/i18n/fr-FR/plugin-trigger.json": {
     "no-irregular-whitespace": {
       "count": 1
     }
   },
-  "i18n/fr-FR/tools.json": {
+  "web/i18n/fr-FR/tools.json": {
     "no-irregular-whitespace": {
       "count": 1
     }
   },
-  "i18n/fr-FR/workflow.json": {
+  "web/i18n/fr-FR/workflow.json": {
     "no-irregular-whitespace": {
       "count": 2
     }
   },
-  "i18n/pt-BR/common.json": {
+  "web/i18n/pt-BR/common.json": {
     "no-irregular-whitespace": {
       "count": 1
     }
   },
-  "i18n/ru-RU/common.json": {
+  "web/i18n/ru-RU/common.json": {
     "no-irregular-whitespace": {
       "count": 2
     }
   },
-  "i18n/uk-UA/app-debug.json": {
+  "web/i18n/uk-UA/app-debug.json": {
     "no-irregular-whitespace": {
       "count": 1
     }
   },
-  "models/access-control.ts": {
+  "web/models/access-control.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "models/app.ts": {
+  "web/models/app.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "models/common.ts": {
+  "web/models/common.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     },
@@ -8068,7 +8111,7 @@
       "count": 3
     }
   },
-  "models/datasets.ts": {
+  "web/models/datasets.ts": {
     "erasable-syntax-only/enums": {
       "count": 8
     },
@@ -8076,7 +8119,7 @@
       "count": 5
     }
   },
-  "models/debug.ts": {
+  "web/models/debug.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     },
@@ -8084,7 +8127,7 @@
       "count": 4
     }
   },
-  "models/log.ts": {
+  "web/models/log.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -8092,7 +8135,7 @@
       "count": 7
     }
   },
-  "models/pipeline.ts": {
+  "web/models/pipeline.ts": {
     "erasable-syntax-only/enums": {
       "count": 3
     },
@@ -8100,57 +8143,62 @@
       "count": 6
     }
   },
-  "models/share.ts": {
+  "web/models/share.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "plugins/dev-proxy/server.spec.ts": {
+  "web/plugins/dev-proxy/server.spec.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "scripts/component-analyzer.js": {
+  "web/scripts/component-analyzer.js": {
     "regexp/no-unused-capturing-group": {
       "count": 6
     }
   },
-  "service/access-control.ts": {
+  "web/service/access-control.ts": {
     "@tanstack/query/exhaustive-deps": {
       "count": 1
     }
   },
-  "service/annotation.ts": {
+  "web/service/annotation.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "service/apps.ts": {
+  "web/service/apps.ts": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "service/base.ts": {
+  "web/service/base.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "service/common.ts": {
+  "web/service/client.spec.ts": {
+    "next/no-assign-module-variable": {
+      "count": 1
+    }
+  },
+  "web/service/common.ts": {
     "ts/no-explicit-any": {
       "count": 29
     }
   },
-  "service/datasets.ts": {
+  "web/service/datasets.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "service/debug.ts": {
+  "web/service/debug.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "service/fetch.ts": {
+  "web/service/fetch.ts": {
     "regexp/no-unused-capturing-group": {
       "count": 1
     },
@@ -8158,12 +8206,12 @@
       "count": 2
     }
   },
-  "service/knowledge/use-dataset.ts": {
+  "web/service/knowledge/use-dataset.ts": {
     "@tanstack/query/exhaustive-deps": {
       "count": 1
     }
   },
-  "service/share.ts": {
+  "web/service/share.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
@@ -8171,17 +8219,17 @@
       "count": 3
     }
   },
-  "service/try-app.ts": {
+  "web/service/try-app.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
     }
   },
-  "service/use-apps.ts": {
+  "web/service/use-apps.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "service/use-common.ts": {
+  "web/service/use-common.ts": {
     "ts/no-empty-object-type": {
       "count": 1
     },
@@ -8189,27 +8237,27 @@
       "count": 1
     }
   },
-  "service/use-endpoints.ts": {
+  "web/service/use-endpoints.ts": {
     "ts/no-explicit-any": {
       "count": 7
     }
   },
-  "service/use-flow.ts": {
+  "web/service/use-flow.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 1
     }
   },
-  "service/use-pipeline.ts": {
+  "web/service/use-pipeline.ts": {
     "@tanstack/query/exhaustive-deps": {
       "count": 1
     }
   },
-  "service/use-plugins-auth.ts": {
+  "web/service/use-plugins-auth.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "service/use-plugins.ts": {
+  "web/service/use-plugins.ts": {
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -8223,12 +8271,12 @@
       "count": 1
     }
   },
-  "service/use-tools.ts": {
+  "web/service/use-tools.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "service/use-workflow.ts": {
+  "web/service/use-workflow.ts": {
     "@tanstack/query/exhaustive-deps": {
       "count": 1
     },
@@ -8236,12 +8284,12 @@
       "count": 3
     }
   },
-  "service/utils.spec.ts": {
+  "web/service/utils.spec.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "types/app.ts": {
+  "web/types/app.ts": {
     "erasable-syntax-only/enums": {
       "count": 9
     },
@@ -8249,62 +8297,62 @@
       "count": 1
     }
   },
-  "types/assets.d.ts": {
+  "web/types/assets.d.ts": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "types/common.ts": {
+  "web/types/common.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "types/feature.ts": {
+  "web/types/feature.ts": {
     "erasable-syntax-only/enums": {
       "count": 3
     }
   },
-  "types/lamejs.d.ts": {
+  "web/types/lamejs.d.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "types/pipeline.tsx": {
+  "web/types/pipeline.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "types/react-18-input-autosize.d.ts": {
+  "web/types/react-18-input-autosize.d.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "types/workflow.ts": {
+  "web/types/workflow.ts": {
     "ts/no-explicit-any": {
       "count": 17
     }
   },
-  "utils/clipboard.ts": {
+  "web/utils/clipboard.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "utils/completion-params.spec.ts": {
+  "web/utils/completion-params.spec.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "utils/completion-params.ts": {
+  "web/utils/completion-params.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "utils/context.ts": {
+  "web/utils/context.ts": {
     "react/component-hook-factories": {
       "count": 1
     }
   },
-  "utils/error-parser.ts": {
+  "web/utils/error-parser.ts": {
     "no-console": {
       "count": 1
     },
@@ -8312,17 +8360,17 @@
       "count": 1
     }
   },
-  "utils/get-icon.spec.ts": {
+  "web/utils/get-icon.spec.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "utils/gtag.ts": {
+  "web/utils/gtag.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "utils/index.spec.ts": {
+  "web/utils/index.spec.ts": {
     "test/no-identical-title": {
       "count": 2
     },
@@ -8330,37 +8378,37 @@
       "count": 8
     }
   },
-  "utils/index.ts": {
+  "web/utils/index.ts": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "utils/mcp.ts": {
+  "web/utils/mcp.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "utils/model-config.spec.ts": {
+  "web/utils/model-config.spec.ts": {
     "ts/no-explicit-any": {
       "count": 13
     }
   },
-  "utils/model-config.ts": {
+  "web/utils/model-config.ts": {
     "ts/no-explicit-any": {
       "count": 6
     }
   },
-  "utils/navigation.spec.ts": {
+  "web/utils/navigation.spec.ts": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "utils/tool-call.spec.ts": {
+  "web/utils/tool-call.spec.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "utils/validators.ts": {
+  "web/utils/validators.ts": {
     "ts/no-explicit-any": {
       "count": 2
     }
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 0000000000..5e81e95f2f
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,65 @@
+// @ts-check
+
+import antfu, { GLOB_MARKDOWN } from '@antfu/eslint-config'
+import md from 'eslint-markdown'
+import markdownPreferences from 'eslint-plugin-markdown-preferences'
+
+export default antfu(
+  {
+    ignores: original => [
+      '**',
+      '!packages/**',
+      '!web/**',
+      '!e2e/**',
+      '!eslint.config.mjs',
+      '!package.json',
+      '!vite.config.ts',
+      ...original,
+    ],
+    typescript: {
+      overrides: {
+        'ts/consistent-type-definitions': ['error', 'type'],
+        'ts/no-explicit-any': 'error',
+        'ts/no-redeclare': 'off',
+      },
+      erasableOnly: true,
+    },
+    test: {
+      overrides: {
+        'test/prefer-lowercase-title': 'off',
+      },
+    },
+    stylistic: {
+      overrides: {
+        'antfu/top-level-function': 'off',
+      },
+    },
+    e18e: false,
+    pnpm: false,
+  },
+  markdownPreferences.configs.standard,
+  {
+    files: [GLOB_MARKDOWN],
+    plugins: { md },
+    rules: {
+      'md/no-url-trailing-slash': 'error',
+      'markdown-preferences/prefer-link-reference-definitions': [
+        'error',
+        {
+          minLinks: 1,
+        },
+      ],
+      'markdown-preferences/ordered-list-marker-sequence': [
+        'error',
+        { increment: 'never' },
+      ],
+      'markdown-preferences/definitions-last': 'error',
+      'markdown-preferences/sort-definitions': 'error',
+    },
+  },
+  {
+    rules: {
+      'node/prefer-global/process': 'off',
+    },
+  },
+)
diff --git a/package.json b/package.json
index 47c8c170e5..5a67b66a9c 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,26 @@
 {
   "name": "dify",
+  "type": "module",
   "private": true,
-  "scripts": {
-    "prepare": "vp config",
-    "type-check": "vp run -r type-check"
-  },
-  "devDependencies": {
-    "vite": "catalog:",
-    "vite-plus": "catalog:"
-  },
+  "packageManager": "pnpm@10.33.0",
   "engines": {
     "node": "^22.22.1"
   },
-  "packageManager": "pnpm@10.33.0"
+  "scripts": {
+    "prepare": "vp config",
+    "type-check": "vp run -r type-check",
+    "lint": "eslint --cache --concurrency=auto",
+    "lint:ci": "eslint --cache --cache-strategy content --concurrency 2",
+    "lint:fix": "vp run lint --fix",
+    "lint:quiet": "vp run lint --quiet"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "catalog:",
+    "eslint": "catalog:",
+    "eslint-markdown": "catalog:",
+    "eslint-plugin-markdown-preferences": "catalog:",
+    "eslint-plugin-no-barrel-files": "catalog:",
+    "vite": "catalog:",
+    "vite-plus": "catalog:"
+  }
 }
diff --git a/packages/dify-ui/AGENTS.md b/packages/dify-ui/AGENTS.md
index 6875f8b4e9..ecc968e130 100644
--- a/packages/dify-ui/AGENTS.md
+++ b/packages/dify-ui/AGENTS.md
@@ -6,18 +6,18 @@ This package provides shared design tokens (colors, shadows, typography), the `c
 
 The Figma design system uses `--radius/*` tokens whose scale is **offset by one step** from Tailwind CSS v4 defaults. When translating Figma specs to code, always use this mapping — never use `radius-*` as a CSS class, and never extend `borderRadius` in the preset.
 
-| Figma Token | Value | Tailwind Class |
-|---|---|---|
-| `--radius/2xs` | 2px | `rounded-xs` |
-| `--radius/xs` | 4px | `rounded-sm` |
-| `--radius/sm` | 6px | `rounded-md` |
-| `--radius/md` | 8px | `rounded-lg` |
-| `--radius/lg` | 10px | `rounded-[10px]` |
-| `--radius/xl` | 12px | `rounded-xl` |
-| `--radius/2xl` | 16px | `rounded-2xl` |
-| `--radius/3xl` | 20px | `rounded-[20px]` |
-| `--radius/6xl` | 28px | `rounded-[28px]` |
-| `--radius/full` | 999px | `rounded-full` |
+| Figma Token     | Value | Tailwind Class   |
+| --------------- | ----- | ---------------- |
+| `--radius/2xs`  | 2px   | `rounded-xs`     |
+| `--radius/xs`   | 4px   | `rounded-sm`     |
+| `--radius/sm`   | 6px   | `rounded-md`     |
+| `--radius/md`   | 8px   | `rounded-lg`     |
+| `--radius/lg`   | 10px  | `rounded-[10px]` |
+| `--radius/xl`   | 12px  | `rounded-xl`     |
+| `--radius/2xl`  | 16px  | `rounded-2xl`    |
+| `--radius/3xl`  | 20px  | `rounded-[20px]` |
+| `--radius/6xl`  | 28px  | `rounded-[28px]` |
+| `--radius/full` | 999px | `rounded-full`   |
 
 ### Rules
 
diff --git a/packages/dify-ui/package.json b/packages/dify-ui/package.json
index ef731aec89..b54fde9b89 100644
--- a/packages/dify-ui/package.json
+++ b/packages/dify-ui/package.json
@@ -1,19 +1,22 @@
 {
   "name": "@langgenius/dify-ui",
+  "type": "module",
   "version": "0.0.1",
   "private": true,
-  "type": "module",
   "exports": {
     "./styles.css": "./src/styles/styles.css",
     "./tailwind-preset": {
-      "import": "./src/tailwind-preset.ts",
-      "types": "./src/tailwind-preset.ts"
+      "types": "./src/tailwind-preset.ts",
+      "import": "./src/tailwind-preset.ts"
     },
     "./cn": {
-      "import": "./src/cn.ts",
-      "types": "./src/cn.ts"
+      "types": "./src/cn.ts",
+      "import": "./src/cn.ts"
     }
   },
+  "scripts": {
+    "type-check": "tsc"
+  },
   "dependencies": {
     "clsx": "catalog:",
     "tailwind-merge": "catalog:"
@@ -22,8 +25,5 @@
     "@dify/tsconfig": "workspace:*",
     "tailwindcss": "catalog:",
     "typescript": "catalog:"
-  },
-  "scripts": {
-    "type-check": "tsc"
   }
 }
diff --git a/packages/dify-ui/tsconfig.json b/packages/dify-ui/tsconfig.json
index 243fc436d2..b31c48ead6 100644
--- a/packages/dify-ui/tsconfig.json
+++ b/packages/dify-ui/tsconfig.json
@@ -1,12 +1,12 @@
 {
   "extends": "@dify/tsconfig/base.json",
   "compilerOptions": {
-    "noEmit": false,
+    "rootDir": "src",
     "declaration": true,
     "declarationMap": true,
-    "sourceMap": true,
+    "noEmit": false,
     "outDir": "dist",
-    "rootDir": "src",
+    "sourceMap": true,
     "isolatedModules": true,
     "verbatimModuleSyntax": true
   },
diff --git a/packages/iconify-collections/custom-public/index.d.ts b/packages/iconify-collections/custom-public/index.d.ts
index ecca5633d4..be2442726c 100644
--- a/packages/iconify-collections/custom-public/index.d.ts
+++ b/packages/iconify-collections/custom-public/index.d.ts
@@ -1,4 +1,4 @@
-export interface IconifyJSON {
+export type IconifyJSON = {
   prefix: string
   icons: Record<string, IconifyIcon>
   aliases?: Record<string, IconifyAlias>
@@ -7,7 +7,7 @@ export interface IconifyJSON {
   lastModified?: number
 }
 
-export interface IconifyIcon {
+export type IconifyIcon = {
   body: string
   left?: number
   top?: number
@@ -18,11 +18,11 @@ export interface IconifyIcon {
   vFlip?: boolean
 }
 
-export interface IconifyAlias extends Omit<IconifyIcon, 'body'> {
+export type IconifyAlias = {
   parent: string
-}
+} & Omit<IconifyIcon, 'body'>
 
-export interface IconifyInfo {
+export type IconifyInfo = {
   prefix: string
   name: string
   total: number
@@ -40,11 +40,11 @@ export interface IconifyInfo {
   palette?: boolean
 }
 
-export interface IconifyMetaData {
+export type IconifyMetaData = {
   [key: string]: unknown
 }
 
-export interface IconifyChars {
+export type IconifyChars = {
   [key: string]: string
 }
 
@@ -52,4 +52,3 @@ export declare const icons: IconifyJSON
 export declare const info: IconifyInfo
 export declare const metadata: IconifyMetaData
 export declare const chars: IconifyChars
-
diff --git a/packages/iconify-collections/custom-public/index.js b/packages/iconify-collections/custom-public/index.js
index 81c1d0f5c4..aa7f8d5058 100644
--- a/packages/iconify-collections/custom-public/index.js
+++ b/packages/iconify-collections/custom-public/index.js
@@ -1,9 +1,8 @@
 'use strict'
 
+const chars = require('./chars.json')
 const icons = require('./icons.json')
 const info = require('./info.json')
 const metadata = require('./metadata.json')
-const chars = require('./chars.json')
 
 module.exports = { icons, info, metadata, chars }
-
diff --git a/packages/iconify-collections/custom-public/index.mjs b/packages/iconify-collections/custom-public/index.mjs
index 6c1108a92d..8e1c022130 100644
--- a/packages/iconify-collections/custom-public/index.mjs
+++ b/packages/iconify-collections/custom-public/index.mjs
@@ -1,7 +1,6 @@
+import chars from './chars.json' with { type: 'json' }
 import icons from './icons.json' with { type: 'json' }
 import info from './info.json' with { type: 'json' }
 import metadata from './metadata.json' with { type: 'json' }
-import chars from './chars.json' with { type: 'json' }
-
-export { icons, info, metadata, chars }
 
+export { chars, icons, info, metadata }
diff --git a/packages/iconify-collections/custom-vender/index.d.ts b/packages/iconify-collections/custom-vender/index.d.ts
index ecca5633d4..be2442726c 100644
--- a/packages/iconify-collections/custom-vender/index.d.ts
+++ b/packages/iconify-collections/custom-vender/index.d.ts
@@ -1,4 +1,4 @@
-export interface IconifyJSON {
+export type IconifyJSON = {
   prefix: string
   icons: Record<string, IconifyIcon>
   aliases?: Record<string, IconifyAlias>
@@ -7,7 +7,7 @@ export interface IconifyJSON {
   lastModified?: number
 }
 
-export interface IconifyIcon {
+export type IconifyIcon = {
   body: string
   left?: number
   top?: number
@@ -18,11 +18,11 @@ export interface IconifyIcon {
   vFlip?: boolean
 }
 
-export interface IconifyAlias extends Omit<IconifyIcon, 'body'> {
+export type IconifyAlias = {
   parent: string
-}
+} & Omit<IconifyIcon, 'body'>
 
-export interface IconifyInfo {
+export type IconifyInfo = {
   prefix: string
   name: string
   total: number
@@ -40,11 +40,11 @@ export interface IconifyInfo {
   palette?: boolean
 }
 
-export interface IconifyMetaData {
+export type IconifyMetaData = {
   [key: string]: unknown
 }
 
-export interface IconifyChars {
+export type IconifyChars = {
   [key: string]: string
 }
 
@@ -52,4 +52,3 @@ export declare const icons: IconifyJSON
 export declare const info: IconifyInfo
 export declare const metadata: IconifyMetaData
 export declare const chars: IconifyChars
-
diff --git a/packages/iconify-collections/custom-vender/index.js b/packages/iconify-collections/custom-vender/index.js
index 81c1d0f5c4..aa7f8d5058 100644
--- a/packages/iconify-collections/custom-vender/index.js
+++ b/packages/iconify-collections/custom-vender/index.js
@@ -1,9 +1,8 @@
 'use strict'
 
+const chars = require('./chars.json')
 const icons = require('./icons.json')
 const info = require('./info.json')
 const metadata = require('./metadata.json')
-const chars = require('./chars.json')
 
 module.exports = { icons, info, metadata, chars }
-
diff --git a/packages/iconify-collections/custom-vender/index.mjs b/packages/iconify-collections/custom-vender/index.mjs
index 6c1108a92d..8e1c022130 100644
--- a/packages/iconify-collections/custom-vender/index.mjs
+++ b/packages/iconify-collections/custom-vender/index.mjs
@@ -1,7 +1,6 @@
+import chars from './chars.json' with { type: 'json' }
 import icons from './icons.json' with { type: 'json' }
 import info from './info.json' with { type: 'json' }
 import metadata from './metadata.json' with { type: 'json' }
-import chars from './chars.json' with { type: 'json' }
-
-export { icons, info, metadata, chars }
 
+export { chars, icons, info, metadata }
diff --git a/packages/iconify-collections/package.json b/packages/iconify-collections/package.json
index 3bd7285f1a..07c29f0a07 100644
--- a/packages/iconify-collections/package.json
+++ b/packages/iconify-collections/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@dify/iconify-collections",
-  "private": true,
   "version": "0.0.0-private",
+  "private": true,
   "exports": {
     "./custom-public": {
       "types": "./custom-public/index.d.ts",
-      "require": "./custom-public/index.js",
-      "import": "./custom-public/index.mjs"
+      "import": "./custom-public/index.mjs",
+      "require": "./custom-public/index.js"
     },
     "./custom-public/icons.json": "./custom-public/icons.json",
     "./custom-public/info.json": "./custom-public/info.json",
@@ -14,8 +14,8 @@
     "./custom-public/chars.json": "./custom-public/chars.json",
     "./custom-vender": {
       "types": "./custom-vender/index.d.ts",
-      "require": "./custom-vender/index.js",
-      "import": "./custom-vender/index.mjs"
+      "import": "./custom-vender/index.mjs",
+      "require": "./custom-vender/index.js"
     },
     "./custom-vender/icons.json": "./custom-vender/icons.json",
     "./custom-vender/info.json": "./custom-vender/info.json",
diff --git a/packages/migrate-no-unchecked-indexed-access/package.json b/packages/migrate-no-unchecked-indexed-access/package.json
index cea9dcde60..5da8d4cb50 100644
--- a/packages/migrate-no-unchecked-indexed-access/package.json
+++ b/packages/migrate-no-unchecked-indexed-access/package.json
@@ -1,8 +1,8 @@
 {
   "name": "migrate-no-unchecked-indexed-access",
-  "private": true,
-  "version": "0.0.0-private",
   "type": "module",
+  "version": "0.0.0-private",
+  "private": true,
   "bin": {
     "migrate-no-unchecked-indexed-access": "./bin/migrate-no-unchecked-indexed-access.js"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2301b5b281..914bc342e2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -574,6 +574,21 @@ importers:
 
   .:
     devDependencies:
+      '@antfu/eslint-config':
+        specifier: 'catalog:'
+        version: 8.2.0(@eslint-react/eslint-plugin@3.0.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@next/eslint-plugin-next@16.2.3)(@typescript-eslint/rule-tester@8.57.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.2))(@typescript-eslint/utils@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@vue/compiler-sfc@3.5.31)(eslint-plugin-react-refresh@0.5.2(eslint@10.2.0(jiti@2.6.1)))(eslint@10.2.0(jiti@2.6.1))(oxlint@1.60.0(oxlint-tsgolint@0.20.0))(typescript@6.0.2)(vitest@4.1.4)
+      eslint:
+        specifier: 'catalog:'
+        version: 10.2.0(jiti@2.6.1)
+      eslint-markdown:
+        specifier: 'catalog:'
+        version: 0.6.1(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-markdown-preferences:
+        specifier: 'catalog:'
+        version: 0.41.1(@eslint/markdown@8.0.1)(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-no-barrel-files:
+        specifier: 'catalog:'
+        version: 1.3.1(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
       vite:
         specifier: npm:@voidzero-dev/vite-plus-core@0.1.18
         version: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
@@ -4532,15 +4547,38 @@ packages:
   '@vitest/expect@3.2.4':
     resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==}
 
+  '@vitest/expect@4.1.4':
+    resolution: {integrity: sha512-iPBpra+VDuXmBFI3FMKHSFXp3Gx5HfmSCE8X67Dn+bwephCnQCaB7qWK2ldHa+8ncN8hJU8VTMcxjPpyMkUjww==}
+
+  '@vitest/mocker@4.1.4':
+    resolution: {integrity: sha512-R9HTZBhW6yCSGbGQnDnH3QHfJxokKN4KB+Yvk9Q1le7eQNYwiCyKxmLmurSpFy6BzJanSLuEUDrD+j97Q+ZLPg==}
+    peerDependencies:
+      msw: ^2.4.9
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
+    peerDependenciesMeta:
+      msw:
+        optional: true
+      vite:
+        optional: true
+
   '@vitest/pretty-format@3.2.4':
     resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==}
 
   '@vitest/pretty-format@4.1.4':
     resolution: {integrity: sha512-ddmDHU0gjEUyEVLxtZa7xamrpIefdEETu3nZjWtHeZX4QxqJ7tRxSteHVXJOcr8jhiLoGAhkK4WJ3WqBpjx42A==}
 
+  '@vitest/runner@4.1.4':
+    resolution: {integrity: sha512-xTp7VZ5aXP5ZJrn15UtJUWlx6qXLnGtF6jNxHepdPHpMfz/aVPx+htHtgcAL2mDXJgKhpoo2e9/hVJsIeFbytQ==}
+
+  '@vitest/snapshot@4.1.4':
+    resolution: {integrity: sha512-MCjCFgaS8aZz+m5nTcEcgk/xhWv0rEH4Yl53PPlMXOZ1/Ka2VcZU6CJ+MgYCZbcJvzGhQRjVrGQNZqkGPttIKw==}
+
   '@vitest/spy@3.2.4':
     resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==}
 
+  '@vitest/spy@4.1.4':
+    resolution: {integrity: sha512-XxNdAsKW7C+FLydqFJLb5KhJtl3PGCMmYwFRfhvIgxJvLSXhhVI1zM8f1qD3Zg7RCjTSzDVyct6sghs9UEgBEQ==}
+
   '@vitest/utils@3.2.4':
     resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
 
@@ -5006,6 +5044,10 @@ packages:
     resolution: {integrity: sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==}
     engines: {node: '>=18'}
 
+  chai@6.2.2:
+    resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
+    engines: {node: '>=18'}
+
   chalk@4.1.1:
     resolution: {integrity: sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==}
     engines: {node: '>=10'}
@@ -5970,6 +6012,10 @@ packages:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
 
+  expect-type@1.3.0:
+    resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}
+    engines: {node: '>=12.0.0'}
+
   exsolve@1.0.8:
     resolution: {integrity: sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==}
 
@@ -7810,6 +7856,9 @@ packages:
     resolution: {integrity: sha512-eAVKTMedR5ckPo4xne/PjYQYrU3qx78gtJZ+sHlXEg5IHhhoQhMfZVzetTYuaJS0L2Ef3AcCRzCHV8T0WI6nIQ==}
     engines: {node: '>=20'}
 
+  siginfo@2.0.0:
+    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
+
   simple-concat@1.0.1:
     resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
 
@@ -7882,6 +7931,9 @@ packages:
     engines: {node: '>=20.16.0'}
     hasBin: true
 
+  stackback@0.0.2:
+    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
+
   stackframe@1.3.4:
     resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==}
 
@@ -8479,6 +8531,47 @@ packages:
     peerDependencies:
       vitest: ^3.0.0 || ^4.0.0
 
+  vitest@4.1.4:
+    resolution: {integrity: sha512-tFuJqTxKb8AvfyqMfnavXdzfy3h3sWZRWwfluGbkeR7n0HUev+FmNgZ8SDrRBTVrVCjgH5cA21qGbCffMNtWvg==}
+    engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@opentelemetry/api': ^1.9.0
+      '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
+      '@vitest/browser-playwright': 4.1.4
+      '@vitest/browser-preview': 4.1.4
+      '@vitest/browser-webdriverio': 4.1.4
+      '@vitest/coverage-istanbul': 4.1.4
+      '@vitest/coverage-v8': 4.1.4
+      '@vitest/ui': 4.1.4
+      happy-dom: '*'
+      jsdom: '*'
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@opentelemetry/api':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser-playwright':
+        optional: true
+      '@vitest/browser-preview':
+        optional: true
+      '@vitest/browser-webdriverio':
+        optional: true
+      '@vitest/coverage-istanbul':
+        optional: true
+      '@vitest/coverage-v8':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+
   void-elements@3.1.0:
     resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
     engines: {node: '>=0.10.0'}
@@ -8558,6 +8651,11 @@ packages:
     engines: {node: '>= 8'}
     hasBin: true
 
+  why-is-node-running@2.3.0:
+    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
+    engines: {node: '>=8'}
+    hasBin: true
+
   word-wrap@1.2.5:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
@@ -8905,6 +9003,60 @@ snapshots:
       - typescript
       - vitest
 
+  '@antfu/eslint-config@8.2.0(@eslint-react/eslint-plugin@3.0.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@next/eslint-plugin-next@16.2.3)(@typescript-eslint/rule-tester@8.57.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.2))(@typescript-eslint/utils@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@vue/compiler-sfc@3.5.31)(eslint-plugin-react-refresh@0.5.2(eslint@10.2.0(jiti@2.6.1)))(eslint@10.2.0(jiti@2.6.1))(oxlint@1.60.0(oxlint-tsgolint@0.20.0))(typescript@6.0.2)(vitest@4.1.4)':
+    dependencies:
+      '@antfu/install-pkg': 1.1.0
+      '@clack/prompts': 1.2.0
+      '@e18e/eslint-plugin': 0.3.0(eslint@10.2.0(jiti@2.6.1))(oxlint@1.60.0(oxlint-tsgolint@0.20.0))
+      '@eslint-community/eslint-plugin-eslint-comments': 4.7.1(eslint@10.2.0(jiti@2.6.1))
+      '@eslint/markdown': 8.0.1
+      '@stylistic/eslint-plugin': 5.10.0(eslint@10.2.0(jiti@2.6.1))
+      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
+      '@typescript-eslint/parser': 8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
+      '@vitest/eslint-plugin': 1.6.15(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)(vitest@4.1.4)
+      ansis: 4.2.0
+      cac: 7.0.0
+      eslint: 10.2.0(jiti@2.6.1)
+      eslint-config-flat-gitignore: 2.3.0(eslint@10.2.0(jiti@2.6.1))
+      eslint-flat-config-utils: 3.1.0
+      eslint-merge-processors: 2.0.0(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-antfu: 3.2.2(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-command: 3.5.2(@typescript-eslint/rule-tester@8.57.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.2))(@typescript-eslint/utils@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-import-lite: 0.6.0(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-jsdoc: 62.9.0(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-jsonc: 3.1.2(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-n: 17.24.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
+      eslint-plugin-no-only-tests: 3.3.0
+      eslint-plugin-perfectionist: 5.8.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
+      eslint-plugin-pnpm: 1.6.0(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-regexp: 3.1.0(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-toml: 1.3.1(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-unicorn: 64.0.0(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-unused-imports: 4.4.1(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))
+      eslint-plugin-vue: 10.8.0(@stylistic/eslint-plugin@5.10.0(eslint@10.2.0(jiti@2.6.1)))(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(vue-eslint-parser@10.4.0(eslint@10.2.0(jiti@2.6.1)))
+      eslint-plugin-yml: 3.3.1(eslint@10.2.0(jiti@2.6.1))
+      eslint-processor-vue-blocks: 2.0.0(@vue/compiler-sfc@3.5.31)(eslint@10.2.0(jiti@2.6.1))
+      globals: 17.5.0
+      local-pkg: 1.1.2
+      parse-gitignore: 2.0.0
+      toml-eslint-parser: 1.0.3
+      vue-eslint-parser: 10.4.0(eslint@10.2.0(jiti@2.6.1))
+      yaml-eslint-parser: 2.0.0
+    optionalDependencies:
+      '@eslint-react/eslint-plugin': 3.0.0(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
+      '@next/eslint-plugin-next': 16.2.3
+      eslint-plugin-react-refresh: 0.5.2(eslint@10.2.0(jiti@2.6.1))
+    transitivePeerDependencies:
+      - '@eslint/json'
+      - '@typescript-eslint/rule-tester'
+      - '@typescript-eslint/typescript-estree'
+      - '@typescript-eslint/utils'
+      - '@vue/compiler-sfc'
+      - oxlint
+      - supports-color
+      - typescript
+      - vitest
+
   '@antfu/install-pkg@1.1.0':
     dependencies:
       package-manager-detector: 1.6.0
@@ -12043,6 +12195,21 @@ snapshots:
       tinyrainbow: 3.1.0
       vitest: '@voidzero-dev/vite-plus-test@0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
 
+  '@vitest/coverage-v8@4.1.4(vitest@4.1.4)':
+    dependencies:
+      '@bcoe/v8-coverage': 1.0.2
+      '@vitest/utils': 4.1.4
+      ast-v8-to-istanbul: 1.0.0
+      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-report: 3.0.1
+      istanbul-reports: 3.2.0
+      magicast: 0.5.2
+      obug: 2.1.1
+      std-env: 4.0.0
+      tinyrainbow: 3.1.0
+      vitest: 4.1.4(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)
+    optional: true
+
   '@vitest/eslint-plugin@1.6.15(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(@voidzero-dev/vite-plus-test@0.1.18)(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.58.2
@@ -12055,6 +12222,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@vitest/eslint-plugin@1.6.15(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)(vitest@4.1.4)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 8.58.2
+      '@typescript-eslint/utils': 8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
+      eslint: 10.2.0(jiti@2.6.1)
+    optionalDependencies:
+      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2))(eslint@10.2.0(jiti@2.6.1))(typescript@6.0.2)
+      typescript: 6.0.2
+      vitest: 4.1.4(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
   '@vitest/expect@3.2.4':
     dependencies:
       '@types/chai': 5.2.3
@@ -12063,6 +12242,25 @@ snapshots:
       chai: 5.3.3
       tinyrainbow: 2.0.0
 
+  '@vitest/expect@4.1.4':
+    dependencies:
+      '@standard-schema/spec': 1.1.0
+      '@types/chai': 5.2.3
+      '@vitest/spy': 4.1.4
+      '@vitest/utils': 4.1.4
+      chai: 6.2.2
+      tinyrainbow: 3.1.0
+    optional: true
+
+  '@vitest/mocker@4.1.4(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))':
+    dependencies:
+      '@vitest/spy': 4.1.4
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+    optional: true
+
   '@vitest/pretty-format@3.2.4':
     dependencies:
       tinyrainbow: 2.0.0
@@ -12071,10 +12269,27 @@ snapshots:
     dependencies:
       tinyrainbow: 3.1.0
 
+  '@vitest/runner@4.1.4':
+    dependencies:
+      '@vitest/utils': 4.1.4
+      pathe: 2.0.3
+    optional: true
+
+  '@vitest/snapshot@4.1.4':
+    dependencies:
+      '@vitest/pretty-format': 4.1.4
+      '@vitest/utils': 4.1.4
+      magic-string: 0.30.21
+      pathe: 2.0.3
+    optional: true
+
   '@vitest/spy@3.2.4':
     dependencies:
       tinyspy: 4.0.4
 
+  '@vitest/spy@4.1.4':
+    optional: true
+
   '@vitest/utils@3.2.4':
     dependencies:
       '@vitest/pretty-format': 3.2.4
@@ -12509,6 +12724,9 @@ snapshots:
       loupe: 3.2.1
       pathval: 2.0.1
 
+  chai@6.2.2:
+    optional: true
+
   chalk@4.1.1:
     dependencies:
       ansi-styles: 4.3.0
@@ -13335,7 +13553,7 @@ snapshots:
       jsonc-eslint-parser: 3.1.0
       pathe: 2.0.3
       pnpm-workspace-yaml: 1.6.0
-      tinyglobby: 0.2.15
+      tinyglobby: 0.2.16
       yaml: 2.8.3
       yaml-eslint-parser: 2.0.0
 
@@ -13703,6 +13921,9 @@ snapshots:
   expand-template@2.0.3:
     optional: true
 
+  expect-type@1.3.0:
+    optional: true
+
   exsolve@1.0.8: {}
 
   extend@3.0.2: {}
@@ -16092,6 +16313,9 @@ snapshots:
       '@shikijs/vscode-textmate': 10.0.2
       '@types/hast': 3.0.4
 
+  siginfo@2.0.0:
+    optional: true
+
   simple-concat@1.0.1:
     optional: true
 
@@ -16174,6 +16398,9 @@ snapshots:
 
   srvx@0.11.15: {}
 
+  stackback@0.0.2:
+    optional: true
+
   stackframe@1.3.4: {}
 
   state-local@1.0.7: {}
@@ -16815,6 +17042,36 @@ snapshots:
       moo-color: 1.0.3
       vitest: '@voidzero-dev/vite-plus-test@0.1.18(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
 
+  vitest@4.1.4(@types/node@25.6.0)(@vitest/coverage-v8@4.1.4)(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))(happy-dom@20.9.0):
+    dependencies:
+      '@vitest/expect': 4.1.4
+      '@vitest/mocker': 4.1.4(@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3))
+      '@vitest/pretty-format': 4.1.4
+      '@vitest/runner': 4.1.4
+      '@vitest/snapshot': 4.1.4
+      '@vitest/spy': 4.1.4
+      '@vitest/utils': 4.1.4
+      es-module-lexer: 2.0.0
+      expect-type: 1.3.0
+      magic-string: 0.30.21
+      obug: 2.1.1
+      pathe: 2.0.3
+      picomatch: 4.0.4
+      std-env: 4.0.0
+      tinybench: 2.9.0
+      tinyexec: 1.0.4
+      tinyglobby: 0.2.16
+      tinyrainbow: 3.1.0
+      vite: '@voidzero-dev/vite-plus-core@0.1.18(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3)'
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/node': 25.6.0
+      '@vitest/coverage-v8': 4.1.4(vitest@4.1.4)
+      happy-dom: 20.9.0
+    transitivePeerDependencies:
+      - msw
+    optional: true
+
   void-elements@3.1.0: {}
 
   vscode-jsonrpc@8.2.0: {}
@@ -16905,6 +17162,12 @@ snapshots:
     dependencies:
       isexe: 2.0.0
 
+  why-is-node-running@2.3.0:
+    dependencies:
+      siginfo: 2.0.0
+      stackback: 0.0.2
+    optional: true
+
   word-wrap@1.2.5: {}
 
   wrappy@1.0.2: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 433bb467c8..0bd1303fb3 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -4,93 +4,93 @@ packages:
   - sdks/nodejs-client
   - packages/*
 allowBuilds:
-  "@parcel/watcher": false
+  '@parcel/watcher': false
   canvas: false
   esbuild: false
   sharp: false
 blockExoticSubdeps: true
 catalog:
-  "@amplitude/analytics-browser": 2.39.0
-  "@amplitude/plugin-session-replay-browser": 1.27.7
-  "@antfu/eslint-config": 8.2.0
-  "@base-ui/react": 1.4.0
-  "@chromatic-com/storybook": 5.1.2
-  "@cucumber/cucumber": 12.8.0
-  "@date-fns/tz": 1.4.1
-  "@egoist/tailwindcss-icons": 1.9.2
-  "@emoji-mart/data": 1.2.1
-  "@eslint-react/eslint-plugin": 3.0.0
-  "@eslint/js": 10.0.1
-  "@floating-ui/react": 0.27.19
-  "@formatjs/intl-localematcher": 0.8.3
-  "@headlessui/react": 2.2.10
-  "@heroicons/react": 2.2.0
-  "@hono/node-server": 1.19.14
-  "@iconify-json/heroicons": 1.2.3
-  "@iconify-json/ri": 1.2.10
-  "@lexical/code": 0.43.0
-  "@lexical/link": 0.43.0
-  "@lexical/list": 0.43.0
-  "@lexical/react": 0.43.0
-  "@lexical/selection": 0.43.0
-  "@lexical/text": 0.43.0
-  "@lexical/utils": 0.43.0
-  "@mdx-js/loader": 3.1.1
-  "@mdx-js/react": 3.1.1
-  "@mdx-js/rollup": 3.1.1
-  "@monaco-editor/react": 4.7.0
-  "@next/eslint-plugin-next": 16.2.3
-  "@next/mdx": 16.2.3
-  "@orpc/client": 1.13.14
-  "@orpc/contract": 1.13.14
-  "@orpc/openapi-client": 1.13.14
-  "@orpc/tanstack-query": 1.13.14
-  "@playwright/test": 1.59.1
-  "@remixicon/react": 4.9.0
-  "@rgrove/parse-xml": 4.2.0
-  "@sentry/react": 10.48.0
-  "@storybook/addon-docs": 10.3.5
-  "@storybook/addon-links": 10.3.5
-  "@storybook/addon-onboarding": 10.3.5
-  "@storybook/addon-themes": 10.3.5
-  "@storybook/nextjs-vite": 10.3.5
-  "@storybook/react": 10.3.5
-  "@streamdown/math": 1.0.2
-  "@svgdotjs/svg.js": 3.2.5
-  "@t3-oss/env-nextjs": 0.13.11
-  "@tailwindcss/postcss": 4.2.2
-  "@tailwindcss/typography": 0.5.19
-  "@tailwindcss/vite": 4.2.2
-  "@tanstack/eslint-plugin-query": 5.99.0
-  "@tanstack/react-devtools": 0.10.2
-  "@tanstack/react-form": 1.29.0
-  "@tanstack/react-form-devtools": 0.2.21
-  "@tanstack/react-query": 5.99.0
-  "@tanstack/react-query-devtools": 5.99.0
-  "@tanstack/react-virtual": 3.13.23
-  "@testing-library/dom": 10.4.1
-  "@testing-library/jest-dom": 6.9.1
-  "@testing-library/react": 16.3.2
-  "@testing-library/user-event": 14.6.1
+  '@amplitude/analytics-browser': 2.39.0
+  '@amplitude/plugin-session-replay-browser': 1.27.7
+  '@antfu/eslint-config': 8.2.0
+  '@base-ui/react': 1.4.0
+  '@chromatic-com/storybook': 5.1.2
+  '@cucumber/cucumber': 12.8.0
+  '@date-fns/tz': 1.4.1
+  '@egoist/tailwindcss-icons': 1.9.2
+  '@emoji-mart/data': 1.2.1
+  '@eslint-react/eslint-plugin': 3.0.0
+  '@eslint/js': 10.0.1
+  '@floating-ui/react': 0.27.19
+  '@formatjs/intl-localematcher': 0.8.3
+  '@headlessui/react': 2.2.10
+  '@heroicons/react': 2.2.0
+  '@hono/node-server': 1.19.14
+  '@iconify-json/heroicons': 1.2.3
+  '@iconify-json/ri': 1.2.10
+  '@lexical/code': 0.43.0
+  '@lexical/link': 0.43.0
+  '@lexical/list': 0.43.0
+  '@lexical/react': 0.43.0
+  '@lexical/selection': 0.43.0
+  '@lexical/text': 0.43.0
+  '@lexical/utils': 0.43.0
+  '@mdx-js/loader': 3.1.1
+  '@mdx-js/react': 3.1.1
+  '@mdx-js/rollup': 3.1.1
+  '@monaco-editor/react': 4.7.0
+  '@next/eslint-plugin-next': 16.2.3
+  '@next/mdx': 16.2.3
+  '@orpc/client': 1.13.14
+  '@orpc/contract': 1.13.14
+  '@orpc/openapi-client': 1.13.14
+  '@orpc/tanstack-query': 1.13.14
+  '@playwright/test': 1.59.1
+  '@remixicon/react': 4.9.0
+  '@rgrove/parse-xml': 4.2.0
+  '@sentry/react': 10.48.0
+  '@storybook/addon-docs': 10.3.5
+  '@storybook/addon-links': 10.3.5
+  '@storybook/addon-onboarding': 10.3.5
+  '@storybook/addon-themes': 10.3.5
+  '@storybook/nextjs-vite': 10.3.5
+  '@storybook/react': 10.3.5
+  '@streamdown/math': 1.0.2
+  '@svgdotjs/svg.js': 3.2.5
+  '@t3-oss/env-nextjs': 0.13.11
+  '@tailwindcss/postcss': 4.2.2
+  '@tailwindcss/typography': 0.5.19
+  '@tailwindcss/vite': 4.2.2
+  '@tanstack/eslint-plugin-query': 5.99.0
+  '@tanstack/react-devtools': 0.10.2
+  '@tanstack/react-form': 1.29.0
+  '@tanstack/react-form-devtools': 0.2.21
+  '@tanstack/react-query': 5.99.0
+  '@tanstack/react-query-devtools': 5.99.0
+  '@tanstack/react-virtual': 3.13.23
+  '@testing-library/dom': 10.4.1
+  '@testing-library/jest-dom': 6.9.1
+  '@testing-library/react': 16.3.2
+  '@testing-library/user-event': 14.6.1
   '@tsdown/css': 0.21.8
-  "@tsslint/cli": 3.0.3
-  "@tsslint/compat-eslint": 3.0.3
-  "@tsslint/config": 3.0.3
-  "@types/js-cookie": 3.0.6
-  "@types/js-yaml": 4.0.9
-  "@types/negotiator": 0.6.4
-  "@types/node": 25.6.0
-  "@types/postcss-js": 4.1.0
-  "@types/qs": 6.15.0
-  "@types/react": 19.2.14
-  "@types/react-dom": 19.2.3
-  "@types/sortablejs": 1.15.9
-  "@typescript-eslint/eslint-plugin": 8.58.2
-  "@typescript-eslint/parser": 8.58.2
-  "@typescript/native-preview": 7.0.0-dev.20260413.1
-  "@vitejs/plugin-react": 6.0.1
-  "@vitejs/plugin-rsc": 0.5.24
-  "@vitest/coverage-v8": 4.1.4
+  '@tsslint/cli': 3.0.3
+  '@tsslint/compat-eslint': 3.0.3
+  '@tsslint/config': 3.0.3
+  '@types/js-cookie': 3.0.6
+  '@types/js-yaml': 4.0.9
+  '@types/negotiator': 0.6.4
+  '@types/node': 25.6.0
+  '@types/postcss-js': 4.1.0
+  '@types/qs': 6.15.0
+  '@types/react': 19.2.14
+  '@types/react-dom': 19.2.3
+  '@types/sortablejs': 1.15.9
+  '@typescript-eslint/eslint-plugin': 8.58.2
+  '@typescript-eslint/parser': 8.58.2
+  '@typescript/native-preview': 7.0.0-dev.20260413.1
+  '@vitejs/plugin-react': 6.0.1
+  '@vitejs/plugin-rsc': 0.5.24
+  '@vitest/coverage-v8': 4.1.4
   abcjs: 6.6.2
   agentation: 3.0.2
   ahooks: 3.9.7
@@ -200,8 +200,8 @@ catalog:
   zustand: 5.0.12
 catalogMode: prefer
 overrides:
-  "@lexical/code": npm:lexical-code-no-prism@0.41.0
-  "@monaco-editor/loader": 1.7.0
+  '@lexical/code': npm:lexical-code-no-prism@0.41.0
+  '@monaco-editor/loader': 1.7.0
   brace-expansion@>=2.0.0 <2.0.3: 2.0.3
   canvas: ^3.2.2
   dompurify@>=3.1.3 <=3.3.1: 3.3.2
diff --git a/vite.config.ts b/vite.config.ts
index a34932a4ef..aebcaf8f73 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,5 +1,7 @@
 import { defineConfig } from 'vite-plus'
 
 export default defineConfig({
-  staged: {},
+  staged: {
+    '*': 'eslint --fix --pass-on-unpruned-suppressions',
+  },
 })
diff --git a/web/.gitignore b/web/.gitignore
index a4ae324795..9de3dc83f9 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -64,5 +64,3 @@ public/fallback-*.js
 
 .vscode/settings.json
 .vscode/mcp.json
-
-.eslintcache
diff --git a/web/README.md b/web/README.md
index 382c804264..683a18c769 100644
--- a/web/README.md
+++ b/web/README.md
@@ -106,7 +106,7 @@ Open <http://localhost:6006> with your browser to see the result.
 
 ## Lint Code
 
-If your IDE is VSCode, rename `web/.vscode/settings.example.json` to `web/.vscode/settings.json` for lint code setting.
+If your IDE is VSCode, rename `.vscode/settings.example.json` to `.vscode/settings.json` for lint code setting.
 
 Then follow the [Lint Documentation] to lint the code.
 
diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs
index 0fe2a56c03..73a30fc072 100644
--- a/web/eslint.config.mjs
+++ b/web/eslint.config.mjs
@@ -1,5 +1,6 @@
 // @ts-check
 
+import path from 'node:path'
 import antfu, { GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_TESTS, GLOB_TS, GLOB_TSX, isInEditorEnv, isInGitHooksOrLintStaged } from '@antfu/eslint-config'
 import pluginQuery from '@tanstack/eslint-plugin-query'
 import md from 'eslint-markdown'
@@ -32,11 +33,6 @@ export default antfu(
         'react/no-unnecessary-use-prefix': 'error',
       },
     },
-    nextjs: {
-      overrides: {
-        'next/no-img-element': 'off',
-      },
-    },
     ignores: ['public', 'types/doc-paths.ts', 'eslint-suppressions.json'],
     typescript: {
       overrides: {
@@ -134,7 +130,8 @@ export default antfu(
     },
     settings: {
       'better-tailwindcss': {
-        entryPoint: 'app/styles/globals.css',
+        cwd: import.meta.dirname,
+        entryPoint: path.resolve(import.meta.dirname, './app/styles/globals.css'),
       },
     },
   },
diff --git a/web/package.json b/web/package.json
index eeb3c94460..543181bd97 100644
--- a/web/package.json
+++ b/web/package.json
@@ -34,10 +34,6 @@
     "gen-icons": "pnpm --filter @dify/iconify-collections generate && node ./scripts/gen-icons.mjs && eslint --fix app/components/base/icons/src/",
     "i18n:check": "tsx ./scripts/check-i18n.js",
     "knip": "knip",
-    "lint": "eslint --cache --concurrency=auto",
-    "lint:ci": "eslint --cache --cache-strategy content --concurrency 2",
-    "lint:fix": "vp run lint --fix",
-    "lint:quiet": "vp run lint --quiet",
     "lint:tss": "tsslint --project tsconfig.json",
     "preinstall": "npx only-allow pnpm",
     "refactor-component": "node ./scripts/refactor-component.js",
diff --git a/web/vite.config.ts b/web/vite.config.ts
index d17a6d4045..60c406aa35 100644
--- a/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -19,9 +19,6 @@ export default defineConfig(({ mode }) => {
     || process.argv.some(arg => arg.toLowerCase().includes('storybook'))
 
   return {
-    staged: {
-      '*': 'eslint --fix --pass-on-unpruned-suppressions',
-    },
     plugins: isTest
       ? [
           nextStaticImageTestPlugin({ projectRoot }),

From 6ca066983d12fefe4c9a8e6cc1f39a288d804ce4 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Fri, 17 Apr 2026 01:11:06 +0800
Subject: [PATCH 25/36] chore: auto fix for tailwind rules (#35332)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 eslint-suppressions.json                      | 1416 -----------------
 web/.storybook/utils/form-story-wrapper.tsx   |    2 +-
 .../[appId]/overview/chart-view.tsx           |    2 +-
 .../[datasetId]/settings/page.tsx             |    2 +-
 .../components/authenticated-layout.tsx       |    2 +-
 web/app/(shareLayout)/components/splash.tsx   |    2 +-
 web/app/(shareLayout)/webapp-signin/page.tsx  |    2 +-
 web/app/components/app-sidebar/basic.tsx      |    8 +-
 .../app-sidebar/dataset-info/menu-item.tsx    |    2 +-
 .../add-annotation-modal/edit-item/index.tsx  |    2 +-
 .../csv-downloader.tsx                        |   14 +-
 .../edit-annotation-modal/index.tsx           |    4 +-
 .../app/annotation/empty-element.tsx          |    4 +-
 .../specific-groups-or-members.tsx            |    6 +-
 .../configuration/base/group-name/index.tsx   |    2 +-
 .../configuration/base/warning-mask/index.tsx |    2 +-
 .../config-var/input-type-icon.tsx            |    2 +-
 .../config-vision/param-config-content.tsx    |    8 +-
 .../config/automatic/res-placeholder.tsx      |    2 +-
 .../params-config/weighted-score.tsx          |    6 +-
 .../debug-with-multiple-model/debug-item.tsx  |    2 +-
 .../debug/debug-with-multiple-model/index.tsx |    2 +-
 web/app/components/app/log/empty-element.tsx  |    4 +-
 web/app/components/app/log/index.tsx          |    2 +-
 .../app/text-generate/item/result-tab.tsx     |    4 +-
 .../components/app/workflow-log/detail.tsx    |    4 +-
 web/app/components/apps/footer.tsx            |    4 +-
 web/app/components/apps/list.tsx              |    2 +-
 .../base/agent-log-modal/result.tsx           |    2 +-
 .../base/app-icon/index.stories.tsx           |    2 +-
 .../header/mobile-operation-dropdown.tsx      |    4 +-
 .../inputs-form/view-form-dropdown.tsx        |    2 +-
 .../chat/chat-with-history/sidebar/list.tsx   |    2 +-
 .../human-input-content/executed-action.tsx   |    6 +-
 .../chat/answer/human-input-content/tips.tsx  |    6 +-
 .../components/base/chat/chat/answer/more.tsx |    2 +-
 .../base/chat/chat/citation/index.tsx         |   10 +-
 .../base/chat/chat/citation/popup.tsx         |   18 +-
 .../chat/chat/citation/progress-tooltip.tsx   |    2 +-
 .../base/chat/chat/citation/tooltip.tsx       |    2 +-
 .../components/base/content-dialog/index.tsx  |    2 +-
 web/app/components/base/copy-icon/index.tsx   |    4 +-
 .../base/corner-label/index.stories.tsx       |    2 +-
 .../calendar/days-of-week.tsx                 |    2 +-
 .../date-picker/header.tsx                    |    2 +-
 .../time-picker/header.tsx                    |    2 +-
 .../year-and-month-picker/header.tsx          |    2 +-
 .../components/base/effect/index.stories.tsx  |    4 +-
 .../annotation-reply/config-param.tsx         |    4 +-
 .../annotation-reply/score-slider/index.tsx   |    2 +-
 .../base/features/new-feature-panel/index.tsx |    4 +-
 .../base/file-icon/index.stories.tsx          |    2 +-
 .../base/file-uploader/audio-preview.tsx      |    2 +-
 .../base/file-uploader/pdf-preview.tsx        |    6 +-
 .../base/file-uploader/video-preview.tsx      |    2 +-
 .../mixed-variable-text-input/placeholder.tsx |    4 +-
 .../base/grid-mask/index.stories.tsx          |    6 +-
 .../base/image-uploader/audio-preview.tsx     |    2 +-
 .../image-uploader/image-list.stories.tsx     |    4 +-
 .../base/image-uploader/image-preview.tsx     |   12 +-
 .../base/image-uploader/video-preview.tsx     |    2 +-
 .../components/base/loading/index.stories.tsx |    2 +-
 .../components/base/logo/index.stories.tsx    |    8 +-
 .../markdown-blocks/code-block.stories.tsx    |    2 +-
 .../markdown-blocks/think-block.stories.tsx   |    4 +-
 .../base/markdown/index.stories.tsx           |    2 +-
 .../components/base/mermaid/index.stories.tsx |    2 +-
 .../base/modal-like-wrap/index.stories.tsx    |    4 +-
 .../credential-selector/index.tsx             |    4 +-
 .../notion-page-selector/index.stories.tsx    |    2 +-
 .../base/pagination/index.stories.tsx         |    2 +-
 .../base/param-item/index.stories.tsx         |    2 +-
 .../portal-to-follow-elem/index.stories.tsx   |    2 +-
 .../base/premium-badge/index.stories.tsx      |    6 +-
 .../progress-bar/progress-circle.stories.tsx  |    2 +-
 .../base/prompt-editor/index.stories.tsx      |    4 +-
 .../component-picker-block/prompt-option.tsx  |    2 +-
 .../plugins/context-block/component.tsx       |    4 +-
 .../plugins/history-block/component.tsx       |    2 +-
 .../plugins/hitl-input-block/component.tsx    |    2 +-
 .../plugins/query-block/component.tsx         |    2 +-
 .../components/base/prompt-log-modal/card.tsx |    2 +-
 .../base/prompt-log-modal/index.tsx           |    2 +-
 .../components/base/qrcode/index.stories.tsx  |    2 +-
 web/app/components/base/qrcode/index.tsx      |    2 +-
 .../base/segmented-control/index.stories.tsx  |    2 +-
 .../components/base/select/locale-signin.tsx  |    2 +-
 .../base/simple-pie-chart/index.stories.tsx   |    2 +-
 .../base/skeleton/index.stories.tsx           |    2 +-
 .../components/base/sort/index.stories.tsx    |    2 +-
 .../components/base/spinner/index.stories.tsx |    2 +-
 web/app/components/base/spinner/index.tsx     |    2 +-
 web/app/components/base/svg/index.stories.tsx |    2 +-
 .../base/tab-header/index.stories.tsx         |    2 +-
 .../base/tab-slider-new/index.stories.tsx     |    2 +-
 .../base/tab-slider-plain/index.stories.tsx   |    2 +-
 .../base/tab-slider/index.stories.tsx         |    2 +-
 .../components/base/tag-management/index.tsx  |    4 +-
 .../components/base/tag-management/panel.tsx  |   10 +-
 .../base/tag-management/trigger.tsx           |    4 +-
 web/app/components/base/tag/index.stories.tsx |    4 +-
 .../components/base/tooltip/index.stories.tsx |    4 +-
 .../base/voice-input/index.stories.tsx        |    4 +-
 web/app/components/billing/pricing/index.tsx  |    4 +-
 .../pricing/plans/cloud-plan-item/index.tsx   |   16 +-
 .../plans/cloud-plan-item/list/item/index.tsx |    2 +-
 .../plans/self-hosted-plan-item/list/item.tsx |    2 +-
 .../components/custom/custom-page/index.tsx   |    2 +-
 .../components/powered-by-brand.tsx           |    2 +-
 web/app/components/datasets/chunk.tsx         |    4 +-
 .../datasets/common/image-list/more.tsx       |    2 +-
 .../common/retrieval-method-info/index.tsx    |    2 +-
 .../create-from-dsl-modal/header.tsx          |    4 +-
 .../create-from-dsl-modal/tab/index.tsx       |    2 +-
 .../datasets/create-from-pipeline/footer.tsx  |    4 +-
 .../datasets/create-from-pipeline/index.tsx   |    2 +-
 .../list/customized-list.tsx                  |    2 +-
 .../create-from-pipeline/list/index.tsx       |    2 +-
 .../list/template-card/content.tsx            |    6 +-
 .../datasets/create/step-one/upgrade-card.tsx |    4 +-
 .../create/step-two/preview-item/index.tsx    |    2 +-
 .../datasets/create/website/base/input.tsx    |    4 +-
 .../datasets/documents/components/list.tsx    |    4 +-
 .../base/credential-selector/item.tsx         |    2 +-
 .../data-source/online-documents/title.tsx    |    2 +-
 .../header/breadcrumbs/dropdown/item.tsx      |    2 +-
 .../file-list/header/breadcrumbs/index.tsx    |    4 +-
 .../preview/file-preview.tsx                  |   10 +-
 .../preview/online-document-preview.tsx       |   10 +-
 .../preview/web-preview.tsx                   |   10 +-
 .../steps/preview-panel.tsx                   |    4 +-
 .../detail/batch-modal/csv-downloader.tsx     |   18 +-
 .../detail/completed/common/empty.tsx         |   16 +-
 .../detail/completed/components/menu-bar.tsx  |    2 +-
 .../skeleton/full-doc-list-skeleton.tsx       |    2 +-
 .../skeleton/general-list-skeleton.tsx        |    2 +-
 .../skeleton/paragraph-list-skeleton.tsx      |    4 +-
 .../skeleton/parent-chunk-card-skeleton.tsx   |    2 +-
 .../embedding/components/status-header.tsx    |    6 +-
 .../detail/embedding/skeleton/index.tsx       |    2 +-
 .../settings/pipeline-settings/index.tsx      |    2 +-
 .../create/ExternalApiSelect.tsx              |    8 +-
 .../create/InfoPanel.tsx                      |    8 +-
 .../datasets/extra-info/statistics.tsx        |    8 +-
 .../components/child-chunks-item.tsx          |    2 +-
 .../components/result-item-footer.tsx         |    2 +-
 .../list/dataset-card/operation-item.tsx      |    2 +-
 .../datasets/list/dataset-footer/index.tsx    |    4 +-
 .../datasets/list/new-dataset-card/option.tsx |    2 +-
 .../metadata/metadata-dataset/field.tsx       |    2 +-
 .../metadata-dataset/select-metadata.tsx      |   12 +-
 .../metadata/metadata-document/field.tsx      |    2 +-
 .../components/external-knowledge-section.tsx |    2 +-
 .../form/components/indexing-section.tsx      |    6 +-
 .../permission-selector/permission-item.tsx   |    2 +-
 web/app/components/develop/ApiServer.tsx      |    2 +-
 .../develop/secret-key/input-copy.tsx         |    2 +-
 .../explore/installed-app/index.tsx           |    2 +-
 .../try-app/preview/basic-app-preview.tsx     |    4 +-
 .../goto-anything/components/result-item.tsx  |    2 +-
 .../goto-anything/components/result-list.tsx  |    2 +-
 .../api-based-extension-page/selector.tsx     |    6 +-
 .../data-source-page-new/operator.tsx         |   10 +-
 .../key-validator/KeyInput.tsx                |    4 +-
 .../account-setting/members-page/index.tsx    |   28 +-
 .../invited-modal/invitation-link.tsx         |    2 +-
 .../model-auth/authorized/authorized-item.tsx |    2 +-
 .../model-auth/credential-selector.tsx        |    8 +-
 .../model-provider-page/model-modal/Input.tsx |    2 +-
 .../model-parameter-modal/model-display.tsx   |    2 +-
 .../status-indicators.tsx                     |    4 +-
 .../credits-fallback-alert.tsx                |    6 +-
 .../model-auth-dropdown/dropdown-content.tsx  |    4 +-
 .../provider-added-card/model-list.tsx        |    6 +-
 .../provider-added-card/priority-use-tip.tsx  |    2 +-
 web/app/components/header/index.tsx           |    6 +-
 .../components/header/license-env/index.tsx   |    6 +-
 .../components/header/plan-badge/index.tsx    |    2 +-
 .../plugins/card/base/corner-mark.tsx         |    4 +-
 .../components/plugins/card/base/title.tsx    |    2 +-
 .../plugins/card/card-more-info.tsx           |    4 +-
 .../plugins/marketplace/description/index.tsx |   18 +-
 .../plugins/marketplace/list/list-wrapper.tsx |    2 +-
 .../marketplace/search-box/tags-filter.tsx    |    4 +-
 .../marketplace/sort-dropdown/index.tsx       |    6 +-
 .../plugin-detail-panel/action-list.tsx       |    4 +-
 .../agent-strategy-list.tsx                   |    4 +-
 .../app-selector/app-inputs-form.tsx          |    2 +-
 .../app-selector/app-picker.tsx               |    6 +-
 .../app-selector/index.tsx                    |    2 +-
 .../components/header-modals.tsx              |    8 +-
 .../components/plugin-source-badge.tsx        |    2 +-
 .../plugin-detail-panel/model-list.tsx        |    4 +-
 .../create/components/modal-steps.tsx         |    2 +-
 .../tool-selector/components/schema-modal.tsx |    6 +-
 .../components/tool-base-form.tsx             |    4 +-
 .../plugin-tasks/components/plugin-item.tsx   |    6 +-
 .../components/plugin-section.tsx             |    2 +-
 .../auto-update-setting/tool-item.tsx         |    8 +-
 .../components/chunk-card-list/q-a-item.tsx   |    4 +-
 .../editor/form/show-all-settings.tsx         |    4 +-
 .../panel/input-field/preview/data-source.tsx |    2 +-
 .../input-field/preview/process-documents.tsx |    2 +-
 .../components/panel/test-run/header.tsx      |    4 +-
 .../document-processing/options.tsx           |    2 +-
 .../test-run/preparation/footer-tips.tsx      |    2 +-
 .../rag-pipeline/components/publish-toast.tsx |    4 +-
 .../share/text-generation/no-data/index.tsx   |    2 +-
 .../run-batch/csv-download/index.tsx          |    4 +-
 web/app/components/signin/countdown.tsx       |    2 +-
 .../components/tools/marketplace/index.tsx    |   28 +-
 web/app/components/tools/mcp/create-card.tsx  |    4 +-
 .../tools/mcp/sections/headers-section.tsx    |    2 +-
 .../tools/provider/custom-create-card.tsx     |    2 +-
 .../start-node-option.tsx                     |    4 +-
 .../workflow/block-selector/blocks.tsx        |    2 +-
 .../block-selector/featured-tools.tsx         |   12 +-
 .../block-selector/featured-triggers.tsx      |   12 +-
 .../rag-tool-recommendations/index.tsx        |    6 +-
 .../uninstalled-item.tsx                      |    6 +-
 .../workflow/block-selector/start-blocks.tsx  |    6 +-
 .../workflow/comment/mention-input.tsx        |    2 +-
 .../components/workflow/comment/thread.tsx    |    2 +-
 .../workflow/header/editing-title.tsx         |    2 +-
 web/app/components/workflow/header/index.tsx  |    2 +-
 .../workflow/header/restoring-title.tsx       |    4 +-
 .../workflow/header/running-title.tsx         |    2 +-
 .../workflow/header/test-run-menu-helpers.tsx |    2 +-
 .../components/before-run-form/bool-input.tsx |    2 +-
 .../components/before-run-form/panel-wrap.tsx |    4 +-
 .../components/collapse/field-collapse.tsx    |    2 +-
 .../_base/components/editor/text-editor.tsx   |    2 +-
 .../_base/components/entry-node-container.tsx |    4 +-
 .../components/error-handle/default-value.tsx |    4 +-
 .../error-handle/error-handle-on-panel.tsx    |    2 +-
 .../error-handle/error-handle-tip.tsx         |    2 +-
 .../_base/components/file-upload-setting.tsx  |    2 +-
 .../nodes/_base/components/info-panel.tsx     |    2 +-
 .../mixed-variable-text-input/placeholder.tsx |    4 +-
 .../components/title-description-input.tsx    |    6 +-
 .../components/variable/constant-field.tsx    |    2 +-
 .../variable/manage-input-field.tsx           |    4 +-
 .../variable/var-full-path-panel.tsx          |    6 +-
 .../base/variable-node-label.tsx              |    4 +-
 .../workflow/nodes/_base/node-sections.tsx    |    6 +-
 .../nodes/agent/components/model-bar.tsx      |    4 +-
 .../workflow/nodes/answer/panel.tsx           |    2 +-
 .../workflow/nodes/assigner/node.tsx          |    2 +-
 .../workflow/nodes/assigner/panel.tsx         |    2 +-
 .../workflow/nodes/code/dependency-picker.tsx |    2 +-
 .../workflow/nodes/data-source/node.tsx       |    2 +-
 .../nodes/document-extractor/node.tsx         |    2 +-
 .../nodes/document-extractor/panel.tsx        |    2 +-
 .../components/key-value/bulk-edit/index.tsx  |    4 +-
 .../components/workflow/nodes/http/node.tsx   |    4 +-
 .../components/condition-files-list-value.tsx |    4 +-
 .../workflow/nodes/if-else/node.tsx           |    2 +-
 .../workflow/nodes/iteration-start/index.tsx  |    2 +-
 .../components/retrieval-setting/index.tsx    |    2 +-
 .../components/dataset-item.tsx               |    4 +-
 .../components/dataset-list.tsx               |    2 +-
 .../condition-common-variable-selector.tsx    |    8 +-
 .../condition-list/condition-number.tsx       |    4 +-
 .../condition-list/condition-string.tsx       |    4 +-
 .../condition-variable-selector.tsx           |    4 +-
 .../metadata/metadata-filter/index.tsx        |    4 +-
 .../components/metadata/metadata-panel.tsx    |    2 +-
 .../nodes/knowledge-retrieval/node.tsx        |    2 +-
 .../workflow/nodes/list-operator/node.tsx     |    2 +-
 .../llm/components/config-prompt-item.tsx     |    2 +-
 .../visual-editor/card.tsx                    |   10 +-
 .../edit-card/advanced-options.tsx            |    2 +-
 .../llm/components/resolution-picker.tsx      |    2 +-
 .../workflow/nodes/loop-start/index.tsx       |    2 +-
 .../components/condition-files-list-value.tsx |    4 +-
 .../components/extract-parameter/item.tsx     |    8 +-
 .../nodes/question-classifier/node.tsx        |    4 +-
 .../components/workflow/nodes/start/node.tsx  |    4 +-
 .../nodes/tool/components/copy-id.tsx         |    4 +-
 .../workflow/nodes/trigger-plugin/node.tsx    |    4 +-
 .../components/next-execution-times.tsx       |    4 +-
 .../components/on-minute-selector.tsx         |    4 +-
 .../workflow/nodes/trigger-schedule/node.tsx  |    2 +-
 .../workflow/nodes/trigger-schedule/panel.tsx |    2 +-
 .../workflow/nodes/trigger-webhook/node.tsx   |    2 +-
 .../utils/render-output-vars.tsx              |    4 +-
 .../components/var-group-item.tsx             |    8 +-
 .../components/workflow/operator/index.tsx    |    2 +-
 .../workflow/panel/chat-record/user-input.tsx |    2 +-
 .../components/object-value-item.tsx          |    6 +-
 .../components/object-value-list.tsx          |    4 +-
 .../workflow/panel/comments-panel/index.tsx   |    4 +-
 .../panel/debug-and-preview/empty.tsx         |    2 +-
 web/app/components/workflow/panel/record.tsx  |    2 +-
 .../filter/filter-item.tsx                    |    2 +-
 .../version-history-panel/loading/index.tsx   |    2 +-
 web/app/components/workflow/run/meta.tsx      |   26 +-
 .../components/workflow/run/output-panel.tsx  |    2 +-
 .../components/workflow/run/result-panel.tsx  |    6 +-
 .../components/workflow/run/result-text.tsx   |    6 +-
 .../run/retry-log/retry-result-panel.tsx      |    2 +-
 .../components/nodes/if-else/node.tsx         |    2 +-
 web/app/education-apply/search-input.tsx      |    2 +-
 web/app/signup/page.tsx                       |    2 +-
 web/context/app-context-provider.tsx          |    2 +-
 web/eslint.config.mjs                         |   15 +-
 306 files changed, 605 insertions(+), 2034 deletions(-)

diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index 87d7987dd2..e4831c4e98 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -37,11 +37,6 @@
       "count": 3
     }
   },
-  "web/.storybook/utils/form-story-wrapper.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/__mocks__/zustand.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
@@ -116,11 +111,6 @@
       "count": 1
     }
   },
-  "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/long-time-range-picker.tsx": {
     "no-restricted-imports": {
       "count": 2
@@ -169,27 +159,14 @@
       "count": 1
     }
   },
-  "web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/settings/page.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/(humanInputLayout)/form/[token]/form.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "web/app/(shareLayout)/components/authenticated-layout.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/(shareLayout)/components/splash.tsx": {
     "react/set-state-in-effect": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/(shareLayout)/webapp-reset-password/layout.tsx": {
@@ -202,11 +179,6 @@
       "count": 2
     }
   },
-  "web/app/(shareLayout)/webapp-signin/page.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/account/(commonLayout)/account-page/email-change-modal.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -261,9 +233,6 @@
   "web/app/components/app-sidebar/basic.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
     }
   },
   "web/app/components/app-sidebar/dataset-info/dropdown.tsx": {
@@ -274,11 +243,6 @@
       "count": 1
     }
   },
-  "web/app/components/app-sidebar/dataset-info/menu-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/app-sidebar/dataset-sidebar-dropdown.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -300,14 +264,6 @@
     },
     "react-refresh/only-export-components": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/app/annotation/batch-add-annotation-modal/csv-downloader.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 7
     }
   },
   "web/app/components/app/annotation/batch-add-annotation-modal/index.tsx": {
@@ -338,16 +294,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/annotation/edit-annotation-modal/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "web/app/components/app/annotation/empty-element.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/app/annotation/header-opts/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -380,9 +326,6 @@
   "web/app/components/app/app-access-control/specific-groups-or-members.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
     }
   },
   "web/app/components/app/app-publisher/features-wrapper.tsx": {
@@ -405,21 +348,11 @@
       "count": 1
     }
   },
-  "web/app/components/app/configuration/base/group-name/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/base/var-highlight/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
     }
   },
-  "web/app/components/app/configuration/base/warning-mask/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -461,11 +394,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/configuration/config-var/input-type-icon.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/config-var/select-var-type.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -482,12 +410,6 @@
   "web/app/components/app/configuration/config-vision/param-config-content.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
     }
   },
   "web/app/components/app/configuration/config/agent/agent-setting/index.tsx": {
@@ -556,11 +478,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/configuration/config/automatic/res-placeholder.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/config/automatic/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -625,11 +542,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "web/app/components/app/configuration/dataset-config/select-dataset/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -666,15 +578,9 @@
   "web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx": {
     "no-restricted-imports": {
       "count": 2
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/app/configuration/debug/debug-with-multiple-model/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -762,11 +668,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/log/empty-element.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/app/log/filter.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
@@ -775,9 +676,6 @@
   "web/app/components/app/log/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/app/log/list.tsx": {
@@ -847,12 +745,6 @@
     }
   },
   "web/app/components/app/text-generate/item/result-tab.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -860,9 +752,6 @@
   "web/app/components/app/workflow-log/detail.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/app/workflow-log/filter.tsx": {
@@ -891,20 +780,12 @@
       "count": 2
     }
   },
-  "web/app/components/apps/footer.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/apps/list.tsx": {
     "react-hooks/exhaustive-deps": {
       "count": 1
     },
     "react/unsupported-syntax": {
       "count": 2
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/apps/new-app-card.tsx": {
@@ -945,9 +826,6 @@
     }
   },
   "web/app/components/base/agent-log-modal/result.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -972,11 +850,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/app-icon/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/audio-btn/audio.ts": {
     "node/prefer-global/buffer": {
       "count": 1
@@ -1072,11 +945,6 @@
       "count": 2
     }
   },
-  "web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/base/chat/chat-with-history/hooks.tsx": {
     "react/set-state-in-effect": {
       "count": 4
@@ -1098,16 +966,6 @@
       "count": 3
     }
   },
-  "web/app/components/base/chat/chat-with-history/inputs-form/view-form-dropdown.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/chat/chat-with-history/sidebar/list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/chat/chat-with-history/sidebar/operation.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -1126,16 +984,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "web/app/components/base/chat/chat/answer/human-input-content/tips.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "web/app/components/base/chat/chat/answer/human-input-content/utils.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -1149,11 +997,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/chat/chat/answer/more.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/chat/chat/answer/operation.tsx": {
     "no-restricted-imports": {
       "count": 2
@@ -1180,24 +1023,6 @@
     },
     "react/set-state-in-effect": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 5
-    }
-  },
-  "web/app/components/base/chat/chat/citation/popup.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 9
-    }
-  },
-  "web/app/components/base/chat/chat/citation/progress-tooltip.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/chat/chat/citation/tooltip.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/base/chat/chat/hooks.ts": {
@@ -1285,36 +1110,11 @@
       "count": 1
     }
   },
-  "web/app/components/base/content-dialog/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/copy-feedback/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "web/app/components/base/copy-icon/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "web/app/components/base/corner-label/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/date-and-time-picker/calendar/days-of-week.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/date-and-time-picker/date-picker/header.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/date-and-time-picker/date-picker/index.tsx": {
     "react/set-state-in-effect": {
       "count": 4
@@ -1325,11 +1125,6 @@
       "count": 2
     }
   },
-  "web/app/components/base/date-and-time-picker/time-picker/header.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/date-and-time-picker/time-picker/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
@@ -1345,11 +1140,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/date-and-time-picker/year-and-month-picker/header.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/dialog/index.stories.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -1360,11 +1150,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/effect/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/base/emoji-picker/Inner.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -1409,9 +1194,6 @@
   "web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/base/features/new-feature-panel/annotation-reply/index.tsx": {
@@ -1419,11 +1201,6 @@
       "count": 3
     }
   },
-  "web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/features/new-feature-panel/annotation-reply/type.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -1460,11 +1237,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/features/new-feature-panel/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/base/features/new-feature-panel/moderation/form-generation.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1501,16 +1273,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/file-icon/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/file-uploader/audio-preview.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/file-uploader/dynamic-pdf-preview.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -1545,9 +1307,6 @@
   "web/app/components/base/file-uploader/pdf-preview.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
     }
   },
   "web/app/components/base/file-uploader/store.tsx": {
@@ -1565,11 +1324,6 @@
       "count": 3
     }
   },
-  "web/app/components/base/file-uploader/video-preview.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/form/components/base/base-field.tsx": {
     "no-restricted-imports": {
       "count": 2
@@ -1589,9 +1343,6 @@
     }
   },
   "web/app/components/base/form/components/field/mixed-variable-text-input/placeholder.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -1698,11 +1449,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/grid-mask/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "web/app/components/base/icons/src/public/avatar/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
@@ -1948,11 +1694,6 @@
       "count": 3
     }
   },
-  "web/app/components/base/image-uploader/audio-preview.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/image-uploader/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 4
@@ -1963,11 +1704,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/image-uploader/image-list.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/base/image-uploader/image-list.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -1977,9 +1713,6 @@
     "no-restricted-imports": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 6
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -1989,11 +1722,6 @@
       "count": 2
     }
   },
-  "web/app/components/base/image-uploader/video-preview.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/inline-delete-confirm/index.stories.tsx": {
     "no-console": {
       "count": 2
@@ -2017,21 +1745,11 @@
       "count": 1
     }
   },
-  "web/app/components/base/loading/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/logo/dify-logo.tsx": {
     "react-refresh/only-export-components": {
       "count": 2
     }
   },
-  "web/app/components/base/logo/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
-    }
-  },
   "web/app/components/base/markdown-blocks/audio-block.tsx": {
     "ts/no-explicit-any": {
       "count": 5
@@ -2042,11 +1760,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/markdown-blocks/code-block.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/markdown-blocks/code-block.tsx": {
     "react/set-state-in-effect": {
       "count": 7
@@ -2085,11 +1798,6 @@
       "count": 2
     }
   },
-  "web/app/components/base/markdown-blocks/think-block.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/base/markdown-blocks/think-block.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -2108,21 +1816,11 @@
       "count": 3
     }
   },
-  "web/app/components/base/markdown/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/markdown/markdown-utils.ts": {
     "regexp/no-unused-capturing-group": {
       "count": 1
     }
   },
-  "web/app/components/base/mermaid/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/mermaid/index.tsx": {
     "react/set-state-in-effect": {
       "count": 7
@@ -2161,9 +1859,6 @@
   "web/app/components/base/modal-like-wrap/index.stories.tsx": {
     "no-console": {
       "count": 3
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/base/modal/index.stories.tsx": {
@@ -2200,26 +1895,11 @@
       "count": 1
     }
   },
-  "web/app/components/base/notion-page-selector/credential-selector/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "web/app/components/base/notion-page-selector/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/notion-page-selector/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "web/app/components/base/pagination/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/pagination/index.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 1
@@ -2230,43 +1910,20 @@
       "count": 1
     }
   },
-  "web/app/components/base/param-item/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/param-item/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "web/app/components/base/portal-to-follow-elem/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/portal-to-follow-elem/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "web/app/components/base/premium-badge/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "web/app/components/base/progress-bar/progress-circle.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/prompt-editor/index.stories.tsx": {
     "no-console": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -2286,15 +1943,7 @@
       "count": 1
     }
   },
-  "web/app/components/base/prompt-editor/plugins/component-picker-block/prompt-option.tsx": {
-    "tailwindcss/no-duplicate-classes": {
-      "count": 2
-    }
-  },
   "web/app/components/base/prompt-editor/plugins/context-block/component.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -2329,9 +1978,6 @@
     }
   },
   "web/app/components/base/prompt-editor/plugins/history-block/component.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -2349,11 +1995,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/prompt-editor/plugins/hitl-input-block/component.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/prompt-editor/plugins/hitl-input-block/hitl-input-block-replacement-block.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -2380,11 +2021,6 @@
       "count": 2
     }
   },
-  "web/app/components/base/prompt-editor/plugins/query-block/component.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/prompt-editor/plugins/query-block/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
@@ -2434,11 +2070,6 @@
       "count": 4
     }
   },
-  "web/app/components/base/prompt-log-modal/card.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/prompt-log-modal/index.stories.tsx": {
     "no-console": {
       "count": 1
@@ -2447,22 +2078,11 @@
   "web/app/components/base/prompt-log-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/qrcode/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/base/qrcode/index.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/base/radio-card/index.stories.tsx": {
@@ -2493,11 +2113,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/segmented-control/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/select/index.stories.tsx": {
     "no-console": {
       "count": 4
@@ -2517,76 +2132,21 @@
       "count": 1
     }
   },
-  "web/app/components/base/select/locale-signin.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/simple-pie-chart/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/skeleton/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/sort/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/sort/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "web/app/components/base/spinner/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/spinner/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/svg-gallery/index.tsx": {
     "node/prefer-global/buffer": {
       "count": 1
     }
   },
-  "web/app/components/base/svg/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/switch/index.stories.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "web/app/components/base/tab-header/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/tab-slider-new/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/tab-slider-plain/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/tab-slider/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/base/tab-slider/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
@@ -2608,14 +2168,6 @@
   "web/app/components/base/tag-management/index.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "web/app/components/base/tag-management/panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 5
     }
   },
   "web/app/components/base/tag-management/tag-item-editor.tsx": {
@@ -2628,16 +2180,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/tag-management/trigger.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "web/app/components/base/tag/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/base/text-generation/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -2661,11 +2203,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/tooltip/index.stories.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/base/video-gallery/VideoPlayer.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -2680,9 +2217,6 @@
     "no-console": {
       "count": 2
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -2743,11 +2277,6 @@
       "count": 12
     }
   },
-  "web/app/components/billing/pricing/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/billing/pricing/plan-switcher/plan-range-switcher.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -2756,21 +2285,6 @@
       "count": 1
     }
   },
-  "web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 8
-    }
-  },
-  "web/app/components/billing/pricing/plans/cloud-plan-item/list/item/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/billing/pricing/plans/self-hosted-plan-item/list/item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/billing/pricing/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -2796,21 +2310,6 @@
       "count": 1
     }
   },
-  "web/app/components/custom/custom-page/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/custom/custom-web-app-brand/components/powered-by-brand.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/chunk.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/datasets/common/document-picker/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -2821,11 +2320,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/common/image-list/more.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/common/image-previewer/index.tsx": {
     "no-irregular-whitespace": {
       "count": 1
@@ -2854,9 +2348,6 @@
   "web/app/components/datasets/common/retrieval-method-info/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/datasets/common/retrieval-param-config/index.tsx": {
@@ -2869,11 +2360,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/header.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/use-dsl-import.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -2887,36 +2373,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/tab/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/create-from-pipeline/footer.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "web/app/components/datasets/create-from-pipeline/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/create-from-pipeline/list/customized-list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/create-from-pipeline/list/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/create-from-pipeline/list/template-card/content.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "web/app/components/datasets/create-from-pipeline/list/template-card/details/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -2962,14 +2418,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/create/step-one/upgrade-card.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/create/step-two/components/general-chunking-options.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3017,9 +2465,6 @@
     },
     "react-refresh/only-export-components": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/datasets/create/stop-embedding-modal/index.tsx": {
@@ -3037,11 +2482,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/create/website/base/input.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/create/website/firecrawl/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -3119,11 +2559,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/components/list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/datasets/documents/components/operations.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3144,11 +2579,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/create-from-pipeline/data-source/base/header.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3159,11 +2589,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/title.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/bucket.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3174,16 +2599,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/item.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3229,24 +2644,6 @@
       "count": 5
     }
   },
-  "web/app/components/datasets/documents/create-from-pipeline/preview/file-preview.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 5
-    }
-  },
-  "web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 5
-    }
-  },
-  "web/app/components/datasets/documents/create-from-pipeline/preview/web-preview.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 5
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx": {
     "ts/no-explicit-any": {
       "count": 3
@@ -3267,21 +2664,11 @@
       "count": 3
     }
   },
-  "web/app/components/datasets/documents/create-from-pipeline/steps/preview-panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/datasets/documents/create-from-pipeline/types.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/detail/batch-modal/csv-downloader.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 9
-    }
-  },
   "web/app/components/datasets/documents/detail/batch-modal/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3295,11 +2682,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/detail/completed/common/empty.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 8
-    }
-  },
   "web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3318,9 +2700,6 @@
   "web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx": {
     "no-restricted-imports": {
       "count": 2
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/datasets/documents/detail/completed/components/segment-list-content.tsx": {
@@ -3359,26 +2738,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/detail/completed/skeleton/full-doc-list-skeleton.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "web/app/components/datasets/documents/detail/completed/skeleton/parent-chunk-card-skeleton.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/detail/completed/status-item.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3394,21 +2753,11 @@
       "count": 4
     }
   },
-  "web/app/components/datasets/documents/detail/embedding/components/status-header.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "web/app/components/datasets/documents/detail/embedding/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/detail/embedding/skeleton/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/detail/metadata/components/doc-type-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3446,9 +2795,6 @@
     }
   },
   "web/app/components/datasets/documents/detail/settings/pipeline-settings/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 6
     }
@@ -3474,9 +2820,6 @@
   "web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx": {
     "react/set-state-in-effect": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
     }
   },
   "web/app/components/datasets/external-knowledge-base/create/ExternalApiSelection.tsx": {
@@ -3484,17 +2827,9 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
-    }
-  },
   "web/app/components/datasets/extra-info/statistics.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
     }
   },
   "web/app/components/datasets/formatted-text/flavours/type.ts": {
@@ -3502,14 +2837,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/hit-testing/components/child-chunks-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3525,11 +2852,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/hit-testing/components/result-item-footer.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/hit-testing/components/score.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 1
@@ -3550,21 +2872,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/list/dataset-card/operation-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/list/dataset-footer/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "web/app/components/datasets/list/new-dataset-card/option.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/metadata/edit-metadata-batch/edited-beacon.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3608,29 +2915,11 @@
       "count": 2
     }
   },
-  "web/app/components/datasets/metadata/metadata-dataset/field.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 2
-    }
-  },
-  "web/app/components/datasets/metadata/metadata-document/field.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/metadata/metadata-document/info-group.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3651,16 +2940,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/settings/form/components/external-knowledge-section.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/settings/form/components/indexing-section.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "web/app/components/datasets/settings/index-method/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3679,21 +2958,11 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/settings/permission-selector/permission-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/settings/summary-index-setting.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "web/app/components/develop/ApiServer.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/develop/code.tsx": {
     "ts/no-empty-object-type": {
       "count": 1
@@ -3713,9 +2982,6 @@
   "web/app/components/develop/secret-key/input-copy.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/develop/secret-key/secret-key-generate.tsx": {
@@ -3755,11 +3021,6 @@
       "count": 1
     }
   },
-  "web/app/components/explore/installed-app/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/explore/item-operation/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -3778,14 +3039,6 @@
       "count": 1
     }
   },
-  "web/app/components/explore/try-app/preview/basic-app-preview.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 2
-    }
-  },
   "web/app/components/explore/try-app/tab.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -3847,16 +3100,6 @@
       "count": 4
     }
   },
-  "web/app/components/goto-anything/components/result-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/goto-anything/components/result-list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/goto-anything/context.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
@@ -3893,9 +3136,6 @@
   "web/app/components/header/account-setting/api-based-extension-page/selector.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
     }
   },
   "web/app/components/header/account-setting/data-source-page-new/card.tsx": {
@@ -3931,9 +3171,6 @@
   "web/app/components/header/account-setting/data-source-page-new/operator.tsx": {
     "no-restricted-imports": {
       "count": 2
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 5
     }
   },
   "web/app/components/header/account-setting/data-source-page-new/types.ts": {
@@ -3941,11 +3178,6 @@
       "count": 2
     }
   },
-  "web/app/components/header/account-setting/key-validator/KeyInput.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/header/account-setting/key-validator/declarations.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -3959,21 +3191,11 @@
       "count": 2
     }
   },
-  "web/app/components/header/account-setting/members-page/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 14
-    }
-  },
   "web/app/components/header/account-setting/members-page/invite-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 3
     }
   },
-  "web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/header/account-setting/members-page/operation/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -4024,11 +3246,6 @@
       "count": 2
     }
   },
-  "web/app/components/header/account-setting/model-provider-page/model-auth/authorized/authorized-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/header/account-setting/model-provider-page/model-auth/authorized/index.tsx": {
     "no-restricted-imports": {
       "count": 2
@@ -4045,9 +3262,6 @@
   "web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
     }
   },
   "web/app/components/header/account-setting/model-provider-page/model-auth/hooks/index.ts": {
@@ -4092,9 +3306,6 @@
     }
   },
   "web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "unicorn/prefer-number-properties": {
       "count": 2
     }
@@ -4110,9 +3321,6 @@
     }
   },
   "web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-display.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -4121,9 +3329,6 @@
     "no-restricted-imports": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -4146,26 +3351,11 @@
       "count": 2
     }
   },
-  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/credits-fallback-alert.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/dropdown-content.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list-item.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -4188,9 +3378,6 @@
   "web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-use-tip.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/header/account-setting/model-provider-page/utils.ts": {
@@ -4216,21 +3403,6 @@
       "count": 1
     }
   },
-  "web/app/components/header/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "web/app/components/header/license-env/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "web/app/components/header/plan-badge/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/base/badges/icon-with-tooltip.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -4241,24 +3413,6 @@
       "count": 1
     }
   },
-  "web/app/components/plugins/card/base/corner-mark.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/card/base/title.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/card/card-more-info.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/plugins/card/index.tsx": {
     "ts/no-non-null-asserted-optional-chain": {
       "count": 1
@@ -4326,35 +3480,19 @@
       "count": 1
     }
   },
-  "web/app/components/plugins/marketplace/description/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 9
-    }
-  },
   "web/app/components/plugins/marketplace/hooks.ts": {
     "@tanstack/query/exhaustive-deps": {
       "count": 1
     }
   },
-  "web/app/components/plugins/marketplace/list/list-wrapper.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/marketplace/search-box/tags-filter.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/plugins/marketplace/sort-dropdown/index.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
     }
   },
   "web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx": {
@@ -4438,15 +3576,7 @@
       "count": 2
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/action-list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/plugins/plugin-detail-panel/agent-strategy-list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -4455,9 +3585,6 @@
     "no-restricted-imports": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 8
     }
@@ -4465,17 +3592,11 @@
   "web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
     }
   },
   "web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/plugins/plugin-detail-panel/datasource-action-list.tsx": {
@@ -4488,11 +3609,6 @@
       "count": 1
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/detail-header/components/header-modals.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
-    }
-  },
   "web/app/components/plugins/plugin-detail-panel/detail-header/components/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
@@ -4501,9 +3617,6 @@
   "web/app/components/plugins/plugin-detail-panel/detail-header/components/plugin-source-badge.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/plugins/plugin-detail-panel/detail-header/hooks/index.ts": {
@@ -4533,9 +3646,6 @@
     }
   },
   "web/app/components/plugins/plugin-detail-panel/model-list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -4573,11 +3683,6 @@
       "count": 1
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/components/modal-steps.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-common-modal-state.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -4675,14 +3780,6 @@
   "web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-base-form.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx": {
@@ -4766,16 +3863,6 @@
       "count": 1
     }
   },
-  "web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-section.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-page/plugin-tasks/components/task-status-indicator.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -4801,14 +3888,6 @@
       "count": 1
     }
   },
-  "web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -4837,11 +3916,6 @@
       "count": 1
     }
   },
-  "web/app/components/rag-pipeline/components/chunk-card-list/q-a-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/rag-pipeline/components/panel/input-field/editor/form/hidden-fields.tsx": {
     "react/component-hook-factories": {
       "count": 1
@@ -4867,9 +3941,6 @@
     "react/component-hook-factories": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -4894,39 +3965,16 @@
       "count": 1
     }
   },
-  "web/app/components/rag-pipeline/components/panel/input-field/preview/data-source.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/rag-pipeline/components/panel/input-field/preview/process-documents.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/rag-pipeline/components/panel/test-run/header.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
   "web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "web/app/components/rag-pipeline/components/panel/test-run/preparation/footer-tips.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/rag-pipeline/components/panel/test-run/preparation/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -4952,11 +4000,6 @@
       "count": 1
     }
   },
-  "web/app/components/rag-pipeline/components/publish-toast.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/rag-pipeline/components/rag-pipeline-children.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -5056,9 +4099,6 @@
     }
   },
   "web/app/components/share/text-generation/no-data/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-empty-object-type": {
       "count": 1
     }
@@ -5068,11 +4108,6 @@
       "count": 1
     }
   },
-  "web/app/components/share/text-generation/run-batch/csv-download/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/share/text-generation/run-batch/csv-reader/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -5099,11 +4134,6 @@
       "count": 2
     }
   },
-  "web/app/components/signin/countdown.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/edit-custom-collection-modal/config-credentials.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -5132,15 +4162,7 @@
       "count": 1
     }
   },
-  "web/app/components/tools/marketplace/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 14
-    }
-  },
   "web/app/components/tools/mcp/create-card.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -5191,21 +4213,11 @@
       "count": 3
     }
   },
-  "web/app/components/tools/mcp/sections/headers-section.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/provider-list.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "web/app/components/tools/provider/custom-create-card.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/provider/empty.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -5244,11 +4256,6 @@
       "count": 3
     }
   },
-  "web/app/components/workflow-app/components/workflow-onboarding-modal/start-node-option.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow-app/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 13
@@ -5302,9 +4309,6 @@
   "web/app/components/workflow/block-selector/blocks.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/workflow/block-selector/featured-tools.tsx": {
@@ -5314,12 +4318,6 @@
     "react/set-state-in-effect": {
       "count": 2
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 6
-    },
-    "tailwindcss/no-duplicate-classes": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -5331,12 +4329,6 @@
     "react/set-state-in-effect": {
       "count": 2
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 6
-    },
-    "tailwindcss/no-duplicate-classes": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -5372,22 +4364,11 @@
   "web/app/components/workflow/block-selector/rag-tool-recommendations/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "web/app/components/workflow/block-selector/rag-tool-recommendations/uninstalled-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
     }
   },
   "web/app/components/workflow/block-selector/start-blocks.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
     }
   },
   "web/app/components/workflow/block-selector/tabs.tsx": {
@@ -5459,16 +4440,6 @@
       "count": 2
     }
   },
-  "web/app/components/workflow/comment/mention-input.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/comment/thread.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/context.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
@@ -5484,21 +4455,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/header/editing-title.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/header/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/header/restoring-title.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/header/run-mode.tsx": {
     "no-console": {
       "count": 1
@@ -5507,16 +4463,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/header/running-title.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/header/test-run-menu-helpers.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/header/test-run-menu.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -5660,11 +4606,6 @@
       "count": 3
     }
   },
-  "web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -5686,19 +4627,6 @@
       "count": 5
     }
   },
-  "web/app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/_base/components/collapse/field-collapse.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/collapse/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
@@ -5725,26 +4653,15 @@
       "count": 6
     }
   },
-  "web/app/components/workflow/nodes/_base/components/editor/text-editor.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/entry-node-container.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
     "react-refresh/only-export-components": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/workflow/nodes/_base/components/error-handle/default-value.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -5752,14 +4669,6 @@
   "web/app/components/workflow/nodes/_base/components/error-handle/error-handle-on-panel.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx": {
@@ -5780,11 +4689,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/form-input-item.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -5803,11 +4707,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/_base/components/info-panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/input-support-select-var.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -5850,9 +4749,6 @@
     }
   },
   "web/app/components/workflow/nodes/_base/components/mixed-variable-text-input/placeholder.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -5913,22 +4809,9 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/_base/components/title-description-input.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/_base/components/variable/manage-input-field.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/workflow/nodes/_base/components/variable/match-schema-type.ts": {
@@ -5951,14 +4834,6 @@
       "count": 32
     }
   },
-  "web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/variable/var-list.tsx": {
     "react/unsupported-syntax": {
       "count": 1
@@ -5985,11 +4860,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-node-label.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/variable/variable-label/hooks.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 2
@@ -6064,11 +4934,6 @@
       "count": 2
     }
   },
-  "web/app/components/workflow/nodes/_base/node-sections.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "web/app/components/workflow/nodes/_base/node.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -6086,9 +4951,6 @@
     "no-restricted-imports": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-empty-object-type": {
       "count": 1
     }
@@ -6139,11 +5001,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/answer/panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/assigner/components/operation-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -6159,16 +5016,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/assigner/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/assigner/panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/assigner/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
@@ -6195,9 +5042,6 @@
   "web/app/components/workflow/nodes/code/dependency-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/workflow/nodes/code/types.ts": {
@@ -6246,11 +5090,6 @@
       "count": 6
     }
   },
-  "web/app/components/workflow/nodes/data-source/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/data-source/panel.tsx": {
     "ts/no-explicit-any": {
       "count": 3
@@ -6277,16 +5116,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/document-extractor/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/document-extractor/panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/document-extractor/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 4
@@ -6312,11 +5141,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/http/components/key-value/bulk-edit/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -6332,11 +5156,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/http/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/http/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 5
@@ -6445,14 +5264,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/if-else/components/condition-files-list-value.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/if-else/components/condition-list/condition-input.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -6488,11 +5299,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/if-else/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/if-else/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
@@ -6506,9 +5312,6 @@
   "web/app/components/workflow/nodes/iteration-start/index.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/workflow/nodes/iteration/default.ts": {
@@ -6551,11 +5354,6 @@
       "count": 4
     }
   },
-  "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/search-method-option.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -6589,19 +5387,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -6610,9 +5395,6 @@
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
     }
   },
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx": {
@@ -6620,21 +5402,11 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-operator.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-value-method.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -6643,17 +5415,11 @@
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx": {
@@ -6661,11 +5427,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-trigger.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -6684,9 +5445,6 @@
   "web/app/components/workflow/nodes/knowledge-retrieval/node.tsx": {
     "react/set-state-in-effect": {
       "count": 2
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/workflow/nodes/knowledge-retrieval/types.ts": {
@@ -6723,11 +5481,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/list-operator/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/list-operator/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -6737,9 +5490,6 @@
     "no-restricted-imports": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 3
     }
@@ -6801,11 +5551,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/card.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 5
-    }
-  },
   "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/context.tsx": {
     "react-refresh/only-export-components": {
       "count": 2
@@ -6816,11 +5561,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/advanced-options.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/auto-width-input.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -6836,11 +5576,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/llm/components/resolution-picker.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/llm/components/structure-output.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -6880,9 +5615,6 @@
   "web/app/components/workflow/nodes/loop-start/index.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
     }
   },
   "web/app/components/workflow/nodes/loop/components/condition-add.tsx": {
@@ -6890,14 +5622,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/loop/components/condition-files-list-value.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/loop/components/condition-list/condition-input.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -6981,11 +5705,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 4
-    }
-  },
   "web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/update.tsx": {
     "no-restricted-imports": {
       "count": 2
@@ -7048,9 +5767,6 @@
   "web/app/components/workflow/nodes/question-classifier/node.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
     }
   },
   "web/app/components/workflow/nodes/question-classifier/use-config.ts": {
@@ -7066,14 +5782,6 @@
       "count": 8
     }
   },
-  "web/app/components/workflow/nodes/start/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/start/panel.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -7107,12 +5815,6 @@
   "web/app/components/workflow/nodes/tool/components/copy-id.tsx": {
     "no-restricted-imports": {
       "count": 1
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
     }
   },
   "web/app/components/workflow/nodes/tool/components/input-var-list.tsx": {
@@ -7198,9 +5900,6 @@
     "react/unsupported-syntax": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -7235,16 +5934,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/trigger-schedule/default.ts": {
     "regexp/no-unused-capturing-group": {
       "count": 2
@@ -7253,16 +5942,6 @@
       "count": 10
     }
   },
-  "web/app/components/workflow/nodes/trigger-schedule/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/trigger-schedule/panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/trigger-webhook/components/generic-table.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -7278,33 +5957,17 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/trigger-webhook/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/trigger-webhook/panel.tsx": {
     "no-restricted-imports": {
       "count": 2
     }
   },
-  "web/app/components/workflow/nodes/trigger-webhook/utils/render-output-vars.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/utils.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
   "web/app/components/workflow/nodes/variable-assigner/components/var-group-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -7367,11 +6030,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/operator/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/operator/more-actions.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -7396,9 +6054,6 @@
     }
   },
   "web/app/components/workflow/panel/chat-record/user-input.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -7417,9 +6072,6 @@
     "react-refresh/only-export-components": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    },
     "ts/no-explicit-any": {
       "count": 5
     },
@@ -7428,9 +6080,6 @@
     }
   },
   "web/app/components/workflow/panel/chat-variable-panel/components/object-value-list.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -7448,11 +6097,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/panel/comments-panel/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/panel/debug-and-preview/chat-wrapper.tsx": {
     "ts/no-explicit-any": {
       "count": 6
@@ -7466,11 +6110,6 @@
       "count": 2
     }
   },
-  "web/app/components/workflow/panel/debug-and-preview/empty.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/panel/debug-and-preview/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 12
@@ -7502,11 +6141,6 @@
       "count": 4
     }
   },
-  "web/app/components/workflow/panel/record.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/panel/version-history-panel/context-menu/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -7517,21 +6151,11 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/panel/version-history-panel/filter/filter-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/panel/version-history-panel/filter/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "web/app/components/workflow/panel/version-history-panel/loading/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -7587,11 +6211,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/run/meta.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 13
-    }
-  },
   "web/app/components/workflow/run/node.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -7601,28 +6220,16 @@
     }
   },
   "web/app/components/workflow/run/output-panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 3
     }
   },
   "web/app/components/workflow/run/result-panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    },
     "ts/no-explicit-any": {
       "count": 4
     }
   },
   "web/app/components/workflow/run/result-text.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    },
-    "tailwindcss/no-unnecessary-whitespace": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -7632,11 +6239,6 @@
       "count": 2
     }
   },
-  "web/app/components/workflow/run/retry-log/retry-result-panel.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/run/utils/format-log/agent/index.ts": {
     "ts/no-explicit-any": {
       "count": 11
@@ -7835,11 +6437,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/workflow-preview/components/nodes/if-else/node.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/workflow-preview/components/nodes/iteration-start/index.tsx": {
     "no-restricted-imports": {
       "count": 1
@@ -7872,9 +6469,6 @@
     "no-restricted-imports": {
       "count": 1
     },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -7942,16 +6536,6 @@
       "count": 1
     }
   },
-  "web/app/signup/page.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "web/context/app-context-provider.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "web/context/external-api-panel-context.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
diff --git a/web/.storybook/utils/form-story-wrapper.tsx b/web/.storybook/utils/form-story-wrapper.tsx
index 90349a0325..7503e9905d 100644
--- a/web/.storybook/utils/form-story-wrapper.tsx
+++ b/web/.storybook/utils/form-story-wrapper.tsx
@@ -47,7 +47,7 @@ export const FormStoryWrapper = ({
         {children(form)}
       </div>
       <aside className="w-full max-w-sm rounded-xl border border-divider-subtle bg-components-panel-bg p-4 text-xs text-text-secondary shadow-sm">
-        <div className="flex items-center justify-between text-[11px] uppercase tracking-wide text-text-tertiary">
+        <div className="flex items-center justify-between text-[11px] tracking-wide text-text-tertiary uppercase">
           <span>Form State</span>
           <span>
             {submitCount}
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx
index 0d33de2972..0fbc41eb6b 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chart-view.tsx
@@ -48,7 +48,7 @@ export default function ChartView({ appId, headerRight }: IChartViewProps) {
   return (
     <div>
       <div className="mb-4">
-        <div className="system-xl-semibold mb-2 text-text-primary">{t('appMenus.overview', { ns: 'common' })}</div>
+        <div className="mb-2 system-xl-semibold text-text-primary">{t('appMenus.overview', { ns: 'common' })}</div>
         <div className="flex items-center justify-between">
           {IS_CLOUD_EDITION
             ? (
diff --git a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/settings/page.tsx b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/settings/page.tsx
index 1d65e4de53..8aec27707b 100644
--- a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/settings/page.tsx
+++ b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/settings/page.tsx
@@ -6,7 +6,7 @@ const Settings = () => {
 
   return (
     <div className="h-full overflow-y-auto">
-      <div className="flex flex-col gap-y-0.5 px-6 pb-2 pt-3">
+      <div className="flex flex-col gap-y-0.5 px-6 pt-3 pb-2">
         <div className="system-xl-semibold text-text-primary">{t('title')}</div>
         <div className="system-sm-regular text-text-tertiary">{t('desc')}</div>
       </div>
diff --git a/web/app/(shareLayout)/components/authenticated-layout.tsx b/web/app/(shareLayout)/components/authenticated-layout.tsx
index 9f956a8501..a7b65f33fe 100644
--- a/web/app/(shareLayout)/components/authenticated-layout.tsx
+++ b/web/app/(shareLayout)/components/authenticated-layout.tsx
@@ -81,7 +81,7 @@ const AuthenticatedLayout = ({ children }: { children: React.ReactNode }) => {
     return (
       <div className="flex h-full flex-col items-center justify-center gap-y-2">
         <AppUnavailable className="h-auto w-auto" code={403} unknownReason="no permission." />
-        <span className="system-sm-regular cursor-pointer text-text-tertiary" onClick={backToHome}>{t('userProfile.logout', { ns: 'common' })}</span>
+        <span className="cursor-pointer system-sm-regular text-text-tertiary" onClick={backToHome}>{t('userProfile.logout', { ns: 'common' })}</span>
       </div>
     )
   }
diff --git a/web/app/(shareLayout)/components/splash.tsx b/web/app/(shareLayout)/components/splash.tsx
index 402005752d..86d676721a 100644
--- a/web/app/(shareLayout)/components/splash.tsx
+++ b/web/app/(shareLayout)/components/splash.tsx
@@ -95,7 +95,7 @@ const Splash: FC<PropsWithChildren> = ({ children }) => {
     return (
       <div className="flex h-full flex-col items-center justify-center gap-y-4">
         <AppUnavailable className="h-auto w-auto" code={code || t('common.appUnavailable', { ns: 'share' })} unknownReason={message} />
-        <span className="system-sm-regular cursor-pointer text-text-tertiary" onClick={backToHome}>{code === '403' ? t('userProfile.logout', { ns: 'common' }) : t('login.backToHome', { ns: 'share' })}</span>
+        <span className="cursor-pointer system-sm-regular text-text-tertiary" onClick={backToHome}>{code === '403' ? t('userProfile.logout', { ns: 'common' }) : t('login.backToHome', { ns: 'share' })}</span>
       </div>
     )
   }
diff --git a/web/app/(shareLayout)/webapp-signin/page.tsx b/web/app/(shareLayout)/webapp-signin/page.tsx
index a5c2528cc7..4b94a7210f 100644
--- a/web/app/(shareLayout)/webapp-signin/page.tsx
+++ b/web/app/(shareLayout)/webapp-signin/page.tsx
@@ -63,7 +63,7 @@ const WebSSOForm: FC = () => {
   return (
     <div className="flex h-full flex-col items-center justify-center gap-y-4">
       <AppUnavailable className="h-auto w-auto" isUnknownReason={true} />
-      <span className="system-sm-regular cursor-pointer text-text-tertiary" onClick={backToHome}>{t('login.backToHome', { ns: 'share' })}</span>
+      <span className="cursor-pointer system-sm-regular text-text-tertiary" onClick={backToHome}>{t('login.backToHome', { ns: 'share' })}</span>
     </div>
   )
 }
diff --git a/web/app/components/app-sidebar/basic.tsx b/web/app/components/app-sidebar/basic.tsx
index 29a08f8a01..2814072860 100644
--- a/web/app/components/app-sidebar/basic.tsx
+++ b/web/app/components/app-sidebar/basic.tsx
@@ -76,8 +76,8 @@ export default function AppBasic({ icon, icon_background, name, isExternal, type
         )}
       {mode === 'expand' && (
         <div className="group w-full">
-          <div className={`flex flex-row items-center text-text-secondary system-md-semibold group-hover:text-text-primary ${textStyle?.main ?? ''}`}>
-            <div className="min-w-0 overflow-hidden text-ellipsis break-normal">
+          <div className={`flex flex-row items-center system-md-semibold text-text-secondary group-hover:text-text-primary ${textStyle?.main ?? ''}`}>
+            <div className="min-w-0 overflow-hidden break-normal text-ellipsis">
               {name}
             </div>
             {hoverTip
@@ -95,10 +95,10 @@ export default function AppBasic({ icon, icon_background, name, isExternal, type
               )}
           </div>
           {!hideType && isExtraInLine && (
-            <div className="flex text-text-tertiary system-2xs-medium-uppercase">{type}</div>
+            <div className="flex system-2xs-medium-uppercase text-text-tertiary">{type}</div>
           )}
           {!hideType && !isExtraInLine && (
-            <div className="text-text-tertiary system-2xs-medium-uppercase">{isExternal ? t('externalTag', { ns: 'dataset' }) : type}</div>
+            <div className="system-2xs-medium-uppercase text-text-tertiary">{isExternal ? t('externalTag', { ns: 'dataset' }) : type}</div>
           )}
         </div>
       )}
diff --git a/web/app/components/app-sidebar/dataset-info/menu-item.tsx b/web/app/components/app-sidebar/dataset-info/menu-item.tsx
index 7ad8d9407f..d426512176 100644
--- a/web/app/components/app-sidebar/dataset-info/menu-item.tsx
+++ b/web/app/components/app-sidebar/dataset-info/menu-item.tsx
@@ -22,7 +22,7 @@ const MenuItem = ({
       }}
     >
       <Icon className="size-4 text-text-tertiary" />
-      <span className="px-1 text-text-secondary system-md-regular">{name}</span>
+      <span className="px-1 system-md-regular text-text-secondary">{name}</span>
     </div>
   )
 }
diff --git a/web/app/components/app/annotation/add-annotation-modal/edit-item/index.tsx b/web/app/components/app/annotation/add-annotation-modal/edit-item/index.tsx
index a1a3dc21c6..639854ae0a 100644
--- a/web/app/components/app/annotation/add-annotation-modal/edit-item/index.tsx
+++ b/web/app/components/app/annotation/add-annotation-modal/edit-item/index.tsx
@@ -31,7 +31,7 @@ const EditItem: FC<Props> = ({
         {avatar}
       </div>
       <div className="grow">
-        <div className="system-xs-semibold mb-1 text-text-primary">{name}</div>
+        <div className="mb-1 system-xs-semibold text-text-primary">{name}</div>
         <Textarea
           value={content}
           onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => onChange(e.target.value)}
diff --git a/web/app/components/app/annotation/batch-add-annotation-modal/csv-downloader.tsx b/web/app/components/app/annotation/batch-add-annotation-modal/csv-downloader.tsx
index 8db70104bc..3828a1facc 100644
--- a/web/app/components/app/annotation/batch-add-annotation-modal/csv-downloader.tsx
+++ b/web/app/components/app/annotation/batch-add-annotation-modal/csv-downloader.tsx
@@ -38,30 +38,30 @@ const CSVDownload: FC = () => {
         <table className="w-full table-fixed border-separate border-spacing-0 rounded-lg border border-divider-regular text-xs">
           <thead className="text-text-tertiary">
             <tr>
-              <td className="h-9 border-b border-divider-regular pl-3 pr-2">{t('batchModal.question', { ns: 'appAnnotation' })}</td>
-              <td className="h-9 border-b border-divider-regular pl-3 pr-2">{t('batchModal.answer', { ns: 'appAnnotation' })}</td>
+              <td className="h-9 border-b border-divider-regular pr-2 pl-3">{t('batchModal.question', { ns: 'appAnnotation' })}</td>
+              <td className="h-9 border-b border-divider-regular pr-2 pl-3">{t('batchModal.answer', { ns: 'appAnnotation' })}</td>
             </tr>
           </thead>
           <tbody className="text-text-secondary">
             <tr>
-              <td className="h-9 border-b border-divider-subtle pl-3 pr-2 text-[13px]">
+              <td className="h-9 border-b border-divider-subtle pr-2 pl-3 text-[13px]">
                 {t('batchModal.question', { ns: 'appAnnotation' })}
                 {' '}
                 1
               </td>
-              <td className="h-9 border-b border-divider-subtle pl-3 pr-2 text-[13px]">
+              <td className="h-9 border-b border-divider-subtle pr-2 pl-3 text-[13px]">
                 {t('batchModal.answer', { ns: 'appAnnotation' })}
                 {' '}
                 1
               </td>
             </tr>
             <tr>
-              <td className="h-9 pl-3 pr-2 text-[13px]">
+              <td className="h-9 pr-2 pl-3 text-[13px]">
                 {t('batchModal.question', { ns: 'appAnnotation' })}
                 {' '}
                 2
               </td>
-              <td className="h-9 pl-3 pr-2 text-[13px]">
+              <td className="h-9 pr-2 pl-3 text-[13px]">
                 {t('batchModal.answer', { ns: 'appAnnotation' })}
                 {' '}
                 2
@@ -77,7 +77,7 @@ const CSVDownload: FC = () => {
         bom={true}
         data={getTemplate()}
       >
-        <div className="system-xs-medium flex h-[18px] items-center space-x-1 text-text-accent">
+        <div className="flex h-[18px] items-center space-x-1 system-xs-medium text-text-accent">
           <DownloadIcon className="mr-1 h-3 w-3" />
           {t('batchModal.template', { ns: 'appAnnotation' })}
         </div>
diff --git a/web/app/components/app/annotation/edit-annotation-modal/index.tsx b/web/app/components/app/annotation/edit-annotation-modal/index.tsx
index 53bf813388..c3d5b140eb 100644
--- a/web/app/components/app/annotation/edit-annotation-modal/index.tsx
+++ b/web/app/components/app/annotation/edit-annotation-modal/index.tsx
@@ -146,7 +146,7 @@ const EditAnnotationModal: FC<Props> = ({
         foot={(
           <div>
             {isAnnotationFull && (
-              <div className="mb-4 mt-6 px-6">
+              <div className="mt-6 mb-4 px-6">
                 <AnnotationFull />
               </div>
             )}
@@ -154,7 +154,7 @@ const EditAnnotationModal: FC<Props> = ({
             {
               annotationId
                 ? (
-                    <div className="system-sm-medium flex h-16 items-center justify-between rounded-bl-xl rounded-br-xl border-t border-divider-subtle bg-background-section-burn px-4 text-text-tertiary">
+                    <div className="flex h-16 items-center justify-between rounded-br-xl rounded-bl-xl border-t border-divider-subtle bg-background-section-burn px-4 system-sm-medium text-text-tertiary">
                       <div
                         className="flex cursor-pointer items-center space-x-2 pl-3"
                         onClick={() => setShowModal(true)}
diff --git a/web/app/components/app/annotation/empty-element.tsx b/web/app/components/app/annotation/empty-element.tsx
index 5bcaaac303..7473920d47 100644
--- a/web/app/components/app/annotation/empty-element.tsx
+++ b/web/app/components/app/annotation/empty-element.tsx
@@ -19,9 +19,9 @@ const EmptyElement: FC = () => {
       <div className="box-border h-fit w-[560px] rounded-2xl bg-background-section-burn px-5 py-4">
         <span className="system-md-semibold text-text-secondary">
           {t('noData.title', { ns: 'appAnnotation' })}
-          <ThreeDotsIcon className="relative -left-1.5 -top-3 inline" />
+          <ThreeDotsIcon className="relative -top-3 -left-1.5 inline" />
         </span>
-        <div className="system-sm-regular mt-2 text-text-tertiary">
+        <div className="mt-2 system-sm-regular text-text-tertiary">
           {t('noData.description', { ns: 'appAnnotation' })}
         </div>
       </div>
diff --git a/web/app/components/app/app-access-control/specific-groups-or-members.tsx b/web/app/components/app/app-access-control/specific-groups-or-members.tsx
index 8f4e71c8d2..5b5c8342fc 100644
--- a/web/app/components/app/app-access-control/specific-groups-or-members.tsx
+++ b/web/app/components/app/app-access-control/specific-groups-or-members.tsx
@@ -60,14 +60,14 @@ function RenderGroupsAndMembers() {
   const specificGroups = useAccessControlStore(s => s.specificGroups)
   const specificMembers = useAccessControlStore(s => s.specificMembers)
   if (specificGroups.length <= 0 && specificMembers.length <= 0)
-    return <div className="px-2 pb-1.5 pt-5"><p className="system-xs-regular text-center text-text-tertiary">{t('accessControlDialog.noGroupsOrMembers', { ns: 'app' })}</p></div>
+    return <div className="px-2 pt-5 pb-1.5"><p className="text-center system-xs-regular text-text-tertiary">{t('accessControlDialog.noGroupsOrMembers', { ns: 'app' })}</p></div>
   return (
     <>
-      <p className="system-2xs-medium-uppercase sticky top-0 text-text-tertiary">{t('accessControlDialog.groups', { ns: 'app', count: specificGroups.length ?? 0 })}</p>
+      <p className="sticky top-0 system-2xs-medium-uppercase text-text-tertiary">{t('accessControlDialog.groups', { ns: 'app', count: specificGroups.length ?? 0 })}</p>
       <div className="flex flex-row flex-wrap gap-1">
         {specificGroups.map((group, index) => <GroupItem key={index} group={group} />)}
       </div>
-      <p className="system-2xs-medium-uppercase sticky top-0 text-text-tertiary">{t('accessControlDialog.members', { ns: 'app', count: specificMembers.length ?? 0 })}</p>
+      <p className="sticky top-0 system-2xs-medium-uppercase text-text-tertiary">{t('accessControlDialog.members', { ns: 'app', count: specificMembers.length ?? 0 })}</p>
       <div className="flex flex-row flex-wrap gap-1">
         {specificMembers.map((member, index) => <MemberItem key={index} member={member} />)}
       </div>
diff --git a/web/app/components/app/configuration/base/group-name/index.tsx b/web/app/components/app/configuration/base/group-name/index.tsx
index 210ba4ca87..cd73a2ef60 100644
--- a/web/app/components/app/configuration/base/group-name/index.tsx
+++ b/web/app/components/app/configuration/base/group-name/index.tsx
@@ -11,7 +11,7 @@ const GroupName: FC<IGroupNameProps> = ({
 }) => {
   return (
     <div className="mb-1 flex items-center">
-      <div className="mr-3 text-xs font-semibold uppercase leading-[18px] text-text-tertiary">{name}</div>
+      <div className="mr-3 text-xs leading-[18px] font-semibold text-text-tertiary uppercase">{name}</div>
       <div
         className="h-px grow"
         style={{
diff --git a/web/app/components/app/configuration/base/warning-mask/index.tsx b/web/app/components/app/configuration/base/warning-mask/index.tsx
index 5275f022cb..763053835b 100644
--- a/web/app/components/app/configuration/base/warning-mask/index.tsx
+++ b/web/app/components/app/configuration/base/warning-mask/index.tsx
@@ -25,7 +25,7 @@ const WarningMask: FC<IWarningMaskProps> = ({
     <div className={`${s.mask} absolute inset-0 z-10 bg-components-panel-bg-blur pt-16`}>
       <div className="mx-auto px-10">
         <div className={`${s.icon} flex h-11 w-11 items-center justify-center rounded-xl bg-components-panel-bg`}>{warningIcon}</div>
-        <div className="mt-4 text-[24px] font-semibold leading-normal text-text-primary">
+        <div className="mt-4 text-[24px] leading-normal font-semibold text-text-primary">
           {title}
         </div>
         <div className="mt-3 text-base text-text-secondary">
diff --git a/web/app/components/app/configuration/config-var/input-type-icon.tsx b/web/app/components/app/configuration/config-var/input-type-icon.tsx
index d79964ab70..7cd64c0230 100644
--- a/web/app/components/app/configuration/config-var/input-type-icon.tsx
+++ b/web/app/components/app/configuration/config-var/input-type-icon.tsx
@@ -11,7 +11,7 @@ export type IInputTypeIconProps = {
 }
 
 const IconMap = (type: IInputTypeIconProps['type'], className: string) => {
-  const classNames = `w-3.5 h-3.5 ${className}`
+  const classNames = `h-3.5 w-3.5 ${className}`
   const icons = {
     string: (
       <InputVarTypeIcon type={InputVarType.textInput} className={classNames} />
diff --git a/web/app/components/app/configuration/config-vision/param-config-content.tsx b/web/app/components/app/configuration/config-vision/param-config-content.tsx
index 56ecabcbaf..85f1689aa3 100644
--- a/web/app/components/app/configuration/config-vision/param-config-content.tsx
+++ b/web/app/components/app/configuration/config-vision/param-config-content.tsx
@@ -42,11 +42,11 @@ const ParamConfigContent: FC = () => {
 
   return (
     <div>
-      <div className="text-base font-semibold leading-6 text-text-primary">{t('vision.visionSettings.title', { ns: 'appDebug' })}</div>
+      <div className="text-base leading-6 font-semibold text-text-primary">{t('vision.visionSettings.title', { ns: 'appDebug' })}</div>
       <div className="space-y-6 pt-3">
         <div>
-          <div className="mb-2 flex items-center  space-x-1">
-            <div className="text-[13px] font-semibold leading-[18px] text-text-secondary">{t('vision.visionSettings.resolution', { ns: 'appDebug' })}</div>
+          <div className="mb-2 flex items-center space-x-1">
+            <div className="text-[13px] leading-[18px] font-semibold text-text-secondary">{t('vision.visionSettings.resolution', { ns: 'appDebug' })}</div>
             <Tooltip
               popupContent={(
                 <div className="w-[180px]">
@@ -79,7 +79,7 @@ const ParamConfigContent: FC = () => {
           </div>
         </div>
         <div>
-          <div className="mb-2 text-[13px] font-semibold leading-[18px] text-text-secondary">{t('vision.visionSettings.uploadMethod', { ns: 'appDebug' })}</div>
+          <div className="mb-2 text-[13px] leading-[18px] font-semibold text-text-secondary">{t('vision.visionSettings.uploadMethod', { ns: 'appDebug' })}</div>
           <div className="flex items-center gap-1">
             <OptionCard
               className="grow"
diff --git a/web/app/components/app/configuration/config/automatic/res-placeholder.tsx b/web/app/components/app/configuration/config/automatic/res-placeholder.tsx
index 6b84e8ce8b..54a51bb41a 100644
--- a/web/app/components/app/configuration/config/automatic/res-placeholder.tsx
+++ b/web/app/components/app/configuration/config/automatic/res-placeholder.tsx
@@ -9,7 +9,7 @@ const ResPlaceholder: FC = () => {
   return (
     <div className="flex h-full w-0 grow flex-col items-center justify-center space-y-3 px-8">
       <Generator className="size-8 text-text-quaternary" />
-      <div className="text-center text-[13px] font-normal leading-5 text-text-tertiary">
+      <div className="text-center text-[13px] leading-5 font-normal text-text-tertiary">
         <div>{t('generate.newNoDataLine1', { ns: 'appDebug' })}</div>
       </div>
     </div>
diff --git a/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx b/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
index c8f7bc49ec..8488d0269f 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
@@ -36,7 +36,7 @@ const WeightedScore = ({
 
   return (
     <div>
-      <div className="space-x-3 rounded-lg border border-components-panel-border px-3 pb-2 pt-5">
+      <div className="space-x-3 rounded-lg border border-components-panel-border px-3 pt-5 pb-2">
         <div className="grow" style={weightedScoreSliderStyle}>
           <Slider
             className="grow"
@@ -50,13 +50,13 @@ const WeightedScore = ({
           />
         </div>
         <div className="mt-3 flex justify-between">
-          <div className="flex w-[90px] shrink-0 items-center text-util-colors-blue-light-blue-light-500 system-xs-semibold-uppercase">
+          <div className="flex w-[90px] shrink-0 items-center system-xs-semibold-uppercase text-util-colors-blue-light-blue-light-500">
             <div className="mr-1 truncate uppercase" title={t('weightedScore.semantic', { ns: 'dataset' }) || ''}>
               {t('weightedScore.semantic', { ns: 'dataset' })}
             </div>
             {formatNumber(value.value[0]!)}
           </div>
-          <div className="flex w-[90px] shrink-0 items-center justify-end text-util-colors-teal-teal-500 system-xs-semibold-uppercase">
+          <div className="flex w-[90px] shrink-0 items-center justify-end system-xs-semibold-uppercase text-util-colors-teal-teal-500">
             {formatNumber(value.value[1]!)}
             <div className="ml-1 truncate uppercase" title={t('weightedScore.keyword', { ns: 'dataset' }) || ''}>
               {t('weightedScore.keyword', { ns: 'dataset' })}
diff --git a/web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx b/web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx
index f7a3112225..7693c3ab43 100644
--- a/web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx
+++ b/web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx
@@ -69,7 +69,7 @@ const DebugItem: FC<DebugItemProps> = ({
       style={style}
     >
       <div className="flex h-10 shrink-0 items-center justify-between border-b-[0.5px] border-divider-regular px-3">
-        <div className="flex h-5 w-6 items-center justify-center font-medium italic text-text-tertiary">
+        <div className="flex h-5 w-6 items-center justify-center font-medium text-text-tertiary italic">
           #
           {index + 1}
         </div>
diff --git a/web/app/components/app/configuration/debug/debug-with-multiple-model/index.tsx b/web/app/components/app/configuration/debug/debug-with-multiple-model/index.tsx
index f98e8c1f06..11241fec67 100644
--- a/web/app/components/app/configuration/debug/debug-with-multiple-model/index.tsx
+++ b/web/app/components/app/configuration/debug/debug-with-multiple-model/index.tsx
@@ -122,7 +122,7 @@ const DebugWithMultipleModel = () => {
               key={modelConfig.id}
               modelAndParameter={modelConfig}
               className={`
-                absolute left-6 top-0 min-h-[200px]
+                absolute top-0 left-6 min-h-[200px]
                 ${twoLine && index === 0 && 'mr-2'}
                 ${threeLine && (index === 0 || index === 1) && 'mr-2'}
                 ${fourLine && (index === 0 || index === 2) && 'mr-2'}
diff --git a/web/app/components/app/log/empty-element.tsx b/web/app/components/app/log/empty-element.tsx
index 95b0e7f03f..7b89ac4060 100644
--- a/web/app/components/app/log/empty-element.tsx
+++ b/web/app/components/app/log/empty-element.tsx
@@ -30,9 +30,9 @@ const EmptyElement: FC<{ appDetail: App }> = ({ appDetail }) => {
       <div className="box-border h-fit w-[560px] rounded-2xl bg-background-section-burn px-5 py-4">
         <span className="system-md-semibold text-text-secondary">
           {t('table.empty.element.title', { ns: 'appLog' })}
-          <ThreeDotsIcon className="relative -left-1.5 -top-3 inline text-text-secondary" />
+          <ThreeDotsIcon className="relative -top-3 -left-1.5 inline text-text-secondary" />
         </span>
-        <div className="system-sm-regular mt-2 text-text-tertiary">
+        <div className="mt-2 system-sm-regular text-text-tertiary">
           <Trans
             i18nKey="table.empty.element.content"
             ns="appLog"
diff --git a/web/app/components/app/log/index.tsx b/web/app/components/app/log/index.tsx
index 411ec8694d..0899121838 100644
--- a/web/app/components/app/log/index.tsx
+++ b/web/app/components/app/log/index.tsx
@@ -118,7 +118,7 @@ const Logs: FC<ILogsProps> = ({ appDetail }) => {
 
   return (
     <div className="flex h-full grow flex-col">
-      <p className="system-sm-regular shrink-0 text-text-tertiary">{t('description', { ns: 'appLog' })}</p>
+      <p className="shrink-0 system-sm-regular text-text-tertiary">{t('description', { ns: 'appLog' })}</p>
       <div className="flex max-h-[calc(100%-16px)] flex-1 grow flex-col py-4">
         <Filter isChatMode={isChatMode} appId={appDetail.id} queryParams={queryParams} setQueryParams={handleQueryParamsChange} />
         {total === undefined
diff --git a/web/app/components/app/text-generate/item/result-tab.tsx b/web/app/components/app/text-generate/item/result-tab.tsx
index 575f322848..5e8a0d2b24 100644
--- a/web/app/components/app/text-generate/item/result-tab.tsx
+++ b/web/app/components/app/text-generate/item/result-tab.tsx
@@ -24,8 +24,8 @@ const ResultTab = ({
           {!!data?.files?.length && (
             <div className="flex flex-col gap-2">
               {data?.files.map((item: any) => (
-                <div key={item.varName} className="system-xs-regular flex flex-col gap-1">
-                  <div className="py-1 text-text-tertiary ">{item.varName}</div>
+                <div key={item.varName} className="flex flex-col gap-1 system-xs-regular">
+                  <div className="py-1 text-text-tertiary">{item.varName}</div>
                   <FileList
                     files={item.list}
                     showDeleteAction={false}
diff --git a/web/app/components/app/workflow-log/detail.tsx b/web/app/components/app/workflow-log/detail.tsx
index 99d2c70228..e191bfb794 100644
--- a/web/app/components/app/workflow-log/detail.tsx
+++ b/web/app/components/app/workflow-log/detail.tsx
@@ -27,11 +27,11 @@ const DetailPanel: FC<ILogDetail> = ({ runID, onClose, canReplay = false }) => {
 
   return (
     <div className="relative flex grow flex-col pt-3">
-      <span className="absolute right-3 top-4 z-20 cursor-pointer p-1" onClick={onClose}>
+      <span className="absolute top-4 right-3 z-20 cursor-pointer p-1" onClick={onClose}>
         <RiCloseLine className="h-4 w-4 text-text-tertiary" />
       </span>
       <div className="flex items-center bg-components-panel-bg">
-        <h1 className="system-xl-semibold shrink-0 px-4 py-1 text-text-primary">{t('runDetail.workflowTitle', { ns: 'appLog' })}</h1>
+        <h1 className="shrink-0 px-4 py-1 system-xl-semibold text-text-primary">{t('runDetail.workflowTitle', { ns: 'appLog' })}</h1>
         {canReplay && (
           <TooltipPlus
             popupContent={t('runDetail.testWithParams', { ns: 'appLog' })}
diff --git a/web/app/components/apps/footer.tsx b/web/app/components/apps/footer.tsx
index 9147ccf6a6..4c66393bab 100644
--- a/web/app/components/apps/footer.tsx
+++ b/web/app/components/apps/footer.tsx
@@ -29,8 +29,8 @@ const Footer = () => {
 
   return (
     <footer className="relative shrink-0 grow-0 px-12 py-2">
-      <h3 className="text-gradient text-xl font-semibold leading-tight">{t('join', { ns: 'app' })}</h3>
-      <p className="system-sm-regular mt-1 text-text-tertiary">{t('communityIntro', { ns: 'app' })}</p>
+      <h3 className="text-gradient text-xl leading-tight font-semibold">{t('join', { ns: 'app' })}</h3>
+      <p className="mt-1 system-sm-regular text-text-tertiary">{t('communityIntro', { ns: 'app' })}</p>
       <div className="mt-3 flex items-center gap-2">
         <CustomLink href="https://github.com/langgenius/dify">
           <RiGithubFill className="h-5 w-5 text-text-tertiary" />
diff --git a/web/app/components/apps/list.tsx b/web/app/components/apps/list.tsx
index 3b30a839d4..02f12a0c78 100644
--- a/web/app/components/apps/list.tsx
+++ b/web/app/components/apps/list.tsx
@@ -241,7 +241,7 @@ const List: FC<Props> = ({
     <>
       <div ref={containerRef} className="relative flex h-0 shrink-0 grow flex-col overflow-y-auto bg-background-body">
         {dragging && (
-          <div className="inset-0 absolute z-50 m-0.5 rounded-2xl border-2 border-dashed border-components-dropzone-border-accent bg-[rgba(21,90,239,0.14)] p-2">
+          <div className="absolute inset-0 z-50 m-0.5 rounded-2xl border-2 border-dashed border-components-dropzone-border-accent bg-[rgba(21,90,239,0.14)] p-2">
           </div>
         )}
 
diff --git a/web/app/components/base/agent-log-modal/result.tsx b/web/app/components/base/agent-log-modal/result.tsx
index b4c614ac4e..da7c43ebec 100644
--- a/web/app/components/base/agent-log-modal/result.tsx
+++ b/web/app/components/base/agent-log-modal/result.tsx
@@ -66,7 +66,7 @@ const ResultPanel: FC<ResultPanelProps> = ({
       </div>
       <div className="px-4 py-2">
         <div className="relative">
-          <div className="h-6 text-xs font-medium leading-6 text-text-tertiary">{t('meta.title', { ns: 'runLog' })}</div>
+          <div className="h-6 text-xs leading-6 font-medium text-text-tertiary">{t('meta.title', { ns: 'runLog' })}</div>
           <div className="py-1">
             <div className="flex">
               <div className="w-[104px] shrink-0 truncate px-2 py-[5px] text-xs leading-[18px] text-text-tertiary">{t('meta.status', { ns: 'runLog' })}</div>
diff --git a/web/app/components/base/app-icon/index.stories.tsx b/web/app/components/base/app-icon/index.stories.tsx
index 15438ca9d1..2d7209ba2f 100644
--- a/web/app/components/base/app-icon/index.stories.tsx
+++ b/web/app/components/base/app-icon/index.stories.tsx
@@ -52,7 +52,7 @@ export const Sizes: Story = {
         {sizes.map(size => (
           <div key={size} className="flex flex-col items-center gap-2">
             <AppIcon {...args} size={size} icon="🚀" background="#E5DEFF" />
-            <span className="text-xs uppercase text-text-tertiary">{size}</span>
+            <span className="text-xs text-text-tertiary uppercase">{size}</span>
           </div>
         ))}
       </div>
diff --git a/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx b/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx
index f8101e1b3a..43cf25908c 100644
--- a/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx
@@ -39,11 +39,11 @@ const MobileOperationDropdown = ({
         <div
           className="min-w-[160px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg backdrop-blur-xs"
         >
-          <div className="flex cursor-pointer items-center space-x-1 rounded-lg px-3 py-1.5 text-text-secondary system-md-regular hover:bg-state-base-hover" onClick={handleResetChat}>
+          <div className="flex cursor-pointer items-center space-x-1 rounded-lg px-3 py-1.5 system-md-regular text-text-secondary hover:bg-state-base-hover" onClick={handleResetChat}>
             <span className="grow">{t('chat.resetChat', { ns: 'share' })}</span>
           </div>
           {!hideViewChatSettings && (
-            <div className="flex cursor-pointer items-center space-x-1 rounded-lg px-3 py-1.5 text-text-secondary system-md-regular hover:bg-state-base-hover" onClick={handleViewChatSettings}>
+            <div className="flex cursor-pointer items-center space-x-1 rounded-lg px-3 py-1.5 system-md-regular text-text-secondary hover:bg-state-base-hover" onClick={handleViewChatSettings}>
               <span className="grow">{t('chat.viewChatSettings', { ns: 'share' })}</span>
             </div>
           )}
diff --git a/web/app/components/base/chat/chat-with-history/inputs-form/view-form-dropdown.tsx b/web/app/components/base/chat/chat-with-history/inputs-form/view-form-dropdown.tsx
index fbf8128cc7..057f3d03df 100644
--- a/web/app/components/base/chat/chat-with-history/inputs-form/view-form-dropdown.tsx
+++ b/web/app/components/base/chat/chat-with-history/inputs-form/view-form-dropdown.tsx
@@ -33,7 +33,7 @@ const ViewFormDropdown = () => {
         <div className="w-[400px] rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg backdrop-blur-xs">
           <div className="flex items-center gap-3 rounded-t-2xl border-b border-divider-subtle px-6 py-4">
             <Message3Fill className="h-6 w-6 shrink-0" />
-            <div className="system-xl-semibold grow text-text-secondary">{t('chat.chatSettingsTitle', { ns: 'share' })}</div>
+            <div className="grow system-xl-semibold text-text-secondary">{t('chat.chatSettingsTitle', { ns: 'share' })}</div>
           </div>
           <div className="p-6">
             <InputsFormContent />
diff --git a/web/app/components/base/chat/chat-with-history/sidebar/list.tsx b/web/app/components/base/chat/chat-with-history/sidebar/list.tsx
index d85f80cb5e..fda1ceea0f 100644
--- a/web/app/components/base/chat/chat-with-history/sidebar/list.tsx
+++ b/web/app/components/base/chat/chat-with-history/sidebar/list.tsx
@@ -21,7 +21,7 @@ const List: FC<ListProps> = ({
   return (
     <div className="space-y-0.5">
       {title && (
-        <div className="system-xs-medium-uppercase px-3 pb-1 pt-2 text-text-tertiary">{title}</div>
+        <div className="px-3 pt-2 pb-1 system-xs-medium-uppercase text-text-tertiary">{title}</div>
       )}
       {list.map(item => (
         <Item
diff --git a/web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx b/web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx
index a063fee777..0d85311cdc 100644
--- a/web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx
+++ b/web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx
@@ -12,13 +12,13 @@ const ExecutedAction = ({
 }: ExecutedActionProps) => {
   return (
     <div className="flex flex-col gap-y-1 py-1" data-testid="executed-action">
-      <Divider className="mb-2 mt-1 w-[30px]" />
-      <div className="flex items-center gap-x-1 text-text-tertiary system-xs-regular">
+      <Divider className="mt-1 mb-2 w-[30px]" />
+      <div className="flex items-center gap-x-1 system-xs-regular text-text-tertiary">
         <div className="i-custom-vender-workflow-trigger-all size-3.5 shrink-0" />
         <Trans
           i18nKey="nodes.humanInput.userActions.triggered"
           ns="workflow"
-          components={{ strong: <span className="text-text-secondary system-xs-medium"></span> }}
+          components={{ strong: <span className="system-xs-medium text-text-secondary"></span> }}
           values={{ actionName: executedAction.id }}
         />
       </div>
diff --git a/web/app/components/base/chat/chat/answer/human-input-content/tips.tsx b/web/app/components/base/chat/chat/answer/human-input-content/tips.tsx
index 42e9b784c9..724b639fcd 100644
--- a/web/app/components/base/chat/chat/answer/human-input-content/tips.tsx
+++ b/web/app/components/base/chat/chat/answer/human-input-content/tips.tsx
@@ -22,10 +22,10 @@ const Tips = ({
       <Divider className="my-2! w-[30px]" />
       <div className="space-y-1 pt-1" data-testid="tips">
         {showEmailTip && !isEmailDebugMode && (
-          <div className="text-text-secondary system-xs-regular">{t('common.humanInputEmailTip', { ns: 'workflow' })}</div>
+          <div className="system-xs-regular text-text-secondary">{t('common.humanInputEmailTip', { ns: 'workflow' })}</div>
         )}
         {showEmailTip && isEmailDebugMode && (
-          <div className="text-text-secondary system-xs-regular">
+          <div className="system-xs-regular text-text-secondary">
             <Trans
               i18nKey="common.humanInputEmailTipInDebugMode"
               ns="workflow"
@@ -34,7 +34,7 @@ const Tips = ({
             />
           </div>
         )}
-        {showDebugModeTip && <div className="text-text-warning system-xs-medium">{t('common.humanInputWebappTip', { ns: 'workflow' })}</div>}
+        {showDebugModeTip && <div className="system-xs-medium text-text-warning">{t('common.humanInputWebappTip', { ns: 'workflow' })}</div>}
       </div>
     </>
   )
diff --git a/web/app/components/base/chat/chat/answer/more.tsx b/web/app/components/base/chat/chat/answer/more.tsx
index 700c548ee4..11d93e56f0 100644
--- a/web/app/components/base/chat/chat/answer/more.tsx
+++ b/web/app/components/base/chat/chat/answer/more.tsx
@@ -14,7 +14,7 @@ const More: FC<MoreProps> = ({
 
   return (
     <div
-      className="mt-1 flex items-center text-text-quaternary opacity-0 system-xs-regular group-hover:opacity-100"
+      className="mt-1 flex items-center system-xs-regular text-text-quaternary opacity-0 group-hover:opacity-100"
       data-testid="more-container"
     >
       {
diff --git a/web/app/components/base/chat/chat/citation/index.tsx b/web/app/components/base/chat/chat/citation/index.tsx
index 56eb0e602d..cd5998e74f 100644
--- a/web/app/components/base/chat/chat/citation/index.tsx
+++ b/web/app/components/base/chat/chat/citation/index.tsx
@@ -74,8 +74,8 @@ const Citation: FC<CitationProps> = ({
   const resourcesLength = resources.length
 
   return (
-    <div className="-mb-1 mt-3">
-      <div data-testid="citation-title" className="mb-2 flex items-center text-text-tertiary system-xs-medium">
+    <div className="mt-3 -mb-1">
+      <div data-testid="citation-title" className="mb-2 flex items-center system-xs-medium text-text-tertiary">
         {t('chat.citation.title', { ns: 'common' })}
         <div className="ml-2 h-px grow bg-divider-regular" />
       </div>
@@ -85,7 +85,7 @@ const Citation: FC<CitationProps> = ({
             <div
               key={res.documentId}
               data-testid="citation-measurement-item"
-              className="absolute left-0 top-0 -z-10 mb-1 mr-1 h-7 w-auto max-w-[240px] whitespace-nowrap pl-7 pr-2 text-xs opacity-0"
+              className="absolute top-0 left-0 -z-10 mr-1 mb-1 h-7 w-auto max-w-[240px] pr-2 pl-7 text-xs whitespace-nowrap opacity-0"
               ref={(ele: HTMLDivElement | null) => { elesRef.current[index] = ele! }}
             >
               {res.documentName}
@@ -94,7 +94,7 @@ const Citation: FC<CitationProps> = ({
         }
         {
           resources.slice(0, showMore ? resourcesLength : limitNumberInOneLine).map(res => (
-            <div key={res.documentId} className="mb-1 mr-1 cursor-pointer">
+            <div key={res.documentId} className="mr-1 mb-1 cursor-pointer">
               <Popup
                 data={res}
                 showHitInfo={showHitInfo}
@@ -106,7 +106,7 @@ const Citation: FC<CitationProps> = ({
           limitNumberInOneLine < resourcesLength && (
             <div
               data-testid="citation-more-toggle"
-              className="flex h-7 cursor-pointer items-center rounded-lg bg-components-panel-bg px-2 text-text-tertiary system-xs-medium"
+              className="flex h-7 cursor-pointer items-center rounded-lg bg-components-panel-bg px-2 system-xs-medium text-text-tertiary"
               onClick={() => setShowMore(v => !v)}
             >
               {
diff --git a/web/app/components/base/chat/chat/citation/popup.tsx b/web/app/components/base/chat/chat/citation/popup.tsx
index 2b4070b69a..51a73bc4b6 100644
--- a/web/app/components/base/chat/chat/citation/popup.tsx
+++ b/web/app/components/base/chat/chat/citation/popup.tsx
@@ -64,10 +64,10 @@ const Popup: FC<PopupProps> = ({
       </PortalToFollowElemTrigger>
       <PortalToFollowElemContent style={{ zIndex: 1000 }}>
         <div data-testid="popup-content" className="max-w-[360px] rounded-xl bg-background-section-burn shadow-lg backdrop-blur-[5px]">
-          <div className="px-4 pb-2 pt-3">
+          <div className="px-4 pt-3 pb-2">
             <div className="flex h-[18px] items-center">
               <FileIcon type={fileType} className="mr-1 h-4 w-4 shrink-0" />
-              <div className="truncate text-text-tertiary system-xs-medium">
+              <div className="truncate system-xs-medium text-text-tertiary">
                 {(data.dataSourceType === 'upload_file' || data.dataSourceType === 'file') && !!data.sources?.[0]?.dataset_id
                   ? (
                       <button
@@ -98,7 +98,7 @@ const Popup: FC<PopupProps> = ({
                         <div className="mb-2 flex items-center justify-between">
                           <div className="flex h-5 items-center rounded-md border border-divider-subtle px-1.5">
                             {/* replaced svg component with tailwind icon class per lint rule */}
-                            <i className="i-custom-vender-line-general-hash-02 mr-0.5 h-3 w-3 text-text-quaternary" aria-hidden />
+                            <i className="mr-0.5 i-custom-vender-line-general-hash-02 h-3 w-3 text-text-quaternary" aria-hidden />
                             <div data-testid="popup-segment-position" className="text-[11px] font-medium text-text-tertiary">
                               {source.segment_position || index + 1}
                             </div>
@@ -111,29 +111,29 @@ const Popup: FC<PopupProps> = ({
                                 className="hidden h-[18px] items-center text-xs text-text-accent group-hover:flex"
                               >
                                 {t('chat.citation.linkToDataset', { ns: 'common' })}
-                                <i className="i-custom-vender-line-arrows-arrow-up-right ml-1 h-3 w-3" aria-hidden />
+                                <i className="ml-1 i-custom-vender-line-arrows-arrow-up-right h-3 w-3" aria-hidden />
                               </Link>
                             )
                           }
                         </div>
-                        <div data-testid="popup-source-content" className="wrap-break-word text-[13px] text-text-secondary">{source.content}</div>
+                        <div data-testid="popup-source-content" className="text-[13px] wrap-break-word text-text-secondary">{source.content}</div>
                         {
                           showHitInfo && (
-                            <div data-testid="popup-hit-info" className="mt-2 flex flex-wrap items-center text-text-quaternary system-xs-medium">
+                            <div data-testid="popup-hit-info" className="mt-2 flex flex-wrap items-center system-xs-medium text-text-quaternary">
                               <Tooltip
                                 text={t('chat.citation.characters', { ns: 'common' })}
                                 data={source.word_count}
-                                icon={<i className="i-custom-vender-line-editor-type-square mr-1 h-3 w-3" aria-hidden />}
+                                icon={<i className="mr-1 i-custom-vender-line-editor-type-square h-3 w-3" aria-hidden />}
                               />
                               <Tooltip
                                 text={t('chat.citation.hitCount', { ns: 'common' })}
                                 data={source.hit_count}
-                                icon={<i className="i-custom-vender-line-general-target-04 mr-1 h-3 w-3" aria-hidden />}
+                                icon={<i className="mr-1 i-custom-vender-line-general-target-04 h-3 w-3" aria-hidden />}
                               />
                               <Tooltip
                                 text={t('chat.citation.vectorHash', { ns: 'common' })}
                                 data={source.index_node_hash?.substring(0, 7)}
-                                icon={<i className="i-custom-vender-line-editor-bezier-curve-03 mr-1 h-3 w-3" aria-hidden />}
+                                icon={<i className="mr-1 i-custom-vender-line-editor-bezier-curve-03 h-3 w-3" aria-hidden />}
                               />
                               {
                                 !!source.score && (
diff --git a/web/app/components/base/chat/chat/citation/progress-tooltip.tsx b/web/app/components/base/chat/chat/citation/progress-tooltip.tsx
index 7915a09d20..fd75c2f3b0 100644
--- a/web/app/components/base/chat/chat/citation/progress-tooltip.tsx
+++ b/web/app/components/base/chat/chat/citation/progress-tooltip.tsx
@@ -40,7 +40,7 @@ const ProgressTooltip: FC<ProgressTooltipProps> = ({
         </div>
       </PortalToFollowElemTrigger>
       <PortalToFollowElemContent style={{ zIndex: 1001 }}>
-        <div data-testid="progress-tooltip-popup" className="rounded-lg bg-components-tooltip-bg p-3 text-text-quaternary shadow-lg system-xs-medium">
+        <div data-testid="progress-tooltip-popup" className="rounded-lg bg-components-tooltip-bg p-3 system-xs-medium text-text-quaternary shadow-lg">
           {t('chat.citation.hitScore', { ns: 'common' })}
           {' '}
           {data}
diff --git a/web/app/components/base/chat/chat/citation/tooltip.tsx b/web/app/components/base/chat/chat/citation/tooltip.tsx
index d23234a660..16e122bc04 100644
--- a/web/app/components/base/chat/chat/citation/tooltip.tsx
+++ b/web/app/components/base/chat/chat/citation/tooltip.tsx
@@ -36,7 +36,7 @@ const Tooltip: FC<TooltipProps> = ({
         </div>
       </PortalToFollowElemTrigger>
       <PortalToFollowElemContent style={{ zIndex: 1001 }}>
-        <div data-testid="tooltip-popup" className="rounded-lg bg-components-tooltip-bg p-3 text-text-quaternary shadow-lg system-xs-medium">
+        <div data-testid="tooltip-popup" className="rounded-lg bg-components-tooltip-bg p-3 system-xs-medium text-text-quaternary shadow-lg">
           {text}
           {' '}
           {data}
diff --git a/web/app/components/base/content-dialog/index.tsx b/web/app/components/base/content-dialog/index.tsx
index 7348879111..5367a35fc4 100644
--- a/web/app/components/base/content-dialog/index.tsx
+++ b/web/app/components/base/content-dialog/index.tsx
@@ -19,7 +19,7 @@ const ContentDialog = ({
     <Transition
       show={show}
       as="div"
-      className="absolute left-0 top-0 z-[70] box-border h-full w-full p-2"
+      className="absolute top-0 left-0 z-[70] box-border h-full w-full p-2"
     >
       <TransitionChild>
         <div
diff --git a/web/app/components/base/copy-icon/index.tsx b/web/app/components/base/copy-icon/index.tsx
index 15332592d0..b0b4635a39 100644
--- a/web/app/components/base/copy-icon/index.tsx
+++ b/web/app/components/base/copy-icon/index.tsx
@@ -30,8 +30,8 @@ const CopyIcon = ({ content }: Props) => {
     >
       <div onMouseLeave={reset}>
         {!copied
-          ? (<span className="i-custom-vender-line-files-copy mx-1 h-3.5 w-3.5 cursor-pointer text-text-tertiary" onClick={handleCopy} data-testid="copy-icon" />)
-          : (<span className="i-custom-vender-line-files-copy-check mx-1 h-3.5 w-3.5 text-text-tertiary" data-testid="copied-icon" />)}
+          ? (<span className="mx-1 i-custom-vender-line-files-copy h-3.5 w-3.5 cursor-pointer text-text-tertiary" onClick={handleCopy} data-testid="copy-icon" />)
+          : (<span className="mx-1 i-custom-vender-line-files-copy-check h-3.5 w-3.5 text-text-tertiary" data-testid="copied-icon" />)}
       </div>
     </Tooltip>
   )
diff --git a/web/app/components/base/corner-label/index.stories.tsx b/web/app/components/base/corner-label/index.stories.tsx
index cb7a180c85..ce2ff6d277 100644
--- a/web/app/components/base/corner-label/index.stories.tsx
+++ b/web/app/components/base/corner-label/index.stories.tsx
@@ -31,7 +31,7 @@ export const Default: Story = {}
 export const OnCard: Story = {
   render: args => (
     <div className="relative w-80 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <CornerLabel {...args} className="absolute -right-px -top-px" />
+      <CornerLabel {...args} className="absolute -top-px -right-px" />
       <div className="text-sm text-text-secondary">
         Showcase how the label sits on a card header. Pair with contextual text or status information.
       </div>
diff --git a/web/app/components/base/date-and-time-picker/calendar/days-of-week.tsx b/web/app/components/base/date-and-time-picker/calendar/days-of-week.tsx
index 46670b27b3..e9bdd70e62 100644
--- a/web/app/components/base/date-and-time-picker/calendar/days-of-week.tsx
+++ b/web/app/components/base/date-and-time-picker/calendar/days-of-week.tsx
@@ -9,7 +9,7 @@ export const DaysOfWeek = () => {
       {daysOfWeek.map(day => (
         <div
           key={day}
-          className="system-2xs-medium flex items-center justify-center text-text-tertiary"
+          className="flex items-center justify-center system-2xs-medium text-text-tertiary"
         >
           {day}
         </div>
diff --git a/web/app/components/base/date-and-time-picker/date-picker/header.tsx b/web/app/components/base/date-and-time-picker/date-picker/header.tsx
index 4177edfe7a..272a4958d2 100644
--- a/web/app/components/base/date-and-time-picker/date-picker/header.tsx
+++ b/web/app/components/base/date-and-time-picker/date-picker/header.tsx
@@ -18,7 +18,7 @@ const Header: FC<DatePickerHeaderProps> = ({
         <button
           type="button"
           onClick={handleOpenYearMonthPicker}
-          className="system-md-semibold flex items-center gap-x-0.5 rounded-lg px-2 py-1.5 text-text-primary hover:bg-state-base-hover"
+          className="flex items-center gap-x-0.5 rounded-lg px-2 py-1.5 system-md-semibold text-text-primary hover:bg-state-base-hover"
         >
           <span>{`${months[currentDate.month()]} ${currentDate.year()}`}</span>
           <RiArrowDownSLine className="h-4 w-4 text-text-tertiary" />
diff --git a/web/app/components/base/date-and-time-picker/time-picker/header.tsx b/web/app/components/base/date-and-time-picker/time-picker/header.tsx
index ffda3d486f..23e86a18c1 100644
--- a/web/app/components/base/date-and-time-picker/time-picker/header.tsx
+++ b/web/app/components/base/date-and-time-picker/time-picker/header.tsx
@@ -11,7 +11,7 @@ const Header = ({
 
   return (
     <div className="flex flex-col border-b-[0.5px] border-divider-regular">
-      <div className="system-md-semibold flex items-center px-2 py-1.5 text-text-primary">
+      <div className="flex items-center px-2 py-1.5 system-md-semibold text-text-primary">
         {title || t('title.pickTime', { ns: 'time' })}
       </div>
     </div>
diff --git a/web/app/components/base/date-and-time-picker/year-and-month-picker/header.tsx b/web/app/components/base/date-and-time-picker/year-and-month-picker/header.tsx
index 043598884a..c0a90d7acb 100644
--- a/web/app/components/base/date-and-time-picker/year-and-month-picker/header.tsx
+++ b/web/app/components/base/date-and-time-picker/year-and-month-picker/header.tsx
@@ -17,7 +17,7 @@ const Header: FC<YearAndMonthPickerHeaderProps> = ({
       <button
         type="button"
         onClick={onClick}
-        className="system-md-semibold flex items-center gap-x-0.5 rounded-lg px-2 py-1.5 text-text-primary hover:bg-state-base-hover"
+        className="flex items-center gap-x-0.5 rounded-lg px-2 py-1.5 system-md-semibold text-text-primary hover:bg-state-base-hover"
       >
         <span>{`${months[selectedMonth]} ${selectedYear}`}</span>
         <RiArrowUpSLine className="h-4 w-4 text-text-tertiary" />
diff --git a/web/app/components/base/effect/index.stories.tsx b/web/app/components/base/effect/index.stories.tsx
index 8452e9aefe..a631e30166 100644
--- a/web/app/components/base/effect/index.stories.tsx
+++ b/web/app/components/base/effect/index.stories.tsx
@@ -28,8 +28,8 @@ type Story = StoryObj<typeof meta>
 export const Playground: Story = {
   render: () => (
     <div className="relative h-40 w-72 overflow-hidden rounded-2xl border border-divider-subtle bg-background-default-subtle">
-      <Effect className="left-8 top-6" />
-      <Effect className="bg-util-colors-purple-brand-purple-brand-500 right-10 top-14" />
+      <Effect className="top-6 left-8" />
+      <Effect className="bg-util-colors-purple-brand-purple-brand-500 top-14 right-10" />
       <div className="absolute inset-x-0 bottom-4 flex justify-center text-xs text-text-secondary">
         Accent glow
       </div>
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx b/web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx
index b3985df481..0335587af0 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx
@@ -11,10 +11,10 @@ export const Item: FC<{ title: string, tooltip: string, children: React.JSX.Elem
   return (
     <div>
       <div className="mb-1 flex items-center space-x-1">
-        <div className="py-1 text-text-secondary system-sm-semibold">{title}</div>
+        <div className="py-1 system-sm-semibold text-text-secondary">{title}</div>
         <Tooltip
           popupContent={
-            <div className="max-w-[200px] text-text-secondary system-sm-regular">{tooltip}</div>
+            <div className="max-w-[200px] system-sm-regular text-text-secondary">{tooltip}</div>
           }
         />
       </div>
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx b/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx
index 0363eb2820..f3d86749f4 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx
@@ -38,7 +38,7 @@ const ScoreSlider: FC<Props> = ({
           aria-label={t('feature.annotation.scoreThreshold.title', { ns: 'appDebug' })}
         />
         <div
-          className="pointer-events-none absolute top-[-16px] text-text-primary system-sm-semibold"
+          className="pointer-events-none absolute top-[-16px] system-sm-semibold text-text-primary"
           style={{
             left: `calc(4px + ${(safeValue - 80) / 20} * (100% - 8px))`,
             transform: 'translateX(-50%)',
diff --git a/web/app/components/base/features/new-feature-panel/index.tsx b/web/app/components/base/features/new-feature-panel/index.tsx
index 9ee2f407eb..8425e03ae1 100644
--- a/web/app/components/base/features/new-feature-panel/index.tsx
+++ b/web/app/components/base/features/new-feature-panel/index.tsx
@@ -66,12 +66,12 @@ const NewFeaturePanel = ({
         <div className="grow basis-0 overflow-y-auto px-4 pb-4">
           {showFileUpload && (
             <div className="relative mb-1 rounded-xl border border-components-panel-border p-2 shadow-xs">
-              <div className="absolute left-0 top-0 h-full w-full rounded-xl opacity-40" style={{ background: 'linear-gradient(92deg, rgba(11, 165, 236, 0.25) 18.12%, rgba(255, 255, 255, 0.00) 167.31%)' }}></div>
+              <div className="absolute top-0 left-0 h-full w-full rounded-xl opacity-40" style={{ background: 'linear-gradient(92deg, rgba(11, 165, 236, 0.25) 18.12%, rgba(255, 255, 255, 0.00) 167.31%)' }}></div>
               <div className="relative flex h-full w-full items-start">
                 <div className="mr-0.5 shrink-0 p-0.5">
                   <RiInformation2Fill className="h-5 w-5 text-text-accent" />
                 </div>
-                <div className="system-xs-medium p-1 text-text-primary">
+                <div className="p-1 system-xs-medium text-text-primary">
                   <span>{isChatMode ? t('common.fileUploadTip', { ns: 'workflow' }) : t('common.ImageUploadLegacyTip', { ns: 'workflow' })}</span>
                 </div>
               </div>
diff --git a/web/app/components/base/file-icon/index.stories.tsx b/web/app/components/base/file-icon/index.stories.tsx
index 4f0ec61c94..65be658a7c 100644
--- a/web/app/components/base/file-icon/index.stories.tsx
+++ b/web/app/components/base/file-icon/index.stories.tsx
@@ -61,7 +61,7 @@ export const Gallery: Story = {
         {examples.map(type => (
           <div key={type} className="flex flex-col items-center gap-1">
             <FileIcon type={type} className="h-9 w-9" />
-            <span className="text-xs uppercase text-text-tertiary">{type}</span>
+            <span className="text-xs text-text-tertiary uppercase">{type}</span>
           </div>
         ))}
       </div>
diff --git a/web/app/components/base/file-uploader/audio-preview.tsx b/web/app/components/base/file-uploader/audio-preview.tsx
index 11b5ea12da..28988b3a7c 100644
--- a/web/app/components/base/file-uploader/audio-preview.tsx
+++ b/web/app/components/base/file-uploader/audio-preview.tsx
@@ -32,7 +32,7 @@ const AudioPreview: FC<AudioPreviewProps> = ({
         </audio>
       </div>
       <div
-        className="absolute right-6 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
+        className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
         onClick={onCancel}
       >
         <span className="i-ri-close-line h-4 w-4 text-gray-500" data-testid="close-btn" />
diff --git a/web/app/components/base/file-uploader/pdf-preview.tsx b/web/app/components/base/file-uploader/pdf-preview.tsx
index 7b27124933..bfd115401b 100644
--- a/web/app/components/base/file-uploader/pdf-preview.tsx
+++ b/web/app/components/base/file-uploader/pdf-preview.tsx
@@ -78,7 +78,7 @@ const PdfPreview: FC<PdfPreviewProps> = ({
       </div>
       <Tooltip popupContent={t('operation.zoomOut', { ns: 'common' })}>
         <div
-          className="absolute right-24 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+          className="absolute top-6 right-24 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
           onClick={zoomOut}
         >
           <RiZoomOutLine className="h-4 w-4 text-gray-500" />
@@ -86,7 +86,7 @@ const PdfPreview: FC<PdfPreviewProps> = ({
       </Tooltip>
       <Tooltip popupContent={t('operation.zoomIn', { ns: 'common' })}>
         <div
-          className="absolute right-16 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+          className="absolute top-6 right-16 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
           onClick={zoomIn}
         >
           <RiZoomInLine className="h-4 w-4 text-gray-500" />
@@ -94,7 +94,7 @@ const PdfPreview: FC<PdfPreviewProps> = ({
       </Tooltip>
       <Tooltip popupContent={t('operation.cancel', { ns: 'common' })}>
         <div
-          className="absolute right-6 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/8 backdrop-blur-[2px]"
+          className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/8 backdrop-blur-[2px]"
           onClick={onCancel}
         >
           <RiCloseLine className="h-4 w-4 text-gray-500" />
diff --git a/web/app/components/base/file-uploader/video-preview.tsx b/web/app/components/base/file-uploader/video-preview.tsx
index 00bed2c67a..ec1644400f 100644
--- a/web/app/components/base/file-uploader/video-preview.tsx
+++ b/web/app/components/base/file-uploader/video-preview.tsx
@@ -31,7 +31,7 @@ const VideoPreview: FC<VideoPreviewProps> = ({
         </video>
       </div>
       <div
-        className="absolute right-6 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
+        className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
         onClick={onCancel}
       >
         <span className="i-ri-close-line h-4 w-4 text-gray-500" data-testid="video-preview-close-btn" />
diff --git a/web/app/components/base/form/components/field/mixed-variable-text-input/placeholder.tsx b/web/app/components/base/form/components/field/mixed-variable-text-input/placeholder.tsx
index b6b7a858de..c4efd7b0a0 100644
--- a/web/app/components/base/form/components/field/mixed-variable-text-input/placeholder.tsx
+++ b/web/app/components/base/form/components/field/mixed-variable-text-input/placeholder.tsx
@@ -25,9 +25,9 @@ const Placeholder = () => {
     >
       <div className="flex grow items-center">
         Type or press
-        <div className="system-kbd mx-0.5 flex h-4 w-4 items-center justify-center rounded-sm bg-components-kbd-bg-gray text-text-placeholder">/</div>
+        <div className="mx-0.5 flex h-4 w-4 items-center justify-center rounded-sm bg-components-kbd-bg-gray system-kbd text-text-placeholder">/</div>
         <div
-          className="system-sm-regular cursor-pointer text-components-input-text-placeholder underline decoration-dotted decoration-auto underline-offset-auto hover:text-text-tertiary"
+          className="cursor-pointer system-sm-regular text-components-input-text-placeholder underline decoration-dotted decoration-auto underline-offset-auto hover:text-text-tertiary"
           onClick={((e) => {
             e.stopPropagation()
             handleInsert('/')
diff --git a/web/app/components/base/grid-mask/index.stories.tsx b/web/app/components/base/grid-mask/index.stories.tsx
index 75ec38b684..318955ba4f 100644
--- a/web/app/components/base/grid-mask/index.stories.tsx
+++ b/web/app/components/base/grid-mask/index.stories.tsx
@@ -18,8 +18,8 @@ const meta = {
     gradientClassName: '',
     children: (
       <div className="relative z-10 flex flex-col gap-3 text-left text-white">
-        <span className="text-xs uppercase tracking-[0.16em] text-white/70">Grid Mask Demo</span>
-        <span className="text-2xl font-semibold leading-tight">Beautiful backgrounds for feature highlights</span>
+        <span className="text-xs tracking-[0.16em] text-white/70 uppercase">Grid Mask Demo</span>
+        <span className="text-2xl leading-tight font-semibold">Beautiful backgrounds for feature highlights</span>
         <p className="max-w-md text-sm text-white/80">
           Place any content inside the mask. On dark backgrounds the grid and soft gradient add depth without distracting from the main message.
         </p>
@@ -41,7 +41,7 @@ export const CustomBackground: Story = {
     children: (
       <div className="flex flex-col gap-2 text-white">
         <span className="text-sm font-medium text-white/80">Custom gradient</span>
-        <span className="text-3xl font-semibold leading-tight">Use your own colors</span>
+        <span className="text-3xl leading-tight font-semibold">Use your own colors</span>
         <p className="max-w-md text-sm text-white/70">
           Override gradient and canvas classes to match brand palettes while keeping the grid texture.
         </p>
diff --git a/web/app/components/base/image-uploader/audio-preview.tsx b/web/app/components/base/image-uploader/audio-preview.tsx
index ea6bdd6062..aa87d9d04e 100644
--- a/web/app/components/base/image-uploader/audio-preview.tsx
+++ b/web/app/components/base/image-uploader/audio-preview.tsx
@@ -23,7 +23,7 @@ const AudioPreview: FC<AudioPreviewProps> = ({
         </audio>
       </div>
       <div
-        className="absolute right-6 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
+        className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
         onClick={onCancel}
         data-testid="close-preview"
       >
diff --git a/web/app/components/base/image-uploader/image-list.stories.tsx b/web/app/components/base/image-uploader/image-list.stories.tsx
index cfea4a0da0..0c27211d16 100644
--- a/web/app/components/base/image-uploader/image-list.stories.tsx
+++ b/web/app/components/base/image-uploader/image-list.stories.tsx
@@ -132,7 +132,7 @@ const ImageUploaderPlayground = ({ readonly }: Story['args']) => {
   return (
     <div className="flex w-[360px] flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-4">
       <div className="flex flex-col gap-2">
-        <span className="text-xs font-medium uppercase tracking-[0.18em] text-text-tertiary">Add images</span>
+        <span className="text-xs font-medium tracking-[0.18em] text-text-tertiary uppercase">Add images</span>
         <div className="flex items-center gap-2">
           <ImageLinkInput onUpload={handleUploadFromLink} disabled={readonly} />
           <button
@@ -156,7 +156,7 @@ const ImageUploaderPlayground = ({ readonly }: Story['args']) => {
       />
 
       <div className="rounded-lg border border-divider-subtle bg-background-default p-2">
-        <span className="mb-1 block text-[11px] font-semibold uppercase tracking-widest text-text-tertiary">
+        <span className="mb-1 block text-[11px] font-semibold tracking-widest text-text-tertiary uppercase">
           Files state
         </span>
         <pre className="max-h-40 overflow-auto text-[11px] leading-relaxed text-text-tertiary">
diff --git a/web/app/components/base/image-uploader/image-preview.tsx b/web/app/components/base/image-uploader/image-preview.tsx
index 4ae6ccb7e6..ec240be9ec 100644
--- a/web/app/components/base/image-uploader/image-preview.tsx
+++ b/web/app/components/base/image-uploader/image-preview.tsx
@@ -200,7 +200,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({
       />
       <Tooltip popupContent={t('operation.copyImage', { ns: 'common' })}>
         <div
-          className="absolute right-48 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+          className="absolute top-6 right-48 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
           onClick={imageCopy}
         >
           {isCopied
@@ -210,7 +210,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({
       </Tooltip>
       <Tooltip popupContent={t('operation.zoomOut', { ns: 'common' })}>
         <div
-          className="absolute right-40 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+          className="absolute top-6 right-40 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
           onClick={zoomOut}
         >
           <span className="i-ri-zoom-out-line h-4 w-4 text-gray-500" data-testid="image-preview-zoom-out-button" />
@@ -218,7 +218,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({
       </Tooltip>
       <Tooltip popupContent={t('operation.zoomIn', { ns: 'common' })}>
         <div
-          className="absolute right-32 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+          className="absolute top-6 right-32 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
           onClick={zoomIn}
         >
           <span className="i-ri-zoom-in-line h-4 w-4 text-gray-500" data-testid="image-preview-zoom-in-button" />
@@ -226,7 +226,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({
       </Tooltip>
       <Tooltip popupContent={t('operation.download', { ns: 'common' })}>
         <div
-          className="absolute right-24 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+          className="absolute top-6 right-24 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
           onClick={downloadImage}
         >
           <span className="i-ri-download-cloud-2-line h-4 w-4 text-gray-500" data-testid="image-preview-download-button" />
@@ -234,7 +234,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({
       </Tooltip>
       <Tooltip popupContent={t('operation.openInNewTab', { ns: 'common' })}>
         <div
-          className="absolute right-16 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+          className="absolute top-6 right-16 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
           onClick={openInNewTab}
         >
           <span className="i-ri-add-box-line h-4 w-4 text-gray-500" data-testid="image-preview-open-in-tab-button" />
@@ -242,7 +242,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({
       </Tooltip>
       <Tooltip popupContent={t('operation.cancel', { ns: 'common' })}>
         <div
-          className="absolute right-6 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/8 backdrop-blur-[2px]"
+          className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/8 backdrop-blur-[2px]"
           onClick={onCancel}
         >
           <span className="i-ri-close-line h-4 w-4 text-gray-500" data-testid="image-preview-close-button" />
diff --git a/web/app/components/base/image-uploader/video-preview.tsx b/web/app/components/base/image-uploader/video-preview.tsx
index 618d31944a..d2a0179b57 100644
--- a/web/app/components/base/image-uploader/video-preview.tsx
+++ b/web/app/components/base/image-uploader/video-preview.tsx
@@ -23,7 +23,7 @@ const VideoPreview: FC<VideoPreviewProps> = ({
         </video>
       </div>
       <div
-        className="absolute right-6 top-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
+        className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
         onClick={onCancel}
       >
         <span className="i-ri-close-line h-4 w-4 text-gray-500" data-testid="close-button" />
diff --git a/web/app/components/base/loading/index.stories.tsx b/web/app/components/base/loading/index.stories.tsx
index 22fe746709..643ef55339 100644
--- a/web/app/components/base/loading/index.stories.tsx
+++ b/web/app/components/base/loading/index.stories.tsx
@@ -33,7 +33,7 @@ const LoadingPreview = ({ type }: { type: 'area' | 'app' }) => {
 
   return (
     <div className="flex flex-col items-center gap-4">
-      <span className="text-xs uppercase tracking-[0.18em] text-text-tertiary">{title}</span>
+      <span className="text-xs tracking-[0.18em] text-text-tertiary uppercase">{title}</span>
       <div
         className={`flex w-64 items-center justify-center rounded-xl border border-divider-subtle bg-background-default-subtle ${containerHeight}`}
       >
diff --git a/web/app/components/base/logo/index.stories.tsx b/web/app/components/base/logo/index.stories.tsx
index 2aa7ec2bb9..90209564ae 100644
--- a/web/app/components/base/logo/index.stories.tsx
+++ b/web/app/components/base/logo/index.stories.tsx
@@ -55,7 +55,7 @@ export const Playground: Story = {
       <ThemePreview theme="dark">
         <div className="flex flex-col gap-6">
           <div className="flex flex-col gap-2">
-            <span className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Primary logo</span>
+            <span className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Primary logo</span>
             <div className="flex items-center justify-between rounded-xl border border-divider-subtle bg-background-default p-4">
               <DifyLogo size={size} style={style} />
               <code className="text-[11px] text-text-tertiary">{`size="${size}" | style="${style}"`}</code>
@@ -63,15 +63,15 @@ export const Playground: Story = {
           </div>
           <div className="grid gap-4 sm:grid-cols-2">
             <div className="flex flex-col gap-2 rounded-xl border border-divider-subtle bg-background-default p-4">
-              <span className="text-[11px] font-medium uppercase tracking-widest text-text-tertiary">Site favicon</span>
+              <span className="text-[11px] font-medium tracking-widest text-text-tertiary uppercase">Site favicon</span>
               <LogoSite />
             </div>
             <div className="flex flex-col gap-2 rounded-xl border border-divider-subtle bg-background-default p-4">
-              <span className="text-[11px] font-medium uppercase tracking-widest text-text-tertiary">Embedded header</span>
+              <span className="text-[11px] font-medium tracking-widest text-text-tertiary uppercase">Embedded header</span>
               <LogoEmbeddedChatHeader />
             </div>
             <div className="flex flex-col gap-2 rounded-xl border border-divider-subtle bg-background-default p-4 sm:col-span-2">
-              <span className="text-[11px] font-medium uppercase tracking-widest text-text-tertiary">Embedded avatar</span>
+              <span className="text-[11px] font-medium tracking-widest text-text-tertiary uppercase">Embedded avatar</span>
               <LogoEmbeddedChatAvatar className="border-divider-strong rounded-2xl border" />
             </div>
           </div>
diff --git a/web/app/components/base/markdown-blocks/code-block.stories.tsx b/web/app/components/base/markdown-blocks/code-block.stories.tsx
index b9e92ada22..5e797dc348 100644
--- a/web/app/components/base/markdown-blocks/code-block.stories.tsx
+++ b/web/app/components/base/markdown-blocks/code-block.stories.tsx
@@ -14,7 +14,7 @@ const CodeBlockDemo = ({
 }) => {
   return (
     <div className="flex w-full max-w-xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Code block</div>
+      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Code block</div>
       <CodeBlock
         className={`language-${language}`}
       >
diff --git a/web/app/components/base/markdown-blocks/think-block.stories.tsx b/web/app/components/base/markdown-blocks/think-block.stories.tsx
index 7c3f809ee7..85b8ec8a5d 100644
--- a/web/app/components/base/markdown-blocks/think-block.stories.tsx
+++ b/web/app/components/base/markdown-blocks/think-block.stories.tsx
@@ -32,7 +32,7 @@ const ThinkBlockDemo = ({
       onFeedback={undefined}
     >
       <div className="flex w-full max-w-xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-        <div className="flex items-center justify-between text-xs uppercase tracking-[0.18em] text-text-tertiary">
+        <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
           <span>Think block</span>
           <button
             type="button"
@@ -43,7 +43,7 @@ const ThinkBlockDemo = ({
           </button>
         </div>
         <ThinkBlock data-think>
-          <pre className="whitespace-pre-wrap text-sm text-text-secondary">
+          <pre className="text-sm whitespace-pre-wrap text-text-secondary">
             {THOUGHT_TEXT}
           </pre>
         </ThinkBlock>
diff --git a/web/app/components/base/markdown/index.stories.tsx b/web/app/components/base/markdown/index.stories.tsx
index 2267864ac5..cfab49b6c0 100644
--- a/web/app/components/base/markdown/index.stories.tsx
+++ b/web/app/components/base/markdown/index.stories.tsx
@@ -47,7 +47,7 @@ const MarkdownDemo = ({
 
   return (
     <div className="flex w-full max-w-3xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Markdown renderer</div>
+      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Markdown renderer</div>
       <Markdown
         content={content}
         className={compact ? 'text-sm! leading-relaxed' : ''}
diff --git a/web/app/components/base/mermaid/index.stories.tsx b/web/app/components/base/mermaid/index.stories.tsx
index 70c259db08..e27a9f633d 100644
--- a/web/app/components/base/mermaid/index.stories.tsx
+++ b/web/app/components/base/mermaid/index.stories.tsx
@@ -20,7 +20,7 @@ const MermaidDemo = ({
 
   return (
     <div className="flex w-full max-w-3xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex items-center justify-between text-xs uppercase tracking-[0.18em] text-text-tertiary">
+      <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
         <span>Mermaid diagram</span>
         <button
           type="button"
diff --git a/web/app/components/base/modal-like-wrap/index.stories.tsx b/web/app/components/base/modal-like-wrap/index.stories.tsx
index ed6688773d..38d969b2ce 100644
--- a/web/app/components/base/modal-like-wrap/index.stories.tsx
+++ b/web/app/components/base/modal-like-wrap/index.stories.tsx
@@ -81,10 +81,10 @@ export const WithBackLink: Story = {
       hideCloseBtn
       beforeHeader={(
         <button
-          className="mb-1 flex items-center gap-1 text-xs font-medium uppercase text-text-accent"
+          className="mb-1 flex items-center gap-1 text-xs font-medium text-text-accent uppercase"
           onClick={() => console.log('back')}
         >
-          <span className="bg-text-accent/10 inline-block h-4 w-4 rounded-sm text-center text-[10px] leading-4 text-text-accent">{'<'}</span>
+          <span className="inline-block h-4 w-4 rounded-sm bg-text-accent/10 text-center text-[10px] leading-4 text-text-accent">{'<'}</span>
           Back
         </button>
       )}
diff --git a/web/app/components/base/notion-page-selector/credential-selector/index.tsx b/web/app/components/base/notion-page-selector/credential-selector/index.tsx
index 63ee6e65cc..c8db7bc978 100644
--- a/web/app/components/base/notion-page-selector/credential-selector/index.tsx
+++ b/web/app/components/base/notion-page-selector/credential-selector/index.tsx
@@ -66,7 +66,7 @@ const CredentialSelector = ({
               leaveTo="transform opacity-0 scale-95"
             >
               <MenuItems
-                className="absolute left-0 top-8 z-10 w-80
+                className="absolute top-8 left-0 z-10 w-80
                   origin-top-right rounded-lg border-[0.5px]
                   border-components-panel-border bg-components-panel-bg-blur shadow-lg shadow-shadow-shadow-5"
               >
@@ -88,7 +88,7 @@ const CredentialSelector = ({
                               size={20}
                             />
                             <div
-                              className="mr-2 grow truncate text-text-secondary system-sm-medium"
+                              className="mr-2 grow truncate system-sm-medium text-text-secondary"
                               title={displayName}
                             >
                               {displayName}
diff --git a/web/app/components/base/notion-page-selector/index.stories.tsx b/web/app/components/base/notion-page-selector/index.stories.tsx
index d338793363..71bd7201a8 100644
--- a/web/app/components/base/notion-page-selector/index.stories.tsx
+++ b/web/app/components/base/notion-page-selector/index.stories.tsx
@@ -168,7 +168,7 @@ const NotionSelectorPreview = () => {
         canPreview
       />
       <div className="rounded-xl border border-divider-subtle bg-background-default-subtle p-4 text-xs text-text-secondary">
-        <div className="mb-2 font-semibold uppercase tracking-[0.18em] text-text-tertiary">
+        <div className="mb-2 font-semibold tracking-[0.18em] text-text-tertiary uppercase">
           Debug state
         </div>
         <p className="mb-1">
diff --git a/web/app/components/base/pagination/index.stories.tsx b/web/app/components/base/pagination/index.stories.tsx
index e53f285bb2..f764ef120d 100644
--- a/web/app/components/base/pagination/index.stories.tsx
+++ b/web/app/components/base/pagination/index.stories.tsx
@@ -22,7 +22,7 @@ const PaginationDemo = ({
 
   return (
     <div className="flex w-full max-w-3xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex items-center justify-between text-xs uppercase tracking-[0.18em] text-text-tertiary">
+      <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
         <span>Log pagination</span>
         <span className="rounded-md border border-divider-subtle bg-background-default px-2 py-1 font-medium text-text-secondary">
           {pageSummary}
diff --git a/web/app/components/base/param-item/index.stories.tsx b/web/app/components/base/param-item/index.stories.tsx
index 6ba6650dd4..adad09dfef 100644
--- a/web/app/components/base/param-item/index.stories.tsx
+++ b/web/app/components/base/param-item/index.stories.tsx
@@ -74,7 +74,7 @@ const ParamItemPlayground = () => {
 
   return (
     <div className="flex w-full max-w-2xl flex-col gap-5 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex items-center justify-between text-xs uppercase tracking-[0.18em] text-text-tertiary">
+      <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
         <span>Generation parameters</span>
         <code className="rounded-md border border-divider-subtle bg-background-default px-2 py-1 text-[11px] text-text-tertiary">
           {JSON.stringify(state, null, 0)}
diff --git a/web/app/components/base/portal-to-follow-elem/index.stories.tsx b/web/app/components/base/portal-to-follow-elem/index.stories.tsx
index c9c43f34c6..8f0fc48921 100644
--- a/web/app/components/base/portal-to-follow-elem/index.stories.tsx
+++ b/web/app/components/base/portal-to-follow-elem/index.stories.tsx
@@ -8,7 +8,7 @@ import {
 
 const TooltipCard = ({ title, description }: { title: string, description: string }) => (
   <div className="w-[220px] rounded-lg border border-divider-subtle bg-components-panel-bg px-3 py-2 text-sm text-text-secondary shadow-lg">
-    <div className="mb-1 text-xs font-semibold uppercase tracking-[0.14em] text-text-tertiary">
+    <div className="mb-1 text-xs font-semibold tracking-[0.14em] text-text-tertiary uppercase">
       {title}
     </div>
     <p className="leading-5">{description}</p>
diff --git a/web/app/components/base/premium-badge/index.stories.tsx b/web/app/components/base/premium-badge/index.stories.tsx
index 9d892cbf61..5f3786a2ea 100644
--- a/web/app/components/base/premium-badge/index.stories.tsx
+++ b/web/app/components/base/premium-badge/index.stories.tsx
@@ -12,14 +12,14 @@ const PremiumBadgeGallery = ({
 }) => {
   return (
     <div className="flex w-full max-w-xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <p className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Brand badge variants</p>
+      <p className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Brand badge variants</p>
       <div className="grid grid-cols-2 gap-4 sm:grid-cols-4">
         {colors.map(color => (
           <div key={color} className="flex flex-col items-center gap-2 rounded-xl border border-transparent px-2 py-4 hover:border-divider-subtle hover:bg-background-default-subtle">
             <PremiumBadge color={color} size={size} allowHover={allowHover}>
-              <span className="px-2 text-xs font-semibold uppercase tracking-[0.14em]">Premium</span>
+              <span className="px-2 text-xs font-semibold tracking-[0.14em] uppercase">Premium</span>
             </PremiumBadge>
-            <span className="text-[11px] uppercase tracking-[0.16em] text-text-tertiary">{color}</span>
+            <span className="text-[11px] tracking-[0.16em] text-text-tertiary uppercase">{color}</span>
           </div>
         ))}
       </div>
diff --git a/web/app/components/base/progress-bar/progress-circle.stories.tsx b/web/app/components/base/progress-bar/progress-circle.stories.tsx
index 1dd52d5683..2c0e70b4a1 100644
--- a/web/app/components/base/progress-bar/progress-circle.stories.tsx
+++ b/web/app/components/base/progress-bar/progress-circle.stories.tsx
@@ -13,7 +13,7 @@ const ProgressCircleDemo = ({
 
   return (
     <div className="flex w-full max-w-md flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex items-center justify-between text-xs uppercase tracking-[0.18em] text-text-tertiary">
+      <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
         <span>Upload progress</span>
         <span className="rounded-md border border-divider-subtle bg-background-default px-2 py-1 text-[11px] text-text-secondary">
           {percentage}
diff --git a/web/app/components/base/prompt-editor/index.stories.tsx b/web/app/components/base/prompt-editor/index.stories.tsx
index 271b1db383..4c8175ea12 100644
--- a/web/app/components/base/prompt-editor/index.stories.tsx
+++ b/web/app/components/base/prompt-editor/index.stories.tsx
@@ -86,7 +86,7 @@ const PromptEditorDemo = (args: any) => {
       {value && (
         <div className="mt-4 rounded-lg bg-gray-50 p-3">
           <div className="mb-2 text-xs font-medium text-gray-600">Current Value:</div>
-          <div className="whitespace-pre-wrap font-mono text-sm text-gray-800">
+          <div className="font-mono text-sm whitespace-pre-wrap text-gray-800">
             {value}
           </div>
         </div>
@@ -204,7 +204,7 @@ const MultipleEditorsDemo = () => {
       {(systemPrompt || userPrompt) && (
         <div className="rounded-lg bg-gray-50 p-4">
           <div className="mb-2 text-xs font-medium text-gray-600">Combined Output:</div>
-          <div className="whitespace-pre-wrap text-sm text-gray-800">
+          <div className="text-sm whitespace-pre-wrap text-gray-800">
             {systemPrompt && (
               <>
                 <strong>System:</strong>
diff --git a/web/app/components/base/prompt-editor/plugins/component-picker-block/prompt-option.tsx b/web/app/components/base/prompt-editor/plugins/component-picker-block/prompt-option.tsx
index a36403b898..1499fc1d7f 100644
--- a/web/app/components/base/prompt-editor/plugins/component-picker-block/prompt-option.tsx
+++ b/web/app/components/base/prompt-editor/plugins/component-picker-block/prompt-option.tsx
@@ -23,7 +23,7 @@ export const PromptMenuItem = memo(({
       className={`
         flex h-6 cursor-pointer items-center rounded-md px-3 hover:bg-state-base-hover
         ${isSelected && !disabled && 'bg-state-base-hover!'}
-        ${disabled ? 'cursor-not-allowed opacity-30' : 'cursor-pointer hover:bg-state-base-hover'}
+        ${disabled ? 'cursor-not-allowed opacity-30' : ''}
       `}
       tabIndex={-1}
       ref={setRefElement}
diff --git a/web/app/components/base/prompt-editor/plugins/context-block/component.tsx b/web/app/components/base/prompt-editor/plugins/context-block/component.tsx
index 49f14daed0..35f6948e07 100644
--- a/web/app/components/base/prompt-editor/plugins/context-block/component.tsx
+++ b/web/app/components/base/prompt-editor/plugins/context-block/component.tsx
@@ -40,13 +40,13 @@ const ContextBlockComponent: FC<ContextBlockComponentProps> = ({
   return (
     <div
       className={`
-      group inline-flex h-6 items-center rounded-[5px] border border-transparent bg-[#F4F3FF] pl-1 pr-0.5 text-[#6938EF] hover:bg-[#EBE9FE]
+      group inline-flex h-6 items-center rounded-[5px] border border-transparent bg-[#F4F3FF] pr-0.5 pl-1 text-[#6938EF] hover:bg-[#EBE9FE]
       ${open ? 'bg-[#EBE9FE]' : ''}
       ${isSelected && 'border-[#9B8AFB]!'}
     `}
       ref={ref}
     >
-      <span className="i-custom-vender-solid-files-file-05 mr-1 h-[14px] w-[14px]" data-testid="file-icon" />
+      <span className="mr-1 i-custom-vender-solid-files-file-05 h-[14px] w-[14px]" data-testid="file-icon" />
       <div className="mr-1 text-xs font-medium">{t('promptEditor.context.item.title', { ns: 'common' })}</div>
       {!canNotAddContext && (
         <PortalToFollowElem
diff --git a/web/app/components/base/prompt-editor/plugins/history-block/component.tsx b/web/app/components/base/prompt-editor/plugins/history-block/component.tsx
index 8335023ce6..15ce102bd9 100644
--- a/web/app/components/base/prompt-editor/plugins/history-block/component.tsx
+++ b/web/app/components/base/prompt-editor/plugins/history-block/component.tsx
@@ -41,7 +41,7 @@ const HistoryBlockComponent: FC<HistoryBlockComponentProps> = ({
   return (
     <div
       className={`
-      group inline-flex h-6 items-center rounded-[5px] border border-transparent pl-1 pr-0.5 text-[#DD2590] hover:bg-[#FCE7F6]
+      group inline-flex h-6 items-center rounded-[5px] border border-transparent pr-0.5 pl-1 text-[#DD2590] hover:bg-[#FCE7F6]
       ${open ? 'bg-[#FCE7F6]' : 'bg-[#FDF2FA]'}
       ${isSelected && 'border-[#F670C7]!'}
     `}
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/component.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/component.tsx
index df4147fc33..e13ac2aee3 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/component.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/component.tsx
@@ -63,7 +63,7 @@ const HITLInputComponent: FC<HITLInputComponentProps> = ({
   return (
     <div
       ref={ref}
-      className="w-full pb-1 pt-3"
+      className="w-full pt-3 pb-1"
     >
       <ComponentUi
         nodeId={nodeId}
diff --git a/web/app/components/base/prompt-editor/plugins/query-block/component.tsx b/web/app/components/base/prompt-editor/plugins/query-block/component.tsx
index a5b5969904..cd5b60bc9b 100644
--- a/web/app/components/base/prompt-editor/plugins/query-block/component.tsx
+++ b/web/app/components/base/prompt-editor/plugins/query-block/component.tsx
@@ -17,7 +17,7 @@ const QueryBlockComponent: FC<QueryBlockComponentProps> = ({
   return (
     <div
       className={`
-        inline-flex h-6 items-center rounded-[5px] border border-transparent bg-[#FFF6ED] pl-1 pr-0.5 hover:bg-[#FFEAD5]
+        inline-flex h-6 items-center rounded-[5px] border border-transparent bg-[#FFF6ED] pr-0.5 pl-1 hover:bg-[#FFEAD5]
         ${isSelected && 'border-[#FD853A]!'}
       `}
       ref={ref}
diff --git a/web/app/components/base/prompt-log-modal/card.tsx b/web/app/components/base/prompt-log-modal/card.tsx
index 515fa6bf2c..28a0a13922 100644
--- a/web/app/components/base/prompt-log-modal/card.tsx
+++ b/web/app/components/base/prompt-log-modal/card.tsx
@@ -23,7 +23,7 @@ const Card: FC<CardProps> = ({
           <div>
             {
               log.map((item, index) => (
-                <div key={index} className="group/card mb-2 rounded-xl px-4 pb-4 pt-2 last-of-type:mb-0 hover:bg-state-base-hover">
+                <div key={index} className="group/card mb-2 rounded-xl px-4 pt-2 pb-4 last-of-type:mb-0 hover:bg-state-base-hover">
                   <div className="flex h-8 items-center justify-between">
                     <div className="font-semibold text-[#2D31A6]">{item.role.toUpperCase()}</div>
                     <CopyFeedbackNew className="hidden h-6 w-6 group-hover/card:block" content={item.text} />
diff --git a/web/app/components/base/prompt-log-modal/index.tsx b/web/app/components/base/prompt-log-modal/index.tsx
index 5b9468a501..08200623ae 100644
--- a/web/app/components/base/prompt-log-modal/index.tsx
+++ b/web/app/components/base/prompt-log-modal/index.tsx
@@ -42,7 +42,7 @@ const PromptLogModal: FC<PromptLogModalProps> = ({
       }}
       ref={ref}
     >
-      <div className="flex h-14 shrink-0 items-center justify-between border-b border-divider-regular pl-6 pr-5">
+      <div className="flex h-14 shrink-0 items-center justify-between border-b border-divider-regular pr-5 pl-6">
         <div className="text-base font-semibold text-text-primary">PROMPT LOG</div>
         <div className="flex items-center">
           {
diff --git a/web/app/components/base/qrcode/index.stories.tsx b/web/app/components/base/qrcode/index.stories.tsx
index 700a71fceb..2453b990ab 100644
--- a/web/app/components/base/qrcode/index.stories.tsx
+++ b/web/app/components/base/qrcode/index.stories.tsx
@@ -8,7 +8,7 @@ const QRDemo = ({
 }) => {
   return (
     <div className="flex w-full max-w-sm flex-col gap-3 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <p className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Share QR</p>
+      <p className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Share QR</p>
       <div className="flex items-center gap-2 text-sm text-text-secondary">
         <span>Generated URL:</span>
         <code className="rounded-md bg-background-default px-2 py-1 text-[11px]">{content}</code>
diff --git a/web/app/components/base/qrcode/index.tsx b/web/app/components/base/qrcode/index.tsx
index f3335fe889..ba3946b185 100644
--- a/web/app/components/base/qrcode/index.tsx
+++ b/web/app/components/base/qrcode/index.tsx
@@ -64,7 +64,7 @@ const ShareQRCode = ({ content }: Props) => {
         {isShow && (
           <div
             ref={qrCodeRef}
-            className="absolute -right-8 top-8 z-10 flex w-[232px] flex-col items-center rounded-lg bg-components-panel-bg p-4 shadow-xs"
+            className="absolute top-8 -right-8 z-10 flex w-[232px] flex-col items-center rounded-lg bg-components-panel-bg p-4 shadow-xs"
             onClick={handlePanelClick}
           >
             <QRCode size={160} value={content} className="mb-2" />
diff --git a/web/app/components/base/segmented-control/index.stories.tsx b/web/app/components/base/segmented-control/index.stories.tsx
index 6ccb3e293a..3f8f9b7c62 100644
--- a/web/app/components/base/segmented-control/index.stories.tsx
+++ b/web/app/components/base/segmented-control/index.stories.tsx
@@ -24,7 +24,7 @@ const SegmentedControlDemo = ({
 
   return (
     <div className="flex w-full max-w-lg flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex items-center justify-between text-xs uppercase tracking-[0.18em] text-text-tertiary">
+      <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
         <span>Segmented control</span>
         <code className="rounded-md bg-background-default px-2 py-1 text-[11px] text-text-tertiary">
           value="
diff --git a/web/app/components/base/select/locale-signin.tsx b/web/app/components/base/select/locale-signin.tsx
index 3c5dd999f6..046a76a5d4 100644
--- a/web/app/components/base/select/locale-signin.tsx
+++ b/web/app/components/base/select/locale-signin.tsx
@@ -36,7 +36,7 @@ export default function LocaleSigninSelect({
           leaveTo="transform opacity-0 scale-95"
         >
           <MenuItems className="absolute right-0 z-10 mt-2 w-[200px] origin-top-right divide-y divide-divider-regular rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg focus:outline-hidden">
-            <div className="max-h-96 overflow-y-auto px-1 py-1 mask-[linear-gradient(to_bottom,transparent_0px,black_8px,black_calc(100%-8px),transparent_100%)]">
+            <div className="max-h-96 overflow-y-auto mask-[linear-gradient(to_bottom,transparent_0px,black_8px,black_calc(100%-8px),transparent_100%)] px-1 py-1">
               {items.map((item) => {
                 return (
                   <MenuItem key={item.value}>
diff --git a/web/app/components/base/simple-pie-chart/index.stories.tsx b/web/app/components/base/simple-pie-chart/index.stories.tsx
index 25f82979d1..5d66a9424c 100644
--- a/web/app/components/base/simple-pie-chart/index.stories.tsx
+++ b/web/app/components/base/simple-pie-chart/index.stories.tsx
@@ -17,7 +17,7 @@ const PieChartPlayground = ({
 
   return (
     <div className="flex w-full max-w-md flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex items-center justify-between text-xs uppercase tracking-[0.18em] text-text-tertiary">
+      <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
         <span>Conversion snapshot</span>
         <span className="rounded-md border border-divider-subtle bg-background-default px-2 py-1 text-[11px] text-text-secondary">
           {label}
diff --git a/web/app/components/base/skeleton/index.stories.tsx b/web/app/components/base/skeleton/index.stories.tsx
index e767852406..24a7383e38 100644
--- a/web/app/components/base/skeleton/index.stories.tsx
+++ b/web/app/components/base/skeleton/index.stories.tsx
@@ -9,7 +9,7 @@ import {
 const SkeletonDemo = () => {
   return (
     <div className="flex w-full max-w-xl flex-col gap-6 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Loading skeletons</div>
+      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Loading skeletons</div>
       <div className="space-y-4 rounded-xl border border-divider-subtle bg-background-default-subtle p-4">
         <SkeletonContainer>
           <SkeletonRow>
diff --git a/web/app/components/base/sort/index.stories.tsx b/web/app/components/base/sort/index.stories.tsx
index 46b46e8d1e..abc11b1ea3 100644
--- a/web/app/components/base/sort/index.stories.tsx
+++ b/web/app/components/base/sort/index.stories.tsx
@@ -21,7 +21,7 @@ const SortPlayground = () => {
 
   return (
     <div className="flex w-full max-w-xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex items-center justify-between text-xs uppercase tracking-[0.18em] text-text-tertiary">
+      <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
         <span>Sort control</span>
         <code className="rounded-md bg-background-default px-2 py-1 text-[11px] text-text-tertiary">
           sort_by="
diff --git a/web/app/components/base/spinner/index.stories.tsx b/web/app/components/base/spinner/index.stories.tsx
index f5a8e83059..cff5c36794 100644
--- a/web/app/components/base/spinner/index.stories.tsx
+++ b/web/app/components/base/spinner/index.stories.tsx
@@ -11,7 +11,7 @@ const SpinnerPlayground = ({
 
   return (
     <div className="flex w-full max-w-xs flex-col items-center gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <p className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Spinner</p>
+      <p className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Spinner</p>
       <Spinner loading={isLoading} className="text-primary-500" />
       <button
         type="button"
diff --git a/web/app/components/base/spinner/index.tsx b/web/app/components/base/spinner/index.tsx
index 65fea46a91..48ee65b99f 100644
--- a/web/app/components/base/spinner/index.tsx
+++ b/web/app/components/base/spinner/index.tsx
@@ -14,7 +14,7 @@ const Spinner: FC<Props> = ({ loading = false, children, className }) => {
       role="status"
     >
       <span
-        className="absolute! -m-px! h-px! w-px! overflow-hidden! whitespace-nowrap! border-0! p-0! [clip:rect(0,0,0,0)]!"
+        className="absolute! -m-px! h-px! w-px! overflow-hidden! border-0! p-0! whitespace-nowrap! [clip:rect(0,0,0,0)]!"
       >
         Loading...
       </span>
diff --git a/web/app/components/base/svg/index.stories.tsx b/web/app/components/base/svg/index.stories.tsx
index a97bfe2e5a..cdf4f6bcb6 100644
--- a/web/app/components/base/svg/index.stories.tsx
+++ b/web/app/components/base/svg/index.stories.tsx
@@ -7,7 +7,7 @@ const SvgToggleDemo = () => {
 
   return (
     <div className="flex w-full max-w-xs flex-col items-center gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <p className="text-xs uppercase tracking-[0.18em] text-text-tertiary">SVG toggle</p>
+      <p className="text-xs tracking-[0.18em] text-text-tertiary uppercase">SVG toggle</p>
       <SVGBtn isSVG={isSVG} setIsSVG={setIsSVG} />
       <span className="text-xs text-text-secondary">
         Mode:
diff --git a/web/app/components/base/tab-header/index.stories.tsx b/web/app/components/base/tab-header/index.stories.tsx
index 2b45907788..e783b67cd2 100644
--- a/web/app/components/base/tab-header/index.stories.tsx
+++ b/web/app/components/base/tab-header/index.stories.tsx
@@ -20,7 +20,7 @@ const TabHeaderDemo = ({
 
   return (
     <div className="flex w-full max-w-3xl flex-col gap-6 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex items-center justify-between text-xs uppercase tracking-[0.18em] text-text-tertiary">
+      <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
         <span>Tabs</span>
         <code className="rounded-md bg-background-default px-2 py-1 text-[11px] text-text-tertiary">
           active="
diff --git a/web/app/components/base/tab-slider-new/index.stories.tsx b/web/app/components/base/tab-slider-new/index.stories.tsx
index 56f9df4e27..83abb17974 100644
--- a/web/app/components/base/tab-slider-new/index.stories.tsx
+++ b/web/app/components/base/tab-slider-new/index.stories.tsx
@@ -17,7 +17,7 @@ const TabSliderNewDemo = ({
 
   return (
     <div className="flex w-full max-w-sm flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Pill tabs</div>
+      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Pill tabs</div>
       <TabSliderNew value={value} options={OPTIONS} onChange={setValue} />
     </div>
   )
diff --git a/web/app/components/base/tab-slider-plain/index.stories.tsx b/web/app/components/base/tab-slider-plain/index.stories.tsx
index e621ba43aa..abc2788371 100644
--- a/web/app/components/base/tab-slider-plain/index.stories.tsx
+++ b/web/app/components/base/tab-slider-plain/index.stories.tsx
@@ -17,7 +17,7 @@ const TabSliderPlainDemo = ({
 
   return (
     <div className="flex w-full max-w-2xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Underline tabs</div>
+      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Underline tabs</div>
       <TabSliderPlain
         value={value}
         onChange={setValue}
diff --git a/web/app/components/base/tab-slider/index.stories.tsx b/web/app/components/base/tab-slider/index.stories.tsx
index 0db53491bd..2cfa7d9d15 100644
--- a/web/app/components/base/tab-slider/index.stories.tsx
+++ b/web/app/components/base/tab-slider/index.stories.tsx
@@ -54,7 +54,7 @@ const TabSliderDemo = ({
 
   return (
     <div className="flex w-full max-w-lg flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Segmented tabs</div>
+      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Segmented tabs</div>
       <TabSlider
         value={value}
         options={OPTIONS}
diff --git a/web/app/components/base/tag-management/index.tsx b/web/app/components/base/tag-management/index.tsx
index 79c557a8b9..8e693fb9f1 100644
--- a/web/app/components/base/tag-management/index.tsx
+++ b/web/app/components/base/tag-management/index.tsx
@@ -48,8 +48,8 @@ const TagManagementModal = ({ show, type }: TagManagementModalProps) => {
   }, [type])
   return (
     <Modal className="!w-[600px] !max-w-[600px] rounded-xl px-8 py-6" isShow={show} onClose={() => setShowTagManagementModal(false)}>
-      <div className="relative pb-2 text-xl font-semibold leading-[30px] text-text-primary">{t('tag.manageTags', { ns: 'common' })}</div>
-      <div className="absolute right-4 top-4 cursor-pointer p-2" onClick={() => setShowTagManagementModal(false)}>
+      <div className="relative pb-2 text-xl leading-[30px] font-semibold text-text-primary">{t('tag.manageTags', { ns: 'common' })}</div>
+      <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={() => setShowTagManagementModal(false)}>
         <span className="i-ri-close-line h-4 w-4 text-text-tertiary" data-testid="tag-management-modal-close-button" />
       </div>
       <div className="mt-3 flex flex-wrap gap-2">
diff --git a/web/app/components/base/tag-management/panel.tsx b/web/app/components/base/tag-management/panel.tsx
index cceb09b4d7..db0aae1b05 100644
--- a/web/app/components/base/tag-management/panel.tsx
+++ b/web/app/components/base/tag-management/panel.tsx
@@ -114,7 +114,7 @@ const Panel = (props: PanelProps) => {
         <div className="p-1">
           <div className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover" data-testid="create-tag-option" onClick={createNewTag}>
             <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-            <div className="grow truncate px-1 text-text-secondary system-md-regular">
+            <div className="grow truncate px-1 system-md-regular text-text-secondary">
               {`${t('tag.create', { ns: 'common' })} `}
               <span className="system-md-medium">{`'${keywords}'`}</span>
             </div>
@@ -127,7 +127,7 @@ const Panel = (props: PanelProps) => {
           {filteredSelectedTagList.map(tag => (
             <div key={tag.id} className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover" onClick={() => selectTag(tag)} data-testid="tag-row">
               <Checkbox className="shrink-0" checked={selectedTagIDs.includes(tag.id)} onCheck={noop} id={tag.id} />
-              <div title={tag.name} className="grow truncate px-1 text-text-secondary system-md-regular">
+              <div title={tag.name} className="grow truncate px-1 system-md-regular text-text-secondary">
                 {tag.name}
               </div>
             </div>
@@ -135,7 +135,7 @@ const Panel = (props: PanelProps) => {
           {filteredTagList.map(tag => (
             <div key={tag.id} className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover" onClick={() => selectTag(tag)} data-testid="tag-row">
               <Checkbox className="shrink-0" checked={selectedTagIDs.includes(tag.id)} onCheck={noop} id={tag.id} />
-              <div title={tag.name} className="grow truncate px-1 text-text-secondary system-md-regular">
+              <div title={tag.name} className="grow truncate px-1 system-md-regular text-text-secondary">
                 {tag.name}
               </div>
             </div>
@@ -146,7 +146,7 @@ const Panel = (props: PanelProps) => {
         <div className="p-1">
           <div className="flex flex-col items-center gap-y-1 p-3">
             <span className="i-ri-price-tag-3-line h-6 w-6 text-text-quaternary" />
-            <div className="text-text-tertiary system-xs-regular">{t('tag.noTag', { ns: 'common' })}</div>
+            <div className="system-xs-regular text-text-tertiary">{t('tag.noTag', { ns: 'common' })}</div>
           </div>
         </div>
       )}
@@ -154,7 +154,7 @@ const Panel = (props: PanelProps) => {
       <div className="p-1">
         <div className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover" onClick={() => setShowTagManagementModal(true)}>
           <span className="i-ri-price-tag-3-line h-4 w-4 text-text-tertiary" />
-          <div className="grow truncate px-1 text-text-secondary system-md-regular">
+          <div className="grow truncate px-1 system-md-regular text-text-secondary">
             {t('tag.manageTags', { ns: 'common' })}
           </div>
         </div>
diff --git a/web/app/components/base/tag-management/trigger.tsx b/web/app/components/base/tag-management/trigger.tsx
index 1ee5b17f16..def88b2c79 100644
--- a/web/app/components/base/tag-management/trigger.tsx
+++ b/web/app/components/base/tag-management/trigger.tsx
@@ -16,7 +16,7 @@ const Trigger = ({
         ? (
             <div className="flex items-center gap-x-0.5 rounded-[5px] border border-dashed border-divider-deep bg-components-badge-bg-dimm px-[5px] py-[3px]">
               <span className="i-ri-price-tag-3-line h-3 w-3 shrink-0 text-text-quaternary" />
-              <div className="text-nowrap text-text-tertiary system-2xs-medium-uppercase">
+              <div className="system-2xs-medium-uppercase text-nowrap text-text-tertiary">
                 {t('tag.addTag', { ns: 'common' })}
               </div>
             </div>
@@ -32,7 +32,7 @@ const Trigger = ({
                       data-testid={`tag-badge-${index}`}
                     >
                       <span className="i-ri-price-tag-3-line h-3 w-3 shrink-0 text-text-quaternary" />
-                      <div className="text-nowrap text-text-tertiary system-2xs-medium-uppercase">
+                      <div className="system-2xs-medium-uppercase text-nowrap text-text-tertiary">
                         {content}
                       </div>
                     </div>
diff --git a/web/app/components/base/tag/index.stories.tsx b/web/app/components/base/tag/index.stories.tsx
index 219ed4f9e8..6f9294424d 100644
--- a/web/app/components/base/tag/index.stories.tsx
+++ b/web/app/components/base/tag/index.stories.tsx
@@ -12,14 +12,14 @@ const TagGallery = ({
 }) => {
   return (
     <div className="flex w-full max-w-md flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Tag variants</div>
+      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Tag variants</div>
       <div className="grid grid-cols-2 gap-3">
         {COLORS.map(color => (
           <div key={color} className="flex flex-col items-start gap-2 rounded-xl border border-transparent px-3 py-2 hover:border-divider-subtle hover:bg-background-default-subtle">
             <Tag color={color} bordered={bordered} hideBg={hideBg}>
               {color.charAt(0).toUpperCase() + color.slice(1)}
             </Tag>
-            <span className="text-[11px] uppercase tracking-[0.16em] text-text-quaternary">{color}</span>
+            <span className="text-[11px] tracking-[0.16em] text-text-quaternary uppercase">{color}</span>
           </div>
         ))}
       </div>
diff --git a/web/app/components/base/tooltip/index.stories.tsx b/web/app/components/base/tooltip/index.stories.tsx
index 9e2ce9977b..69d0c5d2b6 100644
--- a/web/app/components/base/tooltip/index.stories.tsx
+++ b/web/app/components/base/tooltip/index.stories.tsx
@@ -4,7 +4,7 @@ import Tooltip from '.'
 const TooltipGrid = () => {
   return (
     <div className="flex w-full max-w-xl flex-col gap-6 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Hover tooltips</div>
+      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Hover tooltips</div>
       <div className="flex flex-wrap gap-4">
         <Tooltip popupContent="Helpful hint explaining the setting.">
           <button
@@ -20,7 +20,7 @@ const TooltipGrid = () => {
           </span>
         </Tooltip>
       </div>
-      <div className="text-xs uppercase tracking-[0.18em] text-text-tertiary">Click tooltips</div>
+      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Click tooltips</div>
       <div className="flex flex-wrap gap-4">
         <Tooltip popupContent="Click again to close." triggerMethod="click" position="bottom-start">
           <button
diff --git a/web/app/components/base/voice-input/index.stories.tsx b/web/app/components/base/voice-input/index.stories.tsx
index f6c87fd436..efbc3bb08d 100644
--- a/web/app/components/base/voice-input/index.stories.tsx
+++ b/web/app/components/base/voice-input/index.stories.tsx
@@ -26,7 +26,7 @@ const VoiceInputMock = ({ onConverted, onCancel }: any) => {
 
   return (
     <div className="relative h-16 w-full overflow-hidden rounded-xl border-2 border-primary-600">
-      <div className="absolute inset-[1.5px] flex items-center overflow-hidden rounded-[10.5px] bg-primary-25 py-[14px] pl-[14.5px] pr-[6.5px]">
+      <div className="absolute inset-[1.5px] flex items-center overflow-hidden rounded-[10.5px] bg-primary-25 py-[14px] pr-[6.5px] pl-[14.5px]">
         {/* Waveform visualization placeholder */}
         <div className="absolute bottom-0 left-0 flex h-4 w-full items-end gap-[3px] px-2">
           {Array.from({ length: 40 }).map((_, i) => (
@@ -260,7 +260,7 @@ const SearchWithVoiceDemo = () => {
                   value={searchQuery}
                   onChange={e => setSearchQuery(e.target.value)}
                 />
-                <span className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400">
+                <span className="absolute top-1/2 left-3 -translate-y-1/2 text-gray-400">
                   🔍
                 </span>
               </div>
diff --git a/web/app/components/billing/pricing/index.tsx b/web/app/components/billing/pricing/index.tsx
index 990939985e..0873b2dea4 100644
--- a/web/app/components/billing/pricing/index.tsx
+++ b/web/app/components/billing/pricing/index.tsx
@@ -65,7 +65,7 @@ const Pricing: FC<PricingProps> = ({
           <ScrollAreaViewport className={pricingScrollAreaClassNames.viewport}>
             <ScrollAreaContent className={pricingScrollAreaClassNames.content}>
               <div className="relative grid min-h-full grid-rows-[1fr_auto_auto_1fr] overflow-hidden">
-                <div className="absolute -top-12 left-0 right-0 -z-10">
+                <div className="absolute -top-12 right-0 left-0 -z-10">
                   <NoiseTop />
                 </div>
                 <Header onClose={onCancel} />
@@ -82,7 +82,7 @@ const Pricing: FC<PricingProps> = ({
                   canPay={canPay}
                 />
                 <Footer pricingPageURL={pricingPageURL} currentCategory={currentCategory} />
-                <div className="absolute -bottom-12 left-0 right-0 -z-10">
+                <div className="absolute right-0 -bottom-12 left-0 -z-10">
                   <NoiseBottom />
                 </div>
               </div>
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx
index b85f1d8631..99d956ba90 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx
@@ -103,38 +103,38 @@ const CloudPlanItem: FC<CloudPlanItemProps> = ({
           {ICON_MAP[plan]}
           <div className="flex min-h-[104px] flex-col gap-y-2">
             <div className="flex items-center gap-x-2.5">
-              <div className="text-[30px] font-medium leading-[1.2] text-text-primary">{t(`${i18nPrefix}.name`, { ns: 'billing' })}</div>
+              <div className="text-[30px] leading-[1.2] font-medium text-text-primary">{t(`${i18nPrefix}.name`, { ns: 'billing' })}</div>
               {
                 isMostPopularPlan && (
                   <div className="flex items-center justify-center bg-saas-dify-blue-static px-1.5 py-1">
-                    <span className="text-text-primary-on-surface system-2xs-semibold-uppercase">
+                    <span className="system-2xs-semibold-uppercase text-text-primary-on-surface">
                       {t('plansCommon.mostPopular', { ns: 'billing' })}
                     </span>
                   </div>
                 )
               }
             </div>
-            <div className="text-text-secondary system-sm-regular">{t(`${i18nPrefix}.description`, { ns: 'billing' })}</div>
+            <div className="system-sm-regular text-text-secondary">{t(`${i18nPrefix}.description`, { ns: 'billing' })}</div>
           </div>
         </div>
         {/* Price */}
-        <div className="flex items-end gap-x-2 px-1 pb-8 pt-4">
+        <div className="flex items-end gap-x-2 px-1 pt-4 pb-8">
           {isFreePlan && (
-            <span className="text-text-primary title-4xl-semi-bold">{t('plansCommon.free', { ns: 'billing' })}</span>
+            <span className="title-4xl-semi-bold text-text-primary">{t('plansCommon.free', { ns: 'billing' })}</span>
           )}
           {!isFreePlan && (
             <>
               {isYear && (
-                <span className="text-text-quaternary line-through title-4xl-semi-bold">
+                <span className="title-4xl-semi-bold text-text-quaternary line-through">
                   $
                   {planInfo.price * 12}
                 </span>
               )}
-              <span className="text-text-primary title-4xl-semi-bold">
+              <span className="title-4xl-semi-bold text-text-primary">
                 $
                 {isYear ? planInfo.price * 10 : planInfo.price}
               </span>
-              <span className="pb-0.5 text-text-tertiary system-md-regular">
+              <span className="pb-0.5 system-md-regular text-text-tertiary">
                 {t('plansCommon.priceTip', { ns: 'billing' })}
                 {t(`plansCommon.${!isYear ? 'month' : 'year'}`, { ns: 'billing' })}
               </span>
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/index.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/index.tsx
index df93a5fb0e..129ebaf853 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/index.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/index.tsx
@@ -12,7 +12,7 @@ const Item = ({
 }: ItemProps) => {
   return (
     <div className="flex items-center">
-      <span className="system-sm-regular grow text-text-secondary">{label}</span>
+      <span className="grow system-sm-regular text-text-secondary">{label}</span>
       {tooltip && (
         <Tooltip
           content={tooltip}
diff --git a/web/app/components/billing/pricing/plans/self-hosted-plan-item/list/item.tsx b/web/app/components/billing/pricing/plans/self-hosted-plan-item/list/item.tsx
index ee14117d24..d84e946f36 100644
--- a/web/app/components/billing/pricing/plans/self-hosted-plan-item/list/item.tsx
+++ b/web/app/components/billing/pricing/plans/self-hosted-plan-item/list/item.tsx
@@ -13,7 +13,7 @@ const Item = ({
       <div className="py-px">
         <RiCheckLine className="size-4 shrink-0 text-text-tertiary" />
       </div>
-      <span className="system-sm-regular grow text-text-secondary">{label}</span>
+      <span className="grow system-sm-regular text-text-secondary">{label}</span>
     </div>
   )
 }
diff --git a/web/app/components/custom/custom-page/index.tsx b/web/app/components/custom/custom-page/index.tsx
index 38f651882d..cd85a91230 100644
--- a/web/app/components/custom/custom-page/index.tsx
+++ b/web/app/components/custom/custom-page/index.tsx
@@ -20,7 +20,7 @@ const CustomPage = () => {
             <div className="title-xl-semi-bold">{t('upgradeTip.title', { ns: 'custom' })}</div>
             <div className="system-sm-regular">{t('upgradeTip.des', { ns: 'custom' })}</div>
           </div>
-          <div className="system-md-semibold flex h-10 w-[120px] cursor-pointer items-center justify-center rounded-3xl bg-white text-text-accent shadow-xs hover:opacity-95" onClick={() => setShowPricingModal()}>{t('upgradeBtn.encourageShort', { ns: 'billing' })}</div>
+          <div className="flex h-10 w-[120px] cursor-pointer items-center justify-center rounded-3xl bg-white system-md-semibold text-text-accent shadow-xs hover:opacity-95" onClick={() => setShowPricingModal()}>{t('upgradeBtn.encourageShort', { ns: 'billing' })}</div>
         </div>
       )}
       <CustomWebAppBrand />
diff --git a/web/app/components/custom/custom-web-app-brand/components/powered-by-brand.tsx b/web/app/components/custom/custom-web-app-brand/components/powered-by-brand.tsx
index 8a0feffbc4..51c0db53d7 100644
--- a/web/app/components/custom/custom-web-app-brand/components/powered-by-brand.tsx
+++ b/web/app/components/custom/custom-web-app-brand/components/powered-by-brand.tsx
@@ -20,7 +20,7 @@ const PoweredByBrand = ({
 
   return (
     <>
-      <div className="text-text-tertiary system-2xs-medium-uppercase">POWERED BY</div>
+      <div className="system-2xs-medium-uppercase text-text-tertiary">POWERED BY</div>
       {previewLogo
         ? <img src={previewLogo} alt="logo" className="block h-5 w-auto" />
         : <DifyLogo size="small" />}
diff --git a/web/app/components/datasets/chunk.tsx b/web/app/components/datasets/chunk.tsx
index e0d820a4f3..947f2859c4 100644
--- a/web/app/components/datasets/chunk.tsx
+++ b/web/app/components/datasets/chunk.tsx
@@ -50,11 +50,11 @@ export const QAPreview: FC<QAPreviewProps> = (props) => {
   return (
     <div className="flex flex-col gap-y-2">
       <div className="flex gap-x-1">
-        <label className="shrink-0 text-[13px] font-medium leading-[20px] text-text-tertiary">Q</label>
+        <label className="shrink-0 text-[13px] leading-[20px] font-medium text-text-tertiary">Q</label>
         <p className="body-md-regular text-text-secondary">{qa.question}</p>
       </div>
       <div className="flex gap-x-1">
-        <label className="shrink-0 text-[13px] font-medium leading-[20px] text-text-tertiary">A</label>
+        <label className="shrink-0 text-[13px] leading-[20px] font-medium text-text-tertiary">A</label>
         <p className="body-md-regular text-text-secondary">{qa.answer}</p>
       </div>
     </div>
diff --git a/web/app/components/datasets/common/image-list/more.tsx b/web/app/components/datasets/common/image-list/more.tsx
index be6b53a5a5..255e5e4d87 100644
--- a/web/app/components/datasets/common/image-list/more.tsx
+++ b/web/app/components/datasets/common/image-list/more.tsx
@@ -32,7 +32,7 @@ const More = ({ count, onClick }: MoreProps) => {
           </span>
         </div>
       </div>
-      <div className="absolute -right-0.5 top-1 z-0 h-6 w-1 rounded-r-md bg-divider-regular" />
+      <div className="absolute top-1 -right-0.5 z-0 h-6 w-1 rounded-r-md bg-divider-regular" />
     </div>
   )
 }
diff --git a/web/app/components/datasets/common/retrieval-method-info/index.tsx b/web/app/components/datasets/common/retrieval-method-info/index.tsx
index 865db355cf..c219a5c15f 100644
--- a/web/app/components/datasets/common/retrieval-method-info/index.tsx
+++ b/web/app/components/datasets/common/retrieval-method-info/index.tsx
@@ -37,7 +37,7 @@ const EconomicalRetrievalMethodConfig: FC<Props> = ({
         noRadio
         chosenConfigWrapClassName="pb-3!"
         chosenConfig={(
-          <div className="flex flex-wrap text-xs font-normal leading-[18px]">
+          <div className="flex flex-wrap text-xs leading-[18px] font-normal">
             {value.reranking_model.reranking_model_name && (
               <div className="mr-8 flex space-x-1">
                 <div className="text-gray-500">{t('modelProvider.rerankModel.key', { ns: 'common' })}</div>
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/header.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/header.tsx
index 5e4cb88c27..cf759880be 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/header.tsx
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/header.tsx
@@ -12,10 +12,10 @@ const Header = ({
   const { t } = useTranslation()
 
   return (
-    <div className="title-2xl-semi-bold relative flex items-center justify-between pb-3 pl-6 pr-14 pt-6 text-text-primary">
+    <div className="relative flex items-center justify-between pt-6 pr-14 pb-3 pl-6 title-2xl-semi-bold text-text-primary">
       {t('importFromDSL', { ns: 'app' })}
       <div
-        className="absolute right-5 top-5 flex size-8 cursor-pointer items-center"
+        className="absolute top-5 right-5 flex size-8 cursor-pointer items-center"
         onClick={onClose}
       >
         <RiCloseLine className="size-[18px] text-text-tertiary" />
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/tab/index.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/tab/index.tsx
index 76507de7c2..125cd70737 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/tab/index.tsx
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/tab/index.tsx
@@ -26,7 +26,7 @@ const Tab = ({
   ]
 
   return (
-    <div className="system-md-semibold flex h-9 items-center gap-x-6 border-b border-divider-subtle px-6 text-text-tertiary">
+    <div className="flex h-9 items-center gap-x-6 border-b border-divider-subtle px-6 system-md-semibold text-text-tertiary">
       {
         tabs.map(tab => (
           <Item
diff --git a/web/app/components/datasets/create-from-pipeline/footer.tsx b/web/app/components/datasets/create-from-pipeline/footer.tsx
index ae1bb48394..dee48163d2 100644
--- a/web/app/components/datasets/create-from-pipeline/footer.tsx
+++ b/web/app/components/datasets/create-from-pipeline/footer.tsx
@@ -39,11 +39,11 @@ const Footer = () => {
   }, [invalidDatasetList])
 
   return (
-    <div className="absolute bottom-0 left-0 right-0 z-10 flex flex-col gap-y-4 bg-knowledge-pipeline-creation-footer-bg px-16 pb-6 backdrop-blur-[6px]">
+    <div className="absolute right-0 bottom-0 left-0 z-10 flex flex-col gap-y-4 bg-knowledge-pipeline-creation-footer-bg px-16 pb-6 backdrop-blur-[6px]">
       <Divider type="horizontal" className="my-0 w-8" />
       <button
         type="button"
-        className="system-md-medium flex items-center gap-x-3 text-text-accent"
+        className="flex items-center gap-x-3 system-md-medium text-text-accent"
         onClick={openImportFromDSL}
       >
         <RiFileUploadLine className="size-5" />
diff --git a/web/app/components/datasets/create-from-pipeline/index.tsx b/web/app/components/datasets/create-from-pipeline/index.tsx
index 0c788f613d..f5b5c2ec8b 100644
--- a/web/app/components/datasets/create-from-pipeline/index.tsx
+++ b/web/app/components/datasets/create-from-pipeline/index.tsx
@@ -9,7 +9,7 @@ const CreateFromPipeline = () => {
     <div
       className="relative flex h-[calc(100vh-56px)] flex-col overflow-hidden rounded-t-2xl border-t border-effects-highlight bg-background-default-subtle"
     >
-      <Effect className="left-8 top-[-34px] opacity-20" />
+      <Effect className="top-[-34px] left-8 opacity-20" />
       <Header />
       <List />
       <Footer />
diff --git a/web/app/components/datasets/create-from-pipeline/list/customized-list.tsx b/web/app/components/datasets/create-from-pipeline/list/customized-list.tsx
index b14a42c489..e7f2f4156c 100644
--- a/web/app/components/datasets/create-from-pipeline/list/customized-list.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/customized-list.tsx
@@ -12,7 +12,7 @@ const CustomizedList = () => {
 
   return (
     <>
-      <div className="system-sm-semibold-uppercase pt-2 text-text-tertiary">{t('templates.customized', { ns: 'datasetPipeline' })}</div>
+      <div className="pt-2 system-sm-semibold-uppercase text-text-tertiary">{t('templates.customized', { ns: 'datasetPipeline' })}</div>
       <div className="grid grid-cols-1 gap-3 py-2 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
         {list.map((pipeline, index) => (
           <TemplateCard
diff --git a/web/app/components/datasets/create-from-pipeline/list/index.tsx b/web/app/components/datasets/create-from-pipeline/list/index.tsx
index 7b56e12b74..baad1318b3 100644
--- a/web/app/components/datasets/create-from-pipeline/list/index.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/index.tsx
@@ -3,7 +3,7 @@ import CustomizedList from './customized-list'
 
 const List = () => {
   return (
-    <div className="grow gap-y-1 overflow-y-auto px-16 pb-[60px] pt-1">
+    <div className="grow gap-y-1 overflow-y-auto px-16 pt-1 pb-[60px]">
       <BuiltInPipelineList />
       <CustomizedList />
     </div>
diff --git a/web/app/components/datasets/create-from-pipeline/list/template-card/content.tsx b/web/app/components/datasets/create-from-pipeline/list/template-card/content.tsx
index 31c6ea1a82..b4091f65ef 100644
--- a/web/app/components/datasets/create-from-pipeline/list/template-card/content.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/template-card/content.tsx
@@ -32,13 +32,13 @@ const Content = ({
             background={iconInfo.icon_type === 'image' ? undefined : iconInfo.icon_background}
             imageUrl={iconInfo.icon_type === 'image' ? iconInfo.icon_url : undefined}
           />
-          <div className="absolute -bottom-1 -right-1 z-10">
+          <div className="absolute -right-1 -bottom-1 z-10">
             <Icon className="size-4" />
           </div>
         </div>
         <div className="flex grow flex-col gap-y-1 overflow-hidden py-px">
           <div
-            className="system-md-semibold truncate text-text-secondary"
+            className="truncate system-md-semibold text-text-secondary"
             title={name}
           >
             {name}
@@ -49,7 +49,7 @@ const Content = ({
         </div>
       </div>
       <p
-        className="system-xs-regular line-clamp-3 grow px-4 py-1 text-text-tertiary"
+        className="line-clamp-3 grow px-4 py-1 system-xs-regular text-text-tertiary"
         title={description}
       >
         {description}
diff --git a/web/app/components/datasets/create/step-one/upgrade-card.tsx b/web/app/components/datasets/create/step-one/upgrade-card.tsx
index 356e15ed43..e7016206ea 100644
--- a/web/app/components/datasets/create/step-one/upgrade-card.tsx
+++ b/web/app/components/datasets/create/step-one/upgrade-card.tsx
@@ -15,9 +15,9 @@ const UpgradeCard: FC = () => {
   }, [setShowPricingModal])
 
   return (
-    <div className="flex items-center justify-between rounded-xl border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg py-3 pl-4 pr-3.5 shadow-xs backdrop-blur-[5px] ">
+    <div className="flex items-center justify-between rounded-xl border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg py-3 pr-3.5 pl-4 shadow-xs backdrop-blur-[5px]">
       <div>
-        <div className="title-md-semi-bold bg-[linear-gradient(92deg,var(--components-input-border-active-prompt-1,#0BA5EC)_0%,var(--components-input-border-active-prompt-2,#155AEF)_99.21%)] bg-clip-text text-transparent">{t('upgrade.uploadMultipleFiles.title', { ns: 'billing' })}</div>
+        <div className="bg-[linear-gradient(92deg,var(--components-input-border-active-prompt-1,#0BA5EC)_0%,var(--components-input-border-active-prompt-2,#155AEF)_99.21%)] bg-clip-text title-md-semi-bold text-transparent">{t('upgrade.uploadMultipleFiles.title', { ns: 'billing' })}</div>
         <div className="system-xs-regular text-text-tertiary">{t('upgrade.uploadMultipleFiles.description', { ns: 'billing' })}</div>
       </div>
       <UpgradeBtn
diff --git a/web/app/components/datasets/create/step-two/preview-item/index.tsx b/web/app/components/datasets/create/step-two/preview-item/index.tsx
index 8797850888..75ccadbec7 100644
--- a/web/app/components/datasets/create/step-two/preview-item/index.tsx
+++ b/web/app/components/datasets/create/step-two/preview-item/index.tsx
@@ -46,7 +46,7 @@ const PreviewItem: FC<IPreviewItemProps> = ({
   return (
     <div className="rounded-xl bg-gray-50 p-4">
       <div className="flex h-5 items-center justify-between text-xs text-gray-500">
-        <div className="box-border flex h-[18px] items-center space-x-1 rounded-md border border-gray-200 pl-1 pr-1.5 font-medium italic">
+        <div className="box-border flex h-[18px] items-center space-x-1 rounded-md border border-gray-200 pr-1.5 pl-1 font-medium italic">
           {sharpIcon}
           <span>{formattedIndex}</span>
         </div>
diff --git a/web/app/components/datasets/create/website/base/input.tsx b/web/app/components/datasets/create/website/base/input.tsx
index 49b01c610b..a9c42a6b7c 100644
--- a/web/app/components/datasets/create/website/base/input.tsx
+++ b/web/app/components/datasets/create/website/base/input.tsx
@@ -51,8 +51,8 @@ const Input: FC<Props> = ({
       {...otherOption}
       value={value}
       onChange={handleChange}
-      className="system-xs-regular focus:bg-components-inout-border-active flex h-8 w-full rounded-lg border border-transparent
-      bg-components-input-bg-normal p-2 text-components-input-text-filled
+      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
diff --git a/web/app/components/datasets/documents/components/list.tsx b/web/app/components/datasets/documents/components/list.tsx
index e40e4c061b..abd40c33a0 100644
--- a/web/app/components/datasets/documents/components/list.tsx
+++ b/web/app/components/datasets/documents/components/list.tsx
@@ -117,8 +117,8 @@ const DocumentList: FC<DocumentListProps> = ({
   return (
     <div className="relative mt-3 flex h-full w-full flex-col">
       <div className="relative h-0 grow overflow-x-auto">
-        <table className={`w-full min-w-[700px] max-w-full border-collapse border-0 text-sm ${s.documentTable}`}>
-          <thead className="h-8 border-b border-divider-subtle text-xs font-medium uppercase leading-8 text-text-tertiary">
+        <table className={`w-full max-w-full min-w-[700px] border-collapse border-0 text-sm ${s.documentTable}`}>
+          <thead className="h-8 border-b border-divider-subtle text-xs leading-8 font-medium text-text-tertiary uppercase">
             <tr>
               <td className="w-12">
                 <div className="flex items-center" onClick={e => e.stopPropagation()}>
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/item.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/item.tsx
index 4d54a04d1f..b162411f6c 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/item.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/item.tsx
@@ -31,7 +31,7 @@ const Item = ({
         name={name}
         size={20}
       />
-      <span className="system-sm-medium grow truncate text-text-secondary">
+      <span className="grow truncate system-sm-medium text-text-secondary">
         {name}
       </span>
       {
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/title.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/title.tsx
index 4f555f3e1f..2d4eb81212 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/title.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/title.tsx
@@ -11,7 +11,7 @@ const Title = ({
   const { t } = useTranslation()
 
   return (
-    <div className="system-sm-medium px-[5px] py-1 text-text-secondary">
+    <div className="px-[5px] py-1 system-sm-medium text-text-secondary">
       {t('onlineDocument.pageSelectorTitle', { ns: 'datasetPipeline', name })}
     </div>
   )
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/item.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/item.tsx
index 864cade85c..6f04ede88a 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/item.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/item.tsx
@@ -18,7 +18,7 @@ const Item = ({
 
   return (
     <div
-      className="system-md-regular rounded-lg px-3 py-1.5 text-text-secondary hover:bg-state-base-hover"
+      className="rounded-lg px-3 py-1.5 system-md-regular text-text-secondary hover:bg-state-base-hover"
       onClick={handleClick}
     >
       {name}
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 91d3acc1d1..1dfa0443d0 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
@@ -83,7 +83,7 @@ const Breadcrumbs = ({
   return (
     <div className="flex grow items-center overflow-hidden">
       {showSearchResult && (
-        <div className="system-sm-medium text-test-secondary px-[5px]">
+        <div className="text-test-secondary px-[5px] system-sm-medium">
           {t('onlineDrive.breadcrumbs.searchResult', {
             ns: 'datasetPipeline',
             searchResultsLength,
@@ -92,7 +92,7 @@ const Breadcrumbs = ({
         </div>
       )}
       {!showSearchResult && showBucketListTitle && (
-        <div className="system-sm-medium text-test-secondary px-[5px]">
+        <div className="text-test-secondary px-[5px] system-sm-medium">
           {t('onlineDrive.breadcrumbs.allBuckets', { ns: 'datasetPipeline' })}
         </div>
       )}
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 6e1b567bd6..d8cee8b040 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
@@ -29,12 +29,12 @@ const FilePreview = ({
   }, [file])
 
   return (
-    <div className="flex h-full w-full flex-col rounded-t-xl border-l border-t border-components-panel-border bg-background-default-lighter shadow-md shadow-shadow-shadow-5">
-      <div className="flex gap-x-2 border-b border-divider-subtle pb-3 pl-6 pr-4 pt-4">
+    <div className="flex h-full w-full flex-col rounded-t-xl border-t border-l border-components-panel-border bg-background-default-lighter shadow-md shadow-shadow-shadow-5">
+      <div className="flex gap-x-2 border-b border-divider-subtle pt-4 pr-4 pb-3 pl-6">
         <div className="flex grow flex-col gap-y-1">
           <div className="system-2xs-semibold-uppercase text-text-accent">{t('addDocuments.stepOne.preview', { ns: 'datasetPipeline' })}</div>
-          <div className="title-md-semi-bold text-tex-primary">{`${fileName}.${file.extension || ''}`}</div>
-          <div className="system-xs-medium flex items-center gap-x-1 text-text-tertiary">
+          <div className="text-tex-primary 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"
               name={file.name}
@@ -65,7 +65,7 @@ const FilePreview = ({
         </div>
       )}
       {!isFetching && fileData && (
-        <div className="body-md-regular grow overflow-hidden px-6 py-5 text-text-secondary">
+        <div className="grow overflow-hidden px-6 py-5 body-md-regular text-text-secondary">
           {fileData.content}
         </div>
       )}
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 ff2f9f46a4..3e9b409a70 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
@@ -50,12 +50,12 @@ const OnlineDocumentPreview = ({
   }, [currentPage.page_id])
 
   return (
-    <div className="flex h-full w-full flex-col rounded-t-xl border-l border-t border-components-panel-border bg-background-default-lighter shadow-md shadow-shadow-shadow-5">
-      <div className="flex gap-x-2 border-b border-divider-subtle pb-3 pl-6 pr-4 pt-4">
+    <div className="flex h-full w-full flex-col rounded-t-xl border-t border-l border-components-panel-border bg-background-default-lighter shadow-md shadow-shadow-shadow-5">
+      <div className="flex gap-x-2 border-b border-divider-subtle pt-4 pr-4 pb-3 pl-6">
         <div className="flex grow flex-col gap-y-1">
           <div className="system-2xs-semibold-uppercase text-text-accent">{t('addDocuments.stepOne.preview', { ns: 'datasetPipeline' })}</div>
-          <div className="title-md-semi-bold text-tex-primary">{currentPage?.page_name}</div>
-          <div className="system-xs-medium flex items-center gap-x-1 text-text-tertiary">
+          <div className="text-tex-primary 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>
             <span>·</span>
@@ -76,7 +76,7 @@ const OnlineDocumentPreview = ({
         </div>
       )}
       {!isPending && content && (
-        <div className="body-md-regular grow overflow-hidden px-6 py-5 text-text-secondary">
+        <div className="grow overflow-hidden px-6 py-5 body-md-regular text-text-secondary">
           <Markdown content={content} />
         </div>
       )}
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 a527f12c0d..f83d68902f 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
@@ -17,12 +17,12 @@ const WebsitePreview = ({
   const { t } = useTranslation()
 
   return (
-    <div className="flex h-full w-full flex-col rounded-t-xl border-l border-t border-components-panel-border bg-background-default-lighter shadow-md shadow-shadow-shadow-5">
-      <div className="flex gap-x-2 border-b border-divider-subtle pb-3 pl-6 pr-4 pt-4">
+    <div className="flex h-full w-full flex-col rounded-t-xl border-t border-l border-components-panel-border bg-background-default-lighter shadow-md shadow-shadow-shadow-5">
+      <div className="flex gap-x-2 border-b border-divider-subtle pt-4 pr-4 pb-3 pl-6">
         <div className="flex grow flex-col gap-y-1">
           <div className="system-2xs-semibold-uppercase">{t('addDocuments.stepOne.preview', { ns: 'datasetPipeline' })}</div>
-          <div className="title-md-semi-bold text-tex-primary">{currentWebsite.title}</div>
-          <div className="system-xs-medium flex gap-x-1  text-text-tertiary">
+          <div className="text-tex-primary 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}>{currentWebsite.source_url}</span>
             <span>·</span>
@@ -38,7 +38,7 @@ const WebsitePreview = ({
           <RiCloseLine className="size-[18px]" />
         </button>
       </div>
-      <div className="body-md-regular grow overflow-hidden px-6 py-5 text-text-secondary">
+      <div className="grow overflow-hidden px-6 py-5 body-md-regular text-text-secondary">
         {currentWebsite.markdown}
       </div>
     </div>
diff --git a/web/app/components/datasets/documents/create-from-pipeline/steps/preview-panel.tsx b/web/app/components/datasets/documents/create-from-pipeline/steps/preview-panel.tsx
index 7687345664..392d28bb9e 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/steps/preview-panel.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/steps/preview-panel.tsx
@@ -30,7 +30,7 @@ export const StepOnePreview = memo(({
 }: StepOnePreviewProps) => {
   return (
     <div className="h-full min-w-0 flex-1">
-      <div className="flex h-full flex-col pl-2 pt-2">
+      <div className="flex h-full flex-col pt-2 pl-2">
         {currentLocalFile && (
           <FilePreview
             file={currentLocalFile}
@@ -89,7 +89,7 @@ export const StepTwoPreview = memo(({
 }: StepTwoPreviewProps) => {
   return (
     <div className="h-full min-w-0 flex-1">
-      <div className="flex h-full flex-col pl-2 pt-2">
+      <div className="flex h-full flex-col pt-2 pl-2">
         <ChunkPreview
           dataSourceType={datasourceType as DatasourceType}
           localFiles={localFileList.map(file => file.file)}
diff --git a/web/app/components/datasets/documents/detail/batch-modal/csv-downloader.tsx b/web/app/components/datasets/documents/detail/batch-modal/csv-downloader.tsx
index 83008b7d40..0ef734b079 100644
--- a/web/app/components/datasets/documents/detail/batch-modal/csv-downloader.tsx
+++ b/web/app/components/datasets/documents/detail/batch-modal/csv-downloader.tsx
@@ -55,30 +55,30 @@ const CSVDownload: FC<{ docForm: ChunkingMode }> = ({ docForm }) => {
           <table className="w-full table-fixed border-separate border-spacing-0 rounded-lg border border-divider-subtle text-xs">
             <thead className="text-text-secondary">
               <tr>
-                <td className="h-9 border-b border-divider-subtle pl-3 pr-2">{t('list.batchModal.question', { ns: 'datasetDocuments' })}</td>
-                <td className="h-9 border-b border-divider-subtle pl-3 pr-2">{t('list.batchModal.answer', { ns: 'datasetDocuments' })}</td>
+                <td className="h-9 border-b border-divider-subtle pr-2 pl-3">{t('list.batchModal.question', { ns: 'datasetDocuments' })}</td>
+                <td className="h-9 border-b border-divider-subtle pr-2 pl-3">{t('list.batchModal.answer', { ns: 'datasetDocuments' })}</td>
               </tr>
             </thead>
             <tbody className="text-text-tertiary">
               <tr>
-                <td className="h-9 border-b border-divider-subtle pl-3 pr-2 text-[13px]">
+                <td className="h-9 border-b border-divider-subtle pr-2 pl-3 text-[13px]">
                   {t('list.batchModal.question', { ns: 'datasetDocuments' })}
                   {' '}
                   1
                 </td>
-                <td className="h-9 border-b border-divider-subtle pl-3 pr-2 text-[13px]">
+                <td className="h-9 border-b border-divider-subtle pr-2 pl-3 text-[13px]">
                   {t('list.batchModal.answer', { ns: 'datasetDocuments' })}
                   {' '}
                   1
                 </td>
               </tr>
               <tr>
-                <td className="h-9 pl-3 pr-2 text-[13px]">
+                <td className="h-9 pr-2 pl-3 text-[13px]">
                   {t('list.batchModal.question', { ns: 'datasetDocuments' })}
                   {' '}
                   2
                 </td>
-                <td className="h-9 pl-3 pr-2 text-[13px]">
+                <td className="h-9 pr-2 pl-3 text-[13px]">
                   {t('list.batchModal.answer', { ns: 'datasetDocuments' })}
                   {' '}
                   2
@@ -91,19 +91,19 @@ const CSVDownload: FC<{ docForm: ChunkingMode }> = ({ docForm }) => {
           <table className="w-full table-fixed border-separate border-spacing-0 rounded-lg border border-divider-subtle text-xs">
             <thead className="text-text-secondary">
               <tr>
-                <td className="h-9 border-b border-divider-subtle pl-3 pr-2">{t('list.batchModal.contentTitle', { ns: 'datasetDocuments' })}</td>
+                <td className="h-9 border-b border-divider-subtle pr-2 pl-3">{t('list.batchModal.contentTitle', { ns: 'datasetDocuments' })}</td>
               </tr>
             </thead>
             <tbody className="text-text-tertiary">
               <tr>
-                <td className="h-9 border-b border-divider-subtle pl-3 pr-2 text-[13px]">
+                <td className="h-9 border-b border-divider-subtle pr-2 pl-3 text-[13px]">
                   {t('list.batchModal.content', { ns: 'datasetDocuments' })}
                   {' '}
                   1
                 </td>
               </tr>
               <tr>
-                <td className="h-9 pl-3 pr-2 text-[13px]">
+                <td className="h-9 pr-2 pl-3 text-[13px]">
                   {t('list.batchModal.content', { ns: 'datasetDocuments' })}
                   {' '}
                   2
diff --git a/web/app/components/datasets/documents/detail/completed/common/empty.tsx b/web/app/components/datasets/documents/detail/completed/common/empty.tsx
index c212a55c86..d4c9d8ea0b 100644
--- a/web/app/components/datasets/documents/detail/completed/common/empty.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/empty.tsx
@@ -48,30 +48,30 @@ const Empty: FC<IEmptyProps> = ({
       <div className="flex flex-col items-center">
         <div className="relative z-10 flex h-14 w-14 items-center justify-center rounded-xl border border-divider-subtle bg-components-card-bg shadow-lg shadow-shadow-shadow-5">
           <RiFileList2Line className="h-6 w-6 text-text-secondary" />
-          <Line className="absolute -right-px top-1/2 -translate-y-1/2" />
-          <Line className="absolute -left-px top-1/2 -translate-y-1/2" />
-          <Line className="absolute left-1/2 top-0 -translate-x-1/2 -translate-y-1/2 rotate-90" />
-          <Line className="absolute left-1/2 top-full -translate-x-1/2 -translate-y-1/2 rotate-90" />
+          <Line className="absolute top-1/2 -right-px -translate-y-1/2" />
+          <Line className="absolute top-1/2 -left-px -translate-y-1/2" />
+          <Line className="absolute top-0 left-1/2 -translate-x-1/2 -translate-y-1/2 rotate-90" />
+          <Line className="absolute top-full left-1/2 -translate-x-1/2 -translate-y-1/2 rotate-90" />
         </div>
-        <div className="system-md-regular mt-3 text-text-tertiary">
+        <div className="mt-3 system-md-regular text-text-tertiary">
           {t('segment.empty', { ns: 'datasetDocuments' })}
         </div>
         <button
           type="button"
-          className="system-sm-medium mt-1 text-text-accent"
+          className="mt-1 system-sm-medium text-text-accent"
           onClick={onClearFilter}
         >
           {t('segment.clearFilter', { ns: 'datasetDocuments' })}
         </button>
       </div>
-      <div className="absolute left-0 top-0 -z-20 flex h-full w-full flex-col gap-y-3 overflow-hidden">
+      <div className="absolute top-0 left-0 -z-20 flex h-full w-full flex-col gap-y-3 overflow-hidden">
         {
           Array.from({ length: 10 }).map((_, i) => (
             <EmptyCard key={i} />
           ))
         }
       </div>
-      <div className="absolute left-0 top-0 -z-10 h-full w-full bg-dataset-chunk-list-mask-bg" />
+      <div className="absolute top-0 left-0 -z-10 h-full w-full bg-dataset-chunk-list-mask-bg" />
     </div>
   )
 }
diff --git a/web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx b/web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx
index 57a903f5c7..156137cd3a 100644
--- a/web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx
+++ b/web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx
@@ -47,7 +47,7 @@ const MenuBar: FC<MenuBarProps> = ({
         onCheck={onSelectedAll}
         disabled={isLoading}
       />
-      <div className="system-sm-semibold-uppercase flex-1 pl-5 text-text-secondary">{totalText}</div>
+      <div className="flex-1 pl-5 system-sm-semibold-uppercase text-text-secondary">{totalText}</div>
       <SimpleSelect
         onSelect={onChangeStatus}
         items={statusList}
diff --git a/web/app/components/datasets/documents/detail/completed/skeleton/full-doc-list-skeleton.tsx b/web/app/components/datasets/documents/detail/completed/skeleton/full-doc-list-skeleton.tsx
index 9f9f51b55b..388f2f85de 100644
--- a/web/app/components/datasets/documents/detail/completed/skeleton/full-doc-list-skeleton.tsx
+++ b/web/app/components/datasets/documents/detail/completed/skeleton/full-doc-list-skeleton.tsx
@@ -16,7 +16,7 @@ Slice.displayName = 'Slice'
 const FullDocListSkeleton = () => {
   return (
     <div className="relative z-10 flex w-full grow flex-col gap-y-3 overflow-y-hidden">
-      <div className="absolute bottom-14 left-0 top-0 z-20 h-full w-full bg-dataset-chunk-list-mask-bg" />
+      <div className="absolute top-0 bottom-14 left-0 z-20 h-full w-full bg-dataset-chunk-list-mask-bg" />
       {Array.from({ length: 15 }).map((_, index) => <Slice key={index} />)}
     </div>
   )
diff --git a/web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx b/web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx
index 118a39ef56..c8e581fa1f 100644
--- a/web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx
+++ b/web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx
@@ -49,7 +49,7 @@ CardSkelton.displayName = 'CardSkelton'
 const GeneralListSkeleton = () => {
   return (
     <div className="relative z-10 flex grow flex-col overflow-y-hidden">
-      <div className="absolute left-0 top-0 z-20 h-full w-full bg-dataset-chunk-list-mask-bg" />
+      <div className="absolute top-0 left-0 z-20 h-full w-full bg-dataset-chunk-list-mask-bg" />
       {Array.from({ length: 10 }).map((_, index) => {
         return (
           <div key={index} className="flex items-start gap-x-2">
diff --git a/web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx b/web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx
index 9af0543fb6..f2c4c9e6c4 100644
--- a/web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx
+++ b/web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx
@@ -36,7 +36,7 @@ const CardSkelton = React.memo(() => {
       </SkeletonContainer>
       <SkeletonContainer className="p-1 pb-2">
         <SkeletonRow>
-          <SkeletonRow className="h-7 gap-x-0.5 rounded-lg bg-dataset-child-chunk-expand-btn-bg pl-1 pr-3">
+          <SkeletonRow className="h-7 gap-x-0.5 rounded-lg bg-dataset-child-chunk-expand-btn-bg pr-3 pl-1">
             <RiArrowRightSLine className="h-4 w-4 text-text-secondary opacity-20" />
             <SkeletonRectangle className="w-32 bg-text-quaternary" />
           </SkeletonRow>
@@ -51,7 +51,7 @@ CardSkelton.displayName = 'CardSkelton'
 const ParagraphListSkeleton = () => {
   return (
     <div className="relative z-10 flex h-full flex-col overflow-y-hidden">
-      <div className="absolute left-0 top-0 z-20 h-full w-full bg-dataset-chunk-list-mask-bg" />
+      <div className="absolute top-0 left-0 z-20 h-full w-full bg-dataset-chunk-list-mask-bg" />
       {Array.from({ length: 10 }).map((_, index) => {
         return (
           <div key={index} className="flex items-start gap-x-2">
diff --git a/web/app/components/datasets/documents/detail/completed/skeleton/parent-chunk-card-skeleton.tsx b/web/app/components/datasets/documents/detail/completed/skeleton/parent-chunk-card-skeleton.tsx
index 376d7f3cc8..4c3fe9d0bd 100644
--- a/web/app/components/datasets/documents/detail/completed/skeleton/parent-chunk-card-skeleton.tsx
+++ b/web/app/components/datasets/documents/detail/completed/skeleton/parent-chunk-card-skeleton.tsx
@@ -32,7 +32,7 @@ const ParentChunkCardSkelton = () => {
         </SkeletonContainer>
       </SkeletonContainer>
       <div className="mt-0.5 flex items-center px-3">
-        <button type="button" className="system-xs-semibold-uppercase pt-0.5 text-components-button-secondary-accent-text-disabled" disabled>
+        <button type="button" className="pt-0.5 system-xs-semibold-uppercase text-components-button-secondary-accent-text-disabled" disabled>
           {t('operation.viewMore', { ns: 'common' })}
         </button>
       </div>
diff --git a/web/app/components/datasets/documents/detail/embedding/components/status-header.tsx b/web/app/components/datasets/documents/detail/embedding/components/status-header.tsx
index e72f0553b5..0c07abae94 100644
--- a/web/app/components/datasets/documents/detail/embedding/components/status-header.tsx
+++ b/web/app/components/datasets/documents/detail/embedding/components/status-header.tsx
@@ -46,7 +46,7 @@ const StatusHeader: FC<StatusHeaderProps> = React.memo(({
   return (
     <div className="flex h-6 items-center gap-x-1">
       {isEmbedding && <RiLoader2Line className="h-4 w-4 animate-spin text-text-secondary" />}
-      <span className="system-md-semibold-uppercase grow text-text-secondary">
+      <span className="grow system-md-semibold-uppercase text-text-secondary">
         {getStatusText()}
       </span>
       {isEmbedding && (
@@ -57,7 +57,7 @@ const StatusHeader: FC<StatusHeaderProps> = React.memo(({
           disabled={isPauseLoading}
         >
           <RiPauseCircleLine className="h-3.5 w-3.5 text-components-button-secondary-text" />
-          <span className="system-xs-medium pr-[3px] text-components-button-secondary-text">
+          <span className="pr-[3px] system-xs-medium text-components-button-secondary-text">
             {t('embedding.pause', { ns: 'datasetDocuments' })}
           </span>
         </button>
@@ -70,7 +70,7 @@ const StatusHeader: FC<StatusHeaderProps> = React.memo(({
           disabled={isResumeLoading}
         >
           <RiPlayCircleLine className="h-3.5 w-3.5 text-components-button-secondary-text" />
-          <span className="system-xs-medium pr-[3px] text-components-button-secondary-text">
+          <span className="pr-[3px] system-xs-medium text-components-button-secondary-text">
             {t('embedding.resume', { ns: 'datasetDocuments' })}
           </span>
         </button>
diff --git a/web/app/components/datasets/documents/detail/embedding/skeleton/index.tsx b/web/app/components/datasets/documents/detail/embedding/skeleton/index.tsx
index 469d928eaa..767d3a68ce 100644
--- a/web/app/components/datasets/documents/detail/embedding/skeleton/index.tsx
+++ b/web/app/components/datasets/documents/detail/embedding/skeleton/index.tsx
@@ -48,7 +48,7 @@ CardSkelton.displayName = 'CardSkelton'
 const EmbeddingSkeleton = () => {
   return (
     <div className="relative z-10 flex grow flex-col overflow-y-hidden">
-      <div className="absolute left-0 top-0 z-20 h-full w-full bg-dataset-chunk-list-mask-bg" />
+      <div className="absolute top-0 left-0 z-20 h-full w-full bg-dataset-chunk-list-mask-bg" />
       {Array.from({ length: 5 }).map((_, index) => {
         return (
           <div key={index} className="w-full px-11">
diff --git a/web/app/components/datasets/documents/detail/settings/pipeline-settings/index.tsx b/web/app/components/datasets/documents/detail/settings/pipeline-settings/index.tsx
index 4c9dd641e3..28706c221f 100644
--- a/web/app/components/datasets/documents/detail/settings/pipeline-settings/index.tsx
+++ b/web/app/components/datasets/documents/detail/settings/pipeline-settings/index.tsx
@@ -185,7 +185,7 @@ const PipelineSettings = ({
       </div>
       {/* Preview */}
       <div className="h-full min-w-0 flex-1">
-        <div className="flex h-full flex-col pl-2 pt-2">
+        <div className="flex h-full flex-col pt-2 pl-2">
           <ChunkPreview
             dataSourceType={lastRunData!.datasource_type}
             localFiles={files}
diff --git a/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx b/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx
index a527da982a..f0b22ad448 100644
--- a/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx
+++ b/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx
@@ -69,7 +69,7 @@ const ExternalApiSelect: React.FC<ExternalApiSelectProps> = ({ items, value, onS
               <div className="flex items-center gap-2 self-stretch rounded-lg p-1">
                 <ApiConnectionMod className="h-4 w-4 text-text-secondary" />
                 <div className="flex grow items-center">
-                  <span className="system-sm-regular overflow-hidden text-ellipsis text-components-input-text-filled">{selectedItem.name}</span>
+                  <span className="overflow-hidden system-sm-regular text-ellipsis text-components-input-text-filled">{selectedItem.name}</span>
                 </div>
               </div>
             )
@@ -88,8 +88,8 @@ const ExternalApiSelect: React.FC<ExternalApiSelectProps> = ({ items, value, onS
             >
               <div className="flex w-full items-center gap-2 self-stretch rounded-lg p-2 hover:bg-state-base-hover">
                 <ApiConnectionMod className="h-4 w-4 text-text-secondary" />
-                <span className="system-sm-medium grow overflow-hidden text-ellipsis text-text-secondary">{item.name}</span>
-                <span className="system-xs-regular overflow-hidden text-ellipsis text-right text-text-tertiary">{item.url}</span>
+                <span className="grow overflow-hidden system-sm-medium text-ellipsis text-text-secondary">{item.name}</span>
+                <span className="overflow-hidden text-right system-xs-regular text-ellipsis text-text-tertiary">{item.url}</span>
               </div>
             </div>
           ))}
@@ -99,7 +99,7 @@ const ExternalApiSelect: React.FC<ExternalApiSelectProps> = ({ items, value, onS
               onClick={handleAddNewAPI}
             >
               <RiAddLine className="h-4 w-4 text-text-secondary" />
-              <span className="system-sm-medium grow overflow-hidden text-ellipsis text-text-secondary">{t('createNewExternalAPI', { ns: 'dataset' })}</span>
+              <span className="grow overflow-hidden system-sm-medium text-ellipsis text-text-secondary">{t('createNewExternalAPI', { ns: 'dataset' })}</span>
             </div>
           </div>
         </div>
diff --git a/web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx b/web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx
index 61b37a0a1d..83888c6e42 100644
--- a/web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx
+++ b/web/app/components/datasets/external-knowledge-base/create/InfoPanel.tsx
@@ -7,24 +7,24 @@ const InfoPanel = () => {
   const docLink = useDocLink()
 
   return (
-    <div className="flex w-[360px] flex-col items-start pb-2 pr-8 pt-[108px]">
+    <div className="flex w-[360px] flex-col items-start pt-[108px] pr-8 pb-2">
       <div className="flex w-full min-w-[240px] flex-col items-start gap-3 self-stretch rounded-xl bg-background-section p-6">
         <div className="flex h-10 w-10 grow items-center justify-center gap-2 self-stretch rounded-lg border-[0.5px] border-components-card-border bg-components-card-bg p-1">
           <RiBookOpenLine className="h-5 w-5 text-text-accent" />
         </div>
         <p className="flex flex-col items-start gap-2 self-stretch">
-          <span className="system-xl-semibold self-stretch text-text-secondary">
+          <span className="self-stretch system-xl-semibold text-text-secondary">
             {t('connectDatasetIntro.title', { ns: 'dataset' })}
           </span>
           <span className="system-sm-regular text-text-tertiary">
             {t('connectDatasetIntro.content.front', { ns: 'dataset' })}
-            <a className="system-sm-regular ml-1 text-text-accent" href={docLink('/use-dify/knowledge/external-knowledge-api')} target="_blank" rel="noopener noreferrer">
+            <a className="ml-1 system-sm-regular text-text-accent" href={docLink('/use-dify/knowledge/external-knowledge-api')} target="_blank" rel="noopener noreferrer">
               {t('connectDatasetIntro.content.link', { ns: 'dataset' })}
             </a>
             {t('connectDatasetIntro.content.end', { ns: 'dataset' })}
           </span>
           <a
-            className="system-sm-regular self-stretch text-text-accent"
+            className="self-stretch system-sm-regular text-text-accent"
             href={docLink('/use-dify/knowledge/connect-external-knowledge-base')}
             target="_blank"
             rel="noopener noreferrer"
diff --git a/web/app/components/datasets/extra-info/statistics.tsx b/web/app/components/datasets/extra-info/statistics.tsx
index 18a66849af..f02db4c5dc 100644
--- a/web/app/components/datasets/extra-info/statistics.tsx
+++ b/web/app/components/datasets/extra-info/statistics.tsx
@@ -25,7 +25,7 @@ const Statistics = ({
 
   return (
     <div className="flex items-center gap-x-0.5 p-2 pb-0">
-      <div className="flex grow flex-col px-2 pb-1.5 pt-1">
+      <div className="flex grow flex-col px-2 pt-1 pb-1.5">
         <div className="system-md-semibold-uppercase text-text-secondary">
           {documentCount ?? '--'}
         </div>
@@ -33,10 +33,10 @@ const Statistics = ({
           {t('datasetMenus.documents', { ns: 'common' })}
         </div>
       </div>
-      <div className="py-2 pl-0.5 pr-1.5">
+      <div className="py-2 pr-1.5 pl-0.5">
         <Divider className="text-test-divider-regular h-full w-fit" />
       </div>
-      <div className="flex grow flex-col px-2 pb-1.5 pt-1">
+      <div className="flex grow flex-col px-2 pt-1 pb-1.5">
         <div className="system-md-semibold-uppercase text-text-secondary">
           {relatedAppsTotal ?? '--'}
         </div>
@@ -55,7 +55,7 @@ const Statistics = ({
               : <NoLinkedAppsPanel />
           }
         >
-          <div className="system-2xs-medium-uppercase flex cursor-pointer items-center gap-x-0.5 text-text-tertiary">
+          <div className="flex cursor-pointer items-center gap-x-0.5 system-2xs-medium-uppercase text-text-tertiary">
             <span>{t('datasetMenus.relatedApp', { ns: 'common' })}</span>
             <RiInformation2Line className="size-3" />
           </div>
diff --git a/web/app/components/datasets/hit-testing/components/child-chunks-item.tsx b/web/app/components/datasets/hit-testing/components/child-chunks-item.tsx
index bca73994bd..dccf868b30 100644
--- a/web/app/components/datasets/hit-testing/components/child-chunks-item.tsx
+++ b/web/app/components/datasets/hit-testing/components/child-chunks-item.tsx
@@ -20,7 +20,7 @@ const ChildChunks: FC<Props> = ({
       className={!isShowAll ? 'line-clamp-2 break-all' : ''}
     >
       <div className="relative top-[-2px] inline-flex items-center">
-        <div className="system-2xs-semibold-uppercase flex h-[20.5px] items-center  bg-state-accent-solid px-1 text-text-primary-on-surface">
+        <div className="flex h-[20.5px] items-center bg-state-accent-solid px-1 system-2xs-semibold-uppercase text-text-primary-on-surface">
           C-
           {position}
         </div>
diff --git a/web/app/components/datasets/hit-testing/components/result-item-footer.tsx b/web/app/components/datasets/hit-testing/components/result-item-footer.tsx
index bdb43eb4bd..5b1198fcc1 100644
--- a/web/app/components/datasets/hit-testing/components/result-item-footer.tsx
+++ b/web/app/components/datasets/hit-testing/components/result-item-footer.tsx
@@ -21,7 +21,7 @@ const ResultItemFooter: FC<Props> = ({
   const { t } = useTranslation()
 
   return (
-    <div className="mt-3 flex h-10 items-center justify-between border-t border-divider-subtle pl-3 pr-2">
+    <div className="mt-3 flex h-10 items-center justify-between border-t border-divider-subtle pr-2 pl-3">
       <div className="flex grow items-center space-x-1">
         <FileIcon type={docType} size="sm" />
         <span className="w-0 grow truncate text-[13px] font-normal text-text-secondary">
diff --git a/web/app/components/datasets/list/dataset-card/operation-item.tsx b/web/app/components/datasets/list/dataset-card/operation-item.tsx
index 668c9a3c53..6aaf093358 100644
--- a/web/app/components/datasets/list/dataset-card/operation-item.tsx
+++ b/web/app/components/datasets/list/dataset-card/operation-item.tsx
@@ -22,7 +22,7 @@ const OperationItem = ({
       }}
     >
       <span aria-hidden className={cn(iconClassName, 'size-4 text-text-tertiary')} />
-      <span className="system-md-regular px-1 text-text-secondary">
+      <span className="px-1 system-md-regular text-text-secondary">
         {name}
       </span>
     </div>
diff --git a/web/app/components/datasets/list/dataset-footer/index.tsx b/web/app/components/datasets/list/dataset-footer/index.tsx
index 33b554e1f9..96a7c1ad88 100644
--- a/web/app/components/datasets/list/dataset-footer/index.tsx
+++ b/web/app/components/datasets/list/dataset-footer/index.tsx
@@ -8,8 +8,8 @@ const DatasetFooter = () => {
 
   return (
     <footer className="shrink-0 px-12 py-6">
-      <h3 className="text-gradient text-xl font-semibold leading-tight">{t('didYouKnow', { ns: 'dataset' })}</h3>
-      <p className="mt-1 text-sm font-normal leading-tight text-text-secondary">
+      <h3 className="text-gradient text-xl leading-tight font-semibold">{t('didYouKnow', { ns: 'dataset' })}</h3>
+      <p className="mt-1 text-sm leading-tight font-normal text-text-secondary">
         {t('intro1', { ns: 'dataset' })}
         <span className="inline-flex items-center gap-1 text-text-accent">{t('intro2', { ns: 'dataset' })}</span>
         {t('intro3', { ns: 'dataset' })}
diff --git a/web/app/components/datasets/list/new-dataset-card/option.tsx b/web/app/components/datasets/list/new-dataset-card/option.tsx
index 05b14fef1a..b9a1d2f8ff 100644
--- a/web/app/components/datasets/list/new-dataset-card/option.tsx
+++ b/web/app/components/datasets/list/new-dataset-card/option.tsx
@@ -19,7 +19,7 @@ const Option = ({
       href={href}
     >
       <Icon className="h-4 w-4 shrink-0" />
-      <span className="system-sm-medium grow text-left">{text}</span>
+      <span className="grow text-left system-sm-medium">{text}</span>
     </Link>
   )
 }
diff --git a/web/app/components/datasets/metadata/metadata-dataset/field.tsx b/web/app/components/datasets/metadata/metadata-dataset/field.tsx
index 4e8e3e02d8..e78c32ff62 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/field.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/field.tsx
@@ -15,7 +15,7 @@ const Field: FC<Props> = ({
 }) => {
   return (
     <div className={className}>
-      <div className="system-sm-semibold py-1 text-text-secondary">{label}</div>
+      <div className="py-1 system-sm-semibold text-text-secondary">{label}</div>
       <div className="mt-1">{children}</div>
     </div>
   )
diff --git a/web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx b/web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx
index 284bd46ef6..4d86ddf28e 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx
@@ -34,7 +34,7 @@ const SelectMetadata: FC<Props> = ({
     })
   }, [query, notFilteredList])
   return (
-    <div className="w-[320px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-0 pt-2 shadow-lg backdrop-blur-[5px]">
+    <div className="w-[320px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pt-2 pb-0 shadow-lg backdrop-blur-[5px]">
       <SearchInput
         className="mx-2"
         value={query}
@@ -47,7 +47,7 @@ const SelectMetadata: FC<Props> = ({
           return (
             <div
               key={item.id}
-              className="mx-1 flex h-6 cursor-pointer  items-center justify-between rounded-md px-3 hover:bg-state-base-hover"
+              className="mx-1 flex h-6 cursor-pointer items-center justify-between rounded-md px-3 hover:bg-state-base-hover"
               onClick={() => onSelect({
                 id: item.id,
                 name: item.name,
@@ -56,9 +56,9 @@ const SelectMetadata: FC<Props> = ({
             >
               <div className="flex h-full w-0 grow items-center text-text-secondary">
                 <Icon className="mr-[5px] size-3.5 shrink-0" />
-                <div className="system-sm-medium w-0 grow truncate">{item.name}</div>
+                <div className="w-0 grow truncate system-sm-medium">{item.name}</div>
               </div>
-              <div className="system-xs-regular ml-1 shrink-0 text-text-tertiary">
+              <div className="ml-1 shrink-0 system-xs-regular text-text-tertiary">
                 {item.type}
               </div>
             </div>
@@ -70,10 +70,10 @@ const SelectMetadata: FC<Props> = ({
           <RiAddLine className="size-3.5" />
           <div className="system-sm-medium">{t(`${i18nPrefix}.newAction`, { ns: 'dataset' })}</div>
         </div>
-        <div className="flex h-6 items-center text-text-secondary ">
+        <div className="flex h-6 items-center text-text-secondary">
           <div className="mr-[3px] h-3 w-px bg-divider-regular"></div>
           <div className="flex h-full cursor-pointer items-center rounded-md px-1.5 hover:bg-state-base-hover" onClick={onManage}>
-            <div className="system-sm-medium mr-1">{t(`${i18nPrefix}.manageAction`, { ns: 'dataset' })}</div>
+            <div className="mr-1 system-sm-medium">{t(`${i18nPrefix}.manageAction`, { ns: 'dataset' })}</div>
             <RiArrowRightUpLine className="size-3.5" />
           </div>
         </div>
diff --git a/web/app/components/datasets/metadata/metadata-document/field.tsx b/web/app/components/datasets/metadata/metadata-document/field.tsx
index f6f5fdf8f1..3993cfbb40 100644
--- a/web/app/components/datasets/metadata/metadata-document/field.tsx
+++ b/web/app/components/datasets/metadata/metadata-document/field.tsx
@@ -13,7 +13,7 @@ const Field: FC<Props> = ({
 }) => {
   return (
     <div className="flex items-start space-x-2">
-      <div className="system-xs-medium w-[128px] shrink-0 items-center truncate py-1 text-text-tertiary">
+      <div className="w-[128px] shrink-0 items-center truncate py-1 system-xs-medium text-text-tertiary">
         {label}
       </div>
       <div className="w-[244px] shrink-0">
diff --git a/web/app/components/datasets/settings/form/components/external-knowledge-section.tsx b/web/app/components/datasets/settings/form/components/external-knowledge-section.tsx
index 4b08bb1e7a..cb5c4d0028 100644
--- a/web/app/components/datasets/settings/form/components/external-knowledge-section.tsx
+++ b/web/app/components/datasets/settings/form/components/external-knowledge-section.tsx
@@ -53,7 +53,7 @@ const ExternalKnowledgeSection = ({
         <div className="w-full">
           <div className="flex h-full items-center gap-1 rounded-lg bg-components-input-bg-normal px-3 py-2">
             <ApiConnectionMod className="h-4 w-4 text-text-secondary" />
-            <div className="system-sm-medium overflow-hidden text-ellipsis text-text-secondary">
+            <div className="overflow-hidden system-sm-medium text-ellipsis text-text-secondary">
               {currentDataset.external_knowledge_info.external_knowledge_api_name}
             </div>
             <div className="system-xs-regular text-text-tertiary">·</div>
diff --git a/web/app/components/datasets/settings/form/components/indexing-section.tsx b/web/app/components/datasets/settings/form/components/indexing-section.tsx
index f534dd56a8..51afe7dfbf 100644
--- a/web/app/components/datasets/settings/form/components/indexing-section.tsx
+++ b/web/app/components/datasets/settings/form/components/indexing-section.tsx
@@ -73,7 +73,7 @@ const IndexingSection = ({
           <Divider type="horizontal" className="my-1 h-px bg-divider-subtle" />
           <div className={rowClass}>
             <div className="flex w-[180px] shrink-0 flex-col">
-              <div className="system-sm-semibold flex h-8 items-center text-text-secondary">
+              <div className="flex h-8 items-center system-sm-semibold text-text-secondary">
                 {t('form.chunkStructure.title', { ns: 'datasetSettings' })}
               </div>
               <div className="body-xs-regular text-text-tertiary">
@@ -116,7 +116,7 @@ const IndexingSection = ({
             />
             {showUpgradeWarning && (
               <div className="relative 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 px-2 shadow-xs shadow-shadow-shadow-3">
-                <div className="absolute left-0 top-0 flex h-full w-full items-center bg-toast-warning-bg opacity-40" />
+                <div className="absolute top-0 left-0 flex h-full w-full items-center bg-toast-warning-bg opacity-40" />
                 <div className="p-1">
                   <RiAlertFill className="size-4 text-text-warning-secondary" />
                 </div>
@@ -166,7 +166,7 @@ const IndexingSection = ({
           <div className={rowClass}>
             <div className={labelClass}>
               <div className="flex w-[180px] shrink-0 flex-col">
-                <div className="system-sm-semibold flex h-7 items-center pt-1 text-text-secondary">
+                <div className="flex h-7 items-center pt-1 system-sm-semibold text-text-secondary">
                   {t('form.retrievalSetting.title', { ns: 'datasetSettings' })}
                 </div>
                 <div className="body-xs-regular text-text-tertiary">
diff --git a/web/app/components/datasets/settings/permission-selector/permission-item.tsx b/web/app/components/datasets/settings/permission-selector/permission-item.tsx
index c5847896f7..28e1c78be2 100644
--- a/web/app/components/datasets/settings/permission-selector/permission-item.tsx
+++ b/web/app/components/datasets/settings/permission-selector/permission-item.tsx
@@ -20,7 +20,7 @@ const PermissionItem = ({
       onClick={onClick}
     >
       {leftIcon}
-      <div className="system-md-regular grow px-1 text-text-secondary">
+      <div className="grow px-1 system-md-regular text-text-secondary">
         {text}
       </div>
       {isSelected && <RiCheckLine className="size-4 text-text-accent" />}
diff --git a/web/app/components/develop/ApiServer.tsx b/web/app/components/develop/ApiServer.tsx
index c4d53baade..24398d1c85 100644
--- a/web/app/components/develop/ApiServer.tsx
+++ b/web/app/components/develop/ApiServer.tsx
@@ -17,7 +17,7 @@ const ApiServer: FC<ApiServerProps> = ({
 
   return (
     <div className="flex flex-wrap items-center gap-y-2">
-      <div className="mr-2 flex h-8 items-center rounded-lg border-[0.5px] border-components-input-border-active bg-components-input-bg-normal pl-1.5 pr-1 leading-5">
+      <div className="mr-2 flex h-8 items-center rounded-lg border-[0.5px] border-components-input-border-active bg-components-input-bg-normal pr-1 pl-1.5 leading-5">
         <div className="mr-0.5 h-5 shrink-0 rounded-md border border-divider-subtle px-1.5 text-[11px] text-text-tertiary">{t('apiServer', { ns: 'appApi' })}</div>
         <div className="w-fit truncate px-1 text-[13px] font-medium text-text-secondary sm:w-[248px]">{apiBaseUrl}</div>
         <div className="mx-1 h-[14px] w-px bg-divider-regular"></div>
diff --git a/web/app/components/develop/secret-key/input-copy.tsx b/web/app/components/develop/secret-key/input-copy.tsx
index 64703c857a..8bc4a380eb 100644
--- a/web/app/components/develop/secret-key/input-copy.tsx
+++ b/web/app/components/develop/secret-key/input-copy.tsx
@@ -37,7 +37,7 @@ const InputCopy = ({
         {children}
         <div className="relative h-full grow text-[13px]">
           <div
-            className="r-0 absolute left-0 top-0 w-full cursor-pointer truncate pl-2 pr-2"
+            className="r-0 absolute top-0 left-0 w-full cursor-pointer truncate pr-2 pl-2"
             onClick={() => {
               writeTextToClipboard(value).then(() => {
                 setIsCopied(true)
diff --git a/web/app/components/explore/installed-app/index.tsx b/web/app/components/explore/installed-app/index.tsx
index e8eaa3dd5a..78191f2873 100644
--- a/web/app/components/explore/installed-app/index.tsx
+++ b/web/app/components/explore/installed-app/index.tsx
@@ -116,7 +116,7 @@ const InstalledApp = ({
     )
   }
   return (
-    <div className="h-full bg-background-default py-2 pl-0 pr-2 sm:p-2">
+    <div className="h-full bg-background-default py-2 pr-2 pl-0 sm:p-2">
       {installedApp?.app.mode !== AppModeEnum.COMPLETION && installedApp?.app.mode !== AppModeEnum.WORKFLOW && (
         <ChatWithHistory installedAppInfo={installedApp} className="overflow-hidden rounded-2xl shadow-md" />
       )}
diff --git a/web/app/components/explore/try-app/preview/basic-app-preview.tsx b/web/app/components/explore/try-app/preview/basic-app-preview.tsx
index 43fb00600f..ef29e1305a 100644
--- a/web/app/components/explore/try-app/preview/basic-app-preview.tsx
+++ b/web/app/components/explore/try-app/preview/basic-app-preview.tsx
@@ -341,8 +341,8 @@ const BasicAppPreview: FC<Props> = ({
               <Config />
             </div>
             {!isMobile && (
-              <div className="relative flex h-full w-1/2 grow flex-col overflow-y-auto " style={{ borderColor: 'rgba(0, 0, 0, 0.02)' }}>
-                <div className="flex grow flex-col rounded-tl-2xl border-l-[0.5px] border-t-[0.5px] border-components-panel-border bg-chatbot-bg ">
+              <div className="relative flex h-full w-1/2 grow flex-col overflow-y-auto" style={{ borderColor: 'rgba(0, 0, 0, 0.02)' }}>
+                <div className="flex grow flex-col rounded-tl-2xl border-t-[0.5px] border-l-[0.5px] border-components-panel-border bg-chatbot-bg">
                   <Debug
                     isAPIKeySet
                     onSetting={noop}
diff --git a/web/app/components/goto-anything/components/result-item.tsx b/web/app/components/goto-anything/components/result-item.tsx
index d6ec49ac22..1739486ccc 100644
--- a/web/app/components/goto-anything/components/result-item.tsx
+++ b/web/app/components/goto-anything/components/result-item.tsx
@@ -28,7 +28,7 @@ const ResultItem: FC<ResultItemProps> = ({ result, onSelect }) => {
           </div>
         )}
       </div>
-      <div className="text-xs capitalize text-text-quaternary">
+      <div className="text-xs text-text-quaternary capitalize">
         {result.type}
       </div>
     </Command.Item>
diff --git a/web/app/components/goto-anything/components/result-list.tsx b/web/app/components/goto-anything/components/result-list.tsx
index 70d2c6c61e..cc2e1e7a7e 100644
--- a/web/app/components/goto-anything/components/result-list.tsx
+++ b/web/app/components/goto-anything/components/result-list.tsx
@@ -32,7 +32,7 @@ const ResultList: FC<ResultListProps> = ({ groupedResults, onSelect }) => {
         <Command.Group
           key={type}
           heading={getGroupHeading(type)}
-          className="p-2 capitalize text-text-secondary"
+          className="p-2 text-text-secondary capitalize"
         >
           {results.map(result => (
             <ResultItem
diff --git a/web/app/components/header/account-setting/api-based-extension-page/selector.tsx b/web/app/components/header/account-setting/api-based-extension-page/selector.tsx
index 5497fe7781..041657d4be 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/selector.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/selector.tsx
@@ -51,7 +51,7 @@ const ApiBasedExtensionSelector: FC<ApiBasedExtensionSelectorProps> = ({
         {
           currentItem
             ? (
-                <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal pl-3 pr-2.5">
+                <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal pr-2.5 pl-3">
                   <div className="text-sm text-text-primary">{currentItem.name}</div>
                   <div className="flex items-center">
                     <div className="mr-1.5 w-[270px] truncate text-right text-xs text-text-quaternary">
@@ -62,7 +62,7 @@ const ApiBasedExtensionSelector: FC<ApiBasedExtensionSelectorProps> = ({
                 </div>
               )
             : (
-                <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal pl-3 pr-2.5 text-sm text-text-quaternary">
+                <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal pr-2.5 pl-3 text-sm text-text-quaternary">
                   {t('apiBasedExtension.selector.placeholder', { ns: 'common' })}
                   <RiArrowDownSLine className={`h-4 w-4 text-text-secondary ${!open && 'opacity-60'}`} />
                 </div>
@@ -72,7 +72,7 @@ const ApiBasedExtensionSelector: FC<ApiBasedExtensionSelectorProps> = ({
       <PortalToFollowElemContent className="z-1002 w-[calc(100%-32px)] max-w-[576px]">
         <div className="z-10 w-full rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg">
           <div className="p-1">
-            <div className="flex items-center justify-between px-3 pb-1 pt-2">
+            <div className="flex items-center justify-between px-3 pt-2 pb-1">
               <div className="text-xs font-medium text-text-tertiary">
                 {t('apiBasedExtension.selector.title', { ns: 'common' })}
               </div>
diff --git a/web/app/components/header/account-setting/data-source-page-new/operator.tsx b/web/app/components/header/account-setting/data-source-page-new/operator.tsx
index 22303fb8f0..c94f1bb192 100644
--- a/web/app/components/header/account-setting/data-source-page-new/operator.tsx
+++ b/web/app/components/header/account-setting/data-source-page-new/operator.tsx
@@ -39,7 +39,7 @@ const Operator = ({
         text: (
           <div className="flex items-center">
             <RiHome9Line className="mr-2 h-4 w-4 text-text-tertiary" />
-            <div className="text-text-secondary system-sm-semibold">{t('auth.setDefault', { ns: 'plugin' })}</div>
+            <div className="system-sm-semibold text-text-secondary">{t('auth.setDefault', { ns: 'plugin' })}</div>
           </div>
         ),
       },
@@ -51,7 +51,7 @@ const Operator = ({
                 text: (
                   <div className="flex items-center">
                     <RiEditLine className="mr-2 h-4 w-4 text-text-tertiary" />
-                    <div className="text-text-secondary system-sm-semibold">{t('operation.rename', { ns: 'common' })}</div>
+                    <div className="system-sm-semibold text-text-secondary">{t('operation.rename', { ns: 'common' })}</div>
                   </div>
                 ),
               },
@@ -66,7 +66,7 @@ const Operator = ({
                 text: (
                   <div className="flex items-center">
                     <RiEqualizer2Line className="mr-2 h-4 w-4 text-text-tertiary" />
-                    <div className="text-text-secondary system-sm-semibold">{t('operation.edit', { ns: 'common' })}</div>
+                    <div className="system-sm-semibold text-text-secondary">{t('operation.edit', { ns: 'common' })}</div>
                   </div>
                 ),
               },
@@ -81,7 +81,7 @@ const Operator = ({
           text: (
             <div className="flex items-center">
               <RiStickyNoteAddLine className="mr-2 h-4 w-4 text-text-tertiary" />
-              <div className="mb-1 text-text-secondary system-sm-semibold">{t('dataSource.notion.changeAuthorizedPages', { ns: 'common' })}</div>
+              <div className="mb-1 system-sm-semibold text-text-secondary">{t('dataSource.notion.changeAuthorizedPages', { ns: 'common' })}</div>
             </div>
           ),
         },
@@ -98,7 +98,7 @@ const Operator = ({
         text: (
           <div className="flex items-center">
             <RiDeleteBinLine className="mr-2 h-4 w-4 text-text-tertiary" />
-            <div className="text-text-secondary system-sm-semibold">
+            <div className="system-sm-semibold text-text-secondary">
               {t('operation.remove', { ns: 'common' })}
             </div>
           </div>
diff --git a/web/app/components/header/account-setting/key-validator/KeyInput.tsx b/web/app/components/header/account-setting/key-validator/KeyInput.tsx
index cf8f88be7e..c352cc4835 100644
--- a/web/app/components/header/account-setting/key-validator/KeyInput.tsx
+++ b/web/app/components/header/account-setting/key-validator/KeyInput.tsx
@@ -60,8 +60,8 @@ const KeyInput = ({
         <input
           className="
             mr-2 w-full appearance-none
-            bg-transparent py-[9px] text-xs font-medium
-            leading-[18px] text-gray-700 outline-hidden
+            bg-transparent py-[9px] text-xs leading-[18px]
+            font-medium text-gray-700 outline-hidden
           "
           value={value}
           placeholder={placeholder}
diff --git a/web/app/components/header/account-setting/members-page/index.tsx b/web/app/components/header/account-setting/members-page/index.tsx
index 6ac9ee5d2d..0a3ed87e8f 100644
--- a/web/app/components/header/account-setting/members-page/index.tsx
+++ b/web/app/components/header/account-setting/members-page/index.tsx
@@ -50,12 +50,12 @@ const MembersPage = () => {
   return (
     <>
       <div className="flex flex-col">
-        <div className="mb-4 flex items-center gap-3 rounded-xl border-l-[0.5px] border-t-[0.5px] border-divider-subtle bg-linear-to-r from-background-gradient-bg-fill-chat-bg-2 to-background-gradient-bg-fill-chat-bg-1 p-3 pr-5">
+        <div className="mb-4 flex items-center gap-3 rounded-xl border-t-[0.5px] border-l-[0.5px] border-divider-subtle bg-linear-to-r from-background-gradient-bg-fill-chat-bg-2 to-background-gradient-bg-fill-chat-bg-1 p-3 pr-5">
           <div className="flex h-12 w-12 items-center justify-center rounded-xl bg-components-icon-bg-blue-solid text-[20px]">
-            <span className="bg-linear-to-r from-components-avatar-shape-fill-stop-0 to-components-avatar-shape-fill-stop-100 bg-clip-text font-semibold uppercase text-shadow-shadow-1 opacity-90">{currentWorkspace?.name[0]?.toLocaleUpperCase()}</span>
+            <span className="bg-linear-to-r from-components-avatar-shape-fill-stop-0 to-components-avatar-shape-fill-stop-100 bg-clip-text font-semibold text-shadow-shadow-1 uppercase opacity-90">{currentWorkspace?.name[0]?.toLocaleUpperCase()}</span>
           </div>
           <div className="grow">
-            <div className="flex items-center gap-1 text-text-secondary system-md-semibold">
+            <div className="flex items-center gap-1 system-md-semibold text-text-secondary">
               <span>{currentWorkspace?.name}</span>
               {isCurrentWorkspaceOwner && (
                 <span>
@@ -82,7 +82,7 @@ const MembersPage = () => {
                 </span>
               )}
             </div>
-            <div className="mt-1 text-text-tertiary system-xs-medium">
+            <div className="mt-1 system-xs-medium text-text-tertiary">
               {enableBilling && isNotUnlimitedMemberPlan
                 ? (
                     <div className="flex space-x-1">
@@ -116,9 +116,9 @@ const MembersPage = () => {
         </div>
         <div className="overflow-visible lg:overflow-visible">
           <div className="flex min-w-[480px] items-center border-b border-divider-regular py-[7px]">
-            <div className="grow px-3 text-text-tertiary system-xs-medium-uppercase">{t('members.name', { ns: 'common' })}</div>
-            <div className="w-[104px] shrink-0 text-text-tertiary system-xs-medium-uppercase">{t('members.lastActive', { ns: 'common' })}</div>
-            <div className="w-[96px] shrink-0 px-3 text-text-tertiary system-xs-medium-uppercase">{t('members.role', { ns: 'common' })}</div>
+            <div className="grow px-3 system-xs-medium-uppercase text-text-tertiary">{t('members.name', { ns: 'common' })}</div>
+            <div className="w-[104px] shrink-0 system-xs-medium-uppercase text-text-tertiary">{t('members.lastActive', { ns: 'common' })}</div>
+            <div className="w-[96px] shrink-0 px-3 system-xs-medium-uppercase text-text-tertiary">{t('members.role', { ns: 'common' })}</div>
           </div>
           <div className="relative min-w-[480px]">
             {
@@ -127,27 +127,27 @@ const MembersPage = () => {
                   <div className="flex grow items-center px-3 py-2">
                     <Avatar avatar={account.avatar_url} size="sm" className="mr-2" name={account.name} />
                     <div className="">
-                      <div className="text-text-secondary system-sm-medium">
+                      <div className="system-sm-medium text-text-secondary">
                         {account.name}
-                        {account.status === 'pending' && <span className="ml-1 text-text-warning system-xs-medium">{t('members.pending', { ns: 'common' })}</span>}
-                        {userProfile.email === account.email && <span className="text-text-tertiary system-xs-regular">{t('members.you', { ns: 'common' })}</span>}
+                        {account.status === 'pending' && <span className="ml-1 system-xs-medium text-text-warning">{t('members.pending', { ns: 'common' })}</span>}
+                        {userProfile.email === account.email && <span className="system-xs-regular text-text-tertiary">{t('members.you', { ns: 'common' })}</span>}
                       </div>
-                      <div className="text-text-tertiary system-xs-regular">{account.email}</div>
+                      <div className="system-xs-regular text-text-tertiary">{account.email}</div>
                     </div>
                   </div>
-                  <div className="flex w-[104px] shrink-0 items-center py-2 text-text-secondary system-sm-regular">{formatTimeFromNow(Number((account.last_active_at || account.created_at)) * 1000)}</div>
+                  <div className="flex w-[104px] shrink-0 items-center py-2 system-sm-regular text-text-secondary">{formatTimeFromNow(Number((account.last_active_at || account.created_at)) * 1000)}</div>
                   <div className="flex w-[96px] shrink-0 items-center">
                     {isCurrentWorkspaceOwner && account.role === 'owner' && isAllowTransferWorkspace && (
                       <TransferOwnership onOperate={() => setShowTransferOwnershipModal(true)}></TransferOwnership>
                     )}
                     {isCurrentWorkspaceOwner && account.role === 'owner' && !isAllowTransferWorkspace && (
-                      <div className="px-3 text-text-secondary system-sm-regular">{RoleMap[account.role] || RoleMap.normal}</div>
+                      <div className="px-3 system-sm-regular text-text-secondary">{RoleMap[account.role] || RoleMap.normal}</div>
                     )}
                     {isCurrentWorkspaceOwner && account.role !== 'owner' && (
                       <Operation member={account} operatorRole={currentWorkspace.role} onOperate={refetch} />
                     )}
                     {!isCurrentWorkspaceOwner && (
-                      <div className="px-3 text-text-secondary system-sm-regular">{RoleMap[account.role] || RoleMap.normal}</div>
+                      <div className="px-3 system-sm-regular text-text-secondary">{RoleMap[account.role] || RoleMap.normal}</div>
                     )}
                   </div>
                 </div>
diff --git a/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx b/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx
index 0c5874c4dc..4297099382 100644
--- a/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx
+++ b/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx
@@ -40,7 +40,7 @@ const InvitationLink = ({
         <div className="relative h-full grow text-[13px]">
           <Tooltip>
             <TooltipTrigger
-              render={<div className="absolute left-0 right-0 top-0 w-full cursor-pointer truncate pl-2 pr-2 text-text-primary" onClick={copyHandle} data-testid="invitation-link-url">{value.url}</div>}
+              render={<div className="absolute top-0 right-0 left-0 w-full cursor-pointer truncate pr-2 pl-2 text-text-primary" onClick={copyHandle} data-testid="invitation-link-url">{value.url}</div>}
             />
             <TooltipContent>
               {isCopied ? t('copied', { ns: 'appApi' }) : t('copy', { ns: 'appApi' })}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/authorized-item.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/authorized-item.tsx
index 1910e74f33..b0d45375a5 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/authorized-item.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/authorized/authorized-item.tsx
@@ -70,7 +70,7 @@ export const AuthorizedItem = ({
               )
             }
             <div
-              className="system-md-medium mx-1 grow truncate text-text-primary"
+              className="mx-1 grow truncate system-md-medium text-text-primary"
               title={title ?? model?.model}
             >
               {title ?? model?.model}
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 0f507a24c6..be3e9edb93 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
@@ -58,9 +58,9 @@ const CredentialSelector = ({
             selectedCredential && (
               <div className="flex items-center">
                 {
-                  !selectedCredential.addNewCredential && <Indicator className="ml-1 mr-2 shrink-0" />
+                  !selectedCredential.addNewCredential && <Indicator className="mr-2 ml-1 shrink-0" />
                 }
-                <div className="truncate text-components-input-text-filled system-sm-regular" title={selectedCredential.credential_name}>{selectedCredential.credential_name}</div>
+                <div className="truncate system-sm-regular text-components-input-text-filled" title={selectedCredential.credential_name}>{selectedCredential.credential_name}</div>
                 {
                   selectedCredential.from_enterprise && (
                     <Badge className="shrink-0">Enterprise</Badge>
@@ -71,7 +71,7 @@ const CredentialSelector = ({
           }
           {
             !selectedCredential && (
-              <div className="grow truncate text-components-input-text-placeholder system-sm-regular">{t('modelProvider.auth.selectModelCredential', { ns: 'common' })}</div>
+              <div className="grow truncate system-sm-regular text-components-input-text-placeholder">{t('modelProvider.auth.selectModelCredential', { ns: 'common' })}</div>
             )
           }
           <RiArrowDownSLine className="h-4 w-4 text-text-quaternary" />
@@ -98,7 +98,7 @@ const CredentialSelector = ({
           {
             !notAllowAddNewCredential && (
               <div
-                className="flex h-10 cursor-pointer items-center border-t border-t-divider-subtle px-7 text-text-accent-light-mode-only system-xs-medium"
+                className="flex h-10 cursor-pointer items-center border-t border-t-divider-subtle px-7 system-xs-medium text-text-accent-light-mode-only"
                 onClick={handleAddNewCredential}
               >
                 <RiAddLine className="mr-1 h-4 w-4" />
diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx
index 2593e36060..6c6d6110f1 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx
@@ -62,7 +62,7 @@ const Input: FC<InputProps> = ({
         max={max}
       />
       {validated && (
-        <div className="absolute right-2.5 top-2.5">
+        <div className="absolute top-2.5 right-2.5">
           <CheckCircle className="h-4 w-4 text-[#039855]" />
         </div>
       )}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-display.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-display.tsx
index d8a4fabac0..8a50a8de5e 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-display.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-display.tsx
@@ -17,7 +17,7 @@ const ModelDisplay = ({ currentModel, modelId }: ModelDisplayProps) => {
       )
     : (
         <div className="flex grow items-center gap-1 truncate px-1 py-[3px] opacity-50">
-          <div className="system-sm-regular overflow-hidden text-ellipsis text-components-input-text-filled">
+          <div className="overflow-hidden system-sm-regular text-ellipsis text-components-input-text-filled">
             {modelId}
           </div>
         </div>
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx
index 3cb37fd4e5..cca5846390 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx
@@ -20,12 +20,12 @@ const StatusIndicators = ({ needsConfiguration, modelProvider, inModelList, disa
       <div className="flex w-[240px] max-w-[240px] flex-col gap-1 px-1 py-1.5" onClick={e => e.stopPropagation()}>
         <div className="title-xs-semi-bold text-text-primary">{title}</div>
         {description && (
-          <div className="body-xs-regular min-w-[200px] text-text-secondary">
+          <div className="min-w-[200px] body-xs-regular text-text-secondary">
             {description}
           </div>
         )}
         {linkText && linkHref && (
-          <div className="body-xs-regular z-100 cursor-pointer text-text-accent">
+          <div className="z-100 cursor-pointer body-xs-regular text-text-accent">
             <Link
               href={linkHref}
               onClick={(e) => {
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/credits-fallback-alert.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/credits-fallback-alert.tsx
index bc7feb3397..672986b816 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/credits-fallback-alert.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/credits-fallback-alert.tsx
@@ -12,13 +12,13 @@ export default function CreditsFallbackAlert({ hasCredentials }: CreditsFallback
     : 'modelProvider.card.noApiKeysFallback'
 
   return (
-    <div className="mx-2 mb-1 mt-0.5 rounded-lg bg-background-section-burn p-3">
+    <div className="mx-2 mt-0.5 mb-1 rounded-lg bg-background-section-burn p-3">
       <div className="flex flex-col gap-1">
-        <div className="text-text-primary system-sm-medium">
+        <div className="system-sm-medium text-text-primary">
           {t(titleKey, { ns: 'common' })}
         </div>
         {hasCredentials && (
-          <div className="text-text-tertiary system-xs-regular">
+          <div className="system-xs-regular text-text-tertiary">
             {t('modelProvider.card.apiKeyUnavailableFallbackDescription', { ns: 'common' })}
           </div>
         )}
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/dropdown-content.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/dropdown-content.tsx
index 526cdf1dc9..415539383b 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/dropdown-content.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/dropdown-content.tsx
@@ -109,10 +109,10 @@ function DropdownContent({
       >
         <AlertDialogContent>
           <div className="p-6 pb-0">
-            <AlertDialogTitle className="text-text-primary system-xl-semibold">
+            <AlertDialogTitle className="system-xl-semibold text-text-primary">
               {t('modelProvider.confirmDelete', { ns: 'common' })}
             </AlertDialogTitle>
-            <AlertDialogDescription className="mt-1 text-text-secondary system-sm-regular" />
+            <AlertDialogDescription className="mt-1 system-sm-regular text-text-secondary" />
           </div>
           <AlertDialogActions>
             <AlertDialogCancelButton disabled={doingAction}>
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list.tsx
index 21c1ca3fd5..f292397525 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list.tsx
@@ -53,14 +53,14 @@ const ModelList: FC<ModelListProps> = ({
   return (
     <div className="rounded-b-xl px-2 pb-2">
       <div className="rounded-lg bg-components-panel-bg py-1">
-        <div className="flex items-center pl-1 pr-[3px]">
+        <div className="flex items-center pr-[3px] pl-1">
           <span className="group mr-2 flex shrink-0 items-center">
-            <span className="system-xs-medium inline-flex h-6 items-center pl-1 pr-1.5 text-text-tertiary group-hover:hidden">
+            <span className="inline-flex h-6 items-center pr-1.5 pl-1 system-xs-medium text-text-tertiary group-hover:hidden">
               {t('modelProvider.modelsNum', { ns: 'common', num: models.length })}
               <RiArrowRightSLine className="mr-0.5 h-4 w-4 rotate-90" />
             </span>
             <span
-              className="system-xs-medium hidden h-6 cursor-pointer items-center rounded-lg bg-state-base-hover pl-1 pr-1.5 text-text-tertiary group-hover:inline-flex"
+              className="hidden h-6 cursor-pointer items-center rounded-lg bg-state-base-hover pr-1.5 pl-1 system-xs-medium text-text-tertiary group-hover:inline-flex"
               onClick={() => onCollapse()}
             >
               {t('modelProvider.modelsNum', { ns: 'common', num: models.length })}
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-use-tip.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-use-tip.tsx
index 47fd06dfec..174e417dc9 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-use-tip.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-use-tip.tsx
@@ -9,7 +9,7 @@ const PriorityUseTip = () => {
     <Tooltip
       popupContent={t('modelProvider.priorityUsing', { ns: 'common' }) || ''}
     >
-      <div className="absolute -right-[5px] -top-[5px] cursor-pointer rounded-[5px] border-[0.5px] border-components-panel-border-subtle bg-util-colors-indigo-indigo-50 shadow-xs">
+      <div className="absolute -top-[5px] -right-[5px] cursor-pointer rounded-[5px] border-[0.5px] border-components-panel-border-subtle bg-util-colors-indigo-indigo-50 shadow-xs">
         <ChevronDownDouble className="h-3 w-3 rotate-180 text-util-colors-indigo-indigo-600" />
       </div>
     </Tooltip>
diff --git a/web/app/components/header/index.tsx b/web/app/components/header/index.tsx
index 560d5f1eaa..d92fd032fd 100644
--- a/web/app/components/header/index.tsx
+++ b/web/app/components/header/index.tsx
@@ -45,7 +45,7 @@ const Header = () => {
 
   const renderLogo = () => (
     <h1>
-      <Link href="/apps" className="flex h-8 shrink-0 items-center justify-center overflow-hidden whitespace-nowrap px-0.5 indent-[-9999px]">
+      <Link href="/apps" className="flex h-8 shrink-0 items-center justify-center overflow-hidden px-0.5 indent-[-9999px] whitespace-nowrap">
         {isBrandingEnabled && systemFeatures.branding.application_title ? systemFeatures.branding.application_title : 'Dify'}
         {systemFeatures.branding.enabled && systemFeatures.branding.workspace_logo
           ? (
@@ -91,7 +91,7 @@ const Header = () => {
 
   return (
     <div className="flex h-[56px] items-center">
-      <div className="flex min-w-0 flex-1 items-center pl-3 pr-2 min-[1280px]:pr-3">
+      <div className="flex min-w-0 flex-1 items-center pr-2 pl-3 min-[1280px]:pr-3">
         {renderLogo()}
         <div className="mx-1.5 shrink-0 font-light text-divider-deep">/</div>
         <WorkspaceProvider>
@@ -105,7 +105,7 @@ const Header = () => {
         {(isCurrentWorkspaceEditor || isCurrentWorkspaceDatasetOperator) && <DatasetNav />}
         {!isCurrentWorkspaceDatasetOperator && <ToolsNav className={navClassName} />}
       </div>
-      <div className="flex min-w-0 flex-1 items-center justify-end pl-2 pr-3 min-[1280px]:pl-3">
+      <div className="flex min-w-0 flex-1 items-center justify-end pr-3 pl-2 min-[1280px]:pl-3">
         <EnvNav />
         <div className="mr-2">
           <PluginsNav />
diff --git a/web/app/components/header/license-env/index.tsx b/web/app/components/header/license-env/index.tsx
index 292b3a2d30..2e505ddd41 100644
--- a/web/app/components/header/license-env/index.tsx
+++ b/web/app/components/header/license-env/index.tsx
@@ -17,15 +17,15 @@ const LicenseNav = () => {
     return (
       <PremiumBadge color="orange" className="select-none">
         <RiHourglass2Fill className="flex size-3 items-center pl-0.5 text-components-premium-badge-indigo-text-stop-0" />
-        {count <= 1 && <span className="system-xs-medium px-0.5">{t('license.expiring', { ns: 'common', count })}</span>}
-        {count > 1 && <span className="system-xs-medium px-0.5">{t('license.expiring_plural', { ns: 'common', count })}</span>}
+        {count <= 1 && <span className="px-0.5 system-xs-medium">{t('license.expiring', { ns: 'common', count })}</span>}
+        {count > 1 && <span className="px-0.5 system-xs-medium">{t('license.expiring_plural', { ns: 'common', count })}</span>}
       </PremiumBadge>
     )
   }
   if (systemFeatures.license.status === LicenseStatus.ACTIVE) {
     return (
       <PremiumBadge color="indigo" className="select-none">
-        <span className="system-xs-medium px-1">Enterprise</span>
+        <span className="px-1 system-xs-medium">Enterprise</span>
       </PremiumBadge>
     )
   }
diff --git a/web/app/components/header/plan-badge/index.tsx b/web/app/components/header/plan-badge/index.tsx
index 6268371790..9547ddf6f7 100644
--- a/web/app/components/header/plan-badge/index.tsx
+++ b/web/app/components/header/plan-badge/index.tsx
@@ -26,7 +26,7 @@ const PlanBadge: FC<PlanBadgeProps> = ({ plan, allowHover, sandboxAsUpgrade = fa
       <PremiumBadge className="select-none" color="blue" allowHover={allowHover} onClick={onClick}>
         <SparklesSoft className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
         <div className="system-xs-medium">
-          <span className="whitespace-nowrap p-1">
+          <span className="p-1 whitespace-nowrap">
             {t('upgradeBtn.encourageShort', { ns: 'billing' })}
           </span>
         </div>
diff --git a/web/app/components/plugins/card/base/corner-mark.tsx b/web/app/components/plugins/card/base/corner-mark.tsx
index bead0fd254..cc5436d1df 100644
--- a/web/app/components/plugins/card/base/corner-mark.tsx
+++ b/web/app/components/plugins/card/base/corner-mark.tsx
@@ -2,9 +2,9 @@ import { LeftCorner } from '../../../base/icons/src/vender/plugin'
 
 const CornerMark = ({ text }: { text: string }) => {
   return (
-    <div className="absolute right-0 top-0 flex pl-[13px] ">
+    <div className="absolute top-0 right-0 flex pl-[13px]">
       <LeftCorner className="text-background-section" />
-      <div className="system-2xs-medium-uppercase h-5 rounded-tr-xl bg-background-section pr-2 leading-5 text-text-tertiary">{text}</div>
+      <div className="h-5 rounded-tr-xl bg-background-section pr-2 system-2xs-medium-uppercase leading-5 text-text-tertiary">{text}</div>
     </div>
   )
 }
diff --git a/web/app/components/plugins/card/base/title.tsx b/web/app/components/plugins/card/base/title.tsx
index c9270c81b8..b4b0b5f543 100644
--- a/web/app/components/plugins/card/base/title.tsx
+++ b/web/app/components/plugins/card/base/title.tsx
@@ -4,7 +4,7 @@ const Title = ({
   title: string
 }) => {
   return (
-    <div className="system-md-semibold truncate text-text-secondary">
+    <div className="truncate system-md-semibold text-text-secondary">
       {title}
     </div>
   )
diff --git a/web/app/components/plugins/card/card-more-info.tsx b/web/app/components/plugins/card/card-more-info.tsx
index 33f819f31a..237e9232d2 100644
--- a/web/app/components/plugins/card/card-more-info.tsx
+++ b/web/app/components/plugins/card/card-more-info.tsx
@@ -13,14 +13,14 @@ const CardMoreInfoComponent = ({
   return (
     <div className="flex h-5 items-center">
       {downloadCount !== undefined && <DownloadCount downloadCount={downloadCount} />}
-      {downloadCount !== undefined && tags && tags.length > 0 && <div className="system-xs-regular mx-2 text-text-quaternary">·</div>}
+      {downloadCount !== undefined && tags && tags.length > 0 && <div className="mx-2 system-xs-regular text-text-quaternary">·</div>}
       {tags && tags.length > 0 && (
         <>
           <div className="flex h-4 flex-wrap space-x-2 overflow-hidden">
             {tags.map(tag => (
               <div
                 key={tag}
-                className="system-xs-regular flex max-w-[120px] space-x-1 overflow-hidden"
+                className="flex max-w-[120px] space-x-1 overflow-hidden system-xs-regular"
                 title={`# ${tag}`}
               >
                 <span className="text-text-quaternary">#</span>
diff --git a/web/app/components/plugins/marketplace/description/index.tsx b/web/app/components/plugins/marketplace/description/index.tsx
index c3c1ab5fb1..c91110b8cc 100644
--- a/web/app/components/plugins/marketplace/description/index.tsx
+++ b/web/app/components/plugins/marketplace/description/index.tsx
@@ -9,10 +9,10 @@ const Description = () => {
 
   return (
     <>
-      <h1 className="title-4xl-semi-bold mb-2 shrink-0 text-center text-text-primary">
+      <h1 className="mb-2 shrink-0 text-center title-4xl-semi-bold text-text-primary">
         {t('marketplace.empower')}
       </h1>
-      <h2 className="body-md-regular flex shrink-0 items-center justify-center text-center text-text-tertiary">
+      <h2 className="flex shrink-0 items-center justify-center text-center body-md-regular text-text-tertiary">
         {
           isZhHans && (
             <>
@@ -29,31 +29,31 @@ const Description = () => {
             </>
           )
         }
-        <span className="body-md-medium relative z-1 ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+        <span className="relative z-1 ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
           {t('category.models')}
         </span>
         ,
-        <span className="body-md-medium relative z-1 ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+        <span className="relative z-1 ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
           {t('category.tools')}
         </span>
         ,
-        <span className="body-md-medium relative z-1 ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+        <span className="relative z-1 ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
           {t('category.datasources')}
         </span>
         ,
-        <span className="body-md-medium relative z-1 ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+        <span className="relative z-1 ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
           {t('category.triggers')}
         </span>
         ,
-        <span className="body-md-medium relative z-1 ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+        <span className="relative z-1 ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
           {t('category.agents')}
         </span>
         ,
-        <span className="body-md-medium relative z-1 ml-1 mr-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+        <span className="relative z-1 mr-1 ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
           {t('category.extensions')}
         </span>
         {t('marketplace.and')}
-        <span className="body-md-medium relative z-1 ml-1 mr-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+        <span className="relative z-1 mr-1 ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
           {t('category.bundles')}
         </span>
         {
diff --git a/web/app/components/plugins/marketplace/list/list-wrapper.tsx b/web/app/components/plugins/marketplace/list/list-wrapper.tsx
index acc5776a13..864f2445f3 100644
--- a/web/app/components/plugins/marketplace/list/list-wrapper.tsx
+++ b/web/app/components/plugins/marketplace/list/list-wrapper.tsx
@@ -39,7 +39,7 @@ const ListWrapper = ({
       }
       {
         isLoading && page === 1 && (
-          <div className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2">
+          <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2">
             <Loading />
           </div>
         )
diff --git a/web/app/components/plugins/marketplace/search-box/tags-filter.tsx b/web/app/components/plugins/marketplace/search-box/tags-filter.tsx
index 5b37d0c488..b078dbaa9b 100644
--- a/web/app/components/plugins/marketplace/search-box/tags-filter.tsx
+++ b/web/app/components/plugins/marketplace/search-box/tags-filter.tsx
@@ -88,14 +88,14 @@ const TagsFilter = ({
               filteredOptions.map(option => (
                 <div
                   key={option.name}
-                  className="flex h-7 cursor-pointer select-none items-center rounded-lg px-2 py-1.5 hover:bg-state-base-hover"
+                  className="flex h-7 cursor-pointer items-center rounded-lg px-2 py-1.5 select-none hover:bg-state-base-hover"
                   onClick={() => handleCheck(option.name)}
                 >
                   <Checkbox
                     className="mr-1"
                     checked={tags.includes(option.name)}
                   />
-                  <div className="system-sm-medium px-1 text-text-secondary">
+                  <div className="px-1 system-sm-medium text-text-secondary">
                     {option.label}
                   </div>
                 </div>
diff --git a/web/app/components/plugins/marketplace/sort-dropdown/index.tsx b/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
index d8b6939d1a..99f5650a71 100644
--- a/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
+++ b/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
@@ -52,10 +52,10 @@ const SortDropdown = () => {
     >
       <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
         <div className="flex h-8 cursor-pointer items-center rounded-lg bg-state-base-hover-alt px-2 pr-3">
-          <span className="system-sm-regular mr-1 text-text-secondary">
+          <span className="mr-1 system-sm-regular text-text-secondary">
             {t('marketplace.sortBy', { ns: 'plugin' })}
           </span>
-          <span className="system-sm-medium mr-1 text-text-primary">
+          <span className="mr-1 system-sm-medium text-text-primary">
             {selectedOption!.text}
           </span>
           <RiArrowDownSLine className="h-4 w-4 text-text-tertiary" />
@@ -67,7 +67,7 @@ const SortDropdown = () => {
             options.map(option => (
               <div
                 key={`${option.value}-${option.order}`}
-                className="system-md-regular flex h-8 cursor-pointer items-center justify-between rounded-lg px-3 pr-2 text-text-primary hover:bg-components-panel-on-panel-item-bg-hover"
+                className="flex h-8 cursor-pointer items-center justify-between rounded-lg px-3 pr-2 system-md-regular text-text-primary hover:bg-components-panel-on-panel-item-bg-hover"
                 onClick={() => handleSortChange({ sortBy: option.value, sortOrder: option.order })}
               >
                 {option.text}
diff --git a/web/app/components/plugins/plugin-detail-panel/action-list.tsx b/web/app/components/plugins/plugin-detail-panel/action-list.tsx
index 7acf16b5fc..40317f4b78 100644
--- a/web/app/components/plugins/plugin-detail-panel/action-list.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/action-list.tsx
@@ -28,9 +28,9 @@ const ActionList = ({
     return null
 
   return (
-    <div className="px-4 pb-4 pt-2">
+    <div className="px-4 pt-2 pb-4">
       <div className="mb-1 py-1">
-        <div className="system-sm-semibold-uppercase mb-1 flex h-6 items-center justify-between text-text-secondary">
+        <div className="mb-1 flex h-6 items-center justify-between system-sm-semibold-uppercase text-text-secondary">
           {t('detailPanel.actionNum', { ns: 'plugin', num: data.length, action: data.length > 1 ? 'actions' : 'action' })}
         </div>
       </div>
diff --git a/web/app/components/plugins/plugin-detail-panel/agent-strategy-list.tsx b/web/app/components/plugins/plugin-detail-panel/agent-strategy-list.tsx
index db02dc8836..e9aeedfa01 100644
--- a/web/app/components/plugins/plugin-detail-panel/agent-strategy-list.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/agent-strategy-list.tsx
@@ -37,9 +37,9 @@ const AgentStrategyList = ({
     return null
 
   return (
-    <div className="px-4 pb-4 pt-2">
+    <div className="px-4 pt-2 pb-4">
       <div className="mb-1 py-1">
-        <div className="system-sm-semibold-uppercase mb-1 flex h-6 items-center justify-between text-text-secondary">
+        <div className="mb-1 flex h-6 items-center justify-between system-sm-semibold-uppercase text-text-secondary">
           {t('detailPanel.strategyNum', { ns: 'plugin', num: strategyList.length, strategy: strategyList.length > 1 ? 'strategies' : 'strategy' })}
         </div>
       </div>
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx
index f57d82211c..21e313c93c 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx
@@ -111,7 +111,7 @@ const AppInputsForm = ({
     <div className="flex flex-col gap-4 px-4 py-2">
       {inputsForms.map(form => (
         <div key={form.variable}>
-          <div className="system-sm-semibold mb-1 flex h-6 items-center gap-1 text-text-secondary">
+          <div className="mb-1 flex h-6 items-center gap-1 system-sm-semibold text-text-secondary">
             <div className="truncate">{form.label}</div>
             {!form.required && <span className="system-xs-regular text-text-tertiary">{t('panel.optional', { ns: 'workflow' })}</span>}
           </div>
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx
index 4c96b69beb..41140ac63b 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx
@@ -188,7 +188,7 @@ const AppPicker: FC<Props> = ({
             {apps.map(app => (
               <div
                 key={app.id}
-                className="flex cursor-pointer items-center gap-3 rounded-lg py-1 pl-2 pr-3 hover:bg-state-base-hover"
+                className="flex cursor-pointer items-center gap-3 rounded-lg py-1 pr-3 pl-2 hover:bg-state-base-hover"
                 onClick={() => onSelect(app)}
               >
                 <AppIcon
@@ -199,7 +199,7 @@ const AppPicker: FC<Props> = ({
                   background={app.icon_background}
                   imageUrl={app.icon_url}
                 />
-                <div title={`${app.name} (${app.id})`} className="grow text-components-input-text-filled system-sm-medium">
+                <div title={`${app.name} (${app.id})`} className="grow system-sm-medium text-components-input-text-filled">
                   <span className="mr-1">{app.name}</span>
                   <span className="text-text-tertiary">
                     (
@@ -207,7 +207,7 @@ const AppPicker: FC<Props> = ({
                     )
                   </span>
                 </div>
-                <div className="shrink-0 text-text-tertiary system-2xs-medium-uppercase">{getAppType(app)}</div>
+                <div className="shrink-0 system-2xs-medium-uppercase text-text-tertiary">{getAppType(app)}</div>
               </div>
             ))}
             <div ref={observerTargetRef} className="h-4 w-full">
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
index abd47b4592..97e144af6f 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
@@ -161,7 +161,7 @@ const AppSelector: FC<Props> = ({
         <PortalToFollowElemContent className="z-1000">
           <div className="relative min-h-20 w-[389px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-xs">
             <div className="flex flex-col gap-1 px-4 py-3">
-              <div className="flex h-6 items-center text-text-secondary system-sm-semibold">{t('appSelector.label', { ns: 'app' })}</div>
+              <div className="flex h-6 items-center system-sm-semibold text-text-secondary">{t('appSelector.label', { ns: 'app' })}</div>
               <AppPicker
                 placement="bottom"
                 offset={offset}
diff --git a/web/app/components/plugins/plugin-detail-panel/detail-header/components/header-modals.tsx b/web/app/components/plugins/plugin-detail-panel/detail-header/components/header-modals.tsx
index ce97705367..3bf24a19b7 100644
--- a/web/app/components/plugins/plugin-detail-panel/detail-header/components/header-modals.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/detail-header/components/header-modals.tsx
@@ -75,13 +75,13 @@ const HeaderModals: FC<HeaderModalsProps> = ({
         }}
       >
         <AlertDialogContent backdropProps={{ forceRender: true }}>
-          <div className="flex flex-col gap-2 px-6 pb-4 pt-6">
-            <AlertDialogTitle className="text-text-primary title-2xl-semi-bold">
+          <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+            <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">
               {t(`${i18nPrefix}.delete`, { ns: 'plugin' })}
             </AlertDialogTitle>
-            <AlertDialogDescription className="w-full whitespace-pre-wrap wrap-break-word text-text-tertiary system-md-regular">
+            <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
               {t(`${i18nPrefix}.deleteContentLeft`, { ns: 'plugin' })}
-              <span className="text-text-secondary system-md-semibold">{label[locale]}</span>
+              <span className="system-md-semibold text-text-secondary">{label[locale]}</span>
               {t(`${i18nPrefix}.deleteContentRight`, { ns: 'plugin' })}
             </AlertDialogDescription>
           </div>
diff --git a/web/app/components/plugins/plugin-detail-panel/detail-header/components/plugin-source-badge.tsx b/web/app/components/plugins/plugin-detail-panel/detail-header/components/plugin-source-badge.tsx
index e886cec4da..ba15815cde 100644
--- a/web/app/components/plugins/plugin-detail-panel/detail-header/components/plugin-source-badge.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/detail-header/components/plugin-source-badge.tsx
@@ -48,7 +48,7 @@ const PluginSourceBadge: FC<PluginSourceBadgeProps> = ({ source }) => {
 
   return (
     <>
-      <div className="system-xs-regular ml-1 mr-0.5 text-text-quaternary">·</div>
+      <div className="mr-0.5 ml-1 system-xs-regular text-text-quaternary">·</div>
       <Tooltip popupContent={t(config.tipKey as never, { ns: 'plugin' })}>
         <div>{config.icon}</div>
       </Tooltip>
diff --git a/web/app/components/plugins/plugin-detail-panel/model-list.tsx b/web/app/components/plugins/plugin-detail-panel/model-list.tsx
index cc8ecc2998..21c7a88ffb 100644
--- a/web/app/components/plugins/plugin-detail-panel/model-list.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/model-list.tsx
@@ -20,7 +20,7 @@ const ModelList = ({
 
   return (
     <div className="px-4 py-2">
-      <div className="system-sm-semibold-uppercase mb-1 flex h-6 items-center text-text-secondary">{t('detailPanel.modelNum', { ns: 'plugin', num: res.data.length })}</div>
+      <div className="mb-1 flex h-6 items-center system-sm-semibold-uppercase text-text-secondary">{t('detailPanel.modelNum', { ns: 'plugin', num: res.data.length })}</div>
       <div className="flex flex-col">
         {res.data.map(model => (
           <div key={model.model} className="flex h-6 items-center py-1">
@@ -30,7 +30,7 @@ const ModelList = ({
               modelName={model.model}
             />
             <ModelName
-              className="system-md-regular grow text-text-secondary"
+              className="grow system-md-regular text-text-secondary"
               modelItem={model}
               showModelType
               showMode
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/components/modal-steps.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/components/modal-steps.tsx
index e21e49040e..2cc5e58167 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/components/modal-steps.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/components/modal-steps.tsx
@@ -21,7 +21,7 @@ type StatusStepProps = {
 
 const StatusStep = ({ isActive, text }: StatusStepProps) => {
   return (
-    <div className={`system-2xs-semibold-uppercase flex items-center gap-1 ${isActive
+    <div className={`flex items-center gap-1 system-2xs-semibold-uppercase ${isActive
       ? 'text-state-accent-solid'
       : 'text-text-tertiary'}`}
     >
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx
index 8934f8c6af..c01848ea59 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx
@@ -31,11 +31,11 @@ const SchemaModal: FC<Props> = ({
     >
       <div className="pb-6">
         {/* Header */}
-        <div className="relative flex p-6 pb-3 pr-14">
-          <div className="title-2xl-semi-bold grow truncate text-text-primary">
+        <div className="relative flex p-6 pr-14 pb-3">
+          <div className="grow truncate title-2xl-semi-bold text-text-primary">
             {t('nodes.agent.parameterSchema', { ns: 'workflow' })}
           </div>
-          <div className="absolute right-5 top-5 flex h-8 w-8 items-center justify-center p-1.5" onClick={onClose}>
+          <div className="absolute top-5 right-5 flex h-8 w-8 items-center justify-center p-1.5" onClick={onClose}>
             <RiCloseLine className="h-[18px] w-[18px] text-text-tertiary" />
           </div>
         </div>
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-base-form.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-base-form.tsx
index be87684f56..c3f8be2e51 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-base-form.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-base-form.tsx
@@ -47,7 +47,7 @@ const ToolBaseForm: FC<ToolBaseFormProps> = ({
     <div className="flex flex-col gap-3 px-4 py-2">
       {/* Tool picker */}
       <div className="flex flex-col gap-1">
-        <div className="system-sm-semibold flex h-6 items-center justify-between text-text-secondary">
+        <div className="flex h-6 items-center justify-between system-sm-semibold text-text-secondary">
           {t('detailPanel.toolSelector.toolLabel', { ns: 'plugin' })}
           {currentProvider?.plugin_unique_identifier && (
             <ReadmeEntrance
@@ -80,7 +80,7 @@ const ToolBaseForm: FC<ToolBaseFormProps> = ({
 
       {/* Description */}
       <div className="flex flex-col gap-1">
-        <div className="system-sm-semibold flex h-6 items-center text-text-secondary">
+        <div className="flex h-6 items-center system-sm-semibold text-text-secondary">
           {t('detailPanel.toolSelector.descriptionLabel', { ns: 'plugin' })}
         </div>
         <Textarea
diff --git a/web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-item.tsx b/web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-item.tsx
index ca9963e426..f627047b24 100644
--- a/web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-item.tsx
+++ b/web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-item.tsx
@@ -31,12 +31,12 @@ const PluginItem: FC<PluginItemProps> = ({
           size="small"
           src={getIconUrl(plugin.icon)}
         />
-        <div className="absolute -bottom-0.5 -right-0.5 z-10">
+        <div className="absolute -right-0.5 -bottom-0.5 z-10">
           {statusIcon}
         </div>
       </div>
       <div className="flex min-w-0 grow flex-col gap-0.5 px-1">
-        <div className="truncate text-text-secondary system-sm-medium">
+        <div className="truncate system-sm-medium text-text-secondary">
           {plugin.labels[language]}
         </div>
         <div className={`system-xs-regular ${statusClassName || 'text-text-tertiary'}`}>
@@ -47,7 +47,7 @@ const PluginItem: FC<PluginItemProps> = ({
       {onClear && (
         <button
           type="button"
-          className="hidden h-6 w-6 shrink-0 items-center justify-center rounded-md hover:bg-state-base-hover-alt group-hover/item:flex"
+          className="hidden h-6 w-6 shrink-0 items-center justify-center rounded-md group-hover/item:flex hover:bg-state-base-hover-alt"
           onClick={onClear}
         >
           <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
diff --git a/web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-section.tsx b/web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-section.tsx
index 838d2c3119..418c442e11 100644
--- a/web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-section.tsx
+++ b/web/app/components/plugins/plugin-page/plugin-tasks/components/plugin-section.tsx
@@ -35,7 +35,7 @@ const PluginSection: FC<PluginSectionProps> = ({
 
   return (
     <>
-      <div className="sticky top-0 flex h-7 items-center justify-between px-2 pt-1 text-text-secondary system-sm-semibold-uppercase">
+      <div className="sticky top-0 flex h-7 items-center justify-between px-2 pt-1 system-sm-semibold-uppercase text-text-secondary">
         {title}
         {' '}
         (
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx
index 5a6dc08181..e5dbc24b8f 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx
@@ -26,12 +26,12 @@ const ToolItem: FC<Props> = ({
   return (
     <div className="p-1">
       <div
-        className="flex w-full select-none items-center rounded-lg pr-2 hover:bg-state-base-hover"
+        className="flex w-full items-center rounded-lg pr-2 select-none hover:bg-state-base-hover"
       >
-        <div className="flex h-8 grow items-center space-x-2 pl-3 pr-2">
+        <div className="flex h-8 grow items-center space-x-2 pr-2 pl-3">
           <Icon size="tiny" src={`${MARKETPLACE_API_PREFIX}/plugins/${plugin_id}/icon`} />
-          <div className="system-sm-medium max-w-[150px] shrink-0 truncate text-text-primary">{renderI18nObject(label, language)}</div>
-          <div className="system-xs-regular max-w-[150px] shrink-0  truncate text-text-quaternary">{org}</div>
+          <div className="max-w-[150px] shrink-0 truncate system-sm-medium text-text-primary">{renderI18nObject(label, language)}</div>
+          <div className="max-w-[150px] shrink-0 truncate system-xs-regular text-text-quaternary">{org}</div>
         </div>
         <Checkbox
           checked={isChecked}
diff --git a/web/app/components/rag-pipeline/components/chunk-card-list/q-a-item.tsx b/web/app/components/rag-pipeline/components/chunk-card-list/q-a-item.tsx
index bd317a2ce4..99dde5bbe4 100644
--- a/web/app/components/rag-pipeline/components/chunk-card-list/q-a-item.tsx
+++ b/web/app/components/rag-pipeline/components/chunk-card-list/q-a-item.tsx
@@ -10,8 +10,8 @@ const QAItem = (props: QAItemProps) => {
   const { type, text } = props
   return (
     <div className="inline-flex items-start justify-start gap-1 self-stretch">
-      <div className="w-4 text-[13px] font-medium leading-5 text-text-tertiary">{type === QAItemType.Question ? 'Q' : 'A'}</div>
-      <div className="body-md-regular flex-1 text-text-secondary">{text}</div>
+      <div className="w-4 text-[13px] leading-5 font-medium text-text-tertiary">{type === QAItemType.Question ? 'Q' : 'A'}</div>
+      <div className="flex-1 body-md-regular text-text-secondary">{text}</div>
     </div>
   )
 }
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx
index af79aacf54..d881188446 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx
@@ -26,10 +26,10 @@ const ShowAllSettings = ({
     return (
       <div className="flex cursor-pointer items-center gap-x-4" onClick={handleShowAllSettings}>
         <div className="flex grow flex-col">
-          <span className="system-sm-medium flex min-h-6 items-center text-text-secondary">
+          <span className="flex min-h-6 items-center system-sm-medium text-text-secondary">
             {t('variableConfig.showAllSettings', { ns: 'appDebug' })}
           </span>
-          <span className="body-xs-regular pb-0.5 text-text-tertiary first-letter:capitalize">
+          <span className="pb-0.5 body-xs-regular text-text-tertiary first-letter:capitalize">
             {hiddenFieldNames}
           </span>
         </div>
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/preview/data-source.tsx b/web/app/components/rag-pipeline/components/panel/input-field/preview/data-source.tsx
index 86699ddd88..7657d11406 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/preview/data-source.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/preview/data-source.tsx
@@ -24,7 +24,7 @@ const DataSource = ({
 
   return (
     <div className="flex flex-col">
-      <div className="system-sm-semibold-uppercase px-4 pt-2 text-text-secondary">
+      <div className="px-4 pt-2 system-sm-semibold-uppercase text-text-secondary">
         {t('inputFieldPanel.preview.stepOneTitle', { ns: 'datasetPipeline' })}
       </div>
       <div className="px-4 py-2">
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/preview/process-documents.tsx b/web/app/components/rag-pipeline/components/panel/input-field/preview/process-documents.tsx
index b70d40a4d7..fc72810d1c 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/preview/process-documents.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/preview/process-documents.tsx
@@ -20,7 +20,7 @@ const ProcessDocuments = ({
 
   return (
     <div className="flex flex-col">
-      <div className="system-sm-semibold-uppercase px-4 pt-2 text-text-secondary">
+      <div className="px-4 pt-2 system-sm-semibold-uppercase text-text-secondary">
         {t('inputFieldPanel.preview.stepTwoTitle', { ns: 'datasetPipeline' })}
       </div>
       <Form variables={paramsConfig?.variables || []} />
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/header.tsx b/web/app/components/rag-pipeline/components/panel/test-run/header.tsx
index c9de890b07..bab93a1a66 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/header.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/header.tsx
@@ -22,8 +22,8 @@ const Header = () => {
   }, [workflowStore])
 
   return (
-    <div className="flex items-center gap-x-2 pl-4 pr-3 pt-4">
-      <div className="system-xl-semibold grow pl-1 pr-8 text-text-primary">
+    <div className="flex items-center gap-x-2 pt-4 pr-3 pl-4">
+      <div className="grow pr-8 pl-1 system-xl-semibold text-text-primary">
         {t('testRun.title', { ns: 'datasetPipeline' })}
       </div>
       <button
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx b/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx
index 0e904dae7a..7e6baa42b1 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx
@@ -41,7 +41,7 @@ const Options = ({ initialData, configurations, schema, CustomActions, onSubmit
         form.handleSubmit()
       }}
     >
-      <div className="flex flex-col gap-3 px-4 pb-6 pt-3">
+      <div className="flex flex-col gap-3 px-4 pt-3 pb-6">
         {configurations.map((config, index) => {
           const FieldComponent = BaseField({
             initialData,
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/footer-tips.tsx b/web/app/components/rag-pipeline/components/panel/test-run/preparation/footer-tips.tsx
index b9f35842e9..b4695abd5f 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/footer-tips.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/footer-tips.tsx
@@ -5,7 +5,7 @@ const FooterTips = () => {
   const { t } = useTranslation()
 
   return (
-    <div className="system-xs-regular flex grow flex-col justify-end p-4 pt-2 text-text-tertiary">
+    <div className="flex grow flex-col justify-end p-4 pt-2 system-xs-regular text-text-tertiary">
       {t('testRun.tooltip', { ns: 'datasetPipeline' })}
     </div>
   )
diff --git a/web/app/components/rag-pipeline/components/publish-toast.tsx b/web/app/components/rag-pipeline/components/publish-toast.tsx
index 53a7cf4dd4..2ca92081c8 100644
--- a/web/app/components/rag-pipeline/components/publish-toast.tsx
+++ b/web/app/components/rag-pipeline/components/publish-toast.tsx
@@ -18,7 +18,7 @@ const PublishToast = () => {
     return null
 
   return (
-    <div className="pointer-events-none absolute bottom-[45px] left-0 right-0 z-10 flex justify-center">
+    <div className="pointer-events-none absolute right-0 bottom-[45px] left-0 z-10 flex justify-center">
       <div
         className="relative flex w-[420px] space-x-1 overflow-hidden rounded-xl border border-components-panel-border bg-components-panel-bg-blur p-3 shadow-lg"
       >
@@ -28,7 +28,7 @@ const PublishToast = () => {
           <RiInformation2Fill className="text-text-accent" />
         </div>
         <div className="p-1">
-          <div className="system-sm-semibold mb-1 text-text-primary">{t('publishToast.title', { ns: 'pipeline' })}</div>
+          <div className="mb-1 system-sm-semibold text-text-primary">{t('publishToast.title', { ns: 'pipeline' })}</div>
           <div className="system-xs-regular text-text-secondary">
             {t('publishToast.desc', { ns: 'pipeline' })}
           </div>
diff --git a/web/app/components/share/text-generation/no-data/index.tsx b/web/app/components/share/text-generation/no-data/index.tsx
index 5885f60754..2f25306015 100644
--- a/web/app/components/share/text-generation/no-data/index.tsx
+++ b/web/app/components/share/text-generation/no-data/index.tsx
@@ -12,7 +12,7 @@ const NoData: FC<INoDataProps> = () => {
     <div className="flex h-full w-full flex-col items-center justify-center">
       <RiSparklingFill className="h-12 w-12 text-text-empty-state-icon" />
       <div
-        className="system-sm-regular mt-2 text-text-quaternary"
+        className="mt-2 system-sm-regular text-text-quaternary"
       >
         {t('generation.noData', { ns: 'share' })}
       </div>
diff --git a/web/app/components/share/text-generation/run-batch/csv-download/index.tsx b/web/app/components/share/text-generation/run-batch/csv-download/index.tsx
index a179029cb7..301ba13492 100644
--- a/web/app/components/share/text-generation/run-batch/csv-download/index.tsx
+++ b/web/app/components/share/text-generation/run-batch/csv-download/index.tsx
@@ -33,7 +33,7 @@ const CSVDownload: FC<ICSVDownloadProps> = ({
           <thead className="text-text-tertiary">
             <tr>
               {addQueryContentVars.map((item, i) => (
-                <td key={i} className="h-9 border-b border-divider-regular pl-3 pr-2">{item.name}</td>
+                <td key={i} className="h-9 border-b border-divider-regular pr-2 pl-3">{item.name}</td>
               ))}
             </tr>
           </thead>
@@ -62,7 +62,7 @@ const CSVDownload: FC<ICSVDownloadProps> = ({
           template,
         ]}
       >
-        <div className="system-xs-medium flex h-[18px] items-center space-x-1 text-text-accent">
+        <div className="flex h-[18px] items-center space-x-1 system-xs-medium text-text-accent">
           <DownloadIcon className="h-3 w-3" />
           <span>{t('generation.downloadTemplate', { ns: 'share' })}</span>
         </div>
diff --git a/web/app/components/signin/countdown.tsx b/web/app/components/signin/countdown.tsx
index 8eefd1c945..651a2fb430 100644
--- a/web/app/components/signin/countdown.tsx
+++ b/web/app/components/signin/countdown.tsx
@@ -41,7 +41,7 @@ export default function Countdown({ onResend }: CountdownProps) {
         </span>
       )}
       {
-        time <= 0 && <span className="system-xs-medium cursor-pointer text-text-accent-secondary" onClick={resend}>{t('checkCode.resend', { ns: 'login' })}</span>
+        time <= 0 && <span className="cursor-pointer system-xs-medium text-text-accent-secondary" onClick={resend}>{t('checkCode.resend', { ns: 'login' })}</span>
       }
     </p>
   )
diff --git a/web/app/components/tools/marketplace/index.tsx b/web/app/components/tools/marketplace/index.tsx
index 449f0b8b4a..e7d6a22d42 100644
--- a/web/app/components/tools/marketplace/index.tsx
+++ b/web/app/components/tools/marketplace/index.tsx
@@ -37,50 +37,50 @@ const Marketplace = ({
 
   return (
     <>
-      <div className="sticky bottom-0 flex shrink-0 flex-col bg-background-default-subtle px-12 pb-[14px] pt-2">
+      <div className="sticky bottom-0 flex shrink-0 flex-col bg-background-default-subtle px-12 pt-2 pb-[14px]">
         {isMarketplaceArrowVisible && (
           <RiArrowUpDoubleLine
-            className="absolute left-1/2 top-2 z-10 h-4 w-4 -translate-x-1/2 cursor-pointer text-text-quaternary"
+            className="absolute top-2 left-1/2 z-10 h-4 w-4 -translate-x-1/2 cursor-pointer text-text-quaternary"
             onClick={showMarketplacePanel}
           />
         )}
-        <div className="pb-3 pt-4">
-          <div className="title-2xl-semi-bold bg-linear-to-r from-[rgba(11,165,236,0.95)] to-[rgba(21,90,239,0.95)] bg-clip-text text-transparent">
+        <div className="pt-4 pb-3">
+          <div className="bg-linear-to-r from-[rgba(11,165,236,0.95)] to-[rgba(21,90,239,0.95)] bg-clip-text title-2xl-semi-bold text-transparent">
             {t('marketplace.moreFrom', { ns: 'plugin' })}
           </div>
-          <div className="body-md-regular flex items-center text-center text-text-tertiary">
+          <div className="flex items-center text-center body-md-regular text-text-tertiary">
             {t('marketplace.discover', { ns: 'plugin' })}
-            <span className="body-md-medium relative ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+            <span className="relative ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
               {t('category.models', { ns: 'plugin' })}
             </span>
             ,
-            <span className="body-md-medium relative ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+            <span className="relative ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
               {t('category.tools', { ns: 'plugin' })}
             </span>
             ,
-            <span className="body-md-medium relative ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+            <span className="relative ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
               {t('category.datasources', { ns: 'plugin' })}
             </span>
             ,
-            <span className="body-md-medium relative ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+            <span className="relative ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
               {t('category.triggers', { ns: 'plugin' })}
             </span>
             ,
-            <span className="body-md-medium relative ml-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+            <span className="relative ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
               {t('category.agents', { ns: 'plugin' })}
             </span>
             ,
-            <span className="body-md-medium relative ml-1 mr-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+            <span className="relative mr-1 ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
               {t('category.extensions', { ns: 'plugin' })}
             </span>
             {t('marketplace.and', { ns: 'plugin' })}
-            <span className="body-md-medium relative ml-1 mr-1 text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
+            <span className="relative mr-1 ml-1 body-md-medium text-text-secondary after:absolute after:bottom-[1.5px] after:left-0 after:h-2 after:w-full after:bg-text-text-selected after:content-['']">
               {t('category.bundles', { ns: 'plugin' })}
             </span>
             {t('operation.in', { ns: 'common' })}
             <a
               href={getMarketplaceUrl('', { language: locale, q: searchPluginText, tags: filterPluginTags.join(','), theme })}
-              className="system-sm-medium ml-1 flex items-center text-text-accent"
+              className="ml-1 flex items-center system-sm-medium text-text-accent"
               target="_blank"
             >
               {t('marketplace.difyMarketplace', { ns: 'plugin' })}
@@ -92,7 +92,7 @@ const Marketplace = ({
       <div className="mt-[-14px] shrink-0 grow bg-background-default-subtle px-12 pb-2">
         {
           isLoading && page === 1 && (
-            <div className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2">
+            <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2">
               <Loading />
             </div>
           )
diff --git a/web/app/components/tools/mcp/create-card.tsx b/web/app/components/tools/mcp/create-card.tsx
index 6029c856a4..d96365b2db 100644
--- a/web/app/components/tools/mcp/create-card.tsx
+++ b/web/app/components/tools/mcp/create-card.tsx
@@ -41,13 +41,13 @@ const NewMCPCard = ({ handleCreate }: Props) => {
               <div className="flex h-10 w-10 items-center justify-center rounded-lg border border-dashed border-divider-deep group-hover:border-solid group-hover:border-state-accent-hover-alt group-hover:bg-state-accent-hover">
                 <RiAddCircleFill className="h-4 w-4 text-text-quaternary group-hover:text-text-accent" />
               </div>
-              <div className="system-md-semibold ml-3 text-text-secondary group-hover:text-text-accent">{t('mcp.create.cardTitle', { ns: 'tools' })}</div>
+              <div className="ml-3 system-md-semibold text-text-secondary group-hover:text-text-accent">{t('mcp.create.cardTitle', { ns: 'tools' })}</div>
             </div>
           </div>
           <div className="rounded-b-xl border-t-[0.5px] border-divider-subtle px-4 py-3 text-text-tertiary hover:text-text-accent">
             <a href={linkUrl} target="_blank" rel="noopener noreferrer" className="flex items-center space-x-1">
               <RiBookOpenLine className="h-3 w-3 shrink-0" />
-              <div className="system-xs-regular grow truncate" title={t('mcp.create.cardLink', { ns: 'tools' }) || ''}>{t('mcp.create.cardLink', { ns: 'tools' })}</div>
+              <div className="grow truncate system-xs-regular" title={t('mcp.create.cardLink', { ns: 'tools' }) || ''}>{t('mcp.create.cardLink', { ns: 'tools' })}</div>
               <RiArrowRightUpLine className="h-3 w-3 shrink-0" />
             </a>
           </div>
diff --git a/web/app/components/tools/mcp/sections/headers-section.tsx b/web/app/components/tools/mcp/sections/headers-section.tsx
index 052b05b207..8b46c8605d 100644
--- a/web/app/components/tools/mcp/sections/headers-section.tsx
+++ b/web/app/components/tools/mcp/sections/headers-section.tsx
@@ -22,7 +22,7 @@ const HeadersSection: FC<HeadersSectionProps> = ({
       <div className="mb-1 flex h-6 items-center">
         <span className="system-sm-medium text-text-secondary">{t('mcp.modal.headers', { ns: 'tools' })}</span>
       </div>
-      <div className="body-xs-regular mb-2 text-text-tertiary">{t('mcp.modal.headersTip', { ns: 'tools' })}</div>
+      <div className="mb-2 body-xs-regular text-text-tertiary">{t('mcp.modal.headersTip', { ns: 'tools' })}</div>
       <HeadersInput
         headersItems={headers}
         onChange={onHeadersChange}
diff --git a/web/app/components/tools/provider/custom-create-card.tsx b/web/app/components/tools/provider/custom-create-card.tsx
index 15554cc40a..f2154de18c 100644
--- a/web/app/components/tools/provider/custom-create-card.tsx
+++ b/web/app/components/tools/provider/custom-create-card.tsx
@@ -35,7 +35,7 @@ const Contribute = ({ onRefreshData }: Props) => {
               <div className="flex h-10 w-10 items-center justify-center rounded-lg border border-dashed border-divider-deep group-hover:border-solid group-hover:border-state-accent-hover-alt group-hover:bg-state-accent-hover">
                 <RiAddCircleFill className="h-4 w-4 text-text-quaternary group-hover:text-text-accent" />
               </div>
-              <div className="system-md-semibold ml-3 text-text-secondary group-hover:text-text-accent">{t('createCustomTool', { ns: 'tools' })}</div>
+              <div className="ml-3 system-md-semibold text-text-secondary group-hover:text-text-accent">{t('createCustomTool', { ns: 'tools' })}</div>
             </div>
           </div>
         </div>
diff --git a/web/app/components/workflow-app/components/workflow-onboarding-modal/start-node-option.tsx b/web/app/components/workflow-app/components/workflow-onboarding-modal/start-node-option.tsx
index 8b1ce699e7..07eb8ffe3c 100644
--- a/web/app/components/workflow-app/components/workflow-onboarding-modal/start-node-option.tsx
+++ b/web/app/components/workflow-app/components/workflow-onboarding-modal/start-node-option.tsx
@@ -30,7 +30,7 @@ const StartNodeOption: FC<StartNodeOptionProps> = ({
           <h3 className="text-text-primary">
             {title}
             {subtitle && (
-              <span className="text-text-quaternary system-md-regular">
+              <span className="system-md-regular text-text-quaternary">
                 {' '}
                 {subtitle}
               </span>
@@ -39,7 +39,7 @@ const StartNodeOption: FC<StartNodeOptionProps> = ({
         </div>
 
         <div className="h-12 leading-4">
-          <p className="text-text-tertiary system-xs-regular">
+          <p className="system-xs-regular text-text-tertiary">
             {description}
           </p>
         </div>
diff --git a/web/app/components/workflow/block-selector/blocks.tsx b/web/app/components/workflow/block-selector/blocks.tsx
index 97792afd92..7179a7c458 100644
--- a/web/app/components/workflow/block-selector/blocks.tsx
+++ b/web/app/components/workflow/block-selector/blocks.tsx
@@ -105,7 +105,7 @@ const Blocks = ({
                     className="mb-2"
                     type={block.metaData.type}
                   />
-                  <div className="system-md-medium mb-1 text-text-primary">{block.metaData.title}</div>
+                  <div className="mb-1 system-md-medium text-text-primary">{block.metaData.title}</div>
                   <div className="system-xs-regular text-text-tertiary">{block.metaData.description}</div>
                 </div>
               )}
diff --git a/web/app/components/workflow/block-selector/featured-tools.tsx b/web/app/components/workflow/block-selector/featured-tools.tsx
index b57298bcc8..68c6d63a52 100644
--- a/web/app/components/workflow/block-selector/featured-tools.tsx
+++ b/web/app/components/workflow/block-selector/featured-tools.tsx
@@ -126,7 +126,7 @@ const FeaturedTools = ({
   const showEmptyState = !isLoading && totalVisible === 0
 
   return (
-    <div className="px-3 pb-3 pt-2">
+    <div className="px-3 pt-2 pb-3">
       <button
         type="button"
         className="flex w-full items-center rounded-md px-0 py-1 text-left text-text-primary"
@@ -145,7 +145,7 @@ const FeaturedTools = ({
           )}
 
           {showEmptyState && (
-            <p className="system-xs-regular py-2 text-text-tertiary">
+            <p className="py-2 system-xs-regular text-text-tertiary">
               <Link className="text-text-accent" href={getMarketplaceUrl('', { category: 'tool' })} target="_blank" rel="noopener noreferrer">
                 {t('tabs.noFeaturedPlugins', { ns: 'workflow' })}
               </Link>
@@ -187,7 +187,7 @@ const FeaturedTools = ({
 
           {!isLoading && totalVisible > 0 && canToggleVisibility && (
             <div
-              className="group mt-1 flex cursor-pointer items-center gap-x-2 rounded-lg py-1 pl-3 pr-2 text-text-tertiary transition-colors hover:bg-state-base-hover hover:text-text-secondary"
+              className="group mt-1 flex cursor-pointer items-center gap-x-2 rounded-lg py-1 pr-2 pl-3 text-text-tertiary transition-colors hover:bg-state-base-hover hover:text-text-secondary"
               onClick={() => {
                 setVisibleCount((count) => {
                   if (count >= maxAvailable)
@@ -270,18 +270,18 @@ function FeaturedToolUninstalledItem({
         disabled={!description || isActionHovered || actionOpen || isInstallModalOpen}
       >
         <div
-          className="group flex h-8 w-full items-center rounded-lg pl-3 pr-1 hover:bg-state-base-hover"
+          className="group flex h-8 w-full items-center rounded-lg pr-1 pl-3 hover:bg-state-base-hover"
         >
           <div className="flex h-full min-w-0 items-center">
             <BlockIcon type={BlockEnum.Tool} toolIcon={plugin.icon} />
             <div className="ml-2 min-w-0">
-              <div className="system-sm-medium truncate text-text-secondary">{label}</div>
+              <div className="truncate system-sm-medium text-text-secondary">{label}</div>
             </div>
           </div>
           <div className="ml-auto flex h-full items-center gap-1 pl-1">
             <span className={`system-xs-regular text-text-tertiary ${actionOpen ? 'hidden' : 'group-hover:hidden'}`}>{installCountLabel}</span>
             <div
-              className={`system-xs-medium flex h-full items-center gap-1 text-components-button-secondary-accent-text [&_.action-btn]:h-6 [&_.action-btn]:min-h-0 [&_.action-btn]:w-6 [&_.action-btn]:rounded-lg [&_.action-btn]:p-0 ${actionOpen ? 'flex' : 'hidden group-hover:flex'}`}
+              className={`flex h-full items-center gap-1 system-xs-medium text-components-button-secondary-accent-text [&_.action-btn]:h-6 [&_.action-btn]:min-h-0 [&_.action-btn]:w-6 [&_.action-btn]:rounded-lg [&_.action-btn]:p-0 ${actionOpen ? '' : 'hidden group-hover:flex'}`}
               onMouseEnter={() => setIsActionHovered(true)}
               onMouseLeave={() => {
                 if (!actionOpen)
diff --git a/web/app/components/workflow/block-selector/featured-triggers.tsx b/web/app/components/workflow/block-selector/featured-triggers.tsx
index 38b74e5b11..c7c83410a6 100644
--- a/web/app/components/workflow/block-selector/featured-triggers.tsx
+++ b/web/app/components/workflow/block-selector/featured-triggers.tsx
@@ -121,7 +121,7 @@ const FeaturedTriggers = ({
   const showEmptyState = !isLoading && totalVisible === 0
 
   return (
-    <div className="px-3 pb-3 pt-2">
+    <div className="px-3 pt-2 pb-3">
       <button
         type="button"
         className="flex w-full items-center rounded-md px-0 py-1 text-left text-text-primary"
@@ -140,7 +140,7 @@ const FeaturedTriggers = ({
           )}
 
           {showEmptyState && (
-            <p className="system-xs-regular py-2 text-text-tertiary">
+            <p className="py-2 system-xs-regular text-text-tertiary">
               <Link className="text-text-accent" href={getMarketplaceUrl('', { category: 'trigger' })} target="_blank" rel="noopener noreferrer">
                 {t('tabs.noFeaturedTriggers', { ns: 'workflow' })}
               </Link>
@@ -182,7 +182,7 @@ const FeaturedTriggers = ({
 
           {!isLoading && totalVisible > 0 && canToggleVisibility && (
             <div
-              className="group mt-1 flex cursor-pointer items-center gap-x-2 rounded-lg py-1 pl-3 pr-2 text-text-tertiary transition-colors hover:bg-state-base-hover hover:text-text-secondary"
+              className="group mt-1 flex cursor-pointer items-center gap-x-2 rounded-lg py-1 pr-2 pl-3 text-text-tertiary transition-colors hover:bg-state-base-hover hover:text-text-secondary"
               onClick={() => {
                 setVisibleCount((count) => {
                   if (count >= maxAvailable)
@@ -265,18 +265,18 @@ function FeaturedTriggerUninstalledItem({
         disabled={!description || isActionHovered || actionOpen || isInstallModalOpen}
       >
         <div
-          className="group flex h-8 w-full items-center rounded-lg pl-3 pr-1 hover:bg-state-base-hover"
+          className="group flex h-8 w-full items-center rounded-lg pr-1 pl-3 hover:bg-state-base-hover"
         >
           <div className="flex h-full min-w-0 items-center">
             <BlockIcon type={BlockEnum.TriggerPlugin} toolIcon={plugin.icon} />
             <div className="ml-2 min-w-0">
-              <div className="system-sm-medium truncate text-text-secondary">{label}</div>
+              <div className="truncate system-sm-medium text-text-secondary">{label}</div>
             </div>
           </div>
           <div className="ml-auto flex h-full items-center gap-1 pl-1">
             <span className={`system-xs-regular text-text-tertiary ${actionOpen ? 'hidden' : 'group-hover:hidden'}`}>{installCountLabel}</span>
             <div
-              className={`system-xs-medium flex h-full items-center gap-1 text-components-button-secondary-accent-text [&_.action-btn]:h-6 [&_.action-btn]:min-h-0 [&_.action-btn]:w-6 [&_.action-btn]:rounded-lg [&_.action-btn]:p-0 ${actionOpen ? 'flex' : 'hidden group-hover:flex'}`}
+              className={`flex h-full items-center gap-1 system-xs-medium text-components-button-secondary-accent-text [&_.action-btn]:h-6 [&_.action-btn]:min-h-0 [&_.action-btn]:w-6 [&_.action-btn]:rounded-lg [&_.action-btn]:p-0 ${actionOpen ? '' : 'hidden group-hover:flex'}`}
               onMouseEnter={() => setIsActionHovered(true)}
               onMouseLeave={() => {
                 if (!actionOpen)
diff --git a/web/app/components/workflow/block-selector/rag-tool-recommendations/index.tsx b/web/app/components/workflow/block-selector/rag-tool-recommendations/index.tsx
index 77acd5b300..1176a0a388 100644
--- a/web/app/components/workflow/block-selector/rag-tool-recommendations/index.tsx
+++ b/web/app/components/workflow/block-selector/rag-tool-recommendations/index.tsx
@@ -80,7 +80,7 @@ const RAGToolRecommendations = ({
     <div className="flex flex-col p-1">
       <button
         type="button"
-        className="flex w-full items-center rounded-md px-3 pb-0.5 pt-1 text-left text-text-tertiary"
+        className="flex w-full items-center rounded-md px-3 pt-1 pb-0.5 text-left text-text-tertiary"
         onClick={() => setIsCollapsed(prev => !prev)}
       >
         <span className="system-xs-medium text-text-tertiary">{t('ragToolSuggestions.title', { ns: 'pipeline' })}</span>
@@ -95,7 +95,7 @@ const RAGToolRecommendations = ({
             </div>
           )}
           {!isFetchingRAGRecommendedPlugins && recommendedPlugins.length === 0 && unInstalledPlugins.length === 0 && (
-            <p className="system-xs-regular px-3 py-1 text-text-tertiary">
+            <p className="px-3 py-1 system-xs-regular text-text-tertiary">
               <Trans
                 i18nKey="ragToolSuggestions.noRecommendationPlugins"
                 ns="pipeline"
@@ -121,7 +121,7 @@ const RAGToolRecommendations = ({
                 viewType={viewType}
               />
               <div
-                className="flex cursor-pointer items-center gap-x-2 py-1 pl-3 pr-2"
+                className="flex cursor-pointer items-center gap-x-2 py-1 pr-2 pl-3"
                 onClick={loadMore}
               >
                 <div className="px-1">
diff --git a/web/app/components/workflow/block-selector/rag-tool-recommendations/uninstalled-item.tsx b/web/app/components/workflow/block-selector/rag-tool-recommendations/uninstalled-item.tsx
index 1badc2497c..768edc5ace 100644
--- a/web/app/components/workflow/block-selector/rag-tool-recommendations/uninstalled-item.tsx
+++ b/web/app/components/workflow/block-selector/rag-tool-recommendations/uninstalled-item.tsx
@@ -26,7 +26,7 @@ const UninstalledItem = ({
   }] = useBoolean(false)
 
   return (
-    <div className="flex h-8 items-center rounded-lg pl-3 pr-2 hover:bg-state-base-hover">
+    <div className="flex h-8 items-center rounded-lg pr-2 pl-3 hover:bg-state-base-hover">
       <BlockIcon
         className="shrink-0"
         type={BlockEnum.Tool}
@@ -34,7 +34,7 @@ const UninstalledItem = ({
       />
       <div className="ml-2 flex w-0 grow items-center">
         <div className="flex w-0 grow items-center gap-x-2">
-          <span className="system-sm-regular truncate text-text-primary">
+          <span className="truncate system-sm-regular text-text-primary">
             {getLocalizedText(payload.label)}
           </span>
           <span className="system-xs-regular text-text-quaternary">
@@ -42,7 +42,7 @@ const UninstalledItem = ({
           </span>
         </div>
         <div
-          className="system-xs-medium cursor-pointer pl-1.5 text-components-button-secondary-accent-text"
+          className="cursor-pointer pl-1.5 system-xs-medium text-components-button-secondary-accent-text"
           onClick={showInstallModal}
         >
           {t('installAction', { ns: 'plugin' })}
diff --git a/web/app/components/workflow/block-selector/start-blocks.tsx b/web/app/components/workflow/block-selector/start-blocks.tsx
index 69d8989a07..ef332844d5 100644
--- a/web/app/components/workflow/block-selector/start-blocks.tsx
+++ b/web/app/components/workflow/block-selector/start-blocks.tsx
@@ -80,7 +80,7 @@ const StartBlocks = ({
             className="mb-2"
             type={block.type}
           />
-          <div className="system-md-medium mb-1 text-text-primary">
+          <div className="mb-1 system-md-medium text-text-primary">
             {block.type === BlockEnumValues.TriggerWebhook
               ? t('customWebhook', { ns: 'workflow' })
               : t(`blocks.${block.type}`, { ns: 'workflow' })}
@@ -89,7 +89,7 @@ const StartBlocks = ({
             {t(`blocksAbout.${block.type}`, { ns: 'workflow' })}
           </div>
           {(block.type === BlockEnumValues.TriggerWebhook || block.type === BlockEnumValues.TriggerSchedule) && (
-            <div className="system-xs-regular mb-1 mt-1 text-text-tertiary">
+            <div className="mt-1 mb-1 system-xs-regular text-text-tertiary">
               {t('author', { ns: 'tools' })}
               {' '}
               {t('difyTeam', { ns: 'workflow' })}
@@ -109,7 +109,7 @@ const StartBlocks = ({
         <div className="flex w-0 grow items-center justify-between text-sm text-text-secondary">
           <span className="truncate">{t(`blocks.${block.type}`, { ns: 'workflow' })}</span>
           {block.type === BlockEnumValues.Start && (
-            <span className="system-xs-regular ml-2 shrink-0 text-text-quaternary">{t('blocks.originalStartNode', { ns: 'workflow' })}</span>
+            <span className="ml-2 shrink-0 system-xs-regular text-text-quaternary">{t('blocks.originalStartNode', { ns: 'workflow' })}</span>
           )}
         </div>
       </div>
diff --git a/web/app/components/workflow/comment/mention-input.tsx b/web/app/components/workflow/comment/mention-input.tsx
index b5d75d6734..287a1c2e55 100644
--- a/web/app/components/workflow/comment/mention-input.tsx
+++ b/web/app/components/workflow/comment/mention-input.tsx
@@ -511,7 +511,7 @@ const MentionInputInner = forwardRef<HTMLTextAreaElement, MentionInputProps>(({
         <div
           aria-hidden
           className={cn(
-            'inset-0 pointer-events-none absolute z-0 overflow-hidden p-1 leading-6 break-words whitespace-pre-wrap',
+            'pointer-events-none absolute inset-0 z-0 overflow-hidden p-1 leading-6 break-words whitespace-pre-wrap',
             'body-lg-regular text-text-primary',
           )}
           style={{ paddingRight, paddingBottom }}
diff --git a/web/app/components/workflow/comment/thread.tsx b/web/app/components/workflow/comment/thread.tsx
index a23ac4241d..d0ab65db15 100644
--- a/web/app/components/workflow/comment/thread.tsx
+++ b/web/app/components/workflow/comment/thread.tsx
@@ -730,7 +730,7 @@ export const CommentThread: FC<CommentThreadProps> = memo(({
           )}
         </div>
         {loading && (
-          <div className="inset-0 absolute z-30 flex items-center justify-center bg-components-panel-bg/70 text-sm text-text-tertiary">
+          <div className="absolute inset-0 z-30 flex items-center justify-center bg-components-panel-bg/70 text-sm text-text-tertiary">
             {t('comments.loading', { ns: 'workflow' })}
           </div>
         )}
diff --git a/web/app/components/workflow/header/editing-title.tsx b/web/app/components/workflow/header/editing-title.tsx
index 2f4797a98b..f547eb3fe1 100644
--- a/web/app/components/workflow/header/editing-title.tsx
+++ b/web/app/components/workflow/header/editing-title.tsx
@@ -14,7 +14,7 @@ const EditingTitle = () => {
   const maximizeCanvas = useStore(s => s.maximizeCanvas)
 
   return (
-    <div className={`system-xs-regular flex h-[18px] min-w-[300px] items-center whitespace-nowrap text-text-tertiary ${maximizeCanvas ? 'ml-2' : ''}`}>
+    <div className={`flex h-[18px] min-w-[300px] items-center system-xs-regular whitespace-nowrap text-text-tertiary ${maximizeCanvas ? 'ml-2' : ''}`}>
       {
         !!draftUpdatedAt && (
           <>
diff --git a/web/app/components/workflow/header/index.tsx b/web/app/components/workflow/header/index.tsx
index 5e6b714213..0cfb66b11c 100644
--- a/web/app/components/workflow/header/index.tsx
+++ b/web/app/components/workflow/header/index.tsx
@@ -38,7 +38,7 @@ const Header = ({
 
   return (
     <div
-      className="absolute left-0 top-7 z-10 flex h-0 w-full items-center justify-between bg-mask-top2bottom-gray-50-to-transparent px-3"
+      className="absolute top-7 left-0 z-10 flex h-0 w-full items-center justify-between bg-mask-top2bottom-gray-50-to-transparent px-3"
     >
       {(inWorkflowCanvas || isPipelineCanvas) && maximizeCanvas && <div className="h-14 w-[52px]" />}
       {
diff --git a/web/app/components/workflow/header/restoring-title.tsx b/web/app/components/workflow/header/restoring-title.tsx
index 53568469f4..36299b000d 100644
--- a/web/app/components/workflow/header/restoring-title.tsx
+++ b/web/app/components/workflow/header/restoring-title.tsx
@@ -25,11 +25,11 @@ const RestoringTitle = () => {
         <span className="system-sm-semibold text-text-primary">
           {versionName}
         </span>
-        <span className="system-2xs-medium-uppercase rounded-[5px] border border-text-accent-secondary bg-components-badge-bg-dimm px-1 py-0.5 text-text-accent-secondary">
+        <span className="rounded-[5px] border border-text-accent-secondary bg-components-badge-bg-dimm px-1 py-0.5 system-2xs-medium-uppercase text-text-accent-secondary">
           {t('common.viewOnly', { ns: 'workflow' })}
         </span>
       </div>
-      <div className="system-xs-regular flex h-4 items-center gap-x-1 text-text-tertiary">
+      <div className="flex h-4 items-center gap-x-1 system-xs-regular text-text-tertiary">
         {
           currentVersion && (
             <>
diff --git a/web/app/components/workflow/header/running-title.tsx b/web/app/components/workflow/header/running-title.tsx
index 590c6cd329..e3e2ebab75 100644
--- a/web/app/components/workflow/header/running-title.tsx
+++ b/web/app/components/workflow/header/running-title.tsx
@@ -15,7 +15,7 @@ const RunningTitle = () => {
       <ClockPlay className="mr-1 h-3 w-3 text-gray-500" />
       <span>{isChatMode ? `Test Chat${formatWorkflowRunIdentifier(historyWorkflowData?.finished_at)}` : `Test Run${formatWorkflowRunIdentifier(historyWorkflowData?.finished_at)}`}</span>
       <span className="mx-1">·</span>
-      <span className="ml-1 flex h-[18px] items-center rounded-[5px] border border-indigo-300 bg-white/48 px-1 text-[10px] font-semibold uppercase text-indigo-600">
+      <span className="ml-1 flex h-[18px] items-center rounded-[5px] border border-indigo-300 bg-white/48 px-1 text-[10px] font-semibold text-indigo-600 uppercase">
         {t('common.viewOnly', { ns: 'workflow' })}
       </span>
     </div>
diff --git a/web/app/components/workflow/header/test-run-menu-helpers.tsx b/web/app/components/workflow/header/test-run-menu-helpers.tsx
index dbe6b616a0..1c34761df6 100644
--- a/web/app/components/workflow/header/test-run-menu-helpers.tsx
+++ b/web/app/components/workflow/header/test-run-menu-helpers.tsx
@@ -29,7 +29,7 @@ export const OptionRow = ({
   return (
     <div
       key={option.id}
-      className="flex cursor-pointer items-center rounded-lg px-3 py-1.5 text-text-secondary system-md-regular hover:bg-state-base-hover"
+      className="flex cursor-pointer items-center rounded-lg px-3 py-1.5 system-md-regular text-text-secondary hover:bg-state-base-hover"
       onClick={() => onSelect(option)}
     >
       <div className="flex min-w-0 flex-1 items-center">
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx
index 45070acea8..00e4f165e4 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx
@@ -32,7 +32,7 @@ const BoolInput: FC<Props> = ({
         onCheck={handleChange}
         disabled={readonly}
       />
-      <div className="system-sm-medium flex items-center gap-1 text-text-secondary">
+      <div className="flex items-center gap-1 system-sm-medium text-text-secondary">
         {name}
         {!required && <span className="system-xs-regular text-text-tertiary">{t('panel.optional', { ns: 'workflow' })}</span>}
       </div>
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx
index c5ec7d72b8..f4472c63f1 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/panel-wrap.tsx
@@ -23,7 +23,7 @@ const PanelWrap: FC<Props> = ({
   return (
     <div className="absolute inset-0 z-10 rounded-2xl bg-background-overlay-alt">
       <div className="flex h-full flex-col rounded-2xl bg-components-panel-bg">
-        <div className="flex h-8 shrink-0 items-center justify-between pl-4 pr-3 pt-3">
+        <div className="flex h-8 shrink-0 items-center justify-between pt-3 pr-3 pl-4">
           <div className="truncate text-base font-semibold text-text-primary">
             {t(`${i18nPrefix}.testRun`, { ns: 'workflow' })}
             {' '}
@@ -35,7 +35,7 @@ const PanelWrap: FC<Props> = ({
               onHide()
             }}
           >
-            <RiCloseLine className="h-4 w-4 text-text-tertiary " />
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" />
           </div>
         </div>
         {children}
diff --git a/web/app/components/workflow/nodes/_base/components/collapse/field-collapse.tsx b/web/app/components/workflow/nodes/_base/components/collapse/field-collapse.tsx
index 777bd82035..16a9a1130d 100644
--- a/web/app/components/workflow/nodes/_base/components/collapse/field-collapse.tsx
+++ b/web/app/components/workflow/nodes/_base/components/collapse/field-collapse.tsx
@@ -19,7 +19,7 @@ const FieldCollapse = ({
     <div className="py-4">
       <Collapse
         trigger={
-          <div className="system-sm-semibold-uppercase flex h-6 cursor-pointer items-center text-text-secondary">{title}</div>
+          <div className="flex h-6 cursor-pointer items-center system-sm-semibold-uppercase text-text-secondary">{title}</div>
         }
         operations={operations}
         collapsed={collapsed}
diff --git a/web/app/components/workflow/nodes/_base/components/editor/text-editor.tsx b/web/app/components/workflow/nodes/_base/components/editor/text-editor.tsx
index 1cd18f2907..3de713c067 100644
--- a/web/app/components/workflow/nodes/_base/components/editor/text-editor.tsx
+++ b/web/app/components/workflow/nodes/_base/components/editor/text-editor.tsx
@@ -53,7 +53,7 @@ const TextEditor: FC<Props> = ({
           onChange={e => onChange(e.target.value)}
           onFocus={setIsFocus}
           onBlur={handleBlur}
-          className="h-full w-full resize-none border-none bg-transparent px-3 text-[13px] font-normal leading-[18px] text-gray-900 placeholder:text-gray-300 focus:outline-hidden"
+          className="h-full w-full resize-none border-none bg-transparent px-3 text-[13px] leading-[18px] font-normal text-gray-900 placeholder:text-gray-300 focus:outline-hidden"
           placeholder={placeholder}
           readOnly={readonly}
         />
diff --git a/web/app/components/workflow/nodes/_base/components/entry-node-container.tsx b/web/app/components/workflow/nodes/_base/components/entry-node-container.tsx
index 8124ea9197..668cea9459 100644
--- a/web/app/components/workflow/nodes/_base/components/entry-node-container.tsx
+++ b/web/app/components/workflow/nodes/_base/components/entry-node-container.tsx
@@ -26,9 +26,9 @@ const EntryNodeContainer: FC<EntryNodeContainerProps> = ({
   }, [customLabel, nodeType, t])
 
   return (
-    <div className="w-fit min-w-[242px] rounded-2xl bg-workflow-block-wrapper-bg-1 px-0 pb-0 pt-0.5">
+    <div className="w-fit min-w-[242px] rounded-2xl bg-workflow-block-wrapper-bg-1 px-0 pt-0.5 pb-0">
       <div className="mb-0.5 flex items-center px-2.5 pt-0.5">
-        <span className="text-2xs font-semibold uppercase text-text-tertiary">
+        <span className="text-2xs font-semibold text-text-tertiary uppercase">
           {label}
         </span>
       </div>
diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/default-value.tsx b/web/app/components/workflow/nodes/_base/components/error-handle/default-value.tsx
index 080fa0f107..a3be75d763 100644
--- a/web/app/components/workflow/nodes/_base/components/error-handle/default-value.tsx
+++ b/web/app/components/workflow/nodes/_base/components/error-handle/default-value.tsx
@@ -30,7 +30,7 @@ const DefaultValue = ({
 
   return (
     <div className="px-4 pt-2">
-      <div className="body-xs-regular mb-2 text-text-tertiary">
+      <div className="mb-2 body-xs-regular text-text-tertiary">
         {t('nodes.common.errorHandle.defaultValue.desc', { ns: 'workflow' })}
         &nbsp;
       </div>
@@ -43,7 +43,7 @@ const DefaultValue = ({
                 className="py-1"
               >
                 <div className="mb-1 flex items-center">
-                  <div className="system-sm-medium mr-1 text-text-primary">{form.key}</div>
+                  <div className="mr-1 system-sm-medium text-text-primary">{form.key}</div>
                   <div className="system-xs-regular text-text-tertiary">{form.type}</div>
                 </div>
                 {
diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-on-panel.tsx b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-on-panel.tsx
index f71df1039f..10a167c504 100644
--- a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-on-panel.tsx
+++ b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-on-panel.tsx
@@ -54,7 +54,7 @@ const ErrorHandle = ({
             collapseIcon => (
               <div className="flex grow items-center justify-between pr-4">
                 <div className="flex items-center">
-                  <div className="system-sm-semibold-uppercase mr-0.5 text-text-secondary">
+                  <div className="mr-0.5 system-sm-semibold-uppercase text-text-secondary">
                     {t('nodes.common.errorHandle.title', { ns: 'workflow' })}
                   </div>
                   <Tooltip popupContent={t('nodes.common.errorHandle.tip', { ns: 'workflow' })} />
diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip.tsx b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip.tsx
index 560d1e5d77..dda8ddfdc1 100644
--- a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip.tsx
+++ b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip.tsx
@@ -34,7 +34,7 @@ const ErrorHandleTip = ({
       >
       </div>
       <RiAlertFill className="mr-1 h-4 w-4 shrink-0 text-text-warning-secondary" />
-      <div className="system-xs-medium grow text-text-primary">
+      <div className="grow system-xs-medium text-text-primary">
         {text}
       </div>
     </div>
diff --git a/web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx b/web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx
index 19dfbcad1c..55b0a424a2 100644
--- a/web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx
+++ b/web/app/components/workflow/nodes/_base/components/file-upload-setting.tsx
@@ -150,7 +150,7 @@ const FileUploadSetting: FC<Props> = ({
           title={t('variableConfig.maxNumberOfUploads', { ns: 'appDebug' })!}
         >
           <div>
-            <div className="body-xs-regular mb-1.5 text-text-tertiary">
+            <div className="mb-1.5 body-xs-regular text-text-tertiary">
               {t('variableConfig.maxNumberTip', {
                 ns: 'appDebug',
                 imgLimit: formatFileSize(imgSizeLimit),
diff --git a/web/app/components/workflow/nodes/_base/components/info-panel.tsx b/web/app/components/workflow/nodes/_base/components/info-panel.tsx
index 71f5399fc7..a7b2efb7ca 100644
--- a/web/app/components/workflow/nodes/_base/components/info-panel.tsx
+++ b/web/app/components/workflow/nodes/_base/components/info-panel.tsx
@@ -14,7 +14,7 @@ const InfoPanel: FC<Props> = ({
   return (
     <div>
       <div className="flex flex-col gap-y-0.5 rounded-md bg-workflow-block-parma-bg px-[5px] py-[3px]">
-        <div className="system-2xs-semibold-uppercase uppercase text-text-secondary">
+        <div className="system-2xs-semibold-uppercase text-text-secondary uppercase">
           {title}
         </div>
         <div className="system-xs-regular wrap-break-word text-text-tertiary">
diff --git a/web/app/components/workflow/nodes/_base/components/mixed-variable-text-input/placeholder.tsx b/web/app/components/workflow/nodes/_base/components/mixed-variable-text-input/placeholder.tsx
index 9884e85657..4af622bb46 100644
--- a/web/app/components/workflow/nodes/_base/components/mixed-variable-text-input/placeholder.tsx
+++ b/web/app/components/workflow/nodes/_base/components/mixed-variable-text-input/placeholder.tsx
@@ -27,9 +27,9 @@ const Placeholder = () => {
     >
       <div className="flex grow items-center">
         {t('nodes.tool.insertPlaceholder1', { ns: 'workflow' })}
-        <div className="system-kbd mx-0.5 flex h-4 w-4 items-center justify-center rounded-sm bg-components-kbd-bg-gray text-text-placeholder">/</div>
+        <div className="mx-0.5 flex h-4 w-4 items-center justify-center rounded-sm bg-components-kbd-bg-gray system-kbd text-text-placeholder">/</div>
         <div
-          className="system-sm-regular cursor-pointer text-components-input-text-placeholder underline decoration-dotted decoration-auto underline-offset-auto hover:text-text-tertiary"
+          className="cursor-pointer system-sm-regular text-components-input-text-placeholder underline decoration-dotted decoration-auto underline-offset-auto hover:text-text-tertiary"
           onMouseDown={((e) => {
             e.preventDefault()
             e.stopPropagation()
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 db34c35c91..d393896bec 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
@@ -53,7 +53,7 @@ export const TitleInput = memo(({
       onChange={handleChange}
       onKeyDown={handleKeyDown}
       className={`
-        system-xl-semibold mr-2 h-7 min-w-0 grow appearance-none rounded-md border border-transparent bg-transparent px-1 text-text-primary
+        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' }) || ''}
@@ -83,8 +83,8 @@ export const DescriptionInput = memo(({
   return (
     <div
       className={`
-        leading-0 group flex max-h-[60px] overflow-y-auto rounded-lg bg-components-panel-bg
-        px-2 py-[5px]
+        group flex max-h-[60px] overflow-y-auto rounded-lg bg-components-panel-bg px-2
+        py-[5px] leading-0
         ${focus && 'shadow-xs!'}
       `}
     >
diff --git a/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx b/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx
index c5ff2ba98b..41be240bda 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx
@@ -57,7 +57,7 @@ const ConstantField: FC<Props> = ({
       {schema.type === FormTypeEnum.textNumber && (
         <input
           type="number"
-          className="h-8 w-full overflow-hidden rounded-lg bg-workflow-block-parma-bg p-2 text-[13px] font-normal leading-8 text-text-secondary placeholder:text-gray-400 focus:outline-hidden"
+          className="h-8 w-full overflow-hidden rounded-lg bg-workflow-block-parma-bg p-2 text-[13px] leading-8 font-normal text-text-secondary placeholder:text-gray-400 focus:outline-hidden"
           value={value}
           onChange={handleStaticChange}
           readOnly={readonly}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/manage-input-field.tsx b/web/app/components/workflow/nodes/_base/components/variable/manage-input-field.tsx
index aea578fcb4..349bb7bd57 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/manage-input-field.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/manage-input-field.tsx
@@ -18,7 +18,7 @@ const ManageInputField = ({
       >
         <RiAddLine className="mr-1 h-4 w-4 text-text-tertiary" />
         <div
-          className="system-xs-medium truncate text-text-tertiary"
+          className="truncate system-xs-medium text-text-tertiary"
           title="Create user input field"
         >
           {t('inputField.create', { ns: 'pipeline' })}
@@ -26,7 +26,7 @@ const ManageInputField = ({
       </div>
       <div className="mx-1 h-3 w-px shrink-0 bg-divider-regular"></div>
       <div
-        className="system-xs-medium flex h-8 shrink-0 cursor-pointer items-center justify-center px-3 text-text-tertiary"
+        className="flex h-8 shrink-0 cursor-pointer items-center justify-center px-3 system-xs-medium text-text-tertiary"
         onClick={onManage}
       >
         {t('inputField.manage', { ns: 'pipeline' })}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx
index 1ca54888b6..803164547d 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-full-path-panel.tsx
@@ -43,12 +43,12 @@ const VarFullPathPanel: FC<Props> = ({
   })()
   return (
     <div className="w-[280px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-0 shadow-lg backdrop-blur-[5px]">
-      <div className="flex space-x-1 border-b-[0.5px] border-divider-subtle p-3 pb-2 ">
+      <div className="flex space-x-1 border-b-[0.5px] border-divider-subtle p-3 pb-2">
         <BlockIcon size="xs" type={nodeType} />
-        <div className="system-xs-medium w-0 grow truncate text-text-secondary">{nodeName}</div>
+        <div className="w-0 grow truncate system-xs-medium text-text-secondary">{nodeName}</div>
       </div>
       <Panel
-        className="px-1 pb-3 pt-2"
+        className="px-1 pt-2 pb-3"
         root={{ attrName: path[0]! }}
         payload={schema}
         readonly
diff --git a/web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-node-label.tsx b/web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-node-label.tsx
index 35434141ca..64c7d75dda 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-node-label.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-node-label.tsx
@@ -22,14 +22,14 @@ const VariableNodeLabel = ({
       {
         nodeTitle && (
           <div
-            className="system-xs-medium max-w-[60px] truncate text-text-secondary"
+            className="max-w-[60px] truncate system-xs-medium text-text-secondary"
             title={nodeTitle}
           >
             {nodeTitle}
           </div>
         )
       }
-      <div className="system-xs-regular shrink-0 text-divider-deep">/</div>
+      <div className="shrink-0 system-xs-regular text-divider-deep">/</div>
     </>
   )
 }
diff --git a/web/app/components/workflow/nodes/_base/node-sections.tsx b/web/app/components/workflow/nodes/_base/node-sections.tsx
index ee97bf7ab1..891f17eb50 100644
--- a/web/app/components/workflow/nodes/_base/node-sections.tsx
+++ b/web/app/components/workflow/nodes/_base/node-sections.tsx
@@ -25,7 +25,7 @@ export const NodeHeaderMeta = ({
       {data.type === BlockEnum.Iteration && (data as IterationNodeType).is_parallel && (
         <Tooltip>
           <TooltipTrigger>
-            <div className="ml-1 flex items-center justify-center rounded-[5px] border border-text-warning px-[5px] py-[3px] text-text-warning system-2xs-medium-uppercase">
+            <div className="ml-1 flex items-center justify-center rounded-[5px] border border-text-warning px-[5px] py-[3px] system-2xs-medium-uppercase text-text-warning">
               {t('nodes.iteration.parallelModeUpper', { ns: 'workflow' })}
             </div>
           </TooltipTrigger>
@@ -73,7 +73,7 @@ export const NodeBody = ({
 }: NodeBodyProps) => {
   if (data.type === BlockEnum.Iteration || data.type === BlockEnum.Loop) {
     return (
-      <div className="grow pb-1 pl-1 pr-1">
+      <div className="grow pr-1 pb-1 pl-1">
         {child}
       </div>
     )
@@ -87,7 +87,7 @@ export const NodeDescription = ({ data }: { data: NodeProps['data'] }) => {
     return null
 
   return (
-    <div className="whitespace-pre-line wrap-break-word px-3 pb-2 pt-1 text-text-tertiary system-xs-regular">
+    <div className="px-3 pt-1 pb-2 system-xs-regular wrap-break-word whitespace-pre-line text-text-tertiary">
       {data.desc}
     </div>
   )
diff --git a/web/app/components/workflow/nodes/agent/components/model-bar.tsx b/web/app/components/workflow/nodes/agent/components/model-bar.tsx
index 88e6915088..8e2f19d726 100644
--- a/web/app/components/workflow/nodes/agent/components/model-bar.tsx
+++ b/web/app/components/workflow/nodes/agent/components/model-bar.tsx
@@ -50,7 +50,7 @@ export const ModelBar: FC<ModelBarProps> = (props) => {
             readonly
             deprecatedClassName="opacity-50"
           />
-          <Indicator color="red" className="absolute -right-0.5 -top-0.5" />
+          <Indicator color="red" className="absolute -top-0.5 -right-0.5" />
         </div>
       </Tooltip>
     )
@@ -74,7 +74,7 @@ export const ModelBar: FC<ModelBarProps> = (props) => {
           readonly
           deprecatedClassName="opacity-50"
         />
-        {showWarn && <Indicator color="red" className="absolute -right-0.5 -top-0.5" />}
+        {showWarn && <Indicator color="red" className="absolute -top-0.5 -right-0.5" />}
       </div>
     </Tooltip>
   )
diff --git a/web/app/components/workflow/nodes/answer/panel.tsx b/web/app/components/workflow/nodes/answer/panel.tsx
index bbab003a05..8fb9e1815d 100644
--- a/web/app/components/workflow/nodes/answer/panel.tsx
+++ b/web/app/components/workflow/nodes/answer/panel.tsx
@@ -30,7 +30,7 @@ const Panel: FC<NodePanelProps<AnswerNodeType>> = ({
   })
 
   return (
-    <div className="mb-2 mt-2 space-y-4 px-4">
+    <div className="mt-2 mb-2 space-y-4 px-4">
       <Editor
         readOnly={readOnly}
         justVar
diff --git a/web/app/components/workflow/nodes/assigner/node.tsx b/web/app/components/workflow/nodes/assigner/node.tsx
index e31daac138..873030d37a 100644
--- a/web/app/components/workflow/nodes/assigner/node.tsx
+++ b/web/app/components/workflow/nodes/assigner/node.tsx
@@ -30,7 +30,7 @@ const NodeComponent: FC<NodeProps<AssignerNodeType>> = ({
         <div className="relative flex flex-col items-start gap-0.5 self-stretch px-3 py-1">
           <div className="flex flex-col items-start gap-1 self-stretch">
             <div className="flex items-center gap-1 self-stretch rounded-md bg-workflow-block-parma-bg px-[5px] py-1">
-              <div className="system-xs-medium flex-1 text-text-tertiary">{t(`${i18nPrefix}.varNotSet`, { ns: 'workflow' })}</div>
+              <div className="flex-1 system-xs-medium text-text-tertiary">{t(`${i18nPrefix}.varNotSet`, { ns: 'workflow' })}</div>
             </div>
           </div>
         </div>
diff --git a/web/app/components/workflow/nodes/assigner/panel.tsx b/web/app/components/workflow/nodes/assigner/panel.tsx
index d3a2e6bc78..ef32f6a6ac 100644
--- a/web/app/components/workflow/nodes/assigner/panel.tsx
+++ b/web/app/components/workflow/nodes/assigner/panel.tsx
@@ -40,7 +40,7 @@ const Panel: FC<NodePanelProps<AssignerNodeType>> = ({
     <div className="flex flex-col items-start self-stretch py-2">
       <div className="flex w-full flex-col items-start justify-center gap-1 self-stretch px-4 py-2">
         <div className="flex items-start gap-2 self-stretch">
-          <div className="system-sm-semibold-uppercase flex grow flex-col items-start justify-center text-text-secondary">{t(`${i18nPrefix}.variables`, { ns: 'workflow' })}</div>
+          <div className="flex grow flex-col items-start justify-center system-sm-semibold-uppercase text-text-secondary">{t(`${i18nPrefix}.variables`, { ns: 'workflow' })}</div>
           <ActionButton onClick={handleAddOperation}>
             <RiAddLine className="h-4 w-4 shrink-0 text-text-tertiary" />
           </ActionButton>
diff --git a/web/app/components/workflow/nodes/code/dependency-picker.tsx b/web/app/components/workflow/nodes/code/dependency-picker.tsx
index a0da2ccc5b..feed5234a7 100644
--- a/web/app/components/workflow/nodes/code/dependency-picker.tsx
+++ b/web/app/components/workflow/nodes/code/dependency-picker.tsx
@@ -73,7 +73,7 @@ const DependencyPicker: FC<Props> = ({
             }).map(dependency => (
               <div
                 key={dependency.name}
-                className="flex h-[30px] cursor-pointer items-center justify-between rounded-lg pl-3 pr-2 text-[13px] text-gray-900 hover:bg-gray-100"
+                className="flex h-[30px] cursor-pointer items-center justify-between rounded-lg pr-2 pl-3 text-[13px] text-gray-900 hover:bg-gray-100"
                 onClick={handleChange(dependency)}
               >
                 <div className="w-0 grow truncate">{dependency.name}</div>
diff --git a/web/app/components/workflow/nodes/data-source/node.tsx b/web/app/components/workflow/nodes/data-source/node.tsx
index 5bc1dcc798..81ad58ee7d 100644
--- a/web/app/components/workflow/nodes/data-source/node.tsx
+++ b/web/app/components/workflow/nodes/data-source/node.tsx
@@ -23,7 +23,7 @@ const Node: FC<NodeProps<DataSourceNodeType>> = ({
 
   return (
     <div className="relative mb-1 px-3 py-1">
-      <div className="pointer-events-auto absolute right-3 top-[-32px] z-40">
+      <div className="pointer-events-auto absolute top-[-32px] right-3 z-40">
         <InstallPluginButton
           size="small"
           extraIdentifiers={[
diff --git a/web/app/components/workflow/nodes/document-extractor/node.tsx b/web/app/components/workflow/nodes/document-extractor/node.tsx
index 68b6acbab0..d19ebbea98 100644
--- a/web/app/components/workflow/nodes/document-extractor/node.tsx
+++ b/web/app/components/workflow/nodes/document-extractor/node.tsx
@@ -27,7 +27,7 @@ const NodeComponent: FC<NodeProps<DocExtractorNodeType>> = ({
   const node = isSystem ? nodes.find(node => node.data.type === BlockEnum.Start) : nodes.find(node => node.id === variable[0])
   return (
     <div className="relative mb-1 px-3 py-1">
-      <div className="system-2xs-medium-uppercase mb-1 text-text-tertiary">{t(`${i18nPrefix}.inputVar`, { ns: 'workflow' })}</div>
+      <div className="mb-1 system-2xs-medium-uppercase text-text-tertiary">{t(`${i18nPrefix}.inputVar`, { ns: 'workflow' })}</div>
       <VariableLabelInNode
         variables={variable}
         nodeType={node?.data.type}
diff --git a/web/app/components/workflow/nodes/document-extractor/panel.tsx b/web/app/components/workflow/nodes/document-extractor/panel.tsx
index 8504cdf6e5..22421fd885 100644
--- a/web/app/components/workflow/nodes/document-extractor/panel.tsx
+++ b/web/app/components/workflow/nodes/document-extractor/panel.tsx
@@ -64,7 +64,7 @@ const Panel: FC<NodePanelProps<DocExtractorNodeType>> = ({
               filterVar={filterVar}
               typePlaceHolder="File | Array[File]"
             />
-            <div className="body-xs-regular mt-1 py-0.5 text-text-tertiary">
+            <div className="mt-1 py-0.5 body-xs-regular text-text-tertiary">
               {t(`${i18nPrefix}.supportFileTypes`, { ns: 'workflow', types: supportTypesShowNames })}
               <a className="text-text-accent" href={link} target="_blank">{t(`${i18nPrefix}.learnMore`, { ns: 'workflow' })}</a>
             </div>
diff --git a/web/app/components/workflow/nodes/http/components/key-value/bulk-edit/index.tsx b/web/app/components/workflow/nodes/http/components/key-value/bulk-edit/index.tsx
index 8c0015a74b..70edac3ba9 100644
--- a/web/app/components/workflow/nodes/http/components/key-value/bulk-edit/index.tsx
+++ b/web/app/components/workflow/nodes/http/components/key-value/bulk-edit/index.tsx
@@ -50,9 +50,9 @@ const BulkEdit: FC<Props> = ({
               onClick={handleSwitchToKeyValueEdit}
             >
               <LayoutGrid02 className="h-3 w-3 text-gray-500" />
-              <div className="text-xs font-normal leading-[18px] text-gray-500">{t(`${i18nPrefix}.keyValueEdit`, { ns: 'workflow' })}</div>
+              <div className="text-xs leading-[18px] font-normal text-gray-500">{t(`${i18nPrefix}.keyValueEdit`, { ns: 'workflow' })}</div>
             </div>
-            <div className="ml-3 mr-1.5 h-3 w-px bg-gray-200"></div>
+            <div className="mr-1.5 ml-3 h-3 w-px bg-gray-200"></div>
           </div>
         )}
         minHeight={150}
diff --git a/web/app/components/workflow/nodes/http/node.tsx b/web/app/components/workflow/nodes/http/node.tsx
index e40d6e2b6a..97c88da18d 100644
--- a/web/app/components/workflow/nodes/http/node.tsx
+++ b/web/app/components/workflow/nodes/http/node.tsx
@@ -15,8 +15,8 @@ const Node: FC<NodeProps<HttpNodeType>> = ({
   return (
     <div className="mb-1 px-3 py-1">
       <div className="flex items-center justify-start rounded-md bg-workflow-block-parma-bg p-1">
-        <div className="flex h-4 shrink-0 items-center rounded-sm bg-components-badge-white-to-dark px-1 text-xs font-semibold uppercase text-text-secondary">{method}</div>
-        <div className="w-0 grow pl-1 pt-1">
+        <div className="flex h-4 shrink-0 items-center rounded-sm bg-components-badge-white-to-dark px-1 text-xs font-semibold text-text-secondary uppercase">{method}</div>
+        <div className="w-0 grow pt-1 pl-1">
           <ReadonlyInputWithSelectVar
             className="text-text-secondary"
             value={url}
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-files-list-value.tsx b/web/app/components/workflow/nodes/if-else/components/condition-files-list-value.tsx
index e803b31f7c..68bd9cd170 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-files-list-value.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-files-list-value.tsx
@@ -71,7 +71,7 @@ const ConditionValue = ({
 
   return (
     <div className="rounded-md bg-workflow-block-parma-bg">
-      <div className="flex h-6 items-center px-1 ">
+      <div className="flex h-6 items-center px-1">
         <VariableLabelInNode
           className="w-0 grow"
           variables={variableSelector}
@@ -96,7 +96,7 @@ const ConditionValue = ({
                 <div className="system-xs-medium text-text-accent">{c.key}</div>
                 <div className="system-xs-medium text-text-primary">{comparisonOperatorName}</div>
                 {c.comparison_operator && !isEmptyRelatedOperator(c.comparison_operator) && <div className="system-xs-regular text-text-secondary">{isSelect(c) ? selectName(c) : formatValue(c)}</div>}
-                {index !== sub_variable_condition.conditions.length - 1 && (<div className="absolute bottom-[-10px] right-1 z-10 text-[10px] font-medium uppercase leading-4 text-text-accent">{t(`nodes.ifElse.${sub_variable_condition.logical_operator}`, { ns: 'workflow' })}</div>)}
+                {index !== sub_variable_condition.conditions.length - 1 && (<div className="absolute right-1 bottom-[-10px] z-10 text-[10px] leading-4 font-medium text-text-accent uppercase">{t(`nodes.ifElse.${sub_variable_condition.logical_operator}`, { ns: 'workflow' })}</div>)}
               </div>
             )
           })
diff --git a/web/app/components/workflow/nodes/if-else/node.tsx b/web/app/components/workflow/nodes/if-else/node.tsx
index 5199f6705a..c6505004a6 100644
--- a/web/app/components/workflow/nodes/if-else/node.tsx
+++ b/web/app/components/workflow/nodes/if-else/node.tsx
@@ -82,7 +82,7 @@ const IfElseNode: FC<NodeProps<IfElseNodeType>> = (props) => {
                       : conditionNotSet
                   }
                   {i !== caseItem.conditions.length - 1 && (
-                    <div className="absolute bottom-[-10px] right-1 z-10 text-[10px] font-medium uppercase leading-4 text-text-accent">{t(`${i18nPrefix}.${caseItem.logical_operator}`, { ns: 'workflow' })}</div>
+                    <div className="absolute right-1 bottom-[-10px] z-10 text-[10px] leading-4 font-medium text-text-accent uppercase">{t(`${i18nPrefix}.${caseItem.logical_operator}`, { ns: 'workflow' })}</div>
                   )}
                 </div>
               ))}
diff --git a/web/app/components/workflow/nodes/iteration-start/index.tsx b/web/app/components/workflow/nodes/iteration-start/index.tsx
index 1cfa095bbc..90a57bef26 100644
--- a/web/app/components/workflow/nodes/iteration-start/index.tsx
+++ b/web/app/components/workflow/nodes/iteration-start/index.tsx
@@ -29,7 +29,7 @@ export const IterationStartNodeDumb = () => {
   const { t } = useTranslation()
 
   return (
-    <div className="nodrag relative left-[17px] top-[21px] z-11 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg">
+    <div className="nodrag relative top-[21px] left-[17px] z-11 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg">
       <Tooltip popupContent={t('blocks.iteration-start', { ns: 'workflow' })} asChild={false}>
         <div className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500">
           <RiHome5Fill className="h-3 w-3 text-text-primary-on-surface" />
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/index.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/index.tsx
index 07abcedb19..e316f941ea 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/index.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/index.tsx
@@ -62,7 +62,7 @@ const RetrievalSetting = ({
       fieldTitleProps={{
         title: t('form.retrievalSetting.title', { ns: 'datasetSettings' }),
         subTitle: (
-          <div className="body-xs-regular flex items-center text-text-tertiary">
+          <div className="flex items-center body-xs-regular text-text-tertiary">
             <a target="_blank" rel="noopener noreferrer" href={docLink('/use-dify/knowledge/create-knowledge/setting-indexing-methods')} className="text-text-accent">{t('form.retrievalSetting.learnMore', { ns: 'datasetSettings' })}</a>
             &nbsp;
             {t('nodes.knowledgeBase.aboutRetrieval', { ns: 'workflow' })}
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx
index 4262871e7a..90e9caae9d 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx
@@ -78,10 +78,10 @@ const DatasetItem: FC<Props> = ({
           background={iconInfo.icon_type === 'image' ? undefined : iconInfo.icon_background}
           imageUrl={iconInfo.icon_type === 'image' ? iconInfo.icon_url : undefined}
         />
-        <div className="system-sm-medium w-0 grow truncate text-text-secondary">{payload.name}</div>
+        <div className="w-0 grow truncate system-sm-medium text-text-secondary">{payload.name}</div>
       </div>
       {!readonly && (
-        <div className="ml-2 hidden shrink-0 items-center  space-x-1 group-hover/dataset-item:flex">
+        <div className="ml-2 hidden shrink-0 items-center space-x-1 group-hover/dataset-item:flex">
           {
             editable && (
               <ActionButton
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-list.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-list.tsx
index f4e16e9f97..9c1dd854ba 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-list.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-list.tsx
@@ -71,7 +71,7 @@ const DatasetList: FC<Props> = ({
             )
           })
         : (
-            <div className="cursor-default select-none rounded-lg bg-background-section p-3 text-center text-xs text-text-tertiary">
+            <div className="cursor-default rounded-lg bg-background-section p-3 text-center text-xs text-text-tertiary select-none">
               {t('datasetConfig.knowledgeTip', { ns: 'appDebug' })}
             </div>
           )}
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx
index 0a67152182..dd0858942d 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx
@@ -51,7 +51,7 @@ const ConditionCommonVariableSelector = ({
         <div className="flex h-6 grow cursor-pointer items-center">
           {
             selected && (
-              <div className="system-xs-medium inline-flex h-6 items-center rounded-md border-[0.5px] border-components-panel-border-subtle bg-components-badge-white-to-dark pl-[5px] pr-1.5 text-text-secondary shadow-xs">
+              <div className="inline-flex h-6 items-center rounded-md border-[0.5px] border-components-panel-border-subtle bg-components-badge-white-to-dark pr-1.5 pl-[5px] system-xs-medium text-text-secondary shadow-xs">
                 <Variable02 className="mr-1 h-3.5 w-3.5 text-text-accent" />
                 {selected.value}
               </div>
@@ -60,11 +60,11 @@ const ConditionCommonVariableSelector = ({
           {
             !selected && (
               <>
-                <div className="system-sm-regular flex grow items-center text-components-input-text-placeholder">
+                <div className="flex grow items-center system-sm-regular text-components-input-text-placeholder">
                   <Variable02 className="mr-1 h-4 w-4" />
                   {t('nodes.knowledgeRetrieval.metadata.panel.select', { ns: 'workflow' })}
                 </div>
-                <div className="system-2xs-medium flex h-5 shrink-0 items-center rounded-[5px] border border-divider-deep px-[5px] text-text-tertiary">
+                <div className="flex h-5 shrink-0 items-center rounded-[5px] border border-divider-deep px-[5px] system-2xs-medium text-text-tertiary">
                   {varType}
                 </div>
               </>
@@ -78,7 +78,7 @@ const ConditionCommonVariableSelector = ({
             variables.map(v => (
               <div
                 key={v.value}
-                className="system-xs-medium flex h-6 cursor-pointer items-center rounded-md px-2 text-text-secondary hover:bg-state-base-hover"
+                className="flex h-6 cursor-pointer items-center rounded-md px-2 system-xs-medium text-text-secondary hover:bg-state-base-hover"
                 onClick={() => handleChange(v.value)}
               >
                 <Variable02 className="mr-1 h-4 w-4 text-text-accent" />
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx
index 5fec9ad5b6..8505fe76f9 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx
@@ -40,12 +40,12 @@ const ConditionNumber = ({
   }, [onChange])
 
   return (
-    <div className="flex h-8 items-center pl-1 pr-2">
+    <div className="flex h-8 items-center pr-2 pl-1">
       <ConditionValueMethod
         valueMethod={valueMethod}
         onValueMethodChange={onValueMethodChange}
       />
-      <div className="ml-1 mr-1.5 h-4 w-px bg-divider-regular"></div>
+      <div className="mr-1.5 ml-1 h-4 w-px bg-divider-regular"></div>
       {
         valueMethod === 'variable' && !isCommonVariable && (
           <ConditionVariableSelector
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx
index b8085e9160..1a0a3e3067 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx
@@ -40,12 +40,12 @@ const ConditionString = ({
   }, [onChange])
 
   return (
-    <div className="flex h-8 items-center pl-1 pr-2">
+    <div className="flex h-8 items-center pr-2 pl-1">
       <ConditionValueMethod
         valueMethod={valueMethod}
         onValueMethodChange={onValueMethodChange}
       />
-      <div className="ml-1 mr-1.5 h-4 w-px bg-divider-regular"></div>
+      <div className="mr-1.5 ml-1 h-4 w-px bg-divider-regular"></div>
       {
         valueMethod === 'variable' && !isCommonVariable && (
           <ConditionVariableSelector
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx
index 339ffa6aec..15f5ec9377 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx
@@ -64,11 +64,11 @@ const ConditionVariableSelector = ({
           {
             !valueSelector.length && (
               <>
-                <div className="system-sm-regular flex grow items-center text-components-input-text-placeholder">
+                <div className="flex grow items-center system-sm-regular text-components-input-text-placeholder">
                   <Variable02 className="mr-1 h-4 w-4" />
                   {t('nodes.knowledgeRetrieval.metadata.panel.select', { ns: 'workflow' })}
                 </div>
-                <div className="system-2xs-medium flex h-5 shrink-0 items-center rounded-[5px] border border-divider-deep px-[5px] text-text-tertiary">
+                <div className="flex h-5 shrink-0 items-center rounded-[5px] border border-divider-deep px-[5px] system-2xs-medium text-text-tertiary">
                   {varType}
                 </div>
               </>
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx
index 56da85ca73..2f5baeb089 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx
@@ -43,7 +43,7 @@ const MetadataFilter = ({
       trigger={collapseIcon => (
         <div className="flex grow items-center justify-between pr-4">
           <div className="flex items-center">
-            <div className="system-sm-semibold-uppercase mr-0.5 text-text-secondary">
+            <div className="mr-0.5 system-sm-semibold-uppercase text-text-secondary">
               {t('nodes.knowledgeRetrieval.metadata.title', { ns: 'workflow' })}
             </div>
             <Tooltip
@@ -75,7 +75,7 @@ const MetadataFilter = ({
         {
           metadataFilterMode === MetadataFilteringModeEnum.automatic && (
             <>
-              <div className="body-xs-regular px-4 text-text-tertiary">
+              <div className="px-4 body-xs-regular text-text-tertiary">
                 {t('nodes.knowledgeRetrieval.metadata.options.automatic.desc', { ns: 'workflow' })}
               </div>
               <div className="mt-1 px-4">
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-panel.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-panel.tsx
index 484cf3595f..3c92333bd4 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-panel.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-panel.tsx
@@ -23,7 +23,7 @@ const MetadataPanel = ({
           {t('nodes.knowledgeRetrieval.metadata.panel.title', { ns: 'workflow' })}
         </div>
         <div
-          className="absolute bottom-0 right-2.5 flex h-8 w-8 cursor-pointer items-center justify-center"
+          className="absolute right-2.5 bottom-0 flex h-8 w-8 cursor-pointer items-center justify-center"
           onClick={onCancel}
         >
           <RiCloseLine className="h-4 w-4 text-text-tertiary" />
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/node.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/node.tsx
index 3fafdd018e..82fee22eee 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/node.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/node.tsx
@@ -50,7 +50,7 @@ const Node: FC<NodeProps<KnowledgeRetrievalNodeType>> = ({
                 imageUrl={iconInfo.icon_type === 'image' ? iconInfo.icon_url : undefined}
                 className="shrink-0"
               />
-              <div className="system-xs-regular w-0 grow truncate text-text-secondary">
+              <div className="w-0 grow truncate system-xs-regular text-text-secondary">
                 {name}
               </div>
             </div>
diff --git a/web/app/components/workflow/nodes/list-operator/node.tsx b/web/app/components/workflow/nodes/list-operator/node.tsx
index 9f4b69a170..d31bae9dc3 100644
--- a/web/app/components/workflow/nodes/list-operator/node.tsx
+++ b/web/app/components/workflow/nodes/list-operator/node.tsx
@@ -27,7 +27,7 @@ const NodeComponent: FC<NodeProps<ListFilterNodeType>> = ({
   const node = isSystem ? nodes.find(node => node.data.type === BlockEnum.Start) : nodes.find(node => node.id === variable[0])
   return (
     <div className="relative px-3">
-      <div className="system-2xs-medium-uppercase mb-1 text-text-tertiary">{t(`${i18nPrefix}.inputVar`, { ns: 'workflow' })}</div>
+      <div className="mb-1 system-2xs-medium-uppercase text-text-tertiary">{t(`${i18nPrefix}.inputVar`, { ns: 'workflow' })}</div>
       <VariableLabelInNode
         variables={variable}
         nodeType={node?.data.type}
diff --git a/web/app/components/workflow/nodes/llm/components/config-prompt-item.tsx b/web/app/components/workflow/nodes/llm/components/config-prompt-item.tsx
index f8916d3785..ddc15b5fdb 100644
--- a/web/app/components/workflow/nodes/llm/components/config-prompt-item.tsx
+++ b/web/app/components/workflow/nodes/llm/components/config-prompt-item.tsx
@@ -104,7 +104,7 @@ const ConfigPromptItem: FC<Props> = ({
         <div className="relative left-1 flex items-center">
           {payload.role === PromptRole.system
             ? (
-                <div className="relative left-[-4px] text-xs font-semibold uppercase text-text-secondary">
+                <div className="relative left-[-4px] text-xs font-semibold text-text-secondary uppercase">
                   SYSTEM
                 </div>
               )
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/card.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/card.tsx
index 24ab7c39de..174138e987 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/card.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/card.tsx
@@ -19,16 +19,16 @@ const Card: FC<CardProps> = ({
 
   return (
     <div className="flex flex-col py-0.5">
-      <div className="flex h-6 items-center gap-x-1 pl-1 pr-0.5">
-        <div className="system-sm-semibold truncate border border-transparent px-1 py-px text-text-primary">
+      <div className="flex h-6 items-center gap-x-1 pr-0.5 pl-1">
+        <div className="truncate border border-transparent px-1 py-px system-sm-semibold text-text-primary">
           {name}
         </div>
-        <div className="system-xs-medium px-1 py-0.5 text-text-tertiary">
+        <div className="px-1 py-0.5 system-xs-medium text-text-tertiary">
           {type}
         </div>
         {
           required && (
-            <div className="system-2xs-medium-uppercase px-1 py-0.5 text-text-warning">
+            <div className="px-1 py-0.5 system-2xs-medium-uppercase text-text-warning">
               {t('nodes.llm.jsonSchema.required', { ns: 'workflow' })}
             </div>
           )
@@ -36,7 +36,7 @@ const Card: FC<CardProps> = ({
       </div>
 
       {description && (
-        <div className="system-xs-regular truncate px-2 pb-1 text-text-tertiary">
+        <div className="truncate px-2 pb-1 system-xs-regular text-text-tertiary">
           {description}
         </div>
       )}
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/advanced-options.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/advanced-options.tsx
index 6380d7eb6b..171001c688 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/advanced-options.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/advanced-options.tsx
@@ -47,7 +47,7 @@ const AdvancedOptions: FC<AdvancedOptionsProps> = ({
           </div>
         </div>
         <div className="flex flex-col">
-          <div className="system-xs-medium flex h-6 items-center text-text-secondary">
+          <div className="flex h-6 items-center system-xs-medium text-text-secondary">
             Enum
           </div>
           <Textarea
diff --git a/web/app/components/workflow/nodes/llm/components/resolution-picker.tsx b/web/app/components/workflow/nodes/llm/components/resolution-picker.tsx
index 4e350817fa..8a1d06deb5 100644
--- a/web/app/components/workflow/nodes/llm/components/resolution-picker.tsx
+++ b/web/app/components/workflow/nodes/llm/components/resolution-picker.tsx
@@ -26,7 +26,7 @@ const ResolutionPicker: FC<Props> = ({
   }, [onChange])
   return (
     <div className="flex items-center justify-between">
-      <div className="mr-2 text-xs font-medium uppercase text-text-secondary">{t(`${i18nPrefix}.resolution.name`, { ns: 'workflow' })}</div>
+      <div className="mr-2 text-xs font-medium text-text-secondary uppercase">{t(`${i18nPrefix}.resolution.name`, { ns: 'workflow' })}</div>
       <div className="flex items-center space-x-1">
         <OptionCard
           title={t(`${i18nPrefix}.resolution.high`, { ns: 'workflow' })}
diff --git a/web/app/components/workflow/nodes/loop-start/index.tsx b/web/app/components/workflow/nodes/loop-start/index.tsx
index c439516b47..a7bd18c7a5 100644
--- a/web/app/components/workflow/nodes/loop-start/index.tsx
+++ b/web/app/components/workflow/nodes/loop-start/index.tsx
@@ -29,7 +29,7 @@ export const LoopStartNodeDumb = () => {
   const { t } = useTranslation()
 
   return (
-    <div className="nodrag relative left-[17px] top-[21px] z-11 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg">
+    <div className="nodrag relative top-[21px] left-[17px] z-11 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg">
       <Tooltip popupContent={t('blocks.loop-start', { ns: 'workflow' })} asChild={false}>
         <div className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500">
           <RiHome5Fill className="h-3 w-3 text-text-primary-on-surface" />
diff --git a/web/app/components/workflow/nodes/loop/components/condition-files-list-value.tsx b/web/app/components/workflow/nodes/loop/components/condition-files-list-value.tsx
index 63269a85bf..65ef0218f9 100644
--- a/web/app/components/workflow/nodes/loop/components/condition-files-list-value.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-files-list-value.tsx
@@ -73,7 +73,7 @@ const ConditionValue = ({
 
   return (
     <div className="rounded-md bg-workflow-block-parma-bg">
-      <div className="flex h-6 items-center px-1 ">
+      <div className="flex h-6 items-center px-1">
         <VariableLabelInNode
           className="w-0 grow"
           variables={variableSelector}
@@ -93,7 +93,7 @@ const ConditionValue = ({
               <div className="system-xs-medium text-text-accent">{c.key}</div>
               <div className="system-xs-medium text-text-primary">{isComparisonOperatorNeedTranslate(c.comparison_operator) ? t(`nodes.ifElse.comparisonOperator.${c.comparison_operator}`, { ns: 'workflow' }) : c.comparison_operator}</div>
               {c.comparison_operator && !isEmptyRelatedOperator(c.comparison_operator) && <div className="system-xs-regular text-text-secondary">{isSelect(c) ? selectName(c) : formatValue(c)}</div>}
-              {index !== sub_variable_condition.conditions.length - 1 && (<div className="absolute bottom-[-10px] right-1 z-10 text-[10px] font-medium uppercase leading-4 text-text-accent">{t(`${i18nPrefix}.${sub_variable_condition.logical_operator}`, { ns: 'workflow' })}</div>)}
+              {index !== sub_variable_condition.conditions.length - 1 && (<div className="absolute right-1 bottom-[-10px] z-10 text-[10px] leading-4 font-medium text-text-accent uppercase">{t(`${i18nPrefix}.${sub_variable_condition.logical_operator}`, { ns: 'workflow' })}</div>)}
             </div>
           ))
         }
diff --git a/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/item.tsx b/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/item.tsx
index 859be28614..cc254d324e 100644
--- a/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/item.tsx
+++ b/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/item.tsx
@@ -30,15 +30,15 @@ const Item: FC<Props> = ({
         <div className="flex items-center">
           <Variable02 className="h-3.5 w-3.5 text-text-accent-secondary" />
           <div className="ml-1 text-[13px] font-medium text-text-primary">{payload.name}</div>
-          <div className="ml-2 text-xs font-normal capitalize text-text-tertiary">{payload.type}</div>
+          <div className="ml-2 text-xs font-normal text-text-tertiary capitalize">{payload.type}</div>
         </div>
         {payload.required && (
-          <div className="text-xs font-normal uppercase leading-4 text-text-tertiary">{t(`${i18nPrefix}.addExtractParameterContent.required`, { ns: 'workflow' })}</div>
+          <div className="text-xs leading-4 font-normal text-text-tertiary uppercase">{t(`${i18nPrefix}.addExtractParameterContent.required`, { ns: 'workflow' })}</div>
         )}
       </div>
-      <div className="mt-0.5 text-xs font-normal leading-[18px] text-text-tertiary">{payload.description}</div>
+      <div className="mt-0.5 text-xs leading-[18px] font-normal text-text-tertiary">{payload.description}</div>
       <div
-        className="absolute right-0 top-0 hidden h-full w-[119px] items-center justify-end space-x-1 rounded-lg bg-linear-to-l from-components-panel-on-panel-item-bg to-background-gradient-mask-transparent pr-1 group-hover:flex"
+        className="absolute top-0 right-0 hidden h-full w-[119px] items-center justify-end space-x-1 rounded-lg bg-linear-to-l from-components-panel-on-panel-item-bg to-background-gradient-mask-transparent pr-1 group-hover:flex"
       >
         <div
           className="cursor-pointer rounded-md p-1 hover:bg-state-base-hover"
diff --git a/web/app/components/workflow/nodes/question-classifier/node.tsx b/web/app/components/workflow/nodes/question-classifier/node.tsx
index 25740fe2b2..2aae8debcf 100644
--- a/web/app/components/workflow/nodes/question-classifier/node.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/node.tsx
@@ -31,7 +31,7 @@ const TruncatedClassItem: FC<TruncatedClassItemProps> = ({ topic, index, nodeId,
   const shouldShowTooltip = topic.name.length > MAX_CLASS_TEXT_LENGTH
 
   const content = (
-    <div className="system-xs-regular truncate text-text-tertiary">
+    <div className="truncate system-xs-regular text-text-tertiary">
       <ReadonlyInputWithSelectVar
         value={truncatedText}
         nodeId={nodeId}
@@ -42,7 +42,7 @@ const TruncatedClassItem: FC<TruncatedClassItemProps> = ({ topic, index, nodeId,
 
   return (
     <div className="flex flex-col gap-y-0.5 rounded-md bg-workflow-block-parma-bg px-[5px] py-[3px]">
-      <div className="system-2xs-semibold-uppercase uppercase text-text-secondary">
+      <div className="system-2xs-semibold-uppercase text-text-secondary uppercase">
         {`${t(`${i18nPrefix}.class`, { ns: 'workflow' })} ${index + 1}`}
       </div>
       {shouldShowTooltip
diff --git a/web/app/components/workflow/nodes/start/node.tsx b/web/app/components/workflow/nodes/start/node.tsx
index 845a2922ac..7d1cb31766 100644
--- a/web/app/components/workflow/nodes/start/node.tsx
+++ b/web/app/components/workflow/nodes/start/node.tsx
@@ -21,10 +21,10 @@ const Node: FC<NodeProps<StartNodeType>> = ({
     <div className="mb-1 px-3 py-1">
       <div className="space-y-0.5">
         {variables.map(variable => (
-          <div key={variable.variable} className="flex h-6 items-center justify-between space-x-1 rounded-md  bg-workflow-block-parma-bg px-1">
+          <div key={variable.variable} className="flex h-6 items-center justify-between space-x-1 rounded-md bg-workflow-block-parma-bg px-1">
             <div className="flex w-0 grow items-center space-x-1">
               <Variable02 className="h-3.5 w-3.5 shrink-0 text-text-accent" />
-              <span className="system-xs-regular w-0 grow truncate text-text-secondary">{variable.variable}</span>
+              <span className="w-0 grow truncate system-xs-regular text-text-secondary">{variable.variable}</span>
             </div>
 
             <div className="ml-1 flex items-center space-x-1">
diff --git a/web/app/components/workflow/nodes/tool/components/copy-id.tsx b/web/app/components/workflow/nodes/tool/components/copy-id.tsx
index f0c5e191c7..eaf3d1bec5 100644
--- a/web/app/components/workflow/nodes/tool/components/copy-id.tsx
+++ b/web/app/components/workflow/nodes/tool/components/copy-id.tsx
@@ -36,11 +36,11 @@ const CopyFeedbackNew = ({ content }: Props) => {
         }
       >
         <div
-          className="group/copy flex w-full items-center gap-0.5 "
+          className="group/copy flex w-full items-center gap-0.5"
           onClick={onClickCopy}
         >
           <div
-            className="system-2xs-regular w-0 grow cursor-pointer truncate text-text-quaternary group-hover:text-text-tertiary"
+            className="w-0 grow cursor-pointer truncate system-2xs-regular text-text-quaternary group-hover:text-text-tertiary"
           >
             {content}
           </div>
diff --git a/web/app/components/workflow/nodes/trigger-plugin/node.tsx b/web/app/components/workflow/nodes/trigger-plugin/node.tsx
index 9796fa3394..49fb0fd68c 100644
--- a/web/app/components/workflow/nodes/trigger-plugin/node.tsx
+++ b/web/app/components/workflow/nodes/trigger-plugin/node.tsx
@@ -64,7 +64,7 @@ const Node: FC<NodeProps<PluginTriggerNodeType>> = ({
   return (
     <div className="relative mb-1 px-3 py-1">
       {showInstallButton && (
-        <div className="pointer-events-auto absolute right-3 top-[-32px] z-40">
+        <div className="pointer-events-auto absolute top-[-32px] right-3 z-40">
           <InstallPluginButton
             size="small"
             extraIdentifiers={[
@@ -87,7 +87,7 @@ const Node: FC<NodeProps<PluginTriggerNodeType>> = ({
           >
             <div
               title={key}
-              className="max-w-[100px] shrink-0 truncate text-xs font-medium uppercase text-text-tertiary"
+              className="max-w-[100px] shrink-0 truncate text-xs font-medium text-text-tertiary uppercase"
             >
               {key}
             </div>
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx
index c24cae9f2a..68016c92d1 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx
@@ -26,10 +26,10 @@ const NextExecutionTimes = ({ data }: NextExecutionTimesProps) => {
       <div className="flex min-h-[80px] flex-col rounded-xl bg-components-input-bg-normal py-2">
         {executionTimes.map((time, index) => (
           <div key={index} className="flex items-baseline text-xs">
-            <span className="w-6 select-none text-right font-mono font-normal leading-[150%] tracking-wider text-text-quaternary">
+            <span className="w-6 text-right font-mono leading-[150%] font-normal tracking-wider text-text-quaternary select-none">
               {String(index + 1).padStart(2, '0')}
             </span>
-            <span className="pl-2 pr-3 font-mono font-normal leading-[150%] tracking-wider text-text-secondary">
+            <span className="pr-3 pl-2 font-mono leading-[150%] font-normal tracking-wider text-text-secondary">
               {time}
             </span>
           </div>
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx
index e0a46d1c68..61c943992c 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx
@@ -19,8 +19,8 @@ const OnMinuteSelector = ({ value = 0, onChange }: OnMinuteSelectorProps) => {
         <div className="flex h-full w-12 shrink-0 items-center justify-center text-[13px] text-components-input-text-filled">
           {value}
         </div>
-        <div className="absolute left-12 top-0 h-full w-px bg-components-panel-bg"></div>
-        <div className="flex h-full grow items-center pl-4 pr-3">
+        <div className="absolute top-0 left-12 h-full w-px bg-components-panel-bg"></div>
+        <div className="flex h-full grow items-center pr-3 pl-4">
           <Slider
             className="w-full"
             value={value}
diff --git a/web/app/components/workflow/nodes/trigger-schedule/node.tsx b/web/app/components/workflow/nodes/trigger-schedule/node.tsx
index c3b2d0315a..337f2bd8f3 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/node.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/node.tsx
@@ -14,7 +14,7 @@ const Node: FC<NodeProps<ScheduleTriggerNodeType>> = ({
 
   return (
     <div className="mb-1 px-3 py-1">
-      <div className="mb-1 text-[10px] font-medium uppercase tracking-wide text-text-tertiary">
+      <div className="mb-1 text-[10px] font-medium tracking-wide text-text-tertiary uppercase">
         {t(`${i18nPrefix}.nextExecutionTime`, { ns: 'workflow' })}
       </div>
       <div className="flex h-[26px] items-center rounded-md bg-workflow-block-parma-bg px-2 text-xs text-text-secondary">
diff --git a/web/app/components/workflow/nodes/trigger-schedule/panel.tsx b/web/app/components/workflow/nodes/trigger-schedule/panel.tsx
index f1ec655901..d8ca0857af 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/panel.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/panel.tsx
@@ -34,7 +34,7 @@ const Panel: FC<NodePanelProps<ScheduleTriggerNodeType>> = ({
 
   return (
     <div className="mt-2">
-      <div className="space-y-4 px-4 pb-3 pt-2">
+      <div className="space-y-4 px-4 pt-2 pb-3">
         <Field
           title={t(`${i18nPrefix}.title`, { ns: 'workflow' })}
           operations={(
diff --git a/web/app/components/workflow/nodes/trigger-webhook/node.tsx b/web/app/components/workflow/nodes/trigger-webhook/node.tsx
index 2de1b30aee..1777be1cac 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/node.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/node.tsx
@@ -8,7 +8,7 @@ const Node: FC<NodeProps<WebhookTriggerNodeType>> = ({
 }) => {
   return (
     <div className="mb-1 px-3 py-1">
-      <div className="mb-1 text-[10px] font-medium uppercase tracking-wide text-text-tertiary">
+      <div className="mb-1 text-[10px] font-medium tracking-wide text-text-tertiary uppercase">
         URL
       </div>
       <div className="flex h-[26px] items-center rounded-md bg-workflow-block-parma-bg px-2 text-xs text-text-secondary">
diff --git a/web/app/components/workflow/nodes/trigger-webhook/utils/render-output-vars.tsx b/web/app/components/workflow/nodes/trigger-webhook/utils/render-output-vars.tsx
index d58561b603..a0b0e4e8ed 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/utils/render-output-vars.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/utils/render-output-vars.tsx
@@ -34,7 +34,7 @@ const VarItem: FC<VarItemProps> = ({ prefix, name, type }) => {
           .
         </span>
         <span className="code-sm-semibold text-text-secondary">{name}</span>
-        <span className="system-xs-regular ml-2 text-text-tertiary">{type}</span>
+        <span className="ml-2 system-xs-regular text-text-tertiary">{type}</span>
       </div>
     </div>
   )
@@ -43,7 +43,7 @@ const VarItem: FC<VarItemProps> = ({ prefix, name, type }) => {
 export const OutputVariablesContent: FC<OutputVariablesContentProps> = ({ variables = [] }) => {
   if (!variables || variables.length === 0) {
     return (
-      <div className="system-sm-regular py-2 text-text-tertiary">
+      <div className="py-2 system-sm-regular text-text-tertiary">
         No output variables
       </div>
     )
diff --git a/web/app/components/workflow/nodes/variable-assigner/components/var-group-item.tsx b/web/app/components/workflow/nodes/variable-assigner/components/var-group-item.tsx
index 56cdf833f4..738e986e9c 100644
--- a/web/app/components/workflow/nodes/variable-assigner/components/var-group-item.tsx
+++ b/web/app/components/workflow/nodes/variable-assigner/components/var-group-item.tsx
@@ -110,7 +110,7 @@ const VarGroupItem: FC<Props> = ({
                 <Folder className="mr-0.5 h-3.5 w-3.5" />
                 {(!isEditGroupName)
                   ? (
-                      <div className="system-sm-semibold flex h-6 cursor-text items-center rounded-lg px-1 text-text-secondary hover:bg-gray-100" onClick={setEditGroupName}>
+                      <div className="flex h-6 cursor-text items-center rounded-lg px-1 system-sm-semibold text-text-secondary hover:bg-gray-100" onClick={setEditGroupName}>
                         {payload.group_name}
                       </div>
                     )
@@ -133,7 +133,7 @@ const VarGroupItem: FC<Props> = ({
               </div>
               {canRemove && (
                 <div
-                  className="ml-0.5 hidden cursor-pointer rounded-md p-1 text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive group-hover:block"
+                  className="ml-0.5 hidden cursor-pointer rounded-md p-1 text-text-tertiary group-hover:block hover:bg-state-destructive-hover hover:text-text-destructive"
                   onClick={onRemove}
                 >
                   <RiDeleteBinLine
@@ -145,9 +145,9 @@ const VarGroupItem: FC<Props> = ({
           )
         : t(`${i18nPrefix}.title`, { ns: 'workflow' })!}
       operations={(
-        <div className="flex h-6 items-center  space-x-2">
+        <div className="flex h-6 items-center space-x-2">
           {payload.variables.length > 0 && (
-            <div className="system-2xs-medium-uppercase flex h-[18px] items-center rounded-[5px] border border-divider-deep px-1 text-text-tertiary">{payload.output_type}</div>
+            <div className="flex h-[18px] items-center rounded-[5px] border border-divider-deep px-1 system-2xs-medium-uppercase text-text-tertiary">{payload.output_type}</div>
           )}
           {
             !readOnly
diff --git a/web/app/components/workflow/operator/index.tsx b/web/app/components/workflow/operator/index.tsx
index d13758c87d..052953cecf 100644
--- a/web/app/components/workflow/operator/index.tsx
+++ b/web/app/components/workflow/operator/index.tsx
@@ -72,7 +72,7 @@ const Operator = ({ handleUndo, handleRedo }: OperatorProps) => {
   return (
     <div
       ref={bottomPanelRef}
-      className="absolute bottom-0 left-0 right-0 z-[60] px-1"
+      className="absolute right-0 bottom-0 left-0 z-[60] px-1"
       style={
         {
           width: bottomPanelWidth,
diff --git a/web/app/components/workflow/panel/chat-record/user-input.tsx b/web/app/components/workflow/panel/chat-record/user-input.tsx
index c29e28ca9a..111a90c854 100644
--- a/web/app/components/workflow/panel/chat-record/user-input.tsx
+++ b/web/app/components/workflow/panel/chat-record/user-input.tsx
@@ -43,7 +43,7 @@ const UserInput = ({
         />
         {t('panel.userInputField', { ns: 'workflow' }).toLocaleUpperCase()}
       </div>
-      <div className="px-2 pb-3 pt-1">
+      <div className="px-2 pt-1 pb-3">
         {
           expanded && (
             <div className="py-2 text-[13px] text-text-primary">
diff --git a/web/app/components/workflow/panel/chat-variable-panel/components/object-value-item.tsx b/web/app/components/workflow/panel/chat-variable-panel/components/object-value-item.tsx
index e2ee83cb06..cd8e8468a5 100644
--- a/web/app/components/workflow/panel/chat-variable-panel/components/object-value-item.tsx
+++ b/web/app/components/workflow/panel/chat-variable-panel/components/object-value-item.tsx
@@ -97,7 +97,7 @@ const ObjectValueItem: FC<Props> = ({
       {/* Key */}
       <div className="w-[120px] border-r border-gray-200">
         <input
-          className="block h-7 w-full appearance-none px-2 text-text-secondary caret-primary-600 outline-hidden system-xs-regular placeholder:text-components-input-text-placeholder placeholder:system-xs-regular hover:bg-state-base-hover focus:bg-components-input-bg-active"
+          className="block h-7 w-full appearance-none px-2 system-xs-regular text-text-secondary caret-primary-600 outline-hidden placeholder:system-xs-regular placeholder:text-components-input-text-placeholder hover:bg-state-base-hover focus:bg-components-input-bg-active"
           placeholder={t('chatVariable.modal.objectKey', { ns: 'workflow' }) || ''}
           value={list[index].key}
           onChange={handleKeyChange(index)}
@@ -116,7 +116,7 @@ const ObjectValueItem: FC<Props> = ({
       {/* Value */}
       <div className="relative w-[230px]">
         <input
-          className="block h-7 w-full appearance-none px-2 text-text-secondary caret-primary-600 outline-hidden system-xs-regular placeholder:text-components-input-text-placeholder placeholder:system-xs-regular hover:bg-state-base-hover focus:bg-components-input-bg-active"
+          className="block h-7 w-full appearance-none px-2 system-xs-regular text-text-secondary caret-primary-600 outline-hidden placeholder:system-xs-regular placeholder:text-components-input-text-placeholder hover:bg-state-base-hover focus:bg-components-input-bg-active"
           placeholder={t('chatVariable.modal.objectValue', { ns: 'workflow' }) || ''}
           value={list[index].value}
           onChange={handleValueChange(index)}
@@ -126,7 +126,7 @@ const ObjectValueItem: FC<Props> = ({
         />
         {list.length > 1 && !isFocus && (
           <RemoveButton
-            className="absolute right-1 top-0.5 z-10 hidden group-hover:block"
+            className="absolute top-0.5 right-1 z-10 hidden group-hover:block"
             onClick={handleItemRemove(index)}
           />
         )}
diff --git a/web/app/components/workflow/panel/chat-variable-panel/components/object-value-list.tsx b/web/app/components/workflow/panel/chat-variable-panel/components/object-value-list.tsx
index a89688a5a1..486fa9370a 100644
--- a/web/app/components/workflow/panel/chat-variable-panel/components/object-value-list.tsx
+++ b/web/app/components/workflow/panel/chat-variable-panel/components/object-value-list.tsx
@@ -17,10 +17,10 @@ const ObjectValueList: FC<Props> = ({
 
   return (
     <div className="w-full overflow-hidden rounded-lg border border-gray-200">
-      <div className="system-xs-medium flex h-7 items-center uppercase text-text-tertiary">
+      <div className="flex h-7 items-center system-xs-medium text-text-tertiary uppercase">
         <div className="flex h-full w-[120px] items-center border-r border-gray-200 pl-2">{t('chatVariable.modal.objectKey', { ns: 'workflow' })}</div>
         <div className="flex h-full w-[96px] items-center border-r border-gray-200 pl-2">{t('chatVariable.modal.objectType', { ns: 'workflow' })}</div>
-        <div className="flex h-full w-[230px] items-center pl-2 pr-1">{t('chatVariable.modal.objectValue', { ns: 'workflow' })}</div>
+        <div className="flex h-full w-[230px] items-center pr-1 pl-2">{t('chatVariable.modal.objectValue', { ns: 'workflow' })}</div>
       </div>
       {list.map((item, index) => (
         <ObjectValueItem
diff --git a/web/app/components/workflow/panel/comments-panel/index.tsx b/web/app/components/workflow/panel/comments-panel/index.tsx
index 36e1aef833..21b3c3c4e6 100644
--- a/web/app/components/workflow/panel/comments-panel/index.tsx
+++ b/web/app/components/workflow/panel/comments-panel/index.tsx
@@ -94,7 +94,7 @@ const CommentsPanel = () => {
                 }}
               >
                 <span className="text-text-secondary">{t('comments.filter.all', { ns: 'workflow' })}</span>
-                {!showOnlyMine && <RiCheckLine className="text-primary-600 h-4 w-4" />}
+                {!showOnlyMine && <RiCheckLine className="h-4 w-4 text-primary-600" />}
               </button>
               <button
                 className={cn('mt-1 flex w-full items-center justify-between rounded-md px-2 py-2 text-left text-sm hover:bg-state-base-hover', showOnlyMine && 'bg-components-panel-on-panel-item-bg')}
@@ -104,7 +104,7 @@ const CommentsPanel = () => {
                 }}
               >
                 <span className="text-text-secondary">{t('comments.filter.onlyYourThreads', { ns: 'workflow' })}</span>
-                {showOnlyMine && <RiCheckLine className="text-primary-600 h-4 w-4" />}
+                {showOnlyMine && <RiCheckLine className="h-4 w-4 text-primary-600" />}
               </button>
               <Divider type="horizontal" className="my-1" />
               <div
diff --git a/web/app/components/workflow/panel/debug-and-preview/empty.tsx b/web/app/components/workflow/panel/debug-and-preview/empty.tsx
index 0cb0869b5a..d71853d8e1 100644
--- a/web/app/components/workflow/panel/debug-and-preview/empty.tsx
+++ b/web/app/components/workflow/panel/debug-and-preview/empty.tsx
@@ -5,7 +5,7 @@ const Empty = () => {
   const { t } = useTranslation()
 
   return (
-    <div className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2">
+    <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2">
       <div className="mb-2 flex justify-center">
         <ChatBotSlim className="h-12 w-12 text-gray-300" />
       </div>
diff --git a/web/app/components/workflow/panel/record.tsx b/web/app/components/workflow/panel/record.tsx
index ff84c73db9..94aaac3458 100644
--- a/web/app/components/workflow/panel/record.tsx
+++ b/web/app/components/workflow/panel/record.tsx
@@ -22,7 +22,7 @@ const Record = () => {
 
   return (
     <div className="flex h-full w-[400px] flex-col rounded-l-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xl">
-      <div className="system-xl-semibold flex items-center justify-between p-4 pb-0 text-text-primary">
+      <div className="flex items-center justify-between p-4 pb-0 system-xl-semibold text-text-primary">
         {`Test Run${formatWorkflowRunIdentifier(historyWorkflowData?.finished_at)}`}
       </div>
       <Run
diff --git a/web/app/components/workflow/panel/version-history-panel/filter/filter-item.tsx b/web/app/components/workflow/panel/version-history-panel/filter/filter-item.tsx
index d7a37caa5e..6c659fea5b 100644
--- a/web/app/components/workflow/panel/version-history-panel/filter/filter-item.tsx
+++ b/web/app/components/workflow/panel/version-history-panel/filter/filter-item.tsx
@@ -24,7 +24,7 @@ const FilterItem: FC<FilterItemProps> = ({
         onClick(item.key)
       }}
     >
-      <div className="system-md-regular flex-1 text-text-primary">{item.name}</div>
+      <div className="flex-1 system-md-regular text-text-primary">{item.name}</div>
       {isSelected && <RiCheckLine className="h-4 w-4 shrink-0 text-text-accent" />}
     </div>
   )
diff --git a/web/app/components/workflow/panel/version-history-panel/loading/index.tsx b/web/app/components/workflow/panel/version-history-panel/loading/index.tsx
index a6dadcd652..ad5f7d6391 100644
--- a/web/app/components/workflow/panel/version-history-panel/loading/index.tsx
+++ b/web/app/components/workflow/panel/version-history-panel/loading/index.tsx
@@ -12,7 +12,7 @@ const itemConfig = Array.from({ length: 8 }).map((_, index) => {
 const Loading = () => {
   return (
     <div className="relative w-full overflow-y-hidden">
-      <div className="absolute left-0 top-0 z-10 h-full w-full bg-dataset-chunk-list-mask-bg" />
+      <div className="absolute top-0 left-0 z-10 h-full w-full bg-dataset-chunk-list-mask-bg" />
       {itemConfig.map((config, index) => <Item key={index} {...config} />)}
     </div>
   )
diff --git a/web/app/components/workflow/run/meta.tsx b/web/app/components/workflow/run/meta.tsx
index 9cffd7ad41..46dc42c3c1 100644
--- a/web/app/components/workflow/run/meta.tsx
+++ b/web/app/components/workflow/run/meta.tsx
@@ -27,11 +27,11 @@ const MetaData: FC<Props> = ({
 
   return (
     <div className="relative">
-      <div className="system-xs-medium-uppercase h-6 py-1 text-text-tertiary">{t('meta.title', { ns: 'runLog' })}</div>
+      <div className="h-6 py-1 system-xs-medium-uppercase text-text-tertiary">{t('meta.title', { ns: 'runLog' })}</div>
       <div className="py-1">
         <div className="flex">
-          <div className="system-xs-regular w-[104px] shrink-0 truncate px-2 py-1.5 text-text-tertiary">{t('meta.status', { ns: 'runLog' })}</div>
-          <div className="system-xs-regular grow px-2 py-1.5 text-text-secondary">
+          <div className="w-[104px] shrink-0 truncate px-2 py-1.5 system-xs-regular text-text-tertiary">{t('meta.status', { ns: 'runLog' })}</div>
+          <div className="grow px-2 py-1.5 system-xs-regular text-text-secondary">
             {status === 'running' && (
               <div className="my-1 h-2 w-16 rounded-xs bg-text-quaternary" />
             )}
@@ -56,8 +56,8 @@ const MetaData: FC<Props> = ({
           </div>
         </div>
         <div className="flex">
-          <div className="system-xs-regular w-[104px] shrink-0 truncate px-2 py-1.5 text-text-tertiary">{t('meta.executor', { ns: 'runLog' })}</div>
-          <div className="system-xs-regular grow px-2 py-1.5 text-text-secondary">
+          <div className="w-[104px] shrink-0 truncate px-2 py-1.5 system-xs-regular text-text-tertiary">{t('meta.executor', { ns: 'runLog' })}</div>
+          <div className="grow px-2 py-1.5 system-xs-regular text-text-secondary">
             {status === 'running' && (
               <div className="my-1 h-2 w-[88px] rounded-xs bg-text-quaternary" />
             )}
@@ -67,8 +67,8 @@ const MetaData: FC<Props> = ({
           </div>
         </div>
         <div className="flex">
-          <div className="system-xs-regular w-[104px] shrink-0 truncate px-2 py-1.5 text-text-tertiary">{t('meta.startTime', { ns: 'runLog' })}</div>
-          <div className="system-xs-regular grow px-2 py-1.5 text-text-secondary">
+          <div className="w-[104px] shrink-0 truncate px-2 py-1.5 system-xs-regular text-text-tertiary">{t('meta.startTime', { ns: 'runLog' })}</div>
+          <div className="grow px-2 py-1.5 system-xs-regular text-text-secondary">
             {status === 'running' && (
               <div className="my-1 h-2 w-[72px] rounded-xs bg-text-quaternary" />
             )}
@@ -78,8 +78,8 @@ const MetaData: FC<Props> = ({
           </div>
         </div>
         <div className="flex">
-          <div className="system-xs-regular w-[104px] shrink-0 truncate px-2 py-1.5 text-text-tertiary">{t('meta.time', { ns: 'runLog' })}</div>
-          <div className="system-xs-regular grow px-2 py-1.5 text-text-secondary">
+          <div className="w-[104px] shrink-0 truncate px-2 py-1.5 system-xs-regular text-text-tertiary">{t('meta.time', { ns: 'runLog' })}</div>
+          <div className="grow px-2 py-1.5 system-xs-regular text-text-secondary">
             {status === 'running' && (
               <div className="my-1 h-2 w-[72px] rounded-xs bg-text-quaternary" />
             )}
@@ -89,8 +89,8 @@ const MetaData: FC<Props> = ({
           </div>
         </div>
         <div className="flex">
-          <div className="system-xs-regular w-[104px] shrink-0 truncate px-2 py-1.5 text-text-tertiary">{t('meta.tokens', { ns: 'runLog' })}</div>
-          <div className="system-xs-regular grow px-2 py-1.5 text-text-secondary">
+          <div className="w-[104px] shrink-0 truncate px-2 py-1.5 system-xs-regular text-text-tertiary">{t('meta.tokens', { ns: 'runLog' })}</div>
+          <div className="grow px-2 py-1.5 system-xs-regular text-text-secondary">
             {['running', 'paused'].includes(status) && (
               <div className="my-1 h-2 w-[48px] animate-pulse rounded-xs bg-text-quaternary" />
             )}
@@ -101,8 +101,8 @@ const MetaData: FC<Props> = ({
         </div>
         {showSteps && (
           <div className="flex">
-            <div className="system-xs-regular w-[104px] shrink-0 truncate px-2 py-1.5 text-text-tertiary">{t('meta.steps', { ns: 'runLog' })}</div>
-            <div className="system-xs-regular grow px-2 py-1.5 text-text-secondary">
+            <div className="w-[104px] shrink-0 truncate px-2 py-1.5 system-xs-regular text-text-tertiary">{t('meta.steps', { ns: 'runLog' })}</div>
+            <div className="grow px-2 py-1.5 system-xs-regular text-text-secondary">
               {status === 'running' && (
                 <div className="my-1 h-2 w-[24px] rounded-xs bg-text-quaternary" />
               )}
diff --git a/web/app/components/workflow/run/output-panel.tsx b/web/app/components/workflow/run/output-panel.tsx
index f40470244e..f7ed097df2 100644
--- a/web/app/components/workflow/run/output-panel.tsx
+++ b/web/app/components/workflow/run/output-panel.tsx
@@ -56,7 +56,7 @@ const OutputPanel: FC<OutputPanelProps> = ({
   return (
     <div className="p-2">
       {isRunning && (
-        <div className="pl-[26px] pt-4">
+        <div className="pt-4 pl-[26px]">
           <LoadingAnim type="text" />
         </div>
       )}
diff --git a/web/app/components/workflow/run/result-panel.tsx b/web/app/components/workflow/run/result-panel.tsx
index c7f4a45540..0304037d27 100644
--- a/web/app/components/workflow/run/result-panel.tsx
+++ b/web/app/components/workflow/run/result-panel.tsx
@@ -138,7 +138,7 @@ const ResultPanel: FC<ResultPanelProps> = ({
           language={CodeLanguage.json}
           value={inputs}
           isJSONStringifyBeauty
-          footer={inputs_truncated && <LargeDataAlert textHasNoExport className="mx-1 mb-1 mt-2 h-7" />}
+          footer={inputs_truncated && <LargeDataAlert textHasNoExport className="mx-1 mt-2 mb-1 h-7" />}
         />
         {process_data && (
           <CodeEditor
@@ -147,7 +147,7 @@ const ResultPanel: FC<ResultPanelProps> = ({
             language={CodeLanguage.json}
             value={process_data}
             isJSONStringifyBeauty
-            footer={process_data_truncated && <LargeDataAlert textHasNoExport className="mx-1 mb-1 mt-2 h-7" />}
+            footer={process_data_truncated && <LargeDataAlert textHasNoExport className="mx-1 mt-2 mb-1 h-7" />}
           />
         )}
         {(outputs || status === 'running') && (
@@ -158,7 +158,7 @@ const ResultPanel: FC<ResultPanelProps> = ({
             value={outputs}
             isJSONStringifyBeauty
             tip={<ErrorHandleTip type={execution_metadata?.error_strategy} />}
-            footer={outputs_truncated && <LargeDataAlert textHasNoExport downloadUrl={outputs_full_content?.download_url} className="mx-1 mb-1 mt-2 h-7" />}
+            footer={outputs_truncated && <LargeDataAlert textHasNoExport downloadUrl={outputs_full_content?.download_url} className="mx-1 mt-2 mb-1 h-7" />}
           />
         )}
       </div>
diff --git a/web/app/components/workflow/run/result-text.tsx b/web/app/components/workflow/run/result-text.tsx
index 4169f452b2..fcbbf8043d 100644
--- a/web/app/components/workflow/run/result-text.tsx
+++ b/web/app/components/workflow/run/result-text.tsx
@@ -28,7 +28,7 @@ const ResultText: FC<ResultTextProps> = ({
   return (
     <div className="bg-background-section-burn">
       {isRunning && !outputs && (
-        <div className="pl-[26px] pt-4">
+        <div className="pt-4 pl-[26px]">
           <LoadingAnim type="text" />
         </div>
       )}
@@ -58,8 +58,8 @@ const ResultText: FC<ResultTextProps> = ({
             </div>
           )}
           {!!allFiles?.length && allFiles.map(item => (
-            <div key={item.varName} className="system-xs-regular flex flex-col gap-1 px-4 py-2">
-              <div className="py-1 text-text-tertiary ">{item.varName}</div>
+            <div key={item.varName} className="flex flex-col gap-1 px-4 py-2 system-xs-regular">
+              <div className="py-1 text-text-tertiary">{item.varName}</div>
               <FileList
                 files={item.list}
                 showDeleteAction={false}
diff --git a/web/app/components/workflow/run/retry-log/retry-result-panel.tsx b/web/app/components/workflow/run/retry-log/retry-result-panel.tsx
index b0efe6eb21..5ed6574737 100644
--- a/web/app/components/workflow/run/retry-log/retry-result-panel.tsx
+++ b/web/app/components/workflow/run/retry-log/retry-result-panel.tsx
@@ -23,7 +23,7 @@ const RetryResultPanel: FC<Props> = ({
   return (
     <div>
       <div
-        className="system-sm-medium flex h-8 cursor-pointer items-center bg-components-panel-bg px-4 text-text-accent-secondary"
+        className="flex h-8 cursor-pointer items-center bg-components-panel-bg px-4 system-sm-medium text-text-accent-secondary"
         onClick={(e) => {
           e.stopPropagation()
           e.nativeEvent.stopImmediatePropagation()
diff --git a/web/app/components/workflow/workflow-preview/components/nodes/if-else/node.tsx b/web/app/components/workflow/workflow-preview/components/nodes/if-else/node.tsx
index 1fd84fff6d..27c448c487 100644
--- a/web/app/components/workflow/workflow-preview/components/nodes/if-else/node.tsx
+++ b/web/app/components/workflow/workflow-preview/components/nodes/if-else/node.tsx
@@ -85,7 +85,7 @@ const IfElseNode: FC<NodeProps<IfElseNodeType>> = (props) => {
                       : conditionNotSet
                   }
                   {i !== caseItem.conditions.length - 1 && (
-                    <div className="absolute bottom-[-10px] right-1 z-10 text-[10px] font-medium uppercase leading-4 text-text-accent">{t(`${i18nPrefix}.${caseItem.logical_operator}`, { ns: 'workflow' })}</div>
+                    <div className="absolute right-1 bottom-[-10px] z-10 text-[10px] leading-4 font-medium text-text-accent uppercase">{t(`${i18nPrefix}.${caseItem.logical_operator}`, { ns: 'workflow' })}</div>
                   )}
                 </div>
               ))}
diff --git a/web/app/education-apply/search-input.tsx b/web/app/education-apply/search-input.tsx
index 072ae34007..47eca921ee 100644
--- a/web/app/education-apply/search-input.tsx
+++ b/web/app/education-apply/search-input.tsx
@@ -100,7 +100,7 @@ const SearchInput = ({
                 schools.map((school, index) => (
                   <div
                     key={index}
-                    className="system-md-regular flex h-8 cursor-pointer items-center truncate rounded-lg px-2 py-1.5 text-text-secondary hover:bg-state-base-hover"
+                    className="flex h-8 cursor-pointer items-center truncate rounded-lg px-2 py-1.5 system-md-regular text-text-secondary hover:bg-state-base-hover"
                     title={school}
                     onClick={() => {
                       onChange(school)
diff --git a/web/app/signup/page.tsx b/web/app/signup/page.tsx
index da821ae50e..f3a9d2abb2 100644
--- a/web/app/signup/page.tsx
+++ b/web/app/signup/page.tsx
@@ -20,7 +20,7 @@ const Signup = () => {
     <div className="mx-auto mt-8 w-full">
       <div className="mx-auto mb-10 w-full">
         <h2 className="title-4xl-semi-bold text-text-primary">{t('signup.createAccount', { ns: 'login' })}</h2>
-        <p className="body-md-regular mt-2 text-text-tertiary">{t('signup.welcome', { ns: 'login' })}</p>
+        <p className="mt-2 body-md-regular text-text-tertiary">{t('signup.welcome', { ns: 'login' })}</p>
       </div>
       <MailForm onSuccess={handleInputMailSubmitted} />
     </div>
diff --git a/web/context/app-context-provider.tsx b/web/context/app-context-provider.tsx
index 78a8f99e7f..0bf3851046 100644
--- a/web/context/app-context-provider.tsx
+++ b/web/context/app-context-provider.tsx
@@ -145,7 +145,7 @@ export const AppContextProvider: FC<AppContextProviderProps> = ({ children }) =>
     >
       <div className="flex h-full flex-col overflow-y-auto">
         {env.NEXT_PUBLIC_MAINTENANCE_NOTICE && <MaintenanceNotice />}
-        <div className="relative flex grow flex-col overflow-y-auto overflow-x-hidden bg-background-body">
+        <div className="relative flex grow flex-col overflow-x-hidden overflow-y-auto bg-background-body">
           {children}
         </div>
       </div>
diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs
index 73a30fc072..eab02ec664 100644
--- a/web/eslint.config.mjs
+++ b/web/eslint.config.mjs
@@ -1,7 +1,7 @@
 // @ts-check
 
 import path from 'node:path'
-import antfu, { GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_TESTS, GLOB_TS, GLOB_TSX, isInEditorEnv, isInGitHooksOrLintStaged } from '@antfu/eslint-config'
+import antfu, { GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_TESTS, GLOB_TS, GLOB_TSX } from '@antfu/eslint-config'
 import pluginQuery from '@tanstack/eslint-plugin-query'
 import md from 'eslint-markdown'
 import tailwindcss from 'eslint-plugin-better-tailwindcss'
@@ -19,12 +19,6 @@ import {
 } from './eslint.constants.mjs'
 import dify from './plugins/eslint/index.js'
 
-// Enable Tailwind CSS IntelliSense mode for ESLint runs
-// See: tailwind-css-plugin.ts
-process.env.TAILWIND_MODE ??= 'ESLINT'
-
-const disableRuleAutoFix = !(isInEditorEnv() || isInGitHooksOrLintStaged())
-
 export default antfu(
   {
     react: {
@@ -203,10 +197,3 @@ export default antfu(
     },
   },
 )
-  .disableRulesFix(disableRuleAutoFix
-    ? [
-        'tailwindcss/enforce-consistent-class-order',
-        'tailwindcss/no-duplicate-classes',
-        'tailwindcss/no-unnecessary-whitespace',
-      ]
-    : [])

From b565a51ed905675d078f54acee4f1cf1ef447fa0 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Fri, 17 Apr 2026 07:56:11 +0800
Subject: [PATCH 26/36] refactor(web): quality closure pass on base UI
 primitives (#35333)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 .../dify-ui/src/styles/components.css         |  14 +-
 packages/dify-ui/src/styles/styles.css        |   1 +
 .../params-config/weighted-score.tsx          |  10 +-
 .../components/base/ui/alert-dialog/index.tsx |   9 +-
 web/app/components/base/ui/dialog/index.tsx   |   9 +-
 .../components/base/ui/scroll-area/index.tsx  |   6 +-
 web/app/components/base/ui/select/index.tsx   |  49 ++++---
 web/app/components/base/ui/slider/index.tsx   | 127 +++++++++++++-----
 web/app/components/billing/pricing/index.tsx  |   2 +-
 .../header/account-setting/menu-dialog.tsx    |   2 +-
 .../workflow-onboarding-modal/index.tsx       |   2 +-
 11 files changed, 147 insertions(+), 84 deletions(-)
 rename web/app/components/base/ui/scroll-area/scroll-area.css => packages/dify-ui/src/styles/components.css (64%)

diff --git a/web/app/components/base/ui/scroll-area/scroll-area.css b/packages/dify-ui/src/styles/components.css
similarity index 64%
rename from web/app/components/base/ui/scroll-area/scroll-area.css
rename to packages/dify-ui/src/styles/components.css
index 7a33076acf..ab02be97fb 100644
--- a/web/app/components/base/ui/scroll-area/scroll-area.css
+++ b/packages/dify-ui/src/styles/components.css
@@ -15,7 +15,7 @@
   width: 4px;
   height: 12px;
   transform: translateX(-50%);
-  background: linear-gradient(to bottom, var(--scroll-area-edge-hint-bg, var(--color-components-panel-bg)), transparent);
+  background: linear-gradient(to bottom, var(--color-components-panel-bg), transparent);
 }
 
 [data-dify-scrollbar][data-orientation='vertical']::after {
@@ -24,7 +24,7 @@
   width: 4px;
   height: 12px;
   transform: translateX(-50%);
-  background: linear-gradient(to top, var(--scroll-area-edge-hint-bg, var(--color-components-panel-bg)), transparent);
+  background: linear-gradient(to top, var(--color-components-panel-bg), transparent);
 }
 
 [data-dify-scrollbar][data-orientation='horizontal']::before {
@@ -33,7 +33,7 @@
   width: 12px;
   height: 4px;
   transform: translateY(-50%);
-  background: linear-gradient(to right, var(--scroll-area-edge-hint-bg, var(--color-components-panel-bg)), transparent);
+  background: linear-gradient(to right, var(--color-components-panel-bg), transparent);
 }
 
 [data-dify-scrollbar][data-orientation='horizontal']::after {
@@ -42,7 +42,7 @@
   width: 12px;
   height: 4px;
   transform: translateY(-50%);
-  background: linear-gradient(to left, var(--scroll-area-edge-hint-bg, var(--color-components-panel-bg)), transparent);
+  background: linear-gradient(to left, var(--color-components-panel-bg), transparent);
 }
 
 [data-dify-scrollbar][data-orientation='vertical']:not([data-overflow-y-start])::before {
@@ -61,12 +61,6 @@
   opacity: 1;
 }
 
-[data-dify-scrollbar][data-hovering] > [data-orientation],
-[data-dify-scrollbar][data-scrolling] > [data-orientation],
-[data-dify-scrollbar] > [data-orientation]:active {
-  background-color: var(--scroll-area-thumb-bg-active, var(--color-state-base-handle-hover));
-}
-
 @media (prefers-reduced-motion: reduce) {
   [data-dify-scrollbar]::before,
   [data-dify-scrollbar]::after {
diff --git a/packages/dify-ui/src/styles/styles.css b/packages/dify-ui/src/styles/styles.css
index a712e9c5db..fb410b2d5f 100644
--- a/packages/dify-ui/src/styles/styles.css
+++ b/packages/dify-ui/src/styles/styles.css
@@ -1,3 +1,4 @@
 @import '../themes/light.css' layer(base);
 @import '../themes/dark.css' layer(base);
 @import './utilities.css';
+@import './components.css';
diff --git a/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx b/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
index 8488d0269f..e5080f26e4 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
@@ -1,12 +1,11 @@
-import type { CSSProperties } from 'react'
 import { noop } from 'es-toolkit/function'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Slider } from '@/app/components/base/ui/slider'
 
-const weightedScoreSliderStyle: CSSProperties & Record<'--slider-track' | '--slider-range', string> = {
-  '--slider-track': 'var(--color-util-colors-teal-teal-500)',
-  '--slider-range': 'var(--color-util-colors-blue-light-blue-light-500)',
+const weightedScoreSliderSlotClassNames = {
+  track: 'bg-util-colors-teal-teal-500',
+  indicator: 'bg-util-colors-blue-light-blue-light-500',
 }
 
 const formatNumber = (value: number) => {
@@ -37,7 +36,7 @@ const WeightedScore = ({
   return (
     <div>
       <div className="space-x-3 rounded-lg border border-components-panel-border px-3 pt-5 pb-2">
-        <div className="grow" style={weightedScoreSliderStyle}>
+        <div className="grow">
           <Slider
             className="grow"
             max={1.0}
@@ -47,6 +46,7 @@ const WeightedScore = ({
             onValueChange={v => !readonly && onChange({ value: [v, (10 - v * 10) / 10] })}
             disabled={readonly}
             aria-label={t('weightedScore.semantic', { ns: 'dataset' })}
+            slotClassNames={weightedScoreSliderSlotClassNames}
           />
         </div>
         <div className="mt-3 flex justify-between">
diff --git a/web/app/components/base/ui/alert-dialog/index.tsx b/web/app/components/base/ui/alert-dialog/index.tsx
index f277c343fc..5f2af43df8 100644
--- a/web/app/components/base/ui/alert-dialog/index.tsx
+++ b/web/app/components/base/ui/alert-dialog/index.tsx
@@ -14,16 +14,14 @@ export const AlertDialogDescription = BaseAlertDialog.Description
 type AlertDialogContentProps = {
   children: ReactNode
   className?: string
-  overlayClassName?: string
-  popupProps?: Omit<BaseAlertDialog.Popup.Props, 'children' | 'className'>
+  backdropClassName?: string
   backdropProps?: Omit<BaseAlertDialog.Backdrop.Props, 'className'>
 }
 
 export function AlertDialogContent({
   children,
   className,
-  overlayClassName,
-  popupProps,
+  backdropClassName,
   backdropProps,
 }: AlertDialogContentProps) {
   return (
@@ -33,11 +31,10 @@ export function AlertDialogContent({
         className={cn(
           'fixed inset-0 z-1002 bg-background-overlay',
           'transition-opacity duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none',
-          overlayClassName,
+          backdropClassName,
         )}
       />
       <BaseAlertDialog.Popup
-        {...popupProps}
         className={cn(
           'fixed top-1/2 left-1/2 z-1002 max-h-[calc(100vh-2rem)] w-[480px] max-w-[calc(100vw-2rem)] -translate-x-1/2 -translate-y-1/2 overflow-y-auto overscroll-contain rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg',
           'transition-[transform,scale,opacity] duration-150 data-ending-style:scale-95 data-ending-style:opacity-0 data-starting-style:scale-95 data-starting-style:opacity-0 motion-reduce:transition-none',
diff --git a/web/app/components/base/ui/dialog/index.tsx b/web/app/components/base/ui/dialog/index.tsx
index 7ee9cffa8b..bc82230f58 100644
--- a/web/app/components/base/ui/dialog/index.tsx
+++ b/web/app/components/base/ui/dialog/index.tsx
@@ -42,14 +42,14 @@ export function DialogCloseButton({
 type DialogContentProps = {
   children: ReactNode
   className?: string
-  overlayClassName?: string
-  backdropProps?: BaseDialog.Backdrop.Props
+  backdropClassName?: string
+  backdropProps?: Omit<BaseDialog.Backdrop.Props, 'className'>
 }
 
 export function DialogContent({
   children,
   className,
-  overlayClassName,
+  backdropClassName,
   backdropProps,
 }: DialogContentProps) {
   return (
@@ -59,8 +59,7 @@ export function DialogContent({
         className={cn(
           'fixed inset-0 z-1002 bg-background-overlay',
           'transition-opacity duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none',
-          overlayClassName,
-          backdropProps?.className,
+          backdropClassName,
         )}
       />
       <BaseDialog.Popup
diff --git a/web/app/components/base/ui/scroll-area/index.tsx b/web/app/components/base/ui/scroll-area/index.tsx
index 9a23145039..300946b1bf 100644
--- a/web/app/components/base/ui/scroll-area/index.tsx
+++ b/web/app/components/base/ui/scroll-area/index.tsx
@@ -3,7 +3,6 @@
 import type { ReactNode } from 'react'
 import { ScrollArea as BaseScrollArea } from '@base-ui/react/scroll-area'
 import { cn } from '@langgenius/dify-ui/cn'
-import './scroll-area.css'
 
 export const ScrollAreaRoot = BaseScrollArea.Root
 type ScrollAreaRootProps = BaseScrollArea.Root.Props
@@ -25,7 +24,7 @@ type ScrollAreaProps = Omit<ScrollAreaRootProps, 'children'> & {
 }
 
 const scrollAreaScrollbarClassName = cn(
-  'flex touch-none overflow-clip p-1 opacity-100 transition-opacity select-none motion-reduce:transition-none',
+  'group/scrollbar flex touch-none overflow-clip p-1 opacity-100 transition-opacity select-none motion-reduce:transition-none',
   'pointer-events-none data-hovering:pointer-events-auto',
   'data-scrolling:pointer-events-auto',
   'data-[orientation=vertical]:absolute data-[orientation=vertical]:inset-y-0 data-[orientation=vertical]:w-3 data-[orientation=vertical]:justify-center',
@@ -36,6 +35,9 @@ const scrollAreaThumbClassName = cn(
   'shrink-0 rounded-sm bg-state-base-handle transition-[background-color] motion-reduce:transition-none',
   'data-[orientation=vertical]:w-1',
   'data-[orientation=horizontal]:h-1',
+  'group-data-hovering/scrollbar:bg-state-base-handle-hover',
+  'group-data-scrolling/scrollbar:bg-state-base-handle-hover',
+  'active:bg-state-base-handle-hover',
 )
 
 const scrollAreaViewportClassName = cn(
diff --git a/web/app/components/base/ui/select/index.tsx b/web/app/components/base/ui/select/index.tsx
index 5448379ce6..7de0088af4 100644
--- a/web/app/components/base/ui/select/index.tsx
+++ b/web/app/components/base/ui/select/index.tsx
@@ -1,9 +1,11 @@
 'use client'
 
+import type { VariantProps } from 'class-variance-authority'
 import type { ReactNode } from 'react'
 import type { Placement } from '@/app/components/base/ui/placement'
 import { Select as BaseSelect } from '@base-ui/react/select'
 import { cn } from '@langgenius/dify-ui/cn'
+import { cva } from 'class-variance-authority'
 import {
   overlayLabelClassName,
   overlaySeparatorClassName,
@@ -15,34 +17,43 @@ export const SelectValue = BaseSelect.Value
 /** @public */
 export const SelectGroup = BaseSelect.Group
 
-const selectSizeClassName: Record<string, string> = {
-  small: 'h-6 gap-px rounded-md px-2 py-1 system-xs-regular',
-  medium: 'h-8 gap-0.5 rounded-lg px-3 py-2 system-sm-regular',
-  large: 'h-9 gap-0.5 rounded-[10px] px-4 py-2 system-md-regular',
-}
+const selectTriggerVariants = cva(
+  [
+    'group flex w-full items-center border-0 bg-components-input-bg-normal text-left text-components-input-text-filled outline-hidden',
+    'hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt',
+    'data-placeholder:text-components-input-text-placeholder',
+    'data-readonly:cursor-default data-readonly:bg-transparent data-readonly:hover:bg-transparent',
+    'data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled data-disabled:hover:bg-components-input-bg-disabled',
+    'data-disabled:data-placeholder:text-components-input-text-disabled',
+  ],
+  {
+    variants: {
+      size: {
+        small: 'h-6 gap-px rounded-md px-2 py-1 system-xs-regular',
+        medium: 'h-8 gap-0.5 rounded-lg px-3 py-2 system-sm-regular',
+        large: 'h-9 gap-0.5 rounded-[10px] px-4 py-2 system-md-regular',
+      },
+    },
+    defaultVariants: {
+      size: 'medium',
+    },
+  },
+)
 
-type SelectTriggerProps = BaseSelect.Trigger.Props & {
-  size?: 'small' | 'medium' | 'large'
-}
+type SelectTriggerProps
+  = Omit<BaseSelect.Trigger.Props, 'className'>
+    & VariantProps<typeof selectTriggerVariants>
+    & { className?: string }
 
 export function SelectTrigger({
   className,
   children,
-  size = 'medium',
+  size,
   ...props
 }: SelectTriggerProps) {
   return (
     <BaseSelect.Trigger
-      className={cn(
-        'group flex w-full items-center border-0 bg-components-input-bg-normal text-left text-components-input-text-filled outline-hidden',
-        'hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt',
-        'data-placeholder:text-components-input-text-placeholder',
-        selectSizeClassName[size],
-        'data-readonly:cursor-default data-readonly:bg-transparent data-readonly:hover:bg-transparent',
-        'data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled data-disabled:hover:bg-components-input-bg-disabled',
-        'data-disabled:data-placeholder:text-components-input-text-disabled',
-        className,
-      )}
+      className={cn(selectTriggerVariants({ size, className }))}
       {...props}
     >
       <span className="min-w-0 grow truncate">
diff --git a/web/app/components/base/ui/slider/index.tsx b/web/app/components/base/ui/slider/index.tsx
index 931c4e88be..ad1bc0ba8f 100644
--- a/web/app/components/base/ui/slider/index.tsx
+++ b/web/app/components/base/ui/slider/index.tsx
@@ -2,16 +2,98 @@
 
 import { Slider as BaseSlider } from '@base-ui/react/slider'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
+
+/** @public */
+export const SliderRoot = BaseSlider.Root
 
 type SliderRootProps = BaseSlider.Root.Props<number>
+
+const sliderControlClassName = cn(
+  'relative flex h-5 w-full touch-none items-center select-none',
+  'data-disabled:cursor-not-allowed',
+)
+
+type SliderControlProps = BaseSlider.Control.Props
+
+/** @public */
+export function SliderControl({ className, ...props }: SliderControlProps) {
+  return (
+    <BaseSlider.Control
+      className={cn(sliderControlClassName, className)}
+      {...props}
+    />
+  )
+}
+
+const sliderTrackClassName = cn(
+  'relative h-1 w-full overflow-hidden rounded-full',
+  'bg-components-slider-track',
+)
+
+type SliderTrackProps = BaseSlider.Track.Props
+
+/** @public */
+export function SliderTrack({ className, ...props }: SliderTrackProps) {
+  return (
+    <BaseSlider.Track
+      className={cn(sliderTrackClassName, className)}
+      {...props}
+    />
+  )
+}
+
+const sliderIndicatorClassName = cn(
+  'h-full rounded-full',
+  'bg-components-slider-range',
+)
+
+type SliderIndicatorProps = BaseSlider.Indicator.Props
+
+/** @public */
+export function SliderIndicator({ className, ...props }: SliderIndicatorProps) {
+  return (
+    <BaseSlider.Indicator
+      className={cn(sliderIndicatorClassName, className)}
+      {...props}
+    />
+  )
+}
+
+const sliderThumbClassName = cn(
+  'block h-5 w-2 shrink-0 rounded-[3px] border-[0.5px]',
+  'border-components-slider-knob-border bg-components-slider-knob shadow-sm',
+  'transition-[background-color,border-color,box-shadow,opacity] motion-reduce:transition-none',
+  'hover:bg-components-slider-knob-hover',
+  'focus-visible:ring-2 focus-visible:ring-components-slider-knob-border-hover focus-visible:ring-offset-0 focus-visible:outline-hidden',
+  'active:shadow-md',
+  'group-data-disabled/slider:border-components-slider-knob-border group-data-disabled/slider:bg-components-slider-knob-disabled group-data-disabled/slider:shadow-none',
+)
+
 type SliderThumbProps = BaseSlider.Thumb.Props
 
+/** @public */
+export function SliderThumb({ className, ...props }: SliderThumbProps) {
+  return (
+    <BaseSlider.Thumb
+      className={cn(sliderThumbClassName, className)}
+      {...props}
+    />
+  )
+}
+
+type SliderSlotClassNames = {
+  control?: string
+  track?: string
+  indicator?: string
+  thumb?: string
+}
+
 type SliderBaseProps = Pick<
   SliderRootProps,
   'onValueChange' | 'min' | 'max' | 'step' | 'disabled' | 'name'
 > & Pick<SliderThumbProps, 'aria-label' | 'aria-labelledby'> & {
   className?: string
+  slotClassNames?: SliderSlotClassNames
 }
 
 type ControlledSliderProps = SliderBaseProps & {
@@ -27,30 +109,6 @@ type UncontrolledSliderProps = SliderBaseProps & {
 type SliderProps = ControlledSliderProps | UncontrolledSliderProps
 
 const sliderRootClassName = 'group/slider relative inline-flex w-full data-disabled:opacity-30'
-const sliderControlClassName = cn(
-  'relative flex h-5 w-full touch-none items-center select-none',
-  'data-disabled:cursor-not-allowed',
-)
-const sliderTrackClassName = cn(
-  'relative h-1 w-full overflow-hidden rounded-full',
-  'bg-(--slider-track,var(--color-components-slider-track))',
-)
-const sliderIndicatorClassName = cn(
-  'h-full rounded-full',
-  'bg-(--slider-range,var(--color-components-slider-range))',
-)
-const sliderThumbClassName = cn(
-  'block h-5 w-2 shrink-0 rounded-[3px] border-[0.5px]',
-  'border-(--slider-knob-border,var(--color-components-slider-knob-border))',
-  'bg-(--slider-knob,var(--color-components-slider-knob)) shadow-sm',
-  'transition-[background-color,border-color,box-shadow,opacity] motion-reduce:transition-none',
-  'hover:bg-(--slider-knob-hover,var(--color-components-slider-knob-hover))',
-  'focus-visible:ring-2 focus-visible:ring-components-slider-knob-border-hover focus-visible:ring-offset-0 focus-visible:outline-hidden',
-  'active:shadow-md',
-  'group-data-disabled/slider:bg-(--slider-knob-disabled,var(--color-components-slider-knob-disabled))',
-  'group-data-disabled/slider:border-(--slider-knob-border,var(--color-components-slider-knob-border))',
-  'group-data-disabled/slider:shadow-none',
-)
 
 const getSafeValue = (value: number | undefined, min: number) => {
   if (value === undefined)
@@ -69,11 +127,12 @@ export function Slider({
   disabled = false,
   name,
   className,
+  slotClassNames,
   'aria-label': ariaLabel,
   'aria-labelledby': ariaLabelledby,
 }: SliderProps) {
   return (
-    <BaseSlider.Root
+    <SliderRoot
       value={getSafeValue(value, min)}
       defaultValue={getSafeValue(defaultValue, min)}
       onValueChange={onValueChange}
@@ -85,16 +144,16 @@ export function Slider({
       thumbAlignment="edge-client-only"
       className={cn(sliderRootClassName, className)}
     >
-      <BaseSlider.Control className={sliderControlClassName}>
-        <BaseSlider.Track className={sliderTrackClassName}>
-          <BaseSlider.Indicator className={sliderIndicatorClassName} />
-        </BaseSlider.Track>
-        <BaseSlider.Thumb
+      <SliderControl className={slotClassNames?.control}>
+        <SliderTrack className={slotClassNames?.track}>
+          <SliderIndicator className={slotClassNames?.indicator} />
+        </SliderTrack>
+        <SliderThumb
           aria-label={ariaLabel}
           aria-labelledby={ariaLabelledby}
-          className={sliderThumbClassName}
+          className={slotClassNames?.thumb}
         />
-      </BaseSlider.Control>
-    </BaseSlider.Root>
+      </SliderControl>
+    </SliderRoot>
   )
 }
diff --git a/web/app/components/billing/pricing/index.tsx b/web/app/components/billing/pricing/index.tsx
index 0873b2dea4..6b943bde7d 100644
--- a/web/app/components/billing/pricing/index.tsx
+++ b/web/app/components/billing/pricing/index.tsx
@@ -28,7 +28,7 @@ type PricingProps = {
 }
 
 const pricingScrollAreaClassNames = {
-  root: 'relative h-full w-full overflow-hidden [--scroll-area-edge-hint-bg:var(--color-saas-background)]',
+  root: 'relative h-full w-full overflow-hidden',
   viewport: 'overscroll-contain',
   content: 'min-h-full min-w-[1200px]',
   verticalScrollbar: 'data-[orientation=vertical]:my-2 data-[orientation=vertical]:me-1',
diff --git a/web/app/components/header/account-setting/menu-dialog.tsx b/web/app/components/header/account-setting/menu-dialog.tsx
index ae2be362fb..f1a0307b0d 100644
--- a/web/app/components/header/account-setting/menu-dialog.tsx
+++ b/web/app/components/header/account-setting/menu-dialog.tsx
@@ -27,7 +27,7 @@ const MenuDialog = ({
       }}
     >
       <DialogContent
-        overlayClassName="bg-transparent"
+        backdropClassName="bg-transparent"
         className={cn(
           'top-0 left-0 h-full max-h-none w-full max-w-none translate-x-0 translate-y-0 overflow-hidden rounded-none border-none bg-background-sidenav-bg p-0 shadow-none backdrop-blur-md',
           className,
diff --git a/web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx b/web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx
index d124705cf1..36a8e6f7fc 100644
--- a/web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx
+++ b/web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx
@@ -24,7 +24,7 @@ const WorkflowOnboardingModal: FC<WorkflowOnboardingModalProps> = ({
     <Dialog open={isShow} onOpenChange={onClose} disablePointerDismissal>
       <DialogContent
         className="w-[618px] max-w-[618px] rounded-2xl border border-effects-highlight bg-background-default-subtle shadow-lg"
-        overlayClassName="bg-workflow-canvas-canvas-overlay"
+        backdropClassName="bg-workflow-canvas-canvas-overlay"
       >
         <DialogCloseButton />
 

From a5ce17009f521682efd001aca8c506bddcebf377 Mon Sep 17 00:00:00 2001
From: Coding On Star <447357187@qq.com>
Date: Fri, 17 Apr 2026 11:37:24 +0800
Subject: [PATCH 27/36] feat(web): add tracking for app preview events in
 AppCard component (#35347)

Co-authored-by: CodingOnStar <hanxujiang@dify.com>
---
 .../app-card/__tests__/index.spec.tsx         | 43 +++++++++++++++++++
 .../app/create-app-dialog/app-card/index.tsx  | 18 +++++---
 .../explore/app-card/__tests__/index.spec.tsx | 22 ++++++++++
 web/app/components/explore/app-card/index.tsx |  8 ++++
 4 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx b/web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx
index 898bde5c71..2d76c12b68 100644
--- a/web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx
+++ b/web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx
@@ -3,6 +3,8 @@ import type { App } from '@/models/explore'
 import type { AppIconType } from '@/types/app'
 import { render, screen, within } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
+import { trackEvent } from '@/app/components/base/amplitude'
+import AppListContext from '@/context/app-list-context'
 import { AppModeEnum } from '@/types/app'
 import AppCard from '../index'
 
@@ -10,6 +12,10 @@ vi.mock('@heroicons/react/20/solid', () => ({
   PlusIcon: ({ className }: any) => <div data-testid="plus-icon" className={className} aria-label="Add icon">+</div>,
 }))
 
+vi.mock('@/app/components/base/amplitude', () => ({
+  trackEvent: vi.fn(),
+}))
+
 const mockApp: App = {
   can_trial: true,
   app: {
@@ -38,12 +44,30 @@ const mockApp: App = {
 }
 
 describe('AppCard', () => {
+  const mockSetShowTryAppPanel = vi.fn()
+  const mockTrackEvent = vi.mocked(trackEvent)
   const defaultProps = {
     app: mockApp,
     canCreate: true,
     onCreate: vi.fn(),
   }
 
+  const renderWithProvider = (ui: React.ReactElement) => {
+    return render(
+      // eslint-disable-next-line react/no-context-provider
+      <AppListContext.Provider
+        value={{
+          currentApp: undefined,
+          isShowTryAppPanel: false,
+          setShowTryAppPanel: mockSetShowTryAppPanel,
+          controlHideCreateFromTemplatePanel: 0,
+        }}
+      >
+        {ui}
+      </AppListContext.Provider>,
+    )
+  }
+
   beforeEach(() => {
     vi.clearAllMocks()
   })
@@ -217,6 +241,25 @@ describe('AppCard', () => {
       // Note: Card click doesn't trigger onCreate, only the button does
       expect(mockOnCreate).not.toHaveBeenCalled()
     })
+
+    it('should track preview event and open try app panel when detail button is clicked', async () => {
+      renderWithProvider(<AppCard {...defaultProps} />)
+
+      const button = screen.getByRole('button', { name: /explore\.appCard\.try/ })
+      await userEvent.click(button)
+
+      expect(mockTrackEvent).toHaveBeenCalledWith('preview_template', {
+        template_id: mockApp.app_id,
+        template_name: mockApp.app.name,
+        template_mode: mockApp.app.mode,
+        template_category: mockApp.category,
+        page: 'studio',
+      })
+      expect(mockSetShowTryAppPanel).toHaveBeenCalledWith(true, {
+        appId: mockApp.app_id,
+        app: mockApp,
+      })
+    })
   })
 
   describe('Keyboard Accessibility', () => {
diff --git a/web/app/components/app/create-app-dialog/app-card/index.tsx b/web/app/components/app/create-app-dialog/app-card/index.tsx
index 9241461608..fef7199ca2 100644
--- a/web/app/components/app/create-app-dialog/app-card/index.tsx
+++ b/web/app/components/app/create-app-dialog/app-card/index.tsx
@@ -6,6 +6,7 @@ import { RiInformation2Line } from '@remixicon/react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useContextSelector } from 'use-context-selector'
+import { trackEvent } from '@/app/components/base/amplitude'
 import AppIcon from '@/app/components/base/app-icon'
 import { Button } from '@/app/components/base/ui/button'
 import AppListContext from '@/context/app-list-context'
@@ -28,11 +29,16 @@ const AppCard = ({
   const { systemFeatures } = useGlobalPublicStore()
   const isTrialApp = app.can_trial && systemFeatures.enable_trial_app
   const setShowTryAppPanel = useContextSelector(AppListContext, ctx => ctx.setShowTryAppPanel)
-  const showTryAPPPanel = useCallback((appId: string) => {
-    return () => {
-      setShowTryAppPanel?.(true, { appId, app })
-    }
-  }, [setShowTryAppPanel, app.category])
+  const handleShowTryAppPanel = useCallback(() => {
+    trackEvent('preview_template', {
+      template_id: app.app_id,
+      template_name: appBasicInfo.name,
+      template_mode: appBasicInfo.mode,
+      template_category: app.category,
+      page: 'studio',
+    })
+    setShowTryAppPanel?.(true, { appId: app.app_id, app })
+  }, [setShowTryAppPanel, app, appBasicInfo])
   return (
     <div className={cn('group relative flex h-[132px] cursor-pointer flex-col overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-on-panel-item-bg p-4 shadow-xs hover:shadow-lg')}>
       <div className="flex shrink-0 grow-0 items-center gap-3 pb-2">
@@ -71,7 +77,7 @@ const AppCard = ({
                 <span className="text-xs">{t('newApp.useTemplate', { ns: 'app' })}</span>
               </Button>
             )}
-            <Button onClick={showTryAPPPanel(app.app_id)}>
+            <Button onClick={handleShowTryAppPanel}>
               <RiInformation2Line className="mr-1 size-4" />
               <span>{t('appCard.try', { ns: 'explore' })}</span>
             </Button>
diff --git a/web/app/components/explore/app-card/__tests__/index.spec.tsx b/web/app/components/explore/app-card/__tests__/index.spec.tsx
index 2180980ee9..c42f6f1d32 100644
--- a/web/app/components/explore/app-card/__tests__/index.spec.tsx
+++ b/web/app/components/explore/app-card/__tests__/index.spec.tsx
@@ -2,6 +2,7 @@ import type { AppCardProps } from '../index'
 import type { App } from '@/models/explore'
 import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
+import { trackEvent } from '@/app/components/base/amplitude'
 import { AppModeEnum } from '@/types/app'
 import AppCard from '../index'
 
@@ -9,6 +10,10 @@ vi.mock('../../../app/type-selector', () => ({
   AppTypeIcon: ({ type }: { type: string }) => <div data-testid="app-type-icon">{type}</div>,
 }))
 
+vi.mock('@/app/components/base/amplitude', () => ({
+  trackEvent: vi.fn(),
+}))
+
 const createApp = (overrides?: Partial<App>): App => ({
   can_trial: true,
   app_id: 'app-id',
@@ -41,6 +46,7 @@ const createApp = (overrides?: Partial<App>): App => ({
 describe('AppCard', () => {
   const onCreate = vi.fn()
   const onTry = vi.fn()
+  const mockTrackEvent = vi.mocked(trackEvent)
 
   const renderComponent = (props?: Partial<AppCardProps>) => {
     const mergedProps: AppCardProps = {
@@ -148,5 +154,21 @@ describe('AppCard', () => {
 
       expect(onTry).toHaveBeenCalledWith({ appId: 'app-id', app })
     })
+
+    it('should track preview event when detail button is clicked', () => {
+      const app = createApp()
+
+      renderComponent({ app, canCreate: true, isExplore: true })
+
+      fireEvent.click(screen.getByText('explore.appCard.try'))
+
+      expect(mockTrackEvent).toHaveBeenCalledWith('preview_template', {
+        template_id: app.app_id,
+        template_name: app.app.name,
+        template_mode: app.app.mode,
+        template_category: app.category,
+        page: 'explore',
+      })
+    })
   })
 })
diff --git a/web/app/components/explore/app-card/index.tsx b/web/app/components/explore/app-card/index.tsx
index d88eddc2cf..00e21de7d6 100644
--- a/web/app/components/explore/app-card/index.tsx
+++ b/web/app/components/explore/app-card/index.tsx
@@ -5,6 +5,7 @@ import { PlusIcon } from '@heroicons/react/20/solid'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiInformation2Line } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
+import { trackEvent } from '@/app/components/base/amplitude'
 import AppIcon from '@/app/components/base/app-icon'
 import { Button } from '@/app/components/base/ui/button'
 import { useGlobalPublicStore } from '@/context/global-public-context'
@@ -31,6 +32,13 @@ const AppCard = ({
   const { systemFeatures } = useGlobalPublicStore()
   const isTrialApp = app.can_trial && systemFeatures.enable_trial_app
   const handleTryApp = () => {
+    trackEvent('preview_template', {
+      template_id: app.app_id,
+      template_name: appBasicInfo.name,
+      template_mode: appBasicInfo.mode,
+      template_category: app.category,
+      page: 'explore',
+    })
     onTry({ appId: app.app_id, app })
   }
 

From 37714cb44ec9e272f85ee85703df304b4ae0fa95 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2026 12:40:49 +0900
Subject: [PATCH 28/36] chore(deps): bump authlib from 1.6.9 to 1.6.11 in /api
 (#35341)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 api/uv.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/uv.lock b/api/uv.lock
index 854c82d747..e739040efd 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -371,14 +371,14 @@ wheels = [
 
 [[package]]
 name = "authlib"
-version = "1.6.9"
+version = "1.6.11"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cryptography" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/af/98/00d3dd826d46959ad8e32af2dbb2398868fd9fd0683c26e56d0789bd0e68/authlib-1.6.9.tar.gz", hash = "sha256:d8f2421e7e5980cc1ddb4e32d3f5fa659cfaf60d8eaf3281ebed192e4ab74f04", size = 165134, upload-time = "2026-03-02T07:44:01.998Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/28/10/b325d58ffe86815b399334a101e63bc6fa4e1953921cb23703b48a0a0220/authlib-1.6.11.tar.gz", hash = "sha256:64db35b9b01aeccb4715a6c9a6613a06f2bd7be2ab9d2eb89edd1dfc7580a38f", size = 165359, upload-time = "2026-04-16T07:22:50.279Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/53/23/b65f568ed0c22f1efacb744d2db1a33c8068f384b8c9b482b52ebdbc3ef6/authlib-1.6.9-py2.py3-none-any.whl", hash = "sha256:f08b4c14e08f0861dc18a32357b33fbcfd2ea86cfe3fe149484b4d764c4a0ac3", size = 244197, upload-time = "2026-03-02T07:44:00.307Z" },
+    { url = "https://files.pythonhosted.org/packages/57/2f/55fca558f925a51db046e5b929deb317ddb05afed74b22d89f4eca578980/authlib-1.6.11-py2.py3-none-any.whl", hash = "sha256:c8687a9a26451c51a34a06fa17bb97cb15bba46a6a626755e2d7f50da8bff3e3", size = 244469, upload-time = "2026-04-16T07:22:48.413Z" },
 ]
 
 [[package]]

From ed14f586973ebd6b2b0da12d8380e599bcacfd77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2026 12:40:58 +0900
Subject: [PATCH 29/36] chore(deps): bump mako from 1.3.10 to 1.3.11 in /api
 (#35340)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 api/uv.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/uv.lock b/api/uv.lock
index e739040efd..d1412fdf82 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -3586,14 +3586,14 @@ wheels = [
 
 [[package]]
 name = "mako"
-version = "1.3.10"
+version = "1.3.11"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "markupsafe" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/9e/38/bd5b78a920a64d708fe6bc8e0a2c075e1389d53bef8413725c63ba041535/mako-1.3.10.tar.gz", hash = "sha256:99579a6f39583fa7e5630a28c3c1f440e4e97a414b80372649c0ce338da2ea28", size = 392474, upload-time = "2025-04-10T12:44:31.16Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/59/8a/805404d0c0b9f3d7a326475ca008db57aea9c5c9f2e1e39ed0faa335571c/mako-1.3.11.tar.gz", hash = "sha256:071eb4ab4c5010443152255d77db7faa6ce5916f35226eb02dc34479b6858069", size = 399811, upload-time = "2026-04-14T20:19:51.493Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/87/fb/99f81ac72ae23375f22b7afdb7642aba97c00a713c217124420147681a2f/mako-1.3.10-py3-none-any.whl", hash = "sha256:baef24a52fc4fc514a0887ac600f9f1cff3d82c61d4d700a1fa84d597b88db59", size = 78509, upload-time = "2025-04-10T12:50:53.297Z" },
+    { url = "https://files.pythonhosted.org/packages/68/a5/19d7aaa7e433713ffe881df33705925a196afb9532efc8475d26593921a6/mako-1.3.11-py3-none-any.whl", hash = "sha256:e372c6e333cf004aa736a15f425087ec977e1fcbd2966aae7f17c8dc1da27a77", size = 78503, upload-time = "2026-04-14T20:19:53.233Z" },
 ]
 
 [[package]]

From 73962302238aae62c2b80a7989d31486ae3fe88e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2026 12:41:02 +0900
Subject: [PATCH 30/36] chore(deps): bump pypdf from 6.10.1 to 6.10.2 in /api
 (#35339)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 api/uv.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/uv.lock b/api/uv.lock
index d1412fdf82..77ba905a67 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -5113,11 +5113,11 @@ wheels = [
 
 [[package]]
 name = "pypdf"
-version = "6.10.1"
+version = "6.10.2"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/66/79/f2730c42ec7891a75a2fcea2eb4f356872bcbc671b711418060424796612/pypdf-6.10.1.tar.gz", hash = "sha256:62e6ca7f65aaa28b3d192addb44f97296e4be1748f57ed0f4efb2d4915841880", size = 5315704, upload-time = "2026-04-14T12:55:20.996Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/7b/3f/9f2167401c2e94833ca3b69535bad89e533b5de75fefe4197a2c224baec2/pypdf-6.10.2.tar.gz", hash = "sha256:7d09ce108eff6bf67465d461b6ef352dcb8d84f7a91befc02f904455c6eea11d", size = 5315679, upload-time = "2026-04-15T16:37:36.978Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f0/04/e3aa7f1f14dbc53429cae34666261eb935d99bd61d24756ab94d7e0309da/pypdf-6.10.1-py3-none-any.whl", hash = "sha256:6331940d3bfe75b7e6601d35db7adabab5fc1d716efaeb384e3c0c3957d033de", size = 335606, upload-time = "2026-04-14T12:55:18.941Z" },
+    { url = "https://files.pythonhosted.org/packages/0c/d6/1d5c60cc17bbdf37c1552d9c03862fc6d32c5836732a0415b2d637edc2d0/pypdf-6.10.2-py3-none-any.whl", hash = "sha256:aa53be9826655b51c96741e5d7983ca224d898ac0a77896e64636810517624aa", size = 336308, upload-time = "2026-04-15T16:37:34.851Z" },
 ]
 
 [[package]]

From f07f9ee7a3e7367c22165d5e75f0a738d7e74698 Mon Sep 17 00:00:00 2001
From: jerryzai <jerryzh8710@protonmail.com>
Date: Thu, 16 Apr 2026 23:59:41 -0400
Subject: [PATCH 31/36] chore(api): migrate event handlers to use
 Session(db.engine) (#35234)

---
 .../event_handlers/create_document_index.py   | 31 ++++++++++---------
 .../create_installed_app_when_app_created.py  |  7 +++--
 .../create_site_record_when_app_created.py    |  8 ++---
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/api/events/event_handlers/create_document_index.py b/api/events/event_handlers/create_document_index.py
index b7e7a6e60f..0c535a1c5b 100644
--- a/api/events/event_handlers/create_document_index.py
+++ b/api/events/event_handlers/create_document_index.py
@@ -6,9 +6,9 @@ import click
 from sqlalchemy import select
 from werkzeug.exceptions import NotFound
 
+from core.db.session_factory import session_factory
 from core.indexing_runner import DocumentIsPausedError, IndexingRunner
 from events.document_index_event import document_index_created
-from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from models.dataset import Document
 from models.enums import IndexingStatus
@@ -22,24 +22,25 @@ def handle(sender, **kwargs):
     document_ids = kwargs.get("document_ids", [])
     documents = []
     start_at = time.perf_counter()
-    for document_id in document_ids:
-        logger.info(click.style(f"Start process document: {document_id}", fg="green"))
+    with session_factory.create_session() as session:
+        for document_id in document_ids:
+            logger.info(click.style(f"Start process document: {document_id}", fg="green"))
 
-        document = db.session.scalar(
-            select(Document).where(
-                Document.id == document_id,
-                Document.dataset_id == dataset_id,
+            document = session.scalar(
+                select(Document).where(
+                    Document.id == document_id,
+                    Document.dataset_id == dataset_id,
+                )
             )
-        )
 
-        if not document:
-            raise NotFound("Document not found")
+            if not document:
+                raise NotFound("Document not found")
 
-        document.indexing_status = IndexingStatus.PARSING
-        document.processing_started_at = naive_utc_now()
-        documents.append(document)
-        db.session.add(document)
-    db.session.commit()
+            document.indexing_status = IndexingStatus.PARSING
+            document.processing_started_at = naive_utc_now()
+            documents.append(document)
+            session.add(document)
+        session.commit()
 
     with contextlib.suppress(Exception):
         try:
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 57412cc4ad..38e102d5fd 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,5 +1,5 @@
+from core.db.session_factory import session_factory
 from events.app_event import app_was_created
-from extensions.ext_database import db
 from models.model import InstalledApp
 
 
@@ -12,5 +12,6 @@ def handle(sender, **kwargs):
         app_id=app.id,
         app_owner_tenant_id=app.tenant_id,
     )
-    db.session.add(installed_app)
-    db.session.commit()
+    with session_factory.create_session() as session:
+        session.add(installed_app)
+        session.commit()
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 84be592b1a..5e2a456dce 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,5 +1,5 @@
+from core.db.session_factory import session_factory
 from events.app_event import app_was_created
-from extensions.ext_database import db
 from models.enums import CustomizeTokenStrategy
 from models.model import Site
 
@@ -22,6 +22,6 @@ def handle(sender, **kwargs):
             created_by=app.created_by,
             updated_by=app.updated_by,
         )
-
-        db.session.add(site)
-        db.session.commit()
+        with session_factory.create_session() as session:
+            session.add(site)
+            session.commit()

From 13a935919182b059739be37282b4678724277113 Mon Sep 17 00:00:00 2001
From: NVIDIAN <speedy.hpc@hotmail.com>
Date: Thu, 16 Apr 2026 21:16:14 -0700
Subject: [PATCH 32/36] refactor(api): migrate console mcp-server responses to
 BaseModel (#35219)

Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
---
 api/controllers/console/app/mcp_server.py     | 32 +++++----
 .../console/app/test_mcp_server_response.py   | 70 ++++++++++++++++++-
 2 files changed, 88 insertions(+), 14 deletions(-)

diff --git a/api/controllers/console/app/mcp_server.py b/api/controllers/console/app/mcp_server.py
index 5b1abc98dc..d517f695b8 100644
--- a/api/controllers/console/app/mcp_server.py
+++ b/api/controllers/console/app/mcp_server.py
@@ -18,12 +18,6 @@ from models.enums import AppMCPServerStatus
 from models.model import AppMCPServer
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class MCPServerCreatePayload(BaseModel):
     description: str | None = Field(default=None, description="Server description")
     parameters: dict[str, Any] = Field(..., description="Server parameters configuration")
@@ -36,19 +30,25 @@ class MCPServerUpdatePayload(BaseModel):
     status: str | None = Field(default=None, description="Server status")
 
 
+def _to_timestamp(value: datetime | int | None) -> int | None:
+    if isinstance(value, datetime):
+        return int(value.timestamp())
+    return value
+
+
 class AppMCPServerResponse(ResponseModel):
     id: str
     name: str
     server_code: str
     description: str
-    status: str
+    status: AppMCPServerStatus
     parameters: dict[str, Any] | list[Any] | str
     created_at: int | None = None
     updated_at: int | None = None
 
     @field_validator("parameters", mode="before")
     @classmethod
-    def _parse_json_string(cls, value: Any) -> Any:
+    def _normalize_parameters(cls, value: Any) -> Any:
         if isinstance(value, str):
             try:
                 return json.loads(value)
@@ -70,7 +70,9 @@ class AppMCPServerController(Resource):
     @console_ns.doc("get_app_mcp_server")
     @console_ns.doc(description="Get MCP server configuration for an application")
     @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Server configuration", console_ns.models[AppMCPServerResponse.__name__])
+    @console_ns.response(
+        200, "MCP server configuration retrieved successfully", console_ns.models[AppMCPServerResponse.__name__]
+    )
     @login_required
     @account_initialization_required
     @setup_required
@@ -85,7 +87,9 @@ class AppMCPServerController(Resource):
     @console_ns.doc(description="Create MCP server configuration for an application")
     @console_ns.doc(params={"app_id": "Application ID"})
     @console_ns.expect(console_ns.models[MCPServerCreatePayload.__name__])
-    @console_ns.response(200, "Server created", console_ns.models[AppMCPServerResponse.__name__])
+    @console_ns.response(
+        201, "MCP server configuration created successfully", console_ns.models[AppMCPServerResponse.__name__]
+    )
     @console_ns.response(403, "Insufficient permissions")
     @account_initialization_required
     @get_app_model
@@ -111,13 +115,15 @@ class AppMCPServerController(Resource):
         )
         db.session.add(server)
         db.session.commit()
-        return AppMCPServerResponse.model_validate(server, from_attributes=True).model_dump(mode="json")
+        return AppMCPServerResponse.model_validate(server, from_attributes=True).model_dump(mode="json"), 201
 
     @console_ns.doc("update_app_mcp_server")
     @console_ns.doc(description="Update MCP server configuration for an application")
     @console_ns.doc(params={"app_id": "Application ID"})
     @console_ns.expect(console_ns.models[MCPServerUpdatePayload.__name__])
-    @console_ns.response(200, "Server updated", console_ns.models[AppMCPServerResponse.__name__])
+    @console_ns.response(
+        200, "MCP server configuration updated successfully", console_ns.models[AppMCPServerResponse.__name__]
+    )
     @console_ns.response(403, "Insufficient permissions")
     @console_ns.response(404, "Server not found")
     @get_app_model
@@ -154,7 +160,7 @@ class AppMCPServerRefreshController(Resource):
     @console_ns.doc("refresh_app_mcp_server")
     @console_ns.doc(description="Refresh MCP server configuration and regenerate server code")
     @console_ns.doc(params={"server_id": "Server ID"})
-    @console_ns.response(200, "Server refreshed", console_ns.models[AppMCPServerResponse.__name__])
+    @console_ns.response(200, "MCP server refreshed successfully", console_ns.models[AppMCPServerResponse.__name__])
     @console_ns.response(403, "Insufficient permissions")
     @console_ns.response(404, "Server not found")
     @setup_required
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 baac4cd4e0..1af15d8dc6 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
@@ -1,6 +1,25 @@
 import datetime
+from types import SimpleNamespace
+from unittest.mock import PropertyMock, patch
 
-from controllers.console.app.mcp_server import AppMCPServerResponse
+from flask import Flask
+
+from controllers.console import console_ns
+from controllers.console.app.mcp_server import AppMCPServerController, AppMCPServerResponse
+
+
+def unwrap(func):
+    while hasattr(func, "__wrapped__"):
+        func = func.__wrapped__
+    return func
+
+
+class _ValidatedResponse:
+    def __init__(self, payload):
+        self._payload = payload
+
+    def model_dump(self, mode="json"):
+        return self._payload
 
 
 class TestAppMCPServerResponse:
@@ -40,6 +59,18 @@ class TestAppMCPServerResponse:
         resp = AppMCPServerResponse.model_validate(data)
         assert resp.parameters == {"already": "parsed"}
 
+    def test_parameters_json_array_parsed(self):
+        data = {
+            "id": "s1",
+            "name": "test",
+            "server_code": "code",
+            "description": "desc",
+            "status": "active",
+            "parameters": '["a", "b"]',
+        }
+        resp = AppMCPServerResponse.model_validate(data)
+        assert resp.parameters == ["a", "b"]
+
     def test_timestamps_normalized(self):
         dt = datetime.datetime(2024, 1, 1, 0, 0, 0, tzinfo=datetime.UTC)
         data = {
@@ -68,3 +99,40 @@ class TestAppMCPServerResponse:
         resp = AppMCPServerResponse.model_validate(data)
         assert resp.created_at is None
         assert resp.updated_at is None
+
+
+class TestAppMCPServerController:
+    def test_get_returns_empty_dict_when_server_missing(self):
+        api = AppMCPServerController()
+        method = unwrap(api.get)
+
+        with patch("controllers.console.app.mcp_server.db.session.scalar", return_value=None):
+            response = method(api, app_model=SimpleNamespace(id="app-1"))
+
+        assert response == {}
+
+    def test_post_returns_201(self):
+        api = AppMCPServerController()
+        method = unwrap(api.post)
+        payload = {"parameters": {"timeout": 30}}
+        app = Flask(__name__)
+        app.config["TESTING"] = True
+
+        with (
+            app.test_request_context("/", json=payload),
+            patch.object(type(console_ns), "payload", new_callable=PropertyMock, return_value=payload),
+            patch("controllers.console.app.mcp_server.current_account_with_tenant", return_value=(None, "tenant-1")),
+            patch("controllers.console.app.mcp_server.db.session.add"),
+            patch("controllers.console.app.mcp_server.db.session.commit"),
+            patch("controllers.console.app.mcp_server.AppMCPServer.generate_server_code", return_value="server-code"),
+            patch(
+                "controllers.console.app.mcp_server.AppMCPServerResponse.model_validate",
+                return_value=_ValidatedResponse({"id": "server-1"}),
+            ),
+        ):
+            response, status_code = method(
+                api, app_model=SimpleNamespace(id="app-1", name="Demo App", description="App description")
+            )
+
+        assert response == {"id": "server-1"}
+        assert status_code == 201

From dc3f992e6edcb2f8d2a253c011c7dd55412772f5 Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Fri, 17 Apr 2026 12:58:16 +0800
Subject: [PATCH 33/36] docs(web): add Storybook stories for overlay and select
 primitives (#35334)

---
 .../base/ui/alert-dialog/index.stories.tsx    | 179 ++++++++++
 .../base/ui/avatar/index.stories.tsx          |   2 +-
 .../base/ui/button/index.stories.tsx          |   2 +-
 .../base/ui/context-menu/index.stories.tsx    |   2 +-
 .../base/ui/dialog/index.stories.tsx          | 176 ++++++++++
 .../base/ui/dropdown-menu/index.stories.tsx   |   2 +-
 .../base/ui/number-field/index.stories.tsx    |   2 +-
 .../base/ui/popover/index.stories.tsx         | 199 +++++++++++
 .../base/ui/scroll-area/index.stories.tsx     |   2 +-
 .../base/ui/select/index.stories.tsx          | 312 ++++++++++++++++++
 .../base/ui/slider/index.stories.tsx          |   2 +-
 .../base/ui/toast/index.stories.tsx           |   2 +-
 .../base/ui/tooltip/index.stories.tsx         | 247 ++++++++++++++
 13 files changed, 1121 insertions(+), 8 deletions(-)
 create mode 100644 web/app/components/base/ui/alert-dialog/index.stories.tsx
 create mode 100644 web/app/components/base/ui/dialog/index.stories.tsx
 create mode 100644 web/app/components/base/ui/popover/index.stories.tsx
 create mode 100644 web/app/components/base/ui/select/index.stories.tsx
 create mode 100644 web/app/components/base/ui/tooltip/index.stories.tsx

diff --git a/web/app/components/base/ui/alert-dialog/index.stories.tsx b/web/app/components/base/ui/alert-dialog/index.stories.tsx
new file mode 100644
index 0000000000..c9deaa53ed
--- /dev/null
+++ b/web/app/components/base/ui/alert-dialog/index.stories.tsx
@@ -0,0 +1,179 @@
+import type { Meta, StoryObj } from '@storybook/nextjs-vite'
+import { useState } from 'react'
+import {
+  AlertDialog,
+  AlertDialogActions,
+  AlertDialogCancelButton,
+  AlertDialogConfirmButton,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from '.'
+import { Button } from '../button'
+
+const triggerButtonClassName = 'rounded-lg border border-divider-subtle bg-components-button-secondary-bg px-3 py-1.5 text-sm text-text-secondary shadow-xs hover:bg-state-base-hover'
+
+const meta = {
+  title: 'Base/UI/AlertDialog',
+  component: AlertDialog,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Compound alert dialog built on Base UI AlertDialog. Use it for destructive or high-risk confirmations that require an explicit user decision. Compose title, description, and actions via `AlertDialogActions`, `AlertDialogCancelButton`, and `AlertDialogConfirmButton`.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof AlertDialog>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: () => (
+    <AlertDialog>
+      <AlertDialogTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Delete project
+      </AlertDialogTrigger>
+      <AlertDialogContent>
+        <div className="flex flex-col gap-2 p-6 pb-4">
+          <AlertDialogTitle className="text-lg leading-7 font-semibold text-text-primary">
+            Delete project?
+          </AlertDialogTitle>
+          <AlertDialogDescription className="text-sm leading-5 text-text-secondary">
+            This action cannot be undone. All workflows, datasets, and API keys will be permanently removed.
+          </AlertDialogDescription>
+        </div>
+        <AlertDialogActions>
+          <AlertDialogCancelButton variant="secondary">Cancel</AlertDialogCancelButton>
+          <AlertDialogConfirmButton>Delete</AlertDialogConfirmButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
+  ),
+}
+
+export const NonDestructive: Story = {
+  render: () => (
+    <AlertDialog>
+      <AlertDialogTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Publish changes
+      </AlertDialogTrigger>
+      <AlertDialogContent>
+        <div className="flex flex-col gap-2 p-6 pb-4">
+          <AlertDialogTitle className="text-lg leading-7 font-semibold text-text-primary">
+            Publish the latest draft?
+          </AlertDialogTitle>
+          <AlertDialogDescription className="text-sm leading-5 text-text-secondary">
+            Collaborators will immediately see the new workflow. You can still revert from version history.
+          </AlertDialogDescription>
+        </div>
+        <AlertDialogActions>
+          <AlertDialogCancelButton variant="secondary">Not now</AlertDialogCancelButton>
+          <AlertDialogConfirmButton tone="default">Publish</AlertDialogConfirmButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
+  ),
+}
+
+const ControlledDemo = () => {
+  const [open, setOpen] = useState(false)
+  const [count, setCount] = useState(0)
+
+  return (
+    <div className="flex flex-col items-center gap-3">
+      <Button variant="secondary" onClick={() => setOpen(true)}>
+        Open controlled dialog
+      </Button>
+      <span className="text-xs text-text-tertiary">
+        Confirmed
+        {count}
+        {' '}
+        times
+      </span>
+      <AlertDialog open={open} onOpenChange={setOpen}>
+        <AlertDialogContent>
+          <div className="flex flex-col gap-2 p-6 pb-4">
+            <AlertDialogTitle className="text-lg leading-7 font-semibold text-text-primary">
+              Revoke API token?
+            </AlertDialogTitle>
+            <AlertDialogDescription className="text-sm leading-5 text-text-secondary">
+              Any integration using this token will immediately stop working. You can issue a new token afterwards.
+            </AlertDialogDescription>
+          </div>
+          <AlertDialogActions>
+            <AlertDialogCancelButton variant="secondary">Keep token</AlertDialogCancelButton>
+            <AlertDialogConfirmButton
+              onClick={() => {
+                setCount(prev => prev + 1)
+                setOpen(false)
+              }}
+            >
+              Revoke
+            </AlertDialogConfirmButton>
+          </AlertDialogActions>
+        </AlertDialogContent>
+      </AlertDialog>
+    </div>
+  )
+}
+
+export const Controlled: Story = {
+  render: () => <ControlledDemo />,
+}
+
+const LoadingConfirmDemo = () => {
+  const [pending, setPending] = useState(false)
+  const [open, setOpen] = useState(false)
+
+  const handleConfirm = () => {
+    setPending(true)
+    window.setTimeout(() => {
+      setPending(false)
+      setOpen(false)
+    }, 1200)
+  }
+
+  return (
+    <AlertDialog open={open} onOpenChange={setOpen}>
+      <AlertDialogTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Archive workspace
+      </AlertDialogTrigger>
+      <AlertDialogContent>
+        <div className="flex flex-col gap-2 p-6 pb-4">
+          <AlertDialogTitle className="text-lg leading-7 font-semibold text-text-primary">
+            Archive this workspace?
+          </AlertDialogTitle>
+          <AlertDialogDescription className="text-sm leading-5 text-text-secondary">
+            Members will lose access until the workspace is restored. This may take a moment to finalize.
+          </AlertDialogDescription>
+        </div>
+        <AlertDialogActions>
+          <AlertDialogCancelButton variant="secondary" disabled={pending}>
+            Cancel
+          </AlertDialogCancelButton>
+          <AlertDialogConfirmButton
+            tone="default"
+            loading={pending}
+            onClick={handleConfirm}
+          >
+            {pending ? 'Archiving…' : 'Archive'}
+          </AlertDialogConfirmButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
+  )
+}
+
+export const LoadingConfirm: Story = {
+  render: () => <LoadingConfirmDemo />,
+}
diff --git a/web/app/components/base/ui/avatar/index.stories.tsx b/web/app/components/base/ui/avatar/index.stories.tsx
index abb3c99771..22de82e6db 100644
--- a/web/app/components/base/ui/avatar/index.stories.tsx
+++ b/web/app/components/base/ui/avatar/index.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/nextjs-vite'
 import { Avatar, AvatarFallback, AvatarRoot } from '.'
 
 const meta = {
-  title: 'Base/Data Display/Avatar',
+  title: 'Base/UI/Avatar',
   component: Avatar,
   parameters: {
     docs: {
diff --git a/web/app/components/base/ui/button/index.stories.tsx b/web/app/components/base/ui/button/index.stories.tsx
index 9552452a22..40dce31dd4 100644
--- a/web/app/components/base/ui/button/index.stories.tsx
+++ b/web/app/components/base/ui/button/index.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/nextjs-vite'
 import { Button } from '.'
 
 const meta = {
-  title: 'Base/General/Button',
+  title: 'Base/UI/Button',
   component: Button,
   parameters: {
     layout: 'centered',
diff --git a/web/app/components/base/ui/context-menu/index.stories.tsx b/web/app/components/base/ui/context-menu/index.stories.tsx
index 60cf4c1377..b3b43399f6 100644
--- a/web/app/components/base/ui/context-menu/index.stories.tsx
+++ b/web/app/components/base/ui/context-menu/index.stories.tsx
@@ -29,7 +29,7 @@ const TriggerArea = ({ label = 'Right-click inside this area' }: { label?: strin
 )
 
 const meta = {
-  title: 'Base/Navigation/ContextMenu',
+  title: 'Base/UI/ContextMenu',
   component: ContextMenu,
   parameters: {
     layout: 'centered',
diff --git a/web/app/components/base/ui/dialog/index.stories.tsx b/web/app/components/base/ui/dialog/index.stories.tsx
new file mode 100644
index 0000000000..0e8f478520
--- /dev/null
+++ b/web/app/components/base/ui/dialog/index.stories.tsx
@@ -0,0 +1,176 @@
+import type { Meta, StoryObj } from '@storybook/nextjs-vite'
+import { useState } from 'react'
+import {
+  Dialog,
+  DialogCloseButton,
+  DialogContent,
+  DialogDescription,
+  DialogTitle,
+  DialogTrigger,
+} from '.'
+import { Button } from '../button'
+
+const triggerButtonClassName = 'rounded-lg border border-divider-subtle bg-components-button-secondary-bg px-3 py-1.5 text-sm text-text-secondary shadow-xs hover:bg-state-base-hover'
+
+const meta = {
+  title: 'Base/UI/Dialog',
+  component: Dialog,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Compound modal dialog built on Base UI Dialog. Use it for focused flows that interrupt the user, such as editing settings, confirming non-destructive actions, or collecting short-form input. Compose `DialogTitle`, `DialogDescription`, and optional `DialogCloseButton` inside `DialogContent`.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof Dialog>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: () => (
+    <Dialog>
+      <DialogTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Open dialog
+      </DialogTrigger>
+      <DialogContent>
+        <DialogCloseButton />
+        <div className="flex flex-col gap-2 pr-8">
+          <DialogTitle className="text-lg leading-7 font-semibold text-text-primary">
+            Invite collaborators
+          </DialogTitle>
+          <DialogDescription className="text-sm leading-5 text-text-secondary">
+            Add teammates by email to share this workspace. They will receive an invitation link.
+          </DialogDescription>
+        </div>
+        <div className="mt-5 flex flex-col gap-2">
+          <label className="text-xs font-medium text-text-tertiary" htmlFor="invite-email">
+            Email address
+          </label>
+          <input
+            id="invite-email"
+            type="email"
+            placeholder="teammate@example.com"
+            className="h-9 w-full rounded-lg border-[0.5px] border-components-input-border-active bg-components-input-bg-normal px-3 text-sm text-components-input-text-filled outline-hidden placeholder:text-components-input-text-placeholder focus:border-components-input-border-hover"
+          />
+        </div>
+        <div className="mt-6 flex items-center justify-end">
+          <Button variant="primary">Send invite</Button>
+        </div>
+      </DialogContent>
+    </Dialog>
+  ),
+}
+
+export const WithoutCloseButton: Story = {
+  render: () => (
+    <Dialog>
+      <DialogTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Start onboarding
+      </DialogTrigger>
+      <DialogContent>
+        <div className="flex flex-col gap-2">
+          <DialogTitle className="text-lg leading-7 font-semibold text-text-primary">
+            Welcome to Dify
+          </DialogTitle>
+          <DialogDescription className="text-sm leading-5 text-text-secondary">
+            Let's get your workspace ready. This takes about a minute and sets up your default models, datasets, and API keys.
+          </DialogDescription>
+        </div>
+        <div className="mt-6 flex items-center justify-end gap-2">
+          <Button variant="secondary">Skip for now</Button>
+          <Button variant="primary">Start setup</Button>
+        </div>
+      </DialogContent>
+    </Dialog>
+  ),
+}
+
+const ControlledDemo = () => {
+  const [open, setOpen] = useState(false)
+
+  return (
+    <div className="flex flex-col items-center gap-3">
+      <Button variant="secondary" onClick={() => setOpen(true)}>
+        Open controlled dialog
+      </Button>
+      <span className="text-xs text-text-tertiary">
+        State:
+        {' '}
+        {open ? 'open' : 'closed'}
+      </span>
+      <Dialog open={open} onOpenChange={setOpen}>
+        <DialogContent>
+          <DialogCloseButton />
+          <div className="flex flex-col gap-2 pr-8">
+            <DialogTitle className="text-lg leading-7 font-semibold text-text-primary">
+              Rename workspace
+            </DialogTitle>
+            <DialogDescription className="text-sm leading-5 text-text-secondary">
+              The workspace URL will stay the same, but the display name updates everywhere.
+            </DialogDescription>
+          </div>
+          <input
+            type="text"
+            defaultValue="Acme Workspace"
+            className="mt-4 h-9 w-full rounded-lg border-[0.5px] border-components-input-border-active bg-components-input-bg-normal px-3 text-sm text-components-input-text-filled outline-hidden focus:border-components-input-border-hover"
+          />
+          <div className="mt-6 flex items-center justify-end gap-2">
+            <Button variant="secondary" onClick={() => setOpen(false)}>
+              Cancel
+            </Button>
+            <Button variant="primary" onClick={() => setOpen(false)}>
+              Save
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
+    </div>
+  )
+}
+
+export const Controlled: Story = {
+  render: () => <ControlledDemo />,
+}
+
+export const ScrollingContent: Story = {
+  render: () => (
+    <Dialog>
+      <DialogTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Review release notes
+      </DialogTrigger>
+      <DialogContent>
+        <DialogCloseButton />
+        <div className="flex flex-col gap-2 pr-8">
+          <DialogTitle className="text-lg leading-7 font-semibold text-text-primary">
+            Release notes
+          </DialogTitle>
+          <DialogDescription className="text-sm leading-5 text-text-secondary">
+            Highlights from the latest workspace update.
+          </DialogDescription>
+        </div>
+        <ul className="mt-4 flex flex-col gap-3 text-sm leading-5 text-text-secondary">
+          {Array.from({ length: 24 }, (_, index) => `improvement-${index + 1}`).map((id, index) => (
+            <li key={id} className="rounded-lg bg-background-default-subtle px-3 py-2">
+              <span className="font-medium text-text-primary">
+                Improvement #
+                {index + 1}
+                :
+              </span>
+              {' '}
+              Refined a workflow behavior so long content naturally overflows and scrolls inside the dialog.
+            </li>
+          ))}
+        </ul>
+      </DialogContent>
+    </Dialog>
+  ),
+}
diff --git a/web/app/components/base/ui/dropdown-menu/index.stories.tsx b/web/app/components/base/ui/dropdown-menu/index.stories.tsx
index e87543f4ff..ae0ad61c68 100644
--- a/web/app/components/base/ui/dropdown-menu/index.stories.tsx
+++ b/web/app/components/base/ui/dropdown-menu/index.stories.tsx
@@ -28,7 +28,7 @@ const TriggerButton = ({ label = 'Open Menu' }: { label?: string }) => (
 )
 
 const meta = {
-  title: 'Base/Navigation/DropdownMenu',
+  title: 'Base/UI/DropdownMenu',
   component: DropdownMenu,
   parameters: {
     layout: 'centered',
diff --git a/web/app/components/base/ui/number-field/index.stories.tsx b/web/app/components/base/ui/number-field/index.stories.tsx
index 7fcf41325e..6abb93bf11 100644
--- a/web/app/components/base/ui/number-field/index.stories.tsx
+++ b/web/app/components/base/ui/number-field/index.stories.tsx
@@ -108,7 +108,7 @@ const DemoField = ({
 }
 
 const meta = {
-  title: 'Base/Form/NumberField',
+  title: 'Base/UI/NumberField',
   component: NumberField,
   parameters: {
     layout: 'centered',
diff --git a/web/app/components/base/ui/popover/index.stories.tsx b/web/app/components/base/ui/popover/index.stories.tsx
new file mode 100644
index 0000000000..8dbae184de
--- /dev/null
+++ b/web/app/components/base/ui/popover/index.stories.tsx
@@ -0,0 +1,199 @@
+import type { Meta, StoryObj } from '@storybook/nextjs-vite'
+import type { Placement } from '../placement'
+import { useState } from 'react'
+import {
+  Popover,
+  PopoverClose,
+  PopoverContent,
+  PopoverDescription,
+  PopoverTitle,
+  PopoverTrigger,
+} from '.'
+import { Button } from '../button'
+
+const triggerButtonClassName = 'rounded-lg border border-divider-subtle bg-components-button-secondary-bg px-3 py-1.5 text-sm text-text-secondary shadow-xs hover:bg-state-base-hover'
+
+const meta = {
+  title: 'Base/UI/Popover',
+  component: Popover,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Compound popover built on Base UI Popover. Use it for contextual affordances, overflow menus, filters, and forms that anchor to a trigger. Control placement via the `placement` prop on `PopoverContent` and compose arbitrary children inside the popup.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof Popover>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: () => (
+    <Popover>
+      <PopoverTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Open popover
+      </PopoverTrigger>
+      <PopoverContent>
+        <div className="flex w-72 flex-col gap-2 p-4">
+          <PopoverTitle className="text-sm font-semibold text-text-primary">
+            Keyboard shortcuts
+          </PopoverTitle>
+          <PopoverDescription className="text-xs text-text-secondary">
+            Press
+            {' '}
+            <kbd className="rounded bg-background-default-subtle px-1 py-0.5 font-mono text-[11px]">⌘</kbd>
+            {' '}
+            +
+            {' '}
+            <kbd className="rounded bg-background-default-subtle px-1 py-0.5 font-mono text-[11px]">K</kbd>
+            {' '}
+            to open the command palette anywhere in the app.
+          </PopoverDescription>
+        </div>
+      </PopoverContent>
+    </Popover>
+  ),
+}
+
+export const WithActions: Story = {
+  render: () => (
+    <Popover>
+      <PopoverTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Share workspace
+      </PopoverTrigger>
+      <PopoverContent>
+        <div className="flex w-80 flex-col gap-3 p-4">
+          <div className="flex flex-col gap-1">
+            <PopoverTitle className="text-sm font-semibold text-text-primary">
+              Share workspace
+            </PopoverTitle>
+            <PopoverDescription className="text-xs text-text-secondary">
+              Invite collaborators by email. They will get a pending invitation in their inbox.
+            </PopoverDescription>
+          </div>
+          <input
+            type="email"
+            placeholder="teammate@example.com"
+            className="h-8 rounded-md border-[0.5px] border-components-input-border-active bg-components-input-bg-normal px-2 text-sm text-components-input-text-filled outline-hidden placeholder:text-components-input-text-placeholder focus:border-components-input-border-hover"
+          />
+          <div className="flex items-center justify-end gap-2">
+            <PopoverClose
+              render={<Button variant="secondary" size="small" />}
+            >
+              Cancel
+            </PopoverClose>
+            <PopoverClose
+              render={<Button variant="primary" size="small" />}
+            >
+              Send invite
+            </PopoverClose>
+          </div>
+        </div>
+      </PopoverContent>
+    </Popover>
+  ),
+}
+
+const PLACEMENTS: Placement[] = [
+  'top-start',
+  'top',
+  'top-end',
+  'right-start',
+  'right',
+  'right-end',
+  'bottom-start',
+  'bottom',
+  'bottom-end',
+  'left-start',
+  'left',
+  'left-end',
+]
+
+const PlacementsDemo = () => {
+  const [placement, setPlacement] = useState<Placement>('bottom')
+
+  return (
+    <div className="flex flex-col items-center gap-4 p-20">
+      <div className="grid grid-cols-3 gap-2 text-xs">
+        {PLACEMENTS.map(value => (
+          <button
+            key={value}
+            type="button"
+            onClick={() => setPlacement(value)}
+            className={`rounded-md border border-divider-subtle px-2 py-1 text-text-secondary ${
+              placement === value ? 'bg-state-base-hover' : 'bg-components-button-secondary-bg'
+            }`}
+          >
+            {value}
+          </button>
+        ))}
+      </div>
+      <Popover open>
+        <PopoverTrigger
+          render={<button type="button" className={triggerButtonClassName} />}
+        >
+          Anchored trigger
+        </PopoverTrigger>
+        <PopoverContent placement={placement}>
+          <div className="flex w-56 flex-col gap-1 p-3">
+            <PopoverTitle className="text-sm font-semibold text-text-primary">
+              placement="
+              {placement}
+              "
+            </PopoverTitle>
+            <PopoverDescription className="text-xs text-text-secondary">
+              Popover positions itself relative to the trigger using the selected placement.
+            </PopoverDescription>
+          </div>
+        </PopoverContent>
+      </Popover>
+    </div>
+  )
+}
+
+export const Placements: Story = {
+  parameters: {
+    layout: 'fullscreen',
+  },
+  render: () => <PlacementsDemo />,
+}
+
+const ControlledDemo = () => {
+  const [open, setOpen] = useState(false)
+
+  return (
+    <div className="flex items-center gap-3">
+      <Button variant="secondary" onClick={() => setOpen(prev => !prev)}>
+        {open ? 'Close from outside' : 'Open from outside'}
+      </Button>
+      <Popover open={open} onOpenChange={setOpen}>
+        <PopoverTrigger
+          render={<button type="button" className={triggerButtonClassName} />}
+        >
+          Anchor
+        </PopoverTrigger>
+        <PopoverContent>
+          <div className="flex w-64 flex-col gap-2 p-4">
+            <PopoverTitle className="text-sm font-semibold text-text-primary">
+              Controlled popover
+            </PopoverTitle>
+            <PopoverDescription className="text-xs text-text-secondary">
+              Open state is owned by the parent. The trigger and the external button both toggle it.
+            </PopoverDescription>
+          </div>
+        </PopoverContent>
+      </Popover>
+    </div>
+  )
+}
+
+export const Controlled: Story = {
+  render: () => <ControlledDemo />,
+}
diff --git a/web/app/components/base/ui/scroll-area/index.stories.tsx b/web/app/components/base/ui/scroll-area/index.stories.tsx
index 4166f0b66a..dbe8161f8f 100644
--- a/web/app/components/base/ui/scroll-area/index.stories.tsx
+++ b/web/app/components/base/ui/scroll-area/index.stories.tsx
@@ -13,7 +13,7 @@ import {
 } from '.'
 
 const meta = {
-  title: 'Base/Layout/ScrollArea',
+  title: 'Base/UI/ScrollArea',
   component: ScrollAreaRoot,
   parameters: {
     layout: 'padded',
diff --git a/web/app/components/base/ui/select/index.stories.tsx b/web/app/components/base/ui/select/index.stories.tsx
new file mode 100644
index 0000000000..027d0f74df
--- /dev/null
+++ b/web/app/components/base/ui/select/index.stories.tsx
@@ -0,0 +1,312 @@
+import type { Meta, StoryObj } from '@storybook/nextjs-vite'
+import { useState } from 'react'
+import {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectItemIndicator,
+  SelectItemText,
+  SelectLabel,
+  SelectSeparator,
+  SelectTrigger,
+  SelectValue,
+} from '.'
+
+const triggerWidth = 'w-64'
+
+const meta = {
+  title: 'Base/UI/Select',
+  component: Select,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Compound select built on Base UI Select. Compose `SelectTrigger`, `SelectContent`, and `SelectItem` to build accessible single-value pickers with groups, labels, separators, and keyboard selection.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof Select>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: () => (
+    <div className={triggerWidth}>
+      <Select defaultValue="seattle">
+        <SelectTrigger aria-label="City">
+          <SelectValue placeholder="Select a city" />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="seattle">
+            <SelectItemText>Seattle</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="new-york">
+            <SelectItemText>New York</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="tokyo">
+            <SelectItemText>Tokyo</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="paris">
+            <SelectItemText>Paris</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+        </SelectContent>
+      </Select>
+    </div>
+  ),
+}
+
+export const WithPlaceholder: Story = {
+  render: () => (
+    <div className={triggerWidth}>
+      <Select>
+        <SelectTrigger aria-label="Model">
+          <SelectValue placeholder="Choose a model" />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="gpt-5">
+            <SelectItemText>GPT-5</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="claude-opus">
+            <SelectItemText>Claude Opus</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="gemini-25">
+            <SelectItemText>Gemini 2.5</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+        </SelectContent>
+      </Select>
+    </div>
+  ),
+}
+
+export const Sizes: Story = {
+  render: () => (
+    <div className="flex flex-col gap-3">
+      {(['small', 'medium', 'large'] as const).map(size => (
+        <div key={size} className={triggerWidth}>
+          <Select defaultValue="seattle">
+            <SelectTrigger aria-label={`${size} select`} size={size}>
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="seattle">
+                <SelectItemText>Seattle</SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
+              <SelectItem value="new-york">
+                <SelectItemText>New York</SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
+            </SelectContent>
+          </Select>
+        </div>
+      ))}
+    </div>
+  ),
+}
+
+export const WithGroupsAndSeparator: Story = {
+  render: () => (
+    <div className={triggerWidth}>
+      <Select defaultValue="gpt-5">
+        <SelectTrigger aria-label="Model">
+          <SelectValue placeholder="Choose a model" />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectGroup>
+            <SelectLabel>OpenAI</SelectLabel>
+            <SelectItem value="gpt-5">
+              <SelectItemText>GPT-5</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+            <SelectItem value="gpt-4o">
+              <SelectItemText>GPT-4o</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+          </SelectGroup>
+          <SelectSeparator />
+          <SelectGroup>
+            <SelectLabel>Anthropic</SelectLabel>
+            <SelectItem value="claude-opus">
+              <SelectItemText>Claude Opus</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+            <SelectItem value="claude-sonnet">
+              <SelectItemText>Claude Sonnet</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+          </SelectGroup>
+          <SelectSeparator />
+          <SelectGroup>
+            <SelectLabel>Google</SelectLabel>
+            <SelectItem value="gemini-25">
+              <SelectItemText>Gemini 2.5</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+            <SelectItem value="gemini-flash">
+              <SelectItemText>Gemini Flash</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+          </SelectGroup>
+        </SelectContent>
+      </Select>
+    </div>
+  ),
+}
+
+export const WithDisabledItem: Story = {
+  render: () => (
+    <div className={triggerWidth}>
+      <Select defaultValue="free">
+        <SelectTrigger aria-label="Plan">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="free">
+            <SelectItemText>Free</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="team">
+            <SelectItemText>Team</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="enterprise" disabled>
+            <SelectItemText>Enterprise (contact sales)</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+        </SelectContent>
+      </Select>
+    </div>
+  ),
+}
+
+export const Disabled: Story = {
+  render: () => (
+    <div className={triggerWidth}>
+      <Select defaultValue="seattle">
+        <SelectTrigger aria-label="City" disabled>
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="seattle">
+            <SelectItemText>Seattle</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="new-york">
+            <SelectItemText>New York</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+        </SelectContent>
+      </Select>
+    </div>
+  ),
+}
+
+export const ReadOnly: Story = {
+  render: () => (
+    <div className={triggerWidth}>
+      <Select defaultValue="seattle" readOnly>
+        <SelectTrigger aria-label="City">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="seattle">
+            <SelectItemText>Seattle</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="new-york">
+            <SelectItemText>New York</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+        </SelectContent>
+      </Select>
+    </div>
+  ),
+}
+
+const ControlledDemo = () => {
+  const [value, setValue] = useState<string | null>('balanced')
+
+  return (
+    <div className="flex flex-col items-start gap-3">
+      <div className={triggerWidth}>
+        <Select value={value} onValueChange={setValue}>
+          <SelectTrigger aria-label="Routing strategy">
+            <SelectValue placeholder="Choose a strategy" />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="low-latency">
+              <SelectItemText>Low latency</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+            <SelectItem value="balanced">
+              <SelectItemText>Balanced</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+            <SelectItem value="high-quality">
+              <SelectItemText>High quality</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+      <span className="text-xs text-text-tertiary">
+        Selected:
+        {value ?? '—'}
+      </span>
+    </div>
+  )
+}
+
+export const Controlled: Story = {
+  render: () => <ControlledDemo />,
+}
+
+export const InForm: Story = {
+  render: () => (
+    <form
+      onSubmit={(event) => {
+        event.preventDefault()
+      }}
+      className="flex w-72 flex-col gap-3"
+    >
+      <label className="text-xs font-medium text-text-tertiary" htmlFor="timezone">
+        Timezone
+      </label>
+      <Select name="timezone" defaultValue="utc">
+        <SelectTrigger id="timezone" aria-label="Timezone">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="utc">
+            <SelectItemText>UTC</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="pst">
+            <SelectItemText>Pacific (PST)</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+          <SelectItem value="jst">
+            <SelectItemText>Japan (JST)</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+        </SelectContent>
+      </Select>
+      <button
+        type="submit"
+        className="h-8 rounded-lg bg-components-button-primary-bg px-3 text-sm text-components-button-primary-text"
+      >
+        Submit
+      </button>
+    </form>
+  ),
+}
diff --git a/web/app/components/base/ui/slider/index.stories.tsx b/web/app/components/base/ui/slider/index.stories.tsx
index e1bb93381d..91bc0d3ecb 100644
--- a/web/app/components/base/ui/slider/index.stories.tsx
+++ b/web/app/components/base/ui/slider/index.stories.tsx
@@ -4,7 +4,7 @@ import { useState } from 'react'
 import { Slider } from '.'
 
 const meta = {
-  title: 'Base UI/Data Entry/Slider',
+  title: 'Base/UI/Slider',
   component: Slider,
   parameters: {
     layout: 'centered',
diff --git a/web/app/components/base/ui/toast/index.stories.tsx b/web/app/components/base/ui/toast/index.stories.tsx
index fb3ea91a00..d292e3434d 100644
--- a/web/app/components/base/ui/toast/index.stories.tsx
+++ b/web/app/components/base/ui/toast/index.stories.tsx
@@ -298,7 +298,7 @@ const ToastDocsDemo = () => {
 }
 
 const meta = {
-  title: 'Base/Feedback/UI Toast',
+  title: 'Base/UI/Toast',
   component: ToastDocsDemo,
   parameters: {
     layout: 'fullscreen',
diff --git a/web/app/components/base/ui/tooltip/index.stories.tsx b/web/app/components/base/ui/tooltip/index.stories.tsx
new file mode 100644
index 0000000000..16d0675c44
--- /dev/null
+++ b/web/app/components/base/ui/tooltip/index.stories.tsx
@@ -0,0 +1,247 @@
+import type { Meta, StoryObj } from '@storybook/nextjs-vite'
+import type { Placement } from '../placement'
+import { useState } from 'react'
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '.'
+
+const triggerButtonClassName = 'rounded-lg border border-divider-subtle bg-components-button-secondary-bg px-3 py-1.5 text-sm text-text-secondary shadow-xs hover:bg-state-base-hover'
+const iconButtonClassName = 'inline-flex h-8 w-8 items-center justify-center rounded-lg border border-divider-subtle bg-components-button-secondary-bg text-text-secondary shadow-xs hover:bg-state-base-hover'
+
+const meta = {
+  title: 'Base/UI/Tooltip',
+  component: Tooltip,
+  decorators: [
+    Story => (
+      <TooltipProvider>
+        <Story />
+      </TooltipProvider>
+    ),
+  ],
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Compound tooltip built on Base UI Tooltip. Wrap the app in `TooltipProvider` (done automatically in these stories) so multiple tooltips share open/close delays. Each tooltip pairs a `TooltipTrigger` with a `TooltipContent` and supports placement, offsets, and two style variants.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof Tooltip>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: () => (
+    <Tooltip>
+      <TooltipTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Hover me
+      </TooltipTrigger>
+      <TooltipContent>
+        Tooltips describe interactive elements without a click.
+      </TooltipContent>
+    </Tooltip>
+  ),
+}
+
+export const Plain: Story = {
+  parameters: {
+    docs: {
+      description: {
+        story: 'Use `variant="plain"` to render the popup without default chrome (background, padding, typography). Apply your own styling via `className` on `TooltipContent`.',
+      },
+    },
+  },
+  render: () => (
+    <Tooltip>
+      <TooltipTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        Preview details
+      </TooltipTrigger>
+      <TooltipContent
+        variant="plain"
+        className="rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-4 shadow-lg"
+      >
+        <div className="flex w-64 flex-col gap-1">
+          <span className="text-sm font-semibold text-text-primary">Dataset preview</span>
+          <span className="text-xs text-text-secondary">
+            32 documents • Last indexed 2 minutes ago
+          </span>
+        </div>
+      </TooltipContent>
+    </Tooltip>
+  ),
+}
+
+const PLACEMENTS: Placement[] = [
+  'top-start',
+  'top',
+  'top-end',
+  'right-start',
+  'right',
+  'right-end',
+  'bottom-start',
+  'bottom',
+  'bottom-end',
+  'left-start',
+  'left',
+  'left-end',
+]
+
+const PlacementsDemo = () => {
+  const [placement, setPlacement] = useState<Placement>('top')
+
+  return (
+    <div className="flex flex-col items-center gap-4 p-24">
+      <div className="grid grid-cols-3 gap-2 text-xs">
+        {PLACEMENTS.map(value => (
+          <button
+            key={value}
+            type="button"
+            onClick={() => setPlacement(value)}
+            className={`rounded-md border border-divider-subtle px-2 py-1 text-text-secondary ${
+              placement === value ? 'bg-state-base-hover' : 'bg-components-button-secondary-bg'
+            }`}
+          >
+            {value}
+          </button>
+        ))}
+      </div>
+      <Tooltip open>
+        <TooltipTrigger
+          render={<button type="button" className={triggerButtonClassName} />}
+        >
+          Anchor
+        </TooltipTrigger>
+        <TooltipContent placement={placement}>
+          placement="
+          {placement}
+          "
+        </TooltipContent>
+      </Tooltip>
+    </div>
+  )
+}
+
+export const Placements: Story = {
+  parameters: {
+    layout: 'fullscreen',
+  },
+  render: () => <PlacementsDemo />,
+}
+
+export const OnIconButtons: Story = {
+  parameters: {
+    docs: {
+      description: {
+        story: 'Tooltips are essential for icon-only buttons. The trigger is the button; the tooltip provides the accessible label and hover hint.',
+      },
+    },
+  },
+  render: () => (
+    <div className="flex items-center gap-3">
+      <Tooltip>
+        <TooltipTrigger
+          render={(
+            <button type="button" aria-label="Edit" className={iconButtonClassName}>
+              <span aria-hidden className="i-ri-pencil-line h-4 w-4" />
+            </button>
+          )}
+        />
+        <TooltipContent>Edit</TooltipContent>
+      </Tooltip>
+      <Tooltip>
+        <TooltipTrigger
+          render={(
+            <button type="button" aria-label="Duplicate" className={iconButtonClassName}>
+              <span aria-hidden className="i-ri-file-copy-line h-4 w-4" />
+            </button>
+          )}
+        />
+        <TooltipContent>Duplicate</TooltipContent>
+      </Tooltip>
+      <Tooltip>
+        <TooltipTrigger
+          render={(
+            <button type="button" aria-label="Archive" className={iconButtonClassName}>
+              <span aria-hidden className="i-ri-archive-line h-4 w-4" />
+            </button>
+          )}
+        />
+        <TooltipContent>Archive</TooltipContent>
+      </Tooltip>
+      <Tooltip>
+        <TooltipTrigger
+          render={(
+            <button type="button" aria-label="Delete" className={iconButtonClassName}>
+              <span aria-hidden className="i-ri-delete-bin-line h-4 w-4" />
+            </button>
+          )}
+        />
+        <TooltipContent>Delete</TooltipContent>
+      </Tooltip>
+    </div>
+  ),
+}
+
+export const LongContent: Story = {
+  render: () => (
+    <Tooltip>
+      <TooltipTrigger
+        render={<button type="button" className={triggerButtonClassName} />}
+      >
+        What are tokens?
+      </TooltipTrigger>
+      <TooltipContent>
+        Tokens are the basic units a model reads. English text averages ~4 characters per token; non-Latin scripts often use more tokens per character. Both input and output count toward your quota.
+      </TooltipContent>
+    </Tooltip>
+  ),
+}
+
+const DELAY_PRESETS: Array<{ label: string, delay: number }> = [
+  { label: 'Instant (0ms)', delay: 0 },
+  { label: 'Fast (150ms)', delay: 150 },
+  { label: 'Default (600ms)', delay: 600 },
+]
+
+const DelayDemo = () => {
+  return (
+    <div className="flex items-center gap-3">
+      {DELAY_PRESETS.map(({ label, delay }) => (
+        <TooltipProvider key={delay} delay={delay}>
+          <Tooltip>
+            <TooltipTrigger
+              render={<button type="button" className={triggerButtonClassName} />}
+            >
+              {label}
+            </TooltipTrigger>
+            <TooltipContent>
+              Appeared after
+              {delay}
+              ms hover delay.
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      ))}
+    </div>
+  )
+}
+
+export const WithDelay: Story = {
+  parameters: {
+    docs: {
+      description: {
+        story: '`TooltipProvider` controls hover `delay` (and `closeDelay`) for the tooltips nested inside it. Adjacent tooltips under the same provider open instantly after the first has been shown.',
+      },
+    },
+  },
+  render: () => <DelayDemo />,
+}

From af21dc7df875aec8437332ebb1f99bcef893a258 Mon Sep 17 00:00:00 2001
From: NVIDIAN <speedy.hpc@hotmail.com>
Date: Thu, 16 Apr 2026 22:02:04 -0700
Subject: [PATCH 34/36] refactor(api): migrate dataset document response
 schemas to BaseModel (#35298)

Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 .../console/datasets/datasets_document.py     | 166 +++++++++++++-----
 .../datasets/test_datasets_document.py        |   9 +-
 2 files changed, 130 insertions(+), 45 deletions(-)

diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py
index b61e39716f..3372a967d9 100644
--- a/api/controllers/console/datasets/datasets_document.py
+++ b/api/controllers/console/datasets/datasets_document.py
@@ -3,18 +3,19 @@ import logging
 from argparse import ArgumentTypeError
 from collections.abc import Sequence
 from contextlib import ExitStack
+from datetime import datetime
 from typing import Any, Literal, cast
 
 import sqlalchemy as sa
 from flask import request, send_file
-from flask_restx import Resource, fields, marshal, marshal_with
-from pydantic import BaseModel, Field
+from flask_restx import Resource, marshal
+from pydantic import BaseModel, Field, field_validator
 from sqlalchemy import asc, desc, func, select
 from werkzeug.exceptions import Forbidden, NotFound
 
 import services
 from controllers.common.controller_schemas import DocumentBatchDownloadZipPayload
-from controllers.common.schema import get_or_create_model, register_schema_models
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from core.errors.error import (
     LLMBadRequestError,
@@ -29,11 +30,9 @@ from core.rag.extractor.entity.datasource_type import DatasourceType
 from core.rag.extractor.entity.extract_setting import ExtractSetting, NotionInfo, WebsiteInfo
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from extensions.ext_database import db
-from fields.dataset_fields import dataset_fields
+from fields.base import ResponseModel
 from fields.document_fields import (
-    dataset_and_document_fields,
     document_fields,
-    document_metadata_fields,
     document_status_fields,
     document_with_segments_fields,
 )
@@ -72,27 +71,100 @@ from ..wraps import (
 logger = logging.getLogger(__name__)
 
 
-# Register models for flask_restx to avoid dict type issues in Swagger
-dataset_model = get_or_create_model("Dataset", dataset_fields)
+def _to_timestamp(value: datetime | int | None) -> int | None:
+    if isinstance(value, datetime):
+        return int(value.timestamp())
+    return value
 
-document_metadata_model = get_or_create_model("DocumentMetadata", document_metadata_fields)
 
-document_fields_copy = document_fields.copy()
-document_fields_copy["doc_metadata"] = fields.List(
-    fields.Nested(document_metadata_model), attribute="doc_metadata_details"
-)
-document_model = get_or_create_model("Document", document_fields_copy)
+def _normalize_enum(value: Any) -> Any:
+    if isinstance(value, str) or value is None:
+        return value
+    return getattr(value, "value", value)
 
-document_with_segments_fields_copy = document_with_segments_fields.copy()
-document_with_segments_fields_copy["doc_metadata"] = fields.List(
-    fields.Nested(document_metadata_model), attribute="doc_metadata_details"
-)
-document_with_segments_model = get_or_create_model("DocumentWithSegments", document_with_segments_fields_copy)
 
-dataset_and_document_fields_copy = dataset_and_document_fields.copy()
-dataset_and_document_fields_copy["dataset"] = fields.Nested(dataset_model)
-dataset_and_document_fields_copy["documents"] = fields.List(fields.Nested(document_model))
-dataset_and_document_model = get_or_create_model("DatasetAndDocument", dataset_and_document_fields_copy)
+class DatasetResponse(ResponseModel):
+    id: str
+    name: str
+    description: str | None = None
+    permission: str | None = None
+    data_source_type: str | None = None
+    indexing_technique: str | None = None
+    created_by: str | None = None
+    created_at: int | None = None
+
+    @field_validator("data_source_type", "indexing_technique", mode="before")
+    @classmethod
+    def _normalize_enum_fields(cls, value: Any) -> Any:
+        return _normalize_enum(value)
+
+    @field_validator("created_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return _to_timestamp(value)
+
+
+class DocumentMetadataResponse(ResponseModel):
+    id: str
+    name: str
+    type: str
+    value: str | None = None
+
+
+class DocumentResponse(ResponseModel):
+    id: str
+    position: int | None = None
+    data_source_type: str | None = None
+    data_source_info: Any = Field(default=None, validation_alias="data_source_info_dict")
+    data_source_detail_dict: Any = None
+    dataset_process_rule_id: str | None = None
+    name: str
+    created_from: str | None = None
+    created_by: str | None = None
+    created_at: int | None = None
+    tokens: int | None = None
+    indexing_status: str | None = None
+    error: str | None = None
+    enabled: bool | None = None
+    disabled_at: int | None = None
+    disabled_by: str | None = None
+    archived: bool | None = None
+    display_status: str | None = None
+    word_count: int | None = None
+    hit_count: int | None = None
+    doc_form: str | None = None
+    doc_metadata: list[DocumentMetadataResponse] = Field(default_factory=list, validation_alias="doc_metadata_details")
+    summary_index_status: str | None = None
+    need_summary: bool | None = None
+
+    @field_validator("data_source_type", "indexing_status", "display_status", "doc_form", mode="before")
+    @classmethod
+    def _normalize_enum_fields(cls, value: Any) -> Any:
+        return _normalize_enum(value)
+
+    @field_validator("doc_metadata", mode="before")
+    @classmethod
+    def _normalize_doc_metadata(cls, value: Any) -> list[Any]:
+        if value is None:
+            return []
+        return value
+
+    @field_validator("created_at", "disabled_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return _to_timestamp(value)
+
+
+class DocumentWithSegmentsResponse(DocumentResponse):
+    process_rule_dict: Any = None
+    completed_segments: int | None = None
+    total_segments: int | None = None
+
+
+class DatasetAndDocumentResponse(ResponseModel):
+    dataset: DatasetResponse
+    documents: list[DocumentResponse]
+    batch: str
 
 
 class DocumentRetryPayload(BaseModel):
@@ -107,6 +179,11 @@ class GenerateSummaryPayload(BaseModel):
     document_list: list[str]
 
 
+class DocumentMetadataUpdatePayload(BaseModel):
+    doc_type: str | None = None
+    doc_metadata: Any = None
+
+
 class DocumentDatasetListParam(BaseModel):
     page: int = Field(1, title="Page", description="Page number.")
     limit: int = Field(20, title="Limit", description="Page size.")
@@ -124,7 +201,13 @@ register_schema_models(
     DocumentRetryPayload,
     DocumentRenamePayload,
     GenerateSummaryPayload,
+    DocumentMetadataUpdatePayload,
     DocumentBatchDownloadZipPayload,
+    DatasetResponse,
+    DocumentMetadataResponse,
+    DocumentResponse,
+    DocumentWithSegmentsResponse,
+    DatasetAndDocumentResponse,
 )
 
 
@@ -357,10 +440,10 @@ class DatasetDocumentListApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @marshal_with(dataset_and_document_model)
     @cloud_edition_billing_resource_check("vector_space")
     @cloud_edition_billing_rate_limit_check("knowledge")
     @console_ns.expect(console_ns.models[KnowledgeConfig.__name__])
+    @console_ns.response(200, "Documents created successfully", console_ns.models[DatasetAndDocumentResponse.__name__])
     def post(self, dataset_id):
         current_user, _ = current_account_with_tenant()
         dataset_id = str(dataset_id)
@@ -398,7 +481,9 @@ class DatasetDocumentListApi(Resource):
         except ModelCurrentlyNotSupportError:
             raise ProviderModelCurrentlyNotSupportError()
 
-        return {"dataset": dataset, "documents": documents, "batch": batch}
+        return DatasetAndDocumentResponse.model_validate(
+            {"dataset": dataset, "documents": documents, "batch": batch}, from_attributes=True
+        ).model_dump(mode="json")
 
     @setup_required
     @login_required
@@ -426,12 +511,13 @@ class DatasetInitApi(Resource):
     @console_ns.doc("init_dataset")
     @console_ns.doc(description="Initialize dataset with documents")
     @console_ns.expect(console_ns.models[KnowledgeConfig.__name__])
-    @console_ns.response(201, "Dataset initialized successfully", dataset_and_document_model)
+    @console_ns.response(
+        201, "Dataset initialized successfully", console_ns.models[DatasetAndDocumentResponse.__name__]
+    )
     @console_ns.response(400, "Invalid request parameters")
     @setup_required
     @login_required
     @account_initialization_required
-    @marshal_with(dataset_and_document_model)
     @cloud_edition_billing_resource_check("vector_space")
     @cloud_edition_billing_rate_limit_check("knowledge")
     def post(self):
@@ -479,9 +565,9 @@ class DatasetInitApi(Resource):
         except ModelCurrentlyNotSupportError:
             raise ProviderModelCurrentlyNotSupportError()
 
-        response = {"dataset": dataset, "documents": documents, "batch": batch}
-
-        return response
+        return DatasetAndDocumentResponse.model_validate(
+            {"dataset": dataset, "documents": documents, "batch": batch}, from_attributes=True
+        ).model_dump(mode="json")
 
 
 @console_ns.route("/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/indexing-estimate")
@@ -988,15 +1074,7 @@ class DocumentMetadataApi(DocumentResource):
     @console_ns.doc("update_document_metadata")
     @console_ns.doc(description="Update document metadata")
     @console_ns.doc(params={"dataset_id": "Dataset ID", "document_id": "Document ID"})
-    @console_ns.expect(
-        console_ns.model(
-            "UpdateDocumentMetadataRequest",
-            {
-                "doc_type": fields.String(description="Document type"),
-                "doc_metadata": fields.Raw(description="Document metadata"),
-            },
-        )
-    )
+    @console_ns.expect(console_ns.models[DocumentMetadataUpdatePayload.__name__])
     @console_ns.response(200, "Document metadata updated successfully")
     @console_ns.response(404, "Document not found")
     @console_ns.response(403, "Permission denied")
@@ -1009,10 +1087,10 @@ class DocumentMetadataApi(DocumentResource):
         document_id = str(document_id)
         document = self.get_document(dataset_id, document_id)
 
-        req_data = request.get_json()
+        req_data = DocumentMetadataUpdatePayload.model_validate(request.get_json() or {})
 
-        doc_type = req_data.get("doc_type")
-        doc_metadata = req_data.get("doc_metadata")
+        doc_type = req_data.doc_type
+        doc_metadata = req_data.doc_metadata
 
         # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor
         if not current_user.is_dataset_editor:
@@ -1194,7 +1272,7 @@ class DocumentRenameApi(DocumentResource):
     @setup_required
     @login_required
     @account_initialization_required
-    @marshal_with(document_model)
+    @console_ns.response(200, "Document renamed successfully", console_ns.models[DocumentResponse.__name__])
     @console_ns.expect(console_ns.models[DocumentRenamePayload.__name__])
     def post(self, dataset_id, document_id):
         # The role of the current user in the ta table must be admin, owner, editor, or dataset_operator
@@ -1212,7 +1290,7 @@ class DocumentRenameApi(DocumentResource):
         except services.errors.document.DocumentIndexingError:
             raise DocumentIndexingError("Cannot delete document during indexing.")
 
-        return document
+        return DocumentResponse.model_validate(document, from_attributes=True).model_dump(mode="json")
 
 
 @console_ns.route("/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/website-sync")
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
index ce2278de4f..d9b02ac453 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
@@ -1,3 +1,4 @@
+from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -215,17 +216,23 @@ class TestDatasetDocumentListApi:
         method = unwrap(api.post)
 
         payload = {"indexing_technique": "economy"}
+        created_dataset = SimpleNamespace(id="ds-1", name="Dataset", indexing_technique="economy")
+        created_document = SimpleNamespace(id="doc-1", name="Document", doc_metadata_details=None)
 
         with (
             app.test_request_context("/", json=payload),
             patch.object(type(console_ns), "payload", payload),
+            patch(
+                "controllers.console.datasets.datasets_document.DatasetService.get_dataset",
+                return_value=created_dataset,
+            ),
             patch(
                 "controllers.console.datasets.datasets_document.DocumentService.document_create_args_validate",
                 return_value=None,
             ),
             patch(
                 "controllers.console.datasets.datasets_document.DocumentService.save_document_with_dataset_id",
-                return_value=([MagicMock()], "batch-1"),
+                return_value=([created_document], "batch-1"),
             ),
         ):
             response = method(api, "ds-1")

From 4d79b4a7665f43cd5de5acd94307c7bd0906bbe9 Mon Sep 17 00:00:00 2001
From: Junghwan <70629228+shaun0927@users.noreply.github.com>
Date: Fri, 17 Apr 2026 14:06:39 +0900
Subject: [PATCH 35/36] fix(web): stop Splash after useUserProfile errors
 (#35326)

---
 web/app/components/__tests__/splash.spec.tsx | 59 ++++++++++++++++++++
 web/app/components/splash.tsx                |  5 +-
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 web/app/components/__tests__/splash.spec.tsx

diff --git a/web/app/components/__tests__/splash.spec.tsx b/web/app/components/__tests__/splash.spec.tsx
new file mode 100644
index 0000000000..296ef48cdb
--- /dev/null
+++ b/web/app/components/__tests__/splash.spec.tsx
@@ -0,0 +1,59 @@
+import type { MockedFunction } from 'vitest'
+import { render, screen } from '@testing-library/react'
+import { useUserProfile } from '@/service/use-common'
+import Splash from '../splash'
+
+vi.mock('@/service/use-common', () => ({
+  useUserProfile: vi.fn(),
+}))
+
+const mockUseUserProfile = useUserProfile as MockedFunction<typeof useUserProfile>
+
+describe('Splash', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should render the loading indicator while the profile query is pending', () => {
+    mockUseUserProfile.mockReturnValue({
+      isPending: true,
+      isError: false,
+      data: undefined,
+    } as ReturnType<typeof useUserProfile>)
+
+    render(<Splash />)
+
+    expect(screen.getByRole('status')).toBeInTheDocument()
+  })
+
+  it('should not render the loading indicator when the profile query succeeds', () => {
+    mockUseUserProfile.mockReturnValue({
+      isPending: false,
+      isError: false,
+      data: {
+        profile: { id: 'user-1' },
+        meta: {
+          currentVersion: '1.13.3',
+          currentEnv: 'DEVELOPMENT',
+        },
+      },
+    } as ReturnType<typeof useUserProfile>)
+
+    render(<Splash />)
+
+    expect(screen.queryByRole('status')).not.toBeInTheDocument()
+  })
+
+  it('should stop rendering the loading indicator when the profile query errors', () => {
+    mockUseUserProfile.mockReturnValue({
+      isPending: false,
+      isError: true,
+      data: undefined,
+      error: new Error('profile request failed'),
+    } as ReturnType<typeof useUserProfile>)
+
+    render(<Splash />)
+
+    expect(screen.queryByRole('status')).not.toBeInTheDocument()
+  })
+})
diff --git a/web/app/components/splash.tsx b/web/app/components/splash.tsx
index 3103f09ca3..2e46b95f76 100644
--- a/web/app/components/splash.tsx
+++ b/web/app/components/splash.tsx
@@ -5,15 +5,16 @@ import { useUserProfile } from '@/service/use-common'
 import Loading from './base/loading'
 
 const Splash: FC<PropsWithChildren> = () => {
-  const { isPending, data } = useUserProfile()
+  const { isPending } = useUserProfile()
 
-  if (isPending || !data?.profile) {
+  if (isPending) {
     return (
       <div className="fixed inset-0 z-9999999 flex h-full items-center justify-center bg-background-body">
         <Loading />
       </div>
     )
   }
+
   return null
 }
 export default React.memo(Splash)

From af8ffa0654fd23f0d9c55223eaedb79bee231cc3 Mon Sep 17 00:00:00 2001
From: HeYinKazune <70251095+HeYin-OS@users.noreply.github.com>
Date: Fri, 17 Apr 2026 14:07:12 +0900
Subject: [PATCH 36/36] refactor: use sessionmaker in
 api_tools_manage_service.py (#34892)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 api/core/tools/errors.py                      |  11 +
 .../tools/api_tools_manage_service.py         | 351 +++++++++++-------
 .../tools/test_api_tools_manage_service.py    | 198 +++++++++-
 3 files changed, 412 insertions(+), 148 deletions(-)

diff --git a/api/core/tools/errors.py b/api/core/tools/errors.py
index 4c3efd6ff9..2b26832b44 100644
--- a/api/core/tools/errors.py
+++ b/api/core/tools/errors.py
@@ -38,6 +38,17 @@ class ToolCredentialPolicyViolationError(ValueError):
     pass
 
 
+class ApiToolProviderNotFoundError(ValueError):
+    error_code = "api_tool_provider_not_found"
+    provider_name: str
+    tenant_id: str
+
+    def __init__(self, provider_name: str, tenant_id: str):
+        self.provider_name = provider_name
+        self.tenant_id = tenant_id
+        super().__init__(f"api provider {provider_name} does not exist")
+
+
 class WorkflowToolHumanInputNotSupportedError(BaseHTTPException):
     error_code = "workflow_tool_human_input_not_supported"
     description = "Workflow with Human Input nodes cannot be published as a workflow tool."
diff --git a/api/services/tools/api_tools_manage_service.py b/api/services/tools/api_tools_manage_service.py
index 8ad010f62d..5ff2c21749 100644
--- a/api/services/tools/api_tools_manage_service.py
+++ b/api/services/tools/api_tools_manage_service.py
@@ -4,6 +4,7 @@ from typing import Any, TypedDict, cast
 
 from httpx import get
 from sqlalchemy import select
+from sqlalchemy.orm import sessionmaker
 
 from core.entities.provider_entities import ProviderConfig
 from core.tools.__base.tool_runtime import ToolRuntime
@@ -15,6 +16,7 @@ from core.tools.entities.tool_entities import (
     ApiProviderAuthType,
     ApiProviderSchemaType,
 )
+from core.tools.errors import ApiToolProviderNotFoundError
 from core.tools.tool_label_manager import ToolLabelManager
 from core.tools.tool_manager import ToolManager
 from core.tools.utils.encryption import create_tool_provider_encrypter
@@ -116,71 +118,85 @@ class ApiToolManageService:
         privacy_policy: str,
         custom_disclaimer: str,
         labels: list[str],
-    ):
+    ) -> dict[str, Any]:
         """
-        create api tool provider
+        Create a new API tool provider.
+
+        :param user_id: The ID of the user creating the provider.
+        :param tenant_id: The ID of the workspace/tenant.
+        :param provider_name: The name of the API tool provider.
+        :param icon: The icon configuration for the provider.
+        :param credentials: The credentials for the provider.
+        :param schema_type: The type of schema (e.g., OpenAPI).
+        :param schema: The raw schema string.
+        :param privacy_policy: The privacy policy URL or text.
+        :param custom_disclaimer: Custom disclaimer text.
+        :param labels: A list of labels for the provider.
+        :return: A dictionary indicating the result status.
         """
+
         provider_name = provider_name.strip()
 
         # check if the provider exists
-        provider = db.session.scalar(
-            select(ApiToolProvider)
-            .where(
-                ApiToolProvider.tenant_id == tenant_id,
-                ApiToolProvider.name == provider_name,
+        # Create new session with automatic transaction management
+        with sessionmaker(db.engine, expire_on_commit=False).begin() as _session:
+            provider: ApiToolProvider | None = _session.scalar(
+                select(ApiToolProvider)
+                .where(
+                    ApiToolProvider.tenant_id == tenant_id,
+                    ApiToolProvider.name == provider_name,
+                )
+                .limit(1)
             )
-            .limit(1)
-        )
 
-        if provider is not None:
-            raise ValueError(f"provider {provider_name} already exists")
+            if provider is not None:
+                raise ValueError(f"provider {provider_name} already exists")
 
-        # parse openapi to tool bundle
-        extra_info: dict[str, str] = {}
-        # extra info like description will be set here
-        tool_bundles, schema_type = ApiToolManageService.convert_schema_to_tool_bundles(schema, extra_info)
+            # parse openapi to tool bundle
+            extra_info: dict[str, str] = {}
+            # extra info like description will be set here
+            tool_bundles, schema_type = ApiToolManageService.convert_schema_to_tool_bundles(schema, extra_info)
 
-        if len(tool_bundles) > 100:
-            raise ValueError("the number of apis should be less than 100")
+            if len(tool_bundles) > 100:
+                raise ValueError("the number of apis should be less than 100")
 
-        # create db provider
-        db_provider = ApiToolProvider(
-            tenant_id=tenant_id,
-            user_id=user_id,
-            name=provider_name,
-            icon=json.dumps(icon),
-            schema=schema,
-            description=extra_info.get("description", ""),
-            schema_type_str=schema_type,
-            tools_str=json.dumps(jsonable_encoder(tool_bundles)),
-            credentials_str="{}",
-            privacy_policy=privacy_policy,
-            custom_disclaimer=custom_disclaimer,
-        )
+            # create API tool provider
+            api_tool_provider = ApiToolProvider(
+                tenant_id=tenant_id,
+                user_id=user_id,
+                name=provider_name,
+                icon=json.dumps(icon),
+                schema=schema,
+                description=extra_info.get("description", ""),
+                schema_type_str=schema_type,
+                tools_str=json.dumps(jsonable_encoder(tool_bundles)),
+                credentials_str="{}",
+                privacy_policy=privacy_policy,
+                custom_disclaimer=custom_disclaimer,
+            )
 
-        if "auth_type" not in credentials:
-            raise ValueError("auth_type is required")
+            if "auth_type" not in credentials:
+                raise ValueError("auth_type is required")
 
-        # get auth type, none or api key
-        auth_type = ApiProviderAuthType.value_of(credentials["auth_type"])
+            # get auth type, none or api key
+            auth_type = ApiProviderAuthType.value_of(credentials["auth_type"])
 
-        # create provider entity
-        provider_controller = ApiToolProviderController.from_db(db_provider, auth_type)
-        # load tools into provider entity
-        provider_controller.load_bundled_tools(tool_bundles)
+            # create provider entity
+            provider_controller = ApiToolProviderController.from_db(api_tool_provider, auth_type)
+            # load tools into provider entity
+            provider_controller.load_bundled_tools(tool_bundles)
 
-        # encrypt credentials
-        encrypter, _ = create_tool_provider_encrypter(
-            tenant_id=tenant_id,
-            controller=provider_controller,
-        )
-        db_provider.credentials_str = json.dumps(encrypter.encrypt(credentials))
+            # encrypt credentials
+            encrypter, _ = create_tool_provider_encrypter(
+                tenant_id=tenant_id,
+                controller=provider_controller,
+            )
+            api_tool_provider.credentials_str = json.dumps(encrypter.encrypt(credentials))
 
-        db.session.add(db_provider)
-        db.session.commit()
+            _session.add(api_tool_provider)
 
-        # update labels
-        ToolLabelManager.update_tool_labels(provider_controller, labels)
+            # update labels
+            ToolLabelManager.update_tool_labels(provider_controller, labels, _session)
 
         return {"result": "success"}
 
@@ -212,16 +228,25 @@ class ApiToolManageService:
     @staticmethod
     def list_api_tool_provider_tools(user_id: str, tenant_id: str, provider_name: str) -> list[ToolApiEntity]:
         """
-        list api tool provider tools
+        List tools provided by a specific API tool provider.
+
+        :param user_id: The ID of the user requesting the list.
+        :param tenant_id: The ID of the workspace/tenant.
+        :param provider_name: The name of the API tool provider.
+        :return: A list of ToolApiEntity objects.
         """
-        provider: ApiToolProvider | None = db.session.scalar(
-            select(ApiToolProvider)
-            .where(
-                ApiToolProvider.tenant_id == tenant_id,
-                ApiToolProvider.name == provider_name,
+
+        # create new session with automatic transaction management
+        provider: ApiToolProvider | None = None
+        with sessionmaker(db.engine, expire_on_commit=False).begin() as _session:
+            provider = _session.scalar(
+                select(ApiToolProvider)
+                .where(
+                    ApiToolProvider.tenant_id == tenant_id,
+                    ApiToolProvider.name == provider_name,
+                )
+                .limit(1)
             )
-            .limit(1)
-        )
 
         if provider is None:
             raise ValueError(f"you have not added provider {provider_name}")
@@ -251,103 +276,133 @@ class ApiToolManageService:
         privacy_policy: str | None,
         custom_disclaimer: str,
         labels: list[str],
-    ):
+    ) -> dict[str, Any]:
         """
-        update api tool provider
+        Update an existing API tool provider.
+
+        :param user_id: The ID of the user updating the provider.
+        :param tenant_id: The ID of the workspace/tenant.
+        :param provider_name: The new name of the API tool provider.
+        :param original_provider: The original name of the API tool provider.
+        :param icon: The icon configuration for the provider.
+        :param credentials: The credentials for the provider.
+        :param _schema_type: The type of schema (e.g., OpenAPI).
+        :param schema: The raw schema string.
+        :param privacy_policy: The privacy policy URL or text.
+        :param custom_disclaimer: Custom disclaimer text.
+        :param labels: A list of labels for the provider.
+        :return: A dictionary indicating the result status.
         """
+
         provider_name = provider_name.strip()
 
         # check if the provider exists
-        provider = db.session.scalar(
-            select(ApiToolProvider)
-            .where(
-                ApiToolProvider.tenant_id == tenant_id,
-                ApiToolProvider.name == original_provider,
+        # create new session with automatic transaction management
+        with sessionmaker(db.engine, expire_on_commit=False).begin() as _session:
+            provider: ApiToolProvider | None = _session.scalar(
+                select(ApiToolProvider)
+                .where(
+                    ApiToolProvider.tenant_id == tenant_id,
+                    ApiToolProvider.name == original_provider,
+                )
+                .limit(1)
             )
-            .limit(1)
-        )
 
-        if provider is None:
-            raise ValueError(f"api provider {provider_name} does not exists")
-        # parse openapi to tool bundle
-        extra_info: dict[str, str] = {}
-        # extra info like description will be set here
-        tool_bundles, schema_type = ApiToolManageService.convert_schema_to_tool_bundles(schema, extra_info)
+            if provider is None:
+                raise ApiToolProviderNotFoundError(provider_name=original_provider, tenant_id=tenant_id)
 
-        # update db provider
-        provider.name = provider_name
-        provider.icon = json.dumps(icon)
-        provider.schema = schema
-        provider.description = extra_info.get("description", "")
-        provider.schema_type_str = schema_type
-        provider.tools_str = json.dumps(jsonable_encoder(tool_bundles))
-        provider.privacy_policy = privacy_policy
-        provider.custom_disclaimer = custom_disclaimer
+            # parse openapi to tool bundle
+            extra_info: dict[str, str] = {}
+            # extra info like description will be set here
+            tool_bundles, schema_type = ApiToolManageService.convert_schema_to_tool_bundles(schema, extra_info)
 
-        if "auth_type" not in credentials:
-            raise ValueError("auth_type is required")
+            # update db provider
+            provider.name = provider_name
+            provider.icon = json.dumps(icon)
+            provider.schema = schema
+            provider.description = extra_info.get("description", "")
+            provider.schema_type_str = schema_type
+            provider.tools_str = json.dumps(jsonable_encoder(tool_bundles))
+            provider.privacy_policy = privacy_policy
+            provider.custom_disclaimer = custom_disclaimer
 
-        # get auth type, none or api key
-        auth_type = ApiProviderAuthType.value_of(credentials["auth_type"])
+            if "auth_type" not in credentials:
+                raise ValueError("auth_type is required")
 
-        # create provider entity
-        provider_controller = ApiToolProviderController.from_db(provider, auth_type)
-        # load tools into provider entity
-        provider_controller.load_bundled_tools(tool_bundles)
+            # get auth type, none or api key
+            auth_type = ApiProviderAuthType.value_of(credentials["auth_type"])
 
-        # get original credentials if exists
-        encrypter, cache = create_tool_provider_encrypter(
-            tenant_id=tenant_id,
-            controller=provider_controller,
-        )
+            # create provider entity
+            provider_controller = ApiToolProviderController.from_db(provider, auth_type)
+            # load tools into provider entity
+            provider_controller.load_bundled_tools(tool_bundles)
 
-        original_credentials = encrypter.decrypt(provider.credentials)
-        masked_credentials = encrypter.mask_plugin_credentials(original_credentials)
-        # check if the credential has changed, save the original credential
-        for name, value in credentials.items():
-            if name in masked_credentials and value == masked_credentials[name]:
-                credentials[name] = original_credentials[name]
+            # get original credentials if exists
+            encrypter, cache = create_tool_provider_encrypter(
+                tenant_id=tenant_id,
+                controller=provider_controller,
+            )
 
-        credentials = dict(encrypter.encrypt(credentials))
-        provider.credentials_str = json.dumps(credentials)
+            original_credentials = encrypter.decrypt(provider.credentials)
+            masked_credentials = encrypter.mask_plugin_credentials(original_credentials)
 
-        db.session.add(provider)
-        db.session.commit()
+            # check if the credential has changed, save the original credential
+            for name, value in credentials.items():
+                if name in masked_credentials and value == masked_credentials[name]:
+                    credentials[name] = original_credentials[name]
+
+            credentials = dict(encrypter.encrypt(credentials))
+            provider.credentials_str = json.dumps(credentials)
+
+            _session.add(provider)
+
+            # update labels
+            ToolLabelManager.update_tool_labels(provider_controller, labels, _session)
 
         # delete cache
         cache.delete()
 
-        # update labels
-        ToolLabelManager.update_tool_labels(provider_controller, labels)
-
         return {"result": "success"}
 
     @staticmethod
     def delete_api_tool_provider(user_id: str, tenant_id: str, provider_name: str):
         """
-        delete tool provider
+        Delete an API tool provider.
+
+        :param user_id: The ID of the user performing the deletion operation.
+        :param tenant_id: The ID of the workspace/tenant where the provider belongs.
+        :param provider_name: The unique name of the API tool provider to be deleted.
+        :raises ValueError: If the specified provider does not exist in the tenant.
+        :return: A dictionary indicating the result status.
         """
-        provider = db.session.scalar(
-            select(ApiToolProvider)
-            .where(
-                ApiToolProvider.tenant_id == tenant_id,
-                ApiToolProvider.name == provider_name,
+
+        # create new session with automatic transaction management
+        with sessionmaker(db.engine, expire_on_commit=False).begin() as _session:
+            provider: ApiToolProvider | None = _session.scalar(
+                select(ApiToolProvider)
+                .where(
+                    ApiToolProvider.tenant_id == tenant_id,
+                    ApiToolProvider.name == provider_name,
+                )
+                .limit(1)
             )
-            .limit(1)
-        )
 
-        if provider is None:
-            raise ValueError(f"you have not added provider {provider_name}")
+            if provider is None:
+                raise ValueError(f"you have not added provider {provider_name}")
 
-        db.session.delete(provider)
-        db.session.commit()
+            _session.delete(provider)
 
         return {"result": "success"}
 
     @staticmethod
-    def get_api_tool_provider(user_id: str, tenant_id: str, provider: str):
+    def get_api_tool_provider(user_id: str, tenant_id: str, provider: str) -> dict[str, Any]:
         """
-        get api tool provider
+        Get API tool provider details.
+
+        :param user_id: The ID of the user requesting the provider.
+        :param tenant_id: The ID of the workspace/tenant.
+        :param provider: The name of the API tool provider.
+        :return: A dictionary containing the provider details.
         """
         return ToolManager.user_get_api_provider(provider=provider, tenant_id=tenant_id)
 
@@ -360,10 +415,20 @@ class ApiToolManageService:
         parameters: dict[str, Any],
         schema_type: ApiProviderSchemaType,
         schema: str,
-    ):
+    ) -> dict[str, Any]:
         """
-        test api tool before adding api tool provider
+        Test an API tool before adding the API tool provider.
+
+        :param tenant_id: The ID of the workspace/tenant.
+        :param provider_name: The name of the API tool provider.
+        :param tool_name: The name of the specific tool to test.
+        :param credentials: The credentials for the provider.
+        :param parameters: The parameters to pass to the tool.
+        :param schema_type: The type of schema (e.g., OpenAPI).
+        :param schema: The raw schema string.
+        :return: A dictionary containing the result or error message.
         """
+
         if schema_type not in [member.value for member in ApiProviderSchemaType]:
             raise ValueError(f"invalid schema type {schema_type}")
 
@@ -377,18 +442,21 @@ class ApiToolManageService:
         if tool_bundle is None:
             raise ValueError(f"invalid tool name {tool_name}")
 
-        db_provider = db.session.scalar(
-            select(ApiToolProvider)
-            .where(
-                ApiToolProvider.tenant_id == tenant_id,
-                ApiToolProvider.name == provider_name,
+        # create new session with automatic transaction management to get the provider
+        provider: ApiToolProvider | None = None
+        with sessionmaker(db.engine, expire_on_commit=False).begin() as _session:
+            provider = _session.scalar(
+                select(ApiToolProvider)
+                .where(
+                    ApiToolProvider.tenant_id == tenant_id,
+                    ApiToolProvider.name == provider_name,
+                )
+                .limit(1)
             )
-            .limit(1)
-        )
 
-        if not db_provider:
+        if provider is None:
             # create a fake db provider
-            db_provider = ApiToolProvider(
+            provider = ApiToolProvider(
                 tenant_id="",
                 user_id="",
                 name="",
@@ -407,12 +475,12 @@ class ApiToolManageService:
         auth_type = ApiProviderAuthType.value_of(credentials["auth_type"])
 
         # create provider entity
-        provider_controller = ApiToolProviderController.from_db(db_provider, auth_type)
+        provider_controller = ApiToolProviderController.from_db(provider, auth_type)
         # load tools into provider entity
         provider_controller.load_bundled_tools(tool_bundles)
 
         # decrypt credentials
-        if db_provider.id:
+        if provider.id:
             encrypter, _ = create_tool_provider_encrypter(
                 tenant_id=tenant_id,
                 controller=provider_controller,
@@ -443,14 +511,21 @@ class ApiToolManageService:
     @staticmethod
     def list_api_tools(tenant_id: str) -> list[ToolProviderApiEntity]:
         """
-        list api tools
+        List all API tools for a specific tenant.
+
+        :param tenant_id: The ID of the workspace/tenant.
+        :return: A list of ToolProviderApiEntity objects.
         """
         # get all api providers
-        db_providers = db.session.scalars(select(ApiToolProvider).where(ApiToolProvider.tenant_id == tenant_id)).all()
+        # create new session with automatic transaction management
+        providers: list[ApiToolProvider] = []
+        with sessionmaker(db.engine, expire_on_commit=False).begin() as _session:
+            providers = list(
+                _session.scalars(select(ApiToolProvider).where(ApiToolProvider.tenant_id == tenant_id)).all()
+            )
 
         result: list[ToolProviderApiEntity] = []
-
-        for provider in db_providers:
+        for provider in providers:
             # convert provider controller to user provider
             provider_controller = ToolTransformService.api_provider_to_controller(db_provider=provider)
             labels = ToolLabelManager.get_tool_labels(provider_controller)
diff --git a/api/tests/test_containers_integration_tests/services/tools/test_api_tools_manage_service.py b/api/tests/test_containers_integration_tests/services/tools/test_api_tools_manage_service.py
index d3e765055a..af83adaae0 100644
--- a/api/tests/test_containers_integration_tests/services/tools/test_api_tools_manage_service.py
+++ b/api/tests/test_containers_integration_tests/services/tools/test_api_tools_manage_service.py
@@ -1,3 +1,5 @@
+import inspect
+import json
 from unittest.mock import patch
 
 import pytest
@@ -6,6 +8,8 @@ from pydantic import TypeAdapter, ValidationError
 from sqlalchemy.orm import Session
 
 from core.tools.entities.tool_entities import ApiProviderSchemaType
+from core.tools.errors import ApiToolProviderNotFoundError
+from core.tools.tool_label_manager import ToolLabelManager
 from models import Account, Tenant
 from models.tools import ApiToolProvider
 from services.tools.api_tools_manage_service import ApiToolManageService
@@ -590,30 +594,204 @@ class TestApiToolManageService:
         with pytest.raises(ValueError, match="you have not added provider"):
             ApiToolManageService.delete_api_tool_provider(account.id, tenant.id, "nonexistent")
 
-    def test_update_api_tool_provider_not_found(
+    def test_update_api_tool_provider_success(
         self, flask_req_ctx_with_containers, db_session_with_containers: Session, mock_external_service_dependencies
     ):
-        """Test update raises ValueError when original provider not found."""
         fake = Faker()
+
+        # Firmware fix for cache.delete() in update flow
+        mock_encrypter = mock_external_service_dependencies["encrypter"]
+        from unittest.mock import MagicMock
+
+        mock_cache = MagicMock()
+        mock_cache.delete.return_value = None
+        mock_encrypter.return_value = (mock_encrypter, mock_cache)
+
+        # Get fake account and tenant
         account, tenant = self._create_test_account_and_tenant(
             db_session_with_containers, mock_external_service_dependencies
         )
 
-        with pytest.raises(ValueError, match="does not exists"):
-            ApiToolManageService.update_api_tool_provider(
+        # original provider name
+        original_name = "original-provider"
+
+        # Create original provider
+        _ = ApiToolManageService.create_api_tool_provider(
+            user_id=account.id,
+            tenant_id=tenant.id,
+            provider_name=original_name,
+            icon={"type": "emoji", "value": "🔧"},
+            credentials={"auth_type": "none"},
+            schema_type=ApiProviderSchemaType.OPENAPI,
+            schema=self._create_test_openapi_schema(),
+            privacy_policy="",
+            custom_disclaimer="",
+            labels=["old-label"],
+        )
+
+        # new provide name and new labels for update
+        new_name = "updated-provider"
+        new_labels = ["new-label-1", "new-label-2"]
+
+        # Reset mock history so assertions focus on update path only
+        mock_external_service_dependencies["encrypter"].reset_mock()
+        mock_external_service_dependencies["provider_controller"].from_db.reset_mock()
+        mock_external_service_dependencies["tool_label_manager"].update_tool_labels.reset_mock()
+
+        # Act: Update the provider with new values
+        result = ApiToolManageService.update_api_tool_provider(
+            user_id=account.id,
+            tenant_id=tenant.id,
+            # new provider name     - changed 1
+            provider_name=new_name,
+            original_provider=original_name,
+            # new icon              - changed 2
+            icon={"type": "emoji", "value": "🚀"},
+            credentials={"auth_type": "none"},
+            _schema_type=ApiProviderSchemaType.OPENAPI,
+            schema=self._create_test_openapi_schema(),
+            # new privacy policy    - changed 3
+            privacy_policy="https://new-policy.com",
+            # new custom disclaimer - changed 4
+            custom_disclaimer="New disclaimer",
+            # new labels            - changed 5 (However, we will not verify this, not this layer responsibility.)
+            labels=new_labels,
+        )
+
+        # Assert: Verify the result
+        assert result == {"result": "success"}
+
+        # Get the updated provider from the database
+        updated_provider: ApiToolProvider | None = (
+            db_session_with_containers.query(ApiToolProvider)
+            .filter(ApiToolProvider.tenant_id == tenant.id, ApiToolProvider.name == new_name)
+            .first()
+        )
+
+        # Verify the provider was updated successfully
+        assert updated_provider is not None
+
+        # Manually refresh to keep object detachment
+        db_session_with_containers.refresh(updated_provider)
+        # Verify all the updated fields
+        # - changed 1
+        assert updated_provider.name == new_name
+        # - changed 2
+        icon_data = json.loads(updated_provider.icon)
+        assert icon_data["type"] == "emoji"
+        assert icon_data["value"] == "🚀"
+        # - changed 3
+        assert updated_provider.privacy_policy == "https://new-policy.com"
+        # - changed 4
+        assert updated_provider.custom_disclaimer == "New disclaimer"
+
+        # Verify old provider name no longer exists after rename
+        original_provider: ApiToolProvider | None = (
+            db_session_with_containers.query(ApiToolProvider)
+            .filter(ApiToolProvider.tenant_id == tenant.id, ApiToolProvider.name == original_name)
+            .first()
+        )
+        assert original_provider is None
+
+        # Verify update flow calls critical collaborators
+        mock_external_service_dependencies["provider_controller"].from_db.assert_called_once()
+        mock_external_service_dependencies["encrypter"].assert_called_once()
+        mock_cache.delete.assert_called_once()
+
+        # Deeply verify on session propagation of labels update logics:
+        # Since in refactoring, we pass session down to label manager to keep atomicity.
+        # The assertion here is to verify this.
+        sig = inspect.signature(ToolLabelManager.update_tool_labels)
+        args, kwargs = mock_external_service_dependencies["tool_label_manager"].update_tool_labels.call_args
+        bound_args = sig.bind(*args, **kwargs)
+        passed_session = bound_args.arguments.get("session")
+        # Ensure the type: Session
+        assert isinstance(passed_session, Session), f"Expected Session object, got {type(passed_session)}"
+        assert passed_session is not None, (
+            "Atomicity Failure: Session cannot be passed to Label Manager in update_api_tool_provider"
+        )
+
+    def test_update_api_tool_provider_not_found(
+        self, flask_req_ctx_with_containers, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
+        """
+        Test update raises ValueError when original provider not found.
+
+        This test verifies:
+        - Proper error when trying to update a non-existing original provider
+        - No accidental upsert/new provider creation
+        - No external dependency invocation on early failure path
+        """
+        # Arrange: Create test account and tenant
+        account, tenant = self._create_test_account_and_tenant(
+            db_session_with_containers, mock_external_service_dependencies
+        )
+
+        # Keep an existing provider in DB to ensure unrelated data remains unchanged
+        existing_provider_name = "existing-provider"
+        _ = ApiToolManageService.create_api_tool_provider(
+            user_id=account.id,
+            tenant_id=tenant.id,
+            provider_name=existing_provider_name,
+            icon={"type": "emoji", "value": "🔧"},
+            credentials={"auth_type": "none"},
+            schema_type=ApiProviderSchemaType.OPENAPI,
+            schema=self._create_test_openapi_schema(),
+            privacy_policy="https://existing-policy.com",
+            custom_disclaimer="Existing disclaimer",
+            labels=["existing-label"],
+        )
+
+        # Reset mock history so assertions focus on update failure path only
+        mock_external_service_dependencies["tool_label_manager"].update_tool_labels.reset_mock()
+        mock_external_service_dependencies["encrypter"].reset_mock()
+        mock_external_service_dependencies["provider_controller"].from_db.reset_mock()
+
+        # Act & Assert: Verify update fails with clear error message
+        target_new_name = "new-provider-name"
+        missing_original_name = "missing-original-provider"
+        with pytest.raises(ApiToolProviderNotFoundError) as exc_info:
+            _ = ApiToolManageService.update_api_tool_provider(
                 user_id=account.id,
                 tenant_id=tenant.id,
-                provider_name="new-name",
-                original_provider="nonexistent",
-                icon={},
+                provider_name=target_new_name,
+                original_provider=missing_original_name,
+                icon={"type": "emoji", "value": "🚀"},
                 credentials={"auth_type": "none"},
                 _schema_type=ApiProviderSchemaType.OPENAPI,
                 schema=self._create_test_openapi_schema(),
-                privacy_policy=None,
-                custom_disclaimer="",
-                labels=[],
+                privacy_policy="https://new-policy.com",
+                custom_disclaimer="New disclaimer",
+                labels=["new-label"],
             )
 
+        error = exc_info.value
+        assert error.provider_name == missing_original_name
+        assert error.tenant_id == tenant.id
+        assert error.error_code == "api_tool_provider_not_found"
+
+        # Assert: Existing provider should remain unchanged
+        existing_provider: ApiToolProvider | None = (
+            db_session_with_containers.query(ApiToolProvider)
+            .filter(ApiToolProvider.tenant_id == tenant.id, ApiToolProvider.name == existing_provider_name)
+            .first()
+        )
+        assert existing_provider is not None
+        assert existing_provider.name == existing_provider_name
+
+        # Assert: No new provider should be created
+        unexpected_new_provider: ApiToolProvider | None = (
+            db_session_with_containers.query(ApiToolProvider)
+            .filter(ApiToolProvider.tenant_id == tenant.id, ApiToolProvider.name == target_new_name)
+            .first()
+        )
+        assert unexpected_new_provider is None
+
+        # Assert: Early failure should skip all downstream external interactions
+        mock_external_service_dependencies["tool_label_manager"].update_tool_labels.assert_not_called()
+        mock_external_service_dependencies["encrypter"].assert_not_called()
+        mock_external_service_dependencies["provider_controller"].from_db.assert_not_called()
+
     def test_update_api_tool_provider_missing_auth_type(
         self, flask_req_ctx_with_containers, db_session_with_containers: Session, mock_external_service_dependencies
     ):