From 7565b8676fdcf1e737038bd5ea060c55fd54873d Mon Sep 17 00:00:00 2001
From: Rick Ye <rick.ye@gz.questwork.com>
Date: Mon, 7 Sep 2026 19:15:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=86=E5=8F=B2=E5=9B=9E=E5=90=88?=
 =?UTF-8?q?=E8=AF=AF=E6=98=BE=E7=A4=BA=E6=B4=BB=E8=B7=83=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8E=E6=B5=81=E5=BC=8F=E6=AE=B5=E9=97=B4=E9=9A=90=E5=BD=A2?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/renderer/src/components/ChatView.tsx  | 12 +++--
 .../renderer/src/components/MessageItem.tsx   |  7 ++-
 .../renderer/src/components/StreamingText.tsx | 46 +++++++++----------
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/apps/desktop/src/renderer/src/components/ChatView.tsx b/apps/desktop/src/renderer/src/components/ChatView.tsx
index d7c9da6..8b03e28 100644
--- a/apps/desktop/src/renderer/src/components/ChatView.tsx
+++ b/apps/desktop/src/renderer/src/components/ChatView.tsx
@@ -48,13 +48,17 @@ function renderTurns(
     if (message.role === 'assistant') {
       let j = i + 1
       while (j < messages.length && messages[j].role === 'assistant') j += 1
+      // turnActive/streaming 是会话级信号：只有延伸到消息列表末尾的最后一个
+      // assistant 组是「活跃回合」。透传给历史回合会让它们误显示
+      // 「已工作/处理中」并保持过程区展开。
+      const isLive = j === messages.length
       items.push(
         <AssistantTurn
           key={`${message.key}-turn`}
           messages={messages.slice(i, j)}
           tools={tools}
-          streaming={streaming}
-          turnActive={turnActive}
+          streaming={streaming && isLive}
+          turnActive={turnActive && isLive}
           pendingApprovals={pendingApprovals}
         />
       )
@@ -65,8 +69,8 @@ function renderTurns(
           key={message.key}
           message={message}
           tools={tools}
-          streaming={streaming}
-          turnActive={turnActive}
+          streaming={streaming && i === messages.length - 1}
+          turnActive={turnActive && i === messages.length - 1}
           pendingApprovals={pendingApprovals}
         />
       )
diff --git a/apps/desktop/src/renderer/src/components/MessageItem.tsx b/apps/desktop/src/renderer/src/components/MessageItem.tsx
index daccade..170be65 100644
--- a/apps/desktop/src/renderer/src/components/MessageItem.tsx
+++ b/apps/desktop/src/renderer/src/components/MessageItem.tsx
@@ -177,15 +177,18 @@ export function AssistantTurn({
   const streamNodes: ReactNode[] = []
   let visibleThinkingRows = 0
   if (stream) {
-    stream.segments.forEach((seg, i) => {
+    const segments = stream.segments
+    segments.forEach((seg, i) => {
       if (seg.kind === 'thinking') {
         if (!showStreamThinking) return
         const rows = thinkingRows(seg.text)
         if (rows.length === 0) return
         visibleThinkingRows += rows.length
+        // 该思考段之后已有正文段在流：思考已完成，表头从「思考中…」切回「思考过程」
+        const followedByText = segments.some((s, k) => k > i && s.kind === 'text' && s.text.length > 0)
         streamNodes.push(
           <div key={`seg-${i}`} className="mb-3">
-            <Thinking rows={rows} streaming={streaming} />
+            <Thinking rows={rows} streaming={streaming && !followedByText} />
           </div>
         )
         return
diff --git a/apps/desktop/src/renderer/src/components/StreamingText.tsx b/apps/desktop/src/renderer/src/components/StreamingText.tsx
index 6e8452e..2131a97 100644
--- a/apps/desktop/src/renderer/src/components/StreamingText.tsx
+++ b/apps/desktop/src/renderer/src/components/StreamingText.tsx
@@ -48,29 +48,29 @@ export function StreamingText({
         />
       </div>
 
-      {/* 操作行：流式结束后淡入 */}
-      <div
-        className="mt-2 flex items-center gap-0.5 transition-opacity duration-[400ms]"
-        style={{ opacity: done ? 1 : 0, pointerEvents: done ? undefined : 'none' }}
-      >
-        <button
-          type="button"
-          aria-label={copied ? '已复制' : '复制回答'}
-          onClick={copy}
-          className="flex size-6 items-center justify-center rounded-[6px] text-ink-3 transition-colors duration-100 hover:bg-hover-2 hover:text-ink-2"
-        >
-          {copied ? (
-            <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round">
-              <path d="M20 6L9 17l-5-5" />
-            </svg>
-          ) : (
-            <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round">
-              <rect x="9" y="9" width="12" height="12" rx="2.5" />
-              <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1" />
-            </svg>
-          )}
-        </button>
-      </div>
+      {/* 操作行：流式结束后淡入。流式期间不渲染（opacity:0 也会占位，
+        * 每个正文段后会挂一块约 32px 的隐形空白，且完成后卸载造成布局跳动） */}
+      {done && (
+        <div className="mt-2 flex items-center gap-0.5" style={{ animation: 'fade-in 400ms ease both' }}>
+          <button
+            type="button"
+            aria-label={copied ? '已复制' : '复制回答'}
+            onClick={copy}
+            className="flex size-6 items-center justify-center rounded-[6px] text-ink-3 transition-colors duration-100 hover:bg-hover-2 hover:text-ink-2"
+          >
+            {copied ? (
+              <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round">
+                <path d="M20 6L9 17l-5-5" />
+              </svg>
+            ) : (
+              <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round">
+                <rect x="9" y="9" width="12" height="12" rx="2.5" />
+                <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1" />
+              </svg>
+            )}
+          </button>
+        </div>
+      )}
 
       {/* Follow-ups：完成后的跟进问题列表 */}
       {done && followUps && followUps.length > 0 && (