From 7d5916aa629276908f299b8ed05d5bbdf5e62379 Mon Sep 17 00:00:00 2001
From: Suzumiya <suzmii@qq.com>
Date: Wed, 16 Sep 2026 00:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=9D=97=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=8E=92=E5=9C=A8=E6=96=87=E6=9C=AC=E4=B9=8B=E5=90=8E=EF=BC=88?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=9A=E5=AE=9A=E9=81=97=E7=95=99=EF=BC=9A?=
 =?UTF-8?q?=E5=85=88=E5=89=8D=E4=BB=8E=E6=B6=88=E6=81=AF=E5=89=8D=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=BD=86=E6=9C=AA=E6=8F=92=E5=9B=9E=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProjectSupervisorView：该回合的工具组渲染在 assistant 消息之后、轮次统计之前，不再压在同回合文本上面
- 实时回合的工具组改到流式正文之后，顺序与落定回合一致
- 修掉上一次改动把工具组从消息前移除却没插回、导致工具卡片不显示的问题
---
 .../ProjectSupervisorView.tsx                 | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
index 405fe616d..676213f60 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
@@ -522,15 +522,6 @@ export function ProjectSupervisorView({
               Boolean(anchoredTurnId) && nextTurnId !== anchoredTurnId;
             return (
               <Fragment key={message.messageId ?? `${message.role}-${index}`}>
-                {anchoredToolCalls.length > 0 ? (
-                  <ToolCallGroup
-                    calls={anchoredToolCalls}
-                    userSentAt={userMessageUpdatedAtForTurn(
-                      anchoredTurnId ?? '',
-                    )}
-                    className="message-tool-call"
-                  />
-                ) : null}
                 <div className={`message message--${message.role}`}>
                   <ChatMarkdownMessage
                     role={message.role}
@@ -546,20 +537,21 @@ export function ProjectSupervisorView({
                     </details>
                   ) : null}
                 </div>
+                {anchoredToolCalls.length > 0 ? (
+                  <ToolCallGroup
+                    calls={anchoredToolCalls}
+                    userSentAt={userMessageUpdatedAtForTurn(
+                      anchoredTurnId ?? '',
+                    )}
+                    className="message-tool-call"
+                  />
+                ) : null}
                 {isTurnEnd && anchoredTurnId && anchoredTurnId !== activeTurnId
                   ? renderTurnUsage(anchoredTurnId)
                   : null}
               </Fragment>
             );
           })}
-          {liveToolCalls.length > 0 ? (
-            <ToolCallGroup
-              calls={liveToolCalls}
-              userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
-              active
-              className="message-tool-call"
-            />
-          ) : null}
           {liveToolCallTurnId &&
           liveToolCallTurnId !== activeTurnId &&
           !visibleMessages.some(
@@ -595,6 +587,14 @@ export function ProjectSupervisorView({
               />
             </div>
           ) : null}
+          {liveToolCalls.length > 0 ? (
+            <ToolCallGroup
+              calls={liveToolCalls}
+              userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
+              active
+              className="message-tool-call"
+            />
+          ) : null}
           {showDesignReasoning &&
             designReasoningEntries
               .filter((entry) => !entry.messageId)