diff --git a/api/core/workflow/nodes/base/node.py b/api/core/workflow/nodes/base/node.py
index 40feda8b57..302d77d625 100644
--- a/api/core/workflow/nodes/base/node.py
+++ b/api/core/workflow/nodes/base/node.py
@@ -577,8 +577,8 @@ class Node(Generic[NodeDataT]):
 
     @_dispatch.register
     def _(self, event: ToolResultChunkEvent) -> NodeRunStreamChunkEvent:
-        from core.workflow.entities import ToolResult
-        from core.workflow.graph_events import ChunkType, ToolResultStatus
+        from core.workflow.entities import ToolResult, ToolResultStatus
+        from core.workflow.graph_events import ChunkType
 
         tool_result = event.tool_result
         status: ToolResultStatus = (
diff --git a/api/migrations/versions/2025_12_10_1617-85c8b4a64f53_add_llm_generation_detail_table.py b/api/migrations/versions/2025_12_17_1617-85c8b4a64f53_add_llm_generation_detail_table.py
similarity index 98%
rename from api/migrations/versions/2025_12_10_1617-85c8b4a64f53_add_llm_generation_detail_table.py
rename to api/migrations/versions/2025_12_17_1617-85c8b4a64f53_add_llm_generation_detail_table.py
index 700f9ea80b..60786a720c 100644
--- a/api/migrations/versions/2025_12_10_1617-85c8b4a64f53_add_llm_generation_detail_table.py
+++ b/api/migrations/versions/2025_12_17_1617-85c8b4a64f53_add_llm_generation_detail_table.py
@@ -12,7 +12,7 @@ from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = '85c8b4a64f53'
-down_revision = 'd57accd375ae'
+down_revision = '03ea244985ce'
 branch_labels = None
 depends_on = None
 
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_response_coordinator.py b/api/tests/unit_tests/core/workflow/graph_engine/test_response_coordinator.py
index 8e0eba71cc..c6b3797ce2 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_response_coordinator.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_response_coordinator.py
@@ -2,9 +2,9 @@
 
 from unittest.mock import MagicMock
 
-from core.workflow.entities import ToolResultStatus
+from core.workflow.entities.tool_entities import ToolResultStatus
 from core.workflow.enums import NodeType
-from core.workflow.graph import Graph
+from core.workflow.graph.graph import Graph
 from core.workflow.graph_engine.response_coordinator.coordinator import ResponseStreamCoordinator
 from core.workflow.graph_events import (
     ChunkType,