From 2dc9bc00d67b3c0720470a59db84054d80eac50c Mon Sep 17 00:00:00 2001
From: Stable Genius <stablegenius043@gmail.com>
Date: Sun, 1 Mar 2026 20:58:13 -0800
Subject: [PATCH 01/22] refactor(ci): use diff -u for pyrefly diff output
 (#32813)

Co-authored-by: Stable Genius <259448942+stablegenius49@users.noreply.github.com>
---
 .github/workflows/pyrefly-diff.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pyrefly-diff.yml b/.github/workflows/pyrefly-diff.yml
index 1900232dce..14338e85b3 100644
--- a/.github/workflows/pyrefly-diff.yml
+++ b/.github/workflows/pyrefly-diff.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Compute diff
         run: |
-          diff /tmp/pyrefly_base.txt /tmp/pyrefly_pr.txt > pyrefly_diff.txt || true
+          diff -u /tmp/pyrefly_base.txt /tmp/pyrefly_pr.txt > pyrefly_diff.txt || true
 
       - name: Save PR number
         run: |

From ddc47c2f39957f8f4636e04b505f08836c8989a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:59:06 +0900
Subject: [PATCH 02/22] chore(deps): update pyjwt requirement from ~=2.10.1 to
 ~=2.11.0 in /api (#32804)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[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 265addd745..a7069bff60 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -68,7 +68,7 @@ dependencies = [
     "pydantic~=2.12.5",
     "pydantic-extra-types~=2.10.3",
     "pydantic-settings~=2.12.0",
-    "pyjwt~=2.10.1",
+    "pyjwt~=2.11.0",
     "pypdfium2==5.2.0",
     "python-docx~=1.2.0",
     "python-dotenv==1.0.1",
diff --git a/api/uv.lock b/api/uv.lock
index 4b18997367..46fb881001 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -1636,7 +1636,7 @@ requires-dist = [
     { name = "pydantic", specifier = "~=2.12.5" },
     { name = "pydantic-extra-types", specifier = "~=2.10.3" },
     { name = "pydantic-settings", specifier = "~=2.12.0" },
-    { name = "pyjwt", specifier = "~=2.10.1" },
+    { name = "pyjwt", specifier = "~=2.11.0" },
     { name = "pypdfium2", specifier = "==5.2.0" },
     { name = "python-docx", specifier = "~=1.2.0" },
     { name = "python-dotenv", specifier = "==1.0.1" },
@@ -4957,11 +4957,11 @@ wheels = [
 
 [[package]]
 name = "pyjwt"
-version = "2.10.1"
+version = "2.11.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/e7/46/bd74733ff231675599650d3e47f361794b22ef3e3770998dda30d3b63726/pyjwt-2.10.1.tar.gz", hash = "sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953", size = 87785, upload-time = "2024-11-28T03:43:29.933Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/5c/5a/b46fa56bf322901eee5b0454a34343cdbdae202cd421775a8ee4e42fd519/pyjwt-2.11.0.tar.gz", hash = "sha256:35f95c1f0fbe5d5ba6e43f00271c275f7a1a4db1dab27bf708073b75318ea623", size = 98019, upload-time = "2026-01-30T19:59:55.694Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/61/ad/689f02752eeec26aed679477e80e632ef1b682313be70793d798c1d5fc8f/PyJWT-2.10.1-py3-none-any.whl", hash = "sha256:dcdd193e30abefd5debf142f9adfcdd2b58004e644f25406ffaebd50bd98dacb", size = 22997, upload-time = "2024-11-28T03:43:27.893Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/01/c26ce75ba460d5cd503da9e13b21a33804d38c2165dec7b716d06b13010c/pyjwt-2.11.0-py3-none-any.whl", hash = "sha256:94a6bde30eb5c8e04fee991062b534071fd1439ef58d2adc9ccb823e7bcd0469", size = 28224, upload-time = "2026-01-30T19:59:54.539Z" },
 ]
 
 [package.optional-dependencies]

From aca3d1900e5b9d6b79bd3e3b7aef383959ee2886 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:59:53 +0900
Subject: [PATCH 03/22] chore(deps-dev): update types-aiofiles requirement from
 ~=24.1.0 to ~=25.1.0 in /api (#32803)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[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 a7069bff60..f5e43f3ed1 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -124,7 +124,7 @@ dev = [
     "pytest-env~=1.1.3",
     "pytest-mock~=3.14.0",
     "testcontainers~=4.13.2",
-    "types-aiofiles~=24.1.0",
+    "types-aiofiles~=25.1.0",
     "types-beautifulsoup4~=4.12.0",
     "types-cachetools~=5.5.0",
     "types-colorama~=0.4.15",
diff --git a/api/uv.lock b/api/uv.lock
index 46fb881001..b9f660ce71 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -1683,7 +1683,7 @@ dev = [
     { name = "scipy-stubs", specifier = ">=1.15.3.0" },
     { name = "sseclient-py", specifier = ">=1.8.0" },
     { name = "testcontainers", specifier = "~=4.13.2" },
-    { name = "types-aiofiles", specifier = "~=24.1.0" },
+    { name = "types-aiofiles", specifier = "~=25.1.0" },
     { name = "types-beautifulsoup4", specifier = "~=4.12.0" },
     { name = "types-cachetools", specifier = "~=5.5.0" },
     { name = "types-cffi", specifier = ">=1.17.0" },
@@ -6293,11 +6293,11 @@ wheels = [
 
 [[package]]
 name = "types-aiofiles"
-version = "24.1.0.20250822"
+version = "25.1.0.20251011"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/19/48/c64471adac9206cc844afb33ed311ac5a65d2f59df3d861e0f2d0cad7414/types_aiofiles-24.1.0.20250822.tar.gz", hash = "sha256:9ab90d8e0c307fe97a7cf09338301e3f01a163e39f3b529ace82466355c84a7b", size = 14484, upload-time = "2025-08-22T03:02:23.039Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/84/6c/6d23908a8217e36704aa9c79d99a620f2fdd388b66a4b7f72fbc6b6ff6c6/types_aiofiles-25.1.0.20251011.tar.gz", hash = "sha256:1c2b8ab260cb3cd40c15f9d10efdc05a6e1e6b02899304d80dfa0410e028d3ff", size = 14535, upload-time = "2025-10-11T02:44:51.237Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/bc/8e/5e6d2215e1d8f7c2a94c6e9d0059ae8109ce0f5681956d11bb0a228cef04/types_aiofiles-24.1.0.20250822-py3-none-any.whl", hash = "sha256:0ec8f8909e1a85a5a79aed0573af7901f53120dd2a29771dd0b3ef48e12328b0", size = 14322, upload-time = "2025-08-22T03:02:21.918Z" },
+    { url = "https://files.pythonhosted.org/packages/71/0f/76917bab27e270bb6c32addd5968d69e558e5b6f7fb4ac4cbfa282996a96/types_aiofiles-25.1.0.20251011-py3-none-any.whl", hash = "sha256:8ff8de7f9d42739d8f0dadcceeb781ce27cd8d8c4152d4a7c52f6b20edb8149c", size = 14338, upload-time = "2025-10-11T02:44:50.054Z" },
 ]
 
 [[package]]

From cc127f5b6242598c285a9ca6f5be65a860764036 Mon Sep 17 00:00:00 2001
From: wangxiaolei <fatelei@gmail.com>
Date: Mon, 2 Mar 2026 14:05:04 +0800
Subject: [PATCH 04/22] fix: fix chat assistant response mode blocking is not
 work (#32394)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 .../easy_ui_based_generate_task_pipeline.py   |  8 +--
 api/services/app_generate_service.py          | 69 ++++++++++++-------
 .../services/test_app_generate_service.py     | 53 ++++++++++++++
 3 files changed, 102 insertions(+), 28 deletions(-)

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 8792e65512..a77e5abb30 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
@@ -157,7 +157,7 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
                             id=self._message_id,
                             mode=self._conversation_mode,
                             message_id=self._message_id,
-                            answer=cast(str, self._task_state.llm_result.message.content),
+                            answer=self._task_state.llm_result.message.get_text_content(),
                             created_at=self._message_created_at,
                             **extras,
                         ),
@@ -170,7 +170,7 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
                             mode=self._conversation_mode,
                             conversation_id=self._conversation_id,
                             message_id=self._message_id,
-                            answer=cast(str, self._task_state.llm_result.message.content),
+                            answer=self._task_state.llm_result.message.get_text_content(),
                             created_at=self._message_created_at,
                             **extras,
                         ),
@@ -283,7 +283,7 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
 
                 # handle output moderation
                 output_moderation_answer = self.handle_output_moderation_when_task_finished(
-                    cast(str, self._task_state.llm_result.message.content)
+                    self._task_state.llm_result.message.get_text_content()
                 )
                 if output_moderation_answer:
                     self._task_state.llm_result.message.content = output_moderation_answer
@@ -397,7 +397,7 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
         message.message_unit_price = usage.prompt_unit_price
         message.message_price_unit = usage.prompt_price_unit
         message.answer = (
-            PromptTemplateParser.remove_template_variables(cast(str, llm_result.message.content).strip())
+            PromptTemplateParser.remove_template_variables(llm_result.message.get_text_content().strip())
             if llm_result.message.content
             else ""
         )
diff --git a/api/services/app_generate_service.py b/api/services/app_generate_service.py
index 0c27c403f8..31003cb8f7 100644
--- a/api/services/app_generate_service.py
+++ b/api/services/app_generate_service.py
@@ -131,33 +131,54 @@ class AppGenerateService:
             elif app_model.mode == AppMode.ADVANCED_CHAT:
                 workflow_id = args.get("workflow_id")
                 workflow = cls._get_workflow(app_model, invoke_from, workflow_id)
-                with rate_limit_context(rate_limit, request_id):
-                    payload = AppExecutionParams.new(
-                        app_model=app_model,
-                        workflow=workflow,
-                        user=user,
-                        args=args,
-                        invoke_from=invoke_from,
-                        streaming=streaming,
-                        call_depth=0,
-                    )
-                    payload_json = payload.model_dump_json()
 
-                def on_subscribe():
-                    workflow_based_app_execution_task.delay(payload_json)
+                if streaming:
+                    # Streaming mode: subscribe to SSE and enqueue the execution on first subscriber
+                    with rate_limit_context(rate_limit, request_id):
+                        payload = AppExecutionParams.new(
+                            app_model=app_model,
+                            workflow=workflow,
+                            user=user,
+                            args=args,
+                            invoke_from=invoke_from,
+                            streaming=True,
+                            call_depth=0,
+                        )
+                        payload_json = payload.model_dump_json()
 
-                on_subscribe = cls._build_streaming_task_on_subscribe(on_subscribe)
-                generator = AdvancedChatAppGenerator()
-                return rate_limit.generate(
-                    generator.convert_to_event_stream(
-                        generator.retrieve_events(
-                            AppMode.ADVANCED_CHAT,
-                            payload.workflow_run_id,
-                            on_subscribe=on_subscribe,
+                    def on_subscribe():
+                        workflow_based_app_execution_task.delay(payload_json)
+
+                    on_subscribe = cls._build_streaming_task_on_subscribe(on_subscribe)
+                    generator = AdvancedChatAppGenerator()
+                    return rate_limit.generate(
+                        generator.convert_to_event_stream(
+                            generator.retrieve_events(
+                                AppMode.ADVANCED_CHAT,
+                                payload.workflow_run_id,
+                                on_subscribe=on_subscribe,
+                            ),
                         ),
-                    ),
-                    request_id=request_id,
-                )
+                        request_id=request_id,
+                    )
+                else:
+                    # Blocking mode: run synchronously and return JSON instead of SSE
+                    # Keep behaviour consistent with WORKFLOW blocking branch.
+                    advanced_generator = AdvancedChatAppGenerator()
+                    return rate_limit.generate(
+                        advanced_generator.convert_to_event_stream(
+                            advanced_generator.generate(
+                                app_model=app_model,
+                                workflow=workflow,
+                                user=user,
+                                args=args,
+                                invoke_from=invoke_from,
+                                workflow_run_id=str(uuid.uuid4()),
+                                streaming=False,
+                            )
+                        ),
+                        request_id=request_id,
+                    )
             elif app_model.mode == AppMode.WORKFLOW:
                 workflow_id = args.get("workflow_id")
                 workflow = cls._get_workflow(app_model, invoke_from, workflow_id)
diff --git a/api/tests/unit_tests/services/test_app_generate_service.py b/api/tests/unit_tests/services/test_app_generate_service.py
index 71134464e6..47b759bc7d 100644
--- a/api/tests/unit_tests/services/test_app_generate_service.py
+++ b/api/tests/unit_tests/services/test_app_generate_service.py
@@ -63,3 +63,56 @@ def test_workflow_blocking_injects_pause_state_config(mocker, monkeypatch):
     pause_state_config = call_kwargs.get("pause_state_config")
     assert pause_state_config is not None
     assert pause_state_config.state_owner_user_id == "owner-id"
+
+
+def test_advanced_chat_blocking_returns_dict_and_does_not_use_event_retrieval(mocker, monkeypatch):
+    """
+    Regression test: ADVANCED_CHAT in blocking mode should return a plain dict
+    (non-streaming), and must not go through the async retrieve_events path.
+    Keeps behavior consistent with WORKFLOW blocking branch.
+    """
+    # Disable billing and stub RateLimit to a no-op that just passes values through
+    monkeypatch.setattr(app_generate_service_module.dify_config, "BILLING_ENABLED", False)
+    mocker.patch("services.app_generate_service.RateLimit", _DummyRateLimit)
+
+    # Arrange a fake workflow and wire AppGenerateService._get_workflow to return it
+    workflow = MagicMock()
+    workflow.id = "workflow-id"
+    mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
+
+    # Spy on the streaming retrieval path to ensure it's NOT called
+    retrieve_spy = mocker.patch("services.app_generate_service.AdvancedChatAppGenerator.retrieve_events")
+
+    # Make AdvancedChatAppGenerator.generate return a plain dict when streaming=False
+    generate_spy = mocker.patch(
+        "services.app_generate_service.AdvancedChatAppGenerator.generate",
+        return_value={"result": "ok"},
+    )
+
+    # Minimal app model for ADVANCED_CHAT
+    app_model = MagicMock()
+    app_model.mode = AppMode.ADVANCED_CHAT
+    app_model.id = "app-id"
+    app_model.tenant_id = "tenant-id"
+    app_model.max_active_requests = 0
+    app_model.is_agent = False
+
+    user = MagicMock()
+    user.id = "user-id"
+
+    # Must include query and inputs for AdvancedChatAppGenerator
+    args = {"workflow_id": "wf-1", "query": "hello", "inputs": {}}
+
+    # Act: call service with streaming=False (blocking mode)
+    result = AppGenerateService.generate(
+        app_model=app_model,
+        user=user,
+        args=args,
+        invoke_from=MagicMock(),
+        streaming=False,
+    )
+
+    # Assert: returns the dict from generate(), and did not call retrieve_events()
+    assert result == {"result": "ok"}
+    assert generate_spy.call_args.kwargs.get("streaming") is False
+    retrieve_spy.assert_not_called()

From 8af110a87e22bdac7d715dce3383df37985975f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=B5=E3=82=8B=E3=81=84?=
 <46769295+Echo0ff@users.noreply.github.com>
Date: Mon, 2 Mar 2026 14:28:12 +0800
Subject: [PATCH 05/22] refactor: use unified diff format in pyrefly-diff
 workflow (#32828)


From 42a8d962a0f68b2b253cbd702664587d3f97eab4 Mon Sep 17 00:00:00 2001
From: Stable Genius <stablegenius043@gmail.com>
Date: Sun, 1 Mar 2026 22:31:29 -0800
Subject: [PATCH 06/22] refactor: remove tests and core/rag from pyrefly
 excludes (#32801)

Co-authored-by: Stable Genius <259448942+stablegenius49@users.noreply.github.com>
---
 api/pyrefly.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/api/pyrefly.toml b/api/pyrefly.toml
index 80ffba019d..01f4c5a529 100644
--- a/api/pyrefly.toml
+++ b/api/pyrefly.toml
@@ -1,9 +1,7 @@
 project-includes = ["."]
 project-excludes = [
-    "tests/",
     ".venv",
     "migrations/",
-    "core/rag",
 ]
 python-platform = "linux"
 python-version = "3.11.0"

From 9ddbc1c0fb22dfb4264e47b0a86f05b9dc068e8d Mon Sep 17 00:00:00 2001
From: Varun Chawla <34209028+veeceey@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:54:26 -0800
Subject: [PATCH 07/22] fix: map all NodeType values to span kinds in Arize
 Phoenix tracing (#32059)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Crazywoola <100913391+crazywoola@users.noreply.github.com>
---
 .../arize_phoenix_trace.py                    | 29 ++++++++++-----
 .../core/ops/test_arize_phoenix_trace.py      | 36 +++++++++++++++++++
 2 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 api/tests/unit_tests/core/ops/test_arize_phoenix_trace.py

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 a7b73e032e..452255f69e 100644
--- a/api/core/ops/arize_phoenix_trace/arize_phoenix_trace.py
+++ b/api/core/ops/arize_phoenix_trace/arize_phoenix_trace.py
@@ -155,6 +155,26 @@ def wrap_span_metadata(metadata, **kwargs):
     return metadata
 
 
+# Mapping from NodeType string values to OpenInference span kinds.
+# NodeType values not listed here default to CHAIN.
+_NODE_TYPE_TO_SPAN_KIND: dict[str, OpenInferenceSpanKindValues] = {
+    "llm": OpenInferenceSpanKindValues.LLM,
+    "knowledge-retrieval": OpenInferenceSpanKindValues.RETRIEVER,
+    "tool": OpenInferenceSpanKindValues.TOOL,
+    "agent": OpenInferenceSpanKindValues.AGENT,
+}
+
+
+def _get_node_span_kind(node_type: str) -> OpenInferenceSpanKindValues:
+    """Return the OpenInference span kind for a given workflow node type.
+
+    Covers every ``NodeType`` enum value.  Nodes that do not have a
+    specialised span kind (e.g. ``start``, ``end``, ``if-else``,
+    ``code``, ``loop``, ``iteration``, etc.) are mapped to ``CHAIN``.
+    """
+    return _NODE_TYPE_TO_SPAN_KIND.get(node_type, OpenInferenceSpanKindValues.CHAIN)
+
+
 class ArizePhoenixDataTrace(BaseTraceInstance):
     def __init__(
         self,
@@ -289,9 +309,8 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
                 )
 
                 # Determine the correct span kind based on node type
-                span_kind = OpenInferenceSpanKindValues.CHAIN
+                span_kind = _get_node_span_kind(node_execution.node_type)
                 if node_execution.node_type == "llm":
-                    span_kind = OpenInferenceSpanKindValues.LLM
                     provider = process_data.get("model_provider")
                     model = process_data.get("model_name")
                     if provider:
@@ -306,12 +325,6 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
                         node_metadata["total_tokens"] = usage_data.get("total_tokens", 0)
                         node_metadata["prompt_tokens"] = usage_data.get("prompt_tokens", 0)
                         node_metadata["completion_tokens"] = usage_data.get("completion_tokens", 0)
-                elif node_execution.node_type == "dataset_retrieval":
-                    span_kind = OpenInferenceSpanKindValues.RETRIEVER
-                elif node_execution.node_type == "tool":
-                    span_kind = OpenInferenceSpanKindValues.TOOL
-                else:
-                    span_kind = OpenInferenceSpanKindValues.CHAIN
 
                 workflow_span_context = set_span_in_context(workflow_span)
                 node_span = self.tracer.start_span(
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
new file mode 100644
index 0000000000..4f398ce66e
--- /dev/null
+++ b/api/tests/unit_tests/core/ops/test_arize_phoenix_trace.py
@@ -0,0 +1,36 @@
+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 core.workflow.enums import NodeType
+
+
+class TestGetNodeSpanKind:
+    """Tests for _get_node_span_kind helper."""
+
+    def test_all_node_types_are_mapped_correctly(self):
+        """Ensure every NodeType enum member is mapped to the correct span kind."""
+        # Mappings for node types that have a specialised span kind.
+        special_mappings = {
+            NodeType.LLM: OpenInferenceSpanKindValues.LLM,
+            NodeType.KNOWLEDGE_RETRIEVAL: OpenInferenceSpanKindValues.RETRIEVER,
+            NodeType.TOOL: OpenInferenceSpanKindValues.TOOL,
+            NodeType.AGENT: OpenInferenceSpanKindValues.AGENT,
+        }
+
+        # Test that every NodeType enum member is mapped to the correct span kind.
+        # Node types not in `special_mappings` should default to CHAIN.
+        for node_type in NodeType:
+            expected_span_kind = special_mappings.get(node_type, OpenInferenceSpanKindValues.CHAIN)
+            actual_span_kind = _get_node_span_kind(node_type)
+            assert actual_span_kind == expected_span_kind, (
+                f"NodeType.{node_type.name} was mapped to {actual_span_kind}, but {expected_span_kind} was expected."
+            )
+
+    def test_unknown_string_defaults_to_chain(self):
+        """An unrecognised node type string should still return CHAIN."""
+        assert _get_node_span_kind("some-future-node-type") == OpenInferenceSpanKindValues.CHAIN
+
+    def test_stale_dataset_retrieval_not_in_mapping(self):
+        """The old 'dataset_retrieval' string was never a valid NodeType value;
+        make sure it is not present in the mapping dictionary."""
+        assert "dataset_retrieval" not in _NODE_TYPE_TO_SPAN_KIND

From 8a7ba8734946ae359df6d30cf60e1e853effcf22 Mon Sep 17 00:00:00 2001
From: Xiyuan Chen <52963600+GareArc@users.noreply.github.com>
Date: Sun, 1 Mar 2026 23:03:37 -0800
Subject: [PATCH 08/22] fix: upgrade OpenTelemetry to 0.49b0 to fix context
 detach error (#32825)

---
 api/pyproject.toml |  49 ++++---
 api/uv.lock        | 322 +++++++++++++++++++++++----------------------
 2 files changed, 186 insertions(+), 185 deletions(-)

diff --git a/api/pyproject.toml b/api/pyproject.toml
index f5e43f3ed1..f544cd27b2 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -22,14 +22,14 @@ dependencies = [
     "flask-sqlalchemy~=3.1.1",
     "gevent~=25.9.1",
     "gmpy2~=2.3.0",
-    "google-api-core==2.18.0",
+    "google-api-core>=2.19.1",
     "google-api-python-client==2.189.0",
-    "google-auth==2.29.0",
+    "google-auth>=2.47.0",
     "google-auth-httplib2==0.2.0",
-    "google-cloud-aiplatform==1.49.0",
-    "googleapis-common-protos==1.63.0",
+    "google-cloud-aiplatform>=1.123.0",
+    "googleapis-common-protos>=1.65.0",
     "gunicorn~=23.0.0",
-    "httpx[socks]~=0.27.0",
+    "httpx[socks]~=0.28.0",
     "jieba==0.42.1",
     "json-repair>=0.55.1",
     "jsonschema>=4.25.1",
@@ -41,26 +41,23 @@ dependencies = [
     "openpyxl~=3.1.5",
     "opik~=1.8.72",
     "litellm==1.77.1",                                  # Pinned to avoid madoka dependency issue
-    "opentelemetry-api==1.27.0",
-    "opentelemetry-distro==0.48b0",
-    "opentelemetry-exporter-otlp==1.27.0",
-    "opentelemetry-exporter-otlp-proto-common==1.27.0",
-    "opentelemetry-exporter-otlp-proto-grpc==1.27.0",
-    "opentelemetry-exporter-otlp-proto-http==1.27.0",
-    "opentelemetry-instrumentation==0.48b0",
-    "opentelemetry-instrumentation-celery==0.48b0",
-    "opentelemetry-instrumentation-flask==0.48b0",
-    "opentelemetry-instrumentation-httpx==0.48b0",
-    "opentelemetry-instrumentation-redis==0.48b0",
-    "opentelemetry-instrumentation-httpx==0.48b0",
-    "opentelemetry-instrumentation-sqlalchemy==0.48b0",
-    "opentelemetry-propagator-b3==1.27.0",
-    # opentelemetry-proto1.28.0 depends on protobuf (>=5.0,<6.0),
-    # which is conflict with googleapis-common-protos (1.63.0)
-    "opentelemetry-proto==1.27.0",
-    "opentelemetry-sdk==1.27.0",
-    "opentelemetry-semantic-conventions==0.48b0",
-    "opentelemetry-util-http==0.48b0",
+    "opentelemetry-api==1.28.0",
+    "opentelemetry-distro==0.49b0",
+    "opentelemetry-exporter-otlp==1.28.0",
+    "opentelemetry-exporter-otlp-proto-common==1.28.0",
+    "opentelemetry-exporter-otlp-proto-grpc==1.28.0",
+    "opentelemetry-exporter-otlp-proto-http==1.28.0",
+    "opentelemetry-instrumentation==0.49b0",
+    "opentelemetry-instrumentation-celery==0.49b0",
+    "opentelemetry-instrumentation-flask==0.49b0",
+    "opentelemetry-instrumentation-httpx==0.49b0",
+    "opentelemetry-instrumentation-redis==0.49b0",
+    "opentelemetry-instrumentation-sqlalchemy==0.49b0",
+    "opentelemetry-propagator-b3==1.28.0",
+    "opentelemetry-proto==1.28.0",
+    "opentelemetry-sdk==1.28.0",
+    "opentelemetry-semantic-conventions==0.49b0",
+    "opentelemetry-util-http==0.49b0",
     "pandas[excel,output-formatting,performance]~=2.2.2",
     "psycogreen~=1.0.2",
     "psycopg2-binary~=2.9.6",
@@ -187,7 +184,7 @@ storage = [
     "bce-python-sdk~=0.9.23",
     "cos-python-sdk-v5==1.9.38",
     "esdk-obs-python==3.25.8",
-    "google-cloud-storage==2.16.0",
+    "google-cloud-storage>=3.0.0",
     "opendal~=0.46.0",
     "oss2==2.18.5",
     "supabase~=2.18.1",
diff --git a/api/uv.lock b/api/uv.lock
index b9f660ce71..0121cbaab0 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -1591,14 +1591,14 @@ requires-dist = [
     { name = "flask-sqlalchemy", specifier = "~=3.1.1" },
     { name = "gevent", specifier = "~=25.9.1" },
     { name = "gmpy2", specifier = "~=2.3.0" },
-    { name = "google-api-core", specifier = "==2.18.0" },
+    { name = "google-api-core", specifier = ">=2.19.1" },
     { name = "google-api-python-client", specifier = "==2.189.0" },
-    { name = "google-auth", specifier = "==2.29.0" },
+    { name = "google-auth", specifier = ">=2.47.0" },
     { name = "google-auth-httplib2", specifier = "==0.2.0" },
-    { name = "google-cloud-aiplatform", specifier = "==1.49.0" },
-    { name = "googleapis-common-protos", specifier = "==1.63.0" },
+    { name = "google-cloud-aiplatform", specifier = ">=1.123.0" },
+    { name = "googleapis-common-protos", specifier = ">=1.65.0" },
     { name = "gunicorn", specifier = "~=23.0.0" },
-    { name = "httpx", extras = ["socks"], specifier = "~=0.27.0" },
+    { name = "httpx", extras = ["socks"], specifier = "~=0.28.0" },
     { name = "httpx-sse", specifier = "~=0.4.0" },
     { name = "jieba", specifier = "==0.42.1" },
     { name = "json-repair", specifier = ">=0.55.1" },
@@ -1610,23 +1610,23 @@ requires-dist = [
     { name = "mlflow-skinny", specifier = ">=3.0.0" },
     { name = "numpy", specifier = "~=1.26.4" },
     { name = "openpyxl", specifier = "~=3.1.5" },
-    { name = "opentelemetry-api", specifier = "==1.27.0" },
-    { name = "opentelemetry-distro", specifier = "==0.48b0" },
-    { name = "opentelemetry-exporter-otlp", specifier = "==1.27.0" },
-    { name = "opentelemetry-exporter-otlp-proto-common", specifier = "==1.27.0" },
-    { name = "opentelemetry-exporter-otlp-proto-grpc", specifier = "==1.27.0" },
-    { name = "opentelemetry-exporter-otlp-proto-http", specifier = "==1.27.0" },
-    { name = "opentelemetry-instrumentation", specifier = "==0.48b0" },
-    { name = "opentelemetry-instrumentation-celery", specifier = "==0.48b0" },
-    { name = "opentelemetry-instrumentation-flask", specifier = "==0.48b0" },
-    { name = "opentelemetry-instrumentation-httpx", specifier = "==0.48b0" },
-    { name = "opentelemetry-instrumentation-redis", specifier = "==0.48b0" },
-    { name = "opentelemetry-instrumentation-sqlalchemy", specifier = "==0.48b0" },
-    { name = "opentelemetry-propagator-b3", specifier = "==1.27.0" },
-    { name = "opentelemetry-proto", specifier = "==1.27.0" },
-    { name = "opentelemetry-sdk", specifier = "==1.27.0" },
-    { name = "opentelemetry-semantic-conventions", specifier = "==0.48b0" },
-    { name = "opentelemetry-util-http", specifier = "==0.48b0" },
+    { name = "opentelemetry-api", specifier = "==1.28.0" },
+    { name = "opentelemetry-distro", specifier = "==0.49b0" },
+    { name = "opentelemetry-exporter-otlp", specifier = "==1.28.0" },
+    { name = "opentelemetry-exporter-otlp-proto-common", specifier = "==1.28.0" },
+    { name = "opentelemetry-exporter-otlp-proto-grpc", specifier = "==1.28.0" },
+    { name = "opentelemetry-exporter-otlp-proto-http", specifier = "==1.28.0" },
+    { name = "opentelemetry-instrumentation", specifier = "==0.49b0" },
+    { name = "opentelemetry-instrumentation-celery", specifier = "==0.49b0" },
+    { name = "opentelemetry-instrumentation-flask", specifier = "==0.49b0" },
+    { name = "opentelemetry-instrumentation-httpx", specifier = "==0.49b0" },
+    { name = "opentelemetry-instrumentation-redis", specifier = "==0.49b0" },
+    { name = "opentelemetry-instrumentation-sqlalchemy", specifier = "==0.49b0" },
+    { name = "opentelemetry-propagator-b3", specifier = "==1.28.0" },
+    { name = "opentelemetry-proto", specifier = "==1.28.0" },
+    { name = "opentelemetry-sdk", specifier = "==1.28.0" },
+    { name = "opentelemetry-semantic-conventions", specifier = "==0.49b0" },
+    { name = "opentelemetry-util-http", specifier = "==0.49b0" },
     { name = "opik", specifier = "~=1.8.72" },
     { name = "packaging", specifier = "~=23.2" },
     { name = "pandas", extras = ["excel", "output-formatting", "performance"], specifier = "~=2.2.2" },
@@ -1729,7 +1729,7 @@ storage = [
     { name = "bce-python-sdk", specifier = "~=0.9.23" },
     { name = "cos-python-sdk-v5", specifier = "==1.9.38" },
     { name = "esdk-obs-python", specifier = "==3.25.8" },
-    { name = "google-cloud-storage", specifier = "==2.16.0" },
+    { name = "google-cloud-storage", specifier = ">=3.0.0" },
     { name = "opendal", specifier = "~=0.46.0" },
     { name = "oss2", specifier = "==2.18.5" },
     { name = "supabase", specifier = "~=2.18.1" },
@@ -2294,7 +2294,7 @@ wheels = [
 
 [[package]]
 name = "google-api-core"
-version = "2.18.0"
+version = "2.30.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "google-auth" },
@@ -2303,9 +2303,9 @@ dependencies = [
     { name = "protobuf" },
     { name = "requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b2/8f/ecd68579bd2bf5e9321df60dcdee6e575adf77fedacb1d8378760b2b16b6/google-api-core-2.18.0.tar.gz", hash = "sha256:62d97417bfc674d6cef251e5c4d639a9655e00c45528c4364fbfebb478ce72a9", size = 148047, upload-time = "2024-03-21T20:16:56.269Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/22/98/586ec94553b569080caef635f98a3723db36a38eac0e3d7eb3ea9d2e4b9a/google_api_core-2.30.0.tar.gz", hash = "sha256:02edfa9fab31e17fc0befb5f161b3bf93c9096d99aed584625f38065c511ad9b", size = 176959, upload-time = "2026-02-18T20:28:11.926Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/86/75/59a3ad90d9b4ff5b3e0537611dbe885aeb96124521c9d35aa079f1e0f2c9/google_api_core-2.18.0-py3-none-any.whl", hash = "sha256:5a63aa102e0049abe85b5b88cb9409234c1f70afcda21ce1e40b285b9629c1d6", size = 138293, upload-time = "2024-03-21T20:16:53.645Z" },
+    { url = "https://files.pythonhosted.org/packages/45/27/09c33d67f7e0dcf06d7ac17d196594e66989299374bfb0d4331d1038e76b/google_api_core-2.30.0-py3-none-any.whl", hash = "sha256:80be49ee937ff9aba0fd79a6eddfde35fe658b9953ab9b79c57dd7061afa8df5", size = 173288, upload-time = "2026-02-18T20:28:10.367Z" },
 ]
 
 [package.optional-dependencies]
@@ -2332,16 +2332,21 @@ wheels = [
 
 [[package]]
 name = "google-auth"
-version = "2.29.0"
+version = "2.48.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "cachetools" },
+    { name = "cryptography" },
     { name = "pyasn1-modules" },
     { name = "rsa" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/18/b2/f14129111cfd61793609643a07ecb03651a71dd65c6974f63b0310ff4b45/google-auth-2.29.0.tar.gz", hash = "sha256:672dff332d073227550ffc7457868ac4218d6c500b155fe6cc17d2b13602c360", size = 244326, upload-time = "2024-03-20T17:24:27.72Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/0c/41/242044323fbd746615884b1c16639749e73665b718209946ebad7ba8a813/google_auth-2.48.0.tar.gz", hash = "sha256:4f7e706b0cd3208a3d940a19a822c37a476ddba5450156c3e6624a71f7c841ce", size = 326522, upload-time = "2026-01-26T19:22:47.157Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9e/8d/ddbcf81ec751d8ee5fd18ac11ff38a0e110f39dfbf105e6d9db69d556dd0/google_auth-2.29.0-py2.py3-none-any.whl", hash = "sha256:d452ad095688cd52bae0ad6fafe027f6a6d6f560e810fec20914e17a09526415", size = 189186, upload-time = "2024-03-20T17:24:24.292Z" },
+    { url = "https://files.pythonhosted.org/packages/83/1d/d6466de3a5249d35e832a52834115ca9d1d0de6abc22065f049707516d47/google_auth-2.48.0-py3-none-any.whl", hash = "sha256:2e2a537873d449434252a9632c28bfc268b0adb1e53f9fb62afc5333a975903f", size = 236499, upload-time = "2026-01-26T19:22:45.099Z" },
+]
+
+[package.optional-dependencies]
+requests = [
+    { name = "requests" },
 ]
 
 [[package]]
@@ -2359,7 +2364,7 @@ wheels = [
 
 [[package]]
 name = "google-cloud-aiplatform"
-version = "1.49.0"
+version = "1.139.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "docstring-parser" },
@@ -2368,15 +2373,16 @@ dependencies = [
     { name = "google-cloud-bigquery" },
     { name = "google-cloud-resource-manager" },
     { name = "google-cloud-storage" },
+    { name = "google-genai" },
     { name = "packaging" },
     { name = "proto-plus" },
     { name = "protobuf" },
     { name = "pydantic" },
-    { name = "shapely" },
+    { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/47/21/5930a1420f82bec246ae09e1b7cc8458544f3befe669193b33a7b5c0691c/google-cloud-aiplatform-1.49.0.tar.gz", hash = "sha256:e6e6d01079bb5def49e4be4db4d12b13c624b5c661079c869c13c855e5807429", size = 5766450, upload-time = "2024-04-29T17:25:31.646Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/20/40/6767bd4d694354fd55842990da66f7b6ccfdce283d10f65d4a82d9a8e8df/google_cloud_aiplatform-1.139.0.tar.gz", hash = "sha256:cfaa95375bfb79a97b8c949c3ec1600505a4a9c08ca2b01c36ed659a5e05e37c", size = 9964138, upload-time = "2026-02-25T00:51:06.976Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/39/6a/7d9e1c03c814e760361fe8b0ffd373ead4124ace66ed33bb16d526ae1ecf/google_cloud_aiplatform-1.49.0-py2.py3-none-any.whl", hash = "sha256:8072d9e0c18d8942c704233d1a93b8d6312fc7b278786a283247950e28ae98df", size = 4914049, upload-time = "2024-04-29T17:25:27.625Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/20/a8a77dfdbf2a8169a3cce2d4e9cfbbfc168454ddd435891e59908ea8bf33/google_cloud_aiplatform-1.139.0-py2.py3-none-any.whl", hash = "sha256:3190b255cf510bce9e4b1adc8162ab0b3f9eca48801657d7af058d8e1d5ad9d0", size = 8209776, upload-time = "2026-02-25T00:51:03.526Z" },
 ]
 
 [[package]]
@@ -2429,7 +2435,7 @@ wheels = [
 
 [[package]]
 name = "google-cloud-storage"
-version = "2.16.0"
+version = "3.9.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "google-api-core" },
@@ -2439,9 +2445,9 @@ dependencies = [
     { name = "google-resumable-media" },
     { name = "requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/17/c5/0bc3f97cf4c14a731ecc5a95c5cde6883aec7289dc74817f9b41f866f77e/google-cloud-storage-2.16.0.tar.gz", hash = "sha256:dda485fa503710a828d01246bd16ce9db0823dc51bbca742ce96a6817d58669f", size = 5525307, upload-time = "2024-03-18T23:55:37.102Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f7/b1/4f0798e88285b50dfc60ed3a7de071def538b358db2da468c2e0deecbb40/google_cloud_storage-3.9.0.tar.gz", hash = "sha256:f2d8ca7db2f652be757e92573b2196e10fbc09649b5c016f8b422ad593c641cc", size = 17298544, upload-time = "2026-02-02T13:36:34.119Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/cb/e5/7d045d188f4ef85d94b9e3ae1bf876170c6b9f4c9a950124978efc36f680/google_cloud_storage-2.16.0-py2.py3-none-any.whl", hash = "sha256:91a06b96fb79cf9cdfb4e759f178ce11ea885c79938f89590344d079305f5852", size = 125604, upload-time = "2024-03-18T23:55:33.987Z" },
+    { url = "https://files.pythonhosted.org/packages/46/0b/816a6ae3c9fd096937d2e5f9670558908811d57d59ddf69dd4b83b326fd1/google_cloud_storage-3.9.0-py3-none-any.whl", hash = "sha256:2dce75a9e8b3387078cbbdad44757d410ecdb916101f8ba308abf202b6968066", size = 321324, upload-time = "2026-02-02T13:36:32.271Z" },
 ]
 
 [[package]]
@@ -2464,6 +2470,27 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/fd/3c/2a19a60a473de48717b4efb19398c3f914795b64a96cf3fbe82588044f78/google_crc32c-1.7.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6efb97eb4369d52593ad6f75e7e10d053cf00c48983f7a973105bc70b0ac4d82", size = 28048, upload-time = "2025-03-26T14:41:46.696Z" },
 ]
 
+[[package]]
+name = "google-genai"
+version = "1.65.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "distro" },
+    { name = "google-auth", extra = ["requests"] },
+    { name = "httpx" },
+    { name = "pydantic" },
+    { name = "requests" },
+    { name = "sniffio" },
+    { name = "tenacity" },
+    { name = "typing-extensions" },
+    { name = "websockets" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/79/f9/cc1191c2540d6a4e24609a586c4ed45d2db57cfef47931c139ee70e5874a/google_genai-1.65.0.tar.gz", hash = "sha256:d470eb600af802d58a79c7f13342d9ea0d05d965007cae8f76c7adff3d7a4750", size = 497206, upload-time = "2026-02-26T00:20:33.824Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/68/3c/3fea4e7c91357c71782d7dcaad7a2577d636c90317e003386893c25bc62c/google_genai-1.65.0-py3-none-any.whl", hash = "sha256:68c025205856919bc03edb0155c11b4b833810b7ce17ad4b7a9eeba5158f6c44", size = 724429, upload-time = "2026-02-26T00:20:32.186Z" },
+]
+
 [[package]]
 name = "google-resumable-media"
 version = "2.8.0"
@@ -2478,14 +2505,14 @@ wheels = [
 
 [[package]]
 name = "googleapis-common-protos"
-version = "1.63.0"
+version = "1.72.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "protobuf" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/d2/dc/291cebf3c73e108ef8210f19cb83d671691354f4f7dd956445560d778715/googleapis-common-protos-1.63.0.tar.gz", hash = "sha256:17ad01b11d5f1d0171c06d3ba5c04c54474e883b66b949722b4938ee2694ef4e", size = 121646, upload-time = "2024-03-11T12:33:15.765Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e5/7b/adfd75544c415c487b33061fe7ae526165241c1ea133f9a9125a56b39fd8/googleapis_common_protos-1.72.0.tar.gz", hash = "sha256:e55a601c1b32b52d7a3e65f43563e2aa61bcd737998ee672ac9b951cd49319f5", size = 147433, upload-time = "2025-11-06T18:29:24.087Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/dc/a6/12a0c976140511d8bc8a16ad15793b2aef29ac927baa0786ccb7ddbb6e1c/googleapis_common_protos-1.63.0-py2.py3-none-any.whl", hash = "sha256:ae45f75702f7c08b541f750854a678bd8f534a1a6bace6afe975f1d0a82d6632", size = 229141, upload-time = "2024-03-11T12:33:14.052Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/ab/09169d5a4612a5f92490806649ac8d41e3ec9129c636754575b3553f4ea4/googleapis_common_protos-1.72.0-py3-none-any.whl", hash = "sha256:4299c5a82d5ae1a9702ada957347726b167f9f8d1fc352477702a1e851ff4038", size = 297515, upload-time = "2025-11-06T18:29:13.14Z" },
 ]
 
 [package.optional-dependencies]
@@ -2675,31 +2702,35 @@ wheels = [
 
 [[package]]
 name = "grpcio-tools"
-version = "1.62.3"
+version = "1.71.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "grpcio" },
     { name = "protobuf" },
     { name = "setuptools" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/54/fa/b69bd8040eafc09b88bb0ec0fea59e8aacd1a801e688af087cead213b0d0/grpcio-tools-1.62.3.tar.gz", hash = "sha256:7c7136015c3d62c3eef493efabaf9e3380e3e66d24ee8e94c01cb71377f57833", size = 4538520, upload-time = "2024-08-06T00:37:11.035Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ad/9a/edfefb47f11ef6b0f39eea4d8f022c5bb05ac1d14fcc7058e84a51305b73/grpcio_tools-1.71.2.tar.gz", hash = "sha256:b5304d65c7569b21270b568e404a5a843cf027c66552a6a0978b23f137679c09", size = 5330655, upload-time = "2025-06-28T04:22:00.308Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/23/52/2dfe0a46b63f5ebcd976570aa5fc62f793d5a8b169e211c6a5aede72b7ae/grpcio_tools-1.62.3-cp311-cp311-macosx_10_10_universal2.whl", hash = "sha256:703f46e0012af83a36082b5f30341113474ed0d91e36640da713355cd0ea5d23", size = 5147623, upload-time = "2024-08-06T00:30:54.894Z" },
-    { url = "https://files.pythonhosted.org/packages/f0/2e/29fdc6c034e058482e054b4a3c2432f84ff2e2765c1342d4f0aa8a5c5b9a/grpcio_tools-1.62.3-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:7cc83023acd8bc72cf74c2edbe85b52098501d5b74d8377bfa06f3e929803492", size = 2719538, upload-time = "2024-08-06T00:30:57.928Z" },
-    { url = "https://files.pythonhosted.org/packages/f9/60/abe5deba32d9ec2c76cdf1a2f34e404c50787074a2fee6169568986273f1/grpcio_tools-1.62.3-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7ff7d58a45b75df67d25f8f144936a3e44aabd91afec833ee06826bd02b7fbe7", size = 3070964, upload-time = "2024-08-06T00:31:00.267Z" },
-    { url = "https://files.pythonhosted.org/packages/bc/ad/e2b066684c75f8d9a48508cde080a3a36618064b9cadac16d019ca511444/grpcio_tools-1.62.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f2483ea232bd72d98a6dc6d7aefd97e5bc80b15cd909b9e356d6f3e326b6e43", size = 2805003, upload-time = "2024-08-06T00:31:02.565Z" },
-    { url = "https://files.pythonhosted.org/packages/9c/3f/59bf7af786eae3f9d24ee05ce75318b87f541d0950190ecb5ffb776a1a58/grpcio_tools-1.62.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:962c84b4da0f3b14b3cdb10bc3837ebc5f136b67d919aea8d7bb3fd3df39528a", size = 3685154, upload-time = "2024-08-06T00:31:05.339Z" },
-    { url = "https://files.pythonhosted.org/packages/f1/79/4dd62478b91e27084c67b35a2316ce8a967bd8b6cb8d6ed6c86c3a0df7cb/grpcio_tools-1.62.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8ad0473af5544f89fc5a1ece8676dd03bdf160fb3230f967e05d0f4bf89620e3", size = 3297942, upload-time = "2024-08-06T00:31:08.456Z" },
-    { url = "https://files.pythonhosted.org/packages/b8/cb/86449ecc58bea056b52c0b891f26977afc8c4464d88c738f9648da941a75/grpcio_tools-1.62.3-cp311-cp311-win32.whl", hash = "sha256:db3bc9fa39afc5e4e2767da4459df82b095ef0cab2f257707be06c44a1c2c3e5", size = 910231, upload-time = "2024-08-06T00:31:11.464Z" },
-    { url = "https://files.pythonhosted.org/packages/45/a4/9736215e3945c30ab6843280b0c6e1bff502910156ea2414cd77fbf1738c/grpcio_tools-1.62.3-cp311-cp311-win_amd64.whl", hash = "sha256:e0898d412a434e768a0c7e365acabe13ff1558b767e400936e26b5b6ed1ee51f", size = 1052496, upload-time = "2024-08-06T00:31:13.665Z" },
-    { url = "https://files.pythonhosted.org/packages/2a/a5/d6887eba415ce318ae5005e8dfac3fa74892400b54b6d37b79e8b4f14f5e/grpcio_tools-1.62.3-cp312-cp312-macosx_10_10_universal2.whl", hash = "sha256:d102b9b21c4e1e40af9a2ab3c6d41afba6bd29c0aa50ca013bf85c99cdc44ac5", size = 5147690, upload-time = "2024-08-06T00:31:16.436Z" },
-    { url = "https://files.pythonhosted.org/packages/8a/7c/3cde447a045e83ceb4b570af8afe67ffc86896a2fe7f59594dc8e5d0a645/grpcio_tools-1.62.3-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:0a52cc9444df978438b8d2332c0ca99000521895229934a59f94f37ed896b133", size = 2720538, upload-time = "2024-08-06T00:31:18.905Z" },
-    { url = "https://files.pythonhosted.org/packages/88/07/f83f2750d44ac4f06c07c37395b9c1383ef5c994745f73c6bfaf767f0944/grpcio_tools-1.62.3-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:141d028bf5762d4a97f981c501da873589df3f7e02f4c1260e1921e565b376fa", size = 3071571, upload-time = "2024-08-06T00:31:21.684Z" },
-    { url = "https://files.pythonhosted.org/packages/37/74/40175897deb61e54aca716bc2e8919155b48f33aafec8043dda9592d8768/grpcio_tools-1.62.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47a5c093ab256dec5714a7a345f8cc89315cb57c298b276fa244f37a0ba507f0", size = 2806207, upload-time = "2024-08-06T00:31:24.208Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/ee/d8de915105a217cbcb9084d684abdc032030dcd887277f2ef167372287fe/grpcio_tools-1.62.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:f6831fdec2b853c9daa3358535c55eed3694325889aa714070528cf8f92d7d6d", size = 3685815, upload-time = "2024-08-06T00:31:26.917Z" },
-    { url = "https://files.pythonhosted.org/packages/fd/d9/4360a6c12be3d7521b0b8c39e5d3801d622fbb81cc2721dbd3eee31e28c8/grpcio_tools-1.62.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e02d7c1a02e3814c94ba0cfe43d93e872c758bd8fd5c2797f894d0c49b4a1dfc", size = 3298378, upload-time = "2024-08-06T00:31:30.401Z" },
-    { url = "https://files.pythonhosted.org/packages/29/3b/7cdf4a9e5a3e0a35a528b48b111355cd14da601413a4f887aa99b6da468f/grpcio_tools-1.62.3-cp312-cp312-win32.whl", hash = "sha256:b881fd9505a84457e9f7e99362eeedd86497b659030cf57c6f0070df6d9c2b9b", size = 910416, upload-time = "2024-08-06T00:31:33.118Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/66/dd3ec249e44c1cc15e902e783747819ed41ead1336fcba72bf841f72c6e9/grpcio_tools-1.62.3-cp312-cp312-win_amd64.whl", hash = "sha256:11c625eebefd1fd40a228fc8bae385e448c7e32a6ae134e43cf13bbc23f902b7", size = 1052856, upload-time = "2024-08-06T00:31:36.519Z" },
+    { url = "https://files.pythonhosted.org/packages/17/e4/0568d38b8da6237ea8ea15abb960fb7ab83eb7bb51e0ea5926dab3d865b1/grpcio_tools-1.71.2-cp311-cp311-linux_armv7l.whl", hash = "sha256:0acb8151ea866be5b35233877fbee6445c36644c0aa77e230c9d1b46bf34b18b", size = 2385557, upload-time = "2025-06-28T04:20:54.323Z" },
+    { url = "https://files.pythonhosted.org/packages/76/fb/700d46f72b0f636cf0e625f3c18a4f74543ff127471377e49a071f64f1e7/grpcio_tools-1.71.2-cp311-cp311-macosx_10_14_universal2.whl", hash = "sha256:b28f8606f4123edb4e6da281547465d6e449e89f0c943c376d1732dc65e6d8b3", size = 5447590, upload-time = "2025-06-28T04:20:55.836Z" },
+    { url = "https://files.pythonhosted.org/packages/12/69/d9bb2aec3de305162b23c5c884b9f79b1a195d42b1e6dabcc084cc9d0804/grpcio_tools-1.71.2-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:cbae6f849ad2d1f5e26cd55448b9828e678cb947fa32c8729d01998238266a6a", size = 2348495, upload-time = "2025-06-28T04:20:57.33Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/83/f840aba1690461b65330efbca96170893ee02fae66651bcc75f28b33a46c/grpcio_tools-1.71.2-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e4d1027615cfb1e9b1f31f2f384251c847d68c2f3e025697e5f5c72e26ed1316", size = 2742333, upload-time = "2025-06-28T04:20:59.051Z" },
+    { url = "https://files.pythonhosted.org/packages/30/34/c02cd9b37de26045190ba665ee6ab8597d47f033d098968f812d253bbf8c/grpcio_tools-1.71.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9bac95662dc69338edb9eb727cc3dd92342131b84b12b3e8ec6abe973d4cbf1b", size = 2473490, upload-time = "2025-06-28T04:21:00.614Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/c7/375718ae091c8f5776828ce97bdcb014ca26244296f8b7f70af1a803ed2f/grpcio_tools-1.71.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:c50250c7248055040f89eb29ecad39d3a260a4b6d3696af1575945f7a8d5dcdc", size = 2850333, upload-time = "2025-06-28T04:21:01.95Z" },
+    { url = "https://files.pythonhosted.org/packages/19/37/efc69345bd92a73b2bc80f4f9e53d42dfdc234b2491ae58c87da20ca0ea5/grpcio_tools-1.71.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6ab1ad955e69027ef12ace4d700c5fc36341bdc2f420e87881e9d6d02af3d7b8", size = 3300748, upload-time = "2025-06-28T04:21:03.451Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/1f/15f787eb25ae42086f55ed3e4260e85f385921c788debf0f7583b34446e3/grpcio_tools-1.71.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:dd75dde575781262b6b96cc6d0b2ac6002b2f50882bf5e06713f1bf364ee6e09", size = 2913178, upload-time = "2025-06-28T04:21:04.879Z" },
+    { url = "https://files.pythonhosted.org/packages/12/aa/69cb3a9dff7d143a05e4021c3c9b5cde07aacb8eb1c892b7c5b9fb4973e3/grpcio_tools-1.71.2-cp311-cp311-win32.whl", hash = "sha256:9a3cb244d2bfe0d187f858c5408d17cb0e76ca60ec9a274c8fd94cc81457c7fc", size = 946256, upload-time = "2025-06-28T04:21:06.518Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/df/fb951c5c87eadb507a832243942e56e67d50d7667b0e5324616ffd51b845/grpcio_tools-1.71.2-cp311-cp311-win_amd64.whl", hash = "sha256:00eb909997fd359a39b789342b476cbe291f4dd9c01ae9887a474f35972a257e", size = 1117661, upload-time = "2025-06-28T04:21:08.18Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/d3/3ed30a9c5b2424627b4b8411e2cd6a1a3f997d3812dbc6a8630a78bcfe26/grpcio_tools-1.71.2-cp312-cp312-linux_armv7l.whl", hash = "sha256:bfc0b5d289e383bc7d317f0e64c9dfb59dc4bef078ecd23afa1a816358fb1473", size = 2385479, upload-time = "2025-06-28T04:21:10.413Z" },
+    { url = "https://files.pythonhosted.org/packages/54/61/e0b7295456c7e21ef777eae60403c06835160c8d0e1e58ebfc7d024c51d3/grpcio_tools-1.71.2-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:b4669827716355fa913b1376b1b985855d5cfdb63443f8d18faf210180199006", size = 5431521, upload-time = "2025-06-28T04:21:12.261Z" },
+    { url = "https://files.pythonhosted.org/packages/75/d7/7bcad6bcc5f5b7fab53e6bce5db87041f38ef3e740b1ec2d8c49534fa286/grpcio_tools-1.71.2-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:d4071f9b44564e3f75cdf0f05b10b3e8c7ea0ca5220acbf4dc50b148552eef2f", size = 2350289, upload-time = "2025-06-28T04:21:13.625Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/8a/e4c1c4cb8c9ff7f50b7b2bba94abe8d1e98ea05f52a5db476e7f1c1a3c70/grpcio_tools-1.71.2-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a28eda8137d587eb30081384c256f5e5de7feda34776f89848b846da64e4be35", size = 2743321, upload-time = "2025-06-28T04:21:15.007Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/aa/95bc77fda5c2d56fb4a318c1b22bdba8914d5d84602525c99047114de531/grpcio_tools-1.71.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b19c083198f5eb15cc69c0a2f2c415540cbc636bfe76cea268e5894f34023b40", size = 2474005, upload-time = "2025-06-28T04:21:16.443Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/ff/ca11f930fe1daa799ee0ce1ac9630d58a3a3deed3dd2f465edb9a32f299d/grpcio_tools-1.71.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:784c284acda0d925052be19053d35afbf78300f4d025836d424cf632404f676a", size = 2851559, upload-time = "2025-06-28T04:21:18.139Z" },
+    { url = "https://files.pythonhosted.org/packages/64/10/c6fc97914c7e19c9bb061722e55052fa3f575165da9f6510e2038d6e8643/grpcio_tools-1.71.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:381e684d29a5d052194e095546eef067201f5af30fd99b07b5d94766f44bf1ae", size = 3300622, upload-time = "2025-06-28T04:21:20.291Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/d6/965f36cfc367c276799b730d5dd1311b90a54a33726e561393b808339b04/grpcio_tools-1.71.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:3e4b4801fabd0427fc61d50d09588a01b1cfab0ec5e8a5f5d515fbdd0891fd11", size = 2913863, upload-time = "2025-06-28T04:21:22.196Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/f0/c05d5c3d0c1d79ac87df964e9d36f1e3a77b60d948af65bec35d3e5c75a3/grpcio_tools-1.71.2-cp312-cp312-win32.whl", hash = "sha256:84ad86332c44572305138eafa4cc30040c9a5e81826993eae8227863b700b490", size = 945744, upload-time = "2025-06-28T04:21:23.463Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/e9/c84c1078f0b7af7d8a40f5214a9bdd8d2a567ad6c09975e6e2613a08d29d/grpcio_tools-1.71.2-cp312-cp312-win_amd64.whl", hash = "sha256:8e1108d37eecc73b1c4a27350a6ed921b5dda25091700c1da17cfe30761cd462", size = 1117695, upload-time = "2025-06-28T04:21:25.22Z" },
 ]
 
 [[package]]
@@ -2856,18 +2887,17 @@ wheels = [
 
 [[package]]
 name = "httpx"
-version = "0.27.2"
+version = "0.28.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
     { name = "certifi" },
     { name = "httpcore" },
     { name = "idna" },
-    { name = "sniffio" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/78/82/08f8c936781f67d9e6b9eeb8a0c8b4e406136ea4c3d1f89a5db71d42e0e6/httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2", size = 144189, upload-time = "2024-08-27T12:54:01.334Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/56/95/9377bcb415797e44274b51d46e3249eba641711cf3348050f76ee7b15ffc/httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0", size = 76395, upload-time = "2024-08-27T12:53:59.653Z" },
+    { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" },
 ]
 
 [package.optional-dependencies]
@@ -3966,59 +3996,59 @@ wheels = [
 
 [[package]]
 name = "opentelemetry-api"
-version = "1.27.0"
+version = "1.28.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deprecated" },
     { name = "importlib-metadata" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/c9/83/93114b6de85a98963aec218a51509a52ed3f8de918fe91eb0f7299805c3f/opentelemetry_api-1.27.0.tar.gz", hash = "sha256:ed673583eaa5f81b5ce5e86ef7cdaf622f88ef65f0b9aab40b843dcae5bef342", size = 62693, upload-time = "2024-08-28T21:35:31.445Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/79/36/260eaea0f74fdd0c0d8f22ed3a3031109ea1c85531f94f4fde266c29e29a/opentelemetry_api-1.28.0.tar.gz", hash = "sha256:578610bcb8aa5cdcb11169d136cc752958548fb6ccffb0969c1036b0ee9e5353", size = 62803, upload-time = "2024-11-05T19:14:45.497Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/fb/1f/737dcdbc9fea2fa96c1b392ae47275165a7c641663fbb08a8d252968eed2/opentelemetry_api-1.27.0-py3-none-any.whl", hash = "sha256:953d5871815e7c30c81b56d910c707588000fff7a3ca1c73e6531911d53065e7", size = 63970, upload-time = "2024-08-28T21:35:00.598Z" },
+    { url = "https://files.pythonhosted.org/packages/22/e4/3b25d8b856791c04d8a62b1257b5fc09dc41a057800db06885af8ddcdce1/opentelemetry_api-1.28.0-py3-none-any.whl", hash = "sha256:8457cd2c59ea1bd0988560f021656cecd254ad7ef6be4ba09dbefeca2409ce52", size = 64314, upload-time = "2024-11-05T19:14:21.659Z" },
 ]
 
 [[package]]
 name = "opentelemetry-distro"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-api" },
     { name = "opentelemetry-instrumentation" },
     { name = "opentelemetry-sdk" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/f4/09/423e17c439ed24c45110affe84aad886a536b7871a42637d2ad14a179b47/opentelemetry_distro-0.48b0.tar.gz", hash = "sha256:5cb15915780ac4972583286a56683d43bd4ca95371d72f5f3f179c8b0b2ddc91", size = 2556, upload-time = "2024-08-28T21:27:40.455Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4d/75/7cb7c33899e66bb366d40a889111a78c22df0951038b6699f1663e715a9f/opentelemetry_distro-0.49b0.tar.gz", hash = "sha256:1bafa274f9e83baa0d2a5d47ed02caffcf9bcca60107b389b145400d82b07513", size = 2560, upload-time = "2024-11-05T19:21:39.379Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/82/cf/fa9a5fe954f1942e03b319ae0e319ebc93d9f984b548bcd9b3f232a1434d/opentelemetry_distro-0.48b0-py3-none-any.whl", hash = "sha256:b2f8fce114325b020769af3b9bf503efb8af07efc190bd1b9deac7843171664a", size = 3321, upload-time = "2024-08-28T21:26:26.584Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/db/806172b6a4933966eee518db814b375e620602f7fe776b74ef795690f135/opentelemetry_distro-0.49b0-py3-none-any.whl", hash = "sha256:1af4074702f605ea210753dd41947dc2fd61b39724f23cdcf15d5654867cd3c2", size = 3318, upload-time = "2024-11-05T19:20:34.065Z" },
 ]
 
 [[package]]
 name = "opentelemetry-exporter-otlp"
-version = "1.27.0"
+version = "1.28.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-exporter-otlp-proto-grpc" },
     { name = "opentelemetry-exporter-otlp-proto-http" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/fc/d3/8156cc14e8f4573a3572ee7f30badc7aabd02961a09acc72ab5f2c789ef1/opentelemetry_exporter_otlp-1.27.0.tar.gz", hash = "sha256:4a599459e623868cc95d933c301199c2367e530f089750e115599fccd67cb2a1", size = 6166, upload-time = "2024-08-28T21:35:33.746Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/eb/16/14e3fc163930ea68f0980a4cdd4ae5796e60aeb898965990e13263d64baf/opentelemetry_exporter_otlp-1.28.0.tar.gz", hash = "sha256:31ae7495831681dd3da34ac457f6970f147465ae4b9aae3a888d7a581c7cd868", size = 6170, upload-time = "2024-11-05T19:14:47.349Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/59/6d/95e1fc2c8d945a734db32e87a5aa7a804f847c1657a21351df9338bd1c9c/opentelemetry_exporter_otlp-1.27.0-py3-none-any.whl", hash = "sha256:7688791cbdd951d71eb6445951d1cfbb7b6b2d7ee5948fac805d404802931145", size = 7001, upload-time = "2024-08-28T21:35:04.02Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/82/3f521b3c1f2a411ed60a24a8c9f486c1beeaf8c6c55337c87d3ae1642151/opentelemetry_exporter_otlp-1.28.0-py3-none-any.whl", hash = "sha256:1fd02d70f2c1b7ac5579c81e78de4594b188d3317c8ceb69e8b53900fb7b40fd", size = 7024, upload-time = "2024-11-05T19:14:24.534Z" },
 ]
 
 [[package]]
 name = "opentelemetry-exporter-otlp-proto-common"
-version = "1.27.0"
+version = "1.28.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-proto" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/cd/2e/7eaf4ba595fb5213cf639c9158dfb64aacb2e4c7d74bfa664af89fa111f4/opentelemetry_exporter_otlp_proto_common-1.27.0.tar.gz", hash = "sha256:159d27cf49f359e3798c4c3eb8da6ef4020e292571bd8c5604a2a573231dd5c8", size = 17860, upload-time = "2024-08-28T21:35:34.896Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c2/8d/5d411084ac441052f4c9bae03a1aec65ae5d16b439fea7b9c5ac3842c013/opentelemetry_exporter_otlp_proto_common-1.28.0.tar.gz", hash = "sha256:5fa0419b0c8e291180b0fc8430a20dd44a3f3236f8e0827992145914f273ec4f", size = 18505, upload-time = "2024-11-05T19:14:48.204Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/41/27/4610ab3d9bb3cde4309b6505f98b3aabca04a26aa480aa18cede23149837/opentelemetry_exporter_otlp_proto_common-1.27.0-py3-none-any.whl", hash = "sha256:675db7fffcb60946f3a5c43e17d1168a3307a94a930ecf8d2ea1f286f3d4f79a", size = 17848, upload-time = "2024-08-28T21:35:05.412Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/72/3c44aabc74db325aaba09361b6a0d80f6d601f0ff86ecea8ee655c9538fc/opentelemetry_exporter_otlp_proto_common-1.28.0-py3-none-any.whl", hash = "sha256:467e6437d24e020156dffecece8c0a4471a8a60f6a34afeda7386df31a092410", size = 18403, upload-time = "2024-11-05T19:14:25.798Z" },
 ]
 
 [[package]]
 name = "opentelemetry-exporter-otlp-proto-grpc"
-version = "1.27.0"
+version = "1.28.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deprecated" },
@@ -4029,14 +4059,14 @@ dependencies = [
     { name = "opentelemetry-proto" },
     { name = "opentelemetry-sdk" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/a1/d0/c1e375b292df26e0ffebf194e82cd197e4c26cc298582bda626ce3ce74c5/opentelemetry_exporter_otlp_proto_grpc-1.27.0.tar.gz", hash = "sha256:af6f72f76bcf425dfb5ad11c1a6d6eca2863b91e63575f89bb7b4b55099d968f", size = 26244, upload-time = "2024-08-28T21:35:36.314Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/43/4d/f215162e58041afb4bdf5dbd0d8faf0b7fc9bf7b3d3fc0e44e06f9e7e869/opentelemetry_exporter_otlp_proto_grpc-1.28.0.tar.gz", hash = "sha256:47a11c19dc7f4289e220108e113b7de90d59791cb4c37fc29f69a6a56f2c3735", size = 26237, upload-time = "2024-11-05T19:14:49.026Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/8d/80/32217460c2c64c0568cea38410124ff680a9b65f6732867bbf857c4d8626/opentelemetry_exporter_otlp_proto_grpc-1.27.0-py3-none-any.whl", hash = "sha256:56b5bbd5d61aab05e300d9d62a6b3c134827bbd28d0b12f2649c2da368006c9e", size = 18541, upload-time = "2024-08-28T21:35:06.493Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/b5/afabc8106abc0f9cfeecf5b3e682622b3e04bba1d9b967dbfcd91b9c4ebe/opentelemetry_exporter_otlp_proto_grpc-1.28.0-py3-none-any.whl", hash = "sha256:edbdc53e7783f88d4535db5807cb91bd7b1ec9e9b9cdbfee14cd378f29a3b328", size = 18532, upload-time = "2024-11-05T19:14:26.853Z" },
 ]
 
 [[package]]
 name = "opentelemetry-exporter-otlp-proto-http"
-version = "1.27.0"
+version = "1.28.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deprecated" },
@@ -4047,28 +4077,29 @@ dependencies = [
     { name = "opentelemetry-sdk" },
     { name = "requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/31/0a/f05c55e8913bf58a033583f2580a0ec31a5f4cf2beacc9e286dcb74d6979/opentelemetry_exporter_otlp_proto_http-1.27.0.tar.gz", hash = "sha256:2103479092d8eb18f61f3fbff084f67cc7f2d4a7d37e75304b8b56c1d09ebef5", size = 15059, upload-time = "2024-08-28T21:35:37.079Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f1/2a/555f2845928086cd51aa6941c7a546470805b68ed631ec139ce7d841763d/opentelemetry_exporter_otlp_proto_http-1.28.0.tar.gz", hash = "sha256:d83a9a03a8367ead577f02a64127d827c79567de91560029688dd5cfd0152a8e", size = 15051, upload-time = "2024-11-05T19:14:49.813Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2d/8d/4755884afc0b1db6000527cac0ca17273063b6142c773ce4ecd307a82e72/opentelemetry_exporter_otlp_proto_http-1.27.0-py3-none-any.whl", hash = "sha256:688027575c9da42e179a69fe17e2d1eba9b14d81de8d13553a21d3114f3b4d75", size = 17203, upload-time = "2024-08-28T21:35:08.141Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/ce/80d5adabbf7ab4a0ca7b5e0f4039b24d273be370c3ba85fc05b13794411c/opentelemetry_exporter_otlp_proto_http-1.28.0-py3-none-any.whl", hash = "sha256:e8f3f7961b747edb6b44d51de4901a61e9c01d50debd747b120a08c4996c7e7b", size = 17228, upload-time = "2024-11-05T19:14:28.613Z" },
 ]
 
 [[package]]
 name = "opentelemetry-instrumentation"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-api" },
-    { name = "setuptools" },
+    { name = "opentelemetry-semantic-conventions" },
+    { name = "packaging" },
     { name = "wrapt" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/04/0e/d9394839af5d55c8feb3b22cd11138b953b49739b20678ca96289e30f904/opentelemetry_instrumentation-0.48b0.tar.gz", hash = "sha256:94929685d906380743a71c3970f76b5f07476eea1834abd5dd9d17abfe23cc35", size = 24724, upload-time = "2024-08-28T21:27:42.82Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/de/6b/6c25b15063c92a011cf3f68375971e2c58a9c764690847edc97df2d94eeb/opentelemetry_instrumentation-0.49b0.tar.gz", hash = "sha256:398a93e0b9dc2d11cc8627e1761665c506fe08c6b2df252a2ab3ade53d751c46", size = 26478, upload-time = "2024-11-05T19:21:41.402Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0a/7f/405c41d4f359121376c9d5117dcf68149b8122d3f6c718996d037bd4d800/opentelemetry_instrumentation-0.48b0-py3-none-any.whl", hash = "sha256:a69750dc4ba6a5c3eb67986a337185a25b739966d80479befe37b546fc870b44", size = 29449, upload-time = "2024-08-28T21:26:31.288Z" },
+    { url = "https://files.pythonhosted.org/packages/93/61/e0d21e958d6072ce25c4f5e26a1d22835fc86f80836660adf6badb6038ce/opentelemetry_instrumentation-0.49b0-py3-none-any.whl", hash = "sha256:68364d73a1ff40894574cbc6138c5f98674790cae1f3b0865e21cf702f24dcb3", size = 30694, upload-time = "2024-11-05T19:20:38.584Z" },
 ]
 
 [[package]]
 name = "opentelemetry-instrumentation-asgi"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "asgiref" },
@@ -4077,28 +4108,28 @@ dependencies = [
     { name = "opentelemetry-semantic-conventions" },
     { name = "opentelemetry-util-http" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/44/ac/fd3d40bab3234ec3f5c052a815100676baaae1832fa1067935f11e5c59c6/opentelemetry_instrumentation_asgi-0.48b0.tar.gz", hash = "sha256:04c32174b23c7fa72ddfe192dad874954968a6a924608079af9952964ecdf785", size = 23435, upload-time = "2024-08-28T21:27:47.276Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e8/55/693c3d0938ba5fead5c3aa4ac7022a992b4ff99a8e9979800d0feb843ff4/opentelemetry_instrumentation_asgi-0.49b0.tar.gz", hash = "sha256:959fd9b1345c92f20c6ef1d42f92ef6a76b3c3083fbc4104d59da6859b15b083", size = 24117, upload-time = "2024-11-05T19:21:46.769Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/db/74/a0e0d38622856597dd8e630f2bd793760485eb165708e11b8be1696bbb5a/opentelemetry_instrumentation_asgi-0.48b0-py3-none-any.whl", hash = "sha256:ddb1b5fc800ae66e85a4e2eca4d9ecd66367a8c7b556169d9e7b57e10676e44d", size = 15958, upload-time = "2024-08-28T21:26:38.139Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/0b/7900c782a1dfaa584588d724bc3bbdf8405a32497537dd96b3fcbf8461b9/opentelemetry_instrumentation_asgi-0.49b0-py3-none-any.whl", hash = "sha256:722a90856457c81956c88f35a6db606cc7db3231046b708aae2ddde065723dbe", size = 16326, upload-time = "2024-11-05T19:20:46.176Z" },
 ]
 
 [[package]]
 name = "opentelemetry-instrumentation-celery"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-api" },
     { name = "opentelemetry-instrumentation" },
     { name = "opentelemetry-semantic-conventions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/42/68/72975eff50cc22d8f65f96c425a2e8844f91488e78ffcfb603ac7cee0e5a/opentelemetry_instrumentation_celery-0.48b0.tar.gz", hash = "sha256:1d33aa6c4a1e6c5d17a64215245208a96e56c9d07611685dbae09a557704af26", size = 14445, upload-time = "2024-08-28T21:27:56.392Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4c/8b/9b8a9dda3ed53354c6f707a45cdb7a4730e1c109b50fc1b413525493f811/opentelemetry_instrumentation_celery-0.49b0.tar.gz", hash = "sha256:afbaee97cc9c75f29bcc9784f16f8e37c415d4fe9b334748c5b90a3d30d12473", size = 14702, upload-time = "2024-11-05T19:21:53.672Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/28/59/f09e8f9f596d375fd86b7677751525bbc485c8cc8c5388e39786a3d3b968/opentelemetry_instrumentation_celery-0.48b0-py3-none-any.whl", hash = "sha256:c1904e38cc58fb2a33cd657d6e296285c5ffb0dca3f164762f94b905e5abc88e", size = 13697, upload-time = "2024-08-28T21:26:50.01Z" },
+    { url = "https://files.pythonhosted.org/packages/21/8c/d7d4adb36abbc0e517a69f7a069f32742122ae22d6017202f64570d9f4c5/opentelemetry_instrumentation_celery-0.49b0-py3-none-any.whl", hash = "sha256:38d4a78c78f33020032ef77ef0ead756bdf7838bcfb603de10f5925d39f14929", size = 13749, upload-time = "2024-11-05T19:20:54.98Z" },
 ]
 
 [[package]]
 name = "opentelemetry-instrumentation-fastapi"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-api" },
@@ -4107,17 +4138,16 @@ dependencies = [
     { name = "opentelemetry-semantic-conventions" },
     { name = "opentelemetry-util-http" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/58/20/43477da5850ef2cd3792715d442aecd051e885e0603b6ee5783b2104ba8f/opentelemetry_instrumentation_fastapi-0.48b0.tar.gz", hash = "sha256:21a72563ea412c0b535815aeed75fc580240f1f02ebc72381cfab672648637a2", size = 18497, upload-time = "2024-08-28T21:28:01.14Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fe/bf/8e6d2a4807360f2203192017eb4845f5628dbeaf0597adf3d141cc5c24e1/opentelemetry_instrumentation_fastapi-0.49b0.tar.gz", hash = "sha256:6d14935c41fd3e49328188b6a59dd4c37bd17a66b01c15b0c64afa9714a1f905", size = 19230, upload-time = "2024-11-05T19:21:59.361Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ee/50/745ab075a3041b7a5f29a579d2c28eaad54f64b4589d8f9fd364c62cf0f3/opentelemetry_instrumentation_fastapi-0.48b0-py3-none-any.whl", hash = "sha256:afeb820a59e139d3e5d96619600f11ce0187658b8ae9e3480857dd790bc024f2", size = 11777, upload-time = "2024-08-28T21:26:57.457Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/f4/0895b9410c10abf987c90dee1b7688a8f2214a284fe15e575648f6a1473a/opentelemetry_instrumentation_fastapi-0.49b0-py3-none-any.whl", hash = "sha256:646e1b18523cbe6860ae9711eb2c7b9c85466c3c7697cd6b8fb5180d85d3fe6e", size = 12101, upload-time = "2024-11-05T19:21:01.805Z" },
 ]
 
 [[package]]
 name = "opentelemetry-instrumentation-flask"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "importlib-metadata" },
     { name = "opentelemetry-api" },
     { name = "opentelemetry-instrumentation" },
     { name = "opentelemetry-instrumentation-wsgi" },
@@ -4125,29 +4155,30 @@ dependencies = [
     { name = "opentelemetry-util-http" },
     { name = "packaging" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ed/2f/5c3af780a69f9ba78445fe0e5035c41f67281a31b08f3c3e7ec460bda726/opentelemetry_instrumentation_flask-0.48b0.tar.gz", hash = "sha256:e03a34428071aebf4864ea6c6a564acef64f88c13eb3818e64ea90da61266c3d", size = 19196, upload-time = "2024-08-28T21:28:01.986Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/17/12/dc72873fb1e35699941d8eb6a53ef25e8c5843dea37665dad33bd720f047/opentelemetry_instrumentation_flask-0.49b0.tar.gz", hash = "sha256:f7c5ab67753c4781a2e21c8f43dc5fc02ece74fdd819466c75d025db80aa7576", size = 19176, upload-time = "2024-11-05T19:22:00.816Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/78/3d/fcde4f8f0bf9fa1ee73a12304fa538076fb83fe0a2ae966ab0f0b7da5109/opentelemetry_instrumentation_flask-0.48b0-py3-none-any.whl", hash = "sha256:26b045420b9d76e85493b1c23fcf27517972423480dc6cf78fd6924248ba5808", size = 14588, upload-time = "2024-08-28T21:26:58.504Z" },
+    { url = "https://files.pythonhosted.org/packages/a2/fc/354da8f33ef0daebfc8e4eac995d342ae13a35097bbad512cfe0d2f3c61a/opentelemetry_instrumentation_flask-0.49b0-py3-none-any.whl", hash = "sha256:f3ef330c3cee3e2c161f27f1e7017c8800b9bfb6f9204f2f7bfb0b274874be0e", size = 14582, upload-time = "2024-11-05T19:21:02.793Z" },
 ]
 
 [[package]]
 name = "opentelemetry-instrumentation-httpx"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-api" },
     { name = "opentelemetry-instrumentation" },
     { name = "opentelemetry-semantic-conventions" },
     { name = "opentelemetry-util-http" },
+    { name = "wrapt" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/d3/d9/c65d818607c16d1b7ea8d2de6111c6cecadf8d2fd38c1885a72733a7c6d3/opentelemetry_instrumentation_httpx-0.48b0.tar.gz", hash = "sha256:ee977479e10398931921fb995ac27ccdeea2e14e392cb27ef012fc549089b60a", size = 16931, upload-time = "2024-08-28T21:28:03.794Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a0/53/8b5e05e55a513d846ead5afb0509bec37a34a1c3e82f30b13d14156334b1/opentelemetry_instrumentation_httpx-0.49b0.tar.gz", hash = "sha256:07165b624f3e58638cee47ecf1c81939a8c2beb7e42ce9f69e25a9f21dc3f4cf", size = 17750, upload-time = "2024-11-05T19:22:02.911Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c2/fe/f2daa9d6d988c093b8c7b1d35df675761a8ece0b600b035dc04982746c9d/opentelemetry_instrumentation_httpx-0.48b0-py3-none-any.whl", hash = "sha256:d94f9d612c82d09fe22944d1904a30a464c19bea2ba76be656c99a28ad8be8e5", size = 13900, upload-time = "2024-08-28T21:27:01.566Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/9f/843391c6d645cd4f6914b27bc807fc1ff52b97f84cbe3ca675641976b23f/opentelemetry_instrumentation_httpx-0.49b0-py3-none-any.whl", hash = "sha256:e59e0d2fda5ef841630c68da1d78ff9192f63590a9099f12f0eab614abdf239a", size = 14110, upload-time = "2024-11-05T19:21:04.698Z" },
 ]
 
 [[package]]
 name = "opentelemetry-instrumentation-redis"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-api" },
@@ -4155,14 +4186,14 @@ dependencies = [
     { name = "opentelemetry-semantic-conventions" },
     { name = "wrapt" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/70/be/92e98e4c7f275be3d373899a41b0a7d4df64266657d985dbbdb9a54de0d5/opentelemetry_instrumentation_redis-0.48b0.tar.gz", hash = "sha256:61e33e984b4120e1b980d9fba6e9f7ca0c8d972f9970654d8f6e9f27fa115a8c", size = 10511, upload-time = "2024-08-28T21:28:15.061Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/19/5b/1398eb2f92fd76787ccec28d24dc4c7dfaaf97a7557e7729e2f7c2c05d84/opentelemetry_instrumentation_redis-0.49b0.tar.gz", hash = "sha256:922542c3bd192ad4ba74e2c7e0a253c7c58a5cefbd6f89da2aba4d193a974703", size = 11353, upload-time = "2024-11-05T19:22:12.822Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/94/40/892f30d400091106309cc047fd3f6d76a828fedd984a953fd5386b78a2fb/opentelemetry_instrumentation_redis-0.48b0-py3-none-any.whl", hash = "sha256:48c7f2e25cbb30bde749dc0d8b9c74c404c851f554af832956b9630b27f5bcb7", size = 11610, upload-time = "2024-08-28T21:27:18.759Z" },
+    { url = "https://files.pythonhosted.org/packages/24/e4/4f258fef0759629f2e8a0210d5533cfef3ecad69ff35be044637a3e2783e/opentelemetry_instrumentation_redis-0.49b0-py3-none-any.whl", hash = "sha256:b7d8f758bac53e77b7e7ca98ce80f91230577502dacb619ebe8e8b6058042067", size = 12453, upload-time = "2024-11-05T19:21:18.534Z" },
 ]
 
 [[package]]
 name = "opentelemetry-instrumentation-sqlalchemy"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-api" },
@@ -4171,14 +4202,14 @@ dependencies = [
     { name = "packaging" },
     { name = "wrapt" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/4c/77/3fcebbca8bd729da50dc2130d8ca869a235aa5483a85ef06c5dc8643476b/opentelemetry_instrumentation_sqlalchemy-0.48b0.tar.gz", hash = "sha256:dbf2d5a755b470e64e5e2762b56f8d56313787e4c7d71a87fe25c33f48eb3493", size = 13194, upload-time = "2024-08-28T21:28:18.122Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a0/a7/24f6cce3808ae1802dd1b60d752fbab877db5655198929cf4ee8ea416923/opentelemetry_instrumentation_sqlalchemy-0.49b0.tar.gz", hash = "sha256:32658e520fc8b35823c722f5d8831d3a410b76dd2724adb2887befc041ddef04", size = 13194, upload-time = "2024-11-05T19:22:14.92Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e1/84/4b6f1e9e9f83a52d966e91963f5a8424edc4a3d5ea32854c96c2d1618284/opentelemetry_instrumentation_sqlalchemy-0.48b0-py3-none-any.whl", hash = "sha256:625848a34aa5770cb4b1dcdbd95afce4307a0230338711101325261d739f391f", size = 13360, upload-time = "2024-08-28T21:27:22.102Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/6b/a1a3685fed593282999cdc374ece15efbd56f8d774bd368bf7ff2cf5923c/opentelemetry_instrumentation_sqlalchemy-0.49b0-py3-none-any.whl", hash = "sha256:d854052d2b02cd0562e5628a514c8153fceada7f585137e173165dfd0a46ef6a", size = 13358, upload-time = "2024-11-05T19:21:23.654Z" },
 ]
 
 [[package]]
 name = "opentelemetry-instrumentation-wsgi"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-api" },
@@ -4186,70 +4217,70 @@ dependencies = [
     { name = "opentelemetry-semantic-conventions" },
     { name = "opentelemetry-util-http" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/de/a5/f45cdfba18f22aefd2378eac8c07c1f8c9656d6bf7ce315ced48c67f3437/opentelemetry_instrumentation_wsgi-0.48b0.tar.gz", hash = "sha256:1a1e752367b0df4397e0b835839225ef5c2c3c053743a261551af13434fc4d51", size = 17974, upload-time = "2024-08-28T21:28:24.902Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/17/2b/91b022b004ac9e9ab0eefd10bc4257975291f88adc81b4ef2c601ddb1adf/opentelemetry_instrumentation_wsgi-0.49b0.tar.gz", hash = "sha256:0812a02e132f8fc3d5c897bba84e530c37b85c315b199bb97ca6508279e7eb23", size = 17733, upload-time = "2024-11-05T19:22:24.3Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/fb/87/fa420007e0ba7e8cd43799ab204717ab515f000236fa2726a6be3299efdd/opentelemetry_instrumentation_wsgi-0.48b0-py3-none-any.whl", hash = "sha256:c6051124d741972090fe94b2fa302555e1e2a22e9cdda32dd39ed49a5b34e0c6", size = 13691, upload-time = "2024-08-28T21:27:33.257Z" },
+    { url = "https://files.pythonhosted.org/packages/02/1d/59979665778ed8c85bc31c92b75571cd7afb8e3322fb513c87fe1bad6d78/opentelemetry_instrumentation_wsgi-0.49b0-py3-none-any.whl", hash = "sha256:8869ccf96611827e4448417718920e9eec6d25bffb5bf72c7952c7346ec33fbc", size = 13699, upload-time = "2024-11-05T19:21:35.039Z" },
 ]
 
 [[package]]
 name = "opentelemetry-propagator-b3"
-version = "1.27.0"
+version = "1.28.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deprecated" },
     { name = "opentelemetry-api" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/53/a3/3ceeb5ff5a1906371834d5c594e24e5b84f35528d219054833deca4ac44c/opentelemetry_propagator_b3-1.27.0.tar.gz", hash = "sha256:39377b6aa619234e08fbc6db79bf880aff36d7e2761efa9afa28b78d5937308f", size = 9590, upload-time = "2024-08-28T21:35:43.971Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/6f/1d/225ea036785119964509e92f4e1bc0313ba6ec790fbf51bd363abafeafae/opentelemetry_propagator_b3-1.28.0.tar.gz", hash = "sha256:cf6f0d2a1881c4858898be47e8a94b11bc5b16fc73b6c37ebfa2121c4825adc6", size = 9592, upload-time = "2024-11-05T19:14:57.193Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/03/3f/75ba77b8d9938bae575bc457a5c56ca2246ff5367b54c7d4252a31d1c91f/opentelemetry_propagator_b3-1.27.0-py3-none-any.whl", hash = "sha256:1dd75e9801ba02e870df3830097d35771a64c123127c984d9b05c352a35aa9cc", size = 8899, upload-time = "2024-08-28T21:35:18.317Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/fa/438d53d73a6c45df5d416b56dc371a65d0b07859bc107ab632349a079d4a/opentelemetry_propagator_b3-1.28.0-py3-none-any.whl", hash = "sha256:9f6923a5da56d7da6724e4fdd758a67ede2a2732efb929e538cf6fea337700c5", size = 8917, upload-time = "2024-11-05T19:14:37.317Z" },
 ]
 
 [[package]]
 name = "opentelemetry-proto"
-version = "1.27.0"
+version = "1.28.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "protobuf" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/9a/59/959f0beea798ae0ee9c979b90f220736fbec924eedbefc60ca581232e659/opentelemetry_proto-1.27.0.tar.gz", hash = "sha256:33c9345d91dafd8a74fc3d7576c5a38f18b7fdf8d02983ac67485386132aedd6", size = 34749, upload-time = "2024-08-28T21:35:45.839Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c9/63/ac4cef4d30ea0ca1d2153ad2fc62d91d1cf3b89b0e4e5cbd61a8c567885f/opentelemetry_proto-1.28.0.tar.gz", hash = "sha256:4a45728dfefa33f7908b828b9b7c9f2c6de42a05d5ec7b285662ddae71c4c870", size = 34331, upload-time = "2024-11-05T19:14:59.503Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/94/56/3d2d826834209b19a5141eed717f7922150224d1a982385d19a9444cbf8d/opentelemetry_proto-1.27.0-py3-none-any.whl", hash = "sha256:b133873de5581a50063e1e4b29cdcf0c5e253a8c2d8dc1229add20a4c3830ace", size = 52464, upload-time = "2024-08-28T21:35:21.434Z" },
+    { url = "https://files.pythonhosted.org/packages/86/94/c0b43d16e1d96ee1e699373aa59f14a3aa2e7126af3f11d6adc5dcc531cd/opentelemetry_proto-1.28.0-py3-none-any.whl", hash = "sha256:d5ad31b997846543b8e15504657d9a8cf1ad3c71dcbbb6c4799b1ab29e38f7f9", size = 55832, upload-time = "2024-11-05T19:14:40.446Z" },
 ]
 
 [[package]]
 name = "opentelemetry-sdk"
-version = "1.27.0"
+version = "1.28.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-api" },
     { name = "opentelemetry-semantic-conventions" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/0d/9a/82a6ac0f06590f3d72241a587cb8b0b751bd98728e896cc4cbd4847248e6/opentelemetry_sdk-1.27.0.tar.gz", hash = "sha256:d525017dea0ccce9ba4e0245100ec46ecdc043f2d7b8315d56b19aff0904fa6f", size = 145019, upload-time = "2024-08-28T21:35:46.708Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/0c/5b/a509ccab93eacc6044591d5ec437d8266e76f893d0389bbf7e5592c7da32/opentelemetry_sdk-1.28.0.tar.gz", hash = "sha256:41d5420b2e3fb7716ff4981b510d551eff1fc60eb5a95cf7335b31166812a893", size = 156155, upload-time = "2024-11-05T19:15:00.451Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c1/bd/a6602e71e315055d63b2ff07172bd2d012b4cba2d4e00735d74ba42fc4d6/opentelemetry_sdk-1.27.0-py3-none-any.whl", hash = "sha256:365f5e32f920faf0fd9e14fdfd92c086e317eaa5f860edba9cdc17a380d9197d", size = 110505, upload-time = "2024-08-28T21:35:24.769Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/fe/c8decbebb5660529f1d6ba65e50a45b1294022dfcba2968fc9c8697c42b2/opentelemetry_sdk-1.28.0-py3-none-any.whl", hash = "sha256:4b37da81d7fad67f6683c4420288c97f4ed0d988845d5886435f428ec4b8429a", size = 118692, upload-time = "2024-11-05T19:14:41.669Z" },
 ]
 
 [[package]]
 name = "opentelemetry-semantic-conventions"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deprecated" },
     { name = "opentelemetry-api" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/0a/89/1724ad69f7411772446067cdfa73b598694c8c91f7f8c922e344d96d81f9/opentelemetry_semantic_conventions-0.48b0.tar.gz", hash = "sha256:12d74983783b6878162208be57c9effcb89dc88691c64992d70bb89dc00daa1a", size = 89445, upload-time = "2024-08-28T21:35:47.673Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ee/c8/433b0e54143f8c9369f5c4a7a83e73eec7eb2ee7d0b7e81a9243e78c8e80/opentelemetry_semantic_conventions-0.49b0.tar.gz", hash = "sha256:dbc7b28339e5390b6b28e022835f9bac4e134a80ebf640848306d3c5192557e8", size = 95227, upload-time = "2024-11-05T19:15:01.443Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b7/7a/4f0063dbb0b6c971568291a8bc19a4ca70d3c185db2d956230dd67429dfc/opentelemetry_semantic_conventions-0.48b0-py3-none-any.whl", hash = "sha256:a0de9f45c413a8669788a38569c7e0a11ce6ce97861a628cca785deecdc32a1f", size = 149685, upload-time = "2024-08-28T21:35:25.983Z" },
+    { url = "https://files.pythonhosted.org/packages/25/05/20104df4ef07d3bf5c3fd6bcc796ef70ab4ea4309378a9ba57bc4b4d01fa/opentelemetry_semantic_conventions-0.49b0-py3-none-any.whl", hash = "sha256:0458117f6ead0b12e3221813e3e511d85698c31901cac84682052adb9c17c7cd", size = 159214, upload-time = "2024-11-05T19:14:43.047Z" },
 ]
 
 [[package]]
 name = "opentelemetry-util-http"
-version = "0.48b0"
+version = "0.49b0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d6/d7/185c494754340e0a3928fd39fde2616ee78f2c9d66253affaad62d5b7935/opentelemetry_util_http-0.48b0.tar.gz", hash = "sha256:60312015153580cc20f322e5cdc3d3ecad80a71743235bdb77716e742814623c", size = 7863, upload-time = "2024-08-28T21:28:27.266Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a3/99/377ef446928808211b127b9ab31c348bc465c8da4514ebeec6e4a3de3d21/opentelemetry_util_http-0.49b0.tar.gz", hash = "sha256:02928496afcffd58a7c15baf99d2cedae9b8325a8ac52b0d0877b2e8f936dd1b", size = 7863, upload-time = "2024-11-05T19:22:26.973Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ad/2e/36097c0a4d0115b8c7e377c90bab7783ac183bc5cb4071308f8959454311/opentelemetry_util_http-0.48b0-py3-none-any.whl", hash = "sha256:76f598af93aab50328d2a69c786beaedc8b6a7770f7a818cc307eb353debfffb", size = 6946, upload-time = "2024-08-28T21:27:37.975Z" },
+    { url = "https://files.pythonhosted.org/packages/66/0e/ab0a89b315d0bacdd355a345bb69b20c50fc1f0804b52b56fe1c35a60e68/opentelemetry_util_http-0.49b0-py3-none-any.whl", hash = "sha256:8661bbd6aea1839badc44de067ec9c15c05eab05f729f496c856c50a1203caf1", size = 6945, upload-time = "2024-11-05T19:21:37.81Z" },
 ]
 
 [[package]]
@@ -4695,16 +4726,16 @@ wheels = [
 
 [[package]]
 name = "protobuf"
-version = "4.25.8"
+version = "5.29.6"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/df/01/34c8d2b6354906d728703cb9d546a0e534de479e25f1b581e4094c4a85cc/protobuf-4.25.8.tar.gz", hash = "sha256:6135cf8affe1fc6f76cced2641e4ea8d3e59518d1f24ae41ba97bcad82d397cd", size = 380920, upload-time = "2025-05-28T14:22:25.153Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/7e/57/394a763c103e0edf87f0938dafcd918d53b4c011dfc5c8ae80f3b0452dbb/protobuf-5.29.6.tar.gz", hash = "sha256:da9ee6a5424b6b30fd5e45c5ea663aef540ca95f9ad99d1e887e819cdf9b8723", size = 425623, upload-time = "2026-02-04T22:54:40.584Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/45/ff/05f34305fe6b85bbfbecbc559d423a5985605cad5eda4f47eae9e9c9c5c5/protobuf-4.25.8-cp310-abi3-win32.whl", hash = "sha256:504435d831565f7cfac9f0714440028907f1975e4bed228e58e72ecfff58a1e0", size = 392745, upload-time = "2025-05-28T14:22:10.524Z" },
-    { url = "https://files.pythonhosted.org/packages/08/35/8b8a8405c564caf4ba835b1fdf554da869954712b26d8f2a98c0e434469b/protobuf-4.25.8-cp310-abi3-win_amd64.whl", hash = "sha256:bd551eb1fe1d7e92c1af1d75bdfa572eff1ab0e5bf1736716814cdccdb2360f9", size = 413736, upload-time = "2025-05-28T14:22:13.156Z" },
-    { url = "https://files.pythonhosted.org/packages/28/d7/ab27049a035b258dab43445eb6ec84a26277b16105b277cbe0a7698bdc6c/protobuf-4.25.8-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:ca809b42f4444f144f2115c4c1a747b9a404d590f18f37e9402422033e464e0f", size = 394537, upload-time = "2025-05-28T14:22:14.768Z" },
-    { url = "https://files.pythonhosted.org/packages/bd/6d/a4a198b61808dd3d1ee187082ccc21499bc949d639feb948961b48be9a7e/protobuf-4.25.8-cp37-abi3-manylinux2014_aarch64.whl", hash = "sha256:9ad7ef62d92baf5a8654fbb88dac7fa5594cfa70fd3440488a5ca3bfc6d795a7", size = 294005, upload-time = "2025-05-28T14:22:16.052Z" },
-    { url = "https://files.pythonhosted.org/packages/d6/c6/c9deaa6e789b6fc41b88ccbdfe7a42d2b82663248b715f55aa77fbc00724/protobuf-4.25.8-cp37-abi3-manylinux2014_x86_64.whl", hash = "sha256:83e6e54e93d2b696a92cad6e6efc924f3850f82b52e1563778dfab8b355101b0", size = 294924, upload-time = "2025-05-28T14:22:17.105Z" },
-    { url = "https://files.pythonhosted.org/packages/0c/c1/6aece0ab5209981a70cd186f164c133fdba2f51e124ff92b73de7fd24d78/protobuf-4.25.8-py3-none-any.whl", hash = "sha256:15a0af558aa3b13efef102ae6e4f3efac06f1eea11afb3a57db2901447d9fb59", size = 156757, upload-time = "2025-05-28T14:22:24.135Z" },
+    { url = "https://files.pythonhosted.org/packages/d4/88/9ee58ff7863c479d6f8346686d4636dd4c415b0cbeed7a6a7d0617639c2a/protobuf-5.29.6-cp310-abi3-win32.whl", hash = "sha256:62e8a3114992c7c647bce37dcc93647575fc52d50e48de30c6fcb28a6a291eb1", size = 423357, upload-time = "2026-02-04T22:54:25.805Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/66/2dc736a4d576847134fb6d80bd995c569b13cdc7b815d669050bf0ce2d2c/protobuf-5.29.6-cp310-abi3-win_amd64.whl", hash = "sha256:7e6ad413275be172f67fdee0f43484b6de5a904cc1c3ea9804cb6fe2ff366eda", size = 435175, upload-time = "2026-02-04T22:54:28.592Z" },
+    { url = "https://files.pythonhosted.org/packages/06/db/49b05966fd208ae3f44dcd33837b6243b4915c57561d730a43f881f24dea/protobuf-5.29.6-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:b5a169e664b4057183a34bdc424540e86eea47560f3c123a0d64de4e137f9269", size = 418619, upload-time = "2026-02-04T22:54:30.266Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/d7/48cbf6b0c3c39761e47a99cb483405f0fde2be22cf00d71ef316ce52b458/protobuf-5.29.6-cp38-abi3-manylinux2014_aarch64.whl", hash = "sha256:a8866b2cff111f0f863c1b3b9e7572dc7eaea23a7fae27f6fc613304046483e6", size = 320284, upload-time = "2026-02-04T22:54:31.782Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/dd/cadd6ec43069247d91f6345fa7a0d2858bef6af366dbd7ba8f05d2c77d3b/protobuf-5.29.6-cp38-abi3-manylinux2014_x86_64.whl", hash = "sha256:e3387f44798ac1106af0233c04fb8abf543772ff241169946f698b3a9a3d3ab9", size = 320478, upload-time = "2026-02-04T22:54:32.909Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/cb/e3065b447186cb70aa65acc70c86baf482d82bf75625bf5a2c4f6919c6a3/protobuf-5.29.6-py3-none-any.whl", hash = "sha256:6b9edb641441b2da9fa8f428760fc136a49cf97a52076010cf22a2ff73438a86", size = 173126, upload-time = "2026-02-04T22:54:39.462Z" },
 ]
 
 [[package]]
@@ -5810,33 +5841,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a3/dc/17031897dae0efacfea57dfd3a82fdd2a2aeb58e0ff71b77b87e44edc772/setuptools-80.9.0-py3-none-any.whl", hash = "sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922", size = 1201486, upload-time = "2025-05-27T00:56:49.664Z" },
 ]
 
-[[package]]
-name = "shapely"
-version = "2.1.2"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "numpy" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/4d/bc/0989043118a27cccb4e906a46b7565ce36ca7b57f5a18b78f4f1b0f72d9d/shapely-2.1.2.tar.gz", hash = "sha256:2ed4ecb28320a433db18a5bf029986aa8afcfd740745e78847e330d5d94922a9", size = 315489, upload-time = "2025-09-24T13:51:41.432Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/8f/8d/1ff672dea9ec6a7b5d422eb6d095ed886e2e523733329f75fdcb14ee1149/shapely-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:91121757b0a36c9aac3427a651a7e6567110a4a67c97edf04f8d55d4765f6618", size = 1820038, upload-time = "2025-09-24T13:50:15.628Z" },
-    { url = "https://files.pythonhosted.org/packages/4f/ce/28fab8c772ce5db23a0d86bf0adaee0c4c79d5ad1db766055fa3dab442e2/shapely-2.1.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:16a9c722ba774cf50b5d4541242b4cce05aafd44a015290c82ba8a16931ff63d", size = 1626039, upload-time = "2025-09-24T13:50:16.881Z" },
-    { url = "https://files.pythonhosted.org/packages/70/8b/868b7e3f4982f5006e9395c1e12343c66a8155c0374fdc07c0e6a1ab547d/shapely-2.1.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:cc4f7397459b12c0b196c9efe1f9d7e92463cbba142632b4cc6d8bbbbd3e2b09", size = 3001519, upload-time = "2025-09-24T13:50:18.606Z" },
-    { url = "https://files.pythonhosted.org/packages/13/02/58b0b8d9c17c93ab6340edd8b7308c0c5a5b81f94ce65705819b7416dba5/shapely-2.1.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:136ab87b17e733e22f0961504d05e77e7be8c9b5a8184f685b4a91a84efe3c26", size = 3110842, upload-time = "2025-09-24T13:50:21.77Z" },
-    { url = "https://files.pythonhosted.org/packages/af/61/8e389c97994d5f331dcffb25e2fa761aeedfb52b3ad9bcdd7b8671f4810a/shapely-2.1.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:16c5d0fc45d3aa0a69074979f4f1928ca2734fb2e0dde8af9611e134e46774e7", size = 4021316, upload-time = "2025-09-24T13:50:23.626Z" },
-    { url = "https://files.pythonhosted.org/packages/d3/d4/9b2a9fe6039f9e42ccf2cb3e84f219fd8364b0c3b8e7bbc857b5fbe9c14c/shapely-2.1.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6ddc759f72b5b2b0f54a7e7cde44acef680a55019eb52ac63a7af2cf17cb9cd2", size = 4178586, upload-time = "2025-09-24T13:50:25.443Z" },
-    { url = "https://files.pythonhosted.org/packages/16/f6/9840f6963ed4decf76b08fd6d7fed14f8779fb7a62cb45c5617fa8ac6eab/shapely-2.1.2-cp311-cp311-win32.whl", hash = "sha256:2fa78b49485391224755a856ed3b3bd91c8455f6121fee0db0e71cefb07d0ef6", size = 1543961, upload-time = "2025-09-24T13:50:26.968Z" },
-    { url = "https://files.pythonhosted.org/packages/38/1e/3f8ea46353c2a33c1669eb7327f9665103aa3a8dfe7f2e4ef714c210b2c2/shapely-2.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:c64d5c97b2f47e3cd9b712eaced3b061f2b71234b3fc263e0fcf7d889c6559dc", size = 1722856, upload-time = "2025-09-24T13:50:28.497Z" },
-    { url = "https://files.pythonhosted.org/packages/24/c0/f3b6453cf2dfa99adc0ba6675f9aaff9e526d2224cbd7ff9c1a879238693/shapely-2.1.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fe2533caae6a91a543dec62e8360fe86ffcdc42a7c55f9dfd0128a977a896b94", size = 1833550, upload-time = "2025-09-24T13:50:30.019Z" },
-    { url = "https://files.pythonhosted.org/packages/86/07/59dee0bc4b913b7ab59ab1086225baca5b8f19865e6101db9ebb7243e132/shapely-2.1.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ba4d1333cc0bc94381d6d4308d2e4e008e0bd128bdcff5573199742ee3634359", size = 1643556, upload-time = "2025-09-24T13:50:32.291Z" },
-    { url = "https://files.pythonhosted.org/packages/26/29/a5397e75b435b9895cd53e165083faed5d12fd9626eadec15a83a2411f0f/shapely-2.1.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0bd308103340030feef6c111d3eb98d50dc13feea33affc8a6f9fa549e9458a3", size = 2988308, upload-time = "2025-09-24T13:50:33.862Z" },
-    { url = "https://files.pythonhosted.org/packages/b9/37/e781683abac55dde9771e086b790e554811a71ed0b2b8a1e789b7430dd44/shapely-2.1.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1e7d4d7ad262a48bb44277ca12c7c78cb1b0f56b32c10734ec9a1d30c0b0c54b", size = 3099844, upload-time = "2025-09-24T13:50:35.459Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/f3/9876b64d4a5a321b9dc482c92bb6f061f2fa42131cba643c699f39317cb9/shapely-2.1.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e9eddfe513096a71896441a7c37db72da0687b34752c4e193577a145c71736fc", size = 3988842, upload-time = "2025-09-24T13:50:37.478Z" },
-    { url = "https://files.pythonhosted.org/packages/d1/a0/704c7292f7014c7e74ec84eddb7b109e1fbae74a16deae9c1504b1d15565/shapely-2.1.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:980c777c612514c0cf99bc8a9de6d286f5e186dcaf9091252fcd444e5638193d", size = 4152714, upload-time = "2025-09-24T13:50:39.9Z" },
-    { url = "https://files.pythonhosted.org/packages/53/46/319c9dc788884ad0785242543cdffac0e6530e4d0deb6c4862bc4143dcf3/shapely-2.1.2-cp312-cp312-win32.whl", hash = "sha256:9111274b88e4d7b54a95218e243282709b330ef52b7b86bc6aaf4f805306f454", size = 1542745, upload-time = "2025-09-24T13:50:41.414Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/bf/cb6c1c505cb31e818e900b9312d514f381fbfa5c4363edfce0fcc4f8c1a4/shapely-2.1.2-cp312-cp312-win_amd64.whl", hash = "sha256:743044b4cfb34f9a67205cee9279feaf60ba7d02e69febc2afc609047cb49179", size = 1722861, upload-time = "2025-09-24T13:50:43.35Z" },
-]
-
 [[package]]
 name = "shellingham"
 version = "1.5.4"

From 5c7a293ba75220c609faed00a7b632e97b973903 Mon Sep 17 00:00:00 2001
From: wangxiaolei <fatelei@gmail.com>
Date: Mon, 2 Mar 2026 16:28:31 +0800
Subject: [PATCH 09/22] feat: ensure document id is not missing (#32765)

---
 api/core/rag/retrieval/dataset_retrieval.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/api/core/rag/retrieval/dataset_retrieval.py b/api/core/rag/retrieval/dataset_retrieval.py
index cfea8d114a..459d7bed95 100644
--- a/api/core/rag/retrieval/dataset_retrieval.py
+++ b/api/core/rag/retrieval/dataset_retrieval.py
@@ -248,19 +248,22 @@ class DatasetRetrieval:
         retrieval_resource_list = []
         # deal with external documents
         for item in external_documents:
+            ext_meta = item.metadata or {}
+            title = ext_meta.get("title") or ""
+            doc_id = ext_meta.get("document_id") or title
             source = Source(
                 metadata=SourceMetadata(
                     source="knowledge",
-                    dataset_id=item.metadata.get("dataset_id"),
-                    dataset_name=item.metadata.get("dataset_name"),
-                    document_id=item.metadata.get("document_id"),
-                    document_name=item.metadata.get("title"),
+                    dataset_id=ext_meta.get("dataset_id") or "",
+                    dataset_name=ext_meta.get("dataset_name") or "",
+                    document_id=str(doc_id),
+                    document_name=ext_meta.get("title") or "",
                     data_source_type="external",
                     retriever_from="workflow",
-                    score=item.metadata.get("score"),
-                    doc_metadata=item.metadata,
+                    score=float(ext_meta.get("score") or 0.0),
+                    doc_metadata=ext_meta,
                 ),
-                title=item.metadata.get("title"),
+                title=title,
                 content=item.page_content,
             )
             retrieval_resource_list.append(source)

From 68647391e7a4e93c68fd0710f49b409105789c0f Mon Sep 17 00:00:00 2001
From: Br1an <932039080@qq.com>
Date: Mon, 2 Mar 2026 16:51:21 +0800
Subject: [PATCH 10/22] fix(api): add return type annotation to
 filter_none_values() (#32774)

---
 api/core/ops/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/core/ops/utils.py b/api/core/ops/utils.py
index a5196d66c0..8b9a2e424a 100644
--- a/api/core/ops/utils.py
+++ b/api/core/ops/utils.py
@@ -1,6 +1,6 @@
 from contextlib import contextmanager
 from datetime import datetime
-from typing import Union
+from typing import Any, Union
 from urllib.parse import urlparse
 
 from sqlalchemy import select
@@ -9,7 +9,7 @@ from models.engine import db
 from models.model import Message
 
 
-def filter_none_values(data: dict):
+def filter_none_values(data: dict[str, Any]) -> dict[str, Any]:
     new_data = {}
     for key, value in data.items():
         if value is None:

From 707bf20c296794d073da54f37514e38d3ec9f16b Mon Sep 17 00:00:00 2001
From: wangxiaolei <fatelei@gmail.com>
Date: Mon, 2 Mar 2026 17:54:33 +0800
Subject: [PATCH 11/22] refactor: knowledge index node decouples business logic
 (#32274)

---
 api/.importlinter                             |   8 -
 api/core/app/workflow/node_factory.py         |  13 +
 .../rag/index_processor/index_processor.py    | 252 +++++++
 api/core/rag/summary_index/__init__.py        |   0
 api/core/rag/summary_index/summary_index.py   |  86 +++
 .../knowledge_index/knowledge_index_node.py   | 502 ++-----------
 .../repositories/index_processor_protocol.py  |  41 ++
 .../summary_index_service_protocol.py         |   7 +
 .../nodes/knowledge_index/__init__.py         |   0
 .../test_knowledge_index_node_integration.py  |  69 ++
 .../nodes/knowledge_index/__init__.py         |   0
 .../test_knowledge_index_node.py              | 663 ++++++++++++++++++
 12 files changed, 1196 insertions(+), 445 deletions(-)
 create mode 100644 api/core/rag/index_processor/index_processor.py
 create mode 100644 api/core/rag/summary_index/__init__.py
 create mode 100644 api/core/rag/summary_index/summary_index.py
 create mode 100644 api/core/workflow/repositories/index_processor_protocol.py
 create mode 100644 api/core/workflow/repositories/summary_index_service_protocol.py
 create mode 100644 api/tests/integration_tests/workflow/nodes/knowledge_index/__init__.py
 create mode 100644 api/tests/integration_tests/workflow/nodes/knowledge_index/test_knowledge_index_node_integration.py
 create mode 100644 api/tests/unit_tests/core/workflow/nodes/knowledge_index/__init__.py
 create mode 100644 api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py

diff --git a/api/.importlinter b/api/.importlinter
index f74a1b667d..28c853bb62 100644
--- a/api/.importlinter
+++ b/api/.importlinter
@@ -52,7 +52,6 @@ forbidden_modules =
 allow_indirect_imports = True
 ignore_imports =
     core.workflow.nodes.agent.agent_node -> extensions.ext_database
-    core.workflow.nodes.knowledge_index.knowledge_index_node -> extensions.ext_database
     core.workflow.nodes.llm.file_saver -> extensions.ext_database
     core.workflow.nodes.llm.node -> extensions.ext_database
     core.workflow.nodes.tool.tool_node -> extensions.ext_database
@@ -109,7 +108,6 @@ ignore_imports =
     core.workflow.nodes.document_extractor.node -> core.helper.ssrf_proxy
     core.workflow.nodes.iteration.iteration_node -> core.app.workflow.node_factory
     core.workflow.nodes.iteration.iteration_node -> core.app.workflow.layers.llm_quota
-    core.workflow.nodes.knowledge_index.knowledge_index_node -> core.rag.index_processor.index_processor_factory
     core.workflow.nodes.llm.llm_utils -> core.model_manager
     core.workflow.nodes.llm.protocols -> core.model_manager
     core.workflow.nodes.llm.llm_utils -> core.model_runtime.model_providers.__base.large_language_model
@@ -154,18 +152,12 @@ ignore_imports =
     core.workflow.nodes.question_classifier.entities -> core.prompt.entities.advanced_prompt_entities
     core.workflow.nodes.question_classifier.question_classifier_node -> core.prompt.utils.prompt_message_util
     core.workflow.nodes.knowledge_index.entities -> core.rag.retrieval.retrieval_methods
-    core.workflow.nodes.knowledge_index.knowledge_index_node -> core.rag.retrieval.retrieval_methods
-    core.workflow.nodes.knowledge_index.knowledge_index_node -> models.dataset
-    core.workflow.nodes.knowledge_index.knowledge_index_node -> services.summary_index_service
-    core.workflow.nodes.knowledge_index.knowledge_index_node -> tasks.generate_summary_index_task
-    core.workflow.nodes.knowledge_index.knowledge_index_node -> core.rag.index_processor.processor.paragraph_index_processor
     core.workflow.nodes.llm.node -> models.dataset
     core.workflow.nodes.agent.agent_node -> core.tools.utils.message_transformer
     core.workflow.nodes.llm.file_saver -> core.tools.signature
     core.workflow.nodes.llm.file_saver -> core.tools.tool_file_manager
     core.workflow.nodes.tool.tool_node -> core.tools.errors
     core.workflow.nodes.agent.agent_node -> extensions.ext_database
-    core.workflow.nodes.knowledge_index.knowledge_index_node -> extensions.ext_database
     core.workflow.nodes.llm.file_saver -> extensions.ext_database
     core.workflow.nodes.llm.node -> extensions.ext_database
     core.workflow.nodes.tool.tool_node -> extensions.ext_database
diff --git a/api/core/app/workflow/node_factory.py b/api/core/app/workflow/node_factory.py
index 3a82f0a45e..9a56f0fb0d 100644
--- a/api/core/app/workflow/node_factory.py
+++ b/api/core/app/workflow/node_factory.py
@@ -19,7 +19,9 @@ from core.model_runtime.entities.model_entities import ModelType
 from core.model_runtime.memory import PromptMessageMemory
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
+from core.rag.index_processor.index_processor import IndexProcessor
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
+from core.rag.summary_index.summary_index import SummaryIndex
 from core.tools.tool_file_manager import ToolFileManager
 from core.workflow.entities.graph_config import NodeConfigDict
 from core.workflow.enums import NodeType, SystemVariableKey
@@ -32,6 +34,7 @@ from core.workflow.nodes.code.limits import CodeNodeLimits
 from core.workflow.nodes.datasource import DatasourceNode
 from core.workflow.nodes.document_extractor import DocumentExtractorNode, UnstructuredApiConfig
 from core.workflow.nodes.http_request import HttpRequestNode, build_http_request_config
+from core.workflow.nodes.knowledge_index.knowledge_index_node import KnowledgeIndexNode
 from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
 from core.workflow.nodes.llm.entities import ModelConfig
 from core.workflow.nodes.llm.exc import LLMModeRequiredError, ModelNotExistError
@@ -202,6 +205,16 @@ class DifyNodeFactory(NodeFactory):
                 file_manager=self._http_request_file_manager,
             )
 
+        if node_type == NodeType.KNOWLEDGE_INDEX:
+            return KnowledgeIndexNode(
+                id=node_id,
+                config=node_config,
+                graph_init_params=self.graph_init_params,
+                graph_runtime_state=self.graph_runtime_state,
+                index_processor=IndexProcessor(),
+                summary_index_service=SummaryIndex(),
+            )
+
         if node_type == NodeType.LLM:
             model_instance = self._build_model_instance_for_llm_node(node_data)
             memory = self._build_memory_for_llm_node(node_data=node_data, model_instance=model_instance)
diff --git a/api/core/rag/index_processor/index_processor.py b/api/core/rag/index_processor/index_processor.py
new file mode 100644
index 0000000000..95b197c874
--- /dev/null
+++ b/api/core/rag/index_processor/index_processor.py
@@ -0,0 +1,252 @@
+import concurrent.futures
+import datetime
+import logging
+import time
+from collections.abc import Mapping
+from typing import Any
+
+from flask import current_app
+from sqlalchemy import delete, func, select
+
+from core.db.session_factory import session_factory
+from core.workflow.nodes.knowledge_index.exc import KnowledgeIndexNodeError
+from core.workflow.repositories.index_processor_protocol import Preview, PreviewItem, QaPreview
+from models.dataset import Dataset, Document, DocumentSegment
+
+from .index_processor_factory import IndexProcessorFactory
+from .processor.paragraph_index_processor import ParagraphIndexProcessor
+
+logger = logging.getLogger(__name__)
+
+
+class IndexProcessor:
+    def format_preview(self, chunk_structure: str, chunks: Any) -> Preview:
+        index_processor = IndexProcessorFactory(chunk_structure).init_index_processor()
+        preview = index_processor.format_preview(chunks)
+        data = Preview(
+            chunk_structure=preview["chunk_structure"],
+            total_segments=preview["total_segments"],
+            preview=[],
+            parent_mode=None,
+            qa_preview=[],
+        )
+        if "parent_mode" in preview:
+            data.parent_mode = preview["parent_mode"]
+
+        for item in preview["preview"]:
+            if "content" in item and "child_chunks" in item:
+                data.preview.append(
+                    PreviewItem(content=item["content"], child_chunks=item["child_chunks"], summary=None)
+                )
+            elif "question" in item and "answer" in item:
+                data.qa_preview.append(QaPreview(question=item["question"], answer=item["answer"]))
+            elif "content" in item:
+                data.preview.append(PreviewItem(content=item["content"], child_chunks=None, summary=None))
+        return data
+
+    def index_and_clean(
+        self,
+        dataset_id: str,
+        document_id: str,
+        original_document_id: str,
+        chunks: Mapping[str, Any],
+        batch: Any,
+        summary_index_setting: dict | None = None,
+    ):
+        with session_factory.create_session() as session:
+            document = session.query(Document).filter_by(id=document_id).first()
+            if not document:
+                raise KnowledgeIndexNodeError(f"Document {document_id} not found.")
+
+            dataset = session.query(Dataset).filter_by(id=dataset_id).first()
+            if not dataset:
+                raise KnowledgeIndexNodeError(f"Dataset {dataset_id} not found.")
+
+            dataset_name_value = dataset.name
+            document_name_value = document.name
+            created_at_value = document.created_at
+            if summary_index_setting is None:
+                summary_index_setting = dataset.summary_index_setting
+            index_node_ids = []
+
+            index_processor = IndexProcessorFactory(dataset.chunk_structure).init_index_processor()
+            if original_document_id:
+                segments = session.scalars(
+                    select(DocumentSegment).where(DocumentSegment.document_id == original_document_id)
+                ).all()
+                if segments:
+                    index_node_ids = [segment.index_node_id for segment in segments]
+
+        indexing_start_at = time.perf_counter()
+        # delete from vector index
+        if index_node_ids:
+            index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=True)
+
+        with session_factory.create_session() as session, session.begin():
+            if index_node_ids:
+                segment_delete_stmt = delete(DocumentSegment).where(DocumentSegment.document_id == original_document_id)
+                session.execute(segment_delete_stmt)
+
+        index_processor.index(dataset, document, chunks)
+        indexing_end_at = time.perf_counter()
+
+        with session_factory.create_session() as session, session.begin():
+            document.indexing_latency = indexing_end_at - indexing_start_at
+            document.indexing_status = "completed"
+            document.completed_at = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
+            document.word_count = (
+                session.query(func.sum(DocumentSegment.word_count))
+                .where(
+                    DocumentSegment.document_id == document_id,
+                    DocumentSegment.dataset_id == dataset_id,
+                )
+                .scalar()
+            ) or 0
+            # Update need_summary based on dataset's summary_index_setting
+            if summary_index_setting and summary_index_setting.get("enable") is True:
+                document.need_summary = True
+            else:
+                document.need_summary = False
+            session.add(document)
+            # update document segment status
+            session.query(DocumentSegment).where(
+                DocumentSegment.document_id == document_id,
+                DocumentSegment.dataset_id == dataset_id,
+            ).update(
+                {
+                    DocumentSegment.status: "completed",
+                    DocumentSegment.enabled: True,
+                    DocumentSegment.completed_at: datetime.datetime.now(datetime.UTC).replace(tzinfo=None),
+                }
+            )
+
+        return {
+            "dataset_id": dataset_id,
+            "dataset_name": dataset_name_value,
+            "batch": batch,
+            "document_id": document_id,
+            "document_name": document_name_value,
+            "created_at": created_at_value.timestamp(),
+            "display_status": "completed",
+        }
+
+    def get_preview_output(
+        self, chunks: Any, dataset_id: str, document_id: str, chunk_structure: str, summary_index_setting: dict | None
+    ) -> Preview:
+        doc_language = None
+        with session_factory.create_session() as session:
+            if document_id:
+                document = session.query(Document).filter_by(id=document_id).first()
+            else:
+                document = None
+
+            dataset = session.query(Dataset).filter_by(id=dataset_id).first()
+            if not dataset:
+                raise KnowledgeIndexNodeError(f"Dataset {dataset_id} not found.")
+
+            if summary_index_setting is None:
+                summary_index_setting = dataset.summary_index_setting
+
+            if document:
+                doc_language = document.doc_language
+            indexing_technique = dataset.indexing_technique
+            tenant_id = dataset.tenant_id
+
+        preview_output = self.format_preview(chunk_structure, chunks)
+        if indexing_technique != "high_quality":
+            return preview_output
+
+        if not summary_index_setting or not summary_index_setting.get("enable"):
+            return preview_output
+
+        if preview_output.preview is not None:
+            chunk_count = len(preview_output.preview)
+            logger.info(
+                "Generating summaries for %s chunks in preview mode (dataset: %s)",
+                chunk_count,
+                dataset_id,
+            )
+
+            flask_app = None
+            try:
+                flask_app = current_app._get_current_object()  # type: ignore
+            except RuntimeError:
+                logger.warning("No Flask application context available, summary generation may fail")
+
+            def generate_summary_for_chunk(preview_item: PreviewItem) -> None:
+                """Generate summary for a single chunk."""
+                if flask_app:
+                    with flask_app.app_context():
+                        if preview_item.content is not None:
+                            # Set Flask application context in worker thread
+                            summary, _ = ParagraphIndexProcessor.generate_summary(
+                                tenant_id=tenant_id,
+                                text=preview_item.content,
+                                summary_index_setting=summary_index_setting,
+                                document_language=doc_language,
+                            )
+                            if summary:
+                                preview_item.summary = summary
+
+                        else:
+                            summary, _ = ParagraphIndexProcessor.generate_summary(
+                                tenant_id=tenant_id,
+                                text=preview_item.content if preview_item.content is not None else "",
+                                summary_index_setting=summary_index_setting,
+                                document_language=doc_language,
+                            )
+                            if summary:
+                                preview_item.summary = summary
+
+            # Generate summaries concurrently using ThreadPoolExecutor
+            # Set a reasonable timeout to prevent hanging (60 seconds per chunk, max 5 minutes total)
+            timeout_seconds = min(300, 60 * len(preview_output.preview))
+            errors: list[Exception] = []
+
+            with concurrent.futures.ThreadPoolExecutor(max_workers=min(10, len(preview_output.preview))) as executor:
+                futures = [
+                    executor.submit(generate_summary_for_chunk, preview_item) for preview_item in preview_output.preview
+                ]
+                # Wait for all tasks to complete with timeout
+                done, not_done = concurrent.futures.wait(futures, timeout=timeout_seconds)
+
+                # Cancel tasks that didn't complete in time
+                if not_done:
+                    timeout_error_msg = (
+                        f"Summary generation timeout: {len(not_done)} chunks did not complete within {timeout_seconds}s"
+                    )
+                    logger.warning("%s. Cancelling remaining tasks...", timeout_error_msg)
+                    # In preview mode, timeout is also an error
+                    errors.append(TimeoutError(timeout_error_msg))
+                    for future in not_done:
+                        future.cancel()
+                    # Wait a bit for cancellation to take effect
+                    concurrent.futures.wait(not_done, timeout=5)
+
+                # Collect exceptions from completed futures
+                for future in done:
+                    try:
+                        future.result()  # This will raise any exception that occurred
+                    except Exception as e:
+                        logger.exception("Error in summary generation future")
+                        errors.append(e)
+
+            # In preview mode, if there are any errors, fail the request
+            if errors:
+                error_messages = [str(e) for e in errors]
+                error_summary = (
+                    f"Failed to generate summaries for {len(errors)} chunk(s). "
+                    f"Errors: {'; '.join(error_messages[:3])}"  # Show first 3 errors
+                )
+                if len(errors) > 3:
+                    error_summary += f" (and {len(errors) - 3} more)"
+                logger.error("Summary generation failed in preview mode: %s", error_summary)
+                raise KnowledgeIndexNodeError(error_summary)
+
+            completed_count = sum(1 for item in preview_output.preview if item.summary is not None)
+            logger.info(
+                "Completed summary generation for preview chunks: %s/%s succeeded",
+                completed_count,
+                len(preview_output.preview),
+            )
+        return preview_output
diff --git a/api/core/rag/summary_index/__init__.py b/api/core/rag/summary_index/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/core/rag/summary_index/summary_index.py b/api/core/rag/summary_index/summary_index.py
new file mode 100644
index 0000000000..79d7821b4e
--- /dev/null
+++ b/api/core/rag/summary_index/summary_index.py
@@ -0,0 +1,86 @@
+import concurrent.futures
+import logging
+
+from core.db.session_factory import session_factory
+from models.dataset import Dataset, Document, DocumentSegment, DocumentSegmentSummary
+from services.summary_index_service import SummaryIndexService
+from tasks.generate_summary_index_task import generate_summary_index_task
+
+logger = logging.getLogger(__name__)
+
+
+class SummaryIndex:
+    def generate_and_vectorize_summary(
+        self, dataset_id: str, document_id: str, is_preview: bool, summary_index_setting: dict | None = None
+    ) -> None:
+        if is_preview:
+            with session_factory.create_session() as session:
+                dataset = session.query(Dataset).filter_by(id=dataset_id).first()
+                if not dataset or dataset.indexing_technique != "high_quality":
+                    return
+
+                if summary_index_setting is None:
+                    summary_index_setting = dataset.summary_index_setting
+
+                if not summary_index_setting or not summary_index_setting.get("enable"):
+                    return
+
+                if not document_id:
+                    return
+
+                document = session.query(Document).filter_by(id=document_id).first()
+                # Skip qa_model documents
+                if document is None or document.doc_form == "qa_model":
+                    return
+
+                query = session.query(DocumentSegment).filter_by(
+                    dataset_id=dataset_id,
+                    document_id=document_id,
+                    status="completed",
+                    enabled=True,
+                )
+                segments = query.all()
+                segment_ids = [segment.id for segment in segments]
+
+                if not segment_ids:
+                    return
+
+                existing_summaries = (
+                    session.query(DocumentSegmentSummary)
+                    .filter(
+                        DocumentSegmentSummary.chunk_id.in_(segment_ids),
+                        DocumentSegmentSummary.dataset_id == dataset_id,
+                        DocumentSegmentSummary.status == "completed",
+                    )
+                    .all()
+                )
+                completed_summary_segment_ids = {i.chunk_id for i in existing_summaries}
+                # Preview mode should process segments that are MISSING completed summaries
+                pending_segment_ids = [sid for sid in segment_ids if sid not in completed_summary_segment_ids]
+
+            # If all segments already have completed summaries, nothing to do in preview mode
+            if not pending_segment_ids:
+                return
+
+            max_workers = min(10, len(pending_segment_ids))
+
+            def process_segment(segment_id: str) -> None:
+                """Process a single segment in a thread with a fresh DB session."""
+                with session_factory.create_session() as session:
+                    segment = session.query(DocumentSegment).filter_by(id=segment_id).first()
+                    if segment is None:
+                        return
+                    try:
+                        SummaryIndexService.generate_and_vectorize_summary(segment, dataset, summary_index_setting)
+                    except Exception:
+                        logger.exception(
+                            "Failed to generate summary for segment %s",
+                            segment_id,
+                        )
+                        # Continue processing other segments
+
+            with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
+                futures = [executor.submit(process_segment, segment_id) for segment_id in pending_segment_ids]
+                concurrent.futures.wait(futures)
+        else:
+            generate_summary_index_task.delay(dataset_id, document_id, None)
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 2aff953bc6..8fb5b99454 100644
--- a/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
+++ b/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
@@ -1,66 +1,66 @@
-import concurrent.futures
-import datetime
 import logging
-import time
 from collections.abc import Mapping
-from typing import Any
-
-from flask import current_app
-from sqlalchemy import func, select
+from typing import TYPE_CHECKING, Any
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.rag.index_processor.index_processor_factory import IndexProcessorFactory
-from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
 from core.workflow.enums import NodeExecutionType, NodeType, SystemVariableKey
 from core.workflow.node_events import NodeRunResult
 from core.workflow.nodes.base.node import Node
 from core.workflow.nodes.base.template import Template
-from core.workflow.runtime import VariablePool
-from extensions.ext_database import db
-from models.dataset import Dataset, Document, DocumentSegment, DocumentSegmentSummary
-from services.summary_index_service import SummaryIndexService
-from tasks.generate_summary_index_task import generate_summary_index_task
+from core.workflow.repositories.index_processor_protocol import IndexProcessorProtocol
+from core.workflow.repositories.summary_index_service_protocol import SummaryIndexServiceProtocol
 
 from .entities import KnowledgeIndexNodeData
 from .exc import (
     KnowledgeIndexNodeError,
 )
 
-logger = logging.getLogger(__name__)
+if TYPE_CHECKING:
+    from core.workflow.entities import GraphInitParams
+    from core.workflow.runtime import GraphRuntimeState
 
-default_retrieval_model = {
-    "search_method": RetrievalMethod.SEMANTIC_SEARCH,
-    "reranking_enable": False,
-    "reranking_model": {"reranking_provider_name": "", "reranking_model_name": ""},
-    "top_k": 2,
-    "score_threshold_enabled": False,
-}
+logger = logging.getLogger(__name__)
 
 
 class KnowledgeIndexNode(Node[KnowledgeIndexNodeData]):
     node_type = NodeType.KNOWLEDGE_INDEX
     execution_type = NodeExecutionType.RESPONSE
 
+    def __init__(
+        self,
+        id: str,
+        config: Mapping[str, Any],
+        graph_init_params: "GraphInitParams",
+        graph_runtime_state: "GraphRuntimeState",
+        index_processor: IndexProcessorProtocol,
+        summary_index_service: SummaryIndexServiceProtocol,
+    ) -> None:
+        super().__init__(id, config, graph_init_params, graph_runtime_state)
+        self.index_processor = index_processor
+        self.summary_index_service = summary_index_service
+
     def _run(self) -> NodeRunResult:  # type: ignore
         node_data = self.node_data
         variable_pool = self.graph_runtime_state.variable_pool
-        dataset_id = variable_pool.get(["sys", SystemVariableKey.DATASET_ID])
-        if not dataset_id:
+
+        # get dataset id as string
+        dataset_id_segment = variable_pool.get(["sys", SystemVariableKey.DATASET_ID])
+        if not dataset_id_segment:
             raise KnowledgeIndexNodeError("Dataset ID is required.")
-        dataset = db.session.query(Dataset).filter_by(id=dataset_id.value).first()
-        if not dataset:
-            raise KnowledgeIndexNodeError(f"Dataset {dataset_id.value} not found.")
+        dataset_id: str = dataset_id_segment.value
+
+        # get document id as string (may be empty when not provided)
+        document_id_segment = variable_pool.get(["sys", SystemVariableKey.DOCUMENT_ID])
+        document_id: str = document_id_segment.value if document_id_segment else ""
 
         # extract variables
         variable = variable_pool.get(node_data.index_chunk_variable_selector)
         if not variable:
             raise KnowledgeIndexNodeError("Index chunk variable is required.")
         invoke_from = variable_pool.get(["sys", SystemVariableKey.INVOKE_FROM])
-        if invoke_from:
-            is_preview = invoke_from.value == InvokeFrom.DEBUGGER
-        else:
-            is_preview = False
+        is_preview = invoke_from.value == InvokeFrom.DEBUGGER if invoke_from else False
+
         chunks = variable.value
         variables = {"chunks": chunks}
         if not chunks:
@@ -68,52 +68,49 @@ class KnowledgeIndexNode(Node[KnowledgeIndexNodeData]):
                 status=WorkflowNodeExecutionStatus.FAILED, inputs=variables, error="Chunks is required."
             )
 
-        # index knowledge
         try:
+            summary_index_setting = node_data.summary_index_setting
             if is_preview:
                 # Preview mode: generate summaries for chunks directly without saving to database
                 # Format preview and generate summaries on-the-fly
                 # Get indexing_technique and summary_index_setting from node_data (workflow graph config)
                 # or fallback to dataset if not available in node_data
-                indexing_technique = node_data.indexing_technique or dataset.indexing_technique
-                summary_index_setting = node_data.summary_index_setting or dataset.summary_index_setting
 
-                # Try to get document language if document_id is available
-                doc_language = None
-                document_id = variable_pool.get(["sys", SystemVariableKey.DOCUMENT_ID])
-                if document_id:
-                    document = db.session.query(Document).filter_by(id=document_id.value).first()
-                    if document and document.doc_language:
-                        doc_language = document.doc_language
-
-                outputs = self._get_preview_output_with_summaries(
-                    node_data.chunk_structure,
-                    chunks,
-                    dataset=dataset,
-                    indexing_technique=indexing_technique,
-                    summary_index_setting=summary_index_setting,
-                    doc_language=doc_language,
+                outputs = self.index_processor.get_preview_output(
+                    chunks, dataset_id, document_id, node_data.chunk_structure, summary_index_setting
                 )
                 return NodeRunResult(
                     status=WorkflowNodeExecutionStatus.SUCCEEDED,
                     inputs=variables,
-                    outputs=outputs,
+                    outputs=outputs.model_dump(exclude_none=True),
                 )
+
+            original_document_id_segment = variable_pool.get(["sys", SystemVariableKey.ORIGINAL_DOCUMENT_ID])
+            batch = variable_pool.get(["sys", SystemVariableKey.BATCH])
+            if not batch:
+                raise KnowledgeIndexNodeError("Batch is required.")
+
             results = self._invoke_knowledge_index(
-                dataset=dataset, node_data=node_data, chunks=chunks, variable_pool=variable_pool
+                dataset_id=dataset_id,
+                document_id=document_id,
+                original_document_id=original_document_id_segment.value if original_document_id_segment else "",
+                is_preview=is_preview,
+                batch=batch.value,
+                chunks=chunks,
+                summary_index_setting=summary_index_setting,
             )
             return NodeRunResult(status=WorkflowNodeExecutionStatus.SUCCEEDED, inputs=variables, outputs=results)
 
         except KnowledgeIndexNodeError as e:
-            logger.warning("Error when running knowledge index node")
+            logger.warning("Error when running knowledge index node", exc_info=True)
             return NodeRunResult(
                 status=WorkflowNodeExecutionStatus.FAILED,
                 inputs=variables,
                 error=str(e),
                 error_type=type(e).__name__,
             )
-        # Temporary handle all exceptions from DatasetRetrieval class here.
         except Exception as e:
+            logger.error(e, exc_info=True)
             return NodeRunResult(
                 status=WorkflowNodeExecutionStatus.FAILED,
                 inputs=variables,
@@ -123,392 +120,23 @@ class KnowledgeIndexNode(Node[KnowledgeIndexNodeData]):
 
     def _invoke_knowledge_index(
         self,
-        dataset: Dataset,
-        node_data: KnowledgeIndexNodeData,
+        dataset_id: str,
+        document_id: str,
+        original_document_id: str,
+        is_preview: bool,
+        batch: Any,
         chunks: Mapping[str, Any],
-        variable_pool: VariablePool,
-    ) -> Any:
-        document_id = variable_pool.get(["sys", SystemVariableKey.DOCUMENT_ID])
-        if not document_id:
-            raise KnowledgeIndexNodeError("Document ID is required.")
-        original_document_id = variable_pool.get(["sys", SystemVariableKey.ORIGINAL_DOCUMENT_ID])
-
-        batch = variable_pool.get(["sys", SystemVariableKey.BATCH])
-        if not batch:
-            raise KnowledgeIndexNodeError("Batch is required.")
-        document = db.session.query(Document).filter_by(id=document_id.value).first()
-        if not document:
-            raise KnowledgeIndexNodeError(f"Document {document_id.value} not found.")
-        doc_id_value = document.id
-        ds_id_value = dataset.id
-        dataset_name_value = dataset.name
-        document_name_value = document.name
-        created_at_value = document.created_at
-        # chunk nodes by chunk size
-        indexing_start_at = time.perf_counter()
-        index_processor = IndexProcessorFactory(dataset.chunk_structure).init_index_processor()
-        if original_document_id:
-            segments = db.session.scalars(
-                select(DocumentSegment).where(DocumentSegment.document_id == original_document_id.value)
-            ).all()
-            if segments:
-                index_node_ids = [segment.index_node_id for segment in segments]
-
-                # delete from vector index
-                index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=True)
-
-                for segment in segments:
-                    db.session.delete(segment)
-                db.session.commit()
-        index_processor.index(dataset, document, chunks)
-        indexing_end_at = time.perf_counter()
-        document.indexing_latency = indexing_end_at - indexing_start_at
-        # update document status
-        document.indexing_status = "completed"
-        document.completed_at = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
-        document.word_count = (
-            db.session.query(func.sum(DocumentSegment.word_count))
-            .where(
-                DocumentSegment.document_id == doc_id_value,
-                DocumentSegment.dataset_id == ds_id_value,
-            )
-            .scalar()
-        )
-        # Update need_summary based on dataset's summary_index_setting
-        if dataset.summary_index_setting and dataset.summary_index_setting.get("enable") is True:
-            document.need_summary = True
-        else:
-            document.need_summary = False
-        db.session.add(document)
-        # update document segment status
-        db.session.query(DocumentSegment).where(
-            DocumentSegment.document_id == doc_id_value,
-            DocumentSegment.dataset_id == ds_id_value,
-        ).update(
-            {
-                DocumentSegment.status: "completed",
-                DocumentSegment.enabled: True,
-                DocumentSegment.completed_at: datetime.datetime.now(datetime.UTC).replace(tzinfo=None),
-            }
-        )
-
-        db.session.commit()
-
-        # Generate summary index if enabled
-        self._handle_summary_index_generation(dataset, document, variable_pool)
-
-        return {
-            "dataset_id": ds_id_value,
-            "dataset_name": dataset_name_value,
-            "batch": batch.value,
-            "document_id": doc_id_value,
-            "document_name": document_name_value,
-            "created_at": created_at_value.timestamp(),
-            "display_status": "completed",
-        }
-
-    def _handle_summary_index_generation(
-        self,
-        dataset: Dataset,
-        document: Document,
-        variable_pool: VariablePool,
-    ) -> None:
-        """
-        Handle summary index generation based on mode (debug/preview or production).
-
-        Args:
-            dataset: Dataset containing the document
-            document: Document to generate summaries for
-            variable_pool: Variable pool to check invoke_from
-        """
-        # Only generate summary index for high_quality indexing technique
-        if dataset.indexing_technique != "high_quality":
-            return
-
-        # Check if summary index is enabled
-        summary_index_setting = dataset.summary_index_setting
-        if not summary_index_setting or not summary_index_setting.get("enable"):
-            return
-
-        # Skip qa_model documents
-        if document.doc_form == "qa_model":
-            return
-
-        # Determine if in preview/debug mode
-        invoke_from = variable_pool.get(["sys", SystemVariableKey.INVOKE_FROM])
-        is_preview = invoke_from and invoke_from.value == InvokeFrom.DEBUGGER
-
-        if is_preview:
-            try:
-                # Query segments that need summary generation
-                query = db.session.query(DocumentSegment).filter_by(
-                    dataset_id=dataset.id,
-                    document_id=document.id,
-                    status="completed",
-                    enabled=True,
-                )
-                segments = query.all()
-
-                if not segments:
-                    logger.info("No segments found for document %s", document.id)
-                    return
-
-                # Filter segments based on mode
-                segments_to_process = []
-                for segment in segments:
-                    # Skip if summary already exists
-                    existing_summary = (
-                        db.session.query(DocumentSegmentSummary)
-                        .filter_by(chunk_id=segment.id, dataset_id=dataset.id, status="completed")
-                        .first()
-                    )
-                    if existing_summary:
-                        continue
-
-                    # For parent-child mode, all segments are parent chunks, so process all
-                    segments_to_process.append(segment)
-
-                if not segments_to_process:
-                    logger.info("No segments need summary generation for document %s", document.id)
-                    return
-
-                # Use ThreadPoolExecutor for concurrent generation
-                flask_app = current_app._get_current_object()  # type: ignore
-                max_workers = min(10, len(segments_to_process))  # Limit to 10 workers
-
-                def process_segment(segment: DocumentSegment) -> None:
-                    """Process a single segment in a thread with Flask app context."""
-                    with flask_app.app_context():
-                        try:
-                            SummaryIndexService.generate_and_vectorize_summary(segment, dataset, summary_index_setting)
-                        except Exception:
-                            logger.exception(
-                                "Failed to generate summary for segment %s",
-                                segment.id,
-                            )
-                            # Continue processing other segments
-
-                with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
-                    futures = [executor.submit(process_segment, segment) for segment in segments_to_process]
-                    # Wait for all tasks to complete
-                    concurrent.futures.wait(futures)
-
-                logger.info(
-                    "Successfully generated summary index for %s segments in document %s",
-                    len(segments_to_process),
-                    document.id,
-                )
-            except Exception:
-                logger.exception("Failed to generate summary index for document %s", document.id)
-                # Don't fail the entire indexing process if summary generation fails
-        else:
-            # Production mode: asynchronous generation
-            logger.info(
-                "Queuing summary index generation task for document %s (production mode)",
-                document.id,
-            )
-            try:
-                generate_summary_index_task.delay(dataset.id, document.id, None)
-                logger.info("Summary index generation task queued for document %s", document.id)
-            except Exception:
-                logger.exception(
-                    "Failed to queue summary index generation task for document %s",
-                    document.id,
-                )
-                # Don't fail the entire indexing process if task queuing fails
-
-    def _get_preview_output_with_summaries(
-        self,
-        chunk_structure: str,
-        chunks: Any,
-        dataset: Dataset,
-        indexing_technique: str | None = None,
         summary_index_setting: dict | None = None,
-        doc_language: str | None = None,
-    ) -> Mapping[str, Any]:
-        """
-        Generate preview output with summaries for chunks in preview mode.
-        This method generates summaries on-the-fly without saving to database.
-
-        Args:
-            chunk_structure: Chunk structure type
-            chunks: Chunks to generate preview for
-            dataset: Dataset object (for tenant_id)
-            indexing_technique: Indexing technique from node config or dataset
-            summary_index_setting: Summary index setting from node config or dataset
-            doc_language: Optional document language to ensure summary is generated in the correct language
-        """
-        index_processor = IndexProcessorFactory(chunk_structure).init_index_processor()
-        preview_output = index_processor.format_preview(chunks)
-
-        # Check if summary index is enabled
-        if indexing_technique != "high_quality":
-            return preview_output
-
-        if not summary_index_setting or not summary_index_setting.get("enable"):
-            return preview_output
-
-        # Generate summaries for chunks
-        if "preview" in preview_output and isinstance(preview_output["preview"], list):
-            chunk_count = len(preview_output["preview"])
-            logger.info(
-                "Generating summaries for %s chunks in preview mode (dataset: %s)",
-                chunk_count,
-                dataset.id,
-            )
-            # Use ParagraphIndexProcessor's generate_summary method
-            from core.rag.index_processor.processor.paragraph_index_processor import ParagraphIndexProcessor
-
-            # Get Flask app for application context in worker threads
-            flask_app = None
-            try:
-                flask_app = current_app._get_current_object()  # type: ignore
-            except RuntimeError:
-                logger.warning("No Flask application context available, summary generation may fail")
-
-            def generate_summary_for_chunk(preview_item: dict) -> None:
-                """Generate summary for a single chunk."""
-                if "content" in preview_item:
-                    # Set Flask application context in worker thread
-                    if flask_app:
-                        with flask_app.app_context():
-                            summary, _ = ParagraphIndexProcessor.generate_summary(
-                                tenant_id=dataset.tenant_id,
-                                text=preview_item["content"],
-                                summary_index_setting=summary_index_setting,
-                                document_language=doc_language,
-                            )
-                            if summary:
-                                preview_item["summary"] = summary
-                    else:
-                        # Fallback: try without app context (may fail)
-                        summary, _ = ParagraphIndexProcessor.generate_summary(
-                            tenant_id=dataset.tenant_id,
-                            text=preview_item["content"],
-                            summary_index_setting=summary_index_setting,
-                            document_language=doc_language,
-                        )
-                        if summary:
-                            preview_item["summary"] = summary
-
-            # Generate summaries concurrently using ThreadPoolExecutor
-            # Set a reasonable timeout to prevent hanging (60 seconds per chunk, max 5 minutes total)
-            timeout_seconds = min(300, 60 * len(preview_output["preview"]))
-            errors: list[Exception] = []
-
-            with concurrent.futures.ThreadPoolExecutor(max_workers=min(10, len(preview_output["preview"]))) as executor:
-                futures = [
-                    executor.submit(generate_summary_for_chunk, preview_item)
-                    for preview_item in preview_output["preview"]
-                ]
-                # Wait for all tasks to complete with timeout
-                done, not_done = concurrent.futures.wait(futures, timeout=timeout_seconds)
-
-                # Cancel tasks that didn't complete in time
-                if not_done:
-                    timeout_error_msg = (
-                        f"Summary generation timeout: {len(not_done)} chunks did not complete within {timeout_seconds}s"
-                    )
-                    logger.warning("%s. Cancelling remaining tasks...", timeout_error_msg)
-                    # In preview mode, timeout is also an error
-                    errors.append(TimeoutError(timeout_error_msg))
-                    for future in not_done:
-                        future.cancel()
-                    # Wait a bit for cancellation to take effect
-                    concurrent.futures.wait(not_done, timeout=5)
-
-                # Collect exceptions from completed futures
-                for future in done:
-                    try:
-                        future.result()  # This will raise any exception that occurred
-                    except Exception as e:
-                        logger.exception("Error in summary generation future")
-                        errors.append(e)
-
-            # In preview mode, if there are any errors, fail the request
-            if errors:
-                error_messages = [str(e) for e in errors]
-                error_summary = (
-                    f"Failed to generate summaries for {len(errors)} chunk(s). "
-                    f"Errors: {'; '.join(error_messages[:3])}"  # Show first 3 errors
-                )
-                if len(errors) > 3:
-                    error_summary += f" (and {len(errors) - 3} more)"
-                logger.error("Summary generation failed in preview mode: %s", error_summary)
-                raise KnowledgeIndexNodeError(error_summary)
-
-            completed_count = sum(1 for item in preview_output["preview"] if item.get("summary") is not None)
-            logger.info(
-                "Completed summary generation for preview chunks: %s/%s succeeded",
-                completed_count,
-                len(preview_output["preview"]),
-            )
-
-        return preview_output
-
-    def _get_preview_output(
-        self,
-        chunk_structure: str,
-        chunks: Any,
-        dataset: Dataset | None = None,
-        variable_pool: VariablePool | None = None,
-    ) -> Mapping[str, Any]:
-        index_processor = IndexProcessorFactory(chunk_structure).init_index_processor()
-        preview_output = index_processor.format_preview(chunks)
-
-        # If dataset is provided, try to enrich preview with summaries
-        if dataset and variable_pool:
-            document_id = variable_pool.get(["sys", SystemVariableKey.DOCUMENT_ID])
-            if document_id:
-                document = db.session.query(Document).filter_by(id=document_id.value).first()
-                if document:
-                    # Query summaries for this document
-                    summaries = (
-                        db.session.query(DocumentSegmentSummary)
-                        .filter_by(
-                            dataset_id=dataset.id,
-                            document_id=document.id,
-                            status="completed",
-                            enabled=True,
-                        )
-                        .all()
-                    )
-
-                    if summaries:
-                        # Create a map of segment content to summary for matching
-                        # Use content matching as chunks in preview might not be indexed yet
-                        summary_by_content = {}
-                        for summary in summaries:
-                            segment = (
-                                db.session.query(DocumentSegment)
-                                .filter_by(id=summary.chunk_id, dataset_id=dataset.id)
-                                .first()
-                            )
-                            if segment:
-                                # Normalize content for matching (strip whitespace)
-                                normalized_content = segment.content.strip()
-                                summary_by_content[normalized_content] = summary.summary_content
-
-                        # Enrich preview with summaries by content matching
-                        if "preview" in preview_output and isinstance(preview_output["preview"], list):
-                            matched_count = 0
-                            for preview_item in preview_output["preview"]:
-                                if "content" in preview_item:
-                                    # Normalize content for matching
-                                    normalized_chunk_content = preview_item["content"].strip()
-                                    if normalized_chunk_content in summary_by_content:
-                                        preview_item["summary"] = summary_by_content[normalized_chunk_content]
-                                        matched_count += 1
-
-                            if matched_count > 0:
-                                logger.info(
-                                    "Enriched preview with %s existing summaries (dataset: %s, document: %s)",
-                                    matched_count,
-                                    dataset.id,
-                                    document.id,
-                                )
-
-        return preview_output
+    ):
+        if not document_id:
+            raise KnowledgeIndexNodeError("document_id is required.")
+        rst = self.index_processor.index_and_clean(
+            dataset_id, document_id, original_document_id, chunks, batch, summary_index_setting
+        )
+        self.summary_index_service.generate_and_vectorize_summary(
+            dataset_id, document_id, is_preview, summary_index_setting
+        )
+        return rst
 
     @classmethod
     def version(cls) -> str:
diff --git a/api/core/workflow/repositories/index_processor_protocol.py b/api/core/workflow/repositories/index_processor_protocol.py
new file mode 100644
index 0000000000..feaa4ab5de
--- /dev/null
+++ b/api/core/workflow/repositories/index_processor_protocol.py
@@ -0,0 +1,41 @@
+from collections.abc import Mapping
+from typing import Any, Protocol
+
+from pydantic import BaseModel, Field
+
+
+class PreviewItem(BaseModel):
+    content: str | None = Field(None)
+    child_chunks: list[str] | None = Field(None)
+    summary: str | None = Field(None)
+
+
+class QaPreview(BaseModel):
+    answer: str | None = Field(None)
+    question: str | None = Field(None)
+
+
+class Preview(BaseModel):
+    chunk_structure: str
+    parent_mode: str | None = Field(None)
+    preview: list[PreviewItem] = Field([])
+    qa_preview: list[QaPreview] = Field([])
+    total_segments: int
+
+
+class IndexProcessorProtocol(Protocol):
+    def format_preview(self, chunk_structure: str, chunks: Any) -> Preview: ...
+
+    def index_and_clean(
+        self,
+        dataset_id: str,
+        document_id: str,
+        original_document_id: str,
+        chunks: Mapping[str, Any],
+        batch: Any,
+        summary_index_setting: dict | None = None,
+    ) -> dict[str, Any]: ...
+
+    def get_preview_output(
+        self, chunks: Any, dataset_id: str, document_id: str, chunk_structure: str, summary_index_setting: dict | None
+    ) -> Preview: ...
diff --git a/api/core/workflow/repositories/summary_index_service_protocol.py b/api/core/workflow/repositories/summary_index_service_protocol.py
new file mode 100644
index 0000000000..cbcfdd2a77
--- /dev/null
+++ b/api/core/workflow/repositories/summary_index_service_protocol.py
@@ -0,0 +1,7 @@
+from typing import Protocol
+
+
+class SummaryIndexServiceProtocol(Protocol):
+    def generate_and_vectorize_summary(
+        self, dataset_id: str, document_id: str, is_preview: bool, summary_index_setting: dict | None = None
+    ): ...
diff --git a/api/tests/integration_tests/workflow/nodes/knowledge_index/__init__.py b/api/tests/integration_tests/workflow/nodes/knowledge_index/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/tests/integration_tests/workflow/nodes/knowledge_index/test_knowledge_index_node_integration.py b/api/tests/integration_tests/workflow/nodes/knowledge_index/test_knowledge_index_node_integration.py
new file mode 100644
index 0000000000..4edbf2b1e9
--- /dev/null
+++ b/api/tests/integration_tests/workflow/nodes/knowledge_index/test_knowledge_index_node_integration.py
@@ -0,0 +1,69 @@
+"""
+Integration tests for KnowledgeIndexNode.
+
+This module provides integration tests for KnowledgeIndexNode with real database interactions.
+
+Note: These tests require database setup and are more complex than unit tests.
+For now, we focus on unit tests which provide better coverage for the node logic.
+"""
+
+import pytest
+
+
+class TestKnowledgeIndexNodeIntegration:
+    """
+    Integration test suite for KnowledgeIndexNode.
+
+    Note: Full integration tests require:
+    - Database setup with datasets and documents
+    - Vector store for embeddings
+    - Model providers for indexing and summarization
+    - IndexProcessor and SummaryIndexService implementations
+
+    For now, unit tests provide comprehensive coverage of the node logic.
+    """
+
+    @pytest.mark.skip(reason="Integration tests require full database and vector store setup")
+    def test_end_to_end_knowledge_index_preview(self):
+        """Test end-to-end knowledge index workflow in preview mode."""
+        # TODO: Implement with real database
+        # 1. Create a dataset
+        # 2. Create a document
+        # 3. Prepare chunks
+        # 4. Run KnowledgeIndexNode in preview mode
+        # 5. Verify preview output
+        pass
+
+    @pytest.mark.skip(reason="Integration tests require full database and vector store setup")
+    def test_end_to_end_knowledge_index_production(self):
+        """Test end-to-end knowledge index workflow in production mode."""
+        # TODO: Implement with real database
+        # 1. Create a dataset
+        # 2. Create a document
+        # 3. Prepare chunks
+        # 4. Run KnowledgeIndexNode in production mode
+        # 5. Verify indexing and summary generation
+        pass
+
+    @pytest.mark.skip(reason="Integration tests require full database and vector store setup")
+    def test_knowledge_index_with_summary_enabled(self):
+        """Test knowledge index with summary index setting enabled."""
+        # TODO: Implement with real database
+        # 1. Create a dataset
+        # 2. Create a document
+        # 3. Prepare chunks
+        # 4. Configure summary index setting
+        # 5. Run KnowledgeIndexNode
+        # 6. Verify summaries are generated and indexed
+        pass
+
+    @pytest.mark.skip(reason="Integration tests require full database and vector store setup")
+    def test_knowledge_index_parent_child_structure(self):
+        """Test knowledge index with parent-child chunk structure."""
+        # TODO: Implement with real database
+        # 1. Create a dataset
+        # 2. Create a document
+        # 3. Prepare parent-child chunks
+        # 4. Run KnowledgeIndexNode
+        # 5. Verify parent-child indexing
+        pass
diff --git a/api/tests/unit_tests/core/workflow/nodes/knowledge_index/__init__.py b/api/tests/unit_tests/core/workflow/nodes/knowledge_index/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
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
new file mode 100644
index 0000000000..38e434d7d8
--- /dev/null
+++ b/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
@@ -0,0 +1,663 @@
+import time
+import uuid
+from unittest.mock import Mock
+
+import pytest
+
+from core.app.entities.app_invoke_entities import InvokeFrom
+from core.workflow.entities import GraphInitParams
+from core.workflow.enums import SystemVariableKey, WorkflowNodeExecutionStatus
+from core.workflow.nodes.knowledge_index.entities import KnowledgeIndexNodeData
+from core.workflow.nodes.knowledge_index.exc import KnowledgeIndexNodeError
+from core.workflow.nodes.knowledge_index.knowledge_index_node import KnowledgeIndexNode
+from core.workflow.repositories.index_processor_protocol import IndexProcessorProtocol, Preview, PreviewItem
+from core.workflow.repositories.summary_index_service_protocol import SummaryIndexServiceProtocol
+from core.workflow.runtime import GraphRuntimeState, VariablePool
+from core.workflow.system_variable import SystemVariable
+from core.workflow.variables.segments import StringSegment
+from models.enums import UserFrom
+
+
+@pytest.fixture
+def mock_graph_init_params():
+    """Create mock GraphInitParams."""
+    return GraphInitParams(
+        tenant_id=str(uuid.uuid4()),
+        app_id=str(uuid.uuid4()),
+        workflow_id=str(uuid.uuid4()),
+        graph_config={},
+        user_id=str(uuid.uuid4()),
+        user_from=UserFrom.ACCOUNT,
+        invoke_from=InvokeFrom.DEBUGGER,
+        call_depth=0,
+    )
+
+
+@pytest.fixture
+def mock_graph_runtime_state():
+    """Create mock GraphRuntimeState."""
+    variable_pool = VariablePool(
+        system_variables=SystemVariable(user_id=str(uuid.uuid4()), files=[]),
+        user_inputs={},
+        environment_variables=[],
+        conversation_variables=[],
+    )
+    return GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
+
+
+@pytest.fixture
+def mock_index_processor():
+    """Create mock IndexProcessorProtocol."""
+    mock_processor = Mock(spec=IndexProcessorProtocol)
+    return mock_processor
+
+
+@pytest.fixture
+def mock_summary_index_service():
+    """Create mock SummaryIndexServiceProtocol."""
+    mock_service = Mock(spec=SummaryIndexServiceProtocol)
+    return mock_service
+
+
+@pytest.fixture
+def sample_node_data():
+    """Create sample KnowledgeIndexNodeData."""
+    return KnowledgeIndexNodeData(
+        title="Knowledge Index",
+        type="knowledge-index",
+        chunk_structure="general_structure",
+        index_chunk_variable_selector=["start", "chunks"],
+        indexing_technique="high_quality",
+        summary_index_setting=None,
+    )
+
+
+@pytest.fixture
+def sample_chunks():
+    """Create sample chunks data."""
+    return {
+        "general_chunks": ["Chunk 1 content", "Chunk 2 content"],
+        "data_source_info": {"file_id": str(uuid.uuid4())},
+    }
+
+
+class TestKnowledgeIndexNode:
+    """
+    Test suite for KnowledgeIndexNode.
+    """
+
+    def test_node_initialization(
+        self, mock_graph_init_params, mock_graph_runtime_state, mock_index_processor, mock_summary_index_service
+    ):
+        """Test KnowledgeIndexNode initialization."""
+        # Arrange
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": {
+                "title": "Knowledge Index",
+                "type": "knowledge-index",
+                "chunk_structure": "general_structure",
+                "index_chunk_variable_selector": ["start", "chunks"],
+            },
+        }
+
+        # Act
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Assert
+        assert node.id == node_id
+        assert node.index_processor == mock_index_processor
+        assert node.summary_index_service == mock_summary_index_service
+
+    def test_run_without_dataset_id(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+    ):
+        """Test _run raises KnowledgeIndexNodeError when dataset_id is not provided."""
+        # Arrange
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act & Assert
+        with pytest.raises(KnowledgeIndexNodeError, match="Dataset ID is required"):
+            node._run()
+
+    def test_run_without_index_chunk_variable(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+    ):
+        """Test _run raises KnowledgeIndexNodeError when index chunk variable is not provided."""
+        # Arrange
+        dataset_id = str(uuid.uuid4())
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DATASET_ID],
+            StringSegment(value=dataset_id),
+        )
+
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act & Assert
+        with pytest.raises(KnowledgeIndexNodeError, match="Index chunk variable is required"):
+            node._run()
+
+    def test_run_with_empty_chunks(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+    ):
+        """Test _run fails when chunks is empty."""
+        # Arrange
+        dataset_id = str(uuid.uuid4())
+        chunks_selector = ["start", "chunks"]
+
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DATASET_ID],
+            StringSegment(value=dataset_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(chunks_selector, StringSegment(value=""))
+
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act
+        result = node._run()
+
+        # Assert
+        assert result.status == WorkflowNodeExecutionStatus.FAILED
+        assert "Chunks is required" in result.error
+
+    def test_run_preview_mode_success(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+        sample_chunks,
+    ):
+        """Test _run succeeds in preview mode."""
+        # Arrange
+        dataset_id = str(uuid.uuid4())
+        document_id = str(uuid.uuid4())
+        chunks_selector = ["start", "chunks"]
+
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DATASET_ID],
+            StringSegment(value=dataset_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DOCUMENT_ID],
+            StringSegment(value=document_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.INVOKE_FROM],
+            StringSegment(value=InvokeFrom.DEBUGGER),
+        )
+        mock_graph_runtime_state.variable_pool.add(chunks_selector, sample_chunks)
+
+        # Mock preview output
+        mock_preview = Preview(
+            chunk_structure="general_structure",
+            preview=[PreviewItem(content="Chunk 1"), PreviewItem(content="Chunk 2")],
+            total_segments=2,
+        )
+        mock_index_processor.get_preview_output.return_value = mock_preview
+
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act
+        result = node._run()
+
+        # Assert
+        assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
+        assert result.outputs is not None
+        assert mock_index_processor.get_preview_output.called
+
+    def test_run_production_mode_success(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+        sample_chunks,
+    ):
+        """Test _run succeeds in production mode."""
+        # Arrange
+        dataset_id = str(uuid.uuid4())
+        document_id = str(uuid.uuid4())
+        original_document_id = str(uuid.uuid4())
+        batch = "batch_123"
+        chunks_selector = ["start", "chunks"]
+
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DATASET_ID],
+            StringSegment(value=dataset_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DOCUMENT_ID],
+            StringSegment(value=document_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.ORIGINAL_DOCUMENT_ID],
+            StringSegment(value=original_document_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.BATCH],
+            StringSegment(value=batch),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.INVOKE_FROM],
+            StringSegment(value=InvokeFrom.SERVICE_API),
+        )
+        mock_graph_runtime_state.variable_pool.add(chunks_selector, sample_chunks)
+
+        # Mock index_and_clean output
+        mock_index_processor.index_and_clean.return_value = {"status": "indexed"}
+
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act
+        result = node._run()
+
+        # Assert
+        assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
+        assert result.outputs is not None
+        assert mock_summary_index_service.generate_and_vectorize_summary.called
+        assert mock_index_processor.index_and_clean.called
+
+    def test_run_production_mode_without_batch(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+        sample_chunks,
+    ):
+        """Test _run fails when batch is not provided in production mode."""
+        # Arrange
+        dataset_id = str(uuid.uuid4())
+        document_id = str(uuid.uuid4())
+        chunks_selector = ["start", "chunks"]
+
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DATASET_ID],
+            StringSegment(value=dataset_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DOCUMENT_ID],
+            StringSegment(value=document_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.INVOKE_FROM],
+            StringSegment(value=InvokeFrom.SERVICE_API),
+        )
+        mock_graph_runtime_state.variable_pool.add(chunks_selector, sample_chunks)
+
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act
+        result = node._run()
+
+        # Assert
+        assert result.status == WorkflowNodeExecutionStatus.FAILED
+        assert "Batch is required" in result.error
+
+    def test_run_with_knowledge_index_node_error(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+        sample_chunks,
+    ):
+        """Test _run handles KnowledgeIndexNodeError properly."""
+        # Arrange
+        dataset_id = str(uuid.uuid4())
+        document_id = str(uuid.uuid4())
+        batch = "batch_123"
+        chunks_selector = ["start", "chunks"]
+
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DATASET_ID],
+            StringSegment(value=dataset_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DOCUMENT_ID],
+            StringSegment(value=document_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.BATCH],
+            StringSegment(value=batch),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.INVOKE_FROM],
+            StringSegment(value=InvokeFrom.SERVICE_API),
+        )
+        mock_graph_runtime_state.variable_pool.add(chunks_selector, sample_chunks)
+
+        # Mock to raise KnowledgeIndexNodeError
+        mock_index_processor.index_and_clean.side_effect = KnowledgeIndexNodeError("Indexing failed")
+
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act
+        result = node._run()
+
+        # Assert
+        assert result.status == WorkflowNodeExecutionStatus.FAILED
+        assert "Indexing failed" in result.error
+        assert result.error_type == "KnowledgeIndexNodeError"
+
+    def test_run_with_generic_exception(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+        sample_chunks,
+    ):
+        """Test _run handles generic exceptions properly."""
+        # Arrange
+        dataset_id = str(uuid.uuid4())
+        document_id = str(uuid.uuid4())
+        batch = "batch_123"
+        chunks_selector = ["start", "chunks"]
+
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DATASET_ID],
+            StringSegment(value=dataset_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.DOCUMENT_ID],
+            StringSegment(value=document_id),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.BATCH],
+            StringSegment(value=batch),
+        )
+        mock_graph_runtime_state.variable_pool.add(
+            ["sys", SystemVariableKey.INVOKE_FROM],
+            StringSegment(value=InvokeFrom.SERVICE_API),
+        )
+        mock_graph_runtime_state.variable_pool.add(chunks_selector, sample_chunks)
+
+        # Mock to raise generic exception
+        mock_index_processor.index_and_clean.side_effect = Exception("Unexpected error")
+
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act
+        result = node._run()
+
+        # Assert
+        assert result.status == WorkflowNodeExecutionStatus.FAILED
+        assert "Unexpected error" in result.error
+        assert result.error_type == "Exception"
+
+    def test_invoke_knowledge_index(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+    ):
+        # Arrange
+        dataset_id = str(uuid.uuid4())
+        document_id = str(uuid.uuid4())
+        original_document_id = str(uuid.uuid4())
+        batch = "batch_123"
+        chunks = {"general_chunks": ["content"]}
+
+        mock_index_processor.index_and_clean.return_value = {"status": "indexed"}
+
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act
+        result = node._invoke_knowledge_index(
+            dataset_id=dataset_id,
+            document_id=document_id,
+            original_document_id=original_document_id,
+            is_preview=False,
+            batch=batch,
+            chunks=chunks,
+            summary_index_setting=None,
+        )
+
+        # Assert
+        assert mock_summary_index_service.generate_and_vectorize_summary.called
+        assert mock_index_processor.index_and_clean.called
+        assert result == {"status": "indexed"}
+
+    def test_version_method(self):
+        """Test version class method."""
+        # Act
+        version = KnowledgeIndexNode.version()
+
+        # Assert
+        assert version == "1"
+
+    def test_get_streaming_template(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+    ):
+        """Test get_streaming_template method."""
+        # Arrange
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act
+        template = node.get_streaming_template()
+
+        # Assert
+        assert template is not None
+        assert template.segments == []
+
+
+class TestInvokeKnowledgeIndex:
+    def test_invoke_with_summary_index_setting(
+        self,
+        mock_graph_init_params,
+        mock_graph_runtime_state,
+        mock_index_processor,
+        mock_summary_index_service,
+        sample_node_data,
+    ):
+        # Arrange
+        dataset_id = str(uuid.uuid4())
+        document_id = str(uuid.uuid4())
+        original_document_id = str(uuid.uuid4())
+        batch = "batch_123"
+        chunks = {"general_chunks": ["content"]}
+        summary_setting = {"enabled": True}
+
+        mock_index_processor.index_and_clean.return_value = {"status": "indexed"}
+
+        node_id = str(uuid.uuid4())
+        config = {
+            "id": node_id,
+            "data": sample_node_data.model_dump(),
+        }
+
+        node = KnowledgeIndexNode(
+            id=node_id,
+            config=config,
+            graph_init_params=mock_graph_init_params,
+            graph_runtime_state=mock_graph_runtime_state,
+            index_processor=mock_index_processor,
+            summary_index_service=mock_summary_index_service,
+        )
+
+        # Act
+        result = node._invoke_knowledge_index(
+            dataset_id=dataset_id,
+            document_id=document_id,
+            original_document_id=original_document_id,
+            is_preview=False,
+            batch=batch,
+            chunks=chunks,
+            summary_index_setting=summary_setting,
+        )
+
+        # Assert
+        mock_summary_index_service.generate_and_vectorize_summary.assert_called_once_with(
+            dataset_id, document_id, False, summary_setting
+        )
+        mock_index_processor.index_and_clean.assert_called_once_with(
+            dataset_id, document_id, original_document_id, chunks, batch, summary_setting
+        )
+        assert result == {"status": "indexed"}

From 9c33923985052b2a57b743aa1c5e76f594221539 Mon Sep 17 00:00:00 2001
From: Coding On Star <447357187@qq.com>
Date: Mon, 2 Mar 2026 18:24:01 +0800
Subject: [PATCH 12/22] feat(tests): add comprehensive test suite for workflow
 utilities and node creation (#32841)

Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
---
 .../components/workflow/__tests__/fixtures.ts | 111 +++
 .../workflow/__tests__/mock-hooks-store.ts    |  59 ++
 .../workflow/__tests__/mock-reactflow.ts      | 110 +++
 .../workflow/__tests__/mock-workflow-store.ts | 199 +++++
 .../workflow/utils/__tests__/common.spec.ts   | 183 +++++
 .../utils/__tests__/data-source.spec.ts       | 116 +++
 .../workflow/utils/__tests__/debug.spec.ts    |  48 ++
 .../workflow/utils/__tests__/edge.spec.ts     |  33 +
 .../utils/__tests__/elk-layout.spec.ts        | 665 ++++++++++++++++
 .../__tests__/gen-node-meta-data.spec.ts      |  70 ++
 .../utils/__tests__/node-navigation.spec.ts   | 161 ++++
 .../workflow/utils/__tests__/node.spec.ts     | 219 ++++++
 .../workflow/utils/__tests__/tool.spec.ts     | 191 +++++
 .../workflow/utils/__tests__/trigger.spec.ts  | 132 ++++
 .../workflow/utils/__tests__/variable.spec.ts |  55 ++
 .../utils/__tests__/workflow-entry.spec.ts    |  89 +++
 .../utils/__tests__/workflow-init.spec.ts     | 742 ++++++++++++++++++
 .../workflow/utils/__tests__/workflow.spec.ts | 423 ++++++++++
 .../workflow/utils/workflow-init.spec.ts      |  69 --
 19 files changed, 3606 insertions(+), 69 deletions(-)
 create mode 100644 web/app/components/workflow/__tests__/fixtures.ts
 create mode 100644 web/app/components/workflow/__tests__/mock-hooks-store.ts
 create mode 100644 web/app/components/workflow/__tests__/mock-reactflow.ts
 create mode 100644 web/app/components/workflow/__tests__/mock-workflow-store.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/common.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/data-source.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/debug.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/edge.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/elk-layout.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/gen-node-meta-data.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/node-navigation.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/node.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/tool.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/trigger.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/variable.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/workflow-entry.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/workflow-init.spec.ts
 create mode 100644 web/app/components/workflow/utils/__tests__/workflow.spec.ts
 delete mode 100644 web/app/components/workflow/utils/workflow-init.spec.ts

diff --git a/web/app/components/workflow/__tests__/fixtures.ts b/web/app/components/workflow/__tests__/fixtures.ts
new file mode 100644
index 0000000000..50a42ebe3d
--- /dev/null
+++ b/web/app/components/workflow/__tests__/fixtures.ts
@@ -0,0 +1,111 @@
+import type { CommonEdgeType, CommonNodeType, Edge, Node } from '../types'
+import { Position } from 'reactflow'
+import { CUSTOM_NODE } from '../constants'
+import { BlockEnum, NodeRunningStatus } from '../types'
+
+let nodeIdCounter = 0
+let edgeIdCounter = 0
+
+export function resetFixtureCounters() {
+  nodeIdCounter = 0
+  edgeIdCounter = 0
+}
+
+export function createNode(
+  overrides: Omit<Partial<Node>, 'data'> & { data?: Partial<CommonNodeType> & Record<string, unknown> } = {},
+): Node {
+  const id = overrides.id ?? `node-${++nodeIdCounter}`
+  const { data: dataOverrides, ...rest } = overrides
+  return {
+    id,
+    type: CUSTOM_NODE,
+    position: { x: 0, y: 0 },
+    targetPosition: Position.Left,
+    sourcePosition: Position.Right,
+    data: {
+      title: `Node ${id}`,
+      desc: '',
+      type: BlockEnum.Code,
+      _connectedSourceHandleIds: [],
+      _connectedTargetHandleIds: [],
+      ...dataOverrides,
+    } as CommonNodeType,
+    ...rest,
+  } as Node
+}
+
+export function createStartNode(overrides: Omit<Partial<Node>, 'data'> & { data?: Partial<CommonNodeType> & Record<string, unknown> } = {}): Node {
+  return createNode({
+    ...overrides,
+    data: { type: BlockEnum.Start, title: 'Start', desc: '', ...overrides.data },
+  })
+}
+
+export function createTriggerNode(
+  triggerType: BlockEnum.TriggerSchedule | BlockEnum.TriggerWebhook | BlockEnum.TriggerPlugin = BlockEnum.TriggerWebhook,
+  overrides: Omit<Partial<Node>, 'data'> & { data?: Partial<CommonNodeType> & Record<string, unknown> } = {},
+): Node {
+  return createNode({
+    ...overrides,
+    data: { type: triggerType, title: `Trigger ${triggerType}`, desc: '', ...overrides.data },
+  })
+}
+
+export function createIterationNode(overrides: Omit<Partial<Node>, 'data'> & { data?: Partial<CommonNodeType> & Record<string, unknown> } = {}): Node {
+  return createNode({
+    ...overrides,
+    data: { type: BlockEnum.Iteration, title: 'Iteration', desc: '', ...overrides.data },
+  })
+}
+
+export function createLoopNode(overrides: Omit<Partial<Node>, 'data'> & { data?: Partial<CommonNodeType> & Record<string, unknown> } = {}): Node {
+  return createNode({
+    ...overrides,
+    data: { type: BlockEnum.Loop, title: 'Loop', desc: '', ...overrides.data },
+  })
+}
+
+export function createEdge(overrides: Omit<Partial<Edge>, 'data'> & { data?: Partial<CommonEdgeType> & Record<string, unknown> } = {}): Edge {
+  const { data: dataOverrides, ...rest } = overrides
+  return {
+    id: overrides.id ?? `edge-${overrides.source ?? 'src'}-${overrides.target ?? 'tgt'}-${++edgeIdCounter}`,
+    source: 'source-node',
+    target: 'target-node',
+    data: {
+      sourceType: BlockEnum.Start,
+      targetType: BlockEnum.Code,
+      ...dataOverrides,
+    } as CommonEdgeType,
+    ...rest,
+  } as Edge
+}
+
+export function createLinearGraph(nodeCount: number): { nodes: Node[], edges: Edge[] } {
+  const nodes: Node[] = []
+  const edges: Edge[] = []
+
+  for (let i = 0; i < nodeCount; i++) {
+    const type = i === 0 ? BlockEnum.Start : BlockEnum.Code
+    nodes.push(createNode({
+      id: `n${i}`,
+      position: { x: i * 300, y: 0 },
+      data: { type, title: `Node ${i}`, desc: '' },
+    }))
+    if (i > 0) {
+      edges.push(createEdge({
+        id: `e-n${i - 1}-n${i}`,
+        source: `n${i - 1}`,
+        target: `n${i}`,
+        sourceHandle: 'source',
+        targetHandle: 'target',
+        data: {
+          sourceType: i === 1 ? BlockEnum.Start : BlockEnum.Code,
+          targetType: BlockEnum.Code,
+        },
+      }))
+    }
+  }
+  return { nodes, edges }
+}
+
+export { BlockEnum, NodeRunningStatus }
diff --git a/web/app/components/workflow/__tests__/mock-hooks-store.ts b/web/app/components/workflow/__tests__/mock-hooks-store.ts
new file mode 100644
index 0000000000..9363b31c35
--- /dev/null
+++ b/web/app/components/workflow/__tests__/mock-hooks-store.ts
@@ -0,0 +1,59 @@
+import { noop } from 'es-toolkit'
+
+/**
+ * Default hooks store state.
+ * All function fields default to noop / vi.fn() stubs.
+ * Use `createHooksStoreState(overrides)` to get a customised state object.
+ */
+export function createHooksStoreState(overrides: Record<string, unknown> = {}) {
+  return {
+    refreshAll: noop,
+
+    // draft sync
+    doSyncWorkflowDraft: vi.fn().mockResolvedValue(undefined),
+    syncWorkflowDraftWhenPageClose: noop,
+    handleRefreshWorkflowDraft: noop,
+    handleBackupDraft: noop,
+    handleLoadBackupDraft: noop,
+    handleRestoreFromPublishedWorkflow: noop,
+
+    // run
+    handleRun: noop,
+    handleStopRun: noop,
+    handleStartWorkflowRun: noop,
+    handleWorkflowStartRunInWorkflow: noop,
+    handleWorkflowStartRunInChatflow: noop,
+    handleWorkflowTriggerScheduleRunInWorkflow: noop,
+    handleWorkflowTriggerWebhookRunInWorkflow: noop,
+    handleWorkflowTriggerPluginRunInWorkflow: noop,
+    handleWorkflowRunAllTriggersInWorkflow: noop,
+
+    // meta
+    availableNodesMetaData: undefined,
+    configsMap: undefined,
+
+    // export / DSL
+    exportCheck: vi.fn().mockResolvedValue(undefined),
+    handleExportDSL: vi.fn().mockResolvedValue(undefined),
+    getWorkflowRunAndTraceUrl: vi.fn().mockReturnValue({ runUrl: '', traceUrl: '' }),
+
+    // inspect vars
+    fetchInspectVars: vi.fn().mockResolvedValue(undefined),
+    hasNodeInspectVars: vi.fn().mockReturnValue(false),
+    hasSetInspectVar: vi.fn().mockReturnValue(false),
+    fetchInspectVarValue: vi.fn().mockResolvedValue(undefined),
+    editInspectVarValue: vi.fn().mockResolvedValue(undefined),
+    renameInspectVarName: vi.fn().mockResolvedValue(undefined),
+    appendNodeInspectVars: noop,
+    deleteInspectVar: vi.fn().mockResolvedValue(undefined),
+    deleteNodeInspectorVars: vi.fn().mockResolvedValue(undefined),
+    deleteAllInspectorVars: vi.fn().mockResolvedValue(undefined),
+    isInspectVarEdited: vi.fn().mockReturnValue(false),
+    resetToLastRunVar: vi.fn().mockResolvedValue(undefined),
+    invalidateSysVarValues: noop,
+    resetConversationVar: vi.fn().mockResolvedValue(undefined),
+    invalidateConversationVarValues: noop,
+
+    ...overrides,
+  }
+}
diff --git a/web/app/components/workflow/__tests__/mock-reactflow.ts b/web/app/components/workflow/__tests__/mock-reactflow.ts
new file mode 100644
index 0000000000..168713de4c
--- /dev/null
+++ b/web/app/components/workflow/__tests__/mock-reactflow.ts
@@ -0,0 +1,110 @@
+/**
+ * ReactFlow mock factory for workflow tests.
+ *
+ * Usage — add this to the top of any test file that imports reactflow:
+ *
+ *   vi.mock('reactflow', async () => (await import('../__tests__/mock-reactflow')).createReactFlowMock())
+ *
+ * Or for more control:
+ *
+ *   vi.mock('reactflow', async () => {
+ *     const base = (await import('../__tests__/mock-reactflow')).createReactFlowMock()
+ *     return { ...base, useReactFlow: () => ({ ...base.useReactFlow(), fitView: vi.fn() }) }
+ *   })
+ */
+import * as React from 'react'
+
+export function createReactFlowMock(overrides: Record<string, unknown> = {}) {
+  const noopComponent: React.FC<{ children?: React.ReactNode }> = ({ children }) =>
+    React.createElement('div', { 'data-testid': 'reactflow-mock' }, children)
+  noopComponent.displayName = 'ReactFlowMock'
+
+  const backgroundComponent: React.FC = () => null
+  backgroundComponent.displayName = 'BackgroundMock'
+
+  return {
+    // re-export the real Position enum
+    Position: { Left: 'left', Right: 'right', Top: 'top', Bottom: 'bottom' },
+    MarkerType: { Arrow: 'arrow', ArrowClosed: 'arrowclosed' },
+    ConnectionMode: { Strict: 'strict', Loose: 'loose' },
+    ConnectionLineType: { Bezier: 'default', Straight: 'straight', Step: 'step', SmoothStep: 'smoothstep' },
+
+    // components
+    default: noopComponent,
+    ReactFlow: noopComponent,
+    ReactFlowProvider: ({ children }: { children?: React.ReactNode }) =>
+      React.createElement(React.Fragment, null, children),
+    Background: backgroundComponent,
+    MiniMap: backgroundComponent,
+    Controls: backgroundComponent,
+    Handle: (props: Record<string, unknown>) => React.createElement('div', { 'data-testid': 'handle', ...props }),
+    BaseEdge: (props: Record<string, unknown>) => React.createElement('path', props),
+    EdgeLabelRenderer: ({ children }: { children?: React.ReactNode }) =>
+      React.createElement('div', null, children),
+
+    // hooks
+    useReactFlow: () => ({
+      setCenter: vi.fn(),
+      fitView: vi.fn(),
+      zoomIn: vi.fn(),
+      zoomOut: vi.fn(),
+      zoomTo: vi.fn(),
+      getNodes: vi.fn().mockReturnValue([]),
+      getEdges: vi.fn().mockReturnValue([]),
+      getNode: vi.fn(),
+      setNodes: vi.fn(),
+      setEdges: vi.fn(),
+      addNodes: vi.fn(),
+      addEdges: vi.fn(),
+      deleteElements: vi.fn(),
+      getViewport: vi.fn().mockReturnValue({ x: 0, y: 0, zoom: 1 }),
+      setViewport: vi.fn(),
+      screenToFlowPosition: vi.fn().mockImplementation((pos: { x: number, y: number }) => pos),
+      flowToScreenPosition: vi.fn().mockImplementation((pos: { x: number, y: number }) => pos),
+      toObject: vi.fn().mockReturnValue({ nodes: [], edges: [], viewport: { x: 0, y: 0, zoom: 1 } }),
+      viewportInitialized: true,
+    }),
+
+    useStoreApi: () => ({
+      getState: vi.fn().mockReturnValue({
+        nodeInternals: new Map(),
+        edges: [],
+        transform: [0, 0, 1],
+        d3Selection: null,
+        d3Zoom: null,
+      }),
+      setState: vi.fn(),
+      subscribe: vi.fn().mockReturnValue(vi.fn()),
+    }),
+
+    useNodesState: vi.fn((initial: unknown[] = []) => [initial, vi.fn(), vi.fn()]),
+
+    useEdgesState: vi.fn((initial: unknown[] = []) => [initial, vi.fn(), vi.fn()]),
+
+    useStore: vi.fn().mockReturnValue(null),
+    useNodes: vi.fn().mockReturnValue([]),
+    useEdges: vi.fn().mockReturnValue([]),
+    useViewport: vi.fn().mockReturnValue({ x: 0, y: 0, zoom: 1 }),
+    useOnSelectionChange: vi.fn(),
+    useKeyPress: vi.fn().mockReturnValue(false),
+    useUpdateNodeInternals: vi.fn().mockReturnValue(vi.fn()),
+    useOnViewportChange: vi.fn(),
+    useNodeId: vi.fn().mockReturnValue(null),
+
+    // utils
+    getOutgoers: vi.fn().mockReturnValue([]),
+    getIncomers: vi.fn().mockReturnValue([]),
+    getConnectedEdges: vi.fn().mockReturnValue([]),
+    isNode: vi.fn().mockReturnValue(true),
+    isEdge: vi.fn().mockReturnValue(false),
+    addEdge: vi.fn().mockImplementation((_edge: unknown, edges: unknown[]) => edges),
+    applyNodeChanges: vi.fn().mockImplementation((_changes: unknown[], nodes: unknown[]) => nodes),
+    applyEdgeChanges: vi.fn().mockImplementation((_changes: unknown[], edges: unknown[]) => edges),
+    getBezierPath: vi.fn().mockReturnValue(['M 0 0', 0, 0]),
+    getSmoothStepPath: vi.fn().mockReturnValue(['M 0 0', 0, 0]),
+    getStraightPath: vi.fn().mockReturnValue(['M 0 0', 0, 0]),
+    internalsSymbol: Symbol('internals'),
+
+    ...overrides,
+  }
+}
diff --git a/web/app/components/workflow/__tests__/mock-workflow-store.ts b/web/app/components/workflow/__tests__/mock-workflow-store.ts
new file mode 100644
index 0000000000..112384c4f6
--- /dev/null
+++ b/web/app/components/workflow/__tests__/mock-workflow-store.ts
@@ -0,0 +1,199 @@
+import type { ControlMode, Node } from '../types'
+import { noop } from 'es-toolkit'
+import { DEFAULT_ITER_TIMES, DEFAULT_LOOP_TIMES } from '../constants'
+
+/**
+ * Default workflow store state covering all slices.
+ * Use `createWorkflowStoreState(overrides)` to get a state object
+ * that can be injected via `useWorkflowStore.setState(...)` or
+ * used as the return value of a mocked `useStore` selector.
+ */
+export function createWorkflowStoreState(overrides: Record<string, unknown> = {}) {
+  return {
+    // --- workflow-slice ---
+    workflowRunningData: undefined,
+    isListening: false,
+    listeningTriggerType: null,
+    listeningTriggerNodeId: null,
+    listeningTriggerNodeIds: [],
+    listeningTriggerIsAll: false,
+    clipboardElements: [] as Node[],
+    selection: null,
+    bundleNodeSize: null,
+    controlMode: 'pointer' as ControlMode,
+    mousePosition: { pageX: 0, pageY: 0, elementX: 0, elementY: 0 },
+    showConfirm: undefined,
+    controlPromptEditorRerenderKey: 0,
+    showImportDSLModal: false,
+    fileUploadConfig: undefined,
+
+    // --- node-slice ---
+    showSingleRunPanel: false,
+    nodeAnimation: false,
+    candidateNode: undefined,
+    nodeMenu: undefined,
+    showAssignVariablePopup: undefined,
+    hoveringAssignVariableGroupId: undefined,
+    connectingNodePayload: undefined,
+    enteringNodePayload: undefined,
+    iterTimes: DEFAULT_ITER_TIMES,
+    loopTimes: DEFAULT_LOOP_TIMES,
+    iterParallelLogMap: new Map(),
+    pendingSingleRun: undefined,
+
+    // --- panel-slice ---
+    panelWidth: 420,
+    showFeaturesPanel: false,
+    showWorkflowVersionHistoryPanel: false,
+    showInputsPanel: false,
+    showDebugAndPreviewPanel: false,
+    panelMenu: undefined,
+    selectionMenu: undefined,
+    showVariableInspectPanel: false,
+    initShowLastRunTab: false,
+
+    // --- help-line-slice ---
+    helpLineHorizontal: undefined,
+    helpLineVertical: undefined,
+
+    // --- history-slice ---
+    historyWorkflowData: undefined,
+    showRunHistory: false,
+    versionHistory: [],
+
+    // --- chat-variable-slice ---
+    showChatVariablePanel: false,
+    showGlobalVariablePanel: false,
+    conversationVariables: [],
+
+    // --- env-variable-slice ---
+    showEnvPanel: false,
+    environmentVariables: [],
+    envSecrets: {},
+
+    // --- form-slice ---
+    inputs: {},
+    files: [],
+
+    // --- tool-slice ---
+    toolPublished: false,
+    lastPublishedHasUserInput: false,
+    buildInTools: undefined,
+    customTools: undefined,
+    workflowTools: undefined,
+    mcpTools: undefined,
+
+    // --- version-slice ---
+    draftUpdatedAt: 0,
+    publishedAt: 0,
+    currentVersion: null,
+    isRestoring: false,
+
+    // --- workflow-draft-slice ---
+    backupDraft: undefined,
+    syncWorkflowDraftHash: '',
+    isSyncingWorkflowDraft: false,
+    isWorkflowDataLoaded: false,
+    nodes: [] as Node[],
+
+    // --- inspect-vars-slice ---
+    currentFocusNodeId: null,
+    nodesWithInspectVars: [],
+    conversationVars: [],
+
+    // --- layout-slice ---
+    workflowCanvasWidth: undefined,
+    workflowCanvasHeight: undefined,
+    rightPanelWidth: undefined,
+    nodePanelWidth: 420,
+    previewPanelWidth: 420,
+    otherPanelWidth: 420,
+    bottomPanelWidth: 0,
+    bottomPanelHeight: 0,
+    variableInspectPanelHeight: 300,
+    maximizeCanvas: false,
+
+    // --- setters (all default to noop, override as needed) ---
+    setWorkflowRunningData: noop,
+    setIsListening: noop,
+    setListeningTriggerType: noop,
+    setListeningTriggerNodeId: noop,
+    setListeningTriggerNodeIds: noop,
+    setListeningTriggerIsAll: noop,
+    setClipboardElements: noop,
+    setSelection: noop,
+    setBundleNodeSize: noop,
+    setControlMode: noop,
+    setMousePosition: noop,
+    setShowConfirm: noop,
+    setControlPromptEditorRerenderKey: noop,
+    setShowImportDSLModal: noop,
+    setFileUploadConfig: noop,
+    setShowSingleRunPanel: noop,
+    setNodeAnimation: noop,
+    setCandidateNode: noop,
+    setNodeMenu: noop,
+    setShowAssignVariablePopup: noop,
+    setHoveringAssignVariableGroupId: noop,
+    setConnectingNodePayload: noop,
+    setEnteringNodePayload: noop,
+    setIterTimes: noop,
+    setLoopTimes: noop,
+    setIterParallelLogMap: noop,
+    setPendingSingleRun: noop,
+    setShowFeaturesPanel: noop,
+    setShowWorkflowVersionHistoryPanel: noop,
+    setShowInputsPanel: noop,
+    setShowDebugAndPreviewPanel: noop,
+    setPanelMenu: noop,
+    setSelectionMenu: noop,
+    setShowVariableInspectPanel: noop,
+    setInitShowLastRunTab: noop,
+    setHelpLineHorizontal: noop,
+    setHelpLineVertical: noop,
+    setHistoryWorkflowData: noop,
+    setShowRunHistory: noop,
+    setVersionHistory: noop,
+    setShowChatVariablePanel: noop,
+    setShowGlobalVariablePanel: noop,
+    setConversationVariables: noop,
+    setShowEnvPanel: noop,
+    setEnvironmentVariables: noop,
+    setEnvSecrets: noop,
+    setInputs: noop,
+    setFiles: noop,
+    setToolPublished: noop,
+    setLastPublishedHasUserInput: noop,
+    setDraftUpdatedAt: noop,
+    setPublishedAt: noop,
+    setCurrentVersion: noop,
+    setIsRestoring: noop,
+    setBackupDraft: noop,
+    setSyncWorkflowDraftHash: noop,
+    setIsSyncingWorkflowDraft: noop,
+    setIsWorkflowDataLoaded: noop,
+    setNodes: noop,
+    flushPendingSync: noop,
+    setCurrentFocusNodeId: noop,
+    setNodesWithInspectVars: noop,
+    setNodeInspectVars: noop,
+    deleteAllInspectVars: noop,
+    deleteNodeInspectVars: noop,
+    setInspectVarValue: noop,
+    resetToLastRunVar: noop,
+    renameInspectVarName: noop,
+    deleteInspectVar: noop,
+    setWorkflowCanvasWidth: noop,
+    setWorkflowCanvasHeight: noop,
+    setRightPanelWidth: noop,
+    setNodePanelWidth: noop,
+    setPreviewPanelWidth: noop,
+    setOtherPanelWidth: noop,
+    setBottomPanelWidth: noop,
+    setBottomPanelHeight: noop,
+    setVariableInspectPanelHeight: noop,
+    setMaximizeCanvas: noop,
+
+    ...overrides,
+  }
+}
diff --git a/web/app/components/workflow/utils/__tests__/common.spec.ts b/web/app/components/workflow/utils/__tests__/common.spec.ts
new file mode 100644
index 0000000000..8c84a21d09
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/common.spec.ts
@@ -0,0 +1,183 @@
+import {
+  formatWorkflowRunIdentifier,
+  getKeyboardKeyCodeBySystem,
+  getKeyboardKeyNameBySystem,
+  isEventTargetInputArea,
+  isMac,
+} from '../common'
+
+describe('isMac', () => {
+  const originalNavigator = globalThis.navigator
+
+  afterEach(() => {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: originalNavigator,
+      writable: true,
+      configurable: true,
+    })
+  })
+
+  it('should return true when userAgent contains MAC', () => {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: { userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)' },
+      writable: true,
+      configurable: true,
+    })
+    expect(isMac()).toBe(true)
+  })
+
+  it('should return false when userAgent does not contain MAC', () => {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: { userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)' },
+      writable: true,
+      configurable: true,
+    })
+    expect(isMac()).toBe(false)
+  })
+})
+
+describe('getKeyboardKeyNameBySystem', () => {
+  const originalNavigator = globalThis.navigator
+
+  afterEach(() => {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: originalNavigator,
+      writable: true,
+      configurable: true,
+    })
+  })
+
+  function setMac() {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: { userAgent: 'Macintosh' },
+      writable: true,
+      configurable: true,
+    })
+  }
+
+  function setWindows() {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: { userAgent: 'Windows NT' },
+      writable: true,
+      configurable: true,
+    })
+  }
+
+  it('should map ctrl to ⌘ on Mac', () => {
+    setMac()
+    expect(getKeyboardKeyNameBySystem('ctrl')).toBe('⌘')
+  })
+
+  it('should map alt to ⌥ on Mac', () => {
+    setMac()
+    expect(getKeyboardKeyNameBySystem('alt')).toBe('⌥')
+  })
+
+  it('should map shift to ⇧ on Mac', () => {
+    setMac()
+    expect(getKeyboardKeyNameBySystem('shift')).toBe('⇧')
+  })
+
+  it('should return the original key for unmapped keys on Mac', () => {
+    setMac()
+    expect(getKeyboardKeyNameBySystem('enter')).toBe('enter')
+  })
+
+  it('should return the original key on non-Mac', () => {
+    setWindows()
+    expect(getKeyboardKeyNameBySystem('ctrl')).toBe('ctrl')
+    expect(getKeyboardKeyNameBySystem('alt')).toBe('alt')
+  })
+})
+
+describe('getKeyboardKeyCodeBySystem', () => {
+  const originalNavigator = globalThis.navigator
+
+  afterEach(() => {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: originalNavigator,
+      writable: true,
+      configurable: true,
+    })
+  })
+
+  it('should map ctrl to meta on Mac', () => {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: { userAgent: 'Macintosh' },
+      writable: true,
+      configurable: true,
+    })
+    expect(getKeyboardKeyCodeBySystem('ctrl')).toBe('meta')
+  })
+
+  it('should return the original key on non-Mac', () => {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: { userAgent: 'Windows NT' },
+      writable: true,
+      configurable: true,
+    })
+    expect(getKeyboardKeyCodeBySystem('ctrl')).toBe('ctrl')
+  })
+
+  it('should return the original key for unmapped keys on Mac', () => {
+    Object.defineProperty(globalThis, 'navigator', {
+      value: { userAgent: 'Macintosh' },
+      writable: true,
+      configurable: true,
+    })
+    expect(getKeyboardKeyCodeBySystem('alt')).toBe('alt')
+  })
+})
+
+describe('isEventTargetInputArea', () => {
+  it('should return true for INPUT elements', () => {
+    const el = document.createElement('input')
+    expect(isEventTargetInputArea(el)).toBe(true)
+  })
+
+  it('should return true for TEXTAREA elements', () => {
+    const el = document.createElement('textarea')
+    expect(isEventTargetInputArea(el)).toBe(true)
+  })
+
+  it('should return true for contentEditable elements', () => {
+    const el = document.createElement('div')
+    el.contentEditable = 'true'
+    expect(isEventTargetInputArea(el)).toBe(true)
+  })
+
+  it('should return undefined for non-input elements', () => {
+    const el = document.createElement('div')
+    expect(isEventTargetInputArea(el)).toBeUndefined()
+  })
+
+  it('should return undefined for contentEditable=false elements', () => {
+    const el = document.createElement('div')
+    el.contentEditable = 'false'
+    expect(isEventTargetInputArea(el)).toBeUndefined()
+  })
+})
+
+describe('formatWorkflowRunIdentifier', () => {
+  it('should return fallback text when finishedAt is undefined', () => {
+    expect(formatWorkflowRunIdentifier()).toBe(' (Running)')
+  })
+
+  it('should return fallback text when finishedAt is 0', () => {
+    expect(formatWorkflowRunIdentifier(0)).toBe(' (Running)')
+  })
+
+  it('should capitalize custom fallback text', () => {
+    expect(formatWorkflowRunIdentifier(undefined, 'pending')).toBe(' (Pending)')
+  })
+
+  it('should format a valid timestamp', () => {
+    const timestamp = 1704067200 // 2024-01-01 00:00:00 UTC
+    const result = formatWorkflowRunIdentifier(timestamp)
+    expect(result).toMatch(/^ \(\d{2}:\d{2}:\d{2}( [AP]M)?\)$/)
+  })
+
+  it('should handle single-char fallback text', () => {
+    expect(formatWorkflowRunIdentifier(undefined, 'x')).toBe(' (X)')
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/data-source.spec.ts b/web/app/components/workflow/utils/__tests__/data-source.spec.ts
new file mode 100644
index 0000000000..2de5b7f717
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/data-source.spec.ts
@@ -0,0 +1,116 @@
+import type { DataSourceNodeType } from '../../nodes/data-source/types'
+import type { ToolWithProvider } from '../../types'
+import { CollectionType } from '@/app/components/tools/types'
+import { BlockEnum } from '../../types'
+import { getDataSourceCheckParams } from '../data-source'
+
+vi.mock('@/app/components/tools/utils/to-form-schema', () => ({
+  toolParametersToFormSchemas: vi.fn((params: Array<Record<string, unknown>>) =>
+    params.map(p => ({
+      variable: p.name,
+      label: p.label || { en_US: p.name },
+      type: p.type || 'string',
+      required: p.required ?? false,
+      form: p.form ?? 'llm',
+      hide: p.hide ?? false,
+    }))),
+}))
+
+function createDataSourceData(overrides: Partial<DataSourceNodeType> = {}): DataSourceNodeType {
+  return {
+    title: 'DataSource',
+    desc: '',
+    type: BlockEnum.DataSource,
+    plugin_id: 'plugin-ds-1',
+    provider_type: CollectionType.builtIn,
+    datasource_name: 'mysql_query',
+    datasource_parameters: {},
+    datasource_configurations: {},
+    ...overrides,
+  } as DataSourceNodeType
+}
+
+function createDataSourceCollection(overrides: Partial<ToolWithProvider> = {}): ToolWithProvider {
+  return {
+    id: 'ds-collection',
+    plugin_id: 'plugin-ds-1',
+    name: 'MySQL',
+    tools: [
+      {
+        name: 'mysql_query',
+        parameters: [
+          { name: 'query', label: { en_US: 'SQL Query', zh_Hans: 'SQL 查询' }, type: 'string', required: true },
+          { name: 'limit', label: { en_US: 'Limit' }, type: 'number', required: false, hide: true },
+        ],
+      },
+    ],
+    allow_delete: true,
+    is_authorized: false,
+    ...overrides,
+  } as unknown as ToolWithProvider
+}
+
+describe('getDataSourceCheckParams', () => {
+  it('should extract input schema from matching data source', () => {
+    const result = getDataSourceCheckParams(
+      createDataSourceData(),
+      [createDataSourceCollection()],
+      'en_US',
+    )
+
+    expect(result.dataSourceInputsSchema).toEqual([
+      { label: 'SQL Query', variable: 'query', type: 'string', required: true, hide: false },
+      { label: 'Limit', variable: 'limit', type: 'number', required: false, hide: true },
+    ])
+  })
+
+  it('should mark notAuthed for builtin datasource without authorization', () => {
+    const result = getDataSourceCheckParams(
+      createDataSourceData(),
+      [createDataSourceCollection()],
+      'en_US',
+    )
+
+    expect(result.notAuthed).toBe(true)
+  })
+
+  it('should mark as authed when is_authorized is true', () => {
+    const result = getDataSourceCheckParams(
+      createDataSourceData(),
+      [createDataSourceCollection({ is_authorized: true })],
+      'en_US',
+    )
+
+    expect(result.notAuthed).toBe(false)
+  })
+
+  it('should return empty schemas when data source is not found', () => {
+    const result = getDataSourceCheckParams(
+      createDataSourceData({ plugin_id: 'non-existent' }),
+      [createDataSourceCollection()],
+      'en_US',
+    )
+
+    expect(result.dataSourceInputsSchema).toEqual([])
+  })
+
+  it('should return empty schemas when datasource item is not found', () => {
+    const result = getDataSourceCheckParams(
+      createDataSourceData({ datasource_name: 'non_existent_ds' }),
+      [createDataSourceCollection()],
+      'en_US',
+    )
+
+    expect(result.dataSourceInputsSchema).toEqual([])
+  })
+
+  it('should include language in result', () => {
+    const result = getDataSourceCheckParams(
+      createDataSourceData(),
+      [createDataSourceCollection()],
+      'zh_Hans',
+    )
+
+    expect(result.language).toBe('zh_Hans')
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/debug.spec.ts b/web/app/components/workflow/utils/__tests__/debug.spec.ts
new file mode 100644
index 0000000000..4439428e09
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/debug.spec.ts
@@ -0,0 +1,48 @@
+import { VarInInspectType } from '@/types/workflow'
+import { VarType } from '../../types'
+import { outputToVarInInspect } from '../debug'
+
+describe('outputToVarInInspect', () => {
+  it('should create a VarInInspect object with correct fields', () => {
+    const result = outputToVarInInspect({
+      nodeId: 'node-1',
+      name: 'output',
+      value: 'hello world',
+    })
+
+    expect(result).toMatchObject({
+      type: VarInInspectType.node,
+      name: 'output',
+      description: '',
+      selector: ['node-1', 'output'],
+      value_type: VarType.string,
+      value: 'hello world',
+      edited: false,
+      visible: true,
+      is_truncated: false,
+      full_content: { size_bytes: 0, download_url: '' },
+    })
+    expect(result.id).toBeDefined()
+  })
+
+  it('should handle different value types', () => {
+    const result = outputToVarInInspect({
+      nodeId: 'n2',
+      name: 'count',
+      value: 42,
+    })
+
+    expect(result.value).toBe(42)
+    expect(result.selector).toEqual(['n2', 'count'])
+  })
+
+  it('should handle null value', () => {
+    const result = outputToVarInInspect({
+      nodeId: 'n3',
+      name: 'empty',
+      value: null,
+    })
+
+    expect(result.value).toBeNull()
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/edge.spec.ts b/web/app/components/workflow/utils/__tests__/edge.spec.ts
new file mode 100644
index 0000000000..e5067d1866
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/edge.spec.ts
@@ -0,0 +1,33 @@
+import { NodeRunningStatus } from '../../types'
+import { getEdgeColor } from '../edge'
+
+describe('getEdgeColor', () => {
+  it('should return success color when status is Succeeded', () => {
+    expect(getEdgeColor(NodeRunningStatus.Succeeded)).toBe('var(--color-workflow-link-line-success-handle)')
+  })
+
+  it('should return error color when status is Failed', () => {
+    expect(getEdgeColor(NodeRunningStatus.Failed)).toBe('var(--color-workflow-link-line-error-handle)')
+  })
+
+  it('should return failure color when status is Exception', () => {
+    expect(getEdgeColor(NodeRunningStatus.Exception)).toBe('var(--color-workflow-link-line-failure-handle)')
+  })
+
+  it('should return default running color when status is Running and not fail branch', () => {
+    expect(getEdgeColor(NodeRunningStatus.Running)).toBe('var(--color-workflow-link-line-handle)')
+  })
+
+  it('should return failure color when status is Running and is fail branch', () => {
+    expect(getEdgeColor(NodeRunningStatus.Running, true)).toBe('var(--color-workflow-link-line-failure-handle)')
+  })
+
+  it('should return normal color when status is undefined', () => {
+    expect(getEdgeColor()).toBe('var(--color-workflow-link-line-normal)')
+  })
+
+  it('should return normal color for other statuses', () => {
+    expect(getEdgeColor(NodeRunningStatus.Waiting)).toBe('var(--color-workflow-link-line-normal)')
+    expect(getEdgeColor(NodeRunningStatus.NotStart)).toBe('var(--color-workflow-link-line-normal)')
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/elk-layout.spec.ts b/web/app/components/workflow/utils/__tests__/elk-layout.spec.ts
new file mode 100644
index 0000000000..662b380f5d
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/elk-layout.spec.ts
@@ -0,0 +1,665 @@
+import type { CommonEdgeType, CommonNodeType, Edge, Node } from '../../types'
+import { createEdge, createNode, resetFixtureCounters } from '../../__tests__/fixtures'
+import { CUSTOM_NODE, NODE_LAYOUT_HORIZONTAL_PADDING } from '../../constants'
+import { CUSTOM_ITERATION_START_NODE } from '../../nodes/iteration-start/constants'
+import { CUSTOM_LOOP_START_NODE } from '../../nodes/loop-start/constants'
+import { BlockEnum } from '../../types'
+
+type ElkChild = Record<string, unknown> & { id: string, width?: number, height?: number, x?: number, y?: number, children?: ElkChild[], ports?: Array<{ id: string }>, layoutOptions?: Record<string, string> }
+type ElkGraph = Record<string, unknown> & { id: string, children?: ElkChild[], edges?: Array<Record<string, unknown>> }
+
+let layoutCallArgs: ElkGraph | null = null
+let mockReturnOverride: ((graph: ElkGraph) => ElkGraph) | null = null
+
+vi.mock('elkjs/lib/elk.bundled.js', () => {
+  return {
+    default: class MockELK {
+      async layout(graph: ElkGraph) {
+        layoutCallArgs = graph
+        if (mockReturnOverride)
+          return mockReturnOverride(graph)
+
+        const children = (graph.children || []).map((child: ElkChild, i: number) => ({
+          ...child,
+          x: 100 + i * 300,
+          y: 50 + i * 100,
+          width: child.width || 244,
+          height: child.height || 100,
+        }))
+        return { ...graph, children }
+      }
+    },
+  }
+})
+
+const { getLayoutByDagre, getLayoutForChildNodes } = await import('../elk-layout')
+
+function makeWorkflowNode(overrides: Omit<Partial<Node>, 'data'> & { data?: Partial<CommonNodeType> & Record<string, unknown> } = {}): Node {
+  return createNode({
+    type: CUSTOM_NODE,
+    ...overrides,
+  })
+}
+
+function makeWorkflowEdge(overrides: Omit<Partial<Edge>, 'data'> & { data?: Partial<CommonEdgeType> & Record<string, unknown> } = {}): Edge {
+  return createEdge(overrides)
+}
+
+beforeEach(() => {
+  resetFixtureCounters()
+  layoutCallArgs = null
+  mockReturnOverride = null
+})
+
+describe('getLayoutByDagre', () => {
+  it('should return layout for simple linear graph', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [makeWorkflowEdge({ source: 'a', target: 'b' })]
+
+    const result = await getLayoutByDagre(nodes, edges)
+
+    expect(result.nodes.size).toBe(2)
+    expect(result.nodes.has('a')).toBe(true)
+    expect(result.nodes.has('b')).toBe(true)
+    expect(result.bounds.minX).toBe(0)
+    expect(result.bounds.minY).toBe(0)
+  })
+
+  it('should filter out nodes with parentId', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'child', data: { type: BlockEnum.Code, title: '', desc: '' }, parentId: 'a' }),
+    ]
+
+    const result = await getLayoutByDagre(nodes, [])
+    expect(result.nodes.size).toBe(1)
+    expect(result.nodes.has('child')).toBe(false)
+  })
+
+  it('should filter out non-CUSTOM_NODE type nodes', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'iter-start', type: CUSTOM_ITERATION_START_NODE, data: { type: BlockEnum.IterationStart, title: '', desc: '' } }),
+    ]
+
+    const result = await getLayoutByDagre(nodes, [])
+    expect(result.nodes.size).toBe(1)
+  })
+
+  it('should filter out iteration/loop internal edges', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ source: 'a', target: 'b', data: { isInIteration: true, iteration_id: 'iter-1' } }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    expect(layoutCallArgs!.edges).toHaveLength(0)
+  })
+
+  it('should use default dimensions when node has no width/height', async () => {
+    const node = makeWorkflowNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } })
+    Reflect.deleteProperty(node, 'width')
+    Reflect.deleteProperty(node, 'height')
+
+    const result = await getLayoutByDagre([node], [])
+    expect(result.nodes.size).toBe(1)
+    const info = result.nodes.get('a')!
+    expect(info.width).toBe(244)
+    expect(info.height).toBe(100)
+  })
+
+  it('should build ports for IfElse nodes with multiple branches', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'if-1',
+        data: {
+          type: BlockEnum.IfElse,
+          title: '',
+          desc: '',
+          cases: [{ case_id: 'case-1', logical_operator: 'and', conditions: [] }],
+        },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ id: 'e1', source: 'if-1', target: 'b', sourceHandle: 'case-1' }),
+      makeWorkflowEdge({ id: 'e2', source: 'if-1', target: 'c', sourceHandle: 'false' }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    const ifElkNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'if-1')!
+    expect(ifElkNode.ports).toHaveLength(2)
+    expect(ifElkNode.layoutOptions!['elk.portConstraints']).toBe('FIXED_ORDER')
+  })
+
+  it('should use normal node for IfElse with single branch', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'if-1',
+        data: { type: BlockEnum.IfElse, title: '', desc: '', cases: [{ case_id: 'case-1' }] },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [makeWorkflowEdge({ source: 'if-1', target: 'b', sourceHandle: 'case-1' })]
+
+    await getLayoutByDagre(nodes, edges)
+    const ifElkNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'if-1')!
+    expect(ifElkNode.ports).toBeUndefined()
+  })
+
+  it('should build ports for HumanInput nodes with multiple branches', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'hi-1',
+        data: { type: BlockEnum.HumanInput, title: '', desc: '', user_actions: [{ id: 'action-1' }, { id: 'action-2' }] },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ id: 'e1', source: 'hi-1', target: 'b', sourceHandle: 'action-1' }),
+      makeWorkflowEdge({ id: 'e2', source: 'hi-1', target: 'c', sourceHandle: '__timeout' }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    const hiElkNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'hi-1')!
+    expect(hiElkNode.ports).toHaveLength(2)
+  })
+
+  it('should use normal node for HumanInput with single branch', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'hi-1',
+        data: { type: BlockEnum.HumanInput, title: '', desc: '', user_actions: [{ id: 'action-1' }] },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [makeWorkflowEdge({ source: 'hi-1', target: 'b', sourceHandle: 'action-1' })]
+
+    await getLayoutByDagre(nodes, edges)
+    const hiElkNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'hi-1')!
+    expect(hiElkNode.ports).toBeUndefined()
+  })
+
+  it('should normalise bounds so minX and minY start at 0', async () => {
+    const nodes = [makeWorkflowNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } })]
+    const result = await getLayoutByDagre(nodes, [])
+    expect(result.bounds.minX).toBe(0)
+    expect(result.bounds.minY).toBe(0)
+  })
+
+  it('should return empty layout when no nodes match filter', async () => {
+    const result = await getLayoutByDagre([], [])
+    expect(result.nodes.size).toBe(0)
+    expect(result.bounds).toEqual({ minX: 0, minY: 0, maxX: 0, maxY: 0 })
+  })
+
+  it('should sort IfElse edges with false (ELSE) last', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'if-1',
+        data: {
+          type: BlockEnum.IfElse,
+          title: '',
+          desc: '',
+          cases: [
+            { case_id: 'case-a', logical_operator: 'and', conditions: [] },
+            { case_id: 'case-b', logical_operator: 'and', conditions: [] },
+          ],
+        },
+      }),
+      makeWorkflowNode({ id: 'x', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'y', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'z', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ id: 'e-else', source: 'if-1', target: 'z', sourceHandle: 'false' }),
+      makeWorkflowEdge({ id: 'e-a', source: 'if-1', target: 'x', sourceHandle: 'case-a' }),
+      makeWorkflowEdge({ id: 'e-b', source: 'if-1', target: 'y', sourceHandle: 'case-b' }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    const ifNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'if-1')!
+    const portIds = ifNode.ports!.map((p: { id: string }) => p.id)
+    expect(portIds[portIds.length - 1]).toContain('false')
+  })
+
+  it('should sort HumanInput edges with __timeout last', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'hi-1',
+        data: { type: BlockEnum.HumanInput, title: '', desc: '', user_actions: [{ id: 'a1' }, { id: 'a2' }] },
+      }),
+      makeWorkflowNode({ id: 'x', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'y', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'z', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ id: 'e-timeout', source: 'hi-1', target: 'z', sourceHandle: '__timeout' }),
+      makeWorkflowEdge({ id: 'e-a1', source: 'hi-1', target: 'x', sourceHandle: 'a1' }),
+      makeWorkflowEdge({ id: 'e-a2', source: 'hi-1', target: 'y', sourceHandle: 'a2' }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    const hiNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'hi-1')!
+    const portIds = hiNode.ports!.map((p: { id: string }) => p.id)
+    expect(portIds[portIds.length - 1]).toContain('__timeout')
+  })
+
+  it('should assign sourcePort to edges from IfElse nodes with ports', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'if-1',
+        data: { type: BlockEnum.IfElse, title: '', desc: '', cases: [{ case_id: 'case-1' }] },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ id: 'e1', source: 'if-1', target: 'b', sourceHandle: 'case-1' }),
+      makeWorkflowEdge({ id: 'e2', source: 'if-1', target: 'c', sourceHandle: 'false' }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    const portEdges = layoutCallArgs!.edges!.filter((e: Record<string, unknown>) => e.sourcePort)
+    expect(portEdges.length).toBeGreaterThan(0)
+  })
+
+  it('should handle edges without sourceHandle for ports (use index)', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'if-1',
+        data: { type: BlockEnum.IfElse, title: '', desc: '', cases: [] },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const e1 = makeWorkflowEdge({ id: 'e1', source: 'if-1', target: 'b' })
+    const e2 = makeWorkflowEdge({ id: 'e2', source: 'if-1', target: 'c' })
+    Reflect.deleteProperty(e1, 'sourceHandle')
+    Reflect.deleteProperty(e2, 'sourceHandle')
+
+    const result = await getLayoutByDagre(nodes, [e1, e2])
+    expect(result.nodes.size).toBeGreaterThan(0)
+  })
+
+  it('should handle collectLayout with null x/y/width/height values', async () => {
+    mockReturnOverride = (graph: ElkGraph) => ({
+      ...graph,
+      children: (graph.children || []).map((child: ElkChild) => ({
+        id: child.id,
+      })),
+    })
+
+    const nodes = [makeWorkflowNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } })]
+    const result = await getLayoutByDagre(nodes, [])
+    const info = result.nodes.get('a')!
+    expect(info.x).toBe(0)
+    expect(info.y).toBe(0)
+    expect(info.width).toBe(244)
+    expect(info.height).toBe(100)
+  })
+
+  it('should parse layer index from layoutOptions', async () => {
+    mockReturnOverride = (graph: ElkGraph) => ({
+      ...graph,
+      children: (graph.children || []).map((child: ElkChild, i: number) => ({
+        ...child,
+        x: i * 300,
+        y: 0,
+        width: 244,
+        height: 100,
+        layoutOptions: {
+          'org.eclipse.elk.layered.layerIndex': String(i),
+        },
+      })),
+    })
+
+    const nodes = [
+      makeWorkflowNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const result = await getLayoutByDagre(nodes, [])
+    expect(result.nodes.get('a')!.layer).toBe(0)
+    expect(result.nodes.get('b')!.layer).toBe(1)
+  })
+
+  it('should handle collectLayout with nested children', async () => {
+    mockReturnOverride = (graph: ElkGraph) => ({
+      ...graph,
+      children: [
+        {
+          id: 'parent-node',
+          x: 0,
+          y: 0,
+          width: 500,
+          height: 400,
+          children: [
+            { id: 'nested-1', x: 10, y: 10, width: 200, height: 100 },
+            { id: 'nested-2', x: 10, y: 120, width: 200, height: 100 },
+          ],
+        },
+      ],
+    })
+
+    const nodes = [
+      makeWorkflowNode({ id: 'parent-node', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'nested-1', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'nested-2', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const result = await getLayoutByDagre(nodes, [])
+    expect(result.nodes.has('nested-1')).toBe(true)
+    expect(result.nodes.has('nested-2')).toBe(true)
+  })
+
+  it('should handle collectLayout with predicate filtering some children', async () => {
+    mockReturnOverride = (graph: ElkGraph) => ({
+      ...graph,
+      children: [
+        { id: 'visible', x: 0, y: 0, width: 200, height: 100 },
+        { id: 'also-visible', x: 300, y: 0, width: 200, height: 100 },
+      ],
+    })
+
+    const nodes = [
+      makeWorkflowNode({ id: 'visible', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'also-visible', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const result = await getLayoutByDagre(nodes, [])
+    expect(result.nodes.size).toBe(2)
+  })
+
+  it('should sort IfElse edges where case not found in cases array', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'if-1',
+        data: { type: BlockEnum.IfElse, title: '', desc: '', cases: [{ case_id: 'known-case' }] },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ id: 'e1', source: 'if-1', target: 'b', sourceHandle: 'unknown-case' }),
+      makeWorkflowEdge({ id: 'e2', source: 'if-1', target: 'c', sourceHandle: 'other-unknown' }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    const ifNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'if-1')!
+    expect(ifNode.ports).toHaveLength(2)
+  })
+
+  it('should sort HumanInput edges where action not found in user_actions', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'hi-1',
+        data: { type: BlockEnum.HumanInput, title: '', desc: '', user_actions: [{ id: 'known-action' }] },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ id: 'e1', source: 'hi-1', target: 'b', sourceHandle: 'unknown-action' }),
+      makeWorkflowEdge({ id: 'e2', source: 'hi-1', target: 'c', sourceHandle: 'another-unknown' }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    const hiNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'hi-1')!
+    expect(hiNode.ports).toHaveLength(2)
+  })
+
+  it('should handle IfElse edges without handles (no sourceHandle)', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'if-1',
+        data: { type: BlockEnum.IfElse, title: '', desc: '', cases: [] },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const e1 = makeWorkflowEdge({ id: 'e1', source: 'if-1', target: 'b' })
+    const e2 = makeWorkflowEdge({ id: 'e2', source: 'if-1', target: 'c' })
+    Reflect.deleteProperty(e1, 'sourceHandle')
+    Reflect.deleteProperty(e2, 'sourceHandle')
+
+    await getLayoutByDagre(nodes, [e1, e2])
+    const ifNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'if-1')!
+    expect(ifNode.ports).toHaveLength(2)
+  })
+
+  it('should handle HumanInput edges without handles', async () => {
+    const nodes = [
+      makeWorkflowNode({
+        id: 'hi-1',
+        data: { type: BlockEnum.HumanInput, title: '', desc: '', user_actions: [] },
+      }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const e1 = makeWorkflowEdge({ id: 'e1', source: 'hi-1', target: 'b' })
+    const e2 = makeWorkflowEdge({ id: 'e2', source: 'hi-1', target: 'c' })
+    Reflect.deleteProperty(e1, 'sourceHandle')
+    Reflect.deleteProperty(e2, 'sourceHandle')
+
+    await getLayoutByDagre(nodes, [e1, e2])
+    const hiNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'hi-1')!
+    expect(hiNode.ports).toHaveLength(2)
+  })
+
+  it('should handle IfElse with no cases property', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'if-1', data: { type: BlockEnum.IfElse, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ id: 'e1', source: 'if-1', target: 'b', sourceHandle: 'true' }),
+      makeWorkflowEdge({ id: 'e2', source: 'if-1', target: 'c', sourceHandle: 'false' }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    const ifNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'if-1')!
+    expect(ifNode.ports).toHaveLength(2)
+  })
+
+  it('should handle HumanInput with no user_actions property', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'hi-1', data: { type: BlockEnum.HumanInput, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ id: 'e1', source: 'hi-1', target: 'b', sourceHandle: 'action-1' }),
+      makeWorkflowEdge({ id: 'e2', source: 'hi-1', target: 'c', sourceHandle: '__timeout' }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    const hiNode = layoutCallArgs!.children!.find((c: ElkChild) => c.id === 'hi-1')!
+    expect(hiNode.ports).toHaveLength(2)
+  })
+
+  it('should filter loop internal edges', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ source: 'x', target: 'y', data: { isInLoop: true, loop_id: 'loop-1' } }),
+    ]
+
+    await getLayoutByDagre(nodes, edges)
+    expect(layoutCallArgs!.edges).toHaveLength(0)
+  })
+})
+
+describe('getLayoutForChildNodes', () => {
+  it('should return null when no child nodes exist', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'parent', data: { type: BlockEnum.Iteration, title: '', desc: '' } }),
+    ]
+    const result = await getLayoutForChildNodes('parent', nodes, [])
+    expect(result).toBeNull()
+  })
+
+  it('should layout child nodes of an iteration', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'parent', data: { type: BlockEnum.Iteration, title: '', desc: '' } }),
+      makeWorkflowNode({
+        id: 'iter-start',
+        type: CUSTOM_ITERATION_START_NODE,
+        parentId: 'parent',
+        data: { type: BlockEnum.IterationStart, title: '', desc: '' },
+      }),
+      makeWorkflowNode({ id: 'child-1', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ source: 'iter-start', target: 'child-1', data: { isInIteration: true, iteration_id: 'parent' } }),
+    ]
+
+    const result = await getLayoutForChildNodes('parent', nodes, edges)
+    expect(result).not.toBeNull()
+    expect(result!.nodes.size).toBe(2)
+    expect(result!.bounds.minX).toBe(0)
+  })
+
+  it('should layout child nodes of a loop', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'loop-p', data: { type: BlockEnum.Loop, title: '', desc: '' } }),
+      makeWorkflowNode({
+        id: 'loop-start',
+        type: CUSTOM_LOOP_START_NODE,
+        parentId: 'loop-p',
+        data: { type: BlockEnum.LoopStart, title: '', desc: '' },
+      }),
+      makeWorkflowNode({ id: 'loop-child', parentId: 'loop-p', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ source: 'loop-start', target: 'loop-child', data: { isInLoop: true, loop_id: 'loop-p' } }),
+    ]
+
+    const result = await getLayoutForChildNodes('loop-p', nodes, edges)
+    expect(result).not.toBeNull()
+    expect(result!.nodes.size).toBe(2)
+  })
+
+  it('should only include edges belonging to the parent iteration', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'child-a', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'child-b', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      makeWorkflowEdge({ source: 'child-a', target: 'child-b', data: { isInIteration: true, iteration_id: 'parent' } }),
+      makeWorkflowEdge({ source: 'x', target: 'y', data: { isInIteration: true, iteration_id: 'other-parent' } }),
+    ]
+
+    await getLayoutForChildNodes('parent', nodes, edges)
+    expect(layoutCallArgs!.edges).toHaveLength(1)
+  })
+
+  it('should adjust start node position when x exceeds horizontal padding', async () => {
+    mockReturnOverride = (graph: ElkGraph) => ({
+      ...graph,
+      children: (graph.children || []).map((child: ElkChild, i: number) => ({
+        ...child,
+        x: 200 + i * 300,
+        y: 50,
+        width: 244,
+        height: 100,
+      })),
+    })
+
+    const nodes = [
+      makeWorkflowNode({
+        id: 'start',
+        type: CUSTOM_ITERATION_START_NODE,
+        parentId: 'parent',
+        data: { type: BlockEnum.IterationStart, title: '', desc: '' },
+      }),
+      makeWorkflowNode({ id: 'child', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+
+    const result = await getLayoutForChildNodes('parent', nodes, [])
+    expect(result).not.toBeNull()
+    const startInfo = result!.nodes.get('start')!
+    expect(startInfo.x).toBeLessThanOrEqual(NODE_LAYOUT_HORIZONTAL_PADDING / 1.5 + 1)
+  })
+
+  it('should not shift when start node x is already within padding', async () => {
+    mockReturnOverride = (graph: ElkGraph) => ({
+      ...graph,
+      children: (graph.children || []).map((child: ElkChild, i: number) => ({
+        ...child,
+        x: 10 + i * 300,
+        y: 50,
+        width: 244,
+        height: 100,
+      })),
+    })
+
+    const nodes = [
+      makeWorkflowNode({
+        id: 'start',
+        type: CUSTOM_ITERATION_START_NODE,
+        parentId: 'parent',
+        data: { type: BlockEnum.IterationStart, title: '', desc: '' },
+      }),
+      makeWorkflowNode({ id: 'child', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+
+    const result = await getLayoutForChildNodes('parent', nodes, [])
+    expect(result).not.toBeNull()
+  })
+
+  it('should handle child nodes identified by data type LoopStart', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'ls', parentId: 'parent', data: { type: BlockEnum.LoopStart, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'child', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+
+    const result = await getLayoutForChildNodes('parent', nodes, [])
+    expect(result).not.toBeNull()
+    expect(result!.nodes.size).toBe(2)
+  })
+
+  it('should handle child nodes identified by data type IterationStart', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'is', parentId: 'parent', data: { type: BlockEnum.IterationStart, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'child', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+
+    const result = await getLayoutForChildNodes('parent', nodes, [])
+    expect(result).not.toBeNull()
+    expect(result!.nodes.size).toBe(2)
+  })
+
+  it('should handle no start node in child layout', async () => {
+    const nodes = [
+      makeWorkflowNode({ id: 'c1', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      makeWorkflowNode({ id: 'c2', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+
+    const result = await getLayoutForChildNodes('parent', nodes, [])
+    expect(result).not.toBeNull()
+    expect(result!.nodes.size).toBe(2)
+  })
+
+  it('should return original layout when bounds are not finite', async () => {
+    mockReturnOverride = (graph: ElkGraph) => ({
+      ...graph,
+      children: [],
+    })
+
+    const nodes = [
+      makeWorkflowNode({ id: 'c1', parentId: 'parent', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+
+    const result = await getLayoutForChildNodes('parent', nodes, [])
+    expect(result).not.toBeNull()
+    expect(result!.bounds).toEqual({ minX: 0, minY: 0, maxX: 0, maxY: 0 })
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/gen-node-meta-data.spec.ts b/web/app/components/workflow/utils/__tests__/gen-node-meta-data.spec.ts
new file mode 100644
index 0000000000..86203c76b1
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/gen-node-meta-data.spec.ts
@@ -0,0 +1,70 @@
+import { BlockClassificationEnum } from '../../block-selector/types'
+import { BlockEnum } from '../../types'
+import { genNodeMetaData } from '../gen-node-meta-data'
+
+describe('genNodeMetaData', () => {
+  it('should generate metadata with all required fields', () => {
+    const result = genNodeMetaData({
+      sort: 1,
+      type: BlockEnum.LLM,
+      title: 'LLM Node',
+    })
+
+    expect(result).toEqual({
+      classification: BlockClassificationEnum.Default,
+      sort: 1,
+      type: BlockEnum.LLM,
+      title: 'LLM Node',
+      author: 'Dify',
+      helpLinkUri: BlockEnum.LLM,
+      isRequired: false,
+      isUndeletable: false,
+      isStart: false,
+      isSingleton: false,
+      isTypeFixed: false,
+    })
+  })
+
+  it('should use custom values when provided', () => {
+    const result = genNodeMetaData({
+      classification: BlockClassificationEnum.Logic,
+      sort: 5,
+      type: BlockEnum.Start,
+      title: 'Start',
+      author: 'Custom',
+      helpLinkUri: 'code',
+      isRequired: true,
+      isUndeletable: true,
+      isStart: true,
+      isSingleton: true,
+      isTypeFixed: true,
+    })
+
+    expect(result.classification).toBe(BlockClassificationEnum.Logic)
+    expect(result.author).toBe('Custom')
+    expect(result.helpLinkUri).toBe('code')
+    expect(result.isRequired).toBe(true)
+    expect(result.isUndeletable).toBe(true)
+    expect(result.isStart).toBe(true)
+    expect(result.isSingleton).toBe(true)
+    expect(result.isTypeFixed).toBe(true)
+  })
+
+  it('should default title to empty string', () => {
+    const result = genNodeMetaData({
+      sort: 0,
+      type: BlockEnum.Code,
+    })
+
+    expect(result.title).toBe('')
+  })
+
+  it('should fall back helpLinkUri to type when not provided', () => {
+    const result = genNodeMetaData({
+      sort: 0,
+      type: BlockEnum.HttpRequest,
+    })
+
+    expect(result.helpLinkUri).toBe(BlockEnum.HttpRequest)
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/node-navigation.spec.ts b/web/app/components/workflow/utils/__tests__/node-navigation.spec.ts
new file mode 100644
index 0000000000..8ccdff0604
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/node-navigation.spec.ts
@@ -0,0 +1,161 @@
+import {
+  scrollToWorkflowNode,
+  selectWorkflowNode,
+  setupNodeSelectionListener,
+  setupScrollToNodeListener,
+} from '../node-navigation'
+
+describe('selectWorkflowNode', () => {
+  it('should dispatch workflow:select-node event with correct detail', () => {
+    const handler = vi.fn()
+    document.addEventListener('workflow:select-node', handler)
+
+    selectWorkflowNode('node-1', true)
+
+    expect(handler).toHaveBeenCalledTimes(1)
+    const event = handler.mock.calls[0][0] as CustomEvent
+    expect(event.detail).toEqual({ nodeId: 'node-1', focus: true })
+
+    document.removeEventListener('workflow:select-node', handler)
+  })
+
+  it('should default focus to false', () => {
+    const handler = vi.fn()
+    document.addEventListener('workflow:select-node', handler)
+
+    selectWorkflowNode('node-2')
+
+    const event = handler.mock.calls[0][0] as CustomEvent
+    expect(event.detail.focus).toBe(false)
+
+    document.removeEventListener('workflow:select-node', handler)
+  })
+})
+
+describe('scrollToWorkflowNode', () => {
+  it('should dispatch workflow:scroll-to-node event', () => {
+    const handler = vi.fn()
+    document.addEventListener('workflow:scroll-to-node', handler)
+
+    scrollToWorkflowNode('node-5')
+
+    expect(handler).toHaveBeenCalledTimes(1)
+    const event = handler.mock.calls[0][0] as CustomEvent
+    expect(event.detail).toEqual({ nodeId: 'node-5' })
+
+    document.removeEventListener('workflow:scroll-to-node', handler)
+  })
+})
+
+describe('setupNodeSelectionListener', () => {
+  it('should call handleNodeSelect when event is dispatched', () => {
+    const handleNodeSelect = vi.fn()
+    const cleanup = setupNodeSelectionListener(handleNodeSelect)
+
+    selectWorkflowNode('node-10')
+
+    expect(handleNodeSelect).toHaveBeenCalledWith('node-10')
+
+    cleanup()
+  })
+
+  it('should also scroll to node when focus is true', () => {
+    vi.useFakeTimers()
+    const handleNodeSelect = vi.fn()
+    const scrollHandler = vi.fn()
+    document.addEventListener('workflow:scroll-to-node', scrollHandler)
+
+    const cleanup = setupNodeSelectionListener(handleNodeSelect)
+    selectWorkflowNode('node-11', true)
+
+    expect(handleNodeSelect).toHaveBeenCalledWith('node-11')
+
+    vi.advanceTimersByTime(150)
+    expect(scrollHandler).toHaveBeenCalledTimes(1)
+
+    cleanup()
+    document.removeEventListener('workflow:scroll-to-node', scrollHandler)
+    vi.useRealTimers()
+  })
+
+  it('should not call handler after cleanup', () => {
+    const handleNodeSelect = vi.fn()
+    const cleanup = setupNodeSelectionListener(handleNodeSelect)
+
+    cleanup()
+    selectWorkflowNode('node-12')
+
+    expect(handleNodeSelect).not.toHaveBeenCalled()
+  })
+
+  it('should ignore events with empty nodeId', () => {
+    const handleNodeSelect = vi.fn()
+    const cleanup = setupNodeSelectionListener(handleNodeSelect)
+
+    const event = new CustomEvent('workflow:select-node', {
+      detail: { nodeId: '', focus: false },
+    })
+    document.dispatchEvent(event)
+
+    expect(handleNodeSelect).not.toHaveBeenCalled()
+
+    cleanup()
+  })
+})
+
+describe('setupScrollToNodeListener', () => {
+  it('should call reactflow.setCenter when scroll event targets an existing node', () => {
+    const nodes = [{ id: 'n1', position: { x: 100, y: 200 } }]
+    const reactflow = { setCenter: vi.fn() }
+
+    const cleanup = setupScrollToNodeListener(nodes, reactflow)
+    scrollToWorkflowNode('n1')
+
+    expect(reactflow.setCenter).toHaveBeenCalledTimes(1)
+    const [targetX, targetY, options] = reactflow.setCenter.mock.calls[0]
+    expect(targetX).toBeGreaterThan(100)
+    expect(targetY).toBeGreaterThan(200)
+    expect(options).toEqual({ zoom: 1, duration: 800 })
+
+    cleanup()
+  })
+
+  it('should not call setCenter when node is not found', () => {
+    const nodes = [{ id: 'n1', position: { x: 0, y: 0 } }]
+    const reactflow = { setCenter: vi.fn() }
+
+    const cleanup = setupScrollToNodeListener(nodes, reactflow)
+    scrollToWorkflowNode('non-existent')
+
+    expect(reactflow.setCenter).not.toHaveBeenCalled()
+
+    cleanup()
+  })
+
+  it('should not react after cleanup', () => {
+    const nodes = [{ id: 'n1', position: { x: 0, y: 0 } }]
+    const reactflow = { setCenter: vi.fn() }
+
+    const cleanup = setupScrollToNodeListener(nodes, reactflow)
+    cleanup()
+
+    scrollToWorkflowNode('n1')
+    expect(reactflow.setCenter).not.toHaveBeenCalled()
+  })
+
+  it('should ignore events with empty nodeId', () => {
+    const nodes = [{ id: 'n1', position: { x: 0, y: 0 } }]
+    const reactflow = { setCenter: vi.fn() }
+
+    const cleanup = setupScrollToNodeListener(nodes, reactflow)
+
+    const event = new CustomEvent('workflow:scroll-to-node', {
+      detail: { nodeId: '' },
+    })
+    document.dispatchEvent(event)
+
+    expect(reactflow.setCenter).not.toHaveBeenCalled()
+
+    cleanup()
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/node.spec.ts b/web/app/components/workflow/utils/__tests__/node.spec.ts
new file mode 100644
index 0000000000..19f3a1614a
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/node.spec.ts
@@ -0,0 +1,219 @@
+import type { IterationNodeType } from '../../nodes/iteration/types'
+import type { LoopNodeType } from '../../nodes/loop/types'
+import type { CommonNodeType, Node } from '../../types'
+import { CUSTOM_NODE, ITERATION_CHILDREN_Z_INDEX, ITERATION_NODE_Z_INDEX, LOOP_CHILDREN_Z_INDEX, LOOP_NODE_Z_INDEX } from '../../constants'
+import { CUSTOM_ITERATION_START_NODE } from '../../nodes/iteration-start/constants'
+import { CUSTOM_LOOP_START_NODE } from '../../nodes/loop-start/constants'
+import { CUSTOM_SIMPLE_NODE } from '../../simple-node/constants'
+import { BlockEnum } from '../../types'
+import {
+  generateNewNode,
+  genNewNodeTitleFromOld,
+  getIterationStartNode,
+  getLoopStartNode,
+  getNestedNodePosition,
+  getNodeCustomTypeByNodeDataType,
+  getTopLeftNodePosition,
+  hasRetryNode,
+} from '../node'
+
+describe('generateNewNode', () => {
+  it('should create a basic node with default CUSTOM_NODE type', () => {
+    const { newNode } = generateNewNode({
+      data: { title: 'Test', desc: '', type: BlockEnum.Code } as CommonNodeType,
+      position: { x: 100, y: 200 },
+    })
+
+    expect(newNode.type).toBe(CUSTOM_NODE)
+    expect(newNode.position).toEqual({ x: 100, y: 200 })
+    expect(newNode.data.title).toBe('Test')
+    expect(newNode.id).toBeDefined()
+  })
+
+  it('should use provided id when given', () => {
+    const { newNode } = generateNewNode({
+      id: 'custom-id',
+      data: { title: 'Test', desc: '', type: BlockEnum.Code } as CommonNodeType,
+      position: { x: 0, y: 0 },
+    })
+
+    expect(newNode.id).toBe('custom-id')
+  })
+
+  it('should set ITERATION_NODE_Z_INDEX for iteration nodes', () => {
+    const { newNode } = generateNewNode({
+      data: { title: 'Iter', desc: '', type: BlockEnum.Iteration } as CommonNodeType,
+      position: { x: 0, y: 0 },
+    })
+
+    expect(newNode.zIndex).toBe(ITERATION_NODE_Z_INDEX)
+  })
+
+  it('should set LOOP_NODE_Z_INDEX for loop nodes', () => {
+    const { newNode } = generateNewNode({
+      data: { title: 'Loop', desc: '', type: BlockEnum.Loop } as CommonNodeType,
+      position: { x: 0, y: 0 },
+    })
+
+    expect(newNode.zIndex).toBe(LOOP_NODE_Z_INDEX)
+  })
+
+  it('should create an iteration start node for iteration type', () => {
+    const { newNode, newIterationStartNode } = generateNewNode({
+      id: 'iter-1',
+      data: { title: 'Iter', desc: '', type: BlockEnum.Iteration } as CommonNodeType,
+      position: { x: 0, y: 0 },
+    })
+
+    expect(newIterationStartNode).toBeDefined()
+    expect(newIterationStartNode!.id).toBe('iter-1start')
+    expect(newIterationStartNode!.data.type).toBe(BlockEnum.IterationStart)
+    expect((newNode.data as IterationNodeType).start_node_id).toBe('iter-1start')
+    expect((newNode.data as CommonNodeType)._children).toEqual([
+      { nodeId: 'iter-1start', nodeType: BlockEnum.IterationStart },
+    ])
+  })
+
+  it('should create a loop start node for loop type', () => {
+    const { newNode, newLoopStartNode } = generateNewNode({
+      id: 'loop-1',
+      data: { title: 'Loop', desc: '', type: BlockEnum.Loop } as CommonNodeType,
+      position: { x: 0, y: 0 },
+    })
+
+    expect(newLoopStartNode).toBeDefined()
+    expect(newLoopStartNode!.id).toBe('loop-1start')
+    expect(newLoopStartNode!.data.type).toBe(BlockEnum.LoopStart)
+    expect((newNode.data as LoopNodeType).start_node_id).toBe('loop-1start')
+    expect((newNode.data as CommonNodeType)._children).toEqual([
+      { nodeId: 'loop-1start', nodeType: BlockEnum.LoopStart },
+    ])
+  })
+
+  it('should not create child start nodes for regular types', () => {
+    const result = generateNewNode({
+      data: { title: 'Code', desc: '', type: BlockEnum.Code } as CommonNodeType,
+      position: { x: 0, y: 0 },
+    })
+
+    expect(result.newIterationStartNode).toBeUndefined()
+    expect(result.newLoopStartNode).toBeUndefined()
+  })
+})
+
+describe('getIterationStartNode', () => {
+  it('should create a properly configured iteration start node', () => {
+    const node = getIterationStartNode('parent-iter')
+
+    expect(node.id).toBe('parent-iterstart')
+    expect(node.type).toBe(CUSTOM_ITERATION_START_NODE)
+    expect(node.data.type).toBe(BlockEnum.IterationStart)
+    expect(node.data.isInIteration).toBe(true)
+    expect(node.parentId).toBe('parent-iter')
+    expect(node.selectable).toBe(false)
+    expect(node.draggable).toBe(false)
+    expect(node.zIndex).toBe(ITERATION_CHILDREN_Z_INDEX)
+    expect(node.position).toEqual({ x: 24, y: 68 })
+  })
+})
+
+describe('getLoopStartNode', () => {
+  it('should create a properly configured loop start node', () => {
+    const node = getLoopStartNode('parent-loop')
+
+    expect(node.id).toBe('parent-loopstart')
+    expect(node.type).toBe(CUSTOM_LOOP_START_NODE)
+    expect(node.data.type).toBe(BlockEnum.LoopStart)
+    expect(node.data.isInLoop).toBe(true)
+    expect(node.parentId).toBe('parent-loop')
+    expect(node.selectable).toBe(false)
+    expect(node.draggable).toBe(false)
+    expect(node.zIndex).toBe(LOOP_CHILDREN_Z_INDEX)
+    expect(node.position).toEqual({ x: 24, y: 68 })
+  })
+})
+
+describe('genNewNodeTitleFromOld', () => {
+  it('should append (1) to a title without a counter', () => {
+    expect(genNewNodeTitleFromOld('LLM')).toBe('LLM (1)')
+  })
+
+  it('should increment existing counter', () => {
+    expect(genNewNodeTitleFromOld('LLM (1)')).toBe('LLM (2)')
+    expect(genNewNodeTitleFromOld('LLM (99)')).toBe('LLM (100)')
+  })
+
+  it('should handle titles with spaces around counter', () => {
+    expect(genNewNodeTitleFromOld('My Node (3)')).toBe('My Node (4)')
+  })
+
+  it('should handle titles that happen to contain parentheses in the name', () => {
+    expect(genNewNodeTitleFromOld('Node (special) name')).toBe('Node (special) name (1)')
+  })
+})
+
+describe('getTopLeftNodePosition', () => {
+  it('should return the minimum x and y from nodes', () => {
+    const nodes = [
+      { position: { x: 100, y: 50 } },
+      { position: { x: 20, y: 200 } },
+      { position: { x: 50, y: 10 } },
+    ] as Node[]
+
+    expect(getTopLeftNodePosition(nodes)).toEqual({ x: 20, y: 10 })
+  })
+
+  it('should handle a single node', () => {
+    const nodes = [{ position: { x: 42, y: 99 } }] as Node[]
+    expect(getTopLeftNodePosition(nodes)).toEqual({ x: 42, y: 99 })
+  })
+
+  it('should handle negative positions', () => {
+    const nodes = [
+      { position: { x: -10, y: -20 } },
+      { position: { x: 5, y: -30 } },
+    ] as Node[]
+
+    expect(getTopLeftNodePosition(nodes)).toEqual({ x: -10, y: -30 })
+  })
+})
+
+describe('getNestedNodePosition', () => {
+  it('should compute relative position of child to parent', () => {
+    const node = { position: { x: 150, y: 200 } } as Node
+    const parent = { position: { x: 100, y: 80 } } as Node
+
+    expect(getNestedNodePosition(node, parent)).toEqual({ x: 50, y: 120 })
+  })
+})
+
+describe('hasRetryNode', () => {
+  it.each([BlockEnum.LLM, BlockEnum.Tool, BlockEnum.HttpRequest, BlockEnum.Code])(
+    'should return true for %s',
+    (nodeType) => {
+      expect(hasRetryNode(nodeType)).toBe(true)
+    },
+  )
+
+  it.each([BlockEnum.Start, BlockEnum.End, BlockEnum.IfElse, BlockEnum.Iteration])(
+    'should return false for %s',
+    (nodeType) => {
+      expect(hasRetryNode(nodeType)).toBe(false)
+    },
+  )
+
+  it('should return false when nodeType is undefined', () => {
+    expect(hasRetryNode()).toBe(false)
+  })
+})
+
+describe('getNodeCustomTypeByNodeDataType', () => {
+  it('should return CUSTOM_SIMPLE_NODE for LoopEnd', () => {
+    expect(getNodeCustomTypeByNodeDataType(BlockEnum.LoopEnd)).toBe(CUSTOM_SIMPLE_NODE)
+  })
+
+  it('should return undefined for other types', () => {
+    expect(getNodeCustomTypeByNodeDataType(BlockEnum.Code)).toBeUndefined()
+    expect(getNodeCustomTypeByNodeDataType(BlockEnum.LLM)).toBeUndefined()
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/tool.spec.ts b/web/app/components/workflow/utils/__tests__/tool.spec.ts
new file mode 100644
index 0000000000..baa61d8a4e
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/tool.spec.ts
@@ -0,0 +1,191 @@
+import type { ToolNodeType } from '../../nodes/tool/types'
+import type { ToolWithProvider } from '../../types'
+import { CollectionType } from '@/app/components/tools/types'
+import { BlockEnum } from '../../types'
+import { CHUNK_TYPE_MAP, getToolCheckParams, wrapStructuredVarItem } from '../tool'
+
+vi.mock('@/app/components/tools/utils/to-form-schema', () => ({
+  toolParametersToFormSchemas: vi.fn((params: Array<Record<string, unknown>>) =>
+    params.map(p => ({
+      variable: p.name,
+      label: p.label || { en_US: p.name },
+      type: p.type || 'string',
+      required: p.required ?? false,
+      form: p.form ?? 'llm',
+    }))),
+}))
+
+vi.mock('@/utils', () => ({
+  canFindTool: vi.fn((collectionId: string, providerId: string) => collectionId === providerId),
+}))
+
+function createToolData(overrides: Partial<ToolNodeType> = {}): ToolNodeType {
+  return {
+    title: 'Tool',
+    desc: '',
+    type: BlockEnum.Tool,
+    provider_id: 'builtin-search',
+    provider_type: CollectionType.builtIn,
+    tool_name: 'google_search',
+    tool_parameters: {},
+    tool_configurations: {},
+    ...overrides,
+  } as ToolNodeType
+}
+
+function createToolCollection(overrides: Partial<ToolWithProvider> = {}): ToolWithProvider {
+  return {
+    id: 'builtin-search',
+    name: 'Search',
+    tools: [
+      {
+        name: 'google_search',
+        parameters: [
+          { name: 'query', label: { en_US: 'Query', zh_Hans: '查询' }, type: 'string', required: true, form: 'llm' },
+          { name: 'api_key', label: { en_US: 'API Key' }, type: 'string', required: true, form: 'credential' },
+        ],
+      },
+    ],
+    allow_delete: true,
+    is_team_authorization: false,
+    ...overrides,
+  } as unknown as ToolWithProvider
+}
+
+describe('getToolCheckParams', () => {
+  it('should separate llm inputs from settings', () => {
+    const result = getToolCheckParams(
+      createToolData(),
+      [createToolCollection()],
+      [],
+      [],
+      'en_US',
+    )
+
+    expect(result.toolInputsSchema).toEqual([
+      { label: 'Query', variable: 'query', type: 'string', required: true },
+    ])
+    expect(result.toolSettingSchema).toHaveLength(1)
+    expect(result.toolSettingSchema[0].variable).toBe('api_key')
+  })
+
+  it('should mark notAuthed for builtin tools without team auth', () => {
+    const result = getToolCheckParams(
+      createToolData(),
+      [createToolCollection()],
+      [],
+      [],
+      'en_US',
+    )
+
+    expect(result.notAuthed).toBe(true)
+  })
+
+  it('should mark authed when is_team_authorization is true', () => {
+    const result = getToolCheckParams(
+      createToolData(),
+      [createToolCollection({ is_team_authorization: true })],
+      [],
+      [],
+      'en_US',
+    )
+
+    expect(result.notAuthed).toBe(false)
+  })
+
+  it('should use custom tools when provider_type is custom', () => {
+    const customTool = createToolCollection({ id: 'custom-tool' })
+    const result = getToolCheckParams(
+      createToolData({ provider_id: 'custom-tool', provider_type: CollectionType.custom }),
+      [],
+      [customTool],
+      [],
+      'en_US',
+    )
+
+    expect(result.toolInputsSchema).toHaveLength(1)
+  })
+
+  it('should return empty schemas when tool is not found', () => {
+    const result = getToolCheckParams(
+      createToolData({ provider_id: 'non-existent' }),
+      [],
+      [],
+      [],
+      'en_US',
+    )
+
+    expect(result.toolInputsSchema).toEqual([])
+    expect(result.toolSettingSchema).toEqual([])
+  })
+
+  it('should include language in result', () => {
+    const result = getToolCheckParams(createToolData(), [createToolCollection()], [], [], 'zh_Hans')
+    expect(result.language).toBe('zh_Hans')
+  })
+
+  it('should use workflowTools when provider_type is workflow', () => {
+    const workflowTool = createToolCollection({ id: 'wf-tool' })
+    const result = getToolCheckParams(
+      createToolData({ provider_id: 'wf-tool', provider_type: CollectionType.workflow }),
+      [],
+      [],
+      [workflowTool],
+      'en_US',
+    )
+
+    expect(result.toolInputsSchema).toHaveLength(1)
+  })
+
+  it('should fallback to en_US label when language key is missing', () => {
+    const tool = createToolCollection({
+      tools: [
+        {
+          name: 'google_search',
+          parameters: [
+            { name: 'query', label: { en_US: 'Query' }, type: 'string', required: true, form: 'llm' },
+          ],
+        },
+      ],
+    } as Partial<ToolWithProvider>)
+
+    const result = getToolCheckParams(
+      createToolData(),
+      [tool],
+      [],
+      [],
+      'ja_JP',
+    )
+
+    expect(result.toolInputsSchema[0].label).toBe('Query')
+  })
+})
+
+describe('CHUNK_TYPE_MAP', () => {
+  it('should contain all expected chunk type mappings', () => {
+    expect(CHUNK_TYPE_MAP).toEqual({
+      general_chunks: 'GeneralStructureChunk',
+      parent_child_chunks: 'ParentChildStructureChunk',
+      qa_chunks: 'QAStructureChunk',
+    })
+  })
+})
+
+describe('wrapStructuredVarItem', () => {
+  it('should wrap an output item into StructuredOutput format', () => {
+    const outputItem = {
+      name: 'result',
+      value: { type: 'string', description: 'test' },
+    }
+
+    const result = wrapStructuredVarItem(outputItem, 'json_schema')
+
+    expect(result.schema.type).toBe('object')
+    expect(result.schema.additionalProperties).toBe(false)
+    expect(result.schema.properties.result).toEqual({
+      type: 'string',
+      description: 'test',
+      schemaType: 'json_schema',
+    })
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/trigger.spec.ts b/web/app/components/workflow/utils/__tests__/trigger.spec.ts
new file mode 100644
index 0000000000..b74126d69f
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/trigger.spec.ts
@@ -0,0 +1,132 @@
+import type { TriggerWithProvider } from '../../block-selector/types'
+import type { PluginTriggerNodeType } from '../../nodes/trigger-plugin/types'
+import { CollectionType } from '@/app/components/tools/types'
+import { BlockEnum } from '../../types'
+import { getTriggerCheckParams } from '../trigger'
+
+function createTriggerData(overrides: Partial<PluginTriggerNodeType> = {}): PluginTriggerNodeType {
+  return {
+    title: 'Trigger',
+    desc: '',
+    type: BlockEnum.TriggerPlugin,
+    provider_id: 'provider-1',
+    provider_type: CollectionType.builtIn,
+    provider_name: 'my-provider',
+    event_name: 'on_message',
+    event_label: 'On Message',
+    event_parameters: {},
+    event_configurations: {},
+    output_schema: {},
+    ...overrides,
+  } as PluginTriggerNodeType
+}
+
+function createTriggerProvider(overrides: Partial<TriggerWithProvider> = {}): TriggerWithProvider {
+  return {
+    id: 'provider-1',
+    name: 'my-provider',
+    plugin_id: 'plugin-1',
+    events: [
+      {
+        name: 'on_message',
+        label: { en_US: 'On Message', zh_Hans: '收到消息' },
+        parameters: [
+          {
+            name: 'channel',
+            label: { en_US: 'Channel', zh_Hans: '频道' },
+            required: true,
+          },
+          {
+            name: 'filter',
+            label: { en_US: 'Filter' },
+            required: false,
+          },
+        ],
+      },
+    ],
+    ...overrides,
+  } as unknown as TriggerWithProvider
+}
+
+describe('getTriggerCheckParams', () => {
+  it('should return empty schema when triggerProviders is undefined', () => {
+    const result = getTriggerCheckParams(createTriggerData(), undefined, 'en_US')
+
+    expect(result).toEqual({
+      triggerInputsSchema: [],
+      isReadyForCheckValid: false,
+    })
+  })
+
+  it('should match provider by name and extract parameters', () => {
+    const result = getTriggerCheckParams(
+      createTriggerData(),
+      [createTriggerProvider()],
+      'en_US',
+    )
+
+    expect(result.isReadyForCheckValid).toBe(true)
+    expect(result.triggerInputsSchema).toEqual([
+      { variable: 'channel', label: 'Channel', required: true },
+      { variable: 'filter', label: 'Filter', required: false },
+    ])
+  })
+
+  it('should use the requested language for labels', () => {
+    const result = getTriggerCheckParams(
+      createTriggerData(),
+      [createTriggerProvider()],
+      'zh_Hans',
+    )
+
+    expect(result.triggerInputsSchema[0].label).toBe('频道')
+  })
+
+  it('should fall back to en_US when language label is missing', () => {
+    const result = getTriggerCheckParams(
+      createTriggerData(),
+      [createTriggerProvider()],
+      'ja_JP',
+    )
+
+    expect(result.triggerInputsSchema[0].label).toBe('Channel')
+  })
+
+  it('should fall back to parameter name when no labels exist', () => {
+    const provider = createTriggerProvider({
+      events: [{
+        name: 'on_message',
+        label: { en_US: 'On Message' },
+        parameters: [{ name: 'raw_param' }],
+      }],
+    } as Partial<TriggerWithProvider>)
+
+    const result = getTriggerCheckParams(createTriggerData(), [provider], 'en_US')
+
+    expect(result.triggerInputsSchema[0].label).toBe('raw_param')
+  })
+
+  it('should match provider by provider_id', () => {
+    const trigger = createTriggerData({ provider_name: 'different-name', provider_id: 'provider-1' })
+    const provider = createTriggerProvider({ name: 'other-name', id: 'provider-1' })
+
+    const result = getTriggerCheckParams(trigger, [provider], 'en_US')
+    expect(result.isReadyForCheckValid).toBe(true)
+  })
+
+  it('should match provider by plugin_id', () => {
+    const trigger = createTriggerData({ provider_name: 'x', provider_id: 'plugin-1' })
+    const provider = createTriggerProvider({ name: 'y', id: 'z', plugin_id: 'plugin-1' })
+
+    const result = getTriggerCheckParams(trigger, [provider], 'en_US')
+    expect(result.isReadyForCheckValid).toBe(true)
+  })
+
+  it('should return empty schema when event is not found', () => {
+    const trigger = createTriggerData({ event_name: 'non_existent_event' })
+
+    const result = getTriggerCheckParams(trigger, [createTriggerProvider()], 'en_US')
+    expect(result.triggerInputsSchema).toEqual([])
+    expect(result.isReadyForCheckValid).toBe(true)
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/variable.spec.ts b/web/app/components/workflow/utils/__tests__/variable.spec.ts
new file mode 100644
index 0000000000..065e2187ac
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/variable.spec.ts
@@ -0,0 +1,55 @@
+import { BlockEnum } from '../../types'
+import { isExceptionVariable, variableTransformer } from '../variable'
+
+describe('variableTransformer', () => {
+  describe('string → array (template to selector)', () => {
+    it('should parse a simple template variable', () => {
+      expect(variableTransformer('{{#node1.output#}}')).toEqual(['node1', 'output'])
+    })
+
+    it('should parse a deeply nested path', () => {
+      expect(variableTransformer('{{#node1.data.items.0.name#}}')).toEqual(['node1', 'data', 'items', '0', 'name'])
+    })
+
+    it('should handle a single-segment path', () => {
+      expect(variableTransformer('{{#value#}}')).toEqual(['value'])
+    })
+  })
+
+  describe('array → string (selector to template)', () => {
+    it('should join an array into a template variable', () => {
+      expect(variableTransformer(['node1', 'output'])).toBe('{{#node1.output#}}')
+    })
+
+    it('should join a single-element array', () => {
+      expect(variableTransformer(['value'])).toBe('{{#value#}}')
+    })
+  })
+})
+
+describe('isExceptionVariable', () => {
+  const errorHandleTypes = [BlockEnum.LLM, BlockEnum.Tool, BlockEnum.HttpRequest, BlockEnum.Code, BlockEnum.Agent]
+
+  it.each(errorHandleTypes)('should return true for error_message with %s node type', (nodeType) => {
+    expect(isExceptionVariable('error_message', nodeType)).toBe(true)
+  })
+
+  it.each(errorHandleTypes)('should return true for error_type with %s node type', (nodeType) => {
+    expect(isExceptionVariable('error_type', nodeType)).toBe(true)
+  })
+
+  it('should return false for error_message with non-error-handle node types', () => {
+    expect(isExceptionVariable('error_message', BlockEnum.Start)).toBe(false)
+    expect(isExceptionVariable('error_message', BlockEnum.End)).toBe(false)
+    expect(isExceptionVariable('error_message', BlockEnum.IfElse)).toBe(false)
+  })
+
+  it('should return false for normal variables with error-handle node types', () => {
+    expect(isExceptionVariable('output', BlockEnum.LLM)).toBe(false)
+    expect(isExceptionVariable('text', BlockEnum.Tool)).toBe(false)
+  })
+
+  it('should return false when nodeType is undefined', () => {
+    expect(isExceptionVariable('error_message')).toBe(false)
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/workflow-entry.spec.ts b/web/app/components/workflow/utils/__tests__/workflow-entry.spec.ts
new file mode 100644
index 0000000000..5a2a3d8e47
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/workflow-entry.spec.ts
@@ -0,0 +1,89 @@
+import { createNode, createStartNode, createTriggerNode, resetFixtureCounters } from '../../__tests__/fixtures'
+import { BlockEnum } from '../../types'
+import { getWorkflowEntryNode, isTriggerWorkflow, isWorkflowEntryNode } from '../workflow-entry'
+
+beforeEach(() => {
+  resetFixtureCounters()
+})
+
+describe('getWorkflowEntryNode', () => {
+  it('should return the trigger node when present', () => {
+    const nodes = [
+      createStartNode({ id: 'start' }),
+      createTriggerNode(BlockEnum.TriggerWebhook, { id: 'trigger' }),
+      createNode({ id: 'code', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+
+    const entry = getWorkflowEntryNode(nodes)
+    expect(entry?.id).toBe('trigger')
+  })
+
+  it('should return the start node when no trigger node exists', () => {
+    const nodes = [
+      createStartNode({ id: 'start' }),
+      createNode({ id: 'code', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+
+    const entry = getWorkflowEntryNode(nodes)
+    expect(entry?.id).toBe('start')
+  })
+
+  it('should return undefined when no entry node exists', () => {
+    const nodes = [
+      createNode({ id: 'code', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+
+    expect(getWorkflowEntryNode(nodes)).toBeUndefined()
+  })
+
+  it('should prefer trigger node over start node', () => {
+    const nodes = [
+      createStartNode({ id: 'start' }),
+      createTriggerNode(BlockEnum.TriggerSchedule, { id: 'schedule' }),
+    ]
+
+    const entry = getWorkflowEntryNode(nodes)
+    expect(entry?.id).toBe('schedule')
+  })
+})
+
+describe('isWorkflowEntryNode', () => {
+  it('should return true for Start', () => {
+    expect(isWorkflowEntryNode(BlockEnum.Start)).toBe(true)
+  })
+
+  it.each([BlockEnum.TriggerSchedule, BlockEnum.TriggerWebhook, BlockEnum.TriggerPlugin])(
+    'should return true for %s',
+    (type) => {
+      expect(isWorkflowEntryNode(type)).toBe(true)
+    },
+  )
+
+  it('should return false for non-entry types', () => {
+    expect(isWorkflowEntryNode(BlockEnum.Code)).toBe(false)
+    expect(isWorkflowEntryNode(BlockEnum.LLM)).toBe(false)
+    expect(isWorkflowEntryNode(BlockEnum.End)).toBe(false)
+  })
+})
+
+describe('isTriggerWorkflow', () => {
+  it('should return true when nodes contain a trigger node', () => {
+    const nodes = [
+      createStartNode(),
+      createTriggerNode(BlockEnum.TriggerWebhook),
+    ]
+    expect(isTriggerWorkflow(nodes)).toBe(true)
+  })
+
+  it('should return false when no trigger nodes exist', () => {
+    const nodes = [
+      createStartNode(),
+      createNode({ data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    expect(isTriggerWorkflow(nodes)).toBe(false)
+  })
+
+  it('should return false for empty nodes', () => {
+    expect(isTriggerWorkflow([])).toBe(false)
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/workflow-init.spec.ts b/web/app/components/workflow/utils/__tests__/workflow-init.spec.ts
new file mode 100644
index 0000000000..15aa2a933d
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/workflow-init.spec.ts
@@ -0,0 +1,742 @@
+import type { IfElseNodeType } from '../../nodes/if-else/types'
+import type { IterationNodeType } from '../../nodes/iteration/types'
+import type { KnowledgeRetrievalNodeType } from '../../nodes/knowledge-retrieval/types'
+import type { LLMNodeType } from '../../nodes/llm/types'
+import type { LoopNodeType } from '../../nodes/loop/types'
+import type { ParameterExtractorNodeType } from '../../nodes/parameter-extractor/types'
+import type { ToolNodeType } from '../../nodes/tool/types'
+import type {
+  Edge,
+  Node,
+} from '@/app/components/workflow/types'
+import { CUSTOM_NODE, DEFAULT_RETRY_INTERVAL, DEFAULT_RETRY_MAX } from '@/app/components/workflow/constants'
+import { CUSTOM_ITERATION_START_NODE } from '@/app/components/workflow/nodes/iteration-start/constants'
+import { CUSTOM_LOOP_START_NODE } from '@/app/components/workflow/nodes/loop-start/constants'
+import { BlockEnum, ErrorHandleMode } from '@/app/components/workflow/types'
+import { createEdge, createNode, resetFixtureCounters } from '../../__tests__/fixtures'
+import { initialEdges, initialNodes, preprocessNodesAndEdges } from '../workflow-init'
+
+vi.mock('reactflow', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('reactflow')>()
+  return {
+    ...actual,
+    getConnectedEdges: vi.fn((_nodes: Node[], edges: Edge[]) => {
+      const node = _nodes[0]
+      return edges.filter(e => e.source === node.id || e.target === node.id)
+    }),
+  }
+})
+
+vi.mock('@/utils', () => ({
+  correctModelProvider: vi.fn((p: string) => p ? `corrected/${p}` : ''),
+}))
+
+vi.mock('@/app/components/workflow/nodes/if-else/utils', () => ({
+  branchNameCorrect: vi.fn((branches: Array<Record<string, unknown>>) => branches.map((b: Record<string, unknown>, i: number) => ({
+    ...b,
+    name: b.id === 'false' ? 'ELSE' : branches.length === 2 ? 'IF' : `CASE ${i + 1}`,
+  }))),
+}))
+
+beforeEach(() => {
+  resetFixtureCounters()
+  vi.clearAllMocks()
+})
+
+describe('preprocessNodesAndEdges', () => {
+  it('should return origin nodes and edges when no iteration/loop nodes exist', () => {
+    const nodes = [createNode({ data: { type: BlockEnum.Code, title: '', desc: '' } })]
+    const result = preprocessNodesAndEdges(nodes, [])
+    expect(result).toEqual({ nodes, edges: [] })
+  })
+
+  it('should add iteration start node when iteration has no start_node_id', () => {
+    const nodes = [
+      createNode({ id: 'iter-1', data: { type: BlockEnum.Iteration, title: '', desc: '' } }),
+    ]
+    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')
+  })
+
+  it('should add iteration start node when iteration has start_node_id but node type does not match', () => {
+    const nodes = [
+      createNode({
+        id: 'iter-1',
+        data: { type: BlockEnum.Iteration, title: '', desc: '', start_node_id: 'some-node' },
+      }),
+      createNode({ id: 'some-node', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const result = preprocessNodesAndEdges(nodes as Node[], [])
+    const startNodes = result.nodes.filter(n => n.data.type === BlockEnum.IterationStart)
+    expect(startNodes).toHaveLength(1)
+  })
+
+  it('should not add iteration start node when one already exists with correct type', () => {
+    const nodes = [
+      createNode({
+        id: 'iter-1',
+        data: { type: BlockEnum.Iteration, title: '', desc: '', start_node_id: 'iter-start' },
+      }),
+      createNode({
+        id: 'iter-start',
+        type: CUSTOM_ITERATION_START_NODE,
+        data: { type: BlockEnum.IterationStart, title: '', desc: '' },
+      }),
+    ]
+    const result = preprocessNodesAndEdges(nodes as Node[], [])
+    expect(result.nodes).toEqual(nodes)
+  })
+
+  it('should add loop start node when loop has no start_node_id', () => {
+    const nodes = [
+      createNode({ id: 'loop-1', data: { type: BlockEnum.Loop, title: '', desc: '' } }),
+    ]
+    const result = preprocessNodesAndEdges(nodes as Node[], [])
+    const startNodes = result.nodes.filter(n => n.data.type === BlockEnum.LoopStart)
+    expect(startNodes).toHaveLength(1)
+  })
+
+  it('should add loop start node when loop has start_node_id but type does not match', () => {
+    const nodes = [
+      createNode({
+        id: 'loop-1',
+        data: { type: BlockEnum.Loop, title: '', desc: '', start_node_id: 'some-node' },
+      }),
+      createNode({ id: 'some-node', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const result = preprocessNodesAndEdges(nodes as Node[], [])
+    const startNodes = result.nodes.filter(n => n.data.type === BlockEnum.LoopStart)
+    expect(startNodes).toHaveLength(1)
+  })
+
+  it('should not add loop start node when one already exists with correct type', () => {
+    const nodes = [
+      createNode({
+        id: 'loop-1',
+        data: { type: BlockEnum.Loop, title: '', desc: '', start_node_id: 'loop-start' },
+      }),
+      createNode({
+        id: 'loop-start',
+        type: CUSTOM_LOOP_START_NODE,
+        data: { type: BlockEnum.LoopStart, title: '', desc: '' },
+      }),
+    ]
+    const result = preprocessNodesAndEdges(nodes as Node[], [])
+    expect(result.nodes).toEqual(nodes)
+  })
+
+  it('should create edges linking new start nodes to existing start nodes', () => {
+    const nodes = [
+      createNode({
+        id: 'iter-1',
+        data: { type: BlockEnum.Iteration, title: '', desc: '', start_node_id: 'child-1' },
+      }),
+      createNode({
+        id: 'child-1',
+        parentId: 'iter-1',
+        data: { type: BlockEnum.Code, title: '', desc: '' },
+      }),
+    ]
+    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)
+  })
+
+  it('should create edges for loop nodes with start_node_id', () => {
+    const nodes = [
+      createNode({
+        id: 'loop-1',
+        data: { type: BlockEnum.Loop, title: '', desc: '', start_node_id: 'child-1' },
+      }),
+      createNode({
+        id: 'child-1',
+        parentId: 'loop-1',
+        data: { type: BlockEnum.Code, title: '', desc: '' },
+      }),
+    ]
+    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)
+  })
+
+  it('should update start_node_id on iteration and loop nodes', () => {
+    const nodes = [
+      createNode({
+        id: 'iter-1',
+        data: { type: BlockEnum.Iteration, title: '', desc: '' },
+      }),
+      createNode({
+        id: 'loop-1',
+        data: { type: BlockEnum.Loop, title: '', desc: '' },
+      }),
+    ]
+    const result = preprocessNodesAndEdges(nodes as Node[], [])
+    const iterNode = result.nodes.find(n => n.id === 'iter-1')
+    const loopNode = result.nodes.find(n => n.id === 'loop-1')
+    expect((iterNode!.data as IterationNodeType).start_node_id).toBeTruthy()
+    expect((loopNode!.data as LoopNodeType).start_node_id).toBeTruthy()
+  })
+})
+
+describe('initialNodes', () => {
+  it('should set positions when first node has no position', () => {
+    const nodes = [
+      createNode({ id: 'n1', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'n2', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    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)
+  })
+
+  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')
+
+    const result = initialNodes(nodes, [])
+    expect(result[0].type).toBe(CUSTOM_NODE)
+  })
+
+  it('should set connected source and target handle ids', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'a', target: 'b', sourceHandle: 'source', targetHandle: 'target' }),
+    ]
+
+    const result = initialNodes(nodes, edges)
+    expect(result[0].data._connectedSourceHandleIds).toContain('source')
+    expect(result[1].data._connectedTargetHandleIds).toContain('target')
+  })
+
+  it('should handle IfElse node with cases', () => {
+    const nodes = [
+      createNode({
+        id: 'if-1',
+        data: {
+          type: BlockEnum.IfElse,
+          title: '',
+          desc: '',
+          cases: [
+            { case_id: 'case-1', logical_operator: 'and', conditions: [] },
+          ],
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    expect(result[0].data._targetBranches).toBeDefined()
+    expect(result[0].data._targetBranches).toHaveLength(2)
+  })
+
+  it('should migrate legacy IfElse node without cases to cases format', () => {
+    const nodes = [
+      createNode({
+        id: 'if-1',
+        data: {
+          type: BlockEnum.IfElse,
+          title: '',
+          desc: '',
+          logical_operator: 'and',
+          conditions: [{ id: 'c1', value: 'test' }],
+          cases: undefined,
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const data = result[0].data as IfElseNodeType
+    expect(data.cases).toHaveLength(1)
+    expect(data.cases[0].case_id).toBe('true')
+  })
+
+  it('should delete legacy conditions/logical_operator when cases exist', () => {
+    const nodes = [
+      createNode({
+        id: 'if-1',
+        data: {
+          type: BlockEnum.IfElse,
+          title: '',
+          desc: '',
+          logical_operator: 'and',
+          conditions: [{ id: 'c1', value: 'test' }],
+          cases: [
+            { case_id: 'true', logical_operator: 'and', conditions: [{ id: 'c1', value: 'test' }] },
+          ],
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const data = result[0].data as IfElseNodeType
+    expect(data.conditions).toBeUndefined()
+    expect(data.logical_operator).toBeUndefined()
+  })
+
+  it('should set _targetBranches for QuestionClassifier nodes', () => {
+    const nodes = [
+      createNode({
+        id: 'qc-1',
+        data: {
+          type: BlockEnum.QuestionClassifier,
+          title: '',
+          desc: '',
+          classes: [{ id: 'cls-1', name: 'Class 1' }],
+          model: { provider: 'openai' },
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    expect(result[0].data._targetBranches).toHaveLength(1)
+  })
+
+  it('should set iteration node defaults', () => {
+    const nodes = [
+      createNode({
+        id: 'iter-1',
+        data: {
+          type: BlockEnum.Iteration,
+          title: '',
+          desc: '',
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const iterNode = result.find(n => n.id === 'iter-1')!
+    const data = iterNode.data as IterationNodeType
+    expect(data.is_parallel).toBe(false)
+    expect(data.parallel_nums).toBe(10)
+    expect(data.error_handle_mode).toBe(ErrorHandleMode.Terminated)
+    expect(data._children).toBeDefined()
+  })
+
+  it('should set loop node defaults', () => {
+    const nodes = [
+      createNode({
+        id: 'loop-1',
+        data: {
+          type: BlockEnum.Loop,
+          title: '',
+          desc: '',
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const loopNode = result.find(n => n.id === 'loop-1')!
+    const data = loopNode.data as LoopNodeType
+    expect(data.error_handle_mode).toBe(ErrorHandleMode.Terminated)
+    expect(data._children).toBeDefined()
+  })
+
+  it('should populate _children for iteration nodes with child nodes', () => {
+    const nodes = [
+      createNode({
+        id: 'iter-1',
+        data: { type: BlockEnum.Iteration, title: '', desc: '' },
+      }),
+      createNode({
+        id: 'child-1',
+        parentId: 'iter-1',
+        data: { type: BlockEnum.Code, title: '', desc: '' },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const iterNode = result.find(n => n.id === 'iter-1')!
+    const data = iterNode.data as IterationNodeType
+    expect(data._children).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ nodeId: 'child-1', nodeType: BlockEnum.Code }),
+      ]),
+    )
+  })
+
+  it('should correct model provider for LLM nodes', () => {
+    const nodes = [
+      createNode({
+        id: 'llm-1',
+        data: {
+          type: BlockEnum.LLM,
+          title: '',
+          desc: '',
+          model: { provider: 'openai' },
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    expect((result[0].data as LLMNodeType).model.provider).toBe('corrected/openai')
+  })
+
+  it('should correct model provider for KnowledgeRetrieval reranking_model', () => {
+    const nodes = [
+      createNode({
+        id: 'kr-1',
+        data: {
+          type: BlockEnum.KnowledgeRetrieval,
+          title: '',
+          desc: '',
+          multiple_retrieval_config: {
+            reranking_model: { provider: 'cohere' },
+          },
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    expect((result[0].data as KnowledgeRetrievalNodeType).multiple_retrieval_config!.reranking_model!.provider).toBe('corrected/cohere')
+  })
+
+  it('should correct model provider for ParameterExtractor nodes', () => {
+    const nodes = [
+      createNode({
+        id: 'pe-1',
+        data: {
+          type: BlockEnum.ParameterExtractor,
+          title: '',
+          desc: '',
+          model: { provider: 'anthropic' },
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    expect((result[0].data as ParameterExtractorNodeType).model.provider).toBe('corrected/anthropic')
+  })
+
+  it('should add default retry_config for HttpRequest nodes', () => {
+    const nodes = [
+      createNode({
+        id: 'http-1',
+        data: {
+          type: BlockEnum.HttpRequest,
+          title: '',
+          desc: '',
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    expect(result[0].data.retry_config).toEqual({
+      retry_enabled: true,
+      max_retries: DEFAULT_RETRY_MAX,
+      retry_interval: DEFAULT_RETRY_INTERVAL,
+    })
+  })
+
+  it('should not overwrite existing retry_config for HttpRequest nodes', () => {
+    const existingConfig = { retry_enabled: false, max_retries: 1, retry_interval: 50 }
+    const nodes = [
+      createNode({
+        id: 'http-1',
+        data: {
+          type: BlockEnum.HttpRequest,
+          title: '',
+          desc: '',
+          retry_config: existingConfig,
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    expect(result[0].data.retry_config).toEqual(existingConfig)
+  })
+
+  it('should migrate legacy Tool node configurations', () => {
+    const nodes = [
+      createNode({
+        id: 'tool-1',
+        data: {
+          type: BlockEnum.Tool,
+          title: '',
+          desc: '',
+          tool_configurations: {
+            api_key: 'secret-key',
+            nested: { type: 'constant', value: 'already-migrated' },
+          },
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const data = result[0].data as ToolNodeType
+    expect(data.tool_node_version).toBe('2')
+    expect(data.tool_configurations.api_key).toEqual({
+      type: 'constant',
+      value: 'secret-key',
+    })
+    expect(data.tool_configurations.nested).toEqual({
+      type: 'constant',
+      value: 'already-migrated',
+    })
+  })
+
+  it('should not migrate Tool node when version already exists', () => {
+    const nodes = [
+      createNode({
+        id: 'tool-1',
+        data: {
+          type: BlockEnum.Tool,
+          title: '',
+          desc: '',
+          version: '1',
+          tool_configurations: { key: 'val' },
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const data = result[0].data as ToolNodeType
+    expect(data.tool_configurations).toEqual({ key: 'val' })
+  })
+
+  it('should not migrate Tool node when tool_node_version already exists', () => {
+    const nodes = [
+      createNode({
+        id: 'tool-1',
+        data: {
+          type: BlockEnum.Tool,
+          title: '',
+          desc: '',
+          tool_node_version: '2',
+          tool_configurations: { key: 'val' },
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const data = result[0].data as ToolNodeType
+    expect(data.tool_configurations).toEqual({ key: 'val' })
+  })
+
+  it('should handle Tool node with null configuration value', () => {
+    const nodes = [
+      createNode({
+        id: 'tool-1',
+        data: {
+          type: BlockEnum.Tool,
+          title: '',
+          desc: '',
+          tool_configurations: { key: null },
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const data = result[0].data as ToolNodeType
+    expect(data.tool_configurations.key).toEqual({ type: 'constant', value: null })
+  })
+
+  it('should handle Tool node with empty tool_configurations', () => {
+    const nodes = [
+      createNode({
+        id: 'tool-1',
+        data: {
+          type: BlockEnum.Tool,
+          title: '',
+          desc: '',
+          tool_configurations: {},
+        },
+      }),
+    ]
+
+    const result = initialNodes(nodes, [])
+    const data = result[0].data as ToolNodeType
+    expect(data.tool_node_version).toBe('2')
+  })
+})
+
+describe('initialEdges', () => {
+  it('should set edge type to custom', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [createEdge({ source: 'a', target: 'b' })]
+
+    const result = initialEdges(edges, nodes)
+    expect(result[0].type).toBe('custom')
+  })
+
+  it('should set default sourceHandle and targetHandle', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edge = createEdge({ source: 'a', target: 'b' })
+    Reflect.deleteProperty(edge, 'sourceHandle')
+    Reflect.deleteProperty(edge, 'targetHandle')
+
+    const result = initialEdges([edge], nodes)
+    expect(result[0].sourceHandle).toBe('source')
+    expect(result[0].targetHandle).toBe('target')
+  })
+
+  it('should set sourceType and targetType from nodes', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      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')
+
+    const result = initialEdges(edges, nodes)
+    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', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '', selected: true } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [createEdge({ source: 'a', target: 'b' })]
+
+    const result = initialEdges(edges, nodes)
+    expect(result[0].data!._connectedNodeIsSelected).toBe(true)
+  })
+
+  it('should filter cycle edges', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      createNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'a', target: 'b' }),
+      createEdge({ source: 'b', target: 'c' }),
+      createEdge({ source: 'c', target: 'b' }),
+    ]
+
+    const result = initialEdges(edges, nodes)
+    const hasCycleEdge = result.some(
+      e => (e.source === 'b' && e.target === 'c') || (e.source === 'c' && e.target === 'b'),
+    )
+    const hasABEdge = result.some(
+      e => e.source === 'a' && e.target === 'b',
+    )
+    expect(hasCycleEdge).toBe(false)
+    // In this specific graph, getCycleEdges treats all nodes remaining in the DFS stack (a, b, c)
+    // as part of the cycle, so a→b is also filtered. This assertion documents that behaviour.
+    expect(hasABEdge).toBe(false)
+  })
+
+  it('should keep non-cycle edges intact', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [createEdge({ source: 'a', target: 'b' })]
+
+    const result = initialEdges(edges, nodes)
+    expect(result).toHaveLength(1)
+    expect(result[0].source).toBe('a')
+    expect(result[0].target).toBe('b')
+  })
+
+  it('should handle empty edges', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+    ]
+    const result = initialEdges([], nodes)
+    expect(result).toHaveLength(0)
+  })
+
+  it('should handle edges where source/target node is missing from nodesMap', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+    ]
+    const edges = [createEdge({ source: 'a', target: 'missing' })]
+
+    const result = initialEdges(edges, nodes)
+    expect(result).toHaveLength(1)
+  })
+
+  it('should set _connectedNodeIsSelected for edge target matching selected node', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '', selected: true } }),
+    ]
+    const edges = [createEdge({ source: 'a', target: 'b' })]
+
+    const result = initialEdges(edges, nodes)
+    expect(result[0].data!._connectedNodeIsSelected).toBe(true)
+  })
+
+  it('should not set default sourceHandle when sourceHandle already exists', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    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')
+  })
+
+  it('should handle graph with edges referencing nodes not in the node list', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'a', target: 'b' }),
+      createEdge({ source: 'unknown-src', target: 'unknown-tgt' }),
+    ]
+
+    const result = initialEdges(edges, nodes)
+    expect(result.length).toBeGreaterThanOrEqual(1)
+  })
+
+  it('should handle self-referencing cycle', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'a', target: 'b' }),
+      createEdge({ source: 'b', target: 'b' }),
+    ]
+
+    const result = initialEdges(edges, nodes)
+    const selfLoop = result.find(e => e.source === 'b' && e.target === 'b')
+    expect(selfLoop).toBeUndefined()
+  })
+
+  it('should handle complex cycle with multiple nodes', () => {
+    const nodes = [
+      createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      createNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      createNode({ id: 'd', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'a', target: 'b' }),
+      createEdge({ source: 'b', target: 'c' }),
+      createEdge({ source: 'c', target: 'd' }),
+      createEdge({ source: 'd', target: 'b' }),
+    ]
+
+    const result = initialEdges(edges, nodes)
+    expect(result.length).toBeLessThan(edges.length)
+  })
+})
diff --git a/web/app/components/workflow/utils/__tests__/workflow.spec.ts b/web/app/components/workflow/utils/__tests__/workflow.spec.ts
new file mode 100644
index 0000000000..165b4d5ee6
--- /dev/null
+++ b/web/app/components/workflow/utils/__tests__/workflow.spec.ts
@@ -0,0 +1,423 @@
+import { createEdge, createNode, resetFixtureCounters } from '../../__tests__/fixtures'
+import { BlockEnum } from '../../types'
+import {
+  canRunBySingle,
+  changeNodesAndEdgesId,
+  getNodesConnectedSourceOrTargetHandleIdsMap,
+  getValidTreeNodes,
+  hasErrorHandleNode,
+  isSupportCustomRunForm,
+} from '../workflow'
+
+beforeEach(() => {
+  resetFixtureCounters()
+})
+
+describe('canRunBySingle', () => {
+  const runnableTypes = [
+    BlockEnum.LLM,
+    BlockEnum.KnowledgeRetrieval,
+    BlockEnum.Code,
+    BlockEnum.TemplateTransform,
+    BlockEnum.QuestionClassifier,
+    BlockEnum.HttpRequest,
+    BlockEnum.Tool,
+    BlockEnum.ParameterExtractor,
+    BlockEnum.Iteration,
+    BlockEnum.Agent,
+    BlockEnum.DocExtractor,
+    BlockEnum.Loop,
+    BlockEnum.Start,
+    BlockEnum.IfElse,
+    BlockEnum.VariableAggregator,
+    BlockEnum.Assigner,
+    BlockEnum.HumanInput,
+    BlockEnum.DataSource,
+    BlockEnum.TriggerSchedule,
+    BlockEnum.TriggerWebhook,
+    BlockEnum.TriggerPlugin,
+  ]
+
+  it.each(runnableTypes)('should return true for %s when not a child node', (type) => {
+    expect(canRunBySingle(type, false)).toBe(true)
+  })
+
+  it('should return false for Assigner when it is a child node', () => {
+    expect(canRunBySingle(BlockEnum.Assigner, true)).toBe(false)
+  })
+
+  it('should return true for LLM even as a child node', () => {
+    expect(canRunBySingle(BlockEnum.LLM, true)).toBe(true)
+  })
+
+  it('should return false for End node', () => {
+    expect(canRunBySingle(BlockEnum.End, false)).toBe(false)
+  })
+
+  it('should return false for Answer node', () => {
+    expect(canRunBySingle(BlockEnum.Answer, false)).toBe(false)
+  })
+})
+
+describe('isSupportCustomRunForm', () => {
+  it('should return true for DataSource', () => {
+    expect(isSupportCustomRunForm(BlockEnum.DataSource)).toBe(true)
+  })
+
+  it('should return false for other types', () => {
+    expect(isSupportCustomRunForm(BlockEnum.LLM)).toBe(false)
+    expect(isSupportCustomRunForm(BlockEnum.Code)).toBe(false)
+  })
+})
+
+describe('hasErrorHandleNode', () => {
+  it.each([BlockEnum.LLM, BlockEnum.Tool, BlockEnum.HttpRequest, BlockEnum.Code, BlockEnum.Agent])(
+    'should return true for %s',
+    (type) => {
+      expect(hasErrorHandleNode(type)).toBe(true)
+    },
+  )
+
+  it('should return false for non-error-handle types', () => {
+    expect(hasErrorHandleNode(BlockEnum.Start)).toBe(false)
+    expect(hasErrorHandleNode(BlockEnum.Iteration)).toBe(false)
+  })
+
+  it('should return false when undefined', () => {
+    expect(hasErrorHandleNode()).toBe(false)
+  })
+})
+
+describe('getNodesConnectedSourceOrTargetHandleIdsMap', () => {
+  it('should add handle ids when type is add', () => {
+    const node1 = createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } })
+    const node2 = createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } })
+    const edge = createEdge({
+      source: 'a',
+      target: 'b',
+      sourceHandle: 'src-handle',
+      targetHandle: 'tgt-handle',
+    })
+
+    const result = getNodesConnectedSourceOrTargetHandleIdsMap(
+      [{ type: 'add', edge }],
+      [node1, node2],
+    )
+
+    expect(result.a._connectedSourceHandleIds).toContain('src-handle')
+    expect(result.b._connectedTargetHandleIds).toContain('tgt-handle')
+  })
+
+  it('should remove handle ids when type is remove', () => {
+    const node1 = createNode({
+      id: 'a',
+      data: { type: BlockEnum.Start, title: '', desc: '', _connectedSourceHandleIds: ['src-handle'] },
+    })
+    const node2 = createNode({
+      id: 'b',
+      data: { type: BlockEnum.Code, title: '', desc: '', _connectedTargetHandleIds: ['tgt-handle'] },
+    })
+    const edge = createEdge({
+      source: 'a',
+      target: 'b',
+      sourceHandle: 'src-handle',
+      targetHandle: 'tgt-handle',
+    })
+
+    const result = getNodesConnectedSourceOrTargetHandleIdsMap(
+      [{ type: 'remove', edge }],
+      [node1, node2],
+    )
+
+    expect(result.a._connectedSourceHandleIds).not.toContain('src-handle')
+    expect(result.b._connectedTargetHandleIds).not.toContain('tgt-handle')
+  })
+
+  it('should use default handle ids when sourceHandle/targetHandle are missing', () => {
+    const node1 = createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } })
+    const node2 = createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } })
+    const edge = createEdge({ source: 'a', target: 'b' })
+    Reflect.deleteProperty(edge, 'sourceHandle')
+    Reflect.deleteProperty(edge, 'targetHandle')
+
+    const result = getNodesConnectedSourceOrTargetHandleIdsMap(
+      [{ type: 'add', edge }],
+      [node1, node2],
+    )
+
+    expect(result.a._connectedSourceHandleIds).toContain('source')
+    expect(result.b._connectedTargetHandleIds).toContain('target')
+  })
+
+  it('should skip when source node is not found', () => {
+    const node2 = createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } })
+    const edge = createEdge({ source: 'missing', target: 'b', sourceHandle: 'src' })
+
+    const result = getNodesConnectedSourceOrTargetHandleIdsMap(
+      [{ type: 'add', edge }],
+      [node2],
+    )
+
+    expect(result.missing).toBeUndefined()
+    expect(result.b._connectedTargetHandleIds).toBeDefined()
+  })
+
+  it('should skip when target node is not found', () => {
+    const node1 = createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } })
+    const edge = createEdge({ source: 'a', target: 'missing', targetHandle: 'tgt' })
+
+    const result = getNodesConnectedSourceOrTargetHandleIdsMap(
+      [{ type: 'add', edge }],
+      [node1],
+    )
+
+    expect(result.a._connectedSourceHandleIds).toBeDefined()
+    expect(result.missing).toBeUndefined()
+  })
+
+  it('should reuse existing map entry for same node across multiple changes', () => {
+    const node1 = createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } })
+    const node2 = createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } })
+    const node3 = createNode({ id: 'c', data: { type: BlockEnum.Code, title: '', desc: '' } })
+    const edge1 = createEdge({ source: 'a', target: 'b', sourceHandle: 'h1' })
+    const edge2 = createEdge({ source: 'a', target: 'c', sourceHandle: 'h2' })
+
+    const result = getNodesConnectedSourceOrTargetHandleIdsMap(
+      [{ type: 'add', edge: edge1 }, { type: 'add', edge: edge2 }],
+      [node1, node2, node3],
+    )
+
+    expect(result.a._connectedSourceHandleIds).toContain('h1')
+    expect(result.a._connectedSourceHandleIds).toContain('h2')
+  })
+
+  it('should fallback to empty arrays when node data has no handle id arrays', () => {
+    const node1 = createNode({ id: 'a', data: { type: BlockEnum.Start, title: '', desc: '' } })
+    const node2 = createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } })
+    Reflect.deleteProperty(node1.data, '_connectedSourceHandleIds')
+    Reflect.deleteProperty(node1.data, '_connectedTargetHandleIds')
+    Reflect.deleteProperty(node2.data, '_connectedSourceHandleIds')
+    Reflect.deleteProperty(node2.data, '_connectedTargetHandleIds')
+
+    const edge = createEdge({ source: 'a', target: 'b', sourceHandle: 'h1', targetHandle: 'h2' })
+
+    const result = getNodesConnectedSourceOrTargetHandleIdsMap(
+      [{ type: 'add', edge }],
+      [node1, node2],
+    )
+
+    expect(result.a._connectedSourceHandleIds).toContain('h1')
+    expect(result.b._connectedTargetHandleIds).toContain('h2')
+  })
+})
+
+describe('getValidTreeNodes', () => {
+  it('should return empty when there are no start/trigger nodes', () => {
+    const nodes = [
+      createNode({ id: 'n1', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const result = getValidTreeNodes(nodes, [])
+    expect(result.validNodes).toEqual([])
+    expect(result.maxDepth).toBe(0)
+  })
+
+  it('should traverse a linear graph from Start', () => {
+    const nodes = [
+      createNode({ id: 'start', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'llm', data: { type: BlockEnum.LLM, title: '', desc: '' } }),
+      createNode({ id: 'end', data: { type: BlockEnum.End, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'start', target: 'llm' }),
+      createEdge({ source: 'llm', target: 'end' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes.map(n => n.id)).toEqual(['start', 'llm', 'end'])
+    expect(result.maxDepth).toBe(3)
+  })
+
+  it('should traverse from trigger nodes', () => {
+    const nodes = [
+      createNode({ id: 'trigger', data: { type: BlockEnum.TriggerWebhook, title: '', desc: '' } }),
+      createNode({ id: 'code', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'trigger', target: 'code' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes.map(n => n.id)).toContain('trigger')
+    expect(result.validNodes.map(n => n.id)).toContain('code')
+  })
+
+  it('should include iteration children as valid nodes', () => {
+    const nodes = [
+      createNode({ id: 'start', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'iter', data: { type: BlockEnum.Iteration, title: '', desc: '' } }),
+      createNode({ id: 'child1', data: { type: BlockEnum.Code, title: '', desc: '' }, parentId: 'iter' }),
+    ]
+    const edges = [
+      createEdge({ source: 'start', target: 'iter' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes.map(n => n.id)).toContain('child1')
+  })
+
+  it('should include loop children when loop has outgoers', () => {
+    const nodes = [
+      createNode({ id: 'start', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'loop', data: { type: BlockEnum.Loop, title: '', desc: '' } }),
+      createNode({ id: 'loop-child', data: { type: BlockEnum.Code, title: '', desc: '' }, parentId: 'loop' }),
+      createNode({ id: 'end', data: { type: BlockEnum.End, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'start', target: 'loop' }),
+      createEdge({ source: 'loop', target: 'end' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes.map(n => n.id)).toContain('loop-child')
+  })
+
+  it('should include loop children as valid nodes when loop is a leaf', () => {
+    const nodes = [
+      createNode({ id: 'start', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'loop', data: { type: BlockEnum.Loop, title: '', desc: '' } }),
+      createNode({ id: 'loop-child', data: { type: BlockEnum.Code, title: '', desc: '' }, parentId: 'loop' }),
+    ]
+    const edges = [
+      createEdge({ source: 'start', target: 'loop' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes.map(n => n.id)).toContain('loop-child')
+  })
+
+  it('should handle cycles without infinite loop', () => {
+    const nodes = [
+      createNode({ id: 'start', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'a', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'start', target: 'a' }),
+      createEdge({ source: 'a', target: 'b' }),
+      createEdge({ source: 'b', target: 'a' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes).toHaveLength(3)
+  })
+
+  it('should exclude disconnected nodes', () => {
+    const nodes = [
+      createNode({ id: 'start', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'connected', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      createNode({ id: 'isolated', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'start', target: 'connected' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes.map(n => n.id)).not.toContain('isolated')
+  })
+
+  it('should handle multiple start nodes without double-traversal', () => {
+    const nodes = [
+      createNode({ id: 'start1', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'trigger', data: { type: BlockEnum.TriggerSchedule, title: '', desc: '' } }),
+      createNode({ id: 'shared', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'start1', target: 'shared' }),
+      createEdge({ source: 'trigger', target: 'shared' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes.map(n => n.id)).toContain('start1')
+    expect(result.validNodes.map(n => n.id)).toContain('trigger')
+    expect(result.validNodes.map(n => n.id)).toContain('shared')
+  })
+
+  it('should not increase maxDepth when visiting nodes at same or lower depth', () => {
+    const nodes = [
+      createNode({ id: 'start', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'a', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      createNode({ id: 'b', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'start', target: 'a' }),
+      createEdge({ source: 'start', target: 'b' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.maxDepth).toBe(2)
+  })
+
+  it('should traverse from all trigger types', () => {
+    const nodes = [
+      createNode({ id: 'ts', data: { type: BlockEnum.TriggerSchedule, title: '', desc: '' } }),
+      createNode({ id: 'tp', data: { type: BlockEnum.TriggerPlugin, title: '', desc: '' } }),
+      createNode({ id: 'code1', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+      createNode({ id: 'code2', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'ts', target: 'code1' }),
+      createEdge({ source: 'tp', target: 'code2' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes).toHaveLength(4)
+  })
+
+  it('should skip start nodes already visited by a previous start node traversal', () => {
+    const nodes = [
+      createNode({ id: 'start1', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'start2', data: { type: BlockEnum.TriggerWebhook, title: '', desc: '' } }),
+      createNode({ id: 'shared', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'start1', target: 'start2' }),
+      createEdge({ source: 'start2', target: 'shared' }),
+    ]
+
+    const result = getValidTreeNodes(nodes, edges)
+    expect(result.validNodes.map(n => n.id)).toContain('start1')
+    expect(result.validNodes.map(n => n.id)).toContain('start2')
+    expect(result.validNodes.map(n => n.id)).toContain('shared')
+  })
+})
+
+describe('changeNodesAndEdgesId', () => {
+  it('should replace all node and edge ids with new uuids', () => {
+    const nodes = [
+      createNode({ id: 'old-1', data: { type: BlockEnum.Start, title: '', desc: '' } }),
+      createNode({ id: 'old-2', data: { type: BlockEnum.Code, title: '', desc: '' } }),
+    ]
+    const edges = [
+      createEdge({ source: 'old-1', target: 'old-2' }),
+    ]
+
+    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)
+  })
+
+  it('should generate unique ids for all nodes', () => {
+    const nodes = [
+      createNode({ id: 'a' }),
+      createNode({ id: 'b' }),
+      createNode({ id: 'c' }),
+    ]
+
+    const [newNodes] = changeNodesAndEdgesId(nodes, [])
+    const ids = new Set(newNodes.map(n => n.id))
+    expect(ids.size).toBe(3)
+  })
+})
diff --git a/web/app/components/workflow/utils/workflow-init.spec.ts b/web/app/components/workflow/utils/workflow-init.spec.ts
deleted file mode 100644
index 8dfcbeb30d..0000000000
--- a/web/app/components/workflow/utils/workflow-init.spec.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import type {
-  Node,
-} from '@/app/components/workflow/types'
-import { CUSTOM_ITERATION_START_NODE } from '@/app/components/workflow/nodes/iteration-start/constants'
-import { BlockEnum } from '@/app/components/workflow/types'
-import { preprocessNodesAndEdges } from './workflow-init'
-
-describe('preprocessNodesAndEdges', () => {
-  it('process nodes without iteration node or loop node should return origin nodes and edges.', () => {
-    const nodes = [
-      {
-        data: {
-          type: BlockEnum.Code,
-        },
-      },
-    ]
-
-    const result = preprocessNodesAndEdges(nodes as Node[], [])
-    expect(result).toEqual({
-      nodes,
-      edges: [],
-    })
-  })
-
-  it('process nodes with iteration node should return nodes with iteration start node', () => {
-    const nodes = [
-      {
-        id: 'iteration',
-        data: {
-          type: BlockEnum.Iteration,
-        },
-      },
-    ]
-
-    const result = preprocessNodesAndEdges(nodes as Node[], [])
-    expect(result.nodes).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          data: expect.objectContaining({
-            type: BlockEnum.IterationStart,
-          }),
-        }),
-      ]),
-    )
-  })
-
-  it('process nodes with iteration node start should return origin', () => {
-    const nodes = [
-      {
-        data: {
-          type: BlockEnum.Iteration,
-          start_node_id: 'iterationStart',
-        },
-      },
-      {
-        id: 'iterationStart',
-        type: CUSTOM_ITERATION_START_NODE,
-        data: {
-          type: BlockEnum.IterationStart,
-        },
-      },
-    ]
-    const result = preprocessNodesAndEdges(nodes as Node[], [])
-    expect(result).toEqual({
-      nodes,
-      edges: [],
-    })
-  })
-})

From c917838f9c855e32d06ff6c12fbb55422b1bd219 Mon Sep 17 00:00:00 2001
From: -LAN- <laipz8200@outlook.com>
Date: Mon, 2 Mar 2026 18:42:30 +0800
Subject: [PATCH 13/22] refactor: move workflow package to dify_graph (#32844)

---
 api/.importlinter                             | 210 +++++++++---------
 api/context/__init__.py                       |   2 +-
 api/context/flask_app_context.py              |   4 +-
 api/controllers/common/fields.py              |   2 +-
 api/controllers/console/app/app.py            |   4 +-
 api/controllers/console/app/workflow.py       |   6 +-
 .../console/app/workflow_app_log.py           |   2 +-
 .../console/app/workflow_draft_variable.py    |  10 +-
 api/controllers/console/app/workflow_run.py   |   4 +-
 .../rag_pipeline_draft_variable.py            |   4 +-
 api/controllers/console/explore/trial.py      |   2 +-
 api/controllers/console/explore/workflow.py   |   2 +-
 api/controllers/console/remote_files.py       |   2 +-
 api/controllers/files/upload.py               |   2 +-
 api/controllers/inner_api/plugin/plugin.py    |   2 +-
 api/controllers/mcp/mcp.py                    |   2 +-
 api/controllers/service_api/app/workflow.py   |   4 +-
 api/controllers/web/remote_files.py           |   2 +-
 api/controllers/web/workflow.py               |   2 +-
 api/core/agent/base_agent_runner.py           |   2 +-
 api/core/agent/cot_agent_runner.py            |   2 +-
 api/core/agent/cot_chat_agent_runner.py       |   2 +-
 api/core/agent/fc_agent_runner.py             |   4 +-
 .../easy_ui_based_app/variables/manager.py    |   2 +-
 api/core/app/app_config/entities.py           |   4 +-
 .../features/file_upload/manager.py           |   2 +-
 .../variables/manager.py                      |   2 +-
 .../app/apps/advanced_chat/app_generator.py   |  12 +-
 api/core/app/apps/advanced_chat/app_runner.py |  18 +-
 .../advanced_chat/generate_task_pipeline.py   |  12 +-
 api/core/app/apps/base_app_generator.py       |  10 +-
 api/core/app/apps/base_app_queue_manager.py   |   2 +-
 api/core/app/apps/base_app_runner.py          |   4 +-
 api/core/app/apps/chat/app_runner.py          |   2 +-
 .../common/graph_runtime_state_support.py     |   2 +-
 .../common/workflow_response_converter.py     |  18 +-
 api/core/app/apps/completion/app_runner.py    |   2 +-
 .../app/apps/pipeline/pipeline_generator.py   |   8 +-
 api/core/app/apps/pipeline/pipeline_runner.py |  22 +-
 api/core/app/apps/workflow/app_generator.py   |  12 +-
 api/core/app/apps/workflow/app_runner.py      |  16 +-
 .../apps/workflow/generate_task_pipeline.py   |  10 +-
 api/core/app/apps/workflow_app_runner.py      |  26 +--
 api/core/app/entities/app_invoke_entities.py  |   2 +-
 api/core/app/entities/queue_entities.py       |  10 +-
 api/core/app/entities/task_entities.py        |   8 +-
 .../conversation_variable_persist_layer.py    |  14 +-
 .../app/layers/pause_state_persist_layer.py   |   6 +-
 api/core/app/layers/suspend_layer.py          |   6 +-
 api/core/app/layers/timeslice_layer.py        |   6 +-
 api/core/app/layers/trigger_post_layer.py     |   6 +-
 api/core/app/llm/model_access.py              |   6 +-
 .../easy_ui_based_generate_task_pipeline.py   |   4 +-
 api/core/app/workflow/__init__.py             |   2 +-
 api/core/app/workflow/file_runtime.py         |   6 +-
 api/core/app/workflow/layers/llm_quota.py     |  18 +-
 api/core/app/workflow/layers/observability.py |   8 +-
 api/core/app/workflow/layers/persistence.py   |  16 +-
 .../datasource/datasource_file_manager.py     |   2 +-
 api/core/datasource/datasource_manager.py     |  12 +-
 .../datasource/utils/message_transformer.py   |   2 +-
 api/core/entities/execution_extra_content.py  |   2 +-
 api/core/entities/mcp_provider.py             |   2 +-
 .../helper/code_executor/code_executor.py     |   2 +-
 .../code_executor/template_transformer.py     |   2 +-
 api/core/llm_generator/llm_generator.py       |   2 +-
 api/core/mcp/server/streamable_http.py        |   2 +-
 api/core/memory/token_buffer_memory.py        |   2 +-
 api/core/ops/aliyun_trace/aliyun_trace.py     |   4 +-
 api/core/ops/aliyun_trace/utils.py            |   4 +-
 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/ops_trace_manager.py             |   2 +-
 api/core/ops/tencent_trace/span_builder.py    |   2 +-
 api/core/ops/tencent_trace/tencent_trace.py   |   4 +-
 api/core/ops/weave_trace/weave_trace.py       |   2 +-
 api/core/plugin/backwards_invocation/node.py  |  10 +-
 api/core/plugin/entities/request.py           |   8 +-
 api/core/plugin/utils/converter.py            |   2 +-
 api/core/prompt/advanced_prompt_transform.py  |   6 +-
 api/core/prompt/simple_prompt_transform.py    |   4 +-
 .../rag/index_processor/index_processor.py    |   4 +-
 .../processor/paragraph_index_processor.py    |   2 +-
 api/core/rag/models/document.py               |   2 +-
 api/core/rag/retrieval/dataset_retrieval.py   |   6 +-
 .../celery_workflow_execution_repository.py   |   4 +-
 ...lery_workflow_node_execution_repository.py |   4 +-
 api/core/repositories/factory.py              |   4 +-
 .../repositories/human_input_repository.py    |   6 +-
 ...qlalchemy_workflow_execution_repository.py |   8 +-
 ...hemy_workflow_node_execution_repository.py |   8 +-
 .../builtin_tool/providers/audio/tools/asr.py |   4 +-
 api/core/tools/custom_tool/tool.py            |   2 +-
 api/core/tools/tool_engine.py                 |   4 +-
 api/core/tools/tool_file_manager.py           |   2 +-
 api/core/tools/tool_manager.py                |  10 +-
 api/core/tools/utils/message_transformer.py   |   2 +-
 .../utils/workflow_configuration_sync.py      |   6 +-
 api/core/tools/workflow_as_tool/provider.py   |   2 +-
 api/core/tools/workflow_as_tool/tool.py       |   2 +-
 api/core/trigger/debug/event_selectors.py     |   6 +-
 api/core/workflow/__init__.py                 |   4 +
 api/core/{app => }/workflow/node_factory.py   |  48 ++--
 api/core/workflow/nodes/__init__.py           |   3 -
 .../nodes/trigger_schedule/__init__.py        |   3 -
 api/core/workflow/workflow_entry.py           |  36 +--
 api/{core/workflow => dify_graph}/README.md   |   2 +-
 .../entities => dify_graph}/__init__.py       |   0
 .../workflow => dify_graph}/constants.py      |   0
 .../context/__init__.py                       |   4 +-
 .../context/execution_context.py              |   0
 .../workflow => dify_graph}/context/models.py |   0
 .../conversation_variable_updater.py          |   2 +-
 .../entities/__init__.py                      |   0
 .../workflow => dify_graph}/entities/agent.py |   0
 .../entities/graph_config.py                  |   0
 .../entities/graph_init_params.py             |   0
 .../entities/pause_reason.py                  |   2 +-
 .../entities/workflow_execution.py            |   2 +-
 .../entities/workflow_node_execution.py       |   2 +-
 .../entities/workflow_start_reason.py         |   0
 api/{core/workflow => dify_graph}/enums.py    |   0
 api/{core/workflow => dify_graph}/errors.py   |   2 +-
 .../workflow => dify_graph}/file/__init__.py  |   0
 .../workflow => dify_graph}/file/constants.py |   0
 .../workflow => dify_graph}/file/enums.py     |   0
 .../file/file_manager.py                      |   0
 .../workflow => dify_graph}/file/helpers.py   |   0
 .../workflow => dify_graph}/file/models.py    |   0
 .../workflow => dify_graph}/file/protocols.py |   2 +-
 .../workflow => dify_graph}/file/runtime.py   |   0
 .../file/tool_file_parser.py                  |   0
 .../workflow => dify_graph}/graph/__init__.py |   0
 .../workflow => dify_graph}/graph/edge.py     |   2 +-
 .../workflow => dify_graph}/graph/graph.py    |   6 +-
 .../graph/graph_template.py                   |   0
 .../graph/validation.py                       |   2 +-
 .../graph_engine/__init__.py                  |   0
 .../graph_engine/_engine_utils.py             |   0
 .../graph_engine/command_channels/README.md   |   0
 .../graph_engine/command_channels/__init__.py |   0
 .../command_channels/in_memory_channel.py     |   0
 .../command_channels/redis_channel.py         |   0
 .../command_processing/__init__.py            |   0
 .../command_processing/command_handlers.py    |   4 +-
 .../command_processing/command_processor.py   |   0
 .../graph_engine/config.py                    |   0
 .../graph_engine/domain/__init__.py           |   0
 .../graph_engine/domain/graph_execution.py    |   6 +-
 .../graph_engine/domain/node_execution.py     |   2 +-
 .../graph_engine/entities}/__init__.py        |   0
 .../graph_engine/entities/commands.py         |   2 +-
 .../graph_engine/error_handler.py             |  10 +-
 .../graph_engine/event_management/__init__.py |   0
 .../event_management/event_handlers.py        |   8 +-
 .../event_management/event_manager.py         |   2 +-
 .../graph_engine/graph_engine.py              |  18 +-
 .../graph_engine/graph_state_manager.py       |   4 +-
 .../graph_engine/graph_traversal/__init__.py  |   0
 .../graph_traversal/edge_processor.py         |   6 +-
 .../graph_traversal/skip_propagator.py        |   2 +-
 .../graph_engine/layers/README.md             |   0
 .../graph_engine/layers/__init__.py           |   0
 .../graph_engine/layers/base.py               |   8 +-
 .../graph_engine/layers/debug_logging.py      |   2 +-
 .../graph_engine/layers/execution_limits.py   |   8 +-
 .../graph_engine/manager.py                   |   4 +-
 .../graph_engine/orchestration/__init__.py    |   0
 .../graph_engine/orchestration/dispatcher.py  |   2 +-
 .../orchestration/execution_coordinator.py    |   0
 .../graph_engine/protocols/command_channel.py |   0
 .../graph_engine/ready_queue/__init__.py      |   0
 .../graph_engine/ready_queue/factory.py       |   0
 .../graph_engine/ready_queue/in_memory.py     |   0
 .../graph_engine/ready_queue/protocol.py      |   0
 .../response_coordinator/__init__.py          |   0
 .../response_coordinator/coordinator.py       |  10 +-
 .../graph_engine/response_coordinator/path.py |   0
 .../response_coordinator/session.py           |  10 +-
 .../graph_engine/worker.py                    |  10 +-
 .../worker_management/__init__.py             |   0
 .../worker_management/worker_pool.py          |   6 +-
 .../graph_events/__init__.py                  |   0
 .../graph_events/agent.py                     |   0
 .../graph_events/base.py                      |   4 +-
 .../graph_events/graph.py                     |   6 +-
 .../graph_events/human_input.py               |   0
 .../graph_events/iteration.py                 |   0
 .../graph_events/loop.py                      |   0
 .../graph_events/node.py                      |   4 +-
 .../node_events/__init__.py                   |   0
 .../node_events/agent.py                      |   0
 .../node_events/base.py                       |   2 +-
 .../node_events/iteration.py                  |   0
 .../node_events/loop.py                       |   0
 .../node_events/node.py                       |   6 +-
 api/dify_graph/nodes/__init__.py              |   3 +
 .../nodes/agent/__init__.py                   |   0
 .../nodes/agent/agent_node.py                 |  16 +-
 .../nodes/agent/entities.py                   |   2 +-
 .../nodes/agent/exc.py                        |   0
 .../nodes/answer}/__init__.py                 |   0
 .../nodes/answer/answer_node.py               |  14 +-
 .../nodes/answer/entities.py                  |   2 +-
 .../nodes/base/__init__.py                    |   0
 .../nodes/base/entities.py                    |   2 +-
 .../workflow => dify_graph}/nodes/base/exc.py |   0
 .../nodes/base/node.py                        |  32 +--
 .../nodes/base/template.py                    |   2 +-
 .../nodes/base/usage_tracking_mixin.py        |   2 +-
 .../nodes/base/variable_template_parser.py    |   0
 .../nodes/code/__init__.py                    |   0
 .../nodes/code/code_node.py                   |  18 +-
 .../nodes/code/entities.py                    |   6 +-
 .../workflow => dify_graph}/nodes/code/exc.py |   0
 .../nodes/code/limits.py                      |   0
 .../nodes/datasource/__init__.py              |   0
 .../nodes/datasource/datasource_node.py       |  16 +-
 .../nodes/datasource/entities.py              |   2 +-
 .../nodes/datasource/exc.py                   |   0
 .../nodes/document_extractor/__init__.py      |   0
 .../nodes/document_extractor/entities.py      |   2 +-
 .../nodes/document_extractor/exc.py           |   0
 .../nodes/document_extractor/node.py          |  16 +-
 .../nodes/end}/__init__.py                    |   0
 .../nodes/end/end_node.py                     |  10 +-
 .../nodes/end/entities.py                     |   2 +-
 .../nodes/http_request/__init__.py            |   0
 .../nodes/http_request/config.py              |   0
 .../nodes/http_request/entities.py            |   2 +-
 .../nodes/http_request/exc.py                 |   0
 .../nodes/http_request/executor.py            |   6 +-
 .../nodes/http_request/node.py                |  22 +-
 .../nodes/human_input/__init__.py             |   0
 .../nodes/human_input/entities.py             |   8 +-
 .../nodes/human_input/enums.py                |   0
 .../nodes/human_input/human_input_node.py     |  20 +-
 .../nodes/if_else/__init__.py                 |   0
 .../nodes/if_else/entities.py                 |   4 +-
 .../nodes/if_else/if_else_node.py             |  14 +-
 .../nodes/iteration/__init__.py               |   0
 .../nodes/iteration/entities.py               |   2 +-
 .../nodes/iteration/exc.py                    |   0
 .../nodes/iteration/iteration_node.py         |  42 ++--
 .../nodes/iteration/iteration_start_node.py   |   8 +-
 .../nodes/knowledge_index/__init__.py         |   0
 .../nodes/knowledge_index/entities.py         |   2 +-
 .../nodes/knowledge_index/exc.py              |   0
 .../knowledge_index/knowledge_index_node.py   |  18 +-
 .../nodes/knowledge_retrieval/__init__.py     |   0
 .../nodes/knowledge_retrieval/entities.py     |   4 +-
 .../nodes/knowledge_retrieval/exc.py          |   0
 .../knowledge_retrieval_node.py               |  22 +-
 .../knowledge_retrieval/template_prompts.py   |   0
 .../nodes/list_operator/__init__.py           |   0
 .../nodes/list_operator/entities.py           |   2 +-
 .../nodes/list_operator/exc.py                |   0
 .../nodes/list_operator/node.py               |  12 +-
 .../nodes/llm/__init__.py                     |   0
 .../nodes/llm/entities.py                     |   4 +-
 .../workflow => dify_graph}/nodes/llm/exc.py  |   0
 .../nodes/llm/file_saver.py                   |   2 +-
 .../nodes/llm/llm_utils.py                    |   6 +-
 .../workflow => dify_graph}/nodes/llm/node.py |  26 +--
 .../nodes/llm/protocols.py                    |   0
 .../nodes/loop/__init__.py                    |   0
 .../nodes/loop/entities.py                    |   6 +-
 .../nodes/loop/loop_end_node.py               |   8 +-
 .../nodes/loop/loop_node.py                   |  32 +--
 .../nodes/loop/loop_start_node.py             |   8 +-
 .../nodes/node_mapping.py                     |   6 +-
 .../nodes/parameter_extractor/__init__.py     |   0
 .../nodes/parameter_extractor/entities.py     |   6 +-
 .../nodes/parameter_extractor/exc.py          |   2 +-
 .../parameter_extractor_node.py               |  22 +-
 .../nodes/parameter_extractor/prompts.py      |   0
 .../nodes/protocols.py                        |   2 +-
 .../nodes/question_classifier/__init__.py     |   0
 .../nodes/question_classifier/entities.py     |   4 +-
 .../nodes/question_classifier/exc.py          |   0
 .../question_classifier_node.py               |  22 +-
 .../question_classifier/template_prompts.py   |   0
 .../nodes/start/__init__.py                   |   0
 .../nodes/start/entities.py                   |   4 +-
 .../nodes/start/start_node.py                 |  12 +-
 .../nodes/template_transform/__init__.py      |   0
 .../nodes/template_transform/entities.py      |   4 +-
 .../template_transform/template_renderer.py   |   0
 .../template_transform_node.py                |  14 +-
 .../nodes/tool/__init__.py                    |   0
 .../nodes/tool/entities.py                    |   2 +-
 .../workflow => dify_graph}/nodes/tool/exc.py |   0
 .../nodes/tool/tool_node.py                   |  16 +-
 .../nodes/trigger_plugin/__init__.py          |   0
 .../nodes/trigger_plugin/entities.py          |   4 +-
 .../nodes/trigger_plugin/exc.py               |   0
 .../trigger_plugin/trigger_event_node.py      |  10 +-
 .../nodes/trigger_schedule/__init__.py        |   3 +
 .../nodes/trigger_schedule/entities.py        |   2 +-
 .../nodes/trigger_schedule/exc.py             |   2 +-
 .../trigger_schedule/trigger_schedule_node.py |  12 +-
 .../nodes/trigger_webhook/__init__.py         |   0
 .../nodes/trigger_webhook/entities.py         |   2 +-
 .../nodes/trigger_webhook/exc.py              |   2 +-
 .../nodes/trigger_webhook/node.py             |  16 +-
 .../nodes/variable_aggregator/__init__.py     |   0
 .../nodes/variable_aggregator/entities.py     |   4 +-
 .../variable_aggregator_node.py               |  10 +-
 .../nodes/variable_assigner}/__init__.py      |   0
 .../variable_assigner/common}/__init__.py     |   0
 .../nodes/variable_assigner/common/exc.py     |   0
 .../nodes/variable_assigner/common/helpers.py |   6 +-
 .../nodes/variable_assigner/v1/__init__.py    |   0
 .../nodes/variable_assigner/v1/node.py        |  18 +-
 .../nodes/variable_assigner/v1/node_data.py   |   2 +-
 .../nodes/variable_assigner/v2/__init__.py    |   0
 .../nodes/variable_assigner/v2/entities.py    |   2 +-
 .../nodes/variable_assigner/v2/enums.py       |   0
 .../nodes/variable_assigner/v2/exc.py         |   2 +-
 .../nodes/variable_assigner/v2/helpers.py     |   2 +-
 .../nodes/variable_assigner/v2/node.py        |  20 +-
 .../repositories/__init__.py                  |   2 +-
 .../datasource_manager_protocol.py            |   4 +-
 .../repositories/draft_variable_repository.py |   2 +-
 .../human_input_form_repository.py            |   4 +-
 .../repositories/index_processor_protocol.py  |   0
 .../repositories/rag_retrieval_protocol.py    |   4 +-
 .../summary_index_service_protocol.py         |   0
 .../workflow_execution_repository.py          |   2 +-
 .../workflow_node_execution_repository.py     |   2 +-
 .../runtime/__init__.py                       |   0
 .../runtime/graph_runtime_state.py            |  12 +-
 .../runtime/graph_runtime_state_protocol.py   |   4 +-
 .../runtime/read_only_wrappers.py             |   4 +-
 .../runtime/variable_pool.py                  |  14 +-
 .../system_variable.py                        |   4 +-
 .../utils}/__init__.py                        |   0
 api/dify_graph/utils/condition/__init__.py    |   0
 .../utils/condition/entities.py               |   0
 .../utils/condition/processor.py              |   8 +-
 .../variable_loader.py                        |   6 +-
 .../variables/__init__.py                     |   0
 .../variables/consts.py                       |   0
 .../workflow => dify_graph}/variables/exc.py  |   0
 .../variables/input_entities.py               |   2 +-
 .../variables/segment_group.py                |   0
 .../variables/segments.py                     |   2 +-
 .../variables/types.py                        |   2 +-
 .../variables/utils.py                        |   0
 .../variables/variables.py                    |   0
 .../workflow_type_encoder.py                  |   4 +-
 ...rameters_cache_when_sync_draft_workflow.py |   4 +-
 ...nc_workflow_schedule_when_app_published.py |   2 +-
 ...oin_when_app_published_workflow_updated.py |   4 +-
 ...ers_when_app_published_workflow_updated.py |   2 +-
 ..._api_workflow_node_execution_repository.py |   2 +-
 .../logstore_workflow_execution_repository.py |   6 +-
 ...tore_workflow_node_execution_repository.py |  10 +-
 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.py                 |   2 +-
 api/factories/variable_factory.py             |  12 +-
 api/fields/_value_type_serializer.py          |   4 +-
 api/fields/conversation_fields.py             |   2 +-
 api/fields/member_fields.py                   |   2 +-
 api/fields/message_fields.py                  |   2 +-
 api/fields/raws.py                            |   2 +-
 api/fields/workflow_fields.py                 |   2 +-
 api/libs/helper.py                            |   2 +-
 api/models/enums.py                           |   2 +-
 api/models/human_input.py                     |   2 +-
 api/models/model.py                           |   6 +-
 api/models/workflow.py                        |  22 +-
 api/pyproject.toml                            |   2 +-
 .../api_workflow_node_execution_repository.py |   2 +-
 .../api_workflow_run_repository.py            |   6 +-
 api/repositories/entities/workflow_pause.py   |   2 +-
 ..._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               |  14 +-
 api/services/app_task_service.py              |   2 +-
 api/services/conversation_service.py          |   2 +-
 api/services/conversation_variable_updater.py |   2 +-
 api/services/dataset_service.py               |   2 +-
 api/services/external_knowledge_service.py    |   2 +-
 api/services/file_service.py                  |   2 +-
 .../human_input_delivery_test_service.py      |   4 +-
 api/services/human_input_service.py           |   4 +-
 api/services/rag_pipeline/rag_pipeline.py     |  28 +--
 .../rag_pipeline/rag_pipeline_dsl_service.py  |  14 +-
 .../archive_paid_plan_workflow_run.py         |   2 +-
 api/services/trigger/schedule_service.py      |   6 +-
 api/services/trigger/trigger_service.py       |   4 +-
 api/services/trigger/webhook_service.py       |   6 +-
 api/services/variable_truncator.py            |   8 +-
 api/services/workflow/workflow_converter.py   |   6 +-
 api/services/workflow_app_service.py          |   2 +-
 .../workflow_draft_variable_service.py        |  24 +-
 .../workflow_event_snapshot_service.py        |   8 +-
 api/services/workflow_service.py              |  48 ++--
 .../app_generate/workflow_execute_task.py     |   2 +-
 api/tasks/async_workflow_tasks.py             |   2 +-
 api/tasks/human_input_timeout_tasks.py        |   4 +-
 api/tasks/mail_human_input_delivery_task.py   |   4 +-
 api/tasks/trigger_processing_tasks.py         |   4 +-
 api/tasks/workflow_execution_tasks.py         |   4 +-
 api/tasks/workflow_node_execution_tasks.py    |   4 +-
 api/tasks/workflow_schedule_tasks.py          |   2 +-
 .../test_datasource_manager_integration.py    |   2 +-
 .../test_datasource_node_integration.py       |   6 +-
 .../factories/test_storage_key_loader.py      |   2 +-
 .../test_workflow_draft_variable_service.py   |  10 +-
 .../test_remove_app_and_related_data_task.py  |   6 +-
 .../workflow/nodes/test_code.py               |  18 +-
 .../workflow/nodes/test_http.py               |  26 +--
 .../workflow/nodes/test_llm.py                |  14 +-
 .../nodes/test_parameter_extractor.py         |  12 +-
 .../workflow/nodes/test_template_transform.py |  14 +-
 .../workflow/nodes/test_tool.py               |  16 +-
 ...test_chat_conversation_status_count_api.py |   2 +-
 .../layers/test_pause_state_persist_layer.py  |  20 +-
 .../test_dataset_retrieval_integration.py     |   2 +-
 .../test_human_input_form_repository_impl.py  |   4 +-
 .../test_human_input_resume_node_execution.py |  30 +--
 .../factories/test_storage_key_loader.py      |   2 +-
 .../helpers/execution_extra_content.py        |   2 +-
 ..._api_workflow_node_execution_repository.py |   2 +-
 ..._sqlalchemy_api_workflow_run_repository.py |   6 +-
 .../services/test_agent_service.py            |   2 +-
 .../test_delete_archived_workflow_run.py      |   2 +-
 .../test_human_input_delivery_test.py         |   4 +-
 .../services/test_workflow_app_service.py     |   2 +-
 .../test_workflow_draft_variable_service.py   |   8 +-
 .../services/test_workflow_service.py         |  34 +--
 .../workflow/test_workflow_converter.py       |   2 +-
 ...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 +-
 .../app/test_workflow_pause_details_api.py    |   8 +-
 .../app/workflow_draft_variables_test.py      |  12 +-
 .../service_api/app/test_workflow.py          |   4 +-
 .../service_api/app/test_workflow_fields.py   |   2 +-
 .../features/file_upload/test_manager.py      |   2 +-
 .../test_app_runner_conversation_variables.py |   2 +-
 ...t_generate_task_pipeline_extra_contents.py |   2 +-
 .../chat/test_base_app_runner_multimodal.py   |   2 +-
 .../test_graph_runtime_state_support.py       |   6 +-
 .../test_workflow_response_converter.py       |   4 +-
 ...workflow_response_converter_human_input.py |   6 +-
 ..._workflow_response_converter_resumption.py |   6 +-
 ..._workflow_response_converter_truncation.py |   6 +-
 .../core/app/apps/test_base_app_generator.py  |   2 +-
 .../core/app/apps/test_pause_resume.py        |  34 +--
 .../test_workflow_app_runner_notifications.py |   4 +-
 .../test_workflow_app_runner_single_node.py   |   4 +-
 .../app/apps/test_workflow_pause_events.py    |  12 +-
 .../workflow/test_generate_task_pipeline.py   |   6 +-
 ...est_conversation_variable_persist_layer.py |  20 +-
 .../layers/test_pause_state_persist_layer.py  |  12 +-
 .../datasource/test_datasource_manager.py     |   4 +-
 api/tests/unit_tests/core/file/test_models.py |   2 +-
 .../core/mcp/server/test_streamable_http.py   |   2 +-
 .../core/ops/test_arize_phoenix_trace.py      |   2 +-
 .../prompt/test_advanced_prompt_transform.py  |   4 +-
 .../test_dataset_retrieval_methods.py         |   4 +-
 ...st_celery_workflow_execution_repository.py |   2 +-
 ...lery_workflow_node_execution_repository.py |   6 +-
 .../core/repositories/test_factory.py         |   4 +-
 .../test_human_input_form_repository_impl.py  |   4 +-
 ...rkflow_node_execution_conflict_handling.py |   4 +-
 ...test_workflow_node_execution_truncation.py |   4 +-
 api/tests/unit_tests/core/test_file.py        |   2 +-
 .../test_trigger_debug_event_selectors.py     |   2 +-
 .../unit_tests/core/variables/test_segment.py |  12 +-
 .../core/variables/test_segment_type.py       |   2 +-
 .../variables/test_segment_type_validation.py |  10 +-
 .../core/variables/test_variables.py          |   4 +-
 .../context/test_execution_context.py         |  12 +-
 .../entities/test_graph_runtime_state.py      |   8 +-
 .../workflow/entities/test_pause_reason.py    |   2 +-
 .../core/workflow/entities/test_template.py   |   2 +-
 .../workflow/entities/test_variable_pool.py   |   4 +-
 .../entities/test_workflow_node_execution.py  |   4 +-
 .../core/workflow/graph/test_graph.py         |   8 +-
 .../core/workflow/graph/test_graph_builder.py |   6 +-
 .../graph/test_graph_skip_validation.py       |  14 +-
 .../workflow/graph/test_graph_validation.py   |  16 +-
 .../core/workflow/graph_engine/README.md      |  20 +-
 .../command_channels/test_redis_channel.py    |   6 +-
 .../event_management/test_event_handlers.py   |  24 +-
 .../event_management/test_event_manager.py    |   6 +-
 .../graph_traversal/test_skip_propagator.py   |   6 +-
 .../graph_engine/human_input_test_utils.py    |   4 +-
 .../workflow/graph_engine/layers/conftest.py  |   8 +-
 .../layers/test_layer_initialization.py       |   8 +-
 .../graph_engine/layers/test_llm_quota.py     |   8 +-
 .../graph_engine/layers/test_observability.py |   8 +-
 .../orchestration/test_dispatcher.py          |  14 +-
 .../graph_engine/test_answer_end_with_text.py |   2 +-
 .../graph_engine/test_auto_mock_system.py     |  12 +-
 .../graph_engine/test_basic_chatflow.py       |   2 +-
 .../graph_engine/test_command_system.py       |  22 +-
 .../test_complex_branch_workflow.py           |   2 +-
 ...ditional_streaming_vs_template_workflow.py |   8 +-
 .../test_dispatcher_pause_drain.py            |   8 +-
 .../test_end_node_without_value_type.py       |   2 +-
 .../test_execution_coordinator.py             |  10 +-
 .../graph_engine/test_graph_engine.py         |  20 +-
 .../test_graph_execution_serialization.py     |  14 +-
 .../graph_engine/test_graph_state_snapshot.py |  24 +-
 .../test_human_input_pause_multi_branch.py    |  30 +--
 .../test_human_input_pause_single_branch.py   |  30 +--
 .../graph_engine/test_if_else_streaming.py    |  28 +--
 .../graph_engine/test_loop_contains_answer.py |   2 +-
 .../graph_engine/test_loop_with_tool.py       |   2 +-
 .../workflow/graph_engine/test_mock_config.py |   2 +-
 .../graph_engine/test_mock_factory.py         |  10 +-
 .../test_mock_iteration_simple.py             |  14 +-
 .../workflow/graph_engine/test_mock_nodes.py  |  56 ++---
 .../test_mock_nodes_template_code.py          |  46 ++--
 .../workflow/graph_engine/test_mock_simple.py |  10 +-
 .../test_parallel_human_input_join_resume.py  |  36 +--
 ...rallel_human_input_pause_missing_finish.py |  32 +--
 .../test_parallel_streaming_workflow.py       |  22 +-
 .../test_pause_deferred_ready_nodes.py        |  36 +--
 .../graph_engine/test_pause_resume_state.py   |  34 +--
 .../test_redis_stop_integration.py            |   6 +-
 .../test_streaming_conversation_variables.py  |   2 +-
 .../graph_engine/test_table_runner.py         |  18 +-
 .../graph_engine/test_tool_in_chatflow.py     |   6 +-
 .../graph_engine/test_variable_aggregator.py  |   6 +-
 .../core/workflow/nodes/answer/test_answer.py |  14 +-
 .../workflow/nodes/base/test_base_node.py     |   8 +-
 .../test_get_node_type_classes_mapping.py     |  10 +-
 .../workflow/nodes/code/code_node_spec.py     |  10 +-
 .../core/workflow/nodes/code/entities_spec.py |   4 +-
 .../nodes/datasource/test_datasource_node.py  |   6 +-
 .../nodes/http_request/test_config.py         |   2 +-
 .../nodes/http_request/test_entities.py       |   4 +-
 .../test_http_request_executor.py             |  14 +-
 .../http_request/test_http_request_node.py    |  16 +-
 .../human_input/test_email_delivery_config.py |   4 +-
 .../nodes/human_input/test_entities.py        |  18 +-
 .../test_human_input_form_filled_event.py     |  14 +-
 .../workflow/nodes/iteration/entities_spec.py |   2 +-
 .../nodes/iteration/iteration_node_spec.py    |   8 +-
 .../test_knowledge_index_node.py              |  20 +-
 .../test_knowledge_retrieval_node.py          |  22 +-
 .../workflow/nodes/list_operator/node_spec.py |  12 +-
 .../workflow/nodes/llm/test_file_saver.py     |   4 +-
 .../core/workflow/nodes/llm/test_node.py      |  22 +-
 .../core/workflow/nodes/llm/test_scenarios.py |   4 +-
 .../parameter_extractor/test_entities.py      |   4 +-
 .../test_parameter_extractor_node.py          |  10 +-
 .../nodes/template_transform/entities_spec.py |   4 +-
 .../template_transform_node_spec.py           |  30 +--
 .../core/workflow/nodes/test_base_node.py     |  12 +-
 .../nodes/test_document_extractor_node.py     |  24 +-
 .../core/workflow/nodes/test_if_else.py       |  22 +-
 .../core/workflow/nodes/test_list_operator.py |  12 +-
 .../nodes/test_question_classifier_node.py    |   2 +-
 .../nodes/test_start_node_json_object.py      |  12 +-
 .../workflow/nodes/tool/test_tool_node.py     |  16 +-
 .../v1/test_variable_assigner_v1.py           |  20 +-
 .../variable_assigner/v2/test_helpers.py      |   6 +-
 .../v2/test_variable_assigner_v2.py           |  16 +-
 .../workflow/nodes/webhook/test_entities.py   |   4 +-
 .../workflow/nodes/webhook/test_exceptions.py |   6 +-
 .../webhook/test_webhook_file_conversion.py   |  26 +--
 .../nodes/webhook/test_webhook_node.py        |  18 +-
 .../unit_tests/core/workflow/test_enums.py    |   2 +-
 .../core/workflow/test_system_variable.py     |   6 +-
 .../test_system_variable_read_only_view.py    |   4 +-
 .../core/workflow/test_variable_pool.py       |  14 +-
 .../core/workflow/test_workflow_entry.py      |  18 +-
 .../test_workflow_entry_redis_channel.py      |   4 +-
 .../core/workflow/utils/test_condition.py     |   6 +-
 .../utils/test_variable_template_parser.py    |   4 +-
 .../factories/test_variable_factory.py        |  10 +-
 .../unit_tests/libs/_human_input/support.py   |   4 +-
 .../libs/_human_input/test_form_service.py    |   4 +-
 .../libs/_human_input/test_models.py          |   4 +-
 .../libs/test_cron_compatibility.py           |   2 +-
 .../unit_tests/models/test_app_models.py      |   4 +-
 .../models/test_conversation_variable.py      |   2 +-
 api/tests/unit_tests/models/test_workflow.py  |   8 +-
 .../unit_tests/models/test_workflow_models.py |   2 +-
 ..._sqlalchemy_api_workflow_run_repository.py |   6 +-
 ...hemy_execution_extra_content_repository.py |   4 +-
 .../test_sqlalchemy_repository.py             |   6 +-
 ...hemy_workflow_node_execution_repository.py |   4 +-
 .../services/external_dataset_service.py      |   2 +-
 .../test_human_input_delivery_test_service.py |   4 +-
 .../services/test_human_input_service.py      |   4 +-
 .../services/test_schedule_service.py         |   8 +-
 .../services/test_variable_truncator.py       |   6 +-
 .../test_workflow_run_service_pause.py        |   2 +-
 .../services/test_workflow_service.py         |   4 +-
 .../workflow/test_draft_var_loader_simple.py  |   8 +-
 .../workflow/test_workflow_converter.py       |   2 +-
 .../test_workflow_draft_variable_service.py   |   8 +-
 .../test_workflow_event_snapshot_service.py   |   6 +-
 .../test_workflow_human_input_delivery.py     |   4 +-
 .../workflow/test_workflow_service.py         |   6 +-
 .../tasks/test_human_input_timeout_tasks.py   |   2 +-
 .../test_workflow_node_execution_tasks.py     |   4 +-
 613 files changed, 2008 insertions(+), 2012 deletions(-)
 rename api/core/{app => }/workflow/node_factory.py (88%)
 delete mode 100644 api/core/workflow/nodes/__init__.py
 delete mode 100644 api/core/workflow/nodes/trigger_schedule/__init__.py
 rename api/{core/workflow => dify_graph}/README.md (98%)
 rename api/{core/workflow/graph_engine/entities => dify_graph}/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/constants.py (100%)
 rename api/{core/workflow => dify_graph}/context/__init__.py (86%)
 rename api/{core/workflow => dify_graph}/context/execution_context.py (100%)
 rename api/{core/workflow => dify_graph}/context/models.py (100%)
 rename api/{core/workflow => dify_graph}/conversation_variable_updater.py (96%)
 rename api/{core/workflow => dify_graph}/entities/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/entities/agent.py (100%)
 rename api/{core/workflow => dify_graph}/entities/graph_config.py (100%)
 rename api/{core/workflow => dify_graph}/entities/graph_init_params.py (100%)
 rename api/{core/workflow => dify_graph}/entities/pause_reason.py (96%)
 rename api/{core/workflow => dify_graph}/entities/workflow_execution.py (96%)
 rename api/{core/workflow => dify_graph}/entities/workflow_node_execution.py (98%)
 rename api/{core/workflow => dify_graph}/entities/workflow_start_reason.py (100%)
 rename api/{core/workflow => dify_graph}/enums.py (100%)
 rename api/{core/workflow => dify_graph}/errors.py (88%)
 rename api/{core/workflow => dify_graph}/file/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/file/constants.py (100%)
 rename api/{core/workflow => dify_graph}/file/enums.py (100%)
 rename api/{core/workflow => dify_graph}/file/file_manager.py (100%)
 rename api/{core/workflow => dify_graph}/file/helpers.py (100%)
 rename api/{core/workflow => dify_graph}/file/models.py (100%)
 rename api/{core/workflow => dify_graph}/file/protocols.py (94%)
 rename api/{core/workflow => dify_graph}/file/runtime.py (100%)
 rename api/{core/workflow => dify_graph}/file/tool_file_parser.py (100%)
 rename api/{core/workflow => dify_graph}/graph/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph/edge.py (91%)
 rename api/{core/workflow => dify_graph}/graph/graph.py (98%)
 rename api/{core/workflow => dify_graph}/graph/graph_template.py (100%)
 rename api/{core/workflow => dify_graph}/graph/validation.py (98%)
 rename api/{core/workflow => dify_graph}/graph_engine/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/_engine_utils.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/command_channels/README.md (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/command_channels/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/command_channels/in_memory_channel.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/command_channels/redis_channel.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/command_processing/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/command_processing/command_handlers.py (94%)
 rename api/{core/workflow => dify_graph}/graph_engine/command_processing/command_processor.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/config.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/domain/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/domain/graph_execution.py (97%)
 rename api/{core/workflow => dify_graph}/graph_engine/domain/node_execution.py (96%)
 rename api/{core/workflow/nodes/answer => dify_graph/graph_engine/entities}/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/entities/commands.py (96%)
 rename api/{core/workflow => dify_graph}/graph_engine/error_handler.py (97%)
 rename api/{core/workflow => dify_graph}/graph_engine/event_management/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/event_management/event_handlers.py (98%)
 rename api/{core/workflow => dify_graph}/graph_engine/event_management/event_manager.py (98%)
 rename api/{core/workflow => dify_graph}/graph_engine/graph_engine.py (95%)
 rename api/{core/workflow => dify_graph}/graph_engine/graph_state_manager.py (98%)
 rename api/{core/workflow => dify_graph}/graph_engine/graph_traversal/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/graph_traversal/edge_processor.py (97%)
 rename api/{core/workflow => dify_graph}/graph_engine/graph_traversal/skip_propagator.py (98%)
 rename api/{core/workflow => dify_graph}/graph_engine/layers/README.md (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/layers/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/layers/base.py (94%)
 rename api/{core/workflow => dify_graph}/graph_engine/layers/debug_logging.py (99%)
 rename api/{core/workflow => dify_graph}/graph_engine/layers/execution_limits.py (94%)
 rename api/{core/workflow => dify_graph}/graph_engine/manager.py (94%)
 rename api/{core/workflow => dify_graph}/graph_engine/orchestration/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/orchestration/dispatcher.py (99%)
 rename api/{core/workflow => dify_graph}/graph_engine/orchestration/execution_coordinator.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/protocols/command_channel.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/ready_queue/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/ready_queue/factory.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/ready_queue/in_memory.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/ready_queue/protocol.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/response_coordinator/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/response_coordinator/coordinator.py (98%)
 rename api/{core/workflow => dify_graph}/graph_engine/response_coordinator/path.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/response_coordinator/session.py (85%)
 rename api/{core/workflow => dify_graph}/graph_engine/worker.py (95%)
 rename api/{core/workflow => dify_graph}/graph_engine/worker_management/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_engine/worker_management/worker_pool.py (98%)
 rename api/{core/workflow => dify_graph}/graph_events/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/graph_events/agent.py (100%)
 rename api/{core/workflow => dify_graph}/graph_events/base.py (87%)
 rename api/{core/workflow => dify_graph}/graph_events/graph.py (90%)
 rename api/{core/workflow => dify_graph}/graph_events/human_input.py (100%)
 rename api/{core/workflow => dify_graph}/graph_events/iteration.py (100%)
 rename api/{core/workflow => dify_graph}/graph_events/loop.py (100%)
 rename api/{core/workflow => dify_graph}/graph_events/node.py (96%)
 rename api/{core/workflow => dify_graph}/node_events/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/node_events/agent.py (100%)
 rename api/{core/workflow => dify_graph}/node_events/base.py (91%)
 rename api/{core/workflow => dify_graph}/node_events/iteration.py (100%)
 rename api/{core/workflow => dify_graph}/node_events/loop.py (100%)
 rename api/{core/workflow => dify_graph}/node_events/node.py (92%)
 create mode 100644 api/dify_graph/nodes/__init__.py
 rename api/{core/workflow => dify_graph}/nodes/agent/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/agent/agent_node.py (98%)
 rename api/{core/workflow => dify_graph}/nodes/agent/entities.py (95%)
 rename api/{core/workflow => dify_graph}/nodes/agent/exc.py (100%)
 rename api/{core/workflow/nodes/end => dify_graph/nodes/answer}/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/answer/answer_node.py (83%)
 rename api/{core/workflow => dify_graph}/nodes/answer/entities.py (97%)
 rename api/{core/workflow => dify_graph}/nodes/base/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/base/entities.py (99%)
 rename api/{core/workflow => dify_graph}/nodes/base/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/base/node.py (96%)
 rename api/{core/workflow => dify_graph}/nodes/base/template.py (98%)
 rename api/{core/workflow => dify_graph}/nodes/base/usage_tracking_mixin.py (95%)
 rename api/{core/workflow => dify_graph}/nodes/base/variable_template_parser.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/code/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/code/code_node.py (97%)
 rename api/{core/workflow => dify_graph}/nodes/code/entities.py (88%)
 rename api/{core/workflow => dify_graph}/nodes/code/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/code/limits.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/datasource/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/datasource/datasource_node.py (94%)
 rename api/{core/workflow => dify_graph}/nodes/datasource/entities.py (96%)
 rename api/{core/workflow => dify_graph}/nodes/datasource/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/document_extractor/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/document_extractor/entities.py (84%)
 rename api/{core/workflow => dify_graph}/nodes/document_extractor/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/document_extractor/node.py (98%)
 rename api/{core/workflow/nodes/variable_assigner => dify_graph/nodes/end}/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/end/end_node.py (81%)
 rename api/{core/workflow => dify_graph}/nodes/end/entities.py (87%)
 rename api/{core/workflow => dify_graph}/nodes/http_request/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/http_request/config.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/http_request/entities.py (99%)
 rename api/{core/workflow => dify_graph}/nodes/http_request/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/http_request/executor.py (99%)
 rename api/{core/workflow => dify_graph}/nodes/http_request/node.py (93%)
 rename api/{core/workflow => dify_graph}/nodes/human_input/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/human_input/entities.py (98%)
 rename api/{core/workflow => dify_graph}/nodes/human_input/enums.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/human_input/human_input_node.py (95%)
 rename api/{core/workflow => dify_graph}/nodes/if_else/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/if_else/entities.py (82%)
 rename api/{core/workflow => dify_graph}/nodes/if_else/if_else_node.py (90%)
 rename api/{core/workflow => dify_graph}/nodes/iteration/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/iteration/entities.py (94%)
 rename api/{core/workflow => dify_graph}/nodes/iteration/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/iteration/iteration_node.py (95%)
 rename api/{core/workflow => dify_graph}/nodes/iteration/iteration_start_node.py (60%)
 rename api/{core/workflow => dify_graph}/nodes/knowledge_index/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/knowledge_index/entities.py (98%)
 rename api/{core/workflow => dify_graph}/nodes/knowledge_index/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/knowledge_index/knowledge_index_node.py (90%)
 rename api/{core/workflow => dify_graph}/nodes/knowledge_retrieval/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/knowledge_retrieval/entities.py (96%)
 rename api/{core/workflow => dify_graph}/nodes/knowledge_retrieval/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/knowledge_retrieval/knowledge_retrieval_node.py (94%)
 rename api/{core/workflow => dify_graph}/nodes/knowledge_retrieval/template_prompts.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/list_operator/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/list_operator/entities.py (96%)
 rename api/{core/workflow => dify_graph}/nodes/list_operator/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/list_operator/node.py (97%)
 rename api/{core/workflow => dify_graph}/nodes/llm/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/llm/entities.py (96%)
 rename api/{core/workflow => dify_graph}/nodes/llm/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/llm/file_saver.py (98%)
 rename api/{core/workflow => dify_graph}/nodes/llm/llm_utils.py (93%)
 rename api/{core/workflow => dify_graph}/nodes/llm/node.py (98%)
 rename api/{core/workflow => dify_graph}/nodes/llm/protocols.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/loop/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/loop/entities.py (91%)
 rename api/{core/workflow => dify_graph}/nodes/loop/loop_end_node.py (59%)
 rename api/{core/workflow => dify_graph}/nodes/loop/loop_node.py (95%)
 rename api/{core/workflow => dify_graph}/nodes/loop/loop_start_node.py (59%)
 rename api/{core/workflow => dify_graph}/nodes/node_mapping.py (65%)
 rename api/{core/workflow => dify_graph}/nodes/parameter_extractor/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/parameter_extractor/entities.py (95%)
 rename api/{core/workflow => dify_graph}/nodes/parameter_extractor/exc.py (97%)
 rename api/{core/workflow => dify_graph}/nodes/parameter_extractor/parameter_extractor_node.py (98%)
 rename api/{core/workflow => dify_graph}/nodes/parameter_extractor/prompts.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/protocols.py (96%)
 rename api/{core/workflow => dify_graph}/nodes/question_classifier/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/question_classifier/entities.py (87%)
 rename api/{core/workflow => dify_graph}/nodes/question_classifier/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/question_classifier/question_classifier_node.py (95%)
 rename api/{core/workflow => dify_graph}/nodes/question_classifier/template_prompts.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/start/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/start/entities.py (64%)
 rename api/{core/workflow => dify_graph}/nodes/start/start_node.py (84%)
 rename api/{core/workflow => dify_graph}/nodes/template_transform/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/template_transform/entities.py (57%)
 rename api/{core/workflow => dify_graph}/nodes/template_transform/template_renderer.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/template_transform/template_transform_node.py (88%)
 rename api/{core/workflow => dify_graph}/nodes/tool/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/tool/entities.py (98%)
 rename api/{core/workflow => dify_graph}/nodes/tool/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/tool/tool_node.py (97%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_plugin/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_plugin/entities.py (95%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_plugin/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_plugin/trigger_event_node.py (85%)
 create mode 100644 api/dify_graph/nodes/trigger_schedule/__init__.py
 rename api/{core/workflow => dify_graph}/nodes/trigger_schedule/entities.py (97%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_schedule/exc.py (90%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_schedule/trigger_schedule_node.py (77%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_webhook/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_webhook/entities.py (97%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_webhook/exc.py (86%)
 rename api/{core/workflow => dify_graph}/nodes/trigger_webhook/node.py (93%)
 rename api/{core/workflow => dify_graph}/nodes/variable_aggregator/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/variable_aggregator/entities.py (83%)
 rename api/{core/workflow => dify_graph}/nodes/variable_aggregator/variable_aggregator_node.py (81%)
 rename api/{core/workflow/nodes/variable_assigner/common => dify_graph/nodes/variable_assigner}/__init__.py (100%)
 rename api/{core/workflow/utils => dify_graph/nodes/variable_assigner/common}/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/common/exc.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/common/helpers.py (90%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/v1/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/v1/node.py (88%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/v1/node_data.py (86%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/v2/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/v2/entities.py (94%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/v2/enums.py (100%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/v2/exc.py (93%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/v2/helpers.py (98%)
 rename api/{core/workflow => dify_graph}/nodes/variable_assigner/v2/node.py (93%)
 rename api/{core/workflow => dify_graph}/repositories/__init__.py (69%)
 rename api/{core/workflow => dify_graph}/repositories/datasource_manager_protocol.py (91%)
 rename api/{core/workflow => dify_graph}/repositories/draft_variable_repository.py (95%)
 rename api/{core/workflow => dify_graph}/repositories/human_input_form_repository.py (96%)
 rename api/{core/workflow => dify_graph}/repositories/index_processor_protocol.py (100%)
 rename api/{core/workflow => dify_graph}/repositories/rag_retrieval_protocol.py (97%)
 rename api/{core/workflow => dify_graph}/repositories/summary_index_service_protocol.py (100%)
 rename api/{core/workflow => dify_graph}/repositories/workflow_execution_repository.py (95%)
 rename api/{core/workflow => dify_graph}/repositories/workflow_node_execution_repository.py (97%)
 rename api/{core/workflow => dify_graph}/runtime/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/runtime/graph_runtime_state.py (97%)
 rename api/{core/workflow => dify_graph}/runtime/graph_runtime_state_protocol.py (94%)
 rename api/{core/workflow => dify_graph}/runtime/read_only_wrappers.py (95%)
 rename api/{core/workflow => dify_graph}/runtime/variable_pool.py (95%)
 rename api/{core/workflow => dify_graph}/system_variable.py (98%)
 rename api/{core/workflow/utils/condition => dify_graph/utils}/__init__.py (100%)
 create mode 100644 api/dify_graph/utils/condition/__init__.py
 rename api/{core/workflow => dify_graph}/utils/condition/entities.py (100%)
 rename api/{core/workflow => dify_graph}/utils/condition/processor.py (98%)
 rename api/{core/workflow => dify_graph}/variable_loader.py (95%)
 rename api/{core/workflow => dify_graph}/variables/__init__.py (100%)
 rename api/{core/workflow => dify_graph}/variables/consts.py (100%)
 rename api/{core/workflow => dify_graph}/variables/exc.py (100%)
 rename api/{core/workflow => dify_graph}/variables/input_entities.py (97%)
 rename api/{core/workflow => dify_graph}/variables/segment_group.py (100%)
 rename api/{core/workflow => dify_graph}/variables/segments.py (99%)
 rename api/{core/workflow => dify_graph}/variables/types.py (99%)
 rename api/{core/workflow => dify_graph}/variables/utils.py (100%)
 rename api/{core/workflow => dify_graph}/variables/variables.py (100%)
 rename api/{core/workflow => dify_graph}/workflow_type_encoder.py (95%)

diff --git a/api/.importlinter b/api/.importlinter
index 28c853bb62..0bba4fb1e0 100644
--- a/api/.importlinter
+++ b/api/.importlinter
@@ -1,6 +1,7 @@
 [importlinter]
 root_packages =
     core
+    dify_graph
     configs
     controllers
     extensions
@@ -21,48 +22,48 @@ layers =
     runtime
     entities
 containers =
-    core.workflow
+    dify_graph
 ignore_imports =
-    core.workflow.nodes.base.node -> core.workflow.graph_events
-    core.workflow.nodes.iteration.iteration_node -> core.workflow.graph_events
-    core.workflow.nodes.loop.loop_node -> core.workflow.graph_events
+    dify_graph.nodes.base.node -> dify_graph.graph_events
+    dify_graph.nodes.iteration.iteration_node -> dify_graph.graph_events
+    dify_graph.nodes.loop.loop_node -> dify_graph.graph_events
 
-    core.workflow.nodes.iteration.iteration_node -> core.app.workflow.node_factory
-    core.workflow.nodes.loop.loop_node -> core.app.workflow.node_factory
-    core.workflow.nodes.iteration.iteration_node -> core.app.workflow.layers.llm_quota
-    core.workflow.nodes.loop.loop_node -> core.app.workflow.layers.llm_quota
+    dify_graph.nodes.iteration.iteration_node -> core.workflow.node_factory
+    dify_graph.nodes.loop.loop_node -> core.workflow.node_factory
+    dify_graph.nodes.iteration.iteration_node -> core.app.workflow.layers.llm_quota
+    dify_graph.nodes.loop.loop_node -> core.app.workflow.layers.llm_quota
 
-    core.workflow.nodes.iteration.iteration_node -> core.workflow.graph_engine
-    core.workflow.nodes.iteration.iteration_node -> core.workflow.graph
-    core.workflow.nodes.iteration.iteration_node -> core.workflow.graph_engine.command_channels
-    core.workflow.nodes.loop.loop_node -> core.workflow.graph_engine
-    core.workflow.nodes.loop.loop_node -> core.workflow.graph
-    core.workflow.nodes.loop.loop_node -> core.workflow.graph_engine.command_channels
+    dify_graph.nodes.iteration.iteration_node -> dify_graph.graph_engine
+    dify_graph.nodes.iteration.iteration_node -> dify_graph.graph
+    dify_graph.nodes.iteration.iteration_node -> dify_graph.graph_engine.command_channels
+    dify_graph.nodes.loop.loop_node -> dify_graph.graph_engine
+    dify_graph.nodes.loop.loop_node -> dify_graph.graph
+    dify_graph.nodes.loop.loop_node -> dify_graph.graph_engine.command_channels
     # TODO(QuantumGhost): fix the import violation later
-    core.workflow.entities.pause_reason -> core.workflow.nodes.human_input.entities
+    dify_graph.entities.pause_reason -> dify_graph.nodes.human_input.entities
 
 [importlinter:contract:workflow-infrastructure-dependencies]
 name = Workflow Infrastructure Dependencies
 type = forbidden
 source_modules =
-    core.workflow
+    dify_graph
 forbidden_modules =
     extensions.ext_database
     extensions.ext_redis
 allow_indirect_imports = True
 ignore_imports =
-    core.workflow.nodes.agent.agent_node -> extensions.ext_database
-    core.workflow.nodes.llm.file_saver -> extensions.ext_database
-    core.workflow.nodes.llm.node -> extensions.ext_database
-    core.workflow.nodes.tool.tool_node -> extensions.ext_database
+    dify_graph.nodes.agent.agent_node -> extensions.ext_database
+    dify_graph.nodes.llm.file_saver -> extensions.ext_database
+    dify_graph.nodes.llm.node -> extensions.ext_database
+    dify_graph.nodes.tool.tool_node -> extensions.ext_database
     # TODO(QuantumGhost): use DI to avoid depending on global DB.
-    core.workflow.nodes.human_input.human_input_node -> extensions.ext_database
+    dify_graph.nodes.human_input.human_input_node -> extensions.ext_database
 
 [importlinter:contract:workflow-external-imports]
 name = Workflow External Imports
 type = forbidden
 source_modules =
-    core.workflow
+    dify_graph
 forbidden_modules =
     configs
     controllers
@@ -100,77 +101,68 @@ forbidden_modules =
     core.trigger
     core.variables
 ignore_imports =
-    core.workflow.nodes.loop.loop_node -> core.app.workflow.node_factory
-    core.workflow.workflow_entry -> core.app.workflow.layers.observability
-    core.workflow.nodes.agent.agent_node -> core.model_manager
-    core.workflow.nodes.agent.agent_node -> core.provider_manager
-    core.workflow.nodes.agent.agent_node -> core.tools.tool_manager
-    core.workflow.nodes.document_extractor.node -> core.helper.ssrf_proxy
-    core.workflow.nodes.iteration.iteration_node -> core.app.workflow.node_factory
-    core.workflow.nodes.iteration.iteration_node -> core.app.workflow.layers.llm_quota
-    core.workflow.nodes.llm.llm_utils -> core.model_manager
-    core.workflow.nodes.llm.protocols -> core.model_manager
-    core.workflow.nodes.llm.llm_utils -> core.model_runtime.model_providers.__base.large_language_model
-    core.workflow.nodes.llm.node -> core.tools.signature
-    core.workflow.nodes.tool.tool_node -> core.callback_handler.workflow_tool_callback_handler
-    core.workflow.nodes.tool.tool_node -> core.tools.tool_engine
-    core.workflow.nodes.tool.tool_node -> core.tools.tool_manager
-    core.workflow.workflow_entry -> configs
-    core.workflow.workflow_entry -> models.workflow
-    core.workflow.nodes.agent.agent_node -> core.agent.entities
-    core.workflow.nodes.agent.agent_node -> core.agent.plugin_entities
-    core.workflow.nodes.base.node -> core.app.entities.app_invoke_entities
-    core.workflow.nodes.human_input.human_input_node -> core.app.entities.app_invoke_entities
-    core.workflow.nodes.knowledge_index.knowledge_index_node -> core.app.entities.app_invoke_entities
-    core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node -> core.app.app_config.entities
-    core.workflow.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.advanced_prompt_transform
-    core.workflow.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.simple_prompt_transform
-    core.workflow.nodes.parameter_extractor.parameter_extractor_node -> core.model_runtime.model_providers.__base.large_language_model
-    core.workflow.nodes.question_classifier.question_classifier_node -> core.prompt.simple_prompt_transform
-    core.workflow.workflow_entry -> core.app.apps.exc
-    core.workflow.workflow_entry -> core.app.entities.app_invoke_entities
-    core.workflow.workflow_entry -> core.app.workflow.layers.llm_quota
-    core.workflow.workflow_entry -> core.app.workflow.node_factory
-    core.workflow.nodes.parameter_extractor.parameter_extractor_node -> core.model_manager
-    core.workflow.nodes.question_classifier.question_classifier_node -> core.model_manager
-    core.workflow.nodes.tool.tool_node -> core.tools.utils.message_transformer
-    core.workflow.nodes.tool.tool_node -> models
-    core.workflow.nodes.agent.agent_node -> models.model
-    core.workflow.nodes.llm.file_saver -> core.helper.ssrf_proxy
-    core.workflow.nodes.llm.node -> core.helper.code_executor
-    core.workflow.nodes.template_transform.template_renderer -> core.helper.code_executor.code_executor
-    core.workflow.nodes.llm.node -> core.llm_generator.output_parser.errors
-    core.workflow.nodes.llm.node -> core.llm_generator.output_parser.structured_output
-    core.workflow.nodes.llm.node -> core.model_manager
-    core.workflow.nodes.agent.entities -> core.prompt.entities.advanced_prompt_entities
-    core.workflow.nodes.llm.entities -> core.prompt.entities.advanced_prompt_entities
-    core.workflow.nodes.llm.node -> core.prompt.entities.advanced_prompt_entities
-    core.workflow.nodes.llm.node -> core.prompt.utils.prompt_message_util
-    core.workflow.nodes.parameter_extractor.entities -> core.prompt.entities.advanced_prompt_entities
-    core.workflow.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.entities.advanced_prompt_entities
-    core.workflow.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.utils.prompt_message_util
-    core.workflow.nodes.question_classifier.entities -> core.prompt.entities.advanced_prompt_entities
-    core.workflow.nodes.question_classifier.question_classifier_node -> core.prompt.utils.prompt_message_util
-    core.workflow.nodes.knowledge_index.entities -> core.rag.retrieval.retrieval_methods
-    core.workflow.nodes.llm.node -> models.dataset
-    core.workflow.nodes.agent.agent_node -> core.tools.utils.message_transformer
-    core.workflow.nodes.llm.file_saver -> core.tools.signature
-    core.workflow.nodes.llm.file_saver -> core.tools.tool_file_manager
-    core.workflow.nodes.tool.tool_node -> core.tools.errors
-    core.workflow.nodes.agent.agent_node -> extensions.ext_database
-    core.workflow.nodes.llm.file_saver -> extensions.ext_database
-    core.workflow.nodes.llm.node -> extensions.ext_database
-    core.workflow.nodes.tool.tool_node -> extensions.ext_database
-    core.workflow.nodes.human_input.human_input_node -> extensions.ext_database
-    core.workflow.nodes.human_input.human_input_node -> core.repositories.human_input_repository
-    core.workflow.workflow_entry -> extensions.otel.runtime
-    core.workflow.nodes.agent.agent_node -> models
-    core.workflow.nodes.base.node -> models.enums
-    core.workflow.nodes.loop.loop_node -> core.app.workflow.layers.llm_quota
-    core.workflow.nodes.llm.node -> models.model
-    core.workflow.workflow_entry -> models.enums
-    core.workflow.nodes.agent.agent_node -> services
-    core.workflow.nodes.tool.tool_node -> services
+    dify_graph.nodes.loop.loop_node -> core.workflow.node_factory
+    dify_graph.nodes.agent.agent_node -> core.model_manager
+    dify_graph.nodes.agent.agent_node -> core.provider_manager
+    dify_graph.nodes.agent.agent_node -> core.tools.tool_manager
+    dify_graph.nodes.document_extractor.node -> core.helper.ssrf_proxy
+    dify_graph.nodes.iteration.iteration_node -> core.workflow.node_factory
+    dify_graph.nodes.iteration.iteration_node -> core.app.workflow.layers.llm_quota
+    dify_graph.nodes.llm.llm_utils -> core.model_manager
+    dify_graph.nodes.llm.protocols -> core.model_manager
+    dify_graph.nodes.llm.llm_utils -> core.model_runtime.model_providers.__base.large_language_model
+    dify_graph.nodes.llm.node -> core.tools.signature
+    dify_graph.nodes.tool.tool_node -> core.callback_handler.workflow_tool_callback_handler
+    dify_graph.nodes.tool.tool_node -> core.tools.tool_engine
+    dify_graph.nodes.tool.tool_node -> core.tools.tool_manager
+    dify_graph.nodes.agent.agent_node -> core.agent.entities
+    dify_graph.nodes.agent.agent_node -> core.agent.plugin_entities
+    dify_graph.nodes.base.node -> core.app.entities.app_invoke_entities
+    dify_graph.nodes.human_input.human_input_node -> core.app.entities.app_invoke_entities
+    dify_graph.nodes.knowledge_index.knowledge_index_node -> core.app.entities.app_invoke_entities
+    dify_graph.nodes.knowledge_retrieval.knowledge_retrieval_node -> core.app.app_config.entities
+    dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.advanced_prompt_transform
+    dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.simple_prompt_transform
+    dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.model_runtime.model_providers.__base.large_language_model
+    dify_graph.nodes.question_classifier.question_classifier_node -> core.prompt.simple_prompt_transform
+    dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.model_manager
+    dify_graph.nodes.question_classifier.question_classifier_node -> core.model_manager
+    dify_graph.nodes.tool.tool_node -> core.tools.utils.message_transformer
+    dify_graph.nodes.tool.tool_node -> models
+    dify_graph.nodes.agent.agent_node -> models.model
+    dify_graph.nodes.llm.file_saver -> core.helper.ssrf_proxy
+    dify_graph.nodes.llm.node -> core.helper.code_executor
+    dify_graph.nodes.template_transform.template_renderer -> core.helper.code_executor.code_executor
+    dify_graph.nodes.llm.node -> core.llm_generator.output_parser.errors
+    dify_graph.nodes.llm.node -> core.llm_generator.output_parser.structured_output
+    dify_graph.nodes.llm.node -> core.model_manager
+    dify_graph.nodes.agent.entities -> core.prompt.entities.advanced_prompt_entities
+    dify_graph.nodes.llm.entities -> core.prompt.entities.advanced_prompt_entities
+    dify_graph.nodes.llm.node -> core.prompt.entities.advanced_prompt_entities
+    dify_graph.nodes.llm.node -> core.prompt.utils.prompt_message_util
+    dify_graph.nodes.parameter_extractor.entities -> core.prompt.entities.advanced_prompt_entities
+    dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.entities.advanced_prompt_entities
+    dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.utils.prompt_message_util
+    dify_graph.nodes.question_classifier.entities -> core.prompt.entities.advanced_prompt_entities
+    dify_graph.nodes.question_classifier.question_classifier_node -> core.prompt.utils.prompt_message_util
+    dify_graph.nodes.knowledge_index.entities -> core.rag.retrieval.retrieval_methods
+    dify_graph.nodes.llm.node -> models.dataset
+    dify_graph.nodes.agent.agent_node -> core.tools.utils.message_transformer
+    dify_graph.nodes.llm.file_saver -> core.tools.signature
+    dify_graph.nodes.llm.file_saver -> core.tools.tool_file_manager
+    dify_graph.nodes.tool.tool_node -> core.tools.errors
+    dify_graph.nodes.agent.agent_node -> extensions.ext_database
+    dify_graph.nodes.llm.file_saver -> extensions.ext_database
+    dify_graph.nodes.llm.node -> extensions.ext_database
+    dify_graph.nodes.tool.tool_node -> extensions.ext_database
+    dify_graph.nodes.human_input.human_input_node -> extensions.ext_database
+    dify_graph.nodes.human_input.human_input_node -> core.repositories.human_input_repository
+    dify_graph.nodes.agent.agent_node -> models
+    dify_graph.nodes.base.node -> models.enums
+    dify_graph.nodes.loop.loop_node -> core.app.workflow.layers.llm_quota
+    dify_graph.nodes.llm.node -> models.model
+    dify_graph.nodes.agent.agent_node -> services
+    dify_graph.nodes.tool.tool_node -> services
 
 [importlinter:contract:model-runtime-no-internal-imports]
 name = Model Runtime Internal Imports
@@ -214,7 +206,7 @@ forbidden_modules =
     core.tools
     core.trigger
     core.variables
-    core.workflow
+    dify_graph
 ignore_imports =
     core.model_runtime.model_providers.__base.ai_model -> configs
     core.model_runtime.model_providers.__base.ai_model -> extensions.ext_redis
@@ -231,7 +223,7 @@ layers =
     graph_engine
     response_coordinator
 containers =
-    core.workflow.graph_engine
+    dify_graph.graph_engine
 
 [importlinter:contract:worker]
 name = Worker
@@ -240,7 +232,7 @@ layers =
     graph_engine
     worker
 containers =
-    core.workflow.graph_engine
+    dify_graph.graph_engine
 
 [importlinter:contract:graph-engine-architecture]
 name = Graph Engine Architecture
@@ -256,28 +248,28 @@ layers =
     worker_management
     domain
 containers =
-    core.workflow.graph_engine
+    dify_graph.graph_engine
 
 [importlinter:contract:domain-isolation]
 name = Domain Model Isolation
 type = forbidden
 source_modules =
-    core.workflow.graph_engine.domain
+    dify_graph.graph_engine.domain
 forbidden_modules =
-    core.workflow.graph_engine.worker_management
-    core.workflow.graph_engine.command_channels
-    core.workflow.graph_engine.layers
-    core.workflow.graph_engine.protocols
+    dify_graph.graph_engine.worker_management
+    dify_graph.graph_engine.command_channels
+    dify_graph.graph_engine.layers
+    dify_graph.graph_engine.protocols
 
 [importlinter:contract:worker-management]
 name = Worker Management
 type = forbidden
 source_modules =
-    core.workflow.graph_engine.worker_management
+    dify_graph.graph_engine.worker_management
 forbidden_modules =
-    core.workflow.graph_engine.orchestration
-    core.workflow.graph_engine.command_processing
-    core.workflow.graph_engine.event_management
+    dify_graph.graph_engine.orchestration
+    dify_graph.graph_engine.command_processing
+    dify_graph.graph_engine.event_management
 
 
 [importlinter:contract:graph-traversal-components]
@@ -287,11 +279,11 @@ layers =
     edge_processor
     skip_propagator
 containers =
-    core.workflow.graph_engine.graph_traversal
+    dify_graph.graph_engine.graph_traversal
 
 [importlinter:contract:command-channels]
 name = Command Channels Independence
 type = independence
 modules =
-    core.workflow.graph_engine.command_channels.in_memory_channel
-    core.workflow.graph_engine.command_channels.redis_channel
+    dify_graph.graph_engine.command_channels.in_memory_channel
+    dify_graph.graph_engine.command_channels.redis_channel
diff --git a/api/context/__init__.py b/api/context/__init__.py
index aebf9750ce..969e5f583d 100644
--- a/api/context/__init__.py
+++ b/api/context/__init__.py
@@ -12,7 +12,7 @@ or any other web framework.
 import contextvars
 from collections.abc import Callable
 
-from core.workflow.context.execution_context import (
+from dify_graph.context.execution_context import (
     ExecutionContext,
     IExecutionContext,
     NullAppContext,
diff --git a/api/context/flask_app_context.py b/api/context/flask_app_context.py
index 2d465c8cf4..324a9ee8b4 100644
--- a/api/context/flask_app_context.py
+++ b/api/context/flask_app_context.py
@@ -10,8 +10,8 @@ from typing import Any, final
 
 from flask import Flask, current_app, g
 
-from core.workflow.context import register_context_capturer
-from core.workflow.context.execution_context import (
+from dify_graph.context import register_context_capturer
+from dify_graph.context.execution_context import (
     AppContext,
     IExecutionContext,
 )
diff --git a/api/controllers/common/fields.py b/api/controllers/common/fields.py
index 9b30db8b75..ff5326dade 100644
--- a/api/controllers/common/fields.py
+++ b/api/controllers/common/fields.py
@@ -4,7 +4,7 @@ from typing import Any, TypeAlias
 
 from pydantic import BaseModel, ConfigDict, computed_field
 
-from core.workflow.file import helpers as file_helpers
+from dify_graph.file import helpers as file_helpers
 from models.model import IconType
 
 JSONValue: TypeAlias = 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 e799e98d3e..33b3c9ec36 100644
--- a/api/controllers/console/app/app.py
+++ b/api/controllers/console/app/app.py
@@ -25,8 +25,8 @@ from controllers.console.wraps import (
 )
 from core.ops.ops_trace_manager import OpsTraceManager
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
-from core.workflow.enums import NodeType, WorkflowExecutionStatus
-from core.workflow.file import helpers as file_helpers
+from dify_graph.enums import NodeType, WorkflowExecutionStatus
+from dify_graph.file import helpers as file_helpers
 from extensions.ext_database import db
 from libs.login import current_account_with_tenant, login_required
 from models import App, DatasetPermissionEnum, Workflow
diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py
index a66e9543ff..735616bb6b 100644
--- a/api/controllers/console/app/workflow.py
+++ b/api/controllers/console/app/workflow.py
@@ -29,9 +29,9 @@ from core.trigger.debug.event_selectors import (
     create_event_poller,
     select_trigger_debug_events,
 )
-from core.workflow.enums import NodeType
-from core.workflow.file.models import File
-from core.workflow.graph_engine.manager import GraphEngineManager
+from dify_graph.enums import NodeType
+from dify_graph.file.models import File
+from dify_graph.graph_engine.manager import GraphEngineManager
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from factories import file_factory, variable_factory
diff --git a/api/controllers/console/app/workflow_app_log.py b/api/controllers/console/app/workflow_app_log.py
index 6736f24a2e..9b148c3f18 100644
--- a/api/controllers/console/app/workflow_app_log.py
+++ b/api/controllers/console/app/workflow_app_log.py
@@ -9,7 +9,7 @@ from sqlalchemy.orm import Session
 from controllers.console import console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.enums import WorkflowExecutionStatus
 from extensions.ext_database import db
 from fields.workflow_app_log_fields import (
     build_workflow_app_log_pagination_model,
diff --git a/api/controllers/console/app/workflow_draft_variable.py b/api/controllers/console/app/workflow_draft_variable.py
index f37598fb31..165bfcd4ba 100644
--- a/api/controllers/console/app/workflow_draft_variable.py
+++ b/api/controllers/console/app/workflow_draft_variable.py
@@ -15,11 +15,11 @@ from controllers.console.app.error import (
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
 from controllers.web.error import InvalidArgumentError, NotFoundError
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
-from core.workflow.file import helpers as file_helpers
-from core.workflow.variables.segment_group import SegmentGroup
-from core.workflow.variables.segments import ArrayFileSegment, FileSegment, Segment
-from core.workflow.variables.types import SegmentType
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from dify_graph.file import helpers as file_helpers
+from dify_graph.variables.segment_group import SegmentGroup
+from dify_graph.variables.segments import ArrayFileSegment, FileSegment, Segment
+from dify_graph.variables.types import SegmentType
 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
diff --git a/api/controllers/console/app/workflow_run.py b/api/controllers/console/app/workflow_run.py
index 9ac45cf2da..7ac653395e 100644
--- a/api/controllers/console/app/workflow_run.py
+++ b/api/controllers/console/app/workflow_run.py
@@ -12,8 +12,8 @@ from controllers.console import console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from controllers.web.error import NotFoundError
-from core.workflow.entities.pause_reason import HumanInputRequired
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.enums import WorkflowExecutionStatus
 from extensions.ext_database import db
 from fields.end_user_fields import simple_end_user_fields
 from fields.member_fields import simple_account_fields
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 7e285c8da9..4c441a5d07 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
@@ -21,8 +21,8 @@ from controllers.console.app.workflow_draft_variable import (
 from controllers.console.datasets.wraps import get_rag_pipeline
 from controllers.console.wraps import account_initialization_required, setup_required
 from controllers.web.error import InvalidArgumentError, NotFoundError
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
-from core.workflow.variables.types import SegmentType
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from dify_graph.variables.types import SegmentType
 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
diff --git a/api/controllers/console/explore/trial.py b/api/controllers/console/explore/trial.py
index f6f731df36..7771436641 100644
--- a/api/controllers/console/explore/trial.py
+++ b/api/controllers/console/explore/trial.py
@@ -42,7 +42,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from core.model_runtime.errors.invoke import InvokeError
-from core.workflow.graph_engine.manager import GraphEngineManager
+from dify_graph.graph_engine.manager import GraphEngineManager
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from fields.app_fields import (
diff --git a/api/controllers/console/explore/workflow.py b/api/controllers/console/explore/workflow.py
index b841bda323..7e48e43b42 100644
--- a/api/controllers/console/explore/workflow.py
+++ b/api/controllers/console/explore/workflow.py
@@ -22,7 +22,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from core.model_runtime.errors.invoke import InvokeError
-from core.workflow.graph_engine.manager import GraphEngineManager
+from dify_graph.graph_engine.manager import GraphEngineManager
 from extensions.ext_redis import redis_client
 from libs import helper
 from libs.login import current_account_with_tenant
diff --git a/api/controllers/console/remote_files.py b/api/controllers/console/remote_files.py
index f3738319df..49162d4dae 100644
--- a/api/controllers/console/remote_files.py
+++ b/api/controllers/console/remote_files.py
@@ -13,7 +13,7 @@ from controllers.common.errors import (
 )
 from controllers.console import console_ns
 from core.helper import ssrf_proxy
-from core.workflow.file import helpers as file_helpers
+from dify_graph.file import helpers as file_helpers
 from extensions.ext_database import db
 from fields.file_fields import FileWithSignedUrl, RemoteFileInfo
 from libs.login import current_account_with_tenant, login_required
diff --git a/api/controllers/files/upload.py b/api/controllers/files/upload.py
index b34412ef6d..52690a12e1 100644
--- a/api/controllers/files/upload.py
+++ b/api/controllers/files/upload.py
@@ -8,7 +8,7 @@ from werkzeug.exceptions import Forbidden
 
 import services
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.file.helpers import verify_plugin_file_signature
+from dify_graph.file.helpers import verify_plugin_file_signature
 from fields.file_fields import FileResponse
 
 from ..common.errors import (
diff --git a/api/controllers/inner_api/plugin/plugin.py b/api/controllers/inner_api/plugin/plugin.py
index 4cd1c4745f..da1b40f2bd 100644
--- a/api/controllers/inner_api/plugin/plugin.py
+++ b/api/controllers/inner_api/plugin/plugin.py
@@ -29,7 +29,7 @@ from core.plugin.entities.request import (
     RequestRequestUploadFile,
 )
 from core.tools.entities.tool_entities import ToolProviderType
-from core.workflow.file.helpers import get_signed_file_url_for_plugin
+from dify_graph.file.helpers import get_signed_file_url_for_plugin
 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 991a9166c7..2bc6640807 100644
--- a/api/controllers/mcp/mcp.py
+++ b/api/controllers/mcp/mcp.py
@@ -10,7 +10,7 @@ from controllers.console.app.mcp_server import AppMCPServerStatus
 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 core.workflow.variables.input_entities import VariableEntity
+from dify_graph.variables.input_entities import VariableEntity
 from extensions.ext_database import db
 from libs import helper
 from models.model import App, AppMCPServer, AppMode, EndUser
diff --git a/api/controllers/service_api/app/workflow.py b/api/controllers/service_api/app/workflow.py
index 2ce8f05f75..f58295099f 100644
--- a/api/controllers/service_api/app/workflow.py
+++ b/api/controllers/service_api/app/workflow.py
@@ -28,8 +28,8 @@ from core.errors.error import (
 )
 from core.helper.trace_id_helper import get_external_trace_id
 from core.model_runtime.errors.invoke import InvokeError
-from core.workflow.enums import WorkflowExecutionStatus
-from core.workflow.graph_engine.manager import GraphEngineManager
+from dify_graph.enums import WorkflowExecutionStatus
+from dify_graph.graph_engine.manager import GraphEngineManager
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from fields.workflow_app_log_fields import build_workflow_app_log_pagination_model
diff --git a/api/controllers/web/remote_files.py b/api/controllers/web/remote_files.py
index 1cdae0fe56..6a93ef6748 100644
--- a/api/controllers/web/remote_files.py
+++ b/api/controllers/web/remote_files.py
@@ -11,7 +11,7 @@ from controllers.common.errors import (
     UnsupportedFileTypeError,
 )
 from core.helper import ssrf_proxy
-from core.workflow.file import helpers as file_helpers
+from dify_graph.file import helpers as file_helpers
 from extensions.ext_database import db
 from fields.file_fields import FileWithSignedUrl, RemoteFileInfo
 from services.file_service import FileService
diff --git a/api/controllers/web/workflow.py b/api/controllers/web/workflow.py
index a309ef3dad..a4c1ba75eb 100644
--- a/api/controllers/web/workflow.py
+++ b/api/controllers/web/workflow.py
@@ -23,7 +23,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from core.model_runtime.errors.invoke import InvokeError
-from core.workflow.graph_engine.manager import GraphEngineManager
+from dify_graph.graph_engine.manager import GraphEngineManager
 from extensions.ext_redis import redis_client
 from libs import helper
 from models.model import App, AppMode, EndUser
diff --git a/api/core/agent/base_agent_runner.py b/api/core/agent/base_agent_runner.py
index 80e180ce96..22e3843fec 100644
--- a/api/core/agent/base_agent_runner.py
+++ b/api/core/agent/base_agent_runner.py
@@ -39,7 +39,7 @@ from core.tools.entities.tool_entities import (
 )
 from core.tools.tool_manager import ToolManager
 from core.tools.utils.dataset_retriever_tool import DatasetRetrieverTool
-from core.workflow.file import file_manager
+from dify_graph.file import file_manager
 from extensions.ext_database import db
 from factories import file_factory
 from models.enums import CreatorUserRole
diff --git a/api/core/agent/cot_agent_runner.py b/api/core/agent/cot_agent_runner.py
index 0464afe194..511406afde 100644
--- a/api/core/agent/cot_agent_runner.py
+++ b/api/core/agent/cot_agent_runner.py
@@ -22,7 +22,7 @@ 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 core.workflow.nodes.agent.exc import AgentMaxIterationError
+from dify_graph.nodes.agent.exc import AgentMaxIterationError
 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 babb463aba..b0a0b23fb5 100644
--- a/api/core/agent/cot_chat_agent_runner.py
+++ b/api/core/agent/cot_chat_agent_runner.py
@@ -10,7 +10,7 @@ from core.model_runtime.entities import (
 )
 from core.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
 from core.model_runtime.utils.encoders import jsonable_encoder
-from core.workflow.file import file_manager
+from dify_graph.file import file_manager
 
 
 class CotChatAgentRunner(CotAgentRunner):
diff --git a/api/core/agent/fc_agent_runner.py b/api/core/agent/fc_agent_runner.py
index 633609f54f..23650cc21e 100644
--- a/api/core/agent/fc_agent_runner.py
+++ b/api/core/agent/fc_agent_runner.py
@@ -24,8 +24,8 @@ from core.model_runtime.entities.message_entities import ImagePromptMessageConte
 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 core.workflow.file import file_manager
-from core.workflow.nodes.agent.exc import AgentMaxIterationError
+from dify_graph.file import file_manager
+from dify_graph.nodes.agent.exc import AgentMaxIterationError
 from models.model import Message
 
 logger = logging.getLogger(__name__)
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 22d602a190..157e5d8bc0 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
@@ -2,7 +2,7 @@ import re
 
 from core.app.app_config.entities import ExternalDataVariableEntity
 from core.external_data_tool.factory import ExternalDataToolFactory
-from core.workflow.variables.input_entities import VariableEntity, VariableEntityType
+from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
 
 _ALLOWED_VARIABLE_ENTITY_TYPE = frozenset(
     [
diff --git a/api/core/app/app_config/entities.py b/api/core/app/app_config/entities.py
index 062cc6a0b3..b5de73dadd 100644
--- a/api/core/app/app_config/entities.py
+++ b/api/core/app/app_config/entities.py
@@ -6,8 +6,8 @@ from pydantic import BaseModel, Field
 
 from core.model_runtime.entities.llm_entities import LLMMode
 from core.model_runtime.entities.message_entities import PromptMessageRole
-from core.workflow.file import FileUploadConfig
-from core.workflow.variables.input_entities import VariableEntity as WorkflowVariableEntity
+from dify_graph.file import FileUploadConfig
+from dify_graph.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 d69fa85801..0c4266fbeb 100644
--- a/api/core/app/app_config/features/file_upload/manager.py
+++ b/api/core/app/app_config/features/file_upload/manager.py
@@ -2,7 +2,7 @@ from collections.abc import Mapping
 from typing import Any
 
 from constants import DEFAULT_FILE_NUMBER_LIMITS
-from core.workflow.file import FileUploadConfig
+from dify_graph.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 ec7d85a09f..d2a9a73380 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,7 +1,7 @@
 import re
 
 from core.app.app_config.entities import RagPipelineVariableEntity
-from core.workflow.variables.input_entities import VariableEntity
+from dify_graph.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 2891d3ceeb..ccac77eeaa 100644
--- a/api/core/app/apps/advanced_chat/app_generator.py
+++ b/api/core/app/apps/advanced_chat/app_generator.py
@@ -35,14 +35,14 @@ from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.ops.ops_trace_manager import TraceQueueManager
 from core.prompt.utils.get_thread_messages_length import get_thread_messages_length
 from core.repositories import DifyCoreRepositoryFactory
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.repositories.draft_variable_repository import (
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.repositories.draft_variable_repository import (
     DraftVariableSaverFactory,
 )
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
-from core.workflow.runtime import GraphRuntimeState
-from core.workflow.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.runtime import GraphRuntimeState
+from dify_graph.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
 from extensions.ext_database import db
 from factories import file_factory
 from libs.flask_utils import preserve_flask_contexts
diff --git a/api/core/app/apps/advanced_chat/app_runner.py b/api/core/app/apps/advanced_chat/app_runner.py
index 18ae75a087..b38dfdfc1f 100644
--- a/api/core/app/apps/advanced_chat/app_runner.py
+++ b/api/core/app/apps/advanced_chat/app_runner.py
@@ -25,16 +25,16 @@ from core.app.workflow.layers.persistence import PersistenceWorkflowInfo, Workfl
 from core.db.session_factory import session_factory
 from core.moderation.base import ModerationError
 from core.moderation.input_moderation import InputModeration
-from core.workflow.enums import WorkflowType
-from core.workflow.graph_engine.command_channels.redis_channel import RedisChannel
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variable_loader import VariableLoader
-from core.workflow.variables.variables import Variable
 from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.enums import WorkflowType
+from dify_graph.graph_engine.command_channels.redis_channel import RedisChannel
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variable_loader import VariableLoader
+from dify_graph.variables.variables import Variable
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from extensions.otel import WorkflowAppRunnerHandler, trace_span
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 534ef6994a..c19a1e9c0d 100644
--- a/api/core/app/apps/advanced_chat/generate_task_pipeline.py
+++ b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
@@ -67,12 +67,12 @@ from core.model_runtime.entities.llm_entities import LLMUsage
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.ops.ops_trace_manager import TraceQueueManager
 from core.repositories.human_input_repository import HumanInputFormRepositoryImpl
-from core.workflow.entities.pause_reason import HumanInputRequired
-from core.workflow.enums import WorkflowExecutionStatus
-from core.workflow.nodes import NodeType
-from core.workflow.repositories.draft_variable_repository import DraftVariableSaverFactory
-from core.workflow.runtime import GraphRuntimeState
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.enums import WorkflowExecutionStatus
+from dify_graph.nodes import NodeType
+from dify_graph.repositories.draft_variable_repository import DraftVariableSaverFactory
+from dify_graph.runtime import GraphRuntimeState
+from dify_graph.system_variable import SystemVariable
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from models import Account, Conversation, EndUser, Message, MessageFile
diff --git a/api/core/app/apps/base_app_generator.py b/api/core/app/apps/base_app_generator.py
index 81617c5fb2..20e6ac98ea 100644
--- a/api/core/app/apps/base_app_generator.py
+++ b/api/core/app/apps/base_app_generator.py
@@ -4,21 +4,21 @@ from typing import TYPE_CHECKING, Any, Union, final
 from sqlalchemy.orm import Session
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.enums import NodeType
-from core.workflow.file import File, FileUploadConfig
-from core.workflow.repositories.draft_variable_repository import (
+from dify_graph.enums import NodeType
+from dify_graph.file import File, FileUploadConfig
+from dify_graph.repositories.draft_variable_repository import (
     DraftVariableSaver,
     DraftVariableSaverFactory,
     NoopDraftVariableSaver,
 )
-from core.workflow.variables.input_entities import VariableEntityType
+from dify_graph.variables.input_entities import VariableEntityType
 from factories import file_factory
 from libs.orjson import orjson_dumps
 from models import Account, EndUser
 from services.workflow_draft_variable_service import DraftVariableSaver as DraftVariableSaverImpl
 
 if TYPE_CHECKING:
-    from core.workflow.variables.input_entities import VariableEntity
+    from dify_graph.variables.input_entities import VariableEntity
 
 
 class BaseAppGenerator:
diff --git a/api/core/app/apps/base_app_queue_manager.py b/api/core/app/apps/base_app_queue_manager.py
index af1f1d7c66..5addd41815 100644
--- a/api/core/app/apps/base_app_queue_manager.py
+++ b/api/core/app/apps/base_app_queue_manager.py
@@ -20,7 +20,7 @@ from core.app.entities.queue_entities import (
     QueueStopEvent,
     WorkflowQueueMessage,
 )
-from core.workflow.runtime import GraphRuntimeState
+from dify_graph.runtime import GraphRuntimeState
 from extensions.ext_redis import redis_client
 
 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 b98e85dbe9..0223d8f9a7 100644
--- a/api/core/app/apps/base_app_runner.py
+++ b/api/core/app/apps/base_app_runner.py
@@ -38,13 +38,13 @@ from core.prompt.advanced_prompt_transform import AdvancedPromptTransform
 from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
 from core.prompt.simple_prompt_transform import ModelMode, SimplePromptTransform
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.file.enums import FileTransferMethod, FileType
+from dify_graph.file.enums import FileTransferMethod, FileType
 from extensions.ext_database import db
 from models.enums import CreatorUserRole
 from models.model import App, AppMode, Message, MessageAnnotation, MessageFile
 
 if TYPE_CHECKING:
-    from core.workflow.file.models import File
+    from dify_graph.file.models import File
 
 _logger = logging.getLogger(__name__)
 
diff --git a/api/core/app/apps/chat/app_runner.py b/api/core/app/apps/chat/app_runner.py
index 4870a56281..5cf13fbb17 100644
--- a/api/core/app/apps/chat/app_runner.py
+++ b/api/core/app/apps/chat/app_runner.py
@@ -16,7 +16,7 @@ from core.model_manager import ModelInstance
 from core.model_runtime.entities.message_entities import ImagePromptMessageContent
 from core.moderation.base import ModerationError
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
-from core.workflow.file import File
+from dify_graph.file import File
 from extensions.ext_database import db
 from models.model import App, Conversation, Message
 
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 0b03149665..6a8e436163 100644
--- a/api/core/app/apps/common/graph_runtime_state_support.py
+++ b/api/core/app/apps/common/graph_runtime_state_support.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from core.workflow.runtime import GraphRuntimeState
+from dify_graph.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 d4e801de13..67dc9909a1 100644
--- a/api/core/app/apps/common/workflow_response_converter.py
+++ b/api/core/app/apps/common/workflow_response_converter.py
@@ -49,21 +49,21 @@ from core.plugin.impl.datasource import PluginDatasourceManager
 from core.tools.entities.tool_entities import ToolProviderType
 from core.tools.tool_manager import ToolManager
 from core.trigger.trigger_manager import TriggerManager
-from core.workflow.entities.pause_reason import HumanInputRequired
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.enums import (
+from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.enums import (
     NodeType,
     SystemVariableKey,
     WorkflowExecutionStatus,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.file import FILE_MODEL_IDENTITY, File
-from core.workflow.runtime import GraphRuntimeState
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables.segments import ArrayFileSegment, FileSegment, Segment
-from core.workflow.workflow_entry import WorkflowEntry
-from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter
+from dify_graph.file import FILE_MODEL_IDENTITY, File
+from dify_graph.runtime import GraphRuntimeState
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables.segments import ArrayFileSegment, FileSegment, Segment
+from dify_graph.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from models import Account, EndUser
diff --git a/api/core/app/apps/completion/app_runner.py b/api/core/app/apps/completion/app_runner.py
index 30e1a609f8..96bbe532f1 100644
--- a/api/core/app/apps/completion/app_runner.py
+++ b/api/core/app/apps/completion/app_runner.py
@@ -14,7 +14,7 @@ from core.model_manager import ModelInstance
 from core.model_runtime.entities.message_entities import ImagePromptMessageContent
 from core.moderation.base import ModerationError
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
-from core.workflow.file import File
+from dify_graph.file import File
 from extensions.ext_database import db
 from models.model import App, Message
 
diff --git a/api/core/app/apps/pipeline/pipeline_generator.py b/api/core/app/apps/pipeline/pipeline_generator.py
index eca96cb074..6be2d034b5 100644
--- a/api/core/app/apps/pipeline/pipeline_generator.py
+++ b/api/core/app/apps/pipeline/pipeline_generator.py
@@ -36,10 +36,10 @@ from core.entities.knowledge_entities import PipelineDataset, PipelineDocument
 from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.rag.index_processor.constant.built_in_field import BuiltInField
 from core.repositories.factory import DifyCoreRepositoryFactory
-from core.workflow.repositories.draft_variable_repository import DraftVariableSaverFactory
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
-from core.workflow.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
+from dify_graph.repositories.draft_variable_repository import DraftVariableSaverFactory
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
 from extensions.ext_database import db
 from libs.flask_utils import preserve_flask_contexts
 from models import Account, EndUser, Workflow, WorkflowNodeExecutionTriggeredFrom
diff --git a/api/core/app/apps/pipeline/pipeline_runner.py b/api/core/app/apps/pipeline/pipeline_runner.py
index 02caf8f511..b518e33eeb 100644
--- a/api/core/app/apps/pipeline/pipeline_runner.py
+++ b/api/core/app/apps/pipeline/pipeline_runner.py
@@ -10,18 +10,18 @@ from core.app.entities.app_invoke_entities import (
     RagPipelineGenerateEntity,
 )
 from core.app.workflow.layers.persistence import PersistenceWorkflowInfo, WorkflowPersistenceLayer
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities.graph_init_params import GraphInitParams
-from core.workflow.enums import WorkflowType
-from core.workflow.graph import Graph
-from core.workflow.graph_events import GraphEngineEvent, GraphRunFailedEvent
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variable_loader import VariableLoader
-from core.workflow.variables.variables import RAGPipelineVariable, RAGPipelineVariableInput
+from core.workflow.node_factory import DifyNodeFactory
 from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.entities.graph_init_params import GraphInitParams
+from dify_graph.enums import WorkflowType
+from dify_graph.graph import Graph
+from dify_graph.graph_events import GraphEngineEvent, GraphRunFailedEvent
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variable_loader import VariableLoader
+from dify_graph.variables.variables import RAGPipelineVariable, RAGPipelineVariableInput
 from extensions.ext_database import db
 from models.dataset import Document, Pipeline
 from models.enums import UserFrom
diff --git a/api/core/app/apps/workflow/app_generator.py b/api/core/app/apps/workflow/app_generator.py
index dc5852d552..4eee00c999 100644
--- a/api/core/app/apps/workflow/app_generator.py
+++ b/api/core/app/apps/workflow/app_generator.py
@@ -31,12 +31,12 @@ from core.helper.trace_id_helper import extract_external_trace_id_from_args
 from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.ops.ops_trace_manager import TraceQueueManager
 from core.repositories import DifyCoreRepositoryFactory
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.repositories.draft_variable_repository import DraftVariableSaverFactory
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
-from core.workflow.runtime import GraphRuntimeState
-from core.workflow.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.repositories.draft_variable_repository import DraftVariableSaverFactory
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.runtime import GraphRuntimeState
+from dify_graph.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader
 from extensions.ext_database import db
 from factories import file_factory
 from libs.flask_utils import preserve_flask_contexts
diff --git a/api/core/app/apps/workflow/app_runner.py b/api/core/app/apps/workflow/app_runner.py
index a43f7879d6..caea8b6b95 100644
--- a/api/core/app/apps/workflow/app_runner.py
+++ b/api/core/app/apps/workflow/app_runner.py
@@ -8,15 +8,15 @@ from core.app.apps.workflow.app_config_manager import WorkflowAppConfig
 from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
 from core.app.workflow.layers.persistence import PersistenceWorkflowInfo, WorkflowPersistenceLayer
-from core.workflow.enums import WorkflowType
-from core.workflow.graph_engine.command_channels.redis_channel import RedisChannel
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variable_loader import VariableLoader
 from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.enums import WorkflowType
+from dify_graph.graph_engine.command_channels.redis_channel import RedisChannel
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variable_loader import VariableLoader
 from extensions.ext_redis import redis_client
 from extensions.otel import WorkflowAppRunnerHandler, trace_span
 from libs.datetime_utils import naive_utc_now
diff --git a/api/core/app/apps/workflow/generate_task_pipeline.py b/api/core/app/apps/workflow/generate_task_pipeline.py
index 0a567a4315..96dd8c5445 100644
--- a/api/core/app/apps/workflow/generate_task_pipeline.py
+++ b/api/core/app/apps/workflow/generate_task_pipeline.py
@@ -55,11 +55,11 @@ from core.app.entities.task_entities import (
 from core.app.task_pipeline.based_generate_task_pipeline import BasedGenerateTaskPipeline
 from core.base.tts import AppGeneratorTTSPublisher, AudioTrunk
 from core.ops.ops_trace_manager import TraceQueueManager
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.enums import WorkflowExecutionStatus
-from core.workflow.repositories.draft_variable_repository import DraftVariableSaverFactory
-from core.workflow.runtime import GraphRuntimeState
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.enums import WorkflowExecutionStatus
+from dify_graph.repositories.draft_variable_repository import DraftVariableSaverFactory
+from dify_graph.runtime import GraphRuntimeState
+from dify_graph.system_variable import SystemVariable
 from extensions.ext_database import db
 from models import Account
 from models.enums import CreatorUserRole
diff --git a/api/core/app/apps/workflow_app_runner.py b/api/core/app/apps/workflow_app_runner.py
index c9d7464c17..648c2829de 100644
--- a/api/core/app/apps/workflow_app_runner.py
+++ b/api/core/app/apps/workflow_app_runner.py
@@ -29,12 +29,13 @@ from core.app.entities.queue_entities import (
     QueueWorkflowStartedEvent,
     QueueWorkflowSucceededEvent,
 )
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities import GraphInitParams
-from core.workflow.entities.pause_reason import HumanInputRequired
-from core.workflow.graph import Graph
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events import (
+from core.workflow.node_factory import DifyNodeFactory
+from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.entities import GraphInitParams
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.graph import Graph
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events import (
     GraphEngineEvent,
     GraphRunFailedEvent,
     GraphRunPartialSucceededEvent,
@@ -60,13 +61,12 @@ from core.workflow.graph_events import (
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.graph_events.graph import GraphRunAbortedEvent
-from core.workflow.nodes import NodeType
-from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
-from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.graph_events.graph import GraphRunAbortedEvent
+from dify_graph.nodes import NodeType
+from dify_graph.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
 from models.enums import UserFrom
 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 65919e89e1..df906e5e54 100644
--- a/api/core/app/entities/app_invoke_entities.py
+++ b/api/core/app/entities/app_invoke_entities.py
@@ -8,7 +8,7 @@ from constants import UUID_NIL
 from core.app.app_config.entities import EasyUIBasedAppConfig, WorkflowUIBasedAppConfig
 from core.entities.provider_configuration import ProviderModelBundle
 from core.model_runtime.entities.model_entities import AIModelEntity
-from core.workflow.file import File, FileUploadConfig
+from dify_graph.file import File, FileUploadConfig
 
 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 5b2fa29b56..de19b8e6d2 100644
--- a/api/core/app/entities/queue_entities.py
+++ b/api/core/app/entities/queue_entities.py
@@ -7,11 +7,11 @@ from pydantic import BaseModel, ConfigDict, Field
 
 from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
-from core.workflow.entities import AgentNodeStrategyInit
-from core.workflow.entities.pause_reason import PauseReason
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.enums import WorkflowNodeExecutionMetadataKey
-from core.workflow.nodes import NodeType
+from dify_graph.entities import AgentNodeStrategyInit
+from dify_graph.entities.pause_reason import PauseReason
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.enums import WorkflowNodeExecutionMetadataKey
+from dify_graph.nodes import NodeType
 
 
 class QueueEvent(StrEnum):
diff --git a/api/core/app/entities/task_entities.py b/api/core/app/entities/task_entities.py
index f6096eb683..1f3153fff4 100644
--- a/api/core/app/entities/task_entities.py
+++ b/api/core/app/entities/task_entities.py
@@ -6,10 +6,10 @@ from pydantic import BaseModel, ConfigDict, Field
 
 from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
-from core.workflow.entities import AgentNodeStrategyInit
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.enums import WorkflowExecutionStatus, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from core.workflow.nodes.human_input.entities import FormInput, UserAction
+from dify_graph.entities import AgentNodeStrategyInit
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.enums import WorkflowExecutionStatus, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.nodes.human_input.entities import FormInput, UserAction
 
 
 class AnnotationReplyAccount(BaseModel):
diff --git a/api/core/app/layers/conversation_variable_persist_layer.py b/api/core/app/layers/conversation_variable_persist_layer.py
index a748d90387..e495abf855 100644
--- a/api/core/app/layers/conversation_variable_persist_layer.py
+++ b/api/core/app/layers/conversation_variable_persist_layer.py
@@ -1,12 +1,12 @@
 import logging
 
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID
-from core.workflow.conversation_variable_updater import ConversationVariableUpdater
-from core.workflow.enums import NodeType
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events import GraphEngineEvent, NodeRunSucceededEvent
-from core.workflow.nodes.variable_assigner.common import helpers as common_helpers
-from core.workflow.variables import VariableBase
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID
+from dify_graph.conversation_variable_updater import ConversationVariableUpdater
+from dify_graph.enums import NodeType
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events import GraphEngineEvent, NodeRunSucceededEvent
+from dify_graph.nodes.variable_assigner.common import helpers as common_helpers
+from dify_graph.variables import VariableBase
 
 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 1c267091a4..4370c01a0b 100644
--- a/api/core/app/layers/pause_state_persist_layer.py
+++ b/api/core/app/layers/pause_state_persist_layer.py
@@ -6,9 +6,9 @@ from sqlalchemy import Engine
 from sqlalchemy.orm import Session, sessionmaker
 
 from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, WorkflowAppGenerateEntity
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events.base import GraphEngineEvent
-from core.workflow.graph_events.graph import GraphRunPausedEvent
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events.base import GraphEngineEvent
+from dify_graph.graph_events.graph import 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/suspend_layer.py b/api/core/app/layers/suspend_layer.py
index 0a107de012..2adaf14a35 100644
--- a/api/core/app/layers/suspend_layer.py
+++ b/api/core/app/layers/suspend_layer.py
@@ -1,6 +1,6 @@
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events.base import GraphEngineEvent
-from core.workflow.graph_events.graph import GraphRunPausedEvent
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events.base import GraphEngineEvent
+from dify_graph.graph_events.graph import GraphRunPausedEvent
 
 
 class SuspendLayer(GraphEngineLayer):
diff --git a/api/core/app/layers/timeslice_layer.py b/api/core/app/layers/timeslice_layer.py
index f82397deca..d7ca45f209 100644
--- a/api/core/app/layers/timeslice_layer.py
+++ b/api/core/app/layers/timeslice_layer.py
@@ -4,9 +4,9 @@ from typing import ClassVar
 
 from apscheduler.schedulers.background import BackgroundScheduler  # type: ignore
 
-from core.workflow.graph_engine.entities.commands import CommandType, GraphEngineCommand
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events.base import GraphEngineEvent
+from dify_graph.graph_engine.entities.commands import CommandType, GraphEngineCommand
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events.base 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 a7ea9ef446..a4019a83e1 100644
--- a/api/core/app/layers/trigger_post_layer.py
+++ b/api/core/app/layers/trigger_post_layer.py
@@ -5,9 +5,9 @@ from typing import Any, ClassVar
 from pydantic import TypeAdapter
 
 from core.db.session_factory import session_factory
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events.base import GraphEngineEvent
-from core.workflow.graph_events.graph import GraphRunFailedEvent, GraphRunPausedEvent, GraphRunSucceededEvent
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events.base import GraphEngineEvent
+from dify_graph.graph_events.graph import 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 ebae830389..dc28225b8e 100644
--- a/api/core/app/llm/model_access.py
+++ b/api/core/app/llm/model_access.py
@@ -7,9 +7,9 @@ from core.errors.error import ProviderTokenNotInitError
 from core.model_manager import ModelInstance, ModelManager
 from core.model_runtime.entities.model_entities import ModelType
 from core.provider_manager import ProviderManager
-from core.workflow.nodes.llm.entities import ModelConfig
-from core.workflow.nodes.llm.exc import LLMModeRequiredError, ModelNotExistError
-from core.workflow.nodes.llm.protocols import CredentialsProvider, ModelFactory
+from dify_graph.nodes.llm.entities import ModelConfig
+from dify_graph.nodes.llm.exc import LLMModeRequiredError, ModelNotExistError
+from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
 
 
 class DifyCredentialsProvider:
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 a77e5abb30..d7946d5478 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
@@ -57,8 +57,8 @@ from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
 from core.prompt.utils.prompt_message_util import PromptMessageUtil
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from core.tools.signature import sign_tool_file
-from core.workflow.file import helpers as file_helpers
-from core.workflow.file.enums import FileTransferMethod
+from dify_graph.file import helpers as file_helpers
+from dify_graph.file.enums import FileTransferMethod
 from events.message_event import message_was_created
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
diff --git a/api/core/app/workflow/__init__.py b/api/core/app/workflow/__init__.py
index 172ee5d703..3bca7f5c34 100644
--- a/api/core/app/workflow/__init__.py
+++ b/api/core/app/workflow/__init__.py
@@ -1,3 +1,3 @@
-from .node_factory import DifyNodeFactory
+from core.workflow.node_factory import DifyNodeFactory
 
 __all__ = ["DifyNodeFactory"]
diff --git a/api/core/app/workflow/file_runtime.py b/api/core/app/workflow/file_runtime.py
index 954638b901..e0f8d27111 100644
--- a/api/core/app/workflow/file_runtime.py
+++ b/api/core/app/workflow/file_runtime.py
@@ -5,13 +5,13 @@ from collections.abc import Generator
 from configs import dify_config
 from core.helper.ssrf_proxy import ssrf_proxy
 from core.tools.signature import sign_tool_file
-from core.workflow.file.protocols import HttpResponseProtocol, WorkflowFileRuntimeProtocol
-from core.workflow.file.runtime import set_workflow_file_runtime
+from dify_graph.file.protocols import HttpResponseProtocol, WorkflowFileRuntimeProtocol
+from dify_graph.file.runtime import set_workflow_file_runtime
 from extensions.ext_storage import storage
 
 
 class DifyWorkflowFileRuntime(WorkflowFileRuntimeProtocol):
-    """Production runtime wiring for ``core.workflow.file``."""
+    """Production runtime wiring for ``dify_graph.file``."""
 
     @property
     def files_url(self) -> str:
diff --git a/api/core/app/workflow/layers/llm_quota.py b/api/core/app/workflow/layers/llm_quota.py
index 45fb84c81f..f6c80d25c5 100644
--- a/api/core/app/workflow/layers/llm_quota.py
+++ b/api/core/app/workflow/layers/llm_quota.py
@@ -12,17 +12,17 @@ from typing_extensions import override
 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 core.workflow.enums import NodeType
-from core.workflow.graph_engine.entities.commands import AbortCommand, CommandType
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events import GraphEngineEvent, GraphNodeEventBase
-from core.workflow.graph_events.node import NodeRunSucceededEvent
-from core.workflow.nodes.base.node import Node
+from dify_graph.enums import NodeType
+from dify_graph.graph_engine.entities.commands import AbortCommand, CommandType
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events import GraphEngineEvent, GraphNodeEventBase
+from dify_graph.graph_events.node import NodeRunSucceededEvent
+from dify_graph.nodes.base.node import Node
 
 if TYPE_CHECKING:
-    from core.workflow.nodes.llm.node import LLMNode
-    from core.workflow.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
-    from core.workflow.nodes.question_classifier.question_classifier_node import QuestionClassifierNode
+    from dify_graph.nodes.llm.node import LLMNode
+    from dify_graph.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
+    from dify_graph.nodes.question_classifier.question_classifier_node import QuestionClassifierNode
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/app/workflow/layers/observability.py b/api/core/app/workflow/layers/observability.py
index 94839c8ae3..ab73db59f1 100644
--- a/api/core/app/workflow/layers/observability.py
+++ b/api/core/app/workflow/layers/observability.py
@@ -16,10 +16,10 @@ from opentelemetry.trace import Span, SpanKind, Tracer, get_tracer, set_span_in_
 from typing_extensions import override
 
 from configs import dify_config
-from core.workflow.enums import NodeType
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events import GraphNodeEventBase
-from core.workflow.nodes.base.node import Node
+from dify_graph.enums import NodeType
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events import GraphNodeEventBase
+from dify_graph.nodes.base.node import Node
 from extensions.otel.parser import (
     DefaultNodeOTelParser,
     LLMNodeOTelParser,
diff --git a/api/core/app/workflow/layers/persistence.py b/api/core/app/workflow/layers/persistence.py
index 41052b4f52..a30491f30c 100644
--- a/api/core/app/workflow/layers/persistence.py
+++ b/api/core/app/workflow/layers/persistence.py
@@ -17,17 +17,17 @@ 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.workflow.constants import SYSTEM_VARIABLE_NODE_ID
-from core.workflow.entities import WorkflowExecution, WorkflowNodeExecution
-from core.workflow.enums import (
+from dify_graph.constants import SYSTEM_VARIABLE_NODE_ID
+from dify_graph.entities import WorkflowExecution, WorkflowNodeExecution
+from dify_graph.enums import (
     SystemVariableKey,
     WorkflowExecutionStatus,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
     WorkflowType,
 )
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events import (
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events import (
     GraphEngineEvent,
     GraphRunAbortedEvent,
     GraphRunFailedEvent,
@@ -42,9 +42,9 @@ from core.workflow.graph_events import (
     NodeRunStartedEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.node_events import NodeRunResult
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.node_events import NodeRunResult
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/core/datasource/datasource_file_manager.py b/api/core/datasource/datasource_file_manager.py
index f67bfb6ead..5971c1e013 100644
--- a/api/core/datasource/datasource_file_manager.py
+++ b/api/core/datasource/datasource_file_manager.py
@@ -213,6 +213,6 @@ class DatasourceFileManager:
 
 
 # init tool_file_parser
-# from core.workflow.file.datasource_file_parser import datasource_file_manager
+# from dify_graph.file.datasource_file_parser import datasource_file_manager
 #
 # datasource_file_manager["manager"] = DatasourceFileManager
diff --git a/api/core/datasource/datasource_manager.py b/api/core/datasource/datasource_manager.py
index 9c48f755a9..15cd319750 100644
--- a/api/core/datasource/datasource_manager.py
+++ b/api/core/datasource/datasource_manager.py
@@ -24,12 +24,12 @@ from core.datasource.utils.message_transformer import DatasourceFileMessageTrans
 from core.datasource.website_crawl.website_crawl_provider import WebsiteCrawlDatasourcePluginProviderController
 from core.db.session_factory import session_factory
 from core.plugin.impl.datasource import PluginDatasourceManager
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import WorkflowNodeExecutionMetadataKey
-from core.workflow.file import File
-from core.workflow.file.enums import FileTransferMethod, FileType
-from core.workflow.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
-from core.workflow.repositories.datasource_manager_protocol import DatasourceParameter, OnlineDriveDownloadFileParam
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.enums import WorkflowNodeExecutionMetadataKey
+from dify_graph.file import File
+from dify_graph.file.enums import FileTransferMethod, FileType
+from dify_graph.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
+from dify_graph.repositories.datasource_manager_protocol import DatasourceParameter, OnlineDriveDownloadFileParam
 from factories import file_factory
 from models.model import UploadFile
 from models.tools import ToolFile
diff --git a/api/core/datasource/utils/message_transformer.py b/api/core/datasource/utils/message_transformer.py
index ab3302bd6e..2881888e27 100644
--- a/api/core/datasource/utils/message_transformer.py
+++ b/api/core/datasource/utils/message_transformer.py
@@ -4,7 +4,7 @@ from mimetypes import guess_extension, guess_type
 
 from core.datasource.entities.datasource_entities import DatasourceMessage
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.file import File, FileTransferMethod, FileType
+from dify_graph.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 46006f4381..1343bd8e82 100644
--- a/api/core/entities/execution_extra_content.py
+++ b/api/core/entities/execution_extra_content.py
@@ -5,7 +5,7 @@ from typing import Any, TypeAlias
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from core.workflow.nodes.human_input.entities import FormInput, UserAction
+from dify_graph.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 5902c03e27..d214652e9c 100644
--- a/api/core/entities/mcp_provider.py
+++ b/api/core/entities/mcp_provider.py
@@ -15,7 +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 core.workflow.file import helpers as file_helpers
+from dify_graph.file import helpers as file_helpers
 
 if TYPE_CHECKING:
     from models.tools import MCPToolProvider
diff --git a/api/core/helper/code_executor/code_executor.py b/api/core/helper/code_executor/code_executor.py
index d581b3ac39..4251cfd30b 100644
--- a/api/core/helper/code_executor/code_executor.py
+++ b/api/core/helper/code_executor/code_executor.py
@@ -13,7 +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 core.workflow.nodes.code.entities import CodeLanguage
+from dify_graph.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/code_executor/template_transformer.py b/api/core/helper/code_executor/template_transformer.py
index 1b56eaba21..c569e066f4 100644
--- a/api/core/helper/code_executor/template_transformer.py
+++ b/api/core/helper/code_executor/template_transformer.py
@@ -5,7 +5,7 @@ from base64 import b64encode
 from collections.abc import Mapping
 from typing import Any
 
-from core.workflow.variables.utils import dumps_with_segments
+from dify_graph.variables.utils import dumps_with_segments
 
 
 class TemplateTransformer(ABC):
diff --git a/api/core/llm_generator/llm_generator.py b/api/core/llm_generator/llm_generator.py
index 5b2c640265..b16a42e390 100644
--- a/api/core/llm_generator/llm_generator.py
+++ b/api/core/llm_generator/llm_generator.py
@@ -31,7 +31,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 core.prompt.utils.prompt_template_parser import PromptTemplateParser
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from models import App, Message, WorkflowNodeExecutionModel
diff --git a/api/core/mcp/server/streamable_http.py b/api/core/mcp/server/streamable_http.py
index da747d2c1f..de68eb268b 100644
--- a/api/core/mcp/server/streamable_http.py
+++ b/api/core/mcp/server/streamable_http.py
@@ -7,7 +7,7 @@ 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 core.workflow.variables.input_entities import VariableEntity, VariableEntityType
+from dify_graph.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/memory/token_buffer_memory.py b/api/core/memory/token_buffer_memory.py
index 2b78a705c9..2e93681da0 100644
--- a/api/core/memory/token_buffer_memory.py
+++ b/api/core/memory/token_buffer_memory.py
@@ -15,7 +15,7 @@ from core.model_runtime.entities import (
 )
 from core.model_runtime.entities.message_entities import PromptMessageContentUnionTypes
 from core.prompt.utils.extract_thread_messages import extract_thread_messages
-from core.workflow.file import file_manager
+from dify_graph.file import file_manager
 from extensions.ext_database import db
 from factories import file_factory
 from models.model import AppMode, Conversation, Message, MessageFile
diff --git a/api/core/ops/aliyun_trace/aliyun_trace.py b/api/core/ops/aliyun_trace/aliyun_trace.py
index 46c129099d..19111cc917 100644
--- a/api/core/ops/aliyun_trace/aliyun_trace.py
+++ b/api/core/ops/aliyun_trace/aliyun_trace.py
@@ -57,8 +57,8 @@ from core.ops.entities.trace_entity import (
     WorkflowTraceInfo,
 )
 from core.repositories import DifyCoreRepositoryFactory
-from core.workflow.entities import WorkflowNodeExecution
-from core.workflow.enums import NodeType, WorkflowNodeExecutionMetadataKey
+from dify_graph.entities import WorkflowNodeExecution
+from dify_graph.enums import NodeType, WorkflowNodeExecutionMetadataKey
 from extensions.ext_database import db
 from models import WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/core/ops/aliyun_trace/utils.py b/api/core/ops/aliyun_trace/utils.py
index 7f68889e92..45319f24c1 100644
--- a/api/core/ops/aliyun_trace/utils.py
+++ b/api/core/ops/aliyun_trace/utils.py
@@ -14,8 +14,8 @@ from core.ops.aliyun_trace.entities.semconv import (
     GenAISpanKind,
 )
 from core.rag.models.document import Document
-from core.workflow.entities import WorkflowNodeExecution
-from core.workflow.enums import WorkflowNodeExecutionStatus
+from dify_graph.entities import WorkflowNodeExecution
+from dify_graph.enums import WorkflowNodeExecutionStatus
 from extensions.ext_database import db
 from models import EndUser
 
diff --git a/api/core/ops/langfuse_trace/langfuse_trace.py b/api/core/ops/langfuse_trace/langfuse_trace.py
index 4de4f403ce..28e800e6c7 100644
--- a/api/core/ops/langfuse_trace/langfuse_trace.py
+++ b/api/core/ops/langfuse_trace/langfuse_trace.py
@@ -28,7 +28,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 core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 from extensions.ext_database import db
 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 8b8117b24c..b40bc89b71 100644
--- a/api/core/ops/langsmith_trace/langsmith_trace.py
+++ b/api/core/ops/langsmith_trace/langsmith_trace.py
@@ -28,7 +28,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 core.workflow.enums import NodeType, WorkflowNodeExecutionMetadataKey
+from dify_graph.enums import NodeType, WorkflowNodeExecutionMetadataKey
 from extensions.ext_database import db
 from models import EndUser, MessageFile, WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/core/ops/mlflow_trace/mlflow_trace.py b/api/core/ops/mlflow_trace/mlflow_trace.py
index df6e016632..ba2cb9e0c3 100644
--- a/api/core/ops/mlflow_trace/mlflow_trace.py
+++ b/api/core/ops/mlflow_trace/mlflow_trace.py
@@ -23,7 +23,7 @@ from core.ops.entities.trace_entity import (
     TraceTaskName,
     WorkflowTraceInfo,
 )
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 from extensions.ext_database import db
 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 8050c59db9..eeae489c68 100644
--- a/api/core/ops/opik_trace/opik_trace.py
+++ b/api/core/ops/opik_trace/opik_trace.py
@@ -22,7 +22,7 @@ from core.ops.entities.trace_entity import (
     WorkflowTraceInfo,
 )
 from core.repositories import DifyCoreRepositoryFactory
-from core.workflow.enums import NodeType, WorkflowNodeExecutionMetadataKey
+from dify_graph.enums import NodeType, WorkflowNodeExecutionMetadataKey
 from extensions.ext_database import db
 from models import EndUser, MessageFile, WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/core/ops/ops_trace_manager.py b/api/core/ops/ops_trace_manager.py
index 177991e645..33782e7949 100644
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@@ -35,7 +35,7 @@ from models.workflow import WorkflowAppLog
 from tasks.ops_trace_task import process_trace_tasks
 
 if TYPE_CHECKING:
-    from core.workflow.entities import WorkflowExecution
+    from dify_graph.entities import WorkflowExecution
 
 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 26e8779e3e..0a6013e244 100644
--- a/api/core/ops/tencent_trace/span_builder.py
+++ b/api/core/ops/tencent_trace/span_builder.py
@@ -41,7 +41,7 @@ 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 core.workflow.entities.workflow_node_execution import (
+from dify_graph.entities.workflow_node_execution import (
     WorkflowNodeExecution,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
diff --git a/api/core/ops/tencent_trace/tencent_trace.py b/api/core/ops/tencent_trace/tencent_trace.py
index 93ec186863..cbff1c9e1c 100644
--- a/api/core/ops/tencent_trace/tencent_trace.py
+++ b/api/core/ops/tencent_trace/tencent_trace.py
@@ -24,10 +24,10 @@ from core.ops.tencent_trace.entities.tencent_trace_entity import SpanData
 from core.ops.tencent_trace.span_builder import TencentSpanBuilder
 from core.ops.tencent_trace.utils import TencentTraceUtils
 from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
-from core.workflow.entities.workflow_node_execution import (
+from dify_graph.entities.workflow_node_execution import (
     WorkflowNodeExecution,
 )
-from core.workflow.nodes import NodeType
+from dify_graph.nodes import NodeType
 from extensions.ext_database import db
 from models import Account, App, TenantAccountJoin, WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/core/ops/weave_trace/weave_trace.py b/api/core/ops/weave_trace/weave_trace.py
index 2134be0bce..7b62207366 100644
--- a/api/core/ops/weave_trace/weave_trace.py
+++ b/api/core/ops/weave_trace/weave_trace.py
@@ -31,7 +31,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 core.workflow.enums import NodeType, WorkflowNodeExecutionMetadataKey
+from dify_graph.enums import NodeType, WorkflowNodeExecutionMetadataKey
 from extensions.ext_database import db
 from models import EndUser, MessageFile, WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/core/plugin/backwards_invocation/node.py b/api/core/plugin/backwards_invocation/node.py
index 9fbcbf55b4..33c45c0007 100644
--- a/api/core/plugin/backwards_invocation/node.py
+++ b/api/core/plugin/backwards_invocation/node.py
@@ -1,17 +1,17 @@
 from core.plugin.backwards_invocation.base import BaseBackwardsInvocation
-from core.workflow.enums import NodeType
-from core.workflow.nodes.parameter_extractor.entities import (
+from dify_graph.enums import NodeType
+from dify_graph.nodes.parameter_extractor.entities import (
     ModelConfig as ParameterExtractorModelConfig,
 )
-from core.workflow.nodes.parameter_extractor.entities import (
+from dify_graph.nodes.parameter_extractor.entities import (
     ParameterConfig,
     ParameterExtractorNodeData,
 )
-from core.workflow.nodes.question_classifier.entities import (
+from dify_graph.nodes.question_classifier.entities import (
     ClassConfig,
     QuestionClassifierNodeData,
 )
-from core.workflow.nodes.question_classifier.entities import (
+from dify_graph.nodes.question_classifier.entities import (
     ModelConfig as QuestionClassifierModelConfig,
 )
 from services.workflow_service import WorkflowService
diff --git a/api/core/plugin/entities/request.py b/api/core/plugin/entities/request.py
index 73d3b8c89c..0a1dc50bfa 100644
--- a/api/core/plugin/entities/request.py
+++ b/api/core/plugin/entities/request.py
@@ -18,16 +18,16 @@ from core.model_runtime.entities.message_entities import (
 )
 from core.model_runtime.entities.model_entities import ModelType
 from core.plugin.utils.http_parser import deserialize_response
-from core.workflow.nodes.parameter_extractor.entities import (
+from dify_graph.nodes.parameter_extractor.entities import (
     ModelConfig as ParameterExtractorModelConfig,
 )
-from core.workflow.nodes.parameter_extractor.entities import (
+from dify_graph.nodes.parameter_extractor.entities import (
     ParameterConfig,
 )
-from core.workflow.nodes.question_classifier.entities import (
+from dify_graph.nodes.question_classifier.entities import (
     ClassConfig,
 )
-from core.workflow.nodes.question_classifier.entities import (
+from dify_graph.nodes.question_classifier.entities import (
     ModelConfig as QuestionClassifierModelConfig,
 )
 
diff --git a/api/core/plugin/utils/converter.py b/api/core/plugin/utils/converter.py
index 3fe1b84dfa..53bcd9e9c6 100644
--- a/api/core/plugin/utils/converter.py
+++ b/api/core/plugin/utils/converter.py
@@ -1,7 +1,7 @@
 from typing import Any
 
 from core.tools.entities.tool_entities import ToolSelector
-from core.workflow.file.models import File
+from dify_graph.file.models 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 771b6be332..1883538dad 100644
--- a/api/core/prompt/advanced_prompt_transform.py
+++ b/api/core/prompt/advanced_prompt_transform.py
@@ -17,9 +17,9 @@ from core.model_runtime.entities.message_entities import ImagePromptMessageConte
 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 core.workflow.file import file_manager
-from core.workflow.file.models import File
-from core.workflow.runtime import VariablePool
+from dify_graph.file import file_manager
+from dify_graph.file.models import File
+from dify_graph.runtime import VariablePool
 
 
 class AdvancedPromptTransform(PromptTransform):
diff --git a/api/core/prompt/simple_prompt_transform.py b/api/core/prompt/simple_prompt_transform.py
index 936a093488..53981eb1e1 100644
--- a/api/core/prompt/simple_prompt_transform.py
+++ b/api/core/prompt/simple_prompt_transform.py
@@ -18,11 +18,11 @@ from core.model_runtime.entities.message_entities import (
 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 core.workflow.file import file_manager
+from dify_graph.file import file_manager
 from models.model import AppMode
 
 if TYPE_CHECKING:
-    from core.workflow.file.models import File
+    from dify_graph.file.models import File
 
 
 class ModelMode(StrEnum):
diff --git a/api/core/rag/index_processor/index_processor.py b/api/core/rag/index_processor/index_processor.py
index 95b197c874..c8f9d29012 100644
--- a/api/core/rag/index_processor/index_processor.py
+++ b/api/core/rag/index_processor/index_processor.py
@@ -9,8 +9,8 @@ from flask import current_app
 from sqlalchemy import delete, func, select
 
 from core.db.session_factory import session_factory
-from core.workflow.nodes.knowledge_index.exc import KnowledgeIndexNodeError
-from core.workflow.repositories.index_processor_protocol import Preview, PreviewItem, QaPreview
+from dify_graph.nodes.knowledge_index.exc import KnowledgeIndexNodeError
+from dify_graph.repositories.index_processor_protocol import Preview, PreviewItem, QaPreview
 from models.dataset import Dataset, Document, DocumentSegment
 
 from .index_processor_factory import IndexProcessorFactory
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 df5c89a522..79265cf3ed 100644
--- a/api/core/rag/index_processor/processor/paragraph_index_processor.py
+++ b/api/core/rag/index_processor/processor/paragraph_index_processor.py
@@ -35,7 +35,7 @@ from core.rag.index_processor.index_processor_base import BaseIndexProcessor
 from core.rag.models.document import AttachmentDocument, Document, MultimodalGeneralStructureChunk
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.tools.utils.text_processing_utils import remove_leading_symbols
-from core.workflow.file import File, FileTransferMethod, FileType, file_manager
+from dify_graph.file import File, FileTransferMethod, FileType, file_manager
 from extensions.ext_database import db
 from factories.file_factory import build_from_mapping
 from libs import helper
diff --git a/api/core/rag/models/document.py b/api/core/rag/models/document.py
index 48639bf4c8..dc3b771406 100644
--- a/api/core/rag/models/document.py
+++ b/api/core/rag/models/document.py
@@ -4,7 +4,7 @@ from typing import Any
 
 from pydantic import BaseModel, Field
 
-from core.workflow.file import File
+from dify_graph.file import File
 
 
 class ChildDocument(BaseModel):
diff --git a/api/core/rag/retrieval/dataset_retrieval.py b/api/core/rag/retrieval/dataset_retrieval.py
index 459d7bed95..151dfe81b3 100644
--- a/api/core/rag/retrieval/dataset_retrieval.py
+++ b/api/core/rag/retrieval/dataset_retrieval.py
@@ -60,9 +60,9 @@ from core.rag.retrieval.template_prompts import (
 )
 from core.tools.signature import sign_upload_file
 from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
-from core.workflow.file import File, FileTransferMethod, FileType
-from core.workflow.nodes.knowledge_retrieval import exc
-from core.workflow.repositories.rag_retrieval_protocol import (
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.nodes.knowledge_retrieval import exc
+from dify_graph.repositories.rag_retrieval_protocol import (
     KnowledgeRetrievalRequest,
     Source,
     SourceChildChunk,
diff --git a/api/core/repositories/celery_workflow_execution_repository.py b/api/core/repositories/celery_workflow_execution_repository.py
index c7f5942f5f..57764574d7 100644
--- a/api/core/repositories/celery_workflow_execution_repository.py
+++ b/api/core/repositories/celery_workflow_execution_repository.py
@@ -11,8 +11,8 @@ from typing import Union
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
-from core.workflow.entities.workflow_execution import WorkflowExecution
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.entities.workflow_execution import WorkflowExecution
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
 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 9b8e45b1eb..650cf79550 100644
--- a/api/core/repositories/celery_workflow_node_execution_repository.py
+++ b/api/core/repositories/celery_workflow_node_execution_repository.py
@@ -12,8 +12,8 @@ from typing import Union
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecution
-from core.workflow.repositories.workflow_node_execution_repository import (
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecution
+from dify_graph.repositories.workflow_node_execution_repository import (
     OrderConfig,
     WorkflowNodeExecutionRepository,
 )
diff --git a/api/core/repositories/factory.py b/api/core/repositories/factory.py
index 02fcabab5d..dc9f8c96bf 100644
--- a/api/core/repositories/factory.py
+++ b/api/core/repositories/factory.py
@@ -11,8 +11,8 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
 from configs import dify_config
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
 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 0e04c56e0e..bd9afe36f0 100644
--- a/api/core/repositories/human_input_repository.py
+++ b/api/core/repositories/human_input_repository.py
@@ -7,7 +7,7 @@ from typing import Any
 from sqlalchemy import Engine, select
 from sqlalchemy.orm import Session, selectinload, sessionmaker
 
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     DeliveryChannelConfig,
     EmailDeliveryMethod,
     EmailRecipients,
@@ -17,12 +17,12 @@ from core.workflow.nodes.human_input.entities import (
     MemberRecipient,
     WebAppDeliveryMethod,
 )
-from core.workflow.nodes.human_input.enums import (
+from dify_graph.nodes.human_input.enums import (
     DeliveryMethodType,
     HumanInputFormKind,
     HumanInputFormStatus,
 )
-from core.workflow.repositories.human_input_form_repository import (
+from dify_graph.repositories.human_input_form_repository import (
     FormCreateParams,
     FormNotFoundError,
     HumanInputFormEntity,
diff --git a/api/core/repositories/sqlalchemy_workflow_execution_repository.py b/api/core/repositories/sqlalchemy_workflow_execution_repository.py
index 9091a3190b..649e2f7358 100644
--- a/api/core/repositories/sqlalchemy_workflow_execution_repository.py
+++ b/api/core/repositories/sqlalchemy_workflow_execution_repository.py
@@ -9,10 +9,10 @@ from typing import Union
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
-from core.workflow.entities import WorkflowExecution
-from core.workflow.enums import WorkflowExecutionStatus, WorkflowType
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter
+from dify_graph.entities import WorkflowExecution
+from dify_graph.enums import WorkflowExecutionStatus, WorkflowType
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.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 324dd059d1..85ee9b5083 100644
--- a/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
+++ b/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
@@ -18,10 +18,10 @@ from tenacity import before_sleep_log, retry, retry_if_exception, stop_after_att
 
 from configs import dify_config
 from core.model_runtime.utils.encoders import jsonable_encoder
-from core.workflow.entities import WorkflowNodeExecution
-from core.workflow.enums import NodeType, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from core.workflow.repositories.workflow_node_execution_repository import OrderConfig, WorkflowNodeExecutionRepository
-from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter
+from dify_graph.entities import WorkflowNodeExecution
+from dify_graph.enums import NodeType, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.repositories.workflow_node_execution_repository import OrderConfig, WorkflowNodeExecutionRepository
+from dify_graph.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from extensions.ext_storage import storage
 from libs.helper import extract_tenant_id
 from libs.uuid_utils import uuidv7
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 2c1e9fb555..b0552fd863 100644
--- a/api/core/tools/builtin_tool/providers/audio/tools/asr.py
+++ b/api/core/tools/builtin_tool/providers/audio/tools/asr.py
@@ -8,8 +8,8 @@ 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 core.workflow.file.enums import FileType
-from core.workflow.file.file_manager import download
+from dify_graph.file.enums import FileType
+from dify_graph.file.file_manager import download
 from services.model_provider_service import ModelProviderService
 
 
diff --git a/api/core/tools/custom_tool/tool.py b/api/core/tools/custom_tool/tool.py
index afa2ddffed..c6a84e27c6 100644
--- a/api/core/tools/custom_tool/tool.py
+++ b/api/core/tools/custom_tool/tool.py
@@ -13,7 +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 core.workflow.file.file_manager import download
+from dify_graph.file.file_manager import download
 
 API_TOOL_DEFAULT_TIMEOUT = (
     int(getenv("API_TOOL_DEFAULT_CONNECT_TIMEOUT", "10")),
diff --git a/api/core/tools/tool_engine.py b/api/core/tools/tool_engine.py
index de476f6461..0f0eacbdc4 100644
--- a/api/core/tools/tool_engine.py
+++ b/api/core/tools/tool_engine.py
@@ -31,8 +31,8 @@ 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 core.workflow.file import FileType
-from core.workflow.file.models import FileTransferMethod
+from dify_graph.file import FileType
+from dify_graph.file.models import FileTransferMethod
 from extensions.ext_database import db
 from models.enums import CreatorUserRole
 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 ca0dc27f3d..83e4e53418 100644
--- a/api/core/tools/tool_file_manager.py
+++ b/api/core/tools/tool_file_manager.py
@@ -243,7 +243,7 @@ class ToolFileManager:
 
 
 # init tool_file_parser
-from core.workflow.file.tool_file_parser import set_tool_file_manager_factory
+from dify_graph.file.tool_file_parser import set_tool_file_manager_factory
 
 
 def _factory() -> ToolFileManager:
diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py
index d561d39923..1bb9960e62 100644
--- a/api/core/tools/tool_manager.py
+++ b/api/core/tools/tool_manager.py
@@ -24,14 +24,14 @@ from core.tools.plugin_tool.provider import PluginToolProviderController
 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 core.workflow.runtime.variable_pool import VariablePool
+from dify_graph.runtime.variable_pool import VariablePool
 from extensions.ext_database import db
 from models.provider_ids import ToolProviderID
 from services.enterprise.plugin_manager_service import PluginCredentialType
 from services.tools.mcp_tools_manage_service import MCPToolManageService
 
 if TYPE_CHECKING:
-    from core.workflow.nodes.tool.entities import ToolEntity
+    from dify_graph.nodes.tool.entities import ToolEntity
 
 from core.agent.entities import AgentToolEntity
 from core.app.entities.app_invoke_entities import InvokeFrom
@@ -62,7 +62,7 @@ from models.tools import ApiToolProvider, BuiltinToolProvider, WorkflowToolProvi
 from services.tools.tools_transform_service import ToolTransformService
 
 if TYPE_CHECKING:
-    from core.workflow.nodes.tool.entities import ToolEntity
+    from dify_graph.nodes.tool.entities import ToolEntity
 
 logger = logging.getLogger(__name__)
 
@@ -1017,8 +1017,8 @@ class ToolManager:
         """
         Convert tool parameters type
         """
-        from core.workflow.nodes.tool.entities import ToolNodeData
-        from core.workflow.nodes.tool.exc import ToolParameterError
+        from dify_graph.nodes.tool.entities import ToolNodeData
+        from dify_graph.nodes.tool.exc import ToolParameterError
 
         runtime_parameters = {}
         for parameter in parameters:
diff --git a/api/core/tools/utils/message_transformer.py b/api/core/tools/utils/message_transformer.py
index 622cdcf73b..6fc5fead2d 100644
--- a/api/core/tools/utils/message_transformer.py
+++ b/api/core/tools/utils/message_transformer.py
@@ -10,7 +10,7 @@ import pytz
 
 from core.tools.entities.tool_entities import ToolInvokeMessage
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.file import File, FileTransferMethod, FileType
+from dify_graph.file import File, FileTransferMethod, FileType
 from libs.login import current_user
 from models import Account
 
diff --git a/api/core/tools/utils/workflow_configuration_sync.py b/api/core/tools/utils/workflow_configuration_sync.py
index 8e8c5e9c6a..d8ce53083b 100644
--- a/api/core/tools/utils/workflow_configuration_sync.py
+++ b/api/core/tools/utils/workflow_configuration_sync.py
@@ -3,9 +3,9 @@ from typing import Any
 
 from core.tools.entities.tool_entities import WorkflowToolParameterConfiguration
 from core.tools.errors import WorkflowToolHumanInputNotSupportedError
-from core.workflow.enums import NodeType
-from core.workflow.nodes.base.entities import OutputVariableEntity
-from core.workflow.variables.input_entities import VariableEntity
+from dify_graph.enums import NodeType
+from dify_graph.nodes.base.entities import OutputVariableEntity
+from dify_graph.variables.input_entities import VariableEntity
 
 
 class WorkflowToolConfigurationUtils:
diff --git a/api/core/tools/workflow_as_tool/provider.py b/api/core/tools/workflow_as_tool/provider.py
index 56faccb407..d73012375d 100644
--- a/api/core/tools/workflow_as_tool/provider.py
+++ b/api/core/tools/workflow_as_tool/provider.py
@@ -22,7 +22,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 core.workflow.variables.input_entities import VariableEntity, VariableEntityType
+from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
 from extensions.ext_database import db
 from models.account import Account
 from models.model import App, AppMode
diff --git a/api/core/tools/workflow_as_tool/tool.py b/api/core/tools/workflow_as_tool/tool.py
index b2606009a6..6b1b48505b 100644
--- a/api/core/tools/workflow_as_tool/tool.py
+++ b/api/core/tools/workflow_as_tool/tool.py
@@ -18,7 +18,7 @@ from core.tools.entities.tool_entities import (
     ToolProviderType,
 )
 from core.tools.errors import ToolInvokeError
-from core.workflow.file import FILE_MODEL_IDENTITY, File, FileTransferMethod
+from dify_graph.file import FILE_MODEL_IDENTITY, File, FileTransferMethod
 from factories.file_factory import build_from_mapping
 from models import Account, Tenant
 from models.model import App, EndUser
diff --git a/api/core/trigger/debug/event_selectors.py b/api/core/trigger/debug/event_selectors.py
index bd1ff4ebfe..9b7b3de614 100644
--- a/api/core/trigger/debug/event_selectors.py
+++ b/api/core/trigger/debug/event_selectors.py
@@ -19,9 +19,9 @@ from core.trigger.debug.events import (
     build_plugin_pool_key,
     build_webhook_pool_key,
 )
-from core.workflow.enums import NodeType
-from core.workflow.nodes.trigger_plugin.entities import TriggerEventNodeData
-from core.workflow.nodes.trigger_schedule.entities import ScheduleConfig
+from dify_graph.enums import NodeType
+from dify_graph.nodes.trigger_plugin.entities import TriggerEventNodeData
+from dify_graph.nodes.trigger_schedule.entities import ScheduleConfig
 from extensions.ext_redis import redis_client
 from libs.datetime_utils import ensure_naive_utc, naive_utc_now
 from libs.schedule_utils import calculate_next_run_at
diff --git a/api/core/workflow/__init__.py b/api/core/workflow/__init__.py
index e69de29bb2..57c2ef3d10 100644
--- a/api/core/workflow/__init__.py
+++ b/api/core/workflow/__init__.py
@@ -0,0 +1,4 @@
+from .node_factory import DifyNodeFactory
+from .workflow_entry import WorkflowEntry
+
+__all__ = ["DifyNodeFactory", "WorkflowEntry"]
diff --git a/api/core/app/workflow/node_factory.py b/api/core/workflow/node_factory.py
similarity index 88%
rename from api/core/app/workflow/node_factory.py
rename to api/core/workflow/node_factory.py
index 9a56f0fb0d..522e510755 100644
--- a/api/core/app/workflow/node_factory.py
+++ b/api/core/workflow/node_factory.py
@@ -23,36 +23,36 @@ from core.rag.index_processor.index_processor import IndexProcessor
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
 from core.rag.summary_index.summary_index import SummaryIndex
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.entities.graph_config import NodeConfigDict
-from core.workflow.enums import NodeType, SystemVariableKey
-from core.workflow.file.file_manager import file_manager
-from core.workflow.graph.graph import NodeFactory
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.code.code_node import CodeNode, WorkflowCodeExecutor
-from core.workflow.nodes.code.entities import CodeLanguage
-from core.workflow.nodes.code.limits import CodeNodeLimits
-from core.workflow.nodes.datasource import DatasourceNode
-from core.workflow.nodes.document_extractor import DocumentExtractorNode, UnstructuredApiConfig
-from core.workflow.nodes.http_request import HttpRequestNode, build_http_request_config
-from core.workflow.nodes.knowledge_index.knowledge_index_node import KnowledgeIndexNode
-from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
-from core.workflow.nodes.llm.entities import ModelConfig
-from core.workflow.nodes.llm.exc import LLMModeRequiredError, ModelNotExistError
-from core.workflow.nodes.llm.node import LLMNode
-from core.workflow.nodes.node_mapping import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING
-from core.workflow.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
-from core.workflow.nodes.question_classifier.question_classifier_node import QuestionClassifierNode
-from core.workflow.nodes.template_transform.template_renderer import (
+from dify_graph.entities.graph_config import NodeConfigDict
+from dify_graph.enums import NodeType, SystemVariableKey
+from dify_graph.file.file_manager import file_manager
+from dify_graph.graph.graph import NodeFactory
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.code.code_node import CodeNode, WorkflowCodeExecutor
+from dify_graph.nodes.code.entities import CodeLanguage
+from dify_graph.nodes.code.limits import CodeNodeLimits
+from dify_graph.nodes.datasource import DatasourceNode
+from dify_graph.nodes.document_extractor import DocumentExtractorNode, UnstructuredApiConfig
+from dify_graph.nodes.http_request import HttpRequestNode, build_http_request_config
+from dify_graph.nodes.knowledge_index.knowledge_index_node import KnowledgeIndexNode
+from dify_graph.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
+from dify_graph.nodes.llm.entities import ModelConfig
+from dify_graph.nodes.llm.exc import LLMModeRequiredError, ModelNotExistError
+from dify_graph.nodes.llm.node import LLMNode
+from dify_graph.nodes.node_mapping import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING
+from dify_graph.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
+from dify_graph.nodes.question_classifier.question_classifier_node import QuestionClassifierNode
+from dify_graph.nodes.template_transform.template_renderer import (
     CodeExecutorJinja2TemplateRenderer,
 )
-from core.workflow.nodes.template_transform.template_transform_node import TemplateTransformNode
-from core.workflow.variables.segments import StringSegment
+from dify_graph.nodes.template_transform.template_transform_node import TemplateTransformNode
+from dify_graph.variables.segments import StringSegment
 from extensions.ext_database import db
 from models.model import Conversation
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
 
 def fetch_memory(
diff --git a/api/core/workflow/nodes/__init__.py b/api/core/workflow/nodes/__init__.py
deleted file mode 100644
index 82a37acbfa..0000000000
--- a/api/core/workflow/nodes/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from core.workflow.enums import NodeType
-
-__all__ = ["NodeType"]
diff --git a/api/core/workflow/nodes/trigger_schedule/__init__.py b/api/core/workflow/nodes/trigger_schedule/__init__.py
deleted file mode 100644
index 6773bae502..0000000000
--- a/api/core/workflow/nodes/trigger_schedule/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from core.workflow.nodes.trigger_schedule.trigger_schedule_node import TriggerScheduleNode
-
-__all__ = ["TriggerScheduleNode"]
diff --git a/api/core/workflow/workflow_entry.py b/api/core/workflow/workflow_entry.py
index 2ea4266b16..37e7b5fabe 100644
--- a/api/core/workflow/workflow_entry.py
+++ b/api/core/workflow/workflow_entry.py
@@ -8,24 +8,24 @@ from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.workflow.layers.llm_quota import LLMQuotaLayer
 from core.app.workflow.layers.observability import ObservabilityLayer
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.constants import ENVIRONMENT_VARIABLE_NODE_ID
-from core.workflow.entities import GraphInitParams
-from core.workflow.entities.graph_config import NodeConfigData, NodeConfigDict
-from core.workflow.errors import WorkflowNodeRunFailedError
-from core.workflow.file.models import File
-from core.workflow.graph import Graph
-from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-from core.workflow.graph_engine.command_channels import InMemoryChannel
-from core.workflow.graph_engine.layers import DebugLoggingLayer, ExecutionLimitsLayer
-from core.workflow.graph_engine.protocols.command_channel import CommandChannel
-from core.workflow.graph_events import GraphEngineEvent, GraphNodeEventBase, GraphRunFailedEvent
-from core.workflow.nodes import NodeType
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.constants import ENVIRONMENT_VARIABLE_NODE_ID
+from dify_graph.entities import GraphInitParams
+from dify_graph.entities.graph_config import NodeConfigData, NodeConfigDict
+from dify_graph.errors import WorkflowNodeRunFailedError
+from dify_graph.file.models import File
+from dify_graph.graph import Graph
+from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+from dify_graph.graph_engine.command_channels import InMemoryChannel
+from dify_graph.graph_engine.layers import DebugLoggingLayer, ExecutionLimitsLayer
+from dify_graph.graph_engine.protocols.command_channel import CommandChannel
+from dify_graph.graph_events import GraphEngineEvent, GraphNodeEventBase, GraphRunFailedEvent
+from dify_graph.nodes import NodeType
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
 from extensions.otel.runtime import is_instrument_flag_enabled
 from factories import file_factory
 from models.enums import UserFrom
diff --git a/api/core/workflow/README.md b/api/dify_graph/README.md
similarity index 98%
rename from api/core/workflow/README.md
rename to api/dify_graph/README.md
index 9a39f976a6..09c4f5afdc 100644
--- a/api/core/workflow/README.md
+++ b/api/dify_graph/README.md
@@ -114,7 +114,7 @@ The codebase enforces strict layering via import-linter:
 1. Inherit from `BaseNode` or appropriate base class
 1. Implement `_run()` method
 1. Register in `nodes/node_mapping.py`
-1. Add tests in `tests/unit_tests/core/workflow/nodes/`
+1. Add tests in `tests/unit_tests/dify_graph/nodes/`
 
 ### Implementing a Custom Layer
 
diff --git a/api/core/workflow/graph_engine/entities/__init__.py b/api/dify_graph/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/entities/__init__.py
rename to api/dify_graph/__init__.py
diff --git a/api/core/workflow/constants.py b/api/dify_graph/constants.py
similarity index 100%
rename from api/core/workflow/constants.py
rename to api/dify_graph/constants.py
diff --git a/api/core/workflow/context/__init__.py b/api/dify_graph/context/__init__.py
similarity index 86%
rename from api/core/workflow/context/__init__.py
rename to api/dify_graph/context/__init__.py
index 1237d6a017..103f526bec 100644
--- a/api/core/workflow/context/__init__.py
+++ b/api/dify_graph/context/__init__.py
@@ -5,7 +5,7 @@ This package provides Flask-independent context management for workflow
 execution in multi-threaded environments.
 """
 
-from core.workflow.context.execution_context import (
+from dify_graph.context.execution_context import (
     AppContext,
     ContextProviderNotFoundError,
     ExecutionContext,
@@ -17,7 +17,7 @@ from core.workflow.context.execution_context import (
     register_context_capturer,
     reset_context_provider,
 )
-from core.workflow.context.models import SandboxContext
+from dify_graph.context.models import SandboxContext
 
 __all__ = [
     "AppContext",
diff --git a/api/core/workflow/context/execution_context.py b/api/dify_graph/context/execution_context.py
similarity index 100%
rename from api/core/workflow/context/execution_context.py
rename to api/dify_graph/context/execution_context.py
diff --git a/api/core/workflow/context/models.py b/api/dify_graph/context/models.py
similarity index 100%
rename from api/core/workflow/context/models.py
rename to api/dify_graph/context/models.py
diff --git a/api/core/workflow/conversation_variable_updater.py b/api/dify_graph/conversation_variable_updater.py
similarity index 96%
rename from api/core/workflow/conversation_variable_updater.py
rename to api/dify_graph/conversation_variable_updater.py
index 6bfb2b2880..17b19f2502 100644
--- a/api/core/workflow/conversation_variable_updater.py
+++ b/api/dify_graph/conversation_variable_updater.py
@@ -1,7 +1,7 @@
 import abc
 from typing import Protocol
 
-from core.workflow.variables import VariableBase
+from dify_graph.variables import VariableBase
 
 
 class ConversationVariableUpdater(Protocol):
diff --git a/api/core/workflow/entities/__init__.py b/api/dify_graph/entities/__init__.py
similarity index 100%
rename from api/core/workflow/entities/__init__.py
rename to api/dify_graph/entities/__init__.py
diff --git a/api/core/workflow/entities/agent.py b/api/dify_graph/entities/agent.py
similarity index 100%
rename from api/core/workflow/entities/agent.py
rename to api/dify_graph/entities/agent.py
diff --git a/api/core/workflow/entities/graph_config.py b/api/dify_graph/entities/graph_config.py
similarity index 100%
rename from api/core/workflow/entities/graph_config.py
rename to api/dify_graph/entities/graph_config.py
diff --git a/api/core/workflow/entities/graph_init_params.py b/api/dify_graph/entities/graph_init_params.py
similarity index 100%
rename from api/core/workflow/entities/graph_init_params.py
rename to api/dify_graph/entities/graph_init_params.py
diff --git a/api/core/workflow/entities/pause_reason.py b/api/dify_graph/entities/pause_reason.py
similarity index 96%
rename from api/core/workflow/entities/pause_reason.py
rename to api/dify_graph/entities/pause_reason.py
index 147f56e8be..86d8c8ca16 100644
--- a/api/core/workflow/entities/pause_reason.py
+++ b/api/dify_graph/entities/pause_reason.py
@@ -4,7 +4,7 @@ from typing import Annotated, Any, Literal, TypeAlias
 
 from pydantic import BaseModel, Field
 
-from core.workflow.nodes.human_input.entities import FormInput, UserAction
+from dify_graph.nodes.human_input.entities import FormInput, UserAction
 
 
 class PauseReasonType(StrEnum):
diff --git a/api/core/workflow/entities/workflow_execution.py b/api/dify_graph/entities/workflow_execution.py
similarity index 96%
rename from api/core/workflow/entities/workflow_execution.py
rename to api/dify_graph/entities/workflow_execution.py
index 1b3fb36f1f..459ac46415 100644
--- a/api/core/workflow/entities/workflow_execution.py
+++ b/api/dify_graph/entities/workflow_execution.py
@@ -13,7 +13,7 @@ from typing import Any
 
 from pydantic import BaseModel, Field
 
-from core.workflow.enums import WorkflowExecutionStatus, WorkflowType
+from dify_graph.enums import WorkflowExecutionStatus, WorkflowType
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/core/workflow/entities/workflow_node_execution.py b/api/dify_graph/entities/workflow_node_execution.py
similarity index 98%
rename from api/core/workflow/entities/workflow_node_execution.py
rename to api/dify_graph/entities/workflow_node_execution.py
index 4abc9c068d..9dd04e331b 100644
--- a/api/core/workflow/entities/workflow_node_execution.py
+++ b/api/dify_graph/entities/workflow_node_execution.py
@@ -12,7 +12,7 @@ from typing import Any
 
 from pydantic import BaseModel, Field, PrivateAttr
 
-from core.workflow.enums import NodeType, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.enums import NodeType, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 
 
 class WorkflowNodeExecution(BaseModel):
diff --git a/api/core/workflow/entities/workflow_start_reason.py b/api/dify_graph/entities/workflow_start_reason.py
similarity index 100%
rename from api/core/workflow/entities/workflow_start_reason.py
rename to api/dify_graph/entities/workflow_start_reason.py
diff --git a/api/core/workflow/enums.py b/api/dify_graph/enums.py
similarity index 100%
rename from api/core/workflow/enums.py
rename to api/dify_graph/enums.py
diff --git a/api/core/workflow/errors.py b/api/dify_graph/errors.py
similarity index 88%
rename from api/core/workflow/errors.py
rename to api/dify_graph/errors.py
index 5bf1faee5d..463d17713e 100644
--- a/api/core/workflow/errors.py
+++ b/api/dify_graph/errors.py
@@ -1,4 +1,4 @@
-from core.workflow.nodes.base.node import Node
+from dify_graph.nodes.base.node import Node
 
 
 class WorkflowNodeRunFailedError(Exception):
diff --git a/api/core/workflow/file/__init__.py b/api/dify_graph/file/__init__.py
similarity index 100%
rename from api/core/workflow/file/__init__.py
rename to api/dify_graph/file/__init__.py
diff --git a/api/core/workflow/file/constants.py b/api/dify_graph/file/constants.py
similarity index 100%
rename from api/core/workflow/file/constants.py
rename to api/dify_graph/file/constants.py
diff --git a/api/core/workflow/file/enums.py b/api/dify_graph/file/enums.py
similarity index 100%
rename from api/core/workflow/file/enums.py
rename to api/dify_graph/file/enums.py
diff --git a/api/core/workflow/file/file_manager.py b/api/dify_graph/file/file_manager.py
similarity index 100%
rename from api/core/workflow/file/file_manager.py
rename to api/dify_graph/file/file_manager.py
diff --git a/api/core/workflow/file/helpers.py b/api/dify_graph/file/helpers.py
similarity index 100%
rename from api/core/workflow/file/helpers.py
rename to api/dify_graph/file/helpers.py
diff --git a/api/core/workflow/file/models.py b/api/dify_graph/file/models.py
similarity index 100%
rename from api/core/workflow/file/models.py
rename to api/dify_graph/file/models.py
diff --git a/api/core/workflow/file/protocols.py b/api/dify_graph/file/protocols.py
similarity index 94%
rename from api/core/workflow/file/protocols.py
rename to api/dify_graph/file/protocols.py
index 8d923148e0..24cbb42735 100644
--- a/api/core/workflow/file/protocols.py
+++ b/api/dify_graph/file/protocols.py
@@ -14,7 +14,7 @@ class HttpResponseProtocol(Protocol):
 
 
 class WorkflowFileRuntimeProtocol(Protocol):
-    """Runtime dependencies required by ``core.workflow.file``.
+    """Runtime dependencies required by ``dify_graph.file``.
 
     Implementations are expected to be provided by integration layers (for example,
     ``core.app.workflow.file_runtime``) so the workflow package avoids importing
diff --git a/api/core/workflow/file/runtime.py b/api/dify_graph/file/runtime.py
similarity index 100%
rename from api/core/workflow/file/runtime.py
rename to api/dify_graph/file/runtime.py
diff --git a/api/core/workflow/file/tool_file_parser.py b/api/dify_graph/file/tool_file_parser.py
similarity index 100%
rename from api/core/workflow/file/tool_file_parser.py
rename to api/dify_graph/file/tool_file_parser.py
diff --git a/api/core/workflow/graph/__init__.py b/api/dify_graph/graph/__init__.py
similarity index 100%
rename from api/core/workflow/graph/__init__.py
rename to api/dify_graph/graph/__init__.py
diff --git a/api/core/workflow/graph/edge.py b/api/dify_graph/graph/edge.py
similarity index 91%
rename from api/core/workflow/graph/edge.py
rename to api/dify_graph/graph/edge.py
index 1d57747dbb..f4f67ea6be 100644
--- a/api/core/workflow/graph/edge.py
+++ b/api/dify_graph/graph/edge.py
@@ -1,7 +1,7 @@
 import uuid
 from dataclasses import dataclass, field
 
-from core.workflow.enums import NodeState
+from dify_graph.enums import NodeState
 
 
 @dataclass
diff --git a/api/core/workflow/graph/graph.py b/api/dify_graph/graph/graph.py
similarity index 98%
rename from api/core/workflow/graph/graph.py
rename to api/dify_graph/graph/graph.py
index 52bbbb20cc..3fe94eb3fd 100644
--- a/api/core/workflow/graph/graph.py
+++ b/api/dify_graph/graph/graph.py
@@ -7,9 +7,9 @@ from typing import Protocol, cast, final
 
 from pydantic import TypeAdapter
 
-from core.workflow.entities.graph_config import NodeConfigDict
-from core.workflow.enums import ErrorStrategy, NodeExecutionType, NodeState, NodeType
-from core.workflow.nodes.base.node import Node
+from dify_graph.entities.graph_config import NodeConfigDict
+from dify_graph.enums import ErrorStrategy, NodeExecutionType, NodeState, NodeType
+from dify_graph.nodes.base.node import Node
 from libs.typing import is_str
 
 from .edge import Edge
diff --git a/api/core/workflow/graph/graph_template.py b/api/dify_graph/graph/graph_template.py
similarity index 100%
rename from api/core/workflow/graph/graph_template.py
rename to api/dify_graph/graph/graph_template.py
diff --git a/api/core/workflow/graph/validation.py b/api/dify_graph/graph/validation.py
similarity index 98%
rename from api/core/workflow/graph/validation.py
rename to api/dify_graph/graph/validation.py
index 41b4fdfa60..6840bcfed2 100644
--- a/api/core/workflow/graph/validation.py
+++ b/api/dify_graph/graph/validation.py
@@ -4,7 +4,7 @@ from collections.abc import Sequence
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Protocol
 
-from core.workflow.enums import NodeExecutionType, NodeType
+from dify_graph.enums import NodeExecutionType, NodeType
 
 if TYPE_CHECKING:
     from .graph import Graph
diff --git a/api/core/workflow/graph_engine/__init__.py b/api/dify_graph/graph_engine/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/__init__.py
rename to api/dify_graph/graph_engine/__init__.py
diff --git a/api/core/workflow/graph_engine/_engine_utils.py b/api/dify_graph/graph_engine/_engine_utils.py
similarity index 100%
rename from api/core/workflow/graph_engine/_engine_utils.py
rename to api/dify_graph/graph_engine/_engine_utils.py
diff --git a/api/core/workflow/graph_engine/command_channels/README.md b/api/dify_graph/graph_engine/command_channels/README.md
similarity index 100%
rename from api/core/workflow/graph_engine/command_channels/README.md
rename to api/dify_graph/graph_engine/command_channels/README.md
diff --git a/api/core/workflow/graph_engine/command_channels/__init__.py b/api/dify_graph/graph_engine/command_channels/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/command_channels/__init__.py
rename to api/dify_graph/graph_engine/command_channels/__init__.py
diff --git a/api/core/workflow/graph_engine/command_channels/in_memory_channel.py b/api/dify_graph/graph_engine/command_channels/in_memory_channel.py
similarity index 100%
rename from api/core/workflow/graph_engine/command_channels/in_memory_channel.py
rename to api/dify_graph/graph_engine/command_channels/in_memory_channel.py
diff --git a/api/core/workflow/graph_engine/command_channels/redis_channel.py b/api/dify_graph/graph_engine/command_channels/redis_channel.py
similarity index 100%
rename from api/core/workflow/graph_engine/command_channels/redis_channel.py
rename to api/dify_graph/graph_engine/command_channels/redis_channel.py
diff --git a/api/core/workflow/graph_engine/command_processing/__init__.py b/api/dify_graph/graph_engine/command_processing/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/command_processing/__init__.py
rename to api/dify_graph/graph_engine/command_processing/__init__.py
diff --git a/api/core/workflow/graph_engine/command_processing/command_handlers.py b/api/dify_graph/graph_engine/command_processing/command_handlers.py
similarity index 94%
rename from api/core/workflow/graph_engine/command_processing/command_handlers.py
rename to api/dify_graph/graph_engine/command_processing/command_handlers.py
index cfe856d9e8..eefd0c366b 100644
--- a/api/core/workflow/graph_engine/command_processing/command_handlers.py
+++ b/api/dify_graph/graph_engine/command_processing/command_handlers.py
@@ -3,8 +3,8 @@ from typing import final
 
 from typing_extensions import override
 
-from core.workflow.entities.pause_reason import SchedulingPause
-from core.workflow.runtime import VariablePool
+from dify_graph.entities.pause_reason import SchedulingPause
+from dify_graph.runtime import VariablePool
 
 from ..domain.graph_execution import GraphExecution
 from ..entities.commands import AbortCommand, GraphEngineCommand, PauseCommand, UpdateVariablesCommand
diff --git a/api/core/workflow/graph_engine/command_processing/command_processor.py b/api/dify_graph/graph_engine/command_processing/command_processor.py
similarity index 100%
rename from api/core/workflow/graph_engine/command_processing/command_processor.py
rename to api/dify_graph/graph_engine/command_processing/command_processor.py
diff --git a/api/core/workflow/graph_engine/config.py b/api/dify_graph/graph_engine/config.py
similarity index 100%
rename from api/core/workflow/graph_engine/config.py
rename to api/dify_graph/graph_engine/config.py
diff --git a/api/core/workflow/graph_engine/domain/__init__.py b/api/dify_graph/graph_engine/domain/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/domain/__init__.py
rename to api/dify_graph/graph_engine/domain/__init__.py
diff --git a/api/core/workflow/graph_engine/domain/graph_execution.py b/api/dify_graph/graph_engine/domain/graph_execution.py
similarity index 97%
rename from api/core/workflow/graph_engine/domain/graph_execution.py
rename to api/dify_graph/graph_engine/domain/graph_execution.py
index 3ba6e5e37c..0ee4a9f9a7 100644
--- a/api/core/workflow/graph_engine/domain/graph_execution.py
+++ b/api/dify_graph/graph_engine/domain/graph_execution.py
@@ -8,9 +8,9 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
-from core.workflow.entities.pause_reason import PauseReason
-from core.workflow.enums import NodeState
-from core.workflow.runtime.graph_runtime_state import GraphExecutionProtocol
+from dify_graph.entities.pause_reason import PauseReason
+from dify_graph.enums import NodeState
+from dify_graph.runtime.graph_runtime_state import GraphExecutionProtocol
 
 from .node_execution import NodeExecution
 
diff --git a/api/core/workflow/graph_engine/domain/node_execution.py b/api/dify_graph/graph_engine/domain/node_execution.py
similarity index 96%
rename from api/core/workflow/graph_engine/domain/node_execution.py
rename to api/dify_graph/graph_engine/domain/node_execution.py
index 85700caa3a..ae8f9a5e50 100644
--- a/api/core/workflow/graph_engine/domain/node_execution.py
+++ b/api/dify_graph/graph_engine/domain/node_execution.py
@@ -4,7 +4,7 @@ NodeExecution entity representing a node's execution state.
 
 from dataclasses import dataclass
 
-from core.workflow.enums import NodeState
+from dify_graph.enums import NodeState
 
 
 @dataclass
diff --git a/api/core/workflow/nodes/answer/__init__.py b/api/dify_graph/graph_engine/entities/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/answer/__init__.py
rename to api/dify_graph/graph_engine/entities/__init__.py
diff --git a/api/core/workflow/graph_engine/entities/commands.py b/api/dify_graph/graph_engine/entities/commands.py
similarity index 96%
rename from api/core/workflow/graph_engine/entities/commands.py
rename to api/dify_graph/graph_engine/entities/commands.py
index 7e7b65247b..c56845cfc4 100644
--- a/api/core/workflow/graph_engine/entities/commands.py
+++ b/api/dify_graph/graph_engine/entities/commands.py
@@ -11,7 +11,7 @@ from typing import Any
 
 from pydantic import BaseModel, Field
 
-from core.workflow.variables.variables import Variable
+from dify_graph.variables.variables import Variable
 
 
 class CommandType(StrEnum):
diff --git a/api/core/workflow/graph_engine/error_handler.py b/api/dify_graph/graph_engine/error_handler.py
similarity index 97%
rename from api/core/workflow/graph_engine/error_handler.py
rename to api/dify_graph/graph_engine/error_handler.py
index 62e144c12a..d4ee2922ec 100644
--- a/api/core/workflow/graph_engine/error_handler.py
+++ b/api/dify_graph/graph_engine/error_handler.py
@@ -6,21 +6,21 @@ import logging
 import time
 from typing import TYPE_CHECKING, final
 
-from core.workflow.enums import (
+from dify_graph.enums import (
     ErrorStrategy as ErrorStrategyEnum,
 )
-from core.workflow.enums import (
+from dify_graph.enums import (
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.graph import Graph
-from core.workflow.graph_events import (
+from dify_graph.graph import Graph
+from dify_graph.graph_events import (
     GraphNodeEventBase,
     NodeRunExceptionEvent,
     NodeRunFailedEvent,
     NodeRunRetryEvent,
 )
-from core.workflow.node_events import NodeRunResult
+from dify_graph.node_events import NodeRunResult
 
 if TYPE_CHECKING:
     from .domain import GraphExecution
diff --git a/api/core/workflow/graph_engine/event_management/__init__.py b/api/dify_graph/graph_engine/event_management/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/event_management/__init__.py
rename to api/dify_graph/graph_engine/event_management/__init__.py
diff --git a/api/core/workflow/graph_engine/event_management/event_handlers.py b/api/dify_graph/graph_engine/event_management/event_handlers.py
similarity index 98%
rename from api/core/workflow/graph_engine/event_management/event_handlers.py
rename to api/dify_graph/graph_engine/event_management/event_handlers.py
index 98a0702e1c..92ea793ccb 100644
--- a/api/core/workflow/graph_engine/event_management/event_handlers.py
+++ b/api/dify_graph/graph_engine/event_management/event_handlers.py
@@ -8,9 +8,9 @@ from functools import singledispatchmethod
 from typing import TYPE_CHECKING, final
 
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.enums import ErrorStrategy, NodeExecutionType, NodeState
-from core.workflow.graph import Graph
-from core.workflow.graph_events import (
+from dify_graph.enums import ErrorStrategy, NodeExecutionType, NodeState
+from dify_graph.graph import Graph
+from dify_graph.graph_events import (
     GraphNodeEventBase,
     NodeRunAgentLogEvent,
     NodeRunExceptionEvent,
@@ -30,7 +30,7 @@ from core.workflow.graph_events import (
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.runtime import GraphRuntimeState
+from dify_graph.runtime import GraphRuntimeState
 
 from ..domain.graph_execution import GraphExecution
 from ..response_coordinator import ResponseStreamCoordinator
diff --git a/api/core/workflow/graph_engine/event_management/event_manager.py b/api/dify_graph/graph_engine/event_management/event_manager.py
similarity index 98%
rename from api/core/workflow/graph_engine/event_management/event_manager.py
rename to api/dify_graph/graph_engine/event_management/event_manager.py
index ae2e659543..616f621c3e 100644
--- a/api/core/workflow/graph_engine/event_management/event_manager.py
+++ b/api/dify_graph/graph_engine/event_management/event_manager.py
@@ -9,7 +9,7 @@ from collections.abc import Generator
 from contextlib import contextmanager
 from typing import final
 
-from core.workflow.graph_events import GraphEngineEvent
+from dify_graph.graph_events import GraphEngineEvent
 
 from ..layers.base import GraphEngineLayer
 
diff --git a/api/core/workflow/graph_engine/graph_engine.py b/api/dify_graph/graph_engine/graph_engine.py
similarity index 95%
rename from api/core/workflow/graph_engine/graph_engine.py
rename to api/dify_graph/graph_engine/graph_engine.py
index 7c46fc2239..772e607328 100644
--- a/api/core/workflow/graph_engine/graph_engine.py
+++ b/api/dify_graph/graph_engine/graph_engine.py
@@ -12,11 +12,11 @@ import queue
 from collections.abc import Generator
 from typing import TYPE_CHECKING, cast, final
 
-from core.workflow.context import capture_current_context
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.enums import NodeExecutionType
-from core.workflow.graph import Graph
-from core.workflow.graph_events import (
+from dify_graph.context import capture_current_context
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.enums import NodeExecutionType
+from dify_graph.graph import Graph
+from dify_graph.graph_events import (
     GraphEngineEvent,
     GraphNodeEventBase,
     GraphRunAbortedEvent,
@@ -26,10 +26,10 @@ from core.workflow.graph_events import (
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
 )
-from core.workflow.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper
+from dify_graph.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper
 
 if TYPE_CHECKING:  # pragma: no cover - used only for static analysis
-    from core.workflow.runtime.graph_runtime_state import GraphProtocol
+    from dify_graph.runtime.graph_runtime_state import GraphProtocol
 
 from .command_processing import (
     AbortCommandHandler,
@@ -49,8 +49,8 @@ from .protocols.command_channel import CommandChannel
 from .worker_management import WorkerPool
 
 if TYPE_CHECKING:
-    from core.workflow.graph_engine.domain.graph_execution import GraphExecution
-    from core.workflow.graph_engine.response_coordinator import ResponseStreamCoordinator
+    from dify_graph.graph_engine.domain.graph_execution import GraphExecution
+    from dify_graph.graph_engine.response_coordinator import ResponseStreamCoordinator
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/workflow/graph_engine/graph_state_manager.py b/api/dify_graph/graph_engine/graph_state_manager.py
similarity index 98%
rename from api/core/workflow/graph_engine/graph_state_manager.py
rename to api/dify_graph/graph_engine/graph_state_manager.py
index d9773645c3..922a968435 100644
--- a/api/core/workflow/graph_engine/graph_state_manager.py
+++ b/api/dify_graph/graph_engine/graph_state_manager.py
@@ -6,8 +6,8 @@ import threading
 from collections.abc import Sequence
 from typing import TypedDict, final
 
-from core.workflow.enums import NodeState
-from core.workflow.graph import Edge, Graph
+from dify_graph.enums import NodeState
+from dify_graph.graph import Edge, Graph
 
 from .ready_queue import ReadyQueue
 
diff --git a/api/core/workflow/graph_engine/graph_traversal/__init__.py b/api/dify_graph/graph_engine/graph_traversal/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/graph_traversal/__init__.py
rename to api/dify_graph/graph_engine/graph_traversal/__init__.py
diff --git a/api/core/workflow/graph_engine/graph_traversal/edge_processor.py b/api/dify_graph/graph_engine/graph_traversal/edge_processor.py
similarity index 97%
rename from api/core/workflow/graph_engine/graph_traversal/edge_processor.py
rename to api/dify_graph/graph_engine/graph_traversal/edge_processor.py
index 9bd0f86fbf..c4625a8ff7 100644
--- a/api/core/workflow/graph_engine/graph_traversal/edge_processor.py
+++ b/api/dify_graph/graph_engine/graph_traversal/edge_processor.py
@@ -5,9 +5,9 @@ Edge processing logic for graph traversal.
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, final
 
-from core.workflow.enums import NodeExecutionType
-from core.workflow.graph import Edge, Graph
-from core.workflow.graph_events import NodeRunStreamChunkEvent
+from dify_graph.enums import NodeExecutionType
+from dify_graph.graph import Edge, Graph
+from dify_graph.graph_events import NodeRunStreamChunkEvent
 
 from ..graph_state_manager import GraphStateManager
 from ..response_coordinator import ResponseStreamCoordinator
diff --git a/api/core/workflow/graph_engine/graph_traversal/skip_propagator.py b/api/dify_graph/graph_engine/graph_traversal/skip_propagator.py
similarity index 98%
rename from api/core/workflow/graph_engine/graph_traversal/skip_propagator.py
rename to api/dify_graph/graph_engine/graph_traversal/skip_propagator.py
index b9c9243963..76445bccd2 100644
--- a/api/core/workflow/graph_engine/graph_traversal/skip_propagator.py
+++ b/api/dify_graph/graph_engine/graph_traversal/skip_propagator.py
@@ -5,7 +5,7 @@ Skip state propagation through the graph.
 from collections.abc import Sequence
 from typing import final
 
-from core.workflow.graph import Edge, Graph
+from dify_graph.graph import Edge, Graph
 
 from ..graph_state_manager import GraphStateManager
 
diff --git a/api/core/workflow/graph_engine/layers/README.md b/api/dify_graph/graph_engine/layers/README.md
similarity index 100%
rename from api/core/workflow/graph_engine/layers/README.md
rename to api/dify_graph/graph_engine/layers/README.md
diff --git a/api/core/workflow/graph_engine/layers/__init__.py b/api/dify_graph/graph_engine/layers/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/layers/__init__.py
rename to api/dify_graph/graph_engine/layers/__init__.py
diff --git a/api/core/workflow/graph_engine/layers/base.py b/api/dify_graph/graph_engine/layers/base.py
similarity index 94%
rename from api/core/workflow/graph_engine/layers/base.py
rename to api/dify_graph/graph_engine/layers/base.py
index ff4a483aed..890336c1ca 100644
--- a/api/core/workflow/graph_engine/layers/base.py
+++ b/api/dify_graph/graph_engine/layers/base.py
@@ -7,10 +7,10 @@ intercept and respond to GraphEngine events.
 
 from abc import ABC, abstractmethod
 
-from core.workflow.graph_engine.protocols.command_channel import CommandChannel
-from core.workflow.graph_events import GraphEngineEvent, GraphNodeEventBase
-from core.workflow.nodes.base.node import Node
-from core.workflow.runtime import ReadOnlyGraphRuntimeState
+from dify_graph.graph_engine.protocols.command_channel import CommandChannel
+from dify_graph.graph_events import GraphEngineEvent, GraphNodeEventBase
+from dify_graph.nodes.base.node import Node
+from dify_graph.runtime import ReadOnlyGraphRuntimeState
 
 
 class GraphEngineLayerNotInitializedError(Exception):
diff --git a/api/core/workflow/graph_engine/layers/debug_logging.py b/api/dify_graph/graph_engine/layers/debug_logging.py
similarity index 99%
rename from api/core/workflow/graph_engine/layers/debug_logging.py
rename to api/dify_graph/graph_engine/layers/debug_logging.py
index e0402cd09c..1af2e2db9e 100644
--- a/api/core/workflow/graph_engine/layers/debug_logging.py
+++ b/api/dify_graph/graph_engine/layers/debug_logging.py
@@ -11,7 +11,7 @@ from typing import Any, final
 
 from typing_extensions import override
 
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphEngineEvent,
     GraphRunAbortedEvent,
     GraphRunFailedEvent,
diff --git a/api/core/workflow/graph_engine/layers/execution_limits.py b/api/dify_graph/graph_engine/layers/execution_limits.py
similarity index 94%
rename from api/core/workflow/graph_engine/layers/execution_limits.py
rename to api/dify_graph/graph_engine/layers/execution_limits.py
index a2d36d142d..48ba5608d9 100644
--- a/api/core/workflow/graph_engine/layers/execution_limits.py
+++ b/api/dify_graph/graph_engine/layers/execution_limits.py
@@ -15,13 +15,13 @@ from typing import final
 
 from typing_extensions import override
 
-from core.workflow.graph_engine.entities.commands import AbortCommand, CommandType
-from core.workflow.graph_engine.layers import GraphEngineLayer
-from core.workflow.graph_events import (
+from dify_graph.graph_engine.entities.commands import AbortCommand, CommandType
+from dify_graph.graph_engine.layers import GraphEngineLayer
+from dify_graph.graph_events import (
     GraphEngineEvent,
     NodeRunStartedEvent,
 )
-from core.workflow.graph_events.node import NodeRunFailedEvent, NodeRunSucceededEvent
+from dify_graph.graph_events.node import NodeRunFailedEvent, NodeRunSucceededEvent
 
 
 class LimitType(StrEnum):
diff --git a/api/core/workflow/graph_engine/manager.py b/api/dify_graph/graph_engine/manager.py
similarity index 94%
rename from api/core/workflow/graph_engine/manager.py
rename to api/dify_graph/graph_engine/manager.py
index 36f1612af0..955c149069 100644
--- a/api/core/workflow/graph_engine/manager.py
+++ b/api/dify_graph/graph_engine/manager.py
@@ -10,8 +10,8 @@ import logging
 from collections.abc import Sequence
 from typing import final
 
-from core.workflow.graph_engine.command_channels.redis_channel import RedisChannel, RedisClientProtocol
-from core.workflow.graph_engine.entities.commands import (
+from dify_graph.graph_engine.command_channels.redis_channel import RedisChannel, RedisClientProtocol
+from dify_graph.graph_engine.entities.commands import (
     AbortCommand,
     GraphEngineCommand,
     PauseCommand,
diff --git a/api/core/workflow/graph_engine/orchestration/__init__.py b/api/dify_graph/graph_engine/orchestration/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/orchestration/__init__.py
rename to api/dify_graph/graph_engine/orchestration/__init__.py
diff --git a/api/core/workflow/graph_engine/orchestration/dispatcher.py b/api/dify_graph/graph_engine/orchestration/dispatcher.py
similarity index 99%
rename from api/core/workflow/graph_engine/orchestration/dispatcher.py
rename to api/dify_graph/graph_engine/orchestration/dispatcher.py
index 76dd1c7768..f8aaf20b2f 100644
--- a/api/core/workflow/graph_engine/orchestration/dispatcher.py
+++ b/api/dify_graph/graph_engine/orchestration/dispatcher.py
@@ -8,7 +8,7 @@ import threading
 import time
 from typing import TYPE_CHECKING, final
 
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphNodeEventBase,
     NodeRunExceptionEvent,
     NodeRunFailedEvent,
diff --git a/api/core/workflow/graph_engine/orchestration/execution_coordinator.py b/api/dify_graph/graph_engine/orchestration/execution_coordinator.py
similarity index 100%
rename from api/core/workflow/graph_engine/orchestration/execution_coordinator.py
rename to api/dify_graph/graph_engine/orchestration/execution_coordinator.py
diff --git a/api/core/workflow/graph_engine/protocols/command_channel.py b/api/dify_graph/graph_engine/protocols/command_channel.py
similarity index 100%
rename from api/core/workflow/graph_engine/protocols/command_channel.py
rename to api/dify_graph/graph_engine/protocols/command_channel.py
diff --git a/api/core/workflow/graph_engine/ready_queue/__init__.py b/api/dify_graph/graph_engine/ready_queue/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/ready_queue/__init__.py
rename to api/dify_graph/graph_engine/ready_queue/__init__.py
diff --git a/api/core/workflow/graph_engine/ready_queue/factory.py b/api/dify_graph/graph_engine/ready_queue/factory.py
similarity index 100%
rename from api/core/workflow/graph_engine/ready_queue/factory.py
rename to api/dify_graph/graph_engine/ready_queue/factory.py
diff --git a/api/core/workflow/graph_engine/ready_queue/in_memory.py b/api/dify_graph/graph_engine/ready_queue/in_memory.py
similarity index 100%
rename from api/core/workflow/graph_engine/ready_queue/in_memory.py
rename to api/dify_graph/graph_engine/ready_queue/in_memory.py
diff --git a/api/core/workflow/graph_engine/ready_queue/protocol.py b/api/dify_graph/graph_engine/ready_queue/protocol.py
similarity index 100%
rename from api/core/workflow/graph_engine/ready_queue/protocol.py
rename to api/dify_graph/graph_engine/ready_queue/protocol.py
diff --git a/api/core/workflow/graph_engine/response_coordinator/__init__.py b/api/dify_graph/graph_engine/response_coordinator/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/response_coordinator/__init__.py
rename to api/dify_graph/graph_engine/response_coordinator/__init__.py
diff --git a/api/core/workflow/graph_engine/response_coordinator/coordinator.py b/api/dify_graph/graph_engine/response_coordinator/coordinator.py
similarity index 98%
rename from api/core/workflow/graph_engine/response_coordinator/coordinator.py
rename to api/dify_graph/graph_engine/response_coordinator/coordinator.py
index e82ba29438..941a8a496b 100644
--- a/api/core/workflow/graph_engine/response_coordinator/coordinator.py
+++ b/api/dify_graph/graph_engine/response_coordinator/coordinator.py
@@ -14,11 +14,11 @@ from uuid import uuid4
 
 from pydantic import BaseModel, Field
 
-from core.workflow.enums import NodeExecutionType, NodeState
-from core.workflow.graph_events import NodeRunStreamChunkEvent, NodeRunSucceededEvent
-from core.workflow.nodes.base.template import TextSegment, VariableSegment
-from core.workflow.runtime import VariablePool
-from core.workflow.runtime.graph_runtime_state import GraphProtocol
+from dify_graph.enums import NodeExecutionType, NodeState
+from dify_graph.graph_events import NodeRunStreamChunkEvent, NodeRunSucceededEvent
+from dify_graph.nodes.base.template import TextSegment, VariableSegment
+from dify_graph.runtime import VariablePool
+from dify_graph.runtime.graph_runtime_state import GraphProtocol
 
 from .path import Path
 from .session import ResponseSession
diff --git a/api/core/workflow/graph_engine/response_coordinator/path.py b/api/dify_graph/graph_engine/response_coordinator/path.py
similarity index 100%
rename from api/core/workflow/graph_engine/response_coordinator/path.py
rename to api/dify_graph/graph_engine/response_coordinator/path.py
diff --git a/api/core/workflow/graph_engine/response_coordinator/session.py b/api/dify_graph/graph_engine/response_coordinator/session.py
similarity index 85%
rename from api/core/workflow/graph_engine/response_coordinator/session.py
rename to api/dify_graph/graph_engine/response_coordinator/session.py
index 5e4fada7d9..0548e88d93 100644
--- a/api/core/workflow/graph_engine/response_coordinator/session.py
+++ b/api/dify_graph/graph_engine/response_coordinator/session.py
@@ -9,11 +9,11 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-from core.workflow.nodes.answer.answer_node import AnswerNode
-from core.workflow.nodes.base.template import Template
-from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.knowledge_index import KnowledgeIndexNode
-from core.workflow.runtime.graph_runtime_state import NodeProtocol
+from dify_graph.nodes.answer.answer_node import AnswerNode
+from dify_graph.nodes.base.template import Template
+from dify_graph.nodes.end.end_node import EndNode
+from dify_graph.nodes.knowledge_index import KnowledgeIndexNode
+from dify_graph.runtime.graph_runtime_state import NodeProtocol
 
 
 @dataclass
diff --git a/api/core/workflow/graph_engine/worker.py b/api/dify_graph/graph_engine/worker.py
similarity index 95%
rename from api/core/workflow/graph_engine/worker.py
rename to api/dify_graph/graph_engine/worker.py
index 9e218f6fa6..5c5d0fe5b9 100644
--- a/api/core/workflow/graph_engine/worker.py
+++ b/api/dify_graph/graph_engine/worker.py
@@ -14,11 +14,11 @@ from typing import TYPE_CHECKING, final
 
 from typing_extensions import override
 
-from core.workflow.context import IExecutionContext
-from core.workflow.graph import Graph
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events import GraphNodeEventBase, NodeRunFailedEvent, is_node_result_event
-from core.workflow.nodes.base.node import Node
+from dify_graph.context import IExecutionContext
+from dify_graph.graph import Graph
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events import GraphNodeEventBase, NodeRunFailedEvent, is_node_result_event
+from dify_graph.nodes.base.node import Node
 
 from .ready_queue import ReadyQueue
 
diff --git a/api/core/workflow/graph_engine/worker_management/__init__.py b/api/dify_graph/graph_engine/worker_management/__init__.py
similarity index 100%
rename from api/core/workflow/graph_engine/worker_management/__init__.py
rename to api/dify_graph/graph_engine/worker_management/__init__.py
diff --git a/api/core/workflow/graph_engine/worker_management/worker_pool.py b/api/dify_graph/graph_engine/worker_management/worker_pool.py
similarity index 98%
rename from api/core/workflow/graph_engine/worker_management/worker_pool.py
rename to api/dify_graph/graph_engine/worker_management/worker_pool.py
index 2c14f53746..cc93087783 100644
--- a/api/core/workflow/graph_engine/worker_management/worker_pool.py
+++ b/api/dify_graph/graph_engine/worker_management/worker_pool.py
@@ -10,9 +10,9 @@ import queue
 import threading
 from typing import final
 
-from core.workflow.context import IExecutionContext
-from core.workflow.graph import Graph
-from core.workflow.graph_events import GraphNodeEventBase
+from dify_graph.context import IExecutionContext
+from dify_graph.graph import Graph
+from dify_graph.graph_events import GraphNodeEventBase
 
 from ..config import GraphEngineConfig
 from ..layers.base import GraphEngineLayer
diff --git a/api/core/workflow/graph_events/__init__.py b/api/dify_graph/graph_events/__init__.py
similarity index 100%
rename from api/core/workflow/graph_events/__init__.py
rename to api/dify_graph/graph_events/__init__.py
diff --git a/api/core/workflow/graph_events/agent.py b/api/dify_graph/graph_events/agent.py
similarity index 100%
rename from api/core/workflow/graph_events/agent.py
rename to api/dify_graph/graph_events/agent.py
diff --git a/api/core/workflow/graph_events/base.py b/api/dify_graph/graph_events/base.py
similarity index 87%
rename from api/core/workflow/graph_events/base.py
rename to api/dify_graph/graph_events/base.py
index 3714679201..4560cf5085 100644
--- a/api/core/workflow/graph_events/base.py
+++ b/api/dify_graph/graph_events/base.py
@@ -1,7 +1,7 @@
 from pydantic import BaseModel, Field
 
-from core.workflow.enums import NodeType
-from core.workflow.node_events import NodeRunResult
+from dify_graph.enums import NodeType
+from dify_graph.node_events import NodeRunResult
 
 
 class GraphEngineEvent(BaseModel):
diff --git a/api/core/workflow/graph_events/graph.py b/api/dify_graph/graph_events/graph.py
similarity index 90%
rename from api/core/workflow/graph_events/graph.py
rename to api/dify_graph/graph_events/graph.py
index f46526bcab..f4aaba64d6 100644
--- a/api/core/workflow/graph_events/graph.py
+++ b/api/dify_graph/graph_events/graph.py
@@ -1,8 +1,8 @@
 from pydantic import Field
 
-from core.workflow.entities.pause_reason import PauseReason
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.graph_events import BaseGraphEvent
+from dify_graph.entities.pause_reason import PauseReason
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.graph_events import BaseGraphEvent
 
 
 class GraphRunStartedEvent(BaseGraphEvent):
diff --git a/api/core/workflow/graph_events/human_input.py b/api/dify_graph/graph_events/human_input.py
similarity index 100%
rename from api/core/workflow/graph_events/human_input.py
rename to api/dify_graph/graph_events/human_input.py
diff --git a/api/core/workflow/graph_events/iteration.py b/api/dify_graph/graph_events/iteration.py
similarity index 100%
rename from api/core/workflow/graph_events/iteration.py
rename to api/dify_graph/graph_events/iteration.py
diff --git a/api/core/workflow/graph_events/loop.py b/api/dify_graph/graph_events/loop.py
similarity index 100%
rename from api/core/workflow/graph_events/loop.py
rename to api/dify_graph/graph_events/loop.py
diff --git a/api/core/workflow/graph_events/node.py b/api/dify_graph/graph_events/node.py
similarity index 96%
rename from api/core/workflow/graph_events/node.py
rename to api/dify_graph/graph_events/node.py
index 975d72ad1f..21ddf80b64 100644
--- a/api/core/workflow/graph_events/node.py
+++ b/api/dify_graph/graph_events/node.py
@@ -4,8 +4,8 @@ from datetime import datetime
 from pydantic import Field
 
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
-from core.workflow.entities import AgentNodeStrategyInit
-from core.workflow.entities.pause_reason import PauseReason
+from dify_graph.entities import AgentNodeStrategyInit
+from dify_graph.entities.pause_reason import PauseReason
 
 from .base import GraphNodeEventBase
 
diff --git a/api/core/workflow/node_events/__init__.py b/api/dify_graph/node_events/__init__.py
similarity index 100%
rename from api/core/workflow/node_events/__init__.py
rename to api/dify_graph/node_events/__init__.py
diff --git a/api/core/workflow/node_events/agent.py b/api/dify_graph/node_events/agent.py
similarity index 100%
rename from api/core/workflow/node_events/agent.py
rename to api/dify_graph/node_events/agent.py
diff --git a/api/core/workflow/node_events/base.py b/api/dify_graph/node_events/base.py
similarity index 91%
rename from api/core/workflow/node_events/base.py
rename to api/dify_graph/node_events/base.py
index 7fec47e21f..f30c37f2cc 100644
--- a/api/core/workflow/node_events/base.py
+++ b/api/dify_graph/node_events/base.py
@@ -4,7 +4,7 @@ from typing import Any
 from pydantic import BaseModel, Field
 
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 
 
 class NodeEventBase(BaseModel):
diff --git a/api/core/workflow/node_events/iteration.py b/api/dify_graph/node_events/iteration.py
similarity index 100%
rename from api/core/workflow/node_events/iteration.py
rename to api/dify_graph/node_events/iteration.py
diff --git a/api/core/workflow/node_events/loop.py b/api/dify_graph/node_events/loop.py
similarity index 100%
rename from api/core/workflow/node_events/loop.py
rename to api/dify_graph/node_events/loop.py
diff --git a/api/core/workflow/node_events/node.py b/api/dify_graph/node_events/node.py
similarity index 92%
rename from api/core/workflow/node_events/node.py
rename to api/dify_graph/node_events/node.py
index 2468bd0ac3..7f48539255 100644
--- a/api/core/workflow/node_events/node.py
+++ b/api/dify_graph/node_events/node.py
@@ -5,9 +5,9 @@ from pydantic import Field
 
 from core.model_runtime.entities.llm_entities import LLMUsage
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
-from core.workflow.entities.pause_reason import PauseReason
-from core.workflow.file import File
-from core.workflow.node_events import NodeRunResult
+from dify_graph.entities.pause_reason import PauseReason
+from dify_graph.file import File
+from dify_graph.node_events import NodeRunResult
 
 from .base import NodeEventBase
 
diff --git a/api/dify_graph/nodes/__init__.py b/api/dify_graph/nodes/__init__.py
new file mode 100644
index 0000000000..d113ad5e70
--- /dev/null
+++ b/api/dify_graph/nodes/__init__.py
@@ -0,0 +1,3 @@
+from dify_graph.enums import NodeType
+
+__all__ = ["NodeType"]
diff --git a/api/core/workflow/nodes/agent/__init__.py b/api/dify_graph/nodes/agent/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/agent/__init__.py
rename to api/dify_graph/nodes/agent/__init__.py
diff --git a/api/core/workflow/nodes/agent/agent_node.py b/api/dify_graph/nodes/agent/agent_node.py
similarity index 98%
rename from api/core/workflow/nodes/agent/agent_node.py
rename to api/dify_graph/nodes/agent/agent_node.py
index ac86b1784f..5d4c6526c4 100644
--- a/api/core/workflow/nodes/agent/agent_node.py
+++ b/api/dify_graph/nodes/agent/agent_node.py
@@ -25,25 +25,25 @@ from core.tools.entities.tool_entities import (
 )
 from core.tools.tool_manager import ToolManager
 from core.tools.utils.message_transformer import ToolFileMessageTransformer
-from core.workflow.enums import (
+from dify_graph.enums import (
     NodeType,
     SystemVariableKey,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.file import File, FileTransferMethod
-from core.workflow.node_events import (
+from dify_graph.file import File, FileTransferMethod
+from dify_graph.node_events import (
     AgentLogEvent,
     NodeEventBase,
     NodeRunResult,
     StreamChunkEvent,
     StreamCompletedEvent,
 )
-from core.workflow.nodes.agent.entities import AgentNodeData, AgentOldVersionModelFeatures, ParamsAutoGenerated
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.base.variable_template_parser import VariableTemplateParser
-from core.workflow.runtime import VariablePool
-from core.workflow.variables.segments import ArrayFileSegment, StringSegment
+from dify_graph.nodes.agent.entities import AgentNodeData, AgentOldVersionModelFeatures, ParamsAutoGenerated
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
+from dify_graph.runtime import VariablePool
+from dify_graph.variables.segments import ArrayFileSegment, StringSegment
 from extensions.ext_database import db
 from factories import file_factory
 from factories.agent_factory import get_plugin_agent_strategy
diff --git a/api/core/workflow/nodes/agent/entities.py b/api/dify_graph/nodes/agent/entities.py
similarity index 95%
rename from api/core/workflow/nodes/agent/entities.py
rename to api/dify_graph/nodes/agent/entities.py
index 985ee5eef2..9124420f01 100644
--- a/api/core/workflow/nodes/agent/entities.py
+++ b/api/dify_graph/nodes/agent/entities.py
@@ -5,7 +5,7 @@ from pydantic import BaseModel
 
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
 from core.tools.entities.tool_entities import ToolSelector
-from core.workflow.nodes.base.entities import BaseNodeData
+from dify_graph.nodes.base.entities import BaseNodeData
 
 
 class AgentNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/agent/exc.py b/api/dify_graph/nodes/agent/exc.py
similarity index 100%
rename from api/core/workflow/nodes/agent/exc.py
rename to api/dify_graph/nodes/agent/exc.py
diff --git a/api/core/workflow/nodes/end/__init__.py b/api/dify_graph/nodes/answer/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/end/__init__.py
rename to api/dify_graph/nodes/answer/__init__.py
diff --git a/api/core/workflow/nodes/answer/answer_node.py b/api/dify_graph/nodes/answer/answer_node.py
similarity index 83%
rename from api/core/workflow/nodes/answer/answer_node.py
rename to api/dify_graph/nodes/answer/answer_node.py
index 388447368e..d07b9c8062 100644
--- a/api/core/workflow/nodes/answer/answer_node.py
+++ b/api/dify_graph/nodes/answer/answer_node.py
@@ -1,13 +1,13 @@
 from collections.abc import Mapping, Sequence
 from typing import Any
 
-from core.workflow.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.answer.entities import AnswerNodeData
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.base.template import Template
-from core.workflow.nodes.base.variable_template_parser import VariableTemplateParser
-from core.workflow.variables import ArrayFileSegment, FileSegment, Segment
+from dify_graph.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.answer.entities import AnswerNodeData
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.base.template import Template
+from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
+from dify_graph.variables import ArrayFileSegment, FileSegment, Segment
 
 
 class AnswerNode(Node[AnswerNodeData]):
diff --git a/api/core/workflow/nodes/answer/entities.py b/api/dify_graph/nodes/answer/entities.py
similarity index 97%
rename from api/core/workflow/nodes/answer/entities.py
rename to api/dify_graph/nodes/answer/entities.py
index 850ff14880..06927cd71e 100644
--- a/api/core/workflow/nodes/answer/entities.py
+++ b/api/dify_graph/nodes/answer/entities.py
@@ -3,7 +3,7 @@ from enum import StrEnum, auto
 
 from pydantic import BaseModel, Field
 
-from core.workflow.nodes.base import BaseNodeData
+from dify_graph.nodes.base import BaseNodeData
 
 
 class AnswerNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/base/__init__.py b/api/dify_graph/nodes/base/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/base/__init__.py
rename to api/dify_graph/nodes/base/__init__.py
diff --git a/api/core/workflow/nodes/base/entities.py b/api/dify_graph/nodes/base/entities.py
similarity index 99%
rename from api/core/workflow/nodes/base/entities.py
rename to api/dify_graph/nodes/base/entities.py
index c5426e3fb7..956fa59e78 100644
--- a/api/core/workflow/nodes/base/entities.py
+++ b/api/dify_graph/nodes/base/entities.py
@@ -9,7 +9,7 @@ from typing import Any, Union
 
 from pydantic import BaseModel, field_validator, model_validator
 
-from core.workflow.enums import ErrorStrategy
+from dify_graph.enums import ErrorStrategy
 
 from .exc import DefaultValueTypeError
 
diff --git a/api/core/workflow/nodes/base/exc.py b/api/dify_graph/nodes/base/exc.py
similarity index 100%
rename from api/core/workflow/nodes/base/exc.py
rename to api/dify_graph/nodes/base/exc.py
diff --git a/api/core/workflow/nodes/base/node.py b/api/dify_graph/nodes/base/node.py
similarity index 96%
rename from api/core/workflow/nodes/base/node.py
rename to api/dify_graph/nodes/base/node.py
index 976e8032b8..bd8116c1ba 100644
--- a/api/core/workflow/nodes/base/node.py
+++ b/api/dify_graph/nodes/base/node.py
@@ -12,9 +12,9 @@ from typing import Any, ClassVar, Generic, TypeVar, cast, get_args, get_origin
 from uuid import uuid4
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities import AgentNodeStrategyInit, GraphInitParams
-from core.workflow.enums import ErrorStrategy, NodeExecutionType, NodeState, NodeType, WorkflowNodeExecutionStatus
-from core.workflow.graph_events import (
+from dify_graph.entities import AgentNodeStrategyInit, GraphInitParams
+from dify_graph.enums import ErrorStrategy, NodeExecutionType, NodeState, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.graph_events import (
     GraphNodeEventBase,
     NodeRunAgentLogEvent,
     NodeRunFailedEvent,
@@ -34,7 +34,7 @@ from core.workflow.graph_events import (
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.node_events import (
+from dify_graph.node_events import (
     AgentLogEvent,
     HumanInputFormFilledEvent,
     HumanInputFormTimeoutEvent,
@@ -53,7 +53,7 @@ from core.workflow.node_events import (
     StreamChunkEvent,
     StreamCompletedEvent,
 )
-from core.workflow.runtime import GraphRuntimeState
+from dify_graph.runtime import GraphRuntimeState
 from libs.datetime_utils import naive_utc_now
 from models.enums import UserFrom
 
@@ -156,7 +156,7 @@ class Node(Generic[NodeDataT]):
         # Skip base class itself
         if cls is Node:
             return
-        # Only register production node implementations defined under core.workflow.nodes.*
+        # Only register production node implementations defined under dify_graph.nodes.*
         # This prevents test helper subclasses from polluting the global registry and
         # accidentally overriding real node types (e.g., a test Answer node).
         module_name = getattr(cls, "__module__", "")
@@ -164,7 +164,7 @@ class Node(Generic[NodeDataT]):
         node_type = cls.node_type
         version = cls.version()
         bucket = Node._registry.setdefault(node_type, {})
-        if module_name.startswith("core.workflow.nodes."):
+        if module_name.startswith("dify_graph.nodes."):
             # Production node definitions take precedence and may override
             bucket[version] = cls  # type: ignore[index]
         else:
@@ -317,13 +317,13 @@ class Node(Generic[NodeDataT]):
         )
 
         # === FIXME(-LAN-): Needs to refactor.
-        from core.workflow.nodes.tool.tool_node import ToolNode
+        from dify_graph.nodes.tool.tool_node import ToolNode
 
         if isinstance(self, ToolNode):
             start_event.provider_id = getattr(self.node_data, "provider_id", "")
             start_event.provider_type = getattr(self.node_data, "provider_type", "")
 
-        from core.workflow.nodes.datasource.datasource_node import DatasourceNode
+        from dify_graph.nodes.datasource.datasource_node import DatasourceNode
 
         if isinstance(self, DatasourceNode):
             plugin_id = getattr(self.node_data, "plugin_id", "")
@@ -332,7 +332,7 @@ class Node(Generic[NodeDataT]):
             start_event.provider_id = f"{plugin_id}/{provider_name}"
             start_event.provider_type = getattr(self.node_data, "provider_type", "")
 
-        from core.workflow.nodes.trigger_plugin.trigger_event_node import TriggerEventNode
+        from dify_graph.nodes.trigger_plugin.trigger_event_node import TriggerEventNode
 
         if isinstance(self, TriggerEventNode):
             start_event.provider_id = getattr(self.node_data, "provider_id", "")
@@ -340,8 +340,8 @@ class Node(Generic[NodeDataT]):
 
         from typing import cast
 
-        from core.workflow.nodes.agent.agent_node import AgentNode
-        from core.workflow.nodes.agent.entities import AgentNodeData
+        from dify_graph.nodes.agent.agent_node import AgentNode
+        from dify_graph.nodes.agent.entities import AgentNodeData
 
         if isinstance(self, AgentNode):
             start_event.agent_strategy = AgentNodeStrategyInit(
@@ -472,22 +472,22 @@ class Node(Generic[NodeDataT]):
         # NOTE(QuantumGhost): This should be in sync with `NODE_TYPE_CLASSES_MAPPING`.
         #
         # If you have introduced a new node type, please add it to `NODE_TYPE_CLASSES_MAPPING`
-        # in `api/core/workflow/nodes/__init__.py`.
+        # in `api/dify_graph/nodes/__init__.py`.
         raise NotImplementedError("subclasses of BaseNode must implement `version` method.")
 
     @classmethod
     def get_node_type_classes_mapping(cls) -> Mapping[NodeType, Mapping[str, type[Node]]]:
         """Return mapping of NodeType -> {version -> Node subclass} using __init_subclass__ registry.
 
-        Import all modules under core.workflow.nodes so subclasses register themselves on import.
+        Import all modules under dify_graph.nodes so subclasses register themselves on import.
         Then we return a readonly view of the registry to avoid accidental mutation.
         """
         # Import all node modules to ensure they are loaded (thus registered)
-        import core.workflow.nodes as _nodes_pkg
+        import dify_graph.nodes as _nodes_pkg
 
         for _, _modname, _ in pkgutil.walk_packages(_nodes_pkg.__path__, _nodes_pkg.__name__ + "."):
             # Avoid importing modules that depend on the registry to prevent circular imports.
-            if _modname == "core.workflow.nodes.node_mapping":
+            if _modname == "dify_graph.nodes.node_mapping":
                 continue
             importlib.import_module(_modname)
 
diff --git a/api/core/workflow/nodes/base/template.py b/api/dify_graph/nodes/base/template.py
similarity index 98%
rename from api/core/workflow/nodes/base/template.py
rename to api/dify_graph/nodes/base/template.py
index 81f4b9f6fb..5976e808e3 100644
--- a/api/core/workflow/nodes/base/template.py
+++ b/api/dify_graph/nodes/base/template.py
@@ -11,7 +11,7 @@ from collections.abc import Sequence
 from dataclasses import dataclass
 from typing import Any, Union
 
-from core.workflow.nodes.base.variable_template_parser import VariableTemplateParser
+from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
 
 
 @dataclass(frozen=True)
diff --git a/api/core/workflow/nodes/base/usage_tracking_mixin.py b/api/dify_graph/nodes/base/usage_tracking_mixin.py
similarity index 95%
rename from api/core/workflow/nodes/base/usage_tracking_mixin.py
rename to api/dify_graph/nodes/base/usage_tracking_mixin.py
index d9a0ef8972..f1ba953af5 100644
--- a/api/core/workflow/nodes/base/usage_tracking_mixin.py
+++ b/api/dify_graph/nodes/base/usage_tracking_mixin.py
@@ -1,5 +1,5 @@
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.runtime import GraphRuntimeState
+from dify_graph.runtime import GraphRuntimeState
 
 
 class LLMUsageTrackingMixin:
diff --git a/api/core/workflow/nodes/base/variable_template_parser.py b/api/dify_graph/nodes/base/variable_template_parser.py
similarity index 100%
rename from api/core/workflow/nodes/base/variable_template_parser.py
rename to api/dify_graph/nodes/base/variable_template_parser.py
diff --git a/api/core/workflow/nodes/code/__init__.py b/api/dify_graph/nodes/code/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/code/__init__.py
rename to api/dify_graph/nodes/code/__init__.py
diff --git a/api/core/workflow/nodes/code/code_node.py b/api/dify_graph/nodes/code/code_node.py
similarity index 97%
rename from api/core/workflow/nodes/code/code_node.py
rename to api/dify_graph/nodes/code/code_node.py
index 7b1cbfcfea..83e72deea9 100644
--- a/api/core/workflow/nodes/code/code_node.py
+++ b/api/dify_graph/nodes/code/code_node.py
@@ -3,13 +3,13 @@ from decimal import Decimal
 from textwrap import dedent
 from typing import TYPE_CHECKING, Any, Protocol, cast
 
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.code.entities import CodeLanguage, CodeNodeData
-from core.workflow.nodes.code.limits import CodeNodeLimits
-from core.workflow.variables.segments import ArrayFileSegment
-from core.workflow.variables.types import SegmentType
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.code.entities import CodeLanguage, CodeNodeData
+from dify_graph.nodes.code.limits import CodeNodeLimits
+from dify_graph.variables.segments import ArrayFileSegment
+from dify_graph.variables.types import SegmentType
 
 from .exc import (
     CodeNodeError,
@@ -18,8 +18,8 @@ from .exc import (
 )
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
 
 class WorkflowCodeExecutor(Protocol):
diff --git a/api/core/workflow/nodes/code/entities.py b/api/dify_graph/nodes/code/entities.py
similarity index 88%
rename from api/core/workflow/nodes/code/entities.py
rename to api/dify_graph/nodes/code/entities.py
index 8b73b89e2f..9e161c29d0 100644
--- a/api/core/workflow/nodes/code/entities.py
+++ b/api/dify_graph/nodes/code/entities.py
@@ -3,9 +3,9 @@ from typing import Annotated, Literal
 
 from pydantic import AfterValidator, BaseModel
 
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.nodes.base.entities import VariableSelector
-from core.workflow.variables.types import SegmentType
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.nodes.base.entities import VariableSelector
+from dify_graph.variables.types import SegmentType
 
 
 class CodeLanguage(StrEnum):
diff --git a/api/core/workflow/nodes/code/exc.py b/api/dify_graph/nodes/code/exc.py
similarity index 100%
rename from api/core/workflow/nodes/code/exc.py
rename to api/dify_graph/nodes/code/exc.py
diff --git a/api/core/workflow/nodes/code/limits.py b/api/dify_graph/nodes/code/limits.py
similarity index 100%
rename from api/core/workflow/nodes/code/limits.py
rename to api/dify_graph/nodes/code/limits.py
diff --git a/api/core/workflow/nodes/datasource/__init__.py b/api/dify_graph/nodes/datasource/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/datasource/__init__.py
rename to api/dify_graph/nodes/datasource/__init__.py
diff --git a/api/core/workflow/nodes/datasource/datasource_node.py b/api/dify_graph/nodes/datasource/datasource_node.py
similarity index 94%
rename from api/core/workflow/nodes/datasource/datasource_node.py
rename to api/dify_graph/nodes/datasource/datasource_node.py
index 17f8bcb2db..802d34d2d0 100644
--- a/api/core/workflow/nodes/datasource/datasource_node.py
+++ b/api/dify_graph/nodes/datasource/datasource_node.py
@@ -3,12 +3,12 @@ from typing import TYPE_CHECKING, Any
 
 from core.datasource.entities.datasource_entities import DatasourceProviderType
 from core.plugin.impl.exc import PluginDaemonClientSideError
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import NodeExecutionType, NodeType, SystemVariableKey
-from core.workflow.node_events import NodeRunResult, StreamCompletedEvent
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.base.variable_template_parser import VariableTemplateParser
-from core.workflow.repositories.datasource_manager_protocol import (
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.enums import NodeExecutionType, NodeType, SystemVariableKey
+from dify_graph.node_events import NodeRunResult, StreamCompletedEvent
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
+from dify_graph.repositories.datasource_manager_protocol import (
     DatasourceManagerProtocol,
     DatasourceParameter,
     OnlineDriveDownloadFileParam,
@@ -19,8 +19,8 @@ from .entities import DatasourceNodeData
 from .exc import DatasourceNodeError
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
 
 class DatasourceNode(Node[DatasourceNodeData]):
diff --git a/api/core/workflow/nodes/datasource/entities.py b/api/dify_graph/nodes/datasource/entities.py
similarity index 96%
rename from api/core/workflow/nodes/datasource/entities.py
rename to api/dify_graph/nodes/datasource/entities.py
index 4802d3ed98..ba49e65f31 100644
--- a/api/core/workflow/nodes/datasource/entities.py
+++ b/api/dify_graph/nodes/datasource/entities.py
@@ -3,7 +3,7 @@ from typing import Any, Literal, Union
 from pydantic import BaseModel, field_validator
 from pydantic_core.core_schema import ValidationInfo
 
-from core.workflow.nodes.base.entities import BaseNodeData
+from dify_graph.nodes.base.entities import BaseNodeData
 
 
 class DatasourceEntity(BaseModel):
diff --git a/api/core/workflow/nodes/datasource/exc.py b/api/dify_graph/nodes/datasource/exc.py
similarity index 100%
rename from api/core/workflow/nodes/datasource/exc.py
rename to api/dify_graph/nodes/datasource/exc.py
diff --git a/api/core/workflow/nodes/document_extractor/__init__.py b/api/dify_graph/nodes/document_extractor/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/document_extractor/__init__.py
rename to api/dify_graph/nodes/document_extractor/__init__.py
diff --git a/api/core/workflow/nodes/document_extractor/entities.py b/api/dify_graph/nodes/document_extractor/entities.py
similarity index 84%
rename from api/core/workflow/nodes/document_extractor/entities.py
rename to api/dify_graph/nodes/document_extractor/entities.py
index db05bbf4fe..f4949d0df8 100644
--- a/api/core/workflow/nodes/document_extractor/entities.py
+++ b/api/dify_graph/nodes/document_extractor/entities.py
@@ -1,7 +1,7 @@
 from collections.abc import Sequence
 from dataclasses import dataclass
 
-from core.workflow.nodes.base import BaseNodeData
+from dify_graph.nodes.base import BaseNodeData
 
 
 class DocumentExtractorNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/document_extractor/exc.py b/api/dify_graph/nodes/document_extractor/exc.py
similarity index 100%
rename from api/core/workflow/nodes/document_extractor/exc.py
rename to api/dify_graph/nodes/document_extractor/exc.py
diff --git a/api/core/workflow/nodes/document_extractor/node.py b/api/dify_graph/nodes/document_extractor/node.py
similarity index 98%
rename from api/core/workflow/nodes/document_extractor/node.py
rename to api/dify_graph/nodes/document_extractor/node.py
index 59be4c54ef..01ecd49494 100644
--- a/api/core/workflow/nodes/document_extractor/node.py
+++ b/api/dify_graph/nodes/document_extractor/node.py
@@ -21,12 +21,12 @@ from docx.table import Table
 from docx.text.paragraph import Paragraph
 
 from core.helper import ssrf_proxy
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.file import File, FileTransferMethod, file_manager
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.variables import ArrayFileSegment
-from core.workflow.variables.segments import ArrayStringSegment, FileSegment
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.file import File, FileTransferMethod, file_manager
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.variables import ArrayFileSegment
+from dify_graph.variables.segments import ArrayStringSegment, FileSegment
 
 from .entities import DocumentExtractorNodeData, UnstructuredApiConfig
 from .exc import DocumentExtractorError, FileDownloadError, TextExtractionError, UnsupportedFileTypeError
@@ -34,8 +34,8 @@ from .exc import DocumentExtractorError, FileDownloadError, TextExtractionError,
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
 
 class DocumentExtractorNode(Node[DocumentExtractorNodeData]):
diff --git a/api/core/workflow/nodes/variable_assigner/__init__.py b/api/dify_graph/nodes/end/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/variable_assigner/__init__.py
rename to api/dify_graph/nodes/end/__init__.py
diff --git a/api/core/workflow/nodes/end/end_node.py b/api/dify_graph/nodes/end/end_node.py
similarity index 81%
rename from api/core/workflow/nodes/end/end_node.py
rename to api/dify_graph/nodes/end/end_node.py
index 2efcb4f418..7aa526b85b 100644
--- a/api/core/workflow/nodes/end/end_node.py
+++ b/api/dify_graph/nodes/end/end_node.py
@@ -1,8 +1,8 @@
-from core.workflow.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.base.template import Template
-from core.workflow.nodes.end.entities import EndNodeData
+from dify_graph.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.base.template import Template
+from dify_graph.nodes.end.entities import EndNodeData
 
 
 class EndNode(Node[EndNodeData]):
diff --git a/api/core/workflow/nodes/end/entities.py b/api/dify_graph/nodes/end/entities.py
similarity index 87%
rename from api/core/workflow/nodes/end/entities.py
rename to api/dify_graph/nodes/end/entities.py
index 87a221b5f6..a410087214 100644
--- a/api/core/workflow/nodes/end/entities.py
+++ b/api/dify_graph/nodes/end/entities.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel, Field
 
-from core.workflow.nodes.base.entities import BaseNodeData, OutputVariableEntity
+from dify_graph.nodes.base.entities import BaseNodeData, OutputVariableEntity
 
 
 class EndNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/http_request/__init__.py b/api/dify_graph/nodes/http_request/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/http_request/__init__.py
rename to api/dify_graph/nodes/http_request/__init__.py
diff --git a/api/core/workflow/nodes/http_request/config.py b/api/dify_graph/nodes/http_request/config.py
similarity index 100%
rename from api/core/workflow/nodes/http_request/config.py
rename to api/dify_graph/nodes/http_request/config.py
diff --git a/api/core/workflow/nodes/http_request/entities.py b/api/dify_graph/nodes/http_request/entities.py
similarity index 99%
rename from api/core/workflow/nodes/http_request/entities.py
rename to api/dify_graph/nodes/http_request/entities.py
index 0eda20f485..a5564689f8 100644
--- a/api/core/workflow/nodes/http_request/entities.py
+++ b/api/dify_graph/nodes/http_request/entities.py
@@ -8,7 +8,7 @@ import charset_normalizer
 import httpx
 from pydantic import BaseModel, Field, ValidationInfo, field_validator
 
-from core.workflow.nodes.base import BaseNodeData
+from dify_graph.nodes.base import BaseNodeData
 
 HTTP_REQUEST_CONFIG_FILTER_KEY = "http_request_config"
 
diff --git a/api/core/workflow/nodes/http_request/exc.py b/api/dify_graph/nodes/http_request/exc.py
similarity index 100%
rename from api/core/workflow/nodes/http_request/exc.py
rename to api/dify_graph/nodes/http_request/exc.py
diff --git a/api/core/workflow/nodes/http_request/executor.py b/api/dify_graph/nodes/http_request/executor.py
similarity index 99%
rename from api/core/workflow/nodes/http_request/executor.py
rename to api/dify_graph/nodes/http_request/executor.py
index de14c8c517..892b0fc688 100644
--- a/api/core/workflow/nodes/http_request/executor.py
+++ b/api/dify_graph/nodes/http_request/executor.py
@@ -10,9 +10,9 @@ from urllib.parse import urlencode, urlparse
 import httpx
 from json_repair import repair_json
 
-from core.workflow.file.enums import FileTransferMethod
-from core.workflow.runtime import VariablePool
-from core.workflow.variables.segments import ArrayFileSegment, FileSegment
+from dify_graph.file.enums import FileTransferMethod
+from dify_graph.runtime import VariablePool
+from dify_graph.variables.segments import ArrayFileSegment, FileSegment
 
 from ..protocols import FileManagerProtocol, HttpClientProtocol
 from .entities import (
diff --git a/api/core/workflow/nodes/http_request/node.py b/api/dify_graph/nodes/http_request/node.py
similarity index 93%
rename from api/core/workflow/nodes/http_request/node.py
rename to api/dify_graph/nodes/http_request/node.py
index 11458db758..ae0faa8a56 100644
--- a/api/core/workflow/nodes/http_request/node.py
+++ b/api/dify_graph/nodes/http_request/node.py
@@ -3,15 +3,15 @@ import mimetypes
 from collections.abc import Callable, Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.file import File, FileTransferMethod
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base import variable_template_parser
-from core.workflow.nodes.base.entities import VariableSelector
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.http_request.executor import Executor
-from core.workflow.nodes.protocols import FileManagerProtocol, HttpClientProtocol, ToolFileManagerProtocol
-from core.workflow.variables.segments import ArrayFileSegment
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.file import File, FileTransferMethod
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base import variable_template_parser
+from dify_graph.nodes.base.entities import VariableSelector
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.http_request.executor import Executor
+from dify_graph.nodes.protocols import FileManagerProtocol, HttpClientProtocol, ToolFileManagerProtocol
+from dify_graph.variables.segments import ArrayFileSegment
 from factories import file_factory
 
 from .config import build_http_request_config, resolve_http_request_config
@@ -27,8 +27,8 @@ from .exc import HttpRequestNodeError, RequestBodyError
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
 
 class HttpRequestNode(Node[HttpRequestNodeData]):
diff --git a/api/core/workflow/nodes/human_input/__init__.py b/api/dify_graph/nodes/human_input/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/human_input/__init__.py
rename to api/dify_graph/nodes/human_input/__init__.py
diff --git a/api/core/workflow/nodes/human_input/entities.py b/api/dify_graph/nodes/human_input/entities.py
similarity index 98%
rename from api/core/workflow/nodes/human_input/entities.py
rename to api/dify_graph/nodes/human_input/entities.py
index a4473dfa7d..5616949dcc 100644
--- a/api/core/workflow/nodes/human_input/entities.py
+++ b/api/dify_graph/nodes/human_input/entities.py
@@ -10,10 +10,10 @@ from typing import Annotated, Any, ClassVar, Literal, Self
 
 from pydantic import BaseModel, Field, field_validator, model_validator
 
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.nodes.base.variable_template_parser import VariableTemplateParser
-from core.workflow.runtime import VariablePool
-from core.workflow.variables.consts import SELECTORS_LENGTH
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
+from dify_graph.runtime import VariablePool
+from dify_graph.variables.consts import SELECTORS_LENGTH
 
 from .enums import ButtonStyle, DeliveryMethodType, EmailRecipientType, FormInputType, PlaceholderType, TimeoutUnit
 
diff --git a/api/core/workflow/nodes/human_input/enums.py b/api/dify_graph/nodes/human_input/enums.py
similarity index 100%
rename from api/core/workflow/nodes/human_input/enums.py
rename to api/dify_graph/nodes/human_input/enums.py
diff --git a/api/core/workflow/nodes/human_input/human_input_node.py b/api/dify_graph/nodes/human_input/human_input_node.py
similarity index 95%
rename from api/core/workflow/nodes/human_input/human_input_node.py
rename to api/dify_graph/nodes/human_input/human_input_node.py
index 1d7522ea25..ec4a7c85f9 100644
--- a/api/core/workflow/nodes/human_input/human_input_node.py
+++ b/api/dify_graph/nodes/human_input/human_input_node.py
@@ -5,23 +5,23 @@ from typing import TYPE_CHECKING, Any
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.repositories.human_input_repository import HumanInputFormRepositoryImpl
-from core.workflow.entities.pause_reason import HumanInputRequired
-from core.workflow.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import (
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import (
     HumanInputFormFilledEvent,
     HumanInputFormTimeoutEvent,
     NodeRunResult,
     PauseRequestedEvent,
 )
-from core.workflow.node_events.base import NodeEventBase
-from core.workflow.node_events.node import StreamCompletedEvent
-from core.workflow.nodes.base.node import Node
-from core.workflow.repositories.human_input_form_repository import (
+from dify_graph.node_events.base import NodeEventBase
+from dify_graph.node_events.node import StreamCompletedEvent
+from dify_graph.nodes.base.node import Node
+from dify_graph.repositories.human_input_form_repository import (
     FormCreateParams,
     HumanInputFormEntity,
     HumanInputFormRepository,
 )
-from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter
+from dify_graph.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 
@@ -29,8 +29,8 @@ from .entities import DeliveryChannelConfig, HumanInputNodeData, apply_debug_ema
 from .enums import DeliveryMethodType, HumanInputFormStatus, PlaceholderType
 
 if TYPE_CHECKING:
-    from core.workflow.entities.graph_init_params import GraphInitParams
-    from core.workflow.runtime.graph_runtime_state import GraphRuntimeState
+    from dify_graph.entities.graph_init_params import GraphInitParams
+    from dify_graph.runtime.graph_runtime_state import GraphRuntimeState
 
 
 _SELECTED_BRANCH_KEY = "selected_branch"
diff --git a/api/core/workflow/nodes/if_else/__init__.py b/api/dify_graph/nodes/if_else/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/if_else/__init__.py
rename to api/dify_graph/nodes/if_else/__init__.py
diff --git a/api/core/workflow/nodes/if_else/entities.py b/api/dify_graph/nodes/if_else/entities.py
similarity index 82%
rename from api/core/workflow/nodes/if_else/entities.py
rename to api/dify_graph/nodes/if_else/entities.py
index b22bd6f508..4733944039 100644
--- a/api/core/workflow/nodes/if_else/entities.py
+++ b/api/dify_graph/nodes/if_else/entities.py
@@ -2,8 +2,8 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.utils.condition.entities import Condition
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.utils.condition.entities import Condition
 
 
 class IfElseNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/if_else/if_else_node.py b/api/dify_graph/nodes/if_else/if_else_node.py
similarity index 90%
rename from api/core/workflow/nodes/if_else/if_else_node.py
rename to api/dify_graph/nodes/if_else/if_else_node.py
index cda5f1dd42..3c5a33e2b7 100644
--- a/api/core/workflow/nodes/if_else/if_else_node.py
+++ b/api/dify_graph/nodes/if_else/if_else_node.py
@@ -3,13 +3,13 @@ from typing import Any, Literal
 
 from typing_extensions import deprecated
 
-from core.workflow.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.if_else.entities import IfElseNodeData
-from core.workflow.runtime import VariablePool
-from core.workflow.utils.condition.entities import Condition
-from core.workflow.utils.condition.processor import ConditionProcessor
+from dify_graph.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.if_else.entities import IfElseNodeData
+from dify_graph.runtime import VariablePool
+from dify_graph.utils.condition.entities import Condition
+from dify_graph.utils.condition.processor import ConditionProcessor
 
 
 class IfElseNode(Node[IfElseNodeData]):
diff --git a/api/core/workflow/nodes/iteration/__init__.py b/api/dify_graph/nodes/iteration/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/iteration/__init__.py
rename to api/dify_graph/nodes/iteration/__init__.py
diff --git a/api/core/workflow/nodes/iteration/entities.py b/api/dify_graph/nodes/iteration/entities.py
similarity index 94%
rename from api/core/workflow/nodes/iteration/entities.py
rename to api/dify_graph/nodes/iteration/entities.py
index 63a41ec755..a31b05463e 100644
--- a/api/core/workflow/nodes/iteration/entities.py
+++ b/api/dify_graph/nodes/iteration/entities.py
@@ -3,7 +3,7 @@ from typing import Any
 
 from pydantic import Field
 
-from core.workflow.nodes.base import BaseIterationNodeData, BaseIterationState, BaseNodeData
+from dify_graph.nodes.base import BaseIterationNodeData, BaseIterationState, BaseNodeData
 
 
 class ErrorHandleMode(StrEnum):
diff --git a/api/core/workflow/nodes/iteration/exc.py b/api/dify_graph/nodes/iteration/exc.py
similarity index 100%
rename from api/core/workflow/nodes/iteration/exc.py
rename to api/dify_graph/nodes/iteration/exc.py
diff --git a/api/core/workflow/nodes/iteration/iteration_node.py b/api/dify_graph/nodes/iteration/iteration_node.py
similarity index 95%
rename from api/core/workflow/nodes/iteration/iteration_node.py
rename to api/dify_graph/nodes/iteration/iteration_node.py
index 54b0561dd8..5ac25b493d 100644
--- a/api/core/workflow/nodes/iteration/iteration_node.py
+++ b/api/dify_graph/nodes/iteration/iteration_node.py
@@ -7,20 +7,20 @@ from typing import TYPE_CHECKING, Any, NewType, cast
 from typing_extensions import TypeIs
 
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID
-from core.workflow.enums import (
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID
+from dify_graph.enums import (
     NodeExecutionType,
     NodeType,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphNodeEventBase,
     GraphRunFailedEvent,
     GraphRunPartialSucceededEvent,
     GraphRunSucceededEvent,
 )
-from core.workflow.node_events import (
+from dify_graph.node_events import (
     IterationFailedEvent,
     IterationNextEvent,
     IterationStartedEvent,
@@ -29,13 +29,13 @@ from core.workflow.node_events import (
     NodeRunResult,
     StreamCompletedEvent,
 )
-from core.workflow.nodes.base import LLMUsageTrackingMixin
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.iteration.entities import ErrorHandleMode, IterationNodeData
-from core.workflow.runtime import VariablePool
-from core.workflow.variables import IntegerVariable, NoneSegment
-from core.workflow.variables.segments import ArrayAnySegment, ArraySegment
-from core.workflow.variables.variables import Variable
+from dify_graph.nodes.base import LLMUsageTrackingMixin
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.iteration.entities import ErrorHandleMode, IterationNodeData
+from dify_graph.runtime import VariablePool
+from dify_graph.variables import IntegerVariable, NoneSegment
+from dify_graph.variables.segments import ArrayAnySegment, ArraySegment
+from dify_graph.variables.variables import Variable
 from libs.datetime_utils import naive_utc_now
 
 from .exc import (
@@ -48,8 +48,8 @@ from .exc import (
 )
 
 if TYPE_CHECKING:
-    from core.workflow.context import IExecutionContext
-    from core.workflow.graph_engine import GraphEngine
+    from dify_graph.context import IExecutionContext
+    from dify_graph.graph_engine import GraphEngine
 
 logger = logging.getLogger(__name__)
 
@@ -337,7 +337,7 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]):
 
     def _capture_execution_context(self) -> "IExecutionContext":
         """Capture current execution context for parallel iterations."""
-        from core.workflow.context import capture_current_context
+        from dify_graph.context import capture_current_context
 
         return capture_current_context()
 
@@ -488,7 +488,7 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]):
             # variable selector to variable mapping
             try:
                 # Get node class
-                from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
+                from dify_graph.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
 
                 node_type = NodeType(sub_node_config.get("data", {}).get("type"))
                 if node_type not in NODE_TYPE_CLASSES_MAPPING:
@@ -589,12 +589,12 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]):
     def _create_graph_engine(self, index: int, item: object):
         # Import dependencies
         from core.app.workflow.layers.llm_quota import LLMQuotaLayer
-        from core.app.workflow.node_factory import DifyNodeFactory
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.graph import Graph
-        from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-        from core.workflow.graph_engine.command_channels import InMemoryChannel
-        from core.workflow.runtime import GraphRuntimeState
+        from core.workflow.node_factory import DifyNodeFactory
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.graph import Graph
+        from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+        from dify_graph.graph_engine.command_channels import InMemoryChannel
+        from dify_graph.runtime import GraphRuntimeState
 
         # Create GraphInitParams from node attributes
         graph_init_params = GraphInitParams(
diff --git a/api/core/workflow/nodes/iteration/iteration_start_node.py b/api/dify_graph/nodes/iteration/iteration_start_node.py
similarity index 60%
rename from api/core/workflow/nodes/iteration/iteration_start_node.py
rename to api/dify_graph/nodes/iteration/iteration_start_node.py
index 30d9fccbfd..2e1f555ed2 100644
--- a/api/core/workflow/nodes/iteration/iteration_start_node.py
+++ b/api/dify_graph/nodes/iteration/iteration_start_node.py
@@ -1,7 +1,7 @@
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.iteration.entities import IterationStartNodeData
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.iteration.entities import IterationStartNodeData
 
 
 class IterationStartNode(Node[IterationStartNodeData]):
diff --git a/api/core/workflow/nodes/knowledge_index/__init__.py b/api/dify_graph/nodes/knowledge_index/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/knowledge_index/__init__.py
rename to api/dify_graph/nodes/knowledge_index/__init__.py
diff --git a/api/core/workflow/nodes/knowledge_index/entities.py b/api/dify_graph/nodes/knowledge_index/entities.py
similarity index 98%
rename from api/core/workflow/nodes/knowledge_index/entities.py
rename to api/dify_graph/nodes/knowledge_index/entities.py
index bfeb9b5b79..493b5eadd8 100644
--- a/api/core/workflow/nodes/knowledge_index/entities.py
+++ b/api/dify_graph/nodes/knowledge_index/entities.py
@@ -3,7 +3,7 @@ from typing import Literal, Union
 from pydantic import BaseModel
 
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
-from core.workflow.nodes.base import BaseNodeData
+from dify_graph.nodes.base import BaseNodeData
 
 
 class RerankingModelConfig(BaseModel):
diff --git a/api/core/workflow/nodes/knowledge_index/exc.py b/api/dify_graph/nodes/knowledge_index/exc.py
similarity index 100%
rename from api/core/workflow/nodes/knowledge_index/exc.py
rename to api/dify_graph/nodes/knowledge_index/exc.py
diff --git a/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py b/api/dify_graph/nodes/knowledge_index/knowledge_index_node.py
similarity index 90%
rename from api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
rename to api/dify_graph/nodes/knowledge_index/knowledge_index_node.py
index 8fb5b99454..e1e534911f 100644
--- a/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
+++ b/api/dify_graph/nodes/knowledge_index/knowledge_index_node.py
@@ -3,13 +3,13 @@ from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import NodeExecutionType, NodeType, SystemVariableKey
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.base.template import Template
-from core.workflow.repositories.index_processor_protocol import IndexProcessorProtocol
-from core.workflow.repositories.summary_index_service_protocol import SummaryIndexServiceProtocol
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.enums import NodeExecutionType, NodeType, SystemVariableKey
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.base.template import Template
+from dify_graph.repositories.index_processor_protocol import IndexProcessorProtocol
+from dify_graph.repositories.summary_index_service_protocol import SummaryIndexServiceProtocol
 
 from .entities import KnowledgeIndexNodeData
 from .exc import (
@@ -17,8 +17,8 @@ from .exc import (
 )
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/workflow/nodes/knowledge_retrieval/__init__.py b/api/dify_graph/nodes/knowledge_retrieval/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/knowledge_retrieval/__init__.py
rename to api/dify_graph/nodes/knowledge_retrieval/__init__.py
diff --git a/api/core/workflow/nodes/knowledge_retrieval/entities.py b/api/dify_graph/nodes/knowledge_retrieval/entities.py
similarity index 96%
rename from api/core/workflow/nodes/knowledge_retrieval/entities.py
rename to api/dify_graph/nodes/knowledge_retrieval/entities.py
index 86bb2495e7..c3059897c7 100644
--- a/api/core/workflow/nodes/knowledge_retrieval/entities.py
+++ b/api/dify_graph/nodes/knowledge_retrieval/entities.py
@@ -3,8 +3,8 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.nodes.llm.entities import ModelConfig, VisionConfig
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.nodes.llm.entities import ModelConfig, VisionConfig
 
 
 class RerankingModelConfig(BaseModel):
diff --git a/api/core/workflow/nodes/knowledge_retrieval/exc.py b/api/dify_graph/nodes/knowledge_retrieval/exc.py
similarity index 100%
rename from api/core/workflow/nodes/knowledge_retrieval/exc.py
rename to api/dify_graph/nodes/knowledge_retrieval/exc.py
diff --git a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/dify_graph/nodes/knowledge_retrieval/knowledge_retrieval_node.py
similarity index 94%
rename from api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
rename to api/dify_graph/nodes/knowledge_retrieval/knowledge_retrieval_node.py
index 0cfd39e485..86e4a35901 100644
--- a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
+++ b/api/dify_graph/nodes/knowledge_retrieval/knowledge_retrieval_node.py
@@ -5,23 +5,23 @@ from typing import TYPE_CHECKING, Any, Literal
 from core.app.app_config.entities import DatasetRetrieveConfigEntity
 from core.model_runtime.entities.llm_entities import LLMUsage
 from core.model_runtime.utils.encoders import jsonable_encoder
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import (
     NodeType,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base import LLMUsageTrackingMixin
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.llm.file_saver import FileSaverImpl, LLMFileSaver
-from core.workflow.repositories.rag_retrieval_protocol import KnowledgeRetrievalRequest, RAGRetrievalProtocol, Source
-from core.workflow.variables import (
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base import LLMUsageTrackingMixin
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.llm.file_saver import FileSaverImpl, LLMFileSaver
+from dify_graph.repositories.rag_retrieval_protocol import KnowledgeRetrievalRequest, RAGRetrievalProtocol, Source
+from dify_graph.variables import (
     ArrayFileSegment,
     FileSegment,
     StringSegment,
 )
-from core.workflow.variables.segments import ArrayObjectSegment
+from dify_graph.variables.segments import ArrayObjectSegment
 
 from .entities import KnowledgeRetrievalNodeData
 from .exc import (
@@ -30,8 +30,8 @@ from .exc import (
 )
 
 if TYPE_CHECKING:
-    from core.workflow.file.models import File
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.file.models import File
+    from dify_graph.runtime import GraphRuntimeState
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/workflow/nodes/knowledge_retrieval/template_prompts.py b/api/dify_graph/nodes/knowledge_retrieval/template_prompts.py
similarity index 100%
rename from api/core/workflow/nodes/knowledge_retrieval/template_prompts.py
rename to api/dify_graph/nodes/knowledge_retrieval/template_prompts.py
diff --git a/api/core/workflow/nodes/list_operator/__init__.py b/api/dify_graph/nodes/list_operator/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/list_operator/__init__.py
rename to api/dify_graph/nodes/list_operator/__init__.py
diff --git a/api/core/workflow/nodes/list_operator/entities.py b/api/dify_graph/nodes/list_operator/entities.py
similarity index 96%
rename from api/core/workflow/nodes/list_operator/entities.py
rename to api/dify_graph/nodes/list_operator/entities.py
index e51a91f07f..0fdd85f210 100644
--- a/api/core/workflow/nodes/list_operator/entities.py
+++ b/api/dify_graph/nodes/list_operator/entities.py
@@ -3,7 +3,7 @@ from enum import StrEnum
 
 from pydantic import BaseModel, Field
 
-from core.workflow.nodes.base import BaseNodeData
+from dify_graph.nodes.base import BaseNodeData
 
 
 class FilterOperator(StrEnum):
diff --git a/api/core/workflow/nodes/list_operator/exc.py b/api/dify_graph/nodes/list_operator/exc.py
similarity index 100%
rename from api/core/workflow/nodes/list_operator/exc.py
rename to api/dify_graph/nodes/list_operator/exc.py
diff --git a/api/core/workflow/nodes/list_operator/node.py b/api/dify_graph/nodes/list_operator/node.py
similarity index 97%
rename from api/core/workflow/nodes/list_operator/node.py
rename to api/dify_graph/nodes/list_operator/node.py
index d9ef16fbe7..d2fdadc29c 100644
--- a/api/core/workflow/nodes/list_operator/node.py
+++ b/api/dify_graph/nodes/list_operator/node.py
@@ -1,12 +1,12 @@
 from collections.abc import Callable, Sequence
 from typing import Any, TypeAlias, TypeVar
 
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.file import File
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.variables import ArrayFileSegment, ArrayNumberSegment, ArrayStringSegment
-from core.workflow.variables.segments import ArrayAnySegment, ArrayBooleanSegment, ArraySegment
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.file import File
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.variables import ArrayFileSegment, ArrayNumberSegment, ArrayStringSegment
+from dify_graph.variables.segments import ArrayAnySegment, ArrayBooleanSegment, ArraySegment
 
 from .entities import FilterOperator, ListOperatorNodeData, Order
 from .exc import InvalidConditionError, InvalidFilterValueError, InvalidKeyError, ListOperatorError
diff --git a/api/core/workflow/nodes/llm/__init__.py b/api/dify_graph/nodes/llm/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/llm/__init__.py
rename to api/dify_graph/nodes/llm/__init__.py
diff --git a/api/core/workflow/nodes/llm/entities.py b/api/dify_graph/nodes/llm/entities.py
similarity index 96%
rename from api/core/workflow/nodes/llm/entities.py
rename to api/dify_graph/nodes/llm/entities.py
index fe6f2290aa..74e90fdc7d 100644
--- a/api/core/workflow/nodes/llm/entities.py
+++ b/api/dify_graph/nodes/llm/entities.py
@@ -5,8 +5,8 @@ from pydantic import BaseModel, Field, field_validator
 
 from core.model_runtime.entities import ImagePromptMessageContent, LLMMode
 from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.nodes.base.entities import VariableSelector
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.nodes.base.entities import VariableSelector
 
 
 class ModelConfig(BaseModel):
diff --git a/api/core/workflow/nodes/llm/exc.py b/api/dify_graph/nodes/llm/exc.py
similarity index 100%
rename from api/core/workflow/nodes/llm/exc.py
rename to api/dify_graph/nodes/llm/exc.py
diff --git a/api/core/workflow/nodes/llm/file_saver.py b/api/dify_graph/nodes/llm/file_saver.py
similarity index 98%
rename from api/core/workflow/nodes/llm/file_saver.py
rename to api/dify_graph/nodes/llm/file_saver.py
index 3c06ab7d81..b4f64f4093 100644
--- a/api/core/workflow/nodes/llm/file_saver.py
+++ b/api/dify_graph/nodes/llm/file_saver.py
@@ -7,7 +7,7 @@ from constants.mimetypes import DEFAULT_EXTENSION, DEFAULT_MIME_TYPE
 from core.helper import ssrf_proxy
 from core.tools.signature import sign_tool_file
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.file import File, FileTransferMethod, FileType
+from dify_graph.file import File, FileTransferMethod, FileType
 from extensions.ext_database import db as global_db
 
 
diff --git a/api/core/workflow/nodes/llm/llm_utils.py b/api/dify_graph/nodes/llm/llm_utils.py
similarity index 93%
rename from api/core/workflow/nodes/llm/llm_utils.py
rename to api/dify_graph/nodes/llm/llm_utils.py
index 72f150d920..fb64630cd8 100644
--- a/api/core/workflow/nodes/llm/llm_utils.py
+++ b/api/dify_graph/nodes/llm/llm_utils.py
@@ -11,9 +11,9 @@ from core.model_runtime.entities.message_entities import (
 from core.model_runtime.entities.model_entities import AIModelEntity
 from core.model_runtime.memory import PromptMessageMemory
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.workflow.file.models import File
-from core.workflow.runtime import VariablePool
-from core.workflow.variables.segments import ArrayAnySegment, ArrayFileSegment, FileSegment, NoneSegment
+from dify_graph.file.models import File
+from dify_graph.runtime import VariablePool
+from dify_graph.variables.segments import ArrayAnySegment, ArrayFileSegment, FileSegment, NoneSegment
 
 from .exc import InvalidVariableTypeError
 
diff --git a/api/core/workflow/nodes/llm/node.py b/api/dify_graph/nodes/llm/node.py
similarity index 98%
rename from api/core/workflow/nodes/llm/node.py
rename to api/dify_graph/nodes/llm/node.py
index c06db0dc16..0e243bfd3b 100644
--- a/api/core/workflow/nodes/llm/node.py
+++ b/api/dify_graph/nodes/llm/node.py
@@ -43,16 +43,16 @@ from core.prompt.entities.advanced_prompt_entities import CompletionModelPromptT
 from core.prompt.utils.prompt_message_util import PromptMessageUtil
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
 from core.tools.signature import sign_upload_file
-from core.workflow.constants import SYSTEM_VARIABLE_NODE_ID
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import (
+from dify_graph.constants import SYSTEM_VARIABLE_NODE_ID
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import (
     NodeType,
     SystemVariableKey,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.file import File, FileTransferMethod, FileType, file_manager
-from core.workflow.node_events import (
+from dify_graph.file import File, FileTransferMethod, FileType, file_manager
+from dify_graph.node_events import (
     ModelInvokeCompletedEvent,
     NodeEventBase,
     NodeRunResult,
@@ -60,12 +60,12 @@ from core.workflow.node_events import (
     StreamChunkEvent,
     StreamCompletedEvent,
 )
-from core.workflow.nodes.base.entities import VariableSelector
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.base.variable_template_parser import VariableTemplateParser
-from core.workflow.nodes.llm.protocols import CredentialsProvider, ModelFactory
-from core.workflow.runtime import VariablePool
-from core.workflow.variables import (
+from dify_graph.nodes.base.entities import VariableSelector
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
+from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
+from dify_graph.runtime import VariablePool
+from dify_graph.variables import (
     ArrayFileSegment,
     ArraySegment,
     FileSegment,
@@ -95,8 +95,8 @@ from .exc import (
 from .file_saver import FileSaverImpl, LLMFileSaver
 
 if TYPE_CHECKING:
-    from core.workflow.file.models import File
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.file.models import File
+    from dify_graph.runtime import GraphRuntimeState
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/workflow/nodes/llm/protocols.py b/api/dify_graph/nodes/llm/protocols.py
similarity index 100%
rename from api/core/workflow/nodes/llm/protocols.py
rename to api/dify_graph/nodes/llm/protocols.py
diff --git a/api/core/workflow/nodes/loop/__init__.py b/api/dify_graph/nodes/loop/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/loop/__init__.py
rename to api/dify_graph/nodes/loop/__init__.py
diff --git a/api/core/workflow/nodes/loop/entities.py b/api/dify_graph/nodes/loop/entities.py
similarity index 91%
rename from api/core/workflow/nodes/loop/entities.py
rename to api/dify_graph/nodes/loop/entities.py
index 4090f27799..b4a8518048 100644
--- a/api/core/workflow/nodes/loop/entities.py
+++ b/api/dify_graph/nodes/loop/entities.py
@@ -3,9 +3,9 @@ from typing import Annotated, Any, Literal
 
 from pydantic import AfterValidator, BaseModel, Field, field_validator
 
-from core.workflow.nodes.base import BaseLoopNodeData, BaseLoopState, BaseNodeData
-from core.workflow.utils.condition.entities import Condition
-from core.workflow.variables.types import SegmentType
+from dify_graph.nodes.base import BaseLoopNodeData, BaseLoopState, BaseNodeData
+from dify_graph.utils.condition.entities import Condition
+from dify_graph.variables.types import SegmentType
 
 _VALID_VAR_TYPE = frozenset(
     [
diff --git a/api/core/workflow/nodes/loop/loop_end_node.py b/api/dify_graph/nodes/loop/loop_end_node.py
similarity index 59%
rename from api/core/workflow/nodes/loop/loop_end_node.py
rename to api/dify_graph/nodes/loop/loop_end_node.py
index 1e3e317b53..73ac5da927 100644
--- a/api/core/workflow/nodes/loop/loop_end_node.py
+++ b/api/dify_graph/nodes/loop/loop_end_node.py
@@ -1,7 +1,7 @@
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.loop.entities import LoopEndNodeData
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.loop.entities import LoopEndNodeData
 
 
 class LoopEndNode(Node[LoopEndNodeData]):
diff --git a/api/core/workflow/nodes/loop/loop_node.py b/api/dify_graph/nodes/loop/loop_node.py
similarity index 95%
rename from api/core/workflow/nodes/loop/loop_node.py
rename to api/dify_graph/nodes/loop/loop_node.py
index 40ec0cf8b1..9bd79b7947 100644
--- a/api/core/workflow/nodes/loop/loop_node.py
+++ b/api/dify_graph/nodes/loop/loop_node.py
@@ -6,18 +6,18 @@ from datetime import datetime
 from typing import TYPE_CHECKING, Any, Literal, cast
 
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.enums import (
+from dify_graph.enums import (
     NodeExecutionType,
     NodeType,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphNodeEventBase,
     GraphRunFailedEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.node_events import (
+from dify_graph.node_events import (
     LoopFailedEvent,
     LoopNextEvent,
     LoopStartedEvent,
@@ -26,16 +26,16 @@ from core.workflow.node_events import (
     NodeRunResult,
     StreamCompletedEvent,
 )
-from core.workflow.nodes.base import LLMUsageTrackingMixin
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.loop.entities import LoopCompletedReason, LoopNodeData, LoopVariableData
-from core.workflow.utils.condition.processor import ConditionProcessor
-from core.workflow.variables import Segment, SegmentType
+from dify_graph.nodes.base import LLMUsageTrackingMixin
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.loop.entities import LoopCompletedReason, LoopNodeData, LoopVariableData
+from dify_graph.utils.condition.processor import ConditionProcessor
+from dify_graph.variables import Segment, SegmentType
 from factories.variable_factory import TypeMismatchError, build_segment_with_type, segment_to_variable
 from libs.datetime_utils import naive_utc_now
 
 if TYPE_CHECKING:
-    from core.workflow.graph_engine import GraphEngine
+    from dify_graph.graph_engine import GraphEngine
 
 logger = logging.getLogger(__name__)
 
@@ -318,7 +318,7 @@ class LoopNode(LLMUsageTrackingMixin, Node[LoopNodeData]):
             # variable selector to variable mapping
             try:
                 # Get node class
-                from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
+                from dify_graph.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
 
                 node_type = NodeType(sub_node_config.get("data", {}).get("type"))
                 if node_type not in NODE_TYPE_CLASSES_MAPPING:
@@ -414,12 +414,12 @@ class LoopNode(LLMUsageTrackingMixin, Node[LoopNodeData]):
     def _create_graph_engine(self, start_at: datetime, root_node_id: str):
         # Import dependencies
         from core.app.workflow.layers.llm_quota import LLMQuotaLayer
-        from core.app.workflow.node_factory import DifyNodeFactory
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.graph import Graph
-        from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-        from core.workflow.graph_engine.command_channels import InMemoryChannel
-        from core.workflow.runtime import GraphRuntimeState
+        from core.workflow.node_factory import DifyNodeFactory
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.graph import Graph
+        from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+        from dify_graph.graph_engine.command_channels import InMemoryChannel
+        from dify_graph.runtime import GraphRuntimeState
 
         # Create GraphInitParams from node attributes
         graph_init_params = GraphInitParams(
diff --git a/api/core/workflow/nodes/loop/loop_start_node.py b/api/dify_graph/nodes/loop/loop_start_node.py
similarity index 59%
rename from api/core/workflow/nodes/loop/loop_start_node.py
rename to api/dify_graph/nodes/loop/loop_start_node.py
index 95bb5c4018..f469c8286e 100644
--- a/api/core/workflow/nodes/loop/loop_start_node.py
+++ b/api/dify_graph/nodes/loop/loop_start_node.py
@@ -1,7 +1,7 @@
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.loop.entities import LoopStartNodeData
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.loop.entities import LoopStartNodeData
 
 
 class LoopStartNode(Node[LoopStartNodeData]):
diff --git a/api/core/workflow/nodes/node_mapping.py b/api/dify_graph/nodes/node_mapping.py
similarity index 65%
rename from api/core/workflow/nodes/node_mapping.py
rename to api/dify_graph/nodes/node_mapping.py
index 85df543a2a..8e5405f1aa 100644
--- a/api/core/workflow/nodes/node_mapping.py
+++ b/api/dify_graph/nodes/node_mapping.py
@@ -1,9 +1,9 @@
 from collections.abc import Mapping
 
-from core.workflow.enums import NodeType
-from core.workflow.nodes.base.node import Node
+from dify_graph.enums import NodeType
+from dify_graph.nodes.base.node import Node
 
 LATEST_VERSION = "latest"
 
-# Mapping is built by Node.get_node_type_classes_mapping(), which imports and walks core.workflow.nodes
+# Mapping is built by Node.get_node_type_classes_mapping(), which imports and walks dify_graph.nodes
 NODE_TYPE_CLASSES_MAPPING: Mapping[NodeType, Mapping[str, type[Node]]] = Node.get_node_type_classes_mapping()
diff --git a/api/core/workflow/nodes/parameter_extractor/__init__.py b/api/dify_graph/nodes/parameter_extractor/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/parameter_extractor/__init__.py
rename to api/dify_graph/nodes/parameter_extractor/__init__.py
diff --git a/api/core/workflow/nodes/parameter_extractor/entities.py b/api/dify_graph/nodes/parameter_extractor/entities.py
similarity index 95%
rename from api/core/workflow/nodes/parameter_extractor/entities.py
rename to api/dify_graph/nodes/parameter_extractor/entities.py
index 90d78ae429..3b042710f9 100644
--- a/api/core/workflow/nodes/parameter_extractor/entities.py
+++ b/api/dify_graph/nodes/parameter_extractor/entities.py
@@ -8,9 +8,9 @@ from pydantic import (
 )
 
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.nodes.llm.entities import ModelConfig, VisionConfig
-from core.workflow.variables.types import SegmentType
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.nodes.llm.entities import ModelConfig, VisionConfig
+from dify_graph.variables.types import SegmentType
 
 _OLD_BOOL_TYPE_NAME = "bool"
 _OLD_SELECT_TYPE_NAME = "select"
diff --git a/api/core/workflow/nodes/parameter_extractor/exc.py b/api/dify_graph/nodes/parameter_extractor/exc.py
similarity index 97%
rename from api/core/workflow/nodes/parameter_extractor/exc.py
rename to api/dify_graph/nodes/parameter_extractor/exc.py
index 5a58780575..c25b809d1c 100644
--- a/api/core/workflow/nodes/parameter_extractor/exc.py
+++ b/api/dify_graph/nodes/parameter_extractor/exc.py
@@ -1,6 +1,6 @@
 from typing import Any
 
-from core.workflow.variables.types import SegmentType
+from dify_graph.variables.types import SegmentType
 
 
 class ParameterExtractorNodeError(ValueError):
diff --git a/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py b/api/dify_graph/nodes/parameter_extractor/parameter_extractor_node.py
similarity index 98%
rename from api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
rename to api/dify_graph/nodes/parameter_extractor/parameter_extractor_node.py
index 4272b98116..626f38fc9b 100644
--- a/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
+++ b/api/dify_graph/nodes/parameter_extractor/parameter_extractor_node.py
@@ -24,18 +24,18 @@ from core.prompt.advanced_prompt_transform import AdvancedPromptTransform
 from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate
 from core.prompt.simple_prompt_transform import ModelMode
 from core.prompt.utils.prompt_message_util import PromptMessageUtil
-from core.workflow.enums import (
+from dify_graph.enums import (
     NodeType,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.file import File
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base import variable_template_parser
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.llm import llm_utils
-from core.workflow.runtime import VariablePool
-from core.workflow.variables.types import ArrayValidation, SegmentType
+from dify_graph.file import File
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base import variable_template_parser
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.llm import llm_utils
+from dify_graph.runtime import VariablePool
+from dify_graph.variables.types import ArrayValidation, SegmentType
 from factories.variable_factory import build_segment_with_type
 
 from .entities import ParameterExtractorNodeData
@@ -64,9 +64,9 @@ from .prompts import (
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.nodes.llm.protocols import CredentialsProvider, ModelFactory
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
+    from dify_graph.runtime import GraphRuntimeState
 
 
 def extract_json(text):
diff --git a/api/core/workflow/nodes/parameter_extractor/prompts.py b/api/dify_graph/nodes/parameter_extractor/prompts.py
similarity index 100%
rename from api/core/workflow/nodes/parameter_extractor/prompts.py
rename to api/dify_graph/nodes/parameter_extractor/prompts.py
diff --git a/api/core/workflow/nodes/protocols.py b/api/dify_graph/nodes/protocols.py
similarity index 96%
rename from api/core/workflow/nodes/protocols.py
rename to api/dify_graph/nodes/protocols.py
index fda524d701..cc007150f1 100644
--- a/api/core/workflow/nodes/protocols.py
+++ b/api/dify_graph/nodes/protocols.py
@@ -2,7 +2,7 @@ from typing import Any, Protocol
 
 import httpx
 
-from core.workflow.file import File
+from dify_graph.file import File
 
 
 class HttpClientProtocol(Protocol):
diff --git a/api/core/workflow/nodes/question_classifier/__init__.py b/api/dify_graph/nodes/question_classifier/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/question_classifier/__init__.py
rename to api/dify_graph/nodes/question_classifier/__init__.py
diff --git a/api/core/workflow/nodes/question_classifier/entities.py b/api/dify_graph/nodes/question_classifier/entities.py
similarity index 87%
rename from api/core/workflow/nodes/question_classifier/entities.py
rename to api/dify_graph/nodes/question_classifier/entities.py
index edde30708a..03e0a0ac53 100644
--- a/api/core/workflow/nodes/question_classifier/entities.py
+++ b/api/dify_graph/nodes/question_classifier/entities.py
@@ -1,8 +1,8 @@
 from pydantic import BaseModel, Field
 
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.nodes.llm import ModelConfig, VisionConfig
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.nodes.llm import ModelConfig, VisionConfig
 
 
 class ClassConfig(BaseModel):
diff --git a/api/core/workflow/nodes/question_classifier/exc.py b/api/dify_graph/nodes/question_classifier/exc.py
similarity index 100%
rename from api/core/workflow/nodes/question_classifier/exc.py
rename to api/dify_graph/nodes/question_classifier/exc.py
diff --git a/api/core/workflow/nodes/question_classifier/question_classifier_node.py b/api/dify_graph/nodes/question_classifier/question_classifier_node.py
similarity index 95%
rename from api/core/workflow/nodes/question_classifier/question_classifier_node.py
rename to api/dify_graph/nodes/question_classifier/question_classifier_node.py
index 6005bff1a6..59b0a97496 100644
--- a/api/core/workflow/nodes/question_classifier/question_classifier_node.py
+++ b/api/dify_graph/nodes/question_classifier/question_classifier_node.py
@@ -9,25 +9,25 @@ from core.model_runtime.memory import PromptMessageMemory
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.prompt.simple_prompt_transform import ModelMode
 from core.prompt.utils.prompt_message_util import PromptMessageUtil
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import (
     NodeExecutionType,
     NodeType,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.node_events import ModelInvokeCompletedEvent, NodeRunResult
-from core.workflow.nodes.base.entities import VariableSelector
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.base.variable_template_parser import VariableTemplateParser
-from core.workflow.nodes.llm import (
+from dify_graph.node_events import ModelInvokeCompletedEvent, NodeRunResult
+from dify_graph.nodes.base.entities import VariableSelector
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
+from dify_graph.nodes.llm import (
     LLMNode,
     LLMNodeChatModelMessage,
     LLMNodeCompletionModelPromptTemplate,
     llm_utils,
 )
-from core.workflow.nodes.llm.file_saver import FileSaverImpl, LLMFileSaver
-from core.workflow.nodes.llm.protocols import CredentialsProvider, ModelFactory
+from dify_graph.nodes.llm.file_saver import FileSaverImpl, LLMFileSaver
+from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
 from libs.json_in_md_parser import parse_and_check_json_markdown
 
 from .entities import QuestionClassifierNodeData
@@ -43,8 +43,8 @@ from .template_prompts import (
 )
 
 if TYPE_CHECKING:
-    from core.workflow.file.models import File
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.file.models import File
+    from dify_graph.runtime import GraphRuntimeState
 
 
 class QuestionClassifierNode(Node[QuestionClassifierNodeData]):
diff --git a/api/core/workflow/nodes/question_classifier/template_prompts.py b/api/dify_graph/nodes/question_classifier/template_prompts.py
similarity index 100%
rename from api/core/workflow/nodes/question_classifier/template_prompts.py
rename to api/dify_graph/nodes/question_classifier/template_prompts.py
diff --git a/api/core/workflow/nodes/start/__init__.py b/api/dify_graph/nodes/start/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/start/__init__.py
rename to api/dify_graph/nodes/start/__init__.py
diff --git a/api/core/workflow/nodes/start/entities.py b/api/dify_graph/nodes/start/entities.py
similarity index 64%
rename from api/core/workflow/nodes/start/entities.py
rename to api/dify_graph/nodes/start/entities.py
index 3a99e2cbc2..0df832740e 100644
--- a/api/core/workflow/nodes/start/entities.py
+++ b/api/dify_graph/nodes/start/entities.py
@@ -2,8 +2,8 @@ from collections.abc import Sequence
 
 from pydantic import Field
 
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.variables.input_entities import VariableEntity
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.variables.input_entities import VariableEntity
 
 
 class StartNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/start/start_node.py b/api/dify_graph/nodes/start/start_node.py
similarity index 84%
rename from api/core/workflow/nodes/start/start_node.py
rename to api/dify_graph/nodes/start/start_node.py
index 4e5545d330..c09ead0124 100644
--- a/api/core/workflow/nodes/start/start_node.py
+++ b/api/dify_graph/nodes/start/start_node.py
@@ -2,12 +2,12 @@ from typing import Any
 
 from jsonschema import Draft7Validator, ValidationError
 
-from core.workflow.constants import SYSTEM_VARIABLE_NODE_ID
-from core.workflow.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.variables.input_entities import VariableEntityType
+from dify_graph.constants import SYSTEM_VARIABLE_NODE_ID
+from dify_graph.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.variables.input_entities import VariableEntityType
 
 
 class StartNode(Node[StartNodeData]):
diff --git a/api/core/workflow/nodes/template_transform/__init__.py b/api/dify_graph/nodes/template_transform/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/template_transform/__init__.py
rename to api/dify_graph/nodes/template_transform/__init__.py
diff --git a/api/core/workflow/nodes/template_transform/entities.py b/api/dify_graph/nodes/template_transform/entities.py
similarity index 57%
rename from api/core/workflow/nodes/template_transform/entities.py
rename to api/dify_graph/nodes/template_transform/entities.py
index efb7a72f59..123fd41f81 100644
--- a/api/core/workflow/nodes/template_transform/entities.py
+++ b/api/dify_graph/nodes/template_transform/entities.py
@@ -1,5 +1,5 @@
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.nodes.base.entities import VariableSelector
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.nodes.base.entities import VariableSelector
 
 
 class TemplateTransformNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/template_transform/template_renderer.py b/api/dify_graph/nodes/template_transform/template_renderer.py
similarity index 100%
rename from api/core/workflow/nodes/template_transform/template_renderer.py
rename to api/dify_graph/nodes/template_transform/template_renderer.py
diff --git a/api/core/workflow/nodes/template_transform/template_transform_node.py b/api/dify_graph/nodes/template_transform/template_transform_node.py
similarity index 88%
rename from api/core/workflow/nodes/template_transform/template_transform_node.py
rename to api/dify_graph/nodes/template_transform/template_transform_node.py
index 3dc8afd9be..b42bf02d08 100644
--- a/api/core/workflow/nodes/template_transform/template_transform_node.py
+++ b/api/dify_graph/nodes/template_transform/template_transform_node.py
@@ -1,19 +1,19 @@
 from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.template_transform.entities import TemplateTransformNodeData
-from core.workflow.nodes.template_transform.template_renderer import (
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.template_transform.entities import TemplateTransformNodeData
+from dify_graph.nodes.template_transform.template_renderer import (
     CodeExecutorJinja2TemplateRenderer,
     Jinja2TemplateRenderer,
     TemplateRenderError,
 )
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
 DEFAULT_TEMPLATE_TRANSFORM_MAX_OUTPUT_LENGTH = 400_000
 
diff --git a/api/core/workflow/nodes/tool/__init__.py b/api/dify_graph/nodes/tool/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/tool/__init__.py
rename to api/dify_graph/nodes/tool/__init__.py
diff --git a/api/core/workflow/nodes/tool/entities.py b/api/dify_graph/nodes/tool/entities.py
similarity index 98%
rename from api/core/workflow/nodes/tool/entities.py
rename to api/dify_graph/nodes/tool/entities.py
index 8fe33c240a..f15dabdeeb 100644
--- a/api/core/workflow/nodes/tool/entities.py
+++ b/api/dify_graph/nodes/tool/entities.py
@@ -4,7 +4,7 @@ from pydantic import BaseModel, field_validator
 from pydantic_core.core_schema import ValidationInfo
 
 from core.tools.entities.tool_entities import ToolProviderType
-from core.workflow.nodes.base.entities import BaseNodeData
+from dify_graph.nodes.base.entities import BaseNodeData
 
 
 class ToolEntity(BaseModel):
diff --git a/api/core/workflow/nodes/tool/exc.py b/api/dify_graph/nodes/tool/exc.py
similarity index 100%
rename from api/core/workflow/nodes/tool/exc.py
rename to api/dify_graph/nodes/tool/exc.py
diff --git a/api/core/workflow/nodes/tool/tool_node.py b/api/dify_graph/nodes/tool/tool_node.py
similarity index 97%
rename from api/core/workflow/nodes/tool/tool_node.py
rename to api/dify_graph/nodes/tool/tool_node.py
index 0d7270a282..3c072978e9 100644
--- a/api/core/workflow/nodes/tool/tool_node.py
+++ b/api/dify_graph/nodes/tool/tool_node.py
@@ -11,18 +11,18 @@ from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter
 from core.tools.errors import ToolInvokeError
 from core.tools.tool_engine import ToolEngine
 from core.tools.utils.message_transformer import ToolFileMessageTransformer
-from core.workflow.enums import (
+from dify_graph.enums import (
     NodeType,
     SystemVariableKey,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.file import File, FileTransferMethod
-from core.workflow.node_events import NodeEventBase, NodeRunResult, StreamChunkEvent, StreamCompletedEvent
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.base.variable_template_parser import VariableTemplateParser
-from core.workflow.variables.segments import ArrayAnySegment, ArrayFileSegment
-from core.workflow.variables.variables import ArrayAnyVariable
+from dify_graph.file import File, FileTransferMethod
+from dify_graph.node_events import NodeEventBase, NodeRunResult, StreamChunkEvent, StreamCompletedEvent
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
+from dify_graph.variables.segments import ArrayAnySegment, ArrayFileSegment
+from dify_graph.variables.variables import ArrayAnyVariable
 from extensions.ext_database import db
 from factories import file_factory
 from models import ToolFile
@@ -36,7 +36,7 @@ from .exc import (
 )
 
 if TYPE_CHECKING:
-    from core.workflow.runtime import VariablePool
+    from dify_graph.runtime import VariablePool
 
 
 class ToolNode(Node[ToolNodeData]):
diff --git a/api/core/workflow/nodes/trigger_plugin/__init__.py b/api/dify_graph/nodes/trigger_plugin/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/trigger_plugin/__init__.py
rename to api/dify_graph/nodes/trigger_plugin/__init__.py
diff --git a/api/core/workflow/nodes/trigger_plugin/entities.py b/api/dify_graph/nodes/trigger_plugin/entities.py
similarity index 95%
rename from api/core/workflow/nodes/trigger_plugin/entities.py
rename to api/dify_graph/nodes/trigger_plugin/entities.py
index 6c53acee4f..75d10ecaa4 100644
--- a/api/core/workflow/nodes/trigger_plugin/entities.py
+++ b/api/dify_graph/nodes/trigger_plugin/entities.py
@@ -4,8 +4,8 @@ from typing import Any, Literal, Union
 from pydantic import BaseModel, Field, ValidationInfo, field_validator
 
 from core.trigger.entities.entities import EventParameter
-from core.workflow.nodes.base.entities import BaseNodeData
-from core.workflow.nodes.trigger_plugin.exc import TriggerEventParameterError
+from dify_graph.nodes.base.entities import BaseNodeData
+from dify_graph.nodes.trigger_plugin.exc import TriggerEventParameterError
 
 
 class TriggerEventNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/trigger_plugin/exc.py b/api/dify_graph/nodes/trigger_plugin/exc.py
similarity index 100%
rename from api/core/workflow/nodes/trigger_plugin/exc.py
rename to api/dify_graph/nodes/trigger_plugin/exc.py
diff --git a/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py b/api/dify_graph/nodes/trigger_plugin/trigger_event_node.py
similarity index 85%
rename from api/core/workflow/nodes/trigger_plugin/trigger_event_node.py
rename to api/dify_graph/nodes/trigger_plugin/trigger_event_node.py
index e11cb30a7f..b4f1116f7e 100644
--- a/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py
+++ b/api/dify_graph/nodes/trigger_plugin/trigger_event_node.py
@@ -1,10 +1,10 @@
 from collections.abc import Mapping
 
-from core.workflow.constants import SYSTEM_VARIABLE_NODE_ID
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from core.workflow.enums import NodeExecutionType, NodeType
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
+from dify_graph.constants import SYSTEM_VARIABLE_NODE_ID
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.enums import NodeExecutionType, NodeType
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
 
 from .entities import TriggerEventNodeData
 
diff --git a/api/dify_graph/nodes/trigger_schedule/__init__.py b/api/dify_graph/nodes/trigger_schedule/__init__.py
new file mode 100644
index 0000000000..c9b3ae6a0d
--- /dev/null
+++ b/api/dify_graph/nodes/trigger_schedule/__init__.py
@@ -0,0 +1,3 @@
+from dify_graph.nodes.trigger_schedule.trigger_schedule_node import TriggerScheduleNode
+
+__all__ = ["TriggerScheduleNode"]
diff --git a/api/core/workflow/nodes/trigger_schedule/entities.py b/api/dify_graph/nodes/trigger_schedule/entities.py
similarity index 97%
rename from api/core/workflow/nodes/trigger_schedule/entities.py
rename to api/dify_graph/nodes/trigger_schedule/entities.py
index a515d02d55..6daadc7666 100644
--- a/api/core/workflow/nodes/trigger_schedule/entities.py
+++ b/api/dify_graph/nodes/trigger_schedule/entities.py
@@ -2,7 +2,7 @@ from typing import Literal, Union
 
 from pydantic import BaseModel, Field
 
-from core.workflow.nodes.base import BaseNodeData
+from dify_graph.nodes.base import BaseNodeData
 
 
 class TriggerScheduleNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/trigger_schedule/exc.py b/api/dify_graph/nodes/trigger_schedule/exc.py
similarity index 90%
rename from api/core/workflow/nodes/trigger_schedule/exc.py
rename to api/dify_graph/nodes/trigger_schedule/exc.py
index 2f99880ff1..caea6241e4 100644
--- a/api/core/workflow/nodes/trigger_schedule/exc.py
+++ b/api/dify_graph/nodes/trigger_schedule/exc.py
@@ -1,4 +1,4 @@
-from core.workflow.nodes.base.exc import BaseNodeError
+from dify_graph.nodes.base.exc import BaseNodeError
 
 
 class ScheduleNodeError(BaseNodeError):
diff --git a/api/core/workflow/nodes/trigger_schedule/trigger_schedule_node.py b/api/dify_graph/nodes/trigger_schedule/trigger_schedule_node.py
similarity index 77%
rename from api/core/workflow/nodes/trigger_schedule/trigger_schedule_node.py
rename to api/dify_graph/nodes/trigger_schedule/trigger_schedule_node.py
index fb5c8a4dce..7e92eb3f4f 100644
--- a/api/core/workflow/nodes/trigger_schedule/trigger_schedule_node.py
+++ b/api/dify_graph/nodes/trigger_schedule/trigger_schedule_node.py
@@ -1,11 +1,11 @@
 from collections.abc import Mapping
 
-from core.workflow.constants import SYSTEM_VARIABLE_NODE_ID
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import NodeExecutionType, NodeType
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.trigger_schedule.entities import TriggerScheduleNodeData
+from dify_graph.constants import SYSTEM_VARIABLE_NODE_ID
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.enums import NodeExecutionType, NodeType
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.trigger_schedule.entities import TriggerScheduleNodeData
 
 
 class TriggerScheduleNode(Node[TriggerScheduleNodeData]):
diff --git a/api/core/workflow/nodes/trigger_webhook/__init__.py b/api/dify_graph/nodes/trigger_webhook/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/trigger_webhook/__init__.py
rename to api/dify_graph/nodes/trigger_webhook/__init__.py
diff --git a/api/core/workflow/nodes/trigger_webhook/entities.py b/api/dify_graph/nodes/trigger_webhook/entities.py
similarity index 97%
rename from api/core/workflow/nodes/trigger_webhook/entities.py
rename to api/dify_graph/nodes/trigger_webhook/entities.py
index 1011e60b43..fa36aeabd3 100644
--- a/api/core/workflow/nodes/trigger_webhook/entities.py
+++ b/api/dify_graph/nodes/trigger_webhook/entities.py
@@ -4,7 +4,7 @@ from typing import Literal
 
 from pydantic import BaseModel, Field, field_validator
 
-from core.workflow.nodes.base import BaseNodeData
+from dify_graph.nodes.base import BaseNodeData
 
 
 class Method(StrEnum):
diff --git a/api/core/workflow/nodes/trigger_webhook/exc.py b/api/dify_graph/nodes/trigger_webhook/exc.py
similarity index 86%
rename from api/core/workflow/nodes/trigger_webhook/exc.py
rename to api/dify_graph/nodes/trigger_webhook/exc.py
index dc2239c287..853b2456c5 100644
--- a/api/core/workflow/nodes/trigger_webhook/exc.py
+++ b/api/dify_graph/nodes/trigger_webhook/exc.py
@@ -1,4 +1,4 @@
-from core.workflow.nodes.base.exc import BaseNodeError
+from dify_graph.nodes.base.exc import BaseNodeError
 
 
 class WebhookNodeError(BaseNodeError):
diff --git a/api/core/workflow/nodes/trigger_webhook/node.py b/api/dify_graph/nodes/trigger_webhook/node.py
similarity index 93%
rename from api/core/workflow/nodes/trigger_webhook/node.py
rename to api/dify_graph/nodes/trigger_webhook/node.py
index 9f6046c11a..1b8167e799 100644
--- a/api/core/workflow/nodes/trigger_webhook/node.py
+++ b/api/dify_graph/nodes/trigger_webhook/node.py
@@ -2,14 +2,14 @@ import logging
 from collections.abc import Mapping
 from typing import Any
 
-from core.workflow.constants import SYSTEM_VARIABLE_NODE_ID
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.enums import NodeExecutionType, NodeType
-from core.workflow.file import FileTransferMethod
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.variables.types import SegmentType
-from core.workflow.variables.variables import FileVariable
+from dify_graph.constants import SYSTEM_VARIABLE_NODE_ID
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.enums import NodeExecutionType, NodeType
+from dify_graph.file import FileTransferMethod
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.variables.types import SegmentType
+from dify_graph.variables.variables import FileVariable
 from factories import file_factory
 from factories.variable_factory import build_segment_with_type
 
diff --git a/api/core/workflow/nodes/variable_aggregator/__init__.py b/api/dify_graph/nodes/variable_aggregator/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/variable_aggregator/__init__.py
rename to api/dify_graph/nodes/variable_aggregator/__init__.py
diff --git a/api/core/workflow/nodes/variable_aggregator/entities.py b/api/dify_graph/nodes/variable_aggregator/entities.py
similarity index 83%
rename from api/core/workflow/nodes/variable_aggregator/entities.py
rename to api/dify_graph/nodes/variable_aggregator/entities.py
index febbf1d1d6..5f7c1dbe93 100644
--- a/api/core/workflow/nodes/variable_aggregator/entities.py
+++ b/api/dify_graph/nodes/variable_aggregator/entities.py
@@ -1,7 +1,7 @@
 from pydantic import BaseModel
 
-from core.workflow.nodes.base import BaseNodeData
-from core.workflow.variables.types import SegmentType
+from dify_graph.nodes.base import BaseNodeData
+from dify_graph.variables.types import SegmentType
 
 
 class AdvancedSettings(BaseModel):
diff --git a/api/core/workflow/nodes/variable_aggregator/variable_aggregator_node.py b/api/dify_graph/nodes/variable_aggregator/variable_aggregator_node.py
similarity index 81%
rename from api/core/workflow/nodes/variable_aggregator/variable_aggregator_node.py
rename to api/dify_graph/nodes/variable_aggregator/variable_aggregator_node.py
index 762b7dab07..98ab8105fe 100644
--- a/api/core/workflow/nodes/variable_aggregator/variable_aggregator_node.py
+++ b/api/dify_graph/nodes/variable_aggregator/variable_aggregator_node.py
@@ -1,10 +1,10 @@
 from collections.abc import Mapping
 
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.variable_aggregator.entities import VariableAggregatorNodeData
-from core.workflow.variables.segments import Segment
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.variable_aggregator.entities import VariableAggregatorNodeData
+from dify_graph.variables.segments import Segment
 
 
 class VariableAggregatorNode(Node[VariableAggregatorNodeData]):
diff --git a/api/core/workflow/nodes/variable_assigner/common/__init__.py b/api/dify_graph/nodes/variable_assigner/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/variable_assigner/common/__init__.py
rename to api/dify_graph/nodes/variable_assigner/__init__.py
diff --git a/api/core/workflow/utils/__init__.py b/api/dify_graph/nodes/variable_assigner/common/__init__.py
similarity index 100%
rename from api/core/workflow/utils/__init__.py
rename to api/dify_graph/nodes/variable_assigner/common/__init__.py
diff --git a/api/core/workflow/nodes/variable_assigner/common/exc.py b/api/dify_graph/nodes/variable_assigner/common/exc.py
similarity index 100%
rename from api/core/workflow/nodes/variable_assigner/common/exc.py
rename to api/dify_graph/nodes/variable_assigner/common/exc.py
diff --git a/api/core/workflow/nodes/variable_assigner/common/helpers.py b/api/dify_graph/nodes/variable_assigner/common/helpers.py
similarity index 90%
rename from api/core/workflow/nodes/variable_assigner/common/helpers.py
rename to api/dify_graph/nodes/variable_assigner/common/helpers.py
index 37fde9d1b0..f0b22904a9 100644
--- a/api/core/workflow/nodes/variable_assigner/common/helpers.py
+++ b/api/dify_graph/nodes/variable_assigner/common/helpers.py
@@ -3,9 +3,9 @@ from typing import Any, TypeVar
 
 from pydantic import BaseModel
 
-from core.workflow.variables import Segment
-from core.workflow.variables.consts import SELECTORS_LENGTH
-from core.workflow.variables.types import SegmentType
+from dify_graph.variables import Segment
+from dify_graph.variables.consts import SELECTORS_LENGTH
+from dify_graph.variables.types import SegmentType
 
 # Use double underscore (`__`) prefix for internal variables
 # to minimize risk of collision with user-defined variable names.
diff --git a/api/core/workflow/nodes/variable_assigner/v1/__init__.py b/api/dify_graph/nodes/variable_assigner/v1/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/variable_assigner/v1/__init__.py
rename to api/dify_graph/nodes/variable_assigner/v1/__init__.py
diff --git a/api/core/workflow/nodes/variable_assigner/v1/node.py b/api/dify_graph/nodes/variable_assigner/v1/node.py
similarity index 88%
rename from api/core/workflow/nodes/variable_assigner/v1/node.py
rename to api/dify_graph/nodes/variable_assigner/v1/node.py
index b987949541..1aa7042b02 100644
--- a/api/core/workflow/nodes/variable_assigner/v1/node.py
+++ b/api/dify_graph/nodes/variable_assigner/v1/node.py
@@ -1,19 +1,19 @@
 from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.variable_assigner.common import helpers as common_helpers
-from core.workflow.nodes.variable_assigner.common.exc import VariableOperatorNodeError
-from core.workflow.variables import SegmentType, VariableBase
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.variable_assigner.common import helpers as common_helpers
+from dify_graph.nodes.variable_assigner.common.exc import VariableOperatorNodeError
+from dify_graph.variables import SegmentType, VariableBase
 
 from .node_data import VariableAssignerData, WriteMode
 
 if TYPE_CHECKING:
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.runtime import GraphRuntimeState
 
 
 class VariableAssignerNode(Node[VariableAssignerData]):
diff --git a/api/core/workflow/nodes/variable_assigner/v1/node_data.py b/api/dify_graph/nodes/variable_assigner/v1/node_data.py
similarity index 86%
rename from api/core/workflow/nodes/variable_assigner/v1/node_data.py
rename to api/dify_graph/nodes/variable_assigner/v1/node_data.py
index 9734d64712..11e8f93f35 100644
--- a/api/core/workflow/nodes/variable_assigner/v1/node_data.py
+++ b/api/dify_graph/nodes/variable_assigner/v1/node_data.py
@@ -1,7 +1,7 @@
 from collections.abc import Sequence
 from enum import StrEnum
 
-from core.workflow.nodes.base import BaseNodeData
+from dify_graph.nodes.base import BaseNodeData
 
 
 class WriteMode(StrEnum):
diff --git a/api/core/workflow/nodes/variable_assigner/v2/__init__.py b/api/dify_graph/nodes/variable_assigner/v2/__init__.py
similarity index 100%
rename from api/core/workflow/nodes/variable_assigner/v2/__init__.py
rename to api/dify_graph/nodes/variable_assigner/v2/__init__.py
diff --git a/api/core/workflow/nodes/variable_assigner/v2/entities.py b/api/dify_graph/nodes/variable_assigner/v2/entities.py
similarity index 94%
rename from api/core/workflow/nodes/variable_assigner/v2/entities.py
rename to api/dify_graph/nodes/variable_assigner/v2/entities.py
index 2955730289..5f9211d600 100644
--- a/api/core/workflow/nodes/variable_assigner/v2/entities.py
+++ b/api/dify_graph/nodes/variable_assigner/v2/entities.py
@@ -3,7 +3,7 @@ from typing import Any
 
 from pydantic import BaseModel, Field
 
-from core.workflow.nodes.base import BaseNodeData
+from dify_graph.nodes.base import BaseNodeData
 
 from .enums import InputType, Operation
 
diff --git a/api/core/workflow/nodes/variable_assigner/v2/enums.py b/api/dify_graph/nodes/variable_assigner/v2/enums.py
similarity index 100%
rename from api/core/workflow/nodes/variable_assigner/v2/enums.py
rename to api/dify_graph/nodes/variable_assigner/v2/enums.py
diff --git a/api/core/workflow/nodes/variable_assigner/v2/exc.py b/api/dify_graph/nodes/variable_assigner/v2/exc.py
similarity index 93%
rename from api/core/workflow/nodes/variable_assigner/v2/exc.py
rename to api/dify_graph/nodes/variable_assigner/v2/exc.py
index 05173b3ca1..c50aab8668 100644
--- a/api/core/workflow/nodes/variable_assigner/v2/exc.py
+++ b/api/dify_graph/nodes/variable_assigner/v2/exc.py
@@ -1,7 +1,7 @@
 from collections.abc import Sequence
 from typing import Any
 
-from core.workflow.nodes.variable_assigner.common.exc import VariableOperatorNodeError
+from dify_graph.nodes.variable_assigner.common.exc import VariableOperatorNodeError
 
 from .enums import InputType, Operation
 
diff --git a/api/core/workflow/nodes/variable_assigner/v2/helpers.py b/api/dify_graph/nodes/variable_assigner/v2/helpers.py
similarity index 98%
rename from api/core/workflow/nodes/variable_assigner/v2/helpers.py
rename to api/dify_graph/nodes/variable_assigner/v2/helpers.py
index ce3fe9620c..38c69cbe3c 100644
--- a/api/core/workflow/nodes/variable_assigner/v2/helpers.py
+++ b/api/dify_graph/nodes/variable_assigner/v2/helpers.py
@@ -1,6 +1,6 @@
 from typing import Any
 
-from core.workflow.variables import SegmentType
+from dify_graph.variables import SegmentType
 
 from .enums import Operation
 
diff --git a/api/core/workflow/nodes/variable_assigner/v2/node.py b/api/dify_graph/nodes/variable_assigner/v2/node.py
similarity index 93%
rename from api/core/workflow/nodes/variable_assigner/v2/node.py
rename to api/dify_graph/nodes/variable_assigner/v2/node.py
index 0d4c3d2774..7753382cd0 100644
--- a/api/core/workflow/nodes/variable_assigner/v2/node.py
+++ b/api/dify_graph/nodes/variable_assigner/v2/node.py
@@ -2,14 +2,14 @@ import json
 from collections.abc import Mapping, MutableMapping, Sequence
 from typing import TYPE_CHECKING, Any
 
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.variable_assigner.common import helpers as common_helpers
-from core.workflow.nodes.variable_assigner.common.exc import VariableOperatorNodeError
-from core.workflow.variables import SegmentType, VariableBase
-from core.workflow.variables.consts import SELECTORS_LENGTH
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.variable_assigner.common import helpers as common_helpers
+from dify_graph.nodes.variable_assigner.common.exc import VariableOperatorNodeError
+from dify_graph.variables import SegmentType, VariableBase
+from dify_graph.variables.consts import SELECTORS_LENGTH
 
 from . import helpers
 from .entities import VariableAssignerNodeData, VariableOperationItem
@@ -23,8 +23,8 @@ from .exc import (
 )
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
 
 def _target_mapping_from_item(mapping: MutableMapping[str, Sequence[str]], node_id: str, item: VariableOperationItem):
diff --git a/api/core/workflow/repositories/__init__.py b/api/dify_graph/repositories/__init__.py
similarity index 69%
rename from api/core/workflow/repositories/__init__.py
rename to api/dify_graph/repositories/__init__.py
index a778151baa..ef70eb09cc 100644
--- a/api/core/workflow/repositories/__init__.py
+++ b/api/dify_graph/repositories/__init__.py
@@ -6,7 +6,7 @@ for accessing and manipulating data, regardless of the underlying
 storage mechanism.
 """
 
-from core.workflow.repositories.workflow_node_execution_repository import OrderConfig, WorkflowNodeExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import OrderConfig, WorkflowNodeExecutionRepository
 
 __all__ = [
     "OrderConfig",
diff --git a/api/core/workflow/repositories/datasource_manager_protocol.py b/api/dify_graph/repositories/datasource_manager_protocol.py
similarity index 91%
rename from api/core/workflow/repositories/datasource_manager_protocol.py
rename to api/dify_graph/repositories/datasource_manager_protocol.py
index 4acf486bef..fbe2016d3c 100644
--- a/api/core/workflow/repositories/datasource_manager_protocol.py
+++ b/api/dify_graph/repositories/datasource_manager_protocol.py
@@ -3,8 +3,8 @@ from typing import Any, Protocol
 
 from pydantic import BaseModel
 
-from core.workflow.file import File
-from core.workflow.node_events import StreamChunkEvent, StreamCompletedEvent
+from dify_graph.file import File
+from dify_graph.node_events import StreamChunkEvent, StreamCompletedEvent
 
 
 class DatasourceParameter(BaseModel):
diff --git a/api/core/workflow/repositories/draft_variable_repository.py b/api/dify_graph/repositories/draft_variable_repository.py
similarity index 95%
rename from api/core/workflow/repositories/draft_variable_repository.py
rename to api/dify_graph/repositories/draft_variable_repository.py
index 66ef714c16..b2ebfacffd 100644
--- a/api/core/workflow/repositories/draft_variable_repository.py
+++ b/api/dify_graph/repositories/draft_variable_repository.py
@@ -6,7 +6,7 @@ from typing import Any, Protocol
 
 from sqlalchemy.orm import Session
 
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 
 
 class DraftVariableSaver(Protocol):
diff --git a/api/core/workflow/repositories/human_input_form_repository.py b/api/dify_graph/repositories/human_input_form_repository.py
similarity index 96%
rename from api/core/workflow/repositories/human_input_form_repository.py
rename to api/dify_graph/repositories/human_input_form_repository.py
index efde59c6fd..88966831cb 100644
--- a/api/core/workflow/repositories/human_input_form_repository.py
+++ b/api/dify_graph/repositories/human_input_form_repository.py
@@ -4,8 +4,8 @@ from collections.abc import Mapping, Sequence
 from datetime import datetime
 from typing import Any, Protocol
 
-from core.workflow.nodes.human_input.entities import DeliveryChannelConfig, HumanInputNodeData
-from core.workflow.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
+from dify_graph.nodes.human_input.entities import DeliveryChannelConfig, HumanInputNodeData
+from dify_graph.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 
 
 class HumanInputError(Exception):
diff --git a/api/core/workflow/repositories/index_processor_protocol.py b/api/dify_graph/repositories/index_processor_protocol.py
similarity index 100%
rename from api/core/workflow/repositories/index_processor_protocol.py
rename to api/dify_graph/repositories/index_processor_protocol.py
diff --git a/api/core/workflow/repositories/rag_retrieval_protocol.py b/api/dify_graph/repositories/rag_retrieval_protocol.py
similarity index 97%
rename from api/core/workflow/repositories/rag_retrieval_protocol.py
rename to api/dify_graph/repositories/rag_retrieval_protocol.py
index f91cecb694..023400cf32 100644
--- a/api/core/workflow/repositories/rag_retrieval_protocol.py
+++ b/api/dify_graph/repositories/rag_retrieval_protocol.py
@@ -3,8 +3,8 @@ from typing import Any, Literal, Protocol
 from pydantic import BaseModel, Field
 
 from core.model_runtime.entities import LLMUsage
-from core.workflow.nodes.knowledge_retrieval.entities import MetadataFilteringCondition
-from core.workflow.nodes.llm.entities import ModelConfig
+from dify_graph.nodes.knowledge_retrieval.entities import MetadataFilteringCondition
+from dify_graph.nodes.llm.entities import ModelConfig
 
 
 class SourceChildChunk(BaseModel):
diff --git a/api/core/workflow/repositories/summary_index_service_protocol.py b/api/dify_graph/repositories/summary_index_service_protocol.py
similarity index 100%
rename from api/core/workflow/repositories/summary_index_service_protocol.py
rename to api/dify_graph/repositories/summary_index_service_protocol.py
diff --git a/api/core/workflow/repositories/workflow_execution_repository.py b/api/dify_graph/repositories/workflow_execution_repository.py
similarity index 95%
rename from api/core/workflow/repositories/workflow_execution_repository.py
rename to api/dify_graph/repositories/workflow_execution_repository.py
index d9ce591db8..ef83f07649 100644
--- a/api/core/workflow/repositories/workflow_execution_repository.py
+++ b/api/dify_graph/repositories/workflow_execution_repository.py
@@ -1,6 +1,6 @@
 from typing import Protocol
 
-from core.workflow.entities import WorkflowExecution
+from dify_graph.entities import WorkflowExecution
 
 
 class WorkflowExecutionRepository(Protocol):
diff --git a/api/core/workflow/repositories/workflow_node_execution_repository.py b/api/dify_graph/repositories/workflow_node_execution_repository.py
similarity index 97%
rename from api/core/workflow/repositories/workflow_node_execution_repository.py
rename to api/dify_graph/repositories/workflow_node_execution_repository.py
index 43b41ff6b8..e6c1c3e497 100644
--- a/api/core/workflow/repositories/workflow_node_execution_repository.py
+++ b/api/dify_graph/repositories/workflow_node_execution_repository.py
@@ -2,7 +2,7 @@ from collections.abc import Sequence
 from dataclasses import dataclass
 from typing import Literal, Protocol
 
-from core.workflow.entities import WorkflowNodeExecution
+from dify_graph.entities import WorkflowNodeExecution
 
 
 @dataclass
diff --git a/api/core/workflow/runtime/__init__.py b/api/dify_graph/runtime/__init__.py
similarity index 100%
rename from api/core/workflow/runtime/__init__.py
rename to api/dify_graph/runtime/__init__.py
diff --git a/api/core/workflow/runtime/graph_runtime_state.py b/api/dify_graph/runtime/graph_runtime_state.py
similarity index 97%
rename from api/core/workflow/runtime/graph_runtime_state.py
rename to api/dify_graph/runtime/graph_runtime_state.py
index 0af6bf49bc..541830c58b 100644
--- a/api/core/workflow/runtime/graph_runtime_state.py
+++ b/api/dify_graph/runtime/graph_runtime_state.py
@@ -11,11 +11,11 @@ from pydantic import BaseModel, Field
 from pydantic.json import pydantic_encoder
 
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.enums import NodeExecutionType, NodeState, NodeType
-from core.workflow.runtime.variable_pool import VariablePool
+from dify_graph.enums import NodeExecutionType, NodeState, NodeType
+from dify_graph.runtime.variable_pool import VariablePool
 
 if TYPE_CHECKING:
-    from core.workflow.entities.pause_reason import PauseReason
+    from dify_graph.entities.pause_reason import PauseReason
 
 
 class ReadyQueueProtocol(Protocol):
@@ -433,13 +433,13 @@ class GraphRuntimeState:
     # ------------------------------------------------------------------
     def _build_ready_queue(self) -> ReadyQueueProtocol:
         # Import lazily to avoid breaching architecture boundaries enforced by import-linter.
-        module = importlib.import_module("core.workflow.graph_engine.ready_queue")
+        module = importlib.import_module("dify_graph.graph_engine.ready_queue")
         in_memory_cls = module.InMemoryReadyQueue
         return in_memory_cls()
 
     def _build_graph_execution(self) -> GraphExecutionProtocol:
         # Lazily import to keep the runtime domain decoupled from graph_engine modules.
-        module = importlib.import_module("core.workflow.graph_engine.domain.graph_execution")
+        module = importlib.import_module("dify_graph.graph_engine.domain.graph_execution")
         graph_execution_cls = module.GraphExecution
         workflow_id = self._pending_graph_execution_workflow_id or ""
         self._pending_graph_execution_workflow_id = None
@@ -447,7 +447,7 @@ class GraphRuntimeState:
 
     def _build_response_coordinator(self, graph: GraphProtocol) -> ResponseStreamCoordinatorProtocol:
         # Lazily import to keep the runtime domain decoupled from graph_engine modules.
-        module = importlib.import_module("core.workflow.graph_engine.response_coordinator")
+        module = importlib.import_module("dify_graph.graph_engine.response_coordinator")
         coordinator_cls = module.ResponseStreamCoordinator
         return coordinator_cls(variable_pool=self.variable_pool, graph=graph)
 
diff --git a/api/core/workflow/runtime/graph_runtime_state_protocol.py b/api/dify_graph/runtime/graph_runtime_state_protocol.py
similarity index 94%
rename from api/core/workflow/runtime/graph_runtime_state_protocol.py
rename to api/dify_graph/runtime/graph_runtime_state_protocol.py
index 81d87e5a74..4590a4205c 100644
--- a/api/core/workflow/runtime/graph_runtime_state_protocol.py
+++ b/api/dify_graph/runtime/graph_runtime_state_protocol.py
@@ -2,8 +2,8 @@ from collections.abc import Mapping, Sequence
 from typing import Any, Protocol
 
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.system_variable import SystemVariableReadOnlyView
-from core.workflow.variables.segments import Segment
+from dify_graph.system_variable import SystemVariableReadOnlyView
+from dify_graph.variables.segments import Segment
 
 
 class ReadOnlyVariablePool(Protocol):
diff --git a/api/core/workflow/runtime/read_only_wrappers.py b/api/dify_graph/runtime/read_only_wrappers.py
similarity index 95%
rename from api/core/workflow/runtime/read_only_wrappers.py
rename to api/dify_graph/runtime/read_only_wrappers.py
index 25a834a539..8e4a3ed832 100644
--- a/api/core/workflow/runtime/read_only_wrappers.py
+++ b/api/dify_graph/runtime/read_only_wrappers.py
@@ -5,8 +5,8 @@ from copy import deepcopy
 from typing import Any
 
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.system_variable import SystemVariableReadOnlyView
-from core.workflow.variables.segments import Segment
+from dify_graph.system_variable import SystemVariableReadOnlyView
+from dify_graph.variables.segments import Segment
 
 from .graph_runtime_state import GraphRuntimeState
 from .variable_pool import VariablePool
diff --git a/api/core/workflow/runtime/variable_pool.py b/api/dify_graph/runtime/variable_pool.py
similarity index 95%
rename from api/core/workflow/runtime/variable_pool.py
rename to api/dify_graph/runtime/variable_pool.py
index 48ad102b43..a2b1af99bb 100644
--- a/api/core/workflow/runtime/variable_pool.py
+++ b/api/dify_graph/runtime/variable_pool.py
@@ -8,18 +8,18 @@ from typing import Annotated, Any, Union, cast
 
 from pydantic import BaseModel, Field
 
-from core.workflow.constants import (
+from dify_graph.constants import (
     CONVERSATION_VARIABLE_NODE_ID,
     ENVIRONMENT_VARIABLE_NODE_ID,
     RAG_PIPELINE_VARIABLE_NODE_ID,
     SYSTEM_VARIABLE_NODE_ID,
 )
-from core.workflow.file import File, FileAttribute, file_manager
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables import Segment, SegmentGroup, VariableBase
-from core.workflow.variables.consts import SELECTORS_LENGTH
-from core.workflow.variables.segments import FileSegment, ObjectSegment
-from core.workflow.variables.variables import RAGPipelineVariableInput, Variable
+from dify_graph.file import File, FileAttribute, file_manager
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables import Segment, SegmentGroup, VariableBase
+from dify_graph.variables.consts import SELECTORS_LENGTH
+from dify_graph.variables.segments import FileSegment, ObjectSegment
+from dify_graph.variables.variables import RAGPipelineVariableInput, Variable
 from factories import variable_factory
 
 VariableValue = Union[str, int, float, dict[str, object], list[object], File]
diff --git a/api/core/workflow/system_variable.py b/api/dify_graph/system_variable.py
similarity index 98%
rename from api/core/workflow/system_variable.py
rename to api/dify_graph/system_variable.py
index 4144f79b8a..cc5deda892 100644
--- a/api/core/workflow/system_variable.py
+++ b/api/dify_graph/system_variable.py
@@ -7,8 +7,8 @@ from uuid import uuid4
 
 from pydantic import AliasChoices, BaseModel, ConfigDict, Field, model_validator
 
-from core.workflow.enums import SystemVariableKey
-from core.workflow.file.models import File
+from dify_graph.enums import SystemVariableKey
+from dify_graph.file.models import File
 
 
 class SystemVariable(BaseModel):
diff --git a/api/core/workflow/utils/condition/__init__.py b/api/dify_graph/utils/__init__.py
similarity index 100%
rename from api/core/workflow/utils/condition/__init__.py
rename to api/dify_graph/utils/__init__.py
diff --git a/api/dify_graph/utils/condition/__init__.py b/api/dify_graph/utils/condition/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/core/workflow/utils/condition/entities.py b/api/dify_graph/utils/condition/entities.py
similarity index 100%
rename from api/core/workflow/utils/condition/entities.py
rename to api/dify_graph/utils/condition/entities.py
diff --git a/api/core/workflow/utils/condition/processor.py b/api/dify_graph/utils/condition/processor.py
similarity index 98%
rename from api/core/workflow/utils/condition/processor.py
rename to api/dify_graph/utils/condition/processor.py
index 4e635cc2f2..dea72d96c2 100644
--- a/api/core/workflow/utils/condition/processor.py
+++ b/api/dify_graph/utils/condition/processor.py
@@ -2,10 +2,10 @@ import json
 from collections.abc import Mapping, Sequence
 from typing import Literal, NamedTuple
 
-from core.workflow.file import FileAttribute, file_manager
-from core.workflow.runtime import VariablePool
-from core.workflow.variables import ArrayFileSegment
-from core.workflow.variables.segments import ArrayBooleanSegment, BooleanSegment
+from dify_graph.file import FileAttribute, file_manager
+from dify_graph.runtime import VariablePool
+from dify_graph.variables import ArrayFileSegment
+from dify_graph.variables.segments import ArrayBooleanSegment, BooleanSegment
 
 from .entities import Condition, SubCondition, SupportedComparisonOperator
 
diff --git a/api/core/workflow/variable_loader.py b/api/dify_graph/variable_loader.py
similarity index 95%
rename from api/core/workflow/variable_loader.py
rename to api/dify_graph/variable_loader.py
index dfa4ce2e75..d263450334 100644
--- a/api/core/workflow/variable_loader.py
+++ b/api/dify_graph/variable_loader.py
@@ -2,9 +2,9 @@ import abc
 from collections.abc import Mapping, Sequence
 from typing import Any, Protocol
 
-from core.workflow.runtime import VariablePool
-from core.workflow.variables import VariableBase
-from core.workflow.variables.consts import SELECTORS_LENGTH
+from dify_graph.runtime import VariablePool
+from dify_graph.variables import VariableBase
+from dify_graph.variables.consts import SELECTORS_LENGTH
 
 
 class VariableLoader(Protocol):
diff --git a/api/core/workflow/variables/__init__.py b/api/dify_graph/variables/__init__.py
similarity index 100%
rename from api/core/workflow/variables/__init__.py
rename to api/dify_graph/variables/__init__.py
diff --git a/api/core/workflow/variables/consts.py b/api/dify_graph/variables/consts.py
similarity index 100%
rename from api/core/workflow/variables/consts.py
rename to api/dify_graph/variables/consts.py
diff --git a/api/core/workflow/variables/exc.py b/api/dify_graph/variables/exc.py
similarity index 100%
rename from api/core/workflow/variables/exc.py
rename to api/dify_graph/variables/exc.py
diff --git a/api/core/workflow/variables/input_entities.py b/api/dify_graph/variables/input_entities.py
similarity index 97%
rename from api/core/workflow/variables/input_entities.py
rename to api/dify_graph/variables/input_entities.py
index 9a42012f0a..e6a68ea359 100644
--- a/api/core/workflow/variables/input_entities.py
+++ b/api/dify_graph/variables/input_entities.py
@@ -5,7 +5,7 @@ from typing import Any
 from jsonschema import Draft7Validator, SchemaError
 from pydantic import BaseModel, Field, field_validator
 
-from core.workflow.file import FileTransferMethod, FileType
+from dify_graph.file import FileTransferMethod, FileType
 
 
 class VariableEntityType(StrEnum):
diff --git a/api/core/workflow/variables/segment_group.py b/api/dify_graph/variables/segment_group.py
similarity index 100%
rename from api/core/workflow/variables/segment_group.py
rename to api/dify_graph/variables/segment_group.py
diff --git a/api/core/workflow/variables/segments.py b/api/dify_graph/variables/segments.py
similarity index 99%
rename from api/core/workflow/variables/segments.py
rename to api/dify_graph/variables/segments.py
index 64bba7dbe2..bdb213ed48 100644
--- a/api/core/workflow/variables/segments.py
+++ b/api/dify_graph/variables/segments.py
@@ -5,7 +5,7 @@ from typing import Annotated, Any, TypeAlias
 
 from pydantic import BaseModel, ConfigDict, Discriminator, Tag, field_validator
 
-from core.workflow.file import File
+from dify_graph.file import File
 
 from .types import SegmentType
 
diff --git a/api/core/workflow/variables/types.py b/api/dify_graph/variables/types.py
similarity index 99%
rename from api/core/workflow/variables/types.py
rename to api/dify_graph/variables/types.py
index 596905c26d..df8430de5d 100644
--- a/api/core/workflow/variables/types.py
+++ b/api/dify_graph/variables/types.py
@@ -4,7 +4,7 @@ from collections.abc import Mapping
 from enum import StrEnum
 from typing import TYPE_CHECKING, Any
 
-from core.workflow.file.models import File
+from dify_graph.file.models import File
 
 if TYPE_CHECKING:
     pass
diff --git a/api/core/workflow/variables/utils.py b/api/dify_graph/variables/utils.py
similarity index 100%
rename from api/core/workflow/variables/utils.py
rename to api/dify_graph/variables/utils.py
diff --git a/api/core/workflow/variables/variables.py b/api/dify_graph/variables/variables.py
similarity index 100%
rename from api/core/workflow/variables/variables.py
rename to api/dify_graph/variables/variables.py
diff --git a/api/core/workflow/workflow_type_encoder.py b/api/dify_graph/workflow_type_encoder.py
similarity index 95%
rename from api/core/workflow/workflow_type_encoder.py
rename to api/dify_graph/workflow_type_encoder.py
index a192b884f7..3dd846b3cb 100644
--- a/api/core/workflow/workflow_type_encoder.py
+++ b/api/dify_graph/workflow_type_encoder.py
@@ -4,8 +4,8 @@ from typing import Any, overload
 
 from pydantic import BaseModel
 
-from core.workflow.file.models import File
-from core.workflow.variables import Segment
+from dify_graph.file.models import File
+from dify_graph.variables import Segment
 
 
 class WorkflowRuntimeTypeConverter:
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 bac2fbef47..5c02a16a7d 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
@@ -2,8 +2,8 @@ import logging
 
 from core.tools.tool_manager import ToolManager
 from core.tools.utils.configuration import ToolParameterConfigurationManager
-from core.workflow.nodes import NodeType
-from core.workflow.nodes.tool.entities import ToolEntity
+from dify_graph.nodes import NodeType
+from dify_graph.nodes.tool.entities import ToolEntity
 from events.app_event import app_draft_workflow_was_synced
 
 logger = logging.getLogger(__name__)
diff --git a/api/events/event_handlers/sync_workflow_schedule_when_app_published.py b/api/events/event_handlers/sync_workflow_schedule_when_app_published.py
index 168513fc04..90f562d167 100644
--- a/api/events/event_handlers/sync_workflow_schedule_when_app_published.py
+++ b/api/events/event_handlers/sync_workflow_schedule_when_app_published.py
@@ -4,7 +4,7 @@ from typing import cast
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from core.workflow.nodes.trigger_schedule.entities import SchedulePlanUpdate
+from dify_graph.nodes.trigger_schedule.entities import SchedulePlanUpdate
 from events.app_event import app_published_workflow_was_updated
 from extensions.ext_database import db
 from models import AppMode, Workflow, WorkflowSchedulePlan
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 53e0065f6e..8da33d03b9 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
@@ -2,8 +2,8 @@ from typing import cast
 
 from sqlalchemy import select
 
-from core.workflow.nodes import NodeType
-from core.workflow.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
+from dify_graph.nodes import NodeType
+from dify_graph.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
 from events.app_event import app_published_workflow_was_updated
 from extensions.ext_database import db
 from models.dataset import AppDatasetJoin
diff --git a/api/events/event_handlers/update_app_triggers_when_app_published_workflow_updated.py b/api/events/event_handlers/update_app_triggers_when_app_published_workflow_updated.py
index 430514ada2..fd211a3e55 100644
--- a/api/events/event_handlers/update_app_triggers_when_app_published_workflow_updated.py
+++ b/api/events/event_handlers/update_app_triggers_when_app_published_workflow_updated.py
@@ -3,7 +3,7 @@ from typing import cast
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from core.workflow.nodes import NodeType
+from dify_graph.nodes import NodeType
 from events.app_event import app_published_workflow_was_updated
 from extensions.ext_database import db
 from models import AppMode
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 817c8b0448..7ee4638e77 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
@@ -13,7 +13,7 @@ from typing import Any
 
 from sqlalchemy.orm import sessionmaker
 
-from core.workflow.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import WorkflowNodeExecutionStatus
 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
diff --git a/api/extensions/logstore/repositories/logstore_workflow_execution_repository.py b/api/extensions/logstore/repositories/logstore_workflow_execution_repository.py
index 9928879a7b..c58aa6adbb 100644
--- a/api/extensions/logstore/repositories/logstore_workflow_execution_repository.py
+++ b/api/extensions/logstore/repositories/logstore_workflow_execution_repository.py
@@ -8,9 +8,9 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
 from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
-from core.workflow.entities import WorkflowExecution
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter
+from dify_graph.entities import WorkflowExecution
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from extensions.logstore.aliyun_logstore import AliyunLogStore
 from libs.helper import extract_tenant_id
 from models import (
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 4897171b12..b660a6c54a 100644
--- a/api/extensions/logstore/repositories/logstore_workflow_node_execution_repository.py
+++ b/api/extensions/logstore/repositories/logstore_workflow_node_execution_repository.py
@@ -18,11 +18,11 @@ from sqlalchemy.orm import sessionmaker
 
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
-from core.workflow.entities import WorkflowNodeExecution
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from core.workflow.enums import NodeType
-from core.workflow.repositories.workflow_node_execution_repository import OrderConfig, WorkflowNodeExecutionRepository
-from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter
+from dify_graph.entities import WorkflowNodeExecution
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.enums import NodeType
+from dify_graph.repositories.workflow_node_execution_repository import OrderConfig, WorkflowNodeExecutionRepository
+from dify_graph.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from extensions.logstore.aliyun_logstore import AliyunLogStore
 from extensions.logstore.repositories import safe_float, safe_int
 from extensions.logstore.sql_escape import escape_identifier
diff --git a/api/extensions/otel/parser/base.py b/api/extensions/otel/parser/base.py
index 66d1c977d6..fc84147e01 100644
--- a/api/extensions/otel/parser/base.py
+++ b/api/extensions/otel/parser/base.py
@@ -9,11 +9,11 @@ from opentelemetry.trace import Span
 from opentelemetry.trace.status import Status, StatusCode
 from pydantic import BaseModel
 
-from core.workflow.enums import NodeType
-from core.workflow.file.models import File
-from core.workflow.graph_events import GraphNodeEventBase
-from core.workflow.nodes.base.node import Node
-from core.workflow.variables import Segment
+from dify_graph.enums import NodeType
+from dify_graph.file.models import File
+from dify_graph.graph_events import GraphNodeEventBase
+from dify_graph.nodes.base.node import Node
+from dify_graph.variables import Segment
 from extensions.otel.semconv.gen_ai import ChainAttributes, GenAIAttributes
 
 
diff --git a/api/extensions/otel/parser/llm.py b/api/extensions/otel/parser/llm.py
index 8556974080..3da9a9e97d 100644
--- a/api/extensions/otel/parser/llm.py
+++ b/api/extensions/otel/parser/llm.py
@@ -8,8 +8,8 @@ from typing import Any
 
 from opentelemetry.trace import Span
 
-from core.workflow.graph_events import GraphNodeEventBase
-from core.workflow.nodes.base.node import Node
+from dify_graph.graph_events import GraphNodeEventBase
+from dify_graph.nodes.base.node import Node
 from extensions.otel.parser.base import DefaultNodeOTelParser, safe_json_dumps
 from extensions.otel.semconv.gen_ai import LLMAttributes
 
diff --git a/api/extensions/otel/parser/retrieval.py b/api/extensions/otel/parser/retrieval.py
index 82cb865b8b..dd658b250b 100644
--- a/api/extensions/otel/parser/retrieval.py
+++ b/api/extensions/otel/parser/retrieval.py
@@ -8,9 +8,9 @@ from typing import Any
 
 from opentelemetry.trace import Span
 
-from core.workflow.graph_events import GraphNodeEventBase
-from core.workflow.nodes.base.node import Node
-from core.workflow.variables import Segment
+from dify_graph.graph_events import GraphNodeEventBase
+from dify_graph.nodes.base.node import Node
+from dify_graph.variables import Segment
 from extensions.otel.parser.base import DefaultNodeOTelParser, safe_json_dumps
 from extensions.otel.semconv.gen_ai import RetrieverAttributes
 
diff --git a/api/extensions/otel/parser/tool.py b/api/extensions/otel/parser/tool.py
index b99180722b..f4e6a18b4d 100644
--- a/api/extensions/otel/parser/tool.py
+++ b/api/extensions/otel/parser/tool.py
@@ -4,10 +4,10 @@ Parser for tool nodes that captures tool-specific metadata.
 
 from opentelemetry.trace import Span
 
-from core.workflow.enums import WorkflowNodeExecutionMetadataKey
-from core.workflow.graph_events import GraphNodeEventBase
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.tool.entities import ToolNodeData
+from dify_graph.enums import WorkflowNodeExecutionMetadataKey
+from dify_graph.graph_events import GraphNodeEventBase
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.tool.entities import ToolNodeData
 from extensions.otel.parser.base import DefaultNodeOTelParser, safe_json_dumps
 from extensions.otel.semconv.gen_ai import ToolAttributes
 
diff --git a/api/factories/file_factory.py b/api/factories/file_factory.py
index 47396831fa..ef55fe53c5 100644
--- a/api/factories/file_factory.py
+++ b/api/factories/file_factory.py
@@ -14,7 +14,7 @@ from werkzeug.http import parse_options_header
 
 from constants import AUDIO_EXTENSIONS, DOCUMENT_EXTENSIONS, IMAGE_EXTENSIONS, VIDEO_EXTENSIONS
 from core.helper import ssrf_proxy
-from core.workflow.file import File, FileBelongsTo, FileTransferMethod, FileType, FileUploadConfig, helpers
+from dify_graph.file import File, FileBelongsTo, FileTransferMethod, FileType, FileUploadConfig, helpers
 from extensions.ext_database import db
 from models import MessageFile, ToolFile, UploadFile
 
diff --git a/api/factories/variable_factory.py b/api/factories/variable_factory.py
index b74d9517f4..255e5cde83 100644
--- a/api/factories/variable_factory.py
+++ b/api/factories/variable_factory.py
@@ -3,13 +3,13 @@ from typing import Any, cast
 from uuid import uuid4
 
 from configs import dify_config
-from core.workflow.constants import (
+from dify_graph.constants import (
     CONVERSATION_VARIABLE_NODE_ID,
     ENVIRONMENT_VARIABLE_NODE_ID,
 )
-from core.workflow.file import File
-from core.workflow.variables.exc import VariableError
-from core.workflow.variables.segments import (
+from dify_graph.file import File
+from dify_graph.variables.exc import VariableError
+from dify_graph.variables.segments import (
     ArrayAnySegment,
     ArrayBooleanSegment,
     ArrayFileSegment,
@@ -26,8 +26,8 @@ from core.workflow.variables.segments import (
     Segment,
     StringSegment,
 )
-from core.workflow.variables.types import SegmentType
-from core.workflow.variables.variables import (
+from dify_graph.variables.types import SegmentType
+from dify_graph.variables.variables import (
     ArrayAnyVariable,
     ArrayBooleanVariable,
     ArrayFileVariable,
diff --git a/api/fields/_value_type_serializer.py b/api/fields/_value_type_serializer.py
index 461c163e2f..ac7c5376fb 100644
--- a/api/fields/_value_type_serializer.py
+++ b/api/fields/_value_type_serializer.py
@@ -1,7 +1,7 @@
 from typing import TypedDict
 
-from core.workflow.variables.segments import Segment
-from core.workflow.variables.types import SegmentType
+from dify_graph.variables.segments import Segment
+from dify_graph.variables.types import SegmentType
 
 
 class _VarTypedDict(TypedDict, total=False):
diff --git a/api/fields/conversation_fields.py b/api/fields/conversation_fields.py
index faa3606f0e..a5c7ddbb11 100644
--- a/api/fields/conversation_fields.py
+++ b/api/fields/conversation_fields.py
@@ -5,7 +5,7 @@ from typing import Any, TypeAlias
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 
-from core.workflow.file import File
+from dify_graph.file import File
 
 JSONValue: TypeAlias = Any
 
diff --git a/api/fields/member_fields.py b/api/fields/member_fields.py
index 29b9e40242..7ee628726b 100644
--- a/api/fields/member_fields.py
+++ b/api/fields/member_fields.py
@@ -5,7 +5,7 @@ from datetime import datetime
 from flask_restx import fields
 from pydantic import BaseModel, ConfigDict, computed_field, field_validator
 
-from core.workflow.file import helpers as file_helpers
+from dify_graph.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 55bd0a5fbd..428f92ed33 100644
--- a/api/fields/message_fields.py
+++ b/api/fields/message_fields.py
@@ -7,7 +7,7 @@ from uuid import uuid4
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from core.entities.execution_extra_content import ExecutionExtraContentDomainModel
-from core.workflow.file import File
+from dify_graph.file import File
 from fields.conversation_fields import AgentThought, JSONValue, MessageFile
 
 JSONValueType: TypeAlias = JSONValue
diff --git a/api/fields/raws.py b/api/fields/raws.py
index 33b47ba2c3..318dedc25c 100644
--- a/api/fields/raws.py
+++ b/api/fields/raws.py
@@ -1,6 +1,6 @@
 from flask_restx import fields
 
-from core.workflow.file import File
+from dify_graph.file import File
 
 
 class FilesContainedField(fields.Raw):
diff --git a/api/fields/workflow_fields.py b/api/fields/workflow_fields.py
index 019949e105..7ce2139687 100644
--- a/api/fields/workflow_fields.py
+++ b/api/fields/workflow_fields.py
@@ -1,7 +1,7 @@
 from flask_restx import fields
 
 from core.helper import encrypter
-from core.workflow.variables import SecretVariable, SegmentType, VariableBase
+from dify_graph.variables import SecretVariable, SegmentType, VariableBase
 from fields.member_fields import simple_account_fields
 from libs.helper import TimestampField
 
diff --git a/api/libs/helper.py b/api/libs/helper.py
index 206bb8fd81..39f1931299 100644
--- a/api/libs/helper.py
+++ b/api/libs/helper.py
@@ -22,7 +22,7 @@ from pydantic.functional_validators import AfterValidator
 from configs import dify_config
 from core.app.features.rate_limiting.rate_limit import RateLimitGenerator
 from core.model_runtime.utils.encoders import jsonable_encoder
-from core.workflow.file import helpers as file_helpers
+from dify_graph.file import helpers as file_helpers
 from extensions.ext_redis import redis_client
 
 if TYPE_CHECKING:
diff --git a/api/models/enums.py b/api/models/enums.py
index 2bc61120ce..86dcb00bcc 100644
--- a/api/models/enums.py
+++ b/api/models/enums.py
@@ -1,6 +1,6 @@
 from enum import StrEnum
 
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 
 
 class CreatorUserRole(StrEnum):
diff --git a/api/models/human_input.py b/api/models/human_input.py
index 5208461de1..709cc8fe61 100644
--- a/api/models/human_input.py
+++ b/api/models/human_input.py
@@ -6,7 +6,7 @@ import sqlalchemy as sa
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from core.workflow.nodes.human_input.enums import (
+from dify_graph.nodes.human_input.enums import (
     DeliveryMethodType,
     HumanInputFormKind,
     HumanInputFormStatus,
diff --git a/api/models/model.py b/api/models/model.py
index 4a95faf7f7..a5bca06666 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -19,9 +19,9 @@ from sqlalchemy.orm import Mapped, Session, mapped_column
 from configs import dify_config
 from constants import DEFAULT_FILE_NUMBER_LIMITS
 from core.tools.signature import sign_tool_file
-from core.workflow.enums import WorkflowExecutionStatus
-from core.workflow.file import FILE_MODEL_IDENTITY, File, FileTransferMethod
-from core.workflow.file import helpers as file_helpers
+from dify_graph.enums import WorkflowExecutionStatus
+from dify_graph.file import FILE_MODEL_IDENTITY, File, FileTransferMethod
+from dify_graph.file import helpers as file_helpers
 from libs.helper import generate_string  # type: ignore[import-not-found]
 from libs.uuid_utils import uuidv7
 
diff --git a/api/models/workflow.py b/api/models/workflow.py
index 7da09a5a1b..d728ed83bc 100644
--- a/api/models/workflow.py
+++ b/api/models/workflow.py
@@ -22,17 +22,17 @@ from sqlalchemy import (
 from sqlalchemy.orm import Mapped, declared_attr, mapped_column
 from typing_extensions import deprecated
 
-from core.workflow.constants import (
+from dify_graph.constants import (
     CONVERSATION_VARIABLE_NODE_ID,
     SYSTEM_VARIABLE_NODE_ID,
 )
-from core.workflow.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
-from core.workflow.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
-from core.workflow.enums import NodeType, WorkflowExecutionStatus
-from core.workflow.file.constants import maybe_file_object
-from core.workflow.file.models import File
-from core.workflow.variables import utils as variable_utils
-from core.workflow.variables.variables import FloatVariable, IntegerVariable, StringVariable
+from dify_graph.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
+from dify_graph.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
+from dify_graph.enums import NodeType, WorkflowExecutionStatus
+from dify_graph.file.constants import maybe_file_object
+from dify_graph.file.models import File
+from dify_graph.variables import utils as variable_utils
+from dify_graph.variables.variables import FloatVariable, IntegerVariable, StringVariable
 from extensions.ext_storage import Storage
 from factories.variable_factory import TypeMismatchError, build_segment_with_type
 from libs.datetime_utils import naive_utc_now
@@ -46,7 +46,7 @@ if TYPE_CHECKING:
 
 from constants import DEFAULT_FILE_NUMBER_LIMITS, HIDDEN_VALUE
 from core.helper import encrypter
-from core.workflow.variables import SecretVariable, Segment, SegmentType, VariableBase
+from dify_graph.variables import SecretVariable, Segment, SegmentType, VariableBase
 from factories import variable_factory
 from libs import helper
 
@@ -345,7 +345,7 @@ class Workflow(Base):  # bug
             "selected": false,
         }
 
-        For specific node type, refer to `core.workflow.nodes`
+        For specific node type, refer to `dify_graph.nodes`
         """
         graph_dict = self.graph_dict
         if "nodes" not in graph_dict:
@@ -1344,7 +1344,7 @@ class WorkflowDraftVariable(Base):
     # From `VARIABLE_PATTERN`, we may conclude that the length of a top level variable is less than
     # 80 chars.
     #
-    # ref: api/core/workflow/entities/variable_pool.py:18
+    # ref: api/dify_graph/entities/variable_pool.py:18
     name: Mapped[str] = mapped_column(sa.String(255), nullable=False)
     description: Mapped[str] = mapped_column(
         sa.String(255),
diff --git a/api/pyproject.toml b/api/pyproject.toml
index f544cd27b2..84b95fb226 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -238,7 +238,7 @@ module = [
     "configs.middleware.cache.redis_pubsub_config",
     "extensions.ext_redis",
     "tasks.workflow_execution_tasks",
-    "core.workflow.nodes.base.node",
+    "dify_graph.nodes.base.node",
     "services.human_input_delivery_test_service",
     "core.app.apps.advanced_chat.app_generator",
     "controllers.console.human_input_form",
diff --git a/api/repositories/api_workflow_node_execution_repository.py b/api/repositories/api_workflow_node_execution_repository.py
index 6446eb0d6e..2fa065bcc8 100644
--- a/api/repositories/api_workflow_node_execution_repository.py
+++ b/api/repositories/api_workflow_node_execution_repository.py
@@ -16,7 +16,7 @@ from typing import Protocol
 
 from sqlalchemy.orm import Session
 
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionOffload
 
 
diff --git a/api/repositories/api_workflow_run_repository.py b/api/repositories/api_workflow_run_repository.py
index ffa87b209f..a96c4acb31 100644
--- a/api/repositories/api_workflow_run_repository.py
+++ b/api/repositories/api_workflow_run_repository.py
@@ -40,9 +40,9 @@ from typing import Protocol
 
 from sqlalchemy.orm import Session
 
-from core.workflow.entities.pause_reason import PauseReason
-from core.workflow.enums import WorkflowType
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.entities.pause_reason import PauseReason
+from dify_graph.enums import WorkflowType
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
 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/entities/workflow_pause.py b/api/repositories/entities/workflow_pause.py
index a3c4039aaa..be28b7e613 100644
--- a/api/repositories/entities/workflow_pause.py
+++ b/api/repositories/entities/workflow_pause.py
@@ -10,7 +10,7 @@ from abc import ABC, abstractmethod
 from collections.abc import Sequence
 from datetime import datetime
 
-from core.workflow.entities.pause_reason import PauseReason
+from dify_graph.entities.pause_reason import PauseReason
 
 
 class WorkflowPauseEntity(ABC):
diff --git a/api/repositories/sqlalchemy_api_workflow_node_execution_repository.py b/api/repositories/sqlalchemy_api_workflow_node_execution_repository.py
index 6c696b6478..2266c2e646 100644
--- a/api/repositories/sqlalchemy_api_workflow_node_execution_repository.py
+++ b/api/repositories/sqlalchemy_api_workflow_node_execution_repository.py
@@ -14,7 +14,7 @@ from sqlalchemy import asc, delete, desc, func, select
 from sqlalchemy.engine import CursorResult
 from sqlalchemy.orm import Session, sessionmaker
 
-from core.workflow.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.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 5ba7a7e7e8..fdd3e123e4 100644
--- a/api/repositories/sqlalchemy_api_workflow_run_repository.py
+++ b/api/repositories/sqlalchemy_api_workflow_run_repository.py
@@ -33,9 +33,9 @@ from sqlalchemy import and_, delete, func, null, or_, select, tuple_
 from sqlalchemy.engine import CursorResult
 from sqlalchemy.orm import Session, selectinload, sessionmaker
 
-from core.workflow.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
-from core.workflow.enums import WorkflowExecutionStatus, WorkflowType
-from core.workflow.nodes.human_input.entities import FormDefinition
+from dify_graph.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause
+from dify_graph.enums import WorkflowExecutionStatus, WorkflowType
+from dify_graph.nodes.human_input.entities import FormDefinition
 from extensions.ext_storage import storage
 from libs.datetime_utils import naive_utc_now
 from libs.helper import convert_datetime_to_date
diff --git a/api/repositories/sqlalchemy_execution_extra_content_repository.py b/api/repositories/sqlalchemy_execution_extra_content_repository.py
index 5a2c0ea46f..508db22eb0 100644
--- a/api/repositories/sqlalchemy_execution_extra_content_repository.py
+++ b/api/repositories/sqlalchemy_execution_extra_content_repository.py
@@ -18,9 +18,9 @@ from core.entities.execution_extra_content import (
 from core.entities.execution_extra_content import (
     HumanInputContent as HumanInputContentDomainModel,
 )
-from core.workflow.nodes.human_input.entities import FormDefinition
-from core.workflow.nodes.human_input.enums import HumanInputFormStatus
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.nodes.human_input.entities import FormDefinition
+from dify_graph.nodes.human_input.enums import HumanInputFormStatus
+from dify_graph.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 9400362605..ad5a91e74b 100644
--- a/api/services/app_dsl_service.py
+++ b/api/services/app_dsl_service.py
@@ -20,13 +20,13 @@ from configs import dify_config
 from core.helper import ssrf_proxy
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.entities.plugin import PluginDependency
-from core.workflow.enums import NodeType
-from core.workflow.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
-from core.workflow.nodes.llm.entities import LLMNodeData
-from core.workflow.nodes.parameter_extractor.entities import ParameterExtractorNodeData
-from core.workflow.nodes.question_classifier.entities import QuestionClassifierNodeData
-from core.workflow.nodes.tool.entities import ToolNodeData
-from core.workflow.nodes.trigger_schedule.trigger_schedule_node import TriggerScheduleNode
+from dify_graph.enums import NodeType
+from dify_graph.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
+from dify_graph.nodes.llm.entities import LLMNodeData
+from dify_graph.nodes.parameter_extractor.entities import ParameterExtractorNodeData
+from dify_graph.nodes.question_classifier.entities import QuestionClassifierNodeData
+from dify_graph.nodes.tool.entities import ToolNodeData
+from dify_graph.nodes.trigger_schedule.trigger_schedule_node import TriggerScheduleNode
 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
diff --git a/api/services/app_task_service.py b/api/services/app_task_service.py
index 5ae1fba2e8..d556230044 100644
--- a/api/services/app_task_service.py
+++ b/api/services/app_task_service.py
@@ -7,7 +7,7 @@ new GraphEngine command channel mechanism.
 
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.graph_engine.manager import GraphEngineManager
+from dify_graph.graph_engine.manager import GraphEngineManager
 from extensions.ext_redis import redis_client
 from models.model import AppMode
 
diff --git a/api/services/conversation_service.py b/api/services/conversation_service.py
index 4c87150cf7..566c27c0f3 100644
--- a/api/services/conversation_service.py
+++ b/api/services/conversation_service.py
@@ -10,7 +10,7 @@ from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.db.session_factory import session_factory
 from core.llm_generator.llm_generator import LLMGenerator
-from core.workflow.variables.types import SegmentType
+from dify_graph.variables.types import SegmentType
 from extensions.ext_database import db
 from factories import variable_factory
 from libs.datetime_utils import naive_utc_now
diff --git a/api/services/conversation_variable_updater.py b/api/services/conversation_variable_updater.py
index b0012d6f6a..f00e3fe01e 100644
--- a/api/services/conversation_variable_updater.py
+++ b/api/services/conversation_variable_updater.py
@@ -1,7 +1,7 @@
 from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
-from core.workflow.variables.variables import VariableBase
+from dify_graph.variables.variables import VariableBase
 from models import ConversationVariable
 
 
diff --git a/api/services/dataset_service.py b/api/services/dataset_service.py
index 35b20f7601..66a49226ba 100644
--- a/api/services/dataset_service.py
+++ b/api/services/dataset_service.py
@@ -25,7 +25,7 @@ from core.model_runtime.model_providers.__base.text_embedding_model import TextE
 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 core.workflow.file import helpers as file_helpers
+from dify_graph.file import helpers as file_helpers
 from enums.cloud_plan import CloudPlan
 from events.dataset_event import dataset_was_deleted
 from events.document_event import document_was_deleted
diff --git a/api/services/external_knowledge_service.py b/api/services/external_knowledge_service.py
index 65dd41af43..4cf42b7f44 100644
--- a/api/services/external_knowledge_service.py
+++ b/api/services/external_knowledge_service.py
@@ -9,7 +9,7 @@ from sqlalchemy import select
 from constants import HIDDEN_VALUE
 from core.helper import ssrf_proxy
 from core.rag.entities.metadata_entities import MetadataCondition
-from core.workflow.nodes.http_request.exc import InvalidHttpMethodError
+from dify_graph.nodes.http_request.exc import InvalidHttpMethodError
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from models.dataset import (
diff --git a/api/services/file_service.py b/api/services/file_service.py
index da99a66bb9..e08b78bf4c 100644
--- a/api/services/file_service.py
+++ b/api/services/file_service.py
@@ -20,7 +20,7 @@ from constants import (
     VIDEO_EXTENSIONS,
 )
 from core.rag.extractor.extract_processor import ExtractProcessor
-from core.workflow.file import helpers as file_helpers
+from dify_graph.file import helpers as file_helpers
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from libs.datetime_utils import naive_utc_now
diff --git a/api/services/human_input_delivery_test_service.py b/api/services/human_input_delivery_test_service.py
index ff37ff098f..7b43c49686 100644
--- a/api/services/human_input_delivery_test_service.py
+++ b/api/services/human_input_delivery_test_service.py
@@ -8,14 +8,14 @@ from sqlalchemy import Engine, select
 from sqlalchemy.orm import sessionmaker
 
 from configs import dify_config
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     DeliveryChannelConfig,
     EmailDeliveryConfig,
     EmailDeliveryMethod,
     ExternalRecipient,
     MemberRecipient,
 )
-from core.workflow.runtime import VariablePool
+from dify_graph.runtime import VariablePool
 from extensions.ext_database import db
 from extensions.ext_mail import mail
 from libs.email_template_renderer import render_email_template
diff --git a/api/services/human_input_service.py b/api/services/human_input_service.py
index 87816643f6..cfab723fef 100644
--- a/api/services/human_input_service.py
+++ b/api/services/human_input_service.py
@@ -11,12 +11,12 @@ from core.repositories.human_input_repository import (
     HumanInputFormRecord,
     HumanInputFormSubmissionRepository,
 )
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     FormDefinition,
     HumanInputSubmissionValidationError,
     validate_human_input_submission,
 )
-from core.workflow.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
+from dify_graph.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/rag_pipeline/rag_pipeline.py b/api/services/rag_pipeline/rag_pipeline.py
index c0f9e4f323..ce745a4679 100644
--- a/api/services/rag_pipeline/rag_pipeline.py
+++ b/api/services/rag_pipeline/rag_pipeline.py
@@ -36,23 +36,23 @@ from core.rag.entities.event import (
 )
 from core.repositories.factory import DifyCoreRepositoryFactory
 from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLAlchemyWorkflowNodeExecutionRepository
-from core.workflow.entities.workflow_node_execution import (
+from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.entities.workflow_node_execution import (
     WorkflowNodeExecution,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.enums import ErrorStrategy, NodeType, SystemVariableKey
-from core.workflow.errors import WorkflowNodeRunFailedError
-from core.workflow.graph_events import NodeRunFailedEvent, NodeRunSucceededEvent
-from core.workflow.graph_events.base import GraphNodeEventBase
-from core.workflow.node_events.base import NodeRunResult
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, build_http_request_config
-from core.workflow.nodes.node_mapping import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING
-from core.workflow.repositories.workflow_node_execution_repository import OrderConfig
-from core.workflow.runtime import VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables.variables import VariableBase
-from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.enums import ErrorStrategy, NodeType, SystemVariableKey
+from dify_graph.errors import WorkflowNodeRunFailedError
+from dify_graph.graph_events import NodeRunFailedEvent, NodeRunSucceededEvent
+from dify_graph.graph_events.base import GraphNodeEventBase
+from dify_graph.node_events.base import NodeRunResult
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, build_http_request_config
+from dify_graph.nodes.node_mapping import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING
+from dify_graph.repositories.workflow_node_execution_repository import OrderConfig
+from dify_graph.runtime import VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables.variables import VariableBase
 from extensions.ext_database import db
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models import Account
diff --git a/api/services/rag_pipeline/rag_pipeline_dsl_service.py b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
index be1ce834f6..0a257a587d 100644
--- a/api/services/rag_pipeline/rag_pipeline_dsl_service.py
+++ b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
@@ -23,13 +23,13 @@ from core.helper import ssrf_proxy
 from core.helper.name_generator import generate_incremental_name
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.entities.plugin import PluginDependency
-from core.workflow.enums import NodeType
-from core.workflow.nodes.datasource.entities import DatasourceNodeData
-from core.workflow.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
-from core.workflow.nodes.llm.entities import LLMNodeData
-from core.workflow.nodes.parameter_extractor.entities import ParameterExtractorNodeData
-from core.workflow.nodes.question_classifier.entities import QuestionClassifierNodeData
-from core.workflow.nodes.tool.entities import ToolNodeData
+from dify_graph.enums import NodeType
+from dify_graph.nodes.datasource.entities import DatasourceNodeData
+from dify_graph.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
+from dify_graph.nodes.llm.entities import LLMNodeData
+from dify_graph.nodes.parameter_extractor.entities import ParameterExtractorNodeData
+from dify_graph.nodes.question_classifier.entities import QuestionClassifierNodeData
+from dify_graph.nodes.tool.entities import ToolNodeData
 from extensions.ext_redis import redis_client
 from factories import variable_factory
 from models import Account
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 ea5cbb7740..00a2144800 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
@@ -31,7 +31,7 @@ from sqlalchemy import inspect
 from sqlalchemy.orm import Session, sessionmaker
 
 from configs import dify_config
-from core.workflow.enums import WorkflowType
+from dify_graph.enums import WorkflowType
 from enums.cloud_plan import CloudPlan
 from extensions.ext_database import db
 from libs.archive_storage import (
diff --git a/api/services/trigger/schedule_service.py b/api/services/trigger/schedule_service.py
index b49d14f860..8389ccbb34 100644
--- a/api/services/trigger/schedule_service.py
+++ b/api/services/trigger/schedule_service.py
@@ -7,9 +7,9 @@ from typing import Any
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from core.workflow.nodes import NodeType
-from core.workflow.nodes.trigger_schedule.entities import ScheduleConfig, SchedulePlanUpdate, VisualConfig
-from core.workflow.nodes.trigger_schedule.exc import ScheduleConfigError, ScheduleNotFoundError
+from dify_graph.nodes import NodeType
+from dify_graph.nodes.trigger_schedule.entities import ScheduleConfig, SchedulePlanUpdate, VisualConfig
+from dify_graph.nodes.trigger_schedule.exc import ScheduleConfigError, ScheduleNotFoundError
 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 7f12c2e19c..f1f0d0ea84 100644
--- a/api/services/trigger/trigger_service.py
+++ b/api/services/trigger/trigger_service.py
@@ -16,8 +16,8 @@ from core.trigger.debug.events import PluginTriggerDebugEvent
 from core.trigger.provider import PluginTriggerProviderController
 from core.trigger.trigger_manager import TriggerManager
 from core.trigger.utils.encryption import create_trigger_provider_encrypter_for_subscription
-from core.workflow.enums import NodeType
-from core.workflow.nodes.trigger_plugin.entities import TriggerEventNodeData
+from dify_graph.enums import NodeType
+from dify_graph.nodes.trigger_plugin.entities import TriggerEventNodeData
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from models.model import App
diff --git a/api/services/trigger/webhook_service.py b/api/services/trigger/webhook_service.py
index 75a1350e60..285645edce 100644
--- a/api/services/trigger/webhook_service.py
+++ b/api/services/trigger/webhook_service.py
@@ -16,9 +16,9 @@ from werkzeug.exceptions import RequestEntityTooLarge
 from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.enums import NodeType
-from core.workflow.file.models import FileTransferMethod
-from core.workflow.variables.types import SegmentType
+from dify_graph.enums import NodeType
+from dify_graph.file.models import FileTransferMethod
+from dify_graph.variables.types import SegmentType
 from enums.quota_type import QuotaType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
diff --git a/api/services/variable_truncator.py b/api/services/variable_truncator.py
index 12be12776a..60dc1dedb8 100644
--- a/api/services/variable_truncator.py
+++ b/api/services/variable_truncator.py
@@ -6,9 +6,9 @@ from collections.abc import Mapping
 from typing import Any, Generic, TypeAlias, TypeVar, overload
 
 from configs import dify_config
-from core.workflow.file.models import File
-from core.workflow.nodes.variable_assigner.common.helpers import UpdatedVariable
-from core.workflow.variables.segments import (
+from dify_graph.file.models import File
+from dify_graph.nodes.variable_assigner.common.helpers import UpdatedVariable
+from dify_graph.variables.segments import (
     ArrayFileSegment,
     ArraySegment,
     BooleanSegment,
@@ -20,7 +20,7 @@ from core.workflow.variables.segments import (
     Segment,
     StringSegment,
 )
-from core.workflow.variables.utils import dumps_with_segments
+from dify_graph.variables.utils import dumps_with_segments
 
 _MAX_DEPTH = 100
 
diff --git a/api/services/workflow/workflow_converter.py b/api/services/workflow/workflow_converter.py
index 5527c108a2..8b4b3318e1 100644
--- a/api/services/workflow/workflow_converter.py
+++ b/api/services/workflow/workflow_converter.py
@@ -17,9 +17,9 @@ from core.model_runtime.entities.llm_entities import LLMMode
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.prompt.simple_prompt_transform import SimplePromptTransform
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
-from core.workflow.file.models import FileUploadConfig
-from core.workflow.nodes import NodeType
-from core.workflow.variables.input_entities import VariableEntity
+from dify_graph.file.models import FileUploadConfig
+from dify_graph.nodes import NodeType
+from dify_graph.variables.input_entities import VariableEntity
 from events.app_event import app_was_created
 from extensions.ext_database import db
 from models import Account
diff --git a/api/services/workflow_app_service.py b/api/services/workflow_app_service.py
index efc76c33bc..44bc64ec11 100644
--- a/api/services/workflow_app_service.py
+++ b/api/services/workflow_app_service.py
@@ -6,7 +6,7 @@ from typing import Any
 from sqlalchemy import and_, func, or_, select
 from sqlalchemy.orm import Session
 
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.enums import WorkflowExecutionStatus
 from models import Account, App, EndUser, 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 18ad6c5c16..b6f6fc5490 100644
--- a/api/services/workflow_draft_variable_service.py
+++ b/api/services/workflow_draft_variable_service.py
@@ -14,20 +14,20 @@ from sqlalchemy.sql.expression import and_, or_
 
 from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
-from core.workflow.enums import SystemVariableKey
-from core.workflow.file.models import File
-from core.workflow.nodes import NodeType
-from core.workflow.nodes.variable_assigner.common.helpers import get_updated_variables
-from core.workflow.variable_loader import VariableLoader
-from core.workflow.variables import Segment, StringSegment, VariableBase
-from core.workflow.variables.consts import SELECTORS_LENGTH
-from core.workflow.variables.segments import (
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from dify_graph.enums import SystemVariableKey
+from dify_graph.file.models import File
+from dify_graph.nodes import NodeType
+from dify_graph.nodes.variable_assigner.common.helpers import get_updated_variables
+from dify_graph.variable_loader import VariableLoader
+from dify_graph.variables import Segment, StringSegment, VariableBase
+from dify_graph.variables.consts import SELECTORS_LENGTH
+from dify_graph.variables.segments import (
     ArrayFileSegment,
     FileSegment,
 )
-from core.workflow.variables.types import SegmentType
-from core.workflow.variables.utils import dumps_with_segments
+from dify_graph.variables.types import SegmentType
+from dify_graph.variables.utils import dumps_with_segments
 from extensions.ext_storage import storage
 from factories.file_factory import StorageKeyLoader
 from factories.variable_factory import build_segment, segment_to_variable
@@ -70,7 +70,7 @@ class UpdateNotSupportedError(WorkflowDraftVariableError):
 class DraftVarLoader(VariableLoader):
     # This implements the VariableLoader interface for loading draft variables.
     #
-    # ref: core.workflow.variable_loader.VariableLoader
+    # ref: dify_graph.variable_loader.VariableLoader
 
     # Database engine used for loading variables.
     _engine: Engine
diff --git a/api/services/workflow_event_snapshot_service.py b/api/services/workflow_event_snapshot_service.py
index 09037a92ce..8f323ebb8b 100644
--- a/api/services/workflow_event_snapshot_service.py
+++ b/api/services/workflow_event_snapshot_service.py
@@ -22,10 +22,10 @@ from core.app.entities.task_entities import (
     WorkflowStartStreamResponse,
 )
 from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext
-from core.workflow.entities import WorkflowStartReason
-from core.workflow.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-from core.workflow.runtime import GraphRuntimeState
-from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter
+from dify_graph.entities import WorkflowStartReason
+from dify_graph.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
+from dify_graph.runtime import GraphRuntimeState
+from dify_graph.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 3b448423e8..2bf291da54 100644
--- a/api/services/workflow_service.py
+++ b/api/services/workflow_service.py
@@ -14,34 +14,34 @@ from core.app.apps.workflow.app_config_manager import WorkflowAppConfigManager
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.repositories import DifyCoreRepositoryFactory
 from core.repositories.human_input_repository import HumanInputFormRepositoryImpl
-from core.workflow.entities import GraphInitParams, WorkflowNodeExecution
-from core.workflow.entities.pause_reason import HumanInputRequired
-from core.workflow.enums import ErrorStrategy, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from core.workflow.errors import WorkflowNodeRunFailedError
-from core.workflow.file import File
-from core.workflow.graph_events import GraphNodeEventBase, NodeRunFailedEvent, NodeRunSucceededEvent
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes import NodeType
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, build_http_request_config
-from core.workflow.nodes.human_input.entities import (
+from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.entities import GraphInitParams, WorkflowNodeExecution
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.enums import ErrorStrategy, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.errors import WorkflowNodeRunFailedError
+from dify_graph.file import File
+from dify_graph.graph_events import GraphNodeEventBase, NodeRunFailedEvent, NodeRunSucceededEvent
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes import NodeType
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, build_http_request_config
+from dify_graph.nodes.human_input.entities import (
     DeliveryChannelConfig,
     HumanInputNodeData,
     apply_debug_email_recipient,
     validate_human_input_submission,
 )
-from core.workflow.nodes.human_input.enums import HumanInputFormKind
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.nodes.node_mapping import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.repositories.human_input_form_repository import FormCreateParams
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variable_loader import load_into_variable_pool
-from core.workflow.variables import VariableBase
-from core.workflow.variables.input_entities import VariableEntityType
-from core.workflow.variables.variables import Variable
-from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.nodes.human_input.enums import HumanInputFormKind
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.nodes.node_mapping import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.repositories.human_input_form_repository import FormCreateParams
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variable_loader import load_into_variable_pool
+from dify_graph.variables import VariableBase
+from dify_graph.variables.input_entities import VariableEntityType
+from dify_graph.variables.variables import Variable
 from enums.cloud_plan import CloudPlan
 from events.app_event import app_draft_workflow_was_synced, app_published_workflow_was_updated
 from extensions.ext_database import db
@@ -1360,7 +1360,7 @@ class WorkflowService:
         Raises:
             ValueError: If the node data format is invalid
         """
-        from core.workflow.nodes.human_input.entities import HumanInputNodeData
+        from dify_graph.nodes.human_input.entities import HumanInputNodeData
 
         try:
             HumanInputNodeData.model_validate(node_data)
diff --git a/api/tasks/app_generate/workflow_execute_task.py b/api/tasks/app_generate/workflow_execute_task.py
index e58d334f41..dfd15f4123 100644
--- a/api/tasks/app_generate/workflow_execute_task.py
+++ b/api/tasks/app_generate/workflow_execute_task.py
@@ -21,7 +21,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 core.workflow.runtime import GraphRuntimeState
+from dify_graph.runtime import GraphRuntimeState
 from extensions.ext_database import db
 from libs.flask_utils import set_login_user
 from models.account import Account
diff --git a/api/tasks/async_workflow_tasks.py b/api/tasks/async_workflow_tasks.py
index cc96542d4b..d247cf5cf7 100644
--- a/api/tasks/async_workflow_tasks.py
+++ b/api/tasks/async_workflow_tasks.py
@@ -21,7 +21,7 @@ from core.app.layers.timeslice_layer import TimeSliceLayer
 from core.app.layers.trigger_post_layer import TriggerPostLayer
 from core.db.session_factory import session_factory
 from core.repositories import DifyCoreRepositoryFactory
-from core.workflow.runtime import GraphRuntimeState
+from dify_graph.runtime import GraphRuntimeState
 from extensions.ext_database import db
 from models.account import Account
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom, WorkflowTriggerStatus
diff --git a/api/tasks/human_input_timeout_tasks.py b/api/tasks/human_input_timeout_tasks.py
index 5413a33d6a..03441683b0 100644
--- a/api/tasks/human_input_timeout_tasks.py
+++ b/api/tasks/human_input_timeout_tasks.py
@@ -7,8 +7,8 @@ from sqlalchemy.orm import sessionmaker
 
 from configs import dify_config
 from core.repositories.human_input_repository import HumanInputFormSubmissionRepository
-from core.workflow.enums import WorkflowExecutionStatus
-from core.workflow.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
+from dify_graph.enums import WorkflowExecutionStatus
+from dify_graph.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from libs.datetime_utils import ensure_naive_utc, naive_utc_now
diff --git a/api/tasks/mail_human_input_delivery_task.py b/api/tasks/mail_human_input_delivery_task.py
index d1cd0fbadc..bded4cea2b 100644
--- a/api/tasks/mail_human_input_delivery_task.py
+++ b/api/tasks/mail_human_input_delivery_task.py
@@ -11,8 +11,8 @@ from sqlalchemy.orm import Session, sessionmaker
 
 from configs import dify_config
 from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext
-from core.workflow.nodes.human_input.entities import EmailDeliveryConfig, EmailDeliveryMethod
-from core.workflow.runtime import GraphRuntimeState, VariablePool
+from dify_graph.nodes.human_input.entities import EmailDeliveryConfig, EmailDeliveryMethod
+from dify_graph.runtime import GraphRuntimeState, VariablePool
 from extensions.ext_database import db
 from extensions.ext_mail import mail
 from models.human_input import (
diff --git a/api/tasks/trigger_processing_tasks.py b/api/tasks/trigger_processing_tasks.py
index d18ea2c23c..d06b8c980b 100644
--- a/api/tasks/trigger_processing_tasks.py
+++ b/api/tasks/trigger_processing_tasks.py
@@ -25,8 +25,8 @@ from core.trigger.debug.events import PluginTriggerDebugEvent, build_plugin_pool
 from core.trigger.entities.entities import TriggerProviderEntity
 from core.trigger.provider import PluginTriggerProviderController
 from core.trigger.trigger_manager import TriggerManager
-from core.workflow.enums import NodeType, WorkflowExecutionStatus
-from core.workflow.nodes.trigger_plugin.entities import TriggerEventNodeData
+from dify_graph.enums import NodeType, WorkflowExecutionStatus
+from dify_graph.nodes.trigger_plugin.entities import TriggerEventNodeData
 from enums.quota_type import QuotaType, unlimited
 from models.enums import (
     AppTriggerType,
diff --git a/api/tasks/workflow_execution_tasks.py b/api/tasks/workflow_execution_tasks.py
index 3b3c6e5313..db8721e90b 100644
--- a/api/tasks/workflow_execution_tasks.py
+++ b/api/tasks/workflow_execution_tasks.py
@@ -12,8 +12,8 @@ from celery import shared_task
 from sqlalchemy import select
 
 from core.db.session_factory import session_factory
-from core.workflow.entities.workflow_execution import WorkflowExecution
-from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter
+from dify_graph.entities.workflow_execution import WorkflowExecution
+from dify_graph.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 b30a4ff15b..3f607dc55e 100644
--- a/api/tasks/workflow_node_execution_tasks.py
+++ b/api/tasks/workflow_node_execution_tasks.py
@@ -12,10 +12,10 @@ from celery import shared_task
 from sqlalchemy import select
 
 from core.db.session_factory import session_factory
-from core.workflow.entities.workflow_node_execution import (
+from dify_graph.entities.workflow_node_execution import (
     WorkflowNodeExecution,
 )
-from core.workflow.workflow_type_encoder import WorkflowRuntimeTypeConverter
+from dify_graph.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from models import CreatorUserRole, WorkflowNodeExecutionModel
 from models.workflow import WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/tasks/workflow_schedule_tasks.py b/api/tasks/workflow_schedule_tasks.py
index 8c64d3ab27..ced7ef973b 100644
--- a/api/tasks/workflow_schedule_tasks.py
+++ b/api/tasks/workflow_schedule_tasks.py
@@ -3,7 +3,7 @@ import logging
 from celery import shared_task
 
 from core.db.session_factory import session_factory
-from core.workflow.nodes.trigger_schedule.exc import (
+from dify_graph.nodes.trigger_schedule.exc import (
     ScheduleExecutionError,
     ScheduleNotFoundError,
     TenantOwnerNotFoundError,
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 003bb356e5..4fdbb7d9f3 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
@@ -2,7 +2,7 @@ from collections.abc import Generator
 
 from core.datasource.datasource_manager import DatasourceManager
 from core.datasource.entities.datasource_entities import DatasourceMessage
-from core.workflow.node_events import StreamCompletedEvent
+from dify_graph.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 909d6377ce..c043c7dc10 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,6 +1,6 @@
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult, StreamCompletedEvent
-from core.workflow.nodes.datasource.datasource_node import DatasourceNode
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult, StreamCompletedEvent
+from dify_graph.nodes.datasource.datasource_node import DatasourceNode
 
 
 class _Seg:
diff --git a/api/tests/integration_tests/factories/test_storage_key_loader.py b/api/tests/integration_tests/factories/test_storage_key_loader.py
index 16a66bc3f1..b4e3a0e4de 100644
--- a/api/tests/integration_tests/factories/test_storage_key_loader.py
+++ b/api/tests/integration_tests/factories/test_storage_key_loader.py
@@ -6,7 +6,7 @@ from uuid import uuid4
 import pytest
 from sqlalchemy.orm import Session
 
-from core.workflow.file import File, FileTransferMethod, FileType
+from dify_graph.file import File, FileTransferMethod, FileType
 from extensions.ext_database import db
 from factories.file_factory import StorageKeyLoader
 from models import ToolFile, UploadFile
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 5faa002fff..7c4dcda2dc 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
@@ -6,11 +6,11 @@ import pytest
 from sqlalchemy import delete
 from sqlalchemy.orm import Session
 
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
-from core.workflow.nodes import NodeType
-from core.workflow.variables.segments import StringSegment
-from core.workflow.variables.types import SegmentType
-from core.workflow.variables.variables import StringVariable
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from dify_graph.nodes import NodeType
+from dify_graph.variables.segments import StringSegment
+from dify_graph.variables.types import SegmentType
+from dify_graph.variables.variables import StringVariable
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from factories.variable_factory import build_segment
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 a259ccb2b9..988313e68d 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
@@ -5,7 +5,7 @@ import pytest
 from sqlalchemy import delete
 
 from core.db.session_factory import session_factory
-from core.workflow.variables.segments import StringSegment
+from dify_graph.variables.segments import StringSegment
 from models import Tenant
 from models.enums import CreatorUserRole
 from models.model import App, UploadFile
@@ -191,7 +191,7 @@ class TestDeleteDraftVariablesWithOffloadIntegration:
     @pytest.fixture
     def setup_offload_test_data(self, app_and_tenant):
         tenant, app = app_and_tenant
-        from core.workflow.variables.types import SegmentType
+        from dify_graph.variables.types import SegmentType
         from libs.datetime_utils import naive_utc_now
 
         with session_factory.create_session() as session:
@@ -422,7 +422,7 @@ class TestDeleteDraftVariablesSessionCommit:
     @pytest.fixture
     def setup_offload_test_data(self, app_and_tenant):
         """Create test data with offload files for session commit tests."""
-        from core.workflow.variables.types import SegmentType
+        from dify_graph.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/test_code.py b/api/tests/integration_tests/workflow/nodes/test_code.py
index e0ea14b789..c433e95b7a 100644
--- a/api/tests/integration_tests/workflow/nodes/test_code.py
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py
@@ -5,15 +5,15 @@ import pytest
 
 from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.graph import Graph
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.code.code_node import CodeNode
-from core.workflow.nodes.code.limits import CodeNodeLimits
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.graph import Graph
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.code.code_node import CodeNode
+from dify_graph.nodes.code.limits import CodeNodeLimits
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
 from tests.integration_tests.workflow.nodes.__mock.code_executor import setup_code_executor_mock
 
diff --git a/api/tests/integration_tests/workflow/nodes/test_http.py b/api/tests/integration_tests/workflow/nodes/test_http.py
index e0f2363799..31cdb655fa 100644
--- a/api/tests/integration_tests/workflow/nodes/test_http.py
+++ b/api/tests/integration_tests/workflow/nodes/test_http.py
@@ -6,16 +6,16 @@ import pytest
 
 from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
 from core.helper.ssrf_proxy import ssrf_proxy
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.file.file_manager import file_manager
-from core.workflow.graph import Graph
-from core.workflow.nodes.http_request import HttpRequestNode, HttpRequestNodeConfig
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.file.file_manager import file_manager
+from dify_graph.graph import Graph
+from dify_graph.nodes.http_request import HttpRequestNode, HttpRequestNodeConfig
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
 from tests.integration_tests.workflow.nodes.__mock.http import setup_http_mock
 
@@ -190,15 +190,15 @@ 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.nodes.http_request.entities import (
+    from dify_graph.nodes.http_request.entities import (
         HttpRequestNodeAuthorization,
         HttpRequestNodeData,
         HttpRequestNodeTimeout,
     )
-    from core.workflow.nodes.http_request.exc import AuthorizationConfigError
-    from core.workflow.nodes.http_request.executor import Executor
-    from core.workflow.runtime import VariablePool
-    from core.workflow.system_variable import SystemVariable
+    from dify_graph.nodes.http_request.exc import AuthorizationConfigError
+    from dify_graph.nodes.http_request.executor import Executor
+    from dify_graph.runtime import VariablePool
+    from dify_graph.system_variable import SystemVariable
 
     # Create variable pool
     variable_pool = VariablePool(
diff --git a/api/tests/integration_tests/workflow/nodes/test_llm.py b/api/tests/integration_tests/workflow/nodes/test_llm.py
index b5b0fb5334..07783792d1 100644
--- a/api/tests/integration_tests/workflow/nodes/test_llm.py
+++ b/api/tests/integration_tests/workflow/nodes/test_llm.py
@@ -7,13 +7,13 @@ from unittest.mock import MagicMock, patch
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.llm_generator.output_parser.structured_output import _parse_structured_output
 from core.model_manager import ModelInstance
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.node_events import StreamCompletedEvent
-from core.workflow.nodes.llm.node import LLMNode
-from core.workflow.nodes.llm.protocols import CredentialsProvider, ModelFactory
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.node_events import StreamCompletedEvent
+from dify_graph.nodes.llm.node import LLMNode
+from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from extensions.ext_database import db
 from models.enums import UserFrom
 
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 773074e92d..7a3f5bc58e 100644
--- a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
+++ b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
@@ -6,12 +6,12 @@ from unittest.mock import MagicMock
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.model_manager import ModelInstance
 from core.model_runtime.entities import AssistantPromptMessage, UserPromptMessage
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.nodes.llm.protocols import CredentialsProvider, ModelFactory
-from core.workflow.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
+from dify_graph.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from extensions.ext_database import db
 from models.enums import UserFrom
 from tests.integration_tests.workflow.nodes.__mock.model import get_mocked_fetch_model_instance
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 bc03ce1b96..1a8971baa6 100644
--- a/api/tests/integration_tests/workflow/nodes/test_template_transform.py
+++ b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
@@ -4,13 +4,13 @@ import uuid
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.graph import Graph
-from core.workflow.nodes.template_transform.template_transform_node import TemplateTransformNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.graph import Graph
+from dify_graph.nodes.template_transform.template_transform_node import TemplateTransformNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
 from tests.integration_tests.workflow.nodes.__mock.code_executor import setup_code_executor_mock
 
diff --git a/api/tests/integration_tests/workflow/nodes/test_tool.py b/api/tests/integration_tests/workflow/nodes/test_tool.py
index cfbef52c93..58a1137dda 100644
--- a/api/tests/integration_tests/workflow/nodes/test_tool.py
+++ b/api/tests/integration_tests/workflow/nodes/test_tool.py
@@ -3,15 +3,15 @@ import uuid
 from unittest.mock import MagicMock
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
 from core.tools.utils.configuration import ToolParameterConfigurationManager
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.graph import Graph
-from core.workflow.node_events import StreamCompletedEvent
-from core.workflow.nodes.tool.tool_node import ToolNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.graph import Graph
+from dify_graph.node_events import StreamCompletedEvent
+from dify_graph.nodes.tool.tool_node import ToolNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
 
 
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 7fad603a6d..6f2e008d44 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
@@ -8,7 +8,7 @@ from sqlalchemy.orm import Session
 
 from configs import dify_config
 from constants import HEADER_NAME_CSRF_TOKEN
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.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/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 dcf31aeca7..5d6fcf4775 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
@@ -32,15 +32,15 @@ from core.app.layers.pause_state_persist_layer import (
     WorkflowResumptionContext,
 )
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.entities.pause_reason import SchedulingPause
-from core.workflow.enums import WorkflowExecutionStatus
-from core.workflow.graph_engine.entities.commands import GraphEngineCommand
-from core.workflow.graph_engine.layers.base import GraphEngineLayerNotInitializedError
-from core.workflow.graph_events.graph import GraphRunPausedEvent
-from core.workflow.runtime.graph_runtime_state import GraphRuntimeState
-from core.workflow.runtime.graph_runtime_state_protocol import ReadOnlyGraphRuntimeState
-from core.workflow.runtime.read_only_wrappers import ReadOnlyGraphRuntimeStateWrapper
-from core.workflow.runtime.variable_pool import SystemVariable, VariablePool
+from dify_graph.entities.pause_reason import SchedulingPause
+from dify_graph.enums import WorkflowExecutionStatus
+from dify_graph.graph_engine.entities.commands import GraphEngineCommand
+from dify_graph.graph_engine.layers.base import GraphEngineLayerNotInitializedError
+from dify_graph.graph_events.graph import GraphRunPausedEvent
+from dify_graph.runtime.graph_runtime_state import GraphRuntimeState
+from dify_graph.runtime.graph_runtime_state_protocol import ReadOnlyGraphRuntimeState
+from dify_graph.runtime.read_only_wrappers import ReadOnlyGraphRuntimeStateWrapper
+from dify_graph.runtime.variable_pool import SystemVariable, VariablePool
 from extensions.ext_storage import storage
 from libs.datetime_utils import naive_utc_now
 from models import Account
@@ -544,7 +544,7 @@ class TestPauseStatePersistenceLayerTestContainers:
         layer.initialize(graph_runtime_state, command_channel)
 
         # Import other event types
-        from core.workflow.graph_events.graph import (
+        from dify_graph.graph_events.graph import (
             GraphRunFailedEvent,
             GraphRunStartedEvent,
             GraphRunSucceededEvent,
diff --git a/api/tests/test_containers_integration_tests/core/rag/retrieval/test_dataset_retrieval_integration.py b/api/tests/test_containers_integration_tests/core/rag/retrieval/test_dataset_retrieval_integration.py
index 4e6cc620ac..e5d3655771 100644
--- a/api/tests/test_containers_integration_tests/core/rag/retrieval/test_dataset_retrieval_integration.py
+++ b/api/tests/test_containers_integration_tests/core/rag/retrieval/test_dataset_retrieval_integration.py
@@ -5,7 +5,7 @@ import pytest
 from faker import Faker
 
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
-from core.workflow.repositories.rag_retrieval_protocol import KnowledgeRetrievalRequest
+from dify_graph.repositories.rag_retrieval_protocol import KnowledgeRetrievalRequest
 from models.dataset import Dataset, Document
 from services.account_service import AccountService, TenantService
 
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 079e4934bb..4b362d1abe 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
@@ -8,7 +8,7 @@ from sqlalchemy import Engine, select
 from sqlalchemy.orm import Session
 
 from core.repositories.human_input_repository import HumanInputFormRepositoryImpl
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     DeliveryChannelConfig,
     EmailDeliveryConfig,
     EmailDeliveryMethod,
@@ -20,7 +20,7 @@ from core.workflow.nodes.human_input.entities import (
     UserAction,
     WebAppDeliveryMethod,
 )
-from core.workflow.repositories.human_input_form_repository import FormCreateParams
+from dify_graph.repositories.human_input_form_repository import FormCreateParams
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.human_input import (
     EmailExternalRecipientPayload,
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 06d55177eb..c4c9d62c84 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
@@ -12,21 +12,21 @@ from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerat
 from core.app.workflow.layers import PersistenceWorkflowInfo, WorkflowPersistenceLayer
 from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
 from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLAlchemyWorkflowNodeExecutionRepository
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowType
-from core.workflow.graph import Graph
-from core.workflow.graph_engine.command_channels.in_memory_channel import InMemoryChannel
-from core.workflow.graph_engine.graph_engine import GraphEngine
-from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.end.entities import EndNodeData
-from core.workflow.nodes.human_input.entities import HumanInputNodeData, UserAction
-from core.workflow.nodes.human_input.enums import HumanInputFormStatus
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.repositories.human_input_form_repository import HumanInputFormEntity, HumanInputFormRepository
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowType
+from dify_graph.graph import Graph
+from dify_graph.graph_engine.command_channels.in_memory_channel import InMemoryChannel
+from dify_graph.graph_engine.graph_engine import GraphEngine
+from dify_graph.nodes.end.end_node import EndNode
+from dify_graph.nodes.end.entities import EndNodeData
+from dify_graph.nodes.human_input.entities import HumanInputNodeData, UserAction
+from dify_graph.nodes.human_input.enums import HumanInputFormStatus
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.repositories.human_input_form_repository import HumanInputFormEntity, HumanInputFormRepository
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from libs.datetime_utils import naive_utc_now
 from models import Account
 from models.account import Tenant, TenantAccountJoin, TenantAccountRole
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 3568a8b070..cb7cd37a3f 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
@@ -6,7 +6,7 @@ from uuid import uuid4
 import pytest
 from sqlalchemy.orm import Session
 
-from core.workflow.file import File, FileTransferMethod, FileType
+from dify_graph.file import File, FileTransferMethod, FileType
 from extensions.ext_database import db
 from factories.file_factory import StorageKeyLoader
 from models import ToolFile, UploadFile
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 19d7772c39..573f84cb0b 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
@@ -5,7 +5,7 @@ from datetime import datetime, timedelta
 from decimal import Decimal
 from uuid import uuid4
 
-from core.workflow.nodes.human_input.entities import FormDefinition, UserAction
+from dify_graph.nodes.human_input.entities import FormDefinition, UserAction
 from models.account import Account, Tenant, TenantAccountJoin
 from models.execution_extra_content import HumanInputContent
 from models.human_input import HumanInputForm, HumanInputFormStatus
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 556c029b24..458862b0ec 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
@@ -8,7 +8,7 @@ from uuid import uuid4
 from sqlalchemy import Engine, delete
 from sqlalchemy.orm import Session, sessionmaker
 
-from core.workflow.enums import WorkflowNodeExecutionStatus
+from dify_graph.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 05a868c0c2..76e586e65f 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
@@ -11,9 +11,9 @@ import pytest
 from sqlalchemy import Engine, delete, select
 from sqlalchemy.orm import Session, sessionmaker
 
-from core.workflow.entities import WorkflowExecution
-from core.workflow.entities.pause_reason import PauseReasonType
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.entities import WorkflowExecution
+from dify_graph.entities.pause_reason import PauseReasonType
+from dify_graph.enums import WorkflowExecutionStatus
 from extensions.ext_storage import storage
 from libs.datetime_utils import naive_utc_now
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
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 e7cc140582..00bce32f48 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
@@ -841,7 +841,7 @@ class TestAgentService:
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         conversation, message = self._create_test_conversation_and_message(db_session_with_containers, app, account)
 
-        from core.workflow.file import FileTransferMethod, FileType
+        from dify_graph.file import FileTransferMethod, FileType
         from extensions.ext_database import db
         from models.enums import CreatorUserRole
 
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 546292109e..5f86cb2ae9 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
@@ -7,7 +7,7 @@ from uuid import uuid4
 
 from sqlalchemy import select
 
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.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 9c978f830f..08f99cf55a 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
@@ -4,8 +4,8 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from core.workflow.enums import NodeType
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.enums import NodeType
+from dify_graph.nodes.human_input.entities import (
     EmailDeliveryConfig,
     EmailDeliveryMethod,
     EmailRecipients,
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 040fb826e1..ce25eec6f0 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
@@ -6,7 +6,7 @@ from unittest.mock import patch
 import pytest
 from faker import Faker
 
-from core.workflow.entities.workflow_execution import WorkflowExecutionStatus
+from dify_graph.entities.workflow_execution import WorkflowExecutionStatus
 from models import EndUser, Workflow, WorkflowAppLog, WorkflowRun
 from models.enums import CreatorUserRole
 from services.account_service import AccountService, TenantService
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 1f91b40963..624251cd6c 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,8 +1,8 @@
 import pytest
 from faker import Faker
 
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
-from core.workflow.variables.segments import StringSegment
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from dify_graph.variables.segments import StringSegment
 from models import App, Workflow
 from models.enums import DraftVariableType
 from models.workflow import WorkflowDraftVariable
@@ -467,7 +467,7 @@ class TestWorkflowDraftVariableService:
         fake = Faker()
         app = self._create_test_app(db_session_with_containers, mock_external_service_dependencies, fake=fake)
         workflow = self._create_test_workflow(db_session_with_containers, app, fake=fake)
-        from core.workflow.variables.variables import StringVariable
+        from dify_graph.variables.variables import StringVariable
 
         conv_var = StringVariable(
             id=fake.uuid4(),
@@ -650,7 +650,7 @@ class TestWorkflowDraftVariableService:
         fake = Faker()
         app = self._create_test_app(db_session_with_containers, mock_external_service_dependencies, fake=fake)
         workflow = self._create_test_workflow(db_session_with_containers, app, fake=fake)
-        from core.workflow.variables.variables import StringVariable
+        from dify_graph.variables.variables import StringVariable
 
         conv_var1 = StringVariable(
             id=fake.uuid4(),
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_service.py
index c29cda9a73..ef575a9b69 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_service.py
@@ -1393,8 +1393,8 @@ class TestWorkflowService:
 
         from unittest.mock import patch
 
-        from core.app.workflow.node_factory import DifyNodeFactory
         from core.model_manager import ModelInstance
+        from core.workflow.node_factory import DifyNodeFactory
 
         # Act
         with patch.object(
@@ -1472,10 +1472,10 @@ class TestWorkflowService:
             import uuid
             from datetime import datetime
 
-            from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-            from core.workflow.graph_events import NodeRunSucceededEvent
-            from core.workflow.node_events import NodeRunResult
-            from core.workflow.nodes.base.node import Node
+            from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+            from dify_graph.graph_events import NodeRunSucceededEvent
+            from dify_graph.node_events import NodeRunResult
+            from dify_graph.nodes.base.node import Node
 
             # Create mock node
             mock_node = MagicMock(spec=Node)
@@ -1517,12 +1517,12 @@ class TestWorkflowService:
         # Assert
         assert result is not None
         assert result.node_id == node_id
-        from core.workflow.enums import NodeType
+        from dify_graph.enums import NodeType
 
         assert result.node_type == NodeType.START  # Should match the mock node type
         assert result.title == "Test Node"
         # Import the enum for comparison
-        from core.workflow.enums import WorkflowNodeExecutionStatus
+        from dify_graph.enums import WorkflowNodeExecutionStatus
 
         assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
         assert result.inputs is not None
@@ -1547,10 +1547,10 @@ class TestWorkflowService:
             import uuid
             from datetime import datetime
 
-            from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-            from core.workflow.graph_events import NodeRunFailedEvent
-            from core.workflow.node_events import NodeRunResult
-            from core.workflow.nodes.base.node import Node
+            from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+            from dify_graph.graph_events import NodeRunFailedEvent
+            from dify_graph.node_events import NodeRunResult
+            from dify_graph.nodes.base.node import Node
 
             # Create mock node
             mock_node = MagicMock(spec=Node)
@@ -1592,7 +1592,7 @@ class TestWorkflowService:
         assert result is not None
         assert result.node_id == node_id
         # Import the enum for comparison
-        from core.workflow.enums import WorkflowNodeExecutionStatus
+        from dify_graph.enums import WorkflowNodeExecutionStatus
 
         assert result.status == WorkflowNodeExecutionStatus.FAILED
         assert result.error is not None
@@ -1616,10 +1616,10 @@ class TestWorkflowService:
             import uuid
             from datetime import datetime
 
-            from core.workflow.enums import ErrorStrategy, NodeType, WorkflowNodeExecutionStatus
-            from core.workflow.graph_events import NodeRunFailedEvent
-            from core.workflow.node_events import NodeRunResult
-            from core.workflow.nodes.base.node import Node
+            from dify_graph.enums import ErrorStrategy, NodeType, WorkflowNodeExecutionStatus
+            from dify_graph.graph_events import NodeRunFailedEvent
+            from dify_graph.node_events import NodeRunResult
+            from dify_graph.nodes.base.node import Node
 
             # Create mock node with continue_on_error
             mock_node = MagicMock(spec=Node)
@@ -1662,7 +1662,7 @@ class TestWorkflowService:
         assert result is not None
         assert result.node_id == node_id
         # Import the enum for comparison
-        from core.workflow.enums import WorkflowNodeExecutionStatus
+        from dify_graph.enums import WorkflowNodeExecutionStatus
 
         assert result.status == WorkflowNodeExecutionStatus.EXCEPTION  # Should be EXCEPTION, not FAILED
         assert result.outputs is not None
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 2ffb884b82..c2cf249d61 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
@@ -13,7 +13,7 @@ from core.app.app_config.entities import (
 )
 from core.model_runtime.entities.llm_entities import LLMMode
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
-from core.workflow.variables.input_entities import VariableEntity, VariableEntityType
+from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
 from models import Account, Tenant
 from models.api_based_extension import APIBasedExtension
 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 f3ba126706..af9e8d0b2c 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
@@ -4,7 +4,7 @@ from uuid import uuid4
 from sqlalchemy import Engine, select
 from sqlalchemy.orm import Session, sessionmaker
 
-from core.workflow.enums import WorkflowNodeExecutionStatus
+from dify_graph.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 5fd6c56f7a..c9bcba6639 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
@@ -9,8 +9,8 @@ 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
 from core.repositories.human_input_repository import FormCreateParams, HumanInputFormRepositoryImpl
-from core.workflow.enums import WorkflowExecutionStatus
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.enums import WorkflowExecutionStatus
+from dify_graph.nodes.human_input.entities import (
     EmailDeliveryConfig,
     EmailDeliveryMethod,
     EmailRecipients,
@@ -18,7 +18,7 @@ from core.workflow.nodes.human_input.entities import (
     HumanInputNodeData,
     MemberRecipient,
 )
-from core.workflow.runtime import GraphRuntimeState, VariablePool
+from dify_graph.runtime import GraphRuntimeState, VariablePool
 from extensions.ext_storage import storage
 from models.account import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
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 8501a8e39b..182c9ef882 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
@@ -4,8 +4,8 @@ from unittest.mock import ANY, call, patch
 import pytest
 
 from core.db.session_factory import session_factory
-from core.workflow.variables.segments import StringSegment
-from core.workflow.variables.types import SegmentType
+from dify_graph.variables.segments import StringSegment
+from dify_graph.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 5f4f28cf4f..ca76fa0a4b 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
@@ -27,8 +27,8 @@ import pytest
 from sqlalchemy import delete, select
 from sqlalchemy.orm import Session, selectinload, sessionmaker
 
-from core.workflow.entities import WorkflowExecution
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.entities import WorkflowExecution
+from dify_graph.enums import WorkflowExecutionStatus
 from extensions.ext_storage import storage
 from libs.datetime_utils import naive_utc_now
 from models import Account
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 604d68f257..7bfc6c9e13 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
@@ -18,7 +18,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 core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 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_workflow_pause_details_api.py b/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
index f9788e2e50..83601dc1b9 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
@@ -10,10 +10,10 @@ from flask import Flask
 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 core.workflow.entities.pause_reason import HumanInputRequired
-from core.workflow.enums import WorkflowExecutionStatus
-from core.workflow.nodes.human_input.entities import FormInput, UserAction
-from core.workflow.nodes.human_input.enums import FormInputType
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.enums import WorkflowExecutionStatus
+from dify_graph.nodes.human_input.entities import FormInput, UserAction
+from dify_graph.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 cf10182ad3..f34702a257 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
@@ -13,8 +13,8 @@ from controllers.console.app.workflow_draft_variable import (
     _WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS,
     _serialize_full_content,
 )
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
-from core.workflow.variables.types import SegmentType
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from dify_graph.variables.types import SegmentType
 from factories.variable_factory import build_segment
 from libs.datetime_utils import naive_utc_now
 from libs.uuid_utils import uuidv7
@@ -310,8 +310,8 @@ def test_workflow_node_variables_fields():
 
 def test_workflow_file_variable_with_signed_url():
     """Test that File type variables include signed URLs in API responses."""
-    from core.workflow.file.enums import FileTransferMethod, FileType
-    from core.workflow.file.models import File
+    from dify_graph.file.enums import FileTransferMethod, FileType
+    from dify_graph.file.models import File
 
     # Create a File object with LOCAL_FILE transfer method (which generates signed URLs)
     test_file = File(
@@ -368,8 +368,8 @@ def test_workflow_file_variable_with_signed_url():
 
 def test_workflow_file_variable_remote_url():
     """Test that File type variables with REMOTE_URL transfer method return the remote URL."""
-    from core.workflow.file.enums import FileTransferMethod, FileType
-    from core.workflow.file.models import File
+    from dify_graph.file.enums import FileTransferMethod, FileType
+    from dify_graph.file.models import File
 
     # Create a File object with REMOTE_URL transfer method
     test_file = File(
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 0eb3854c84..4eada73b82 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
@@ -35,7 +35,7 @@ from controllers.service_api.app.workflow import (
     WorkflowTaskStopApi,
 )
 from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.enums import WorkflowExecutionStatus
 from models.model import App, AppMode
 from services.app_generate_service import AppGenerateService
 from services.errors.app import IsDraftWorkflowError, WorkflowNotFoundError
@@ -315,7 +315,7 @@ class TestWorkflowStopMechanism:
 
     def test_graph_engine_manager_has_send_stop_command(self):
         """Test GraphEngineManager has send_stop_command method."""
-        from core.workflow.graph_engine.manager import GraphEngineManager
+        from dify_graph.graph_engine.manager import GraphEngineManager
 
         assert hasattr(GraphEngineManager, "send_stop_command")
 
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 fcaa61a871..9e95f45a0a 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,7 +1,7 @@
 from types import SimpleNamespace
 
 from controllers.service_api.app.workflow import WorkflowRunOutputsField, WorkflowRunStatusField
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.enums import WorkflowExecutionStatus
 
 
 def test_workflow_run_status_field_with_enum() -> None:
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 9dddb18595..a20725c5b0 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,6 +1,6 @@
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.model_runtime.entities.message_entities import ImagePromptMessageContent
-from core.workflow.file.models import FileTransferMethod, FileUploadConfig, ImageConfig
+from dify_graph.file.models import FileTransferMethod, FileUploadConfig, ImageConfig
 
 
 def test_convert_with_vision():
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 0ca54a2f4a..12ab587564 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
@@ -7,7 +7,7 @@ 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 core.workflow.variables import SegmentType
+from dify_graph.variables import SegmentType
 from factories import variable_factory
 from models import ConversationVariable, Workflow
 
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_extra_contents.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_extra_contents.py
index a94b5445f7..be773557f6 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_extra_contents.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_extra_contents.py
@@ -10,7 +10,7 @@ import pytest
 from core.app.apps.advanced_chat import generate_task_pipeline as pipeline_module
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.entities.queue_entities import QueueTextChunkEvent, QueueWorkflowPausedEvent
-from core.workflow.entities.pause_reason import HumanInputRequired
+from dify_graph.entities.pause_reason import HumanInputRequired
 from models.enums import MessageStatus
 from models.execution_extra_content import HumanInputContent
 from models.model import EndUser
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 1931e230b2..e85e6e98d9 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
@@ -10,7 +10,7 @@ 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 core.model_runtime.entities.message_entities import ImagePromptMessageContent
-from core.workflow.file.enums import FileTransferMethod, FileType
+from dify_graph.file.enums import FileTransferMethod, FileType
 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 cd5ea8986a..b0789bbc1e 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
@@ -3,9 +3,9 @@ from types import SimpleNamespace
 import pytest
 
 from core.app.apps.common.graph_runtime_state_support import GraphRuntimeStateSupport
-from core.workflow.runtime import GraphRuntimeState
-from core.workflow.runtime.variable_pool import VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.runtime import GraphRuntimeState
+from dify_graph.runtime.variable_pool import VariablePool
+from dify_graph.system_variable import SystemVariable
 
 
 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 5508a117c1..72430a3347 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,8 +1,8 @@
 from collections.abc import Mapping, Sequence
 
 from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
-from core.workflow.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
-from core.workflow.variables.segments import ArrayFileSegment, FileSegment
+from dify_graph.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
+from dify_graph.variables.segments import ArrayFileSegment, FileSegment
 
 
 class TestWorkflowResponseConverterFetchFilesFromVariableValue:
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 1c36b4d12b..4ed7d73cd0 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
@@ -4,9 +4,9 @@ from types import SimpleNamespace
 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.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 
 
 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 0a9794e41c..5879e8fb9b 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
@@ -2,9 +2,9 @@ from types import SimpleNamespace
 
 from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 
 
 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 d25bff92dc..69d476bd13 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
@@ -23,9 +23,9 @@ from core.app.entities.queue_entities import (
     QueueNodeStartedEvent,
     QueueNodeSucceededEvent,
 )
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.enums import NodeType
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.enums import NodeType
+from dify_graph.system_variable import SystemVariable
 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/test_base_app_generator.py b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
index 04c8696525..43a97ae098 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 core.app.apps.base_app_generator import BaseAppGenerator
-from core.workflow.variables.input_entities import VariableEntity, VariableEntityType
+from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
 
 
 def test_validate_inputs_with_zero():
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 97c993928e..dd722c52b2 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
@@ -8,32 +8,32 @@ API_DIR = str(Path(__file__).resolve().parents[5])
 if API_DIR not in sys.path:
     sys.path.insert(0, API_DIR)
 
-import core.workflow.nodes.human_input.entities  # noqa: F401
+import dify_graph.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.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities import GraphInitParams
-from core.workflow.entities.pause_reason import SchedulingPause
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.graph import Graph
-from core.workflow.graph_engine import GraphEngine
-from core.workflow.graph_engine.command_channels.in_memory_channel import InMemoryChannel
-from core.workflow.graph_events import (
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.entities.pause_reason import SchedulingPause
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.graph import Graph
+from dify_graph.graph_engine import GraphEngine
+from dify_graph.graph_engine.command_channels.in_memory_channel import InMemoryChannel
+from dify_graph.graph_events import (
     GraphEngineEvent,
     GraphRunPausedEvent,
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.node_events import NodeRunResult, PauseRequestedEvent
-from core.workflow.nodes.base.entities import BaseNodeData, OutputVariableEntity, RetryConfig
-from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.end.entities import EndNodeData
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.node_events import NodeRunResult, PauseRequestedEvent
+from dify_graph.nodes.base.entities import BaseNodeData, OutputVariableEntity, RetryConfig
+from dify_graph.nodes.base.node import Node
+from dify_graph.nodes.end.entities import EndNodeData
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 
 if "core.ops.ops_trace_manager" not in sys.modules:
     ops_stub = ModuleType("core.ops.ops_trace_manager")
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 f4efb240c0..1388279221 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
@@ -4,8 +4,8 @@ import pytest
 
 from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
 from core.app.entities.queue_entities import QueueWorkflowPausedEvent
-from core.workflow.entities.pause_reason import HumanInputRequired
-from core.workflow.graph_events.graph import GraphRunPausedEvent
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.graph_events.graph 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 f5903d28bd..2e0715e974 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
@@ -8,8 +8,8 @@ import pytest
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.workflow.app_runner import WorkflowAppRunner
 from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 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 c30b925d88..65c6bd6654 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
@@ -10,12 +10,12 @@ from core.app.apps.workflow.app_runner import WorkflowAppRunner
 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.entities.pause_reason import HumanInputRequired
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.graph_events.graph import GraphRunPausedEvent
-from core.workflow.nodes.human_input.entities import FormInput, UserAction
-from core.workflow.nodes.human_input.enums import FormInputType
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.graph_events.graph import GraphRunPausedEvent
+from dify_graph.nodes.human_input.entities import FormInput, UserAction
+from dify_graph.nodes.human_input.enums import FormInputType
+from dify_graph.system_variable import SystemVariable
 from models.account import Account
 
 
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 32cb1ed47c..5b23e71035 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
@@ -7,9 +7,9 @@ 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.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.account import Account
 from models.model import AppMode
 
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 d3ae577d0d..7d0e1d25f6 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
@@ -3,16 +3,16 @@ from datetime import datetime
 from unittest.mock import Mock
 
 from core.app.layers.conversation_variable_persist_layer import ConversationVariablePersistenceLayer
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.graph_engine.protocols.command_channel import CommandChannel
-from core.workflow.graph_events.node import NodeRunSucceededEvent
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.variable_assigner.common import helpers as common_helpers
-from core.workflow.runtime.graph_runtime_state_protocol import ReadOnlyGraphRuntimeState
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables import StringVariable
-from core.workflow.variables.segments import Segment
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.graph_engine.protocols.command_channel import CommandChannel
+from dify_graph.graph_events.node import NodeRunSucceededEvent
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.variable_assigner.common import helpers as common_helpers
+from dify_graph.runtime.graph_runtime_state_protocol import ReadOnlyGraphRuntimeState
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables import StringVariable
+from dify_graph.variables.segments import Segment
 
 
 class MockReadOnlyVariablePool:
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 539f0cb581..035f0ee05c 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
@@ -13,17 +13,17 @@ from core.app.layers.pause_state_persist_layer import (
     _AdvancedChatAppGenerateEntityWrapper,
     _WorkflowGenerateEntityWrapper,
 )
-from core.workflow.entities.pause_reason import SchedulingPause
-from core.workflow.graph_engine.entities.commands import GraphEngineCommand
-from core.workflow.graph_engine.layers.base import GraphEngineLayerNotInitializedError
-from core.workflow.graph_events.graph import (
+from dify_graph.entities.pause_reason import SchedulingPause
+from dify_graph.graph_engine.entities.commands import GraphEngineCommand
+from dify_graph.graph_engine.layers.base import GraphEngineLayerNotInitializedError
+from dify_graph.graph_events.graph import (
     GraphRunFailedEvent,
     GraphRunPausedEvent,
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
 )
-from core.workflow.runtime.graph_runtime_state_protocol import ReadOnlyVariablePool
-from core.workflow.variables.segments import Segment
+from dify_graph.runtime.graph_runtime_state_protocol import ReadOnlyVariablePool
+from dify_graph.variables.segments import Segment
 from models.model import AppMode
 from repositories.factory import DifyAPIRepositoryFactory
 
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 9ee1df8bdc..52c91fb8c9 100644
--- a/api/tests/unit_tests/core/datasource/test_datasource_manager.py
+++ b/api/tests/unit_tests/core/datasource/test_datasource_manager.py
@@ -3,8 +3,8 @@ from collections.abc import Generator
 
 from core.datasource.datasource_manager import DatasourceManager
 from core.datasource.entities.datasource_entities import DatasourceMessage
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.node_events import StreamChunkEvent, StreamCompletedEvent
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.node_events import StreamChunkEvent, StreamCompletedEvent
 
 
 def _gen_messages_text_only(text: str) -> Generator[DatasourceMessage, None, None]:
diff --git a/api/tests/unit_tests/core/file/test_models.py b/api/tests/unit_tests/core/file/test_models.py
index 4d4ccc2672..deebf41320 100644
--- a/api/tests/unit_tests/core/file/test_models.py
+++ b/api/tests/unit_tests/core/file/test_models.py
@@ -1,4 +1,4 @@
-from core.workflow.file import File, FileTransferMethod, FileType
+from dify_graph.file import File, FileTransferMethod, FileType
 
 
 def test_file():
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 40a7700394..f982765b1a 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
@@ -18,7 +18,7 @@ from core.mcp.server.streamable_http import (
     prepare_tool_arguments,
     process_mapping_response,
 )
-from core.workflow.variables.input_entities import VariableEntity, VariableEntityType
+from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
 from models.model import App, AppMCPServer, AppMode, EndUser
 
 
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 4f398ce66e..32389b4d64 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 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 core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 
 
 class TestGetNodeSpanKind:
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 1d25639343..786264513c 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
@@ -14,7 +14,7 @@ from core.model_runtime.entities.message_entities import (
 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 core.workflow.file import File, FileTransferMethod, FileType
+from dify_graph.file import File, FileTransferMethod, FileType
 from models.model import Conversation
 
 
@@ -142,7 +142,7 @@ def test__get_chat_model_prompt_messages_with_files_no_memory(get_chat_model_arg
 
     prompt_transform = AdvancedPromptTransform()
     prompt_transform._calculate_rest_token = MagicMock(return_value=2000)
-    with patch("core.workflow.file.file_manager.to_prompt_message_content", autospec=True) as mock_get_encoded_string:
+    with patch("dify_graph.file.file_manager.to_prompt_message_content", autospec=True) as mock_get_encoded_string:
         mock_get_encoded_string.return_value = ImagePromptMessageContent(
             url=str(files[0].remote_url), format="jpg", mime_type="image/jpg"
         )
diff --git a/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval_methods.py b/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval_methods.py
index 4bc802dc23..682a451117 100644
--- a/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval_methods.py
+++ b/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval_methods.py
@@ -5,8 +5,8 @@ import pytest
 
 from core.rag.models.document import Document
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
-from core.workflow.nodes.knowledge_retrieval import exc
-from core.workflow.repositories.rag_retrieval_protocol import KnowledgeRetrievalRequest
+from dify_graph.nodes.knowledge_retrieval import exc
+from dify_graph.repositories.rag_retrieval_protocol import KnowledgeRetrievalRequest
 from models.dataset import Dataset
 
 # ==================== Helper Functions ====================
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 e6d0371cd5..e7eecfa297 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
@@ -11,7 +11,7 @@ from uuid import uuid4
 import pytest
 
 from core.repositories.celery_workflow_execution_repository import CeleryWorkflowExecutionRepository
-from core.workflow.entities.workflow_execution import WorkflowExecution, WorkflowType
+from dify_graph.entities.workflow_execution import WorkflowExecution, 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 f6211f4cca..b613573927 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
@@ -11,12 +11,12 @@ from uuid import uuid4
 import pytest
 
 from core.repositories.celery_workflow_node_execution_repository import CeleryWorkflowNodeExecutionRepository
-from core.workflow.entities.workflow_node_execution import (
+from dify_graph.entities.workflow_node_execution import (
     WorkflowNodeExecution,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.enums import NodeType
-from core.workflow.repositories.workflow_node_execution_repository import OrderConfig
+from dify_graph.enums import NodeType
+from dify_graph.repositories.workflow_node_execution_repository 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_factory.py b/api/tests/unit_tests/core/repositories/test_factory.py
index 7f1e2c5e5b..fe9eed0307 100644
--- a/api/tests/unit_tests/core/repositories/test_factory.py
+++ b/api/tests/unit_tests/core/repositories/test_factory.py
@@ -12,8 +12,8 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
 from core.repositories.factory import DifyCoreRepositoryFactory, RepositoryImportError
-from core.workflow.repositories.workflow_execution_repository import WorkflowExecutionRepository
-from core.workflow.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
+from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
+from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
 from libs.module_loading import import_string
 from models import Account, EndUser
 from models.enums import WorkflowRunTriggeredFrom
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 811ed2143b..7bf7c2e5f6 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
@@ -15,7 +15,7 @@ from core.repositories.human_input_repository import (
     HumanInputFormSubmissionRepository,
     _WorkspaceMemberInfo,
 )
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     EmailDeliveryConfig,
     EmailDeliveryMethod,
     EmailRecipients,
@@ -24,7 +24,7 @@ from core.workflow.nodes.human_input.entities import (
     MemberRecipient,
     UserAction,
 )
-from core.workflow.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
+from dify_graph.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_workflow_node_execution_conflict_handling.py b/api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py
index 07f28f162a..bae5bae06d 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
@@ -10,11 +10,11 @@ from sqlalchemy.orm import sessionmaker
 from core.repositories.sqlalchemy_workflow_node_execution_repository import (
     SQLAlchemyWorkflowNodeExecutionRepository,
 )
-from core.workflow.entities.workflow_node_execution import (
+from dify_graph.entities.workflow_node_execution import (
     WorkflowNodeExecution,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 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 485be90eae..c880b8d41b 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
@@ -16,11 +16,11 @@ from sqlalchemy import Engine
 from core.repositories.sqlalchemy_workflow_node_execution_repository import (
     SQLAlchemyWorkflowNodeExecutionRepository,
 )
-from core.workflow.entities.workflow_node_execution import (
+from dify_graph.entities.workflow_node_execution import (
     WorkflowNodeExecution,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 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 b9c5fbd7d8..251d6fd25e 100644
--- a/api/tests/unit_tests/core/test_file.py
+++ b/api/tests/unit_tests/core/test_file.py
@@ -1,6 +1,6 @@
 import json
 
-from core.workflow.file import File, FileTransferMethod, FileType, FileUploadConfig
+from dify_graph.file import File, FileTransferMethod, FileType, FileUploadConfig
 from models.workflow import Workflow
 
 
diff --git a/api/tests/unit_tests/core/test_trigger_debug_event_selectors.py b/api/tests/unit_tests/core/test_trigger_debug_event_selectors.py
index 2b508ca654..14b42adbbe 100644
--- a/api/tests/unit_tests/core/test_trigger_debug_event_selectors.py
+++ b/api/tests/unit_tests/core/test_trigger_debug_event_selectors.py
@@ -6,7 +6,7 @@ import pytest
 import pytz
 
 from core.trigger.debug import event_selectors
-from core.workflow.nodes.trigger_schedule.entities import ScheduleConfig
+from dify_graph.nodes.trigger_schedule.entities import ScheduleConfig
 
 
 class _DummyRedis:
diff --git a/api/tests/unit_tests/core/variables/test_segment.py b/api/tests/unit_tests/core/variables/test_segment.py
index a9af8bea1d..d47d4d6130 100644
--- a/api/tests/unit_tests/core/variables/test_segment.py
+++ b/api/tests/unit_tests/core/variables/test_segment.py
@@ -3,10 +3,10 @@ import dataclasses
 from pydantic import BaseModel
 
 from core.helper import encrypter
-from core.workflow.file import File, FileTransferMethod, FileType
-from core.workflow.runtime import VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables.segments import (
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.runtime import VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables.segments import (
     ArrayAnySegment,
     ArrayFileSegment,
     ArrayNumberSegment,
@@ -22,8 +22,8 @@ from core.workflow.variables.segments import (
     StringSegment,
     get_segment_discriminator,
 )
-from core.workflow.variables.types import SegmentType
-from core.workflow.variables.variables import (
+from dify_graph.variables.types import SegmentType
+from dify_graph.variables.variables import (
     ArrayAnyVariable,
     ArrayFileVariable,
     ArrayNumberVariable,
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 e28fed187b..c3371d92e3 100644
--- a/api/tests/unit_tests/core/variables/test_segment_type.py
+++ b/api/tests/unit_tests/core/variables/test_segment_type.py
@@ -1,6 +1,6 @@
 import pytest
 
-from core.workflow.variables.types import ArrayValidation, SegmentType
+from dify_graph.variables.types import ArrayValidation, SegmentType
 
 
 class TestSegmentTypeIsArrayType:
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 52e5dd180c..41ce483447 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
@@ -10,10 +10,10 @@ from typing import Any
 
 import pytest
 
-from core.workflow.file.enums import FileTransferMethod, FileType
-from core.workflow.file.models import File
-from core.workflow.variables.segment_group import SegmentGroup
-from core.workflow.variables.segments import (
+from dify_graph.file.enums import FileTransferMethod, FileType
+from dify_graph.file.models import File
+from dify_graph.variables.segment_group import SegmentGroup
+from dify_graph.variables.segments import (
     ArrayFileSegment,
     BooleanSegment,
     FileSegment,
@@ -22,7 +22,7 @@ from core.workflow.variables.segments import (
     ObjectSegment,
     StringSegment,
 )
-from core.workflow.variables.types import ArrayValidation, SegmentType
+from dify_graph.variables.types import ArrayValidation, SegmentType
 
 
 def create_test_file(
diff --git a/api/tests/unit_tests/core/variables/test_variables.py b/api/tests/unit_tests/core/variables/test_variables.py
index 6fc162e533..dd0fe2e65a 100644
--- a/api/tests/unit_tests/core/variables/test_variables.py
+++ b/api/tests/unit_tests/core/variables/test_variables.py
@@ -1,7 +1,7 @@
 import pytest
 from pydantic import ValidationError
 
-from core.workflow.variables import (
+from dify_graph.variables import (
     ArrayFileVariable,
     ArrayVariable,
     FloatVariable,
@@ -11,7 +11,7 @@ from core.workflow.variables import (
     SegmentType,
     StringVariable,
 )
-from core.workflow.variables.variables import VariableBase
+from dify_graph.variables.variables import VariableBase
 
 
 def test_frozen_variables():
diff --git a/api/tests/unit_tests/core/workflow/context/test_execution_context.py b/api/tests/unit_tests/core/workflow/context/test_execution_context.py
index 8dd669e17f..d09b8397c3 100644
--- a/api/tests/unit_tests/core/workflow/context/test_execution_context.py
+++ b/api/tests/unit_tests/core/workflow/context/test_execution_context.py
@@ -9,7 +9,7 @@ from unittest.mock import MagicMock
 import pytest
 from pydantic import BaseModel
 
-from core.workflow.context.execution_context import (
+from dify_graph.context.execution_context import (
     AppContext,
     ExecutionContext,
     ExecutionContextBuilder,
@@ -286,7 +286,7 @@ class TestCaptureCurrentContext:
 
     def test_capture_current_context_returns_context(self):
         """Test that capture_current_context returns a valid context."""
-        from core.workflow.context.execution_context import capture_current_context
+        from dify_graph.context.execution_context import capture_current_context
 
         result = capture_current_context()
 
@@ -303,7 +303,7 @@ class TestCaptureCurrentContext:
         test_var = contextvars.ContextVar("capture_test_var")
         test_var.set("test_value_123")
 
-        from core.workflow.context.execution_context import capture_current_context
+        from dify_graph.context.execution_context import capture_current_context
 
         result = capture_current_context()
 
@@ -313,12 +313,12 @@ class TestCaptureCurrentContext:
 
 class TestTenantScopedContextRegistry:
     def setup_method(self):
-        from core.workflow.context import reset_context_provider
+        from dify_graph.context import reset_context_provider
 
         reset_context_provider()
 
     def teardown_method(self):
-        from core.workflow.context import reset_context_provider
+        from dify_graph.context import reset_context_provider
 
         reset_context_provider()
 
@@ -333,7 +333,7 @@ class TestTenantScopedContextRegistry:
         assert read_context("workflow.sandbox", tenant_id="t2").base_url == "http://t2"
 
     def test_missing_provider_raises_keyerror(self):
-        from core.workflow.context import ContextProviderNotFoundError
+        from dify_graph.context import ContextProviderNotFoundError
 
         with pytest.raises(ContextProviderNotFoundError):
             read_context("missing", tenant_id="unknown")
diff --git a/api/tests/unit_tests/core/workflow/entities/test_graph_runtime_state.py b/api/tests/unit_tests/core/workflow/entities/test_graph_runtime_state.py
index 8d49394653..b472ffdf1f 100644
--- a/api/tests/unit_tests/core/workflow/entities/test_graph_runtime_state.py
+++ b/api/tests/unit_tests/core/workflow/entities/test_graph_runtime_state.py
@@ -5,7 +5,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
+from dify_graph.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
 
 
 class StubCoordinator:
@@ -115,7 +115,7 @@ class TestGraphRuntimeState:
 
         queue = state.ready_queue
 
-        from core.workflow.graph_engine.ready_queue import InMemoryReadyQueue
+        from dify_graph.graph_engine.ready_queue import InMemoryReadyQueue
 
         assert isinstance(queue, InMemoryReadyQueue)
 
@@ -124,7 +124,7 @@ class TestGraphRuntimeState:
 
         execution = state.graph_execution
 
-        from core.workflow.graph_engine.domain.graph_execution import GraphExecution
+        from dify_graph.graph_engine.domain.graph_execution import GraphExecution
 
         assert isinstance(execution, GraphExecution)
         assert execution.workflow_id == ""
@@ -139,7 +139,7 @@ class TestGraphRuntimeState:
 
         mock_graph = MagicMock()
         with patch(
-            "core.workflow.graph_engine.response_coordinator.ResponseStreamCoordinator", autospec=True
+            "dify_graph.graph_engine.response_coordinator.ResponseStreamCoordinator", autospec=True
         ) as coordinator_cls:
             coordinator_instance = coordinator_cls.return_value
             state.configure(graph=mock_graph)
diff --git a/api/tests/unit_tests/core/workflow/entities/test_pause_reason.py b/api/tests/unit_tests/core/workflow/entities/test_pause_reason.py
index 6144df06e0..158f7018b5 100644
--- a/api/tests/unit_tests/core/workflow/entities/test_pause_reason.py
+++ b/api/tests/unit_tests/core/workflow/entities/test_pause_reason.py
@@ -5,7 +5,7 @@ Tests for PauseReason discriminated union serialization/deserialization.
 import pytest
 from pydantic import BaseModel, ValidationError
 
-from core.workflow.entities.pause_reason import (
+from dify_graph.entities.pause_reason import (
     HumanInputRequired,
     PauseReason,
     SchedulingPause,
diff --git a/api/tests/unit_tests/core/workflow/entities/test_template.py b/api/tests/unit_tests/core/workflow/entities/test_template.py
index f3197ea282..2d4c7f7b77 100644
--- a/api/tests/unit_tests/core/workflow/entities/test_template.py
+++ b/api/tests/unit_tests/core/workflow/entities/test_template.py
@@ -1,6 +1,6 @@
 """Tests for template module."""
 
-from core.workflow.nodes.base.template import Template, TextSegment, VariableSegment
+from dify_graph.nodes.base.template import Template, TextSegment, VariableSegment
 
 
 class TestTemplate:
diff --git a/api/tests/unit_tests/core/workflow/entities/test_variable_pool.py b/api/tests/unit_tests/core/workflow/entities/test_variable_pool.py
index d4254df319..6100ebede5 100644
--- a/api/tests/unit_tests/core/workflow/entities/test_variable_pool.py
+++ b/api/tests/unit_tests/core/workflow/entities/test_variable_pool.py
@@ -1,5 +1,5 @@
-from core.workflow.runtime import VariablePool
-from core.workflow.variables.segments import (
+from dify_graph.runtime import VariablePool
+from dify_graph.variables.segments import (
     BooleanSegment,
     IntegerSegment,
     NoneSegment,
diff --git a/api/tests/unit_tests/core/workflow/entities/test_workflow_node_execution.py b/api/tests/unit_tests/core/workflow/entities/test_workflow_node_execution.py
index a4b1189a1c..4035c1a871 100644
--- a/api/tests/unit_tests/core/workflow/entities/test_workflow_node_execution.py
+++ b/api/tests/unit_tests/core/workflow/entities/test_workflow_node_execution.py
@@ -8,8 +8,8 @@ from typing import Any
 
 import pytest
 
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecution
-from core.workflow.enums import NodeType
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecution
+from dify_graph.enums import NodeType
 
 
 class TestWorkflowNodeExecutionProcessDataTruncation:
diff --git a/api/tests/unit_tests/core/workflow/graph/test_graph.py b/api/tests/unit_tests/core/workflow/graph/test_graph.py
index 01b514ed7c..c46b9e51fd 100644
--- a/api/tests/unit_tests/core/workflow/graph/test_graph.py
+++ b/api/tests/unit_tests/core/workflow/graph/test_graph.py
@@ -2,10 +2,10 @@
 
 from unittest.mock import Mock
 
-from core.workflow.enums import NodeExecutionType, NodeState, NodeType
-from core.workflow.graph.edge import Edge
-from core.workflow.graph.graph import Graph
-from core.workflow.nodes.base.node import Node
+from dify_graph.enums import NodeExecutionType, NodeState, NodeType
+from dify_graph.graph.edge import Edge
+from dify_graph.graph.graph import Graph
+from dify_graph.nodes.base.node import Node
 
 
 def create_mock_node(node_id: str, execution_type: NodeExecutionType, state: NodeState = NodeState.UNKNOWN) -> Node:
diff --git a/api/tests/unit_tests/core/workflow/graph/test_graph_builder.py b/api/tests/unit_tests/core/workflow/graph/test_graph_builder.py
index 15d1dcb48d..bd4a0f32e2 100644
--- a/api/tests/unit_tests/core/workflow/graph/test_graph_builder.py
+++ b/api/tests/unit_tests/core/workflow/graph/test_graph_builder.py
@@ -2,9 +2,9 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from core.workflow.enums import NodeType
-from core.workflow.graph import Graph
-from core.workflow.nodes.base.node import Node
+from dify_graph.enums import NodeType
+from dify_graph.graph import Graph
+from dify_graph.nodes.base.node import Node
 
 
 def _make_node(node_id: str, node_type: NodeType = NodeType.START) -> Node:
diff --git a/api/tests/unit_tests/core/workflow/graph/test_graph_skip_validation.py b/api/tests/unit_tests/core/workflow/graph/test_graph_skip_validation.py
index 6858120335..d2743cbbbe 100644
--- a/api/tests/unit_tests/core/workflow/graph/test_graph_skip_validation.py
+++ b/api/tests/unit_tests/core/workflow/graph/test_graph_skip_validation.py
@@ -5,13 +5,13 @@ from typing import Any
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities import GraphInitParams
-from core.workflow.graph import Graph
-from core.workflow.graph.validation import GraphValidationError
-from core.workflow.nodes import NodeType
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.graph import Graph
+from dify_graph.graph.validation import GraphValidationError
+from dify_graph.nodes import NodeType
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
 
 
diff --git a/api/tests/unit_tests/core/workflow/graph/test_graph_validation.py b/api/tests/unit_tests/core/workflow/graph/test_graph_validation.py
index 5716aae4c7..c9134c4543 100644
--- a/api/tests/unit_tests/core/workflow/graph/test_graph_validation.py
+++ b/api/tests/unit_tests/core/workflow/graph/test_graph_validation.py
@@ -7,14 +7,14 @@ from dataclasses import dataclass
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import ErrorStrategy, NodeExecutionType, NodeType
-from core.workflow.graph import Graph
-from core.workflow.graph.validation import GraphValidationError
-from core.workflow.nodes.base.entities import BaseNodeData
-from core.workflow.nodes.base.node import Node
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import ErrorStrategy, NodeExecutionType, NodeType
+from dify_graph.graph import Graph
+from dify_graph.graph.validation import GraphValidationError
+from dify_graph.nodes.base.entities import BaseNodeData
+from dify_graph.nodes.base.node import Node
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
 
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/README.md b/api/tests/unit_tests/core/workflow/graph_engine/README.md
index 3fff4cf6a9..40ed61eb02 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/README.md
+++ b/api/tests/unit_tests/core/workflow/graph_engine/README.md
@@ -68,7 +68,7 @@ print(f"Success rate: {suite_result.success_rate:.1f}%")
 #### Event Sequence Validation
 
 ```python
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphRunStartedEvent,
     NodeRunStartedEvent,
     NodeRunSucceededEvent,
@@ -376,39 +376,39 @@ See `test_mock_example.py` for comprehensive examples including:
 
 ```bash
 # Run graph engine tests (includes property-based tests)
-uv run pytest api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py
+uv run pytest api/tests/unit_tests/dify_graph/graph_engine/test_graph_engine.py
 
 # Run with specific test patterns
-uv run pytest api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py -k "test_echo"
+uv run pytest api/tests/unit_tests/dify_graph/graph_engine/test_graph_engine.py -k "test_echo"
 
 # Run with verbose output
-uv run pytest api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py -v
+uv run pytest api/tests/unit_tests/dify_graph/graph_engine/test_graph_engine.py -v
 ```
 
 ### Mock System Tests
 
 ```bash
 # Run auto-mock system tests
-uv run pytest api/tests/unit_tests/core/workflow/graph_engine/test_auto_mock_system.py
+uv run pytest api/tests/unit_tests/dify_graph/graph_engine/test_auto_mock_system.py
 
 # Run examples
-uv run python api/tests/unit_tests/core/workflow/graph_engine/test_mock_example.py
+uv run python api/tests/unit_tests/dify_graph/graph_engine/test_mock_example.py
 
 # Run simple validation
-uv run python api/tests/unit_tests/core/workflow/graph_engine/test_mock_simple.py
+uv run python api/tests/unit_tests/dify_graph/graph_engine/test_mock_simple.py
 ```
 
 ### All Tests
 
 ```bash
 # Run all graph engine tests
-uv run pytest api/tests/unit_tests/core/workflow/graph_engine/
+uv run pytest api/tests/unit_tests/dify_graph/graph_engine/
 
 # Run with coverage
-uv run pytest api/tests/unit_tests/core/workflow/graph_engine/ --cov=core.workflow.graph_engine
+uv run pytest api/tests/unit_tests/dify_graph/graph_engine/ --cov=dify_graph.graph_engine
 
 # Run in parallel
-uv run pytest api/tests/unit_tests/core/workflow/graph_engine/ -n auto
+uv run pytest api/tests/unit_tests/dify_graph/graph_engine/ -n auto
 ```
 
 ## Troubleshooting
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/command_channels/test_redis_channel.py b/api/tests/unit_tests/core/workflow/graph_engine/command_channels/test_redis_channel.py
index db9b977e4a..4dec618e49 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/command_channels/test_redis_channel.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/command_channels/test_redis_channel.py
@@ -3,15 +3,15 @@
 import json
 from unittest.mock import MagicMock
 
-from core.workflow.graph_engine.command_channels.redis_channel import RedisChannel
-from core.workflow.graph_engine.entities.commands import (
+from dify_graph.graph_engine.command_channels.redis_channel import RedisChannel
+from dify_graph.graph_engine.entities.commands import (
     AbortCommand,
     CommandType,
     GraphEngineCommand,
     UpdateVariablesCommand,
     VariableUpdate,
 )
-from core.workflow.variables import IntegerVariable, StringVariable
+from dify_graph.variables import IntegerVariable, StringVariable
 
 
 class TestRedisChannel:
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/event_management/test_event_handlers.py b/api/tests/unit_tests/core/workflow/graph_engine/event_management/test_event_handlers.py
index 5d17b7a243..61e0f12550 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/event_management/test_event_handlers.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/event_management/test_event_handlers.py
@@ -2,18 +2,18 @@
 
 from __future__ import annotations
 
-from core.workflow.enums import NodeExecutionType, NodeState, NodeType, WorkflowNodeExecutionStatus
-from core.workflow.graph import Graph
-from core.workflow.graph_engine.domain.graph_execution import GraphExecution
-from core.workflow.graph_engine.event_management.event_handlers import EventHandler
-from core.workflow.graph_engine.event_management.event_manager import EventManager
-from core.workflow.graph_engine.graph_state_manager import GraphStateManager
-from core.workflow.graph_engine.ready_queue.in_memory import InMemoryReadyQueue
-from core.workflow.graph_engine.response_coordinator.coordinator import ResponseStreamCoordinator
-from core.workflow.graph_events import NodeRunRetryEvent, NodeRunStartedEvent
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.base.entities import RetryConfig
-from core.workflow.runtime import GraphRuntimeState, VariablePool
+from dify_graph.enums import NodeExecutionType, NodeState, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.graph import Graph
+from dify_graph.graph_engine.domain.graph_execution import GraphExecution
+from dify_graph.graph_engine.event_management.event_handlers import EventHandler
+from dify_graph.graph_engine.event_management.event_manager import EventManager
+from dify_graph.graph_engine.graph_state_manager import GraphStateManager
+from dify_graph.graph_engine.ready_queue.in_memory import InMemoryReadyQueue
+from dify_graph.graph_engine.response_coordinator.coordinator import ResponseStreamCoordinator
+from dify_graph.graph_events import NodeRunRetryEvent, NodeRunStartedEvent
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.base.entities import RetryConfig
+from dify_graph.runtime import GraphRuntimeState, VariablePool
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/event_management/test_event_manager.py b/api/tests/unit_tests/core/workflow/graph_engine/event_management/test_event_manager.py
index 15eac6b537..25494dc647 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/event_management/test_event_manager.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/event_management/test_event_manager.py
@@ -4,9 +4,9 @@ from __future__ import annotations
 
 import logging
 
-from core.workflow.graph_engine.event_management.event_manager import EventManager
-from core.workflow.graph_engine.layers.base import GraphEngineLayer
-from core.workflow.graph_events import GraphEngineEvent
+from dify_graph.graph_engine.event_management.event_manager import EventManager
+from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.graph_events import GraphEngineEvent
 
 
 class _FaultyLayer(GraphEngineLayer):
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/graph_traversal/test_skip_propagator.py b/api/tests/unit_tests/core/workflow/graph_engine/graph_traversal/test_skip_propagator.py
index 0019020ede..73d59ea4e9 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/graph_traversal/test_skip_propagator.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/graph_traversal/test_skip_propagator.py
@@ -2,9 +2,9 @@
 
 from unittest.mock import MagicMock, create_autospec
 
-from core.workflow.graph import Edge, Graph
-from core.workflow.graph_engine.graph_state_manager import GraphStateManager
-from core.workflow.graph_engine.graph_traversal.skip_propagator import SkipPropagator
+from dify_graph.graph import Edge, Graph
+from dify_graph.graph_engine.graph_state_manager import GraphStateManager
+from dify_graph.graph_engine.graph_traversal.skip_propagator import SkipPropagator
 
 
 class TestSkipPropagator:
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/human_input_test_utils.py b/api/tests/unit_tests/core/workflow/graph_engine/human_input_test_utils.py
index 2ef23c7f0f..fc8133f5e1 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/human_input_test_utils.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/human_input_test_utils.py
@@ -7,8 +7,8 @@ from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Any
 
-from core.workflow.nodes.human_input.enums import HumanInputFormStatus
-from core.workflow.repositories.human_input_form_repository import (
+from dify_graph.nodes.human_input.enums import HumanInputFormStatus
+from dify_graph.repositories.human_input_form_repository import (
     FormCreateParams,
     HumanInputFormEntity,
     HumanInputFormRecipientEntity,
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 903800ce88..3d8de0a00d 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
@@ -10,7 +10,7 @@ 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 core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 
 
 @pytest.fixture
@@ -63,7 +63,7 @@ def mock_llm_node():
 def mock_tool_node():
     """Create a mock Tool Node with tool-specific attributes."""
     from core.tools.entities.tool_entities import ToolProviderType
-    from core.workflow.nodes.tool.entities import ToolNodeData
+    from dify_graph.nodes.tool.entities import ToolNodeData
 
     node = MagicMock()
     node.id = "test-tool-node-id"
@@ -117,8 +117,8 @@ def mock_result_event():
     """Create a mock result event with NodeRunResult."""
     from datetime import datetime
 
-    from core.workflow.graph_events.node import NodeRunSucceededEvent
-    from core.workflow.node_events.base import NodeRunResult
+    from dify_graph.graph_events.node import NodeRunSucceededEvent
+    from dify_graph.node_events.base import NodeRunResult
 
     node_run_result = NodeRunResult(
         inputs={"query": "test query"},
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_layer_initialization.py b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_layer_initialization.py
index f1086c9936..db32527849 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_layer_initialization.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_layer_initialization.py
@@ -2,13 +2,13 @@ from __future__ import annotations
 
 import pytest
 
-from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-from core.workflow.graph_engine.command_channels import InMemoryChannel
-from core.workflow.graph_engine.layers.base import (
+from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+from dify_graph.graph_engine.command_channels import InMemoryChannel
+from dify_graph.graph_engine.layers.base import (
     GraphEngineLayer,
     GraphEngineLayerNotInitializedError,
 )
-from core.workflow.graph_events import GraphEngineEvent
+from dify_graph.graph_events import GraphEngineEvent
 
 from ..test_table_runner import WorkflowRunner
 
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 9a491d24e1..2b882512c9 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
@@ -5,10 +5,10 @@ from unittest.mock import MagicMock, patch
 from core.app.workflow.layers.llm_quota import LLMQuotaLayer
 from core.errors.error import QuotaExceededError
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.graph_engine.entities.commands import CommandType
-from core.workflow.graph_events.node import NodeRunSucceededEvent
-from core.workflow.node_events import NodeRunResult
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.graph_engine.entities.commands import CommandType
+from dify_graph.graph_events.node import NodeRunSucceededEvent
+from dify_graph.node_events import NodeRunResult
 
 
 def _build_succeeded_event() -> NodeRunSucceededEvent:
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 ade846df28..b4a7cec494 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
@@ -16,7 +16,7 @@ import pytest
 from opentelemetry.trace import StatusCode
 
 from core.app.workflow.layers.observability import ObservabilityLayer
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 
 
 class TestObservabilityLayerInitialization:
@@ -144,7 +144,7 @@ class TestObservabilityLayerParserIntegration:
         self, tracer_provider_with_memory_exporter, memory_span_exporter, mock_llm_node, mock_result_event
     ):
         """Test that LLM parser is used for LLM nodes and extracts LLM-specific attributes."""
-        from core.workflow.node_events.base import NodeRunResult
+        from dify_graph.node_events.base import NodeRunResult
 
         mock_result_event.node_run_result = NodeRunResult(
             inputs={},
@@ -182,7 +182,7 @@ class TestObservabilityLayerParserIntegration:
         self, tracer_provider_with_memory_exporter, memory_span_exporter, mock_retrieval_node, mock_result_event
     ):
         """Test that retrieval parser is used for retrieval nodes and extracts retrieval-specific attributes."""
-        from core.workflow.node_events.base import NodeRunResult
+        from dify_graph.node_events.base import NodeRunResult
 
         mock_result_event.node_run_result = NodeRunResult(
             inputs={"query": "test query"},
@@ -210,7 +210,7 @@ class TestObservabilityLayerParserIntegration:
         self, tracer_provider_with_memory_exporter, memory_span_exporter, mock_start_node, mock_result_event
     ):
         """Test that result_event parameter allows parsers to extract inputs and outputs."""
-        from core.workflow.node_events.base import NodeRunResult
+        from dify_graph.node_events.base import NodeRunResult
 
         mock_result_event.node_run_result = NodeRunResult(
             inputs={"input_key": "input_value"},
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/orchestration/test_dispatcher.py b/api/tests/unit_tests/core/workflow/graph_engine/orchestration/test_dispatcher.py
index c1fc4acd73..50d14ff48f 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/orchestration/test_dispatcher.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/orchestration/test_dispatcher.py
@@ -5,18 +5,18 @@ from __future__ import annotations
 import queue
 from unittest import mock
 
-from core.workflow.entities.pause_reason import SchedulingPause
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.graph_engine.event_management.event_handlers import EventHandler
-from core.workflow.graph_engine.orchestration.dispatcher import Dispatcher
-from core.workflow.graph_engine.orchestration.execution_coordinator import ExecutionCoordinator
-from core.workflow.graph_events import (
+from dify_graph.entities.pause_reason import SchedulingPause
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.graph_engine.event_management.event_handlers import EventHandler
+from dify_graph.graph_engine.orchestration.dispatcher import Dispatcher
+from dify_graph.graph_engine.orchestration.execution_coordinator import ExecutionCoordinator
+from dify_graph.graph_events import (
     GraphNodeEventBase,
     NodeRunPauseRequestedEvent,
     NodeRunStartedEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.node_events import NodeRunResult
+from dify_graph.node_events import NodeRunResult
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_answer_end_with_text.py b/api/tests/unit_tests/core/workflow/graph_engine/test_answer_end_with_text.py
index fd1e6fc6dc..7af6b26d87 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_answer_end_with_text.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_answer_end_with_text.py
@@ -1,4 +1,4 @@
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunStartedEvent,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_auto_mock_system.py b/api/tests/unit_tests/core/workflow/graph_engine/test_auto_mock_system.py
index b291f95e0f..244bb2315d 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_auto_mock_system.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_auto_mock_system.py
@@ -7,7 +7,7 @@ for workflows containing nodes that require third-party services.
 
 import pytest
 
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 
 from .test_mock_config import MockConfig, MockConfigBuilder, NodeMockConfig
 from .test_table_runner import TableTestRunner, WorkflowTestCase
@@ -200,8 +200,8 @@ def test_mock_config_builder():
 def test_mock_factory_node_type_detection():
     """Test that MockNodeFactory correctly identifies nodes to mock."""
     from core.app.entities.app_invoke_entities import InvokeFrom
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState, VariablePool
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState, VariablePool
     from models.enums import UserFrom
 
     from .test_mock_factory import MockNodeFactory
@@ -310,9 +310,9 @@ def test_workflow_without_auto_mock():
 def test_register_custom_mock_node():
     """Test registering a custom mock implementation for a node type."""
     from core.app.entities.app_invoke_entities import InvokeFrom
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.nodes.template_transform import TemplateTransformNode
-    from core.workflow.runtime import GraphRuntimeState, VariablePool
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.nodes.template_transform import TemplateTransformNode
+    from dify_graph.runtime import GraphRuntimeState, VariablePool
     from models.enums import UserFrom
 
     from .test_mock_factory import MockNodeFactory
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_basic_chatflow.py b/api/tests/unit_tests/core/workflow/graph_engine/test_basic_chatflow.py
index b04643b78a..30acbdaf3d 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_basic_chatflow.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_basic_chatflow.py
@@ -1,4 +1,4 @@
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunStartedEvent,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_command_system.py b/api/tests/unit_tests/core/workflow/graph_engine/test_command_system.py
index 6c3700ea2b..02ca827d6d 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_command_system.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_command_system.py
@@ -4,22 +4,22 @@ import time
 from unittest.mock import MagicMock
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities.graph_init_params import GraphInitParams
-from core.workflow.entities.pause_reason import SchedulingPause
-from core.workflow.graph import Graph
-from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-from core.workflow.graph_engine.command_channels import InMemoryChannel
-from core.workflow.graph_engine.entities.commands import (
+from dify_graph.entities.graph_init_params import GraphInitParams
+from dify_graph.entities.pause_reason import SchedulingPause
+from dify_graph.graph import Graph
+from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+from dify_graph.graph_engine.command_channels import InMemoryChannel
+from dify_graph.graph_engine.entities.commands import (
     AbortCommand,
     CommandType,
     PauseCommand,
     UpdateVariablesCommand,
     VariableUpdate,
 )
-from core.workflow.graph_events import GraphRunAbortedEvent, GraphRunPausedEvent, GraphRunStartedEvent
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.variables import IntegerVariable, StringVariable
+from dify_graph.graph_events import GraphRunAbortedEvent, GraphRunPausedEvent, GraphRunStartedEvent
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.variables import IntegerVariable, StringVariable
 from models.enums import UserFrom
 
 
@@ -99,7 +99,7 @@ def test_redis_channel_serialization():
     mock_redis.pipeline.return_value.__enter__ = MagicMock(return_value=mock_pipeline)
     mock_redis.pipeline.return_value.__exit__ = MagicMock(return_value=None)
 
-    from core.workflow.graph_engine.command_channels.redis_channel import RedisChannel
+    from dify_graph.graph_engine.command_channels.redis_channel import RedisChannel
 
     # Create channel with a specific key
     channel = RedisChannel(mock_redis, channel_key="workflow:123:commands")
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_complex_branch_workflow.py b/api/tests/unit_tests/core/workflow/graph_engine/test_complex_branch_workflow.py
index 96926797ec..3a9a0b18bc 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_complex_branch_workflow.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_complex_branch_workflow.py
@@ -7,7 +7,7 @@ This test suite validates the behavior of a workflow that:
 3. Handles multiple answer nodes with different outputs
 """
 
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunStartedEvent,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_conditional_streaming_vs_template_workflow.py b/api/tests/unit_tests/core/workflow/graph_engine/test_conditional_streaming_vs_template_workflow.py
index ee944c8e3e..cde99196c8 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_conditional_streaming_vs_template_workflow.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_conditional_streaming_vs_template_workflow.py
@@ -6,10 +6,10 @@ This test validates that:
 - When blocking != 1: NodeRunStreamChunkEvent present (direct LLM to End output)
 """
 
-from core.workflow.enums import NodeType
-from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-from core.workflow.graph_engine.command_channels import InMemoryChannel
-from core.workflow.graph_events import (
+from dify_graph.enums import NodeType
+from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+from dify_graph.graph_engine.command_channels import InMemoryChannel
+from dify_graph.graph_events import (
     GraphRunSucceededEvent,
     NodeRunStartedEvent,
     NodeRunStreamChunkEvent,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_dispatcher_pause_drain.py b/api/tests/unit_tests/core/workflow/graph_engine/test_dispatcher_pause_drain.py
index bf8034487c..b88c15ea2a 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_dispatcher_pause_drain.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_dispatcher_pause_drain.py
@@ -1,10 +1,10 @@
 import queue
 from datetime import datetime
 
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.graph_engine.orchestration.dispatcher import Dispatcher
-from core.workflow.graph_events import NodeRunSucceededEvent
-from core.workflow.node_events import NodeRunResult
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.graph_engine.orchestration.dispatcher import Dispatcher
+from dify_graph.graph_events import NodeRunSucceededEvent
+from dify_graph.node_events import NodeRunResult
 
 
 class StubExecutionCoordinator:
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_end_node_without_value_type.py b/api/tests/unit_tests/core/workflow/graph_engine/test_end_node_without_value_type.py
index b1380cd6d2..c87dc75b95 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_end_node_without_value_type.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_end_node_without_value_type.py
@@ -6,7 +6,7 @@ field is missing from the output configuration, ensuring backward compatibility
 with older workflow definitions.
 """
 
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunStartedEvent,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_execution_coordinator.py b/api/tests/unit_tests/core/workflow/graph_engine/test_execution_coordinator.py
index 53de8908a8..35406997ed 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_execution_coordinator.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_execution_coordinator.py
@@ -4,11 +4,11 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from core.workflow.graph_engine.command_processing.command_processor import CommandProcessor
-from core.workflow.graph_engine.domain.graph_execution import GraphExecution
-from core.workflow.graph_engine.graph_state_manager import GraphStateManager
-from core.workflow.graph_engine.orchestration.execution_coordinator import ExecutionCoordinator
-from core.workflow.graph_engine.worker_management.worker_pool import WorkerPool
+from dify_graph.graph_engine.command_processing.command_processor import CommandProcessor
+from dify_graph.graph_engine.domain.graph_execution import GraphExecution
+from dify_graph.graph_engine.graph_state_manager import GraphStateManager
+from dify_graph.graph_engine.orchestration.execution_coordinator import ExecutionCoordinator
+from dify_graph.graph_engine.worker_management.worker_pool import WorkerPool
 
 
 def _build_coordinator(graph_execution: GraphExecution) -> tuple[ExecutionCoordinator, MagicMock, MagicMock]:
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py
index 5a55d7086e..b9ae680f52 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_engine.py
@@ -10,15 +10,15 @@ import time
 from hypothesis import HealthCheck, given, settings
 from hypothesis import strategies as st
 
-from core.workflow.enums import ErrorStrategy
-from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-from core.workflow.graph_engine.command_channels import InMemoryChannel
-from core.workflow.graph_events import (
+from dify_graph.enums import ErrorStrategy
+from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+from dify_graph.graph_engine.command_channels import InMemoryChannel
+from dify_graph.graph_events import (
     GraphRunPartialSucceededEvent,
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
 )
-from core.workflow.nodes.base.entities import DefaultValue, DefaultValueType
+from dify_graph.nodes.base.entities import DefaultValue, DefaultValueType
 
 # Import the test framework from the new module
 from .test_mock_config import MockConfigBuilder
@@ -455,7 +455,7 @@ def test_if_else_workflow_property_diverse_inputs(query_input):
 # Tests for the Layer system
 def test_layer_system_basic():
     """Test basic layer functionality with DebugLoggingLayer."""
-    from core.workflow.graph_engine.layers import DebugLoggingLayer
+    from dify_graph.graph_engine.layers import DebugLoggingLayer
 
     runner = WorkflowRunner()
 
@@ -495,7 +495,7 @@ def test_layer_system_basic():
 
 def test_layer_chaining():
     """Test chaining multiple layers."""
-    from core.workflow.graph_engine.layers import DebugLoggingLayer, GraphEngineLayer
+    from dify_graph.graph_engine.layers import DebugLoggingLayer, GraphEngineLayer
 
     # Create a custom test layer
     class TestLayer(GraphEngineLayer):
@@ -549,7 +549,7 @@ def test_layer_chaining():
 
 def test_layer_error_handling():
     """Test that layer errors don't crash the engine."""
-    from core.workflow.graph_engine.layers import GraphEngineLayer
+    from dify_graph.graph_engine.layers import GraphEngineLayer
 
     # Create a layer that throws errors
     class FaultyLayer(GraphEngineLayer):
@@ -591,7 +591,7 @@ def test_layer_error_handling():
 
 def test_event_sequence_validation():
     """Test the new event sequence validation feature."""
-    from core.workflow.graph_events import NodeRunStartedEvent, NodeRunStreamChunkEvent, NodeRunSucceededEvent
+    from dify_graph.graph_events import NodeRunStartedEvent, NodeRunStreamChunkEvent, NodeRunSucceededEvent
 
     runner = TableTestRunner()
 
@@ -678,7 +678,7 @@ def test_event_sequence_validation():
 
 def test_event_sequence_validation_with_table_tests():
     """Test event sequence validation with table-driven tests."""
-    from core.workflow.graph_events import NodeRunStartedEvent, NodeRunStreamChunkEvent, NodeRunSucceededEvent
+    from dify_graph.graph_events import NodeRunStartedEvent, NodeRunStreamChunkEvent, NodeRunSucceededEvent
 
     runner = TableTestRunner()
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_execution_serialization.py b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_execution_serialization.py
index 6385b0b91f..805e7dbbce 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_execution_serialization.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_execution_serialization.py
@@ -6,13 +6,13 @@ import json
 from collections import deque
 from unittest.mock import MagicMock
 
-from core.workflow.enums import NodeExecutionType, NodeState, NodeType
-from core.workflow.graph_engine.domain import GraphExecution
-from core.workflow.graph_engine.response_coordinator import ResponseStreamCoordinator
-from core.workflow.graph_engine.response_coordinator.path import Path
-from core.workflow.graph_engine.response_coordinator.session import ResponseSession
-from core.workflow.graph_events import NodeRunStreamChunkEvent
-from core.workflow.nodes.base.template import Template, TextSegment, VariableSegment
+from dify_graph.enums import NodeExecutionType, NodeState, NodeType
+from dify_graph.graph_engine.domain import GraphExecution
+from dify_graph.graph_engine.response_coordinator import ResponseStreamCoordinator
+from dify_graph.graph_engine.response_coordinator.path import Path
+from dify_graph.graph_engine.response_coordinator.session import ResponseSession
+from dify_graph.graph_events import NodeRunStreamChunkEvent
+from dify_graph.nodes.base.template import Template, TextSegment, VariableSegment
 
 
 class CustomGraphExecutionError(Exception):
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_state_snapshot.py b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_state_snapshot.py
index 65d34c2009..0403e91461 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_state_snapshot.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_state_snapshot.py
@@ -3,24 +3,24 @@ from collections.abc import Mapping
 
 from core.model_runtime.entities.llm_entities import LLMMode
 from core.model_runtime.entities.message_entities import PromptMessageRole
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import NodeState
-from core.workflow.graph import Graph
-from core.workflow.graph_engine.graph_state_manager import GraphStateManager
-from core.workflow.graph_engine.ready_queue import InMemoryReadyQueue
-from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.end.entities import EndNodeData
-from core.workflow.nodes.llm.entities import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import NodeState
+from dify_graph.graph import Graph
+from dify_graph.graph_engine.graph_state_manager import GraphStateManager
+from dify_graph.graph_engine.ready_queue import InMemoryReadyQueue
+from dify_graph.nodes.end.end_node import EndNode
+from dify_graph.nodes.end.entities import EndNodeData
+from dify_graph.nodes.llm.entities import (
     ContextConfig,
     LLMNodeChatModelMessage,
     LLMNodeData,
     ModelConfig,
     VisionConfig,
 )
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 
 from .test_mock_config import MockConfig
 from .test_mock_nodes import MockLLMNode
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_multi_branch.py b/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_multi_branch.py
index b117b26b4c..9c075c31f4 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_multi_branch.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_multi_branch.py
@@ -5,9 +5,9 @@ from unittest import mock
 from unittest.mock import MagicMock
 
 from core.model_runtime.entities.message_entities import PromptMessageRole
-from core.workflow.entities import GraphInitParams
-from core.workflow.graph import Graph
-from core.workflow.graph_events import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.graph import Graph
+from dify_graph.graph_events import (
     GraphRunPausedEvent,
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
@@ -16,24 +16,24 @@ from core.workflow.graph_events import (
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.graph_events.node import NodeRunHumanInputFormFilledEvent
-from core.workflow.nodes.base.entities import OutputVariableEntity, OutputVariableType
-from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.end.entities import EndNodeData
-from core.workflow.nodes.human_input.entities import HumanInputNodeData, UserAction
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.nodes.llm.entities import (
+from dify_graph.graph_events.node import NodeRunHumanInputFormFilledEvent
+from dify_graph.nodes.base.entities import OutputVariableEntity, OutputVariableType
+from dify_graph.nodes.end.end_node import EndNode
+from dify_graph.nodes.end.entities import EndNodeData
+from dify_graph.nodes.human_input.entities import HumanInputNodeData, UserAction
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.nodes.llm.entities import (
     ContextConfig,
     LLMNodeChatModelMessage,
     LLMNodeData,
     ModelConfig,
     VisionConfig,
 )
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.repositories.human_input_form_repository import HumanInputFormEntity, HumanInputFormRepository
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.repositories.human_input_form_repository import HumanInputFormEntity, HumanInputFormRepository
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from libs.datetime_utils import naive_utc_now
 
 from .test_mock_config import MockConfig
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_single_branch.py b/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_single_branch.py
index 45505909ea..4f458a41d9 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_single_branch.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_single_branch.py
@@ -4,9 +4,9 @@ from unittest import mock
 from unittest.mock import MagicMock
 
 from core.model_runtime.entities.message_entities import PromptMessageRole
-from core.workflow.entities import GraphInitParams
-from core.workflow.graph import Graph
-from core.workflow.graph_events import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.graph import Graph
+from dify_graph.graph_events import (
     GraphRunPausedEvent,
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
@@ -15,24 +15,24 @@ from core.workflow.graph_events import (
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.graph_events.node import NodeRunHumanInputFormFilledEvent
-from core.workflow.nodes.base.entities import OutputVariableEntity, OutputVariableType
-from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.end.entities import EndNodeData
-from core.workflow.nodes.human_input.entities import HumanInputNodeData, UserAction
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.nodes.llm.entities import (
+from dify_graph.graph_events.node import NodeRunHumanInputFormFilledEvent
+from dify_graph.nodes.base.entities import OutputVariableEntity, OutputVariableType
+from dify_graph.nodes.end.end_node import EndNode
+from dify_graph.nodes.end.entities import EndNodeData
+from dify_graph.nodes.human_input.entities import HumanInputNodeData, UserAction
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.nodes.llm.entities import (
     ContextConfig,
     LLMNodeChatModelMessage,
     LLMNodeData,
     ModelConfig,
     VisionConfig,
 )
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.repositories.human_input_form_repository import HumanInputFormEntity, HumanInputFormRepository
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.repositories.human_input_form_repository import HumanInputFormEntity, HumanInputFormRepository
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from libs.datetime_utils import naive_utc_now
 
 from .test_mock_config import MockConfig
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_if_else_streaming.py b/api/tests/unit_tests/core/workflow/graph_engine/test_if_else_streaming.py
index f33d37e8ff..de5d87ddad 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_if_else_streaming.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_if_else_streaming.py
@@ -3,32 +3,32 @@ from unittest import mock
 
 from core.model_runtime.entities.llm_entities import LLMMode
 from core.model_runtime.entities.message_entities import PromptMessageRole
-from core.workflow.entities import GraphInitParams
-from core.workflow.graph import Graph
-from core.workflow.graph_events import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.graph import Graph
+from dify_graph.graph_events import (
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunStartedEvent,
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.nodes.base.entities import OutputVariableEntity, OutputVariableType
-from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.end.entities import EndNodeData
-from core.workflow.nodes.if_else.entities import IfElseNodeData
-from core.workflow.nodes.if_else.if_else_node import IfElseNode
-from core.workflow.nodes.llm.entities import (
+from dify_graph.nodes.base.entities import OutputVariableEntity, OutputVariableType
+from dify_graph.nodes.end.end_node import EndNode
+from dify_graph.nodes.end.entities import EndNodeData
+from dify_graph.nodes.if_else.entities import IfElseNodeData
+from dify_graph.nodes.if_else.if_else_node import IfElseNode
+from dify_graph.nodes.llm.entities import (
     ContextConfig,
     LLMNodeChatModelMessage,
     LLMNodeData,
     ModelConfig,
     VisionConfig,
 )
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.utils.condition.entities import Condition
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.utils.condition.entities import Condition
 
 from .test_mock_config import MockConfig
 from .test_mock_nodes import MockLLMNode
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_loop_contains_answer.py b/api/tests/unit_tests/core/workflow/graph_engine/test_loop_contains_answer.py
index 3e21a5b44d..733fd53bc8 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_loop_contains_answer.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_loop_contains_answer.py
@@ -5,7 +5,7 @@ This test validates the behavior of a loop containing an answer node
 inside the loop that may produce output errors.
 """
 
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunLoopNextEvent,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_loop_with_tool.py b/api/tests/unit_tests/core/workflow/graph_engine/test_loop_with_tool.py
index d88c1d9f9e..6ff2722f78 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_loop_with_tool.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_loop_with_tool.py
@@ -1,4 +1,4 @@
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunLoopNextEvent,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_config.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_config.py
index 5ceb8dd7f7..6041c6ff30 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_config.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_config.py
@@ -11,7 +11,7 @@ from collections.abc import Callable
 from dataclasses import dataclass, field
 from typing import Any
 
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 
 
 @dataclass
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 b862cbe89e..9f33a81985 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
@@ -8,9 +8,9 @@ requiring external services (LLM, Agent, Tool, Knowledge Retrieval, HTTP Request
 from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any
 
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.enums import NodeType
-from core.workflow.nodes.base.node import Node
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.enums import NodeType
+from dify_graph.nodes.base.node import Node
 
 from .test_mock_nodes import (
     MockAgentNode,
@@ -28,8 +28,8 @@ from .test_mock_nodes import (
 )
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
     from .test_mock_config import MockConfig
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_iteration_simple.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_iteration_simple.py
index aae4de9a27..95bf4bff60 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_iteration_simple.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_iteration_simple.py
@@ -9,7 +9,7 @@ from pathlib import Path
 api_dir = Path(__file__).parent.parent.parent.parent.parent.parent
 sys.path.insert(0, str(api_dir))
 
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 from tests.unit_tests.core.workflow.graph_engine.test_mock_config import MockConfigBuilder
 from tests.unit_tests.core.workflow.graph_engine.test_mock_factory import MockNodeFactory
 
@@ -17,8 +17,8 @@ from tests.unit_tests.core.workflow.graph_engine.test_mock_factory import MockNo
 def test_mock_factory_registers_iteration_node():
     """Test that MockNodeFactory has iteration node registered."""
     from core.app.entities.app_invoke_entities import InvokeFrom
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState, VariablePool
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState, VariablePool
     from models.enums import UserFrom
 
     # Create a MockNodeFactory instance
@@ -66,8 +66,8 @@ def test_mock_iteration_node_preserves_config():
     """Test that MockIterationNode preserves mock configuration."""
 
     from core.app.entities.app_invoke_entities import InvokeFrom
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState, VariablePool
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState, VariablePool
     from models.enums import UserFrom
     from tests.unit_tests.core.workflow.graph_engine.test_mock_nodes import MockIterationNode
 
@@ -128,8 +128,8 @@ def test_mock_loop_node_preserves_config():
     """Test that MockLoopNode preserves mock configuration."""
 
     from core.app.entities.app_invoke_entities import InvokeFrom
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState, VariablePool
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState, VariablePool
     from models.enums import UserFrom
     from tests.unit_tests.core.workflow.graph_engine.test_mock_nodes import MockLoopNode
 
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 5aed463a45..2c46cc53be 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
@@ -12,23 +12,23 @@ from unittest.mock import MagicMock
 
 from core.model_manager import ModelInstance
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
-from core.workflow.nodes.agent import AgentNode
-from core.workflow.nodes.code import CodeNode
-from core.workflow.nodes.document_extractor import DocumentExtractorNode
-from core.workflow.nodes.http_request import HttpRequestNode
-from core.workflow.nodes.knowledge_retrieval import KnowledgeRetrievalNode
-from core.workflow.nodes.llm import LLMNode
-from core.workflow.nodes.llm.protocols import CredentialsProvider, ModelFactory
-from core.workflow.nodes.parameter_extractor import ParameterExtractorNode
-from core.workflow.nodes.question_classifier import QuestionClassifierNode
-from core.workflow.nodes.template_transform import TemplateTransformNode
-from core.workflow.nodes.tool import ToolNode
+from dify_graph.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
+from dify_graph.nodes.agent import AgentNode
+from dify_graph.nodes.code import CodeNode
+from dify_graph.nodes.document_extractor import DocumentExtractorNode
+from dify_graph.nodes.http_request import HttpRequestNode
+from dify_graph.nodes.knowledge_retrieval import KnowledgeRetrievalNode
+from dify_graph.nodes.llm import LLMNode
+from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
+from dify_graph.nodes.parameter_extractor import ParameterExtractorNode
+from dify_graph.nodes.question_classifier import QuestionClassifierNode
+from dify_graph.nodes.template_transform import TemplateTransformNode
+from dify_graph.nodes.tool import ToolNode
 
 if TYPE_CHECKING:
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState
 
     from .test_mock_config import MockConfig
 
@@ -557,8 +557,8 @@ class MockDocumentExtractorNode(MockNodeMixin, DocumentExtractorNode):
         )
 
 
-from core.workflow.nodes.iteration import IterationNode
-from core.workflow.nodes.loop import LoopNode
+from dify_graph.nodes.iteration import IterationNode
+from dify_graph.nodes.loop import LoopNode
 
 
 class MockIterationNode(MockNodeMixin, IterationNode):
@@ -572,11 +572,11 @@ class MockIterationNode(MockNodeMixin, IterationNode):
     def _create_graph_engine(self, index: int, item: Any):
         """Create a graph engine with MockNodeFactory instead of DifyNodeFactory."""
         # Import dependencies
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.graph import Graph
-        from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-        from core.workflow.graph_engine.command_channels import InMemoryChannel
-        from core.workflow.runtime import GraphRuntimeState
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.graph import Graph
+        from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+        from dify_graph.graph_engine.command_channels import InMemoryChannel
+        from dify_graph.runtime import GraphRuntimeState
 
         # Import our MockNodeFactory instead of DifyNodeFactory
         from .test_mock_factory import MockNodeFactory
@@ -621,7 +621,7 @@ class MockIterationNode(MockNodeMixin, IterationNode):
         )
 
         if not iteration_graph:
-            from core.workflow.nodes.iteration.exc import IterationGraphNotFoundError
+            from dify_graph.nodes.iteration.exc import IterationGraphNotFoundError
 
             raise IterationGraphNotFoundError("iteration graph not found")
 
@@ -648,11 +648,11 @@ class MockLoopNode(MockNodeMixin, LoopNode):
     def _create_graph_engine(self, start_at, root_node_id: str):
         """Create a graph engine with MockNodeFactory instead of DifyNodeFactory."""
         # Import dependencies
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.graph import Graph
-        from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-        from core.workflow.graph_engine.command_channels import InMemoryChannel
-        from core.workflow.runtime import GraphRuntimeState
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.graph import Graph
+        from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+        from dify_graph.graph_engine.command_channels import InMemoryChannel
+        from dify_graph.runtime import GraphRuntimeState
 
         # Import our MockNodeFactory instead of DifyNodeFactory
         from .test_mock_factory import MockNodeFactory
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes_template_code.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes_template_code.py
index 6c4178dfed..0942d15073 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes_template_code.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes_template_code.py
@@ -6,8 +6,8 @@ to ensure they work correctly with the TableTestRunner.
 """
 
 from configs import dify_config
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.nodes.code.limits import CodeNodeLimits
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.nodes.code.limits import CodeNodeLimits
 from tests.unit_tests.core.workflow.graph_engine.test_mock_config import MockConfig, MockConfigBuilder, NodeMockConfig
 from tests.unit_tests.core.workflow.graph_engine.test_mock_factory import MockNodeFactory
 from tests.unit_tests.core.workflow.graph_engine.test_mock_nodes import MockCodeNode, MockTemplateTransformNode
@@ -39,8 +39,8 @@ class TestMockTemplateTransformNode:
 
     def test_mock_template_transform_node_default_output(self):
         """Test that MockTemplateTransformNode processes templates with Jinja2."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
 
         # Create test parameters
         graph_init_params = GraphInitParams(
@@ -98,8 +98,8 @@ class TestMockTemplateTransformNode:
 
     def test_mock_template_transform_node_custom_output(self):
         """Test that MockTemplateTransformNode returns custom configured output."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
 
         # Create test parameters
         graph_init_params = GraphInitParams(
@@ -158,8 +158,8 @@ class TestMockTemplateTransformNode:
 
     def test_mock_template_transform_node_error_simulation(self):
         """Test that MockTemplateTransformNode can simulate errors."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
 
         # Create test parameters
         graph_init_params = GraphInitParams(
@@ -215,9 +215,9 @@ class TestMockTemplateTransformNode:
 
     def test_mock_template_transform_node_with_variables(self):
         """Test that MockTemplateTransformNode processes templates with variables."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
-        from core.workflow.variables import StringVariable
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.variables import StringVariable
 
         # Create test parameters
         graph_init_params = GraphInitParams(
@@ -281,8 +281,8 @@ class TestMockCodeNode:
 
     def test_mock_code_node_default_output(self):
         """Test that MockCodeNode returns default output."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
 
         # Create test parameters
         graph_init_params = GraphInitParams(
@@ -343,8 +343,8 @@ class TestMockCodeNode:
 
     def test_mock_code_node_with_output_schema(self):
         """Test that MockCodeNode generates outputs based on schema."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
 
         # Create test parameters
         graph_init_params = GraphInitParams(
@@ -413,8 +413,8 @@ class TestMockCodeNode:
 
     def test_mock_code_node_custom_output(self):
         """Test that MockCodeNode returns custom configured output."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
 
         # Create test parameters
         graph_init_params = GraphInitParams(
@@ -485,8 +485,8 @@ class TestMockNodeFactory:
 
     def test_code_and_template_nodes_mocked_by_default(self):
         """Test that CODE and TEMPLATE_TRANSFORM nodes are mocked by default (they require SSRF proxy)."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
 
         # Create test parameters
         graph_init_params = GraphInitParams(
@@ -526,8 +526,8 @@ class TestMockNodeFactory:
 
     def test_factory_creates_mock_template_transform_node(self):
         """Test that MockNodeFactory creates MockTemplateTransformNode for template-transform type."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
 
         # Create test parameters
         graph_init_params = GraphInitParams(
@@ -577,8 +577,8 @@ class TestMockNodeFactory:
 
     def test_factory_creates_mock_code_node(self):
         """Test that MockNodeFactory creates MockCodeNode for code type."""
-        from core.workflow.entities import GraphInitParams
-        from core.workflow.runtime import GraphRuntimeState, VariablePool
+        from dify_graph.entities import GraphInitParams
+        from dify_graph.runtime import GraphRuntimeState, VariablePool
 
         # Create test parameters
         graph_init_params = GraphInitParams(
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_simple.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_simple.py
index 1b781545f5..975a48705a 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_simple.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_simple.py
@@ -9,7 +9,7 @@ from pathlib import Path
 api_dir = Path(__file__).parent.parent.parent.parent.parent.parent
 sys.path.insert(0, str(api_dir))
 
-from core.workflow.enums import NodeType
+from dify_graph.enums import NodeType
 from tests.unit_tests.core.workflow.graph_engine.test_mock_config import MockConfig, MockConfigBuilder, NodeMockConfig
 from tests.unit_tests.core.workflow.graph_engine.test_mock_factory import MockNodeFactory
 
@@ -102,8 +102,8 @@ def test_node_mock_config():
 def test_mock_factory_detection():
     """Test MockNodeFactory node type detection."""
     from core.app.entities.app_invoke_entities import InvokeFrom
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState, VariablePool
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState, VariablePool
     from models.enums import UserFrom
 
     print("Testing MockNodeFactory detection...")
@@ -155,8 +155,8 @@ def test_mock_factory_detection():
 def test_mock_factory_registration():
     """Test registering and unregistering mock node types."""
     from core.app.entities.app_invoke_entities import InvokeFrom
-    from core.workflow.entities import GraphInitParams
-    from core.workflow.runtime import GraphRuntimeState, VariablePool
+    from dify_graph.entities import GraphInitParams
+    from dify_graph.runtime import GraphRuntimeState, VariablePool
     from models.enums import UserFrom
 
     print("Testing MockNodeFactory registration...")
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 a6aab81f6c..e269263bde 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,33 +4,33 @@ from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Any, Protocol
 
-from core.workflow.entities import GraphInitParams
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.graph import Graph
-from core.workflow.graph_engine.command_channels.in_memory_channel import InMemoryChannel
-from core.workflow.graph_engine.config import GraphEngineConfig
-from core.workflow.graph_engine.graph_engine import GraphEngine
-from core.workflow.graph_events import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.graph import Graph
+from dify_graph.graph_engine.command_channels.in_memory_channel import InMemoryChannel
+from dify_graph.graph_engine.config import GraphEngineConfig
+from dify_graph.graph_engine.graph_engine import GraphEngine
+from dify_graph.graph_events import (
     GraphRunPausedEvent,
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.nodes.base.entities import OutputVariableEntity
-from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.end.entities import EndNodeData
-from core.workflow.nodes.human_input.entities import HumanInputNodeData, UserAction
-from core.workflow.nodes.human_input.enums import HumanInputFormStatus
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.repositories.human_input_form_repository import (
+from dify_graph.nodes.base.entities import OutputVariableEntity
+from dify_graph.nodes.end.end_node import EndNode
+from dify_graph.nodes.end.entities import EndNodeData
+from dify_graph.nodes.human_input.entities import HumanInputNodeData, UserAction
+from dify_graph.nodes.human_input.enums import HumanInputFormStatus
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.repositories.human_input_form_repository import (
     FormCreateParams,
     HumanInputFormEntity,
     HumanInputFormRepository,
 )
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_pause_missing_finish.py b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_pause_missing_finish.py
index 62aa56fc57..9d05dc5bd0 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_pause_missing_finish.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_pause_missing_finish.py
@@ -6,38 +6,38 @@ from typing import Any
 
 from core.model_runtime.entities.llm_entities import LLMMode
 from core.model_runtime.entities.message_entities import PromptMessageRole
-from core.workflow.entities import GraphInitParams
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.graph import Graph
-from core.workflow.graph_engine.command_channels.in_memory_channel import InMemoryChannel
-from core.workflow.graph_engine.config import GraphEngineConfig
-from core.workflow.graph_engine.graph_engine import GraphEngine
-from core.workflow.graph_events import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.graph import Graph
+from dify_graph.graph_engine.command_channels.in_memory_channel import InMemoryChannel
+from dify_graph.graph_engine.config import GraphEngineConfig
+from dify_graph.graph_engine.graph_engine import GraphEngine
+from dify_graph.graph_events import (
     GraphRunPausedEvent,
     GraphRunStartedEvent,
     NodeRunPauseRequestedEvent,
     NodeRunStartedEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.nodes.human_input.entities import HumanInputNodeData, UserAction
-from core.workflow.nodes.human_input.enums import HumanInputFormStatus
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.nodes.llm.entities import (
+from dify_graph.nodes.human_input.entities import HumanInputNodeData, UserAction
+from dify_graph.nodes.human_input.enums import HumanInputFormStatus
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.nodes.llm.entities import (
     ContextConfig,
     LLMNodeChatModelMessage,
     LLMNodeData,
     ModelConfig,
     VisionConfig,
 )
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.repositories.human_input_form_repository import (
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.repositories.human_input_form_repository import (
     FormCreateParams,
     HumanInputFormEntity,
     HumanInputFormRepository,
 )
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from libs.datetime_utils import naive_utc_now
 
 from .test_mock_config import MockConfig, NodeMockConfig
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_streaming_workflow.py b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_streaming_workflow.py
index a93d03c87e..1f456175e9 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_streaming_workflow.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_streaming_workflow.py
@@ -13,23 +13,23 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
 from core.model_manager import ModelInstance
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.graph import Graph
-from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-from core.workflow.graph_engine.command_channels import InMemoryChannel
-from core.workflow.graph_events import (
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.graph import Graph
+from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+from dify_graph.graph_engine.command_channels import InMemoryChannel
+from dify_graph.graph_events import (
     GraphRunSucceededEvent,
     NodeRunStartedEvent,
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.node_events import NodeRunResult, StreamCompletedEvent
-from core.workflow.nodes.llm.node import LLMNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.node_events import NodeRunResult, StreamCompletedEvent
+from dify_graph.nodes.llm.node import LLMNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
 
 from .test_table_runner import TableTestRunner
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_pause_deferred_ready_nodes.py b/api/tests/unit_tests/core/workflow/graph_engine/test_pause_deferred_ready_nodes.py
index 156cfefcd6..ab212a9403 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_pause_deferred_ready_nodes.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_pause_deferred_ready_nodes.py
@@ -6,39 +6,39 @@ from typing import Any
 
 from core.model_runtime.entities.llm_entities import LLMMode
 from core.model_runtime.entities.message_entities import PromptMessageRole
-from core.workflow.entities import GraphInitParams
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.graph import Graph
-from core.workflow.graph_engine.command_channels.in_memory_channel import InMemoryChannel
-from core.workflow.graph_engine.config import GraphEngineConfig
-from core.workflow.graph_engine.graph_engine import GraphEngine
-from core.workflow.graph_events import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.graph import Graph
+from dify_graph.graph_engine.command_channels.in_memory_channel import InMemoryChannel
+from dify_graph.graph_engine.config import GraphEngineConfig
+from dify_graph.graph_engine.graph_engine import GraphEngine
+from dify_graph.graph_events import (
     GraphRunPausedEvent,
     GraphRunStartedEvent,
     NodeRunStartedEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.end.entities import EndNodeData
-from core.workflow.nodes.human_input.entities import HumanInputNodeData, UserAction
-from core.workflow.nodes.human_input.enums import HumanInputFormStatus
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.nodes.llm.entities import (
+from dify_graph.nodes.end.end_node import EndNode
+from dify_graph.nodes.end.entities import EndNodeData
+from dify_graph.nodes.human_input.entities import HumanInputNodeData, UserAction
+from dify_graph.nodes.human_input.enums import HumanInputFormStatus
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.nodes.llm.entities import (
     ContextConfig,
     LLMNodeChatModelMessage,
     LLMNodeData,
     ModelConfig,
     VisionConfig,
 )
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.repositories.human_input_form_repository import (
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.repositories.human_input_form_repository import (
     FormCreateParams,
     HumanInputFormEntity,
     HumanInputFormRepository,
 )
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from libs.datetime_utils import naive_utc_now
 
 from .test_mock_config import MockConfig, NodeMockConfig
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_pause_resume_state.py b/api/tests/unit_tests/core/workflow/graph_engine/test_pause_resume_state.py
index 700b3f4b8b..183d589e2b 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_pause_resume_state.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_pause_resume_state.py
@@ -3,32 +3,32 @@ import time
 from typing import Any
 from unittest.mock import MagicMock
 
-from core.workflow.entities import GraphInitParams
-from core.workflow.entities.workflow_start_reason import WorkflowStartReason
-from core.workflow.graph import Graph
-from core.workflow.graph_engine.command_channels.in_memory_channel import InMemoryChannel
-from core.workflow.graph_engine.graph_engine import GraphEngine
-from core.workflow.graph_events import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.entities.workflow_start_reason import WorkflowStartReason
+from dify_graph.graph import Graph
+from dify_graph.graph_engine.command_channels.in_memory_channel import InMemoryChannel
+from dify_graph.graph_engine.graph_engine import GraphEngine
+from dify_graph.graph_events import (
     GraphEngineEvent,
     GraphRunPausedEvent,
     GraphRunSucceededEvent,
     NodeRunStartedEvent,
     NodeRunSucceededEvent,
 )
-from core.workflow.graph_events.graph import GraphRunStartedEvent
-from core.workflow.nodes.base.entities import OutputVariableEntity
-from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.end.entities import EndNodeData
-from core.workflow.nodes.human_input.entities import HumanInputNodeData, UserAction
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.repositories.human_input_form_repository import (
+from dify_graph.graph_events.graph import GraphRunStartedEvent
+from dify_graph.nodes.base.entities import OutputVariableEntity
+from dify_graph.nodes.end.end_node import EndNode
+from dify_graph.nodes.end.entities import EndNodeData
+from dify_graph.nodes.human_input.entities import HumanInputNodeData, UserAction
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.repositories.human_input_form_repository import (
     HumanInputFormEntity,
     HumanInputFormRepository,
 )
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from libs.datetime_utils import naive_utc_now
 
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_redis_stop_integration.py b/api/tests/unit_tests/core/workflow/graph_engine/test_redis_stop_integration.py
index 0920940e51..9c84f42db6 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_redis_stop_integration.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_redis_stop_integration.py
@@ -12,9 +12,9 @@ import pytest
 import redis
 
 from core.app.apps.base_app_queue_manager import AppQueueManager
-from core.workflow.graph_engine.command_channels.redis_channel import RedisChannel
-from core.workflow.graph_engine.entities.commands import AbortCommand, CommandType, PauseCommand
-from core.workflow.graph_engine.manager import GraphEngineManager
+from dify_graph.graph_engine.command_channels.redis_channel import RedisChannel
+from dify_graph.graph_engine.entities.commands import AbortCommand, CommandType, PauseCommand
+from dify_graph.graph_engine.manager import GraphEngineManager
 
 
 class TestRedisStopIntegration:
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_streaming_conversation_variables.py b/api/tests/unit_tests/core/workflow/graph_engine/test_streaming_conversation_variables.py
index 99157a7c3e..4f1741d4fb 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_streaming_conversation_variables.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_streaming_conversation_variables.py
@@ -1,4 +1,4 @@
-from core.workflow.graph_events import (
+from dify_graph.graph_events import (
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
     NodeRunStartedEvent,
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 5cbb7cf36e..ee36c976f0 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,20 +19,20 @@ from functools import lru_cache
 from pathlib import Path
 from typing import Any
 
-from core.app.workflow.node_factory import DifyNodeFactory
 from core.tools.utils.yaml_utils import _load_yaml_file
-from core.workflow.entities.graph_init_params import GraphInitParams
-from core.workflow.graph import Graph
-from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-from core.workflow.graph_engine.command_channels import InMemoryChannel
-from core.workflow.graph_events import (
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities.graph_init_params import GraphInitParams
+from dify_graph.graph import Graph
+from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+from dify_graph.graph_engine.command_channels import InMemoryChannel
+from dify_graph.graph_events import (
     GraphEngineEvent,
     GraphRunStartedEvent,
     GraphRunSucceededEvent,
 )
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables import (
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables import (
     ArrayNumberVariable,
     ArrayObjectVariable,
     ArrayStringVariable,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_tool_in_chatflow.py b/api/tests/unit_tests/core/workflow/graph_engine/test_tool_in_chatflow.py
index bfcc6e1a5f..7f26bc11a7 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_tool_in_chatflow.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_tool_in_chatflow.py
@@ -1,6 +1,6 @@
-from core.workflow.graph_engine import GraphEngine, GraphEngineConfig
-from core.workflow.graph_engine.command_channels import InMemoryChannel
-from core.workflow.graph_events import (
+from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
+from dify_graph.graph_engine.command_channels import InMemoryChannel
+from dify_graph.graph_events import (
     GraphRunSucceededEvent,
     NodeRunStreamChunkEvent,
 )
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_variable_aggregator.py b/api/tests/unit_tests/core/workflow/graph_engine/test_variable_aggregator.py
index 221e1291d1..f63e8ff4ce 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_variable_aggregator.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_variable_aggregator.py
@@ -2,9 +2,9 @@ from unittest.mock import patch
 
 import pytest
 
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.template_transform.template_transform_node import TemplateTransformNode
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.template_transform.template_transform_node import TemplateTransformNode
 
 from .test_table_runner import TableTestRunner, WorkflowTestCase
 
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 1e95ec1970..842b9e2178 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
@@ -3,13 +3,13 @@ import uuid
 from unittest.mock import MagicMock
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.graph import Graph
-from core.workflow.nodes.answer.answer_node import AnswerNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.graph import Graph
+from dify_graph.nodes.answer.answer_node import AnswerNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from extensions.ext_database import db
 from models.enums import UserFrom
 
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 21a642c2f8..bf814d0c97 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,11 +1,11 @@
 import pytest
 
-from core.workflow.enums import NodeType
-from core.workflow.nodes.base.entities import BaseNodeData
-from core.workflow.nodes.base.node import Node
+from dify_graph.enums import NodeType
+from dify_graph.nodes.base.entities import BaseNodeData
+from dify_graph.nodes.base.node import Node
 
 # Ensures that all node classes are imported.
-from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
+from dify_graph.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
 
 # Ensure `NODE_TYPE_CLASSES_MAPPING` is used and not automatically removed.
 _ = 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 45d222b98c..f8d799e446 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,15 +1,15 @@
 import types
 from collections.abc import Mapping
 
-from core.workflow.enums import NodeType
-from core.workflow.nodes.base.entities import BaseNodeData
-from core.workflow.nodes.base.node import Node
+from dify_graph.enums import NodeType
+from dify_graph.nodes.base.entities import BaseNodeData
+from dify_graph.nodes.base.node import Node
 
 # Import concrete nodes we will assert on (numeric version path)
-from core.workflow.nodes.variable_assigner.v1.node import (
+from dify_graph.nodes.variable_assigner.v1.node import (
     VariableAssignerNode as VariableAssignerV1,
 )
-from core.workflow.nodes.variable_assigner.v2.node import (
+from dify_graph.nodes.variable_assigner.v2.node import (
     VariableAssignerNode as VariableAssignerV2,
 )
 
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 00c8cb3779..95cb653635 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,13 +1,13 @@
 from configs import dify_config
-from core.workflow.nodes.code.code_node import CodeNode
-from core.workflow.nodes.code.entities import CodeLanguage, CodeNodeData
-from core.workflow.nodes.code.exc import (
+from dify_graph.nodes.code.code_node import CodeNode
+from dify_graph.nodes.code.entities import CodeLanguage, CodeNodeData
+from dify_graph.nodes.code.exc import (
     CodeNodeError,
     DepthLimitError,
     OutputValidationError,
 )
-from core.workflow.nodes.code.limits import CodeNodeLimits
-from core.workflow.variables.types import SegmentType
+from dify_graph.nodes.code.limits import CodeNodeLimits
+from dify_graph.variables.types import SegmentType
 
 CodeNode._limits = CodeNodeLimits(
     max_string_length=dify_config.CODE_MAX_STRING_LENGTH,
diff --git a/api/tests/unit_tests/core/workflow/nodes/code/entities_spec.py b/api/tests/unit_tests/core/workflow/nodes/code/entities_spec.py
index 28d59c3568..de7ed0815e 100644
--- a/api/tests/unit_tests/core/workflow/nodes/code/entities_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/code/entities_spec.py
@@ -1,8 +1,8 @@
 import pytest
 from pydantic import ValidationError
 
-from core.workflow.nodes.code.entities import CodeLanguage, CodeNodeData
-from core.workflow.variables.types import SegmentType
+from dify_graph.nodes.code.entities import CodeLanguage, CodeNodeData
+from dify_graph.variables.types import SegmentType
 
 
 class TestCodeNodeDataOutput:
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 584ed23e91..b100c7c02c 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,6 +1,6 @@
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
-from core.workflow.nodes.datasource.datasource_node import DatasourceNode
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
+from dify_graph.nodes.datasource.datasource_node import DatasourceNode
 
 
 class _VarSeg:
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_config.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_config.py
index 90f4cd018b..cd822a6f89 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_config.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_config.py
@@ -1,4 +1,4 @@
-from core.workflow.nodes.http_request import build_http_request_config
+from dify_graph.nodes.http_request import build_http_request_config
 
 
 def test_build_http_request_config_uses_literal_defaults():
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_entities.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_entities.py
index 47a5df92a4..fec6ad90eb 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_entities.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_entities.py
@@ -4,7 +4,7 @@ from unittest.mock import Mock, PropertyMock, patch
 import httpx
 import pytest
 
-from core.workflow.nodes.http_request.entities import Response
+from dify_graph.nodes.http_request.entities import Response
 
 
 @pytest.fixture
@@ -104,7 +104,7 @@ def test_mimetype_based_detection(mock_response, content_type, expected_main_typ
     mock_response.headers = {"content-type": content_type}
     type(mock_response).content = PropertyMock(return_value=bytes([0x00]))  # Dummy content
 
-    with patch("core.workflow.nodes.http_request.entities.mimetypes.guess_type") as mock_guess_type:
+    with patch("dify_graph.nodes.http_request.entities.mimetypes.guess_type") as mock_guess_type:
         # Mock the return value based on expected_main_type
         if expected_main_type:
             mock_guess_type.return_value = (f"{expected_main_type}/subtype", None)
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 67da890eb2..cea7195417 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
@@ -2,19 +2,19 @@ import pytest
 
 from configs import dify_config
 from core.helper.ssrf_proxy import ssrf_proxy
-from core.workflow.file.file_manager import file_manager
-from core.workflow.nodes.http_request import (
+from dify_graph.file.file_manager import file_manager
+from dify_graph.nodes.http_request import (
     BodyData,
     HttpRequestNodeAuthorization,
     HttpRequestNodeBody,
     HttpRequestNodeConfig,
     HttpRequestNodeData,
 )
-from core.workflow.nodes.http_request.entities import HttpRequestNodeTimeout
-from core.workflow.nodes.http_request.exc import AuthorizationConfigError
-from core.workflow.nodes.http_request.executor import Executor
-from core.workflow.runtime import VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.nodes.http_request.entities import HttpRequestNodeTimeout
+from dify_graph.nodes.http_request.exc import AuthorizationConfigError
+from dify_graph.nodes.http_request.executor import Executor
+from dify_graph.runtime import VariablePool
+from dify_graph.system_variable import SystemVariable
 
 HTTP_REQUEST_CONFIG = HttpRequestNodeConfig(
     max_connect_timeout=dify_config.HTTP_REQUEST_MAX_CONNECT_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 cad0466809..8ca973bf9b 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
@@ -7,13 +7,13 @@ import pytest
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.helper.ssrf_proxy import ssrf_proxy
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.file.file_manager import file_manager
-from core.workflow.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
-from core.workflow.nodes.http_request.entities import HttpRequestNodeTimeout, Response
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.file.file_manager import file_manager
+from dify_graph.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
+from dify_graph.nodes.http_request.entities import HttpRequestNodeTimeout, Response
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
 
 HTTP_REQUEST_CONFIG = HttpRequestNodeConfig(
@@ -162,7 +162,7 @@ def test_run_passes_node_data_ssl_verify_to_executor(monkeypatch: pytest.MonkeyP
                 )
             )
 
-    monkeypatch.setattr("core.workflow.nodes.http_request.node.Executor", FakeExecutor)
+    monkeypatch.setattr("dify_graph.nodes.http_request.node.Executor", FakeExecutor)
 
     result = node._run()
 
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 ca4a887d20..d4939b1071 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,5 +1,5 @@
-from core.workflow.nodes.human_input.entities import EmailDeliveryConfig, EmailRecipients
-from core.workflow.runtime import VariablePool
+from dify_graph.nodes.human_input.entities import EmailDeliveryConfig, EmailRecipients
+from dify_graph.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 bfe7b03c13..3b2a81ccef 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
@@ -8,10 +8,10 @@ from unittest.mock import MagicMock
 import pytest
 from pydantic import ValidationError
 
-from core.workflow.entities import GraphInitParams
-from core.workflow.node_events import PauseRequestedEvent
-from core.workflow.node_events.node import StreamCompletedEvent
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.node_events import PauseRequestedEvent
+from dify_graph.node_events.node import StreamCompletedEvent
+from dify_graph.nodes.human_input.entities import (
     EmailDeliveryConfig,
     EmailDeliveryMethod,
     EmailRecipients,
@@ -24,7 +24,7 @@ from core.workflow.nodes.human_input.entities import (
     WebAppDeliveryMethod,
     _WebAppDeliveryConfig,
 )
-from core.workflow.nodes.human_input.enums import (
+from dify_graph.nodes.human_input.enums import (
     ButtonStyle,
     DeliveryMethodType,
     EmailRecipientType,
@@ -32,10 +32,10 @@ from core.workflow.nodes.human_input.enums import (
     PlaceholderType,
     TimeoutUnit,
 )
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.repositories.human_input_form_repository import HumanInputFormRepository
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.repositories.human_input_form_repository import HumanInputFormRepository
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from tests.unit_tests.core.workflow.graph_engine.human_input_test_utils import InMemoryHumanInputFormRepository
 
 
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 a19ee4dee3..1472cdec36 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
@@ -2,17 +2,17 @@ import datetime
 from types import SimpleNamespace
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities.graph_init_params import GraphInitParams
-from core.workflow.enums import NodeType
-from core.workflow.graph_events import (
+from dify_graph.entities.graph_init_params import GraphInitParams
+from dify_graph.enums import NodeType
+from dify_graph.graph_events import (
     NodeRunHumanInputFormFilledEvent,
     NodeRunHumanInputFormTimeoutEvent,
     NodeRunStartedEvent,
 )
-from core.workflow.nodes.human_input.enums import HumanInputFormStatus
-from core.workflow.nodes.human_input.human_input_node import HumanInputNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.nodes.human_input.enums import HumanInputFormStatus
+from dify_graph.nodes.human_input.human_input_node import HumanInputNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 from libs.datetime_utils import naive_utc_now
 from models.enums import UserFrom
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/iteration/entities_spec.py b/api/tests/unit_tests/core/workflow/nodes/iteration/entities_spec.py
index d669cc7465..93c199514e 100644
--- a/api/tests/unit_tests/core/workflow/nodes/iteration/entities_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/iteration/entities_spec.py
@@ -1,4 +1,4 @@
-from core.workflow.nodes.iteration.entities import (
+from dify_graph.nodes.iteration.entities import (
     ErrorHandleMode,
     IterationNodeData,
     IterationStartNodeData,
diff --git a/api/tests/unit_tests/core/workflow/nodes/iteration/iteration_node_spec.py b/api/tests/unit_tests/core/workflow/nodes/iteration/iteration_node_spec.py
index b67e84d1d4..b95a7ad8ae 100644
--- a/api/tests/unit_tests/core/workflow/nodes/iteration/iteration_node_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/iteration/iteration_node_spec.py
@@ -1,6 +1,6 @@
-from core.workflow.enums import NodeType
-from core.workflow.nodes.iteration.entities import ErrorHandleMode, IterationNodeData
-from core.workflow.nodes.iteration.exc import (
+from dify_graph.enums import NodeType
+from dify_graph.nodes.iteration.entities import ErrorHandleMode, IterationNodeData
+from dify_graph.nodes.iteration.exc import (
     InvalidIteratorValueError,
     IterationGraphNotFoundError,
     IterationIndexNotFoundError,
@@ -8,7 +8,7 @@ from core.workflow.nodes.iteration.exc import (
     IteratorVariableNotFoundError,
     StartNodeIdNotFoundError,
 )
-from core.workflow.nodes.iteration.iteration_node import IterationNode
+from dify_graph.nodes.iteration.iteration_node import IterationNode
 
 
 class TestIterationNodeExceptions:
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 38e434d7d8..83a5db2fae 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
@@ -5,16 +5,16 @@ from unittest.mock import Mock
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import SystemVariableKey, WorkflowNodeExecutionStatus
-from core.workflow.nodes.knowledge_index.entities import KnowledgeIndexNodeData
-from core.workflow.nodes.knowledge_index.exc import KnowledgeIndexNodeError
-from core.workflow.nodes.knowledge_index.knowledge_index_node import KnowledgeIndexNode
-from core.workflow.repositories.index_processor_protocol import IndexProcessorProtocol, Preview, PreviewItem
-from core.workflow.repositories.summary_index_service_protocol import SummaryIndexServiceProtocol
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables.segments import StringSegment
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import SystemVariableKey, WorkflowNodeExecutionStatus
+from dify_graph.nodes.knowledge_index.entities import KnowledgeIndexNodeData
+from dify_graph.nodes.knowledge_index.exc import KnowledgeIndexNodeError
+from dify_graph.nodes.knowledge_index.knowledge_index_node import KnowledgeIndexNode
+from dify_graph.repositories.index_processor_protocol import IndexProcessorProtocol, Preview, PreviewItem
+from dify_graph.repositories.summary_index_service_protocol import SummaryIndexServiceProtocol
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables.segments import StringSegment
 from models.enums import UserFrom
 
 
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 a60dde199d..5dcf36ed6a 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
@@ -6,20 +6,20 @@ import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.model_runtime.entities.llm_entities import LLMUsage
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.nodes.knowledge_retrieval.entities import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.nodes.knowledge_retrieval.entities import (
     KnowledgeRetrievalNodeData,
     MultipleRetrievalConfig,
     RerankingModelConfig,
     SingleRetrievalConfig,
 )
-from core.workflow.nodes.knowledge_retrieval.exc import RateLimitExceededError
-from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
-from core.workflow.repositories.rag_retrieval_protocol import RAGRetrievalProtocol, Source
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables import StringSegment
+from dify_graph.nodes.knowledge_retrieval.exc import RateLimitExceededError
+from dify_graph.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
+from dify_graph.repositories.rag_retrieval_protocol import RAGRetrievalProtocol, Source
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables import StringSegment
 from models.enums import UserFrom
 
 
@@ -155,7 +155,7 @@ class TestKnowledgeRetrievalNode:
     ):
         """Test _run with query variable in single mode."""
         # Arrange
-        from core.workflow.nodes.llm.entities import ModelConfig
+        from dify_graph.nodes.llm.entities import ModelConfig
 
         query = "What is Python?"
         query_selector = ["start", "query"]
@@ -444,7 +444,7 @@ class TestFetchDatasetRetriever:
     ):
         """Test _fetch_dataset_retriever in single mode."""
         # Arrange
-        from core.workflow.nodes.llm.entities import ModelConfig
+        from dify_graph.nodes.llm.entities import ModelConfig
 
         query = "What is Python?"
         variables = {"query": query}
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 63a87623da..65228df517 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,13 +1,13 @@
 from unittest.mock import MagicMock
 
 import pytest
-from core.workflow.graph_engine.entities.graph import Graph
-from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
-from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
+from dify_graph.graph_engine.entities.graph import Graph
+from dify_graph.graph_engine.entities.graph_init_params import GraphInitParams
+from dify_graph.graph_engine.entities.graph_runtime_state import GraphRuntimeState
 
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.nodes.list_operator.node import ListOperatorNode
-from core.workflow.variables import ArrayNumberSegment, ArrayStringSegment
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.nodes.list_operator.node import ListOperatorNode
+from dify_graph.variables import ArrayNumberSegment, ArrayStringSegment
 from models.workflow import WorkflowType
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_file_saver.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_file_saver.py
index 0677f1bb52..a3afd1ed5c 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_file_saver.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_file_saver.py
@@ -9,8 +9,8 @@ from sqlalchemy import Engine
 from core.helper import ssrf_proxy
 from core.tools import signature
 from core.tools.tool_file_manager import ToolFileManager
-from core.workflow.file import FileTransferMethod, FileType, models
-from core.workflow.nodes.llm.file_saver import (
+from dify_graph.file import FileTransferMethod, FileType, models
+from dify_graph.nodes.llm.file_saver import (
     FileSaverImpl,
     _extract_content_type_and_extension,
     _get_extension,
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 94b5b72ee1..aac5c296d8 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
@@ -22,10 +22,10 @@ from core.model_runtime.entities.message_entities import (
 from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
 from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
-from core.workflow.entities import GraphInitParams
-from core.workflow.file import File, FileTransferMethod, FileType
-from core.workflow.nodes.llm import llm_utils
-from core.workflow.nodes.llm.entities import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.nodes.llm import llm_utils
+from dify_graph.nodes.llm.entities import (
     ContextConfig,
     LLMNodeChatModelMessage,
     LLMNodeData,
@@ -33,12 +33,12 @@ from core.workflow.nodes.llm.entities import (
     VisionConfig,
     VisionConfigOptions,
 )
-from core.workflow.nodes.llm.file_saver import LLMFileSaver
-from core.workflow.nodes.llm.node import LLMNode, _handle_memory_completion_mode
-from core.workflow.nodes.llm.protocols import CredentialsProvider, ModelFactory
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment
+from dify_graph.nodes.llm.file_saver import LLMFileSaver
+from dify_graph.nodes.llm.node import LLMNode, _handle_memory_completion_mode
+from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment
 from models.enums import UserFrom
 from models.provider import ProviderType
 
@@ -611,7 +611,7 @@ def test_handle_memory_completion_mode_uses_prompt_message_interface():
         window=MemoryConfig.WindowConfig(enabled=True, size=3),
     )
 
-    with mock.patch("core.workflow.nodes.llm.node._calculate_rest_token", return_value=2000) as mock_rest_token:
+    with mock.patch("dify_graph.nodes.llm.node._calculate_rest_token", return_value=2000) as mock_rest_token:
         memory_text = _handle_memory_completion_mode(
             memory=memory,
             memory_config=memory_config,
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_scenarios.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_scenarios.py
index ac0c1df9c5..44dbabb116 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_scenarios.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_scenarios.py
@@ -4,8 +4,8 @@ from pydantic import BaseModel, Field
 
 from core.model_runtime.entities.message_entities import PromptMessage
 from core.model_runtime.entities.model_entities import ModelFeature
-from core.workflow.file import File
-from core.workflow.nodes.llm.entities import LLMNodeChatModelMessage
+from dify_graph.file import File
+from dify_graph.nodes.llm.entities import LLMNodeChatModelMessage
 
 
 class LLMNodeTestScenario(BaseModel):
diff --git a/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_entities.py b/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_entities.py
index 2742b7dab0..fd48edc58c 100644
--- a/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_entities.py
+++ b/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_entities.py
@@ -1,5 +1,5 @@
-from core.workflow.nodes.parameter_extractor.entities import ParameterConfig
-from core.workflow.variables.types import SegmentType
+from dify_graph.nodes.parameter_extractor.entities import ParameterConfig
+from dify_graph.variables.types import SegmentType
 
 
 class TestParameterConfig:
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 ae229bbe2e..110fdeedfb 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
@@ -8,16 +8,16 @@ from typing import Any
 import pytest
 
 from core.model_runtime.entities import LLMMode
-from core.workflow.nodes.llm import ModelConfig, VisionConfig
-from core.workflow.nodes.parameter_extractor.entities import ParameterConfig, ParameterExtractorNodeData
-from core.workflow.nodes.parameter_extractor.exc import (
+from dify_graph.nodes.llm import ModelConfig, VisionConfig
+from dify_graph.nodes.parameter_extractor.entities import ParameterConfig, ParameterExtractorNodeData
+from dify_graph.nodes.parameter_extractor.exc import (
     InvalidNumberOfParametersError,
     InvalidSelectValueError,
     InvalidValueTypeError,
     RequiredParameterMissingError,
 )
-from core.workflow.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
-from core.workflow.variables.types import SegmentType
+from dify_graph.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
+from dify_graph.variables.types import SegmentType
 from factories.variable_factory import build_segment_with_type
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/template_transform/entities_spec.py b/api/tests/unit_tests/core/workflow/nodes/template_transform/entities_spec.py
index 5eb302798f..e57ebbd83e 100644
--- a/api/tests/unit_tests/core/workflow/nodes/template_transform/entities_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/template_transform/entities_spec.py
@@ -1,8 +1,8 @@
 import pytest
 from pydantic import ValidationError
 
-from core.workflow.enums import ErrorStrategy
-from core.workflow.nodes.template_transform.entities import TemplateTransformNodeData
+from dify_graph.enums import ErrorStrategy
+from dify_graph.nodes.template_transform.entities import TemplateTransformNodeData
 
 
 class TestTemplateTransformNodeData:
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 0fb76fb7e7..7edc56c3dc 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,13 +1,13 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from core.workflow.graph_engine.entities.graph import Graph
-from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
-from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
+from dify_graph.graph_engine.entities.graph import Graph
+from dify_graph.graph_engine.entities.graph_init_params import GraphInitParams
+from dify_graph.graph_engine.entities.graph_runtime_state import GraphRuntimeState
 
-from core.workflow.enums import ErrorStrategy, NodeType, WorkflowNodeExecutionStatus
-from core.workflow.nodes.template_transform.template_renderer import TemplateRenderError
-from core.workflow.nodes.template_transform.template_transform_node import TemplateTransformNode
+from dify_graph.enums import ErrorStrategy, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.nodes.template_transform.template_renderer import TemplateRenderError
+from dify_graph.nodes.template_transform.template_transform_node import TemplateTransformNode
 from models.workflow import WorkflowType
 
 
@@ -128,7 +128,7 @@ class TestTemplateTransformNode:
         assert TemplateTransformNode.version() == "1"
 
     @patch(
-        "core.workflow.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
+        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
         autospec=True,
     )
     def test_run_simple_template(
@@ -166,7 +166,7 @@ class TestTemplateTransformNode:
         assert result.inputs["age"] == 30
 
     @patch(
-        "core.workflow.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
+        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
         autospec=True,
     )
     def test_run_with_none_values(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
@@ -194,7 +194,7 @@ class TestTemplateTransformNode:
         assert result.inputs["value"] is None
 
     @patch(
-        "core.workflow.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
+        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
         autospec=True,
     )
     def test_run_with_code_execution_error(
@@ -218,7 +218,7 @@ class TestTemplateTransformNode:
         assert "Template syntax error" in result.error
 
     @patch(
-        "core.workflow.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
+        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
         autospec=True,
     )
     def test_run_output_length_exceeds_limit(
@@ -243,7 +243,7 @@ class TestTemplateTransformNode:
         assert "Output length exceeds" in result.error
 
     @patch(
-        "core.workflow.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
+        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
         autospec=True,
     )
     def test_run_with_complex_jinja2_template(
@@ -308,7 +308,7 @@ class TestTemplateTransformNode:
         assert mapping["node_123.var2"] == ["sys", "input2"]
 
     @patch(
-        "core.workflow.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
+        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
         autospec=True,
     )
     def test_run_with_empty_variables(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
@@ -336,7 +336,7 @@ class TestTemplateTransformNode:
         assert result.inputs == {}
 
     @patch(
-        "core.workflow.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
+        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
         autospec=True,
     )
     def test_run_with_numeric_values(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
@@ -376,7 +376,7 @@ class TestTemplateTransformNode:
         assert result.outputs["output"] == "Total: $31.5"
 
     @patch(
-        "core.workflow.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
+        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
         autospec=True,
     )
     def test_run_with_dict_values(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
@@ -408,7 +408,7 @@ class TestTemplateTransformNode:
         assert "john@example.com" in result.outputs["output"]
 
     @patch(
-        "core.workflow.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
+        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
         autospec=True,
     )
     def test_run_with_list_values(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
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 1854cca236..d5e0a3ce2e 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
@@ -2,12 +2,12 @@ from collections.abc import Mapping
 
 import pytest
 
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import NodeType
-from core.workflow.nodes.base.entities import BaseNodeData
-from core.workflow.nodes.base.node import Node
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import NodeType
+from dify_graph.nodes.base.entities import BaseNodeData
+from dify_graph.nodes.base.node import Node
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
 
 
 class _SampleNodeData(BaseNodeData):
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 35c59b92c4..b6169cd735 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
@@ -6,20 +6,20 @@ import pytest
 from docx.oxml.text.paragraph import CT_P
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
-from core.workflow.file import File, FileTransferMethod
-from core.workflow.node_events import NodeRunResult
-from core.workflow.nodes.document_extractor import DocumentExtractorNode, DocumentExtractorNodeData
-from core.workflow.nodes.document_extractor.node import (
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.file import File, FileTransferMethod
+from dify_graph.node_events import NodeRunResult
+from dify_graph.nodes.document_extractor import DocumentExtractorNode, DocumentExtractorNodeData
+from dify_graph.nodes.document_extractor.node import (
     _extract_text_from_docx,
     _extract_text_from_excel,
     _extract_text_from_pdf,
     _extract_text_from_plain_text,
 )
-from core.workflow.variables import ArrayFileSegment
-from core.workflow.variables.segments import ArrayStringSegment
-from core.workflow.variables.variables import StringVariable
+from dify_graph.variables import ArrayFileSegment
+from dify_graph.variables.segments import ArrayStringSegment
+from dify_graph.variables.variables import StringVariable
 from models.enums import UserFrom
 
 
@@ -146,15 +146,15 @@ def test_run_extract_text(
     mock_ssrf_proxy_get.return_value.content = file_content
     mock_ssrf_proxy_get.return_value.raise_for_status = Mock()
 
-    monkeypatch.setattr("core.workflow.file.file_manager.download", mock_download)
+    monkeypatch.setattr("dify_graph.file.file_manager.download", mock_download)
     monkeypatch.setattr("core.helper.ssrf_proxy.get", mock_ssrf_proxy_get)
 
     if mime_type == "application/pdf":
         mock_pdf_extract = Mock(return_value=expected_text[0])
-        monkeypatch.setattr("core.workflow.nodes.document_extractor.node._extract_text_from_pdf", mock_pdf_extract)
+        monkeypatch.setattr("dify_graph.nodes.document_extractor.node._extract_text_from_pdf", mock_pdf_extract)
     elif mime_type.startswith("application/vnd.openxmlformats"):
         mock_docx_extract = Mock(return_value=expected_text[0])
-        monkeypatch.setattr("core.workflow.nodes.document_extractor.node._extract_text_from_docx", mock_docx_extract)
+        monkeypatch.setattr("dify_graph.nodes.document_extractor.node._extract_text_from_docx", mock_docx_extract)
 
     result = document_extractor_node._run()
 
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 bc87a64161..c90550b460 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
@@ -5,17 +5,17 @@ from unittest.mock import MagicMock, Mock
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities import GraphInitParams
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.file import File, FileTransferMethod, FileType
-from core.workflow.graph import Graph
-from core.workflow.nodes.if_else.entities import IfElseNodeData
-from core.workflow.nodes.if_else.if_else_node import IfElseNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.utils.condition.entities import Condition, SubCondition, SubVariableCondition
-from core.workflow.variables import ArrayFileSegment
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.graph import Graph
+from dify_graph.nodes.if_else.entities import IfElseNodeData
+from dify_graph.nodes.if_else.if_else_node import IfElseNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.utils.condition.entities import Condition, SubCondition, SubVariableCondition
+from dify_graph.variables import ArrayFileSegment
 from extensions.ext_database import db
 from models.enums import UserFrom
 
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 73c17ee45a..8242f1d848 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
@@ -3,9 +3,9 @@ from unittest.mock import MagicMock
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.enums import WorkflowNodeExecutionStatus
-from core.workflow.file import File, FileTransferMethod, FileType
-from core.workflow.nodes.list_operator.entities import (
+from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.nodes.list_operator.entities import (
     ExtractConfig,
     FilterBy,
     FilterCondition,
@@ -14,9 +14,9 @@ from core.workflow.nodes.list_operator.entities import (
     Order,
     OrderByConfig,
 )
-from core.workflow.nodes.list_operator.exc import InvalidKeyError
-from core.workflow.nodes.list_operator.node import ListOperatorNode, _get_file_extract_string_func
-from core.workflow.variables import ArrayFileSegment
+from dify_graph.nodes.list_operator.exc import InvalidKeyError
+from dify_graph.nodes.list_operator.node import ListOperatorNode, _get_file_extract_string_func
+from dify_graph.variables import ArrayFileSegment
 from models.enums import UserFrom
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_question_classifier_node.py b/api/tests/unit_tests/core/workflow/nodes/test_question_classifier_node.py
index 47ef289ef3..1b72589cba 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_question_classifier_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_question_classifier_node.py
@@ -1,5 +1,5 @@
 from core.model_runtime.entities import ImagePromptMessageContent
-from core.workflow.nodes.question_classifier import QuestionClassifierNodeData
+from dify_graph.nodes.question_classifier import QuestionClassifierNodeData
 
 
 def test_init_question_classifier_node_data():
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 8c7dc24868..5fd1e33768 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
@@ -4,12 +4,12 @@ import time
 import pytest
 from pydantic import ValidationError as PydanticValidationError
 
-from core.workflow.entities import GraphInitParams
-from core.workflow.nodes.start.entities import StartNodeData
-from core.workflow.nodes.start.start_node import StartNode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables.input_entities import VariableEntity, VariableEntityType
+from dify_graph.entities import GraphInitParams
+from dify_graph.nodes.start.entities import StartNodeData
+from dify_graph.nodes.start.start_node import StartNode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
 
 
 def make_start_node(user_inputs, variables):
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 678691439f..c6e40bbd84 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
@@ -11,15 +11,15 @@ import pytest
 from core.model_runtime.entities.llm_entities import LLMUsage
 from core.tools.entities.tool_entities import ToolInvokeMessage
 from core.tools.utils.message_transformer import ToolFileMessageTransformer
-from core.workflow.entities import GraphInitParams
-from core.workflow.file import File, FileTransferMethod, FileType
-from core.workflow.node_events import StreamChunkEvent, StreamCompletedEvent
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables.segments import ArrayFileSegment
+from dify_graph.entities import GraphInitParams
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.node_events import StreamChunkEvent, StreamCompletedEvent
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables.segments import ArrayFileSegment
 
 if TYPE_CHECKING:  # pragma: no cover - imported for type checking only
-    from core.workflow.nodes.tool.tool_node import ToolNode
+    from dify_graph.nodes.tool.tool_node import ToolNode
 
 
 @pytest.fixture
@@ -31,7 +31,7 @@ def tool_node(monkeypatch) -> ToolNode:
         ops_stub.TraceTask = object  # pragma: no cover - stub attribute
         monkeypatch.setitem(sys.modules, module_name, ops_stub)
 
-    from core.workflow.nodes.tool.tool_node import ToolNode
+    from dify_graph.nodes.tool.tool_node import ToolNode
 
     graph_config: dict[str, Any] = {
         "nodes": [
diff --git a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
index 8a52f963ef..182172cb9c 100644
--- a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
+++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
@@ -3,16 +3,16 @@ import uuid
 from uuid import uuid4
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities import GraphInitParams
-from core.workflow.graph import Graph
-from core.workflow.graph_events.node import NodeRunSucceededEvent
-from core.workflow.nodes.variable_assigner.common import helpers as common_helpers
-from core.workflow.nodes.variable_assigner.v1 import VariableAssignerNode
-from core.workflow.nodes.variable_assigner.v1.node_data import WriteMode
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables import ArrayStringVariable, StringVariable
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.graph import Graph
+from dify_graph.graph_events.node import NodeRunSucceededEvent
+from dify_graph.nodes.variable_assigner.common import helpers as common_helpers
+from dify_graph.nodes.variable_assigner.v1 import VariableAssignerNode
+from dify_graph.nodes.variable_assigner.v1.node_data import WriteMode
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables import ArrayStringVariable, StringVariable
 from models.enums import UserFrom
 
 DEFAULT_NODE_ID = "node_id"
diff --git a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py
index 9a874337ed..a7673c5a14 100644
--- a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py
+++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py
@@ -1,6 +1,6 @@
-from core.workflow.nodes.variable_assigner.v2.enums import Operation
-from core.workflow.nodes.variable_assigner.v2.helpers import is_input_value_valid
-from core.workflow.variables import SegmentType
+from dify_graph.nodes.variable_assigner.v2.enums import Operation
+from dify_graph.nodes.variable_assigner.v2.helpers import is_input_value_valid
+from dify_graph.variables import SegmentType
 
 
 def test_is_input_value_valid_overwrite_array_string():
diff --git a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py
index 5ed68fe8d0..10eed1786f 100644
--- a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py
+++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py
@@ -3,14 +3,14 @@ import uuid
 from uuid import uuid4
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.workflow.node_factory import DifyNodeFactory
-from core.workflow.entities import GraphInitParams
-from core.workflow.graph import Graph
-from core.workflow.nodes.variable_assigner.v2 import VariableAssignerNode
-from core.workflow.nodes.variable_assigner.v2.enums import InputType, Operation
-from core.workflow.runtime import GraphRuntimeState, VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables import ArrayStringVariable
+from core.workflow.node_factory import DifyNodeFactory
+from dify_graph.entities import GraphInitParams
+from dify_graph.graph import Graph
+from dify_graph.nodes.variable_assigner.v2 import VariableAssignerNode
+from dify_graph.nodes.variable_assigner.v2.enums import InputType, Operation
+from dify_graph.runtime import GraphRuntimeState, VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables import ArrayStringVariable
 from models.enums import UserFrom
 
 DEFAULT_NODE_ID = "node_id"
diff --git a/api/tests/unit_tests/core/workflow/nodes/webhook/test_entities.py b/api/tests/unit_tests/core/workflow/nodes/webhook/test_entities.py
index 4fa9a01b61..410c4993e4 100644
--- a/api/tests/unit_tests/core/workflow/nodes/webhook/test_entities.py
+++ b/api/tests/unit_tests/core/workflow/nodes/webhook/test_entities.py
@@ -1,7 +1,7 @@
 import pytest
 from pydantic import ValidationError
 
-from core.workflow.nodes.trigger_webhook.entities import (
+from dify_graph.nodes.trigger_webhook.entities import (
     ContentType,
     Method,
     WebhookBodyParameter,
@@ -297,7 +297,7 @@ def test_webhook_body_parameter_edge_cases():
 
 def test_webhook_data_inheritance():
     """Test WebhookData inherits from BaseNodeData correctly."""
-    from core.workflow.nodes.base import BaseNodeData
+    from dify_graph.nodes.base import BaseNodeData
 
     # Test that WebhookData is a subclass of BaseNodeData
     assert issubclass(WebhookData, BaseNodeData)
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 374d5183c8..f2273e441e 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,7 +1,7 @@
 import pytest
 
-from core.workflow.nodes.base.exc import BaseNodeError
-from core.workflow.nodes.trigger_webhook.exc import (
+from dify_graph.nodes.base.exc import BaseNodeError
+from dify_graph.nodes.trigger_webhook.exc import (
     WebhookConfigError,
     WebhookNodeError,
     WebhookNotFoundError,
@@ -149,7 +149,7 @@ def test_webhook_error_attributes():
     assert WebhookConfigError.__name__ == "WebhookConfigError"
 
     # Test that all error classes have proper __module__
-    expected_module = "core.workflow.nodes.trigger_webhook.exc"
+    expected_module = "dify_graph.nodes.trigger_webhook.exc"
     assert WebhookNodeError.__module__ == expected_module
     assert WebhookTimeoutError.__module__ == expected_module
     assert WebhookNotFoundError.__module__ == expected_module
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 d8f6b41f89..8aeaf1707c 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,18 +9,18 @@ when passing files to downstream LLM nodes.
 from unittest.mock import Mock, patch
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities.graph_init_params import GraphInitParams
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.nodes.trigger_webhook.entities import (
+from dify_graph.entities.graph_init_params import GraphInitParams
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.nodes.trigger_webhook.entities import (
     ContentType,
     Method,
     WebhookBodyParameter,
     WebhookData,
 )
-from core.workflow.nodes.trigger_webhook.node import TriggerWebhookNode
-from core.workflow.runtime.graph_runtime_state import GraphRuntimeState
-from core.workflow.runtime.variable_pool import VariablePool
-from core.workflow.system_variable import SystemVariable
+from dify_graph.nodes.trigger_webhook.node import TriggerWebhookNode
+from dify_graph.runtime.graph_runtime_state import GraphRuntimeState
+from dify_graph.runtime.variable_pool import VariablePool
+from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
 from models.workflow import WorkflowType
 
@@ -129,8 +129,8 @@ def test_webhook_node_file_conversion_to_file_variable():
     # Mock the file factory and variable factory
     with (
         patch("factories.file_factory.build_from_mapping") as mock_file_factory,
-        patch("core.workflow.nodes.trigger_webhook.node.build_segment_with_type") as mock_segment_factory,
-        patch("core.workflow.nodes.trigger_webhook.node.FileVariable") as mock_file_variable,
+        patch("dify_graph.nodes.trigger_webhook.node.build_segment_with_type") as mock_segment_factory,
+        patch("dify_graph.nodes.trigger_webhook.node.FileVariable") as mock_file_variable,
     ):
         # Setup mocks
         mock_file_obj = Mock()
@@ -321,8 +321,8 @@ def test_webhook_node_file_conversion_mixed_parameters():
 
     with (
         patch("factories.file_factory.build_from_mapping") as mock_file_factory,
-        patch("core.workflow.nodes.trigger_webhook.node.build_segment_with_type") as mock_segment_factory,
-        patch("core.workflow.nodes.trigger_webhook.node.FileVariable") as mock_file_variable,
+        patch("dify_graph.nodes.trigger_webhook.node.build_segment_with_type") as mock_segment_factory,
+        patch("dify_graph.nodes.trigger_webhook.node.FileVariable") as mock_file_variable,
     ):
         # Setup mocks for file
         mock_file_obj = Mock()
@@ -389,8 +389,8 @@ def test_webhook_node_different_file_types():
 
     with (
         patch("factories.file_factory.build_from_mapping") as mock_file_factory,
-        patch("core.workflow.nodes.trigger_webhook.node.build_segment_with_type") as mock_segment_factory,
-        patch("core.workflow.nodes.trigger_webhook.node.FileVariable") as mock_file_variable,
+        patch("dify_graph.nodes.trigger_webhook.node.build_segment_with_type") as mock_segment_factory,
+        patch("dify_graph.nodes.trigger_webhook.node.FileVariable") as mock_file_variable,
     ):
         # Setup mocks for all files
         mock_file_objs = [Mock() for _ in range(3)]
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 24d3740b99..a6548ffc27 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
@@ -3,21 +3,21 @@ from unittest.mock import patch
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.entities.graph_init_params import GraphInitParams
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from core.workflow.file import File, FileTransferMethod, FileType
-from core.workflow.nodes.trigger_webhook.entities import (
+from dify_graph.entities.graph_init_params import GraphInitParams
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.nodes.trigger_webhook.entities import (
     ContentType,
     Method,
     WebhookBodyParameter,
     WebhookData,
     WebhookParameter,
 )
-from core.workflow.nodes.trigger_webhook.node import TriggerWebhookNode
-from core.workflow.runtime.graph_runtime_state import GraphRuntimeState
-from core.workflow.runtime.variable_pool import VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables import FileVariable, StringVariable
+from dify_graph.nodes.trigger_webhook.node import TriggerWebhookNode
+from dify_graph.runtime.graph_runtime_state import GraphRuntimeState
+from dify_graph.runtime.variable_pool import VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables import FileVariable, StringVariable
 from models.enums import UserFrom
 from models.workflow import WorkflowType
 
diff --git a/api/tests/unit_tests/core/workflow/test_enums.py b/api/tests/unit_tests/core/workflow/test_enums.py
index 078ec5f6ab..e8ce6f60f7 100644
--- a/api/tests/unit_tests/core/workflow/test_enums.py
+++ b/api/tests/unit_tests/core/workflow/test_enums.py
@@ -1,6 +1,6 @@
 """Tests for workflow pause related enums and constants."""
 
-from core.workflow.enums import (
+from dify_graph.enums import (
     WorkflowExecutionStatus,
 )
 
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 93e7c9f68d..8023a0b594 100644
--- a/api/tests/unit_tests/core/workflow/test_system_variable.py
+++ b/api/tests/unit_tests/core/workflow/test_system_variable.py
@@ -4,9 +4,9 @@ from typing import Any
 import pytest
 from pydantic import ValidationError
 
-from core.workflow.file.enums import FileTransferMethod, FileType
-from core.workflow.file.models import File
-from core.workflow.system_variable import SystemVariable
+from dify_graph.file.enums import FileTransferMethod, FileType
+from dify_graph.file.models import File
+from dify_graph.system_variable import SystemVariable
 
 # Test data constants for SystemVariable serialization tests
 VALID_BASE_DATA: dict[str, Any] = {
diff --git a/api/tests/unit_tests/core/workflow/test_system_variable_read_only_view.py b/api/tests/unit_tests/core/workflow/test_system_variable_read_only_view.py
index 743fecaed0..b7a8f2551d 100644
--- a/api/tests/unit_tests/core/workflow/test_system_variable_read_only_view.py
+++ b/api/tests/unit_tests/core/workflow/test_system_variable_read_only_view.py
@@ -2,8 +2,8 @@ from typing import cast
 
 import pytest
 
-from core.workflow.file.models import File, FileTransferMethod, FileType
-from core.workflow.system_variable import SystemVariable, SystemVariableReadOnlyView
+from dify_graph.file.models import File, FileTransferMethod, FileType
+from dify_graph.system_variable import SystemVariable, SystemVariableReadOnlyView
 
 
 class TestSystemVariableReadOnlyView:
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 7f2b080498..0fa0d26114 100644
--- a/api/tests/unit_tests/core/workflow/test_variable_pool.py
+++ b/api/tests/unit_tests/core/workflow/test_variable_pool.py
@@ -3,12 +3,12 @@ from collections import defaultdict
 
 import pytest
 
-from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
-from core.workflow.file import File, FileTransferMethod, FileType
-from core.workflow.runtime import VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables import FileSegment, StringSegment
-from core.workflow.variables.segments import (
+from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.runtime import VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables import FileSegment, StringSegment
+from dify_graph.variables.segments import (
     ArrayAnySegment,
     ArrayFileSegment,
     ArrayNumberSegment,
@@ -19,7 +19,7 @@ from core.workflow.variables.segments import (
     NoneSegment,
     ObjectSegment,
 )
-from core.workflow.variables.variables import (
+from dify_graph.variables.variables import (
     ArrayNumberVariable,
     ArrayObjectVariable,
     ArrayStringVariable,
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 4a71692f1e..0aa6ec3f45 100644
--- a/api/tests/unit_tests/core/workflow/test_workflow_entry.py
+++ b/api/tests/unit_tests/core/workflow/test_workflow_entry.py
@@ -4,18 +4,18 @@ import pytest
 
 from configs import dify_config
 from core.helper.code_executor.code_executor import CodeLanguage
-from core.workflow.constants import (
+from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.constants import (
     CONVERSATION_VARIABLE_NODE_ID,
     ENVIRONMENT_VARIABLE_NODE_ID,
 )
-from core.workflow.file.enums import FileType
-from core.workflow.file.models import File, FileTransferMethod
-from core.workflow.nodes.code.code_node import CodeNode
-from core.workflow.nodes.code.limits import CodeNodeLimits
-from core.workflow.runtime import VariablePool
-from core.workflow.system_variable import SystemVariable
-from core.workflow.variables.variables import StringVariable
-from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.file.enums import FileType
+from dify_graph.file.models import File, FileTransferMethod
+from dify_graph.nodes.code.code_node import CodeNode
+from dify_graph.nodes.code.limits import CodeNodeLimits
+from dify_graph.runtime import VariablePool
+from dify_graph.system_variable import SystemVariable
+from dify_graph.variables.variables import StringVariable
 
 
 @pytest.fixture(autouse=True)
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 12b9bf5f14..3437e585e7 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
@@ -3,9 +3,9 @@
 from unittest.mock import MagicMock, patch
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.graph_engine.command_channels.redis_channel import RedisChannel
-from core.workflow.runtime import GraphRuntimeState, VariablePool
 from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.graph_engine.command_channels.redis_channel import RedisChannel
+from dify_graph.runtime import GraphRuntimeState, VariablePool
 from models.enums import UserFrom
 
 
diff --git a/api/tests/unit_tests/core/workflow/utils/test_condition.py b/api/tests/unit_tests/core/workflow/utils/test_condition.py
index efedf88726..324ad5f674 100644
--- a/api/tests/unit_tests/core/workflow/utils/test_condition.py
+++ b/api/tests/unit_tests/core/workflow/utils/test_condition.py
@@ -1,6 +1,6 @@
-from core.workflow.runtime import VariablePool
-from core.workflow.utils.condition.entities import Condition
-from core.workflow.utils.condition.processor import ConditionProcessor
+from dify_graph.runtime import VariablePool
+from dify_graph.utils.condition.entities import Condition
+from dify_graph.utils.condition.processor import ConditionProcessor
 
 
 def test_number_formatting():
diff --git a/api/tests/unit_tests/core/workflow/utils/test_variable_template_parser.py b/api/tests/unit_tests/core/workflow/utils/test_variable_template_parser.py
index 83867e22e4..40df9de7fa 100644
--- a/api/tests/unit_tests/core/workflow/utils/test_variable_template_parser.py
+++ b/api/tests/unit_tests/core/workflow/utils/test_variable_template_parser.py
@@ -1,7 +1,7 @@
 import dataclasses
 
-from core.workflow.nodes.base import variable_template_parser
-from core.workflow.nodes.base.entities import VariableSelector
+from dify_graph.nodes.base import variable_template_parser
+from dify_graph.nodes.base.entities import VariableSelector
 
 
 def test_extract_selectors_from_template():
diff --git a/api/tests/unit_tests/factories/test_variable_factory.py b/api/tests/unit_tests/factories/test_variable_factory.py
index 87d02cb187..ce6b9232ce 100644
--- a/api/tests/unit_tests/factories/test_variable_factory.py
+++ b/api/tests/unit_tests/factories/test_variable_factory.py
@@ -7,8 +7,8 @@ import pytest
 from hypothesis import HealthCheck, given, settings
 from hypothesis import strategies as st
 
-from core.workflow.file import File, FileTransferMethod, FileType
-from core.workflow.variables import (
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.variables import (
     ArrayNumberVariable,
     ArrayObjectVariable,
     ArrayStringVariable,
@@ -17,8 +17,8 @@ from core.workflow.variables import (
     SecretVariable,
     StringVariable,
 )
-from core.workflow.variables.exc import VariableError
-from core.workflow.variables.segments import (
+from dify_graph.variables.exc import VariableError
+from dify_graph.variables.segments import (
     ArrayAnySegment,
     ArrayFileSegment,
     ArrayNumberSegment,
@@ -33,7 +33,7 @@ from core.workflow.variables.segments import (
     Segment,
     StringSegment,
 )
-from core.workflow.variables.types import SegmentType
+from dify_graph.variables.types import SegmentType
 from factories import variable_factory
 from factories.variable_factory import TypeMismatchError, build_segment, build_segment_with_type
 
diff --git a/api/tests/unit_tests/libs/_human_input/support.py b/api/tests/unit_tests/libs/_human_input/support.py
index bd86c13a2c..3fff54f487 100644
--- a/api/tests/unit_tests/libs/_human_input/support.py
+++ b/api/tests/unit_tests/libs/_human_input/support.py
@@ -4,8 +4,8 @@ from dataclasses import dataclass, field
 from datetime import datetime, timedelta
 from typing import Any
 
-from core.workflow.nodes.human_input.entities import FormInput
-from core.workflow.nodes.human_input.enums import TimeoutUnit
+from dify_graph.nodes.human_input.entities import FormInput
+from dify_graph.nodes.human_input.enums import TimeoutUnit
 
 
 # Exceptions
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 15e7d41e85..82598c5c6d 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
@@ -6,11 +6,11 @@ from datetime import datetime, timedelta
 
 import pytest
 
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     FormInput,
     UserAction,
 )
-from core.workflow.nodes.human_input.enums import (
+from dify_graph.nodes.human_input.enums import (
     FormInputType,
     TimeoutUnit,
 )
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 962eeb9e11..5d14b5eb4e 100644
--- a/api/tests/unit_tests/libs/_human_input/test_models.py
+++ b/api/tests/unit_tests/libs/_human_input/test_models.py
@@ -6,11 +6,11 @@ from datetime import datetime, timedelta
 
 import pytest
 
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     FormInput,
     UserAction,
 )
-from core.workflow.nodes.human_input.enums import (
+from dify_graph.nodes.human_input.enums import (
     FormInputType,
     TimeoutUnit,
 )
diff --git a/api/tests/unit_tests/libs/test_cron_compatibility.py b/api/tests/unit_tests/libs/test_cron_compatibility.py
index 6f3a94f6dc..61103d7935 100644
--- a/api/tests/unit_tests/libs/test_cron_compatibility.py
+++ b/api/tests/unit_tests/libs/test_cron_compatibility.py
@@ -294,7 +294,7 @@ class TestFrontendBackendIntegration(unittest.TestCase):
 
     def test_schedule_service_integration(self):
         """Test integration with ScheduleService patterns."""
-        from core.workflow.nodes.trigger_schedule.entities import VisualConfig
+        from dify_graph.nodes.trigger_schedule.entities import VisualConfig
         from services.trigger.schedule_service import ScheduleService
 
         # Test enhanced syntax through visual config conversion
diff --git a/api/tests/unit_tests/models/test_app_models.py b/api/tests/unit_tests/models/test_app_models.py
index 8b96c62dc9..6c619dcf98 100644
--- a/api/tests/unit_tests/models/test_app_models.py
+++ b/api/tests/unit_tests/models/test_app_models.py
@@ -1204,7 +1204,7 @@ class TestConversationStatusCount:
     def test_status_count_batch_loading_implementation(self):
         """Test that status_count uses batch loading instead of N+1 queries."""
         # Arrange
-        from core.workflow.enums import WorkflowExecutionStatus
+        from dify_graph.enums import WorkflowExecutionStatus
 
         app_id = str(uuid4())
         conversation_id = str(uuid4())
@@ -1411,7 +1411,7 @@ class TestConversationStatusCount:
     def test_status_count_paused(self):
         """Test status_count includes paused workflow runs."""
         # Arrange
-        from core.workflow.enums import WorkflowExecutionStatus
+        from dify_graph.enums import WorkflowExecutionStatus
 
         app_id = str(uuid4())
         conversation_id = str(uuid4())
diff --git a/api/tests/unit_tests/models/test_conversation_variable.py b/api/tests/unit_tests/models/test_conversation_variable.py
index d44aa56488..7d7674da3c 100644
--- a/api/tests/unit_tests/models/test_conversation_variable.py
+++ b/api/tests/unit_tests/models/test_conversation_variable.py
@@ -1,6 +1,6 @@
 from uuid import uuid4
 
-from core.workflow.variables import SegmentType
+from dify_graph.variables import SegmentType
 from factories import variable_factory
 from models import ConversationVariable
 
diff --git a/api/tests/unit_tests/models/test_workflow.py b/api/tests/unit_tests/models/test_workflow.py
index 544693da34..f3b72aa128 100644
--- a/api/tests/unit_tests/models/test_workflow.py
+++ b/api/tests/unit_tests/models/test_workflow.py
@@ -4,10 +4,10 @@ from unittest import mock
 from uuid import uuid4
 
 from constants import HIDDEN_VALUE
-from core.workflow.file.enums import FileTransferMethod, FileType
-from core.workflow.file.models import File
-from core.workflow.variables import FloatVariable, IntegerVariable, SecretVariable, StringVariable
-from core.workflow.variables.segments import IntegerSegment, Segment
+from dify_graph.file.enums import FileTransferMethod, FileType
+from dify_graph.file.models import File
+from dify_graph.variables import FloatVariable, IntegerVariable, SecretVariable, StringVariable
+from dify_graph.variables.segments import IntegerSegment, Segment
 from factories.variable_factory import build_segment
 from models.workflow import Workflow, WorkflowDraftVariable, WorkflowNodeExecutionModel, is_system_variable_editable
 
diff --git a/api/tests/unit_tests/models/test_workflow_models.py b/api/tests/unit_tests/models/test_workflow_models.py
index 9907cf05c0..f66f0b657d 100644
--- a/api/tests/unit_tests/models/test_workflow_models.py
+++ b/api/tests/unit_tests/models/test_workflow_models.py
@@ -14,7 +14,7 @@ from uuid import uuid4
 
 import pytest
 
-from core.workflow.enums import (
+from dify_graph.enums import (
     NodeType,
     WorkflowExecutionStatus,
     WorkflowNodeExecutionStatus,
diff --git a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
index 4b5b3b318c..3707ed90be 100644
--- a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
+++ b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
@@ -6,9 +6,9 @@ from unittest.mock import Mock, patch
 
 import pytest
 
-from core.workflow.entities.pause_reason import HumanInputRequired, PauseReasonType
-from core.workflow.nodes.human_input.entities import FormDefinition, FormInput, UserAction
-from core.workflow.nodes.human_input.enums import FormInputType, HumanInputFormStatus
+from dify_graph.entities.pause_reason import HumanInputRequired, PauseReasonType
+from dify_graph.nodes.human_input.entities import FormDefinition, FormInput, UserAction
+from dify_graph.nodes.human_input.enums import FormInputType, HumanInputFormStatus
 from models.human_input import BackstageRecipientPayload, HumanInputForm, HumanInputFormRecipient, RecipientType
 from models.workflow import WorkflowPause as WorkflowPauseModel
 from models.workflow import WorkflowPauseReason
diff --git a/api/tests/unit_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py b/api/tests/unit_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
index f5428b46ff..8daf91c538 100644
--- a/api/tests/unit_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
+++ b/api/tests/unit_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
@@ -6,11 +6,11 @@ from datetime import UTC, datetime, timedelta
 
 from core.entities.execution_extra_content import HumanInputContent as HumanInputContentDomain
 from core.entities.execution_extra_content import HumanInputFormSubmissionData
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     FormDefinition,
     UserAction,
 )
-from core.workflow.nodes.human_input.enums import HumanInputFormStatus
+from dify_graph.nodes.human_input.enums import HumanInputFormStatus
 from models.execution_extra_content import HumanInputContent as HumanInputContentModel
 from models.human_input import ConsoleRecipientPayload, HumanInputForm, HumanInputFormRecipient, RecipientType
 from repositories.sqlalchemy_execution_extra_content_repository import SQLAlchemyExecutionExtraContentRepository
diff --git a/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py b/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py
index 5cba43714a..10a108d425 100644
--- a/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py
+++ b/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py
@@ -14,15 +14,15 @@ from sqlalchemy.orm import Session, sessionmaker
 
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
-from core.workflow.entities import (
+from dify_graph.entities import (
     WorkflowNodeExecution,
 )
-from core.workflow.enums import (
+from dify_graph.enums import (
     NodeType,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
-from core.workflow.repositories.workflow_node_execution_repository import OrderConfig
+from dify_graph.repositories.workflow_node_execution_repository import OrderConfig
 from models.account import Account, Tenant
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom
 
diff --git a/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_workflow_node_execution_repository.py b/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_workflow_node_execution_repository.py
index 5539856083..95a7751273 100644
--- a/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_workflow_node_execution_repository.py
+++ b/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_workflow_node_execution_repository.py
@@ -11,8 +11,8 @@ from sqlalchemy.orm import sessionmaker
 from core.repositories.sqlalchemy_workflow_node_execution_repository import (
     SQLAlchemyWorkflowNodeExecutionRepository,
 )
-from core.workflow.entities.workflow_node_execution import WorkflowNodeExecution
-from core.workflow.enums import NodeType
+from dify_graph.entities.workflow_node_execution import WorkflowNodeExecution
+from dify_graph.enums import NodeType
 from models import Account, WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom
 
 
diff --git a/api/tests/unit_tests/services/external_dataset_service.py b/api/tests/unit_tests/services/external_dataset_service.py
index 57364142ad..afc3b29fca 100644
--- a/api/tests/unit_tests/services/external_dataset_service.py
+++ b/api/tests/unit_tests/services/external_dataset_service.py
@@ -545,7 +545,7 @@ class TestExternalDatasetServiceProcessExternalApi:
             params={},
         )
 
-        from core.workflow.nodes.http_request.exc import InvalidHttpMethodError
+        from dify_graph.nodes.http_request.exc import InvalidHttpMethodError
 
         with pytest.raises(InvalidHttpMethodError):
             ExternalDatasetService.process_external_api(settings, files=None)
diff --git a/api/tests/unit_tests/services/test_human_input_delivery_test_service.py b/api/tests/unit_tests/services/test_human_input_delivery_test_service.py
index e0d6ad1b39..e64d3c5406 100644
--- a/api/tests/unit_tests/services/test_human_input_delivery_test_service.py
+++ b/api/tests/unit_tests/services/test_human_input_delivery_test_service.py
@@ -2,13 +2,13 @@ from types import SimpleNamespace
 
 import pytest
 
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     EmailDeliveryConfig,
     EmailDeliveryMethod,
     EmailRecipients,
     ExternalRecipient,
 )
-from core.workflow.runtime import VariablePool
+from dify_graph.runtime import VariablePool
 from services import human_input_delivery_test_service as service_module
 from services.human_input_delivery_test_service import (
     DeliveryTestContext,
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 5800d029ca..a4c6c50593 100644
--- a/api/tests/unit_tests/services/test_human_input_service.py
+++ b/api/tests/unit_tests/services/test_human_input_service.py
@@ -9,12 +9,12 @@ from core.repositories.human_input_repository import (
     HumanInputFormRecord,
     HumanInputFormSubmissionRepository,
 )
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.nodes.human_input.entities import (
     FormDefinition,
     FormInput,
     UserAction,
 )
-from core.workflow.nodes.human_input.enums import FormInputType, HumanInputFormKind, HumanInputFormStatus
+from dify_graph.nodes.human_input.enums import FormInputType, HumanInputFormKind, HumanInputFormStatus
 from models.human_input import RecipientType
 from services.human_input_service import Form, FormExpiredError, HumanInputService, InvalidFormDataError
 
diff --git a/api/tests/unit_tests/services/test_schedule_service.py b/api/tests/unit_tests/services/test_schedule_service.py
index e28965ea2c..5e3dd157e6 100644
--- a/api/tests/unit_tests/services/test_schedule_service.py
+++ b/api/tests/unit_tests/services/test_schedule_service.py
@@ -5,8 +5,8 @@ from unittest.mock import MagicMock, Mock, patch
 import pytest
 from sqlalchemy.orm import Session
 
-from core.workflow.nodes.trigger_schedule.entities import ScheduleConfig, SchedulePlanUpdate, VisualConfig
-from core.workflow.nodes.trigger_schedule.exc import ScheduleConfigError
+from dify_graph.nodes.trigger_schedule.entities import ScheduleConfig, SchedulePlanUpdate, VisualConfig
+from dify_graph.nodes.trigger_schedule.exc import ScheduleConfigError
 from events.event_handlers.sync_workflow_schedule_when_app_published import (
     sync_schedule_from_workflow,
 )
@@ -136,7 +136,7 @@ class TestScheduleService(unittest.TestCase):
 
     def test_update_schedule_not_found(self):
         """Test updating a non-existent schedule raises exception."""
-        from core.workflow.nodes.trigger_schedule.exc import ScheduleNotFoundError
+        from dify_graph.nodes.trigger_schedule.exc import ScheduleNotFoundError
 
         mock_session = MagicMock(spec=Session)
         mock_session.get.return_value = None
@@ -172,7 +172,7 @@ class TestScheduleService(unittest.TestCase):
 
     def test_delete_schedule_not_found(self):
         """Test deleting a non-existent schedule raises exception."""
-        from core.workflow.nodes.trigger_schedule.exc import ScheduleNotFoundError
+        from dify_graph.nodes.trigger_schedule.exc import ScheduleNotFoundError
 
         mock_session = MagicMock(spec=Session)
         mock_session.get.return_value = None
diff --git a/api/tests/unit_tests/services/test_variable_truncator.py b/api/tests/unit_tests/services/test_variable_truncator.py
index 8199d586da..c703ab64d0 100644
--- a/api/tests/unit_tests/services/test_variable_truncator.py
+++ b/api/tests/unit_tests/services/test_variable_truncator.py
@@ -17,9 +17,9 @@ from uuid import uuid4
 
 import pytest
 
-from core.workflow.file.enums import FileTransferMethod, FileType
-from core.workflow.file.models import File
-from core.workflow.variables.segments import (
+from dify_graph.file.enums import FileTransferMethod, FileType
+from dify_graph.file.models import File
+from dify_graph.variables.segments import (
     ArrayFileSegment,
     ArrayNumberSegment,
     ArraySegment,
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 1f92ff590c..27664c7e29 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
@@ -16,7 +16,7 @@ import pytest
 from sqlalchemy import Engine
 from sqlalchemy.orm import Session, sessionmaker
 
-from core.workflow.enums import WorkflowExecutionStatus
+from dify_graph.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 3a4f2d392a..8820a1acc0 100644
--- a/api/tests/unit_tests/services/test_workflow_service.py
+++ b/api/tests/unit_tests/services/test_workflow_service.py
@@ -14,8 +14,8 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from core.workflow.enums import NodeType
-from core.workflow.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
+from dify_graph.enums import NodeType
+from dify_graph.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
 from libs.datetime_utils import naive_utc_now
 from models.model import App, AppMode
 from models.workflow import Workflow, WorkflowType
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 83642fc209..1e0fdd788b 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
@@ -6,8 +6,8 @@ from unittest.mock import Mock, patch
 import pytest
 from sqlalchemy import Engine
 
-from core.workflow.variables.segments import ObjectSegment, StringSegment
-from core.workflow.variables.types import SegmentType
+from dify_graph.variables.segments import ObjectSegment, StringSegment
+from dify_graph.variables.types import SegmentType
 from models.model import UploadFile
 from models.workflow import WorkflowDraftVariable, WorkflowDraftVariableFile
 from services.workflow_draft_variable_service import DraftVarLoader
@@ -174,7 +174,7 @@ class TestDraftVarLoaderSimple:
             mock_storage.load.return_value = test_json_content.encode()
 
             with patch.object(WorkflowDraftVariable, "build_segment_with_type") as mock_build_segment:
-                from core.workflow.variables.segments import FloatSegment
+                from dify_graph.variables.segments import FloatSegment
 
                 mock_segment = FloatSegment(value=test_number)
                 mock_build_segment.return_value = mock_segment
@@ -224,7 +224,7 @@ class TestDraftVarLoaderSimple:
             mock_storage.load.return_value = test_json_content.encode()
 
             with patch.object(WorkflowDraftVariable, "build_segment_with_type") as mock_build_segment:
-                from core.workflow.variables.segments import ArrayAnySegment
+                from dify_graph.variables.segments import ArrayAnySegment
 
                 mock_segment = ArrayAnySegment(value=test_array)
                 mock_build_segment.return_value = mock_segment
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_converter.py b/api/tests/unit_tests/services/workflow/test_workflow_converter.py
index 8ccbfbb16e..fefd771546 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_converter.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_converter.py
@@ -17,7 +17,7 @@ from core.app.app_config.entities import (
 from core.helper import encrypter
 from core.model_runtime.entities.llm_entities import LLMMode
 from core.model_runtime.entities.message_entities import PromptMessageRole
-from core.workflow.variables.input_entities import VariableEntity, VariableEntityType
+from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
 from models.api_based_extension import APIBasedExtension, APIBasedExtensionPoint
 from models.model import AppMode
 from services.workflow.workflow_converter import WorkflowConverter
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 792257848f..4042e05565 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
@@ -7,10 +7,10 @@ import pytest
 from sqlalchemy import Engine
 from sqlalchemy.orm import Session
 
-from core.workflow.constants import SYSTEM_VARIABLE_NODE_ID
-from core.workflow.enums import NodeType
-from core.workflow.variables.segments import StringSegment
-from core.workflow.variables.types import SegmentType
+from dify_graph.constants import SYSTEM_VARIABLE_NODE_ID
+from dify_graph.enums import NodeType
+from dify_graph.variables.segments import StringSegment
+from dify_graph.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 844dab8976..6c1adba2b8 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
@@ -12,9 +12,9 @@ import pytest
 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 core.workflow.entities.pause_reason import HumanInputRequired
-from core.workflow.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-from core.workflow.runtime import GraphRuntimeState, VariablePool
+from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
+from dify_graph.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 5ac5ac8ad2..5d6fa4c137 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
@@ -5,8 +5,8 @@ from unittest.mock import MagicMock
 import pytest
 from sqlalchemy.orm import sessionmaker
 
-from core.workflow.enums import NodeType
-from core.workflow.nodes.human_input.entities import (
+from dify_graph.enums import NodeType
+from dify_graph.nodes.human_input.entities import (
     EmailDeliveryConfig,
     EmailDeliveryMethod,
     EmailRecipients,
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_service.py b/api/tests/unit_tests/services/workflow/test_workflow_service.py
index 015dac257e..83c1f8d9da 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_service.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_service.py
@@ -4,9 +4,9 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from core.workflow.enums import NodeType
-from core.workflow.nodes.human_input.entities import FormInput, HumanInputNodeData, UserAction
-from core.workflow.nodes.human_input.enums import FormInputType
+from dify_graph.enums import NodeType
+from dify_graph.nodes.human_input.entities import FormInput, HumanInputNodeData, UserAction
+from dify_graph.nodes.human_input.enums import FormInputType
 from models.model import App
 from models.workflow import Workflow
 from services import workflow_service as workflow_service_module
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 ee0699ba2d..6b07f88c41 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
@@ -6,7 +6,7 @@ from typing import Any
 
 import pytest
 
-from core.workflow.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
+from dify_graph.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from tasks import human_input_timeout_tasks as task_module
 
 
diff --git a/api/tests/unit_tests/tasks/test_workflow_node_execution_tasks.py b/api/tests/unit_tests/tasks/test_workflow_node_execution_tasks.py
index fd5f0713a4..54be8379d5 100644
--- a/api/tests/unit_tests/tasks/test_workflow_node_execution_tasks.py
+++ b/api/tests/unit_tests/tasks/test_workflow_node_execution_tasks.py
@@ -11,11 +11,11 @@
 
 # import pytest
 
-# from core.workflow.entities.workflow_node_execution import (
+# from dify_graph.entities.workflow_node_execution import (
 #     WorkflowNodeExecution,
 #     WorkflowNodeExecutionStatus,
 # )
-# from core.workflow.enums import NodeType
+# from dify_graph.enums import NodeType
 # from libs.datetime_utils import naive_utc_now
 # from models import WorkflowNodeExecutionModel
 # from models.enums import ExecutionOffLoadType

From e985e73bdc4ae5fc8c60fa080bac7222c101b0b0 Mon Sep 17 00:00:00 2001
From: wangxiaolei <fatelei@gmail.com>
Date: Mon, 2 Mar 2026 18:49:21 +0800
Subject: [PATCH 14/22] perf: optimize dataset api query speed (#32847)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 api/controllers/console/datasets/datasets.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.py
index a06b872846..92a6eede8a 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -53,7 +53,7 @@ from fields.dataset_fields import (
 from fields.document_fields import document_status_fields
 from libs.login import current_account_with_tenant, login_required
 from models import ApiToken, Dataset, Document, DocumentSegment, UploadFile
-from models.dataset import DatasetPermissionEnum
+from models.dataset import DatasetPermission, DatasetPermissionEnum
 from models.provider_ids import ModelProviderID
 from services.api_token_service import ApiTokenCache
 from services.dataset_service import DatasetPermissionService, DatasetService, DocumentService
@@ -323,6 +323,18 @@ class DatasetListApi(Resource):
             model_names.append(f"{embedding_model.model}:{embedding_model.provider.provider}")
 
         data = cast(list[dict[str, Any]], marshal(datasets, dataset_detail_fields))
+        dataset_ids = [item["id"] for item in data if item.get("permission") == "partial_members"]
+        partial_members_map: dict[str, list[str]] = {}
+        if dataset_ids:
+            permissions = db.session.execute(
+                select(DatasetPermission.dataset_id, DatasetPermission.account_id).where(
+                    DatasetPermission.dataset_id.in_(dataset_ids)
+                )
+            ).all()
+
+            for dataset_id, account_id in permissions:
+                partial_members_map.setdefault(dataset_id, []).append(account_id)
+
         for item in data:
             # convert embedding_model_provider to plugin standard format
             if item["indexing_technique"] == "high_quality" and item["embedding_model_provider"]:
@@ -336,8 +348,7 @@ class DatasetListApi(Resource):
                 item["embedding_available"] = True
 
             if item.get("permission") == "partial_members":
-                part_users_list = DatasetPermissionService.get_dataset_partial_member_list(item["id"])
-                item.update({"partial_member_list": part_users_list})
+                item.update({"partial_member_list": partial_members_map.get(item["id"], [])})
             else:
                 item.update({"partial_member_list": []})
 

From 4fd6b52808584b86f140f5c02ddced7460322764 Mon Sep 17 00:00:00 2001
From: -LAN- <laipz8200@outlook.com>
Date: Mon, 2 Mar 2026 20:15:32 +0800
Subject: [PATCH 15/22] refactor(api): move model_runtime into dify_graph
 (#32858)

---
 .github/CODEOWNERS                            |  2 +-
 api/.importlinter                             | 65 ++++---------------
 api/.ruff.toml                                |  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       |  2 +-
 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/rag_pipeline_workflow.py     |  2 +-
 api/controllers/console/explore/audio.py      |  2 +-
 api/controllers/console/explore/completion.py |  2 +-
 api/controllers/console/explore/message.py    |  2 +-
 api/controllers/console/explore/trial.py      |  2 +-
 api/controllers/console/explore/workflow.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/service_api/app/audio.py      |  2 +-
 api/controllers/service_api/app/completion.py |  2 +-
 api/controllers/service_api/app/workflow.py   |  2 +-
 .../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/workflow.py               |  2 +-
 api/core/agent/base_agent_runner.py           | 24 +++----
 api/core/agent/cot_agent_runner.py            | 14 ++--
 api/core/agent/cot_chat_agent_runner.py       |  8 +--
 api/core/agent/cot_completion_agent_runner.py |  4 +-
 api/core/agent/fc_agent_runner.py             | 12 ++--
 .../agent/output_parser/cot_output_parser.py  |  2 +-
 .../model_config/converter.py                 |  6 +-
 .../easy_ui_based_app/model_config/manager.py |  4 +-
 .../prompt_template/manager.py                |  2 +-
 api/core/app/app_config/entities.py           |  4 +-
 .../app/apps/advanced_chat/app_generator.py   |  2 +-
 .../advanced_chat/generate_task_pipeline.py   |  4 +-
 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   |  2 +-
 api/core/app/apps/base_app_runner.py          | 18 ++---
 api/core/app/apps/chat/app_generator.py       |  2 +-
 api/core/app/apps/chat/app_runner.py          |  2 +-
 api/core/app/apps/completion/app_generator.py |  2 +-
 api/core/app/apps/completion/app_runner.py    |  2 +-
 .../app/apps/pipeline/pipeline_generator.py   |  2 +-
 api/core/app/apps/workflow/app_generator.py   |  2 +-
 api/core/app/entities/app_invoke_entities.py  |  2 +-
 api/core/app/entities/queue_entities.py       |  2 +-
 api/core/app/entities/task_entities.py        |  2 +-
 .../hosting_moderation/hosting_moderation.py  |  2 +-
 api/core/app/llm/model_access.py              |  2 +-
 api/core/app/llm/quota.py                     |  2 +-
 .../based_generate_task_pipeline.py           |  2 +-
 .../easy_ui_based_generate_task_pipeline.py   | 12 ++--
 .../base/tts/app_generator_tts_publisher.py   |  4 +-
 api/core/datasource/entities/api_entities.py  |  2 +-
 api/core/entities/model_entities.py           |  6 +-
 api/core/entities/provider_configuration.py   |  8 +--
 api/core/entities/provider_entities.py        |  2 +-
 api/core/helper/moderation.py                 |  8 +--
 api/core/hosting_configuration.py             |  2 +-
 api/core/indexing_runner.py                   |  2 +-
 api/core/llm_generator/llm_generator.py       |  8 +--
 .../output_parser/structured_output.py        |  8 +--
 api/core/mcp/utils.py                         |  2 +-
 api/core/memory/token_buffer_memory.py        |  8 +--
 api/core/model_manager.py                     | 26 ++++----
 .../openai_moderation/openai_moderation.py    |  2 +-
 api/core/plugin/backwards_invocation/model.py | 24 +++----
 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           |  6 +-
 api/core/plugin/impl/base.py                  | 16 ++---
 api/core/plugin/impl/model.py                 | 12 ++--
 api/core/prompt/advanced_prompt_transform.py  | 14 ++--
 .../prompt/agent_history_prompt_transform.py  |  6 +-
 .../entities/advanced_prompt_entities.py      |  2 +-
 api/core/prompt/prompt_transform.py           |  4 +-
 api/core/prompt/simple_prompt_transform.py    | 10 +--
 api/core/prompt/utils/prompt_message_util.py  |  4 +-
 api/core/provider_manager.py                  |  6 +-
 .../data_post_processor.py                    |  4 +-
 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    | 18 ++---
 api/core/rag/rerank/rerank_model.py           |  4 +-
 api/core/rag/rerank/weight_rerank.py          |  2 +-
 api/core/rag/retrieval/dataset_retrieval.py   |  8 +--
 .../multi_dataset_function_call_router.py     |  4 +-
 .../router/multi_dataset_react_route.py       |  4 +-
 api/core/rag/splitter/fixed_text_splitter.py  |  2 +-
 ...hemy_workflow_node_execution_repository.py |  2 +-
 .../builtin_tool/providers/audio/tools/asr.py |  2 +-
 .../builtin_tool/providers/audio/tools/tts.py |  2 +-
 api/core/tools/builtin_tool/tool.py           |  4 +-
 api/core/tools/entities/api_entities.py       |  2 +-
 api/core/tools/mcp_tool/tool.py               |  2 +-
 api/core/tools/tool_manager.py                |  2 +-
 .../dataset_multi_retriever_tool.py           |  2 +-
 .../tools/utils/model_invocation_utils.py     | 12 ++--
 api/core/tools/workflow_as_tool/tool.py       |  2 +-
 api/core/workflow/node_factory.py             |  6 +-
 api/dify_graph/file/file_manager.py           |  4 +-
 api/dify_graph/file/models.py                 |  2 +-
 .../event_management/event_handlers.py        |  2 +-
 .../model_runtime/README.md                   |  0
 .../model_runtime/README_CN.md                |  0
 .../model_runtime/__init__.py                 |  0
 .../model_runtime/callbacks/__init__.py       |  0
 .../model_runtime/callbacks/base_callback.py  |  6 +-
 .../callbacks/logging_callback.py             |  8 +--
 .../model_runtime/entities/__init__.py        |  0
 .../model_runtime/entities/common_entities.py |  0
 .../model_runtime/entities/defaults.py        |  2 +-
 .../model_runtime/entities/llm_entities.py    |  4 +-
 .../entities/message_entities.py              |  0
 .../model_runtime/entities/model_entities.py  |  2 +-
 .../entities/provider_entities.py             |  4 +-
 .../model_runtime/entities/rerank_entities.py |  0
 .../entities/text_embedding_entities.py       |  2 +-
 .../model_runtime/errors/__init__.py          |  0
 .../model_runtime/errors/invoke.py            |  0
 .../model_runtime/errors/validate.py          |  0
 .../model_runtime/memory/__init__.py          |  0
 .../memory/prompt_message_memory.py           |  2 +-
 .../model_providers/__base/__init__.py        |  0
 .../model_providers/__base/ai_model.py        | 10 +--
 .../__base/large_language_model.py            | 12 ++--
 .../__base/moderation_model.py                |  4 +-
 .../model_providers/__base/rerank_model.py    |  6 +-
 .../__base/speech2text_model.py               |  4 +-
 .../__base/text_embedding_model.py            |  6 +-
 .../__base/tokenizers/gpt2_tokenizer.py       |  0
 .../model_providers/__base/tts_model.py       |  4 +-
 .../model_runtime/model_providers/__init__.py |  0
 .../model_providers/_position.yaml            |  0
 .../model_providers/model_provider_factory.py | 24 +++----
 .../schema_validators/__init__.py             |  0
 .../schema_validators/common_validator.py     |  2 +-
 .../model_credential_schema_validator.py      |  6 +-
 .../provider_credential_schema_validator.py   |  4 +-
 .../model_runtime/utils/__init__.py           |  0
 .../model_runtime/utils/encoders.py           |  0
 api/dify_graph/node_events/base.py            |  2 +-
 api/dify_graph/node_events/node.py            |  2 +-
 api/dify_graph/nodes/agent/agent_node.py      |  6 +-
 .../nodes/base/usage_tracking_mixin.py        |  2 +-
 .../nodes/iteration/iteration_node.py         |  2 +-
 .../knowledge_retrieval_node.py               |  4 +-
 api/dify_graph/nodes/llm/entities.py          |  2 +-
 api/dify_graph/nodes/llm/llm_utils.py         | 12 ++--
 api/dify_graph/nodes/llm/node.py              | 48 +++++++-------
 api/dify_graph/nodes/loop/loop_node.py        |  2 +-
 .../parameter_extractor_node.py               | 28 ++++----
 .../question_classifier_node.py               |  6 +-
 api/dify_graph/nodes/tool/tool_node.py        |  2 +-
 .../repositories/rag_retrieval_protocol.py    |  2 +-
 api/dify_graph/runtime/graph_runtime_state.py |  2 +-
 .../runtime/graph_runtime_state_protocol.py   |  2 +-
 api/dify_graph/runtime/read_only_wrappers.py  |  2 +-
 api/extensions/ext_sentry.py                  |  2 +-
 ...tore_workflow_node_execution_repository.py |  2 +-
 api/libs/helper.py                            |  2 +-
 api/services/app_dsl_service.py               |  2 +-
 api/services/app_service.py                   |  4 +-
 api/services/audio_service.py                 |  2 +-
 .../clear_free_plan_tenant_expired_logs.py    |  2 +-
 api/services/dataset_service.py               |  4 +-
 api/services/datasource_provider_service.py   |  2 +-
 .../entities/model_provider_entities.py       |  6 +-
 api/services/hit_testing_service.py           |  2 +-
 api/services/message_service.py               |  2 +-
 api/services/model_load_balancing_service.py  |  8 +--
 api/services/model_provider_service.py        |  4 +-
 .../rag_pipeline/rag_pipeline_dsl_service.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/vector_service.py                |  2 +-
 api/services/workflow/workflow_converter.py   |  4 +-
 api/services/workflow_service.py              |  4 +-
 .../batch_create_segment_to_index_task.py     |  2 +-
 .../model_runtime/__mock/plugin_model.py      | 21 ++++--
 .../workflow/nodes/__mock/model.py            |  4 +-
 .../workflow/nodes/test_llm.py                | 12 ++--
 .../nodes/test_parameter_extractor.py         |  2 +-
 .../layers/test_pause_state_persist_layer.py  |  2 +-
 .../services/test_dataset_service.py          |  2 +-
 .../test_dataset_service_update_dataset.py    |  2 +-
 .../services/test_model_provider_service.py   |  8 +--
 .../workflow/test_workflow_converter.py       |  2 +-
 .../workspace/test_load_balancing_config.py   |  4 +-
 .../controllers/service_api/app/test_audio.py |  2 +-
 .../service_api/app/test_completion.py        |  2 +-
 .../output_parser/test_cot_output_parser.py   |  2 +-
 .../features/file_upload/test_manager.py      |  2 +-
 .../chat/test_base_app_runner_multimodal.py   |  2 +-
 ...st_easy_ui_based_generate_task_pipeline.py |  4 +-
 .../__base/test_increase_tool_call.py         | 10 +--
 ...large_language_model_non_stream_parsing.py |  6 +-
 .../entities/test_llm_entities.py             |  2 +-
 .../core/plugin/test_plugin_runtime.py        | 16 ++---
 .../prompt/test_advanced_prompt_transform.py  | 10 +--
 .../test_agent_history_prompt_transform.py    |  6 +-
 .../core/prompt/test_prompt_message.py        |  2 +-
 .../core/prompt/test_prompt_transform.py      |  8 +--
 .../prompt/test_simple_prompt_transform.py    |  2 +-
 .../rag/embedding/test_embedding_service.py   |  8 +--
 .../core/rag/indexing/test_indexing_runner.py |  2 +-
 .../core/rag/rerank/test_reranker.py          |  2 +-
 .../unit_tests/core/test_model_manager.py     |  2 +-
 .../core/test_provider_configuration.py       |  6 +-
 .../unit_tests/core/test_provider_manager.py  |  2 +-
 .../entities/test_graph_runtime_state.py      |  2 +-
 .../graph_engine/layers/test_llm_quota.py     |  2 +-
 .../graph_engine/test_graph_state_snapshot.py |  4 +-
 .../test_human_input_pause_multi_branch.py    |  2 +-
 .../test_human_input_pause_single_branch.py   |  2 +-
 .../graph_engine/test_if_else_streaming.py    |  4 +-
 .../workflow/graph_engine/test_mock_nodes.py  |  2 +-
 ...rallel_human_input_pause_missing_finish.py |  4 +-
 .../test_pause_deferred_ready_nodes.py        |  4 +-
 .../test_knowledge_retrieval_node.py          |  2 +-
 .../core/workflow/nodes/llm/test_node.py      | 14 ++--
 .../core/workflow/nodes/llm/test_scenarios.py |  4 +-
 .../test_parameter_extractor_node.py          |  2 +-
 .../nodes/test_question_classifier_node.py    |  2 +-
 .../workflow/nodes/tool/test_tool_node.py     |  2 +-
 .../test_sqlalchemy_repository.py             |  2 +-
 .../services/document_service_validation.py   |  2 +-
 .../test_dataset_service_create_dataset.py    |  2 +-
 ...est_model_provider_service_sanitization.py |  6 +-
 .../workflow/test_workflow_converter.py       |  4 +-
 api/tests/unit_tests/tools/test_mcp_tool.py   |  2 +-
 .../test_structured_output_parser.py          |  6 +-
 253 files changed, 557 insertions(+), 589 deletions(-)
 rename api/{core => dify_graph}/model_runtime/README.md (100%)
 rename api/{core => dify_graph}/model_runtime/README_CN.md (100%)
 rename api/{core => dify_graph}/model_runtime/__init__.py (100%)
 rename api/{core => dify_graph}/model_runtime/callbacks/__init__.py (100%)
 rename api/{core => dify_graph}/model_runtime/callbacks/base_callback.py (94%)
 rename api/{core => dify_graph}/model_runtime/callbacks/logging_callback.py (94%)
 rename api/{core => dify_graph}/model_runtime/entities/__init__.py (100%)
 rename api/{core => dify_graph}/model_runtime/entities/common_entities.py (100%)
 rename api/{core => dify_graph}/model_runtime/entities/defaults.py (98%)
 rename api/{core => dify_graph}/model_runtime/entities/llm_entities.py (97%)
 rename api/{core => dify_graph}/model_runtime/entities/message_entities.py (100%)
 rename api/{core => dify_graph}/model_runtime/entities/model_entities.py (98%)
 rename api/{core => dify_graph}/model_runtime/entities/provider_entities.py (95%)
 rename api/{core => dify_graph}/model_runtime/entities/rerank_entities.py (100%)
 rename api/{core => dify_graph}/model_runtime/entities/text_embedding_entities.py (89%)
 rename api/{core => dify_graph}/model_runtime/errors/__init__.py (100%)
 rename api/{core => dify_graph}/model_runtime/errors/invoke.py (100%)
 rename api/{core => dify_graph}/model_runtime/errors/validate.py (100%)
 rename api/{core => dify_graph}/model_runtime/memory/__init__.py (100%)
 rename api/{core => dify_graph}/model_runtime/memory/prompt_message_memory.py (89%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__base/__init__.py (100%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__base/ai_model.py (97%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__base/large_language_model.py (98%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__base/moderation_model.py (89%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__base/rerank_model.py (92%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__base/speech2text_model.py (88%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__base/text_embedding_model.py (94%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py (100%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__base/tts_model.py (94%)
 rename api/{core => dify_graph}/model_runtime/model_providers/__init__.py (100%)
 rename api/{core => dify_graph}/model_runtime/model_providers/_position.yaml (100%)
 rename api/{core => dify_graph}/model_runtime/model_providers/model_provider_factory.py (93%)
 rename api/{core => dify_graph}/model_runtime/schema_validators/__init__.py (100%)
 rename api/{core => dify_graph}/model_runtime/schema_validators/common_validator.py (97%)
 rename api/{core => dify_graph}/model_runtime/schema_validators/model_credential_schema_validator.py (78%)
 rename api/{core => dify_graph}/model_runtime/schema_validators/provider_credential_schema_validator.py (79%)
 rename api/{core => dify_graph}/model_runtime/utils/__init__.py (100%)
 rename api/{core => dify_graph}/model_runtime/utils/encoders.py (100%)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bfb1c85436..1bb7d06232 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -36,7 +36,7 @@
 /api/core/workflow/graph/ @laipz8200 @QuantumGhost
 /api/core/workflow/graph_events/ @laipz8200 @QuantumGhost
 /api/core/workflow/node_events/ @laipz8200 @QuantumGhost
-/api/core/model_runtime/ @laipz8200 @QuantumGhost
+/api/dify_graph/model_runtime/ @laipz8200 @QuantumGhost
 
 # Backend - Workflow - Nodes (Agent, Iteration, Loop, LLM)
 /api/core/workflow/nodes/agent/ @Nov1c444
diff --git a/api/.importlinter b/api/.importlinter
index 0bba4fb1e0..ebf4ccfbe9 100644
--- a/api/.importlinter
+++ b/api/.importlinter
@@ -56,6 +56,8 @@ ignore_imports =
     dify_graph.nodes.llm.file_saver -> extensions.ext_database
     dify_graph.nodes.llm.node -> extensions.ext_database
     dify_graph.nodes.tool.tool_node -> extensions.ext_database
+    dify_graph.model_runtime.model_providers.__base.ai_model -> extensions.ext_redis
+    dify_graph.model_runtime.model_providers.model_provider_factory -> extensions.ext_redis
     # TODO(QuantumGhost): use DI to avoid depending on global DB.
     dify_graph.nodes.human_input.human_input_node -> extensions.ext_database
 
@@ -110,7 +112,7 @@ ignore_imports =
     dify_graph.nodes.iteration.iteration_node -> core.app.workflow.layers.llm_quota
     dify_graph.nodes.llm.llm_utils -> core.model_manager
     dify_graph.nodes.llm.protocols -> core.model_manager
-    dify_graph.nodes.llm.llm_utils -> core.model_runtime.model_providers.__base.large_language_model
+    dify_graph.nodes.llm.llm_utils -> dify_graph.model_runtime.model_providers.__base.large_language_model
     dify_graph.nodes.llm.node -> core.tools.signature
     dify_graph.nodes.tool.tool_node -> core.callback_handler.workflow_tool_callback_handler
     dify_graph.nodes.tool.tool_node -> core.tools.tool_engine
@@ -123,7 +125,7 @@ ignore_imports =
     dify_graph.nodes.knowledge_retrieval.knowledge_retrieval_node -> core.app.app_config.entities
     dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.advanced_prompt_transform
     dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.simple_prompt_transform
-    dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.model_runtime.model_providers.__base.large_language_model
+    dify_graph.nodes.parameter_extractor.parameter_extractor_node -> dify_graph.model_runtime.model_providers.__base.large_language_model
     dify_graph.nodes.question_classifier.question_classifier_node -> core.prompt.simple_prompt_transform
     dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.model_manager
     dify_graph.nodes.question_classifier.question_classifier_node -> core.model_manager
@@ -163,58 +165,13 @@ ignore_imports =
     dify_graph.nodes.llm.node -> models.model
     dify_graph.nodes.agent.agent_node -> services
     dify_graph.nodes.tool.tool_node -> services
-
-[importlinter:contract:model-runtime-no-internal-imports]
-name = Model Runtime Internal Imports
-type = forbidden
-source_modules =
-    core.model_runtime
-forbidden_modules =
-    configs
-    controllers
-    extensions
-    models
-    services
-    tasks
-    core.agent
-    core.app
-    core.base
-    core.callback_handler
-    core.datasource
-    core.db
-    core.entities
-    core.errors
-    core.extension
-    core.external_data_tool
-    core.file
-    core.helper
-    core.hosting_configuration
-    core.indexing_runner
-    core.llm_generator
-    core.logging
-    core.mcp
-    core.memory
-    core.model_manager
-    core.moderation
-    core.ops
-    core.plugin
-    core.prompt
-    core.provider_manager
-    core.rag
-    core.repositories
-    core.schemas
-    core.tools
-    core.trigger
-    core.variables
-    dify_graph
-ignore_imports =
-    core.model_runtime.model_providers.__base.ai_model -> configs
-    core.model_runtime.model_providers.__base.ai_model -> extensions.ext_redis
-    core.model_runtime.model_providers.__base.large_language_model -> configs
-    core.model_runtime.model_providers.__base.text_embedding_model -> core.entities.embedding_type
-    core.model_runtime.model_providers.model_provider_factory -> configs
-    core.model_runtime.model_providers.model_provider_factory -> extensions.ext_redis
-    core.model_runtime.model_providers.model_provider_factory -> models.provider_ids
+    dify_graph.model_runtime.model_providers.__base.ai_model -> configs
+    dify_graph.model_runtime.model_providers.__base.ai_model -> extensions.ext_redis
+    dify_graph.model_runtime.model_providers.__base.large_language_model -> configs
+    dify_graph.model_runtime.model_providers.__base.text_embedding_model -> core.entities.embedding_type
+    dify_graph.model_runtime.model_providers.model_provider_factory -> configs
+    dify_graph.model_runtime.model_providers.model_provider_factory -> extensions.ext_redis
+    dify_graph.model_runtime.model_providers.model_provider_factory -> models.provider_ids
 
 [importlinter:contract:rsc]
 name = RSC
diff --git a/api/.ruff.toml b/api/.ruff.toml
index 3301452ad9..b0947eb619 100644
--- a/api/.ruff.toml
+++ b/api/.ruff.toml
@@ -100,7 +100,7 @@ ignore = [
 "configs/*" = [
     "N802", # invalid-function-name
 ]
-"core/model_runtime/callbacks/base_callback.py" = ["T201"]
+"dify_graph/model_runtime/callbacks/base_callback.py" = ["T201"]
 "core/workflow/callbacks/workflow_logging_callback.py" = ["T201"]
 "libs/gmpy2_pkcs10aep_cipher.py" = [
     "N803", # invalid-argument-name
diff --git a/api/controllers/console/app/audio.py b/api/controllers/console/app/audio.py
index 941db325bf..2c5e8d29ee 100644
--- a/api/controllers/console/app/audio.py
+++ b/api/controllers/console/app/audio.py
@@ -22,7 +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 core.model_runtime.errors.invoke import InvokeError
+from dify_graph.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 2922121a54..4d7ddfea13 100644
--- a/api/controllers/console/app/completion.py
+++ b/api/controllers/console/app/completion.py
@@ -26,7 +26,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from core.helper.trace_id_helper import get_external_trace_id
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.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 1ac55b5e8d..af4ac450bb 100644
--- a/api/controllers/console/app/generator.py
+++ b/api/controllers/console/app/generator.py
@@ -18,7 +18,7 @@ from core.helper.code_executor.javascript.javascript_code_provider import Javasc
 from core.helper.code_executor.python3.python3_code_provider import Python3CodeProvider
 from core.llm_generator.entities import RuleCodeGeneratePayload, RuleGeneratePayload, RuleStructuredOutputPayload
 from core.llm_generator.llm_generator import LLMGenerator
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from extensions.ext_database import db
 from libs.login import current_account_with_tenant, login_required
 from models import App
diff --git a/api/controllers/console/app/message.py b/api/controllers/console/app/message.py
index 0bea777870..3beea2a385 100644
--- a/api/controllers/console/app/message.py
+++ b/api/controllers/console/app/message.py
@@ -24,7 +24,7 @@ from controllers.console.wraps import (
 )
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from extensions.ext_database import db
 from fields.raws import FilesContainedField
 from libs.helper import TimestampField, uuid_value
diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py
index 735616bb6b..9759e0815a 100644
--- a/api/controllers/console/app/workflow.py
+++ b/api/controllers/console/app/workflow.py
@@ -21,7 +21,6 @@ from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.workflow.app_generator import SKIP_PREPARE_USER_INPUTS_KEY
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.helper.trace_id_helper import get_external_trace_id
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.impl.exc import PluginInvokeError
 from core.trigger.debug.event_selectors import (
     TriggerDebugEvent,
@@ -32,6 +31,7 @@ from core.trigger.debug.event_selectors import (
 from dify_graph.enums import NodeType
 from dify_graph.file.models import File
 from dify_graph.graph_engine.manager import GraphEngineManager
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from factories import file_factory, variable_factory
diff --git a/api/controllers/console/auth/oauth_server.py b/api/controllers/console/auth/oauth_server.py
index 38ea5d2dae..6e59d4203c 100644
--- a/api/controllers/console/auth/oauth_server.py
+++ b/api/controllers/console/auth/oauth_server.py
@@ -8,7 +8,7 @@ from pydantic import BaseModel
 from werkzeug.exceptions import BadRequest, NotFound
 
 from controllers.console.wraps import account_initialization_required, setup_required
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.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 92a6eede8a..45def1ae62 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -25,12 +25,12 @@ from controllers.console.wraps import (
 )
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
 from core.indexing_runner import IndexingRunner
-from core.model_runtime.entities.model_entities import ModelType
 from core.provider_manager import ProviderManager
 from core.rag.datasource.vdb.vector_type import VectorType
 from core.rag.extractor.entity.datasource_type import DatasourceType
 from core.rag.extractor.entity.extract_setting import ExtractSetting, NotionInfo, WebsiteInfo
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from fields.app_fields import app_detail_kernel_fields, related_app_list
 from fields.dataset_fields import (
diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py
index bf097d374a..ee726bc470 100644
--- a/api/controllers/console/datasets/datasets_document.py
+++ b/api/controllers/console/datasets/datasets_document.py
@@ -24,11 +24,11 @@ from core.errors.error import (
 )
 from core.indexing_runner import IndexingRunner
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.plugin.impl.exc import PluginDaemonClientSideError
 from core.rag.extractor.entity.datasource_type import DatasourceType
 from core.rag.extractor.entity.extract_setting import ExtractSetting, NotionInfo, WebsiteInfo
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
 from extensions.ext_database import db
 from fields.dataset_fields import dataset_fields
 from fields.document_fields import (
diff --git a/api/controllers/console/datasets/datasets_segments.py b/api/controllers/console/datasets/datasets_segments.py
index 23a668112d..3fd0f3b712 100644
--- a/api/controllers/console/datasets/datasets_segments.py
+++ b/api/controllers/console/datasets/datasets_segments.py
@@ -26,7 +26,7 @@ from controllers.console.wraps import (
 )
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from fields.segment_fields import child_chunk_fields, segment_fields
diff --git a/api/controllers/console/datasets/hit_testing_base.py b/api/controllers/console/datasets/hit_testing_base.py
index db1a874437..99ff49d79d 100644
--- a/api/controllers/console/datasets/hit_testing_base.py
+++ b/api/controllers/console/datasets/hit_testing_base.py
@@ -19,7 +19,7 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from fields.hit_testing_fields import hit_testing_record_fields
 from libs.login import current_user
 from models.account import Account
diff --git a/api/controllers/console/datasets/rag_pipeline/datasource_auth.py b/api/controllers/console/datasets/rag_pipeline/datasource_auth.py
index 1a47e226e5..a4498005d8 100644
--- a/api/controllers/console/datasets/rag_pipeline/datasource_auth.py
+++ b/api/controllers/console/datasets/rag_pipeline/datasource_auth.py
@@ -9,9 +9,9 @@ from configs import dify_config
 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.model_runtime.errors.validate import CredentialsValidateFailedError
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.impl.oauth import OAuthHandler
+from dify_graph.model_runtime.errors.validate import CredentialsValidateFailedError
+from dify_graph.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_workflow.py b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
index 29b6b64b94..51cdcc0c7a 100644
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
@@ -33,7 +33,7 @@ from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpErr
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.pipeline.pipeline_generator import PipelineGenerator
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_database import db
 from factories import variable_factory
 from libs import helper
diff --git a/api/controllers/console/explore/audio.py b/api/controllers/console/explore/audio.py
index 0311db1584..ffb9e5bb6e 100644
--- a/api/controllers/console/explore/audio.py
+++ b/api/controllers/console/explore/audio.py
@@ -19,7 +19,7 @@ from controllers.console.app.error import (
 )
 from controllers.console.explore.wraps import InstalledAppResource
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.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 a6e5b2822a..fcd52d2818 100644
--- a/api/controllers/console/explore/completion.py
+++ b/api/controllers/console/explore/completion.py
@@ -24,7 +24,7 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from extensions.ext_database import db
 from libs import helper
 from libs.datetime_utils import naive_utc_now
diff --git a/api/controllers/console/explore/message.py b/api/controllers/console/explore/message.py
index 88487ac96f..53970dbd3b 100644
--- a/api/controllers/console/explore/message.py
+++ b/api/controllers/console/explore/message.py
@@ -21,7 +21,7 @@ from controllers.console.explore.error import (
 from controllers.console.explore.wraps import InstalledAppResource
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from fields.conversation_fields import ResultResponse
 from fields.message_fields import MessageInfiniteScrollPagination, MessageListItem, SuggestedQuestionsResponse
 from libs import helper
diff --git a/api/controllers/console/explore/trial.py b/api/controllers/console/explore/trial.py
index 7771436641..25bb8ed7fe 100644
--- a/api/controllers/console/explore/trial.py
+++ b/api/controllers/console/explore/trial.py
@@ -41,8 +41,8 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
-from core.model_runtime.errors.invoke import InvokeError
 from dify_graph.graph_engine.manager import GraphEngineManager
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from fields.app_fields import (
diff --git a/api/controllers/console/explore/workflow.py b/api/controllers/console/explore/workflow.py
index 7e48e43b42..7801cee473 100644
--- a/api/controllers/console/explore/workflow.py
+++ b/api/controllers/console/explore/workflow.py
@@ -21,8 +21,8 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
-from core.model_runtime.errors.invoke import InvokeError
 from dify_graph.graph_engine.manager import GraphEngineManager
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from extensions.ext_redis import redis_client
 from libs import helper
 from libs.login import current_account_with_tenant
diff --git a/api/controllers/console/workspace/agent_providers.py b/api/controllers/console/workspace/agent_providers.py
index 9527fe782e..e2b504751b 100644
--- a/api/controllers/console/workspace/agent_providers.py
+++ b/api/controllers/console/workspace/agent_providers.py
@@ -2,7 +2,7 @@ from flask_restx import Resource, fields
 
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, setup_required
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.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 1897cbdca7..538c5fb561 100644
--- a/api/controllers/console/workspace/endpoint.py
+++ b/api/controllers/console/workspace/endpoint.py
@@ -7,8 +7,8 @@ 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.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.impl.exc import PluginPermissionDeniedError
+from dify_graph.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 ccb60b1461..0a9e54de99 100644
--- a/api/controllers/console/workspace/load_balancing_config.py
+++ b/api/controllers/console/workspace/load_balancing_config.py
@@ -5,8 +5,8 @@ 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 core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.errors.validate import CredentialsValidateFailedError
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.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 7bada2fa12..db3b02ae94 100644
--- a/api/controllers/console/workspace/model_providers.py
+++ b/api/controllers/console/workspace/model_providers.py
@@ -7,9 +7,9 @@ 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 core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.errors.validate import CredentialsValidateFailedError
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.errors.validate import CredentialsValidateFailedError
+from dify_graph.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 583e3e3057..d7eceb656c 100644
--- a/api/controllers/console/workspace/models.py
+++ b/api/controllers/console/workspace/models.py
@@ -8,9 +8,9 @@ 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 core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.errors.validate import CredentialsValidateFailedError
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.errors.validate import CredentialsValidateFailedError
+from dify_graph.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 d1485bc1c0..2f06f72f29 100644
--- a/api/controllers/console/workspace/plugin.py
+++ b/api/controllers/console/workspace/plugin.py
@@ -12,8 +12,8 @@ from controllers.common.schema import register_enum_models, register_schema_mode
 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.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.impl.exc import PluginDaemonClientSideError
+from dify_graph.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 5bfa895849..b38f05795a 100644
--- a/api/controllers/console/workspace/tool_providers.py
+++ b/api/controllers/console/workspace/tool_providers.py
@@ -23,10 +23,10 @@ from core.entities.mcp_provider import MCPAuthentication, MCPConfiguration
 from core.mcp.auth.auth_flow import auth, handle_callback
 from core.mcp.error import MCPAuthError, MCPError, MCPRefreshTokenError
 from core.mcp.mcp_client import MCPClient
-from core.model_runtime.utils.encoders import jsonable_encoder
 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 dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_database import db
 from libs.helper import alphanumeric, uuid_value
 from libs.login import current_account_with_tenant, login_required
diff --git a/api/controllers/console/workspace/trigger_providers.py b/api/controllers/console/workspace/trigger_providers.py
index 6b642af613..ad78d2a623 100644
--- a/api/controllers/console/workspace/trigger_providers.py
+++ b/api/controllers/console/workspace/trigger_providers.py
@@ -10,11 +10,11 @@ from werkzeug.exceptions import BadRequest, Forbidden
 from configs import dify_config
 from controllers.common.schema import register_schema_models
 from controllers.web.error import NotFoundError
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.oauth import OAuthHandler
 from core.trigger.entities.entities import SubscriptionBuilderUpdater
 from core.trigger.trigger_manager import TriggerManager
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_database import db
 from libs.login import current_user, login_required
 from models.account import Account
diff --git a/api/controllers/inner_api/plugin/plugin.py b/api/controllers/inner_api/plugin/plugin.py
index da1b40f2bd..9b8b3950e6 100644
--- a/api/controllers/inner_api/plugin/plugin.py
+++ b/api/controllers/inner_api/plugin/plugin.py
@@ -4,7 +4,6 @@ from controllers.console.wraps import setup_required
 from controllers.inner_api import inner_api_ns
 from controllers.inner_api.plugin.wraps import get_user_tenant, plugin_data
 from controllers.inner_api.wraps import plugin_inner_api_only
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.backwards_invocation.app import PluginAppBackwardsInvocation
 from core.plugin.backwards_invocation.base import BaseBackwardsInvocationResponse
 from core.plugin.backwards_invocation.encrypt import PluginEncrypter
@@ -30,6 +29,7 @@ from core.plugin.entities.request import (
 )
 from core.tools.entities.tool_entities import ToolProviderType
 from dify_graph.file.helpers import get_signed_file_url_for_plugin
+from dify_graph.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/service_api/app/audio.py b/api/controllers/service_api/app/audio.py
index e383920460..38d292d0b9 100644
--- a/api/controllers/service_api/app/audio.py
+++ b/api/controllers/service_api/app/audio.py
@@ -21,7 +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 core.model_runtime.errors.invoke import InvokeError
+from dify_graph.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 9d8431f066..98f09c44a1 100644
--- a/api/controllers/service_api/app/completion.py
+++ b/api/controllers/service_api/app/completion.py
@@ -28,7 +28,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from core.helper.trace_id_helper import get_external_trace_id
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.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/workflow.py b/api/controllers/service_api/app/workflow.py
index f58295099f..b2148f4fa1 100644
--- a/api/controllers/service_api/app/workflow.py
+++ b/api/controllers/service_api/app/workflow.py
@@ -27,9 +27,9 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from core.helper.trace_id_helper import get_external_trace_id
-from core.model_runtime.errors.invoke import InvokeError
 from dify_graph.enums import WorkflowExecutionStatus
 from dify_graph.graph_engine.manager import GraphEngineManager
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from fields.workflow_app_log_fields import build_workflow_app_log_pagination_model
diff --git a/api/controllers/service_api/dataset/dataset.py b/api/controllers/service_api/dataset/dataset.py
index c06b81b775..83d07087ab 100644
--- a/api/controllers/service_api/dataset/dataset.py
+++ b/api/controllers/service_api/dataset/dataset.py
@@ -14,8 +14,8 @@ from controllers.service_api.wraps import (
     DatasetApiResource,
     cloud_edition_billing_rate_limit_check,
 )
-from core.model_runtime.entities.model_entities import ModelType
 from core.provider_manager import ProviderManager
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from fields.dataset_fields import dataset_detail_fields
 from fields.tag_fields import DataSetTag
 from libs.login import current_user
diff --git a/api/controllers/service_api/dataset/segment.py b/api/controllers/service_api/dataset/segment.py
index 4eb4fed29a..2e3b7fd85e 100644
--- a/api/controllers/service_api/dataset/segment.py
+++ b/api/controllers/service_api/dataset/segment.py
@@ -17,7 +17,7 @@ from controllers.service_api.wraps import (
 )
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from fields.segment_fields import child_chunk_fields, segment_fields
 from libs.login import current_account_with_tenant
diff --git a/api/controllers/service_api/workspace/models.py b/api/controllers/service_api/workspace/models.py
index fffcb47bd4..35aed40a59 100644
--- a/api/controllers/service_api/workspace/models.py
+++ b/api/controllers/service_api/workspace/models.py
@@ -3,7 +3,7 @@ from flask_restx import Resource
 
 from controllers.service_api import service_api_ns
 from controllers.service_api.wraps import validate_dataset_token
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.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 15828cc208..2b8f752668 100644
--- a/api/controllers/web/audio.py
+++ b/api/controllers/web/audio.py
@@ -20,7 +20,7 @@ from controllers.web.error import (
 )
 from controllers.web.wraps import WebApiResource
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.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 a97d745471..8634c1f43c 100644
--- a/api/controllers/web/completion.py
+++ b/api/controllers/web/completion.py
@@ -25,7 +25,7 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.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 80035ba818..bbae1ce266 100644
--- a/api/controllers/web/message.py
+++ b/api/controllers/web/message.py
@@ -20,7 +20,7 @@ from controllers.web.error import (
 from controllers.web.wraps import WebApiResource
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from fields.conversation_fields import ResultResponse
 from fields.message_fields import SuggestedQuestionsResponse, WebMessageInfiniteScrollPagination, WebMessageListItem
 from libs import helper
diff --git a/api/controllers/web/workflow.py b/api/controllers/web/workflow.py
index a4c1ba75eb..508d1a756a 100644
--- a/api/controllers/web/workflow.py
+++ b/api/controllers/web/workflow.py
@@ -22,8 +22,8 @@ from core.errors.error import (
     ProviderTokenNotInitError,
     QuotaExceededError,
 )
-from core.model_runtime.errors.invoke import InvokeError
 from dify_graph.graph_engine.manager import GraphEngineManager
+from dify_graph.model_runtime.errors.invoke import InvokeError
 from extensions.ext_redis import redis_client
 from libs import helper
 from models.model import App, AppMode, EndUser
diff --git a/api/core/agent/base_agent_runner.py b/api/core/agent/base_agent_runner.py
index 22e3843fec..4a8b5f3549 100644
--- a/api/core/agent/base_agent_runner.py
+++ b/api/core/agent/base_agent_runner.py
@@ -19,7 +19,15 @@ from core.callback_handler.agent_tool_callback_handler import DifyAgentCallbackH
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance
-from core.model_runtime.entities import (
+from core.prompt.utils.extract_thread_messages import extract_thread_messages
+from core.tools.__base.tool import Tool
+from core.tools.entities.tool_entities import (
+    ToolParameter,
+)
+from core.tools.tool_manager import ToolManager
+from core.tools.utils.dataset_retriever_tool import DatasetRetrieverTool
+from dify_graph.file import file_manager
+from dify_graph.model_runtime.entities import (
     AssistantPromptMessage,
     LLMUsage,
     PromptMessage,
@@ -29,17 +37,9 @@ from core.model_runtime.entities import (
     ToolPromptMessage,
     UserPromptMessage,
 )
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
-from core.model_runtime.entities.model_entities import ModelFeature
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.prompt.utils.extract_thread_messages import extract_thread_messages
-from core.tools.__base.tool import Tool
-from core.tools.entities.tool_entities import (
-    ToolParameter,
-)
-from core.tools.tool_manager import ToolManager
-from core.tools.utils.dataset_retriever_tool import DatasetRetrieverTool
-from dify_graph.file import file_manager
+from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
+from dify_graph.model_runtime.entities.model_entities import ModelFeature
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from extensions.ext_database import db
 from factories import file_factory
 from models.enums import CreatorUserRole
diff --git a/api/core/agent/cot_agent_runner.py b/api/core/agent/cot_agent_runner.py
index 511406afde..c6ecd5509b 100644
--- a/api/core/agent/cot_agent_runner.py
+++ b/api/core/agent/cot_agent_runner.py
@@ -9,19 +9,19 @@ from core.agent.entities import AgentScratchpadUnit
 from core.agent.output_parser.cot_output_parser import CotAgentOutputParser
 from core.app.apps.base_app_queue_manager import PublishFrom
 from core.app.entities.queue_entities import QueueAgentThoughtEvent, QueueMessageEndEvent, QueueMessageFileEvent
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from core.model_runtime.entities.message_entities import (
+from core.ops.ops_trace_manager import TraceQueueManager
+from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
+from core.tools.__base.tool import Tool
+from core.tools.entities.tool_entities import ToolInvokeMeta
+from core.tools.tool_engine import ToolEngine
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     PromptMessage,
     PromptMessageTool,
     ToolPromptMessage,
     UserPromptMessage,
 )
-from core.ops.ops_trace_manager import TraceQueueManager
-from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
-from core.tools.__base.tool import Tool
-from core.tools.entities.tool_entities import ToolInvokeMeta
-from core.tools.tool_engine import ToolEngine
 from dify_graph.nodes.agent.exc import AgentMaxIterationError
 from models.model import Message
 
diff --git a/api/core/agent/cot_chat_agent_runner.py b/api/core/agent/cot_chat_agent_runner.py
index b0a0b23fb5..89451a0498 100644
--- a/api/core/agent/cot_chat_agent_runner.py
+++ b/api/core/agent/cot_chat_agent_runner.py
@@ -1,16 +1,16 @@
 import json
 
 from core.agent.cot_agent_runner import CotAgentRunner
-from core.model_runtime.entities import (
+from dify_graph.file import file_manager
+from dify_graph.model_runtime.entities import (
     AssistantPromptMessage,
     PromptMessage,
     SystemPromptMessage,
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
-from core.model_runtime.utils.encoders import jsonable_encoder
-from dify_graph.file import file_manager
+from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 
 
 class CotChatAgentRunner(CotAgentRunner):
diff --git a/api/core/agent/cot_completion_agent_runner.py b/api/core/agent/cot_completion_agent_runner.py
index da9a001d84..3023b9bc4d 100644
--- a/api/core/agent/cot_completion_agent_runner.py
+++ b/api/core/agent/cot_completion_agent_runner.py
@@ -1,13 +1,13 @@
 import json
 
 from core.agent.cot_agent_runner import CotAgentRunner
-from core.model_runtime.entities.message_entities import (
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     PromptMessage,
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 
 
 class CotCompletionAgentRunner(CotAgentRunner):
diff --git a/api/core/agent/fc_agent_runner.py b/api/core/agent/fc_agent_runner.py
index 23650cc21e..3271fe319b 100644
--- a/api/core/agent/fc_agent_runner.py
+++ b/api/core/agent/fc_agent_runner.py
@@ -7,7 +7,11 @@ from typing import Any, Union
 from core.agent.base_agent_runner import BaseAgentRunner
 from core.app.apps.base_app_queue_manager import PublishFrom
 from core.app.entities.queue_entities import QueueAgentThoughtEvent, QueueMessageEndEvent, QueueMessageFileEvent
-from core.model_runtime.entities import (
+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 dify_graph.file import file_manager
+from dify_graph.model_runtime.entities import (
     AssistantPromptMessage,
     LLMResult,
     LLMResultChunk,
@@ -20,11 +24,7 @@ from core.model_runtime.entities import (
     ToolPromptMessage,
     UserPromptMessage,
 )
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
-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 dify_graph.file import file_manager
+from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
 from dify_graph.nodes.agent.exc import AgentMaxIterationError
 from models.model import Message
 
diff --git a/api/core/agent/output_parser/cot_output_parser.py b/api/core/agent/output_parser/cot_output_parser.py
index 7c8f09e6b9..82676f1ebd 100644
--- a/api/core/agent/output_parser/cot_output_parser.py
+++ b/api/core/agent/output_parser/cot_output_parser.py
@@ -4,7 +4,7 @@ from collections.abc import Generator
 from typing import Union
 
 from core.agent.entities import AgentScratchpadUnit
-from core.model_runtime.entities.llm_entities import LLMResultChunk
+from dify_graph.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 b816c8d7d0..558b6e69a0 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
@@ -4,10 +4,10 @@ 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.model_runtime.entities.llm_entities import LLMMode
-from core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.provider_manager import ProviderManager
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
+from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
+from dify_graph.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 c391a279b5..e4e750c735 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
@@ -2,9 +2,9 @@ from collections.abc import Mapping
 from typing import Any
 
 from core.app.app_config.entities import ModelConfigEntity
-from core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
-from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from core.provider_manager import ProviderManager
+from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
+from dify_graph.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 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 21614c010c..01b9601965 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
@@ -4,8 +4,8 @@ from core.app.app_config.entities import (
     AdvancedCompletionPromptTemplateEntity,
     PromptTemplateEntity,
 )
-from core.model_runtime.entities.message_entities import PromptMessageRole
 from core.prompt.simple_prompt_transform import ModelMode
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 from models.model import AppMode
 
 
diff --git a/api/core/app/app_config/entities.py b/api/core/app/app_config/entities.py
index b5de73dadd..f26351d93e 100644
--- a/api/core/app/app_config/entities.py
+++ b/api/core/app/app_config/entities.py
@@ -4,9 +4,9 @@ from typing import Any, Literal
 
 from pydantic import BaseModel, Field
 
-from core.model_runtime.entities.llm_entities import LLMMode
-from core.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.file import FileUploadConfig
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.variables.input_entities import VariableEntity as WorkflowVariableEntity
 from models.model import AppMode
 
diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py
index ccac77eeaa..05ae1a4d38 100644
--- a/api/core/app/apps/advanced_chat/app_generator.py
+++ b/api/core/app/apps/advanced_chat/app_generator.py
@@ -31,11 +31,11 @@ from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity,
 from core.app.entities.task_entities import ChatbotAppBlockingResponse, ChatbotAppStreamResponse
 from core.app.layers.pause_state_persist_layer import PauseStateLayerConfig, PauseStatePersistenceLayer
 from core.helper.trace_id_helper import extract_external_trace_id_from_args
-from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.ops.ops_trace_manager import TraceQueueManager
 from core.prompt.utils.get_thread_messages_length import get_thread_messages_length
 from core.repositories import DifyCoreRepositoryFactory
 from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
 from dify_graph.repositories.draft_variable_repository import (
     DraftVariableSaverFactory,
 )
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 c19a1e9c0d..f57a0d9b3b 100644
--- a/api/core/app/apps/advanced_chat/generate_task_pipeline.py
+++ b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
@@ -63,12 +63,12 @@ from core.app.entities.task_entities import (
 from core.app.task_pipeline.based_generate_task_pipeline import BasedGenerateTaskPipeline
 from core.app.task_pipeline.message_cycle_manager import MessageCycleManager
 from core.base.tts import AppGeneratorTTSPublisher, AudioTrunk
-from core.model_runtime.entities.llm_entities import LLMUsage
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.ops.ops_trace_manager import TraceQueueManager
 from core.repositories.human_input_repository import HumanInputFormRepositoryImpl
 from dify_graph.entities.pause_reason import HumanInputRequired
 from dify_graph.enums import WorkflowExecutionStatus
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.nodes import NodeType
 from dify_graph.repositories.draft_variable_repository import DraftVariableSaverFactory
 from dify_graph.runtime import GraphRuntimeState
diff --git a/api/core/app/apps/agent_chat/app_generator.py b/api/core/app/apps/agent_chat/app_generator.py
index 7bd3b8a56e..76a067d7b6 100644
--- a/api/core/app/apps/agent_chat/app_generator.py
+++ b/api/core/app/apps/agent_chat/app_generator.py
@@ -20,8 +20,8 @@ from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.apps.message_based_app_generator import MessageBasedAppGenerator
 from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager
 from core.app.entities.app_invoke_entities import AgentChatAppGenerateEntity, InvokeFrom
-from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.ops.ops_trace_manager import TraceQueueManager
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
 from extensions.ext_database import db
 from factories import file_factory
 from libs.flask_utils import preserve_flask_contexts
diff --git a/api/core/app/apps/agent_chat/app_runner.py b/api/core/app/apps/agent_chat/app_runner.py
index 7309113f27..a81da2e91c 100644
--- a/api/core/app/apps/agent_chat/app_runner.py
+++ b/api/core/app/apps/agent_chat/app_runner.py
@@ -14,10 +14,10 @@ from core.app.entities.app_invoke_entities import AgentChatAppGenerateEntity
 from core.app.entities.queue_entities import QueueAnnotationReplyEvent
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.llm_entities import LLMMode
-from core.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.moderation.base import ModerationError
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
+from dify_graph.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from extensions.ext_database import db
 from models.model import App, Conversation, Message
 
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 d1e2f16b6f..77950a832a 100644
--- a/api/core/app/apps/base_app_generate_response_converter.py
+++ b/api/core/app/apps/base_app_generate_response_converter.py
@@ -6,7 +6,7 @@ from typing import Any, Union
 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 core.model_runtime.errors.invoke import InvokeError
+from dify_graph.model_runtime.errors.invoke import InvokeError
 
 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 0223d8f9a7..88714f3837 100644
--- a/api/core/app/apps/base_app_runner.py
+++ b/api/core/app/apps/base_app_runner.py
@@ -24,21 +24,21 @@ from core.app.features.hosting_moderation.hosting_moderation import HostingModer
 from core.external_data_tool.external_data_fetch import ExternalDataFetch
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from core.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    ImagePromptMessageContent,
-    PromptMessage,
-    TextPromptMessageContent,
-)
-from core.model_runtime.entities.model_entities import ModelPropertyKey
-from core.model_runtime.errors.invoke import InvokeBadRequestError
 from core.moderation.input_moderation import InputModeration
 from core.prompt.advanced_prompt_transform import AdvancedPromptTransform
 from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
 from core.prompt.simple_prompt_transform import ModelMode, SimplePromptTransform
 from core.tools.tool_file_manager import ToolFileManager
 from dify_graph.file.enums import FileTransferMethod, FileType
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from dify_graph.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    ImagePromptMessageContent,
+    PromptMessage,
+    TextPromptMessageContent,
+)
+from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey
+from dify_graph.model_runtime.errors.invoke import InvokeBadRequestError
 from extensions.ext_database import db
 from models.enums import CreatorUserRole
 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 c1251d2feb..91cf54c774 100644
--- a/api/core/app/apps/chat/app_generator.py
+++ b/api/core/app/apps/chat/app_generator.py
@@ -19,8 +19,8 @@ from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.apps.message_based_app_generator import MessageBasedAppGenerator
 from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager
 from core.app.entities.app_invoke_entities import ChatAppGenerateEntity, InvokeFrom
-from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.ops.ops_trace_manager import TraceQueueManager
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
 from extensions.ext_database import db
 from factories import file_factory
 from models import Account
diff --git a/api/core/app/apps/chat/app_runner.py b/api/core/app/apps/chat/app_runner.py
index 5cf13fbb17..23546a47bb 100644
--- a/api/core/app/apps/chat/app_runner.py
+++ b/api/core/app/apps/chat/app_runner.py
@@ -13,10 +13,10 @@ from core.app.entities.queue_entities import QueueAnnotationReplyEvent
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent
 from core.moderation.base import ModerationError
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
 from dify_graph.file import File
+from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
 from extensions.ext_database import db
 from models.model import App, Conversation, Message
 
diff --git a/api/core/app/apps/completion/app_generator.py b/api/core/app/apps/completion/app_generator.py
index 843328f904..e8b0e4f179 100644
--- a/api/core/app/apps/completion/app_generator.py
+++ b/api/core/app/apps/completion/app_generator.py
@@ -19,8 +19,8 @@ from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.apps.message_based_app_generator import MessageBasedAppGenerator
 from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager
 from core.app.entities.app_invoke_entities import CompletionAppGenerateEntity, InvokeFrom
-from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.ops.ops_trace_manager import TraceQueueManager
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
 from extensions.ext_database import db
 from factories import file_factory
 from models import Account, App, EndUser, Message
diff --git a/api/core/app/apps/completion/app_runner.py b/api/core/app/apps/completion/app_runner.py
index 96bbe532f1..ac05172945 100644
--- a/api/core/app/apps/completion/app_runner.py
+++ b/api/core/app/apps/completion/app_runner.py
@@ -11,10 +11,10 @@ from core.app.entities.app_invoke_entities import (
 )
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent
 from core.moderation.base import ModerationError
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
 from dify_graph.file import File
+from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
 from extensions.ext_database import db
 from models.model import App, Message
 
diff --git a/api/core/app/apps/pipeline/pipeline_generator.py b/api/core/app/apps/pipeline/pipeline_generator.py
index 6be2d034b5..dcfc1415e8 100644
--- a/api/core/app/apps/pipeline/pipeline_generator.py
+++ b/api/core/app/apps/pipeline/pipeline_generator.py
@@ -33,9 +33,9 @@ from core.datasource.entities.datasource_entities import (
 )
 from core.datasource.online_drive.online_drive_plugin import OnlineDriveDatasourcePlugin
 from core.entities.knowledge_entities import PipelineDataset, PipelineDocument
-from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.rag.index_processor.constant.built_in_field import BuiltInField
 from core.repositories.factory import DifyCoreRepositoryFactory
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
 from dify_graph.repositories.draft_variable_repository import DraftVariableSaverFactory
 from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
 from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
diff --git a/api/core/app/apps/workflow/app_generator.py b/api/core/app/apps/workflow/app_generator.py
index 4eee00c999..32a7a3ccec 100644
--- a/api/core/app/apps/workflow/app_generator.py
+++ b/api/core/app/apps/workflow/app_generator.py
@@ -28,10 +28,10 @@ from core.app.entities.task_entities import WorkflowAppBlockingResponse, Workflo
 from core.app.layers.pause_state_persist_layer import PauseStateLayerConfig, PauseStatePersistenceLayer
 from core.db.session_factory import session_factory
 from core.helper.trace_id_helper import extract_external_trace_id_from_args
-from core.model_runtime.errors.invoke import InvokeAuthorizationError
 from core.ops.ops_trace_manager import TraceQueueManager
 from core.repositories import DifyCoreRepositoryFactory
 from dify_graph.graph_engine.layers.base import GraphEngineLayer
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
 from dify_graph.repositories.draft_variable_repository import DraftVariableSaverFactory
 from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
 from dify_graph.repositories.workflow_node_execution_repository import WorkflowNodeExecutionRepository
diff --git a/api/core/app/entities/app_invoke_entities.py b/api/core/app/entities/app_invoke_entities.py
index df906e5e54..7fe6e0c72c 100644
--- a/api/core/app/entities/app_invoke_entities.py
+++ b/api/core/app/entities/app_invoke_entities.py
@@ -7,8 +7,8 @@ from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validat
 from constants import UUID_NIL
 from core.app.app_config.entities import EasyUIBasedAppConfig, WorkflowUIBasedAppConfig
 from core.entities.provider_configuration import ProviderModelBundle
-from core.model_runtime.entities.model_entities import AIModelEntity
 from dify_graph.file import File, FileUploadConfig
+from dify_graph.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 de19b8e6d2..d42df0d1bf 100644
--- a/api/core/app/entities/queue_entities.py
+++ b/api/core/app/entities/queue_entities.py
@@ -5,12 +5,12 @@ from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
 from dify_graph.entities import AgentNodeStrategyInit
 from dify_graph.entities.pause_reason import PauseReason
 from dify_graph.entities.workflow_start_reason import WorkflowStartReason
 from dify_graph.enums import WorkflowNodeExecutionMetadataKey
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
 from dify_graph.nodes import NodeType
 
 
diff --git a/api/core/app/entities/task_entities.py b/api/core/app/entities/task_entities.py
index 1f3153fff4..b58dae0ff2 100644
--- a/api/core/app/entities/task_entities.py
+++ b/api/core/app/entities/task_entities.py
@@ -4,11 +4,11 @@ from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
 from dify_graph.entities import AgentNodeStrategyInit
 from dify_graph.entities.workflow_start_reason import WorkflowStartReason
 from dify_graph.enums import WorkflowExecutionStatus, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMUsage
 from dify_graph.nodes.human_input.entities import FormInput, UserAction
 
 
diff --git a/api/core/app/features/hosting_moderation/hosting_moderation.py b/api/core/app/features/hosting_moderation/hosting_moderation.py
index a5a5486581..5ed1fadc41 100644
--- a/api/core/app/features/hosting_moderation/hosting_moderation.py
+++ b/api/core/app/features/hosting_moderation/hosting_moderation.py
@@ -2,7 +2,7 @@ import logging
 
 from core.app.entities.app_invoke_entities import EasyUIBasedAppGenerateEntity
 from core.helper import moderation
-from core.model_runtime.entities.message_entities import PromptMessage
+from dify_graph.model_runtime.entities.message_entities import PromptMessage
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/app/llm/model_access.py b/api/core/app/llm/model_access.py
index dc28225b8e..a63ff39fa5 100644
--- a/api/core/app/llm/model_access.py
+++ b/api/core/app/llm/model_access.py
@@ -5,8 +5,8 @@ from typing import Any
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.errors.error import ProviderTokenNotInitError
 from core.model_manager import ModelInstance, ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 from core.provider_manager import ProviderManager
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from dify_graph.nodes.llm.entities import ModelConfig
 from dify_graph.nodes.llm.exc import LLMModeRequiredError, ModelNotExistError
 from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
diff --git a/api/core/app/llm/quota.py b/api/core/app/llm/quota.py
index 1c66c8c1ff..7aa3bf15ab 100644
--- a/api/core/app/llm/quota.py
+++ b/api/core/app/llm/quota.py
@@ -6,7 +6,7 @@ from core.entities.model_entities import ModelStatus
 from core.entities.provider_entities import ProviderQuotaType, QuotaUnit
 from core.errors.error import QuotaExceededError
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.llm_entities import LLMUsage
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from models.provider import Provider, ProviderType
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 26c7e60a4c..0d5e0acec6 100644
--- a/api/core/app/task_pipeline/based_generate_task_pipeline.py
+++ b/api/core/app/task_pipeline/based_generate_task_pipeline.py
@@ -16,8 +16,8 @@ from core.app.entities.task_entities import (
     PingStreamResponse,
 )
 from core.errors.error import QuotaExceededError
-from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from core.moderation.output_moderation import ModerationRule, OutputModeration
+from dify_graph.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 d7946d5478..1fa782eb6c 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
@@ -46,12 +46,6 @@ from core.app.task_pipeline.based_generate_task_pipeline import BasedGenerateTas
 from core.app.task_pipeline.message_cycle_manager import MessageCycleManager
 from core.base.tts import AppGeneratorTTSPublisher, AudioTrunk
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from core.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    TextPromptMessageContent,
-)
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.ops.entities.trace_entity import TraceTaskName
 from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
 from core.prompt.utils.prompt_message_util import PromptMessageUtil
@@ -59,6 +53,12 @@ from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from core.tools.signature import sign_tool_file
 from dify_graph.file import helpers as file_helpers
 from dify_graph.file.enums import FileTransferMethod
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from dify_graph.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    TextPromptMessageContent,
+)
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from events.message_event import message_was_created
 from extensions.ext_database import db
 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 f83aaa0006..beda515666 100644
--- a/api/core/base/tts/app_generator_tts_publisher.py
+++ b/api/core/base/tts/app_generator_tts_publisher.py
@@ -15,8 +15,8 @@ from core.app.entities.queue_entities import (
     WorkflowQueueMessage,
 )
 from core.model_manager import ModelInstance, ModelManager
-from core.model_runtime.entities.message_entities import TextPromptMessageContent
-from core.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.message_entities import TextPromptMessageContent
+from dify_graph.model_runtime.entities.model_entities import ModelType
 
 
 class AudioTrunk:
diff --git a/api/core/datasource/entities/api_entities.py b/api/core/datasource/entities/api_entities.py
index 1179537570..4c9ff64479 100644
--- a/api/core/datasource/entities/api_entities.py
+++ b/api/core/datasource/entities/api_entities.py
@@ -3,8 +3,8 @@ from typing import Literal, Optional
 from pydantic import BaseModel, Field, field_validator
 
 from core.datasource.entities.datasource_entities import DatasourceParameter
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.tools.entities.common_entities import I18nObject
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 
 
 class DatasourceApiEntity(BaseModel):
diff --git a/api/core/entities/model_entities.py b/api/core/entities/model_entities.py
index a123fb0321..3427fc54b1 100644
--- a/api/core/entities/model_entities.py
+++ b/api/core/entities/model_entities.py
@@ -3,9 +3,9 @@ from enum import StrEnum, auto
 
 from pydantic import BaseModel, ConfigDict
 
-from core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.model_entities import ModelType, ProviderModel
-from core.model_runtime.entities.provider_entities import ProviderEntity
+from dify_graph.model_runtime.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.model_entities import ModelType, ProviderModel
+from dify_graph.model_runtime.entities.provider_entities import ProviderEntity
 
 
 class ModelStatus(StrEnum):
diff --git a/api/core/entities/provider_configuration.py b/api/core/entities/provider_configuration.py
index 8a26b2e91b..9f8d06e322 100644
--- a/api/core/entities/provider_configuration.py
+++ b/api/core/entities/provider_configuration.py
@@ -19,15 +19,15 @@ from core.entities.provider_entities import (
 )
 from core.helper import encrypter
 from core.helper.model_provider_cache import ProviderCredentialsCache, ProviderCredentialsCacheType
-from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
-from core.model_runtime.entities.provider_entities import (
+from dify_graph.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
+from dify_graph.model_runtime.entities.provider_entities import (
     ConfigurateMethod,
     CredentialFormSchema,
     FormType,
     ProviderEntity,
 )
-from core.model_runtime.model_providers.__base.ai_model import AIModel
-from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from libs.datetime_utils import naive_utc_now
 from models.engine import db
 from models.provider import (
diff --git a/api/core/entities/provider_entities.py b/api/core/entities/provider_entities.py
index 0078ec7e4f..a830f227a9 100644
--- a/api/core/entities/provider_entities.py
+++ b/api/core/entities/provider_entities.py
@@ -11,8 +11,8 @@ from core.entities.parameter_entities import (
     ModelSelectorScope,
     ToolSelectorScope,
 )
-from core.model_runtime.entities.model_entities import ModelType
 from core.tools.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.model_entities import ModelType
 
 
 class ProviderQuotaType(StrEnum):
diff --git a/api/core/helper/moderation.py b/api/core/helper/moderation.py
index 86bac4119a..873f6a4093 100644
--- a/api/core/helper/moderation.py
+++ b/api/core/helper/moderation.py
@@ -4,10 +4,10 @@ from typing import cast
 
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.entities import DEFAULT_PLUGIN_ID
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.errors.invoke import InvokeBadRequestError
-from core.model_runtime.model_providers.__base.moderation_model import ModerationModel
-from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.errors.invoke import InvokeBadRequestError
+from dify_graph.model_runtime.model_providers.__base.moderation_model import ModerationModel
+from dify_graph.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from extensions.ext_hosting_provider import hosting_configuration
 from models.provider import ProviderType
 
diff --git a/api/core/hosting_configuration.py b/api/core/hosting_configuration.py
index 370e64e385..600a444357 100644
--- a/api/core/hosting_configuration.py
+++ b/api/core/hosting_configuration.py
@@ -4,7 +4,7 @@ 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 core.model_runtime.entities.model_entities import ModelType
+from dify_graph.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 4e3ad7bb75..7eebd9ec95 100644
--- a/api/core/indexing_runner.py
+++ b/api/core/indexing_runner.py
@@ -15,7 +15,6 @@ from configs import dify_config
 from core.entities.knowledge_entities import IndexingEstimate, PreviewDetail, QAPreviewDetail
 from core.errors.error import ProviderTokenNotInitError
 from core.model_manager import ModelInstance, ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.cleaner.clean_processor import CleanProcessor
 from core.rag.datasource.keyword.keyword_factory import Keyword
 from core.rag.docstore.dataset_docstore import DatasetDocumentStore
@@ -31,6 +30,7 @@ from core.rag.splitter.fixed_text_splitter import (
 )
 from core.rag.splitter.text_splitter import TextSplitter
 from core.tools.utils.web_reader_tool import get_image_upload_file_ids
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from extensions.ext_storage import storage
diff --git a/api/core/llm_generator/llm_generator.py b/api/core/llm_generator/llm_generator.py
index b16a42e390..6a09dbff35 100644
--- a/api/core/llm_generator/llm_generator.py
+++ b/api/core/llm_generator/llm_generator.py
@@ -23,15 +23,15 @@ from core.llm_generator.prompts import (
     WORKFLOW_RULE_CONFIG_PROMPT_GENERATE_TEMPLATE,
 )
 from core.model_manager import ModelManager
-from core.model_runtime.entities.llm_entities import LLMResult
-from core.model_runtime.entities.message_entities import PromptMessage, SystemPromptMessage, UserPromptMessage
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 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 core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey
+from dify_graph.model_runtime.entities.llm_entities import LLMResult
+from dify_graph.model_runtime.entities.message_entities import PromptMessage, SystemPromptMessage, UserPromptMessage
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from models import App, Message, WorkflowNodeExecutionModel
diff --git a/api/core/llm_generator/output_parser/structured_output.py b/api/core/llm_generator/output_parser/structured_output.py
index 686529c3ca..77ea1713ea 100644
--- a/api/core/llm_generator/output_parser/structured_output.py
+++ b/api/core/llm_generator/output_parser/structured_output.py
@@ -10,22 +10,22 @@ 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 core.model_runtime.callbacks.base_callback import Callback
-from core.model_runtime.entities.llm_entities import (
+from dify_graph.model_runtime.callbacks.base_callback import Callback
+from dify_graph.model_runtime.entities.llm_entities import (
     LLMResult,
     LLMResultChunk,
     LLMResultChunkDelta,
     LLMResultChunkWithStructuredOutput,
     LLMResultWithStructuredOutput,
 )
-from core.model_runtime.entities.message_entities import (
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     PromptMessage,
     PromptMessageTool,
     SystemPromptMessage,
     TextPromptMessageContent,
 )
-from core.model_runtime.entities.model_entities import AIModelEntity, ParameterRule
+from dify_graph.model_runtime.entities.model_entities import AIModelEntity, ParameterRule
 
 
 class ResponseFormat(StrEnum):
diff --git a/api/core/mcp/utils.py b/api/core/mcp/utils.py
index 84bef7b935..db9cb726d7 100644
--- a/api/core/mcp/utils.py
+++ b/api/core/mcp/utils.py
@@ -8,7 +8,7 @@ from httpx_sse import connect_sse
 
 from configs import dify_config
 from core.mcp.types import ErrorData, JSONRPCError
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.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 2e93681da0..1156a98af1 100644
--- a/api/core/memory/token_buffer_memory.py
+++ b/api/core/memory/token_buffer_memory.py
@@ -5,7 +5,9 @@ from sqlalchemy.orm import sessionmaker
 
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.model_manager import ModelInstance
-from core.model_runtime.entities import (
+from core.prompt.utils.extract_thread_messages import extract_thread_messages
+from dify_graph.file import file_manager
+from dify_graph.model_runtime.entities import (
     AssistantPromptMessage,
     ImagePromptMessageContent,
     PromptMessage,
@@ -13,9 +15,7 @@ from core.model_runtime.entities import (
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from core.model_runtime.entities.message_entities import PromptMessageContentUnionTypes
-from core.prompt.utils.extract_thread_messages import extract_thread_messages
-from dify_graph.file import file_manager
+from dify_graph.model_runtime.entities.message_entities import PromptMessageContentUnionTypes
 from extensions.ext_database import db
 from factories import file_factory
 from models.model import AppMode, Conversation, Message, MessageFile
diff --git a/api/core/model_manager.py b/api/core/model_manager.py
index 2b3a3be1b9..0f710a8fcf 100644
--- a/api/core/model_manager.py
+++ b/api/core/model_manager.py
@@ -7,20 +7,20 @@ 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.model_runtime.callbacks.base_callback import Callback
-from core.model_runtime.entities.llm_entities import LLMResult
-from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
-from core.model_runtime.entities.model_entities import ModelFeature, ModelType
-from core.model_runtime.entities.rerank_entities import RerankResult
-from core.model_runtime.entities.text_embedding_entities import EmbeddingResult
-from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeConnectionError, InvokeRateLimitError
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.model_runtime.model_providers.__base.moderation_model import ModerationModel
-from core.model_runtime.model_providers.__base.rerank_model import RerankModel
-from core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel
-from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
-from core.model_runtime.model_providers.__base.tts_model import TTSModel
 from core.provider_manager import ProviderManager
+from dify_graph.model_runtime.callbacks.base_callback import Callback
+from dify_graph.model_runtime.entities.llm_entities import LLMResult
+from dify_graph.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
+from dify_graph.model_runtime.entities.model_entities import ModelFeature, ModelType
+from dify_graph.model_runtime.entities.rerank_entities import RerankResult
+from dify_graph.model_runtime.entities.text_embedding_entities import EmbeddingResult
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeConnectionError, InvokeRateLimitError
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
+from dify_graph.model_runtime.model_providers.__base.moderation_model import ModerationModel
+from dify_graph.model_runtime.model_providers.__base.rerank_model import RerankModel
+from dify_graph.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel
+from dify_graph.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
+from dify_graph.model_runtime.model_providers.__base.tts_model import TTSModel
 from extensions.ext_redis import redis_client
 from models.provider import ProviderType
 from services.enterprise.plugin_manager_service import PluginCredentialType
diff --git a/api/core/moderation/openai_moderation/openai_moderation.py b/api/core/moderation/openai_moderation/openai_moderation.py
index 5cab4841f5..06676f5cf4 100644
--- a/api/core/moderation/openai_moderation/openai_moderation.py
+++ b/api/core/moderation/openai_moderation/openai_moderation.py
@@ -1,6 +1,6 @@
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 from core.moderation.base import Moderation, ModerationAction, ModerationInputsResult, ModerationOutputsResult
+from dify_graph.model_runtime.entities.model_entities import ModelType
 
 
 class OpenAIModeration(Moderation):
diff --git a/api/core/plugin/backwards_invocation/model.py b/api/core/plugin/backwards_invocation/model.py
index 4ecc22834d..11c9191bac 100644
--- a/api/core/plugin/backwards_invocation/model.py
+++ b/api/core/plugin/backwards_invocation/model.py
@@ -5,18 +5,6 @@ from collections.abc import Generator
 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
-from core.model_runtime.entities.llm_entities import (
-    LLMResult,
-    LLMResultChunk,
-    LLMResultChunkDelta,
-    LLMResultChunkWithStructuredOutput,
-    LLMResultWithStructuredOutput,
-)
-from core.model_runtime.entities.message_entities import (
-    PromptMessage,
-    SystemPromptMessage,
-    UserPromptMessage,
-)
 from core.plugin.backwards_invocation.base import BaseBackwardsInvocation
 from core.plugin.entities.request import (
     RequestInvokeLLM,
@@ -30,6 +18,18 @@ from core.plugin.entities.request import (
 )
 from core.tools.entities.tool_entities import ToolProviderType
 from core.tools.utils.model_invocation_utils import ModelInvocationUtils
+from dify_graph.model_runtime.entities.llm_entities import (
+    LLMResult,
+    LLMResultChunk,
+    LLMResultChunkDelta,
+    LLMResultChunkWithStructuredOutput,
+    LLMResultWithStructuredOutput,
+)
+from dify_graph.model_runtime.entities.message_entities import (
+    PromptMessage,
+    SystemPromptMessage,
+    UserPromptMessage,
+)
 from models.account import Tenant
 
 
diff --git a/api/core/plugin/entities/marketplace.py b/api/core/plugin/entities/marketplace.py
index cf1f7ff0dd..81e1e12c5f 100644
--- a/api/core/plugin/entities/marketplace.py
+++ b/api/core/plugin/entities/marketplace.py
@@ -1,10 +1,10 @@
 from pydantic import BaseModel, Field, computed_field, model_validator
 
-from core.model_runtime.entities.provider_entities import ProviderEntity
 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 dify_graph.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 9e1a9edf82..7a3780f7de 100644
--- a/api/core/plugin/entities/plugin.py
+++ b/api/core/plugin/entities/plugin.py
@@ -8,12 +8,12 @@ from pydantic import BaseModel, Field, field_validator, model_validator
 
 from core.agent.plugin_entities import AgentStrategyProviderEntity
 from core.datasource.entities.datasource_entities import DatasourceProviderEntity
-from core.model_runtime.entities.provider_entities import ProviderEntity
 from core.plugin.entities.base import BasePluginEntity
 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 dify_graph.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 6674228dc0..2dc540e6a8 100644
--- a/api/core/plugin/entities/plugin_daemon.py
+++ b/api/core/plugin/entities/plugin_daemon.py
@@ -10,14 +10,14 @@ from pydantic import BaseModel, ConfigDict, Field
 
 from core.agent.plugin_entities import AgentProviderEntityWithPlugin
 from core.datasource.entities.datasource_entities import DatasourceProviderEntityWithPlugin
-from core.model_runtime.entities.model_entities import AIModelEntity
-from core.model_runtime.entities.provider_entities import ProviderEntity
 from core.plugin.entities.base import BasePluginEntity
 from core.plugin.entities.parameters import PluginParameterOption
 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 dify_graph.model_runtime.entities.model_entities import AIModelEntity
+from dify_graph.model_runtime.entities.provider_entities import ProviderEntity
 
 T = TypeVar("T", bound=(BaseModel | dict | list | bool | str))
 
diff --git a/api/core/plugin/entities/request.py b/api/core/plugin/entities/request.py
index 0a1dc50bfa..c15e9b0385 100644
--- a/api/core/plugin/entities/request.py
+++ b/api/core/plugin/entities/request.py
@@ -7,7 +7,8 @@ from flask import Response
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from core.entities.provider_entities import BasicProviderConfig
-from core.model_runtime.entities.message_entities import (
+from core.plugin.utils.http_parser import deserialize_response
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     PromptMessage,
     PromptMessageRole,
@@ -16,8 +17,7 @@ from core.model_runtime.entities.message_entities import (
     ToolPromptMessage,
     UserPromptMessage,
 )
-from core.model_runtime.entities.model_entities import ModelType
-from core.plugin.utils.http_parser import deserialize_response
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from dify_graph.nodes.parameter_extractor.entities import (
     ModelConfig as ParameterExtractorModelConfig,
 )
diff --git a/api/core/plugin/impl/base.py b/api/core/plugin/impl/base.py
index 7a6a598a2f..737d204105 100644
--- a/api/core/plugin/impl/base.py
+++ b/api/core/plugin/impl/base.py
@@ -9,14 +9,6 @@ from pydantic import BaseModel
 from yarl import URL
 
 from configs import dify_config
-from core.model_runtime.errors.invoke import (
-    InvokeAuthorizationError,
-    InvokeBadRequestError,
-    InvokeConnectionError,
-    InvokeRateLimitError,
-    InvokeServerUnavailableError,
-)
-from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.plugin.endpoint.exc import EndpointSetupFailedError
 from core.plugin.entities.plugin_daemon import PluginDaemonBasicResponse, PluginDaemonError, PluginDaemonInnerError
 from core.plugin.impl.exc import (
@@ -35,6 +27,14 @@ from core.trigger.errors import (
     TriggerPluginInvokeError,
     TriggerProviderCredentialValidationError,
 )
+from dify_graph.model_runtime.errors.invoke import (
+    InvokeAuthorizationError,
+    InvokeBadRequestError,
+    InvokeConnectionError,
+    InvokeRateLimitError,
+    InvokeServerUnavailableError,
+)
+from dify_graph.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 5d70980967..49ee5d79cb 100644
--- a/api/core/plugin/impl/model.py
+++ b/api/core/plugin/impl/model.py
@@ -2,12 +2,6 @@ import binascii
 from collections.abc import Generator, Sequence
 from typing import IO
 
-from core.model_runtime.entities.llm_entities import LLMResultChunk
-from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
-from core.model_runtime.entities.model_entities import AIModelEntity
-from core.model_runtime.entities.rerank_entities import RerankResult
-from core.model_runtime.entities.text_embedding_entities import EmbeddingResult
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.entities.plugin_daemon import (
     PluginBasicBooleanResponse,
     PluginDaemonInnerError,
@@ -19,6 +13,12 @@ from core.plugin.entities.plugin_daemon import (
     PluginVoicesResponse,
 )
 from core.plugin.impl.base import BasePluginClient
+from dify_graph.model_runtime.entities.llm_entities import LLMResultChunk
+from dify_graph.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
+from dify_graph.model_runtime.entities.model_entities import AIModelEntity
+from dify_graph.model_runtime.entities.rerank_entities import RerankResult
+from dify_graph.model_runtime.entities.text_embedding_entities import EmbeddingResult
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 
 
 class PluginModelClient(BasePluginClient):
diff --git a/api/core/prompt/advanced_prompt_transform.py b/api/core/prompt/advanced_prompt_transform.py
index 1883538dad..ce9f7e64b2 100644
--- a/api/core/prompt/advanced_prompt_transform.py
+++ b/api/core/prompt/advanced_prompt_transform.py
@@ -5,7 +5,12 @@ from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEnti
 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.model_runtime.entities import (
+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 dify_graph.file import file_manager
+from dify_graph.file.models import File
+from dify_graph.model_runtime.entities import (
     AssistantPromptMessage,
     PromptMessage,
     PromptMessageRole,
@@ -13,12 +18,7 @@ from core.model_runtime.entities import (
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
-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 dify_graph.file import file_manager
-from dify_graph.file.models import File
+from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
 from dify_graph.runtime import VariablePool
 
 
diff --git a/api/core/prompt/agent_history_prompt_transform.py b/api/core/prompt/agent_history_prompt_transform.py
index c1ae47709f..d09a46bfde 100644
--- a/api/core/prompt/agent_history_prompt_transform.py
+++ b/api/core/prompt/agent_history_prompt_transform.py
@@ -4,13 +4,13 @@ from core.app.entities.app_invoke_entities import (
     ModelConfigWithCredentialsEntity,
 )
 from core.memory.token_buffer_memory import TokenBufferMemory
-from core.model_runtime.entities.message_entities import (
+from core.prompt.prompt_transform import PromptTransform
+from dify_graph.model_runtime.entities.message_entities import (
     PromptMessage,
     SystemPromptMessage,
     UserPromptMessage,
 )
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.prompt.prompt_transform import PromptTransform
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 
 
 class AgentHistoryPromptTransform(PromptTransform):
diff --git a/api/core/prompt/entities/advanced_prompt_entities.py b/api/core/prompt/entities/advanced_prompt_entities.py
index 7094633093..667f5ef099 100644
--- a/api/core/prompt/entities/advanced_prompt_entities.py
+++ b/api/core/prompt/entities/advanced_prompt_entities.py
@@ -2,7 +2,7 @@ from typing import Literal
 
 from pydantic import BaseModel
 
-from core.model_runtime.entities.message_entities import PromptMessageRole
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 
 
 class ChatModelMessage(BaseModel):
diff --git a/api/core/prompt/prompt_transform.py b/api/core/prompt/prompt_transform.py
index 22ef5809bb..951736831f 100644
--- a/api/core/prompt/prompt_transform.py
+++ b/api/core/prompt/prompt_transform.py
@@ -3,9 +3,9 @@ from typing import Any
 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.model_runtime.entities.message_entities import PromptMessage
-from core.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
+from dify_graph.model_runtime.entities.message_entities import PromptMessage
+from dify_graph.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 53981eb1e1..10c44349ae 100644
--- a/api/core/prompt/simple_prompt_transform.py
+++ b/api/core/prompt/simple_prompt_transform.py
@@ -7,7 +7,11 @@ from typing import TYPE_CHECKING, Any, 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.model_runtime.entities.message_entities import (
+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 dify_graph.file import file_manager
+from dify_graph.model_runtime.entities.message_entities import (
     ImagePromptMessageContent,
     PromptMessage,
     PromptMessageContentUnionTypes,
@@ -15,10 +19,6 @@ from core.model_runtime.entities.message_entities import (
     TextPromptMessageContent,
     UserPromptMessage,
 )
-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 dify_graph.file import file_manager
 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 0a7a467227..85a2201395 100644
--- a/api/core/prompt/utils/prompt_message_util.py
+++ b/api/core/prompt/utils/prompt_message_util.py
@@ -1,7 +1,8 @@
 from collections.abc import Sequence
 from typing import Any, cast
 
-from core.model_runtime.entities import (
+from core.prompt.simple_prompt_transform import ModelMode
+from dify_graph.model_runtime.entities import (
     AssistantPromptMessage,
     AudioPromptMessageContent,
     ImagePromptMessageContent,
@@ -10,7 +11,6 @@ from core.model_runtime.entities import (
     PromptMessageRole,
     TextPromptMessageContent,
 )
-from core.prompt.simple_prompt_transform import ModelMode
 
 
 class PromptMessageUtil:
diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py
index fdbfca4330..f82c3a846b 100644
--- a/api/core/provider_manager.py
+++ b/api/core/provider_manager.py
@@ -28,14 +28,14 @@ from core.entities.provider_entities import (
 from core.helper import encrypter
 from core.helper.model_provider_cache import ProviderCredentialsCache, ProviderCredentialsCacheType
 from core.helper.position_helper import is_filtered
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.entities.provider_entities import (
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.provider_entities import (
     ConfigurateMethod,
     CredentialFormSchema,
     FormType,
     ProviderEntity,
 )
-from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
+from dify_graph.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from extensions import ext_hosting_provider
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
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 bfa8781e9f..2b73ef5f26 100644
--- a/api/core/rag/data_post_processor/data_post_processor.py
+++ b/api/core/rag/data_post_processor/data_post_processor.py
@@ -1,6 +1,4 @@
 from core.model_manager import ModelInstance, ModelManager
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.errors.invoke import InvokeAuthorizationError
 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
@@ -8,6 +6,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 dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
 
 
 class DataPostProcessor:
diff --git a/api/core/rag/datasource/retrieval_service.py b/api/core/rag/datasource/retrieval_service.py
index 91c16ce079..e8a3a05e19 100644
--- a/api/core/rag/datasource/retrieval_service.py
+++ b/api/core/rag/datasource/retrieval_service.py
@@ -10,7 +10,6 @@ from sqlalchemy.orm import Session, load_only
 from configs import dify_config
 from core.db.session_factory import session_factory
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.data_post_processor.data_post_processor import DataPostProcessor
 from core.rag.datasource.keyword.keyword_factory import Keyword
 from core.rag.datasource.vdb.vector_factory import Vector
@@ -23,6 +22,7 @@ from core.rag.models.document import Document
 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 dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from models.dataset import (
     ChildChunk,
diff --git a/api/core/rag/datasource/vdb/vector_factory.py b/api/core/rag/datasource/vdb/vector_factory.py
index b9772b3c08..3225764693 100644
--- a/api/core/rag/datasource/vdb/vector_factory.py
+++ b/api/core/rag/datasource/vdb/vector_factory.py
@@ -8,13 +8,13 @@ from sqlalchemy import select
 
 from configs import dify_config
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.datasource.vdb.vector_base import BaseVector
 from core.rag.datasource.vdb.vector_type import VectorType
 from core.rag.embedding.cached_embedding import CacheEmbedding
 from core.rag.embedding.embedding_base import Embeddings
 from core.rag.index_processor.constant.doc_type import DocType
 from core.rag.models.document import Document
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from extensions.ext_storage import storage
diff --git a/api/core/rag/docstore/dataset_docstore.py b/api/core/rag/docstore/dataset_docstore.py
index 69adac522d..16a5588024 100644
--- a/api/core/rag/docstore/dataset_docstore.py
+++ b/api/core/rag/docstore/dataset_docstore.py
@@ -6,8 +6,8 @@ from typing import Any
 from sqlalchemy import func, select
 
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.models.document import AttachmentDocument, Document
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 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 0efe19a57c..6d1b65a055 100644
--- a/api/core/rag/embedding/cached_embedding.py
+++ b/api/core/rag/embedding/cached_embedding.py
@@ -9,9 +9,9 @@ from sqlalchemy.exc import IntegrityError
 from configs import dify_config
 from core.entities.embedding_type import EmbeddingInputType
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.model_entities import ModelPropertyKey
-from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 from core.rag.embedding.embedding_base import Embeddings
+from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey
+from dify_graph.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from libs import helper
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 79265cf3ed..9c21dad488 100644
--- a/api/core/rag/index_processor/processor/paragraph_index_processor.py
+++ b/api/core/rag/index_processor/processor/paragraph_index_processor.py
@@ -12,15 +12,6 @@ from core.app.llm import deduct_llm_quota
 from core.entities.knowledge_entities import PreviewDetail
 from core.llm_generator.prompts import DEFAULT_GENERATOR_SUMMARY_PROMPT
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from core.model_runtime.entities.message_entities import (
-    ImagePromptMessageContent,
-    PromptMessage,
-    PromptMessageContentUnionTypes,
-    TextPromptMessageContent,
-    UserPromptMessage,
-)
-from core.model_runtime.entities.model_entities import ModelFeature, ModelType
 from core.provider_manager import ProviderManager
 from core.rag.cleaner.clean_processor import CleanProcessor
 from core.rag.datasource.keyword.keyword_factory import Keyword
@@ -36,6 +27,15 @@ from core.rag.models.document import AttachmentDocument, Document, MultimodalGen
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.tools.utils.text_processing_utils import remove_leading_symbols
 from dify_graph.file import File, FileTransferMethod, FileType, file_manager
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from dify_graph.model_runtime.entities.message_entities import (
+    ImagePromptMessageContent,
+    PromptMessage,
+    PromptMessageContentUnionTypes,
+    TextPromptMessageContent,
+    UserPromptMessage,
+)
+from dify_graph.model_runtime.entities.model_entities import ModelFeature, ModelType
 from extensions.ext_database import db
 from factories.file_factory import build_from_mapping
 from libs import helper
diff --git a/api/core/rag/rerank/rerank_model.py b/api/core/rag/rerank/rerank_model.py
index 690e780921..fcb14ffc52 100644
--- a/api/core/rag/rerank/rerank_model.py
+++ b/api/core/rag/rerank/rerank_model.py
@@ -1,12 +1,12 @@
 import base64
 
 from core.model_manager import ModelInstance, ModelManager
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.entities.rerank_entities import RerankResult
 from core.rag.index_processor.constant.doc_type import DocType
 from core.rag.index_processor.constant.query_type import QueryType
 from core.rag.models.document import Document
 from core.rag.rerank.rerank_base import BaseRerankRunner
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.rerank_entities import RerankResult
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from models.model import UploadFile
diff --git a/api/core/rag/rerank/weight_rerank.py b/api/core/rag/rerank/weight_rerank.py
index 18020608cb..7edd05d2d1 100644
--- a/api/core/rag/rerank/weight_rerank.py
+++ b/api/core/rag/rerank/weight_rerank.py
@@ -4,7 +4,6 @@ from collections import Counter
 import numpy as np
 
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.datasource.keyword.jieba.jieba_keyword_table_handler import JiebaKeywordTableHandler
 from core.rag.embedding.cached_embedding import CacheEmbedding
 from core.rag.index_processor.constant.doc_type import DocType
@@ -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 dify_graph.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 151dfe81b3..b56ff9edef 100644
--- a/api/core/rag/retrieval/dataset_retrieval.py
+++ b/api/core/rag/retrieval/dataset_retrieval.py
@@ -25,10 +25,6 @@ from core.entities.agent_entities import PlanningStrategy
 from core.entities.model_entities import ModelStatus
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance, ModelManager
-from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, PromptMessageTool
-from core.model_runtime.entities.model_entities import ModelFeature, ModelType
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.ops.entities.trace_entity import TraceTaskName
 from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
 from core.ops.utils import measure_time
@@ -61,6 +57,10 @@ from core.rag.retrieval.template_prompts import (
 from core.tools.signature import sign_upload_file
 from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
 from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from dify_graph.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, PromptMessageTool
+from dify_graph.model_runtime.entities.model_entities import ModelFeature, ModelType
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from dify_graph.nodes.knowledge_retrieval import exc
 from dify_graph.repositories.rag_retrieval_protocol import (
     KnowledgeRetrievalRequest,
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 5f3e1a8cae..23a2ac8386 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
@@ -2,8 +2,8 @@ from typing import Union
 
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from core.model_runtime.entities.message_entities import PromptMessageTool, SystemPromptMessage, UserPromptMessage
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from dify_graph.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 fa2007122d..ea110fa0a7 100644
--- a/api/core/rag/retrieval/router/multi_dataset_react_route.py
+++ b/api/core/rag/retrieval/router/multi_dataset_react_route.py
@@ -4,12 +4,12 @@ from typing import Union
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.app.llm import deduct_llm_quota
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, PromptMessageTool
 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 dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from dify_graph.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, PromptMessageTool
 
 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 b65cb14d8e..7a00e8a886 100644
--- a/api/core/rag/splitter/fixed_text_splitter.py
+++ b/api/core/rag/splitter/fixed_text_splitter.py
@@ -7,7 +7,6 @@ import re
 from typing import Any
 
 from core.model_manager import ModelInstance
-from core.model_runtime.model_providers.__base.tokenizers.gpt2_tokenizer import GPT2Tokenizer
 from core.rag.splitter.text_splitter import (
     TS,
     Collection,
@@ -16,6 +15,7 @@ from core.rag.splitter.text_splitter import (
     Set,
     Union,
 )
+from dify_graph.model_runtime.model_providers.__base.tokenizers.gpt2_tokenizer import GPT2Tokenizer
 
 
 class EnhanceRecursiveCharacterTextSplitter(RecursiveCharacterTextSplitter):
diff --git a/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py b/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
index 85ee9b5083..3fc333038d 100644
--- a/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
+++ b/api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
@@ -17,9 +17,9 @@ from sqlalchemy.orm import sessionmaker
 from tenacity import before_sleep_log, retry, retry_if_exception, stop_after_attempt
 
 from configs import dify_config
-from core.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.entities import WorkflowNodeExecution
 from dify_graph.enums import NodeType, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.repositories.workflow_node_execution_repository import OrderConfig, WorkflowNodeExecutionRepository
 from dify_graph.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from extensions.ext_storage import storage
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 b0552fd863..dacc49c746 100644
--- a/api/core/tools/builtin_tool/providers/audio/tools/asr.py
+++ b/api/core/tools/builtin_tool/providers/audio/tools/asr.py
@@ -3,13 +3,13 @@ from collections.abc import Generator
 from typing import Any
 
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 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 dify_graph.file.enums import FileType
 from dify_graph.file.file_manager import download
+from dify_graph.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 5009f7ac21..7818bff0ab 100644
--- a/api/core/tools/builtin_tool/providers/audio/tools/tts.py
+++ b/api/core/tools/builtin_tool/providers/audio/tools/tts.py
@@ -3,11 +3,11 @@ from collections.abc import Generator
 from typing import Any
 
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
 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 dify_graph.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 51b0407886..00f5931088 100644
--- a/api/core/tools/builtin_tool/tool.py
+++ b/api/core/tools/builtin_tool/tool.py
@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from core.model_runtime.entities.llm_entities import LLMResult
-from core.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 dify_graph.model_runtime.entities.llm_entities import LLMResult
+from dify_graph.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/entities/api_entities.py b/api/core/tools/entities/api_entities.py
index 218ffafd55..2545290b57 100644
--- a/api/core/tools/entities/api_entities.py
+++ b/api/core/tools/entities/api_entities.py
@@ -5,11 +5,11 @@ from typing import Any, Literal
 from pydantic import BaseModel, Field, field_validator
 
 from core.entities.mcp_provider import MCPAuthentication, MCPConfiguration
-from core.model_runtime.utils.encoders import jsonable_encoder
 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 dify_graph.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 1d439323f2..9025ff6ef1 100644
--- a/api/core/tools/mcp_tool/tool.py
+++ b/api/core/tools/mcp_tool/tool.py
@@ -17,11 +17,11 @@ from core.mcp.types import (
     TextContent,
     TextResourceContents,
 )
-from core.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
 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 dify_graph.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py
index 1bb9960e62..323bb0584a 100644
--- a/api/core/tools/tool_manager.py
+++ b/api/core/tools/tool_manager.py
@@ -37,7 +37,6 @@ 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
 from core.helper.position_helper import is_filtered
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.tools.__base.tool import Tool
 from core.tools.builtin_tool.provider import BuiltinToolProviderController
@@ -58,6 +57,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 dify_graph.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 20e10be075..3dbbbe6563 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
@@ -7,13 +7,13 @@ from sqlalchemy import select
 
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.datasource.retrieval_service import RetrievalService
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
 from core.rag.models.document import Document as RagDocument
 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 dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from models.dataset import Dataset, Document, DocumentSegment
 
diff --git a/api/core/tools/utils/model_invocation_utils.py b/api/core/tools/utils/model_invocation_utils.py
index e7fba09359..8f958563bd 100644
--- a/api/core/tools/utils/model_invocation_utils.py
+++ b/api/core/tools/utils/model_invocation_utils.py
@@ -9,18 +9,18 @@ from decimal import Decimal
 from typing import cast
 
 from core.model_manager import ModelManager
-from core.model_runtime.entities.llm_entities import LLMResult
-from core.model_runtime.entities.message_entities import PromptMessage
-from core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
-from core.model_runtime.errors.invoke import (
+from dify_graph.model_runtime.entities.llm_entities import LLMResult
+from dify_graph.model_runtime.entities.message_entities import PromptMessage
+from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
+from dify_graph.model_runtime.errors.invoke import (
     InvokeAuthorizationError,
     InvokeBadRequestError,
     InvokeConnectionError,
     InvokeRateLimitError,
     InvokeServerUnavailableError,
 )
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_database import db
 from models.tools import ToolModelInvoke
 
diff --git a/api/core/tools/workflow_as_tool/tool.py b/api/core/tools/workflow_as_tool/tool.py
index 6b1b48505b..9b9aa7a741 100644
--- a/api/core/tools/workflow_as_tool/tool.py
+++ b/api/core/tools/workflow_as_tool/tool.py
@@ -8,7 +8,6 @@ from typing import Any, cast
 from sqlalchemy import select
 
 from core.db.session_factory import session_factory
-from core.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
 from core.tools.__base.tool import Tool
 from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.entities.tool_entities import (
@@ -19,6 +18,7 @@ from core.tools.entities.tool_entities import (
 )
 from core.tools.errors import ToolInvokeError
 from dify_graph.file import FILE_MODEL_IDENTITY, File, FileTransferMethod
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
 from factories.file_factory import build_from_mapping
 from models import Account, Tenant
 from models.model import App, EndUser
diff --git a/api/core/workflow/node_factory.py b/api/core/workflow/node_factory.py
index 522e510755..3105ceb04b 100644
--- a/api/core/workflow/node_factory.py
+++ b/api/core/workflow/node_factory.py
@@ -15,9 +15,6 @@ from core.helper.code_executor.code_executor import (
 from core.helper.ssrf_proxy import ssrf_proxy
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.memory import PromptMessageMemory
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
 from core.rag.index_processor.index_processor import IndexProcessor
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
@@ -27,6 +24,9 @@ from dify_graph.entities.graph_config import NodeConfigDict
 from dify_graph.enums import NodeType, SystemVariableKey
 from dify_graph.file.file_manager import file_manager
 from dify_graph.graph.graph import NodeFactory
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.memory import PromptMessageMemory
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from dify_graph.nodes.base.node import Node
 from dify_graph.nodes.code.code_node import CodeNode, WorkflowCodeExecutor
 from dify_graph.nodes.code.entities import CodeLanguage
diff --git a/api/dify_graph/file/file_manager.py b/api/dify_graph/file/file_manager.py
index a7719400d9..8d998054db 100644
--- a/api/dify_graph/file/file_manager.py
+++ b/api/dify_graph/file/file_manager.py
@@ -3,14 +3,14 @@ from __future__ import annotations
 import base64
 from collections.abc import Mapping
 
-from core.model_runtime.entities import (
+from dify_graph.model_runtime.entities import (
     AudioPromptMessageContent,
     DocumentPromptMessageContent,
     ImagePromptMessageContent,
     TextPromptMessageContent,
     VideoPromptMessageContent,
 )
-from core.model_runtime.entities.message_entities import PromptMessageContentUnionTypes
+from dify_graph.model_runtime.entities.message_entities import PromptMessageContentUnionTypes
 
 from . import helpers
 from .enums import FileAttribute
diff --git a/api/dify_graph/file/models.py b/api/dify_graph/file/models.py
index cd7d3edde8..db12d4f57a 100644
--- a/api/dify_graph/file/models.py
+++ b/api/dify_graph/file/models.py
@@ -5,7 +5,7 @@ from typing import Any
 
 from pydantic import BaseModel, Field, model_validator
 
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent
+from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
 
 from . import helpers
 from .constants import FILE_MODEL_IDENTITY
diff --git a/api/dify_graph/graph_engine/event_management/event_handlers.py b/api/dify_graph/graph_engine/event_management/event_handlers.py
index 92ea793ccb..7f5ad40e0e 100644
--- a/api/dify_graph/graph_engine/event_management/event_handlers.py
+++ b/api/dify_graph/graph_engine/event_management/event_handlers.py
@@ -7,7 +7,6 @@ from collections.abc import Mapping
 from functools import singledispatchmethod
 from typing import TYPE_CHECKING, final
 
-from core.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.enums import ErrorStrategy, NodeExecutionType, NodeState
 from dify_graph.graph import Graph
 from dify_graph.graph_events import (
@@ -30,6 +29,7 @@ from dify_graph.graph_events import (
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.runtime import GraphRuntimeState
 
 from ..domain.graph_execution import GraphExecution
diff --git a/api/core/model_runtime/README.md b/api/dify_graph/model_runtime/README.md
similarity index 100%
rename from api/core/model_runtime/README.md
rename to api/dify_graph/model_runtime/README.md
diff --git a/api/core/model_runtime/README_CN.md b/api/dify_graph/model_runtime/README_CN.md
similarity index 100%
rename from api/core/model_runtime/README_CN.md
rename to api/dify_graph/model_runtime/README_CN.md
diff --git a/api/core/model_runtime/__init__.py b/api/dify_graph/model_runtime/__init__.py
similarity index 100%
rename from api/core/model_runtime/__init__.py
rename to api/dify_graph/model_runtime/__init__.py
diff --git a/api/core/model_runtime/callbacks/__init__.py b/api/dify_graph/model_runtime/callbacks/__init__.py
similarity index 100%
rename from api/core/model_runtime/callbacks/__init__.py
rename to api/dify_graph/model_runtime/callbacks/__init__.py
diff --git a/api/core/model_runtime/callbacks/base_callback.py b/api/dify_graph/model_runtime/callbacks/base_callback.py
similarity index 94%
rename from api/core/model_runtime/callbacks/base_callback.py
rename to api/dify_graph/model_runtime/callbacks/base_callback.py
index a745a91510..20faf3d6cd 100644
--- a/api/core/model_runtime/callbacks/base_callback.py
+++ b/api/dify_graph/model_runtime/callbacks/base_callback.py
@@ -1,9 +1,9 @@
 from abc import ABC, abstractmethod
 from collections.abc import Sequence
 
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
-from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
-from core.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
+from dify_graph.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
 
 _TEXT_COLOR_MAPPING = {
     "blue": "36;1",
diff --git a/api/core/model_runtime/callbacks/logging_callback.py b/api/dify_graph/model_runtime/callbacks/logging_callback.py
similarity index 94%
rename from api/core/model_runtime/callbacks/logging_callback.py
rename to api/dify_graph/model_runtime/callbacks/logging_callback.py
index b366fcc57b..49b9ab27eb 100644
--- a/api/core/model_runtime/callbacks/logging_callback.py
+++ b/api/dify_graph/model_runtime/callbacks/logging_callback.py
@@ -4,10 +4,10 @@ import sys
 from collections.abc import Sequence
 from typing import cast
 
-from core.model_runtime.callbacks.base_callback import Callback
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
-from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
-from core.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.callbacks.base_callback import Callback
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
+from dify_graph.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/model_runtime/entities/__init__.py b/api/dify_graph/model_runtime/entities/__init__.py
similarity index 100%
rename from api/core/model_runtime/entities/__init__.py
rename to api/dify_graph/model_runtime/entities/__init__.py
diff --git a/api/core/model_runtime/entities/common_entities.py b/api/dify_graph/model_runtime/entities/common_entities.py
similarity index 100%
rename from api/core/model_runtime/entities/common_entities.py
rename to api/dify_graph/model_runtime/entities/common_entities.py
diff --git a/api/core/model_runtime/entities/defaults.py b/api/dify_graph/model_runtime/entities/defaults.py
similarity index 98%
rename from api/core/model_runtime/entities/defaults.py
rename to api/dify_graph/model_runtime/entities/defaults.py
index 51c9c51257..53b732e5c6 100644
--- a/api/core/model_runtime/entities/defaults.py
+++ b/api/dify_graph/model_runtime/entities/defaults.py
@@ -1,4 +1,4 @@
-from core.model_runtime.entities.model_entities import DefaultParameterName
+from dify_graph.model_runtime.entities.model_entities import DefaultParameterName
 
 PARAMETER_RULE_TEMPLATE: dict[DefaultParameterName, dict] = {
     DefaultParameterName.TEMPERATURE: {
diff --git a/api/core/model_runtime/entities/llm_entities.py b/api/dify_graph/model_runtime/entities/llm_entities.py
similarity index 97%
rename from api/core/model_runtime/entities/llm_entities.py
rename to api/dify_graph/model_runtime/entities/llm_entities.py
index 2c7c421eed..eec682a2ae 100644
--- a/api/core/model_runtime/entities/llm_entities.py
+++ b/api/dify_graph/model_runtime/entities/llm_entities.py
@@ -7,8 +7,8 @@ from typing import Any, TypedDict, Union
 
 from pydantic import BaseModel, Field
 
-from core.model_runtime.entities.message_entities import AssistantPromptMessage, PromptMessage
-from core.model_runtime.entities.model_entities import ModelUsage, PriceInfo
+from dify_graph.model_runtime.entities.message_entities import AssistantPromptMessage, PromptMessage
+from dify_graph.model_runtime.entities.model_entities import ModelUsage, PriceInfo
 
 
 class LLMMode(StrEnum):
diff --git a/api/core/model_runtime/entities/message_entities.py b/api/dify_graph/model_runtime/entities/message_entities.py
similarity index 100%
rename from api/core/model_runtime/entities/message_entities.py
rename to api/dify_graph/model_runtime/entities/message_entities.py
diff --git a/api/core/model_runtime/entities/model_entities.py b/api/dify_graph/model_runtime/entities/model_entities.py
similarity index 98%
rename from api/core/model_runtime/entities/model_entities.py
rename to api/dify_graph/model_runtime/entities/model_entities.py
index 19194d162c..fbcde6740a 100644
--- a/api/core/model_runtime/entities/model_entities.py
+++ b/api/dify_graph/model_runtime/entities/model_entities.py
@@ -6,7 +6,7 @@ from typing import Any
 
 from pydantic import BaseModel, ConfigDict, model_validator
 
-from core.model_runtime.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.common_entities import I18nObject
 
 
 class ModelType(StrEnum):
diff --git a/api/core/model_runtime/entities/provider_entities.py b/api/dify_graph/model_runtime/entities/provider_entities.py
similarity index 95%
rename from api/core/model_runtime/entities/provider_entities.py
rename to api/dify_graph/model_runtime/entities/provider_entities.py
index 2d88751668..97a99ea7ce 100644
--- a/api/core/model_runtime/entities/provider_entities.py
+++ b/api/dify_graph/model_runtime/entities/provider_entities.py
@@ -3,8 +3,8 @@ from enum import StrEnum, auto
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 
-from core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.model_entities import AIModelEntity, ModelType
+from dify_graph.model_runtime.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.model_entities import AIModelEntity, ModelType
 
 
 class ConfigurateMethod(StrEnum):
diff --git a/api/core/model_runtime/entities/rerank_entities.py b/api/dify_graph/model_runtime/entities/rerank_entities.py
similarity index 100%
rename from api/core/model_runtime/entities/rerank_entities.py
rename to api/dify_graph/model_runtime/entities/rerank_entities.py
diff --git a/api/core/model_runtime/entities/text_embedding_entities.py b/api/dify_graph/model_runtime/entities/text_embedding_entities.py
similarity index 89%
rename from api/core/model_runtime/entities/text_embedding_entities.py
rename to api/dify_graph/model_runtime/entities/text_embedding_entities.py
index 854c448250..a0210c169d 100644
--- a/api/core/model_runtime/entities/text_embedding_entities.py
+++ b/api/dify_graph/model_runtime/entities/text_embedding_entities.py
@@ -2,7 +2,7 @@ from decimal import Decimal
 
 from pydantic import BaseModel
 
-from core.model_runtime.entities.model_entities import ModelUsage
+from dify_graph.model_runtime.entities.model_entities import ModelUsage
 
 
 class EmbeddingUsage(ModelUsage):
diff --git a/api/core/model_runtime/errors/__init__.py b/api/dify_graph/model_runtime/errors/__init__.py
similarity index 100%
rename from api/core/model_runtime/errors/__init__.py
rename to api/dify_graph/model_runtime/errors/__init__.py
diff --git a/api/core/model_runtime/errors/invoke.py b/api/dify_graph/model_runtime/errors/invoke.py
similarity index 100%
rename from api/core/model_runtime/errors/invoke.py
rename to api/dify_graph/model_runtime/errors/invoke.py
diff --git a/api/core/model_runtime/errors/validate.py b/api/dify_graph/model_runtime/errors/validate.py
similarity index 100%
rename from api/core/model_runtime/errors/validate.py
rename to api/dify_graph/model_runtime/errors/validate.py
diff --git a/api/core/model_runtime/memory/__init__.py b/api/dify_graph/model_runtime/memory/__init__.py
similarity index 100%
rename from api/core/model_runtime/memory/__init__.py
rename to api/dify_graph/model_runtime/memory/__init__.py
diff --git a/api/core/model_runtime/memory/prompt_message_memory.py b/api/dify_graph/model_runtime/memory/prompt_message_memory.py
similarity index 89%
rename from api/core/model_runtime/memory/prompt_message_memory.py
rename to api/dify_graph/model_runtime/memory/prompt_message_memory.py
index 4491ddfd05..a76a7faf71 100644
--- a/api/core/model_runtime/memory/prompt_message_memory.py
+++ b/api/dify_graph/model_runtime/memory/prompt_message_memory.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections.abc import Sequence
 from typing import Protocol
 
-from core.model_runtime.entities import PromptMessage
+from dify_graph.model_runtime.entities import PromptMessage
 
 DEFAULT_MEMORY_MAX_TOKEN_LIMIT = 2000
 
diff --git a/api/core/model_runtime/model_providers/__base/__init__.py b/api/dify_graph/model_runtime/model_providers/__base/__init__.py
similarity index 100%
rename from api/core/model_runtime/model_providers/__base/__init__.py
rename to api/dify_graph/model_runtime/model_providers/__base/__init__.py
diff --git a/api/core/model_runtime/model_providers/__base/ai_model.py b/api/dify_graph/model_runtime/model_providers/__base/ai_model.py
similarity index 97%
rename from api/core/model_runtime/model_providers/__base/ai_model.py
rename to api/dify_graph/model_runtime/model_providers/__base/ai_model.py
index c3e50eaddd..ac7ae9925b 100644
--- a/api/core/model_runtime/model_providers/__base/ai_model.py
+++ b/api/dify_graph/model_runtime/model_providers/__base/ai_model.py
@@ -6,9 +6,10 @@ from pydantic import BaseModel, ConfigDict, Field, ValidationError
 from redis import RedisError
 
 from configs import dify_config
-from core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.defaults import PARAMETER_RULE_TEMPLATE
-from core.model_runtime.entities.model_entities import (
+from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
+from dify_graph.model_runtime.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.defaults import PARAMETER_RULE_TEMPLATE
+from dify_graph.model_runtime.entities.model_entities import (
     AIModelEntity,
     DefaultParameterName,
     ModelType,
@@ -16,7 +17,7 @@ from core.model_runtime.entities.model_entities import (
     PriceInfo,
     PriceType,
 )
-from core.model_runtime.errors.invoke import (
+from dify_graph.model_runtime.errors.invoke import (
     InvokeAuthorizationError,
     InvokeBadRequestError,
     InvokeConnectionError,
@@ -24,7 +25,6 @@ from core.model_runtime.errors.invoke import (
     InvokeRateLimitError,
     InvokeServerUnavailableError,
 )
-from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
 from extensions.ext_redis import redis_client
 
 logger = logging.getLogger(__name__)
diff --git a/api/core/model_runtime/model_providers/__base/large_language_model.py b/api/dify_graph/model_runtime/model_providers/__base/large_language_model.py
similarity index 98%
rename from api/core/model_runtime/model_providers/__base/large_language_model.py
rename to api/dify_graph/model_runtime/model_providers/__base/large_language_model.py
index c32ab0879e..bf864ca227 100644
--- a/api/core/model_runtime/model_providers/__base/large_language_model.py
+++ b/api/dify_graph/model_runtime/model_providers/__base/large_language_model.py
@@ -7,21 +7,21 @@ from typing import Union
 from pydantic import ConfigDict
 
 from configs import dify_config
-from core.model_runtime.callbacks.base_callback import Callback
-from core.model_runtime.callbacks.logging_callback import LoggingCallback
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMUsage
-from core.model_runtime.entities.message_entities import (
+from dify_graph.model_runtime.callbacks.base_callback import Callback
+from dify_graph.model_runtime.callbacks.logging_callback import LoggingCallback
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMUsage
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     PromptMessage,
     PromptMessageContentUnionTypes,
     PromptMessageTool,
     TextPromptMessageContent,
 )
-from core.model_runtime.entities.model_entities import (
+from dify_graph.model_runtime.entities.model_entities import (
     ModelType,
     PriceType,
 )
-from core.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/model_runtime/model_providers/__base/moderation_model.py b/api/dify_graph/model_runtime/model_providers/__base/moderation_model.py
similarity index 89%
rename from api/core/model_runtime/model_providers/__base/moderation_model.py
rename to api/dify_graph/model_runtime/model_providers/__base/moderation_model.py
index 7aff0184f4..5fa3d1634b 100644
--- a/api/core/model_runtime/model_providers/__base/moderation_model.py
+++ b/api/dify_graph/model_runtime/model_providers/__base/moderation_model.py
@@ -2,8 +2,8 @@ import time
 
 from pydantic import ConfigDict
 
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
 
 
 class ModerationModel(AIModel):
diff --git a/api/core/model_runtime/model_providers/__base/rerank_model.py b/api/dify_graph/model_runtime/model_providers/__base/rerank_model.py
similarity index 92%
rename from api/core/model_runtime/model_providers/__base/rerank_model.py
rename to api/dify_graph/model_runtime/model_providers/__base/rerank_model.py
index 0a576b832a..5da2b84b95 100644
--- a/api/core/model_runtime/model_providers/__base/rerank_model.py
+++ b/api/dify_graph/model_runtime/model_providers/__base/rerank_model.py
@@ -1,6 +1,6 @@
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.entities.rerank_entities import RerankResult
-from core.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.rerank_entities import RerankResult
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
 
 
 class RerankModel(AIModel):
diff --git a/api/core/model_runtime/model_providers/__base/speech2text_model.py b/api/dify_graph/model_runtime/model_providers/__base/speech2text_model.py
similarity index 88%
rename from api/core/model_runtime/model_providers/__base/speech2text_model.py
rename to api/dify_graph/model_runtime/model_providers/__base/speech2text_model.py
index 9d3bf13e79..e69069a85d 100644
--- a/api/core/model_runtime/model_providers/__base/speech2text_model.py
+++ b/api/dify_graph/model_runtime/model_providers/__base/speech2text_model.py
@@ -2,8 +2,8 @@ from typing import IO
 
 from pydantic import ConfigDict
 
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
 
 
 class Speech2TextModel(AIModel):
diff --git a/api/core/model_runtime/model_providers/__base/text_embedding_model.py b/api/dify_graph/model_runtime/model_providers/__base/text_embedding_model.py
similarity index 94%
rename from api/core/model_runtime/model_providers/__base/text_embedding_model.py
rename to api/dify_graph/model_runtime/model_providers/__base/text_embedding_model.py
index 4c902e2c11..3438da2ada 100644
--- a/api/core/model_runtime/model_providers/__base/text_embedding_model.py
+++ b/api/dify_graph/model_runtime/model_providers/__base/text_embedding_model.py
@@ -1,9 +1,9 @@
 from pydantic import ConfigDict
 
 from core.entities.embedding_type import EmbeddingInputType
-from core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
-from core.model_runtime.entities.text_embedding_entities import EmbeddingResult
-from core.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
+from dify_graph.model_runtime.entities.text_embedding_entities import EmbeddingResult
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
 
 
 class TextEmbeddingModel(AIModel):
diff --git a/api/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py b/api/dify_graph/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py
similarity index 100%
rename from api/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py
rename to api/dify_graph/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py
diff --git a/api/core/model_runtime/model_providers/__base/tts_model.py b/api/dify_graph/model_runtime/model_providers/__base/tts_model.py
similarity index 94%
rename from api/core/model_runtime/model_providers/__base/tts_model.py
rename to api/dify_graph/model_runtime/model_providers/__base/tts_model.py
index a83c8be37c..0656529f22 100644
--- a/api/core/model_runtime/model_providers/__base/tts_model.py
+++ b/api/dify_graph/model_runtime/model_providers/__base/tts_model.py
@@ -3,8 +3,8 @@ from collections.abc import Iterable
 
 from pydantic import ConfigDict
 
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/core/model_runtime/model_providers/__init__.py b/api/dify_graph/model_runtime/model_providers/__init__.py
similarity index 100%
rename from api/core/model_runtime/model_providers/__init__.py
rename to api/dify_graph/model_runtime/model_providers/__init__.py
diff --git a/api/core/model_runtime/model_providers/_position.yaml b/api/dify_graph/model_runtime/model_providers/_position.yaml
similarity index 100%
rename from api/core/model_runtime/model_providers/_position.yaml
rename to api/dify_graph/model_runtime/model_providers/_position.yaml
diff --git a/api/core/model_runtime/model_providers/model_provider_factory.py b/api/dify_graph/model_runtime/model_providers/model_provider_factory.py
similarity index 93%
rename from api/core/model_runtime/model_providers/model_provider_factory.py
rename to api/dify_graph/model_runtime/model_providers/model_provider_factory.py
index 9cfc6889ac..e168fc11d1 100644
--- a/api/core/model_runtime/model_providers/model_provider_factory.py
+++ b/api/dify_graph/model_runtime/model_providers/model_provider_factory.py
@@ -10,18 +10,20 @@ from redis import RedisError
 
 import contexts
 from configs import dify_config
-from core.model_runtime.entities.model_entities import AIModelEntity, ModelType
-from core.model_runtime.entities.provider_entities import ProviderConfig, ProviderEntity, SimpleProviderEntity
-from core.model_runtime.model_providers.__base.ai_model import AIModel
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.model_runtime.model_providers.__base.moderation_model import ModerationModel
-from core.model_runtime.model_providers.__base.rerank_model import RerankModel
-from core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel
-from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
-from core.model_runtime.model_providers.__base.tts_model import TTSModel
-from core.model_runtime.schema_validators.model_credential_schema_validator import ModelCredentialSchemaValidator
-from core.model_runtime.schema_validators.provider_credential_schema_validator import ProviderCredentialSchemaValidator
 from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
+from dify_graph.model_runtime.entities.model_entities import AIModelEntity, ModelType
+from dify_graph.model_runtime.entities.provider_entities import ProviderConfig, ProviderEntity, SimpleProviderEntity
+from dify_graph.model_runtime.model_providers.__base.ai_model import AIModel
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
+from dify_graph.model_runtime.model_providers.__base.moderation_model import ModerationModel
+from dify_graph.model_runtime.model_providers.__base.rerank_model import RerankModel
+from dify_graph.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel
+from dify_graph.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
+from dify_graph.model_runtime.model_providers.__base.tts_model import TTSModel
+from dify_graph.model_runtime.schema_validators.model_credential_schema_validator import ModelCredentialSchemaValidator
+from dify_graph.model_runtime.schema_validators.provider_credential_schema_validator import (
+    ProviderCredentialSchemaValidator,
+)
 from extensions.ext_redis import redis_client
 from models.provider_ids import ModelProviderID
 
diff --git a/api/core/model_runtime/schema_validators/__init__.py b/api/dify_graph/model_runtime/schema_validators/__init__.py
similarity index 100%
rename from api/core/model_runtime/schema_validators/__init__.py
rename to api/dify_graph/model_runtime/schema_validators/__init__.py
diff --git a/api/core/model_runtime/schema_validators/common_validator.py b/api/dify_graph/model_runtime/schema_validators/common_validator.py
similarity index 97%
rename from api/core/model_runtime/schema_validators/common_validator.py
rename to api/dify_graph/model_runtime/schema_validators/common_validator.py
index 2caedeaf48..04cdb8e4f7 100644
--- a/api/core/model_runtime/schema_validators/common_validator.py
+++ b/api/dify_graph/model_runtime/schema_validators/common_validator.py
@@ -1,6 +1,6 @@
 from typing import Union, cast
 
-from core.model_runtime.entities.provider_entities import CredentialFormSchema, FormType
+from dify_graph.model_runtime.entities.provider_entities import CredentialFormSchema, FormType
 
 
 class CommonValidator:
diff --git a/api/core/model_runtime/schema_validators/model_credential_schema_validator.py b/api/dify_graph/model_runtime/schema_validators/model_credential_schema_validator.py
similarity index 78%
rename from api/core/model_runtime/schema_validators/model_credential_schema_validator.py
rename to api/dify_graph/model_runtime/schema_validators/model_credential_schema_validator.py
index 0ac935ca31..a97796e98f 100644
--- a/api/core/model_runtime/schema_validators/model_credential_schema_validator.py
+++ b/api/dify_graph/model_runtime/schema_validators/model_credential_schema_validator.py
@@ -1,6 +1,6 @@
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.entities.provider_entities import ModelCredentialSchema
-from core.model_runtime.schema_validators.common_validator import CommonValidator
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.provider_entities import ModelCredentialSchema
+from dify_graph.model_runtime.schema_validators.common_validator import CommonValidator
 
 
 class ModelCredentialSchemaValidator(CommonValidator):
diff --git a/api/core/model_runtime/schema_validators/provider_credential_schema_validator.py b/api/dify_graph/model_runtime/schema_validators/provider_credential_schema_validator.py
similarity index 79%
rename from api/core/model_runtime/schema_validators/provider_credential_schema_validator.py
rename to api/dify_graph/model_runtime/schema_validators/provider_credential_schema_validator.py
index 06350f92a9..2fed75a76c 100644
--- a/api/core/model_runtime/schema_validators/provider_credential_schema_validator.py
+++ b/api/dify_graph/model_runtime/schema_validators/provider_credential_schema_validator.py
@@ -1,5 +1,5 @@
-from core.model_runtime.entities.provider_entities import ProviderCredentialSchema
-from core.model_runtime.schema_validators.common_validator import CommonValidator
+from dify_graph.model_runtime.entities.provider_entities import ProviderCredentialSchema
+from dify_graph.model_runtime.schema_validators.common_validator import CommonValidator
 
 
 class ProviderCredentialSchemaValidator(CommonValidator):
diff --git a/api/core/model_runtime/utils/__init__.py b/api/dify_graph/model_runtime/utils/__init__.py
similarity index 100%
rename from api/core/model_runtime/utils/__init__.py
rename to api/dify_graph/model_runtime/utils/__init__.py
diff --git a/api/core/model_runtime/utils/encoders.py b/api/dify_graph/model_runtime/utils/encoders.py
similarity index 100%
rename from api/core/model_runtime/utils/encoders.py
rename to api/dify_graph/model_runtime/utils/encoders.py
diff --git a/api/dify_graph/node_events/base.py b/api/dify_graph/node_events/base.py
index f30c37f2cc..2f6259ae7d 100644
--- a/api/dify_graph/node_events/base.py
+++ b/api/dify_graph/node_events/base.py
@@ -3,8 +3,8 @@ from typing import Any
 
 from pydantic import BaseModel, Field
 
-from core.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 
 
 class NodeEventBase(BaseModel):
diff --git a/api/dify_graph/node_events/node.py b/api/dify_graph/node_events/node.py
index 7f48539255..481e793267 100644
--- a/api/dify_graph/node_events/node.py
+++ b/api/dify_graph/node_events/node.py
@@ -3,10 +3,10 @@ from datetime import datetime
 
 from pydantic import Field
 
-from core.model_runtime.entities.llm_entities import LLMUsage
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
 from dify_graph.entities.pause_reason import PauseReason
 from dify_graph.file import File
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.node_events import NodeRunResult
 
 from .base import NodeEventBase
diff --git a/api/dify_graph/nodes/agent/agent_node.py b/api/dify_graph/nodes/agent/agent_node.py
index 5d4c6526c4..f55871718f 100644
--- a/api/dify_graph/nodes/agent/agent_node.py
+++ b/api/dify_graph/nodes/agent/agent_node.py
@@ -13,9 +13,6 @@ from core.agent.entities import AgentToolEntity
 from core.agent.plugin_entities import AgentStrategyParameter
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelInstance, ModelManager
-from core.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
-from core.model_runtime.entities.model_entities import AIModelEntity, ModelType
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.provider_manager import ProviderManager
 from core.tools.entities.tool_entities import (
     ToolIdentity,
@@ -32,6 +29,9 @@ from dify_graph.enums import (
     WorkflowNodeExecutionStatus,
 )
 from dify_graph.file import File, FileTransferMethod
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
+from dify_graph.model_runtime.entities.model_entities import AIModelEntity, ModelType
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.node_events import (
     AgentLogEvent,
     NodeEventBase,
diff --git a/api/dify_graph/nodes/base/usage_tracking_mixin.py b/api/dify_graph/nodes/base/usage_tracking_mixin.py
index f1ba953af5..bd49419fd3 100644
--- a/api/dify_graph/nodes/base/usage_tracking_mixin.py
+++ b/api/dify_graph/nodes/base/usage_tracking_mixin.py
@@ -1,4 +1,4 @@
-from core.model_runtime.entities.llm_entities import LLMUsage
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.runtime import GraphRuntimeState
 
 
diff --git a/api/dify_graph/nodes/iteration/iteration_node.py b/api/dify_graph/nodes/iteration/iteration_node.py
index 5ac25b493d..03d57e3f04 100644
--- a/api/dify_graph/nodes/iteration/iteration_node.py
+++ b/api/dify_graph/nodes/iteration/iteration_node.py
@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING, Any, NewType, cast
 
 from typing_extensions import TypeIs
 
-from core.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.constants import CONVERSATION_VARIABLE_NODE_ID
 from dify_graph.enums import (
     NodeExecutionType,
@@ -20,6 +19,7 @@ from dify_graph.graph_events import (
     GraphRunPartialSucceededEvent,
     GraphRunSucceededEvent,
 )
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.node_events import (
     IterationFailedEvent,
     IterationNextEvent,
diff --git a/api/dify_graph/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/dify_graph/nodes/knowledge_retrieval/knowledge_retrieval_node.py
index 86e4a35901..97c013812e 100644
--- a/api/dify_graph/nodes/knowledge_retrieval/knowledge_retrieval_node.py
+++ b/api/dify_graph/nodes/knowledge_retrieval/knowledge_retrieval_node.py
@@ -3,14 +3,14 @@ from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Any, Literal
 
 from core.app.app_config.entities import DatasetRetrieveConfigEntity
-from core.model_runtime.entities.llm_entities import LLMUsage
-from core.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.entities import GraphInitParams
 from dify_graph.enums import (
     NodeType,
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.node_events import NodeRunResult
 from dify_graph.nodes.base import LLMUsageTrackingMixin
 from dify_graph.nodes.base.node import Node
diff --git a/api/dify_graph/nodes/llm/entities.py b/api/dify_graph/nodes/llm/entities.py
index 74e90fdc7d..707ed8ece0 100644
--- a/api/dify_graph/nodes/llm/entities.py
+++ b/api/dify_graph/nodes/llm/entities.py
@@ -3,8 +3,8 @@ from typing import Any, Literal
 
 from pydantic import BaseModel, Field, field_validator
 
-from core.model_runtime.entities import ImagePromptMessageContent, LLMMode
 from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
+from dify_graph.model_runtime.entities import ImagePromptMessageContent, LLMMode
 from dify_graph.nodes.base import BaseNodeData
 from dify_graph.nodes.base.entities import VariableSelector
 
diff --git a/api/dify_graph/nodes/llm/llm_utils.py b/api/dify_graph/nodes/llm/llm_utils.py
index fb64630cd8..ca478a09f8 100644
--- a/api/dify_graph/nodes/llm/llm_utils.py
+++ b/api/dify_graph/nodes/llm/llm_utils.py
@@ -2,16 +2,16 @@ from collections.abc import Sequence
 from typing import cast
 
 from core.model_manager import ModelInstance
-from core.model_runtime.entities import PromptMessageRole
-from core.model_runtime.entities.message_entities import (
+from dify_graph.file.models import File
+from dify_graph.model_runtime.entities import PromptMessageRole
+from dify_graph.model_runtime.entities.message_entities import (
     ImagePromptMessageContent,
     PromptMessage,
     TextPromptMessageContent,
 )
-from core.model_runtime.entities.model_entities import AIModelEntity
-from core.model_runtime.memory import PromptMessageMemory
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from dify_graph.file.models import File
+from dify_graph.model_runtime.entities.model_entities import AIModelEntity
+from dify_graph.model_runtime.memory import PromptMessageMemory
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from dify_graph.runtime import VariablePool
 from dify_graph.variables.segments import ArrayAnySegment, ArrayFileSegment, FileSegment, NoneSegment
 
diff --git a/api/dify_graph/nodes/llm/node.py b/api/dify_graph/nodes/llm/node.py
index 0e243bfd3b..65b92b3bcc 100644
--- a/api/dify_graph/nodes/llm/node.py
+++ b/api/dify_graph/nodes/llm/node.py
@@ -15,30 +15,6 @@ from core.helper.code_executor import CodeExecutor, CodeLanguage
 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.model_runtime.entities import (
-    ImagePromptMessageContent,
-    PromptMessage,
-    PromptMessageContentType,
-    TextPromptMessageContent,
-)
-from core.model_runtime.entities.llm_entities import (
-    LLMResult,
-    LLMResultChunk,
-    LLMResultChunkWithStructuredOutput,
-    LLMResultWithStructuredOutput,
-    LLMStructuredOutput,
-    LLMUsage,
-)
-from core.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    PromptMessageContentUnionTypes,
-    PromptMessageRole,
-    SystemPromptMessage,
-    UserPromptMessage,
-)
-from core.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
-from core.model_runtime.memory import PromptMessageMemory
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.prompt.entities.advanced_prompt_entities import CompletionModelPromptTemplate, MemoryConfig
 from core.prompt.utils.prompt_message_util import PromptMessageUtil
 from core.rag.entities.citation_metadata import RetrievalSourceMetadata
@@ -52,6 +28,30 @@ from dify_graph.enums import (
     WorkflowNodeExecutionStatus,
 )
 from dify_graph.file import File, FileTransferMethod, FileType, file_manager
+from dify_graph.model_runtime.entities import (
+    ImagePromptMessageContent,
+    PromptMessage,
+    PromptMessageContentType,
+    TextPromptMessageContent,
+)
+from dify_graph.model_runtime.entities.llm_entities import (
+    LLMResult,
+    LLMResultChunk,
+    LLMResultChunkWithStructuredOutput,
+    LLMResultWithStructuredOutput,
+    LLMStructuredOutput,
+    LLMUsage,
+)
+from dify_graph.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    PromptMessageContentUnionTypes,
+    PromptMessageRole,
+    SystemPromptMessage,
+    UserPromptMessage,
+)
+from dify_graph.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
+from dify_graph.model_runtime.memory import PromptMessageMemory
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.node_events import (
     ModelInvokeCompletedEvent,
     NodeEventBase,
diff --git a/api/dify_graph/nodes/loop/loop_node.py b/api/dify_graph/nodes/loop/loop_node.py
index 9bd79b7947..6ae3b5220d 100644
--- a/api/dify_graph/nodes/loop/loop_node.py
+++ b/api/dify_graph/nodes/loop/loop_node.py
@@ -5,7 +5,6 @@ from collections.abc import Callable, Generator, Mapping, Sequence
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, Literal, cast
 
-from core.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.enums import (
     NodeExecutionType,
     NodeType,
@@ -17,6 +16,7 @@ from dify_graph.graph_events import (
     GraphRunFailedEvent,
     NodeRunSucceededEvent,
 )
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.node_events import (
     LoopFailedEvent,
     LoopNextEvent,
diff --git a/api/dify_graph/nodes/parameter_extractor/parameter_extractor_node.py b/api/dify_graph/nodes/parameter_extractor/parameter_extractor_node.py
index 626f38fc9b..a9b21d83b1 100644
--- a/api/dify_graph/nodes/parameter_extractor/parameter_extractor_node.py
+++ b/api/dify_graph/nodes/parameter_extractor/parameter_extractor_node.py
@@ -6,20 +6,6 @@ from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Any, cast
 
 from core.model_manager import ModelInstance
-from core.model_runtime.entities import ImagePromptMessageContent
-from core.model_runtime.entities.llm_entities import LLMUsage
-from core.model_runtime.entities.message_entities import (
-    AssistantPromptMessage,
-    PromptMessage,
-    PromptMessageRole,
-    PromptMessageTool,
-    ToolPromptMessage,
-    UserPromptMessage,
-)
-from core.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
-from core.model_runtime.memory import PromptMessageMemory
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.prompt.advanced_prompt_transform import AdvancedPromptTransform
 from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate
 from core.prompt.simple_prompt_transform import ModelMode
@@ -30,6 +16,20 @@ from dify_graph.enums import (
     WorkflowNodeExecutionStatus,
 )
 from dify_graph.file import File
+from dify_graph.model_runtime.entities import ImagePromptMessageContent
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
+from dify_graph.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    PromptMessage,
+    PromptMessageRole,
+    PromptMessageTool,
+    ToolPromptMessage,
+    UserPromptMessage,
+)
+from dify_graph.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
+from dify_graph.model_runtime.memory import PromptMessageMemory
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.node_events import NodeRunResult
 from dify_graph.nodes.base import variable_template_parser
 from dify_graph.nodes.base.node import Node
diff --git a/api/dify_graph/nodes/question_classifier/question_classifier_node.py b/api/dify_graph/nodes/question_classifier/question_classifier_node.py
index 59b0a97496..03ddf9ab5f 100644
--- a/api/dify_graph/nodes/question_classifier/question_classifier_node.py
+++ b/api/dify_graph/nodes/question_classifier/question_classifier_node.py
@@ -4,9 +4,6 @@ from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
 from core.model_manager import ModelInstance
-from core.model_runtime.entities import LLMUsage, ModelPropertyKey, PromptMessageRole
-from core.model_runtime.memory import PromptMessageMemory
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.prompt.simple_prompt_transform import ModelMode
 from core.prompt.utils.prompt_message_util import PromptMessageUtil
 from dify_graph.entities import GraphInitParams
@@ -16,6 +13,9 @@ from dify_graph.enums import (
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
+from dify_graph.model_runtime.entities import LLMUsage, ModelPropertyKey, PromptMessageRole
+from dify_graph.model_runtime.memory import PromptMessageMemory
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.node_events import ModelInvokeCompletedEvent, NodeRunResult
 from dify_graph.nodes.base.entities import VariableSelector
 from dify_graph.nodes.base.node import Node
diff --git a/api/dify_graph/nodes/tool/tool_node.py b/api/dify_graph/nodes/tool/tool_node.py
index 3c072978e9..eee065c311 100644
--- a/api/dify_graph/nodes/tool/tool_node.py
+++ b/api/dify_graph/nodes/tool/tool_node.py
@@ -5,7 +5,6 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.callback_handler.workflow_tool_callback_handler import DifyWorkflowCallbackHandler
-from core.model_runtime.entities.llm_entities import LLMUsage
 from core.tools.__base.tool import Tool
 from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter
 from core.tools.errors import ToolInvokeError
@@ -18,6 +17,7 @@ from dify_graph.enums import (
     WorkflowNodeExecutionStatus,
 )
 from dify_graph.file import File, FileTransferMethod
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.node_events import NodeEventBase, NodeRunResult, StreamChunkEvent, StreamCompletedEvent
 from dify_graph.nodes.base.node import Node
 from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
diff --git a/api/dify_graph/repositories/rag_retrieval_protocol.py b/api/dify_graph/repositories/rag_retrieval_protocol.py
index 023400cf32..5f3d38167e 100644
--- a/api/dify_graph/repositories/rag_retrieval_protocol.py
+++ b/api/dify_graph/repositories/rag_retrieval_protocol.py
@@ -2,7 +2,7 @@ from typing import Any, Literal, Protocol
 
 from pydantic import BaseModel, Field
 
-from core.model_runtime.entities import LLMUsage
+from dify_graph.model_runtime.entities import LLMUsage
 from dify_graph.nodes.knowledge_retrieval.entities import MetadataFilteringCondition
 from dify_graph.nodes.llm.entities import ModelConfig
 
diff --git a/api/dify_graph/runtime/graph_runtime_state.py b/api/dify_graph/runtime/graph_runtime_state.py
index 541830c58b..6b88dd683c 100644
--- a/api/dify_graph/runtime/graph_runtime_state.py
+++ b/api/dify_graph/runtime/graph_runtime_state.py
@@ -10,8 +10,8 @@ from typing import TYPE_CHECKING, Any, ClassVar, Protocol
 from pydantic import BaseModel, Field
 from pydantic.json import pydantic_encoder
 
-from core.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.enums import NodeExecutionType, NodeState, NodeType
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.runtime.variable_pool import VariablePool
 
 if TYPE_CHECKING:
diff --git a/api/dify_graph/runtime/graph_runtime_state_protocol.py b/api/dify_graph/runtime/graph_runtime_state_protocol.py
index 4590a4205c..7e55ece3f1 100644
--- a/api/dify_graph/runtime/graph_runtime_state_protocol.py
+++ b/api/dify_graph/runtime/graph_runtime_state_protocol.py
@@ -1,7 +1,7 @@
 from collections.abc import Mapping, Sequence
 from typing import Any, Protocol
 
-from core.model_runtime.entities.llm_entities import LLMUsage
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.system_variable import SystemVariableReadOnlyView
 from dify_graph.variables.segments import Segment
 
diff --git a/api/dify_graph/runtime/read_only_wrappers.py b/api/dify_graph/runtime/read_only_wrappers.py
index 8e4a3ed832..ca06d88c3d 100644
--- a/api/dify_graph/runtime/read_only_wrappers.py
+++ b/api/dify_graph/runtime/read_only_wrappers.py
@@ -4,7 +4,7 @@ from collections.abc import Mapping, Sequence
 from copy import deepcopy
 from typing import Any
 
-from core.model_runtime.entities.llm_entities import LLMUsage
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.system_variable import SystemVariableReadOnlyView
 from dify_graph.variables.segments import Segment
 
diff --git a/api/extensions/ext_sentry.py b/api/extensions/ext_sentry.py
index c3aa8edf80..9a34acb0c1 100644
--- a/api/extensions/ext_sentry.py
+++ b/api/extensions/ext_sentry.py
@@ -10,7 +10,7 @@ def init_app(app: DifyApp):
         from sentry_sdk.integrations.flask import FlaskIntegration
         from werkzeug.exceptions import HTTPException
 
-        from core.model_runtime.errors.invoke import InvokeRateLimitError
+        from dify_graph.model_runtime.errors.invoke import InvokeRateLimitError
 
         def before_send(event, hint):
             if "exc_info" in hint:
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 b660a6c54a..bd1c08d96e 100644
--- a/api/extensions/logstore/repositories/logstore_workflow_node_execution_repository.py
+++ b/api/extensions/logstore/repositories/logstore_workflow_node_execution_repository.py
@@ -16,11 +16,11 @@ from typing import Any, Union
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
 from dify_graph.entities import WorkflowNodeExecution
 from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from dify_graph.enums import NodeType
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.repositories.workflow_node_execution_repository import OrderConfig, WorkflowNodeExecutionRepository
 from dify_graph.workflow_type_encoder import WorkflowRuntimeTypeConverter
 from extensions.logstore.aliyun_logstore import AliyunLogStore
diff --git a/api/libs/helper.py b/api/libs/helper.py
index 39f1931299..6151eb0940 100644
--- a/api/libs/helper.py
+++ b/api/libs/helper.py
@@ -21,8 +21,8 @@ from pydantic.functional_validators import AfterValidator
 
 from configs import dify_config
 from core.app.features.rate_limiting.rate_limit import RateLimitGenerator
-from core.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.file import helpers as file_helpers
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_redis import redis_client
 
 if TYPE_CHECKING:
diff --git a/api/services/app_dsl_service.py b/api/services/app_dsl_service.py
index ad5a91e74b..5790c8b9ec 100644
--- a/api/services/app_dsl_service.py
+++ b/api/services/app_dsl_service.py
@@ -18,9 +18,9 @@ from sqlalchemy.orm import Session
 
 from configs import dify_config
 from core.helper import ssrf_proxy
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.entities.plugin import PluginDependency
 from dify_graph.enums import NodeType
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
 from dify_graph.nodes.llm.entities import LLMNodeData
 from dify_graph.nodes.parameter_extractor.entities import ParameterExtractorNodeData
diff --git a/api/services/app_service.py b/api/services/app_service.py
index e57253f8b6..ce6826ef5c 100644
--- a/api/services/app_service.py
+++ b/api/services/app_service.py
@@ -10,10 +10,10 @@ from constants.model_template import default_app_templates
 from core.agent.entities import AgentToolEntity
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.tools.tool_manager import ToolManager
 from core.tools.utils.configuration import ToolParameterConfigurationManager
+from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey, ModelType
+from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from events.app_event import app_was_created
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
diff --git a/api/services/audio_service.py b/api/services/audio_service.py
index a95361cebd..1b698fad17 100644
--- a/api/services/audio_service.py
+++ b/api/services/audio_service.py
@@ -8,7 +8,7 @@ from werkzeug.datastructures import FileStorage
 
 from constants import AUDIO_EXTENSIONS
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from models.enums import MessageStatus
 from models.model import App, AppMode, Message
diff --git a/api/services/clear_free_plan_tenant_expired_logs.py b/api/services/clear_free_plan_tenant_expired_logs.py
index aefc34fcae..0e0eab00ad 100644
--- a/api/services/clear_free_plan_tenant_expired_logs.py
+++ b/api/services/clear_free_plan_tenant_expired_logs.py
@@ -10,7 +10,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
 from configs import dify_config
-from core.model_runtime.utils.encoders import jsonable_encoder
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from enums.cloud_plan import CloudPlan
 from extensions.ext_database import db
 from extensions.ext_storage import storage
diff --git a/api/services/dataset_service.py b/api/services/dataset_service.py
index 66a49226ba..3a7d483a9d 100644
--- a/api/services/dataset_service.py
+++ b/api/services/dataset_service.py
@@ -20,12 +20,12 @@ from core.db.session_factory import session_factory
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
 from core.helper.name_generator import generate_incremental_name
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelFeature, ModelType
-from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 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 dify_graph.file import helpers as file_helpers
+from dify_graph.model_runtime.entities.model_entities import ModelFeature, ModelType
+from dify_graph.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
 from enums.cloud_plan import CloudPlan
 from events.dataset_event import dataset_was_deleted
 from events.document_event import document_was_deleted
diff --git a/api/services/datasource_provider_service.py b/api/services/datasource_provider_service.py
index eeb14072bd..95a50f0512 100644
--- a/api/services/datasource_provider_service.py
+++ b/api/services/datasource_provider_service.py
@@ -10,11 +10,11 @@ from constants import HIDDEN_VALUE, UNKNOWN_VALUE
 from core.helper import encrypter
 from core.helper.name_generator import generate_incremental_name
 from core.helper.provider_cache import NoOpProviderCredentialCache
-from core.model_runtime.entities.provider_entities import FormType
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.datasource import PluginDatasourceManager
 from core.plugin.impl.oauth import OAuthHandler
 from core.tools.utils.encryption import ProviderConfigCache, ProviderConfigEncrypter, create_provider_encrypter
+from dify_graph.model_runtime.entities.provider_entities import FormType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from models.oauth import DatasourceOauthParamConfig, DatasourceOauthTenantParamConfig, DatasourceProvider
diff --git a/api/services/entities/model_provider_entities.py b/api/services/entities/model_provider_entities.py
index a29d848ac5..9dd595f516 100644
--- a/api/services/entities/model_provider_entities.py
+++ b/api/services/entities/model_provider_entities.py
@@ -15,9 +15,9 @@ from core.entities.provider_entities import (
     QuotaConfiguration,
     UnaddedModelConfiguration,
 )
-from core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.entities.provider_entities import (
+from dify_graph.model_runtime.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.provider_entities import (
     ConfigurateMethod,
     ModelCredentialSchema,
     ProviderCredentialSchema,
diff --git a/api/services/hit_testing_service.py b/api/services/hit_testing_service.py
index 8cbf3a25c3..c00c76a826 100644
--- a/api/services/hit_testing_service.py
+++ b/api/services/hit_testing_service.py
@@ -4,12 +4,12 @@ import time
 from typing import Any
 
 from core.app.app_config.entities import ModelConfig
-from core.model_runtime.entities import LLMMode
 from core.rag.datasource.retrieval_service import RetrievalService
 from core.rag.index_processor.constant.query_type import QueryType
 from core.rag.models.document import Document
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
+from dify_graph.model_runtime.entities import LLMMode
 from extensions.ext_database import db
 from models import Account
 from models.dataset import Dataset, DatasetQuery
diff --git a/api/services/message_service.py b/api/services/message_service.py
index ce699e79d4..789b6c2f8c 100644
--- a/api/services/message_service.py
+++ b/api/services/message_service.py
@@ -9,10 +9,10 @@ from core.app.entities.app_invoke_entities import InvokeFrom
 from core.llm_generator.llm_generator import LLMGenerator
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 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 dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models import Account
diff --git a/api/services/model_load_balancing_service.py b/api/services/model_load_balancing_service.py
index 69da3bfb79..2133dc5b3a 100644
--- a/api/services/model_load_balancing_service.py
+++ b/api/services/model_load_balancing_service.py
@@ -10,13 +10,13 @@ from core.entities.provider_configuration import ProviderConfiguration
 from core.helper import encrypter
 from core.helper.model_provider_cache import ProviderCredentialsCache, ProviderCredentialsCacheType
 from core.model_manager import LBModelManager
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.entities.provider_entities import (
+from core.provider_manager import ProviderManager
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.provider_entities import (
     ModelCredentialSchema,
     ProviderCredentialSchema,
 )
-from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
-from core.provider_manager import ProviderManager
+from dify_graph.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from models.provider import LoadBalancingModelConfig, ProviderCredential, ProviderModelCredential
diff --git a/api/services/model_provider_service.py b/api/services/model_provider_service.py
index edd1004b82..0ddd6b9b1a 100644
--- a/api/services/model_provider_service.py
+++ b/api/services/model_provider_service.py
@@ -1,9 +1,9 @@
 import logging
 
 from core.entities.model_entities import ModelWithProviderEntity, ProviderModelWithStatusEntity
-from core.model_runtime.entities.model_entities import ModelType, ParameterRule
-from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from core.provider_manager import ProviderManager
+from dify_graph.model_runtime.entities.model_entities import ModelType, ParameterRule
+from dify_graph.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from models.provider import ProviderType
 from services.entities.model_provider_entities import (
     CustomConfigurationResponse,
diff --git a/api/services/rag_pipeline/rag_pipeline_dsl_service.py b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
index 0a257a587d..58bb4b7c90 100644
--- a/api/services/rag_pipeline/rag_pipeline_dsl_service.py
+++ b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
@@ -21,9 +21,9 @@ from sqlalchemy.orm import Session
 
 from core.helper import ssrf_proxy
 from core.helper.name_generator import generate_incremental_name
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.entities.plugin import PluginDependency
 from dify_graph.enums import NodeType
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.nodes.datasource.entities import DatasourceNodeData
 from dify_graph.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData
 from dify_graph.nodes.llm.entities import LLMNodeData
diff --git a/api/services/summary_index_service.py b/api/services/summary_index_service.py
index 7c03ceed5b..eb78be8f88 100644
--- a/api/services/summary_index_service.py
+++ b/api/services/summary_index_service.py
@@ -10,11 +10,11 @@ from sqlalchemy.orm import Session
 
 from core.db.session_factory import session_factory
 from core.model_manager import ModelManager
-from core.model_runtime.entities.llm_entities import LLMUsage
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.datasource.vdb.vector_factory import Vector
 from core.rag.index_processor.constant.doc_type import DocType
 from core.rag.models.document import Document
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
+from dify_graph.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 c32157919b..dc883f0daa 100644
--- a/api/services/tools/api_tools_manage_service.py
+++ b/api/services/tools/api_tools_manage_service.py
@@ -7,7 +7,6 @@ from httpx import get
 from sqlalchemy import select
 
 from core.entities.provider_entities import ProviderConfig
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.custom_tool.provider import ApiToolProviderController
 from core.tools.entities.api_entities import ToolApiEntity, ToolProviderApiEntity
@@ -21,6 +20,7 @@ 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
 from core.tools.utils.parser import ApiBasedToolSchemaParser
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_database import db
 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 ff0b276f77..101b2fe5a2 100644
--- a/api/services/tools/workflow_tools_manage_service.py
+++ b/api/services/tools/workflow_tools_manage_service.py
@@ -5,7 +5,6 @@ from datetime import datetime
 from sqlalchemy import or_, select
 from sqlalchemy.orm import Session
 
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.tools.__base.tool_provider import ToolProviderController
 from core.tools.entities.api_entities import ToolApiEntity, ToolProviderApiEntity
 from core.tools.entities.tool_entities import WorkflowToolParameterConfiguration
@@ -13,6 +12,7 @@ from core.tools.tool_label_manager import ToolLabelManager
 from core.tools.utils.workflow_configuration_sync import WorkflowToolConfigurationUtils
 from core.tools.workflow_as_tool.provider import WorkflowToolProviderController
 from core.tools.workflow_as_tool.tool import WorkflowTool
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from extensions.ext_database import db
 from models.model import App
 from models.tools import WorkflowToolProvider
diff --git a/api/services/vector_service.py b/api/services/vector_service.py
index f1fa33cb75..73bb46b797 100644
--- a/api/services/vector_service.py
+++ b/api/services/vector_service.py
@@ -1,7 +1,6 @@
 import logging
 
 from core.model_manager import ModelInstance, ModelManager
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.datasource.keyword.keyword_factory import Keyword
 from core.rag.datasource.vdb.vector_factory import Vector
 from core.rag.index_processor.constant.doc_type import DocType
@@ -9,6 +8,7 @@ from core.rag.index_processor.constant.index_type import IndexStructureType
 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 dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from models import UploadFile
 from models.dataset import ChildChunk, Dataset, DatasetProcessRule, DocumentSegment, SegmentAttachmentBinding
diff --git a/api/services/workflow/workflow_converter.py b/api/services/workflow/workflow_converter.py
index 8b4b3318e1..0153046acc 100644
--- a/api/services/workflow/workflow_converter.py
+++ b/api/services/workflow/workflow_converter.py
@@ -13,11 +13,11 @@ from core.app.apps.agent_chat.app_config_manager import AgentChatAppConfigManage
 from core.app.apps.chat.app_config_manager import ChatAppConfigManager
 from core.app.apps.completion.app_config_manager import CompletionAppConfigManager
 from core.helper import encrypter
-from core.model_runtime.entities.llm_entities import LLMMode
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.prompt.simple_prompt_transform import SimplePromptTransform
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from dify_graph.file.models import FileUploadConfig
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.nodes import NodeType
 from dify_graph.variables.input_entities import VariableEntity
 from events.app_event import app_was_created
diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py
index 2bf291da54..a7f0b036c6 100644
--- a/api/services/workflow_service.py
+++ b/api/services/workflow_service.py
@@ -438,8 +438,8 @@ class WorkflowService:
         """
         try:
             from core.model_manager import ModelManager
-            from core.model_runtime.entities.model_entities import ModelType
             from core.provider_manager import ProviderManager
+            from dify_graph.model_runtime.entities.model_entities import ModelType
 
             # Get model instance to validate provider+model combination
             model_manager = ModelManager()
@@ -558,8 +558,8 @@ class WorkflowService:
         :return: True if load balancing is enabled, False otherwise
         """
         try:
-            from core.model_runtime.entities.model_entities import ModelType
             from core.provider_manager import ProviderManager
+            from dify_graph.model_runtime.entities.model_entities import ModelType
 
             # Get provider configurations
             provider_manager = ProviderManager()
diff --git a/api/tasks/batch_create_segment_to_index_task.py b/api/tasks/batch_create_segment_to_index_task.py
index f69f17b16d..49dee00919 100644
--- a/api/tasks/batch_create_segment_to_index_task.py
+++ b/api/tasks/batch_create_segment_to_index_task.py
@@ -11,7 +11,7 @@ from sqlalchemy import func
 
 from core.db.session_factory import session_factory
 from core.model_manager import ModelManager
-from core.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_redis import redis_client
 from extensions.ext_storage import storage
 from libs import helper
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 5012defdad..4e184c93fd 100644
--- a/api/tests/integration_tests/model_runtime/__mock/plugin_model.py
+++ b/api/tests/integration_tests/model_runtime/__mock/plugin_model.py
@@ -4,20 +4,27 @@ 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 core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from core.model_runtime.entities.message_entities import AssistantPromptMessage, PromptMessage, PromptMessageTool
-from core.model_runtime.entities.model_entities import (
+from dify_graph.model_runtime.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.llm_entities import (
+    LLMMode,
+    LLMResult,
+    LLMResultChunk,
+    LLMResultChunkDelta,
+    LLMUsage,
+)
+from dify_graph.model_runtime.entities.message_entities import AssistantPromptMessage, PromptMessage, PromptMessageTool
+from dify_graph.model_runtime.entities.model_entities import (
     AIModelEntity,
     FetchFrom,
     ModelFeature,
     ModelPropertyKey,
     ModelType,
 )
-from core.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
-from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
-from core.plugin.impl.model import PluginModelClient
+from dify_graph.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
 
 
 class MockModelClass(PluginModelClient):
diff --git a/api/tests/integration_tests/workflow/nodes/__mock/model.py b/api/tests/integration_tests/workflow/nodes/__mock/model.py
index cdecdf41d2..5b0f86fed1 100644
--- a/api/tests/integration_tests/workflow/nodes/__mock/model.py
+++ b/api/tests/integration_tests/workflow/nodes/__mock/model.py
@@ -4,8 +4,8 @@ from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEnti
 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.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from models.provider import ProviderType
 
 
diff --git a/api/tests/integration_tests/workflow/nodes/test_llm.py b/api/tests/integration_tests/workflow/nodes/test_llm.py
index 07783792d1..fda31d516b 100644
--- a/api/tests/integration_tests/workflow/nodes/test_llm.py
+++ b/api/tests/integration_tests/workflow/nodes/test_llm.py
@@ -113,8 +113,8 @@ def test_execute_llm():
         from decimal import Decimal
         from unittest.mock import MagicMock
 
-        from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-        from core.model_runtime.entities.message_entities import AssistantPromptMessage
+        from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+        from dify_graph.model_runtime.entities.message_entities import AssistantPromptMessage
 
         # Create mock model instance
         mock_model_instance = MagicMock(spec=ModelInstance)
@@ -158,7 +158,7 @@ def test_execute_llm():
 
     # Mock fetch_prompt_messages to avoid database calls
     def mock_fetch_prompt_messages_1(**_kwargs):
-        from core.model_runtime.entities.message_entities import SystemPromptMessage, UserPromptMessage
+        from dify_graph.model_runtime.entities.message_entities import SystemPromptMessage, UserPromptMessage
 
         return [
             SystemPromptMessage(content="you are a helpful assistant. today's weather is sunny."),
@@ -229,8 +229,8 @@ def test_execute_llm_with_jinja2():
         from decimal import Decimal
         from unittest.mock import MagicMock
 
-        from core.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-        from core.model_runtime.entities.message_entities import AssistantPromptMessage
+        from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+        from dify_graph.model_runtime.entities.message_entities import AssistantPromptMessage
 
         # Create mock model instance
         mock_model_instance = MagicMock(spec=ModelInstance)
@@ -274,7 +274,7 @@ def test_execute_llm_with_jinja2():
 
     # Mock fetch_prompt_messages to avoid database calls
     def mock_fetch_prompt_messages_2(**_kwargs):
-        from core.model_runtime.entities.message_entities import SystemPromptMessage, UserPromptMessage
+        from dify_graph.model_runtime.entities.message_entities import SystemPromptMessage, UserPromptMessage
 
         return [
             SystemPromptMessage(content="you are a helpful assistant. today's weather is sunny."),
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 7a3f5bc58e..09e560578e 100644
--- a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
+++ b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
@@ -5,9 +5,9 @@ from unittest.mock import MagicMock
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.model_manager import ModelInstance
-from core.model_runtime.entities import AssistantPromptMessage, UserPromptMessage
 from dify_graph.entities import GraphInitParams
 from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.model_runtime.entities import AssistantPromptMessage, UserPromptMessage
 from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
 from dify_graph.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
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 5d6fcf4775..96fb7ea293 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
@@ -31,12 +31,12 @@ from core.app.layers.pause_state_persist_layer import (
     PauseStatePersistenceLayer,
     WorkflowResumptionContext,
 )
-from core.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.entities.pause_reason import SchedulingPause
 from dify_graph.enums import WorkflowExecutionStatus
 from dify_graph.graph_engine.entities.commands import GraphEngineCommand
 from dify_graph.graph_engine.layers.base import GraphEngineLayerNotInitializedError
 from dify_graph.graph_events.graph import GraphRunPausedEvent
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.runtime.graph_runtime_state import GraphRuntimeState
 from dify_graph.runtime.graph_runtime_state_protocol import ReadOnlyGraphRuntimeState
 from dify_graph.runtime.read_only_wrappers import ReadOnlyGraphRuntimeStateWrapper
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 f05c47913e..0ca649b36d 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
@@ -10,8 +10,8 @@ from uuid import uuid4
 
 import pytest
 
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.dataset import Dataset, DatasetPermissionEnum, Document, ExternalKnowledgeBindings
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 f6d9dfddae..7f9135bb81 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,7 +3,7 @@ from uuid import uuid4
 
 import pytest
 
-from core.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.dataset import Dataset, ExternalKnowledgeBindings
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 f7044f7d45..7a4662055c 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
@@ -4,7 +4,7 @@ import pytest
 from faker import Faker
 
 from core.entities.model_entities import ModelStatus
-from core.model_runtime.entities.model_entities import FetchFrom, ModelType
+from dify_graph.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
@@ -407,8 +407,8 @@ class TestModelProviderService:
 
         # Create mock models
         from core.entities.model_entities import ModelWithProviderEntity, SimpleModelProviderEntity
-        from core.model_runtime.entities.common_entities import I18nObject
-        from core.model_runtime.entities.provider_entities import ProviderEntity
+        from dify_graph.model_runtime.entities.common_entities import I18nObject
+        from dify_graph.model_runtime.entities.provider_entities import ProviderEntity
 
         # Create real model objects instead of mocks
         provider_entity_1 = SimpleModelProviderEntity(
@@ -643,7 +643,7 @@ class TestModelProviderService:
 
         # Create mock default model response
         from core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity
-        from core.model_runtime.entities.common_entities import I18nObject
+        from dify_graph.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/workflow/test_workflow_converter.py b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_converter.py
index c2cf249d61..0c2ccaa051 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
@@ -11,8 +11,8 @@ from core.app.app_config.entities import (
     ModelConfigEntity,
     PromptTemplateEntity,
 )
-from core.model_runtime.entities.llm_entities import LLMMode
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
 from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
 from models import Account, Tenant
 from models.api_based_extension import APIBasedExtension
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 59b6614d5e..f2e57eb65f 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
@@ -13,8 +13,8 @@ from flask import Flask
 from flask.views import MethodView
 from werkzeug.exceptions import Forbidden
 
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.errors.validate import CredentialsValidateFailedError
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.errors.validate import CredentialsValidateFailedError
 
 if not hasattr(builtins, "MethodView"):
     builtins.MethodView = MethodView  # type: ignore[attr-defined]
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 b70e70105c..1923ab7fa7 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
@@ -29,7 +29,7 @@ from controllers.service_api.app.error import (
     UnsupportedAudioTypeError,
 )
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.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 c5b1cbc127..4e4482f704 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
@@ -34,7 +34,7 @@ from controllers.service_api.app.error import (
     NotChatAppError,
 )
 from core.errors.error import QuotaExceededError
-from core.model_runtime.errors.invoke import InvokeError
+from dify_graph.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/core/agent/output_parser/test_cot_output_parser.py b/api/tests/unit_tests/core/agent/output_parser/test_cot_output_parser.py
index 4a613e35b0..ba8c903f65 100644
--- a/api/tests/unit_tests/core/agent/output_parser/test_cot_output_parser.py
+++ b/api/tests/unit_tests/core/agent/output_parser/test_cot_output_parser.py
@@ -3,7 +3,7 @@ from collections.abc import Generator
 
 from core.agent.entities import AgentScratchpadUnit
 from core.agent.output_parser.cot_output_parser import CotAgentOutputParser
-from core.model_runtime.entities.llm_entities import AssistantPromptMessage, LLMResultChunk, LLMResultChunkDelta
+from dify_graph.model_runtime.entities.llm_entities import AssistantPromptMessage, LLMResultChunk, LLMResultChunkDelta
 
 
 def mock_llm_response(text) -> Generator[LLMResultChunk, None, None]:
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 a20725c5b0..de99833aac 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,6 +1,6 @@
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent
 from dify_graph.file.models import FileTransferMethod, FileUploadConfig, ImageConfig
+from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
 
 
 def test_convert_with_vision():
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 e85e6e98d9..67b3777c40 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
@@ -9,8 +9,8 @@ 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 core.model_runtime.entities.message_entities import ImagePromptMessageContent
 from dify_graph.file.enums import FileTransferMethod, FileType
+from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
 from models.enums import CreatorUserRole
 
 
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 40f58c9ddf..13fbca6e26 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
@@ -25,9 +25,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 AppGeneratorTTSPublisher
-from core.model_runtime.entities.llm_entities import LLMResult as RuntimeLLMResult
-from core.model_runtime.entities.message_entities import TextPromptMessageContent
 from core.ops.ops_trace_manager import TraceQueueManager
+from dify_graph.model_runtime.entities.llm_entities import LLMResult as RuntimeLLMResult
+from dify_graph.model_runtime.entities.message_entities import TextPromptMessageContent
 from models.model import AppMode
 
 
diff --git a/api/tests/unit_tests/core/model_runtime/__base/test_increase_tool_call.py b/api/tests/unit_tests/core/model_runtime/__base/test_increase_tool_call.py
index 5fbdabceed..d42b7ca0d9 100644
--- a/api/tests/unit_tests/core/model_runtime/__base/test_increase_tool_call.py
+++ b/api/tests/unit_tests/core/model_runtime/__base/test_increase_tool_call.py
@@ -2,8 +2,8 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from core.model_runtime.entities.message_entities import AssistantPromptMessage
-from core.model_runtime.model_providers.__base.large_language_model import _increase_tool_call
+from dify_graph.model_runtime.entities.message_entities import AssistantPromptMessage
+from dify_graph.model_runtime.model_providers.__base.large_language_model import _increase_tool_call
 
 ToolCall = AssistantPromptMessage.ToolCall
 
@@ -97,7 +97,9 @@ def test__increase_tool_call():
     # case 4:
     mock_id_generator = MagicMock()
     mock_id_generator.side_effect = [_exp_case.id for _exp_case in EXPECTED_CASE_4]
-    with patch("core.model_runtime.model_providers.__base.large_language_model._gen_tool_call_id", mock_id_generator):
+    with patch(
+        "dify_graph.model_runtime.model_providers.__base.large_language_model._gen_tool_call_id", mock_id_generator
+    ):
         _run_case(INPUTS_CASE_4, EXPECTED_CASE_4)
 
 
@@ -107,6 +109,6 @@ def test__increase_tool_call__no_id_no_name_first_delta_should_raise():
         ToolCall(id="", type="function", function=ToolCall.ToolCallFunction(name="func_foo", arguments='"value"}')),
     ]
     actual: list[ToolCall] = []
-    with patch("core.model_runtime.model_providers.__base.large_language_model._gen_tool_call_id", MagicMock()):
+    with patch("dify_graph.model_runtime.model_providers.__base.large_language_model._gen_tool_call_id", MagicMock()):
         with pytest.raises(ValueError):
             _increase_tool_call(inputs, actual)
diff --git a/api/tests/unit_tests/core/model_runtime/__base/test_large_language_model_non_stream_parsing.py b/api/tests/unit_tests/core/model_runtime/__base/test_large_language_model_non_stream_parsing.py
index 09d527cb12..8dcfd10ec6 100644
--- a/api/tests/unit_tests/core/model_runtime/__base/test_large_language_model_non_stream_parsing.py
+++ b/api/tests/unit_tests/core/model_runtime/__base/test_large_language_model_non_stream_parsing.py
@@ -1,10 +1,10 @@
-from core.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from core.model_runtime.entities.message_entities import (
+from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from core.model_runtime.model_providers.__base.large_language_model import _normalize_non_stream_plugin_result
+from dify_graph.model_runtime.model_providers.__base.large_language_model import _normalize_non_stream_plugin_result
 
 
 def _make_chunk(
diff --git a/api/tests/unit_tests/core/model_runtime/entities/test_llm_entities.py b/api/tests/unit_tests/core/model_runtime/entities/test_llm_entities.py
index c10f7b89c3..4e435cb4c6 100644
--- a/api/tests/unit_tests/core/model_runtime/entities/test_llm_entities.py
+++ b/api/tests/unit_tests/core/model_runtime/entities/test_llm_entities.py
@@ -2,7 +2,7 @@
 
 from decimal import Decimal
 
-from core.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage, LLMUsageMetadata
 
 
 class TestLLMUsage:
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 9e871fcb74..4f038d4a5b 100644
--- a/api/tests/unit_tests/core/plugin/test_plugin_runtime.py
+++ b/api/tests/unit_tests/core/plugin/test_plugin_runtime.py
@@ -19,14 +19,6 @@ import httpx
 import pytest
 from pydantic import BaseModel
 
-from core.model_runtime.errors.invoke import (
-    InvokeAuthorizationError,
-    InvokeBadRequestError,
-    InvokeConnectionError,
-    InvokeRateLimitError,
-    InvokeServerUnavailableError,
-)
-from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.plugin.entities.plugin_daemon import (
     CredentialType,
     PluginDaemonInnerError,
@@ -44,6 +36,14 @@ from core.plugin.impl.exc import (
 )
 from core.plugin.impl.plugin import PluginInstaller
 from core.plugin.impl.tool import PluginToolManager
+from dify_graph.model_runtime.errors.invoke import (
+    InvokeAuthorizationError,
+    InvokeBadRequestError,
+    InvokeConnectionError,
+    InvokeRateLimitError,
+    InvokeServerUnavailableError,
+)
+from dify_graph.model_runtime.errors.validate import CredentialsValidateFailedError
 
 
 class TestPluginRuntimeExecution:
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 786264513c..3e184cbf21 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
@@ -5,16 +5,16 @@ 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.model_runtime.entities.message_entities import (
+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 dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     ImagePromptMessageContent,
     PromptMessageRole,
     UserPromptMessage,
 )
-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 dify_graph.file import File, FileTransferMethod, FileType
 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 d157a41d2c..634703740c 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
@@ -5,14 +5,14 @@ from core.app.entities.app_invoke_entities import (
 )
 from core.entities.provider_configuration import ProviderModelBundle
 from core.memory.token_buffer_memory import TokenBufferMemory
-from core.model_runtime.entities.message_entities import (
+from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     SystemPromptMessage,
     ToolPromptMessage,
     UserPromptMessage,
 )
-from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
+from dify_graph.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 e5da51d733..4136816562 100644
--- a/api/tests/unit_tests/core/prompt/test_prompt_message.py
+++ b/api/tests/unit_tests/core/prompt/test_prompt_message.py
@@ -1,4 +1,4 @@
-from core.model_runtime.entities.message_entities import (
+from dify_graph.model_runtime.entities.message_entities import (
     ImagePromptMessageContent,
     TextPromptMessageContent,
     UserPromptMessage,
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 16896a0c6c..7976120547 100644
--- a/api/tests/unit_tests/core/prompt/test_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_prompt_transform.py
@@ -2,10 +2,10 @@
 
 # from core.app.app_config.entities import ModelConfigEntity
 # from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
-# from core.model_runtime.entities.message_entities import UserPromptMessage
-# from core.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey, ParameterRule
-# from core.model_runtime.entities.provider_entities import ProviderEntity
-# from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
+# from dify_graph.model_runtime.entities.message_entities import UserPromptMessage
+# from dify_graph.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey, ParameterRule
+# from dify_graph.model_runtime.entities.provider_entities import ProviderEntity
+# from dify_graph.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 # from core.prompt.prompt_transform import PromptTransform
 
 
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 c822ecbe78..2ef66e8a96 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,8 +2,8 @@ from unittest.mock import MagicMock
 
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.memory.token_buffer_memory import TokenBufferMemory
-from core.model_runtime.entities.message_entities import AssistantPromptMessage, UserPromptMessage
 from core.prompt.simple_prompt_transform import SimplePromptTransform
+from dify_graph.model_runtime.entities.message_entities import AssistantPromptMessage, UserPromptMessage
 from models.model import AppMode, Conversation
 
 
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 63596bc320..6e71f0c61f 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
@@ -52,14 +52,14 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 
 from core.entities.embedding_type import EmbeddingInputType
-from core.model_runtime.entities.model_entities import ModelPropertyKey
-from core.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
-from core.model_runtime.errors.invoke import (
+from core.rag.embedding.cached_embedding import CacheEmbedding
+from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey
+from dify_graph.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
+from dify_graph.model_runtime.errors.invoke import (
     InvokeAuthorizationError,
     InvokeConnectionError,
     InvokeRateLimitError,
 )
-from core.rag.embedding.cached_embedding import CacheEmbedding
 from models.dataset import Embedding
 
 
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 c00fee8fe5..b011ade884 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
@@ -61,9 +61,9 @@ from core.indexing_runner import (
     DocumentIsPausedError,
     IndexingRunner,
 )
-from core.model_runtime.entities.model_entities import ModelType
 from core.rag.index_processor.constant.index_type import IndexStructureType
 from core.rag.models.document import ChildDocument, Document
+from dify_graph.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 e4597e7f8c..0e53482c51 100644
--- a/api/tests/unit_tests/core/rag/rerank/test_reranker.py
+++ b/api/tests/unit_tests/core/rag/rerank/test_reranker.py
@@ -17,13 +17,13 @@ from unittest.mock import MagicMock, Mock, patch
 import pytest
 
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.rerank_entities import RerankDocument, RerankResult
 from core.rag.models.document import Document
 from core.rag.rerank.entity.weight import KeywordSetting, VectorSetting, Weights
 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 dify_graph.model_runtime.entities.rerank_entities import RerankDocument, RerankResult
 
 
 def create_mock_model_instance():
diff --git a/api/tests/unit_tests/core/test_model_manager.py b/api/tests/unit_tests/core/test_model_manager.py
index 5a7547e85c..92e4b58473 100644
--- a/api/tests/unit_tests/core/test_model_manager.py
+++ b/api/tests/unit_tests/core/test_model_manager.py
@@ -6,7 +6,7 @@ from pytest_mock import MockerFixture
 
 from core.entities.provider_entities import ModelLoadBalancingConfiguration
 from core.model_manager import LBModelManager
-from core.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from extensions.ext_redis import redis_client
 
 
diff --git a/api/tests/unit_tests/core/test_provider_configuration.py b/api/tests/unit_tests/core/test_provider_configuration.py
index 636fac7a40..90ed1647aa 100644
--- a/api/tests/unit_tests/core/test_provider_configuration.py
+++ b/api/tests/unit_tests/core/test_provider_configuration.py
@@ -12,9 +12,9 @@ from core.entities.provider_entities import (
     RestrictModel,
     SystemConfiguration,
 )
-from core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.entities.provider_entities import (
+from dify_graph.model_runtime.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.provider_entities import (
     ConfigurateMethod,
     CredentialFormSchema,
     FormOption,
diff --git a/api/tests/unit_tests/core/test_provider_manager.py b/api/tests/unit_tests/core/test_provider_manager.py
index 3163d53b87..3abfb8c9f8 100644
--- a/api/tests/unit_tests/core/test_provider_manager.py
+++ b/api/tests/unit_tests/core/test_provider_manager.py
@@ -2,8 +2,8 @@ import pytest
 from pytest_mock import MockerFixture
 
 from core.entities.provider_entities import ModelSettings
-from core.model_runtime.entities.model_entities import ModelType
 from core.provider_manager import ProviderManager
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from models.provider import LoadBalancingModelConfig, ProviderModelSetting
 
 
diff --git a/api/tests/unit_tests/core/workflow/entities/test_graph_runtime_state.py b/api/tests/unit_tests/core/workflow/entities/test_graph_runtime_state.py
index b472ffdf1f..0df4927697 100644
--- a/api/tests/unit_tests/core/workflow/entities/test_graph_runtime_state.py
+++ b/api/tests/unit_tests/core/workflow/entities/test_graph_runtime_state.py
@@ -4,7 +4,7 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from core.model_runtime.entities.llm_entities import LLMUsage
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
 
 
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 2b882512c9..352e270fe4 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
@@ -4,10 +4,10 @@ from unittest.mock import MagicMock, patch
 
 from core.app.workflow.layers.llm_quota import LLMQuotaLayer
 from core.errors.error import QuotaExceededError
-from core.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
 from dify_graph.graph_engine.entities.commands import CommandType
 from dify_graph.graph_events.node import NodeRunSucceededEvent
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.node_events import NodeRunResult
 
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_state_snapshot.py b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_state_snapshot.py
index 0403e91461..84e033156d 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_graph_state_snapshot.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_graph_state_snapshot.py
@@ -1,13 +1,13 @@
 import time
 from collections.abc import Mapping
 
-from core.model_runtime.entities.llm_entities import LLMMode
-from core.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.entities import GraphInitParams
 from dify_graph.enums import NodeState
 from dify_graph.graph import Graph
 from dify_graph.graph_engine.graph_state_manager import GraphStateManager
 from dify_graph.graph_engine.ready_queue import InMemoryReadyQueue
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.nodes.end.end_node import EndNode
 from dify_graph.nodes.end.entities import EndNodeData
 from dify_graph.nodes.llm.entities import (
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_multi_branch.py b/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_multi_branch.py
index 9c075c31f4..695e99c1cf 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_multi_branch.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_multi_branch.py
@@ -4,7 +4,6 @@ from collections.abc import Iterable
 from unittest import mock
 from unittest.mock import MagicMock
 
-from core.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.entities import GraphInitParams
 from dify_graph.graph import Graph
 from dify_graph.graph_events import (
@@ -17,6 +16,7 @@ from dify_graph.graph_events import (
     NodeRunSucceededEvent,
 )
 from dify_graph.graph_events.node import NodeRunHumanInputFormFilledEvent
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.nodes.base.entities import OutputVariableEntity, OutputVariableType
 from dify_graph.nodes.end.end_node import EndNode
 from dify_graph.nodes.end.entities import EndNodeData
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_single_branch.py b/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_single_branch.py
index 4f458a41d9..0275062c41 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_single_branch.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_human_input_pause_single_branch.py
@@ -3,7 +3,6 @@ import time
 from unittest import mock
 from unittest.mock import MagicMock
 
-from core.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.entities import GraphInitParams
 from dify_graph.graph import Graph
 from dify_graph.graph_events import (
@@ -16,6 +15,7 @@ from dify_graph.graph_events import (
     NodeRunSucceededEvent,
 )
 from dify_graph.graph_events.node import NodeRunHumanInputFormFilledEvent
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.nodes.base.entities import OutputVariableEntity, OutputVariableType
 from dify_graph.nodes.end.end_node import EndNode
 from dify_graph.nodes.end.entities import EndNodeData
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_if_else_streaming.py b/api/tests/unit_tests/core/workflow/graph_engine/test_if_else_streaming.py
index de5d87ddad..fbcb8d7155 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_if_else_streaming.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_if_else_streaming.py
@@ -1,8 +1,6 @@
 import time
 from unittest import mock
 
-from core.model_runtime.entities.llm_entities import LLMMode
-from core.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.entities import GraphInitParams
 from dify_graph.graph import Graph
 from dify_graph.graph_events import (
@@ -12,6 +10,8 @@ from dify_graph.graph_events import (
     NodeRunStreamChunkEvent,
     NodeRunSucceededEvent,
 )
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.nodes.base.entities import OutputVariableEntity, OutputVariableType
 from dify_graph.nodes.end.end_node import EndNode
 from dify_graph.nodes.end.entities import EndNodeData
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 2c46cc53be..ad71227205 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
@@ -11,8 +11,8 @@ from typing import TYPE_CHECKING, Any, Optional
 from unittest.mock import MagicMock
 
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
 from dify_graph.nodes.agent import AgentNode
 from dify_graph.nodes.code import CodeNode
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_pause_missing_finish.py b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_pause_missing_finish.py
index 9d05dc5bd0..910292b52c 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_pause_missing_finish.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_pause_missing_finish.py
@@ -4,8 +4,6 @@ from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Any
 
-from core.model_runtime.entities.llm_entities import LLMMode
-from core.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.entities import GraphInitParams
 from dify_graph.entities.workflow_start_reason import WorkflowStartReason
 from dify_graph.graph import Graph
@@ -19,6 +17,8 @@ from dify_graph.graph_events import (
     NodeRunStartedEvent,
     NodeRunSucceededEvent,
 )
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.nodes.human_input.entities import HumanInputNodeData, UserAction
 from dify_graph.nodes.human_input.enums import HumanInputFormStatus
 from dify_graph.nodes.human_input.human_input_node import HumanInputNode
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_pause_deferred_ready_nodes.py b/api/tests/unit_tests/core/workflow/graph_engine/test_pause_deferred_ready_nodes.py
index ab212a9403..e5a9a29a1f 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_pause_deferred_ready_nodes.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_pause_deferred_ready_nodes.py
@@ -4,8 +4,6 @@ from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Any
 
-from core.model_runtime.entities.llm_entities import LLMMode
-from core.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.entities import GraphInitParams
 from dify_graph.entities.workflow_start_reason import WorkflowStartReason
 from dify_graph.graph import Graph
@@ -18,6 +16,8 @@ from dify_graph.graph_events import (
     NodeRunStartedEvent,
     NodeRunSucceededEvent,
 )
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.nodes.end.end_node import EndNode
 from dify_graph.nodes.end.entities import EndNodeData
 from dify_graph.nodes.human_input.entities import HumanInputNodeData, UserAction
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 5dcf36ed6a..98246ccb2f 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
@@ -5,9 +5,9 @@ from unittest.mock import Mock
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.entities import GraphInitParams
 from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.nodes.knowledge_retrieval.entities import (
     KnowledgeRetrievalNodeData,
     MultipleRetrievalConfig,
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 aac5c296d8..18ec3c0dc4 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
@@ -10,8 +10,11 @@ from core.app.llm.model_access import DifyCredentialsProvider, DifyModelFactory,
 from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
 from core.entities.provider_entities import CustomConfiguration, SystemConfiguration
 from core.model_manager import ModelInstance
-from core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.message_entities import (
+from core.prompt.entities.advanced_prompt_entities import MemoryConfig
+from dify_graph.entities import GraphInitParams
+from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.model_runtime.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     ImagePromptMessageContent,
     PromptMessage,
@@ -19,11 +22,8 @@ from core.model_runtime.entities.message_entities import (
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
-from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
-from core.prompt.entities.advanced_prompt_entities import MemoryConfig
-from dify_graph.entities import GraphInitParams
-from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
+from dify_graph.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from dify_graph.nodes.llm import llm_utils
 from dify_graph.nodes.llm.entities import (
     ContextConfig,
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_scenarios.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_scenarios.py
index 44dbabb116..e40d565ef5 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_scenarios.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_scenarios.py
@@ -2,9 +2,9 @@ from collections.abc import Mapping, Sequence
 
 from pydantic import BaseModel, Field
 
-from core.model_runtime.entities.message_entities import PromptMessage
-from core.model_runtime.entities.model_entities import ModelFeature
 from dify_graph.file import File
+from dify_graph.model_runtime.entities.message_entities import PromptMessage
+from dify_graph.model_runtime.entities.model_entities import ModelFeature
 from dify_graph.nodes.llm.entities import LLMNodeChatModelMessage
 
 
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 110fdeedfb..7eca531b62 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
@@ -7,7 +7,7 @@ from typing import Any
 
 import pytest
 
-from core.model_runtime.entities import LLMMode
+from dify_graph.model_runtime.entities import LLMMode
 from dify_graph.nodes.llm import ModelConfig, VisionConfig
 from dify_graph.nodes.parameter_extractor.entities import ParameterConfig, ParameterExtractorNodeData
 from dify_graph.nodes.parameter_extractor.exc import (
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_question_classifier_node.py b/api/tests/unit_tests/core/workflow/nodes/test_question_classifier_node.py
index 1b72589cba..4dfec5ef60 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_question_classifier_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_question_classifier_node.py
@@ -1,4 +1,4 @@
-from core.model_runtime.entities import ImagePromptMessageContent
+from dify_graph.model_runtime.entities import ImagePromptMessageContent
 from dify_graph.nodes.question_classifier import QuestionClassifierNodeData
 
 
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 c6e40bbd84..3d88baa272 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,11 +8,11 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from core.model_runtime.entities.llm_entities import LLMUsage
 from core.tools.entities.tool_entities import ToolInvokeMessage
 from core.tools.utils.message_transformer import ToolFileMessageTransformer
 from dify_graph.entities import GraphInitParams
 from dify_graph.file import File, FileTransferMethod, FileType
+from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.node_events import StreamChunkEvent, StreamCompletedEvent
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
diff --git a/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py b/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py
index 10a108d425..06703b8e38 100644
--- a/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py
+++ b/api/tests/unit_tests/repositories/workflow_node_execution/test_sqlalchemy_repository.py
@@ -12,7 +12,6 @@ import pytest
 from pytest_mock import MockerFixture
 from sqlalchemy.orm import Session, sessionmaker
 
-from core.model_runtime.utils.encoders import jsonable_encoder
 from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
 from dify_graph.entities import (
     WorkflowNodeExecution,
@@ -22,6 +21,7 @@ from dify_graph.enums import (
     WorkflowNodeExecutionMetadataKey,
     WorkflowNodeExecutionStatus,
 )
+from dify_graph.model_runtime.utils.encoders import jsonable_encoder
 from dify_graph.repositories.workflow_node_execution_repository import OrderConfig
 from models.account import Account, Tenant
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom
diff --git a/api/tests/unit_tests/services/document_service_validation.py b/api/tests/unit_tests/services/document_service_validation.py
index 4923e29d73..6829691507 100644
--- a/api/tests/unit_tests/services/document_service_validation.py
+++ b/api/tests/unit_tests/services/document_service_validation.py
@@ -111,7 +111,7 @@ from unittest.mock import Mock, patch
 import pytest
 
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
-from core.model_runtime.entities.model_entities import ModelType
+from dify_graph.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/test_dataset_service_create_dataset.py b/api/tests/unit_tests/services/test_dataset_service_create_dataset.py
index 7c7a70f962..87a0d6b678 100644
--- a/api/tests/unit_tests/services/test_dataset_service_create_dataset.py
+++ b/api/tests/unit_tests/services/test_dataset_service_create_dataset.py
@@ -13,7 +13,7 @@ from uuid import uuid4
 
 import pytest
 
-from core.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.model_entities import ModelType
 from models.account import Account
 from models.dataset import Dataset, Pipeline
 from services.dataset_service import DatasetService
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 e2360b116d..6a6b63f003 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
@@ -3,9 +3,9 @@ import types
 import pytest
 
 from core.entities.provider_entities import CredentialConfiguration, CustomModelConfiguration
-from core.model_runtime.entities.common_entities import I18nObject
-from core.model_runtime.entities.model_entities import ModelType
-from core.model_runtime.entities.provider_entities import ConfigurateMethod
+from dify_graph.model_runtime.entities.common_entities import I18nObject
+from dify_graph.model_runtime.entities.model_entities import ModelType
+from dify_graph.model_runtime.entities.provider_entities import ConfigurateMethod
 from models.provider import ProviderType
 from services.model_provider_service import ModelProviderService
 
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_converter.py b/api/tests/unit_tests/services/workflow/test_workflow_converter.py
index fefd771546..a847c2b4d1 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_converter.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_converter.py
@@ -15,8 +15,8 @@ from core.app.app_config.entities import (
     PromptTemplateEntity,
 )
 from core.helper import encrypter
-from core.model_runtime.entities.llm_entities import LLMMode
-from core.model_runtime.entities.message_entities import PromptMessageRole
+from dify_graph.model_runtime.entities.llm_entities import LLMMode
+from dify_graph.model_runtime.entities.message_entities import PromptMessageRole
 from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
 from models.api_based_extension import APIBasedExtension, APIBasedExtensionPoint
 from models.model import AppMode
diff --git a/api/tests/unit_tests/tools/test_mcp_tool.py b/api/tests/unit_tests/tools/test_mcp_tool.py
index 5930b63f58..fa9c6af287 100644
--- a/api/tests/unit_tests/tools/test_mcp_tool.py
+++ b/api/tests/unit_tests/tools/test_mcp_tool.py
@@ -13,11 +13,11 @@ from core.mcp.types import (
     TextContent,
     TextResourceContents,
 )
-from core.model_runtime.entities.llm_entities import LLMUsage
 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 dify_graph.model_runtime.entities.llm_entities import LLMUsage
 
 
 def _make_mcp_tool(output_schema: dict | 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 9a0dbfa2d8..7ec1343f98 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
@@ -5,7 +5,7 @@ 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 core.model_runtime.entities.llm_entities import (
+from dify_graph.model_runtime.entities.llm_entities import (
     LLMResult,
     LLMResultChunk,
     LLMResultChunkDelta,
@@ -13,13 +13,13 @@ from core.model_runtime.entities.llm_entities import (
     LLMResultWithStructuredOutput,
     LLMUsage,
 )
-from core.model_runtime.entities.message_entities import (
+from dify_graph.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
     SystemPromptMessage,
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from core.model_runtime.entities.model_entities import AIModelEntity, ModelType
+from dify_graph.model_runtime.entities.model_entities import AIModelEntity, ModelType
 
 
 def create_mock_usage(prompt_tokens: int = 10, completion_tokens: int = 5) -> LLMUsage:

From d6ab36ff1ea263bc1249520b31e379f5e7985d10 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <hi@hyoban.cc>
Date: Tue, 3 Mar 2026 11:21:04 +0800
Subject: [PATCH 16/22] chore: update vinext, add workaround (#32878)

---
 .../components/devtools/react-scan/loader.tsx |  20 +--
 .../components/devtools/react-scan/scan.tsx   |  22 ---
 .../plugins/marketplace/hydration-server.tsx  |   4 +
 web/app/layout.tsx                            |   3 +-
 web/app/sw.ts                                 |   1 -
 web/package.json                              |   4 +-
 web/pnpm-lock.yaml                            | 144 +++++++-----------
 7 files changed, 74 insertions(+), 124 deletions(-)
 delete mode 100644 web/app/components/devtools/react-scan/scan.tsx

diff --git a/web/app/components/devtools/react-scan/loader.tsx b/web/app/components/devtools/react-scan/loader.tsx
index ee702216f7..a5956d7825 100644
--- a/web/app/components/devtools/react-scan/loader.tsx
+++ b/web/app/components/devtools/react-scan/loader.tsx
@@ -1,21 +1,15 @@
-'use client'
-
-import { lazy, Suspense } from 'react'
+import Script from 'next/script'
 import { IS_DEV } from '@/config'
 
-const ReactScan = lazy(() =>
-  import('./scan').then(module => ({
-    default: module.ReactScan,
-  })),
-)
-
-export const ReactScanLoader = () => {
+export function ReactScanLoader() {
   if (!IS_DEV)
     return null
 
   return (
-    <Suspense fallback={null}>
-      <ReactScan />
-    </Suspense>
+    <Script
+      src="//unpkg.com/react-scan/dist/auto.global.js"
+      crossOrigin="anonymous"
+      strategy="beforeInteractive"
+    />
   )
 }
diff --git a/web/app/components/devtools/react-scan/scan.tsx b/web/app/components/devtools/react-scan/scan.tsx
deleted file mode 100644
index f1d9f3de20..0000000000
--- a/web/app/components/devtools/react-scan/scan.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client'
-
-import { useEffect } from 'react'
-import { scan } from 'react-scan'
-import { IS_DEV } from '@/config'
-
-export function ReactScan() {
-  useEffect(() => {
-    if (IS_DEV) {
-      scan({
-        enabled: true,
-        // HACK: react-scan's getIsProduction() incorrectly detects Next.js dev as production
-        // because Next.js devtools overlay uses production React build
-        // Issue: https://github.com/aidenybai/react-scan/issues/402
-        // TODO: remove this option after upstream fix
-        dangerouslyForceRunInProduction: true,
-      })
-    }
-  }, [])
-
-  return null
-}
diff --git a/web/app/components/plugins/marketplace/hydration-server.tsx b/web/app/components/plugins/marketplace/hydration-server.tsx
index bf01f4d4ed..287bcbe8c0 100644
--- a/web/app/components/plugins/marketplace/hydration-server.tsx
+++ b/web/app/components/plugins/marketplace/hydration-server.tsx
@@ -37,6 +37,10 @@ export async function HydrateQueryClient({
   children: React.ReactNode
 }) {
   const dehydratedState = await getDehydratedState(searchParams)
+  // TODO: vinext do not handle hydration boundary well for now.
+  if (!dehydratedState) {
+    return <>{children}</>
+  }
   return (
     <HydrationBoundary state={dehydratedState}>
       {children}
diff --git a/web/app/layout.tsx b/web/app/layout.tsx
index 64f0e5ac3b..fd81e09cb6 100644
--- a/web/app/layout.tsx
+++ b/web/app/layout.tsx
@@ -55,6 +55,8 @@ const LocaleLayout = async ({
         <link rel="icon" type="image/png" sizes="16x16" href="/icon-192x192.png" />
         <meta name="msapplication-TileColor" content="#1C64F2" />
         <meta name="msapplication-config" content="/browserconfig.xml" />
+
+        <ReactScanLoader />
       </head>
       <body
         className="h-full select-auto"
@@ -62,7 +64,6 @@ const LocaleLayout = async ({
       >
         <div className="isolate h-full">
           <PWAProvider>
-            <ReactScanLoader />
             <JotaiProvider>
               <ThemeProvider
                 attribute="data-theme"
diff --git a/web/app/sw.ts b/web/app/sw.ts
index f4011ee224..e01ad21004 100644
--- a/web/app/sw.ts
+++ b/web/app/sw.ts
@@ -1,4 +1,3 @@
-/// <reference no-default-lib="true" />
 /// <reference lib="esnext" />
 /// <reference lib="webworker" />
 
diff --git a/web/package.json b/web/package.json
index f0d4fdd1fc..833e7f9af6 100644
--- a/web/package.json
+++ b/web/package.json
@@ -237,7 +237,7 @@
     "nock": "14.0.10",
     "postcss": "8.5.6",
     "postcss-js": "5.0.3",
-    "react-scan": "0.4.3",
+    "react-scan": "0.5.3",
     "react-server-dom-webpack": "19.2.4",
     "sass": "1.93.2",
     "serwist": "9.5.4",
@@ -246,7 +246,7 @@
     "tsx": "4.21.0",
     "typescript": "5.9.3",
     "uglify-js": "3.19.3",
-    "vinext": "https://pkg.pr.new/hyoban/vinext@e283197",
+    "vinext": "https://pkg.pr.new/hyoban/vinext@cfae669",
     "vite": "7.3.1",
     "vite-tsconfig-paths": "6.1.1",
     "vitest": "4.0.18",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index a754e0aa7a..b51d4ddd4d 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -578,8 +578,8 @@ importers:
         specifier: 5.0.3
         version: 5.0.3(postcss@8.5.6)
       react-scan:
-        specifier: 0.4.3
-        version: 0.4.3(@types/react@19.2.9)(next@16.1.5(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(rollup@4.56.0)
+        specifier: 0.5.3
+        version: 0.5.3(@types/react@19.2.9)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(rollup@4.56.0)
       react-server-dom-webpack:
         specifier: 19.2.4
         version: 19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.104.1(esbuild@0.27.2)(uglify-js@3.19.3))
@@ -605,8 +605,8 @@ importers:
         specifier: 3.19.3
         version: 3.19.3
       vinext:
-        specifier: https://pkg.pr.new/hyoban/vinext@e283197
-        version: https://pkg.pr.new/hyoban/vinext@e283197(next@16.1.5(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@5.9.3)(vite@7.3.1(@types/node@24.10.12)(jiti@1.21.7)(sass@1.93.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(webpack@5.104.1(esbuild@0.27.2)(uglify-js@3.19.3))
+        specifier: https://pkg.pr.new/hyoban/vinext@cfae669
+        version: https://pkg.pr.new/hyoban/vinext@cfae669(next@16.1.5(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@5.9.3)(vite@7.3.1(@types/node@24.10.12)(jiti@1.21.7)(sass@1.93.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(webpack@5.104.1(esbuild@0.27.2)(uglify-js@3.19.3))
       vite:
         specifier: 7.3.1
         version: 7.3.1(@types/node@24.10.12)(jiti@1.21.7)(sass@1.93.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
@@ -2160,12 +2160,6 @@ packages:
     resolution: {integrity: sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==}
     engines: {node: '>= 10.0.0'}
 
-  '@pivanov/utils@0.0.2':
-    resolution: {integrity: sha512-q9CN0bFWxWgMY5hVVYyBgez1jGiLBa6I+LkG37ycylPhFvEGOOeaADGtUSu46CaZasPnlY8fCdVJZmrgKb1EPA==}
-    peerDependencies:
-      react: '>=18'
-      react-dom: '>=18'
-
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
@@ -3888,8 +3882,8 @@ packages:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
-  bippy@0.3.34:
-    resolution: {integrity: sha512-vmptmU/20UdIWHHhq7qCSHhHzK7Ro3YJ1utU0fBG7ujUc58LEfTtilKxcF0IOgSjT5XLcm7CBzDjbv4lcKApGQ==}
+  bippy@0.5.30:
+    resolution: {integrity: sha512-8CFmJAHD3gmTLDOCDHuWhjm1nxHSFZdlGoWtak9r53Uxn36ynOjxBLyxXHh/7h/XiKLyPvfdXa0gXWcD9o9lLQ==}
     peerDependencies:
       react: '>=17.0.1'
 
@@ -4133,6 +4127,10 @@ packages:
     resolution: {integrity: sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==}
     engines: {node: '>=18'}
 
+  commander@14.0.3:
+    resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==}
+    engines: {node: '>=20'}
+
   commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
@@ -5122,11 +5120,6 @@ packages:
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
-  fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -5649,8 +5642,8 @@ packages:
   khroma@2.1.0:
     resolution: {integrity: sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==}
 
-  kleur@4.1.5:
-    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
+  kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
 
   knip@5.78.0:
@@ -6089,10 +6082,6 @@ packages:
   moo-color@1.0.3:
     resolution: {integrity: sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==}
 
-  mri@1.2.0:
-    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
-    engines: {node: '>=4'}
-
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
@@ -6381,16 +6370,6 @@ packages:
   pkg-types@2.3.0:
     resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==}
 
-  playwright-core@1.58.0:
-    resolution: {integrity: sha512-aaoB1RWrdNi3//rOeKuMiS65UCcgOVljU46At6eFcOFPFHWtd2weHRRow6z/n+Lec0Lvu0k9ZPKJSjPugikirw==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  playwright@1.58.0:
-    resolution: {integrity: sha512-2SVA0sbPktiIY/MCOPX8e86ehA/e+tDNq+e5Y8qjKYti2Z/JG7xnronT/TXTIkKbYGWlCbuucZ6dziEgkoEjQQ==}
-    engines: {node: '>=18'}
-    hasBin: true
-
   pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
@@ -6498,6 +6477,10 @@ packages:
     resolution: {integrity: sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==}
     engines: {node: '>=6'}
 
+  prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+
   prop-types@15.8.1:
     resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
 
@@ -6669,25 +6652,12 @@ packages:
       react: '>=16.3.0'
       react-dom: '>=16.3.0'
 
-  react-scan@0.4.3:
-    resolution: {integrity: sha512-jhAQuQ1nja6HUYrSpbmNFHqZPsRCXk8Yqu0lHoRIw9eb8N96uTfXCpVyQhTTnJ/nWqnwuvxbpKVG/oWZT8+iTQ==}
+  react-scan@0.5.3:
+    resolution: {integrity: sha512-qde9PupmUf0L3MU1H6bjmoukZNbCXdMyTEwP4Gh8RQ4rZPd2GGNBgEKWszwLm96E8k+sGtMpc0B9P0KyFDP6Bw==}
     hasBin: true
     peerDependencies:
-      '@remix-run/react': '>=1.0.0'
-      next: '>=13.0.0'
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      react-router: ^5.0.0 || ^6.0.0 || ^7.0.0
-      react-router-dom: ^5.0.0 || ^6.0.0 || ^7.0.0
-    peerDependenciesMeta:
-      '@remix-run/react':
-        optional: true
-      next:
-        optional: true
-      react-router:
-        optional: true
-      react-router-dom:
-        optional: true
 
   react-server-dom-webpack@19.2.4:
     resolution: {integrity: sha512-zEhkWv6RhXDctC2N7yEUHg3751nvFg81ydHj8LTTZuukF/IF1gcOKqqAL6Ds+kS5HtDVACYPik0IvzkgYXPhlQ==}
@@ -7564,8 +7534,8 @@ packages:
   vfile@6.0.3:
     resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
-  vinext@https://pkg.pr.new/hyoban/vinext@e283197:
-    resolution: {tarball: https://pkg.pr.new/hyoban/vinext@e283197}
+  vinext@https://pkg.pr.new/hyoban/vinext@cfae669:
+    resolution: {integrity: sha512-4SRm/Dkou0Ib0UYexP8xg0G83jIM17XPUC32uXwLHt5lO47AisblMpDZXTh84fhN058FEHtPaAGtoFThaoZLIw==, tarball: https://pkg.pr.new/hyoban/vinext@cfae669}
     version: 0.0.5
     engines: {node: '>=22'}
     hasBin: true
@@ -7574,6 +7544,12 @@ packages:
       react-dom: '>=19.2.0'
       vite: ^7.0.0
 
+  vite-plugin-commonjs@0.10.4:
+    resolution: {integrity: sha512-eWQuvQKCcx0QYB5e5xfxBNjQKyrjEWZIR9UOkOV6JAgxVhtbZvCOF+FNC2ZijBJ3U3Px04ZMMyyMyFBVWIJ5+g==}
+
+  vite-plugin-dynamic-import@1.6.0:
+    resolution: {integrity: sha512-TM0sz70wfzTIo9YCxVFwS8OA9lNREsh+0vMHGSkWDTZ7bgd1Yjs5RV8EgB634l/91IsXJReg0xtmuQqP0mf+rg==}
+
   vite-plugin-storybook-nextjs@3.2.2:
     resolution: {integrity: sha512-ZJXCrhi9mW4jEJTKhJ5sUtpBe84mylU40me2aMuLSgIJo4gE/Rc559hZvMYLFTWta1gX7Rm8Co5EEHakPct+wA==}
     peerDependencies:
@@ -9675,11 +9651,6 @@ snapshots:
       '@parcel/watcher-win32-x64': 2.5.6
     optional: true
 
-  '@pivanov/utils@0.0.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
@@ -11547,7 +11518,7 @@ snapshots:
 
   binary-extensions@2.3.0: {}
 
-  bippy@0.3.34(@types/react@19.2.9)(react@19.2.4):
+  bippy@0.5.30(@types/react@19.2.9)(react@19.2.4):
     dependencies:
       '@types/react-reconciler': 0.28.9(@types/react@19.2.9)
       react: 19.2.4
@@ -11800,6 +11771,8 @@ snapshots:
 
   commander@13.1.0: {}
 
+  commander@14.0.3: {}
+
   commander@2.20.3: {}
 
   commander@4.1.1: {}
@@ -12998,9 +12971,6 @@ snapshots:
   fs-constants@1.0.0:
     optional: true
 
-  fsevents@2.3.2:
-    optional: true
-
   fsevents@2.3.3:
     optional: true
 
@@ -13548,7 +13518,7 @@ snapshots:
 
   khroma@2.1.0: {}
 
-  kleur@4.1.5: {}
+  kleur@3.0.3: {}
 
   knip@5.78.0(@types/node@24.10.12)(typescript@5.9.3):
     dependencies:
@@ -14301,8 +14271,6 @@ snapshots:
     dependencies:
       color-name: 1.1.4
 
-  mri@1.2.0: {}
-
   ms@2.1.3: {}
 
   mz@2.7.0:
@@ -14591,14 +14559,6 @@ snapshots:
       exsolve: 1.0.8
       pathe: 2.0.3
 
-  playwright-core@1.58.0: {}
-
-  playwright@1.58.0:
-    dependencies:
-      playwright-core: 1.58.0
-    optionalDependencies:
-      fsevents: 2.3.2
-
   pluralize@8.0.0: {}
 
   pnpm-workspace-yaml@1.6.0:
@@ -14708,6 +14668,11 @@ snapshots:
 
   prismjs@1.30.0: {}
 
+  prompts@2.4.2:
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+
   prop-types@15.8.1:
     dependencies:
       loose-envify: 1.4.0
@@ -14894,29 +14859,24 @@ snapshots:
       react-draggable: 4.4.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       tslib: 2.6.2
 
-  react-scan@0.4.3(@types/react@19.2.9)(next@16.1.5(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(rollup@4.56.0):
+  react-scan@0.5.3(@types/react@19.2.9)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(rollup@4.56.0):
     dependencies:
-      '@babel/core': 7.28.6
-      '@babel/generator': 7.28.6
-      '@babel/types': 7.28.6
-      '@clack/core': 0.3.5
-      '@clack/prompts': 0.8.2
-      '@pivanov/utils': 0.0.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@babel/core': 7.29.0
+      '@babel/generator': 7.29.1
+      '@babel/types': 7.29.0
       '@preact/signals': 1.3.2(preact@10.28.2)
       '@rollup/pluginutils': 5.3.0(rollup@4.56.0)
       '@types/node': 20.19.30
-      bippy: 0.3.34(@types/react@19.2.9)(react@19.2.4)
+      bippy: 0.5.30(@types/react@19.2.9)(react@19.2.4)
+      commander: 14.0.3
       esbuild: 0.27.2
       estree-walker: 3.0.3
-      kleur: 4.1.5
-      mri: 1.2.0
-      playwright: 1.58.0
+      picocolors: 1.1.1
       preact: 10.28.2
+      prompts: 2.4.2
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
-      tsx: 4.21.0
     optionalDependencies:
-      next: 16.1.5(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2)
       unplugin: 2.1.0
     transitivePeerDependencies:
       - '@types/react'
@@ -15858,7 +15818,7 @@ snapshots:
 
   unplugin@2.1.0:
     dependencies:
-      acorn: 8.15.0
+      acorn: 8.16.0
       webpack-virtual-modules: 0.6.2
     optional: true
 
@@ -15949,7 +15909,7 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vinext@https://pkg.pr.new/hyoban/vinext@e283197(next@16.1.5(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@5.9.3)(vite@7.3.1(@types/node@24.10.12)(jiti@1.21.7)(sass@1.93.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(webpack@5.104.1(esbuild@0.27.2)(uglify-js@3.19.3)):
+  vinext@https://pkg.pr.new/hyoban/vinext@cfae669(next@16.1.5(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@5.9.3)(vite@7.3.1(@types/node@24.10.12)(jiti@1.21.7)(sass@1.93.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(webpack@5.104.1(esbuild@0.27.2)(uglify-js@3.19.3)):
     dependencies:
       '@unpic/react': 1.0.2(next@16.1.5(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@vercel/og': 0.8.6
@@ -15960,6 +15920,7 @@ snapshots:
       react-server-dom-webpack: 19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.104.1(esbuild@0.27.2)(uglify-js@3.19.3))
       rsc-html-stream: 0.0.7
       vite: 7.3.1(@types/node@24.10.12)(jiti@1.21.7)(sass@1.93.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+      vite-plugin-commonjs: 0.10.4
       vite-tsconfig-paths: 6.1.1(typescript@5.9.3)(vite@7.3.1(@types/node@24.10.12)(jiti@1.21.7)(sass@1.93.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
     transitivePeerDependencies:
       - next
@@ -15967,6 +15928,19 @@ snapshots:
       - typescript
       - webpack
 
+  vite-plugin-commonjs@0.10.4:
+    dependencies:
+      acorn: 8.16.0
+      magic-string: 0.30.21
+      vite-plugin-dynamic-import: 1.6.0
+
+  vite-plugin-dynamic-import@1.6.0:
+    dependencies:
+      acorn: 8.16.0
+      es-module-lexer: 1.7.0
+      fast-glob: 3.3.3
+      magic-string: 0.30.21
+
   vite-plugin-storybook-nextjs@3.2.2(next@16.1.5(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.93.2))(storybook@10.2.13(@testing-library/dom@10.4.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)(vite@7.3.1(@types/node@24.10.12)(jiti@1.21.7)(sass@1.93.2)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)):
     dependencies:
       '@next/env': 16.0.0

From 4c07bc99f7a0bd8897c8dd16075d63387b2c5bc8 Mon Sep 17 00:00:00 2001
From: Coding On Star <447357187@qq.com>
Date: Tue, 3 Mar 2026 13:32:52 +0800
Subject: [PATCH 17/22] refactor(web): restructure app-sidebar with component
 decomposition and folder organization (#32887)

Co-authored-by: CodingOnStar <hanxujiang@dify.com>
---
 .../(appDetailLayout)/[appId]/layout-main.tsx |   2 +-
 .../__tests__/app-sidebar-dropdown.spec.tsx   | 177 +++++++
 .../app-sidebar/__tests__/basic.spec.tsx      | 110 ++++
 .../dataset-sidebar-dropdown.spec.tsx         | 193 +++++++
 .../app-sidebar/__tests__/index.spec.tsx      | 298 +++++++++++
 .../sidebar-animation-issues.spec.tsx         |  36 --
 .../text-squeeze-fix-verification.spec.tsx    |  66 +--
 .../__tests__/toggle-button.spec.tsx          |  46 ++
 web/app/components/app-sidebar/app-info.tsx   | 474 -----------------
 .../__tests__/app-info-detail-panel.spec.tsx  | 298 +++++++++++
 .../__tests__/app-info-modals.spec.tsx        | 264 ++++++++++
 .../__tests__/app-info-trigger.spec.tsx       |  99 ++++
 .../__tests__/app-mode-labels.spec.ts         |  34 ++
 .../__tests__/app-operations.spec.tsx         | 253 +++++++++
 .../app-info/__tests__/index.spec.tsx         | 147 ++++++
 .../__tests__/use-app-info-actions.spec.ts    | 492 ++++++++++++++++++
 .../app-info/app-info-detail-panel.tsx        | 151 ++++++
 .../app-sidebar/app-info/app-info-modals.tsx  | 122 +++++
 .../app-sidebar/app-info/app-info-trigger.tsx |  67 +++
 .../app-sidebar/app-info/app-mode-labels.ts   |  17 +
 .../{ => app-info}/app-operations.tsx         |  12 +-
 .../components/app-sidebar/app-info/index.tsx |  75 +++
 .../app-info/use-app-info-actions.ts          | 189 +++++++
 .../app-sidebar/app-sidebar-dropdown.tsx      |  10 +-
 web/app/components/app-sidebar/basic.tsx      |   6 +-
 web/app/components/app-sidebar/completion.png | Bin 71615 -> 0 bytes
 .../__tests__/dropdown-callbacks.spec.tsx     | 228 ++++++++
 .../{ => __tests__}/index.spec.tsx            |   8 +-
 .../app-sidebar/dataset-info/index.tsx        |   6 +-
 .../app-sidebar/dataset-info/menu-item.tsx    |   2 +-
 .../app-sidebar/dataset-sidebar-dropdown.tsx  |  10 +-
 web/app/components/app-sidebar/expert.png     | Bin 88100 -> 0 bytes
 web/app/components/app-sidebar/index.tsx      |   4 +-
 .../__tests__/index.spec.tsx}                 |   6 +-
 .../{navLink.tsx => nav-link/index.tsx}       |   6 +-
 .../components/app-sidebar/style.module.css   |  11 -
 .../components/app-sidebar/toggle-button.tsx  |   2 +-
 web/eslint-suppressions.json                  |  81 +--
 38 files changed, 3299 insertions(+), 703 deletions(-)
 create mode 100644 web/app/components/app-sidebar/__tests__/app-sidebar-dropdown.spec.tsx
 create mode 100644 web/app/components/app-sidebar/__tests__/basic.spec.tsx
 create mode 100644 web/app/components/app-sidebar/__tests__/dataset-sidebar-dropdown.spec.tsx
 create mode 100644 web/app/components/app-sidebar/__tests__/index.spec.tsx
 rename web/app/components/app-sidebar/{ => __tests__}/sidebar-animation-issues.spec.tsx (80%)
 rename web/app/components/app-sidebar/{ => __tests__}/text-squeeze-fix-verification.spec.tsx (65%)
 create mode 100644 web/app/components/app-sidebar/__tests__/toggle-button.spec.tsx
 delete mode 100644 web/app/components/app-sidebar/app-info.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/__tests__/app-info-detail-panel.spec.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/__tests__/app-info-modals.spec.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/__tests__/app-info-trigger.spec.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/__tests__/app-mode-labels.spec.ts
 create mode 100644 web/app/components/app-sidebar/app-info/__tests__/app-operations.spec.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/__tests__/index.spec.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/__tests__/use-app-info-actions.spec.ts
 create mode 100644 web/app/components/app-sidebar/app-info/app-info-detail-panel.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/app-info-modals.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/app-info-trigger.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/app-mode-labels.ts
 rename web/app/components/app-sidebar/{ => app-info}/app-operations.tsx (93%)
 create mode 100644 web/app/components/app-sidebar/app-info/index.tsx
 create mode 100644 web/app/components/app-sidebar/app-info/use-app-info-actions.ts
 delete mode 100644 web/app/components/app-sidebar/completion.png
 create mode 100644 web/app/components/app-sidebar/dataset-info/__tests__/dropdown-callbacks.spec.tsx
 rename web/app/components/app-sidebar/dataset-info/{ => __tests__}/index.spec.tsx (98%)
 delete mode 100644 web/app/components/app-sidebar/expert.png
 rename web/app/components/app-sidebar/{navLink.spec.tsx => nav-link/__tests__/index.spec.tsx} (98%)
 rename web/app/components/app-sidebar/{navLink.tsx => nav-link/index.tsx} (83%)
 delete mode 100644 web/app/components/app-sidebar/style.module.css

diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
index 470f4477fa..fd0bf2c8bd 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
@@ -1,6 +1,6 @@
 'use client'
 import type { FC } from 'react'
-import type { NavIcon } from '@/app/components/app-sidebar/navLink'
+import type { NavIcon } from '@/app/components/app-sidebar/nav-link'
 import type { App } from '@/types/app'
 import {
   RiDashboard2Fill,
diff --git a/web/app/components/app-sidebar/__tests__/app-sidebar-dropdown.spec.tsx b/web/app/components/app-sidebar/__tests__/app-sidebar-dropdown.spec.tsx
new file mode 100644
index 0000000000..5018709da1
--- /dev/null
+++ b/web/app/components/app-sidebar/__tests__/app-sidebar-dropdown.spec.tsx
@@ -0,0 +1,177 @@
+import type { App, AppSSO } from '@/types/app'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import { AppModeEnum } from '@/types/app'
+import AppSidebarDropdown from '../app-sidebar-dropdown'
+
+let mockAppDetail: (App & Partial<AppSSO>) | undefined
+
+vi.mock('@/app/components/app/store', () => ({
+  useStore: (selector: (state: Record<string, unknown>) => unknown) => selector({
+    appDetail: mockAppDetail,
+  }),
+}))
+
+vi.mock('@/context/app-context', () => ({
+  useAppContext: () => ({
+    isCurrentWorkspaceEditor: true,
+  }),
+}))
+
+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}>{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('../../base/app-icon', () => ({
+  default: ({ size, icon }: { size: string, icon: string }) => (
+    <div data-testid="app-icon" data-size={size} data-icon={icon} />
+  ),
+}))
+
+vi.mock('../../base/divider', () => ({
+  default: () => <hr data-testid="divider" />,
+}))
+
+vi.mock('../app-info', () => ({
+  default: ({ expand, onlyShowDetail, openState }: {
+    expand: boolean
+    onlyShowDetail?: boolean
+    openState?: boolean
+  }) => (
+    <div data-testid="app-info" data-expand={expand} data-only-detail={onlyShowDetail} data-open={openState} />
+  ),
+}))
+
+vi.mock('../nav-link', () => ({
+  default: ({ name, href, mode }: { name: string, href: string, mode?: string }) => (
+    <a data-testid={`nav-link-${name}`} href={href} data-mode={mode}>{name}</a>
+  ),
+}))
+
+const MockIcon = (props: React.SVGProps<SVGSVGElement>) => <svg {...props} />
+
+const createAppDetail = (overrides: Partial<App> = {}): App & Partial<AppSSO> => ({
+  id: 'app-1',
+  name: 'Test App',
+  mode: AppModeEnum.CHAT,
+  icon: '🤖',
+  icon_type: 'emoji',
+  icon_background: '#FFEAD5',
+  icon_url: '',
+  description: '',
+  use_icon_as_answer_icon: false,
+  ...overrides,
+} as App & Partial<AppSSO>)
+
+const navigation = [
+  { name: 'Overview', href: '/overview', icon: MockIcon, selectedIcon: MockIcon },
+  { name: 'Logs', href: '/logs', icon: MockIcon, selectedIcon: MockIcon },
+]
+
+describe('AppSidebarDropdown', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockAppDetail = createAppDetail()
+  })
+
+  it('should return null when appDetail is not available', () => {
+    mockAppDetail = undefined
+    const { container } = render(<AppSidebarDropdown navigation={navigation} />)
+    expect(container.innerHTML).toBe('')
+  })
+
+  it('should render trigger with app icon', () => {
+    render(<AppSidebarDropdown navigation={navigation} />)
+    const icons = screen.getAllByTestId('app-icon')
+    const smallIcon = icons.find(i => i.getAttribute('data-size') === 'small')
+    expect(smallIcon).toBeInTheDocument()
+  })
+
+  it('should render navigation links', () => {
+    render(<AppSidebarDropdown navigation={navigation} />)
+    expect(screen.getByTestId('nav-link-Overview')).toBeInTheDocument()
+    expect(screen.getByTestId('nav-link-Logs')).toBeInTheDocument()
+  })
+
+  it('should display app name', () => {
+    render(<AppSidebarDropdown navigation={navigation} />)
+    expect(screen.getByText('Test App')).toBeInTheDocument()
+  })
+
+  it('should display app mode label', () => {
+    render(<AppSidebarDropdown navigation={navigation} />)
+    expect(screen.getByText('app.types.chatbot')).toBeInTheDocument()
+  })
+
+  it('should display mode labels for different modes', () => {
+    mockAppDetail = createAppDetail({ mode: AppModeEnum.ADVANCED_CHAT })
+    render(<AppSidebarDropdown navigation={navigation} />)
+    expect(screen.getByText('app.types.advanced')).toBeInTheDocument()
+  })
+
+  it('should render AppInfo component for detail expand', () => {
+    render(<AppSidebarDropdown navigation={navigation} />)
+    expect(screen.getByTestId('app-info')).toBeInTheDocument()
+    expect(screen.getByTestId('app-info')).toHaveAttribute('data-only-detail', 'true')
+  })
+
+  it('should toggle portal open state when trigger is clicked', async () => {
+    const user = userEvent.setup()
+    render(<AppSidebarDropdown navigation={navigation} />)
+
+    const trigger = screen.getByTestId('portal-trigger')
+    await user.click(trigger)
+
+    const portal = screen.getByTestId('portal-elem')
+    expect(portal).toHaveAttribute('data-open', 'true')
+  })
+
+  it('should render divider between app info and navigation', () => {
+    render(<AppSidebarDropdown navigation={navigation} />)
+    expect(screen.getByTestId('divider')).toBeInTheDocument()
+  })
+
+  it('should render large app icon in dropdown content', () => {
+    render(<AppSidebarDropdown navigation={navigation} />)
+    const icons = screen.getAllByTestId('app-icon')
+    const largeIcon = icons.find(icon => icon.getAttribute('data-size') === 'large')
+    expect(largeIcon).toBeInTheDocument()
+  })
+
+  it('should set detailExpand when clicking app info area', async () => {
+    const user = userEvent.setup()
+    render(<AppSidebarDropdown navigation={navigation} />)
+
+    const appName = screen.getByText('Test App')
+    const appInfoArea = appName.closest('[class*="cursor-pointer"]')
+    if (appInfoArea)
+      await user.click(appInfoArea)
+  })
+
+  it('should display workflow mode label', () => {
+    mockAppDetail = createAppDetail({ mode: AppModeEnum.WORKFLOW })
+    render(<AppSidebarDropdown navigation={navigation} />)
+    expect(screen.getByText('app.types.workflow')).toBeInTheDocument()
+  })
+
+  it('should display agent mode label', () => {
+    mockAppDetail = createAppDetail({ mode: AppModeEnum.AGENT_CHAT })
+    render(<AppSidebarDropdown navigation={navigation} />)
+    expect(screen.getByText('app.types.agent')).toBeInTheDocument()
+  })
+
+  it('should display completion mode label', () => {
+    mockAppDetail = createAppDetail({ mode: AppModeEnum.COMPLETION })
+    render(<AppSidebarDropdown navigation={navigation} />)
+    expect(screen.getByText('app.types.completion')).toBeInTheDocument()
+  })
+})
diff --git a/web/app/components/app-sidebar/__tests__/basic.spec.tsx b/web/app/components/app-sidebar/__tests__/basic.spec.tsx
new file mode 100644
index 0000000000..67e708eb02
--- /dev/null
+++ b/web/app/components/app-sidebar/__tests__/basic.spec.tsx
@@ -0,0 +1,110 @@
+import { render, screen } from '@testing-library/react'
+import * as React from 'react'
+import AppBasic from '../basic'
+
+vi.mock('@/app/components/base/icons/src/vender/workflow', () => ({
+  ApiAggregate: (props: React.SVGProps<SVGSVGElement>) => <svg data-testid="api-icon" {...props} />,
+  WindowCursor: (props: React.SVGProps<SVGSVGElement>) => <svg data-testid="webapp-icon" {...props} />,
+}))
+
+vi.mock('@/app/components/base/tooltip', () => ({
+  default: ({ popupContent }: { popupContent: React.ReactNode }) => (
+    <div data-testid="tooltip">{popupContent}</div>
+  ),
+}))
+
+vi.mock('../../base/app-icon', () => ({
+  default: ({ icon, background, innerIcon, className }: {
+    icon?: string
+    background?: string
+    innerIcon?: React.ReactNode
+    className?: string
+  }) => (
+    <div data-testid="app-icon" data-icon={icon} data-bg={background} className={className}>
+      {innerIcon}
+    </div>
+  ),
+}))
+
+describe('AppBasic', () => {
+  describe('Icon rendering', () => {
+    it('should render app icon when iconType is app with valid icon and background', () => {
+      render(<AppBasic name="Test" type="Chat" icon="🤖" icon_background="#fff" />)
+      expect(screen.getByTestId('app-icon')).toBeInTheDocument()
+    })
+
+    it('should not render app icon when icon is empty', () => {
+      render(<AppBasic name="Test" type="Chat" />)
+      expect(screen.queryByTestId('app-icon')).not.toBeInTheDocument()
+    })
+
+    it('should render api icon when iconType is api', () => {
+      render(<AppBasic name="Test" type="API" iconType="api" />)
+      expect(screen.getByTestId('api-icon')).toBeInTheDocument()
+    })
+
+    it('should render webapp icon when iconType is webapp', () => {
+      render(<AppBasic name="Test" type="Webapp" iconType="webapp" />)
+      expect(screen.getByTestId('webapp-icon')).toBeInTheDocument()
+    })
+
+    it('should render dataset icon when iconType is dataset', () => {
+      render(<AppBasic name="Test" type="Dataset" iconType="dataset" />)
+      const icons = screen.getAllByTestId('app-icon')
+      expect(icons.length).toBeGreaterThan(0)
+    })
+
+    it('should render notion icon when iconType is notion', () => {
+      render(<AppBasic name="Test" type="Notion" iconType="notion" />)
+      const icons = screen.getAllByTestId('app-icon')
+      expect(icons.length).toBeGreaterThan(0)
+    })
+  })
+
+  describe('Expand mode', () => {
+    it('should show name and type in expand mode', () => {
+      render(<AppBasic name="My App" type="Chatbot" />)
+      expect(screen.getByText('My App')).toBeInTheDocument()
+      expect(screen.getByText('Chatbot')).toBeInTheDocument()
+    })
+
+    it('should hide name and type in collapse mode', () => {
+      render(<AppBasic name="My App" type="Chatbot" mode="collapse" />)
+      expect(screen.queryByText('My App')).not.toBeInTheDocument()
+    })
+
+    it('should show hover tip when provided', () => {
+      render(<AppBasic name="My App" type="Chatbot" hoverTip="Some tip" />)
+      expect(screen.getByTestId('tooltip')).toBeInTheDocument()
+      expect(screen.getByText('Some tip')).toBeInTheDocument()
+    })
+
+    it('should not show hover tip when not provided', () => {
+      render(<AppBasic name="My App" type="Chatbot" />)
+      expect(screen.queryByTestId('tooltip')).not.toBeInTheDocument()
+    })
+  })
+
+  describe('Type display', () => {
+    it('should hide type when hideType is true', () => {
+      render(<AppBasic name="My App" type="Chatbot" hideType />)
+      expect(screen.queryByText('Chatbot')).not.toBeInTheDocument()
+    })
+
+    it('should show external tag when isExternal is true', () => {
+      render(<AppBasic name="My App" type="Dataset" isExternal />)
+      expect(screen.getByText('dataset.externalTag')).toBeInTheDocument()
+    })
+
+    it('should show type inline when isExtraInLine is true and hideType is false', () => {
+      render(<AppBasic name="My App" type="Chatbot" isExtraInLine />)
+      expect(screen.getByText('Chatbot')).toBeInTheDocument()
+    })
+
+    it('should apply custom text styles', () => {
+      render(<AppBasic name="My App" type="Chatbot" textStyle={{ main: 'text-red-500' }} />)
+      const nameContainer = screen.getByText('My App').parentElement
+      expect(nameContainer).toHaveClass('text-red-500')
+    })
+  })
+})
diff --git a/web/app/components/app-sidebar/__tests__/dataset-sidebar-dropdown.spec.tsx b/web/app/components/app-sidebar/__tests__/dataset-sidebar-dropdown.spec.tsx
new file mode 100644
index 0000000000..1f3a5f9ad8
--- /dev/null
+++ b/web/app/components/app-sidebar/__tests__/dataset-sidebar-dropdown.spec.tsx
@@ -0,0 +1,193 @@
+import type { DataSet } from '@/models/datasets'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import DatasetSidebarDropdown from '../dataset-sidebar-dropdown'
+
+let mockDataset: DataSet
+
+vi.mock('@/context/dataset-detail', () => ({
+  useDatasetDetailContextWithSelector: (selector: (state: { dataset: DataSet }) => unknown) =>
+    selector({ dataset: mockDataset }),
+}))
+
+vi.mock('@/service/knowledge/use-dataset', () => ({
+  useDatasetRelatedApps: () => ({ data: [] }),
+}))
+
+vi.mock('@/hooks/use-knowledge', () => ({
+  useKnowledge: () => ({
+    formatIndexingTechniqueAndMethod: () => 'method-text',
+  }),
+}))
+
+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}>{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('../../base/app-icon', () => ({
+  default: ({ size, icon }: { size: string, icon: string }) => (
+    <div data-testid="app-icon" data-size={size} data-icon={icon} />
+  ),
+}))
+
+vi.mock('../../base/divider', () => ({
+  default: () => <hr data-testid="divider" />,
+}))
+
+vi.mock('../../base/effect', () => ({
+  default: ({ className }: { className?: string }) => <div data-testid="effect" className={className} />,
+}))
+
+vi.mock('../../datasets/extra-info', () => ({
+  default: ({ expand, documentCount }: {
+    relatedApps?: unknown[]
+    expand: boolean
+    documentCount: number
+  }) => (
+    <div data-testid="extra-info" data-expand={expand} data-doc-count={documentCount} />
+  ),
+}))
+
+vi.mock('../dataset-info/dropdown', () => ({
+  default: ({ expand }: { expand: boolean }) => (
+    <div data-testid="dataset-dropdown" data-expand={expand} />
+  ),
+}))
+
+vi.mock('../nav-link', () => ({
+  default: ({ name, href, mode, disabled }: { name: string, href: string, mode?: string, disabled?: boolean }) => (
+    <a data-testid={`nav-link-${name}`} href={href} data-mode={mode} data-disabled={disabled}>{name}</a>
+  ),
+}))
+
+const MockIcon = (props: React.SVGProps<SVGSVGElement>) => <svg {...props} />
+
+const createDataset = (overrides: Partial<DataSet> = {}): DataSet => ({
+  id: 'dataset-1',
+  name: 'Test Dataset',
+  description: 'A test dataset',
+  provider: 'internal',
+  icon_info: {
+    icon: '📙',
+    icon_type: 'emoji',
+    icon_background: '#FFF4ED',
+    icon_url: '',
+  },
+  doc_form: 'text_model' as DataSet['doc_form'],
+  indexing_technique: 'high_quality' as DataSet['indexing_technique'],
+  document_count: 10,
+  runtime_mode: 'general',
+  retrieval_model_dict: {
+    search_method: 'semantic_search' as DataSet['retrieval_model_dict']['search_method'],
+    reranking_enable: false,
+    reranking_model: { reranking_provider_name: '', reranking_model_name: '' },
+    top_k: 5,
+    score_threshold_enabled: false,
+    score_threshold: 0,
+  },
+  ...overrides,
+} as DataSet)
+
+const navigation = [
+  { name: 'Documents', href: '/documents', icon: MockIcon, selectedIcon: MockIcon },
+  { name: 'Settings', href: '/settings', icon: MockIcon, selectedIcon: MockIcon, disabled: true },
+]
+
+describe('DatasetSidebarDropdown', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockDataset = createDataset()
+  })
+
+  it('should render trigger with dataset icon', () => {
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    const icons = screen.getAllByTestId('app-icon')
+    const smallIcon = icons.find(i => i.getAttribute('data-size') === 'small')
+    expect(smallIcon).toBeInTheDocument()
+    expect(smallIcon).toHaveAttribute('data-icon', '📙')
+  })
+
+  it('should display dataset name in dropdown content', () => {
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    expect(screen.getByText('Test Dataset')).toBeInTheDocument()
+  })
+
+  it('should display dataset description', () => {
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    expect(screen.getByText('A test dataset')).toBeInTheDocument()
+  })
+
+  it('should not display description when empty', () => {
+    mockDataset = createDataset({ description: '' })
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    expect(screen.queryByText('A test dataset')).not.toBeInTheDocument()
+  })
+
+  it('should render navigation links', () => {
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    expect(screen.getByTestId('nav-link-Documents')).toBeInTheDocument()
+    expect(screen.getByTestId('nav-link-Settings')).toBeInTheDocument()
+  })
+
+  it('should render ExtraInfo', () => {
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    const extraInfo = screen.getByTestId('extra-info')
+    expect(extraInfo).toHaveAttribute('data-expand', 'true')
+    expect(extraInfo).toHaveAttribute('data-doc-count', '10')
+  })
+
+  it('should render Effect component', () => {
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    expect(screen.getByTestId('effect')).toBeInTheDocument()
+  })
+
+  it('should render Dropdown component with expand=true', () => {
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    expect(screen.getByTestId('dataset-dropdown')).toHaveAttribute('data-expand', 'true')
+  })
+
+  it('should show external tag for external provider', () => {
+    mockDataset = createDataset({ provider: 'external' })
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    expect(screen.getByText('dataset.externalTag')).toBeInTheDocument()
+  })
+
+  it('should use fallback icon info when icon_info is missing', () => {
+    mockDataset = createDataset({ icon_info: undefined as unknown as DataSet['icon_info'] })
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    const icons = screen.getAllByTestId('app-icon')
+    const fallbackIcon = icons.find(i => i.getAttribute('data-icon') === '📙')
+    expect(fallbackIcon).toBeInTheDocument()
+  })
+
+  it('should toggle dropdown open state on trigger click', async () => {
+    const user = userEvent.setup()
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+
+    const trigger = screen.getByTestId('portal-trigger')
+    await user.click(trigger)
+
+    expect(screen.getByTestId('portal-elem')).toHaveAttribute('data-open', 'true')
+  })
+
+  it('should render divider', () => {
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    expect(screen.getByTestId('divider')).toBeInTheDocument()
+  })
+
+  it('should render medium app icon in content area', () => {
+    render(<DatasetSidebarDropdown navigation={navigation} />)
+    const icons = screen.getAllByTestId('app-icon')
+    const mediumIcon = icons.find(i => i.getAttribute('data-size') === 'medium')
+    expect(mediumIcon).toBeInTheDocument()
+  })
+})
diff --git a/web/app/components/app-sidebar/__tests__/index.spec.tsx b/web/app/components/app-sidebar/__tests__/index.spec.tsx
new file mode 100644
index 0000000000..89db80e0f1
--- /dev/null
+++ b/web/app/components/app-sidebar/__tests__/index.spec.tsx
@@ -0,0 +1,298 @@
+import { act, render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import AppDetailNav from '..'
+
+let mockAppSidebarExpand = 'expand'
+const mockSetAppSidebarExpand = vi.fn()
+let mockPathname = '/app/123/overview'
+
+vi.mock('@/app/components/app/store', () => ({
+  useStore: (selector: (state: Record<string, unknown>) => unknown) => selector({
+    appDetail: { id: 'app-1', name: 'Test', mode: 'chat', icon: '🤖', icon_type: 'emoji', icon_background: '#fff' },
+    appSidebarExpand: mockAppSidebarExpand,
+    setAppSidebarExpand: mockSetAppSidebarExpand,
+  }),
+}))
+
+vi.mock('zustand/react/shallow', () => ({
+  useShallow: (fn: unknown) => fn,
+}))
+
+vi.mock('next/navigation', () => ({
+  usePathname: () => mockPathname,
+}))
+
+let mockIsHovering = true
+let mockKeyPressCallback: ((e: { preventDefault: () => void }) => void) | null = null
+
+vi.mock('ahooks', () => ({
+  useHover: () => mockIsHovering,
+  useKeyPress: (_key: string, cb: (e: { preventDefault: () => void }) => void) => {
+    mockKeyPressCallback = cb
+  },
+}))
+
+vi.mock('@/hooks/use-breakpoints', () => ({
+  default: () => 'desktop',
+  MediaType: { mobile: 'mobile', desktop: 'desktop' },
+}))
+
+let mockSubscriptionCallback: ((v: unknown) => void) | null = null
+
+vi.mock('@/context/event-emitter', () => ({
+  useEventEmitterContextContext: () => ({
+    eventEmitter: {
+      useSubscription: (cb: (v: unknown) => void) => { mockSubscriptionCallback = cb },
+    },
+  }),
+}))
+
+vi.mock('../../base/divider', () => ({
+  default: ({ className }: { className?: string }) => <hr data-testid="divider" className={className} />,
+}))
+
+vi.mock('@/app/components/workflow/utils', () => ({
+  getKeyboardKeyCodeBySystem: () => 'ctrl',
+}))
+
+vi.mock('../app-info', () => ({
+  default: ({ expand }: { expand: boolean }) => (
+    <div data-testid="app-info" data-expand={expand} />
+  ),
+}))
+
+vi.mock('../app-sidebar-dropdown', () => ({
+  default: ({ navigation }: { navigation: unknown[] }) => (
+    <div data-testid="app-sidebar-dropdown" data-nav-count={navigation.length} />
+  ),
+}))
+
+vi.mock('../dataset-info', () => ({
+  default: ({ expand }: { expand: boolean }) => (
+    <div data-testid="dataset-info" data-expand={expand} />
+  ),
+}))
+
+vi.mock('../dataset-sidebar-dropdown', () => ({
+  default: ({ navigation }: { navigation: unknown[] }) => (
+    <div data-testid="dataset-sidebar-dropdown" data-nav-count={navigation.length} />
+  ),
+}))
+
+vi.mock('../nav-link', () => ({
+  default: ({ name, href, mode }: { name: string, href: string, mode?: string }) => (
+    <a data-testid={`nav-link-${name}`} href={href} data-mode={mode}>{name}</a>
+  ),
+}))
+
+vi.mock('../toggle-button', () => ({
+  default: ({ expand, handleToggle, className }: { expand: boolean, handleToggle: () => void, className?: string }) => (
+    <button type="button" data-testid="toggle-button" data-expand={expand} onClick={handleToggle} className={className}>
+      Toggle
+    </button>
+  ),
+}))
+
+const MockIcon = (props: React.SVGProps<SVGSVGElement>) => <svg {...props} />
+
+const navigation = [
+  { name: 'Overview', href: '/overview', icon: MockIcon, selectedIcon: MockIcon },
+  { name: 'Logs', href: '/logs', icon: MockIcon, selectedIcon: MockIcon },
+]
+
+describe('AppDetailNav', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockAppSidebarExpand = 'expand'
+    mockPathname = '/app/123/overview'
+    mockIsHovering = true
+  })
+
+  describe('Normal sidebar mode', () => {
+    it('should render AppInfo when iconType is app', () => {
+      render(<AppDetailNav navigation={navigation} />)
+      expect(screen.getByTestId('app-info')).toBeInTheDocument()
+      expect(screen.getByTestId('app-info')).toHaveAttribute('data-expand', 'true')
+    })
+
+    it('should render DatasetInfo when iconType is dataset', () => {
+      render(<AppDetailNav navigation={navigation} iconType="dataset" />)
+      expect(screen.getByTestId('dataset-info')).toBeInTheDocument()
+    })
+
+    it('should render navigation links', () => {
+      render(<AppDetailNav navigation={navigation} />)
+      expect(screen.getByTestId('nav-link-Overview')).toBeInTheDocument()
+      expect(screen.getByTestId('nav-link-Logs')).toBeInTheDocument()
+    })
+
+    it('should render divider', () => {
+      render(<AppDetailNav navigation={navigation} />)
+      expect(screen.getByTestId('divider')).toBeInTheDocument()
+    })
+
+    it('should apply expanded width class', () => {
+      const { container } = render(<AppDetailNav navigation={navigation} />)
+      const sidebar = container.firstElementChild as HTMLElement
+      expect(sidebar).toHaveClass('w-[216px]')
+    })
+
+    it('should apply collapsed width class', () => {
+      mockAppSidebarExpand = 'collapse'
+      const { container } = render(<AppDetailNav navigation={navigation} />)
+      const sidebar = container.firstElementChild as HTMLElement
+      expect(sidebar).toHaveClass('w-14')
+    })
+
+    it('should render extraInfo when iconType is dataset and extraInfo provided', () => {
+      render(
+        <AppDetailNav
+          navigation={navigation}
+          iconType="dataset"
+          extraInfo={mode => <div data-testid="extra-info" data-mode={mode} />}
+        />,
+      )
+      expect(screen.getByTestId('extra-info')).toBeInTheDocument()
+    })
+
+    it('should not render extraInfo when iconType is app', () => {
+      render(
+        <AppDetailNav
+          navigation={navigation}
+          extraInfo={mode => <div data-testid="extra-info" data-mode={mode} />}
+        />,
+      )
+      expect(screen.queryByTestId('extra-info')).not.toBeInTheDocument()
+    })
+  })
+
+  describe('Workflow canvas mode', () => {
+    it('should render AppSidebarDropdown when in workflow canvas with hidden header', () => {
+      mockPathname = '/app/123/workflow'
+      localStorage.setItem('workflow-canvas-maximize', 'true')
+
+      render(<AppDetailNav navigation={navigation} />)
+
+      expect(screen.getByTestId('app-sidebar-dropdown')).toBeInTheDocument()
+      expect(screen.queryByTestId('app-info')).not.toBeInTheDocument()
+    })
+
+    it('should render normal sidebar when workflow canvas is not maximized', () => {
+      mockPathname = '/app/123/workflow'
+      localStorage.setItem('workflow-canvas-maximize', 'false')
+
+      render(<AppDetailNav navigation={navigation} />)
+
+      expect(screen.queryByTestId('app-sidebar-dropdown')).not.toBeInTheDocument()
+      expect(screen.getByTestId('app-info')).toBeInTheDocument()
+    })
+  })
+
+  describe('Pipeline canvas mode', () => {
+    it('should render DatasetSidebarDropdown when in pipeline canvas with hidden header', () => {
+      mockPathname = '/dataset/123/pipeline'
+      localStorage.setItem('workflow-canvas-maximize', 'true')
+
+      render(<AppDetailNav navigation={navigation} />)
+
+      expect(screen.getByTestId('dataset-sidebar-dropdown')).toBeInTheDocument()
+      expect(screen.queryByTestId('app-info')).not.toBeInTheDocument()
+    })
+  })
+
+  describe('Navigation mode', () => {
+    it('should pass expand mode to nav links when expanded', () => {
+      render(<AppDetailNav navigation={navigation} />)
+      expect(screen.getByTestId('nav-link-Overview')).toHaveAttribute('data-mode', 'expand')
+    })
+
+    it('should pass collapse mode to nav links when collapsed', () => {
+      mockAppSidebarExpand = 'collapse'
+      render(<AppDetailNav navigation={navigation} />)
+      expect(screen.getByTestId('nav-link-Overview')).toHaveAttribute('data-mode', 'collapse')
+    })
+  })
+
+  describe('Toggle behavior', () => {
+    it('should call setAppSidebarExpand on toggle', async () => {
+      const user = userEvent.setup()
+      render(<AppDetailNav navigation={navigation} />)
+
+      await user.click(screen.getByTestId('toggle-button'))
+
+      expect(mockSetAppSidebarExpand).toHaveBeenCalledWith('collapse')
+    })
+
+    it('should toggle from collapse to expand', async () => {
+      const user = userEvent.setup()
+      mockAppSidebarExpand = 'collapse'
+      render(<AppDetailNav navigation={navigation} />)
+
+      await user.click(screen.getByTestId('toggle-button'))
+
+      expect(mockSetAppSidebarExpand).toHaveBeenCalledWith('expand')
+    })
+  })
+
+  describe('Sidebar persistence', () => {
+    it('should persist expand state to localStorage', () => {
+      render(<AppDetailNav navigation={navigation} />)
+      expect(localStorage.setItem).toHaveBeenCalledWith('app-detail-collapse-or-expand', 'expand')
+    })
+  })
+
+  describe('Disabled navigation items', () => {
+    it('should render disabled navigation items', () => {
+      const navWithDisabled = [
+        ...navigation,
+        { name: 'Disabled', href: '/disabled', icon: MockIcon, selectedIcon: MockIcon, disabled: true },
+      ]
+      render(<AppDetailNav navigation={navWithDisabled} />)
+      expect(screen.getByTestId('nav-link-Disabled')).toBeInTheDocument()
+    })
+  })
+
+  describe('Event emitter subscription', () => {
+    it('should handle workflow-canvas-maximize event', () => {
+      mockPathname = '/app/123/workflow'
+      render(<AppDetailNav navigation={navigation} />)
+
+      const cb = mockSubscriptionCallback
+      expect(cb).not.toBeNull()
+      act(() => {
+        cb!({ type: 'workflow-canvas-maximize', payload: true })
+      })
+    })
+
+    it('should ignore non-maximize events', () => {
+      render(<AppDetailNav navigation={navigation} />)
+
+      const cb = mockSubscriptionCallback
+      act(() => {
+        cb!({ type: 'other-event' })
+      })
+    })
+  })
+
+  describe('Keyboard shortcut', () => {
+    it('should toggle sidebar on ctrl+b', () => {
+      render(<AppDetailNav navigation={navigation} />)
+
+      const cb = mockKeyPressCallback
+      expect(cb).not.toBeNull()
+      act(() => {
+        cb!({ preventDefault: vi.fn() })
+      })
+      expect(mockSetAppSidebarExpand).toHaveBeenCalledWith('collapse')
+    })
+  })
+
+  describe('Hover-based toggle button visibility', () => {
+    it('should hide toggle button when not hovering', () => {
+      mockIsHovering = false
+      render(<AppDetailNav navigation={navigation} />)
+      expect(screen.queryByTestId('toggle-button')).not.toBeInTheDocument()
+    })
+  })
+})
diff --git a/web/app/components/app-sidebar/sidebar-animation-issues.spec.tsx b/web/app/components/app-sidebar/__tests__/sidebar-animation-issues.spec.tsx
similarity index 80%
rename from web/app/components/app-sidebar/sidebar-animation-issues.spec.tsx
rename to web/app/components/app-sidebar/__tests__/sidebar-animation-issues.spec.tsx
index 5d85b99d9a..fef65fcad3 100644
--- a/web/app/components/app-sidebar/sidebar-animation-issues.spec.tsx
+++ b/web/app/components/app-sidebar/__tests__/sidebar-animation-issues.spec.tsx
@@ -143,12 +143,6 @@ describe('Sidebar Animation Issues Reproduction', () => {
       expect(toggleSection).toHaveClass('px-4') // Same consistent padding
       expect(toggleSection).not.toHaveClass('px-5')
       expect(toggleSection).not.toHaveClass('px-6')
-
-      // THE FIX: px-4 in both states prevents position movement
-      console.log('✅ Issue #1 FIXED: Toggle button now has consistent padding')
-      console.log('   - Before: px-4 (collapsed) vs px-6 (expanded) - 8px difference')
-      console.log('   - After:  px-4 (both states) - 0px difference')
-      console.log('   - Result: No button position movement during transition')
     })
 
     it('should verify sidebar width animation is working correctly', () => {
@@ -164,8 +158,6 @@ describe('Sidebar Animation Issues Reproduction', () => {
       // Expanded state
       rerender(<MockSidebarToggleButton expand={true} onToggle={handleToggle} />)
       expect(container).toHaveClass('w-[216px]')
-
-      console.log('✅ Sidebar width transition is properly configured')
     })
   })
 
@@ -188,13 +180,6 @@ describe('Sidebar Animation Issues Reproduction', () => {
       expect(link).toHaveClass('px-3') // 12px padding (+2px)
       expect(icon).toHaveClass('mr-2') // 8px margin (+8px)
       expect(screen.getByTestId('nav-text-Orchestrate')).toBeInTheDocument()
-
-      // THE BUG: Multiple simultaneous changes create squeeze effect
-      console.log('🐛 Issue #2 Reproduced: Text squeeze effect from multiple layout changes')
-      console.log('   - Link padding: px-2.5 → px-3 (+2px)')
-      console.log('   - Icon margin: mr-0 → mr-2 (+8px)')
-      console.log('   - Text appears: none → visible (abrupt)')
-      console.log('   - Result: Text appears with squeeze effect due to layout shifts')
     })
 
     it('should document the abrupt text rendering issue', () => {
@@ -207,10 +192,6 @@ describe('Sidebar Animation Issues Reproduction', () => {
 
       // Text suddenly appears - no transition
       expect(screen.getByTestId('nav-text-API Access')).toBeInTheDocument()
-
-      console.log('🐛 Issue #2 Detail: Conditional rendering {mode === "expand" && name}')
-      console.log('   - Problem: Text appears/disappears abruptly without transition')
-      console.log('   - Should use: opacity or width transition for smooth appearance')
     })
   })
 
@@ -234,13 +215,6 @@ describe('Sidebar Animation Issues Reproduction', () => {
       expect(iconContainer).toHaveClass('gap-1')
       expect(iconContainer).not.toHaveClass('justify-between')
       expect(appIcon).toHaveAttribute('data-size', 'small')
-
-      // THE BUG: Layout mode switch causes icon to "bounce"
-      console.log('🐛 Issue #3 Reproduced: Icon bounce from layout mode switching')
-      console.log('   - Layout change: justify-between → flex-col gap-1')
-      console.log('   - Icon size: large (40px) → small (24px)')
-      console.log('   - Transition: transition-all causes excessive animation')
-      console.log('   - Result: Icon appears to bounce to right then back during collapse')
     })
 
     it('should identify the problematic transition-all property', () => {
@@ -251,10 +225,6 @@ describe('Sidebar Animation Issues Reproduction', () => {
 
       // The problematic broad transition
       expect(computedStyle.transition).toContain('all')
-
-      console.log('🐛 Issue #3 Detail: transition-all affects ALL CSS properties')
-      console.log('   - Problem: Animates layout properties that should not transition')
-      console.log('   - Solution: Use specific transition properties instead of "all"')
     })
   })
 
@@ -276,7 +246,6 @@ describe('Sidebar Animation Issues Reproduction', () => {
 
       // Initial state verification
       expect(expanded).toBe(false)
-      console.log('🔄 Starting interactive test - all issues will be reproduced')
 
       // Simulate toggle click
       fireEvent.click(toggleButton)
@@ -287,11 +256,6 @@ describe('Sidebar Animation Issues Reproduction', () => {
           <MockAppInfo expand={expanded} />
         </div>,
       )
-
-      console.log('✨ All three issues successfully reproduced in interactive test:')
-      console.log('   1. Toggle button position movement (padding inconsistency)')
-      console.log('   2. Navigation text squeeze effect (multiple layout changes)')
-      console.log('   3. App icon bounce animation (layout mode switching)')
     })
   })
 })
diff --git a/web/app/components/app-sidebar/text-squeeze-fix-verification.spec.tsx b/web/app/components/app-sidebar/__tests__/text-squeeze-fix-verification.spec.tsx
similarity index 65%
rename from web/app/components/app-sidebar/text-squeeze-fix-verification.spec.tsx
rename to web/app/components/app-sidebar/__tests__/text-squeeze-fix-verification.spec.tsx
index f7e91b3dea..fb19833dd2 100644
--- a/web/app/components/app-sidebar/text-squeeze-fix-verification.spec.tsx
+++ b/web/app/components/app-sidebar/__tests__/text-squeeze-fix-verification.spec.tsx
@@ -13,7 +13,7 @@ vi.mock('next/navigation', () => ({
 
 // Mock classnames utility
 vi.mock('@/utils/classnames', () => ({
-  default: (...classes: any[]) => classes.filter(Boolean).join(' '),
+  default: (...classes: unknown[]) => classes.filter(Boolean).join(' '),
 }))
 
 // Simplified NavLink component to test the fix
@@ -101,12 +101,6 @@ describe('Text Squeeze Fix Verification', () => {
       expect(textElement).toHaveClass('whitespace-nowrap')
       expect(textElement).toHaveClass('transition-all')
 
-      console.log('✅ NavLink Collapsed State:')
-      console.log('   - Text is in DOM but visually hidden')
-      console.log('   - Uses opacity-0 and w-0 for hiding')
-      console.log('   - Has whitespace-nowrap to prevent wrapping')
-      console.log('   - Has transition-all for smooth animation')
-
       // Switch to expanded state
       rerender(<TestNavLink mode="expand" />)
 
@@ -115,13 +109,6 @@ describe('Text Squeeze Fix Verification', () => {
       expect(expandedText).toHaveClass('opacity-100')
       expect(expandedText).toHaveClass('w-auto')
       expect(expandedText).not.toHaveClass('pointer-events-none')
-
-      console.log('✅ NavLink Expanded State:')
-      console.log('   - Text is visible with opacity-100')
-      console.log('   - Uses w-auto for natural width')
-      console.log('   - No layout jumps during transition')
-
-      console.log('🎯 NavLink Fix Result: Text squeeze effect ELIMINATED')
     })
 
     it('should verify smooth transition properties', () => {
@@ -131,11 +118,6 @@ describe('Text Squeeze Fix Verification', () => {
       expect(textElement).toHaveClass('transition-all')
       expect(textElement).toHaveClass('duration-200')
       expect(textElement).toHaveClass('ease-in-out')
-
-      console.log('✅ Transition Properties Verified:')
-      console.log('   - transition-all: Smooth property changes')
-      console.log('   - duration-200: 200ms transition time')
-      console.log('   - ease-in-out: Smooth easing function')
     })
   })
 
@@ -159,11 +141,6 @@ describe('Text Squeeze Fix Verification', () => {
       expect(appName).toHaveClass('whitespace-nowrap')
       expect(appType).toHaveClass('whitespace-nowrap')
 
-      console.log('✅ AppInfo Collapsed State:')
-      console.log('   - Text container is in DOM but visually hidden')
-      console.log('   - App name and type elements always present')
-      console.log('   - Uses whitespace-nowrap to prevent wrapping')
-
       // Switch to expanded state
       rerender(<TestAppInfo expand={true} />)
 
@@ -172,13 +149,6 @@ describe('Text Squeeze Fix Verification', () => {
       expect(expandedContainer).toHaveClass('opacity-100')
       expect(expandedContainer).toHaveClass('w-auto')
       expect(expandedContainer).not.toHaveClass('pointer-events-none')
-
-      console.log('✅ AppInfo Expanded State:')
-      console.log('   - Text container is visible with opacity-100')
-      console.log('   - Uses w-auto for natural width')
-      console.log('   - No layout jumps during transition')
-
-      console.log('🎯 AppInfo Fix Result: Text squeeze effect ELIMINATED')
     })
 
     it('should verify transition properties on text container', () => {
@@ -188,45 +158,11 @@ describe('Text Squeeze Fix Verification', () => {
       expect(textContainer).toHaveClass('transition-all')
       expect(textContainer).toHaveClass('duration-200')
       expect(textContainer).toHaveClass('ease-in-out')
-
-      console.log('✅ AppInfo Transition Properties Verified:')
-      console.log('   - Container has smooth CSS transitions')
-      console.log('   - Same 200ms duration as NavLink for consistency')
     })
   })
 
   describe('Fix Strategy Comparison', () => {
     it('should document the fix strategy differences', () => {
-      console.log('\n📋 TEXT SQUEEZE FIX STRATEGY COMPARISON')
-      console.log('='.repeat(60))
-
-      console.log('\n❌ BEFORE (Problematic):')
-      console.log('   NavLink: {mode === "expand" && name}')
-      console.log('   AppInfo: {expand && (<div>...</div>)}')
-      console.log('   Problem: Conditional rendering causes abrupt appearance')
-      console.log('   Result: Text "squeezes" from center during layout changes')
-
-      console.log('\n✅ AFTER (Fixed):')
-      console.log('   NavLink: <span className="opacity-0 w-0">{name}</span>')
-      console.log('   AppInfo: <div className="opacity-0 w-0">...</div>')
-      console.log('   Solution: CSS controls visibility, element always in DOM')
-      console.log('   Result: Smooth opacity and width transitions')
-
-      console.log('\n🎯 KEY FIX PRINCIPLES:')
-      console.log('   1. ✅ Always keep text elements in DOM')
-      console.log('   2. ✅ Use opacity for show/hide transitions')
-      console.log('   3. ✅ Use width (w-0/w-auto) for layout control')
-      console.log('   4. ✅ Add whitespace-nowrap to prevent wrapping')
-      console.log('   5. ✅ Use pointer-events-none when hidden')
-      console.log('   6. ✅ Add overflow-hidden for clean hiding')
-
-      console.log('\n🚀 BENEFITS:')
-      console.log('   - No more abrupt text appearance')
-      console.log('   - Smooth 200ms transitions')
-      console.log('   - No layout jumps or shifts')
-      console.log('   - Consistent animation timing')
-      console.log('   - Better user experience')
-
       // Always pass documentation test
       expect(true).toBe(true)
     })
diff --git a/web/app/components/app-sidebar/__tests__/toggle-button.spec.tsx b/web/app/components/app-sidebar/__tests__/toggle-button.spec.tsx
new file mode 100644
index 0000000000..1a117ac5e3
--- /dev/null
+++ b/web/app/components/app-sidebar/__tests__/toggle-button.spec.tsx
@@ -0,0 +1,46 @@
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import ToggleButton from '../toggle-button'
+
+vi.mock('@/app/components/workflow/shortcuts-name', () => ({
+  default: ({ keys }: { keys: string[] }) => (
+    <span data-testid="shortcuts">{keys.join('+')}</span>
+  ),
+}))
+
+describe('ToggleButton', () => {
+  it('should render collapse arrow when expanded', () => {
+    render(<ToggleButton expand handleToggle={vi.fn()} />)
+    const button = screen.getByRole('button')
+    expect(button).toBeInTheDocument()
+  })
+
+  it('should render expand arrow when collapsed', () => {
+    render(<ToggleButton expand={false} handleToggle={vi.fn()} />)
+    const button = screen.getByRole('button')
+    expect(button).toBeInTheDocument()
+  })
+
+  it('should call handleToggle when clicked', async () => {
+    const user = userEvent.setup()
+    const handleToggle = vi.fn()
+    render(<ToggleButton expand handleToggle={handleToggle} />)
+
+    await user.click(screen.getByRole('button'))
+
+    expect(handleToggle).toHaveBeenCalledTimes(1)
+  })
+
+  it('should apply custom className', () => {
+    render(<ToggleButton expand handleToggle={vi.fn()} className="custom-class" />)
+    const button = screen.getByRole('button')
+    expect(button).toHaveClass('custom-class')
+  })
+
+  it('should have rounded-full style', () => {
+    render(<ToggleButton expand handleToggle={vi.fn()} />)
+    const button = screen.getByRole('button')
+    expect(button).toHaveClass('rounded-full')
+  })
+})
diff --git a/web/app/components/app-sidebar/app-info.tsx b/web/app/components/app-sidebar/app-info.tsx
deleted file mode 100644
index aa31f0201f..0000000000
--- a/web/app/components/app-sidebar/app-info.tsx
+++ /dev/null
@@ -1,474 +0,0 @@
-import type { Operation } from './app-operations'
-import type { DuplicateAppModalProps } from '@/app/components/app/duplicate-modal'
-import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
-import type { EnvironmentVariable } from '@/app/components/workflow/types'
-import {
-  RiDeleteBinLine,
-  RiEditLine,
-  RiEqualizer2Line,
-  RiExchange2Line,
-  RiFileCopy2Line,
-  RiFileDownloadLine,
-  RiFileUploadLine,
-} from '@remixicon/react'
-import dynamic from 'next/dynamic'
-import { useRouter } from 'next/navigation'
-import * as React from 'react'
-import { useCallback, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { useContext } from 'use-context-selector'
-import CardView from '@/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/card-view'
-import { useStore as useAppStore } from '@/app/components/app/store'
-import Button from '@/app/components/base/button'
-import ContentDialog from '@/app/components/base/content-dialog'
-import { ToastContext } from '@/app/components/base/toast'
-import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
-import { useAppContext } from '@/context/app-context'
-import { useProviderContext } from '@/context/provider-context'
-import { copyApp, deleteApp, exportAppConfig, updateAppInfo } from '@/service/apps'
-import { useInvalidateAppList } from '@/service/use-apps'
-import { fetchWorkflowDraft } from '@/service/workflow'
-import { AppModeEnum } from '@/types/app'
-import { getRedirection } from '@/utils/app-redirection'
-import { cn } from '@/utils/classnames'
-import { downloadBlob } from '@/utils/download'
-import AppIcon from '../base/app-icon'
-import AppOperations from './app-operations'
-
-const SwitchAppModal = dynamic(() => import('@/app/components/app/switch-app-modal'), {
-  ssr: false,
-})
-const CreateAppModal = dynamic(() => import('@/app/components/explore/create-app-modal'), {
-  ssr: false,
-})
-const DuplicateAppModal = dynamic(() => import('@/app/components/app/duplicate-modal'), {
-  ssr: false,
-})
-const Confirm = dynamic(() => import('@/app/components/base/confirm'), {
-  ssr: false,
-})
-const UpdateDSLModal = dynamic(() => import('@/app/components/workflow/update-dsl-modal'), {
-  ssr: false,
-})
-const DSLExportConfirmModal = dynamic(() => import('@/app/components/workflow/dsl-export-confirm-modal'), {
-  ssr: false,
-})
-
-export type IAppInfoProps = {
-  expand: boolean
-  onlyShowDetail?: boolean
-  openState?: boolean
-  onDetailExpand?: (expand: boolean) => void
-}
-
-const AppInfo = ({ expand, onlyShowDetail = false, openState = false, onDetailExpand }: IAppInfoProps) => {
-  const { t } = useTranslation()
-  const { notify } = useContext(ToastContext)
-  const { replace } = useRouter()
-  const { onPlanInfoChanged } = useProviderContext()
-  const appDetail = useAppStore(state => state.appDetail)
-  const setAppDetail = useAppStore(state => state.setAppDetail)
-  const invalidateAppList = useInvalidateAppList()
-  const [open, setOpen] = useState(openState)
-  const [showEditModal, setShowEditModal] = useState(false)
-  const [showDuplicateModal, setShowDuplicateModal] = useState(false)
-  const [showConfirmDelete, setShowConfirmDelete] = useState(false)
-  const [showSwitchModal, setShowSwitchModal] = useState<boolean>(false)
-  const [showImportDSLModal, setShowImportDSLModal] = useState<boolean>(false)
-  const [secretEnvList, setSecretEnvList] = useState<EnvironmentVariable[]>([])
-  const [showExportWarning, setShowExportWarning] = useState(false)
-
-  const onEdit: CreateAppModalProps['onConfirm'] = useCallback(async ({
-    name,
-    icon_type,
-    icon,
-    icon_background,
-    description,
-    use_icon_as_answer_icon,
-    max_active_requests,
-  }) => {
-    if (!appDetail)
-      return
-    try {
-      const app = await updateAppInfo({
-        appID: appDetail.id,
-        name,
-        icon_type,
-        icon,
-        icon_background,
-        description,
-        use_icon_as_answer_icon,
-        max_active_requests,
-      })
-      setShowEditModal(false)
-      notify({
-        type: 'success',
-        message: t('editDone', { ns: 'app' }),
-      })
-      setAppDetail(app)
-    }
-    catch {
-      notify({ type: 'error', message: t('editFailed', { ns: 'app' }) })
-    }
-  }, [appDetail, notify, setAppDetail, t])
-
-  const onCopy: DuplicateAppModalProps['onConfirm'] = async ({ name, icon_type, icon, icon_background }) => {
-    if (!appDetail)
-      return
-    try {
-      const newApp = await copyApp({
-        appID: appDetail.id,
-        name,
-        icon_type,
-        icon,
-        icon_background,
-        mode: appDetail.mode,
-      })
-      setShowDuplicateModal(false)
-      notify({
-        type: 'success',
-        message: t('newApp.appCreated', { ns: 'app' }),
-      })
-      localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
-      onPlanInfoChanged()
-      getRedirection(true, newApp, replace)
-    }
-    catch {
-      notify({ type: 'error', message: t('newApp.appCreateFailed', { ns: 'app' }) })
-    }
-  }
-
-  const onExport = async (include = false) => {
-    if (!appDetail)
-      return
-    try {
-      const { data } = await exportAppConfig({
-        appID: appDetail.id,
-        include,
-      })
-      const file = new Blob([data], { type: 'application/yaml' })
-      downloadBlob({ data: file, fileName: `${appDetail.name}.yml` })
-    }
-    catch {
-      notify({ type: 'error', message: t('exportFailed', { ns: 'app' }) })
-    }
-  }
-
-  const exportCheck = async () => {
-    if (!appDetail)
-      return
-    if (appDetail.mode !== AppModeEnum.WORKFLOW && appDetail.mode !== AppModeEnum.ADVANCED_CHAT) {
-      onExport()
-      return
-    }
-
-    setShowExportWarning(true)
-  }
-
-  const handleConfirmExport = async () => {
-    if (!appDetail)
-      return
-    setShowExportWarning(false)
-    try {
-      const workflowDraft = await fetchWorkflowDraft(`/apps/${appDetail.id}/workflows/draft`)
-      const list = (workflowDraft.environment_variables || []).filter(env => env.value_type === 'secret')
-      if (list.length === 0) {
-        onExport()
-        return
-      }
-      setSecretEnvList(list)
-    }
-    catch {
-      notify({ type: 'error', message: t('exportFailed', { ns: 'app' }) })
-    }
-  }
-
-  const onConfirmDelete = useCallback(async () => {
-    if (!appDetail)
-      return
-    try {
-      await deleteApp(appDetail.id)
-      notify({ type: 'success', message: t('appDeleted', { ns: 'app' }) })
-      invalidateAppList()
-      onPlanInfoChanged()
-      setAppDetail()
-      replace('/apps')
-    }
-    catch (e: any) {
-      notify({
-        type: 'error',
-        message: `${t('appDeleteFailed', { ns: 'app' })}${'message' in e ? `: ${e.message}` : ''}`,
-      })
-    }
-    setShowConfirmDelete(false)
-  }, [appDetail, invalidateAppList, notify, onPlanInfoChanged, replace, setAppDetail, t])
-
-  const { isCurrentWorkspaceEditor } = useAppContext()
-
-  if (!appDetail)
-    return null
-
-  const primaryOperations = [
-    {
-      id: 'edit',
-      title: t('editApp', { ns: 'app' }),
-      icon: <RiEditLine />,
-      onClick: () => {
-        setOpen(false)
-        onDetailExpand?.(false)
-        setShowEditModal(true)
-      },
-    },
-    {
-      id: 'duplicate',
-      title: t('duplicate', { ns: 'app' }),
-      icon: <RiFileCopy2Line />,
-      onClick: () => {
-        setOpen(false)
-        onDetailExpand?.(false)
-        setShowDuplicateModal(true)
-      },
-    },
-    {
-      id: 'export',
-      title: t('export', { ns: 'app' }),
-      icon: <RiFileDownloadLine />,
-      onClick: exportCheck,
-    },
-  ]
-
-  const secondaryOperations: Operation[] = [
-    // Import DSL (conditional)
-    ...(appDetail.mode === AppModeEnum.ADVANCED_CHAT || appDetail.mode === AppModeEnum.WORKFLOW)
-      ? [{
-          id: 'import',
-          title: t('common.importDSL', { ns: 'workflow' }),
-          icon: <RiFileUploadLine />,
-          onClick: () => {
-            setOpen(false)
-            onDetailExpand?.(false)
-            setShowImportDSLModal(true)
-          },
-        }]
-      : [],
-    // Divider
-    {
-      id: 'divider-1',
-      title: '',
-      icon: <></>,
-      onClick: () => { /* divider has no action */ },
-      type: 'divider' as const,
-    },
-    // Delete operation
-    {
-      id: 'delete',
-      title: t('operation.delete', { ns: 'common' }),
-      icon: <RiDeleteBinLine />,
-      onClick: () => {
-        setOpen(false)
-        onDetailExpand?.(false)
-        setShowConfirmDelete(true)
-      },
-    },
-  ]
-
-  // Keep the switch operation separate as it's not part of the main operations
-  const switchOperation = (appDetail.mode === AppModeEnum.COMPLETION || appDetail.mode === AppModeEnum.CHAT)
-    ? {
-        id: 'switch',
-        title: t('switch', { ns: 'app' }),
-        icon: <RiExchange2Line />,
-        onClick: () => {
-          setOpen(false)
-          onDetailExpand?.(false)
-          setShowSwitchModal(true)
-        },
-      }
-    : null
-
-  return (
-    <div>
-      {!onlyShowDetail && (
-        <button
-          type="button"
-          onClick={() => {
-            if (isCurrentWorkspaceEditor)
-              setOpen(v => !v)
-          }}
-          className="block w-full"
-        >
-          <div className="flex flex-col gap-2 rounded-lg p-1 hover:bg-state-base-hover">
-            <div className="flex items-center gap-1">
-              <div className={cn(!expand && 'ml-1')}>
-                <AppIcon
-                  size={expand ? 'large' : 'small'}
-                  iconType={appDetail.icon_type}
-                  icon={appDetail.icon}
-                  background={appDetail.icon_background}
-                  imageUrl={appDetail.icon_url}
-                />
-              </div>
-              {expand && (
-                <div className="ml-auto flex items-center justify-center rounded-md p-0.5">
-                  <div className="flex h-5 w-5 items-center justify-center">
-                    <RiEqualizer2Line className="h-4 w-4 text-text-tertiary" />
-                  </div>
-                </div>
-              )}
-            </div>
-            {!expand && (
-              <div className="flex items-center justify-center">
-                <div className="flex h-5 w-5 items-center justify-center rounded-md p-0.5">
-                  <RiEqualizer2Line className="h-4 w-4 text-text-tertiary" />
-                </div>
-              </div>
-            )}
-            {expand && (
-              <div className="flex flex-col items-start gap-1">
-                <div className="flex w-full">
-                  <div className="system-md-semibold truncate whitespace-nowrap text-text-secondary">{appDetail.name}</div>
-                </div>
-                <div className="system-2xs-medium-uppercase whitespace-nowrap text-text-tertiary">
-                  {appDetail.mode === AppModeEnum.ADVANCED_CHAT
-                    ? t('types.advanced', { ns: 'app' })
-                    : appDetail.mode === AppModeEnum.AGENT_CHAT
-                      ? t('types.agent', { ns: 'app' })
-                      : appDetail.mode === AppModeEnum.CHAT
-                        ? t('types.chatbot', { ns: 'app' })
-                        : appDetail.mode === AppModeEnum.COMPLETION
-                          ? t('types.completion', { ns: 'app' })
-                          : t('types.workflow', { ns: 'app' })}
-                </div>
-              </div>
-            )}
-          </div>
-        </button>
-      )}
-      <ContentDialog
-        show={onlyShowDetail ? openState : open}
-        onClose={() => {
-          setOpen(false)
-          onDetailExpand?.(false)
-        }}
-        className="absolute bottom-2 left-2 top-2 flex w-[420px] flex-col rounded-2xl !p-0"
-      >
-        <div className="flex shrink-0 flex-col items-start justify-center gap-3 self-stretch p-4">
-          <div className="flex items-center gap-3 self-stretch">
-            <AppIcon
-              size="large"
-              iconType={appDetail.icon_type}
-              icon={appDetail.icon}
-              background={appDetail.icon_background}
-              imageUrl={appDetail.icon_url}
-            />
-            <div className="flex flex-1 flex-col items-start justify-center overflow-hidden">
-              <div className="system-md-semibold w-full truncate text-text-secondary">{appDetail.name}</div>
-              <div className="system-2xs-medium-uppercase text-text-tertiary">{appDetail.mode === AppModeEnum.ADVANCED_CHAT ? t('types.advanced', { ns: 'app' }) : appDetail.mode === AppModeEnum.AGENT_CHAT ? t('types.agent', { ns: 'app' }) : appDetail.mode === AppModeEnum.CHAT ? t('types.chatbot', { ns: 'app' }) : appDetail.mode === AppModeEnum.COMPLETION ? t('types.completion', { ns: 'app' }) : t('types.workflow', { ns: 'app' })}</div>
-            </div>
-          </div>
-          {/* description */}
-          {appDetail.description && (
-            <div className="system-xs-regular overflow-wrap-anywhere max-h-[105px] w-full max-w-full overflow-y-auto whitespace-normal break-words text-text-tertiary">{appDetail.description}</div>
-          )}
-          {/* operations */}
-          <AppOperations
-            gap={4}
-            primaryOperations={primaryOperations}
-            secondaryOperations={secondaryOperations}
-          />
-        </div>
-        <CardView
-          appId={appDetail.id}
-          isInPanel={true}
-          className="flex flex-1 flex-col gap-2 overflow-auto px-2 py-1"
-        />
-        {/* Switch operation (if available) */}
-        {switchOperation && (
-          <div className="flex min-h-fit shrink-0 flex-col items-start justify-center gap-3 self-stretch pb-2">
-            <Button
-              size="medium"
-              variant="ghost"
-              className="gap-0.5"
-              onClick={switchOperation.onClick}
-            >
-              {switchOperation.icon}
-              <span className="system-sm-medium text-text-tertiary">{switchOperation.title}</span>
-            </Button>
-          </div>
-        )}
-      </ContentDialog>
-      {showSwitchModal && (
-        <SwitchAppModal
-          inAppDetail
-          show={showSwitchModal}
-          appDetail={appDetail}
-          onClose={() => setShowSwitchModal(false)}
-          onSuccess={() => setShowSwitchModal(false)}
-        />
-      )}
-      {showEditModal && (
-        <CreateAppModal
-          isEditModal
-          appName={appDetail.name}
-          appIconType={appDetail.icon_type}
-          appIcon={appDetail.icon}
-          appIconBackground={appDetail.icon_background}
-          appIconUrl={appDetail.icon_url}
-          appDescription={appDetail.description}
-          appMode={appDetail.mode}
-          appUseIconAsAnswerIcon={appDetail.use_icon_as_answer_icon}
-          max_active_requests={appDetail.max_active_requests ?? null}
-          show={showEditModal}
-          onConfirm={onEdit}
-          onHide={() => setShowEditModal(false)}
-        />
-      )}
-      {showDuplicateModal && (
-        <DuplicateAppModal
-          appName={appDetail.name}
-          icon_type={appDetail.icon_type}
-          icon={appDetail.icon}
-          icon_background={appDetail.icon_background}
-          icon_url={appDetail.icon_url}
-          show={showDuplicateModal}
-          onConfirm={onCopy}
-          onHide={() => setShowDuplicateModal(false)}
-        />
-      )}
-      {showConfirmDelete && (
-        <Confirm
-          title={t('deleteAppConfirmTitle', { ns: 'app' })}
-          content={t('deleteAppConfirmContent', { ns: 'app' })}
-          isShow={showConfirmDelete}
-          onConfirm={onConfirmDelete}
-          onCancel={() => setShowConfirmDelete(false)}
-        />
-      )}
-      {showImportDSLModal && (
-        <UpdateDSLModal
-          onCancel={() => setShowImportDSLModal(false)}
-          onBackup={exportCheck}
-        />
-      )}
-      {secretEnvList.length > 0 && (
-        <DSLExportConfirmModal
-          envList={secretEnvList}
-          onConfirm={onExport}
-          onClose={() => setSecretEnvList([])}
-        />
-      )}
-      {showExportWarning && (
-        <Confirm
-          type="info"
-          isShow={showExportWarning}
-          title={t('sidebar.exportWarning', { ns: 'workflow' })}
-          content={t('sidebar.exportWarningDesc', { ns: 'workflow' })}
-          onConfirm={handleConfirmExport}
-          onCancel={() => setShowExportWarning(false)}
-        />
-      )}
-    </div>
-  )
-}
-
-export default React.memo(AppInfo)
diff --git a/web/app/components/app-sidebar/app-info/__tests__/app-info-detail-panel.spec.tsx b/web/app/components/app-sidebar/app-info/__tests__/app-info-detail-panel.spec.tsx
new file mode 100644
index 0000000000..3082eb3789
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/__tests__/app-info-detail-panel.spec.tsx
@@ -0,0 +1,298 @@
+import type { App, AppSSO } from '@/types/app'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import { AppModeEnum } from '@/types/app'
+import AppInfoDetailPanel from '../app-info-detail-panel'
+
+vi.mock('../../../base/app-icon', () => ({
+  default: ({ size, icon }: { size: string, icon: string }) => (
+    <div data-testid="app-icon" data-size={size} data-icon={icon} />
+  ),
+}))
+
+vi.mock('@/app/components/base/content-dialog', () => ({
+  default: ({ show, onClose, children, className }: {
+    show: boolean
+    onClose: () => void
+    children: React.ReactNode
+    className?: string
+  }) => (
+    show
+      ? (
+          <div data-testid="content-dialog" className={className}>
+            <button type="button" data-testid="dialog-close" onClick={onClose}>Close</button>
+            {children}
+          </div>
+        )
+      : null
+  ),
+}))
+
+vi.mock('@/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/card-view', () => ({
+  default: ({ appId }: { appId: string }) => (
+    <div data-testid="card-view" data-app-id={appId} />
+  ),
+}))
+
+vi.mock('@/app/components/base/button', () => ({
+  default: ({ children, onClick, className, size, variant }: {
+    children: React.ReactNode
+    onClick?: () => void
+    className?: string
+    size?: string
+    variant?: string
+  }) => (
+    <button type="button" onClick={onClick} className={className} data-size={size} data-variant={variant}>
+      {children}
+    </button>
+  ),
+}))
+
+vi.mock('../app-operations', () => ({
+  default: ({ primaryOperations, secondaryOperations }: {
+    primaryOperations?: Array<{ id: string, title: string, onClick: () => void }>
+    secondaryOperations?: Array<{ id: string, title: string, onClick: () => void, type?: string }>
+  }) => (
+    <div data-testid="app-operations">
+      {primaryOperations?.map(op => (
+        <button key={op.id} type="button" data-testid={`op-${op.id}`} onClick={op.onClick}>{op.title}</button>
+      ))}
+      {secondaryOperations?.map(op => (
+        op.type === 'divider'
+          ? <button key={op.id} type="button" data-testid={`op-${op.id}`} onClick={op.onClick}>divider</button>
+          : <button key={op.id} type="button" data-testid={`op-${op.id}`} onClick={op.onClick}>{op.title}</button>
+      ))}
+    </div>
+  ),
+}))
+
+const createAppDetail = (overrides: Partial<App> = {}): App & Partial<AppSSO> => ({
+  id: 'app-1',
+  name: 'Test App',
+  mode: AppModeEnum.CHAT,
+  icon: '🤖',
+  icon_type: 'emoji',
+  icon_background: '#FFEAD5',
+  icon_url: '',
+  description: 'A test description',
+  use_icon_as_answer_icon: false,
+  ...overrides,
+} as App & Partial<AppSSO>)
+
+describe('AppInfoDetailPanel', () => {
+  const defaultProps = {
+    appDetail: createAppDetail(),
+    show: true,
+    onClose: vi.fn(),
+    openModal: vi.fn(),
+    exportCheck: vi.fn(),
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('Rendering', () => {
+    it('should not render when show is false', () => {
+      render(<AppInfoDetailPanel {...defaultProps} show={false} />)
+      expect(screen.queryByTestId('content-dialog')).not.toBeInTheDocument()
+    })
+
+    it('should render dialog when show is true', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      expect(screen.getByTestId('content-dialog')).toBeInTheDocument()
+    })
+
+    it('should display app name', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      expect(screen.getByText('Test App')).toBeInTheDocument()
+    })
+
+    it('should display app mode label', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      expect(screen.getByText('app.types.chatbot')).toBeInTheDocument()
+    })
+
+    it('should display description when available', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      expect(screen.getByText('A test description')).toBeInTheDocument()
+    })
+
+    it('should not display description when empty', () => {
+      render(<AppInfoDetailPanel {...defaultProps} appDetail={createAppDetail({ description: '' })} />)
+      expect(screen.queryByText('A test description')).not.toBeInTheDocument()
+    })
+
+    it('should not display description when undefined', () => {
+      render(<AppInfoDetailPanel {...defaultProps} appDetail={createAppDetail({ description: undefined as unknown as string })} />)
+      expect(screen.queryByText('A test description')).not.toBeInTheDocument()
+    })
+
+    it('should render CardView with correct appId', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      const cardView = screen.getByTestId('card-view')
+      expect(cardView).toHaveAttribute('data-app-id', 'app-1')
+    })
+
+    it('should render app icon with large size', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      const icon = screen.getByTestId('app-icon')
+      expect(icon).toHaveAttribute('data-size', 'large')
+    })
+  })
+
+  describe('Operations', () => {
+    it('should render edit, duplicate, and export operations', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      expect(screen.getByTestId('op-edit')).toBeInTheDocument()
+      expect(screen.getByTestId('op-duplicate')).toBeInTheDocument()
+      expect(screen.getByTestId('op-export')).toBeInTheDocument()
+    })
+
+    it('should call openModal with edit when edit is clicked', async () => {
+      const user = userEvent.setup()
+      render(<AppInfoDetailPanel {...defaultProps} />)
+
+      await user.click(screen.getByTestId('op-edit'))
+
+      expect(defaultProps.openModal).toHaveBeenCalledWith('edit')
+    })
+
+    it('should call openModal with duplicate when duplicate is clicked', async () => {
+      const user = userEvent.setup()
+      render(<AppInfoDetailPanel {...defaultProps} />)
+
+      await user.click(screen.getByTestId('op-duplicate'))
+
+      expect(defaultProps.openModal).toHaveBeenCalledWith('duplicate')
+    })
+
+    it('should call exportCheck when export is clicked', async () => {
+      const user = userEvent.setup()
+      render(<AppInfoDetailPanel {...defaultProps} />)
+
+      await user.click(screen.getByTestId('op-export'))
+
+      expect(defaultProps.exportCheck).toHaveBeenCalledTimes(1)
+    })
+
+    it('should render delete operation', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      expect(screen.getByTestId('op-delete')).toBeInTheDocument()
+    })
+
+    it('should call openModal with delete when delete is clicked', async () => {
+      const user = userEvent.setup()
+      render(<AppInfoDetailPanel {...defaultProps} />)
+
+      await user.click(screen.getByTestId('op-delete'))
+
+      expect(defaultProps.openModal).toHaveBeenCalledWith('delete')
+    })
+  })
+
+  describe('Import DSL option', () => {
+    it('should show import DSL for advanced_chat mode', () => {
+      render(
+        <AppInfoDetailPanel
+          {...defaultProps}
+          appDetail={createAppDetail({ mode: AppModeEnum.ADVANCED_CHAT })}
+        />,
+      )
+      expect(screen.getByTestId('op-import')).toBeInTheDocument()
+    })
+
+    it('should show import DSL for workflow mode', () => {
+      render(
+        <AppInfoDetailPanel
+          {...defaultProps}
+          appDetail={createAppDetail({ mode: AppModeEnum.WORKFLOW })}
+        />,
+      )
+      expect(screen.getByTestId('op-import')).toBeInTheDocument()
+    })
+
+    it('should not show import DSL for chat mode', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      expect(screen.queryByTestId('op-import')).not.toBeInTheDocument()
+    })
+
+    it('should call openModal with importDSL when import is clicked', async () => {
+      const user = userEvent.setup()
+      render(
+        <AppInfoDetailPanel
+          {...defaultProps}
+          appDetail={createAppDetail({ mode: AppModeEnum.ADVANCED_CHAT })}
+        />,
+      )
+      await user.click(screen.getByTestId('op-import'))
+      expect(defaultProps.openModal).toHaveBeenCalledWith('importDSL')
+    })
+
+    it('should render divider in secondary operations', async () => {
+      const user = userEvent.setup()
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      const divider = screen.getByTestId('op-divider-1')
+      expect(divider).toBeInTheDocument()
+      await user.click(divider)
+    })
+  })
+
+  describe('Switch operation', () => {
+    it('should show switch button for chat mode', () => {
+      render(<AppInfoDetailPanel {...defaultProps} />)
+      expect(screen.getByText('app.switch')).toBeInTheDocument()
+    })
+
+    it('should show switch button for completion mode', () => {
+      render(
+        <AppInfoDetailPanel
+          {...defaultProps}
+          appDetail={createAppDetail({ mode: AppModeEnum.COMPLETION })}
+        />,
+      )
+      expect(screen.getByText('app.switch')).toBeInTheDocument()
+    })
+
+    it('should not show switch button for workflow mode', () => {
+      render(
+        <AppInfoDetailPanel
+          {...defaultProps}
+          appDetail={createAppDetail({ mode: AppModeEnum.WORKFLOW })}
+        />,
+      )
+      expect(screen.queryByText('app.switch')).not.toBeInTheDocument()
+    })
+
+    it('should not show switch button for advanced_chat mode', () => {
+      render(
+        <AppInfoDetailPanel
+          {...defaultProps}
+          appDetail={createAppDetail({ mode: AppModeEnum.ADVANCED_CHAT })}
+        />,
+      )
+      expect(screen.queryByText('app.switch')).not.toBeInTheDocument()
+    })
+
+    it('should call openModal with switch when switch button is clicked', async () => {
+      const user = userEvent.setup()
+      render(<AppInfoDetailPanel {...defaultProps} />)
+
+      await user.click(screen.getByText('app.switch'))
+
+      expect(defaultProps.openModal).toHaveBeenCalledWith('switch')
+    })
+  })
+
+  describe('Dialog interactions', () => {
+    it('should call onClose when dialog close button is clicked', async () => {
+      const user = userEvent.setup()
+      render(<AppInfoDetailPanel {...defaultProps} />)
+
+      await user.click(screen.getByTestId('dialog-close'))
+
+      expect(defaultProps.onClose).toHaveBeenCalledTimes(1)
+    })
+  })
+})
diff --git a/web/app/components/app-sidebar/app-info/__tests__/app-info-modals.spec.tsx b/web/app/components/app-sidebar/app-info/__tests__/app-info-modals.spec.tsx
new file mode 100644
index 0000000000..f8612e8057
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/__tests__/app-info-modals.spec.tsx
@@ -0,0 +1,264 @@
+import type { App, AppSSO } from '@/types/app'
+import { act, render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import { AppModeEnum } from '@/types/app'
+import AppInfoModals from '../app-info-modals'
+
+vi.mock('next/dynamic', () => ({
+  default: (loader: () => Promise<{ default: React.ComponentType }>) => {
+    const LazyComp = React.lazy(loader)
+    return function DynamicWrapper(props: Record<string, unknown>) {
+      return React.createElement(
+        React.Suspense,
+        { fallback: null },
+        React.createElement(LazyComp, props),
+      )
+    }
+  },
+}))
+
+vi.mock('@/app/components/app/switch-app-modal', () => ({
+  default: ({ show, onClose }: { show: boolean, onClose: () => void }) => (
+    show ? <div data-testid="switch-modal"><button type="button" onClick={onClose}>Close Switch</button></div> : null
+  ),
+}))
+
+vi.mock('@/app/components/explore/create-app-modal', () => ({
+  default: ({ show, onHide, isEditModal }: { show: boolean, onHide: () => void, isEditModal?: boolean }) => (
+    show ? <div data-testid={isEditModal ? 'edit-modal' : 'create-modal'}><button type="button" onClick={onHide}>Close Edit</button></div> : null
+  ),
+}))
+
+vi.mock('@/app/components/app/duplicate-modal', () => ({
+  default: ({ show, onHide }: { show: boolean, onHide: () => void }) => (
+    show ? <div data-testid="duplicate-modal"><button type="button" onClick={onHide}>Close Dup</button></div> : null
+  ),
+}))
+
+vi.mock('@/app/components/base/confirm', () => ({
+  default: ({ isShow, title, onConfirm, onCancel }: {
+    isShow: boolean
+    title: string
+    onConfirm: () => void
+    onCancel: () => void
+  }) => (
+    isShow
+      ? (
+          <div data-testid="confirm-modal" data-title={title}>
+            <button type="button" onClick={onConfirm}>Confirm</button>
+            <button type="button" onClick={onCancel}>Cancel</button>
+          </div>
+        )
+      : null
+  ),
+}))
+
+vi.mock('@/app/components/workflow/update-dsl-modal', () => ({
+  default: ({ onCancel, onBackup }: { onCancel: () => void, onBackup: () => void }) => (
+    <div data-testid="import-dsl-modal">
+      <button type="button" onClick={onCancel}>Cancel Import</button>
+      <button type="button" onClick={onBackup}>Backup</button>
+    </div>
+  ),
+}))
+
+vi.mock('@/app/components/workflow/dsl-export-confirm-modal', () => ({
+  default: ({ onConfirm, onClose }: { onConfirm: (include?: boolean) => void, onClose: () => void }) => (
+    <div data-testid="dsl-export-confirm-modal">
+      <button type="button" onClick={() => onConfirm(true)}>Export Include</button>
+      <button type="button" onClick={onClose}>Close Export</button>
+    </div>
+  ),
+}))
+
+const createAppDetail = (overrides: Partial<App> = {}): App & Partial<AppSSO> => ({
+  id: 'app-1',
+  name: 'Test App',
+  mode: AppModeEnum.CHAT,
+  icon: '🤖',
+  icon_type: 'emoji',
+  icon_background: '#FFEAD5',
+  icon_url: '',
+  description: '',
+  use_icon_as_answer_icon: false,
+  max_active_requests: null,
+  ...overrides,
+} as App & Partial<AppSSO>)
+
+const defaultProps = {
+  appDetail: createAppDetail(),
+  closeModal: vi.fn(),
+  secretEnvList: [] as never[],
+  setSecretEnvList: vi.fn(),
+  onEdit: vi.fn(),
+  onCopy: vi.fn(),
+  onExport: vi.fn(),
+  exportCheck: vi.fn(),
+  handleConfirmExport: vi.fn(),
+  onConfirmDelete: vi.fn(),
+}
+
+describe('AppInfoModals', () => {
+  beforeAll(async () => {
+    await new Promise(resolve => setTimeout(resolve, 0))
+  })
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should render nothing when activeModal is null', async () => {
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal={null} />)
+    })
+    expect(screen.queryByTestId('switch-modal')).not.toBeInTheDocument()
+    expect(screen.queryByTestId('confirm-modal')).not.toBeInTheDocument()
+  })
+
+  it('should render SwitchAppModal when activeModal is switch', async () => {
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="switch" />)
+    })
+    await waitFor(() => {
+      expect(screen.getByTestId('switch-modal')).toBeInTheDocument()
+    })
+  })
+
+  it('should render CreateAppModal in edit mode when activeModal is edit', async () => {
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="edit" />)
+    })
+    await waitFor(() => {
+      expect(screen.getByTestId('edit-modal')).toBeInTheDocument()
+    })
+  })
+
+  it('should render DuplicateAppModal when activeModal is duplicate', async () => {
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="duplicate" />)
+    })
+    await waitFor(() => {
+      expect(screen.getByTestId('duplicate-modal')).toBeInTheDocument()
+    })
+  })
+
+  it('should render Confirm for delete when activeModal is delete', async () => {
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="delete" />)
+    })
+    await waitFor(() => {
+      const confirm = screen.getByTestId('confirm-modal')
+      expect(confirm).toBeInTheDocument()
+      expect(confirm).toHaveAttribute('data-title', 'app.deleteAppConfirmTitle')
+    })
+  })
+
+  it('should render UpdateDSLModal when activeModal is importDSL', async () => {
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="importDSL" />)
+    })
+    await waitFor(() => {
+      expect(screen.getByTestId('import-dsl-modal')).toBeInTheDocument()
+    })
+  })
+
+  it('should render export warning Confirm when activeModal is exportWarning', async () => {
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="exportWarning" />)
+    })
+    await waitFor(() => {
+      const confirm = screen.getByTestId('confirm-modal')
+      expect(confirm).toBeInTheDocument()
+      expect(confirm).toHaveAttribute('data-title', 'workflow.sidebar.exportWarning')
+    })
+  })
+
+  it('should render DSLExportConfirmModal when secretEnvList is not empty', async () => {
+    await act(async () => {
+      render(
+        <AppInfoModals
+          {...defaultProps}
+          activeModal={null}
+          secretEnvList={[{ id: 'env-1', key: 'SECRET', value: '', value_type: 'secret', name: 'Secret' } as never]}
+        />,
+      )
+    })
+    await waitFor(() => {
+      expect(screen.getByTestId('dsl-export-confirm-modal')).toBeInTheDocument()
+    })
+  })
+
+  it('should not render DSLExportConfirmModal when secretEnvList is empty', async () => {
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal={null} />)
+    })
+    expect(screen.queryByTestId('dsl-export-confirm-modal')).not.toBeInTheDocument()
+  })
+
+  it('should call closeModal when cancel on delete modal', async () => {
+    const user = userEvent.setup()
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="delete" />)
+    })
+
+    await waitFor(() => expect(screen.getByText('Cancel')).toBeInTheDocument())
+    await user.click(screen.getByText('Cancel'))
+
+    expect(defaultProps.closeModal).toHaveBeenCalledTimes(1)
+  })
+
+  it('should call onConfirmDelete when confirm on delete modal', async () => {
+    const user = userEvent.setup()
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="delete" />)
+    })
+
+    await waitFor(() => expect(screen.getByText('Confirm')).toBeInTheDocument())
+    await user.click(screen.getByText('Confirm'))
+
+    expect(defaultProps.onConfirmDelete).toHaveBeenCalledTimes(1)
+  })
+
+  it('should call handleConfirmExport when confirm on export warning', async () => {
+    const user = userEvent.setup()
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="exportWarning" />)
+    })
+
+    await waitFor(() => expect(screen.getByText('Confirm')).toBeInTheDocument())
+    await user.click(screen.getByText('Confirm'))
+
+    expect(defaultProps.handleConfirmExport).toHaveBeenCalledTimes(1)
+  })
+
+  it('should call exportCheck when backup on importDSL modal', async () => {
+    const user = userEvent.setup()
+    await act(async () => {
+      render(<AppInfoModals {...defaultProps} activeModal="importDSL" />)
+    })
+
+    await waitFor(() => expect(screen.getByText('Backup')).toBeInTheDocument())
+    await user.click(screen.getByText('Backup'))
+
+    expect(defaultProps.exportCheck).toHaveBeenCalledTimes(1)
+  })
+
+  it('should call setSecretEnvList with empty array when closing DSLExportConfirmModal', async () => {
+    const user = userEvent.setup()
+    await act(async () => {
+      render(
+        <AppInfoModals
+          {...defaultProps}
+          activeModal={null}
+          secretEnvList={[{ id: 'env-1', key: 'SECRET', value: '', value_type: 'secret', name: 'Secret' } as never]}
+        />,
+      )
+    })
+
+    await waitFor(() => expect(screen.getByText('Close Export')).toBeInTheDocument())
+    await user.click(screen.getByText('Close Export'))
+
+    expect(defaultProps.setSecretEnvList).toHaveBeenCalledWith([])
+  })
+})
diff --git a/web/app/components/app-sidebar/app-info/__tests__/app-info-trigger.spec.tsx b/web/app/components/app-sidebar/app-info/__tests__/app-info-trigger.spec.tsx
new file mode 100644
index 0000000000..65d660876c
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/__tests__/app-info-trigger.spec.tsx
@@ -0,0 +1,99 @@
+import type { App, AppSSO } from '@/types/app'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import { AppModeEnum } from '@/types/app'
+import AppInfoTrigger from '../app-info-trigger'
+
+vi.mock('../../../base/app-icon', () => ({
+  default: ({ size, icon, background }: {
+    size: string
+    icon: string
+    background: string
+    iconType?: string
+    imageUrl?: string
+  }) => (
+    <div data-testid="app-icon" data-size={size} data-icon={icon} data-bg={background} />
+  ),
+}))
+
+const createAppDetail = (overrides: Partial<App> = {}): App & Partial<AppSSO> => ({
+  id: 'app-1',
+  name: 'Test App',
+  mode: AppModeEnum.CHAT,
+  icon: '🤖',
+  icon_type: 'emoji',
+  icon_background: '#FFEAD5',
+  icon_url: '',
+  description: 'A test app',
+  use_icon_as_answer_icon: false,
+  ...overrides,
+} as App & Partial<AppSSO>)
+
+describe('AppInfoTrigger', () => {
+  it('should render app icon with correct size when expanded', () => {
+    render(<AppInfoTrigger appDetail={createAppDetail()} expand onClick={vi.fn()} />)
+    const icon = screen.getByTestId('app-icon')
+    expect(icon).toHaveAttribute('data-size', 'large')
+  })
+
+  it('should render app icon with small size when collapsed', () => {
+    render(<AppInfoTrigger appDetail={createAppDetail()} expand={false} onClick={vi.fn()} />)
+    const icon = screen.getByTestId('app-icon')
+    expect(icon).toHaveAttribute('data-size', 'small')
+  })
+
+  it('should show app name when expanded', () => {
+    render(<AppInfoTrigger appDetail={createAppDetail({ name: 'My Chatbot' })} expand onClick={vi.fn()} />)
+    expect(screen.getByText('My Chatbot')).toBeInTheDocument()
+  })
+
+  it('should not show app name when collapsed', () => {
+    render(<AppInfoTrigger appDetail={createAppDetail({ name: 'My Chatbot' })} expand={false} onClick={vi.fn()} />)
+    expect(screen.queryByText('My Chatbot')).not.toBeInTheDocument()
+  })
+
+  it('should show app mode label when expanded', () => {
+    render(<AppInfoTrigger appDetail={createAppDetail({ mode: AppModeEnum.ADVANCED_CHAT })} expand onClick={vi.fn()} />)
+    expect(screen.getByText('app.types.advanced')).toBeInTheDocument()
+  })
+
+  it('should not show mode label when collapsed', () => {
+    render(<AppInfoTrigger appDetail={createAppDetail()} expand={false} onClick={vi.fn()} />)
+    expect(screen.queryByText('app.types.chatbot')).not.toBeInTheDocument()
+  })
+
+  it('should call onClick when button is clicked', async () => {
+    const user = userEvent.setup()
+    const onClick = vi.fn()
+    render(<AppInfoTrigger appDetail={createAppDetail()} expand onClick={onClick} />)
+
+    await user.click(screen.getByRole('button'))
+
+    expect(onClick).toHaveBeenCalledTimes(1)
+  })
+
+  it('should show settings icon in expanded and collapsed states', () => {
+    const { container, rerender } = render(
+      <AppInfoTrigger appDetail={createAppDetail()} expand onClick={vi.fn()} />,
+    )
+    expect(container.querySelector('svg')).toBeInTheDocument()
+
+    rerender(<AppInfoTrigger appDetail={createAppDetail()} expand={false} onClick={vi.fn()} />)
+    expect(container.querySelector('svg')).toBeInTheDocument()
+  })
+
+  it('should apply ml-1 class to icon wrapper when collapsed', () => {
+    render(
+      <AppInfoTrigger appDetail={createAppDetail()} expand={false} onClick={vi.fn()} />,
+    )
+    const iconWrapper = screen.getByTestId('app-icon').parentElement
+    expect(iconWrapper).toHaveClass('ml-1')
+  })
+
+  it('should not apply ml-1 class when expanded', () => {
+    render(<AppInfoTrigger appDetail={createAppDetail()} expand onClick={vi.fn()} />)
+    const iconWrapper = screen.getByTestId('app-icon').parentElement
+    expect(iconWrapper).not.toHaveClass('ml-1')
+  })
+})
diff --git a/web/app/components/app-sidebar/app-info/__tests__/app-mode-labels.spec.ts b/web/app/components/app-sidebar/app-info/__tests__/app-mode-labels.spec.ts
new file mode 100644
index 0000000000..ac4318278c
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/__tests__/app-mode-labels.spec.ts
@@ -0,0 +1,34 @@
+import type { TFunction } from 'i18next'
+import { AppModeEnum } from '@/types/app'
+import { getAppModeLabel } from '../app-mode-labels'
+
+describe('getAppModeLabel', () => {
+  const t: TFunction = ((key: string, options?: Record<string, unknown>) => {
+    const ns = (options?.ns as string | undefined) ?? ''
+    return ns ? `${ns}.${key}` : key
+  }) as TFunction
+
+  it('should return advanced chat label', () => {
+    expect(getAppModeLabel(AppModeEnum.ADVANCED_CHAT, t)).toBe('app.types.advanced')
+  })
+
+  it('should return agent chat label', () => {
+    expect(getAppModeLabel(AppModeEnum.AGENT_CHAT, t)).toBe('app.types.agent')
+  })
+
+  it('should return chatbot label', () => {
+    expect(getAppModeLabel(AppModeEnum.CHAT, t)).toBe('app.types.chatbot')
+  })
+
+  it('should return completion label', () => {
+    expect(getAppModeLabel(AppModeEnum.COMPLETION, t)).toBe('app.types.completion')
+  })
+
+  it('should return workflow label for unknown mode', () => {
+    expect(getAppModeLabel('unknown-mode', t)).toBe('app.types.workflow')
+  })
+
+  it('should return workflow label for workflow mode', () => {
+    expect(getAppModeLabel(AppModeEnum.WORKFLOW, t)).toBe('app.types.workflow')
+  })
+})
diff --git a/web/app/components/app-sidebar/app-info/__tests__/app-operations.spec.tsx b/web/app/components/app-sidebar/app-info/__tests__/app-operations.spec.tsx
new file mode 100644
index 0000000000..1df23c2d20
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/__tests__/app-operations.spec.tsx
@@ -0,0 +1,253 @@
+import type { Operation } from '../app-operations'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import AppOperations from '../app-operations'
+
+vi.mock('../../../base/button', () => ({
+  default: ({ children, onClick, className, size, variant, id, tabIndex, ...rest }: {
+    'children': React.ReactNode
+    'onClick'?: () => void
+    'className'?: string
+    'size'?: string
+    'variant'?: string
+    'id'?: string
+    'tabIndex'?: number
+    'data-targetid'?: string
+  }) => (
+    <button
+      type="button"
+      onClick={onClick}
+      className={className}
+      data-size={size}
+      data-variant={variant}
+      id={id}
+      tabIndex={tabIndex}
+      data-targetid={rest['data-targetid']}
+    >
+      {children}
+    </button>
+  ),
+}))
+
+vi.mock('../../../base/portal-to-follow-elem', () => ({
+  PortalToFollowElem: ({ children, open }: { children: React.ReactNode, open: boolean }) => (
+    <div data-testid="portal-elem" data-open={open}>{children}</div>
+  ),
+  PortalToFollowElemTrigger: ({ children, onClick }: { children: React.ReactNode, onClick?: () => void }) => (
+    <div data-testid="portal-trigger" onClick={onClick}>{children}</div>
+  ),
+  PortalToFollowElemContent: ({ children, className }: { children: React.ReactNode, className?: string }) => (
+    <div data-testid="portal-content" className={className}>{children}</div>
+  ),
+}))
+
+const createOperation = (id: string, title: string, type?: 'divider'): Operation => ({
+  id,
+  title,
+  icon: <svg data-testid={`icon-${id}`} />,
+  onClick: vi.fn(),
+  type,
+})
+
+function setupDomMeasurements(navWidth: number, moreWidth: number, childWidths: number[]) {
+  const originalClientWidth = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'clientWidth')
+
+  Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
+    configurable: true,
+    get(this: HTMLElement) {
+      if (this.getAttribute('aria-hidden') === 'true')
+        return navWidth
+      if (this.id === 'more-measure')
+        return moreWidth
+      if (this.dataset.targetid) {
+        const idx = Array.from(this.parentElement?.children ?? []).indexOf(this)
+        return childWidths[idx] ?? 50
+      }
+      return 0
+    },
+  })
+
+  return () => {
+    if (originalClientWidth)
+      Object.defineProperty(HTMLElement.prototype, 'clientWidth', originalClientWidth)
+  }
+}
+
+describe('AppOperations', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('Rendering with operations prop', () => {
+    it('should render measurement container', () => {
+      const ops = [createOperation('edit', 'Edit'), createOperation('copy', 'Copy')]
+      const { container } = render(<AppOperations gap={4} operations={ops} />)
+      expect(container.querySelector('[aria-hidden="true"]')).toBeInTheDocument()
+    })
+
+    it('should render operation buttons in measurement container', () => {
+      const ops = [createOperation('edit', 'Edit'), createOperation('copy', 'Copy')]
+      render(<AppOperations gap={4} operations={ops} />)
+      const editButtons = screen.getAllByText('Edit')
+      expect(editButtons.length).toBeGreaterThanOrEqual(1)
+    })
+
+    it('should use operations as primary when provided', () => {
+      const ops = [createOperation('edit', 'Edit')]
+      const secondary = [createOperation('delete', 'Delete')]
+      render(<AppOperations gap={4} operations={ops} secondaryOperations={secondary} />)
+      const editButtons = screen.getAllByText('Edit')
+      expect(editButtons.length).toBeGreaterThanOrEqual(1)
+    })
+  })
+
+  describe('Rendering with primaryOperations and secondaryOperations', () => {
+    it('should render primary operations in measurement container', () => {
+      const primary = [createOperation('edit', 'Edit')]
+      render(<AppOperations gap={4} primaryOperations={primary} />)
+      const editButtons = screen.getAllByText('Edit')
+      expect(editButtons.length).toBeGreaterThanOrEqual(1)
+    })
+
+    it('should use secondary operations when provided', () => {
+      const primary = [createOperation('edit', 'Edit')]
+      const secondary = [createOperation('delete', 'Delete')]
+      render(<AppOperations gap={4} primaryOperations={primary} secondaryOperations={secondary} />)
+      const editButtons = screen.getAllByText('Edit')
+      expect(editButtons.length).toBeGreaterThanOrEqual(1)
+    })
+
+    it('should use empty operations array when neither operations nor primaryOperations provided', () => {
+      const { container } = render(<AppOperations gap={4} />)
+      expect(container).toBeInTheDocument()
+    })
+  })
+
+  describe('Overflow behavior', () => {
+    it('should show all operations when container is wide enough', () => {
+      const cleanup = setupDomMeasurements(500, 60, [80, 80])
+      const ops = [createOperation('edit', 'Edit'), createOperation('copy', 'Copy')]
+
+      render(<AppOperations gap={4} operations={ops} />)
+
+      cleanup()
+    })
+
+    it('should move operations to more menu when container is narrow', () => {
+      const cleanup = setupDomMeasurements(100, 60, [80, 80])
+      const ops = [createOperation('edit', 'Edit'), createOperation('copy', 'Copy')]
+
+      render(<AppOperations gap={4} operations={ops} />)
+
+      cleanup()
+    })
+
+    it('should show last item without more button if it fits alone', () => {
+      const cleanup = setupDomMeasurements(90, 60, [80])
+      const ops = [createOperation('edit', 'Edit')]
+
+      render(<AppOperations gap={4} operations={ops} />)
+
+      cleanup()
+    })
+  })
+
+  describe('More button', () => {
+    it('should render more button text in measurement container', () => {
+      const ops = [createOperation('edit', 'Edit')]
+      render(<AppOperations gap={4} operations={ops} />)
+      const moreButtons = screen.getAllByText('common.operation.more')
+      expect(moreButtons.length).toBeGreaterThanOrEqual(1)
+    })
+
+    it('should handle trigger more click', async () => {
+      const cleanup = setupDomMeasurements(100, 60, [80, 80])
+      const user = userEvent.setup()
+      const ops = [createOperation('edit', 'Edit'), createOperation('copy', 'Copy')]
+      const secondary = [createOperation('delete', 'Delete')]
+
+      render(<AppOperations gap={4} primaryOperations={ops} secondaryOperations={secondary} />)
+
+      const trigger = screen.queryByTestId('portal-trigger')
+      if (trigger)
+        await user.click(trigger)
+
+      cleanup()
+    })
+  })
+
+  describe('Visible operations click', () => {
+    it('should call onClick when a visible operation is clicked', async () => {
+      const cleanup = setupDomMeasurements(500, 60, [80, 80])
+      const user = userEvent.setup()
+      const editOp = createOperation('edit', 'Edit')
+      const copyOp = createOperation('copy', 'Copy')
+
+      render(<AppOperations gap={4} operations={[editOp, copyOp]} />)
+
+      const visibleButtons = screen.getAllByText('Edit')
+      const clickableButton = visibleButtons.find(btn => btn.closest('button')?.tabIndex !== -1)
+      if (clickableButton)
+        await user.click(clickableButton)
+
+      cleanup()
+    })
+  })
+
+  describe('Divider operations', () => {
+    it('should filter out divider operations from inline display', () => {
+      const ops = [
+        createOperation('edit', 'Edit'),
+        createOperation('div-1', '', 'divider'),
+        createOperation('delete', 'Delete'),
+      ]
+      render(<AppOperations gap={4} operations={ops} />)
+      const editButtons = screen.getAllByText('Edit')
+      expect(editButtons.length).toBeGreaterThanOrEqual(1)
+    })
+  })
+
+  describe('Gap styling', () => {
+    it('should apply gap to measurement and visible containers', () => {
+      const ops = [createOperation('edit', 'Edit')]
+      const { container } = render(<AppOperations gap={8} operations={ops} />)
+      const hiddenContainer = container.querySelector('[aria-hidden="true"]')
+      expect(hiddenContainer).toHaveStyle({ gap: '8px' })
+    })
+
+    it('should apply gap to visible container', () => {
+      const ops = [createOperation('edit', 'Edit')]
+      const { container } = render(<AppOperations gap={4} operations={ops} />)
+      const containers = container.querySelectorAll('div[style]')
+      const visibleContainer = Array.from(containers).find(
+        el => el.getAttribute('aria-hidden') !== 'true',
+      )
+      if (visibleContainer)
+        expect(visibleContainer).toHaveStyle({ gap: '4px' })
+    })
+  })
+
+  describe('More menu content', () => {
+    it('should render divider items in more menu', () => {
+      const cleanup = setupDomMeasurements(100, 60, [80, 80])
+      const primary = [createOperation('edit', 'Edit'), createOperation('copy', 'Copy')]
+      const secondary = [
+        createOperation('divider-1', '', 'divider'),
+        createOperation('delete', 'Delete'),
+      ]
+
+      render(<AppOperations gap={4} primaryOperations={primary} secondaryOperations={secondary} />)
+
+      cleanup()
+    })
+  })
+
+  describe('Empty inline operations', () => {
+    it('should handle when all operations are dividers', () => {
+      const ops = [createOperation('div-1', '', 'divider'), createOperation('div-2', '', 'divider')]
+      const { container } = render(<AppOperations gap={4} operations={ops} />)
+      expect(container).toBeInTheDocument()
+    })
+  })
+})
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
new file mode 100644
index 0000000000..fc0bb56f75
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/__tests__/index.spec.tsx
@@ -0,0 +1,147 @@
+import type { App, AppSSO } from '@/types/app'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import { AppModeEnum } from '@/types/app'
+import AppInfo from '..'
+
+let mockIsCurrentWorkspaceEditor = true
+const mockSetPanelOpen = vi.fn()
+
+vi.mock('@/context/app-context', () => ({
+  useAppContext: () => ({
+    isCurrentWorkspaceEditor: mockIsCurrentWorkspaceEditor,
+  }),
+}))
+
+vi.mock('../app-info-trigger', () => ({
+  default: React.memo(({ appDetail, expand, onClick }: {
+    appDetail: App & Partial<AppSSO>
+    expand: boolean
+    onClick: () => void
+  }) => (
+    <button type="button" data-testid="trigger" data-expand={expand} onClick={onClick}>
+      {appDetail.name}
+    </button>
+  )),
+}))
+
+vi.mock('../app-info-detail-panel', () => ({
+  default: React.memo(({ show, onClose }: { show: boolean, onClose: () => void }) => (
+    show ? <div data-testid="detail-panel"><button type="button" onClick={onClose}>Close Panel</button></div> : null
+  )),
+}))
+
+vi.mock('../app-info-modals', () => ({
+  default: React.memo(({ activeModal }: { activeModal: string | null }) => (
+    activeModal ? <div data-testid="modals" data-modal={activeModal} /> : null
+  )),
+}))
+
+const mockAppDetail: App & Partial<AppSSO> = {
+  id: 'app-1',
+  name: 'Test App',
+  mode: AppModeEnum.CHAT,
+  icon: '🤖',
+  icon_type: 'emoji',
+  icon_background: '#FFEAD5',
+  icon_url: '',
+  description: '',
+  use_icon_as_answer_icon: false,
+} as App & Partial<AppSSO>
+
+const mockUseAppInfoActions = {
+  appDetail: mockAppDetail,
+  panelOpen: false,
+  setPanelOpen: mockSetPanelOpen,
+  closePanel: vi.fn(),
+  activeModal: null as string | null,
+  openModal: vi.fn(),
+  closeModal: vi.fn(),
+  secretEnvList: [],
+  setSecretEnvList: vi.fn(),
+  onEdit: vi.fn(),
+  onCopy: vi.fn(),
+  onExport: vi.fn(),
+  exportCheck: vi.fn(),
+  handleConfirmExport: vi.fn(),
+  onConfirmDelete: vi.fn(),
+}
+
+vi.mock('../use-app-info-actions', () => ({
+  useAppInfoActions: () => mockUseAppInfoActions,
+}))
+
+describe('AppInfo', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockIsCurrentWorkspaceEditor = true
+    mockUseAppInfoActions.appDetail = mockAppDetail
+    mockUseAppInfoActions.panelOpen = false
+    mockUseAppInfoActions.activeModal = null
+  })
+
+  it('should return null when appDetail is not available', () => {
+    mockUseAppInfoActions.appDetail = undefined as unknown as App & Partial<AppSSO>
+    const { container } = render(<AppInfo expand />)
+    expect(container.innerHTML).toBe('')
+  })
+
+  it('should render trigger when not onlyShowDetail', () => {
+    render(<AppInfo expand />)
+    expect(screen.getByTestId('trigger')).toBeInTheDocument()
+  })
+
+  it('should not render trigger when onlyShowDetail is true', () => {
+    render(<AppInfo expand onlyShowDetail />)
+    expect(screen.queryByTestId('trigger')).not.toBeInTheDocument()
+  })
+
+  it('should pass expand prop to trigger', () => {
+    render(<AppInfo expand />)
+    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')
+    unmount()
+  })
+
+  it('should toggle panel when trigger is clicked and user is editor', async () => {
+    const user = userEvent.setup()
+    render(<AppInfo expand />)
+
+    await user.click(screen.getByTestId('trigger'))
+
+    expect(mockSetPanelOpen).toHaveBeenCalled()
+    const updater = mockSetPanelOpen.mock.calls[0][0] as (v: boolean) => boolean
+    expect(updater(false)).toBe(true)
+    expect(updater(true)).toBe(false)
+  })
+
+  it('should not toggle panel when trigger is clicked and user is not editor', async () => {
+    const user = userEvent.setup()
+    mockIsCurrentWorkspaceEditor = false
+    render(<AppInfo expand />)
+
+    await user.click(screen.getByTestId('trigger'))
+
+    expect(mockSetPanelOpen).not.toHaveBeenCalled()
+  })
+
+  it('should show detail panel based on panelOpen when not onlyShowDetail', () => {
+    mockUseAppInfoActions.panelOpen = true
+    render(<AppInfo expand />)
+    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()
+  })
+
+  it('should hide detail panel when openState is false and onlyShowDetail', () => {
+    render(<AppInfo expand onlyShowDetail openState={false} />)
+    expect(screen.queryByTestId('detail-panel')).not.toBeInTheDocument()
+  })
+})
diff --git a/web/app/components/app-sidebar/app-info/__tests__/use-app-info-actions.spec.ts b/web/app/components/app-sidebar/app-info/__tests__/use-app-info-actions.spec.ts
new file mode 100644
index 0000000000..e5966ed972
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/__tests__/use-app-info-actions.spec.ts
@@ -0,0 +1,492 @@
+import { act, renderHook } from '@testing-library/react'
+import { AppModeEnum } from '@/types/app'
+import { useAppInfoActions } from '../use-app-info-actions'
+
+const mockNotify = vi.fn()
+const mockReplace = vi.fn()
+const mockOnPlanInfoChanged = vi.fn()
+const mockInvalidateAppList = vi.fn()
+const mockSetAppDetail = vi.fn()
+const mockUpdateAppInfo = vi.fn()
+const mockCopyApp = vi.fn()
+const mockExportAppConfig = vi.fn()
+const mockDeleteApp = vi.fn()
+const mockFetchWorkflowDraft = vi.fn()
+const mockDownloadBlob = vi.fn()
+
+let mockAppDetail: Record<string, unknown> | undefined = {
+  id: 'app-1',
+  name: 'Test App',
+  mode: AppModeEnum.CHAT,
+  icon: '🤖',
+  icon_type: 'emoji',
+  icon_background: '#FFEAD5',
+}
+
+vi.mock('next/navigation', () => ({
+  useRouter: () => ({ replace: mockReplace }),
+}))
+
+vi.mock('use-context-selector', () => ({
+  useContext: () => ({ notify: mockNotify }),
+}))
+
+vi.mock('@/context/provider-context', () => ({
+  useProviderContext: () => ({ onPlanInfoChanged: mockOnPlanInfoChanged }),
+}))
+
+vi.mock('@/app/components/app/store', () => ({
+  useStore: (selector: (state: Record<string, unknown>) => unknown) => selector({
+    appDetail: mockAppDetail,
+    setAppDetail: mockSetAppDetail,
+  }),
+}))
+
+vi.mock('@/app/components/base/toast', () => ({
+  ToastContext: {},
+}))
+
+vi.mock('@/service/use-apps', () => ({
+  useInvalidateAppList: () => mockInvalidateAppList,
+}))
+
+vi.mock('@/service/apps', () => ({
+  updateAppInfo: (...args: unknown[]) => mockUpdateAppInfo(...args),
+  copyApp: (...args: unknown[]) => mockCopyApp(...args),
+  exportAppConfig: (...args: unknown[]) => mockExportAppConfig(...args),
+  deleteApp: (...args: unknown[]) => mockDeleteApp(...args),
+}))
+
+vi.mock('@/service/workflow', () => ({
+  fetchWorkflowDraft: (...args: unknown[]) => mockFetchWorkflowDraft(...args),
+}))
+
+vi.mock('@/utils/download', () => ({
+  downloadBlob: (...args: unknown[]) => mockDownloadBlob(...args),
+}))
+
+vi.mock('@/utils/app-redirection', () => ({
+  getRedirection: vi.fn(),
+}))
+
+vi.mock('@/config', () => ({
+  NEED_REFRESH_APP_LIST_KEY: 'test-refresh-key',
+}))
+
+describe('useAppInfoActions', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockAppDetail = {
+      id: 'app-1',
+      name: 'Test App',
+      mode: AppModeEnum.CHAT,
+      icon: '🤖',
+      icon_type: 'emoji',
+      icon_background: '#FFEAD5',
+    }
+  })
+
+  describe('Initial state', () => {
+    it('should return initial state correctly', () => {
+      const { result } = renderHook(() => useAppInfoActions({}))
+      expect(result.current.appDetail).toEqual(mockAppDetail)
+      expect(result.current.panelOpen).toBe(false)
+      expect(result.current.activeModal).toBeNull()
+      expect(result.current.secretEnvList).toEqual([])
+    })
+  })
+
+  describe('Panel management', () => {
+    it('should toggle panelOpen', () => {
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      act(() => {
+        result.current.setPanelOpen(true)
+      })
+
+      expect(result.current.panelOpen).toBe(true)
+    })
+
+    it('should close panel and call onDetailExpand', () => {
+      const onDetailExpand = vi.fn()
+      const { result } = renderHook(() => useAppInfoActions({ onDetailExpand }))
+
+      act(() => {
+        result.current.setPanelOpen(true)
+      })
+
+      act(() => {
+        result.current.closePanel()
+      })
+
+      expect(result.current.panelOpen).toBe(false)
+      expect(onDetailExpand).toHaveBeenCalledWith(false)
+    })
+  })
+
+  describe('Modal management', () => {
+    it('should open modal and close panel', () => {
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      act(() => {
+        result.current.setPanelOpen(true)
+      })
+
+      act(() => {
+        result.current.openModal('edit')
+      })
+
+      expect(result.current.activeModal).toBe('edit')
+      expect(result.current.panelOpen).toBe(false)
+    })
+
+    it('should close modal', () => {
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      act(() => {
+        result.current.openModal('delete')
+      })
+
+      act(() => {
+        result.current.closeModal()
+      })
+
+      expect(result.current.activeModal).toBeNull()
+    })
+  })
+
+  describe('onEdit', () => {
+    it('should update app info and close modal on success', async () => {
+      const updatedApp = { ...mockAppDetail, name: 'Updated' }
+      mockUpdateAppInfo.mockResolvedValue(updatedApp)
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onEdit({
+          name: 'Updated',
+          icon_type: 'emoji',
+          icon: '🤖',
+          icon_background: '#fff',
+          description: '',
+          use_icon_as_answer_icon: false,
+        })
+      })
+
+      expect(mockUpdateAppInfo).toHaveBeenCalled()
+      expect(mockSetAppDetail).toHaveBeenCalledWith(updatedApp)
+      expect(mockNotify).toHaveBeenCalledWith({ type: 'success', message: 'app.editDone' })
+    })
+
+    it('should notify error on edit failure', async () => {
+      mockUpdateAppInfo.mockRejectedValue(new Error('fail'))
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onEdit({
+          name: 'Updated',
+          icon_type: 'emoji',
+          icon: '🤖',
+          icon_background: '#fff',
+          description: '',
+          use_icon_as_answer_icon: false,
+        })
+      })
+
+      expect(mockNotify).toHaveBeenCalledWith({ type: 'error', message: 'app.editFailed' })
+    })
+
+    it('should not call updateAppInfo when appDetail is undefined', async () => {
+      mockAppDetail = undefined
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onEdit({
+          name: 'Updated',
+          icon_type: 'emoji',
+          icon: '🤖',
+          icon_background: '#fff',
+          description: '',
+          use_icon_as_answer_icon: false,
+        })
+      })
+
+      expect(mockUpdateAppInfo).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('onCopy', () => {
+    it('should copy app and redirect on success', async () => {
+      const newApp = { id: 'app-2', name: 'Copy', mode: 'chat' }
+      mockCopyApp.mockResolvedValue(newApp)
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onCopy({
+          name: 'Copy',
+          icon_type: 'emoji',
+          icon: '🤖',
+          icon_background: '#fff',
+        })
+      })
+
+      expect(mockCopyApp).toHaveBeenCalled()
+      expect(mockNotify).toHaveBeenCalledWith({ type: 'success', message: 'app.newApp.appCreated' })
+      expect(mockOnPlanInfoChanged).toHaveBeenCalled()
+    })
+
+    it('should notify error on copy failure', async () => {
+      mockCopyApp.mockRejectedValue(new Error('fail'))
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onCopy({
+          name: 'Copy',
+          icon_type: 'emoji',
+          icon: '🤖',
+          icon_background: '#fff',
+        })
+      })
+
+      expect(mockNotify).toHaveBeenCalledWith({ type: 'error', message: 'app.newApp.appCreateFailed' })
+    })
+  })
+
+  describe('onCopy - early return', () => {
+    it('should not call copyApp when appDetail is undefined', async () => {
+      mockAppDetail = undefined
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onCopy({
+          name: 'Copy',
+          icon_type: 'emoji',
+          icon: '🤖',
+          icon_background: '#fff',
+        })
+      })
+
+      expect(mockCopyApp).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('onExport', () => {
+    it('should export app config and trigger download', async () => {
+      mockExportAppConfig.mockResolvedValue({ data: 'yaml-content' })
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onExport(false)
+      })
+
+      expect(mockExportAppConfig).toHaveBeenCalledWith({ appID: 'app-1', include: false })
+      expect(mockDownloadBlob).toHaveBeenCalled()
+    })
+
+    it('should notify error on export failure', async () => {
+      mockExportAppConfig.mockRejectedValue(new Error('fail'))
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onExport()
+      })
+
+      expect(mockNotify).toHaveBeenCalledWith({ type: 'error', message: 'app.exportFailed' })
+    })
+  })
+
+  describe('onExport - early return', () => {
+    it('should not export when appDetail is undefined', async () => {
+      mockAppDetail = undefined
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onExport()
+      })
+
+      expect(mockExportAppConfig).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('exportCheck', () => {
+    it('should call onExport directly for non-workflow modes', async () => {
+      mockExportAppConfig.mockResolvedValue({ data: 'yaml' })
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.exportCheck()
+      })
+
+      expect(mockExportAppConfig).toHaveBeenCalled()
+    })
+
+    it('should open export warning modal for workflow mode', async () => {
+      mockAppDetail = { ...mockAppDetail, mode: AppModeEnum.WORKFLOW }
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.exportCheck()
+      })
+
+      expect(result.current.activeModal).toBe('exportWarning')
+    })
+
+    it('should open export warning modal for advanced_chat mode', async () => {
+      mockAppDetail = { ...mockAppDetail, mode: AppModeEnum.ADVANCED_CHAT }
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.exportCheck()
+      })
+
+      expect(result.current.activeModal).toBe('exportWarning')
+    })
+  })
+
+  describe('exportCheck - early return', () => {
+    it('should not do anything when appDetail is undefined', async () => {
+      mockAppDetail = undefined
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.exportCheck()
+      })
+
+      expect(mockExportAppConfig).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('handleConfirmExport', () => {
+    it('should export directly when no secret env variables', async () => {
+      mockAppDetail = { ...mockAppDetail, mode: AppModeEnum.WORKFLOW }
+      mockFetchWorkflowDraft.mockResolvedValue({
+        environment_variables: [{ value_type: 'string' }],
+      })
+      mockExportAppConfig.mockResolvedValue({ data: 'yaml' })
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.handleConfirmExport()
+      })
+
+      expect(mockExportAppConfig).toHaveBeenCalled()
+    })
+
+    it('should set secret env list when secret variables exist', async () => {
+      mockAppDetail = { ...mockAppDetail, mode: AppModeEnum.WORKFLOW }
+      const secretVars = [{ value_type: 'secret', key: 'API_KEY' }]
+      mockFetchWorkflowDraft.mockResolvedValue({
+        environment_variables: secretVars,
+      })
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.handleConfirmExport()
+      })
+
+      expect(result.current.secretEnvList).toEqual(secretVars)
+    })
+
+    it('should notify error on workflow draft fetch failure', async () => {
+      mockFetchWorkflowDraft.mockRejectedValue(new Error('fail'))
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.handleConfirmExport()
+      })
+
+      expect(mockNotify).toHaveBeenCalledWith({ type: 'error', message: 'app.exportFailed' })
+    })
+  })
+
+  describe('handleConfirmExport - early return', () => {
+    it('should not do anything when appDetail is undefined', async () => {
+      mockAppDetail = undefined
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.handleConfirmExport()
+      })
+
+      expect(mockFetchWorkflowDraft).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('handleConfirmExport - with environment variables', () => {
+    it('should handle empty environment_variables', async () => {
+      mockFetchWorkflowDraft.mockResolvedValue({
+        environment_variables: undefined,
+      })
+      mockExportAppConfig.mockResolvedValue({ data: 'yaml' })
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.handleConfirmExport()
+      })
+
+      expect(mockExportAppConfig).toHaveBeenCalled()
+    })
+  })
+
+  describe('onConfirmDelete', () => {
+    it('should delete app and redirect on success', async () => {
+      mockDeleteApp.mockResolvedValue({})
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onConfirmDelete()
+      })
+
+      expect(mockDeleteApp).toHaveBeenCalledWith('app-1')
+      expect(mockNotify).toHaveBeenCalledWith({ type: 'success', message: 'app.appDeleted' })
+      expect(mockInvalidateAppList).toHaveBeenCalled()
+      expect(mockReplace).toHaveBeenCalledWith('/apps')
+      expect(mockSetAppDetail).toHaveBeenCalledWith()
+    })
+
+    it('should not delete when appDetail is undefined', async () => {
+      mockAppDetail = undefined
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onConfirmDelete()
+      })
+
+      expect(mockDeleteApp).not.toHaveBeenCalled()
+    })
+
+    it('should notify error on delete failure', async () => {
+      mockDeleteApp.mockRejectedValue({ message: 'cannot delete' })
+
+      const { result } = renderHook(() => useAppInfoActions({}))
+
+      await act(async () => {
+        await result.current.onConfirmDelete()
+      })
+
+      expect(mockNotify).toHaveBeenCalledWith({
+        type: 'error',
+        message: expect.stringContaining('app.appDeleteFailed'),
+      })
+    })
+  })
+})
diff --git a/web/app/components/app-sidebar/app-info/app-info-detail-panel.tsx b/web/app/components/app-sidebar/app-info/app-info-detail-panel.tsx
new file mode 100644
index 0000000000..70dcb8df70
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/app-info-detail-panel.tsx
@@ -0,0 +1,151 @@
+import type { Operation } from './app-operations'
+import type { AppInfoModalType } from './use-app-info-actions'
+import type { App, AppSSO } from '@/types/app'
+import {
+  RiDeleteBinLine,
+  RiEditLine,
+  RiExchange2Line,
+  RiFileCopy2Line,
+  RiFileDownloadLine,
+  RiFileUploadLine,
+} from '@remixicon/react'
+import * as React from 'react'
+import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import CardView from '@/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/card-view'
+import Button from '@/app/components/base/button'
+import ContentDialog from '@/app/components/base/content-dialog'
+import { AppModeEnum } from '@/types/app'
+import AppIcon from '../../base/app-icon'
+import { getAppModeLabel } from './app-mode-labels'
+import AppOperations from './app-operations'
+
+type AppInfoDetailPanelProps = {
+  appDetail: App & Partial<AppSSO>
+  show: boolean
+  onClose: () => void
+  openModal: (modal: Exclude<AppInfoModalType, null>) => void
+  exportCheck: () => void
+}
+
+const AppInfoDetailPanel = ({
+  appDetail,
+  show,
+  onClose,
+  openModal,
+  exportCheck,
+}: AppInfoDetailPanelProps) => {
+  const { t } = useTranslation()
+
+  const primaryOperations = useMemo<Operation[]>(() => [
+    {
+      id: 'edit',
+      title: t('editApp', { ns: 'app' }),
+      icon: <RiEditLine />,
+      onClick: () => openModal('edit'),
+    },
+    {
+      id: 'duplicate',
+      title: t('duplicate', { ns: 'app' }),
+      icon: <RiFileCopy2Line />,
+      onClick: () => openModal('duplicate'),
+    },
+    {
+      id: 'export',
+      title: t('export', { ns: 'app' }),
+      icon: <RiFileDownloadLine />,
+      onClick: exportCheck,
+    },
+  ], [t, openModal, exportCheck])
+
+  const secondaryOperations = useMemo<Operation[]>(() => [
+    ...(appDetail.mode === AppModeEnum.ADVANCED_CHAT || appDetail.mode === AppModeEnum.WORKFLOW)
+      ? [{
+          id: 'import',
+          title: t('common.importDSL', { ns: 'workflow' }),
+          icon: <RiFileUploadLine />,
+          onClick: () => openModal('importDSL'),
+        }]
+      : [],
+    {
+      id: 'divider-1',
+      title: '',
+      icon: <></>,
+      onClick: () => {},
+      type: 'divider' as const,
+    },
+    {
+      id: 'delete',
+      title: t('operation.delete', { ns: 'common' }),
+      icon: <RiDeleteBinLine />,
+      onClick: () => openModal('delete'),
+    },
+  ], [appDetail.mode, t, openModal])
+
+  const switchOperation = useMemo(() => {
+    if (appDetail.mode !== AppModeEnum.COMPLETION && appDetail.mode !== AppModeEnum.CHAT)
+      return null
+    return {
+      id: 'switch',
+      title: t('switch', { ns: 'app' }),
+      icon: <RiExchange2Line />,
+      onClick: () => openModal('switch'),
+    }
+  }, [appDetail.mode, t, openModal])
+
+  return (
+    <ContentDialog
+      show={show}
+      onClose={onClose}
+      className="absolute bottom-2 left-2 top-2 flex w-[420px] flex-col rounded-2xl !p-0"
+    >
+      <div className="flex shrink-0 flex-col items-start justify-center gap-3 self-stretch p-4">
+        <div className="flex items-center gap-3 self-stretch">
+          <AppIcon
+            size="large"
+            iconType={appDetail.icon_type}
+            icon={appDetail.icon}
+            background={appDetail.icon_background}
+            imageUrl={appDetail.icon_url}
+          />
+          <div className="flex flex-1 flex-col items-start justify-center overflow-hidden">
+            <div className="w-full truncate text-text-secondary system-md-semibold">{appDetail.name}</div>
+            <div className="text-text-tertiary system-2xs-medium-uppercase">
+              {getAppModeLabel(appDetail.mode, t)}
+            </div>
+          </div>
+        </div>
+        {appDetail.description && (
+          <div className="overflow-wrap-anywhere max-h-[105px] w-full max-w-full overflow-y-auto whitespace-normal break-words text-text-tertiary system-xs-regular">
+            {appDetail.description}
+          </div>
+        )}
+        <AppOperations
+          gap={4}
+          primaryOperations={primaryOperations}
+          secondaryOperations={secondaryOperations}
+        />
+      </div>
+      <CardView
+        appId={appDetail.id}
+        isInPanel={true}
+        className="flex flex-1 flex-col gap-2 overflow-auto px-2 py-1"
+      />
+      {switchOperation && (
+        <div className="flex min-h-fit shrink-0 flex-col items-start justify-center gap-3 self-stretch pb-2">
+          <Button
+            size="medium"
+            variant="ghost"
+            className="gap-0.5"
+            onClick={switchOperation.onClick}
+          >
+            {switchOperation.icon}
+            <span className="text-text-tertiary system-sm-medium">{switchOperation.title}</span>
+          </Button>
+        </div>
+      )}
+    </ContentDialog>
+  )
+}
+
+export default React.memo(AppInfoDetailPanel)
diff --git a/web/app/components/app-sidebar/app-info/app-info-modals.tsx b/web/app/components/app-sidebar/app-info/app-info-modals.tsx
new file mode 100644
index 0000000000..4ca7f6adbc
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/app-info-modals.tsx
@@ -0,0 +1,122 @@
+import type { AppInfoModalType } from './use-app-info-actions'
+import type { DuplicateAppModalProps } from '@/app/components/app/duplicate-modal'
+import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
+import type { EnvironmentVariable } from '@/app/components/workflow/types'
+import type { App, AppSSO } from '@/types/app'
+import dynamic from 'next/dynamic'
+import * as React from 'react'
+import { useTranslation } from 'react-i18next'
+
+const SwitchAppModal = dynamic(() => import('@/app/components/app/switch-app-modal'), { ssr: false })
+const CreateAppModal = dynamic(() => import('@/app/components/explore/create-app-modal'), { ssr: false })
+const DuplicateAppModal = dynamic(() => import('@/app/components/app/duplicate-modal'), { ssr: false })
+const Confirm = dynamic(() => import('@/app/components/base/confirm'), { ssr: false })
+const UpdateDSLModal = dynamic(() => import('@/app/components/workflow/update-dsl-modal'), { ssr: false })
+const DSLExportConfirmModal = dynamic(() => import('@/app/components/workflow/dsl-export-confirm-modal'), { ssr: false })
+
+type AppInfoModalsProps = {
+  appDetail: App & Partial<AppSSO>
+  activeModal: AppInfoModalType
+  closeModal: () => void
+  secretEnvList: EnvironmentVariable[]
+  setSecretEnvList: (list: EnvironmentVariable[]) => void
+  onEdit: CreateAppModalProps['onConfirm']
+  onCopy: DuplicateAppModalProps['onConfirm']
+  onExport: (include?: boolean) => Promise<void>
+  exportCheck: () => void
+  handleConfirmExport: () => void
+  onConfirmDelete: () => void
+}
+
+const AppInfoModals = ({
+  appDetail,
+  activeModal,
+  closeModal,
+  secretEnvList,
+  setSecretEnvList,
+  onEdit,
+  onCopy,
+  onExport,
+  exportCheck,
+  handleConfirmExport,
+  onConfirmDelete,
+}: AppInfoModalsProps) => {
+  const { t } = useTranslation()
+
+  return (
+    <>
+      {activeModal === 'switch' && (
+        <SwitchAppModal
+          inAppDetail
+          show
+          appDetail={appDetail}
+          onClose={closeModal}
+          onSuccess={closeModal}
+        />
+      )}
+      {activeModal === 'edit' && (
+        <CreateAppModal
+          isEditModal
+          appName={appDetail.name}
+          appIconType={appDetail.icon_type}
+          appIcon={appDetail.icon}
+          appIconBackground={appDetail.icon_background}
+          appIconUrl={appDetail.icon_url}
+          appDescription={appDetail.description}
+          appMode={appDetail.mode}
+          appUseIconAsAnswerIcon={appDetail.use_icon_as_answer_icon}
+          max_active_requests={appDetail.max_active_requests ?? null}
+          show
+          onConfirm={onEdit}
+          onHide={closeModal}
+        />
+      )}
+      {activeModal === 'duplicate' && (
+        <DuplicateAppModal
+          appName={appDetail.name}
+          icon_type={appDetail.icon_type}
+          icon={appDetail.icon}
+          icon_background={appDetail.icon_background}
+          icon_url={appDetail.icon_url}
+          show
+          onConfirm={onCopy}
+          onHide={closeModal}
+        />
+      )}
+      {activeModal === 'delete' && (
+        <Confirm
+          title={t('deleteAppConfirmTitle', { ns: 'app' })}
+          content={t('deleteAppConfirmContent', { ns: 'app' })}
+          isShow
+          onConfirm={onConfirmDelete}
+          onCancel={closeModal}
+        />
+      )}
+      {activeModal === 'importDSL' && (
+        <UpdateDSLModal
+          onCancel={closeModal}
+          onBackup={exportCheck}
+        />
+      )}
+      {activeModal === 'exportWarning' && (
+        <Confirm
+          type="info"
+          isShow
+          title={t('sidebar.exportWarning', { ns: 'workflow' })}
+          content={t('sidebar.exportWarningDesc', { ns: 'workflow' })}
+          onConfirm={handleConfirmExport}
+          onCancel={closeModal}
+        />
+      )}
+      {secretEnvList.length > 0 && (
+        <DSLExportConfirmModal
+          envList={secretEnvList}
+          onConfirm={onExport}
+          onClose={() => setSecretEnvList([])}
+        />
+      )}
+    </>
+  )
+}
+
+export default React.memo(AppInfoModals)
diff --git a/web/app/components/app-sidebar/app-info/app-info-trigger.tsx b/web/app/components/app-sidebar/app-info/app-info-trigger.tsx
new file mode 100644
index 0000000000..07a41124e3
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/app-info-trigger.tsx
@@ -0,0 +1,67 @@
+import type { App, AppSSO } from '@/types/app'
+import { RiEqualizer2Line } from '@remixicon/react'
+import * as React from 'react'
+import { useTranslation } from 'react-i18next'
+import { cn } from '@/utils/classnames'
+import AppIcon from '../../base/app-icon'
+import { getAppModeLabel } from './app-mode-labels'
+
+type AppInfoTriggerProps = {
+  appDetail: App & Partial<AppSSO>
+  expand: boolean
+  onClick: () => void
+}
+
+const AppInfoTrigger = ({ appDetail, expand, onClick }: AppInfoTriggerProps) => {
+  const { t } = useTranslation()
+  const modeLabel = getAppModeLabel(appDetail.mode, t)
+
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      className="block w-full"
+      aria-label={!expand ? `${appDetail.name} - ${modeLabel}` : undefined}
+    >
+      <div className="flex flex-col gap-2 rounded-lg p-1 hover:bg-state-base-hover">
+        <div className="flex items-center gap-1">
+          <div className={cn(!expand && 'ml-1')}>
+            <AppIcon
+              size={expand ? 'large' : 'small'}
+              iconType={appDetail.icon_type}
+              icon={appDetail.icon}
+              background={appDetail.icon_background}
+              imageUrl={appDetail.icon_url}
+            />
+          </div>
+          {expand && (
+            <div className="ml-auto flex items-center justify-center rounded-md p-0.5">
+              <div className="flex h-5 w-5 items-center justify-center">
+                <RiEqualizer2Line className="h-4 w-4 text-text-tertiary" />
+              </div>
+            </div>
+          )}
+        </div>
+        {!expand && (
+          <div className="flex items-center justify-center">
+            <div className="flex h-5 w-5 items-center justify-center rounded-md p-0.5">
+              <RiEqualizer2Line className="h-4 w-4 text-text-tertiary" />
+            </div>
+          </div>
+        )}
+        {expand && (
+          <div className="flex flex-col items-start gap-1">
+            <div className="flex w-full">
+              <div className="truncate whitespace-nowrap text-text-secondary system-md-semibold">{appDetail.name}</div>
+            </div>
+            <div className="whitespace-nowrap text-text-tertiary system-2xs-medium-uppercase">
+              {getAppModeLabel(appDetail.mode, t)}
+            </div>
+          </div>
+        )}
+      </div>
+    </button>
+  )
+}
+
+export default React.memo(AppInfoTrigger)
diff --git a/web/app/components/app-sidebar/app-info/app-mode-labels.ts b/web/app/components/app-sidebar/app-info/app-mode-labels.ts
new file mode 100644
index 0000000000..1d72feb089
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/app-mode-labels.ts
@@ -0,0 +1,17 @@
+import type { TFunction } from 'i18next'
+import { AppModeEnum } from '@/types/app'
+
+export function getAppModeLabel(mode: string, t: TFunction): string {
+  switch (mode) {
+    case AppModeEnum.ADVANCED_CHAT:
+      return t('types.advanced', { ns: 'app' })
+    case AppModeEnum.AGENT_CHAT:
+      return t('types.agent', { ns: 'app' })
+    case AppModeEnum.CHAT:
+      return t('types.chatbot', { ns: 'app' })
+    case AppModeEnum.COMPLETION:
+      return t('types.completion', { ns: 'app' })
+    default:
+      return t('types.workflow', { ns: 'app' })
+  }
+}
diff --git a/web/app/components/app-sidebar/app-operations.tsx b/web/app/components/app-sidebar/app-info/app-operations.tsx
similarity index 93%
rename from web/app/components/app-sidebar/app-operations.tsx
rename to web/app/components/app-sidebar/app-info/app-operations.tsx
index 871d8a19e8..78dd6f0043 100644
--- a/web/app/components/app-sidebar/app-operations.tsx
+++ b/web/app/components/app-sidebar/app-info/app-operations.tsx
@@ -3,7 +3,7 @@ import { RiMoreLine } from '@remixicon/react'
 import { cloneElement, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Button from '@/app/components/base/button'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '../base/portal-to-follow-elem'
+import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '../../base/portal-to-follow-elem'
 
 export type Operation = {
   id: string
@@ -134,7 +134,7 @@ const AppOperations = ({
             tabIndex={-1}
           >
             {cloneElement(operation.icon, { className: 'h-3.5 w-3.5 text-components-button-secondary-text' })}
-            <span className="system-xs-medium text-components-button-secondary-text">
+            <span className="text-components-button-secondary-text system-xs-medium">
               {operation.title}
             </span>
           </Button>
@@ -147,7 +147,7 @@ const AppOperations = ({
           tabIndex={-1}
         >
           <RiMoreLine className="h-3.5 w-3.5 text-components-button-secondary-text" />
-          <span className="system-xs-medium text-components-button-secondary-text">
+          <span className="text-components-button-secondary-text system-xs-medium">
             {t('operation.more', { ns: 'common' })}
           </span>
         </Button>
@@ -163,7 +163,7 @@ const AppOperations = ({
             onClick={operation.onClick}
           >
             {cloneElement(operation.icon, { className: 'h-3.5 w-3.5 text-components-button-secondary-text' })}
-            <span className="system-xs-medium text-components-button-secondary-text">
+            <span className="text-components-button-secondary-text system-xs-medium">
               {operation.title}
             </span>
           </Button>
@@ -182,7 +182,7 @@ const AppOperations = ({
                 className="gap-[1px]"
               >
                 <RiMoreLine className="h-3.5 w-3.5 text-components-button-secondary-text" />
-                <span className="system-xs-medium text-components-button-secondary-text">
+                <span className="text-components-button-secondary-text system-xs-medium">
                   {t('operation.more', { ns: 'common' })}
                 </span>
               </Button>
@@ -200,7 +200,7 @@ const AppOperations = ({
                         onClick={item.onClick}
                       >
                         {cloneElement(item.icon, { className: 'h-4 w-4 text-text-tertiary' })}
-                        <span className="system-md-regular text-text-secondary">{item.title}</span>
+                        <span className="text-text-secondary system-md-regular">{item.title}</span>
                       </div>
                     ))}
               </div>
diff --git a/web/app/components/app-sidebar/app-info/index.tsx b/web/app/components/app-sidebar/app-info/index.tsx
new file mode 100644
index 0000000000..2530add2dc
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/index.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { useAppContext } from '@/context/app-context'
+import AppInfoDetailPanel from './app-info-detail-panel'
+import AppInfoModals from './app-info-modals'
+import AppInfoTrigger from './app-info-trigger'
+import { useAppInfoActions } from './use-app-info-actions'
+
+export type IAppInfoProps = {
+  expand: boolean
+  onlyShowDetail?: boolean
+  openState?: boolean
+  onDetailExpand?: (expand: boolean) => void
+}
+
+const AppInfo = ({ expand, onlyShowDetail = false, openState = false, onDetailExpand }: IAppInfoProps) => {
+  const { isCurrentWorkspaceEditor } = useAppContext()
+
+  const {
+    appDetail,
+    panelOpen,
+    setPanelOpen,
+    closePanel,
+    activeModal,
+    openModal,
+    closeModal,
+    secretEnvList,
+    setSecretEnvList,
+    onEdit,
+    onCopy,
+    onExport,
+    exportCheck,
+    handleConfirmExport,
+    onConfirmDelete,
+  } = useAppInfoActions({ onDetailExpand })
+
+  if (!appDetail)
+    return null
+
+  return (
+    <div>
+      {!onlyShowDetail && (
+        <AppInfoTrigger
+          appDetail={appDetail}
+          expand={expand}
+          onClick={() => {
+            if (isCurrentWorkspaceEditor)
+              setPanelOpen(v => !v)
+          }}
+        />
+      )}
+      <AppInfoDetailPanel
+        appDetail={appDetail}
+        show={onlyShowDetail ? openState : panelOpen}
+        onClose={closePanel}
+        openModal={openModal}
+        exportCheck={exportCheck}
+      />
+      <AppInfoModals
+        appDetail={appDetail}
+        activeModal={activeModal}
+        closeModal={closeModal}
+        secretEnvList={secretEnvList}
+        setSecretEnvList={setSecretEnvList}
+        onEdit={onEdit}
+        onCopy={onCopy}
+        onExport={onExport}
+        exportCheck={exportCheck}
+        handleConfirmExport={handleConfirmExport}
+        onConfirmDelete={onConfirmDelete}
+      />
+    </div>
+  )
+}
+
+export default React.memo(AppInfo)
diff --git a/web/app/components/app-sidebar/app-info/use-app-info-actions.ts b/web/app/components/app-sidebar/app-info/use-app-info-actions.ts
new file mode 100644
index 0000000000..13880acbed
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/use-app-info-actions.ts
@@ -0,0 +1,189 @@
+import type { DuplicateAppModalProps } from '@/app/components/app/duplicate-modal'
+import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
+import type { EnvironmentVariable } from '@/app/components/workflow/types'
+import { useRouter } from 'next/navigation'
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useContext } from 'use-context-selector'
+import { useStore as useAppStore } from '@/app/components/app/store'
+import { ToastContext } from '@/app/components/base/toast'
+import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
+import { useProviderContext } from '@/context/provider-context'
+import { copyApp, deleteApp, exportAppConfig, updateAppInfo } from '@/service/apps'
+import { useInvalidateAppList } from '@/service/use-apps'
+import { fetchWorkflowDraft } from '@/service/workflow'
+import { AppModeEnum } from '@/types/app'
+import { getRedirection } from '@/utils/app-redirection'
+import { downloadBlob } from '@/utils/download'
+
+export type AppInfoModalType = 'edit' | 'duplicate' | 'delete' | 'switch' | 'importDSL' | 'exportWarning' | null
+
+type UseAppInfoActionsParams = {
+  onDetailExpand?: (expand: boolean) => void
+}
+
+export function useAppInfoActions({ onDetailExpand }: UseAppInfoActionsParams) {
+  const { t } = useTranslation()
+  const { notify } = useContext(ToastContext)
+  const { replace } = useRouter()
+  const { onPlanInfoChanged } = useProviderContext()
+  const appDetail = useAppStore(state => state.appDetail)
+  const setAppDetail = useAppStore(state => state.setAppDetail)
+  const invalidateAppList = useInvalidateAppList()
+
+  const [panelOpen, setPanelOpen] = useState(false)
+  const [activeModal, setActiveModal] = useState<AppInfoModalType>(null)
+  const [secretEnvList, setSecretEnvList] = useState<EnvironmentVariable[]>([])
+
+  const closePanel = useCallback(() => {
+    setPanelOpen(false)
+    onDetailExpand?.(false)
+  }, [onDetailExpand])
+
+  const openModal = useCallback((modal: Exclude<AppInfoModalType, null>) => {
+    closePanel()
+    setActiveModal(modal)
+  }, [closePanel])
+
+  const closeModal = useCallback(() => {
+    setActiveModal(null)
+  }, [])
+
+  const onEdit: CreateAppModalProps['onConfirm'] = useCallback(async ({
+    name,
+    icon_type,
+    icon,
+    icon_background,
+    description,
+    use_icon_as_answer_icon,
+    max_active_requests,
+  }) => {
+    if (!appDetail)
+      return
+    try {
+      const app = await updateAppInfo({
+        appID: appDetail.id,
+        name,
+        icon_type,
+        icon,
+        icon_background,
+        description,
+        use_icon_as_answer_icon,
+        max_active_requests,
+      })
+      closeModal()
+      notify({ type: 'success', message: t('editDone', { ns: 'app' }) })
+      setAppDetail(app)
+    }
+    catch {
+      notify({ type: 'error', message: t('editFailed', { ns: 'app' }) })
+    }
+  }, [appDetail, closeModal, notify, setAppDetail, t])
+
+  const onCopy: DuplicateAppModalProps['onConfirm'] = useCallback(async ({
+    name,
+    icon_type,
+    icon,
+    icon_background,
+  }) => {
+    if (!appDetail)
+      return
+    try {
+      const newApp = await copyApp({
+        appID: appDetail.id,
+        name,
+        icon_type,
+        icon,
+        icon_background,
+        mode: appDetail.mode,
+      })
+      closeModal()
+      notify({ type: 'success', message: t('newApp.appCreated', { ns: 'app' }) })
+      localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
+      onPlanInfoChanged()
+      getRedirection(true, newApp, replace)
+    }
+    catch {
+      notify({ type: 'error', message: t('newApp.appCreateFailed', { ns: 'app' }) })
+    }
+  }, [appDetail, closeModal, notify, onPlanInfoChanged, replace, t])
+
+  const onExport = useCallback(async (include = false) => {
+    if (!appDetail)
+      return
+    try {
+      const { data } = await exportAppConfig({ appID: appDetail.id, include })
+      const file = new Blob([data], { type: 'application/yaml' })
+      downloadBlob({ data: file, fileName: `${appDetail.name}.yml` })
+    }
+    catch {
+      notify({ type: 'error', message: t('exportFailed', { ns: 'app' }) })
+    }
+  }, [appDetail, notify, t])
+
+  const exportCheck = useCallback(async () => {
+    if (!appDetail)
+      return
+    if (appDetail.mode !== AppModeEnum.WORKFLOW && appDetail.mode !== AppModeEnum.ADVANCED_CHAT) {
+      onExport()
+      return
+    }
+    setActiveModal('exportWarning')
+  }, [appDetail, onExport])
+
+  const handleConfirmExport = useCallback(async () => {
+    if (!appDetail)
+      return
+    closeModal()
+    try {
+      const workflowDraft = await fetchWorkflowDraft(`/apps/${appDetail.id}/workflows/draft`)
+      const list = (workflowDraft.environment_variables || []).filter(env => env.value_type === 'secret')
+      if (list.length === 0) {
+        onExport()
+        return
+      }
+      setSecretEnvList(list)
+    }
+    catch {
+      notify({ type: 'error', message: t('exportFailed', { ns: 'app' }) })
+    }
+  }, [appDetail, closeModal, notify, onExport, t])
+
+  const onConfirmDelete = useCallback(async () => {
+    if (!appDetail)
+      return
+    try {
+      await deleteApp(appDetail.id)
+      notify({ type: 'success', message: t('appDeleted', { ns: 'app' }) })
+      invalidateAppList()
+      onPlanInfoChanged()
+      setAppDetail()
+      replace('/apps')
+    }
+    catch (e: unknown) {
+      notify({
+        type: 'error',
+        message: `${t('appDeleteFailed', { ns: 'app' })}${e instanceof Error && e.message ? `: ${e.message}` : ''}`,
+      })
+    }
+    closeModal()
+  }, [appDetail, closeModal, invalidateAppList, notify, onPlanInfoChanged, replace, setAppDetail, t])
+
+  return {
+    appDetail,
+    panelOpen,
+    setPanelOpen,
+    closePanel,
+    activeModal,
+    openModal,
+    closeModal,
+    secretEnvList,
+    setSecretEnvList,
+    onEdit,
+    onCopy,
+    onExport,
+    exportCheck,
+    handleConfirmExport,
+    onConfirmDelete,
+  }
+}
diff --git a/web/app/components/app-sidebar/app-sidebar-dropdown.tsx b/web/app/components/app-sidebar/app-sidebar-dropdown.tsx
index 9ed86cbf32..87632ba647 100644
--- a/web/app/components/app-sidebar/app-sidebar-dropdown.tsx
+++ b/web/app/components/app-sidebar/app-sidebar-dropdown.tsx
@@ -1,4 +1,4 @@
-import type { NavIcon } from './navLink'
+import type { NavIcon } from './nav-link'
 import {
   RiEqualizer2Line,
   RiMenuLine,
@@ -13,12 +13,12 @@ import {
   PortalToFollowElemTrigger,
 } from '@/app/components/base/portal-to-follow-elem'
 import { useAppContext } from '@/context/app-context'
-import { AppModeEnum } from '@/types/app'
 import { cn } from '@/utils/classnames'
 import AppIcon from '../base/app-icon'
 import Divider from '../base/divider'
 import AppInfo from './app-info'
-import NavLink from './navLink'
+import { getAppModeLabel } from './app-info/app-mode-labels'
+import NavLink from './nav-link'
 
 type Props = {
   navigation: Array<{
@@ -97,9 +97,9 @@ const AppSidebarDropdown = ({ navigation }: Props) => {
                   </div>
                   <div className="flex flex-col items-start gap-1">
                     <div className="flex w-full">
-                      <div className="system-md-semibold truncate text-text-secondary">{appDetail.name}</div>
+                      <div className="truncate text-text-secondary system-md-semibold">{appDetail.name}</div>
                     </div>
-                    <div className="system-2xs-medium-uppercase text-text-tertiary">{appDetail.mode === AppModeEnum.ADVANCED_CHAT ? t('types.advanced', { ns: 'app' }) : appDetail.mode === AppModeEnum.AGENT_CHAT ? t('types.agent', { ns: 'app' }) : appDetail.mode === AppModeEnum.CHAT ? t('types.chatbot', { ns: 'app' }) : appDetail.mode === AppModeEnum.COMPLETION ? t('types.completion', { ns: 'app' }) : t('types.workflow', { ns: 'app' })}</div>
+                    <div className="text-text-tertiary system-2xs-medium-uppercase">{getAppModeLabel(appDetail.mode, t)}</div>
                   </div>
                 </div>
               </div>
diff --git a/web/app/components/app-sidebar/basic.tsx b/web/app/components/app-sidebar/basic.tsx
index f5f24f4938..5d4d2e5d1e 100644
--- a/web/app/components/app-sidebar/basic.tsx
+++ b/web/app/components/app-sidebar/basic.tsx
@@ -76,7 +76,7 @@ export default function AppBasic({ icon, icon_background, name, isExternal, type
         )}
       {mode === 'expand' && (
         <div className="group w-full">
-          <div className={`system-md-semibold flex flex-row items-center text-text-secondary group-hover:text-text-primary ${textStyle?.main ?? ''}`}>
+          <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">
               {name}
             </div>
@@ -95,10 +95,10 @@ export default function AppBasic({ icon, icon_background, name, isExternal, type
               )}
           </div>
           {!hideType && isExtraInLine && (
-            <div className="system-2xs-medium-uppercase flex text-text-tertiary">{type}</div>
+            <div className="flex text-text-tertiary system-2xs-medium-uppercase">{type}</div>
           )}
           {!hideType && !isExtraInLine && (
-            <div className="system-2xs-medium-uppercase text-text-tertiary">{isExternal ? t('externalTag', { ns: 'dataset' }) : type}</div>
+            <div className="text-text-tertiary system-2xs-medium-uppercase">{isExternal ? t('externalTag', { ns: 'dataset' }) : type}</div>
           )}
         </div>
       )}
diff --git a/web/app/components/app-sidebar/completion.png b/web/app/components/app-sidebar/completion.png
deleted file mode 100644
index 7a3cbd510769bcc8bd8e5778c91b9e70d3b32053..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 71615
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
E1DNF84FCWD

diff --git a/web/app/components/app-sidebar/dataset-info/__tests__/dropdown-callbacks.spec.tsx b/web/app/components/app-sidebar/dataset-info/__tests__/dropdown-callbacks.spec.tsx
new file mode 100644
index 0000000000..512f9490c2
--- /dev/null
+++ b/web/app/components/app-sidebar/dataset-info/__tests__/dropdown-callbacks.spec.tsx
@@ -0,0 +1,228 @@
+import type { DataSet } from '@/models/datasets'
+import { render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import * as React from 'react'
+import {
+  ChunkingMode,
+  DatasetPermission,
+  DataSourceType,
+} from '@/models/datasets'
+import { RETRIEVE_METHOD } from '@/types/app'
+import Dropdown from '../dropdown'
+
+let mockDataset: DataSet
+let mockIsDatasetOperator = false
+const mockReplace = vi.fn()
+const mockInvalidDatasetList = vi.fn()
+const mockInvalidDatasetDetail = vi.fn()
+const mockExportPipeline = vi.fn()
+const mockCheckIsUsedInApp = vi.fn()
+const mockDeleteDataset = vi.fn()
+
+const createDataset = (overrides: Partial<DataSet> = {}): DataSet => ({
+  id: 'dataset-1',
+  name: 'Dataset Name',
+  indexing_status: 'completed',
+  icon_info: {
+    icon: '📙',
+    icon_background: '#FFF4ED',
+    icon_type: 'emoji',
+    icon_url: '',
+  },
+  description: 'Dataset description',
+  permission: DatasetPermission.onlyMe,
+  data_source_type: DataSourceType.FILE,
+  indexing_technique: 'high_quality' as DataSet['indexing_technique'],
+  created_by: 'user-1',
+  updated_by: 'user-1',
+  updated_at: 1690000000,
+  app_count: 0,
+  doc_form: ChunkingMode.text,
+  document_count: 1,
+  total_document_count: 1,
+  word_count: 1000,
+  provider: 'internal',
+  embedding_model: 'text-embedding-3',
+  embedding_model_provider: 'openai',
+  embedding_available: true,
+  retrieval_model_dict: {
+    search_method: RETRIEVE_METHOD.semantic,
+    reranking_enable: false,
+    reranking_model: { reranking_provider_name: '', reranking_model_name: '' },
+    top_k: 5,
+    score_threshold_enabled: false,
+    score_threshold: 0,
+  },
+  retrieval_model: {
+    search_method: RETRIEVE_METHOD.semantic,
+    reranking_enable: false,
+    reranking_model: { reranking_provider_name: '', reranking_model_name: '' },
+    top_k: 5,
+    score_threshold_enabled: false,
+    score_threshold: 0,
+  },
+  tags: [],
+  external_knowledge_info: {
+    external_knowledge_id: '',
+    external_knowledge_api_id: '',
+    external_knowledge_api_name: '',
+    external_knowledge_api_endpoint: '',
+  },
+  external_retrieval_model: {
+    top_k: 0,
+    score_threshold: 0,
+    score_threshold_enabled: false,
+  },
+  built_in_field_enabled: false,
+  runtime_mode: 'rag_pipeline',
+  enable_api: false,
+  is_multimodal: false,
+  ...overrides,
+})
+
+vi.mock('next/navigation', () => ({
+  useRouter: () => ({ replace: mockReplace }),
+}))
+
+vi.mock('@/context/dataset-detail', () => ({
+  useDatasetDetailContextWithSelector: (selector: (state: { dataset?: DataSet }) => unknown) => selector({ dataset: mockDataset }),
+}))
+
+vi.mock('@/context/app-context', () => ({
+  useSelector: (selector: (state: { isCurrentWorkspaceDatasetOperator: boolean }) => unknown) =>
+    selector({ isCurrentWorkspaceDatasetOperator: mockIsDatasetOperator }),
+}))
+
+vi.mock('@/service/knowledge/use-dataset', () => ({
+  datasetDetailQueryKeyPrefix: ['dataset', 'detail'],
+  useInvalidDatasetList: () => mockInvalidDatasetList,
+}))
+
+vi.mock('@/service/use-base', () => ({
+  useInvalid: () => mockInvalidDatasetDetail,
+}))
+
+vi.mock('@/service/use-pipeline', () => ({
+  useExportPipelineDSL: () => ({ mutateAsync: mockExportPipeline }),
+}))
+
+vi.mock('@/service/datasets', () => ({
+  checkIsUsedInApp: (...args: unknown[]) => mockCheckIsUsedInApp(...args),
+  deleteDataset: (...args: unknown[]) => mockDeleteDataset(...args),
+}))
+
+vi.mock('@/app/components/datasets/rename-modal', () => ({
+  default: ({
+    show,
+    onClose,
+    onSuccess,
+  }: {
+    show: boolean
+    onClose: () => void
+    onSuccess?: () => void
+  }) => {
+    if (!show)
+      return null
+    return (
+      <div data-testid="rename-modal">
+        <button type="button" onClick={onSuccess}>Success</button>
+        <button type="button" onClick={onClose}>Close</button>
+      </div>
+    )
+  },
+}))
+
+vi.mock('@/app/components/base/confirm', () => ({
+  default: ({
+    isShow,
+    onConfirm,
+    onCancel,
+    title,
+    content,
+  }: {
+    isShow: boolean
+    onConfirm: () => void
+    onCancel: () => void
+    title: string
+    content: string
+  }) => {
+    if (!isShow)
+      return null
+    return (
+      <div data-testid="confirm-dialog">
+        <span>{title}</span>
+        <span>{content}</span>
+        <button type="button" onClick={onConfirm}>confirm</button>
+        <button type="button" onClick={onCancel}>cancel</button>
+      </div>
+    )
+  },
+}))
+
+vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
+  PortalToFollowElem: ({ children }: { children: React.ReactNode }) => <div>{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>{children}</div>,
+}))
+
+describe('Dropdown callback coverage', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockDataset = createDataset({ pipeline_id: 'pipeline-1', runtime_mode: 'rag_pipeline' })
+    mockIsDatasetOperator = false
+    mockExportPipeline.mockResolvedValue({ data: 'pipeline-content' })
+    mockCheckIsUsedInApp.mockResolvedValue({ is_using: false })
+    mockDeleteDataset.mockResolvedValue({})
+  })
+
+  it('should call refreshDataset when rename succeeds', async () => {
+    const user = userEvent.setup()
+    render(<Dropdown expand />)
+
+    await user.click(screen.getByTestId('portal-trigger'))
+    await user.click(screen.getByText('common.operation.edit'))
+
+    expect(screen.getByTestId('rename-modal')).toBeInTheDocument()
+    await user.click(screen.getByText('Success'))
+
+    await waitFor(() => {
+      expect(mockInvalidDatasetList).toHaveBeenCalled()
+      expect(mockInvalidDatasetDetail).toHaveBeenCalled()
+    })
+  })
+
+  it('should close rename modal when onClose is called', async () => {
+    const user = userEvent.setup()
+    render(<Dropdown expand />)
+
+    await user.click(screen.getByTestId('portal-trigger'))
+    await user.click(screen.getByText('common.operation.edit'))
+
+    expect(screen.getByTestId('rename-modal')).toBeInTheDocument()
+    await user.click(screen.getByText('Close'))
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('rename-modal')).not.toBeInTheDocument()
+    })
+  })
+
+  it('should close confirm dialog when cancel is clicked', async () => {
+    const user = userEvent.setup()
+    render(<Dropdown expand />)
+
+    await user.click(screen.getByTestId('portal-trigger'))
+    await user.click(screen.getByText('common.operation.delete'))
+
+    await waitFor(() => {
+      expect(screen.getByTestId('confirm-dialog')).toBeInTheDocument()
+    })
+
+    await user.click(screen.getByText('cancel'))
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument()
+    })
+  })
+})
diff --git a/web/app/components/app-sidebar/dataset-info/index.spec.tsx b/web/app/components/app-sidebar/dataset-info/__tests__/index.spec.tsx
similarity index 98%
rename from web/app/components/app-sidebar/dataset-info/index.spec.tsx
rename to web/app/components/app-sidebar/dataset-info/__tests__/index.spec.tsx
index 9996ef2b4d..be27e247d7 100644
--- a/web/app/components/app-sidebar/dataset-info/index.spec.tsx
+++ b/web/app/components/app-sidebar/dataset-info/__tests__/index.spec.tsx
@@ -9,10 +9,10 @@ import {
   DataSourceType,
 } from '@/models/datasets'
 import { RETRIEVE_METHOD } from '@/types/app'
-import Dropdown from './dropdown'
-import DatasetInfo from './index'
-import Menu from './menu'
-import MenuItem from './menu-item'
+import DatasetInfo from '..'
+import Dropdown from '../dropdown'
+import Menu from '../menu'
+import MenuItem from '../menu-item'
 
 let mockDataset: DataSet
 let mockIsDatasetOperator = false
diff --git a/web/app/components/app-sidebar/dataset-info/index.tsx b/web/app/components/app-sidebar/dataset-info/index.tsx
index ba82099b6c..e46c4e4085 100644
--- a/web/app/components/app-sidebar/dataset-info/index.tsx
+++ b/web/app/components/app-sidebar/dataset-info/index.tsx
@@ -64,12 +64,12 @@ const DatasetInfo: FC<DatasetInfoProps> = ({
         {expand && (
           <div className="flex flex-col gap-y-1 pb-0.5">
             <div
-              className="system-md-semibold truncate text-text-secondary"
+              className="truncate text-text-secondary system-md-semibold"
               title={dataset.name}
             >
               {dataset.name}
             </div>
-            <div className="system-2xs-medium-uppercase text-text-tertiary">
+            <div className="text-text-tertiary system-2xs-medium-uppercase">
               {isExternalProvider && t('externalTag', { ns: 'dataset' })}
               {!!(!isExternalProvider && isPipelinePublished && dataset.doc_form && dataset.indexing_technique) && (
                 <div className="flex items-center gap-x-2">
@@ -79,7 +79,7 @@ const DatasetInfo: FC<DatasetInfoProps> = ({
               )}
             </div>
             {!!dataset.description && (
-              <p className="system-xs-regular line-clamp-3 text-text-tertiary first-letter:capitalize">
+              <p className="line-clamp-3 text-text-tertiary system-xs-regular first-letter:capitalize">
                 {dataset.description}
               </p>
             )}
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 441482283b..7ad8d9407f 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="system-md-regular px-1 text-text-secondary">{name}</span>
+      <span className="px-1 text-text-secondary system-md-regular">{name}</span>
     </div>
   )
 }
diff --git a/web/app/components/app-sidebar/dataset-sidebar-dropdown.tsx b/web/app/components/app-sidebar/dataset-sidebar-dropdown.tsx
index c81125e973..5beea54ab0 100644
--- a/web/app/components/app-sidebar/dataset-sidebar-dropdown.tsx
+++ b/web/app/components/app-sidebar/dataset-sidebar-dropdown.tsx
@@ -1,4 +1,4 @@
-import type { NavIcon } from './navLink'
+import type { NavIcon } from './nav-link'
 import type { DataSet } from '@/models/datasets'
 import {
   RiMenuLine,
@@ -21,7 +21,7 @@ import Divider from '../base/divider'
 import Effect from '../base/effect'
 import ExtraInfo from '../datasets/extra-info'
 import Dropdown from './dataset-info/dropdown'
-import NavLink from './navLink'
+import NavLink from './nav-link'
 
 type DatasetSidebarDropdownProps = {
   navigation: Array<{
@@ -107,12 +107,12 @@ const DatasetSidebarDropdown = ({
                 </div>
                 <div className="flex flex-col gap-y-1 pb-0.5">
                   <div
-                    className="system-md-semibold truncate text-text-secondary"
+                    className="truncate text-text-secondary system-md-semibold"
                     title={dataset.name}
                   >
                     {dataset.name}
                   </div>
-                  <div className="system-2xs-medium-uppercase text-text-tertiary">
+                  <div className="text-text-tertiary system-2xs-medium-uppercase">
                     {isExternalProvider && t('externalTag', { ns: 'dataset' })}
                     {!!(!isExternalProvider && dataset.doc_form && dataset.indexing_technique) && (
                       <div className="flex items-center gap-x-2">
@@ -123,7 +123,7 @@ const DatasetSidebarDropdown = ({
                   </div>
                 </div>
                 {!!dataset.description && (
-                  <p className="system-xs-regular line-clamp-3 text-text-tertiary first-letter:capitalize">
+                  <p className="line-clamp-3 text-text-tertiary system-xs-regular first-letter:capitalize">
                     {dataset.description}
                   </p>
                 )}
diff --git a/web/app/components/app-sidebar/expert.png b/web/app/components/app-sidebar/expert.png
deleted file mode 100644
index ba941a586569eb97fee00018497a4dfad8822af4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88100
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
b2>{xbcKY+u({IYxsW104XMZI-U%CH(RgaAv

diff --git a/web/app/components/app-sidebar/index.tsx b/web/app/components/app-sidebar/index.tsx
index afc6bd0f13..e24b005d01 100644
--- a/web/app/components/app-sidebar/index.tsx
+++ b/web/app/components/app-sidebar/index.tsx
@@ -1,4 +1,4 @@
-import type { NavIcon } from './navLink'
+import type { NavIcon } from './nav-link'
 import { useHover, useKeyPress } from 'ahooks'
 import { usePathname } from 'next/navigation'
 import * as React from 'react'
@@ -14,7 +14,7 @@ import AppInfo from './app-info'
 import AppSidebarDropdown from './app-sidebar-dropdown'
 import DatasetInfo from './dataset-info'
 import DatasetSidebarDropdown from './dataset-sidebar-dropdown'
-import NavLink from './navLink'
+import NavLink from './nav-link'
 import ToggleButton from './toggle-button'
 
 export type IAppDetailNavProps = {
diff --git a/web/app/components/app-sidebar/navLink.spec.tsx b/web/app/components/app-sidebar/nav-link/__tests__/index.spec.tsx
similarity index 98%
rename from web/app/components/app-sidebar/navLink.spec.tsx
rename to web/app/components/app-sidebar/nav-link/__tests__/index.spec.tsx
index 62ef553386..04ca7bd0e4 100644
--- a/web/app/components/app-sidebar/navLink.spec.tsx
+++ b/web/app/components/app-sidebar/nav-link/__tests__/index.spec.tsx
@@ -1,7 +1,7 @@
-import type { NavLinkProps } from './navLink'
+import type { NavLinkProps } from '..'
 import { render, screen } from '@testing-library/react'
 import * as React from 'react'
-import NavLink from './navLink'
+import NavLink from '..'
 
 // Mock Next.js navigation
 vi.mock('next/navigation', () => ({
@@ -10,7 +10,7 @@ vi.mock('next/navigation', () => ({
 
 // Mock Next.js Link component
 vi.mock('next/link', () => ({
-  default: function MockLink({ children, href, className, title }: any) {
+  default: function MockLink({ children, href, className, title }: { children: React.ReactNode, href: string, className?: string, title?: string }) {
     return (
       <a href={href} className={className} title={title} data-testid="nav-link">
         {children}
diff --git a/web/app/components/app-sidebar/navLink.tsx b/web/app/components/app-sidebar/nav-link/index.tsx
similarity index 83%
rename from web/app/components/app-sidebar/navLink.tsx
rename to web/app/components/app-sidebar/nav-link/index.tsx
index 9d5e319046..d69ed8590e 100644
--- a/web/app/components/app-sidebar/navLink.tsx
+++ b/web/app/components/app-sidebar/nav-link/index.tsx
@@ -54,7 +54,7 @@ const NavLink = ({
         key={name}
         type="button"
         disabled
-        className={cn('system-sm-medium flex h-8 cursor-not-allowed items-center rounded-lg text-components-menu-item-text opacity-30 hover:bg-components-menu-item-bg-hover', 'pl-3 pr-1')}
+        className={cn('flex h-8 cursor-not-allowed items-center rounded-lg text-components-menu-item-text opacity-30 system-sm-medium hover:bg-components-menu-item-bg-hover', 'pl-3 pr-1')}
         title={mode === 'collapse' ? name : ''}
         aria-disabled
       >
@@ -75,8 +75,8 @@ const NavLink = ({
       key={name}
       href={href}
       className={cn(isActive
-        ? 'system-sm-semibold border-b-[0.25px] border-l-[0.75px] border-r-[0.25px] border-t-[0.75px] border-effects-highlight-lightmode-off bg-components-menu-item-bg-active text-text-accent-light-mode-only'
-        : 'system-sm-medium text-components-menu-item-text hover:bg-components-menu-item-bg-hover hover:text-components-menu-item-text-hover', 'flex h-8 items-center rounded-lg pl-3 pr-1')}
+        ? 'border-b-[0.25px] border-l-[0.75px] border-r-[0.25px] border-t-[0.75px] border-effects-highlight-lightmode-off bg-components-menu-item-bg-active text-text-accent-light-mode-only system-sm-semibold'
+        : 'text-components-menu-item-text system-sm-medium hover:bg-components-menu-item-bg-hover hover:text-components-menu-item-text-hover', 'flex h-8 items-center rounded-lg pl-3 pr-1')}
       title={mode === 'collapse' ? name : ''}
     >
       {renderIcon()}
diff --git a/web/app/components/app-sidebar/style.module.css b/web/app/components/app-sidebar/style.module.css
deleted file mode 100644
index ca0978b760..0000000000
--- a/web/app/components/app-sidebar/style.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.sidebar {
-    border-right: 1px solid #F3F4F6;
-}
-
-.completionPic {
-background-image: url('./completion.png')
-}
-
-.expertPic {
-background-image: url('./expert.png')
-}
diff --git a/web/app/components/app-sidebar/toggle-button.tsx b/web/app/components/app-sidebar/toggle-button.tsx
index cbfbeee452..811e979b89 100644
--- a/web/app/components/app-sidebar/toggle-button.tsx
+++ b/web/app/components/app-sidebar/toggle-button.tsx
@@ -19,7 +19,7 @@ const TooltipContent = ({
 
   return (
     <div className="flex items-center gap-x-1">
-      <span className="system-xs-medium px-0.5 text-text-secondary">{expand ? t('sidebar.collapseSidebar', { ns: 'layout' }) : t('sidebar.expandSidebar', { ns: 'layout' })}</span>
+      <span className="px-0.5 text-text-secondary system-xs-medium">{expand ? t('sidebar.collapseSidebar', { ns: 'layout' }) : t('sidebar.expandSidebar', { ns: 'layout' })}</span>
       <ShortcutsName keys={TOGGLE_SHORTCUT} textColor="secondary" />
     </div>
   )
diff --git a/web/eslint-suppressions.json b/web/eslint-suppressions.json
index 3282630fef..c5307cbe8e 100644
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json
@@ -277,30 +277,9 @@
       "count": 1
     }
   },
-  "app/components/app-sidebar/app-info.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 6
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "app/components/app-sidebar/app-operations.tsx": {
+  "app/components/app-sidebar/app-info/app-operations.tsx": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 4
-    },
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 5
-    }
-  },
-  "app/components/app-sidebar/app-sidebar-dropdown.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 2
-    }
-  },
-  "app/components/app-sidebar/basic.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
     }
   },
   "app/components/app-sidebar/dataset-info/dropdown.tsx": {
@@ -308,54 +287,11 @@
       "count": 1
     }
   },
-  "app/components/app-sidebar/dataset-info/index.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "app/components/app-sidebar/dataset-info/menu-item.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
-  "app/components/app-sidebar/dataset-sidebar-dropdown.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
   "app/components/app-sidebar/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "app/components/app-sidebar/navLink.spec.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "app/components/app-sidebar/navLink.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 3
-    }
-  },
-  "app/components/app-sidebar/sidebar-animation-issues.spec.tsx": {
-    "no-console": {
-      "count": 26
-    }
-  },
-  "app/components/app-sidebar/text-squeeze-fix-verification.spec.tsx": {
-    "no-console": {
-      "count": 51
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "app/components/app-sidebar/toggle-button.tsx": {
-    "tailwindcss/enforce-consistent-class-order": {
-      "count": 1
-    }
-  },
   "app/components/app/annotation/add-annotation-modal/edit-item/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
@@ -1856,11 +1792,6 @@
       "count": 4
     }
   },
-  "app/components/base/file-uploader/utils.spec.ts": {
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
   "app/components/base/file-uploader/utils.ts": {
     "ts/no-explicit-any": {
       "count": 3
@@ -2033,11 +1964,6 @@
       "count": 1
     }
   },
-  "app/components/base/input/index.spec.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
   "app/components/base/input/index.stories.tsx": {
     "no-console": {
       "count": 2
@@ -2618,11 +2544,6 @@
       "count": 4
     }
   },
-  "app/components/base/with-input-validation/index.spec.tsx": {
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
   "app/components/base/with-input-validation/index.stories.tsx": {
     "no-console": {
       "count": 1

From 1b2234a19fc9da7909438d234d0824bce2780502 Mon Sep 17 00:00:00 2001
From: wangxiaolei <fatelei@gmail.com>
Date: Tue, 3 Mar 2026 13:36:17 +0800
Subject: [PATCH 18/22] refactor: TemplateTransformNode decouple code executor
 (#32879)

---
 api/.importlinter                             |   1 -
 api/core/workflow/node_factory.py             |   2 +-
 .../template_transform/template_renderer.py   |  19 +-
 .../template_transform_node.py                |   5 +-
 .../workflow/nodes/test_template_transform.py |  23 ++-
 .../workflow/graph_engine/test_mock_nodes.py  |  20 ++
 .../template_transform_node_spec.py           | 182 ++++++++----------
 7 files changed, 130 insertions(+), 122 deletions(-)

diff --git a/api/.importlinter b/api/.importlinter
index ebf4ccfbe9..10c3dbb82e 100644
--- a/api/.importlinter
+++ b/api/.importlinter
@@ -134,7 +134,6 @@ ignore_imports =
     dify_graph.nodes.agent.agent_node -> models.model
     dify_graph.nodes.llm.file_saver -> core.helper.ssrf_proxy
     dify_graph.nodes.llm.node -> core.helper.code_executor
-    dify_graph.nodes.template_transform.template_renderer -> core.helper.code_executor.code_executor
     dify_graph.nodes.llm.node -> core.llm_generator.output_parser.errors
     dify_graph.nodes.llm.node -> core.llm_generator.output_parser.structured_output
     dify_graph.nodes.llm.node -> core.model_manager
diff --git a/api/core/workflow/node_factory.py b/api/core/workflow/node_factory.py
index 3105ceb04b..22d86748f1 100644
--- a/api/core/workflow/node_factory.py
+++ b/api/core/workflow/node_factory.py
@@ -119,7 +119,7 @@ class DifyNodeFactory(NodeFactory):
             max_string_array_length=dify_config.CODE_MAX_STRING_ARRAY_LENGTH,
             max_object_array_length=dify_config.CODE_MAX_OBJECT_ARRAY_LENGTH,
         )
-        self._template_renderer = CodeExecutorJinja2TemplateRenderer()
+        self._template_renderer = CodeExecutorJinja2TemplateRenderer(code_executor=self._code_executor)
         self._template_transform_max_output_length = dify_config.TEMPLATE_TRANSFORM_MAX_LENGTH
         self._http_request_http_client = ssrf_proxy
         self._http_request_tool_file_manager_factory = ToolFileManager
diff --git a/api/dify_graph/nodes/template_transform/template_renderer.py b/api/dify_graph/nodes/template_transform/template_renderer.py
index a5f06bf2bb..9b679d4497 100644
--- a/api/dify_graph/nodes/template_transform/template_renderer.py
+++ b/api/dify_graph/nodes/template_transform/template_renderer.py
@@ -3,7 +3,8 @@ from __future__ import annotations
 from collections.abc import Mapping
 from typing import Any, Protocol
 
-from core.helper.code_executor.code_executor import CodeExecutionError, CodeExecutor, CodeLanguage
+from dify_graph.nodes.code.code_node import WorkflowCodeExecutor
+from dify_graph.nodes.code.entities import CodeLanguage
 
 
 class TemplateRenderError(ValueError):
@@ -21,18 +22,18 @@ class Jinja2TemplateRenderer(Protocol):
 class CodeExecutorJinja2TemplateRenderer(Jinja2TemplateRenderer):
     """Adapter that renders Jinja2 templates via CodeExecutor."""
 
-    _code_executor: type[CodeExecutor]
+    _code_executor: WorkflowCodeExecutor
 
-    def __init__(self, code_executor: type[CodeExecutor] | None = None) -> None:
-        self._code_executor = code_executor or CodeExecutor
+    def __init__(self, code_executor: WorkflowCodeExecutor) -> None:
+        self._code_executor = code_executor
 
     def render_template(self, template: str, variables: Mapping[str, Any]) -> str:
         try:
-            result = self._code_executor.execute_workflow_code_template(
-                language=CodeLanguage.JINJA2, code=template, inputs=variables
-            )
-        except CodeExecutionError as exc:
-            raise TemplateRenderError(str(exc)) from exc
+            result = self._code_executor.execute(language=CodeLanguage.JINJA2, code=template, inputs=variables)
+        except Exception as exc:
+            if self._code_executor.is_execution_error(exc):
+                raise TemplateRenderError(str(exc)) from exc
+            raise
 
         rendered = result.get("result")
         if not isinstance(rendered, str):
diff --git a/api/dify_graph/nodes/template_transform/template_transform_node.py b/api/dify_graph/nodes/template_transform/template_transform_node.py
index b42bf02d08..367442e997 100644
--- a/api/dify_graph/nodes/template_transform/template_transform_node.py
+++ b/api/dify_graph/nodes/template_transform/template_transform_node.py
@@ -6,7 +6,6 @@ from dify_graph.node_events import NodeRunResult
 from dify_graph.nodes.base.node import Node
 from dify_graph.nodes.template_transform.entities import TemplateTransformNodeData
 from dify_graph.nodes.template_transform.template_renderer import (
-    CodeExecutorJinja2TemplateRenderer,
     Jinja2TemplateRenderer,
     TemplateRenderError,
 )
@@ -30,7 +29,7 @@ class TemplateTransformNode(Node[TemplateTransformNodeData]):
         graph_init_params: "GraphInitParams",
         graph_runtime_state: "GraphRuntimeState",
         *,
-        template_renderer: Jinja2TemplateRenderer | None = None,
+        template_renderer: Jinja2TemplateRenderer,
         max_output_length: int | None = None,
     ) -> None:
         super().__init__(
@@ -39,7 +38,7 @@ class TemplateTransformNode(Node[TemplateTransformNodeData]):
             graph_init_params=graph_init_params,
             graph_runtime_state=graph_runtime_state,
         )
-        self._template_renderer = template_renderer or CodeExecutorJinja2TemplateRenderer()
+        self._template_renderer = template_renderer
 
         if max_output_length is not None and max_output_length <= 0:
             raise ValueError("max_output_length must be a positive integer")
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 1a8971baa6..a4f3a2c830 100644
--- a/api/tests/integration_tests/workflow/nodes/test_template_transform.py
+++ b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
@@ -1,22 +1,31 @@
 import time
 import uuid
 
-import pytest
-
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
 from dify_graph.enums import WorkflowNodeExecutionStatus
 from dify_graph.graph import Graph
+from dify_graph.nodes.template_transform.template_renderer import TemplateRenderError
 from dify_graph.nodes.template_transform.template_transform_node import TemplateTransformNode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from models.enums import UserFrom
-from tests.integration_tests.workflow.nodes.__mock.code_executor import setup_code_executor_mock
 
 
-@pytest.mark.parametrize("setup_code_executor_mock", [["none"]], indirect=True)
-def test_execute_code(setup_code_executor_mock):
+class _SimpleJinja2Renderer:
+    """Minimal Jinja2-based renderer for integration tests (no code executor)."""
+
+    def render_template(self, template: str, variables: dict[str, object]) -> str:
+        from jinja2 import Template
+
+        try:
+            return Template(template).render(**variables)
+        except Exception as exc:
+            raise TemplateRenderError(str(exc)) from exc
+
+
+def test_execute_template_transform():
     code = """{{args2}}"""
     config = {
         "id": "1",
@@ -68,19 +77,21 @@ def test_execute_code(setup_code_executor_mock):
 
     graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
 
-    # Create node factory
+    # Create node factory (graph init path still works regardless of renderer choice below)
     node_factory = DifyNodeFactory(
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
     )
 
     graph = Graph.init(graph_config=graph_config, node_factory=node_factory)
+    assert graph is not None
 
     node = TemplateTransformNode(
         id=str(uuid.uuid4()),
         config=config,
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
+        template_renderer=_SimpleJinja2Renderer(),
     )
 
     # execute node
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 ad71227205..22afbb4909 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
@@ -24,6 +24,10 @@ from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
 from dify_graph.nodes.parameter_extractor import ParameterExtractorNode
 from dify_graph.nodes.question_classifier import QuestionClassifierNode
 from dify_graph.nodes.template_transform import TemplateTransformNode
+from dify_graph.nodes.template_transform.template_renderer import (
+    Jinja2TemplateRenderer,
+    TemplateRenderError,
+)
 from dify_graph.nodes.tool import ToolNode
 
 if TYPE_CHECKING:
@@ -33,6 +37,18 @@ if TYPE_CHECKING:
     from .test_mock_config import MockConfig
 
 
+class _TestJinja2Renderer(Jinja2TemplateRenderer):
+    """Simple Jinja2 renderer for tests (avoids code executor)."""
+
+    def render_template(self, template: str, variables: Mapping[str, Any]) -> str:
+        from jinja2 import Template as _Jinja2Template
+
+        try:
+            return _Jinja2Template(template).render(**variables)
+        except Exception as exc:  # pragma: no cover - pass through as contract error
+            raise TemplateRenderError(str(exc)) from exc
+
+
 class MockNodeMixin:
     """Mixin providing common mock functionality."""
 
@@ -50,6 +66,10 @@ class MockNodeMixin:
             kwargs.setdefault("model_factory", MagicMock(spec=ModelFactory))
             kwargs.setdefault("model_instance", MagicMock(spec=ModelInstance))
 
+        # Ensure TemplateTransformNode receives a renderer now required by constructor
+        if isinstance(self, TemplateTransformNode):
+            kwargs.setdefault("template_renderer", _TestJinja2Renderer())
+
         super().__init__(
             id=id,
             config=config,
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 7edc56c3dc..48d76d9b9b 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,13 +1,15 @@
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock
 
 import pytest
-from dify_graph.graph_engine.entities.graph import Graph
-from dify_graph.graph_engine.entities.graph_init_params import GraphInitParams
-from dify_graph.graph_engine.entities.graph_runtime_state import GraphRuntimeState
 
+from core.app.entities.app_invoke_entities import InvokeFrom
+from dify_graph.entities import GraphInitParams
 from dify_graph.enums import ErrorStrategy, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.graph import Graph
 from dify_graph.nodes.template_transform.template_renderer import TemplateRenderError
 from dify_graph.nodes.template_transform.template_transform_node import TemplateTransformNode
+from dify_graph.runtime import GraphRuntimeState
+from models.enums import UserFrom
 from models.workflow import WorkflowType
 
 
@@ -24,7 +26,7 @@ class TestTemplateTransformNode:
 
     @pytest.fixture
     def mock_graph(self):
-        """Create a mock Graph."""
+        """Create a mock Graph (kept for backward compat in other tests)."""
         return MagicMock(spec=Graph)
 
     @pytest.fixture
@@ -37,8 +39,8 @@ class TestTemplateTransformNode:
             workflow_id="test_workflow",
             graph_config={},
             user_id="test_user",
-            user_from="test",
-            invoke_from="test",
+            user_from=UserFrom.ACCOUNT,
+            invoke_from=InvokeFrom.DEBUGGER,
             call_depth=0,
         )
 
@@ -55,14 +57,15 @@ class TestTemplateTransformNode:
             "template": "Hello {{ name }}, you are {{ age }} years old!",
         }
 
-    def test_node_initialization(self, basic_node_data, mock_graph, mock_graph_runtime_state, graph_init_params):
+    def test_node_initialization(self, basic_node_data, mock_graph_runtime_state, graph_init_params):
         """Test that TemplateTransformNode initializes correctly."""
+        mock_renderer = MagicMock()
         node = TemplateTransformNode(
             id="test_node",
-            config=basic_node_data,
+            config={"id": "test_node", "data": basic_node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         assert node.node_type == NodeType.TEMPLATE_TRANSFORM
@@ -70,31 +73,33 @@ class TestTemplateTransformNode:
         assert len(node._node_data.variables) == 2
         assert node._node_data.template == "Hello {{ name }}, you are {{ age }} years old!"
 
-    def test_get_title(self, basic_node_data, mock_graph, mock_graph_runtime_state, graph_init_params):
+    def test_get_title(self, basic_node_data, mock_graph_runtime_state, graph_init_params):
         """Test _get_title method."""
+        mock_renderer = MagicMock()
         node = TemplateTransformNode(
             id="test_node",
-            config=basic_node_data,
+            config={"id": "test_node", "data": basic_node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         assert node._get_title() == "Template Transform"
 
-    def test_get_description(self, basic_node_data, mock_graph, mock_graph_runtime_state, graph_init_params):
+    def test_get_description(self, basic_node_data, mock_graph_runtime_state, graph_init_params):
         """Test _get_description method."""
+        mock_renderer = MagicMock()
         node = TemplateTransformNode(
             id="test_node",
-            config=basic_node_data,
+            config={"id": "test_node", "data": basic_node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         assert node._get_description() == "Transform data using template"
 
-    def test_get_error_strategy(self, mock_graph, mock_graph_runtime_state, graph_init_params):
+    def test_get_error_strategy(self, mock_graph_runtime_state, graph_init_params):
         """Test _get_error_strategy method."""
         node_data = {
             "title": "Test",
@@ -103,12 +108,13 @@ class TestTemplateTransformNode:
             "error_strategy": "fail-branch",
         }
 
+        mock_renderer = MagicMock()
         node = TemplateTransformNode(
             id="test_node",
-            config=node_data,
+            config={"id": "test_node", "data": node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         assert node._get_error_strategy() == ErrorStrategy.FAIL_BRANCH
@@ -127,14 +133,8 @@ class TestTemplateTransformNode:
         """Test version class method."""
         assert TemplateTransformNode.version() == "1"
 
-    @patch(
-        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
-        autospec=True,
-    )
-    def test_run_simple_template(
-        self, mock_execute, basic_node_data, mock_graph, mock_graph_runtime_state, graph_init_params
-    ):
-        """Test _run with simple template transformation."""
+    def test_run_simple_template(self, basic_node_data, mock_graph_runtime_state, graph_init_params):
+        """Test _run with simple template transformation using injected renderer."""
         # Setup mock variable pool
         mock_name_value = MagicMock()
         mock_name_value.to_object.return_value = "Alice"
@@ -147,15 +147,16 @@ class TestTemplateTransformNode:
         }
         mock_graph_runtime_state.variable_pool.get.side_effect = lambda selector: variable_map.get(tuple(selector))
 
-        # Setup mock executor
-        mock_execute.return_value = "Hello Alice, you are 30 years old!"
+        # Setup mock renderer
+        mock_renderer = MagicMock()
+        mock_renderer.render_template.return_value = "Hello Alice, you are 30 years old!"
 
         node = TemplateTransformNode(
             id="test_node",
-            config=basic_node_data,
+            config={"id": "test_node", "data": basic_node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         result = node._run()
@@ -165,11 +166,7 @@ class TestTemplateTransformNode:
         assert result.inputs["name"] == "Alice"
         assert result.inputs["age"] == 30
 
-    @patch(
-        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
-        autospec=True,
-    )
-    def test_run_with_none_values(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
+    def test_run_with_none_values(self, mock_graph_runtime_state, graph_init_params):
         """Test _run with None variable values."""
         node_data = {
             "title": "Test",
@@ -178,14 +175,16 @@ class TestTemplateTransformNode:
         }
 
         mock_graph_runtime_state.variable_pool.get.return_value = None
-        mock_execute.return_value = "Value: "
+
+        mock_renderer = MagicMock()
+        mock_renderer.render_template.return_value = "Value: "
 
         node = TemplateTransformNode(
             id="test_node",
-            config=node_data,
+            config={"id": "test_node", "data": node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         result = node._run()
@@ -193,23 +192,19 @@ class TestTemplateTransformNode:
         assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
         assert result.inputs["value"] is None
 
-    @patch(
-        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
-        autospec=True,
-    )
-    def test_run_with_code_execution_error(
-        self, mock_execute, basic_node_data, mock_graph, mock_graph_runtime_state, graph_init_params
-    ):
-        """Test _run when code execution fails."""
+    def test_run_with_render_error(self, basic_node_data, mock_graph_runtime_state, graph_init_params):
+        """Test _run when template rendering fails."""
         mock_graph_runtime_state.variable_pool.get.return_value = MagicMock()
-        mock_execute.side_effect = TemplateRenderError("Template syntax error")
+
+        mock_renderer = MagicMock()
+        mock_renderer.render_template.side_effect = TemplateRenderError("Template syntax error")
 
         node = TemplateTransformNode(
             id="test_node",
-            config=basic_node_data,
+            config={"id": "test_node", "data": basic_node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         result = node._run()
@@ -217,23 +212,19 @@ class TestTemplateTransformNode:
         assert result.status == WorkflowNodeExecutionStatus.FAILED
         assert "Template syntax error" in result.error
 
-    @patch(
-        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
-        autospec=True,
-    )
-    def test_run_output_length_exceeds_limit(
-        self, mock_execute, basic_node_data, mock_graph, mock_graph_runtime_state, graph_init_params
-    ):
+    def test_run_output_length_exceeds_limit(self, basic_node_data, mock_graph_runtime_state, graph_init_params):
         """Test _run when output exceeds maximum length."""
         mock_graph_runtime_state.variable_pool.get.return_value = MagicMock()
-        mock_execute.return_value = "This is a very long output that exceeds the limit"
+
+        mock_renderer = MagicMock()
+        mock_renderer.render_template.return_value = "This is a very long output that exceeds the limit"
 
         node = TemplateTransformNode(
             id="test_node",
-            config=basic_node_data,
+            config={"id": "test_node", "data": basic_node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
             max_output_length=10,
         )
 
@@ -242,13 +233,7 @@ class TestTemplateTransformNode:
         assert result.status == WorkflowNodeExecutionStatus.FAILED
         assert "Output length exceeds" in result.error
 
-    @patch(
-        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
-        autospec=True,
-    )
-    def test_run_with_complex_jinja2_template(
-        self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params
-    ):
+    def test_run_with_complex_jinja2_template(self, mock_graph_runtime_state, graph_init_params):
         """Test _run with complex Jinja2 template including loops and conditions."""
         node_data = {
             "title": "Complex Template",
@@ -272,14 +257,16 @@ class TestTemplateTransformNode:
             ("sys", "show_total"): mock_show_total,
         }
         mock_graph_runtime_state.variable_pool.get.side_effect = lambda selector: variable_map.get(tuple(selector))
-        mock_execute.return_value = "apple, banana, orange (Total: 3)"
+
+        mock_renderer = MagicMock()
+        mock_renderer.render_template.return_value = "apple, banana, orange (Total: 3)"
 
         node = TemplateTransformNode(
             id="test_node",
-            config=node_data,
+            config={"id": "test_node", "data": node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         result = node._run()
@@ -307,11 +294,7 @@ class TestTemplateTransformNode:
         assert mapping["node_123.var1"] == ["sys", "input1"]
         assert mapping["node_123.var2"] == ["sys", "input2"]
 
-    @patch(
-        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
-        autospec=True,
-    )
-    def test_run_with_empty_variables(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
+    def test_run_with_empty_variables(self, mock_graph_runtime_state, graph_init_params):
         """Test _run with no variables (static template)."""
         node_data = {
             "title": "Static Template",
@@ -319,14 +302,15 @@ class TestTemplateTransformNode:
             "template": "This is a static message.",
         }
 
-        mock_execute.return_value = "This is a static message."
+        mock_renderer = MagicMock()
+        mock_renderer.render_template.return_value = "This is a static message."
 
         node = TemplateTransformNode(
             id="test_node",
-            config=node_data,
+            config={"id": "test_node", "data": node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         result = node._run()
@@ -335,11 +319,7 @@ class TestTemplateTransformNode:
         assert result.outputs["output"] == "This is a static message."
         assert result.inputs == {}
 
-    @patch(
-        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
-        autospec=True,
-    )
-    def test_run_with_numeric_values(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
+    def test_run_with_numeric_values(self, mock_graph_runtime_state, graph_init_params):
         """Test _run with numeric variable values."""
         node_data = {
             "title": "Numeric Template",
@@ -360,14 +340,16 @@ class TestTemplateTransformNode:
             ("sys", "quantity"): mock_quantity,
         }
         mock_graph_runtime_state.variable_pool.get.side_effect = lambda selector: variable_map.get(tuple(selector))
-        mock_execute.return_value = "Total: $31.5"
+
+        mock_renderer = MagicMock()
+        mock_renderer.render_template.return_value = "Total: $31.5"
 
         node = TemplateTransformNode(
             id="test_node",
-            config=node_data,
+            config={"id": "test_node", "data": node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         result = node._run()
@@ -375,11 +357,7 @@ class TestTemplateTransformNode:
         assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
         assert result.outputs["output"] == "Total: $31.5"
 
-    @patch(
-        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
-        autospec=True,
-    )
-    def test_run_with_dict_values(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
+    def test_run_with_dict_values(self, mock_graph_runtime_state, graph_init_params):
         """Test _run with dictionary variable values."""
         node_data = {
             "title": "Dict Template",
@@ -391,14 +369,16 @@ class TestTemplateTransformNode:
         mock_user.to_object.return_value = {"name": "John Doe", "email": "john@example.com"}
 
         mock_graph_runtime_state.variable_pool.get.return_value = mock_user
-        mock_execute.return_value = "Name: John Doe, Email: john@example.com"
+
+        mock_renderer = MagicMock()
+        mock_renderer.render_template.return_value = "Name: John Doe, Email: john@example.com"
 
         node = TemplateTransformNode(
             id="test_node",
-            config=node_data,
+            config={"id": "test_node", "data": node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         result = node._run()
@@ -407,11 +387,7 @@ class TestTemplateTransformNode:
         assert "John Doe" in result.outputs["output"]
         assert "john@example.com" in result.outputs["output"]
 
-    @patch(
-        "dify_graph.nodes.template_transform.template_transform_node.CodeExecutorJinja2TemplateRenderer.render_template",
-        autospec=True,
-    )
-    def test_run_with_list_values(self, mock_execute, mock_graph, mock_graph_runtime_state, graph_init_params):
+    def test_run_with_list_values(self, mock_graph_runtime_state, graph_init_params):
         """Test _run with list variable values."""
         node_data = {
             "title": "List Template",
@@ -423,14 +399,16 @@ class TestTemplateTransformNode:
         mock_tags.to_object.return_value = ["python", "ai", "workflow"]
 
         mock_graph_runtime_state.variable_pool.get.return_value = mock_tags
-        mock_execute.return_value = "Tags: #python #ai #workflow "
+
+        mock_renderer = MagicMock()
+        mock_renderer.render_template.return_value = "Tags: #python #ai #workflow "
 
         node = TemplateTransformNode(
             id="test_node",
-            config=node_data,
+            config={"id": "test_node", "data": node_data},
             graph_init_params=graph_init_params,
-            graph=mock_graph,
             graph_runtime_state=mock_graph_runtime_state,
+            template_renderer=mock_renderer,
         )
 
         result = node._run()

From 56f460e29005f22d96bfecbe0940c59a22653cc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Mar 2026 14:42:05 +0900
Subject: [PATCH 19/22] chore(deps): bump pypdf from 6.7.4 to 6.7.5 in /api
 (#32882)

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 0121cbaab0..42b010286b 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -5078,11 +5078,11 @@ wheels = [
 
 [[package]]
 name = "pypdf"
-version = "6.7.4"
+version = "6.7.5"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/09/dc/f52deef12797ad58b88e4663f097a343f53b9361338aef6573f135ac302f/pypdf-6.7.4.tar.gz", hash = "sha256:9edd1cd47938bb35ec87795f61225fd58a07cfaf0c5699018ae1a47d6f8ab0e3", size = 5304821, upload-time = "2026-02-27T10:44:39.395Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f6/52/37cc0aa9e9d1bf7729a737a0d83f8b3f851c8eb137373d9f71eafb0a3405/pypdf-6.7.5.tar.gz", hash = "sha256:40bb2e2e872078655f12b9b89e2f900888bb505e88a82150b64f9f34fa25651d", size = 5304278, upload-time = "2026-03-02T09:05:21.464Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c1/be/cded021305f5c81b47265b8c5292b99388615a4391c21ff00fd538d34a56/pypdf-6.7.4-py3-none-any.whl", hash = "sha256:527d6da23274a6c70a9cb59d1986d93946ba8e36a6bc17f3f7cce86331492dda", size = 331496, upload-time = "2026-02-27T10:44:37.527Z" },
+    { url = "https://files.pythonhosted.org/packages/05/89/336673efd0a88956562658aba4f0bbef7cb92a6fbcbcaf94926dbc82b408/pypdf-6.7.5-py3-none-any.whl", hash = "sha256:07ba7f1d6e6d9aa2a17f5452e320a84718d4ce863367f7ede2fd72280349ab13", size = 331421, upload-time = "2026-03-02T09:05:19.722Z" },
 ]
 
 [[package]]

From 48c8aac09291eafb686e4e7f30a9bd25de699e6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Mar 2026 13:50:13 +0800
Subject: [PATCH 20/22] chore(deps): bump @orpc/client from 1.13.4 to 1.13.6 in
 /web (#32883)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
---
 web/package.json   |   8 +--
 web/pnpm-lock.yaml | 121 ++++++++++++++++++++++++---------------------
 2 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/web/package.json b/web/package.json
index 833e7f9af6..a1f1c5966a 100644
--- a/web/package.json
+++ b/web/package.json
@@ -78,10 +78,10 @@
     "@monaco-editor/react": "4.7.0",
     "@octokit/core": "6.1.6",
     "@octokit/request-error": "6.1.8",
-    "@orpc/client": "1.13.4",
-    "@orpc/contract": "1.13.4",
-    "@orpc/openapi-client": "1.13.4",
-    "@orpc/tanstack-query": "1.13.4",
+    "@orpc/client": "1.13.6",
+    "@orpc/contract": "1.13.6",
+    "@orpc/openapi-client": "1.13.6",
+    "@orpc/tanstack-query": "1.13.6",
     "@remixicon/react": "4.7.0",
     "@sentry/react": "8.55.0",
     "@svgdotjs/svg.js": "3.2.5",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index b51d4ddd4d..338cae78ca 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -106,17 +106,17 @@ importers:
         specifier: 6.1.8
         version: 6.1.8
       '@orpc/client':
-        specifier: 1.13.4
-        version: 1.13.4
+        specifier: 1.13.6
+        version: 1.13.6
       '@orpc/contract':
-        specifier: 1.13.4
-        version: 1.13.4
+        specifier: 1.13.6
+        version: 1.13.6
       '@orpc/openapi-client':
-        specifier: 1.13.4
-        version: 1.13.4
+        specifier: 1.13.6
+        version: 1.13.6
       '@orpc/tanstack-query':
-        specifier: 1.13.4
-        version: 1.13.4(@orpc/client@1.13.4)(@tanstack/query-core@5.90.5)
+        specifier: 1.13.6
+        version: 1.13.6(@orpc/client@1.13.6)(@tanstack/query-core@5.90.5)
       '@remixicon/react':
         specifier: 4.7.0
         version: 4.7.0(react@19.2.4)
@@ -1942,36 +1942,36 @@ packages:
   '@open-draft/until@2.1.0':
     resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==}
 
-  '@orpc/client@1.13.4':
-    resolution: {integrity: sha512-s13GPMeoooJc5Th2EaYT5HMFtWG8S03DUVytYfJv8pIhP87RYKl94w52A36denH6r/B4LaAgBeC9nTAOslK+Og==}
+  '@orpc/client@1.13.6':
+    resolution: {integrity: sha512-M6lYM6fJUFp9GR+It/qglYTeXwspb6sGj46xXWHqHS6iDVquqju0bdYuLOfHx8CGJcUSzi0aKUcqMXiGJhBG3w==}
 
-  '@orpc/contract@1.13.4':
-    resolution: {integrity: sha512-TIxyaF67uOlihCRcasjHZxguZpbqfNK7aMrDLnhoufmQBE4OKvguNzmrOFHgsuM0OXoopX0Nuhun1ccaxKP10A==}
+  '@orpc/contract@1.13.6':
+    resolution: {integrity: sha512-wjnpKMsCBbUE7MxdS+9by1BIDTJ4vnfUk9he4GmxKQ8fvK/MRNHUR5jkNhsBCoLnigBrsAedHrr9AIqNgqquyQ==}
 
-  '@orpc/openapi-client@1.13.4':
-    resolution: {integrity: sha512-tRUcY4E6sgpS5bY/9nNES/Q/PMyYyPOsI4TuhwLhfgxOb0GFPwYKJ6Kif7KFNOhx4fkN/jTOfE1nuWuIZU1gyg==}
+  '@orpc/openapi-client@1.13.6':
+    resolution: {integrity: sha512-d1bAWpJSoK1HdVBPRmMlYCuqkR2nbdF3kztd7Xz2EsRdl5TRhNLqUJ+5CIfBZHuueicrpdBlwrOuLMmSlcGrew==}
 
-  '@orpc/shared@1.13.4':
-    resolution: {integrity: sha512-TYt9rLG/BUkNQBeQ6C1tEiHS/Seb8OojHgj9GlvqyjHJhMZx5qjsIyTW6RqLPZJ4U2vgK6x4Her36+tlFCKJug==}
+  '@orpc/shared@1.13.6':
+    resolution: {integrity: sha512-XqpXPgmtkg2tviDXZC13Y4a3B0D5r1yuG4Q2qPG3gM1dargxob6/aSIeKE6rs1tNXOoI+IpJaGV53EWWB+x+iA==}
     peerDependencies:
       '@opentelemetry/api': '>=1.9.0'
     peerDependenciesMeta:
       '@opentelemetry/api':
         optional: true
 
-  '@orpc/standard-server-fetch@1.13.4':
-    resolution: {integrity: sha512-/zmKwnuxfAXbppJpgr1CMnQX3ptPlYcDzLz1TaVzz9VG/Xg58Ov3YhabS2Oi1utLVhy5t4kaCppUducAvoKN+A==}
+  '@orpc/standard-server-fetch@1.13.6':
+    resolution: {integrity: sha512-O0bK4crjEOU9H4LzJ2abMjku3dvEhs8tcLXP/W5NXyH+Wm7qjBjDr6psxZ3YuaWdVbfd/P7CHtvw2rQDHJCNfQ==}
 
-  '@orpc/standard-server-peer@1.13.4':
-    resolution: {integrity: sha512-UfqnTLqevjCKUk4cmImOG8cQUwANpV1dp9e9u2O1ki6BRBsg/zlXFg6G2N6wP0zr9ayIiO1d2qJdH55yl/1BNw==}
+  '@orpc/standard-server-peer@1.13.6':
+    resolution: {integrity: sha512-WTqjNS6A9sxR4HVxWUb9ZoBHeQiesHeANmVBFdM/QjAaPUZYKn6WACYU6Q2eGmsCUeTQFfMssk0BG2EsgRNEYw==}
 
-  '@orpc/standard-server@1.13.4':
-    resolution: {integrity: sha512-ZOzgfVp6XUg+wVYw+gqesfRfGPtQbnBIrIiSnFMtZF+6ncmFJeF2Shc4RI2Guqc0Qz25juy8Ogo4tX3YqysOcg==}
+  '@orpc/standard-server@1.13.6':
+    resolution: {integrity: sha512-GNYZXCWxYLVHsxBWR+bg5F12vDCsQghqxbqoFpMnA4goe58dugNWmuxM+aSDbI0D81YxkKDULSqft5S+GWi5ww==}
 
-  '@orpc/tanstack-query@1.13.4':
-    resolution: {integrity: sha512-gCL/kh3kf6OUGKfXxSoOZpcX1jNYzxGfo/PkLQKX7ui4xiTbfWw3sCDF30sNS4I7yAOnBwDwJ3N2xzfkTftOBg==}
+  '@orpc/tanstack-query@1.13.6':
+    resolution: {integrity: sha512-OBseuArjkAobKtKLVdzpepiS0fhc0TzW0O0Jixt1gkhkCiWG1xK8z0gZ7daQ85UBXRIoI9SXzwXhl+HVP+j14w==}
     peerDependencies:
-      '@orpc/client': 1.13.4
+      '@orpc/client': 1.13.6
       '@tanstack/query-core': '>=5.80.2'
 
   '@ota-meshi/ast-token-store@0.3.0':
@@ -4580,6 +4580,10 @@ packages:
     resolution: {integrity: sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==}
     engines: {node: '>=10.13.0'}
 
+  enhanced-resolve@5.20.0:
+    resolution: {integrity: sha512-/ce7+jQ1PQ6rVXwe+jKEg5hW5ciicHwIQUagZkp6IufBoY3YDgdTTY1azVs0qoRgVmvsNB+rbjLJxDAeHHtwsQ==}
+    engines: {node: '>=10.13.0'}
+
   entities@4.5.0:
     resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
     engines: {node: '>=0.12'}
@@ -7361,8 +7365,8 @@ packages:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
 
-  type-fest@5.4.1:
-    resolution: {integrity: sha512-xygQcmneDyzsEuKZrFbRMne5HDqMs++aFzefrJTgEIKjQ3rekM+RPfFCVq2Gp1VIDqddoYeppCj4Pcb+RZW0GQ==}
+  type-fest@5.4.4:
+    resolution: {integrity: sha512-JnTrzGu+zPV3aXIUhnyWJj4z/wigMsdYajGLIYakqyOW1nPllzXEJee0QQbHj+CTIQtXGlAjuK0UY+2xTyjVAw==}
     engines: {node: '>=20'}
 
   typescript@5.9.3:
@@ -9466,62 +9470,62 @@ snapshots:
 
   '@open-draft/until@2.1.0': {}
 
-  '@orpc/client@1.13.4':
+  '@orpc/client@1.13.6':
     dependencies:
-      '@orpc/shared': 1.13.4
-      '@orpc/standard-server': 1.13.4
-      '@orpc/standard-server-fetch': 1.13.4
-      '@orpc/standard-server-peer': 1.13.4
+      '@orpc/shared': 1.13.6
+      '@orpc/standard-server': 1.13.6
+      '@orpc/standard-server-fetch': 1.13.6
+      '@orpc/standard-server-peer': 1.13.6
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/contract@1.13.4':
+  '@orpc/contract@1.13.6':
     dependencies:
-      '@orpc/client': 1.13.4
-      '@orpc/shared': 1.13.4
+      '@orpc/client': 1.13.6
+      '@orpc/shared': 1.13.6
       '@standard-schema/spec': 1.1.0
       openapi-types: 12.1.3
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/openapi-client@1.13.4':
+  '@orpc/openapi-client@1.13.6':
     dependencies:
-      '@orpc/client': 1.13.4
-      '@orpc/contract': 1.13.4
-      '@orpc/shared': 1.13.4
-      '@orpc/standard-server': 1.13.4
+      '@orpc/client': 1.13.6
+      '@orpc/contract': 1.13.6
+      '@orpc/shared': 1.13.6
+      '@orpc/standard-server': 1.13.6
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/shared@1.13.4':
+  '@orpc/shared@1.13.6':
     dependencies:
       radash: 12.1.1
-      type-fest: 5.4.1
+      type-fest: 5.4.4
 
-  '@orpc/standard-server-fetch@1.13.4':
+  '@orpc/standard-server-fetch@1.13.6':
     dependencies:
-      '@orpc/shared': 1.13.4
-      '@orpc/standard-server': 1.13.4
+      '@orpc/shared': 1.13.6
+      '@orpc/standard-server': 1.13.6
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/standard-server-peer@1.13.4':
+  '@orpc/standard-server-peer@1.13.6':
     dependencies:
-      '@orpc/shared': 1.13.4
-      '@orpc/standard-server': 1.13.4
+      '@orpc/shared': 1.13.6
+      '@orpc/standard-server': 1.13.6
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/standard-server@1.13.4':
+  '@orpc/standard-server@1.13.6':
     dependencies:
-      '@orpc/shared': 1.13.4
+      '@orpc/shared': 1.13.6
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/tanstack-query@1.13.4(@orpc/client@1.13.4)(@tanstack/query-core@5.90.5)':
+  '@orpc/tanstack-query@1.13.6(@orpc/client@1.13.6)(@tanstack/query-core@5.90.5)':
     dependencies:
-      '@orpc/client': 1.13.4
-      '@orpc/shared': 1.13.4
+      '@orpc/client': 1.13.6
+      '@orpc/shared': 1.13.6
       '@tanstack/query-core': 5.90.5
     transitivePeerDependencies:
       - '@opentelemetry/api'
@@ -12220,6 +12224,11 @@ snapshots:
       graceful-fs: 4.2.11
       tapable: 2.3.0
 
+  enhanced-resolve@5.20.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.3.0
+
   entities@4.5.0: {}
 
   entities@6.0.1: {}
@@ -12769,7 +12778,7 @@ snapshots:
     dependencies:
       acorn: 8.16.0
       acorn-jsx: 5.3.2(acorn@8.16.0)
-      eslint-visitor-keys: 5.0.0
+      eslint-visitor-keys: 5.0.1
 
   espree@11.1.1:
     dependencies:
@@ -15742,7 +15751,7 @@ snapshots:
     dependencies:
       prelude-ls: 1.2.1
 
-  type-fest@5.4.1:
+  type-fest@5.4.4:
     dependencies:
       tagged-tag: 1.0.0
 
@@ -16110,7 +16119,7 @@ snapshots:
       acorn-import-phases: 1.0.4(acorn@8.16.0)
       browserslist: 4.28.1
       chrome-trace-event: 1.0.4
-      enhanced-resolve: 5.19.0
+      enhanced-resolve: 5.20.0
       es-module-lexer: 2.0.0
       eslint-scope: 5.1.1
       events: 3.3.0

From c8688ec371ba7a8bedbffbef755b93d1436c6ec2 Mon Sep 17 00:00:00 2001
From: 99 <wh2099@pm.me>
Date: Tue, 3 Mar 2026 15:05:20 +0800
Subject: [PATCH 21/22] refactor(dify_graph): unify invoke and user enums
 source in workflow (#32873)

---
 api/.importlinter                             |  4 --
 api/core/app/apps/pipeline/pipeline_runner.py |  3 +-
 api/core/app/apps/workflow_app_runner.py      |  2 +-
 api/core/app/entities/app_invoke_entities.py  | 69 +------------------
 api/core/tools/tool_manager.py                |  5 +-
 api/core/workflow/workflow_entry.py           |  2 +-
 api/dify_graph/entities/graph_init_params.py  | 10 ++-
 api/dify_graph/enums.py                       | 33 +++++++++
 api/dify_graph/nodes/base/node.py             | 14 ++--
 .../nodes/human_input/human_input_node.py     |  3 +-
 .../nodes/iteration/iteration_node.py         |  4 +-
 .../knowledge_index/knowledge_index_node.py   |  3 +-
 api/dify_graph/nodes/loop/loop_node.py        |  4 +-
 api/models/__init__.py                        |  2 -
 api/models/enums.py                           |  5 --
 api/services/workflow_service.py              |  7 +-
 .../workflow/nodes/test_code.py               |  3 +-
 .../workflow/nodes/test_http.py               |  3 +-
 .../workflow/nodes/test_llm.py                |  3 +-
 .../nodes/test_parameter_extractor.py         |  3 +-
 .../workflow/nodes/test_template_transform.py |  3 +-
 .../workflow/nodes/test_tool.py               |  3 +-
 .../graph/test_graph_skip_validation.py       |  2 +-
 .../workflow/graph/test_graph_validation.py   |  3 +-
 .../graph_engine/test_auto_mock_system.py     |  4 +-
 .../graph_engine/test_command_system.py       |  2 +-
 .../test_mock_iteration_simple.py             |  6 +-
 .../workflow/graph_engine/test_mock_simple.py |  4 +-
 .../test_parallel_streaming_workflow.py       |  3 +-
 .../core/workflow/nodes/answer/test_answer.py |  3 +-
 .../http_request/test_http_request_node.py    |  3 +-
 .../test_human_input_form_filled_event.py     |  3 +-
 .../test_knowledge_index_node.py              |  3 +-
 .../test_knowledge_retrieval_node.py          |  3 +-
 .../core/workflow/nodes/llm/test_node.py      |  2 +-
 .../core/workflow/nodes/test_base_node.py     | 33 ++++++++-
 .../nodes/test_document_extractor_node.py     |  3 +-
 .../core/workflow/nodes/test_if_else.py       |  3 +-
 .../core/workflow/nodes/test_list_operator.py |  3 +-
 .../v1/test_variable_assigner_v1.py           |  2 +-
 .../v2/test_variable_assigner_v2.py           |  2 +-
 .../webhook/test_webhook_file_conversion.py   |  2 +-
 .../nodes/webhook/test_webhook_node.py        |  2 +-
 .../test_workflow_entry_redis_channel.py      |  2 +-
 44 files changed, 124 insertions(+), 157 deletions(-)

diff --git a/api/.importlinter b/api/.importlinter
index 10c3dbb82e..14c2b30101 100644
--- a/api/.importlinter
+++ b/api/.importlinter
@@ -119,9 +119,6 @@ ignore_imports =
     dify_graph.nodes.tool.tool_node -> core.tools.tool_manager
     dify_graph.nodes.agent.agent_node -> core.agent.entities
     dify_graph.nodes.agent.agent_node -> core.agent.plugin_entities
-    dify_graph.nodes.base.node -> core.app.entities.app_invoke_entities
-    dify_graph.nodes.human_input.human_input_node -> core.app.entities.app_invoke_entities
-    dify_graph.nodes.knowledge_index.knowledge_index_node -> core.app.entities.app_invoke_entities
     dify_graph.nodes.knowledge_retrieval.knowledge_retrieval_node -> core.app.app_config.entities
     dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.advanced_prompt_transform
     dify_graph.nodes.parameter_extractor.parameter_extractor_node -> core.prompt.simple_prompt_transform
@@ -159,7 +156,6 @@ ignore_imports =
     dify_graph.nodes.human_input.human_input_node -> extensions.ext_database
     dify_graph.nodes.human_input.human_input_node -> core.repositories.human_input_repository
     dify_graph.nodes.agent.agent_node -> models
-    dify_graph.nodes.base.node -> models.enums
     dify_graph.nodes.loop.loop_node -> core.app.workflow.layers.llm_quota
     dify_graph.nodes.llm.node -> models.model
     dify_graph.nodes.agent.agent_node -> services
diff --git a/api/core/app/apps/pipeline/pipeline_runner.py b/api/core/app/apps/pipeline/pipeline_runner.py
index b518e33eeb..748edb7956 100644
--- a/api/core/app/apps/pipeline/pipeline_runner.py
+++ b/api/core/app/apps/pipeline/pipeline_runner.py
@@ -13,7 +13,7 @@ from core.app.workflow.layers.persistence import PersistenceWorkflowInfo, Workfl
 from core.workflow.node_factory import DifyNodeFactory
 from core.workflow.workflow_entry import WorkflowEntry
 from dify_graph.entities.graph_init_params import GraphInitParams
-from dify_graph.enums import WorkflowType
+from dify_graph.enums import UserFrom, WorkflowType
 from dify_graph.graph import Graph
 from dify_graph.graph_events import GraphEngineEvent, GraphRunFailedEvent
 from dify_graph.repositories.workflow_execution_repository import WorkflowExecutionRepository
@@ -24,7 +24,6 @@ from dify_graph.variable_loader import VariableLoader
 from dify_graph.variables.variables import RAGPipelineVariable, RAGPipelineVariableInput
 from extensions.ext_database import db
 from models.dataset import Document, Pipeline
-from models.enums import UserFrom
 from models.model import EndUser
 from models.workflow import Workflow
 
diff --git a/api/core/app/apps/workflow_app_runner.py b/api/core/app/apps/workflow_app_runner.py
index 648c2829de..c5a00aa4ff 100644
--- a/api/core/app/apps/workflow_app_runner.py
+++ b/api/core/app/apps/workflow_app_runner.py
@@ -33,6 +33,7 @@ from core.workflow.node_factory import DifyNodeFactory
 from core.workflow.workflow_entry import WorkflowEntry
 from dify_graph.entities import GraphInitParams
 from dify_graph.entities.pause_reason import HumanInputRequired
+from dify_graph.enums import UserFrom
 from dify_graph.graph import Graph
 from dify_graph.graph_engine.layers.base import GraphEngineLayer
 from dify_graph.graph_events import (
@@ -67,7 +68,6 @@ from dify_graph.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from dify_graph.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
-from models.enums import UserFrom
 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 7fe6e0c72c..6ecca84425 100644
--- a/api/core/app/entities/app_invoke_entities.py
+++ b/api/core/app/entities/app_invoke_entities.py
@@ -1,5 +1,4 @@
 from collections.abc import Mapping, Sequence
-from enum import StrEnum
 from typing import TYPE_CHECKING, Any, Optional
 
 from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validator
@@ -7,6 +6,7 @@ from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validat
 from constants import UUID_NIL
 from core.app.app_config.entities import EasyUIBasedAppConfig, WorkflowUIBasedAppConfig
 from core.entities.provider_configuration import ProviderModelBundle
+from dify_graph.enums import InvokeFrom
 from dify_graph.file import File, FileUploadConfig
 from dify_graph.model_runtime.entities.model_entities import AIModelEntity
 
@@ -14,73 +14,6 @@ if TYPE_CHECKING:
     from core.ops.ops_trace_manager import TraceQueueManager
 
 
-class InvokeFrom(StrEnum):
-    """
-    Invoke From.
-    """
-
-    # SERVICE_API indicates that this invocation is from an API call to Dify app.
-    #
-    # Description of service api in Dify docs:
-    # https://docs.dify.ai/en/guides/application-publishing/developing-with-apis
-    SERVICE_API = "service-api"
-
-    # WEB_APP indicates that this invocation is from
-    # the web app of the workflow (or chatflow).
-    #
-    # Description of web app in Dify docs:
-    # https://docs.dify.ai/en/guides/application-publishing/launch-your-webapp-quickly/README
-    WEB_APP = "web-app"
-
-    # TRIGGER indicates that this invocation is from a trigger.
-    # this is used for plugin trigger and webhook trigger.
-    TRIGGER = "trigger"
-
-    # EXPLORE indicates that this invocation is from
-    # the workflow (or chatflow) explore page.
-    EXPLORE = "explore"
-    # DEBUGGER indicates that this invocation is from
-    # the workflow (or chatflow) edit page.
-    DEBUGGER = "debugger"
-    # PUBLISHED_PIPELINE indicates that this invocation runs a published RAG pipeline workflow.
-    PUBLISHED_PIPELINE = "published"
-
-    # VALIDATION indicates that this invocation is from validation.
-    VALIDATION = "validation"
-
-    @classmethod
-    def value_of(cls, value: str):
-        """
-        Get value of given mode.
-
-        :param value: mode value
-        :return: mode
-        """
-        for mode in cls:
-            if mode.value == value:
-                return mode
-        raise ValueError(f"invalid invoke from value {value}")
-
-    def to_source(self) -> str:
-        """
-        Get source of invoke from.
-
-        :return: source
-        """
-        if self == InvokeFrom.WEB_APP:
-            return "web_app"
-        elif self == InvokeFrom.DEBUGGER:
-            return "dev"
-        elif self == InvokeFrom.EXPLORE:
-            return "explore_app"
-        elif self == InvokeFrom.TRIGGER:
-            return "trigger"
-        elif self == InvokeFrom.SERVICE_API:
-            return "api"
-
-        return "dev"
-
-
 class ModelConfigWithCredentialsEntity(BaseModel):
     """
     Model Config With Credentials Entity.
diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py
index 323bb0584a..7f7787b92a 100644
--- a/api/core/tools/tool_manager.py
+++ b/api/core/tools/tool_manager.py
@@ -179,7 +179,6 @@ class ToolManager:
 
         :return: the tool
         """
-
         if provider_type == ToolProviderType.BUILT_IN:
             # check if the builtin tool need credentials
             provider_controller = cls.get_builtin_provider(provider_id, tenant_id)
@@ -628,9 +627,9 @@ class ToolManager:
             # MySQL: Use window function to achieve same result
             sql = """
                 SELECT id FROM (
-                    SELECT id, 
+                    SELECT id,
                            ROW_NUMBER() OVER (
-                               PARTITION BY tenant_id, provider 
+                               PARTITION BY tenant_id, provider
                                ORDER BY is_default DESC, created_at DESC
                            ) as rn
                     FROM tool_builtin_providers
diff --git a/api/core/workflow/workflow_entry.py b/api/core/workflow/workflow_entry.py
index 37e7b5fabe..6210a81c4e 100644
--- a/api/core/workflow/workflow_entry.py
+++ b/api/core/workflow/workflow_entry.py
@@ -12,6 +12,7 @@ from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.constants import ENVIRONMENT_VARIABLE_NODE_ID
 from dify_graph.entities import GraphInitParams
 from dify_graph.entities.graph_config import NodeConfigData, NodeConfigDict
+from dify_graph.enums import UserFrom
 from dify_graph.errors import WorkflowNodeRunFailedError
 from dify_graph.file.models import File
 from dify_graph.graph import Graph
@@ -28,7 +29,6 @@ from dify_graph.system_variable import SystemVariable
 from dify_graph.variable_loader import DUMMY_VARIABLE_LOADER, VariableLoader, load_into_variable_pool
 from extensions.otel.runtime import is_instrument_flag_enabled
 from factories import file_factory
-from models.enums import UserFrom
 from models.workflow import Workflow
 
 logger = logging.getLogger(__name__)
diff --git a/api/dify_graph/entities/graph_init_params.py b/api/dify_graph/entities/graph_init_params.py
index ff224a28d1..3712842aaf 100644
--- a/api/dify_graph/entities/graph_init_params.py
+++ b/api/dify_graph/entities/graph_init_params.py
@@ -3,6 +3,8 @@ from typing import Any
 
 from pydantic import BaseModel, Field
 
+from dify_graph.enums import InvokeFrom, UserFrom
+
 
 class GraphInitParams(BaseModel):
     """GraphInitParams encapsulates the configurations and contextual information
@@ -21,10 +23,6 @@ class GraphInitParams(BaseModel):
     workflow_id: str = Field(..., description="workflow id")
     graph_config: Mapping[str, Any] = Field(..., description="graph config")
     user_id: str = Field(..., description="user id")
-    user_from: str = Field(
-        ..., description="user from, account or end-user"
-    )  # Should be UserFrom enum: 'account' | 'end-user'
-    invoke_from: str = Field(
-        ..., description="invoke from, service-api, web-app, explore or debugger"
-    )  # Should be InvokeFrom enum: 'service-api' | 'web-app' | 'explore' | 'debugger'
+    user_from: UserFrom = Field(..., description="user from, account or end-user")
+    invoke_from: InvokeFrom = Field(..., description="invoke from, service-api, web-app, explore or debugger")
     call_depth: int = Field(..., description="call depth")
diff --git a/api/dify_graph/enums.py b/api/dify_graph/enums.py
index bb3b13e8c6..6c0593945e 100644
--- a/api/dify_graph/enums.py
+++ b/api/dify_graph/enums.py
@@ -33,6 +33,39 @@ class SystemVariableKey(StrEnum):
     INVOKE_FROM = "invoke_from"
 
 
+class UserFrom(StrEnum):
+    ACCOUNT = "account"
+    END_USER = "end-user"
+
+
+class InvokeFrom(StrEnum):
+    SERVICE_API = "service-api"
+    WEB_APP = "web-app"
+    TRIGGER = "trigger"
+    EXPLORE = "explore"
+    DEBUGGER = "debugger"
+    PUBLISHED_PIPELINE = "published"
+    VALIDATION = "validation"
+
+    @classmethod
+    def value_of(cls, value: str) -> "InvokeFrom":
+        return cls(value)
+
+    def to_source(self) -> str:
+        """Get source of invoke from.
+
+        :return: source
+        """
+        source_mapping = {
+            InvokeFrom.WEB_APP: "web_app",
+            InvokeFrom.DEBUGGER: "dev",
+            InvokeFrom.EXPLORE: "explore_app",
+            InvokeFrom.TRIGGER: "trigger",
+            InvokeFrom.SERVICE_API: "api",
+        }
+        return source_mapping.get(self, "dev")
+
+
 class NodeType(StrEnum):
     START = "start"
     END = "end"
diff --git a/api/dify_graph/nodes/base/node.py b/api/dify_graph/nodes/base/node.py
index bd8116c1ba..8eaf0b16b3 100644
--- a/api/dify_graph/nodes/base/node.py
+++ b/api/dify_graph/nodes/base/node.py
@@ -11,9 +11,14 @@ from types import MappingProxyType
 from typing import Any, ClassVar, Generic, TypeVar, cast, get_args, get_origin
 from uuid import uuid4
 
-from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities import AgentNodeStrategyInit, GraphInitParams
-from dify_graph.enums import ErrorStrategy, NodeExecutionType, NodeState, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.enums import (
+    ErrorStrategy,
+    NodeExecutionType,
+    NodeState,
+    NodeType,
+    WorkflowNodeExecutionStatus,
+)
 from dify_graph.graph_events import (
     GraphNodeEventBase,
     NodeRunAgentLogEvent,
@@ -55,7 +60,6 @@ from dify_graph.node_events import (
 )
 from dify_graph.runtime import GraphRuntimeState
 from libs.datetime_utils import naive_utc_now
-from models.enums import UserFrom
 
 from .entities import BaseNodeData, RetryConfig
 
@@ -229,8 +233,8 @@ class Node(Generic[NodeDataT]):
         self.workflow_id = graph_init_params.workflow_id
         self.graph_config = graph_init_params.graph_config
         self.user_id = graph_init_params.user_id
-        self.user_from = UserFrom(graph_init_params.user_from)
-        self.invoke_from = InvokeFrom(graph_init_params.invoke_from)
+        self.user_from = graph_init_params.user_from
+        self.invoke_from = graph_init_params.invoke_from
         self.workflow_call_depth = graph_init_params.call_depth
         self.graph_runtime_state = graph_runtime_state
         self.state: NodeState = NodeState.UNKNOWN  # node execution state
diff --git a/api/dify_graph/nodes/human_input/human_input_node.py b/api/dify_graph/nodes/human_input/human_input_node.py
index ec4a7c85f9..f41423f550 100644
--- a/api/dify_graph/nodes/human_input/human_input_node.py
+++ b/api/dify_graph/nodes/human_input/human_input_node.py
@@ -3,10 +3,9 @@ import logging
 from collections.abc import Generator, Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
-from core.app.entities.app_invoke_entities import InvokeFrom
 from core.repositories.human_input_repository import HumanInputFormRepositoryImpl
 from dify_graph.entities.pause_reason import HumanInputRequired
-from dify_graph.enums import NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
+from dify_graph.enums import InvokeFrom, NodeExecutionType, NodeType, WorkflowNodeExecutionStatus
 from dify_graph.node_events import (
     HumanInputFormFilledEvent,
     HumanInputFormTimeoutEvent,
diff --git a/api/dify_graph/nodes/iteration/iteration_node.py b/api/dify_graph/nodes/iteration/iteration_node.py
index 03d57e3f04..ed3634fa91 100644
--- a/api/dify_graph/nodes/iteration/iteration_node.py
+++ b/api/dify_graph/nodes/iteration/iteration_node.py
@@ -603,8 +603,8 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]):
             workflow_id=self.workflow_id,
             graph_config=self.graph_config,
             user_id=self.user_id,
-            user_from=self.user_from.value,
-            invoke_from=self.invoke_from.value,
+            user_from=self.user_from,
+            invoke_from=self.invoke_from,
             call_depth=self.workflow_call_depth,
         )
         # Create a deep copy of the variable pool for each iteration
diff --git a/api/dify_graph/nodes/knowledge_index/knowledge_index_node.py b/api/dify_graph/nodes/knowledge_index/knowledge_index_node.py
index e1e534911f..daf97d6ca9 100644
--- a/api/dify_graph/nodes/knowledge_index/knowledge_index_node.py
+++ b/api/dify_graph/nodes/knowledge_index/knowledge_index_node.py
@@ -2,9 +2,8 @@ import logging
 from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any
 
-from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
-from dify_graph.enums import NodeExecutionType, NodeType, SystemVariableKey
+from dify_graph.enums import InvokeFrom, NodeExecutionType, NodeType, SystemVariableKey
 from dify_graph.node_events import NodeRunResult
 from dify_graph.nodes.base.node import Node
 from dify_graph.nodes.base.template import Template
diff --git a/api/dify_graph/nodes/loop/loop_node.py b/api/dify_graph/nodes/loop/loop_node.py
index 6ae3b5220d..93a9b4d7eb 100644
--- a/api/dify_graph/nodes/loop/loop_node.py
+++ b/api/dify_graph/nodes/loop/loop_node.py
@@ -428,8 +428,8 @@ class LoopNode(LLMUsageTrackingMixin, Node[LoopNodeData]):
             workflow_id=self.workflow_id,
             graph_config=self.graph_config,
             user_id=self.user_id,
-            user_from=self.user_from.value,
-            invoke_from=self.invoke_from.value,
+            user_from=self.user_from,
+            invoke_from=self.invoke_from,
             call_depth=self.workflow_call_depth,
         )
 
diff --git a/api/models/__init__.py b/api/models/__init__.py
index 1d5d604ba7..fcae07f948 100644
--- a/api/models/__init__.py
+++ b/api/models/__init__.py
@@ -30,7 +30,6 @@ from .enums import (
     AppTriggerStatus,
     AppTriggerType,
     CreatorUserRole,
-    UserFrom,
     WorkflowRunTriggeredFrom,
     WorkflowTriggerStatus,
 )
@@ -204,7 +203,6 @@ __all__ = [
     "TriggerOAuthTenantClient",
     "TriggerSubscription",
     "UploadFile",
-    "UserFrom",
     "Whitelist",
     "Workflow",
     "WorkflowAppLog",
diff --git a/api/models/enums.py b/api/models/enums.py
index 86dcb00bcc..ed6236209f 100644
--- a/api/models/enums.py
+++ b/api/models/enums.py
@@ -8,11 +8,6 @@ class CreatorUserRole(StrEnum):
     END_USER = "end_user"
 
 
-class UserFrom(StrEnum):
-    ACCOUNT = "account"
-    END_USER = "end-user"
-
-
 class WorkflowRunTriggeredFrom(StrEnum):
     DEBUGGING = "debugging"
     APP_RUN = "app-run"  # webapp / service api
diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py
index a7f0b036c6..3ea38c3535 100644
--- a/api/services/workflow_service.py
+++ b/api/services/workflow_service.py
@@ -17,7 +17,7 @@ from core.repositories.human_input_repository import HumanInputFormRepositoryImp
 from core.workflow.workflow_entry import WorkflowEntry
 from dify_graph.entities import GraphInitParams, WorkflowNodeExecution
 from dify_graph.entities.pause_reason import HumanInputRequired
-from dify_graph.enums import ErrorStrategy, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from dify_graph.enums import ErrorStrategy, UserFrom, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from dify_graph.errors import WorkflowNodeRunFailedError
 from dify_graph.file import File
 from dify_graph.graph_events import GraphNodeEventBase, NodeRunFailedEvent, NodeRunSucceededEvent
@@ -49,7 +49,6 @@ from extensions.ext_storage import storage
 from factories.file_factory import build_from_mapping, build_from_mappings
 from libs.datetime_utils import naive_utc_now
 from models import Account
-from models.enums import UserFrom
 from models.human_input import HumanInputFormRecipient, RecipientType
 from models.model import App, AppMode
 from models.tools import WorkflowToolProvider
@@ -1069,8 +1068,8 @@ class WorkflowService:
             workflow_id=workflow.id,
             graph_config=workflow.graph_dict,
             user_id=account.id,
-            user_from=UserFrom.ACCOUNT.value,
-            invoke_from=InvokeFrom.DEBUGGER.value,
+            user_from=UserFrom.ACCOUNT,
+            invoke_from=InvokeFrom.DEBUGGER,
             call_depth=0,
         )
         graph_runtime_state = GraphRuntimeState(
diff --git a/api/tests/integration_tests/workflow/nodes/test_code.py b/api/tests/integration_tests/workflow/nodes/test_code.py
index c433e95b7a..9971e357d2 100644
--- a/api/tests/integration_tests/workflow/nodes/test_code.py
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py
@@ -7,14 +7,13 @@ from configs import dify_config
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.graph import Graph
 from dify_graph.node_events import NodeRunResult
 from dify_graph.nodes.code.code_node import CodeNode
 from dify_graph.nodes.code.limits import CodeNodeLimits
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
-from models.enums import UserFrom
 from tests.integration_tests.workflow.nodes.__mock.code_executor import setup_code_executor_mock
 
 CODE_MAX_STRING_LENGTH = dify_config.CODE_MAX_STRING_LENGTH
diff --git a/api/tests/integration_tests/workflow/nodes/test_http.py b/api/tests/integration_tests/workflow/nodes/test_http.py
index 31cdb655fa..6e7b3a573a 100644
--- a/api/tests/integration_tests/workflow/nodes/test_http.py
+++ b/api/tests/integration_tests/workflow/nodes/test_http.py
@@ -10,13 +10,12 @@ from core.helper.ssrf_proxy import ssrf_proxy
 from core.tools.tool_file_manager import ToolFileManager
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.file.file_manager import file_manager
 from dify_graph.graph import Graph
 from dify_graph.nodes.http_request import HttpRequestNode, HttpRequestNodeConfig
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
-from models.enums import UserFrom
 from tests.integration_tests.workflow.nodes.__mock.http import setup_http_mock
 
 HTTP_REQUEST_CONFIG = HttpRequestNodeConfig(
diff --git a/api/tests/integration_tests/workflow/nodes/test_llm.py b/api/tests/integration_tests/workflow/nodes/test_llm.py
index fda31d516b..cc83f0ea16 100644
--- a/api/tests/integration_tests/workflow/nodes/test_llm.py
+++ b/api/tests/integration_tests/workflow/nodes/test_llm.py
@@ -8,14 +8,13 @@ from core.app.entities.app_invoke_entities import InvokeFrom
 from core.llm_generator.output_parser.structured_output import _parse_structured_output
 from core.model_manager import ModelInstance
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.node_events import StreamCompletedEvent
 from dify_graph.nodes.llm.node import LLMNode
 from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from extensions.ext_database import db
-from models.enums import UserFrom
 
 """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 09e560578e..7310c40c50 100644
--- a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
+++ b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
@@ -6,14 +6,13 @@ from unittest.mock import MagicMock
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.model_manager import ModelInstance
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.model_runtime.entities import AssistantPromptMessage, UserPromptMessage
 from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
 from dify_graph.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from extensions.ext_database import db
-from models.enums import UserFrom
 from tests.integration_tests.workflow.nodes.__mock.model import get_mocked_fetch_model_instance
 
 """FOR MOCK FIXTURES, DO NOT REMOVE"""
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 a4f3a2c830..9b4274c667 100644
--- a/api/tests/integration_tests/workflow/nodes/test_template_transform.py
+++ b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
@@ -4,13 +4,12 @@ import uuid
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.graph import Graph
 from dify_graph.nodes.template_transform.template_renderer import TemplateRenderError
 from dify_graph.nodes.template_transform.template_transform_node import TemplateTransformNode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
-from models.enums import UserFrom
 
 
 class _SimpleJinja2Renderer:
diff --git a/api/tests/integration_tests/workflow/nodes/test_tool.py b/api/tests/integration_tests/workflow/nodes/test_tool.py
index 58a1137dda..fdc690e4cb 100644
--- a/api/tests/integration_tests/workflow/nodes/test_tool.py
+++ b/api/tests/integration_tests/workflow/nodes/test_tool.py
@@ -6,13 +6,12 @@ from core.app.entities.app_invoke_entities import InvokeFrom
 from core.tools.utils.configuration import ToolParameterConfigurationManager
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.graph import Graph
 from dify_graph.node_events import StreamCompletedEvent
 from dify_graph.nodes.tool.tool_node import ToolNode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
-from models.enums import UserFrom
 
 
 def init_tool_node(config: dict):
diff --git a/api/tests/unit_tests/core/workflow/graph/test_graph_skip_validation.py b/api/tests/unit_tests/core/workflow/graph/test_graph_skip_validation.py
index d2743cbbbe..d7d2258df8 100644
--- a/api/tests/unit_tests/core/workflow/graph/test_graph_skip_validation.py
+++ b/api/tests/unit_tests/core/workflow/graph/test_graph_skip_validation.py
@@ -7,12 +7,12 @@ import pytest
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
+from dify_graph.enums import UserFrom
 from dify_graph.graph import Graph
 from dify_graph.graph.validation import GraphValidationError
 from dify_graph.nodes import NodeType
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
-from models.enums import UserFrom
 
 
 def _build_iteration_graph(node_id: str) -> dict[str, Any]:
diff --git a/api/tests/unit_tests/core/workflow/graph/test_graph_validation.py b/api/tests/unit_tests/core/workflow/graph/test_graph_validation.py
index c9134c4543..d3ef971e6a 100644
--- a/api/tests/unit_tests/core/workflow/graph/test_graph_validation.py
+++ b/api/tests/unit_tests/core/workflow/graph/test_graph_validation.py
@@ -8,14 +8,13 @@ import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import ErrorStrategy, NodeExecutionType, NodeType
+from dify_graph.enums import ErrorStrategy, NodeExecutionType, NodeType, UserFrom
 from dify_graph.graph import Graph
 from dify_graph.graph.validation import GraphValidationError
 from dify_graph.nodes.base.entities import BaseNodeData
 from dify_graph.nodes.base.node import Node
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
-from models.enums import UserFrom
 
 
 class _TestNodeData(BaseNodeData):
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_auto_mock_system.py b/api/tests/unit_tests/core/workflow/graph_engine/test_auto_mock_system.py
index 244bb2315d..5196af277e 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_auto_mock_system.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_auto_mock_system.py
@@ -201,8 +201,8 @@ def test_mock_factory_node_type_detection():
     """Test that MockNodeFactory correctly identifies nodes to mock."""
     from core.app.entities.app_invoke_entities import InvokeFrom
     from dify_graph.entities import GraphInitParams
+    from dify_graph.enums import UserFrom
     from dify_graph.runtime import GraphRuntimeState, VariablePool
-    from models.enums import UserFrom
 
     from .test_mock_factory import MockNodeFactory
 
@@ -311,9 +311,9 @@ def test_register_custom_mock_node():
     """Test registering a custom mock implementation for a node type."""
     from core.app.entities.app_invoke_entities import InvokeFrom
     from dify_graph.entities import GraphInitParams
+    from dify_graph.enums import UserFrom
     from dify_graph.nodes.template_transform import TemplateTransformNode
     from dify_graph.runtime import GraphRuntimeState, VariablePool
-    from models.enums import UserFrom
 
     from .test_mock_factory import MockNodeFactory
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_command_system.py b/api/tests/unit_tests/core/workflow/graph_engine/test_command_system.py
index 02ca827d6d..09fc412e7f 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_command_system.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_command_system.py
@@ -6,6 +6,7 @@ from unittest.mock import MagicMock
 from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities.graph_init_params import GraphInitParams
 from dify_graph.entities.pause_reason import SchedulingPause
+from dify_graph.enums import UserFrom
 from dify_graph.graph import Graph
 from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
 from dify_graph.graph_engine.command_channels import InMemoryChannel
@@ -20,7 +21,6 @@ from dify_graph.graph_events import GraphRunAbortedEvent, GraphRunPausedEvent, G
 from dify_graph.nodes.start.start_node import StartNode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.variables import IntegerVariable, StringVariable
-from models.enums import UserFrom
 
 
 def test_abort_command():
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_iteration_simple.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_iteration_simple.py
index 95bf4bff60..da666ce987 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_iteration_simple.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_iteration_simple.py
@@ -18,8 +18,8 @@ def test_mock_factory_registers_iteration_node():
     """Test that MockNodeFactory has iteration node registered."""
     from core.app.entities.app_invoke_entities import InvokeFrom
     from dify_graph.entities import GraphInitParams
+    from dify_graph.enums import UserFrom
     from dify_graph.runtime import GraphRuntimeState, VariablePool
-    from models.enums import UserFrom
 
     # Create a MockNodeFactory instance
     graph_init_params = GraphInitParams(
@@ -67,8 +67,8 @@ def test_mock_iteration_node_preserves_config():
 
     from core.app.entities.app_invoke_entities import InvokeFrom
     from dify_graph.entities import GraphInitParams
+    from dify_graph.enums import UserFrom
     from dify_graph.runtime import GraphRuntimeState, VariablePool
-    from models.enums import UserFrom
     from tests.unit_tests.core.workflow.graph_engine.test_mock_nodes import MockIterationNode
 
     # Create mock config
@@ -129,8 +129,8 @@ def test_mock_loop_node_preserves_config():
 
     from core.app.entities.app_invoke_entities import InvokeFrom
     from dify_graph.entities import GraphInitParams
+    from dify_graph.enums import UserFrom
     from dify_graph.runtime import GraphRuntimeState, VariablePool
-    from models.enums import UserFrom
     from tests.unit_tests.core.workflow.graph_engine.test_mock_nodes import MockLoopNode
 
     # Create mock config
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_simple.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_simple.py
index 975a48705a..2376423738 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_simple.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_simple.py
@@ -103,8 +103,8 @@ def test_mock_factory_detection():
     """Test MockNodeFactory node type detection."""
     from core.app.entities.app_invoke_entities import InvokeFrom
     from dify_graph.entities import GraphInitParams
+    from dify_graph.enums import UserFrom
     from dify_graph.runtime import GraphRuntimeState, VariablePool
-    from models.enums import UserFrom
 
     print("Testing MockNodeFactory detection...")
 
@@ -156,8 +156,8 @@ def test_mock_factory_registration():
     """Test registering and unregistering mock node types."""
     from core.app.entities.app_invoke_entities import InvokeFrom
     from dify_graph.entities import GraphInitParams
+    from dify_graph.enums import UserFrom
     from dify_graph.runtime import GraphRuntimeState, VariablePool
-    from models.enums import UserFrom
 
     print("Testing MockNodeFactory registration...")
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_streaming_workflow.py b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_streaming_workflow.py
index 1f456175e9..8e6b30896f 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_streaming_workflow.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_streaming_workflow.py
@@ -16,7 +16,7 @@ from core.app.entities.app_invoke_entities import InvokeFrom
 from core.model_manager import ModelInstance
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.enums import NodeType, UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.graph import Graph
 from dify_graph.graph_engine import GraphEngine, GraphEngineConfig
 from dify_graph.graph_engine.command_channels import InMemoryChannel
@@ -30,7 +30,6 @@ from dify_graph.node_events import NodeRunResult, StreamCompletedEvent
 from dify_graph.nodes.llm.node import LLMNode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
-from models.enums import UserFrom
 
 from .test_table_runner import TableTestRunner
 
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 842b9e2178..b1351c9fc3 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
@@ -5,13 +5,12 @@ from unittest.mock import MagicMock
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.graph import Graph
 from dify_graph.nodes.answer.answer_node import AnswerNode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from extensions.ext_database import db
-from models.enums import UserFrom
 
 
 def test_execute_answer():
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 8ca973bf9b..38e68dcdc9 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
@@ -8,13 +8,12 @@ from core.app.entities.app_invoke_entities import InvokeFrom
 from core.helper.ssrf_proxy import ssrf_proxy
 from core.tools.tool_file_manager import ToolFileManager
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.file.file_manager import file_manager
 from dify_graph.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
 from dify_graph.nodes.http_request.entities import HttpRequestNodeTimeout, Response
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
-from models.enums import UserFrom
 
 HTTP_REQUEST_CONFIG = HttpRequestNodeConfig(
     max_connect_timeout=10,
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 1472cdec36..46b4f1ed37 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
@@ -3,7 +3,7 @@ from types import SimpleNamespace
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities.graph_init_params import GraphInitParams
-from dify_graph.enums import NodeType
+from dify_graph.enums import NodeType, UserFrom
 from dify_graph.graph_events import (
     NodeRunHumanInputFormFilledEvent,
     NodeRunHumanInputFormTimeoutEvent,
@@ -14,7 +14,6 @@ from dify_graph.nodes.human_input.human_input_node import HumanInputNode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from libs.datetime_utils import naive_utc_now
-from models.enums import UserFrom
 
 
 class _FakeFormRepository:
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 83a5db2fae..ffb9c0a43f 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
@@ -6,7 +6,7 @@ import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import SystemVariableKey, WorkflowNodeExecutionStatus
+from dify_graph.enums import SystemVariableKey, UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.nodes.knowledge_index.entities import KnowledgeIndexNodeData
 from dify_graph.nodes.knowledge_index.exc import KnowledgeIndexNodeError
 from dify_graph.nodes.knowledge_index.knowledge_index_node import KnowledgeIndexNode
@@ -15,7 +15,6 @@ from dify_graph.repositories.summary_index_service_protocol import SummaryIndexS
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from dify_graph.variables.segments import StringSegment
-from models.enums import UserFrom
 
 
 @pytest.fixture
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 98246ccb2f..45a4316ead 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
@@ -6,7 +6,7 @@ import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.model_runtime.entities.llm_entities import LLMUsage
 from dify_graph.nodes.knowledge_retrieval.entities import (
     KnowledgeRetrievalNodeData,
@@ -20,7 +20,6 @@ from dify_graph.repositories.rag_retrieval_protocol import RAGRetrievalProtocol,
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from dify_graph.variables import StringSegment
-from models.enums import UserFrom
 
 
 @pytest.fixture
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 18ec3c0dc4..b822f1fbe4 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
@@ -12,6 +12,7 @@ from core.entities.provider_entities import CustomConfiguration, SystemConfigura
 from core.model_manager import ModelInstance
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
 from dify_graph.entities import GraphInitParams
+from dify_graph.enums import UserFrom
 from dify_graph.file import File, FileTransferMethod, FileType
 from dify_graph.model_runtime.entities.common_entities import I18nObject
 from dify_graph.model_runtime.entities.message_entities import (
@@ -39,7 +40,6 @@ from dify_graph.nodes.llm.protocols import CredentialsProvider, ModelFactory
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from dify_graph.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment
-from models.enums import UserFrom
 from models.provider import ProviderType
 
 
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 d5e0a3ce2e..ff9247059b 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
@@ -2,8 +2,9 @@ from collections.abc import Mapping
 
 import pytest
 
+from core.app.entities.app_invoke_entities import InvokeFrom as LegacyInvokeFrom
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import NodeType
+from dify_graph.enums import InvokeFrom, NodeType, UserFrom
 from dify_graph.nodes.base.entities import BaseNodeData
 from dify_graph.nodes.base.node import Node
 from dify_graph.runtime import GraphRuntimeState, VariablePool
@@ -56,6 +57,36 @@ def test_node_hydrates_data_during_initialization():
 
     assert node.node_data.foo == "bar"
     assert node.title == "Sample"
+    assert node.user_from == UserFrom.ACCOUNT
+    assert node.invoke_from == InvokeFrom.DEBUGGER
+
+
+def test_node_normalizes_legacy_invoke_from_enum():
+    graph_config: dict[str, object] = {}
+    init_params = GraphInitParams(
+        tenant_id="tenant",
+        app_id="app",
+        workflow_id="workflow",
+        graph_config=graph_config,
+        user_id="user",
+        user_from=UserFrom.ACCOUNT,
+        invoke_from=LegacyInvokeFrom.DEBUGGER,
+        call_depth=0,
+    )
+    runtime_state = GraphRuntimeState(
+        variable_pool=VariablePool(system_variables=SystemVariable(user_id="user", files=[]), user_inputs={}),
+        start_at=0.0,
+    )
+
+    node = _SampleNode(
+        id="node-1",
+        config={"id": "node-1", "data": {"title": "Sample", "foo": "bar"}},
+        graph_init_params=init_params,
+        graph_runtime_state=runtime_state,
+    )
+
+    assert node.user_from == UserFrom.ACCOUNT
+    assert node.invoke_from == InvokeFrom.DEBUGGER
 
 
 def test_missing_generic_argument_raises_type_error():
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 b6169cd735..a74bdd8837 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
@@ -7,7 +7,7 @@ from docx.oxml.text.paragraph import CT_P
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
+from dify_graph.enums import NodeType, UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.file import File, FileTransferMethod
 from dify_graph.node_events import NodeRunResult
 from dify_graph.nodes.document_extractor import DocumentExtractorNode, DocumentExtractorNodeData
@@ -20,7 +20,6 @@ from dify_graph.nodes.document_extractor.node import (
 from dify_graph.variables import ArrayFileSegment
 from dify_graph.variables.segments import ArrayStringSegment
 from dify_graph.variables.variables import StringVariable
-from models.enums import UserFrom
 
 
 @pytest.fixture
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 c90550b460..23b96e7b25 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
@@ -7,7 +7,7 @@ import pytest
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.file import File, FileTransferMethod, FileType
 from dify_graph.graph import Graph
 from dify_graph.nodes.if_else.entities import IfElseNodeData
@@ -17,7 +17,6 @@ from dify_graph.system_variable import SystemVariable
 from dify_graph.utils.condition.entities import Condition, SubCondition, SubVariableCondition
 from dify_graph.variables import ArrayFileSegment
 from extensions.ext_database import db
-from models.enums import UserFrom
 
 
 def test_execute_if_else_result_true():
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 8242f1d848..4c43f63c74 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
@@ -3,7 +3,7 @@ from unittest.mock import MagicMock
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from dify_graph.enums import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom, WorkflowNodeExecutionStatus
 from dify_graph.file import File, FileTransferMethod, FileType
 from dify_graph.nodes.list_operator.entities import (
     ExtractConfig,
@@ -17,7 +17,6 @@ from dify_graph.nodes.list_operator.entities import (
 from dify_graph.nodes.list_operator.exc import InvalidKeyError
 from dify_graph.nodes.list_operator.node import ListOperatorNode, _get_file_extract_string_func
 from dify_graph.variables import ArrayFileSegment
-from models.enums import UserFrom
 
 
 @pytest.fixture
diff --git a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
index 182172cb9c..d5a593ffab 100644
--- a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
+++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
@@ -5,6 +5,7 @@ from uuid import uuid4
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
+from dify_graph.enums import UserFrom
 from dify_graph.graph import Graph
 from dify_graph.graph_events.node import NodeRunSucceededEvent
 from dify_graph.nodes.variable_assigner.common import helpers as common_helpers
@@ -13,7 +14,6 @@ from dify_graph.nodes.variable_assigner.v1.node_data import WriteMode
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from dify_graph.variables import ArrayStringVariable, StringVariable
-from models.enums import UserFrom
 
 DEFAULT_NODE_ID = "node_id"
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py
index 10eed1786f..ef816b9ddc 100644
--- a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py
+++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_variable_assigner_v2.py
@@ -5,13 +5,13 @@ from uuid import uuid4
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.node_factory import DifyNodeFactory
 from dify_graph.entities import GraphInitParams
+from dify_graph.enums import UserFrom
 from dify_graph.graph import Graph
 from dify_graph.nodes.variable_assigner.v2 import VariableAssignerNode
 from dify_graph.nodes.variable_assigner.v2.enums import InputType, Operation
 from dify_graph.runtime import GraphRuntimeState, VariablePool
 from dify_graph.system_variable import SystemVariable
 from dify_graph.variables import ArrayStringVariable
-from models.enums import UserFrom
 
 DEFAULT_NODE_ID = "node_id"
 
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 8aeaf1707c..5c89ba7d34 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
@@ -11,6 +11,7 @@ from unittest.mock import Mock, patch
 from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities.graph_init_params import GraphInitParams
 from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom
 from dify_graph.nodes.trigger_webhook.entities import (
     ContentType,
     Method,
@@ -21,7 +22,6 @@ from dify_graph.nodes.trigger_webhook.node import TriggerWebhookNode
 from dify_graph.runtime.graph_runtime_state import GraphRuntimeState
 from dify_graph.runtime.variable_pool import VariablePool
 from dify_graph.system_variable import SystemVariable
-from models.enums import UserFrom
 from models.workflow import WorkflowType
 
 
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 a6548ffc27..066ec5542d 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
@@ -5,6 +5,7 @@ import pytest
 from core.app.entities.app_invoke_entities import InvokeFrom
 from dify_graph.entities.graph_init_params import GraphInitParams
 from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from dify_graph.enums import UserFrom
 from dify_graph.file import File, FileTransferMethod, FileType
 from dify_graph.nodes.trigger_webhook.entities import (
     ContentType,
@@ -18,7 +19,6 @@ from dify_graph.runtime.graph_runtime_state import GraphRuntimeState
 from dify_graph.runtime.variable_pool import VariablePool
 from dify_graph.system_variable import SystemVariable
 from dify_graph.variables import FileVariable, StringVariable
-from models.enums import UserFrom
 from models.workflow import WorkflowType
 
 
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 3437e585e7..31644edcd8 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
@@ -4,9 +4,9 @@ from unittest.mock import MagicMock, patch
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.workflow.workflow_entry import WorkflowEntry
+from dify_graph.enums import UserFrom
 from dify_graph.graph_engine.command_channels.redis_channel import RedisChannel
 from dify_graph.runtime import GraphRuntimeState, VariablePool
-from models.enums import UserFrom
 
 
 class TestWorkflowEntryRedisChannel:

From 2068640a4b0461859dc9db5e9122fad4d32d1845 Mon Sep 17 00:00:00 2001
From: FFXN <31929997+FFXN@users.noreply.github.com>
Date: Tue, 3 Mar 2026 15:54:43 +0800
Subject: [PATCH 22/22] fix: Add the missing validation of doc_form in the
 service API. (#32892)

---
 api/controllers/console/datasets/datasets.py     | 16 ++++++++++++++++
 api/controllers/service_api/dataset/document.py  | 16 +++++++++++++++-
 api/models/dataset.py                            |  2 ++
 .../knowledge_entities/knowledge_entities.py     | 15 ++++++++++++++-
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.py
index 45def1ae62..54303b2482 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -119,6 +119,14 @@ def _validate_indexing_technique(value: str | None) -> str | None:
     return value
 
 
+def _validate_doc_form(value: str | None) -> str | None:
+    if value is None:
+        return value
+    if value not in Dataset.DOC_FORM_LIST:
+        raise ValueError("Invalid doc_form.")
+    return value
+
+
 class DatasetCreatePayload(BaseModel):
     name: str = Field(..., min_length=1, max_length=40)
     description: str = Field("", max_length=400)
@@ -179,6 +187,14 @@ class IndexingEstimatePayload(BaseModel):
             raise ValueError("indexing_technique is required.")
         return result
 
+    @field_validator("doc_form")
+    @classmethod
+    def validate_doc_form(cls, value: str) -> str:
+        result = _validate_doc_form(value)
+        if result is None:
+            return "text_model"
+        return result
+
 
 class ConsoleDatasetListQuery(BaseModel):
     page: int = Field(default=1, description="Page number")
diff --git a/api/controllers/service_api/dataset/document.py b/api/controllers/service_api/dataset/document.py
index 0aeb4a2d36..dc8da025d4 100644
--- a/api/controllers/service_api/dataset/document.py
+++ b/api/controllers/service_api/dataset/document.py
@@ -4,7 +4,7 @@ from uuid import UUID
 
 from flask import request
 from flask_restx import marshal
-from pydantic import BaseModel, Field, model_validator
+from pydantic import BaseModel, Field, field_validator, model_validator
 from sqlalchemy import desc, select
 from werkzeug.exceptions import Forbidden, NotFound
 
@@ -60,6 +60,13 @@ class DocumentTextCreatePayload(BaseModel):
     embedding_model: str | None = None
     embedding_model_provider: str | None = None
 
+    @field_validator("doc_form")
+    @classmethod
+    def validate_doc_form(cls, value: str) -> str:
+        if value not in Dataset.DOC_FORM_LIST:
+            raise ValueError("Invalid doc_form.")
+        return value
+
 
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 
@@ -72,6 +79,13 @@ class DocumentTextUpdate(BaseModel):
     doc_language: str = "English"
     retrieval_model: RetrievalModel | None = None
 
+    @field_validator("doc_form")
+    @classmethod
+    def validate_doc_form(cls, value: str) -> str:
+        if value not in Dataset.DOC_FORM_LIST:
+            raise ValueError("Invalid doc_form.")
+        return value
+
     @model_validator(mode="after")
     def check_text_and_name(self) -> Self:
         if self.text is not None and self.name is None:
diff --git a/api/models/dataset.py b/api/models/dataset.py
index e7da2961bc..4ef39fcde1 100644
--- a/api/models/dataset.py
+++ b/api/models/dataset.py
@@ -19,6 +19,7 @@ from sqlalchemy.orm import Mapped, Session, mapped_column
 
 from configs import dify_config
 from core.rag.index_processor.constant.built_in_field import BuiltInField, MetadataDataSource
+from core.rag.index_processor.constant.index_type import IndexStructureType
 from core.rag.index_processor.constant.query_type import QueryType
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from core.tools.signature import sign_upload_file
@@ -51,6 +52,7 @@ class Dataset(Base):
 
     INDEXING_TECHNIQUE_LIST = ["high_quality", "economy", None]
     PROVIDER_LIST = ["vendor", "external", None]
+    DOC_FORM_LIST = [member.value for member in IndexStructureType]
 
     id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
     tenant_id: Mapped[str] = mapped_column(StringUUID)
diff --git a/api/services/entities/knowledge_entities/knowledge_entities.py b/api/services/entities/knowledge_entities/knowledge_entities.py
index 8dc5b93501..66309f0e59 100644
--- a/api/services/entities/knowledge_entities/knowledge_entities.py
+++ b/api/services/entities/knowledge_entities/knowledge_entities.py
@@ -1,8 +1,9 @@
 from enum import StrEnum
 from typing import Literal
 
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator
 
+from core.rag.index_processor.constant.index_type import IndexStructureType
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 
 
@@ -127,6 +128,18 @@ class KnowledgeConfig(BaseModel):
     name: str | None = None
     is_multimodal: bool = False
 
+    @field_validator("doc_form")
+    @classmethod
+    def validate_doc_form(cls, value: str) -> str:
+        valid_forms = [
+            IndexStructureType.PARAGRAPH_INDEX,
+            IndexStructureType.QA_INDEX,
+            IndexStructureType.PARENT_CHILD_INDEX,
+        ]
+        if value not in valid_forms:
+            raise ValueError("Invalid doc_form.")
+        return value
+
 
 class SegmentCreateArgs(BaseModel):
     content: str | None = None