refactor(llm node): tool call tool result entity

api/core/app/apps/advanced_chat/generate_task_pipeline.py

@@ -516,6 +516,14 @@ class AdvancedChatAppGenerateTaskPipeline(GraphRuntimeStateSupport):
         if tts_publisher and queue_message:
             tts_publisher.publish(queue_message)
 
+        tool_call = event.tool_call
+        tool_result = event.tool_result
+        tool_payload = tool_call or tool_result
+        tool_call_id = tool_payload.id if tool_payload and tool_payload.id else ""
+        tool_name = tool_payload.name if tool_payload and tool_payload.name else ""
+        tool_arguments = tool_call.arguments if tool_call and tool_call.arguments else ""
+        tool_files = tool_result.files if tool_result else []
+
         # Record stream event based on chunk type
         chunk_type = event.chunk_type or ChunkType.TEXT
         match chunk_type:
@@ -525,13 +533,13 @@ class AdvancedChatAppGenerateTaskPipeline(GraphRuntimeStateSupport):
                 self._stream_buffer.record_thought_chunk(delta_text)
             case ChunkType.TOOL_CALL:
                 self._stream_buffer.record_tool_call(
-                    tool_call_id=event.tool_call_id or "",
-                    tool_name=event.tool_name or "",
-                    tool_arguments=event.tool_arguments or "",
+                    tool_call_id=tool_call_id,
+                    tool_name=tool_name,
+                    tool_arguments=tool_arguments,
                 )
             case ChunkType.TOOL_RESULT:
                 self._stream_buffer.record_tool_result(
-                    tool_call_id=event.tool_call_id or "",
+                    tool_call_id=tool_call_id,
                     result=delta_text,
                 )
 
@@ -541,11 +549,10 @@ class AdvancedChatAppGenerateTaskPipeline(GraphRuntimeStateSupport):
             message_id=self._message_id,
             from_variable_selector=event.from_variable_selector,
             chunk_type=event.chunk_type.value if event.chunk_type else None,
-            tool_call_id=event.tool_call_id,
-            tool_name=event.tool_name,
-            tool_arguments=event.tool_arguments,
-            tool_files=event.tool_files,
-            tool_error=event.tool_error,
+            tool_call_id=tool_call_id or None,
+            tool_name=tool_name or None,
+            tool_arguments=tool_arguments or None,
+            tool_files=tool_files,
         )
 
     def _handle_iteration_start_event(

api/core/app/apps/workflow/generate_task_pipeline.py

@@ -484,6 +484,14 @@ class WorkflowAppGenerateTaskPipeline(GraphRuntimeStateSupport):
         if delta_text is None:
             return
 
+        tool_call = event.tool_call
+        tool_result = event.tool_result
+        tool_payload = tool_call or tool_result
+        tool_call_id = tool_payload.id if tool_payload and tool_payload.id else None
+        tool_name = tool_payload.name if tool_payload and tool_payload.name else None
+        tool_arguments = tool_call.arguments if tool_call else None
+        tool_files = tool_result.files if tool_result else []
+
         # only publish tts message at text chunk streaming
         if tts_publisher and queue_message:
             tts_publisher.publish(queue_message)
@@ -492,11 +500,10 @@ class WorkflowAppGenerateTaskPipeline(GraphRuntimeStateSupport):
             text=delta_text,
             from_variable_selector=event.from_variable_selector,
             chunk_type=event.chunk_type,
-            tool_call_id=event.tool_call_id,
-            tool_name=event.tool_name,
-            tool_arguments=event.tool_arguments,
-            tool_files=event.tool_files,
-            tool_error=event.tool_error,
+            tool_call_id=tool_call_id,
+            tool_name=tool_name,
+            tool_arguments=tool_arguments,
+            tool_files=tool_files,
         )
 
     def _handle_agent_log_event(self, event: QueueAgentLogEvent, **kwargs) -> Generator[StreamResponse, None, None]:

api/core/app/apps/workflow_app_runner.py

@@ -464,11 +464,8 @@ class WorkflowBasedAppRunner:
                     in_iteration_id=event.in_iteration_id,
                     in_loop_id=event.in_loop_id,
                     chunk_type=QueueChunkType(event.chunk_type.value),
-                    tool_call_id=event.tool_call_id,
-                    tool_name=event.tool_name,
-                    tool_arguments=event.tool_arguments,
-                    tool_files=event.tool_files,
-                    tool_error=event.tool_error,
+                    tool_call=event.tool_call,
+                    tool_result=event.tool_result,
                 )
             )
         elif isinstance(event, NodeRunRetrieverResourceEvent):

api/core/app/entities/queue_entities.py

@@ -9,6 +9,7 @@ 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.enums import WorkflowNodeExecutionMetadataKey
+from core.workflow.graph_events import ToolCall, ToolResult
 from core.workflow.nodes import NodeType
 
 
@@ -204,19 +205,11 @@ class QueueTextChunkEvent(AppQueueEvent):
     chunk_type: ChunkType = ChunkType.TEXT
     """type of the chunk"""
 
-    # Tool call fields (when chunk_type == TOOL_CALL)
-    tool_call_id: str | None = None
-    """unique identifier for this tool call"""
-    tool_name: str | None = None
-    """name of the tool being called"""
-    tool_arguments: str | None = None
-    """accumulated tool arguments JSON"""
-
-    # Tool result fields (when chunk_type == TOOL_RESULT)
-    tool_files: list[str] = Field(default_factory=list)
-    """file IDs produced by tool"""
-    tool_error: str | None = None
-    """error message if tool failed"""
+    # Tool streaming payloads
+    tool_call: ToolCall | None = None
+    """structured tool call info"""
+    tool_result: ToolResult | None = None
+    """structured tool result info"""
 
 
 class QueueAgentMessageEvent(AppQueueEvent):