From f8ae7be5395fcb4b7987cd4d6505d113030a1c09 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 24 Jan 2026 00:18:06 +0000
Subject: [PATCH] Fix: Ensure tool exceptions are stored in memory to maintain
 message chain integrity

Co-authored-by: jxxghp <51039935+jxxghp@users.noreply.github.com>
---
 app/agent/tools/base.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/agent/tools/base.py b/app/agent/tools/base.py
index e530f6da..e4e972bf 100644
--- a/app/agent/tools/base.py
+++ b/app/agent/tools/base.py
@@ -75,8 +75,16 @@ class MoviePilotTool(BaseTool, metaclass=ABCMeta):
             await self.send_tool_message(merged_message, title="MoviePilot助手")
 
         logger.debug(f'Executing tool {self.name} with args: {kwargs}')
-        result = await self.run(**kwargs)
-        logger.debug(f'Tool {self.name} executed with result: {result}')
+        
+        # 执行工具，捕获异常确保结果总是被存储到记忆中
+        try:
+            result = await self.run(**kwargs)
+            logger.debug(f'Tool {self.name} executed with result: {result}')
+        except Exception as e:
+            # 记录异常详情
+            error_message = f"工具执行异常: {str(e)}"
+            logger.error(f'Tool {self.name} execution failed: {e}', exc_info=True)
+            result = error_message
 
         # 记忆工具调用结果
         if isinstance(result, str):