diff --git a/src/main/presenter/sqlitePresenter/tables/messages.ts b/src/main/presenter/sqlitePresenter/tables/messages.ts
index 6975a9d8d..69120f20a 100644
--- a/src/main/presenter/sqlitePresenter/tables/messages.ts
+++ b/src/main/presenter/sqlitePresenter/tables/messages.ts
@@ -293,8 +293,9 @@ export class MessagesTable extends BaseTable {
         FROM messages
         WHERE conversation_id = ?
         AND parent_id = ?
+        AND role = 'assistant'
         AND is_variant = 0
-        ORDER BY created_at ASC
+        ORDER BY created_at DESC
         LIMIT 1
       `
       )
diff --git a/src/renderer/src/components/message/MessageItemAssistant.vue b/src/renderer/src/components/message/MessageItemAssistant.vue
index 949cd2675..111af15f6 100644
--- a/src/renderer/src/components/message/MessageItemAssistant.vue
+++ b/src/renderer/src/components/message/MessageItemAssistant.vue
@@ -177,21 +177,12 @@ const emit = defineEmits<{
 // 获取当前会话ID
 const currentThreadId = computed(() => chatStore.getActiveThreadId() || '')
 
-// 将 currentVariantIndex 从 ref 改造为 computed 属性
-// 这确保了其值总是与 Pinia store 中的状态同步，从根本上消除了竞态条件。
+// currentVariantIndex: 0 = 主消息, 1-N = 对应的变体索引
 const currentVariantIndex = computed(() => {
-  const selectedVariantId = chatStore.selectedVariantsMap.get(props.message.id)
+  const selectedVariantId = chatStore.selectedVariantsMap[props.message.id]
+  if (!selectedVariantId) return 0
 
-  // 如果 store 中没有记录，则显示主消息 (索引 0)
-  if (!selectedVariantId) {
-    return 0
-  }
-
-  // 在所有变体中查找已选择的 ID
   const variantIndex = allVariants.value.findIndex((v) => v.id === selectedVariantId)
-
-  // 如果找到了，返回其索引 + 1 (因为索引 0 是主消息)
-  // 如果没找到 (数据过时或已删除)，则安全地回退到主消息
   return variantIndex !== -1 ? variantIndex + 1 : 0
 })
 
@@ -205,19 +196,26 @@ const currentMessage = computed(() => {
   return variant || props.message
 })
 
-// 计算当前消息的所有变体（包括缓存中的）
+// 计算当前消息的所有变体（包括缓存中的，过滤掉主消息本身）
 const allVariants = computed(() => {
   const messageVariants = props.message.variants || []
-  const combinedVariants = messageVariants.map((variant) => {
-    const cachedVariant = Array.from(chatStore.getGeneratingMessagesCache().values()).find(
-      (cached) => {
-        const msg = cached.message as AssistantMessage
-        return msg.is_variant && msg.id === variant.id
-      }
-    )
-    return cachedVariant ? cachedVariant.message : variant
+  const variantsById = new Map<string, AssistantMessage>()
+
+  // 只添加真正的变体（is_variant !== 0），过滤掉主消息本身
+  messageVariants.forEach((variant) => {
+    if (variant.is_variant !== 0) {
+      variantsById.set(variant.id, variant as AssistantMessage)
+    }
   })
-  return combinedVariants
+
+  for (const [, cached] of chatStore.getGeneratingMessagesCache().entries()) {
+    const msg = cached.message
+    if (msg.role === 'assistant' && msg.is_variant && msg.parentId === props.message.id) {
+      variantsById.set(msg.id, msg as AssistantMessage)
+    }
+  }
+
+  return Array.from(variantsById.values())
 })
 
 // 计算变体总数
@@ -240,14 +238,12 @@ watch(
     // 仅当新变体被添加时触发
     // 并且当前会话不是正在生成中的消息，避免在生成过程中频繁切换
     if (newLength > oldLength && !chatStore.generatingThreadIds.has(currentThreadId.value)) {
-      const newVariantIndex = newLength // 新变体的索引
-
       const mainMessageId = props.message.id
-      // newVariantIndex 此时至少为 1
-      const selectedVariant = allVariants.value[newVariantIndex - 1]
+      // 获取最后一个变体（数组最后一个元素）
+      const lastVariant = allVariants.value[newLength - 1]
 
-      // 只有当 selectedVariant 存在时才调用 updateSelectedVariant，确保是有效的变体
-      chatStore.updateSelectedVariant(mainMessageId, selectedVariant ? selectedVariant.id : null)
+      // 只有当 lastVariant 存在时才调用 updateSelectedVariant，确保是有效的变体
+      chatStore.updateSelectedVariant(mainMessageId, lastVariant ? lastVariant.id : null)
     }
   }
 )
@@ -324,30 +320,18 @@ const handleAction = (action: HandleActionType) => {
         .trim()
     )
   } else if (action === 'prev' || action === 'next') {
-    // 修改 prev/next 逻辑以遵循单向数据流
-    let newIndex = currentVariantIndex.value // 获取当前计算出的索引
+    let newIndex = currentVariantIndex.value
 
-    switch (action) {
-      case 'prev':
-        if (newIndex > 0) newIndex--
-        break
-      case 'next':
-        if (newIndex < totalVariants.value - 1) newIndex++
-        break
+    if (action === 'prev' && newIndex > 0) {
+      newIndex--
+    } else if (action === 'next' && newIndex < totalVariants.value - 1) {
+      newIndex++
     }
 
-    // 如果计算出的新索引与当前索引相同，则不执行任何操作
     if (newIndex === currentVariantIndex.value) return
 
-    const mainMessageId = props.message.id
-    // 如果 newIndex 是 0，则 selectedVariant 为 null，表示选择主消息
-    const selectedVariant = newIndex > 0 ? allVariants.value[newIndex - 1] : null
-    const selectedVariantId = selectedVariant ? selectedVariant.id : null
-
-    // 不再直接修改本地 state，而是调用 store 的 action 来更新全局状态
-    // store 的更新会通过 computed 属性自动反馈到 UI
-    chatStore.updateSelectedVariant(mainMessageId, selectedVariantId)
-
+    const selectedVariantId = newIndex > 0 ? allVariants.value[newIndex - 1]?.id : null
+    chatStore.updateSelectedVariant(props.message.id, selectedVariantId)
     emit('variantChanged', props.message.id)
   } else if (action === 'copyImage') {
     // 使用原始消息的ID，因为DOM中的data-message-id使用的是message.id
diff --git a/src/renderer/src/components/message/MessageList.vue b/src/renderer/src/components/message/MessageList.vue
index 25aee7694..2e5a22449 100644
--- a/src/renderer/src/components/message/MessageList.vue
+++ b/src/renderer/src/components/message/MessageList.vue
@@ -23,7 +23,6 @@
           <div @mouseenter="minimap.handleHover(item.id)" @mouseleave="minimap.handleHover(null)">
             <MessageItemAssistant
               v-if="item.message?.role === 'assistant'"
-              :ref="retry.setAssistantRef(index)"
               :message="item.message"
               :is-capturing-image="capture.isCapturing.value"
               @copy-image="handleCopyImage"
@@ -33,7 +32,7 @@
             <MessageItemUser
               v-else-if="item.message?.role === 'user'"
               :message="item.message"
-              @retry="handleRetry(index)"
+              @retry="handleRetry(item.message?.id)"
               @scroll-to-bottom="scrollToBottom"
             />
             <MessageItemPlaceholder
@@ -103,7 +102,6 @@ import { useMessageScroll } from '@/composables/message/useMessageScroll'
 import { useCleanDialog } from '@/composables/message/useCleanDialog'
 import { useMessageMinimap } from '@/composables/message/useMessageMinimap'
 import { useMessageCapture } from '@/composables/message/useMessageCapture'
-import { useMessageRetry } from '@/composables/message/useMessageRetry'
 import { DynamicScroller, DynamicScrollerItem } from 'vue-virtual-scroller'
 import { getAllMessageDomInfo, getMessageDomInfo } from '@/lib/messageRuntimeCache'
 
@@ -159,9 +157,6 @@ const minimap = useMessageMinimap(scroll.scrollInfo)
 const capture = useMessageCapture()
 
 // Message retry
-const loadedMessages = computed(() =>
-  props.items.map((item) => item.message).filter((message): message is Message => Boolean(message))
-)
 
 const minimapMessages = computed(() => {
   const mapped = props.items.map((item) => {
@@ -179,7 +174,6 @@ const minimapMessages = computed(() => {
   if (current.length > 0) return current
   return chatStore.variantAwareMessages
 })
-const retry = useMessageRetry(loadedMessages)
 
 // === Constants ===
 const HIGHLIGHT_CLASS = 'selection-highlight'
@@ -225,7 +219,7 @@ const getMessageSizeKey = (item: MessageListItem) => {
 const getVariantSizeKey = (item: MessageListItem) => {
   const message = item.message
   if (!message || message.role !== 'assistant') return ''
-  return chatStore.selectedVariantsMap.get(message.id) ?? ''
+  return chatStore.selectedVariantsMap[message.id] ?? ''
 }
 
 // === Event Handlers ===
@@ -247,8 +241,9 @@ const handleCopyImage = async (
   await capture.captureMessage({ messageId, parentId, fromTop, modelInfo })
 }
 
-const handleRetry = async (index: number) => {
-  if (await retry.retryFromUserMessage(index)) {
+const handleRetry = async (messageId?: string) => {
+  if (!messageId) return
+  if (await chatStore.retryFromUserMessage(messageId)) {
     scrollToBottom(true)
   }
 }
diff --git a/src/renderer/src/components/message/MessageToolbar.vue b/src/renderer/src/components/message/MessageToolbar.vue
index 95a0a14e8..712469fcc 100644
--- a/src/renderer/src/components/message/MessageToolbar.vue
+++ b/src/renderer/src/components/message/MessageToolbar.vue
@@ -68,14 +68,13 @@
               <TooltipContent>{{ t('thread.toolbar.previousVariant') }}</TooltipContent>
             </Tooltip>
             <span v-show="isAssistant && hasVariants">
-              {{ currentVariantIndex !== undefined ? currentVariantIndex + 1 : 1 }} /
-              {{ totalVariants }}
+              {{ (currentVariantIndex ?? 0) + 1 }} / {{ totalVariants }}
             </span>
             <Tooltip :delayDuration="200">
               <TooltipTrigger as-child>
                 <Button
                   v-show="isAssistant && hasVariants"
-                  :disabled="hasVariants && totalVariants === (currentVariantIndex ?? 0) + 1"
+                  :disabled="(currentVariantIndex ?? 0) >= (totalVariants || 0) - 1"
                   variant="ghost"
                   size="icon"
                   class="w-4 h-4 text-muted-foreground hover:text-primary hover:bg-transparent"
diff --git a/src/renderer/src/composables/message/useMessageRetry.ts b/src/renderer/src/composables/message/useMessageRetry.ts
index 4f164c71d..552a19dba 100644
--- a/src/renderer/src/composables/message/useMessageRetry.ts
+++ b/src/renderer/src/composables/message/useMessageRetry.ts
@@ -2,30 +2,38 @@ import { ref, type Ref } from 'vue'
 import { useChatStore } from '@/stores/chat'
 import type { Message } from '@shared/chat'
 
-export function useMessageRetry(messages: Ref<Array<Message>>) {
+export function useMessageRetry(messages: Ref<Array<Message | null>>) {
   const chatStore = useChatStore()
 
   // Simplified ref management - use Map for better type safety
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const assistantRefs = ref(new Map<number, any>())
+  const assistantRefs = ref(new Map<string, any>())
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const setAssistantRef = (index: number) => (el: any) => {
+  const setAssistantRef = (messageId?: string) => (el: any) => {
+    if (!messageId) return
     if (el) {
-      assistantRefs.value.set(index, el)
+      assistantRefs.value.set(messageId, el)
     } else {
-      assistantRefs.value.delete(index)
+      assistantRefs.value.delete(messageId)
     }
   }
 
-  const retryFromUserMessage = async (userMessageIndex: number) => {
+  const retryFromUserMessage = async (userMessageId?: string) => {
+    if (!userMessageId) return false
+
     let triggered = false
+    const orderedMessages = messages.value
 
     // Find next assistant message
-    for (let i = userMessageIndex + 1; i < messages.value.length; i++) {
-      if (messages.value[i].role === 'assistant') {
+    const userMessageIndex = orderedMessages.findIndex((msg) => msg?.id === userMessageId)
+    if (userMessageIndex === -1) return false
+
+    for (let i = userMessageIndex + 1; i < orderedMessages.length; i++) {
+      const nextMessage = orderedMessages[i]
+      if (nextMessage?.role === 'assistant') {
         try {
-          const assistantRef = assistantRefs.value.get(i)
+          const assistantRef = assistantRefs.value.get(nextMessage.id)
           if (assistantRef && typeof assistantRef.handleAction === 'function') {
             assistantRef.handleAction('retry')
             triggered = true
@@ -40,7 +48,7 @@ export function useMessageRetry(messages: Ref<Array<Message>>) {
     // Fallback: regenerate from user message
     if (!triggered) {
       try {
-        const userMsg = messages.value[userMessageIndex]
+        const userMsg = orderedMessages[userMessageIndex]
         if (userMsg && userMsg.role === 'user') {
           await chatStore.regenerateFromUserMessage(userMsg.id)
           return true
diff --git a/src/renderer/src/stores/chat.ts b/src/renderer/src/stores/chat.ts
index 97c2179f0..c198b1410 100644
--- a/src/renderer/src/stores/chat.ts
+++ b/src/renderer/src/stores/chat.ts
@@ -126,7 +126,10 @@ export const useChatStore = defineStore('chat', () => {
   } | null>(null)
 
   // 用于管理当前激活会话的 selectedVariantsMap
-  const selectedVariantsMap = ref<Map<string, string>>(new Map())
+  const selectedVariantsMap = ref<Record<string, string>>({})
+
+  // 标志：是否正在更新变体选择（用于防止 LIST_UPDATED 循环）
+  let isUpdatingVariant = false
 
   // Getters
   const getTabId = () => window.api.getWebContentsId()
@@ -241,10 +244,10 @@ export const useChatStore = defineStore('chat', () => {
 
   const resolveVariantMessage = (
     message: Message,
-    currentSelectedVariants: Map<string, string>
+    currentSelectedVariants: Record<string, string>
   ) => {
-    if (message.role === 'assistant' && currentSelectedVariants.has(message.id)) {
-      const selectedVariantId = currentSelectedVariants.get(message.id)
+    if (message.role === 'assistant' && currentSelectedVariants[message.id]) {
+      const selectedVariantId = currentSelectedVariants[message.id]
       if (!selectedVariantId) return message
       const selectedVariant = (message as AssistantMessage).variants?.find(
         (v) => v.id === selectedVariantId
@@ -419,7 +422,7 @@ export const useChatStore = defineStore('chat', () => {
     setMessageIds([])
     clearCachedMessagesForThread(activeThreadId)
     clearMessageDomInfo()
-    selectedVariantsMap.value.clear()
+    selectedVariantsMap.value = {}
     childThreadsByMessageId.value = new Map()
     pendingContextMentions.value = new Map()
     pendingScrollTargetByConversation.value = new Map()
@@ -444,7 +447,7 @@ export const useChatStore = defineStore('chat', () => {
     }
     setMessageIds([])
     clearMessageDomInfo()
-    selectedVariantsMap.value.clear()
+    selectedVariantsMap.value = {}
     childThreadsByMessageId.value = new Map()
     pendingContextMentions.value = new Map()
     pendingScrollTargetByConversation.value = new Map()
@@ -628,8 +631,11 @@ export const useChatStore = defineStore('chat', () => {
       const activeThread = getActiveThreadId()
       for (const [, cached] of getGeneratingMessagesCache()) {
         if (cached.threadId === activeThread) {
-          cacheMessageForView(await enrichMessageWithExtra(cached.message))
-          ensureMessageId(cached.message.id)
+          const enriched = await enrichMessageWithExtra(cached.message)
+          if (!enriched.is_variant) {
+            cacheMessageForView(enriched)
+            ensureMessageId(enriched.id)
+          }
         }
       }
       await prefetchMessagesForRange(0, Math.min(messageIds.length - 1, 50))
@@ -653,7 +659,7 @@ export const useChatStore = defineStore('chat', () => {
         threadId,
         JSON.stringify(content),
         getTabId(),
-        Object.fromEntries(selectedVariantsMap.value)
+        selectedVariantsMap.value
       )
 
       if (!aiResponseMessage) {
@@ -685,18 +691,40 @@ export const useChatStore = defineStore('chat', () => {
   const retryMessage = async (messageId: string) => {
     if (!getActiveThreadId()) return
     try {
-      const aiResponseMessage = await agentP.retryMessage(
-        messageId,
-        Object.fromEntries(selectedVariantsMap.value)
-      )
-      // 将消息添加到缓存
+      const aiResponseMessage = await agentP.retryMessage(messageId, selectedVariantsMap.value)
+      // 将正在生成的变体消息缓存起来，但不插入消息列表，避免额外的消息行
       getGeneratingMessagesCache().set(aiResponseMessage.id, {
         message: aiResponseMessage,
         threadId: getActiveThreadId()!
       })
-      cacheMessageForView(aiResponseMessage)
-      ensureMessageId(aiResponseMessage.id)
+      // 将新变体挂到主消息，确保流式更新能渲染到当前消息上
+      if (aiResponseMessage.parentId) {
+        const parentMsg = getCachedMessage(aiResponseMessage.parentId) as AssistantMessage | null
+        if (parentMsg) {
+          if (!parentMsg.variants) {
+            parentMsg.variants = []
+          }
+          const existingIndex = parentMsg.variants.findIndex((v) => v.id === aiResponseMessage.id)
+          if (existingIndex !== -1) {
+            parentMsg.variants[existingIndex] = aiResponseMessage
+          } else {
+            parentMsg.variants.push(aiResponseMessage)
+          }
+          cacheMessageForView({ ...parentMsg })
+          ensureMessageId(parentMsg.id)
+          await updateSelectedVariant(parentMsg.id, aiResponseMessage.id)
+        }
+      }
       await loadMessages()
+      if (aiResponseMessage.parentId) {
+        const mainMessage = await threadP.getMainMessageByParentId(
+          getActiveThreadId()!,
+          aiResponseMessage.parentId
+        )
+        if (mainMessage) {
+          await updateSelectedVariant(mainMessage.id, aiResponseMessage.id)
+        }
+      }
       generatingThreadIds.value.add(getActiveThreadId()!)
       // 设置当前会话的workingStatus为working
       updateThreadWorkingStatus(getActiveThreadId()!, 'working')
@@ -716,7 +744,7 @@ export const useChatStore = defineStore('chat', () => {
       const aiResponseMessage = await agentP.regenerateFromUserMessage(
         activeThread,
         userMessageId,
-        Object.fromEntries(selectedVariantsMap.value)
+        selectedVariantsMap.value
       )
 
       getGeneratingMessagesCache().set(aiResponseMessage.id, {
@@ -733,6 +761,25 @@ export const useChatStore = defineStore('chat', () => {
     }
   }
 
+  const retryFromUserMessage = async (userMessageId: string) => {
+    const activeThread = getActiveThreadId()
+    if (!activeThread) return false
+
+    try {
+      const mainMessage = await threadP.getMainMessageByParentId(activeThread, userMessageId)
+      if (mainMessage) {
+        await retryMessage(mainMessage.id)
+        return true
+      }
+
+      await regenerateFromUserMessage(userMessageId)
+      return true
+    } catch (error) {
+      console.error('Failed to retry from user message:', error)
+      throw error
+    }
+  }
+
   // 创建会话分支（从指定消息开始fork一个新会话）
   const forkThread = async (messageId: string, forkTag: string = '(fork)') => {
     const activeThread = getActiveThreadId()
@@ -751,7 +798,7 @@ export const useChatStore = defineStore('chat', () => {
         messageId,
         newThreadTitle,
         currentThread.settings,
-        Object.fromEntries(selectedVariantsMap.value)
+        selectedVariantsMap.value
       )
 
       // 切换到新会话
@@ -1065,7 +1112,9 @@ export const useChatStore = defineStore('chat', () => {
       // 如果是当前激活的会话，更新显示
       if (cached.threadId === getActiveThreadId()) {
         cacheMessageForView(curMsg)
-        ensureMessageId(curMsg.id)
+        if (!curMsg.is_variant) {
+          ensureMessageId(curMsg.id)
+        }
       }
     }
   }
@@ -1249,11 +1298,9 @@ export const useChatStore = defineStore('chat', () => {
         }
         // Populate the in-memory map from the loaded settings
         if (conversation.settings.selectedVariantsMap) {
-          selectedVariantsMap.value = new Map(
-            Object.entries(conversation.settings.selectedVariantsMap)
-          )
+          selectedVariantsMap.value = { ...conversation.settings.selectedVariantsMap }
         } else {
-          selectedVariantsMap.value.clear()
+          selectedVariantsMap.value = {}
         }
       }
     } catch (error) {
@@ -1290,8 +1337,8 @@ export const useChatStore = defineStore('chat', () => {
       let parentIndex = -1
       const mainMsgIndex = messages.findIndex((m) => m.id === messageId)
       if (mainMsgIndex !== -1 && (messages[mainMsgIndex] as AssistantMessage).is_variant === 0) {
-        if (selectedVariantsMap.value.has(messageId)) {
-          selectedVariantsMap.value.delete(messageId)
+        if (selectedVariantsMap.value[messageId]) {
+          delete selectedVariantsMap.value[messageId]
           await updateSelectedVariant(messageId, null)
         }
       } else {
@@ -1377,7 +1424,9 @@ export const useChatStore = defineStore('chat', () => {
         const updatedMessage = await threadP.getMessage(messageId)
         const enrichedMessage = await enrichMessageWithExtra(updatedMessage)
         cacheMessageForView(enrichedMessage)
-        ensureMessageId(enrichedMessage.id)
+        if (!enrichedMessage.is_variant) {
+          ensureMessageId(enrichedMessage.id)
+        }
       }
     } catch (error) {
       console.error('Failed to cancel generation:', error)
@@ -1394,7 +1443,7 @@ export const useChatStore = defineStore('chat', () => {
       const aiResponseMessage = await agentP.continueLoop(
         conversationId,
         messageId,
-        Object.fromEntries(selectedVariantsMap.value)
+        selectedVariantsMap.value
       )
 
       if (!aiResponseMessage) {
@@ -1456,22 +1505,43 @@ export const useChatStore = defineStore('chat', () => {
 
       // 如果是当前会话的消息，也更新显示
       if (cached.threadId === getActiveThreadId()) {
+        if (enrichedMessage.is_variant && enrichedMessage.parentId) {
+          const mainMessage = await threadP.getMainMessageByParentId(
+            cached.threadId,
+            enrichedMessage.parentId
+          )
+          if (mainMessage) {
+            const enrichedMainMessage = await enrichMessageWithExtra(mainMessage)
+            cacheMessageForView(enrichedMainMessage as AssistantMessage | UserMessage)
+            ensureMessageId(enrichedMainMessage.id)
+            return
+          }
+        }
+
         cacheMessageForView(enrichedMessage as AssistantMessage | UserMessage)
-        ensureMessageId(enrichedMessage.id)
+        if (!enrichedMessage.is_variant) {
+          ensureMessageId(enrichedMessage.id)
+        }
       }
     } else if (getActiveThreadId()) {
-      // 如果不在缓存中，先尝试获取主消息
-      const mainMessage = await threadP.getMainMessageByParentId(getActiveThreadId()!, msgId)
-      if (mainMessage) {
-        // 如果找到主消息，说明当前消息是变体消息
-        const enrichedMainMessage = await enrichMessageWithExtra(mainMessage)
-        cacheMessageForView(enrichedMainMessage as AssistantMessage | UserMessage)
-        ensureMessageId(enrichedMainMessage.id)
-      } else {
-        // 如果不是变体消息，直接更新当前消息
-        const updatedMessage = await threadP.getMessage(msgId)
-        const enrichedMessage = await enrichMessageWithExtra(updatedMessage)
-        cacheMessageForView(enrichedMessage as AssistantMessage | UserMessage)
+      const updatedMessage = await threadP.getMessage(msgId)
+      const enrichedMessage = await enrichMessageWithExtra(updatedMessage)
+
+      if (enrichedMessage.is_variant && enrichedMessage.parentId) {
+        const mainMessage = await threadP.getMainMessageByParentId(
+          getActiveThreadId()!,
+          enrichedMessage.parentId
+        )
+        if (mainMessage) {
+          const enrichedMainMessage = await enrichMessageWithExtra(mainMessage)
+          cacheMessageForView(enrichedMainMessage as AssistantMessage | UserMessage)
+          ensureMessageId(enrichedMainMessage.id)
+          return
+        }
+      }
+
+      cacheMessageForView(enrichedMessage as AssistantMessage | UserMessage)
+      if (!enrichedMessage.is_variant) {
         ensureMessageId(enrichedMessage.id)
       }
     }
@@ -1483,31 +1553,37 @@ export const useChatStore = defineStore('chat', () => {
     const activeThreadId = getActiveThreadId()
     if (!activeThreadId) return
 
-    // 更新内存中的 Map
+    isUpdatingVariant = true
+
+    // 更新内存中的映射
     if (selectedVariantId && selectedVariantId !== mainMessageId) {
-      selectedVariantsMap.value.set(mainMessageId, selectedVariantId)
+      selectedVariantsMap.value[mainMessageId] = selectedVariantId
     } else {
-      selectedVariantsMap.value.delete(mainMessageId)
+      delete selectedVariantsMap.value[mainMessageId]
     }
 
-    // 同步更新 chatConfig 内的 selectedVariantsMap
+    // 同步更新 chatConfig
     if (chatConfig.value) {
-      chatConfig.value.selectedVariantsMap = Object.fromEntries(selectedVariantsMap.value)
+      chatConfig.value.selectedVariantsMap = { ...selectedVariantsMap.value }
     }
 
     // 持久化到后端
     try {
       await threadP.updateConversationSettings(activeThreadId, {
-        selectedVariantsMap: Object.fromEntries(selectedVariantsMap.value)
+        selectedVariantsMap: selectedVariantsMap.value
       })
     } catch (error) {
       console.error('Failed to update selected variant:', error)
+    } finally {
+      setTimeout(() => {
+        isUpdatingVariant = false
+      }, 100)
     }
   }
 
   const clearSelectedVariantForMessage = (mainMessageId: string): boolean => {
     if (!mainMessageId) return false
-    if (!selectedVariantsMap.value.has(mainMessageId)) return false
+    if (!selectedVariantsMap.value[mainMessageId]) return false
     void updateSelectedVariant(mainMessageId, null)
     return true
   }
@@ -1646,14 +1722,17 @@ export const useChatStore = defineStore('chat', () => {
         // 2. 用主进程推送的最新、完整的、已格式化好的列表直接替换本地状态
         threads.value = updatedGroupedList
 
-        // 3. 检查列表更新之前的活动会话是否还存在于新列表中
+        // 3. 检查活动会话是否还存在
         if (currentActiveId) {
           const flatList = updatedGroupedList.flatMap((g) => g.dtThreads)
-          const activeThreadExists = flatList.some((thread) => thread.id === currentActiveId)
+          const activeThread = flatList.find((thread) => thread.id === currentActiveId)
 
-          // 如果活动会话不存在了（如在其他窗口被删除），只清空当前tab的活动状态，待其他流程处理
-          if (!activeThreadExists) {
+          if (!activeThread) {
+            // 如果活动会话不存在了（如在其他窗口被删除），清空当前tab的活动状态
             clearActiveThread()
+          } else if (!isUpdatingVariant && activeThread.settings.selectedVariantsMap) {
+            // 只在非变体更新期间，同步 selectedVariantsMap（防止其他窗口的更新被覆盖）
+            selectedVariantsMap.value = { ...activeThread.settings.selectedVariantsMap }
           }
         }
       }
@@ -1935,6 +2014,7 @@ export const useChatStore = defineStore('chat', () => {
     getNowledgeMemConfig,
     showProviderSelector,
     regenerateFromUserMessage,
+    retryFromUserMessage,
     updateSelectedVariant
   }
 })