From a081a69bbefa6e469b5a5cbde9c8fb94df454088 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 19 Jan 2026 16:00:36 +0000 Subject: [PATCH] Simplify message merging logic using list join Co-authored-by: jxxghp <51039935+jxxghp@users.noreply.github.com> --- app/agent/tools/base.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/agent/tools/base.py b/app/agent/tools/base.py index 02617868..e530f6da 100644 --- a/app/agent/tools/base.py +++ b/app/agent/tools/base.py @@ -63,18 +63,15 @@ class MoviePilotTool(BaseTool, metaclass=ABCMeta): tool_message = explanation # 合并agent消息和工具执行消息，一起发送 - merged_message = "" + messages = [] if agent_message: - merged_message = agent_message + messages.append(agent_message) if tool_message: - formatted_tool_message = f"⚙️ => {tool_message}" - if merged_message: - merged_message = f"{merged_message}\n\n{formatted_tool_message}" - else: - merged_message = formatted_tool_message + messages.append(f"⚙️ => {tool_message}") # 发送合并后的消息 - if merged_message: + if messages: + merged_message = "\n\n".join(messages) await self.send_tool_message(merged_message, title="MoviePilot助手") logger.debug(f'Executing tool {self.name} with args: {kwargs}')