From 4caa230c47611c13df4084230dcad1e8ab6dd02c Mon Sep 17 00:00:00 2001
From: thzxx <thzxx@users.noreply.gitee.com>
Date: Thu, 23 Apr 2026 11:52:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E8=AF=9D=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E5=B7=A5=E5=85=B7=E5=8D=A1=E7=89=87=E5=A7=8B=E7=BB=88?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=9C=850=20=E2=9D=8C0=E4=B8=94=E6=B0=B8?=
 =?UTF-8?q?=E8=BF=9C=E8=BD=AC=E5=9C=88=E6=89=A7=E8=A1=8C=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因：onNewIteration 保存工具记录时 status='running'、result=null，
工具执行完成后只更新了工作空间面板，未更新消息中的记录。

修复：
1. 新增 updateMessageToolRecord() 函数，从后往前查找消息中
   running 状态的同名工具记录并更新为最终状态
2. onToolCallResult/onToolCallError 回调中同步更新消息记录
3. onDone 多迭代模式下，最终消息也包含 toolRecords
---
 src/renderer/components/input-area.ts | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/renderer/components/input-area.ts b/src/renderer/components/input-area.ts
index ccb4364..00ff423 100644
--- a/src/renderer/components/input-area.ts
+++ b/src/renderer/components/input-area.ts
@@ -330,12 +330,14 @@ async function handleRetry(): Promise<void> {
             name, arguments: call.function.arguments,
             result, status: result.success ? 'success' : 'error', timestamp: Date.now()
           });
+          updateMessageToolRecord(name, result.success ? 'success' : 'error', result);
         },
         onToolCallError: (name, error, call) => {
           updateToolCard({
             name, arguments: call.function.arguments,
             result: { success: false, error }, status: 'error', timestamp: Date.now()
           });
+          updateMessageToolRecord(name, 'error', { success: false, error });
         },
         onConfirmTool: async (call) => showToolConfirm(call),
         onDone: async (finalContent, toolRecords, loopStats) => {
@@ -345,6 +347,7 @@ async function handleRetry(): Promise<void> {
               const lastMsg: ChatMessage = {
                 role: 'assistant', content: finalContent, timestamp: Date.now(),
                 ...(retryThinkContent && { think: retryThinkContent }),
+                ...(toolRecords?.length && { toolCalls: toolRecords }),
                 ...(loopStats?.eval_count && { eval_count: loopStats.eval_count }),
                 ...(loopStats?.total_duration && { total_duration: loopStats.total_duration }),
               };
@@ -846,6 +849,27 @@ export async function sendMessage(): Promise<void> {
   }
 }
 
+/** 更新当前会话消息中最近一个 'running' 状态的同名工具记录 */
+function updateMessageToolRecord(toolName: string, status: 'success' | 'error', result: Record<string, unknown>): void {
+  state.update(KEYS.CURRENT_SESSION, (session: ChatSession | null) => {
+    if (!session) return session;
+    const messages = [...session.messages];
+    // 从后往前找最近一条包含该工具 running 状态记录的消息
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const msg = messages[i];
+      if (!msg.toolCalls) continue;
+      const idx = msg.toolCalls.findIndex(tc => tc.name === toolName && tc.status === 'running');
+      if (idx !== -1) {
+        const updated = [...msg.toolCalls];
+        updated[idx] = { ...updated[idx], status, result };
+        messages[i] = { ...msg, toolCalls: updated };
+        return { ...session, messages, updatedAt: Date.now() };
+      }
+    }
+    return session;
+  });
+}
+
 async function sendMessageWithAgentLoop(text: string, currentSession: ChatSession, model: string): Promise<void> {
   const now = Date.now();
   const msgsToAdd: ChatMessage[] = [];
@@ -1004,12 +1028,14 @@ async function sendMessageWithAgentLoop(text: string, currentSession: ChatSessio
           name, arguments: call.function.arguments,
           result, status: result.success ? 'success' : 'error', timestamp: Date.now()
         });
+        updateMessageToolRecord(name, result.success ? 'success' : 'error', result);
       },
       onToolCallError: (name, error, call) => {
         updateToolCard({
           name, arguments: call.function.arguments,
           result: { success: false, error }, status: 'error', timestamp: Date.now()
         });
+        updateMessageToolRecord(name, 'error', { success: false, error });
       },
       onConfirmTool: async (call) => {
         return showToolConfirm(call);
@@ -1028,6 +1054,7 @@ async function sendMessageWithAgentLoop(text: string, currentSession: ChatSessio
               content: assistantContent,
               timestamp: Date.now(),
               ...(thinkContent && { think: thinkContent }),
+              ...(toolRecords?.length && { toolCalls: toolRecords }),
               ...(loopStats?.eval_count && { eval_count: loopStats.eval_count }),
               ...(lastIterDuration > 0 && { total_duration: lastIterDuration }),
             };