From 281b1efffdc2677dfa1216f5aec1473b5fed5a25 Mon Sep 17 00:00:00 2001
From: matevip <matevip@mate.vip>
Date: Sat, 11 Apr 2026 00:20:47 +0800
Subject: [PATCH] fix(chat): enrich stream metadata with plan/approval/browser
 tracking, fix thinking segment ordering

---
 mateclaw-ui/src/composables/chat/useChat.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mateclaw-ui/src/composables/chat/useChat.ts b/mateclaw-ui/src/composables/chat/useChat.ts
index ae9d502d..f704f4c8 100644
--- a/mateclaw-ui/src/composables/chat/useChat.ts
+++ b/mateclaw-ui/src/composables/chat/useChat.ts
@@ -222,8 +222,15 @@ export function useChat(options: UseChatOptions): UseChatReturn {
       let thinkSeg = segs.findLast((s: MessageSegment) => s.type === 'thinking' && s.status === 'running')
       if (!thinkSeg) {
         thinkSeg = { id: genSegId(), type: 'thinking', status: 'running', thinkingText: '', timestamp: Date.now() }
-        segs.push(thinkSeg)
-        flushSegmentsToMessage() // 新 thinking segment 创建时同步一次
+        // 修复：如果前面已有 content segment（模型先发 content 后发 thinking），
+        // 把 thinking 插入到第一个 content 之前，确保 thinking 在上方显示
+        const firstContentIdx = segs.findIndex((s: MessageSegment) => s.type === 'content')
+        if (firstContentIdx >= 0 && !segs.some((s: MessageSegment) => s.type === 'tool_call')) {
+          segs.splice(firstContentIdx, 0, thinkSeg)
+        } else {
+          segs.push(thinkSeg)
+        }
+        flushSegmentsToMessage()
       }
       thinkSeg.thinkingText = (thinkSeg.thinkingText || '') + (data.delta || '')
     }