From fa9ec1ee9ca4785e1378cf6cb3bca71ff010f7e6 Mon Sep 17 00:00:00 2001
From: cthomas <caren@letta.com>
Date: Tue, 25 Nov 2025 00:16:39 -0800
Subject: [PATCH] fix: missing name in tool return (#6381)

* fix: missing name in tool return

* add empty check
---
 letta/server/rest_api/utils.py | 3 ++-
 letta/server/server.py         | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/letta/server/rest_api/utils.py b/letta/server/rest_api/utils.py
index de5134f1..8b2125d0 100644
--- a/letta/server/rest_api/utils.py
+++ b/letta/server/rest_api/utils.py
@@ -523,9 +523,10 @@ def create_parallel_tool_messages_from_llm_response(
         agent_id=agent_id,
         model=model,
         tool_calls=[],
-        tool_call_id=tool_returns[0].tool_call_id,  # For legacy reasons, set to first one
+        tool_call_id=tool_returns[0].tool_call_id if tool_returns else None,  # For legacy reasons, set to first one
         created_at=get_utc_time(),
         batch_item_id=llm_batch_item_id,
+        name=tool_call_specs[0].get("name") if tool_call_specs else None,  # For legacy reasons, set to first one
         tool_returns=tool_returns,
         run_id=run_id,
     )
diff --git a/letta/server/server.py b/letta/server/server.py
index fd5de28d..c439a29f 100644
--- a/letta/server/server.py
+++ b/letta/server/server.py
@@ -1371,6 +1371,7 @@ class SyncServer(object):
                 id="null",
                 tool_call_id="null",
                 date=get_utc_time(),
+                name=tool_name,
                 status=tool_execution_result.status,
                 tool_return=str(tool_execution_result.func_return),
                 stdout=tool_execution_result.stdout,
@@ -1394,6 +1395,7 @@ class SyncServer(object):
                 id="null",
                 tool_call_id="null",
                 date=get_utc_time(),
+                name=tool.name,
                 status="error",
                 tool_return=func_return,
                 stdout=[],