diff --git a/typescript-sdk/integrations/langgraph/python/ag_ui_langgraph/agent.py b/typescript-sdk/integrations/langgraph/python/ag_ui_langgraph/agent.py
index 916b65558..5a8a9d60a 100644
--- a/typescript-sdk/integrations/langgraph/python/ag_ui_langgraph/agent.py
+++ b/typescript-sdk/integrations/langgraph/python/ag_ui_langgraph/agent.py
@@ -113,6 +113,7 @@ async def _handle_stream_events(self, input: RunAgentInput) -> AsyncGenerator[st
             "thread_id": thread_id,
             "thinking_process": None,
             "node_name": None,
+            "has_function_streaming": False,
         }
         self.active_run = INITIAL_ACTIVE_RUN
 
@@ -485,6 +486,9 @@ async def _handle_single_event(self, event: Any, state: State) -> AsyncGenerator
             is_tool_call_args_event = has_current_stream and current_stream.get("tool_call_id") and tool_call_data and tool_call_data.get("args")
             is_tool_call_end_event = has_current_stream and current_stream.get("tool_call_id") and not tool_call_data
 
+            if is_tool_call_start_event or is_tool_call_end_event or is_tool_call_args_event:
+                self.active_run["has_function_streaming"] = True
+
             reasoning_data = resolve_reasoning_content(event["data"]["chunk"]) if event["data"]["chunk"] else None
             message_content = resolve_message_content(event["data"]["chunk"].content) if event["data"]["chunk"] and event["data"]["chunk"].content else None
             is_message_content_event = tool_call_data is None and message_content
@@ -649,6 +653,35 @@ async def _handle_single_event(self, event: Any, state: State) -> AsyncGenerator
                 CustomEvent(type=EventType.CUSTOM, name=event["name"], value=event["data"], raw_event=event)
             )
 
+        elif event_type == LangGraphEventTypes.OnToolEnd:
+            if self.active_run["has_function_streaming"]:
+                return
+            tool_call_output = event["data"]["output"]
+            yield self._dispatch_event(
+                ToolCallStartEvent(
+                    type=EventType.TOOL_CALL_START,
+                    tool_call_id=tool_call_output.tool_call_id,
+                    tool_call_name=tool_call_output.name,
+                    parent_message_id=tool_call_output.id,
+                    raw_event=event,
+                )
+            )
+            yield self._dispatch_event(
+                ToolCallArgsEvent(
+                    type=EventType.TOOL_CALL_ARGS,
+                    tool_call_id=tool_call_output.tool_call_id,
+                    delta=json.dumps(event["data"]["input"]),
+                    raw_event=event
+                )
+            )
+            yield self._dispatch_event(
+                ToolCallEndEvent(
+                    type=EventType.TOOL_CALL_END,
+                    tool_call_id=tool_call_output.tool_call_id,
+                    raw_event=event
+                )
+            )
+
     def handle_thinking_event(self, reasoning_data: LangGraphReasoning) -> Generator[str, Any, str | None]:
         if not reasoning_data or "type" not in reasoning_data or "text" not in reasoning_data:
             return ""
diff --git a/typescript-sdk/integrations/langgraph/python/ag_ui_langgraph/types.py b/typescript-sdk/integrations/langgraph/python/ag_ui_langgraph/types.py
index 046c61478..5dbe62456 100644
--- a/typescript-sdk/integrations/langgraph/python/ag_ui_langgraph/types.py
+++ b/typescript-sdk/integrations/langgraph/python/ag_ui_langgraph/types.py
@@ -48,7 +48,8 @@ class CustomEventNames(str, Enum):
     "exiting_node": NotRequired[bool],
     "manually_emitted_state": NotRequired[Optional[State]],
     "thread_id": NotRequired[Optional[ThinkingProcess]],
-    "thinking_process": NotRequired[Optional[str]]
+    "thinking_process": NotRequired[Optional[str]],
+    "has_function_streaming": NotRequired[bool],
 })
 
 MessagesInProgressRecord = Dict[str, Optional[MessageInProgress]]
diff --git a/typescript-sdk/integrations/langgraph/src/agent.ts b/typescript-sdk/integrations/langgraph/src/agent.ts
index 110837cd2..e70aea72b 100644
--- a/typescript-sdk/integrations/langgraph/src/agent.ts
+++ b/typescript-sdk/integrations/langgraph/src/agent.ts
@@ -164,6 +164,7 @@ export class LangGraphAgent extends AbstractAgent {
     this.activeRun = {
       id: input.runId,
       threadId: input.threadId,
+      hasFunctionStreaming: false,
     };
     this.subscriber = subscriber;
     if (!this.assistant) {
@@ -571,6 +572,10 @@ export class LangGraphAgent extends AbstractAgent {
           hasCurrentStream && currentStream?.toolCallId && toolCallData?.args;
         const isToolCallEndEvent = hasCurrentStream && currentStream?.toolCallId && !toolCallData;
 
+        if (isToolCallEndEvent || isToolCallArgsEvent || isToolCallStartEvent) {
+          this.activeRun!.hasFunctionStreaming = true;
+        }
+
         const reasoningData = resolveReasoningContent(event.data);
         const messageContent = resolveMessageContent(event.data.chunk.content);
         const isMessageContentEvent = Boolean(!toolCallData && messageContent);
@@ -768,6 +773,27 @@ export class LangGraphAgent extends AbstractAgent {
           rawEvent: event,
         });
         break;
+      case LangGraphEventTypes.OnToolEnd:
+        if (this.activeRun!.hasFunctionStreaming) break;
+        const toolCallOutput = event.data.output
+        this.dispatchEvent({
+          type: EventType.TOOL_CALL_START,
+          toolCallId: toolCallOutput.tool_call_id,
+          toolCallName: toolCallOutput.name,
+          parentMessageId: toolCallOutput.id,
+          rawEvent: event,
+        })
+        this.dispatchEvent({
+          type: EventType.TOOL_CALL_ARGS,
+          toolCallId: toolCallOutput.tool_call_id,
+          delta: JSON.stringify(event.data.input),
+          rawEvent: event,
+        });
+        this.dispatchEvent({
+          type: EventType.TOOL_CALL_END,
+          toolCallId: toolCallOutput.tool_call_id,
+          rawEvent: event,
+        });
     }
   }
 
diff --git a/typescript-sdk/integrations/langgraph/src/types.ts b/typescript-sdk/integrations/langgraph/src/types.ts
index a35a3c48c..97abdbb84 100644
--- a/typescript-sdk/integrations/langgraph/src/types.ts
+++ b/typescript-sdk/integrations/langgraph/src/types.ts
@@ -63,6 +63,7 @@ export interface RunMetadata {
   manuallyEmittedState?: State | null;
   threadId?: string;
   graphInfo?: AssistantGraph
+  hasFunctionStreaming?: boolean;
 }
 
 export type MessagesInProgressRecord = Record<string, MessageInProgress | null>;