From 2b9cda15e47ca2cdcdd2bf4a57c3f6c677346219 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 19 Jan 2026 13:31:43 +0000
Subject: [PATCH] Fix tool_call_id error by adding metadata to tool_result and
 using it in ToolMessage

Co-authored-by: jxxghp <51039935+jxxghp@users.noreply.github.com>
---
 app/agent/__init__.py   | 6 +++++-
 app/agent/tools/base.py | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/agent/__init__.py b/app/agent/__init__.py
index 9965ccf9..880f6aa1 100644
--- a/app/agent/__init__.py
+++ b/app/agent/__init__.py
@@ -113,7 +113,11 @@ class MoviePilotAgent:
                         )
                     )
                 elif msg.get("role") == "tool_result":
-                    chat_history.add_message(ToolMessage(content=msg.get("content", "")))
+                    metadata = msg.get("metadata", {})
+                    chat_history.add_message(ToolMessage(
+                        content=msg.get("content", ""),
+                        tool_call_id=metadata.get("call_id", "unknown")
+                    ))
                 elif msg.get("role") == "system":
                     chat_history.add_message(SystemMessage(content=msg.get("content", "")))
         return chat_history
diff --git a/app/agent/tools/base.py b/app/agent/tools/base.py
index 6246ef4f..f200aa46 100644
--- a/app/agent/tools/base.py
+++ b/app/agent/tools/base.py
@@ -83,7 +83,10 @@ class MoviePilotTool(BaseTool, metaclass=ABCMeta):
             session_id=self._session_id,
             user_id=self._user_id,
             role="tool_result",
-            content=formated_result
+            content=formated_result,
+            metadata={
+                "call_id": self.__class__.__name__
+            }
         )
 
         return result