From 5ed4d648e4159c09b2bc9feac76a249f80ad2b15 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Thu, 9 Oct 2025 11:35:13 +0800
Subject: [PATCH 01/25] feat(chat): implement message editing and copying
 functionality in User component

---
 .../components/Chat/Messages/User.vue         | 145 ++++++++++++++++++
 .../sidepanel/components/Chat/index.vue       |  49 ++++--
 entrypoints/sidepanel/utils/chat/chat.ts      |  42 +++++
 locales/de.json                               |   7 +-
 locales/en.json                               |   7 +-
 locales/es.json                               |   7 +-
 locales/fr.json                               |   7 +-
 locales/id.json                               |   7 +-
 locales/ja.json                               |   7 +-
 locales/ko.json                               |   7 +-
 locales/pt.json                               |   7 +-
 locales/ru.json                               |   7 +-
 locales/th.json                               |   7 +-
 locales/vi.json                               |   7 +-
 locales/zh-CN.json                            |   7 +-
 locales/zh-TW.json                            |   7 +-
 16 files changed, 291 insertions(+), 36 deletions(-)
 create mode 100644 entrypoints/sidepanel/components/Chat/Messages/User.vue

diff --git a/entrypoints/sidepanel/components/Chat/Messages/User.vue b/entrypoints/sidepanel/components/Chat/Messages/User.vue
new file mode 100644
index 00000000..af957096
--- /dev/null
+++ b/entrypoints/sidepanel/components/Chat/Messages/User.vue
@@ -0,0 +1,145 @@
+<template>
+  <div class="flex flex-col items-end max-w-full">
+    <div class="relative group/message max-w-full">
+      <div
+        v-if="!isEditing"
+        class="text-sm inline-block bg-accent-primary rounded-md p-3 max-w-full text-white"
+      >
+        <div class="wrap-anywhere">
+          <MarkdownViewer :text="message.displayContent ?? message.content" />
+        </div>
+      </div>
+      <div
+        v-else
+        class="rounded-md border border-border-chat-input bg-bg-chat-input text-text-primary p-2 max-w-full min-w-[220px]"
+      >
+        <AutoExpandTextArea
+          ref="editTextareaRef"
+          v-model="draft"
+          class="w-full bg-transparent border-none outline-none resize-none text-sm leading-5"
+        />
+        <div class="flex justify-end gap-1 mt-2">
+          <Tooltip :content="t('common.cancel')">
+            <button
+              class="size-6 flex items-center justify-center rounded-md bg-bg-secondary text-text-tertiary hover:bg-bg-hover transition-colors"
+              type="button"
+              @click="$emit('cancelEdit')"
+            >
+              <IconClose class="size-3.5" />
+            </button>
+          </Tooltip>
+          <Tooltip :content="t('common.send')">
+            <button
+              class="size-6 flex items-center justify-center rounded-md transition-colors"
+              :class="canSubmit
+                ? 'bg-accent-primary hover:bg-accent-primary-hover text-white'
+                : 'bg-border-disabled text-text-disabled cursor-not-allowed'"
+              :disabled="!canSubmit"
+              type="button"
+              @click="onSubmit"
+            >
+              <IconSendFill class="size-3.5" />
+            </button>
+          </Tooltip>
+        </div>
+      </div>
+
+      <div
+        v-if="!isEditing"
+        class="absolute bottom-1 right-1 flex gap-1 opacity-0 group-hover/message:opacity-100 transition-opacity"
+      >
+        <Tooltip :content="t('tooltips.copy_message')">
+          <button
+            class="size-6 flex items-center justify-center rounded-md bg-bg-secondary text-text-tertiary hover:bg-bg-hover transition-colors"
+            type="button"
+            @click="copyMessage"
+          >
+            <IconCopy class="size-3.5" />
+          </button>
+        </Tooltip>
+        <Tooltip :content="t('tooltips.edit_message')">
+          <button
+            class="size-6 flex items-center justify-center rounded-md transition-colors"
+            :class="disabled
+              ? 'bg-border-disabled text-text-disabled cursor-not-allowed'
+              : 'bg-bg-secondary text-text-tertiary hover:bg-bg-hover'"
+            type="button"
+            :disabled="disabled"
+            @click="$emit('startEdit')"
+          >
+            <IconEdit class="size-3.5" />
+          </button>
+        </Tooltip>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, nextTick, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import IconClose from '@/assets/icons/close.svg?component'
+import IconCopy from '@/assets/icons/copy.svg?component'
+import IconEdit from '@/assets/icons/edit-pencil.svg?component'
+import IconSendFill from '@/assets/icons/send-fill.svg?component'
+import AutoExpandTextArea from '@/components/AutoExpandTextArea.vue'
+import MarkdownViewer from '@/components/MarkdownViewer.vue'
+import Tooltip from '@/components/ui/Tooltip.vue'
+import type { UserMessageV1 } from '@/types/chat'
+import logger from '@/utils/logger'
+
+const props = defineProps<{
+  message: UserMessageV1
+  isEditing: boolean
+  disabled?: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'startEdit'): void
+  (e: 'cancelEdit'): void
+  (e: 'submitEdit', value: string): void
+}>()
+
+const { t } = useI18n()
+const draft = ref(props.message.displayContent ?? props.message.content)
+const editTextareaRef = ref<InstanceType<typeof AutoExpandTextArea>>()
+const log = logger.child('chat-user-message')
+
+const canSubmit = computed(() => draft.value.trim().length > 0)
+
+const ensureDraftFromMessage = () => {
+  draft.value = props.message.displayContent ?? props.message.content
+}
+
+watch(() => [props.message.displayContent, props.message.content], () => {
+  if (!props.isEditing) ensureDraftFromMessage()
+})
+
+watch(() => props.isEditing, async (isEditing) => {
+  if (isEditing) {
+    ensureDraftFromMessage()
+    await nextTick()
+    const textareaEl = editTextareaRef.value?.$el as HTMLTextAreaElement | undefined
+    textareaEl?.focus()
+  }
+})
+
+const copyMessage = async () => {
+  try {
+    await navigator.clipboard.writeText(props.message.displayContent ?? props.message.content)
+  }
+  catch (error) {
+    log.error('Failed to copy message', error)
+  }
+}
+
+const onSubmit = () => {
+  if (!canSubmit.value) return
+  emit('submitEdit', draft.value.trim())
+}
+
+defineExpose({
+  focus: () => (editTextareaRef.value?.$el as HTMLTextAreaElement | undefined)?.focus(),
+})
+</script>
diff --git a/entrypoints/sidepanel/components/Chat/index.vue b/entrypoints/sidepanel/components/Chat/index.vue
index 47cadcdf..9fe12b87 100644
--- a/entrypoints/sidepanel/components/Chat/index.vue
+++ b/entrypoints/sidepanel/components/Chat/index.vue
@@ -19,16 +19,15 @@
           :class="[item.role === 'user' ? 'self-end' : 'self-start', { 'w-full': ['agent-task-group', 'assistant', 'agent'].includes(item.role) ,'mt-2': ['agent-task-group', 'assistant', 'agent'].includes(item.role) }]"
           class="max-w-full relative flex"
         >
-          <div
+          <MessageUser
             v-if="item.role === 'user'"
-            class="flex flex-col items-end"
-          >
-            <div class="text-sm inline-block bg-accent-primary rounded-md p-3 max-w-full">
-              <div class="wrap-anywhere text-white">
-                <MarkdownViewer :text="item.displayContent ?? item.content" />
-              </div>
-            </div>
-          </div>
+            :message="item"
+            :isEditing="editingMessageId === item.id"
+            :disabled="chat.isAnswering() || editingInFlight"
+            @startEdit="onStartEdit(item.id)"
+            @cancelEdit="() => onCancelEdit(item.id)"
+            @submitEdit="(value) => onSubmitEdit(item.id, value)"
+          />
           <MessageAssistant
             v-else-if="item.role === 'assistant' || item.role === 'agent'"
             :message="item"
@@ -140,10 +139,10 @@ import ScrollContainer from '@/components/ScrollContainer.vue'
 import Button from '@/components/ui/Button.vue'
 import { FileGetter } from '@/utils/file'
 import { useI18n } from '@/utils/i18n'
+import logger from '@/utils/logger'
 import { setSidepanelStatus } from '@/utils/sidepanel-status'
 import { classNames } from '@/utils/vue/utils'
 
-import MarkdownViewer from '../../../../components/MarkdownViewer.vue'
 import { showSettings } from '../../../../utils/settings'
 import {
   ActionEvent,
@@ -155,6 +154,7 @@ import MessageAction from './Messages/Action.vue'
 import MessageTaskGroup from './Messages/AgentTaskGroup.vue'
 import MessageAssistant from './Messages/Assistant.vue'
 import MessageTask from './Messages/Task.vue'
+import MessageUser from './Messages/User.vue'
 import OnlineSearchSwitch from './OnlineSearchSwitch.vue'
 import ThinkingModeSwitch from './ThinkingModeSwitch.vue'
 
@@ -167,6 +167,9 @@ const userInput = ref('')
 const isComposing = ref(false)
 const attachmentSelectorRef = ref<InstanceType<typeof AttachmentSelector>>()
 const scrollContainerRef = ref<InstanceType<typeof ScrollContainer>>()
+const editingMessageId = ref<string | null>(null)
+const editingInFlight = ref(false)
+const log = logger.child('chat-sidepanel')
 
 defineExpose({
   attachmentSelectorRef,
@@ -194,6 +197,32 @@ const allowAsk = computed(() => {
   return !chat.isAnswering() && userInput.value.trim().length > 0
 })
 
+const onStartEdit = (messageId: string) => {
+  if (chat.isAnswering() || editingInFlight.value) return
+  editingMessageId.value = messageId
+}
+
+const onCancelEdit = (messageId: string) => {
+  if (editingMessageId.value === messageId) {
+    editingMessageId.value = null
+  }
+}
+
+const onSubmitEdit = async (messageId: string, value: string) => {
+  if (editingInFlight.value) return
+  editingMessageId.value = null
+  editingInFlight.value = true
+  try {
+    await chat.editUserMessage(messageId, value)
+  }
+  catch (error) {
+    log.error('Failed to re-send edited message', error)
+  }
+  finally {
+    editingInFlight.value = false
+  }
+}
+
 const cleanUp = chat.historyManager.onMessageAdded(() => {
   scrollContainerRef.value?.snapToBottom()
 })
diff --git a/entrypoints/sidepanel/utils/chat/chat.ts b/entrypoints/sidepanel/utils/chat/chat.ts
index a52bdf65..7bc2f8f2 100644
--- a/entrypoints/sidepanel/utils/chat/chat.ts
+++ b/entrypoints/sidepanel/utils/chat/chat.ts
@@ -536,6 +536,48 @@ export class Chat {
     await this.runWithAgent(baseMessages)
   }
 
+  async editUserMessage(messageId: string, question: string) {
+    const trimmedQuestion = question.trim()
+    if (!trimmedQuestion) throw new Error('Question cannot be empty.')
+
+    const messageIndex = this.historyManager.history.value.findIndex((item) => item.id === messageId)
+    if (messageIndex === -1) throw new Error(`Message with id ${messageId} not found.`)
+    const message = this.historyManager.history.value[messageIndex]
+    if (message.role !== 'user') throw new Error(`Message with id ${messageId} is not a user message.`)
+
+    this.stop()
+    using _s = this.statusScope('pending')
+    const abortController = new AbortController()
+    this.abortControllers.push(abortController)
+
+    this.historyManager.chatHistory.value.lastInteractedAt = Date.now()
+
+    if (messageIndex < this.historyManager.history.value.length - 1) {
+      this.historyManager.history.value.splice(messageIndex + 1)
+    }
+
+    const contextInfo = this.historyManager.chatHistory.value.contextUpdateInfo
+    if (contextInfo?.lastFullUpdateMessageId) {
+      const exists = this.historyManager.history.value.some((item) => item.id === contextInfo.lastFullUpdateMessageId)
+      if (!exists) {
+        contextInfo.lastFullUpdateMessageId = undefined
+      }
+    }
+
+    const environmentDetails = await this.generateEnvironmentDetails(message.id)
+    const prompt = await chatWithEnvironment(trimmedQuestion, environmentDetails)
+
+    message.displayContent = trimmedQuestion
+    message.content = prompt.user.extractText()
+    message.timestamp = Date.now()
+    message.done = true
+
+    const baseMessages = this.historyManager.getLLMMessages({ system: prompt.system, lastUser: prompt.user })
+    await this.prepareModel()
+    if (this.contextPDFs.length > 1) log.warn('Multiple PDFs are attached, only the first one will be used for the chat context.')
+    await this.runWithAgent(baseMessages)
+  }
+
   private async runWithAgent(baseMessages: CoreMessage[]) {
     const userConfig = await getUserConfig()
     const maxIterations = userConfig.chat.agent.maxIterations.get()
diff --git a/locales/de.json b/locales/de.json
index 9d761d29..05cd640d 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -438,7 +438,8 @@
       "years": "{year} Jahr | {year} Jahre",
       "months": "{month} Monat | {month} Monate"
     },
-    "confirm": "Bestätigen"
+    "confirm": "Bestätigen",
+    "send": "Senden"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "Schließen",
     "chat_history": "Geschichte",
     "new_chat": "Neuer Chat",
-    "back": "Zurück"
+    "back": "Zurück",
+    "copy_message": "Nachricht kopieren",
+    "edit_message": "Nachricht bearbeiten"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/en.json b/locales/en.json
index 5b52d4c8..6c2975fe 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -417,7 +417,8 @@
       "years": "{year} year | {year} years",
       "months": "{month} month | {month} months"
     },
-    "confirm": "Confirm"
+    "confirm": "Confirm",
+    "send": "Send"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "Close",
     "chat_history": "History",
     "new_chat": "New Chat",
-    "back": "Back"
+    "back": "Back",
+    "copy_message": "Copy message",
+    "edit_message": "Edit message"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/es.json b/locales/es.json
index f0db0018..ffdb4e95 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -417,7 +417,8 @@
       "years": "{year} año | {year} años",
       "months": "{month} mes | {month} meses"
     },
-    "confirm": "Confirmar"
+    "confirm": "Confirmar",
+    "send": "Enviar"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "Cerrar",
     "chat_history": "Historia",
     "new_chat": "Nuevo chat",
-    "back": "Atrás"
+    "back": "Atrás",
+    "copy_message": "Copiar mensaje",
+    "edit_message": "Editar mensaje"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/fr.json b/locales/fr.json
index 57dc4615..169e82ca 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -417,7 +417,8 @@
       "years": "{year} an | {year} ans",
       "months": "{month} mois | {month} mois"
     },
-    "confirm": "Confirmer"
+    "confirm": "Confirmer",
+    "send": "Envoyer"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "Fermer",
     "chat_history": "Histoire",
     "new_chat": "Nouveau chat",
-    "back": "Retour"
+    "back": "Retour",
+    "copy_message": "Copier le message",
+    "edit_message": "Modifier le message"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/id.json b/locales/id.json
index c74f293f..e4ed9666 100644
--- a/locales/id.json
+++ b/locales/id.json
@@ -417,7 +417,8 @@
       "years": "{year} tahun | {year} tahun",
       "months": "{month} bulan | {month} bulan"
     },
-    "confirm": "Konfirmasi"
+    "confirm": "Konfirmasi",
+    "send": "Kirim"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "Tutup",
     "chat_history": "Sejarah",
     "new_chat": "Obrolan baru",
-    "back": "Kembali"
+    "back": "Kembali",
+    "copy_message": "Salin pesan",
+    "edit_message": "Edit pesan"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/ja.json b/locales/ja.json
index c20c5c26..8c9a0f5f 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -417,7 +417,8 @@
       "years": "{year}年 | {year}年",
       "months": "{month}ヶ月 | {month}ヶ月"
     },
-    "confirm": "確認"
+    "confirm": "確認",
+    "send": "送信"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "閉じる",
     "chat_history": "歴史",
     "new_chat": "新しいチャット",
-    "back": "戻る"
+    "back": "戻る",
+    "copy_message": "メッセージをコピー",
+    "edit_message": "メッセージを編集"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/ko.json b/locales/ko.json
index fa2887de..e923d9ff 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -417,7 +417,8 @@
       "years": "{year}년 | {year}년",
       "months": "{month}개월 | {month}개월"
     },
-    "confirm": "확인"
+    "confirm": "확인",
+    "send": "보내기"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "닫기",
     "chat_history": "역사",
     "new_chat": "새로운 채팅",
-    "back": "뒤로"
+    "back": "뒤로",
+    "copy_message": "메시지 복사",
+    "edit_message": "메시지 수정"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/pt.json b/locales/pt.json
index 58e50a1d..62643d44 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -417,7 +417,8 @@
       "years": "{year} ano | {year} anos",
       "months": "{month} mês | {month} meses"
     },
-    "confirm": "Confirmar"
+    "confirm": "Confirmar",
+    "send": "Enviar"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "Fechar",
     "chat_history": "História",
     "new_chat": "Novo bate -papo",
-    "back": "Voltar"
+    "back": "Voltar",
+    "copy_message": "Copiar mensagem",
+    "edit_message": "Editar mensagem"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/ru.json b/locales/ru.json
index 93beda36..1dbab26c 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -417,7 +417,8 @@
       "years": "{year} год | {year} лет",
       "months": "{month} месяц | {month} месяца | {month} месяцев"
     },
-    "confirm": "Подтвердить"
+    "confirm": "Подтвердить",
+    "send": "Отправить"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "Закрыть",
     "chat_history": "История",
     "new_chat": "Новый чат",
-    "back": "Назад"
+    "back": "Назад",
+    "copy_message": "Скопировать сообщение",
+    "edit_message": "Редактировать сообщение"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/th.json b/locales/th.json
index 7587af5d..bd2f74e5 100644
--- a/locales/th.json
+++ b/locales/th.json
@@ -417,7 +417,8 @@
       "years": "{year} ปี | {year} ปี",
       "months": "{month} เดือน | {month} เดือน"
     },
-    "confirm": "ยืนยัน"
+    "confirm": "ยืนยัน",
+    "send": "ส่ง"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "ปิด",
     "chat_history": "ประวัติศาสตร์",
     "new_chat": "แชทใหม่",
-    "back": "กลับ"
+    "back": "กลับ",
+    "copy_message": "คัดลอกข้อความ",
+    "edit_message": "แก้ไขข้อความ"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/vi.json b/locales/vi.json
index e8e4537f..50632761 100644
--- a/locales/vi.json
+++ b/locales/vi.json
@@ -417,7 +417,8 @@
       "years": "{year} năm | {year} năm",
       "months": "{month} tháng | {month} tháng"
     },
-    "confirm": "Xác nhận"
+    "confirm": "Xác nhận",
+    "send": "Gửi"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "Đóng",
     "chat_history": "Lịch sử",
     "new_chat": "Trò chuyện mới",
-    "back": "Quay lại"
+    "back": "Quay lại",
+    "copy_message": "Sao chép tin nhắn",
+    "edit_message": "Chỉnh sửa tin nhắn"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index bee4d513..ec97b663 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -417,7 +417,8 @@
       "years": "{year} 年 | {year} 年",
       "months": "{month} 个月 | {month} 个月"
     },
-    "confirm": "确认"
+    "confirm": "确认",
+    "send": "发送"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "关闭",
     "chat_history": "历史",
     "new_chat": "新聊天",
-    "back": "返回"
+    "back": "返回",
+    "copy_message": "复制消息",
+    "edit_message": "编辑消息"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index 47752408..f741c8f5 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -417,7 +417,8 @@
       "years": "{year} 年 | {year} 年",
       "months": "{month} 個月 | {month} 個月"
     },
-    "confirm": "確認"
+    "confirm": "確認",
+    "send": "傳送"
   },
   "ollama": {
     "sites": {
@@ -453,7 +454,9 @@
     "close": "關閉",
     "chat_history": "歷史",
     "new_chat": "新聊天",
-    "back": "返回"
+    "back": "返回",
+    "copy_message": "複製訊息",
+    "edit_message": "編輯訊息"
   },
   "gmail_tools": {
     "buttons": {

From 88ed48d7fe87665fe6fb08ff734c166efee1b60b Mon Sep 17 00:00:00 2001
From: Neko Liu <NekoWings@outlook.com>
Date: Fri, 10 Oct 2025 13:26:06 +0800
Subject: [PATCH 02/25] feat(chat): enhance message editing UI with scroll
 container and improved button functionality

---
 .../components/Chat/Messages/User.vue         | 129 ++++++++++++------
 1 file changed, 87 insertions(+), 42 deletions(-)

diff --git a/entrypoints/sidepanel/components/Chat/Messages/User.vue b/entrypoints/sidepanel/components/Chat/Messages/User.vue
index af957096..b561b412 100644
--- a/entrypoints/sidepanel/components/Chat/Messages/User.vue
+++ b/entrypoints/sidepanel/components/Chat/Messages/User.vue
@@ -11,63 +11,93 @@
       </div>
       <div
         v-else
-        class="rounded-md border border-border-chat-input bg-bg-chat-input text-text-primary p-2 max-w-full min-w-[220px]"
+        class="flex relative rounded-md border border-border-chat-input bg-bg-chat-input text-text-primary p-2 max-w-full min-w-[220px] focus-within:shadow-[0px_0px_0px_1px_var(--color-border-accent)] max-h-24"
       >
-        <AutoExpandTextArea
-          ref="editTextareaRef"
-          v-model="draft"
-          class="w-full bg-transparent border-none outline-none resize-none text-sm leading-5"
-        />
-        <div class="flex justify-end gap-1 mt-2">
-          <Tooltip :content="t('common.cancel')">
-            <button
-              class="size-6 flex items-center justify-center rounded-md bg-bg-secondary text-text-tertiary hover:bg-bg-hover transition-colors"
-              type="button"
-              @click="$emit('cancelEdit')"
-            >
-              <IconClose class="size-3.5" />
-            </button>
-          </Tooltip>
-          <Tooltip :content="t('common.send')">
-            <button
-              class="size-6 flex items-center justify-center rounded-md transition-colors"
-              :class="canSubmit
-                ? 'bg-accent-primary hover:bg-accent-primary-hover text-white'
-                : 'bg-border-disabled text-text-disabled cursor-not-allowed'"
-              :disabled="!canSubmit"
-              type="button"
-              @click="onSubmit"
-            >
-              <IconSendFill class="size-3.5" />
-            </button>
-          </Tooltip>
-        </div>
+        <ScrollContainer
+          class="overflow-hidden w-full"
+          :arrivalShadow="{
+            top: { color: 'var(--color-bg-primary', size: 12, offset: 8 },
+            bottom: { color: 'var(--color-bg-primary', size: 12, offset: 8 }
+          }"
+        >
+          <AutoExpandTextArea
+            ref="editTextareaRef"
+            v-model="draft"
+            class="w-full bg-transparent border-none outline-none resize-none text-sm leading-5"
+          />
+        </ScrollContainer>
       </div>
 
       <div
-        v-if="!isEditing"
-        class="absolute bottom-1 right-1 flex gap-1 opacity-0 group-hover/message:opacity-100 transition-opacity"
+        v-if="isEditing"
+        class="flex justify-end mt-2 gap-2"
       >
-        <Tooltip :content="t('tooltips.copy_message')">
+        <Tooltip
+          :content="t('common.send')"
+          position="bottom"
+        >
           <button
-            class="size-6 flex items-center justify-center rounded-md bg-bg-secondary text-text-tertiary hover:bg-bg-hover transition-colors"
+            class="size-5 flex items-center justify-center rounded-md transition-colors"
+            :class="canSubmit
+              ? 'bg-accent-primary hover:bg-accent-primary-hover text-white'
+              : 'bg-border-disabled text-text-disabled cursor-not-allowed'"
+            :disabled="!canSubmit"
             type="button"
-            @click="copyMessage"
+            @click="onSubmit"
           >
-            <IconCopy class="size-3.5" />
+            <IconSendFill class="size-2" />
           </button>
         </Tooltip>
-        <Tooltip :content="t('tooltips.edit_message')">
+        <Tooltip
+          :content="t('common.cancel')"
+          position="bottom"
+        >
           <button
-            class="size-6 flex items-center justify-center rounded-md transition-colors"
+            class="size-5 flex items-center justify-center rounded-md bg-bg-secondary text-text-tertiary hover:bg-bg-hover transition-colors"
+            type="button"
+            @click="$emit('cancelEdit')"
+          >
+            <IconClose class="size-4" />
+          </button>
+        </Tooltip>
+      </div>
+      <div
+        v-else
+        class="flex justify-end mt-2 gap-2 opacity-0 group-hover/message:opacity-100 transition-opacity"
+      >
+        <Tooltip
+          :content="t('tooltips.edit_message')"
+          position="bottom"
+        >
+          <button
+            class="size-5 flex items-center justify-center rounded-md transition-colors"
             :class="disabled
-              ? 'bg-border-disabled text-text-disabled cursor-not-allowed'
-              : 'bg-bg-secondary text-text-tertiary hover:bg-bg-hover'"
+              ? 'text-text-disabled cursor-not-allowed'
+              : 'text-text-secondary hover:bg-bg-hover'"
             type="button"
             :disabled="disabled"
             @click="$emit('startEdit')"
           >
-            <IconEdit class="size-3.5" />
+            <IconEdit class="size-4" />
+          </button>
+        </Tooltip>
+        <Tooltip
+          :content="t('tooltips.copy_message')"
+          position="bottom"
+        >
+          <button
+            class="size-5 flex items-center justify-center rounded-md text-text-secondary hover:bg-bg-hover transition-colors"
+            type="button"
+            @click="copyMessage"
+          >
+            <IconTick
+              v-if="copied"
+              class="size-4"
+            />
+            <IconCopy
+              v-else
+              class="size-4"
+            />
           </button>
         </Tooltip>
       </div>
@@ -76,15 +106,17 @@
 </template>
 
 <script setup lang="ts">
-import { computed, nextTick, ref, watch } from 'vue'
+import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import IconClose from '@/assets/icons/close.svg?component'
 import IconCopy from '@/assets/icons/copy.svg?component'
 import IconEdit from '@/assets/icons/edit-pencil.svg?component'
 import IconSendFill from '@/assets/icons/send-fill.svg?component'
+import IconTick from '@/assets/icons/tick.svg?component'
 import AutoExpandTextArea from '@/components/AutoExpandTextArea.vue'
 import MarkdownViewer from '@/components/MarkdownViewer.vue'
+import ScrollContainer from '@/components/ScrollContainer.vue'
 import Tooltip from '@/components/ui/Tooltip.vue'
 import type { UserMessageV1 } from '@/types/chat'
 import logger from '@/utils/logger'
@@ -106,6 +138,9 @@ const draft = ref(props.message.displayContent ?? props.message.content)
 const editTextareaRef = ref<InstanceType<typeof AutoExpandTextArea>>()
 const log = logger.child('chat-user-message')
 
+const copied = ref(false)
+let copyResetTimer: ReturnType<typeof setTimeout> | undefined
+
 const canSubmit = computed(() => draft.value.trim().length > 0)
 
 const ensureDraftFromMessage = () => {
@@ -128,12 +163,22 @@ watch(() => props.isEditing, async (isEditing) => {
 const copyMessage = async () => {
   try {
     await navigator.clipboard.writeText(props.message.displayContent ?? props.message.content)
+    copied.value = true
+    if (copyResetTimer) clearTimeout(copyResetTimer)
+    copyResetTimer = setTimeout(() => {
+      copied.value = false
+      copyResetTimer = undefined
+    }, 2000)
   }
   catch (error) {
     log.error('Failed to copy message', error)
   }
 }
 
+onBeforeUnmount(() => {
+  if (copyResetTimer) clearTimeout(copyResetTimer)
+})
+
 const onSubmit = () => {
   if (!canSubmit.value) return
   emit('submitEdit', draft.value.trim())

From ccdf9828176f109a311f15f1093ae028c8196b61 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Thu, 16 Oct 2025 14:17:24 +0800
Subject: [PATCH 03/25] feat(selection): implement selection text tracking and
 integrate with llm

---
 entrypoints/content/App.vue                   |  2 +
 .../utils/page-injection/selection-tracker.ts | 51 ++++++++++++++
 .../components/AttachmentSelector.vue         | 67 ++++++++++++++++++-
 types/chat.ts                                 | 10 ++-
 utils/prompts/chat.ts                         | 11 ++-
 utils/rpc/background-fns.ts                   | 13 ++++
 utils/rpc/content-fns.ts                      |  8 +++
 utils/rpc/sidepanel-fns.ts                    |  1 +
 utils/user-config/defaults.ts                 | 14 ++--
 9 files changed, 167 insertions(+), 10 deletions(-)
 create mode 100644 entrypoints/content/utils/page-injection/selection-tracker.ts

diff --git a/entrypoints/content/App.vue b/entrypoints/content/App.vue
index 106854c4..092085e6 100644
--- a/entrypoints/content/App.vue
+++ b/entrypoints/content/App.vue
@@ -17,11 +17,13 @@ import { useTranslator } from './composables/useTranslator'
 import { initContextMenu } from './utils/context-menu'
 import { useInjectGmailTools } from './utils/page-injection/gmail-tools'
 import { useInjectOllamaDownloadButtons } from './utils/page-injection/ollama-search-page'
+import { useInjectSelectionTracker } from './utils/page-injection/selection-tracker'
 
 // init translator global event listeners
 useTranslator()
 useInjectOllamaDownloadButtons()
 useInjectGmailTools()
+useInjectSelectionTracker()
 initContextMenu()
 const toast = useToast()
 
diff --git a/entrypoints/content/utils/page-injection/selection-tracker.ts b/entrypoints/content/utils/page-injection/selection-tracker.ts
new file mode 100644
index 00000000..a4283801
--- /dev/null
+++ b/entrypoints/content/utils/page-injection/selection-tracker.ts
@@ -0,0 +1,51 @@
+import { onScopeDispose } from 'vue'
+
+import Logger from '@/utils/logger'
+import { c2bRpc } from '@/utils/rpc'
+
+const logger = Logger.child('selection-tracker')
+
+/**
+ * Inject selection change tracking into the page
+ * Automatically forwards selected text to sidepanel via background
+ */
+export function useInjectSelectionTracker() {
+  let selectionChangeTimeout: ReturnType<typeof setTimeout> | undefined
+
+  const handleSelectionChange = () => {
+    if (selectionChangeTimeout) {
+      clearTimeout(selectionChangeTimeout)
+    }
+
+    // Debounce: wait 300ms after user stops selecting
+    selectionChangeTimeout = setTimeout(async () => {
+      const selection = window.getSelection()
+      const selectedText = selection?.toString().trim() || ''
+
+      // Forward selection text to sidepanel via background
+      try {
+        const tabInfo = await c2bRpc.getTabInfo()
+        if (tabInfo.tabId) {
+          await c2bRpc.forwardSelectionText(tabInfo.tabId, selectedText)
+          logger.debug('Selection text forwarded', { textLength: selectedText.length })
+        }
+      }
+      catch (err) {
+        logger.debug('Failed to forward selection text', err)
+      }
+    }, 300)
+  }
+
+  // Register selection change listener
+  document.addEventListener('selectionchange', handleSelectionChange)
+  logger.debug('Selection tracker initialized')
+
+  // Clean up on component unmount
+  onScopeDispose(() => {
+    document.removeEventListener('selectionchange', handleSelectionChange)
+    if (selectionChangeTimeout) {
+      clearTimeout(selectionChangeTimeout)
+    }
+    logger.debug('Selection tracker disposed')
+  })
+}
diff --git a/entrypoints/sidepanel/components/AttachmentSelector.vue b/entrypoints/sidepanel/components/AttachmentSelector.vue
index 17c35072..474ecab9 100644
--- a/entrypoints/sidepanel/components/AttachmentSelector.vue
+++ b/entrypoints/sidepanel/components/AttachmentSelector.vue
@@ -149,6 +149,12 @@
               >
                 <IconAttachmentPDF class="w-3 h-3 text-text-secondary" />
               </div>
+              <div
+                v-else-if="attachment.type === 'selected-text'"
+                class="flex items-center justify-center w-3 h-4 shrink-0 grow-0 ml-[2px]"
+              >
+                <IconHighlight class="w-3 h-3 text-text-secondary" />
+              </div>
               <div
                 v-else-if="attachment.type === 'loading'"
                 class="flex items-center justify-center w-3 h-4 shrink-0 grow-0 ml-[2px]"
@@ -162,10 +168,15 @@
             </template>
             <template #text>
               <span
-                :title="attachment.type === 'tab' ? attachment.value.title : attachment.value.name"
+                :title="attachment.type === 'tab' ? attachment.value.title : (attachment.type === 'selected-text' ? attachment.value.text : attachment.value.name)"
                 class="text-xs text-text-secondary whitespace-nowrap max-w-28 overflow-hidden text-ellipsis"
               >
-                {{ attachment.type === 'tab' ? attachment.value.title : attachment.value.name }}
+                <template v-if="attachment.type === 'selected-text'">
+                  Selected Text: {{ attachment.value.text }}
+                </template>
+                <template v-else>
+                  {{ attachment.type === 'tab' ? attachment.value.title : attachment.value.name }}
+                </template>
               </span>
             </template>
             <template #button>
@@ -185,13 +196,14 @@
 
 <script setup lang="ts">
 import { useEventListener, useFileDialog, useVModel } from '@vueuse/core'
-import { computed, onMounted, ref, toRef } from 'vue'
+import { computed, onBeforeUnmount, onMounted, ref, toRef } from 'vue'
 import { browser } from 'wxt/browser'
 
 import IconAdd from '@/assets/icons/add.svg?component'
 import IconAttachmentImage from '@/assets/icons/attachment-image.svg?component'
 import IconAttachmentPDF from '@/assets/icons/attachment-pdf.svg?component'
 import IconAttachmentUpload from '@/assets/icons/attachment-upload.svg?component'
+import IconHighlight from '@/assets/icons/md-highlight-action.svg?component'
 import IconTab from '@/assets/icons/tab.svg?component'
 import IconClose from '@/assets/icons/tag-close.svg?component'
 import IconWarningSolid from '@/assets/icons/warning-solid.svg?component'
@@ -218,6 +230,7 @@ import { convertImageFileToJpegBase64 } from '@/utils/image'
 import { checkReadableTextContent, extractPdfText } from '@/utils/pdf'
 import { useLLMBackendStatusStore } from '@/utils/pinia-store/store'
 import { s2bRpc } from '@/utils/rpc'
+import { registerSidepanelRpcEvent } from '@/utils/rpc/sidepanel-fns'
 import { ByteSize } from '@/utils/sizes'
 import { tabToTabInfo } from '@/utils/tab'
 
@@ -674,6 +687,46 @@ const updateCurrentTabAttachment = async () => {
   }
 }
 
+// Handle selection change events from content scripts
+const handleSelectionChanged = async (opts: { tabId: number, selectedText: string }) => {
+  logger.debug('AttachmentSelector handleSelectionChanged')
+  const currentTab = await browser.tabs.query({ active: true, currentWindow: true }).then((tabs) => tabs[0])
+
+  // Only process if this is the active tab
+  if (!currentTab?.id || currentTab.id !== opts.tabId) return
+
+  const { selectedText } = opts
+
+  if (selectedText && selectedText.length > 0) {
+    // Check if we already have a selected-text attachment
+    const existingIndex = attachments.value.findIndex((a) => a.type === 'selected-text')
+
+    const selectedTextAttachment = {
+      type: 'selected-text' as const,
+      value: {
+        id: existingIndex !== -1 ? attachments.value[existingIndex].value.id : generateRandomId(),
+        text: selectedText,
+      },
+    }
+
+    if (existingIndex !== -1) {
+      // Update existing
+      attachments.value[existingIndex] = selectedTextAttachment
+    }
+    else {
+      // Add new
+      attachments.value.unshift(selectedTextAttachment)
+    }
+  }
+  else {
+    // Remove selected-text attachment if no text is selected
+    const existingIndex = attachments.value.findIndex((a) => a.type === 'selected-text')
+    if (existingIndex !== -1) {
+      attachments.value.splice(existingIndex, 1)
+    }
+  }
+}
+
 useEventListener(window, 'click', (e: MouseEvent) => {
   const target = (e.composed ? e.composedPath()[0] : e.target) as HTMLElement
   if (!selectorListContainer.value?.contains(target)) {
@@ -693,8 +746,16 @@ useEventListener(tabsContainerRef, 'wheel', (e: WheelEvent) => {
   }
 })
 
+// Register event listener for selection changes from content scripts
+const unregisterSelectionEvent = registerSidepanelRpcEvent('selectionChanged', handleSelectionChanged)
+
 onMounted(async () => {
   updateAllTabs()
   updateCurrentTabAttachment()
 })
+
+onBeforeUnmount(() => {
+  // Clean up event listener
+  unregisterSelectionEvent()
+})
 </script>
diff --git a/types/chat.ts b/types/chat.ts
index 60835840..b7bd8f44 100644
--- a/types/chat.ts
+++ b/types/chat.ts
@@ -42,6 +42,14 @@ export type TabAttachment = {
   value: TabInfo & { id: string }
 }
 
+export type SelectedTextAttachment = {
+  type: 'selected-text'
+  value: {
+    id: string
+    text: string
+  }
+}
+
 // this is a placeholder for attachment that is still loading
 export type LoadingAttachment = {
   type: 'loading'
@@ -52,7 +60,7 @@ export type LoadingAttachment = {
   }
 }
 
-export type ContextAttachment = ImageAttachment | PDFAttachment | TabAttachment | LoadingAttachment
+export type ContextAttachment = ImageAttachment | PDFAttachment | TabAttachment | SelectedTextAttachment | LoadingAttachment
 export type ContextAttachmentStorage = {
   id: string
   lastInteractedAt?: number // last time user interacted with this context(attach/detach)
diff --git a/utils/prompts/chat.ts b/utils/prompts/chat.ts
index fb53b250..0caa8187 100644
--- a/utils/prompts/chat.ts
+++ b/utils/prompts/chat.ts
@@ -1,4 +1,4 @@
-import { ContextAttachment, ContextAttachmentStorage, ImageAttachment, PDFAttachment, TabAttachment } from '@/types/chat'
+import { ContextAttachment, ContextAttachmentStorage, ImageAttachment, PDFAttachment, SelectedTextAttachment, TabAttachment } from '@/types/chat'
 import { Base64ImageData } from '@/types/image'
 import dayjs from '@/utils/time'
 
@@ -71,6 +71,9 @@ export class EnvironmentDetailsBuilder {
   }
 
   generateFull() {
+    // Check for selected text
+    const selectedTextAttachment = this.contextAttachmentStorage.attachments.find((a): a is SelectedTextAttachment => a.type === 'selected-text')
+
     const tabContextBuilder = new TextBuilder('# Available Tabs')
     const currentTab = this.contextAttachmentStorage.currentTab?.type === 'tab' ? this.contextAttachmentStorage.currentTab : undefined
     const tabs = this.contextAttachmentStorage.attachments.filter((a): a is TabAttachment => a.type === 'tab' && a.value.tabId !== currentTab?.value.tabId)
@@ -117,6 +120,12 @@ ${pdfContextBuilder}
 ${imageContextBuilder}
 `.trim())
 
+    // Build the result with optional selected text before environment details
+    if (selectedTextAttachment) {
+      const selectedTextTag = new TagBuilder('user_selection').insertContent(selectedTextAttachment.value.text.trim())
+      return `${selectedTextTag.build()}\n\n${environmentTagBuilder.build()}`
+    }
+
     return environmentTagBuilder.build()
   }
 }
diff --git a/utils/rpc/background-fns.ts b/utils/rpc/background-fns.ts
index 31621f0c..449c77b0 100644
--- a/utils/rpc/background-fns.ts
+++ b/utils/rpc/background-fns.ts
@@ -1075,6 +1075,17 @@ async function forwardGmailAction(action: 'summary' | 'reply' | 'compose', data:
   }
 }
 
+async function forwardSelectionText(tabId: number, selectedText: string) {
+  try {
+    b2sRpc.emit('selectionChanged', { tabId, selectedText })
+    return { success: true }
+  }
+  catch (error) {
+    logger.error('Failed to forward selection text to sidepanel:', error)
+    return { success: false, error: String(error) }
+  }
+}
+
 export const backgroundFunctions = {
   emit: <E extends keyof Events>(ev: E, ...args: Parameters<Events[E]>) => {
     eventEmitter.emit(ev, ...args)
@@ -1146,5 +1157,7 @@ export const backgroundFunctions = {
   showSettings: showSettingsForBackground,
   updateSidepanelModelList,
   forwardGmailAction,
+  // Selected Text
+  forwardSelectionText,
 }
   ; (self as unknown as { backgroundFunctions: unknown }).backgroundFunctions = backgroundFunctions
diff --git a/utils/rpc/content-fns.ts b/utils/rpc/content-fns.ts
index ebef8b6b..5d1d0701 100644
--- a/utils/rpc/content-fns.ts
+++ b/utils/rpc/content-fns.ts
@@ -15,6 +15,7 @@ export type Events = {
   tabUpdated(opts: { tabId: number, url?: string, faviconUrl?: string, title?: string }): void
   tabRemoved(opts: { tabId: number } & Browser.tabs.TabRemoveInfo): void
   contextMenuClicked(opts: { _toTab?: number } & Browser.contextMenus.OnClickData & { menuItemId: ContextMenuId }): void
+  selectionChanged(opts: { tabId: number, selectedText: string }): void
 }
 
 export type EventKey = keyof Events
@@ -53,6 +54,12 @@ export function ping(_: { _toTab?: number }) {
   return 'pong'
 }
 
+export function getSelectedText(_: { _toTab?: number }) {
+  const selection = window.getSelection()
+  const selectedText = selection?.toString().trim() || ''
+  return selectedText
+}
+
 export const contentFunctions = {
   emit: <E extends keyof Events>(ev: E, ...args: Parameters<Events[E]>) => {
     eventEmitter.emit(ev, ...args)
@@ -63,6 +70,7 @@ export const contentFunctions = {
   getPagePDFContent,
   getPageContentType,
   getDocumentContent,
+  getSelectedText,
   ping,
 } as const
 
diff --git a/utils/rpc/sidepanel-fns.ts b/utils/rpc/sidepanel-fns.ts
index 14e64e23..36cf74b3 100644
--- a/utils/rpc/sidepanel-fns.ts
+++ b/utils/rpc/sidepanel-fns.ts
@@ -14,6 +14,7 @@ export type Events = {
   gmailAction(options: { action: 'summary' | 'reply' | 'compose', data: unknown, tabInfo: TabInfo }): void
   updateModelList(): void
   updateChatList(): void
+  selectionChanged(options: { tabId: number, selectedText: string }): void
 }
 
 export type EventKey = keyof Events
diff --git a/utils/user-config/defaults.ts b/utils/user-config/defaults.ts
index e9cf9a90..aa2da0b4 100644
--- a/utils/user-config/defaults.ts
+++ b/utils/user-config/defaults.ts
@@ -209,18 +209,22 @@ ${tools.map((tool) => renderPrompt`${new PromptBasedToolBuilder(tool)}`).join('\
 
 # WORKFLOW
 
-Simple two-step process for ALL queries:
+Simple step-by-step process for ALL queries:
 
-### Step 1: Always Check Selected Tab First
-- Start with brief explanation: "Let me first check the selected tab to see if it contains relevant information"
+### Step 1: Check for Selected Text First
+- If user_message contains <user_selection> tags, prioritize understanding and responding to the selected content
+- The selected text indicates the user's specific focus area and should guide all subsequent tool usage
+
+### Step 2: Always Check Selected Tab First
+- Start with brief explanation: "Let me first check the selected tab to see if it contains relevant information about [selected text topic]"
 - Use view_tab for the SELECTED tab (marked as SELECTED in available tabs)
 - This is mandatory regardless of query type
 
-### Step 2: Click on Relevant Links Found  
+### Step 3: Click on Relevant Links Found
 - If the selected tab shows relevant interactive elements, use click to explore them
 - Prioritize click over other tools when relevant links are available
 
-### Step 3: Other Tools as Needed
+### Step 4: Other Tools as Needed
 - Use other available resources: view_pdf, view_image, other tabs
 ${hasOnlineSearch ? '- Use search_online only if existing resources don\'t provide sufficient information' : '- Note: Web search is currently disabled. Focus on available local resources.'}
 - Use fetch_page for specific URLs mentioned by user

From 2c551a36533b7cc4c03eca115bcbea355f19bb38 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Thu, 16 Oct 2025 17:00:22 +0800
Subject: [PATCH 04/25] feat: Add camera functionality and support for captured
 pages

- Introduced CameraButton component for capturing screenshots.
- Added SVG icons for camera, captured page, and selected text.
- Enhanced AttachmentSelector to handle captured page attachments.
- Updated context attachment types to include CapturedPageAttachment.
- Implemented image preview tooltip for attachments in AttachmentSelector.
- Modified localization files to include new strings for selected text and captured page.
- Updated agent storage and chat utilities to support captured page handling.
---
 assets/icons/camera.svg                       |   8 ++
 assets/icons/captured-page.svg                |  16 +++
 assets/icons/selected-text.svg                |  13 ++
 .../components/AttachmentSelector.vue         |  97 ++++++++++++++-
 .../components/Chat/CameraButton.vue          | 112 ++++++++++++++++++
 .../sidepanel/components/Chat/index.vue       |  43 ++++---
 entrypoints/sidepanel/utils/agent/strorage.ts |   2 +-
 .../sidepanel/utils/chat/tool-calls/index.ts  |   3 +-
 locales/de.json                               |   4 +-
 locales/en.json                               |   4 +-
 locales/es.json                               |   4 +-
 locales/fr.json                               |   4 +-
 locales/id.json                               |   4 +-
 locales/ja.json                               |   4 +-
 locales/ko.json                               |   4 +-
 locales/pt.json                               |   4 +-
 locales/ru.json                               |   4 +-
 locales/th.json                               |   4 +-
 locales/vi.json                               |   4 +-
 locales/zh-CN.json                            |   4 +-
 locales/zh-TW.json                            |   4 +-
 types/chat.ts                                 |  11 +-
 utils/prompts/chat.ts                         |  33 +++++-
 23 files changed, 344 insertions(+), 46 deletions(-)
 create mode 100644 assets/icons/camera.svg
 create mode 100644 assets/icons/captured-page.svg
 create mode 100644 assets/icons/selected-text.svg
 create mode 100644 entrypoints/sidepanel/components/Chat/CameraButton.vue

diff --git a/assets/icons/camera.svg b/assets/icons/camera.svg
new file mode 100644
index 00000000..bc3976ed
--- /dev/null
+++ b/assets/icons/camera.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M18.2706 7.55348H15.6223L15.2757 6.86476C15.2355 6.77563 14.869 5.99414 14.3515 5.99414H9.64807C9.13052 5.99414 8.7641 6.77563 8.72686 6.85875L8.37745 7.55348H5.72895C5.21182 7.55348 4.79093 7.97222 4.79093 8.48698V17.0602C4.79093 17.5752 5.21182 17.9941 5.72895 17.9941H18.2704C18.7875 17.9941 19.2084 17.5752 19.2084 17.0602L19.2088 15.9689V13.467V8.48698C19.2088 7.97222 18.788 7.55348 18.2706 7.55348ZM12.0159 15.7053C10.316 15.7053 8.933 14.3296 8.933 12.6385C8.933 10.9476 10.316 9.5719 12.0159 9.5719C13.7158 9.5719 15.0989 10.9476 15.0989 12.6385C15.0989 14.3296 13.7158 15.7053 12.0159 15.7053ZM16.5918 10.2756C16.1733 10.2756 15.8327 9.93501 15.8327 9.51649C15.8327 9.09796 16.1733 8.7576 16.5918 8.7576C17.0103 8.7576 17.3507 9.09796 17.3507 9.51649C17.3507 9.93501 17.0103 10.2756 16.5918 10.2756Z"
+    fill="currentColor" />
+  <path
+    d="M12.016 10.6074C10.8896 10.6074 9.97339 11.5179 9.97339 12.6372C9.97339 13.7567 10.8897 14.6673 12.016 14.6673C13.1424 14.6673 14.0587 13.7567 14.0587 12.6372C14.0587 11.5179 13.1424 10.6074 12.016 10.6074Z"
+    fill="currentColor" />
+</svg>
\ No newline at end of file
diff --git a/assets/icons/captured-page.svg b/assets/icons/captured-page.svg
new file mode 100644
index 00000000..47bf0f8c
--- /dev/null
+++ b/assets/icons/captured-page.svg
@@ -0,0 +1,16 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M10 4.66602V9.5549C10 9.80037 9.80102 9.99935 9.55556 9.99935H2.44444C2.19898 9.99935 2 9.80037 2 9.5549V4.66602"
+    stroke="currentColor" stroke-width="0.888889" stroke-linecap="round" stroke-linejoin="round" />
+  <path d="M2 2.44444C2 2.19898 2.19898 2 2.44444 2H9.55556C9.80102 2 10 2.19898 10 2.44444V4.66667H2V2.44444Z"
+    stroke="currentColor" stroke-width="0.888889" stroke-linejoin="round" />
+  <path fill-rule="evenodd" clip-rule="evenodd"
+    d="M3.33333 3.77756C3.5788 3.77756 3.77777 3.57858 3.77777 3.33312C3.77777 3.08765 3.5788 2.88867 3.33333 2.88867C3.08786 2.88867 2.88889 3.08765 2.88889 3.33312C2.88889 3.57858 3.08786 3.77756 3.33333 3.77756Z"
+    fill="currentColor" />
+  <path fill-rule="evenodd" clip-rule="evenodd"
+    d="M4.66667 3.77756C4.91214 3.77756 5.11112 3.57858 5.11112 3.33312C5.11112 3.08765 4.91214 2.88867 4.66667 2.88867C4.42121 2.88867 4.22223 3.08765 4.22223 3.33312C4.22223 3.57858 4.42121 3.77756 4.66667 3.77756Z"
+    fill="currentColor" />
+  <path fill-rule="evenodd" clip-rule="evenodd"
+    d="M6 3.77756C6.24547 3.77756 6.44445 3.57858 6.44445 3.33312C6.44445 3.08765 6.24547 2.88867 6 2.88867C5.75454 2.88867 5.55556 3.08765 5.55556 3.33312C5.55556 3.57858 5.75454 3.77756 6 3.77756Z"
+    fill="currentColor" />
+</svg>
\ No newline at end of file
diff --git a/assets/icons/selected-text.svg b/assets/icons/selected-text.svg
new file mode 100644
index 00000000..96fd057d
--- /dev/null
+++ b/assets/icons/selected-text.svg
@@ -0,0 +1,13 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M7.77797 2H10.0001V4.22211" stroke="currentColor" stroke-width="0.888843" stroke-linecap="round"
+    stroke-linejoin="round" />
+  <path
+    d="M4.4447 7.77998L4.93079 6.66893M4.93079 6.66893L6.00018 4.22461L7.06957 6.66893M4.93079 6.66893H7.06957M7.55565 7.77998L7.06957 6.66893"
+    stroke="currentColor" stroke-width="0.888843" stroke-linecap="round" stroke-linejoin="round" />
+  <path d="M4.22218 2H2.00008V4.22211" stroke="currentColor" stroke-width="0.888843" stroke-linecap="round"
+    stroke-linejoin="round" />
+  <path d="M7.77797 9.9975H10.0001V7.77539" stroke="currentColor" stroke-width="0.888843" stroke-linecap="round"
+    stroke-linejoin="round" />
+  <path d="M4.22218 9.9975H2.00008V7.77539" stroke="currentColor" stroke-width="0.888843" stroke-linecap="round"
+    stroke-linejoin="round" />
+</svg>
\ No newline at end of file
diff --git a/entrypoints/sidepanel/components/AttachmentSelector.vue b/entrypoints/sidepanel/components/AttachmentSelector.vue
index 474ecab9..846b7459 100644
--- a/entrypoints/sidepanel/components/AttachmentSelector.vue
+++ b/entrypoints/sidepanel/components/AttachmentSelector.vue
@@ -1,5 +1,35 @@
 <template>
   <div class="relative">
+    <!-- Image Preview Tooltip -->
+    <Transition
+      enterActiveClass="transition-opacity duration-200"
+      leaveActiveClass="transition-opacity duration-200"
+      enterFromClass="opacity-0"
+      leaveToClass="opacity-0"
+      enterToClass="opacity-100"
+      leaveFromClass="opacity-100"
+    >
+      <div
+        v-if="hoveredImageData"
+        :style="{
+          position: 'fixed',
+          left: `${hoveredImageData.x}px`,
+          top: `${hoveredImageData.y - 16}px`,
+          transform: 'translate(-50%, -100%)',
+          zIndex: 100,
+          pointerEvents: 'none'
+        }"
+        @mouseenter="() => { hoveredImageData = null }"
+      >
+        <div class="rounded-lg shadow-lg overflow-hidden bg-transparent">
+          <img
+            :src="`data:${hoveredImageData.imageType};base64,${hoveredImageData.data}`"
+            alt="Preview"
+            class="max-w-[172px] max-h-64 rounded bg-transparent"
+          >
+        </div>
+      </div>
+    </Transition>
     <Transition
       enterActiveClass="transition-all duration-300 ease-cubic-1"
       leaveActiveClass="transition-all duration-300 ease-cubic-1"
@@ -118,7 +148,11 @@
         <div
           v-for="(attachment, index) in attachmentsToShow"
           :key="index"
-          class="items-center gap-2 grow-0 text-xs shrink-0"
+          :ref="el => setItemRef(el, index)"
+          class="items-center gap-2 grow-0 text-xs shrink-0 relative"
+          @mouseenter="() => handleImageHover(attachment, index)"
+          @mouseleave="handleImageLeave"
+          @click="handleImageLeave"
         >
           <Tag class="inline-flex bg-bg-tertiary border border-border">
             <template #icon>
@@ -153,7 +187,13 @@
                 v-else-if="attachment.type === 'selected-text'"
                 class="flex items-center justify-center w-3 h-4 shrink-0 grow-0 ml-[2px]"
               >
-                <IconHighlight class="w-3 h-3 text-text-secondary" />
+                <IconSelectedText class="w-3 h-3 text-text-secondary" />
+              </div>
+              <div
+                v-else-if="attachment.type === 'captured-page'"
+                class="flex items-center justify-center w-3 h-4 shrink-0 grow-0 ml-[2px]"
+              >
+                <IconCapturedPage class="w-3 h-3 text-text-secondary" />
               </div>
               <div
                 v-else-if="attachment.type === 'loading'"
@@ -172,7 +212,10 @@
                 class="text-xs text-text-secondary whitespace-nowrap max-w-28 overflow-hidden text-ellipsis"
               >
                 <template v-if="attachment.type === 'selected-text'">
-                  Selected Text: {{ attachment.value.text }}
+                  {{ t('chat.input.attachment_selector.selected_text_prefix') }} {{ attachment.value.text }}
+                </template>
+                <template v-else-if="attachment.type === 'captured-page'">
+                  {{ t('chat.input.attachment_selector.captured_page_prefix') }} {{ attachment.value.name }}
                 </template>
                 <template v-else>
                   {{ attachment.type === 'tab' ? attachment.value.title : attachment.value.name }}
@@ -196,14 +239,15 @@
 
 <script setup lang="ts">
 import { useEventListener, useFileDialog, useVModel } from '@vueuse/core'
-import { computed, onBeforeUnmount, onMounted, ref, toRef } from 'vue'
+import { ComponentPublicInstance, computed, onBeforeUnmount, onMounted, ref, toRef } from 'vue'
 import { browser } from 'wxt/browser'
 
 import IconAdd from '@/assets/icons/add.svg?component'
 import IconAttachmentImage from '@/assets/icons/attachment-image.svg?component'
 import IconAttachmentPDF from '@/assets/icons/attachment-pdf.svg?component'
 import IconAttachmentUpload from '@/assets/icons/attachment-upload.svg?component'
-import IconHighlight from '@/assets/icons/md-highlight-action.svg?component'
+import IconCapturedPage from '@/assets/icons/captured-page.svg?component'
+import IconSelectedText from '@/assets/icons/selected-text.svg?component'
 import IconTab from '@/assets/icons/tab.svg?component'
 import IconClose from '@/assets/icons/tag-close.svg?component'
 import IconWarningSolid from '@/assets/icons/warning-solid.svg?component'
@@ -218,7 +262,7 @@ import Text from '@/components/ui/Text.vue'
 import { useExtensionEventListener } from '@/composables/useExtensionEventListener'
 import { useLogger } from '@/composables/useLogger'
 import { useTimeoutValue } from '@/composables/useTimeoutValue'
-import { AttachmentItem, ContextAttachment, ContextAttachmentStorage, LoadingAttachment, TabAttachment } from '@/types/chat'
+import { AttachmentItem, CapturedPageAttachment, ContextAttachment, ContextAttachmentStorage, LoadingAttachment, TabAttachment } from '@/types/chat'
 import { TabInfo } from '@/types/tab'
 import { nonNullable } from '@/utils/array'
 import { INVALID_URLS } from '@/utils/constants'
@@ -240,6 +284,16 @@ import { getValidTabs } from '../utils/tabs'
 const logger = useLogger()
 const { t } = useI18n()
 
+// Image preview state
+const hoveredImageData = ref<{ data: string, imageType: string, x: number, y: number } | null>(null)
+const itemRefs = ref<(HTMLElement | null)[]>([])
+
+const setItemRef = (el: Element | ComponentPublicInstance | null, index: number) => {
+  if (el) {
+    itemRefs.value[index] = el as HTMLElement
+  }
+}
+
 useExtensionEventListener(browser.tabs.onUpdated, async (_tabId, changeInfo) => {
   if (changeInfo.status === 'complete') {
     await updateAllTabs()
@@ -485,6 +539,18 @@ defineExpose({
     attachmentStorage.value.lastInteractedAt = Date.now()
     addAttachmentsFromFiles(...args)
   },
+  addCapturedPageAttachment: (attachment: CapturedPageAttachment) => {
+    attachmentStorage.value.lastInteractedAt = Date.now()
+    // Remove existing captured-page with same id if exists
+    const existingIndex = attachments.value.findIndex(
+      (a) => a.type === 'captured-page' && a.value.id === attachment.value.id,
+    )
+    if (existingIndex >= 0) {
+      attachments.value.splice(existingIndex, 1)
+    }
+    // Add new captured-page attachment at the beginning
+    attachments.value.unshift(attachment)
+  },
 })
 
 onChange(async (files) => {
@@ -640,6 +706,25 @@ const removeAttachment = (attachment: ContextAttachment) => {
   attachments.value = attachments.value.filter((a) => a.value.id !== attachment.value.id)
 }
 
+const handleImageHover = (attachment: ContextAttachment, index: number) => {
+  if (attachment.type === 'image' || attachment.type === 'captured-page') {
+    const itemElement = itemRefs.value[index]
+    if (itemElement) {
+      const rect = itemElement.getBoundingClientRect()
+      hoveredImageData.value = {
+        data: attachment.value.data,
+        imageType: attachment.value.type,
+        x: rect.left + rect.width / 2, // 中心点
+        y: rect.top, // 元素顶部
+      }
+    }
+  }
+}
+
+const handleImageLeave = () => {
+  hoveredImageData.value = null
+}
+
 const updateCurrentTabAttachment = async () => {
   const currentTab = await browser.tabs.query({ active: true, currentWindow: true }).then((tabs) => tabs[0])
   const currentTabUrl = currentTab?.url
diff --git a/entrypoints/sidepanel/components/Chat/CameraButton.vue b/entrypoints/sidepanel/components/Chat/CameraButton.vue
new file mode 100644
index 00000000..23823586
--- /dev/null
+++ b/entrypoints/sidepanel/components/Chat/CameraButton.vue
@@ -0,0 +1,112 @@
+<template>
+  <button
+    v-if="showButton"
+    :class="classNames(
+      'size-6 rounded-md flex items-center justify-center transition-colors',
+      isCapturing
+        ? 'cursor-wait opacity-50'
+        : 'hover:bg-bg-tertiary cursor-pointer'
+    )"
+    :disabled="isCapturing"
+    @click="handleCapture"
+  >
+    <IconCamera :class="classNames('size-6', hasCapturedPage ? 'text-accent-primary' : 'text-text-tertiary')" />
+  </button>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { browser } from 'wxt/browser'
+
+import IconCamera from '@/assets/icons/camera.svg?component'
+import { CapturedPageAttachment, ContextAttachmentStorage } from '@/types/chat'
+import { generateRandomId } from '@/utils/id'
+import logger from '@/utils/logger'
+import { useLLMBackendStatusStore } from '@/utils/pinia-store/store'
+import { s2bRpc } from '@/utils/rpc'
+import { tabToTabInfo } from '@/utils/tab'
+import { getUserConfig } from '@/utils/user-config'
+import { classNames } from '@/utils/vue/utils'
+
+import type AttachmentSelector from '../AttachmentSelector.vue'
+
+const props = defineProps<{
+  attachmentSelectorRef?: InstanceType<typeof AttachmentSelector>
+  contextAttachmentStorage?: ContextAttachmentStorage
+}>()
+
+const llmBackendStatusStore = useLLMBackendStatusStore()
+
+const isCapturing = ref(false)
+const supportsVision = ref(false)
+
+// Check if there's a captured-page attachment
+const hasCapturedPage = computed(() => {
+  return props.contextAttachmentStorage?.attachments.some((a) => a.type === 'captured-page') ?? false
+})
+
+const userConfig = await getUserConfig()
+
+const currentModel = userConfig.llm.model.toRef()
+
+// Check if current model supports vision
+const checkVisionSupport = async () => {
+  supportsVision.value = await llmBackendStatusStore.checkCurrentModelSupportVision()
+}
+
+// Check vision support on mount and when model changes
+watch(currentModel, async () => {
+  await checkVisionSupport()
+}, { immediate: true })
+
+const showButton = computed(() => supportsVision.value)
+
+const handleCapture = async () => {
+  if (isCapturing.value || !props.attachmentSelectorRef) return
+
+  isCapturing.value = true
+
+  try {
+    // Capture the visible tab
+    const dataUrl = await s2bRpc.captureVisibleTab()
+
+    if (!dataUrl) {
+      throw new Error('Failed to capture screenshot')
+    }
+
+    // Get current tab name
+    const currentTab = await browser.tabs.query({ active: true, currentWindow: true }).then((tabs) => tabs[0])
+    const tabInfo = tabToTabInfo(currentTab)
+
+    // Extract base64 data and MIME type from data URL
+    // dataUrl format: "data:image/png;base64,iVBORw0KGgo..."
+    const [metadata, base64Data] = dataUrl.split(',')
+    const mimeType = metadata.match(/:(.*?);/)?.[1] || 'image/png'
+
+    // Convert data URL to blob to get size
+    const response = await fetch(dataUrl)
+    const blob = await response.blob()
+
+    // Create CapturedPageAttachment
+    const capturedPageAttachment: CapturedPageAttachment = {
+      type: 'captured-page',
+      value: {
+        id: generateRandomId(),
+        name: tabInfo.title ?? 'Unknown Page',
+        data: base64Data,
+        type: mimeType,
+        size: blob.size,
+      },
+    }
+
+    // Add captured-page attachment
+    props.attachmentSelectorRef?.addCapturedPageAttachment(capturedPageAttachment)
+  }
+  catch (error) {
+    logger.error('Failed to capture screenshot:', error)
+  }
+  finally {
+    isCapturing.value = false
+  }
+}
+</script>
diff --git a/entrypoints/sidepanel/components/Chat/index.vue b/entrypoints/sidepanel/components/Chat/index.vue
index 9fe12b87..48b537fd 100644
--- a/entrypoints/sidepanel/components/Chat/index.vue
+++ b/entrypoints/sidepanel/components/Chat/index.vue
@@ -99,25 +99,31 @@
               <ThinkingModeSwitch />
               <OnlineSearchSwitch />
             </div>
-            <div
-              ref="sendButtonContainerRef"
-            >
-              <Button
-                v-if="chat.isAnswering()"
-                variant="secondary"
-                class="size-6 rounded-md flex items-center justify-center hover:bg-border-strong/80 bg-border-strong cursor-pointer shadow-none"
-                @click="onStop"
-              >
-                <IconStop class="size-[15px] text-white" />
-              </Button>
-              <button
-                v-else
-                :class="classNames('size-6 rounded-md flex items-center justify-center', allowAsk ? 'hover:bg-accent-primary-hover bg-accent-primary cursor-pointer' : 'cursor-not-allowed')"
-                :disabled="!allowAsk"
-                @click="onSubmit"
+            <div class="flex gap-2 flex-row">
+              <CameraButton
+                :attachmentSelectorRef="attachmentSelectorRef"
+                :contextAttachmentStorage="contextAttachmentStorage"
+              />
+              <div
+                ref="sendButtonContainerRef"
               >
-                <IconSendFill :class="classNames('size-[15px]', allowAsk ? 'text-white' : 'text-text-quaternary')" />
-              </button>
+                <Button
+                  v-if="chat.isAnswering()"
+                  variant="secondary"
+                  class="size-6 rounded-md flex items-center justify-center hover:bg-border-strong/80 bg-border-strong cursor-pointer shadow-none"
+                  @click="onStop"
+                >
+                  <IconStop class="size-[15px] text-white" />
+                </Button>
+                <button
+                  v-else
+                  :class="classNames('size-6 rounded-md flex items-center justify-center', allowAsk ? 'hover:bg-accent-primary-hover bg-accent-primary cursor-pointer' : 'cursor-not-allowed')"
+                  :disabled="!allowAsk"
+                  @click="onSubmit"
+                >
+                  <IconSendFill :class="classNames('size-[15px]', allowAsk ? 'text-white' : 'text-text-quaternary')" />
+                </button>
+              </div>
             </div>
           </div>
         </div>
@@ -150,6 +156,7 @@ import {
   initChatSideEffects,
 } from '../../utils/chat/index'
 import AttachmentSelector from '../AttachmentSelector.vue'
+import CameraButton from './CameraButton.vue'
 import MessageAction from './Messages/Action.vue'
 import MessageTaskGroup from './Messages/AgentTaskGroup.vue'
 import MessageAssistant from './Messages/Assistant.vue'
diff --git a/entrypoints/sidepanel/utils/agent/strorage.ts b/entrypoints/sidepanel/utils/agent/strorage.ts
index 6f916187..85218e3c 100644
--- a/entrypoints/sidepanel/utils/agent/strorage.ts
+++ b/entrypoints/sidepanel/utils/agent/strorage.ts
@@ -32,7 +32,7 @@ export class AgentStorage {
     if (this.attachmentStorage.currentTab?.type === 'image') {
       imageAttachments.push(this.attachmentStorage.currentTab)
     }
-    imageAttachments.push(...this.attachmentStorage.attachments.filter((attachment) => attachment.type === 'image'))
+    imageAttachments.push(...this.attachmentStorage.attachments.filter((attachment) => attachment.type === 'image' || attachment.type === 'captured-page'))
     return imageAttachments
   }
 
diff --git a/entrypoints/sidepanel/utils/chat/tool-calls/index.ts b/entrypoints/sidepanel/utils/chat/tool-calls/index.ts
index 1d4ffc3c..a1fb422a 100644
--- a/entrypoints/sidepanel/utils/chat/tool-calls/index.ts
+++ b/entrypoints/sidepanel/utils/chat/tool-calls/index.ts
@@ -266,7 +266,8 @@ export const executeViewPdf: AgentToolCallExecute<'view_pdf'> = async ({ params,
 export const executeViewImage: AgentToolCallExecute<'view_image'> = async ({ params, taskMessageModifier, agentStorage, loopImages }) => {
   const { image_id: imageId } = params
   const { t } = await useGlobalI18n()
-  const image = agentStorage.getById('image', imageId)
+  const capturedPage = agentStorage.getById('captured-page', imageId)
+  const image = agentStorage.getById('image', imageId) ?? capturedPage
   const taskMsg = taskMessageModifier.addTaskMessage({ summary: t('chat.tool_calls.view_image.analyzing', { title: imageId }) })
   taskMsg.icon = 'taskReadFile'
   if (!image) {
diff --git a/locales/de.json b/locales/de.json
index 05cd640d..49573076 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "Textextraktion fehlgeschlagen - diese PDF könnte gescannt oder bildbasiert sein.",
         "too_many_pdfs": "Maximal {max} PDF-Datei erlaubt",
         "pdf_page_count_exceeded": "PDF muss weniger als {max} Seiten haben",
-        "only_load_partial_pages": "Aufgrund der Dateigröße werden nur die ersten {max} Seiten geladen"
+        "only_load_partial_pages": "Aufgrund der Dateigröße werden nur die ersten {max} Seiten geladen",
+        "selected_text_prefix": "Ausgewählter Text:",
+        "captured_page_prefix": "Erfasste Seite:"
       }
     },
     "prompt": {
diff --git a/locales/en.json b/locales/en.json
index 6c2975fe..12267098 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -268,7 +268,9 @@
         "pdf_oversize": "PDF file size must be less than {size}",
         "too_many_pdfs": "Maximum {max} PDF file allowed",
         "pdf_text_extract_error": "Text extraction failed - this PDF may be scanned or image-based.",
-        "only_load_partial_pages": "Only the first {max} pages are loaded due to file size"
+        "only_load_partial_pages": "Only the first {max} pages are loaded due to file size",
+        "selected_text_prefix": "Selected Text:",
+        "captured_page_prefix": "Page Captured:"
       }
     },
     "prompt": {
diff --git a/locales/es.json b/locales/es.json
index ffdb4e95..c0b63c8f 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -16,7 +16,9 @@
         "pdf_text_extract_error": "La extracción de texto falló - este PDF puede estar escaneado o basado en imágenes.",
         "too_many_pdfs": "Máximo {max} archivo PDF permitido",
         "pdf_page_count_exceeded": "El PDF debe tener menos de {max} páginas",
-        "only_load_partial_pages": "Solo se cargan las primeras {max} páginas debido al tamaño del archivo"
+        "only_load_partial_pages": "Solo se cargan las primeras {max} páginas debido al tamaño del archivo",
+        "selected_text_prefix": "Texto seleccionado:",
+        "captured_page_prefix": "Página capturada:"
       }
     },
     "messages": {
diff --git a/locales/fr.json b/locales/fr.json
index 169e82ca..1b99d626 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "L'extraction de texte a échoué - ce PDF peut être numérisé ou basé sur des images.",
         "too_many_pdfs": "Maximum {max} fichier PDF autorisé",
         "pdf_page_count_exceeded": "Le PDF doit contenir moins de {max} pages",
-        "only_load_partial_pages": "Seules les {max} premières pages sont chargées en raison de la taille du fichier"
+        "only_load_partial_pages": "Seules les {max} premières pages sont chargées en raison de la taille du fichier",
+        "selected_text_prefix": "Texte sélectionné :",
+        "captured_page_prefix": "Page capturée :"
       }
     },
     "prompt": {
diff --git a/locales/id.json b/locales/id.json
index e4ed9666..d13dae04 100644
--- a/locales/id.json
+++ b/locales/id.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "Ekstraksi teks gagal - PDF ini mungkin hasil scan atau berbasis gambar.",
         "too_many_pdfs": "Maksimal {max} file PDF diizinkan",
         "pdf_page_count_exceeded": "PDF harus kurang dari {max} halaman",
-        "only_load_partial_pages": "Hanya {max} halaman pertama yang dimuat karena ukuran file"
+        "only_load_partial_pages": "Hanya {max} halaman pertama yang dimuat karena ukuran file",
+        "selected_text_prefix": "Teks terpilih:",
+        "captured_page_prefix": "Halaman tertangkap:"
       }
     },
     "prompt": {
diff --git a/locales/ja.json b/locales/ja.json
index 8c9a0f5f..35b76eea 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "テキスト抽出に失敗しました - このPDFはスキャンされたものか画像ベースの可能性があります。",
         "too_many_pdfs": "最大{max}個のPDFファイルまで許可されています",
         "pdf_page_count_exceeded": "PDFは{max}ページ以下である必要があります",
-        "only_load_partial_pages": "ファイルサイズのため、最初の{max}ページのみが読み込まれました"
+        "only_load_partial_pages": "ファイルサイズのため、最初の{max}ページのみが読み込まれました",
+        "selected_text_prefix": "選択テキスト：",
+        "captured_page_prefix": "キャプチャページ："
       }
     },
     "prompt": {
diff --git a/locales/ko.json b/locales/ko.json
index e923d9ff..6ad5bd73 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "PDF에서 텍스트 추출에 실패했습니다 - 이 PDF는 스캔되었거나 이미지 기반일 수 있습니다.",
         "too_many_pdfs": "최대 {max}개의 PDF 파일이 허용됩니다",
         "pdf_page_count_exceeded": "PDF는 {max}페이지 미만이어야 합니다",
-        "only_load_partial_pages": "파일 크기로 인해 처음 {max}페이지만 로드됩니다"
+        "only_load_partial_pages": "파일 크기로 인해 처음 {max}페이지만 로드됩니다",
+        "selected_text_prefix": "선택된 텍스트:",
+        "captured_page_prefix": "캡처된 페이지:"
       }
     },
     "prompt": {
diff --git a/locales/pt.json b/locales/pt.json
index 62643d44..95914bc0 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "A extração de texto falhou - este PDF pode estar digitalizado ou ser baseado em imagem.",
         "too_many_pdfs": "Máximo de {max} arquivo PDF permitido",
         "pdf_page_count_exceeded": "O PDF deve ter menos de {max} páginas",
-        "only_load_partial_pages": "Apenas as primeiras {max} páginas são carregadas devido ao tamanho do arquivo"
+        "only_load_partial_pages": "Apenas as primeiras {max} páginas são carregadas devido ao tamanho do arquivo",
+        "selected_text_prefix": "Texto selecionado:",
+        "captured_page_prefix": "Página capturada:"
       }
     },
     "prompt": {
diff --git a/locales/ru.json b/locales/ru.json
index 1dbab26c..6f597dc6 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "Извлечение текста не удалось - этот PDF может быть отсканированным или основанным на изображениях.",
         "too_many_pdfs": "Максимально разрешено {max} PDF файлов",
         "pdf_page_count_exceeded": "PDF должен содержать менее {max} страниц",
-        "only_load_partial_pages": "Загружены только первые {max} страниц из-за размера файла"
+        "only_load_partial_pages": "Загружены только первые {max} страниц из-за размера файла",
+        "selected_text_prefix": "Выделенный текст:",
+        "captured_page_prefix": "Захваченная страница:"
       }
     },
     "prompt": {
diff --git a/locales/th.json b/locales/th.json
index bd2f74e5..7603bc54 100644
--- a/locales/th.json
+++ b/locales/th.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "การดึงข้อความล้มเหลว - PDF นี้อาจเป็นไฟล์สแกนหรือเป็นรูปภาพ",
         "too_many_pdfs": "อนุญาตไฟล์ PDF สูงสุด {max} ไฟล์",
         "pdf_page_count_exceeded": "PDF ต้องมีจำนวนหน้าไม่เกิน {max} หน้า",
-        "only_load_partial_pages": "โหลดเฉพาะ {max} หน้าแรกเท่านั้นเนื่องจากขนาดไฟล์"
+        "only_load_partial_pages": "โหลดเฉพาะ {max} หน้าแรกเท่านั้นเนื่องจากขนาดไฟล์",
+        "selected_text_prefix": "ข้อความที่เลือก:",
+        "captured_page_prefix": "หน้าที่จับภาพ:"
       }
     },
     "prompt": {
diff --git a/locales/vi.json b/locales/vi.json
index 50632761..93ef2ddb 100644
--- a/locales/vi.json
+++ b/locales/vi.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "Trích xuất văn bản thất bại - tệp PDF này có thể được quét hoặc dựa trên hình ảnh.",
         "too_many_pdfs": "Tối đa {max} tệp PDF được phép",
         "pdf_page_count_exceeded": "PDF phải có ít hơn {max} trang",
-        "only_load_partial_pages": "Chỉ {max} trang đầu tiên được tải do kích thước tệp"
+        "only_load_partial_pages": "Chỉ {max} trang đầu tiên được tải do kích thước tệp",
+        "selected_text_prefix": "Văn bản đã chọn:",
+        "captured_page_prefix": "Trang đã chụp:"
       }
     },
     "prompt": {
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index ec97b663..11ee7fa4 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -268,7 +268,9 @@
         "pdf_text_extract_error": "文本提取失败 - 此PDF可能是扫描版或基于图像的。",
         "too_many_pdfs": "最多允许 {max} 个 PDF 文件",
         "pdf_page_count_exceeded": "PDF 页数不能超过 {max} 页",
-        "only_load_partial_pages": "由于文件大小限制，仅加载前 {max} 页"
+        "only_load_partial_pages": "由于文件大小限制，仅加载前 {max} 页",
+        "selected_text_prefix": "已选择文本：",
+        "captured_page_prefix": "已捕获页面："
       }
     },
     "prompt": {
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index f741c8f5..cb63cd6b 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -28,7 +28,9 @@
         "pdf_text_extract_error": "文字擷取失敗 - 此 PDF 可能是掃描檔或圖像格式。",
         "too_many_pdfs": "最多允許 {max} 個 PDF 檔案",
         "pdf_page_count_exceeded": "PDF 必須少於 {max} 頁",
-        "only_load_partial_pages": "由於檔案大小限制，僅載入前 {max} 頁"
+        "only_load_partial_pages": "由於檔案大小限制，僅載入前 {max} 頁",
+        "selected_text_prefix": "已選擇文字：",
+        "captured_page_prefix": "已擷取頁面："
       }
     },
     "prompt": {
diff --git a/types/chat.ts b/types/chat.ts
index b7bd8f44..1b0da406 100644
--- a/types/chat.ts
+++ b/types/chat.ts
@@ -50,6 +50,15 @@ export type SelectedTextAttachment = {
   }
 }
 
+export type CapturedPageAttachment = {
+  type: 'captured-page'
+  value: Base64ImageData & {
+    id: string
+    name: string
+    size?: number
+  }
+}
+
 // this is a placeholder for attachment that is still loading
 export type LoadingAttachment = {
   type: 'loading'
@@ -60,7 +69,7 @@ export type LoadingAttachment = {
   }
 }
 
-export type ContextAttachment = ImageAttachment | PDFAttachment | TabAttachment | SelectedTextAttachment | LoadingAttachment
+export type ContextAttachment = ImageAttachment | PDFAttachment | TabAttachment | SelectedTextAttachment | LoadingAttachment | CapturedPageAttachment
 export type ContextAttachmentStorage = {
   id: string
   lastInteractedAt?: number // last time user interacted with this context(attach/detach)
diff --git a/utils/prompts/chat.ts b/utils/prompts/chat.ts
index 0caa8187..3d77b09c 100644
--- a/utils/prompts/chat.ts
+++ b/utils/prompts/chat.ts
@@ -1,4 +1,4 @@
-import { ContextAttachment, ContextAttachmentStorage, ImageAttachment, PDFAttachment, SelectedTextAttachment, TabAttachment } from '@/types/chat'
+import { CapturedPageAttachment, ContextAttachment, ContextAttachmentStorage, ImageAttachment, PDFAttachment, SelectedTextAttachment, TabAttachment } from '@/types/chat'
 import { Base64ImageData } from '@/types/image'
 import dayjs from '@/utils/time'
 
@@ -31,6 +31,12 @@ export class EnvironmentDetailsBuilder {
   generateUpdates(usedIds: string[] = []) {
     const ensureUnused = <T extends ContextAttachment>(attachment?: T) => this.ensureUnused(usedIds, attachment)
 
+    // Check for selected text (always include it, regardless of usedIds)
+    const selectedTextAttachment = this.contextAttachmentStorage.attachments.find((a): a is SelectedTextAttachment => a.type === 'selected-text')
+
+    // Check for Captured page (always include it, regardless of usedIds)
+    const capturedPageAttachment = this.contextAttachmentStorage.attachments.find((a): a is CapturedPageAttachment => a.type === 'captured-page')
+
     const envBuilder = new TagBuilder('environment_updates')
     const currentTab = ensureUnused(this.contextAttachmentStorage.currentTab?.type === 'tab' ? this.contextAttachmentStorage.currentTab : undefined)
     const attachments = this.contextAttachmentStorage.attachments.filter((a) => !!ensureUnused(a))
@@ -58,8 +64,14 @@ export class EnvironmentDetailsBuilder {
     }
 
     const currentTabImage = ensureUnused(this.contextAttachmentStorage.currentTab?.type === 'image' ? this.contextAttachmentStorage.currentTab : undefined)
-    const imagesMeta = attachments.filter((a): a is ImageAttachment => a.type === 'image')
-    const allImages = [currentTabImage, ...imagesMeta].filter(Boolean) as ImageAttachment[]
+    const currentTabCapturedPage = ensureUnused(this.contextAttachmentStorage.currentTab?.type === 'captured-page' ? this.contextAttachmentStorage.currentTab : undefined)
+    const imagesMeta = attachments.filter((a): a is ImageAttachment | CapturedPageAttachment => a.type === 'image' || a.type === 'captured-page')
+    const allImages = [currentTabImage, currentTabCapturedPage, ...imagesMeta].filter(Boolean) as (ImageAttachment | CapturedPageAttachment)[]
+
+    if (capturedPageAttachment) {
+      allImages.unshift(capturedPageAttachment)
+    }
+
     if (allImages.length) {
       envBuilder.insertContent(`# Updated Images`)
       for (const img of allImages) {
@@ -67,7 +79,15 @@ export class EnvironmentDetailsBuilder {
       }
     }
 
-    return envBuilder.hasContent() ? envBuilder.build() : undefined
+    const envUpdates = envBuilder.hasContent() ? envBuilder.build() : undefined
+
+    // Include selected text if present
+    if (selectedTextAttachment) {
+      const selectedTextTag = new TagBuilder('user_selection').insertContent(selectedTextAttachment.value.text.trim())
+      return envUpdates ? `${selectedTextTag.build()}\n\n${envUpdates}` : selectedTextTag.build()
+    }
+
+    return envUpdates
   }
 
   generateFull() {
@@ -102,8 +122,9 @@ export class EnvironmentDetailsBuilder {
 
     const imageContextBuilder = new TextBuilder('# Available Images')
     const currentTabImage = this.contextAttachmentStorage.currentTab?.type === 'image' ? this.contextAttachmentStorage.currentTab : undefined
-    const attachmentImages = this.contextAttachmentStorage.attachments.filter((a): a is ImageAttachment => a.type === 'image')
-    const allImages = [currentTabImage, ...attachmentImages].filter(Boolean) as ImageAttachment[]
+    const currentTabCapturedPage = this.contextAttachmentStorage.currentTab?.type === 'captured-page' ? this.contextAttachmentStorage.currentTab : undefined
+    const attachmentImages = this.contextAttachmentStorage.attachments.filter((a): a is ImageAttachment | CapturedPageAttachment => a.type === 'image' || a.type === 'captured-page')
+    const allImages = [currentTabImage, currentTabCapturedPage, ...attachmentImages].filter(Boolean) as (ImageAttachment | CapturedPageAttachment)[]
     if (allImages.length === 0) {
       imageContextBuilder.insertContent('(No available images)')
     }

From 11d3e19f0e1604a9949ac3106d915c9133251e80 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Sun, 12 Oct 2025 23:40:40 +0800
Subject: [PATCH 05/25] feat: Introduce effort selection for gpt-oss in chat

---
 entrypoints/background/database/types.ts      |  4 +-
 .../services/chat-history-service.ts          |  7 +-
 entrypoints/content/utils/llm.ts              | 45 ++++++++--
 .../components/DebugSettings/index.vue        | 13 ++-
 .../Chat/ThinkingEffortSelector.vue           | 84 +++++++++++++++++++
 .../components/Chat/ThinkingModeSwitch.vue    | 10 ++-
 .../sidepanel/components/Chat/index.vue       | 10 ++-
 entrypoints/sidepanel/utils/chat/chat.ts      | 16 +++-
 entrypoints/sidepanel/utils/llm.ts            | 39 ++++++++-
 locales/de.json                               |  5 +-
 locales/en.json                               |  5 +-
 locales/es.json                               |  5 +-
 locales/fr.json                               |  5 +-
 locales/id.json                               |  5 +-
 locales/ja.json                               |  5 +-
 locales/ko.json                               |  5 +-
 locales/pt.json                               |  5 +-
 locales/ru.json                               |  5 +-
 locales/th.json                               |  5 +-
 locales/vi.json                               |  5 +-
 locales/zh-CN.json                            |  5 +-
 locales/zh-TW.json                            |  5 +-
 types/chat.ts                                 |  3 +-
 types/reasoning.ts                            | 53 ++++++++++++
 utils/llm/models.ts                           | 20 ++++-
 .../lm-studio/chat-language-model.ts          |  7 ++
 utils/llm/reasoning.ts                        | 36 ++++++++
 utils/rpc/background-fns.ts                   |  5 +-
 utils/user-config/index.ts                    |  7 +-
 29 files changed, 383 insertions(+), 41 deletions(-)
 create mode 100644 entrypoints/sidepanel/components/Chat/ThinkingEffortSelector.vue
 create mode 100644 types/reasoning.ts
 create mode 100644 utils/llm/reasoning.ts

diff --git a/entrypoints/background/database/types.ts b/entrypoints/background/database/types.ts
index 8caef6cb..940d61d0 100644
--- a/entrypoints/background/database/types.ts
+++ b/entrypoints/background/database/types.ts
@@ -1,3 +1,5 @@
+import { StoredReasoningPreference } from '@/types/reasoning'
+
 // Database configuration
 export const DB_NAME = 'NativeMindExtension'
 export const DB_VERSION = 2
@@ -9,7 +11,7 @@ export interface ChatHistoryRecord {
   lastInteractedAt?: number
   history: string // JSON serialized HistoryItemV1[]
   contextUpdateInfo?: string // JSON serialized contextUpdateInfo from ChatHistoryV1
-  reasoningEnabled?: boolean // reasoning setting for this chat
+  reasoningEnabled?: StoredReasoningPreference // reasoning setting for this chat
   onlineSearchEnabled?: boolean // online search setting for this chat, default is true
   createdAt: number
   updatedAt: number
diff --git a/entrypoints/background/services/chat-history-service.ts b/entrypoints/background/services/chat-history-service.ts
index 70ee8faa..16786934 100644
--- a/entrypoints/background/services/chat-history-service.ts
+++ b/entrypoints/background/services/chat-history-service.ts
@@ -6,6 +6,7 @@
  */
 
 import { ChatHistoryV1, ChatList, ContextAttachment, ContextAttachmentStorage, HistoryItemV1 } from '@/types/chat'
+import { normalizeReasoningPreference } from '@/types/reasoning'
 import { useGlobalI18n } from '@/utils/i18n'
 import { getLocaleName } from '@/utils/i18n/constants'
 import logger from '@/utils/logger'
@@ -65,12 +66,16 @@ export class BackgroundChatHistoryService {
   }
 
   migrateFromOldHistoryRecord(record: ChatHistoryRecord): ChatHistoryV1 {
+    const reasoningPreference = record.reasoningEnabled === undefined
+      ? undefined
+      : normalizeReasoningPreference(record.reasoningEnabled)
+
     return {
       id: record.id,
       title: record.title,
       lastInteractedAt: record.lastInteractedAt,
       contextUpdateInfo: record.contextUpdateInfo ? JSON.parse(record.contextUpdateInfo) : undefined,
-      reasoningEnabled: record.reasoningEnabled,
+      reasoningEnabled: reasoningPreference,
       onlineSearchEnabled: record.onlineSearchEnabled ?? true, // default to true if undefined for backward compatibility
       history: JSON.parse(record.history) as HistoryItemV1[],
     }
diff --git a/entrypoints/content/utils/llm.ts b/entrypoints/content/utils/llm.ts
index 4cd62440..71d91637 100644
--- a/entrypoints/content/utils/llm.ts
+++ b/entrypoints/content/utils/llm.ts
@@ -8,6 +8,7 @@ import { readPortMessageIntoIterator, toAsyncIter } from '@/utils/async'
 import { AbortError, fromError, ModelRequestTimeoutError } from '@/utils/error'
 import { BackgroundAliveKeeper } from '@/utils/keepalive'
 import { SchemaName, Schemas } from '@/utils/llm/output-schema'
+import { getReasoningOptionForModel } from '@/utils/llm/reasoning'
 import { WebLLMSupportedModel } from '@/utils/llm/web-llm'
 import logger from '@/utils/logger'
 import { c2bRpc } from '@/utils/rpc'
@@ -22,9 +23,19 @@ interface ExtraOptions {
 }
 
 export async function* streamTextInBackground(options: Parameters<typeof c2bRpc.streamText>[0] & ExtraOptions) {
-  const defaultFirstTokenTimeout = (await getUserConfig()).llm.defaultFirstTokenTimeout.get()
+  const userConfig = await getUserConfig()
+  const defaultFirstTokenTimeout = userConfig.llm.defaultFirstTokenTimeout.get()
   const { abortSignal, timeout = defaultFirstTokenTimeout, ...restOptions } = options
-  const { portName } = await c2bRpc.streamText(restOptions)
+  const modelId = userConfig.llm.model.get()
+  const reasoningPreference = userConfig.llm.reasoning.get()
+  const computedReasoning = restOptions.autoThinking
+    ? restOptions.reasoning
+    : (restOptions.reasoning ?? getReasoningOptionForModel(reasoningPreference, modelId))
+  const requestOptions = {
+    ...restOptions,
+    ...(computedReasoning !== undefined ? { reasoning: computedReasoning } : {}),
+  }
+  const { portName } = await c2bRpc.streamText(requestOptions)
   const aliveKeeper = new BackgroundAliveKeeper()
   const port = browser.runtime.connect({ name: portName })
   abortSignal?.addEventListener('abort', () => {
@@ -36,9 +47,19 @@ export async function* streamTextInBackground(options: Parameters<typeof c2bRpc.
 }
 
 export async function* streamObjectInBackground<S extends SchemaName>(options: Parameters<typeof c2bRpc.streamObjectFromSchema<S>>[0] & ExtraOptions) {
-  const defaultFirstTokenTimeout = (await getUserConfig()).llm.defaultFirstTokenTimeout.get()
+  const userConfig = await getUserConfig()
+  const defaultFirstTokenTimeout = userConfig.llm.defaultFirstTokenTimeout.get()
   const { abortSignal, timeout = defaultFirstTokenTimeout, ...restOptions } = options
-  const { portName } = await c2bRpc.streamObjectFromSchema(restOptions)
+  const modelId = userConfig.llm.model.get()
+  const reasoningPreference = userConfig.llm.reasoning.get()
+  const computedReasoning = restOptions.autoThinking
+    ? restOptions.reasoning
+    : (restOptions.reasoning ?? getReasoningOptionForModel(reasoningPreference, modelId))
+  const requestOptions = {
+    ...restOptions,
+    ...(computedReasoning !== undefined ? { reasoning: computedReasoning } : {}),
+  }
+  const { portName } = await c2bRpc.streamObjectFromSchema(requestOptions)
   const aliveKeeper = new BackgroundAliveKeeper()
   const port = browser.runtime.connect({ name: portName })
   port.onDisconnect.addListener(() => aliveKeeper.dispose())
@@ -51,9 +72,19 @@ export async function* streamObjectInBackground<S extends SchemaName>(options: P
 }
 
 export async function generateObjectInBackground<S extends SchemaName>(options: Parameters<typeof c2bRpc.generateObjectFromSchema<S>>[0] & ExtraOptions) {
-  const defaultFirstTokenTimeout = (await getUserConfig()).llm.defaultFirstTokenTimeout.get()
+  const userConfig = await getUserConfig()
+  const defaultFirstTokenTimeout = userConfig.llm.defaultFirstTokenTimeout.get()
   const { promise: abortPromise, resolve, reject } = Promise.withResolvers<Awaited<ReturnType<typeof c2bRpc.generateObjectFromSchema<S>>>>()
   const { abortSignal, timeout = defaultFirstTokenTimeout, ...restOptions } = options
+  const modelId = userConfig.llm.model.get()
+  const reasoningPreference = userConfig.llm.reasoning.get()
+  const computedReasoning = restOptions.autoThinking
+    ? restOptions.reasoning
+    : (restOptions.reasoning ?? getReasoningOptionForModel(reasoningPreference, modelId))
+  const requestOptions = {
+    ...restOptions,
+    ...(computedReasoning !== undefined ? { reasoning: computedReasoning } : {}),
+  }
   const aliveKeeper = new BackgroundAliveKeeper()
   abortSignal?.addEventListener('abort', () => {
     log.debug('generate object request aborted')
@@ -61,12 +92,12 @@ export async function generateObjectInBackground<S extends SchemaName>(options:
     reject(new AbortError('Aborted'))
   })
   const timeoutTimer = setTimeout(() => {
-    log.warn('generate object request timeout', restOptions)
+    log.warn('generate object request timeout', requestOptions)
     reject(new ModelRequestTimeoutError())
   }, timeout)
   const promise = await c2bRpc
     .generateObjectFromSchema({
-      ...restOptions,
+      ...requestOptions,
     })
     .then((result) => {
       clearTimeout(timeoutTimer)
diff --git a/entrypoints/settings/components/DebugSettings/index.vue b/entrypoints/settings/components/DebugSettings/index.vue
index e652a166..eff73c55 100644
--- a/entrypoints/settings/components/DebugSettings/index.vue
+++ b/entrypoints/settings/components/DebugSettings/index.vue
@@ -556,7 +556,7 @@
 </template>
 
 <script setup lang="tsx">
-import { onMounted, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 
 import IconDelete from '@/assets/icons/delete.svg?component'
 import Input from '@/components/Input.vue'
@@ -566,6 +566,7 @@ import Switch from '@/components/Switch.vue'
 import Button from '@/components/ui/Button.vue'
 import UILanguageSelector from '@/components/UILanguageSelector.vue'
 import { BrowserSession } from '@/entrypoints/sidepanel/utils/chat/tool-calls/utils/browser-use'
+import { mergeReasoningPreference, normalizeReasoningPreference } from '@/types/reasoning'
 import { SettingsScrollTarget } from '@/types/scroll-targets'
 import { INVALID_URLS } from '@/utils/constants'
 import { formatSize } from '@/utils/formatter'
@@ -586,7 +587,15 @@ defineProps<{
 const userConfig = await getUserConfig()
 const translationSystemPrompt = userConfig.translation.systemPrompt.toRef()
 const chatSystemPrompt = userConfig.chat.systemPrompt.toRef()
-const enableReasoning = userConfig.llm.reasoning.toRef()
+const reasoningPreference = userConfig.llm.reasoning.toRef()
+const enableReasoning = computed({
+  get() {
+    return normalizeReasoningPreference(reasoningPreference.value).enabled
+  },
+  set(value: boolean) {
+    reasoningPreference.value = mergeReasoningPreference(reasoningPreference.value, { enabled: value })
+  },
+})
 const onboardingVersion = userConfig.ui.onboarding.version.toRef()
 const enabledChromeAIPolyfill = userConfig.browserAI.polyfill.enable.toRef()
 const writingToolsRewritePrompt = userConfig.writingTools.rewrite.systemPrompt.toRef()
diff --git a/entrypoints/sidepanel/components/Chat/ThinkingEffortSelector.vue b/entrypoints/sidepanel/components/Chat/ThinkingEffortSelector.vue
new file mode 100644
index 00000000..d38203ec
--- /dev/null
+++ b/entrypoints/sidepanel/components/Chat/ThinkingEffortSelector.vue
@@ -0,0 +1,84 @@
+<template>
+  <Selector
+    v-if="shouldShowSelector"
+    v-model="selectedEffort"
+    :options="effortOptions"
+    containerClass="min-w-0"
+    dropdownClass="text-xs text-text-primary w-32"
+    dropdownAlign="left"
+    triggerStyle="ghost"
+  >
+    <template #button="{ option }">
+      <div class="cursor-pointer text-xs bg-bg-accent-green text-text-secondary font-medium px-1 py-1 min-h-6 rounded-sm flex flex-row gap-1 items-center justify-center">
+        <IconThinking class="w-4 h-4 shrink-0" />
+        <span class="text-ellipsis overflow-hidden whitespace-nowrap">
+          {{ option?.label || t('chat.thinking_mode.label') }}
+        </span>
+        <IconExpand class="shrink-0" />
+      </div>
+    </template>
+  </Selector>
+</template>
+
+<script setup lang="ts">
+import { computed, watch } from 'vue'
+
+import IconExpand from '@/assets/icons/model-expand.svg?component'
+import IconThinking from '@/assets/icons/thinking-capability.svg?component'
+import Selector from '@/components/Selector.vue'
+import { DEFAULT_REASONING_PREFERENCE, mergeReasoningPreference, normalizeReasoningPreference, ReasoningEffort, ReasoningPreference } from '@/types/reasoning'
+import { useI18n } from '@/utils/i18n'
+import { isGptOssModel } from '@/utils/llm/reasoning'
+import { getUserConfig } from '@/utils/user-config'
+
+import { Chat } from '../../utils/chat'
+
+const { t } = useI18n()
+const userConfig = await getUserConfig()
+const chat = await Chat.getInstance()
+const currentModel = userConfig.llm.model.toRef()
+
+const effortOptions = computed(() => {
+  const labels: Record<ReasoningEffort, string> = {
+    low: t('chat.thinking_mode.low'),
+    medium: t('chat.thinking_mode.medium'),
+    high: t('chat.thinking_mode.high'),
+  }
+  return (['low', 'medium', 'high'] as ReasoningEffort[]).map((effort) => ({
+    id: effort,
+    label: labels[effort],
+  }))
+})
+
+const shouldShowSelector = computed(() => isGptOssModel(currentModel.value))
+
+const updateReasoningPreference = (updates: Partial<ReasoningPreference>, skipStoreUpdate = false) => {
+  const updatedGlobal = mergeReasoningPreference(userConfig.llm.reasoning.get(), updates)
+  userConfig.llm.reasoning.set(updatedGlobal)
+  if (skipStoreUpdate) return
+  const chatPreferenceSource = chat.historyManager.chatHistory.value.reasoningEnabled ?? updatedGlobal
+  chat.historyManager.chatHistory.value.reasoningEnabled = mergeReasoningPreference(chatPreferenceSource, updates)
+}
+
+const selectedEffort = computed<ReasoningEffort>({
+  get() {
+    const chatPreference = chat.historyManager.chatHistory.value.reasoningEnabled
+    const source = chatPreference !== undefined ? chatPreference : userConfig.llm.reasoning.get()
+    return normalizeReasoningPreference(source).effort
+  },
+  set(value) {
+    updateReasoningPreference({ effort: value, enabled: true })
+  },
+})
+
+watch(shouldShowSelector, (show) => {
+  if (!show) return
+  const chatPreference = chat.historyManager.chatHistory.value.reasoningEnabled
+  const source = chatPreference !== undefined ? chatPreference : userConfig.llm.reasoning.get()
+  const normalized = normalizeReasoningPreference(source)
+  if (!normalized.enabled || normalized.effort !== selectedEffort.value) {
+    const targetEffort: ReasoningEffort = normalized.enabled ? selectedEffort.value : DEFAULT_REASONING_PREFERENCE.effort
+    updateReasoningPreference({ enabled: true, effort: targetEffort })
+  }
+}, { immediate: true })
+</script>
diff --git a/entrypoints/sidepanel/components/Chat/ThinkingModeSwitch.vue b/entrypoints/sidepanel/components/Chat/ThinkingModeSwitch.vue
index 4c0a923f..f43a5ffa 100644
--- a/entrypoints/sidepanel/components/Chat/ThinkingModeSwitch.vue
+++ b/entrypoints/sidepanel/components/Chat/ThinkingModeSwitch.vue
@@ -29,6 +29,7 @@
 import { computed, onBeforeUnmount, onMounted, toRefs, watch } from 'vue'
 
 import IconThinking from '@/assets/icons/thinking-capability.svg?component'
+import { mergeReasoningPreference, normalizeReasoningPreference } from '@/types/reasoning'
 import { useI18n } from '@/utils/i18n'
 import { isToggleableThinkingModel } from '@/utils/llm/thinking-models'
 import { useLLMBackendStatusStore } from '@/utils/pinia-store/store'
@@ -64,7 +65,8 @@ const isThinkingEnabled = computed({
   get() {
     // If chat has a specific setting, use it; otherwise use global setting
     const chatSetting = chat.historyManager.chatHistory.value.reasoningEnabled
-    return chatSetting !== undefined ? chatSetting : userConfig.llm.reasoning.get()
+    const source = chatSetting !== undefined ? chatSetting : userConfig.llm.reasoning.get()
+    return normalizeReasoningPreference(source).enabled
   },
   set(value: boolean) {
     setThinkingEnabled(value)
@@ -101,10 +103,12 @@ const toggleThinking = () => {
 
 const setThinkingEnabled = (value: boolean, skipStoreUpdate = false) => {
   // Update global setting
-  userConfig.llm.reasoning.set(value)
+  const updatedGlobal = mergeReasoningPreference(userConfig.llm.reasoning.get(), { enabled: value })
+  userConfig.llm.reasoning.set(updatedGlobal)
   if (skipStoreUpdate) return
   // Store chat-specific setting in chat history
-  chat.historyManager.chatHistory.value.reasoningEnabled = value
+  const chatPreference = chat.historyManager.chatHistory.value.reasoningEnabled ?? updatedGlobal
+  chat.historyManager.chatHistory.value.reasoningEnabled = mergeReasoningPreference(chatPreference, { enabled: value })
 }
 
 // Handle thinking state based on model capabilities
diff --git a/entrypoints/sidepanel/components/Chat/index.vue b/entrypoints/sidepanel/components/Chat/index.vue
index 48b537fd..1570a387 100644
--- a/entrypoints/sidepanel/components/Chat/index.vue
+++ b/entrypoints/sidepanel/components/Chat/index.vue
@@ -96,7 +96,8 @@
           <!-- Toolbar -->
           <div class="absolute bottom-0 left-0 right-0 flex flex-row justify-between w-full h-9 pl-3 pr-1.5 items-center">
             <div class="flex grow items-center gap-1">
-              <ThinkingModeSwitch />
+              <ThinkingEffortSelector v-if="showReasoningEffortSelector" />
+              <ThinkingModeSwitch v-else />
               <OnlineSearchSwitch />
             </div>
             <div class="flex gap-2 flex-row">
@@ -145,8 +146,10 @@ import ScrollContainer from '@/components/ScrollContainer.vue'
 import Button from '@/components/ui/Button.vue'
 import { FileGetter } from '@/utils/file'
 import { useI18n } from '@/utils/i18n'
+import { isGptOssModel } from '@/utils/llm/reasoning'
 import logger from '@/utils/logger'
 import { setSidepanelStatus } from '@/utils/sidepanel-status'
+import { getUserConfig } from '@/utils/user-config'
 import { classNames } from '@/utils/vue/utils'
 
 import { showSettings } from '../../../../utils/settings'
@@ -163,6 +166,7 @@ import MessageAssistant from './Messages/Assistant.vue'
 import MessageTask from './Messages/Task.vue'
 import MessageUser from './Messages/User.vue'
 import OnlineSearchSwitch from './OnlineSearchSwitch.vue'
+import ThinkingEffortSelector from './ThinkingEffortSelector.vue'
 import ThinkingModeSwitch from './ThinkingModeSwitch.vue'
 
 const inputContainerRef = ref<HTMLDivElement>()
@@ -182,6 +186,10 @@ defineExpose({
   attachmentSelectorRef,
 })
 
+const userConfig = await getUserConfig()
+const currentModel = userConfig.llm.model.toRef()
+const showReasoningEffortSelector = computed(() => isGptOssModel(currentModel.value))
+
 const chat = await Chat.getInstance()
 const contextAttachmentStorage = chat.contextAttachmentStorage
 
diff --git a/entrypoints/sidepanel/utils/chat/chat.ts b/entrypoints/sidepanel/utils/chat/chat.ts
index 7bc2f8f2..13b1ccb3 100644
--- a/entrypoints/sidepanel/utils/chat/chat.ts
+++ b/entrypoints/sidepanel/utils/chat/chat.ts
@@ -4,6 +4,7 @@ import { type Ref, ref, toRaw, toRef, watch } from 'vue'
 
 import type { ActionMessageV1, ActionTypeV1, ActionV1, AgentMessageV1, AgentTaskGroupMessageV1, AgentTaskMessageV1, AssistantMessageV1, ChatHistoryV1, ChatList, HistoryItemV1, TaskMessageV1, UserMessageV1 } from '@/types/chat'
 import { ContextAttachmentStorage } from '@/types/chat'
+import { normalizeReasoningPreference, StoredReasoningPreference } from '@/types/reasoning'
 import { nonNullable } from '@/utils/array'
 import { debounce } from '@/utils/debounce'
 import { useGlobalI18n } from '@/utils/i18n'
@@ -316,7 +317,18 @@ export class Chat {
           onlineSearchEnabled: true, // Default to true for new chats
         })
 
-        userConfig.llm.reasoning.set(chatHistory.value.reasoningEnabled ?? true)
+        const applyReasoningPreference = (preference?: StoredReasoningPreference) => {
+          if (preference === undefined) {
+            const normalized = normalizeReasoningPreference(userConfig.llm.reasoning.get())
+            userConfig.llm.reasoning.set(normalized)
+            return
+          }
+          const normalized = normalizeReasoningPreference(preference)
+          chatHistory.value.reasoningEnabled = normalized
+          userConfig.llm.reasoning.set(normalized)
+        }
+
+        applyReasoningPreference(chatHistory.value.reasoningEnabled)
         userConfig.chat.onlineSearch.enable.set(chatHistory.value.onlineSearchEnabled ?? true)
         const contextAttachments = ref<ContextAttachmentStorage>(await s2bRpc.getContextAttachments(chatHistoryId.value) ?? { attachments: [], id: chatHistoryId.value, lastInteractedAt: Date.now() })
         const chatList = ref<ChatList>([])
@@ -384,7 +396,7 @@ export class Chat {
           Object.assign(chatHistory.value, newChatHistory)
           Object.assign(contextAttachments.value, newContextAttachments)
 
-          userConfig.llm.reasoning.set(newChatHistory.reasoningEnabled ?? true)
+          applyReasoningPreference(newChatHistory.reasoningEnabled)
           userConfig.chat.onlineSearch.enable.set(newChatHistory.onlineSearchEnabled ?? true)
 
           // Clean up any loading messages
diff --git a/entrypoints/sidepanel/utils/llm.ts b/entrypoints/sidepanel/utils/llm.ts
index ed649ba1..ba7c191b 100644
--- a/entrypoints/sidepanel/utils/llm.ts
+++ b/entrypoints/sidepanel/utils/llm.ts
@@ -8,6 +8,7 @@ import { readPortMessageIntoIterator, toAsyncIter } from '@/utils/async'
 import { AbortError, fromError, ModelRequestTimeoutError } from '@/utils/error'
 import { BackgroundAliveKeeper } from '@/utils/keepalive'
 import { SchemaName } from '@/utils/llm/output-schema'
+import { getReasoningOptionForModel } from '@/utils/llm/reasoning'
 import { WebLLMSupportedModel } from '@/utils/llm/web-llm'
 import logger from '@/utils/logger'
 import { s2bRpc } from '@/utils/rpc'
@@ -23,7 +24,17 @@ interface ExtraOptions {
 
 export async function* streamTextInBackground(options: Parameters<typeof s2bRpc.streamText>[0] & ExtraOptions) {
   const { abortSignal, timeout = DEFAULT_PENDING_TIMEOUT, ...restOptions } = options
-  const { portName } = await s2bRpc.streamText(restOptions)
+  const userConfig = await getUserConfig()
+  const modelId = userConfig.llm.model.get()
+  const reasoningPreference = userConfig.llm.reasoning.get()
+  const computedReasoning = restOptions.autoThinking
+    ? restOptions.reasoning
+    : (restOptions.reasoning ?? getReasoningOptionForModel(reasoningPreference, modelId))
+  const requestOptions = {
+    ...restOptions,
+    ...(computedReasoning !== undefined ? { reasoning: computedReasoning } : {}),
+  }
+  const { portName } = await s2bRpc.streamText(requestOptions)
   const aliveKeeper = new BackgroundAliveKeeper()
   const port = browser.runtime.connect({ name: portName })
   abortSignal?.addEventListener('abort', () => {
@@ -36,7 +47,17 @@ export async function* streamTextInBackground(options: Parameters<typeof s2bRpc.
 
 export async function* streamObjectInBackground(options: Parameters<typeof s2bRpc.streamObjectFromSchema>[0] & ExtraOptions) {
   const { abortSignal, timeout = DEFAULT_PENDING_TIMEOUT, ...restOptions } = options
-  const { portName } = await s2bRpc.streamObjectFromSchema(restOptions)
+  const userConfig = await getUserConfig()
+  const modelId = userConfig.llm.model.get()
+  const reasoningPreference = userConfig.llm.reasoning.get()
+  const computedReasoning = restOptions.autoThinking
+    ? restOptions.reasoning
+    : (restOptions.reasoning ?? getReasoningOptionForModel(reasoningPreference, modelId))
+  const requestOptions = {
+    ...restOptions,
+    ...(computedReasoning !== undefined ? { reasoning: computedReasoning } : {}),
+  }
+  const { portName } = await s2bRpc.streamObjectFromSchema(requestOptions)
   const aliveKeeper = new BackgroundAliveKeeper()
   const port = browser.runtime.connect({ name: portName })
   port.onDisconnect.addListener(() => aliveKeeper.dispose())
@@ -51,6 +72,16 @@ export async function* streamObjectInBackground(options: Parameters<typeof s2bRp
 export async function generateObjectInBackground<S extends SchemaName>(options: Parameters<typeof s2bRpc.generateObjectFromSchema<S>>[0] & ExtraOptions) {
   const { promise: abortPromise, reject } = Promise.withResolvers<Awaited<ReturnType<typeof s2bRpc.generateObjectFromSchema<S>>>>()
   const { abortSignal, timeout = DEFAULT_PENDING_TIMEOUT, ...restOptions } = options
+  const userConfig = await getUserConfig()
+  const modelId = userConfig.llm.model.get()
+  const reasoningPreference = userConfig.llm.reasoning.get()
+  const computedReasoning = restOptions.autoThinking
+    ? restOptions.reasoning
+    : (restOptions.reasoning ?? getReasoningOptionForModel(reasoningPreference, modelId))
+  const requestOptions = {
+    ...restOptions,
+    ...(computedReasoning !== undefined ? { reasoning: computedReasoning } : {}),
+  }
   const aliveKeeper = new BackgroundAliveKeeper()
   abortSignal?.addEventListener('abort', () => {
     log.debug('generate object request aborted')
@@ -58,12 +89,12 @@ export async function generateObjectInBackground<S extends SchemaName>(options:
     reject(new AbortError('Aborted'))
   })
   const timeoutTimer = setTimeout(() => {
-    log.warn('generate object request timeout', restOptions)
+    log.warn('generate object request timeout', requestOptions)
     reject(new ModelRequestTimeoutError())
   }, timeout)
   const promise = s2bRpc
     .generateObjectFromSchema({
-      ...restOptions,
+      ...requestOptions,
     })
     .then((result) => {
       clearTimeout(timeoutTimer)
diff --git a/locales/de.json b/locales/de.json
index 49573076..b408baad 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -10,7 +10,10 @@
       "title": "Schnelle Aktionen"
     },
     "thinking_mode": {
-      "label": "Denken"
+      "label": "Denken",
+      "low": "Niedrig",
+      "medium": "Mittel",
+      "high": "Hoch"
     },
     "input": {
       "placeholder": {
diff --git a/locales/en.json b/locales/en.json
index 12267098..c27f70f2 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -250,7 +250,10 @@
       "title": "Quick Actions"
     },
     "thinking_mode": {
-      "label": "Thinking"
+      "label": "Thinking",
+      "low": "Low",
+      "medium": "Medium",
+      "high": "High"
     },
     "input": {
       "placeholder": {
diff --git a/locales/es.json b/locales/es.json
index c0b63c8f..9f733288 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -31,7 +31,10 @@
       "title": "Acciones Rápidas"
     },
     "thinking_mode": {
-      "label": "Pensando"
+      "label": "Pensando",
+      "low": "Bajo",
+      "medium": "Medio",
+      "high": "Alto"
     },
     "prompt": {
       "highlight_key_insights": {
diff --git a/locales/fr.json b/locales/fr.json
index 1b99d626..8f5bb55a 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -10,7 +10,10 @@
       "title": "Actions rapides"
     },
     "thinking_mode": {
-      "label": "Réflexion"
+      "label": "Réflexion",
+      "low": "Faible",
+      "medium": "Moyen",
+      "high": "Élevé"
     },
     "input": {
       "placeholder": {
diff --git a/locales/id.json b/locales/id.json
index d13dae04..2cb63bbe 100644
--- a/locales/id.json
+++ b/locales/id.json
@@ -10,7 +10,10 @@
       "title": "Tindakan cepat"
     },
     "thinking_mode": {
-      "label": "Berpikir"
+      "label": "Berpikir",
+      "low": "Rendah",
+      "medium": "Sedang",
+      "high": "Tinggi"
     },
     "input": {
       "placeholder": {
diff --git a/locales/ja.json b/locales/ja.json
index 35b76eea..ca85c8da 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -10,7 +10,10 @@
       "title": "クイックアクション"
     },
     "thinking_mode": {
-      "label": "思考"
+      "label": "思考",
+      "low": "低",
+      "medium": "中",
+      "high": "高"
     },
     "input": {
       "placeholder": {
diff --git a/locales/ko.json b/locales/ko.json
index 6ad5bd73..76ebc42e 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -10,7 +10,10 @@
       "title": "빠른 액션"
     },
     "thinking_mode": {
-      "label": "사고"
+      "label": "사고",
+      "low": "낮음",
+      "medium": "중간",
+      "high": "높음"
     },
     "input": {
       "placeholder": {
diff --git a/locales/pt.json b/locales/pt.json
index 95914bc0..88137618 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -10,7 +10,10 @@
       "title": "Ações rápidas"
     },
     "thinking_mode": {
-      "label": "Pensando"
+      "label": "Pensando",
+      "low": "Baixo",
+      "medium": "Médio",
+      "high": "Alto"
     },
     "input": {
       "placeholder": {
diff --git a/locales/ru.json b/locales/ru.json
index 6f597dc6..8acb01fa 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -10,7 +10,10 @@
       "title": "Быстрые действия"
     },
     "thinking_mode": {
-      "label": "Мышление"
+      "label": "Мышление",
+      "low": "Низкий",
+      "medium": "Средний",
+      "high": "Высокий"
     },
     "input": {
       "placeholder": {
diff --git a/locales/th.json b/locales/th.json
index 7603bc54..62771cbd 100644
--- a/locales/th.json
+++ b/locales/th.json
@@ -10,7 +10,10 @@
       "title": "การกระทำที่รวดเร็ว"
     },
     "thinking_mode": {
-      "label": "กำลังคิด"
+      "label": "กำลังคิด",
+      "low": "ต่ำ",
+      "medium": "ปานกลาง",
+      "high": "สูง"
     },
     "input": {
       "placeholder": {
diff --git a/locales/vi.json b/locales/vi.json
index 93ef2ddb..b99679e0 100644
--- a/locales/vi.json
+++ b/locales/vi.json
@@ -10,7 +10,10 @@
       "title": "Thao tác nhanh"
     },
     "thinking_mode": {
-      "label": "Suy nghĩ"
+      "label": "Suy nghĩ",
+      "low": "Thấp",
+      "medium": "Trung bình",
+      "high": "Cao"
     },
     "input": {
       "placeholder": {
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 11ee7fa4..ef466698 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -250,7 +250,10 @@
       "title": "快捷操作"
     },
     "thinking_mode": {
-      "label": "思考"
+      "label": "思考",
+      "low": "低",
+      "medium": "中",
+      "high": "高"
     },
     "input": {
       "placeholder": {
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index cb63cd6b..4c26c9c0 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -10,7 +10,10 @@
       "title": "快捷操作"
     },
     "thinking_mode": {
-      "label": "推理"
+      "label": "推理",
+      "low": "低",
+      "medium": "中",
+      "high": "高"
     },
     "input": {
       "placeholder": {
diff --git a/types/chat.ts b/types/chat.ts
index 1b0da406..bdfc5dbd 100644
--- a/types/chat.ts
+++ b/types/chat.ts
@@ -4,6 +4,7 @@ import { IconName } from '@/utils/icon'
 
 import { PromiseOr } from './common'
 import { Base64ImageData } from './image'
+import { StoredReasoningPreference } from './reasoning'
 import { SettingsScrollTarget } from './scroll-targets'
 import { TabInfo } from './tab'
 
@@ -197,7 +198,7 @@ export type ChatHistoryV1 = {
     lastFullUpdateMessageId?: string // last message id that was fully updated with context info
     lastAttachmentIds: string[]
   }
-  reasoningEnabled?: boolean // reasoning setting for this chat
+  reasoningEnabled?: StoredReasoningPreference // reasoning setting for this chat
   onlineSearchEnabled: boolean // online search setting for this chat, default is true
   history: HistoryItemV1[]
 }
diff --git a/types/reasoning.ts b/types/reasoning.ts
new file mode 100644
index 00000000..ae191b4f
--- /dev/null
+++ b/types/reasoning.ts
@@ -0,0 +1,53 @@
+export const REASONING_EFFORTS = ['low', 'medium', 'high'] as const
+
+export type ReasoningEffort = typeof REASONING_EFFORTS[number]
+
+export type ReasoningPreference = {
+  enabled: boolean
+  effort: ReasoningEffort
+}
+
+export type StoredReasoningPreference = boolean | ReasoningPreference | undefined
+export type ReasoningOption = boolean | ReasoningEffort
+
+export const DEFAULT_REASONING_PREFERENCE: ReasoningPreference = {
+  enabled: true,
+  effort: 'medium',
+}
+
+export const isReasoningEffort = (value: unknown): value is ReasoningEffort => {
+  return typeof value === 'string' && (REASONING_EFFORTS as readonly string[]).includes(value.toLowerCase())
+}
+
+export const normalizeReasoningEffort = (value: unknown): ReasoningEffort => {
+  if (isReasoningEffort(value)) return value
+  return DEFAULT_REASONING_PREFERENCE.effort
+}
+
+export const normalizeReasoningPreference = (value: StoredReasoningPreference): ReasoningPreference => {
+  if (!value) return { ...DEFAULT_REASONING_PREFERENCE }
+  if (typeof value === 'boolean') {
+    return {
+      enabled: value,
+      effort: DEFAULT_REASONING_PREFERENCE.effort,
+    }
+  }
+  const enabled = typeof value.enabled === 'boolean' ? value.enabled : DEFAULT_REASONING_PREFERENCE.enabled
+  const effort = normalizeReasoningEffort(value.effort)
+  return {
+    enabled,
+    effort,
+  }
+}
+
+export const mergeReasoningPreference = (
+  base: StoredReasoningPreference,
+  updates: Partial<ReasoningPreference>,
+): ReasoningPreference => {
+  const normalized = normalizeReasoningPreference(base)
+  return {
+    ...normalized,
+    ...updates,
+    effort: updates.effort ? normalizeReasoningEffort(updates.effort) : normalized.effort,
+  }
+}
diff --git a/utils/llm/models.ts b/utils/llm/models.ts
index f8f0d9cb..4135b0e5 100644
--- a/utils/llm/models.ts
+++ b/utils/llm/models.ts
@@ -1,5 +1,6 @@
 import { LanguageModelV1, wrapLanguageModel } from 'ai'
 
+import type { ReasoningOption } from '@/types/reasoning'
 import { getUserConfig } from '@/utils/user-config'
 
 import { ModelNotFoundError } from '../error'
@@ -10,6 +11,7 @@ import { checkModelSupportThinking } from './ollama'
 import { LMStudioChatLanguageModel } from './providers/lm-studio/chat-language-model'
 import { createOllama } from './providers/ollama'
 import { WebLLMChatLanguageModel } from './providers/web-llm/openai-compatible-chat-language-model'
+import { getReasoningOptionForModel, isGptOssModel } from './reasoning'
 import { isToggleableThinkingModel } from './thinking-models'
 import { getWebLLMEngine, WebLLMSupportedModel } from './web-llm'
 
@@ -21,7 +23,8 @@ export async function getModelUserConfig() {
   const apiKey = userConfig.llm.apiKey.get()
   const numCtx = userConfig.llm.backends[endpointType === 'lm-studio' ? 'lmStudio' : 'ollama'].numCtx.get()
   const enableNumCtx = userConfig.llm.backends[endpointType === 'lm-studio' ? 'lmStudio' : 'ollama'].enableNumCtx.get()
-  const reasoning = userConfig.llm.reasoning.get()
+  const reasoningPreference = userConfig.llm.reasoning.get()
+  const reasoning = getReasoningOptionForModel(reasoningPreference, model)
   if (!model) {
     throw new ModelNotFoundError(undefined, endpointType)
   }
@@ -44,7 +47,7 @@ export async function getModel(options: {
   apiKey: string
   numCtx: number
   enableNumCtx: boolean
-  reasoning: boolean
+  reasoning: ReasoningOption
   autoThinking?: boolean
   endpointType: LLMEndpointType
   onLoadingModel?: (prg: ModelLoadingProgressEvent) => void
@@ -58,6 +61,17 @@ export async function getModel(options: {
     const currentModel = options.model
     const supportsThinking = await checkModelSupportThinking(currentModel)
     const supportsToggleThinking = isToggleableThinkingModel(endpointType, currentModel)
+    const isCurrentGptOss = isGptOssModel(currentModel)
+    const reasoningValue = options.reasoning
+    let thinkValue: ReasoningOption | undefined
+    if (supportsThinking && reasoningValue !== undefined) {
+      if (isCurrentGptOss) {
+        thinkValue = reasoningValue
+      }
+      else if (supportsToggleThinking) {
+        thinkValue = typeof reasoningValue === 'boolean' ? reasoningValue : true
+      }
+    }
     const customFetch = makeCustomFetch({
       bodyTransformer: (body) => {
         // process thinking capability by ollama itself, using on translation feature
@@ -67,7 +81,7 @@ export async function getModel(options: {
         const parsedBody = JSON.parse(body)
         return JSON.stringify({
           ...parsedBody,
-          think: supportsThinking && supportsToggleThinking ? options.reasoning : undefined,
+          think: thinkValue,
         })
       },
     })
diff --git a/utils/llm/providers/lm-studio/chat-language-model.ts b/utils/llm/providers/lm-studio/chat-language-model.ts
index d437ff9c..51061013 100644
--- a/utils/llm/providers/lm-studio/chat-language-model.ts
+++ b/utils/llm/providers/lm-studio/chat-language-model.ts
@@ -60,6 +60,7 @@ export class LMStudioChatLanguageModel implements LanguageModelV1 {
     stopSequences,
     seed,
     abortSignal,
+    providerMetadata,
   }: Parameters<LanguageModelV1['doGenerate']>[0]) {
     const warnings: LanguageModelV1CallWarning[] = []
 
@@ -90,6 +91,8 @@ export class LMStudioChatLanguageModel implements LanguageModelV1 {
 
       stop: stopSequences,
       seed,
+      // reasoning_effort support for gpt-oss models
+      reasoningEffort: providerMetadata?.['lm-studio']?.reasoningEffort ?? providerMetadata?.['openai-compatible']?.reasoningEffort,
       // messages:
       messages: await convertToLMStudioMessages(this.client, prompt),
     }
@@ -107,6 +110,9 @@ export class LMStudioChatLanguageModel implements LanguageModelV1 {
 
     log.debug('doGenerate called', { args, options })
 
+    // Note: LM Studio SDK types don't include reasoningEffort yet, but we pass it anyway
+    // in case the runtime supports it (for gpt-oss models)
+
     const responseBody = await this.model.respond(args.messages, {
       signal: body.signal,
       maxTokens: body.maxTokens,
@@ -116,6 +122,7 @@ export class LMStudioChatLanguageModel implements LanguageModelV1 {
       stopStrings: body.stop,
       contextOverflowPolicy: 'truncateMiddle',
       structured: body.structured,
+      // reasoningEffort: body.reasoningEffort, //TODO
     })
 
     const { messages: rawPrompt, ...rawSettings } = args
diff --git a/utils/llm/reasoning.ts b/utils/llm/reasoning.ts
new file mode 100644
index 00000000..47d2a2cb
--- /dev/null
+++ b/utils/llm/reasoning.ts
@@ -0,0 +1,36 @@
+import { DEFAULT_REASONING_PREFERENCE, mergeReasoningPreference, normalizeReasoningPreference, ReasoningEffort, ReasoningPreference, StoredReasoningPreference } from '@/types/reasoning'
+
+export const isGptOssModel = (model?: string | null): boolean => {
+  if (!model) return false
+  return model.toLowerCase().includes('gpt-oss')
+}
+
+export const ensureReasoningPreference = (value: StoredReasoningPreference): ReasoningPreference => {
+  return normalizeReasoningPreference(value)
+}
+
+export const withReasoningUpdates = (
+  base: StoredReasoningPreference,
+  updates: Partial<ReasoningPreference>,
+): ReasoningPreference => {
+  return mergeReasoningPreference(base, updates)
+}
+
+export const getReasoningOptionForModel = (
+  preference: StoredReasoningPreference,
+  model?: string | null,
+): ReasoningEffort | boolean => {
+  const normalized = normalizeReasoningPreference(preference)
+  if (!normalized.enabled) return false
+  return isGptOssModel(model) ? normalized.effort : true
+}
+
+export const getReasoningPreferenceOrDefault = (value: StoredReasoningPreference): ReasoningPreference => {
+  const normalized = normalizeReasoningPreference(value)
+  return {
+    ...DEFAULT_REASONING_PREFERENCE,
+    ...normalized,
+    effort: normalized.effort,
+    enabled: normalized.enabled,
+  }
+}
diff --git a/utils/rpc/background-fns.ts b/utils/rpc/background-fns.ts
index 449c77b0..abd69406 100644
--- a/utils/rpc/background-fns.ts
+++ b/utils/rpc/background-fns.ts
@@ -6,6 +6,7 @@ import { z } from 'zod'
 import { convertJsonSchemaToZod, JSONSchema } from 'zod-from-json-schema'
 
 import { ChatHistoryV1, ContextAttachmentStorage } from '@/types/chat'
+import type { ReasoningOption } from '@/types/reasoning'
 import { TabInfo } from '@/types/tab'
 import logger from '@/utils/logger'
 
@@ -34,7 +35,7 @@ import { preparePortConnection, shouldGenerateChatTitle } from './utils'
 type StreamTextOptions = Omit<Parameters<typeof originalStreamText>[0], 'tools'>
 type GenerateTextOptions = Omit<Parameters<typeof originalGenerateText>[0], 'tools'>
 type GenerateObjectOptions = Omit<Parameters<typeof originalGenerateObject>[0], 'tools'>
-type ExtraGenerateOptions = { modelId?: string, reasoning?: boolean, autoThinking?: boolean }
+type ExtraGenerateOptions = { modelId?: string, reasoning?: ReasoningOption, autoThinking?: boolean }
 type ExtraGenerateOptionsWithTools = ExtraGenerateOptions
 type SchemaOptions<S extends SchemaName> = { schema: S } | { jsonSchema: JSONSchema }
 
@@ -79,7 +80,7 @@ const parseSchema = <S extends SchemaName>(options: SchemaOptions<S>) => {
 const generateExtraModelOptions = (options: ExtraGenerateOptions) => {
   return {
     ...(options.modelId !== undefined ? { model: options.modelId } : {}),
-    ...(options.reasoning !== undefined ? { reasoningEffort: options.reasoning } : {}),
+    ...(options.reasoning !== undefined ? { reasoning: options.reasoning } : {}),
     ...(options.autoThinking !== undefined ? { autoThinking: options.autoThinking } : {}),
   }
 }
diff --git a/utils/user-config/index.ts b/utils/user-config/index.ts
index cc5fcb2f..90d37d54 100644
--- a/utils/user-config/index.ts
+++ b/utils/user-config/index.ts
@@ -1,6 +1,7 @@
 import { computed } from 'vue'
 import { browser } from 'wxt/browser'
 
+import { DEFAULT_REASONING_PREFERENCE, normalizeReasoningPreference } from '@/types/reasoning'
 import { ThemeModeType } from '@/types/theme'
 import { c2bRpc } from '@/utils/rpc'
 
@@ -92,6 +93,10 @@ export async function _getUserConfig() {
     }
   })
 
+  const reasoning = await new Config('llm.reasoning').default(DEFAULT_REASONING_PREFERENCE).build()
+  const normalizedReasoning = normalizeReasoningPreference(reasoning.get())
+  reasoning.set(normalizedReasoning)
+
   return {
     locale: {
       current: await new Config<SupportedLocaleCode, undefined>('locale.current').build(),
@@ -101,7 +106,7 @@ export async function _getUserConfig() {
       endpointType: await new Config('llm.endpointType').default('ollama' as LLMEndpointType).build(),
       model: await new Config<string, undefined>('llm.model').build(),
       apiKey: await new Config('llm.apiKey').default('ollama').build(),
-      reasoning: await new Config('llm.reasoning').default(true).build(),
+      reasoning,
       titleGenerationSystemPrompt: await new Config('llm.titleGenerationSystemPrompt').default(DEFAULT_CHAT_TITLE_GENERATION_SYSTEM_PROMPT).build(),
       backends: {
         ollama: {

From 2a53084337476a02554cbf0353102f5cb559b468 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 Oct 2025 05:46:19 +0000
Subject: [PATCH 06/25] chore(release): v1.11.0-beta.0

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86e73fd4..32824a1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## v1.11.0-beta.0
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.10.1...v1.11.0-beta.0)
+
+### 🚀 Enhancements
+
+- **chat:** Implement message editing and copying functionality in User component ([5ed4d64](https://github.com/NativeMindBrowser/NativeMindExtension/commit/5ed4d64))
+- **chat:** Enhance message editing UI with scroll container and improved button functionality ([88ed48d](https://github.com/NativeMindBrowser/NativeMindExtension/commit/88ed48d))
+- **selection:** Implement selection text tracking and integrate with llm ([ccdf982](https://github.com/NativeMindBrowser/NativeMindExtension/commit/ccdf982))
+- Add camera functionality and support for captured pages ([2c551a3](https://github.com/NativeMindBrowser/NativeMindExtension/commit/2c551a3))
+- Introduce effort selection for gpt-oss in chat ([11d3e19](https://github.com/NativeMindBrowser/NativeMindExtension/commit/11d3e19))
+
+### 🩹 Fixes
+
+- **web-llm:** Fix infinite loading when local model cache is invalid ([66239b1](https://github.com/NativeMindBrowser/NativeMindExtension/commit/66239b1))
+
+### 🏡 Chore
+
+- **release:** V1.9.5 ([c7afaef](https://github.com/NativeMindBrowser/NativeMindExtension/commit/c7afaef))
+
+### ❤️ Contributors
+
+- NekoWings ([@NekoWings](http://github.com/NekoWings))
+- Neko Liu ([@NekoWings](http://github.com/NekoWings))
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+
 ## v1.10.1
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.10.1-beta.2...v1.10.1)
diff --git a/package.json b/package.json
index 6292b070..79440b4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativemind-extension",
-  "version": "1.10.1",
+  "version": "1.11.0-beta.0",
   "private": false,
   "author": "NativeMind",
   "keywords": [

From befb170efb183305f90ecf4a347422f42de3a8f9 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Mon, 20 Oct 2025 16:43:01 +0800
Subject: [PATCH 07/25] fix(chat): add cleanup method for loading attachments
 in ReactiveHistoryManager

---
 entrypoints/sidepanel/utils/chat/chat.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/entrypoints/sidepanel/utils/chat/chat.ts b/entrypoints/sidepanel/utils/chat/chat.ts
index 13b1ccb3..5415332f 100644
--- a/entrypoints/sidepanel/utils/chat/chat.ts
+++ b/entrypoints/sidepanel/utils/chat/chat.ts
@@ -280,6 +280,17 @@ export class ReactiveHistoryManager extends EventEmitter {
   cleanupLoadingMessages() {
     this.cleanUp(this.chatHistory.value.history)
   }
+
+  cleanupLoadingAttachments(contextAttachmentStorage: Ref<ContextAttachmentStorage>) {
+    // Remove loading attachments from the attachments array
+    contextAttachmentStorage.value.attachments = contextAttachmentStorage.value.attachments.filter(
+      (attachment) => attachment.type !== 'loading',
+    )
+    // Remove loading attachment from currentTab if it exists
+    if (contextAttachmentStorage.value.currentTab?.type === 'loading') {
+      contextAttachmentStorage.value.currentTab = undefined
+    }
+  }
 }
 
 type ChatStatus = 'idle' | 'pending' | 'streaming'
@@ -401,6 +412,8 @@ export class Chat {
 
           // Clean up any loading messages
           instance.historyManager.cleanupLoadingMessages()
+          // Clean up any loading attachments
+          instance.historyManager.cleanupLoadingAttachments(contextAttachments)
 
           // Update the chat list to reflect any changes
           updateChatList()
@@ -645,6 +658,8 @@ export class Chat {
       abortController.abort()
     })
     this.abortControllers.length = 0
+    // Clean up any loading attachments when stopping
+    this.historyManager.cleanupLoadingAttachments(this.contextAttachmentStorage)
   }
 
   /**

From eec015bd888736f703b94fed8f429e07ae77ede5 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Tue, 21 Oct 2025 17:23:40 +0800
Subject: [PATCH 08/25] feat: Add copy and retry actions for AI messages
 component.

- Introduced a new component `MessageRetrySelector.vue` to allow users to retry messages with different models.
- Updated `User.vue` to integrate the retry functionality with the new component.
- Enhanced `index.vue` to manage the state of retry actions and track assistant messages for retries.
- Modified onboarding and chat utilities to support temporary model overrides during retries.
- Updated localization files to include new strings for retry actions and used models.
- Adjusted various utility functions to accommodate model and endpoint type parameters for better flexibility in model handling.
---
 assets/icons/copy.svg                         |   7 +-
 assets/icons/retry.svg                        |   8 +
 components/Selector.vue                       |  17 +-
 .../components/Chat/Messages/Assistant.vue    | 283 +++++++++++-------
 .../Chat/Messages/MessageRetrySelector.vue    | 132 ++++++++
 .../components/Chat/Messages/User.vue         |   4 +-
 .../sidepanel/components/Chat/index.vue       |  82 +++++
 .../sidepanel/components/Onboarding/index.vue |  18 +-
 entrypoints/sidepanel/utils/agent/index.ts    |  24 +-
 entrypoints/sidepanel/utils/chat/chat.ts      |  19 +-
 entrypoints/sidepanel/utils/llm.ts            |  10 +-
 locales/de.json                               |   6 +-
 locales/en.json                               |   8 +-
 locales/es.json                               |   8 +-
 locales/fr.json                               |   6 +-
 locales/id.json                               |   8 +-
 locales/ja.json                               |   6 +-
 locales/ko.json                               |   6 +-
 locales/pt.json                               |   6 +-
 locales/ru.json                               |   6 +-
 locales/th.json                               |   6 +-
 locales/vi.json                               |   6 +-
 locales/zh-CN.json                            |   8 +-
 locales/zh-TW.json                            |   6 +-
 types/chat.ts                                 |   4 +
 utils/llm/models.ts                           |  17 +-
 utils/rpc/background-fns.ts                   |  13 +-
 27 files changed, 550 insertions(+), 174 deletions(-)
 create mode 100644 assets/icons/retry.svg
 create mode 100644 entrypoints/sidepanel/components/Chat/Messages/MessageRetrySelector.vue

diff --git a/assets/icons/copy.svg b/assets/icons/copy.svg
index 7577d583..0c5f0218 100644
--- a/assets/icons/copy.svg
+++ b/assets/icons/copy.svg
@@ -1,5 +1,8 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path
-    d="M5.61653 4.02817V2.73869C5.61653 2.16793 5.76101 1.73634 6.04998 1.44392C6.33894 1.14797 6.7671 1 7.33445 1H9.32196C9.62854 1 9.90165 1.04404 10.1413 1.13212C10.3844 1.21668 10.6047 1.36113 10.802 1.56547L13.4344 4.24485C13.6423 4.45976 13.7886 4.68877 13.8731 4.93187C13.9577 5.17144 14 5.46563 14 5.81442V9.99996C14 10.5707 13.8538 11.0023 13.5613 11.2947C13.2723 11.5871 12.8459 11.7334 12.2821 11.7334H11.1985V10.6975H12.1869C12.4442 10.6975 12.6362 10.6324 12.7631 10.502C12.8935 10.3681 12.9587 10.1796 12.9587 9.93654V5.56075H10.6329C10.3051 5.56075 10.0567 5.47796 9.88755 5.31237C9.7184 5.14326 9.63383 4.89487 9.63383 4.56722V2.0411H7.41903C7.16531 2.0411 6.97325 2.10628 6.84286 2.23664C6.716 2.36699 6.65257 2.55548 6.65257 2.80211V4.02817H5.61653ZM10.5007 4.4351C10.5007 4.5267 10.5201 4.59364 10.5589 4.63592C10.6012 4.67467 10.6663 4.69405 10.7544 4.69405H12.6891L10.5007 2.47445V4.4351ZM3 12.711V5.44977C3 4.87902 3.14448 4.44743 3.43345 4.15501C3.72241 3.85906 4.15057 3.71109 4.71792 3.71109H6.55742C6.8781 3.71109 7.1424 3.74632 7.35031 3.81678C7.56175 3.88372 7.77319 4.02641 7.98462 4.24485L10.8496 7.15147C10.9976 7.30296 11.1104 7.44741 11.1879 7.58482C11.2654 7.72222 11.3165 7.87548 11.3412 8.04459C11.3694 8.21018 11.3835 8.411 11.3835 8.64706V12.711C11.3835 13.2818 11.239 13.7134 10.95 14.0058C10.6611 14.2982 10.2329 14.4444 9.66555 14.4444H4.71792C4.15057 14.4444 3.72241 14.2982 3.43345 14.0058C3.14448 13.7169 3 13.2853 3 12.711ZM4.04133 12.6476C4.04133 12.8942 4.10476 13.0827 4.23162 13.2131C4.35848 13.3435 4.54877 13.4086 4.8025 13.4086H9.57569C9.82941 13.4086 10.0197 13.3435 10.1466 13.2131C10.277 13.0827 10.3421 12.8942 10.3421 12.6476V8.76861H7.55118C7.17764 8.76861 6.89749 8.677 6.71072 8.4938C6.52395 8.30707 6.43056 8.02345 6.43056 7.64295V4.75218H4.80778C4.55054 4.75218 4.35848 4.81736 4.23162 4.94772C4.10476 5.07808 4.04133 5.26481 4.04133 5.50791V12.6476ZM7.6569 7.85434H10.1994L7.34503 4.95301V7.54254C7.34503 7.65176 7.36969 7.73103 7.41903 7.78035C7.46836 7.82968 7.54765 7.85434 7.6569 7.85434Z"
-    fill="currentColor" />
+    d="M4.6665 6.44597C4.6665 5.97441 4.85383 5.52217 5.18727 5.18873C5.52071 4.85529 5.97295 4.66797 6.4445 4.66797H12.2218C12.4553 4.66797 12.6865 4.71396 12.9022 4.80331C13.118 4.89266 13.314 5.02363 13.4791 5.18873C13.6442 5.35384 13.7751 5.54984 13.8645 5.76556C13.9538 5.98127 13.9998 6.21248 13.9998 6.44597V12.2233C13.9998 12.4568 13.9538 12.688 13.8645 12.9037C13.7751 13.1194 13.6442 13.3154 13.4791 13.4805C13.314 13.6456 13.118 13.7766 12.9022 13.866C12.6865 13.9553 12.4553 14.0013 12.2218 14.0013H6.4445C6.21101 14.0013 5.97981 13.9553 5.76409 13.866C5.54838 13.7766 5.35237 13.6456 5.18727 13.4805C5.02217 13.3154 4.8912 13.1194 4.80185 12.9037C4.71249 12.688 4.6665 12.4568 4.6665 12.2233V6.44597Z"
+    stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round" />
+  <path
+    d="M2.67454 11.158C2.47011 11.0415 2.30006 10.873 2.18159 10.6697C2.06313 10.4663 2.00045 10.2353 1.99988 10V3.33333C1.99988 2.6 2.59988 2 3.33321 2H9.99988C10.4999 2 10.7719 2.25667 10.9999 2.66667"
+    stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round" />
 </svg>
\ No newline at end of file
diff --git a/assets/icons/retry.svg b/assets/icons/retry.svg
new file mode 100644
index 00000000..0d7f19cf
--- /dev/null
+++ b/assets/icons/retry.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M2.66669 8V6C2.66669 5.46957 2.8774 4.96086 3.25247 4.58579C3.62755 4.21071 4.13625 4 4.66669 4H13.3334M13.3334 4L11.3334 2M13.3334 4L11.3334 6"
+    stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round" />
+  <path
+    d="M13.3334 8V10C13.3334 10.5304 13.1226 11.0391 12.7476 11.4142C12.3725 11.7893 11.8638 12 11.3334 12H2.66669M2.66669 12L4.66669 14M2.66669 12L4.66669 10"
+    stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
\ No newline at end of file
diff --git a/components/Selector.vue b/components/Selector.vue
index 9aea8a5b..1047f3e4 100644
--- a/components/Selector.vue
+++ b/components/Selector.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="relative"
+    class="relative flex"
     data-nativemind-selector
   >
     <div
@@ -31,6 +31,18 @@
         </slot>
       </div>
     </div>
+    <div
+      v-else-if="isCustomizedBtn"
+      ref="selectorRef"
+      :class="classNames('inline-flex items-center cursor-pointer', containerClass)"
+      @click="toggleDropdown"
+    >
+      <slot
+        name="button"
+        :option="selectedOption"
+      />
+    </div>
+
     <Button
       v-else
       variant="secondary"
@@ -151,7 +163,7 @@ interface Props {
   disabled?: boolean
   listenScrollElements?: HTMLElement[]
   onChange?: (value: Option, oldValue?: Option) => Promise<boolean> | boolean // function to call when the value changes, return false to prevent the change
-  triggerStyle?: 'normal' | 'ghost'
+  triggerStyle?: 'normal' | 'ghost' | 'customized'
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -170,6 +182,7 @@ const emit = defineEmits<{
 }>()
 
 const isGhostBtn = computed(() => props.triggerStyle === 'ghost')
+const isCustomizedBtn = computed(() => props.triggerStyle === 'customized')
 
 const options = computed(() => {
   return props.options
diff --git a/entrypoints/sidepanel/components/Chat/Messages/Assistant.vue b/entrypoints/sidepanel/components/Chat/Messages/Assistant.vue
index ccf66043..413b1eae 100644
--- a/entrypoints/sidepanel/components/Chat/Messages/Assistant.vue
+++ b/entrypoints/sidepanel/components/Chat/Messages/Assistant.vue
@@ -1,146 +1,200 @@
 <template>
   <div
     v-if="message.content || message.reasoning || !message.done"
-    class="w-full flex"
+    class="w-full flex flex-col"
   >
-    <div
-      class="text-sm rounded-md relative max-w-full inline-flex items-center min-w-0 gap-2 w-full"
-      :style="{ backgroundColor: message.style?.backgroundColor }"
-      :class="[message.content || message.reasoning ? 'p-0' : 'pt-2 pb-3']"
-    >
+    <div class="relative group/message w-full">
       <div
-        v-if="message.isError"
-        class="grow-0 shrink-0"
+        class="text-sm rounded-md relative max-w-full inline-flex items-center min-w-0 gap-2 w-full"
+        :style="{ backgroundColor: message.style?.backgroundColor }"
+        :class="[message.content || message.reasoning ? 'p-0' : 'pt-2 pb-3']"
       >
-        <IconWarning class="w-4 text-text-caution" />
-      </div>
-      <div class="max-w-full flex-1 flex flex-col gap-1">
         <div
-          v-if="shouldShowThinkingSection && message.reasoningTime"
-          class="text-text-primary text-sm flex items-center justify-between overflow-hidden"
+          v-if="message.isError"
+          class="grow-0 shrink-0"
         >
-          <div class="flex flex-grow">
-            <motion.div
-              v-if="message.content || message.done"
-              :initial="{ width: 0 }"
-              :animate="{ width: '100%' }"
-              :transition="{
-                duration: 0.5,
-                ease: 'linear'
-              }"
-              class="flex items-center gap-1.5 overflow-hidden whitespace-nowrap"
-            >
-              <div class="shrink-0 grow-0 size-5 p-0.5">
-                <IconTickCircle class="w-4 text-success shrink-0" />
-              </div>
-              <Text color="primary">
-                {{ t('chat.messages.thought_for_seconds', Math.ceil(message.reasoningTime / 1000), { named: { second: Math.ceil(message.reasoningTime / 1000) } }) }}
-              </Text>
-            </motion.div>
-            <motion.div
-              v-else
-              :initial="{ width: 0, opacity: 1 }"
-              :animate="{
-                width: '100%',
-                opacity: [1, 0.3, 1]
-              }"
-              :transition="{
-                width: { duration: 0.5, ease: 'linear' },
-                opacity: {
-                  duration: 1.5,
-                  repeat: Infinity,
-                  ease: 'easeOut'
-                }
+          <IconWarning class="w-4 text-text-caution" />
+        </div>
+        <div class="max-w-full flex-1 flex flex-col gap-1">
+          <div
+            v-if="shouldShowThinkingSection && message.reasoningTime"
+            class="text-text-primary text-sm flex items-center justify-between overflow-hidden"
+          >
+            <div class="flex flex-grow">
+              <motion.div
+                v-if="message.content || message.done"
+                :initial="{ width: 0 }"
+                :animate="{ width: '100%' }"
+                :transition="{
+                  duration: 0.5,
+                  ease: 'linear'
+                }"
+                class="flex items-center gap-1.5 overflow-hidden whitespace-nowrap"
+              >
+                <div class="shrink-0 grow-0 size-5 p-0.5">
+                  <IconTickCircle class="w-4 text-success shrink-0" />
+                </div>
+                <Text color="primary">
+                  {{ t('chat.messages.thought_for_seconds', Math.ceil(message.reasoningTime / 1000), { named: { second: Math.ceil(message.reasoningTime / 1000) } }) }}
+                </Text>
+              </motion.div>
+              <motion.div
+                v-else
+                :initial="{ width: 0, opacity: 1 }"
+                :animate="{
+                  width: '100%',
+                  opacity: [1, 0.3, 1]
+                }"
+                :transition="{
+                  width: { duration: 0.5, ease: 'linear' },
+                  opacity: {
+                    duration: 1.5,
+                    repeat: Infinity,
+                    ease: 'easeOut'
+                  }
+                }"
+                class="flex items-center justify-start gap-1.5 overflow-hidden whitespace-nowrap"
+              >
+                <div class="shrink-0 grow-0 size-5 p-0.5">
+                  <Loading :size="16" />
+                </div>
+                <Text color="primary">
+                  {{ t('chat.messages.thinking') }}
+                </Text>
+              </motion.div>
+            </div>
+            <div
+              v-if="shouldShowExpandButton"
+              class="ml-2 transform transition-transform cursor-pointer"
+              :class="{
+                'rotate-180': isContentExpanded
               }"
-              class="flex items-center justify-start gap-1.5 overflow-hidden whitespace-nowrap"
+              @click="toggleExpanded"
             >
-              <div class="shrink-0 grow-0 size-5 p-0.5">
-                <Loading :size="16" />
-              </div>
-              <Text color="primary">
-                {{ t('chat.messages.thinking') }}
-              </Text>
-            </motion.div>
+              <IconArrowDown class="w-4 text-text-tertiary" />
+            </div>
           </div>
-          <div
-            v-if="shouldShowExpandButton"
-            class="ml-2 transform transition-transform cursor-pointer"
-            :class="{
-              'rotate-180': isContentExpanded
+          <ScrollContainer
+            v-if="showReasoning"
+            ref="scrollContainerRef"
+            :containerClass="classNames('overscroll-auto overflow-auto transition-height duration-200 [interpolate-size:allow-keywords] wrap-anywhere pl-6', showClampedReasoning ? 'h-[3.3em] leading-[1.5em]' : 'h-auto')"
+            :arrivalShadow="{
+              top: { color: 'var(--color-bg-app)', size: 12, offset: 8 },
+              bottom: { color: 'var(--color-bg-app)', size: 12, offset: 8 }
             }"
-            @click="toggleExpanded"
+            :autoSnap="{bottom: (showClampedReasoning && !message.done) ? true : false}"
           >
-            <IconArrowDown class="w-4 text-text-tertiary" />
+            <MarkdownViewer
+              :text="message.reasoning"
+              class="text-sm text-text-quaternary"
+            />
+          </ScrollContainer>
+          <div
+            v-if="message.content"
+          >
+            <MarkdownViewer
+              :fadeInAnimation="!message.done"
+              :text="message.content"
+              class="text-text-primary"
+            />
           </div>
         </div>
-        <ScrollContainer
-          v-if="showReasoning"
-          ref="scrollContainerRef"
-          :containerClass="classNames('overscroll-auto overflow-auto transition-height duration-200 [interpolate-size:allow-keywords] wrap-anywhere pl-6', showClampedReasoning ? 'h-[3.3em] leading-[1.5em]' : 'h-auto')"
-          :arrivalShadow="{
-            top: { color: 'var(--color-bg-app)', size: 12, offset: 8 },
-            bottom: { color: 'var(--color-bg-app)', size: 12, offset: 8 }
+        <motion.div
+          v-if="!message.done && !message.content && !message.reasoning"
+          class="absolute top-0 left-0 flex items-center justify-start gap-1.5 overflow-hidden whitespace-nowrap"
+          :initial="{ opacity: 1 }"
+          :animate="{ opacity: [1, 0.3, 1] }"
+          :transition="{
+            opacity: {
+              duration: 1.5,
+              repeat: Infinity,
+              ease: 'easeOut'
+            }
           }"
-          :autoSnap="{bottom: (showClampedReasoning && !message.done) ? true : false}"
         >
-          <MarkdownViewer
-            :text="message.reasoning"
-            class="text-sm text-text-quaternary"
-          />
-        </ScrollContainer>
-        <div
-          v-if="message.content"
-        >
-          <MarkdownViewer
-            :fadeInAnimation="!message.done"
-            :text="message.content"
-            class="text-text-primary"
-          />
-        </div>
+          <div class="shrink-0 grow-0 size-5 p-0.5">
+            <Loading :size="16" />
+          </div>
+          <Text color="primary">
+            {{ t('chat.messages.thinking') }}
+          </Text>
+        </motion.div>
       </div>
-      <motion.div
-        v-if="!message.done && !message.content && !message.reasoning"
-        class="absolute top-0 left-0 flex items-center justify-start gap-1.5 overflow-hidden whitespace-nowrap"
-        :initial="{ opacity: 1 }"
-        :animate="{ opacity: [1, 0.3, 1] }"
-        :transition="{
-          opacity: {
-            duration: 1.5,
-            repeat: Infinity,
-            ease: 'easeOut'
-          }
-        }"
+
+      <!-- Actions -->
+      <div
+        v-if="message.done && !disabled && showActions"
+        class="flex items-center mt-2 gap-2 opacity-0 group-hover/message:opacity-100 transition-opacity"
       >
-        <div class="shrink-0 grow-0 size-5 p-0.5">
-          <Loading :size="16" />
-        </div>
-        <Text color="primary">
-          {{ t('chat.messages.thinking') }}
-        </Text>
-      </motion.div>
+        <Tooltip
+          :content="t('tooltips.copy_message')"
+          position="bottom"
+        >
+          <button
+            class="size-6 flex items-center justify-center rounded-md text-text-secondary hover:bg-bg-hover transition-colors"
+            type="button"
+            @click="copyMessage"
+          >
+            <IconTick
+              v-if="copied"
+              class="size-4"
+            />
+            <IconCopy
+              v-else
+              class="size-4"
+            />
+          </button>
+        </Tooltip>
+        <MessageRetrySelector
+          :disabled="disabled"
+          @retry="(modelId, endpointType) => emit('retry', modelId, endpointType)"
+        />
+        <span
+          v-if="message.model"
+          class="text-text-tertiary text-xs ml-1"
+        >
+          {{ t('chat.messages.used_model', { model: message.model }) }}
+        </span>
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import { motion } from 'motion-v'
-import { computed, nextTick, ref, watch } from 'vue'
+import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import IconArrowDown from '@/assets/icons/arrow-down-small.svg?component'
+import IconCopy from '@/assets/icons/copy.svg?component'
+import IconTick from '@/assets/icons/tick.svg?component'
 import IconTickCircle from '@/assets/icons/tick-circle.svg?component'
 import IconWarning from '@/assets/icons/warning-circle.svg?component'
 import Loading from '@/components/Loading.vue'
 import MarkdownViewer from '@/components/MarkdownViewer.vue'
 import ScrollContainer from '@/components/ScrollContainer.vue'
 import Text from '@/components/ui/Text.vue'
+import Tooltip from '@/components/ui/Tooltip.vue'
 import { AgentMessageV1, AssistantMessageV1 } from '@/types/chat'
+import { LLMEndpointType } from '@/utils/llm/models'
+import logger from '@/utils/logger'
 import { getUserConfig } from '@/utils/user-config'
 import { classNames } from '@/utils/vue/utils'
+
+import MessageRetrySelector from './MessageRetrySelector.vue'
+
 const props = defineProps<{
   message: AssistantMessageV1 | AgentMessageV1
+  disabled?: boolean
+  showActions?: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'retry', modelId: string, endpointType: LLMEndpointType): void
 }>()
 
+const log = logger.child('chat-assistant-message')
+
 const message = computed(() => {
   return {
     ...props.message,
@@ -148,12 +202,14 @@ const message = computed(() => {
     reasoning: props.message.reasoning?.trim().replace(/(<br\s*\/?>)+$/g, '').trim(),
   }
 })
+const showActions = computed(() => props.showActions ?? true)
 
 const { t } = useI18n()
 const userConfig = await getUserConfig()
 const thinkingVisibility = userConfig.chat.thinkingVisibility.toRef()
 const expanded = ref(false)
 const scrollContainerRef = ref<InstanceType<typeof ScrollContainer>>()
+const copied = ref(false)
 
 // Helper computed properties for cleaner logic
 const isThinking = computed(() => !message.value.content && !message.value.done)
@@ -244,4 +300,27 @@ watch(thinkingVisibility, (newValue, oldValue) => {
     })
   }
 })
+
+// Copy functionality
+
+let copyResetTimer: ReturnType<typeof setTimeout> | undefined
+
+const copyMessage = async () => {
+  try {
+    await navigator.clipboard.writeText(props.message.content)
+    copied.value = true
+    if (copyResetTimer) clearTimeout(copyResetTimer)
+    copyResetTimer = setTimeout(() => {
+      copied.value = false
+      copyResetTimer = undefined
+    }, 2000)
+  }
+  catch (error) {
+    log.error('Failed to copy message', error)
+  }
+}
+
+onBeforeUnmount(() => {
+  if (copyResetTimer) clearTimeout(copyResetTimer)
+})
 </script>
diff --git a/entrypoints/sidepanel/components/Chat/Messages/MessageRetrySelector.vue b/entrypoints/sidepanel/components/Chat/Messages/MessageRetrySelector.vue
new file mode 100644
index 00000000..ce6ac314
--- /dev/null
+++ b/entrypoints/sidepanel/components/Chat/Messages/MessageRetrySelector.vue
@@ -0,0 +1,132 @@
+<template>
+  <Selector
+    v-model="selectedModelId"
+    :options="modelOptions"
+    containerClass="min-w-0"
+    dropdownClass="text-xs text-text-primary w-52"
+    dropdownAlign="left"
+    triggerStyle="customized"
+    :disabled="disabled"
+    @click="(e) => e.stopPropagation()"
+  >
+    <template #button>
+      <Tooltip
+        :content="t('tooltips.retry_message')"
+        position="bottom"
+      >
+        <button
+          class="size-6 flex items-center justify-center rounded-md text-text-secondary hover:bg-bg-hover transition-colors"
+          :class="{ 'cursor-not-allowed opacity-50': disabled }"
+          type="button"
+          :disabled="disabled"
+        >
+          <IconRetry class="size-4" />
+        </button>
+      </Tooltip>
+    </template>
+    <template #option="{ option }">
+      <div class="flex items-center gap-2 justify-between w-full">
+        <div
+          v-if="option.type === 'option'"
+          class="flex items-center gap-[6px]"
+        >
+          <ModelLogo
+            :modelId="option.model.id"
+            class="shrink-0 grow-0"
+          />
+          <div class="text-left wrap-anywhere">
+            {{ option.label }}
+          </div>
+        </div>
+        <div
+          v-else-if="option.type === 'header'"
+          class="flex items-center gap-[6px]"
+        >
+          <div class="text-left wrap-anywhere font-medium">
+            {{ option.label }}
+          </div>
+        </div>
+      </div>
+    </template>
+  </Selector>
+</template>
+
+<script setup lang="ts">
+import { computed, toRefs } from 'vue'
+
+import IconRetry from '@/assets/icons/retry.svg?component'
+import ModelLogo from '@/components/ModelLogo.vue'
+import Selector from '@/components/Selector.vue'
+import Tooltip from '@/components/ui/Tooltip.vue'
+import { useI18n } from '@/utils/i18n'
+import { LLMEndpointType } from '@/utils/llm/models'
+import { SUPPORTED_MODELS } from '@/utils/llm/web-llm'
+import { useLLMBackendStatusStore } from '@/utils/pinia-store/store'
+import { getUserConfig } from '@/utils/user-config'
+
+defineProps<{
+  disabled?: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'retry', modelId: string, endpointType: LLMEndpointType): void
+}>()
+
+const { t } = useI18n()
+const { modelList: composedModelList } = toRefs(useLLMBackendStatusStore())
+const userConfig = await getUserConfig()
+const endpointType = userConfig.llm.endpointType.toRef()
+
+const modelList = computed(() => {
+  if (endpointType.value !== 'web-llm') {
+    return composedModelList.value
+  }
+  else {
+    return SUPPORTED_MODELS.map((model) => ({
+      name: model.name as string,
+      model: model.modelId as string,
+      backend: 'web-llm' as LLMEndpointType,
+    }))
+  }
+})
+
+const modelOptions = computed(() => {
+  const ollamaModels = modelList.value.filter((model) => model.backend === 'ollama')
+  const lmStudioModels = modelList.value.filter((model) => model.backend === 'lm-studio')
+  const webllmModels = modelList.value.filter((model) => model.backend === 'web-llm')
+
+  const makeModelOptions = (model: typeof modelList.value[number]) => ({ type: 'option' as const, id: `${model.backend}#${model.model}`, label: model.name, model: { backend: model.backend, id: model.model } })
+  const makeHeader = (label: string) => ({ type: 'header' as const, id: `header-${label}`, label, selectable: false })
+
+  if (webllmModels.length > 0) {
+    return webllmModels.map((model) => makeModelOptions(model))
+  }
+  else {
+    const options = []
+    if (ollamaModels.length) {
+      options.push(
+        makeHeader(t('settings.models.ollama_models', { count: ollamaModels.length })),
+        ...ollamaModels.map((model) => makeModelOptions(model)))
+    }
+    if (lmStudioModels.length) {
+      options.push(
+        makeHeader(t('settings.models.lmstudio_models', { count: lmStudioModels.length })),
+        ...lmStudioModels.map((model) => makeModelOptions(model)),
+      )
+    }
+    return options
+  }
+})
+
+const selectedModelId = computed({
+  get() {
+    return undefined
+  },
+  set(value) {
+    if (!value) return
+    const modelInfo = modelOptions.value.find((opt) => opt.id === value)
+    if (!modelInfo || modelInfo.type === 'header') return
+    emit('retry', modelInfo.model.id, modelInfo.model.backend as LLMEndpointType)
+  },
+})
+</script>
diff --git a/entrypoints/sidepanel/components/Chat/Messages/User.vue b/entrypoints/sidepanel/components/Chat/Messages/User.vue
index b561b412..75d9b9dd 100644
--- a/entrypoints/sidepanel/components/Chat/Messages/User.vue
+++ b/entrypoints/sidepanel/components/Chat/Messages/User.vue
@@ -70,7 +70,7 @@
           position="bottom"
         >
           <button
-            class="size-5 flex items-center justify-center rounded-md transition-colors"
+            class="size-6 flex items-center justify-center rounded-md transition-colors"
             :class="disabled
               ? 'text-text-disabled cursor-not-allowed'
               : 'text-text-secondary hover:bg-bg-hover'"
@@ -86,7 +86,7 @@
           position="bottom"
         >
           <button
-            class="size-5 flex items-center justify-center rounded-md text-text-secondary hover:bg-bg-hover transition-colors"
+            class="size-6 flex items-center justify-center rounded-md text-text-secondary hover:bg-bg-hover transition-colors"
             type="button"
             @click="copyMessage"
           >
diff --git a/entrypoints/sidepanel/components/Chat/index.vue b/entrypoints/sidepanel/components/Chat/index.vue
index 1570a387..9576d58c 100644
--- a/entrypoints/sidepanel/components/Chat/index.vue
+++ b/entrypoints/sidepanel/components/Chat/index.vue
@@ -31,6 +31,9 @@
           <MessageAssistant
             v-else-if="item.role === 'assistant' || item.role === 'agent'"
             :message="item"
+            :disabled="chat.isAnswering()"
+            :showActions="assistantActionMessageIds.has(item.id)"
+            @retry="(modelId, endpointType) => onRetryAssistantMessage(item.id, modelId, endpointType)"
           />
           <div v-else-if="item.role === 'task'">
             <MessageTask :message="item" />
@@ -195,6 +198,31 @@ const contextAttachmentStorage = chat.contextAttachmentStorage
 
 initChatSideEffects()
 
+// Track the final assistant/agent message for each reply block (between user turns) FOR triggering retry action
+const assistantActionMessageIds = computed(() => {
+  const ids = new Set<string>()
+  const history = chat.historyManager.history.value
+  let lastAssistantId: string | null = null
+
+  for (const item of history) {
+    if (item.role === 'assistant' || item.role === 'agent') {
+      lastAssistantId = item.id
+    }
+    else if (item.role === 'user') {
+      if (lastAssistantId) {
+        ids.add(lastAssistantId)
+        lastAssistantId = null
+      }
+    }
+  }
+
+  if (lastAssistantId) {
+    ids.add(lastAssistantId)
+  }
+
+  return ids
+})
+
 const actionEventHandler = Chat.createActionEventHandler((actionEvent) => {
   if (actionEvent.action === 'customInput') {
     chat.ask((actionEvent as ActionEvent<'customInput'>).data.prompt)
@@ -238,6 +266,60 @@ const onSubmitEdit = async (messageId: string, value: string) => {
   }
 }
 
+const onRetryAssistantMessage = async (assistantMessageId: string, modelId: string, endpointType: string) => {
+  if (chat.isAnswering() || editingInFlight.value) return
+
+  const messageIndex = chat.historyManager.history.value.findIndex((item) => item.id === assistantMessageId)
+  if (messageIndex === -1) {
+    log.error('Assistant message not found', assistantMessageId)
+    return
+  }
+
+  // Find the last user message before this assistant message
+  let userMessageIndex = -1
+  for (let i = messageIndex - 1; i >= 0; i--) {
+    if (chat.historyManager.history.value[i].role === 'user') {
+      userMessageIndex = i
+      break
+    }
+  }
+
+  if (userMessageIndex === -1) {
+    log.error('No user message found before assistant message')
+    return
+  }
+
+  const userMessage = chat.historyManager.history.value[userMessageIndex]
+  if (userMessage.role !== 'user') return
+
+  // Stop any ongoing chat
+  chat.stop()
+  editingInFlight.value = true
+
+  try {
+    // Remove all messages after and including the assistant message
+    chat.historyManager.history.value.splice(messageIndex)
+
+    // Set temporary model override
+    chat.historyManager.temporaryModelOverride = { model: modelId, endpointType }
+
+    try {
+      // Re-generate the response with the new model
+      await chat.editUserMessage(userMessage.id, userMessage.displayContent ?? userMessage.content)
+    }
+    finally {
+      // Clear temporary model override
+      chat.historyManager.temporaryModelOverride = null
+    }
+  }
+  catch (error) {
+    log.error('Failed to retry assistant message', error)
+  }
+  finally {
+    editingInFlight.value = false
+  }
+}
+
 const cleanUp = chat.historyManager.onMessageAdded(() => {
   scrollContainerRef.value?.snapToBottom()
 })
diff --git a/entrypoints/sidepanel/components/Onboarding/index.vue b/entrypoints/sidepanel/components/Onboarding/index.vue
index a32f3478..32cf3016 100644
--- a/entrypoints/sidepanel/components/Onboarding/index.vue
+++ b/entrypoints/sidepanel/components/Onboarding/index.vue
@@ -96,13 +96,13 @@ const onBackendInstalled = async (backend: 'ollama' | 'lm-studio') => {
     panel.value = 'model-downloader'
   }
   else {
-    close()
+    await close()
   }
 }
 
 const onOpenSettings = async () => {
   endpointType.value = 'ollama'
-  close()
+  await close()
   showSettings()
 }
 
@@ -110,17 +110,17 @@ const onModelDownloaderFinished = async () => {
   endpointType.value = 'ollama'
   await llmBackendStatusStore.updateOllamaConnectionStatus()
   await llmBackendStatusStore.updateOllamaModelList()
-  close()
+  await close()
 }
 
-const onWebLLMInstalled = () => {
+const onWebLLMInstalled = async () => {
   endpointType.value = 'web-llm'
-  close()
+  await close()
 }
 
-const setWelcomeChatMessage = () => {
+const setWelcomeChatMessage = async () => {
   // FYI: this message will also be modified by side-effects.ts for locale changes
-  const msg = chat.historyManager.appendAssistantMessage(welcomeMessage(t))
+  const msg = await chat.historyManager.appendAssistantMessage(welcomeMessage(t))
   msg.style = {
     backgroundColor: 'transparent',
   }
@@ -131,8 +131,8 @@ const setWelcomeChatMessage = () => {
   chat.historyManager.insertMessageAt(msg, 0)
 }
 
-const close = () => {
-  setWelcomeChatMessage()
+const close = async () => {
+  await setWelcomeChatMessage()
   onboardingVersion.value = TARGET_ONBOARDING_VERSION
 }
 
diff --git a/entrypoints/sidepanel/utils/agent/index.ts b/entrypoints/sidepanel/utils/agent/index.ts
index 9376d657..13481326 100644
--- a/entrypoints/sidepanel/utils/agent/index.ts
+++ b/entrypoints/sidepanel/utils/agent/index.ts
@@ -77,6 +77,7 @@ interface AgentOptions<T extends PromptBasedToolName> {
   agentStorage: AgentStorage
   tools: AgentToolCall<T>
   maxIterations?: number
+  temporaryModelOverride?: { model: string, endpointType: string } | null
 }
 
 type AgentStatus = 'idle' | 'running' | 'error'
@@ -87,6 +88,7 @@ export class Agent<T extends PromptBasedToolName> {
   tools: AgentOptions<T>['tools']
   agentStorage: AgentStorage
   maxIterations: number
+  temporaryModelOverride: { model: string, endpointType: string } | null
   status: Ref<AgentStatus> = ref('idle')
   log = logger.child('Agent')
   constructor(public options: AgentOptions<T>) {
@@ -94,6 +96,7 @@ export class Agent<T extends PromptBasedToolName> {
     this.tools = options.tools
     this.agentStorage = options.agentStorage
     this.maxIterations = options.maxIterations || 6
+    this.temporaryModelOverride = options.temporaryModelOverride || null
   }
 
   createAbortController() {
@@ -191,8 +194,8 @@ export class Agent<T extends PromptBasedToolName> {
     const getAgentMessage = () => {
       return agentMessage
     }
-    const getOrAddAgentMessage = () => {
-      if (!agentMessage) agentMessage = this.historyManager.appendAgentMessage()
+    const getOrAddAgentMessage = async () => {
+      if (!agentMessage) agentMessage = await this.historyManager.appendAgentMessage()
       return agentMessage
     }
     const deleteAgentMessageIfEmpty = (includeReasoning = true) => {
@@ -204,8 +207,8 @@ export class Agent<T extends PromptBasedToolName> {
       }
     }
     // make this message available to the next user task
-    const convertToAssistantMessage = (): AssistantMessageV1 => {
-      const agentMessage = getOrAddAgentMessage()
+    const convertToAssistantMessage = async (): Promise<AssistantMessageV1> => {
+      const agentMessage = await getOrAddAgentMessage()
       agentMessage.done = true
       ;(agentMessage as unknown as AssistantMessageV1).role = 'assistant'
       return agentMessage as unknown as AssistantMessageV1
@@ -302,10 +305,11 @@ export class Agent<T extends PromptBasedToolName> {
       if (shouldForceAnswer) thisLoopMessages.push({ role: 'user', content: AGENT_FORCE_FINAL_ANSWER })
       let taskMessageModifier = this.makeTaskMessageGroupProxy(abortController.signal)
       const agentMessageManager = this.makeTempAgentMessageManager()
-      const agentMessage = agentMessageManager.getOrAddAgentMessage()
+      const agentMessage = await agentMessageManager.getOrAddAgentMessage()
       const response = streamTextInBackground({
         abortSignal: abortController.signal,
         messages: this.injectImagesToLastMessage(thisLoopMessages, loopImages),
+        temporaryModelOverride: this.temporaryModelOverride,
       })
       let hasError = false
       let text = ''
@@ -384,7 +388,7 @@ export class Agent<T extends PromptBasedToolName> {
       this.log.debug('Agent iteration end', iteration, { currentLoopToolCalls, text, normalizedText, hasError })
       if ((currentLoopToolCalls.length === 0 && normalizedText && !hasError) || shouldForceAnswer) {
         this.log.debug('No tool call, ending iteration')
-        const lastMsg = agentMessageManager.convertToAssistantMessage()
+        const lastMsg = await agentMessageManager.convertToAssistantMessage()
         eventBus.emit('onAgentFinished')
         return lastMsg
       }
@@ -412,7 +416,7 @@ export class Agent<T extends PromptBasedToolName> {
     }
     else if (error instanceof ModelNotFoundError) {
       const { t } = await useGlobalI18n()
-      const errorMsg = agentMessageManager.convertToAssistantMessage()
+      const errorMsg = await agentMessageManager.convertToAssistantMessage()
       errorMsg.isError = true
       errorMsg.content = t('errors.model_not_found', { endpointType: error.endpointType === 'ollama' ? 'Ollama' : 'LM Studio' })
       // unresolvable error, break the loop
@@ -420,14 +424,14 @@ export class Agent<T extends PromptBasedToolName> {
     }
     else if (error instanceof ModelRequestError) {
       const { t } = await useGlobalI18n()
-      const errorMsg = agentMessageManager.convertToAssistantMessage()
+      const errorMsg = await agentMessageManager.convertToAssistantMessage()
       errorMsg.isError = true
       errorMsg.content = t('errors.model_request_error', { endpointType: error.endpointType === 'ollama' ? 'Ollama' : 'LM Studio' })
       return false
     }
     else if (error instanceof LMStudioLoadModelError) {
       const { t } = await useGlobalI18n()
-      const errorMsg = agentMessageManager.convertToAssistantMessage()
+      const errorMsg = await agentMessageManager.convertToAssistantMessage()
       errorMsg.isError = true
       const msg = error.message.split('\n')[0]
       const trimmedMsg = msg.length > 300 ? msg.slice(0, 300) + '...' : msg
@@ -436,7 +440,7 @@ export class Agent<T extends PromptBasedToolName> {
     }
     else if (error instanceof AppError) {
       const { t } = await useGlobalI18n()
-      const errorMsg = agentMessageManager.convertToAssistantMessage()
+      const errorMsg = await agentMessageManager.convertToAssistantMessage()
       errorMsg.isError = true
       errorMsg.content = t('errors.unknown_error', { message: error.message })
       return false
diff --git a/entrypoints/sidepanel/utils/chat/chat.ts b/entrypoints/sidepanel/utils/chat/chat.ts
index 5415332f..4cb6a1c6 100644
--- a/entrypoints/sidepanel/utils/chat/chat.ts
+++ b/entrypoints/sidepanel/utils/chat/chat.ts
@@ -30,6 +30,8 @@ const log = logger.child('chat')
 export type MessageIdScope = 'quickActions' | 'welcomeMessage'
 
 export class ReactiveHistoryManager extends EventEmitter {
+  public temporaryModelOverride: { model: string, endpointType: string } | null = null
+
   constructor(public chatHistory: Ref<ChatHistoryV1>) {
     super()
     this.cleanUp()
@@ -152,26 +154,38 @@ export class ReactiveHistoryManager extends EventEmitter {
     return newMsg as UserMessageV1
   }
 
-  appendAssistantMessage(content: string = '') {
+  async appendAssistantMessage(content: string = '') {
+    const userConfig = await getUserConfig()
+    const model = this.temporaryModelOverride?.model ?? userConfig.llm.model.get()
+    const endpointType = this.temporaryModelOverride?.endpointType ?? userConfig.llm.endpointType.get()
+
     this.history.value.push({
       id: this.generateId(),
       role: 'assistant',
       content,
       done: false,
       timestamp: Date.now(),
+      model,
+      endpointType,
     })
     const newMsg = this.history.value[this.history.value.length - 1]
     this.emit('messageAdded', newMsg)
     return newMsg as AssistantMessageV1
   }
 
-  appendAgentMessage(content: string = '') {
+  async appendAgentMessage(content: string = '') {
+    const userConfig = await getUserConfig()
+    const model = this.temporaryModelOverride?.model ?? userConfig.llm.model.get()
+    const endpointType = this.temporaryModelOverride?.endpointType ?? userConfig.llm.endpointType.get()
+
     this.history.value.push({
       id: this.generateId(),
       role: 'agent',
       content,
       done: false,
       timestamp: Date.now(),
+      model,
+      endpointType,
     })
     const newMsg = this.history.value[this.history.value.length - 1]
     this.emit('messageAdded', newMsg)
@@ -611,6 +625,7 @@ export class Chat {
       historyManager: this.historyManager,
       agentStorage: new AgentStorage(this.contextAttachmentStorage.value),
       maxIterations,
+      temporaryModelOverride: this.historyManager.temporaryModelOverride,
       tools: {
         search_online: { execute: executeSearchOnline },
         fetch_page: { execute: executeFetchPage },
diff --git a/entrypoints/sidepanel/utils/llm.ts b/entrypoints/sidepanel/utils/llm.ts
index ba7c191b..a7e12338 100644
--- a/entrypoints/sidepanel/utils/llm.ts
+++ b/entrypoints/sidepanel/utils/llm.ts
@@ -7,6 +7,7 @@ import { browser } from 'wxt/browser'
 import { readPortMessageIntoIterator, toAsyncIter } from '@/utils/async'
 import { AbortError, fromError, ModelRequestTimeoutError } from '@/utils/error'
 import { BackgroundAliveKeeper } from '@/utils/keepalive'
+import type { LLMEndpointType } from '@/utils/llm/models'
 import { SchemaName } from '@/utils/llm/output-schema'
 import { getReasoningOptionForModel } from '@/utils/llm/reasoning'
 import { WebLLMSupportedModel } from '@/utils/llm/web-llm'
@@ -22,10 +23,11 @@ interface ExtraOptions {
   timeout?: number
 }
 
-export async function* streamTextInBackground(options: Parameters<typeof s2bRpc.streamText>[0] & ExtraOptions) {
-  const { abortSignal, timeout = DEFAULT_PENDING_TIMEOUT, ...restOptions } = options
+export async function* streamTextInBackground(options: Parameters<typeof s2bRpc.streamText>[0] & ExtraOptions & { temporaryModelOverride?: { model: string, endpointType: string } | null }) {
+  const { abortSignal, timeout = DEFAULT_PENDING_TIMEOUT, temporaryModelOverride, ...restOptions } = options
   const userConfig = await getUserConfig()
-  const modelId = userConfig.llm.model.get()
+  const modelId = temporaryModelOverride?.model ?? userConfig.llm.model.get()
+  const endpointType = (temporaryModelOverride?.endpointType as LLMEndpointType | undefined) ?? userConfig.llm.endpointType.get()
   const reasoningPreference = userConfig.llm.reasoning.get()
   const computedReasoning = restOptions.autoThinking
     ? restOptions.reasoning
@@ -33,6 +35,8 @@ export async function* streamTextInBackground(options: Parameters<typeof s2bRpc.
   const requestOptions = {
     ...restOptions,
     ...(computedReasoning !== undefined ? { reasoning: computedReasoning } : {}),
+    modelId,
+    endpointType,
   }
   const { portName } = await s2bRpc.streamText(requestOptions)
   const aliveKeeper = new BackgroundAliveKeeper()
diff --git a/locales/de.json b/locales/de.json
index b408baad..b69c340d 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -4,7 +4,8 @@
       "thinking": "Denken...",
       "reading": "Lektüre",
       "search_locally": "Lokal im Browser suchen…",
-      "thought_for_seconds": "Gedanke für {second} Sekunde | Gedanke für {second} Sekunden"
+      "thought_for_seconds": "Gedanke für {second} Sekunde | Gedanke für {second} Sekunden",
+      "used_model": "Verwendet {model}"
     },
     "quick_actions": {
       "title": "Schnelle Aktionen"
@@ -461,7 +462,8 @@
     "new_chat": "Neuer Chat",
     "back": "Zurück",
     "copy_message": "Nachricht kopieren",
-    "edit_message": "Nachricht bearbeiten"
+    "edit_message": "Nachricht bearbeiten",
+    "retry_message": "Wiederholen"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/en.json b/locales/en.json
index c27f70f2..945562a9 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -244,7 +244,8 @@
       "thought_for_seconds": "Thought for {second} second | Thought for {second} seconds",
       "thinking": "Thinking...",
       "search_locally": "Searching locally in browser…",
-      "reading": "Reading"
+      "reading": "Reading",
+      "used_model": "Used {model}"
     },
     "quick_actions": {
       "title": "Quick Actions"
@@ -460,8 +461,9 @@
     "chat_history": "History",
     "new_chat": "New Chat",
     "back": "Back",
-    "copy_message": "Copy message",
-    "edit_message": "Edit message"
+    "copy_message": "Copy",
+    "edit_message": "Edit",
+    "retry_message": "Retry"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/es.json b/locales/es.json
index 9f733288..5b532e14 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -25,7 +25,8 @@
       "reading": "Leyendo",
       "search_locally": "Buscando localmente en el navegador...",
       "thinking": "Pensando...",
-      "thought_for_seconds": "Pensando durante {second} segundo | Pensando durante {second} segundos"
+      "thought_for_seconds": "Pensando durante {second} segundo | Pensando durante {second} segundos",
+      "used_model": "Usó {model}"
     },
     "quick_actions": {
       "title": "Acciones Rápidas"
@@ -460,8 +461,9 @@
     "chat_history": "Historia",
     "new_chat": "Nuevo chat",
     "back": "Atrás",
-    "copy_message": "Copiar mensaje",
-    "edit_message": "Editar mensaje"
+    "copy_message": "Copiar",
+    "edit_message": "Editar",
+    "retry_message": "Reintentar"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/fr.json b/locales/fr.json
index 8f5bb55a..438958df 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -4,7 +4,8 @@
       "thought_for_seconds": "Réflexion pendant {second} seconde | Réflexion pendant {second} secondes",
       "thinking": "Réflexion en cours...",
       "reading": "Lecture en cours",
-      "search_locally": "Recherche locale dans le navigateur..."
+      "search_locally": "Recherche locale dans le navigateur...",
+      "used_model": "Utilisé {model}"
     },
     "quick_actions": {
       "title": "Actions rapides"
@@ -461,7 +462,8 @@
     "new_chat": "Nouveau chat",
     "back": "Retour",
     "copy_message": "Copier le message",
-    "edit_message": "Modifier le message"
+    "edit_message": "Modifier le message",
+    "retry_message": "Réessayer"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/id.json b/locales/id.json
index 2cb63bbe..0c772cb7 100644
--- a/locales/id.json
+++ b/locales/id.json
@@ -4,7 +4,8 @@
       "thought_for_seconds": "Berpikir selama {second} detik | Berpikir selama {second} detik",
       "thinking": "Sedang berpikir...",
       "reading": "Sedang membaca...",
-      "search_locally": "Mencari secara lokal di browser..."
+      "search_locally": "Mencari secara lokal di browser...",
+      "used_model": "Menggunakan {model}"
     },
     "quick_actions": {
       "title": "Tindakan cepat"
@@ -460,8 +461,9 @@
     "chat_history": "Sejarah",
     "new_chat": "Obrolan baru",
     "back": "Kembali",
-    "copy_message": "Salin pesan",
-    "edit_message": "Edit pesan"
+    "copy_message": "Salin",
+    "edit_message": "Edit",
+    "retry_message": "Coba lagi"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/ja.json b/locales/ja.json
index ca85c8da..5a2f39c0 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -4,7 +4,8 @@
       "thought_for_seconds": "{second}秒間考えています | {second}秒間考えています",
       "thinking": "考え中...",
       "reading": "読み込み中",
-      "search_locally": "ブラウザ内で検索中..."
+      "search_locally": "ブラウザ内で検索中...",
+      "used_model": "{model}を使用"
     },
     "quick_actions": {
       "title": "クイックアクション"
@@ -461,7 +462,8 @@
     "new_chat": "新しいチャット",
     "back": "戻る",
     "copy_message": "メッセージをコピー",
-    "edit_message": "メッセージを編集"
+    "edit_message": "メッセージを編集",
+    "retry_message": "再試行"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/ko.json b/locales/ko.json
index 76ebc42e..b759c74f 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -4,7 +4,8 @@
       "thought_for_seconds": "{second}초 동안 생각 중 | {second}초 동안 생각 중",
       "thinking": "생각하는 중...",
       "reading": "읽는 중",
-      "search_locally": "브라우저에서 검색 중..."
+      "search_locally": "브라우저에서 검색 중...",
+      "used_model": "{model} 사용"
     },
     "quick_actions": {
       "title": "빠른 액션"
@@ -461,7 +462,8 @@
     "new_chat": "새로운 채팅",
     "back": "뒤로",
     "copy_message": "메시지 복사",
-    "edit_message": "메시지 수정"
+    "edit_message": "메시지 수정",
+    "retry_message": "재시도"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/pt.json b/locales/pt.json
index 88137618..e589aeae 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -4,7 +4,8 @@
       "thought_for_seconds": "Pensando por {second} segundo | Pensando por {second} segundos",
       "thinking": "Pensando...",
       "reading": "Lendo",
-      "search_locally": "Pesquisando localmente no navegador..."
+      "search_locally": "Pesquisando localmente no navegador...",
+      "used_model": "Usado {model}"
     },
     "quick_actions": {
       "title": "Ações rápidas"
@@ -461,7 +462,8 @@
     "new_chat": "Novo bate -papo",
     "back": "Voltar",
     "copy_message": "Copiar mensagem",
-    "edit_message": "Editar mensagem"
+    "edit_message": "Editar mensagem",
+    "retry_message": "Tentar novamente"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/ru.json b/locales/ru.json
index 8acb01fa..8892a624 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -4,7 +4,8 @@
       "thought_for_seconds": "Думаю {second} секунду | Думаю {second} секунд",
       "thinking": "Думаю...",
       "reading": "Читаю",
-      "search_locally": "Ищу локально в браузере..."
+      "search_locally": "Ищу локально в браузере...",
+      "used_model": "Используется {model}"
     },
     "quick_actions": {
       "title": "Быстрые действия"
@@ -461,7 +462,8 @@
     "new_chat": "Новый чат",
     "back": "Назад",
     "copy_message": "Скопировать сообщение",
-    "edit_message": "Редактировать сообщение"
+    "edit_message": "Редактировать сообщение",
+    "retry_message": "Повторить"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/th.json b/locales/th.json
index 62771cbd..bd033417 100644
--- a/locales/th.json
+++ b/locales/th.json
@@ -4,7 +4,8 @@
       "thought_for_seconds": "กำลังคิด {second} วินาที | กำลังคิด {second} วินาที",
       "thinking": "กำลังคิด...",
       "reading": "กำลังอ่าน",
-      "search_locally": "กำลังค้นหาในเบราว์เซอร์..."
+      "search_locally": "กำลังค้นหาในเบราว์เซอร์...",
+      "used_model": "ใช้ {model}"
     },
     "quick_actions": {
       "title": "การกระทำที่รวดเร็ว"
@@ -461,7 +462,8 @@
     "new_chat": "แชทใหม่",
     "back": "กลับ",
     "copy_message": "คัดลอกข้อความ",
-    "edit_message": "แก้ไขข้อความ"
+    "edit_message": "แก้ไขข้อความ",
+    "retry_message": "ลองอีกครั้ง"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/vi.json b/locales/vi.json
index b99679e0..d2e13503 100644
--- a/locales/vi.json
+++ b/locales/vi.json
@@ -4,7 +4,8 @@
       "thought_for_seconds": "Suy nghĩ trong {second} giây | Suy nghĩ trong {second} giây",
       "thinking": "Đang suy nghĩ...",
       "reading": "Đang đọc...",
-      "search_locally": "Đang tìm kiếm trong trình duyệt..."
+      "search_locally": "Đang tìm kiếm trong trình duyệt...",
+      "used_model": "Đã sử dụng {model}"
     },
     "quick_actions": {
       "title": "Thao tác nhanh"
@@ -461,7 +462,8 @@
     "new_chat": "Trò chuyện mới",
     "back": "Quay lại",
     "copy_message": "Sao chép tin nhắn",
-    "edit_message": "Chỉnh sửa tin nhắn"
+    "edit_message": "Chỉnh sửa tin nhắn",
+    "retry_message": "Thử lại"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index ef466698..59b7cfff 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -244,7 +244,8 @@
       "thought_for_seconds": "思考了{second}秒 | 思考了{second}秒",
       "thinking": "正在思考...",
       "reading": "正在阅读",
-      "search_locally": "正在浏览器中本地搜索..."
+      "search_locally": "正在浏览器中本地搜索...",
+      "used_model": "使用了 {model}"
     },
     "quick_actions": {
       "title": "快捷操作"
@@ -460,8 +461,9 @@
     "chat_history": "历史",
     "new_chat": "新聊天",
     "back": "返回",
-    "copy_message": "复制消息",
-    "edit_message": "编辑消息"
+    "copy_message": "复制",
+    "edit_message": "编辑",
+    "retry_message": "重试"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index 4c26c9c0..30c2fdb5 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -4,7 +4,8 @@
       "thought_for_seconds": "思考了{second}秒 | 思考了{second}秒",
       "thinking": "正在思考...",
       "reading": "讀取中",
-      "search_locally": "在瀏覽器中本地搜尋…"
+      "search_locally": "在瀏覽器中本地搜尋…",
+      "used_model": "使用了 {model}"
     },
     "quick_actions": {
       "title": "快捷操作"
@@ -461,7 +462,8 @@
     "new_chat": "新聊天",
     "back": "返回",
     "copy_message": "複製訊息",
-    "edit_message": "編輯訊息"
+    "edit_message": "編輯訊息",
+    "retry_message": "重試"
   },
   "gmail_tools": {
     "buttons": {
diff --git a/types/chat.ts b/types/chat.ts
index bdfc5dbd..5a116c81 100644
--- a/types/chat.ts
+++ b/types/chat.ts
@@ -112,6 +112,8 @@ export interface AssistantMessageV1 extends BaseMessage {
   reasoningTime?: number
   isError?: boolean
   timestamp?: number
+  model?: string
+  endpointType?: string
   style?: {
     backgroundColor?: CSS.Property.BackgroundColor
   }
@@ -124,6 +126,8 @@ export interface AgentMessageV1 extends BaseMessage {
   reasoningTime?: number
   isError?: boolean
   timestamp?: number
+  model?: string
+  endpointType?: string
   style?: {
     backgroundColor?: CSS.Property.BackgroundColor
   }
diff --git a/utils/llm/models.ts b/utils/llm/models.ts
index 4135b0e5..c12409ff 100644
--- a/utils/llm/models.ts
+++ b/utils/llm/models.ts
@@ -15,14 +15,19 @@ import { getReasoningOptionForModel, isGptOssModel } from './reasoning'
 import { isToggleableThinkingModel } from './thinking-models'
 import { getWebLLMEngine, WebLLMSupportedModel } from './web-llm'
 
-export async function getModelUserConfig() {
+export async function getModelUserConfig(overrides?: { model?: string, endpointType?: LLMEndpointType }) {
   const userConfig = await getUserConfig()
-  const model = userConfig.llm.model.get()
-  const endpointType = userConfig.llm.endpointType.get()
-  const baseUrl = userConfig.llm.backends[endpointType === 'lm-studio' ? 'lmStudio' : 'ollama'].baseUrl.get()
+  const endpointType = overrides?.endpointType ?? userConfig.llm.endpointType.get()
+  const model = overrides?.model ?? userConfig.llm.model.get()
+  const backendConfig = endpointType === 'lm-studio'
+    ? userConfig.llm.backends.lmStudio
+    : endpointType === 'ollama'
+      ? userConfig.llm.backends.ollama
+      : undefined
+  const baseUrl = backendConfig ? backendConfig.baseUrl.get() : ''
   const apiKey = userConfig.llm.apiKey.get()
-  const numCtx = userConfig.llm.backends[endpointType === 'lm-studio' ? 'lmStudio' : 'ollama'].numCtx.get()
-  const enableNumCtx = userConfig.llm.backends[endpointType === 'lm-studio' ? 'lmStudio' : 'ollama'].enableNumCtx.get()
+  const numCtx = backendConfig ? backendConfig.numCtx.get() : 0
+  const enableNumCtx = backendConfig ? backendConfig.enableNumCtx.get() : false
   const reasoningPreference = userConfig.llm.reasoning.get()
   const reasoning = getReasoningOptionForModel(reasoningPreference, model)
   if (!model) {
diff --git a/utils/rpc/background-fns.ts b/utils/rpc/background-fns.ts
index abd69406..9df7dcfe 100644
--- a/utils/rpc/background-fns.ts
+++ b/utils/rpc/background-fns.ts
@@ -35,7 +35,7 @@ import { preparePortConnection, shouldGenerateChatTitle } from './utils'
 type StreamTextOptions = Omit<Parameters<typeof originalStreamText>[0], 'tools'>
 type GenerateTextOptions = Omit<Parameters<typeof originalGenerateText>[0], 'tools'>
 type GenerateObjectOptions = Omit<Parameters<typeof originalGenerateObject>[0], 'tools'>
-type ExtraGenerateOptions = { modelId?: string, reasoning?: ReasoningOption, autoThinking?: boolean }
+type ExtraGenerateOptions = { modelId?: string, endpointType?: LLMEndpointType, reasoning?: ReasoningOption, autoThinking?: boolean }
 type ExtraGenerateOptionsWithTools = ExtraGenerateOptions
 type SchemaOptions<S extends SchemaName> = { schema: S } | { jsonSchema: JSONSchema }
 
@@ -80,6 +80,7 @@ const parseSchema = <S extends SchemaName>(options: SchemaOptions<S>) => {
 const generateExtraModelOptions = (options: ExtraGenerateOptions) => {
   return {
     ...(options.modelId !== undefined ? { model: options.modelId } : {}),
+    ...(options.endpointType !== undefined ? { endpointType: options.endpointType } : {}),
     ...(options.reasoning !== undefined ? { reasoning: options.reasoning } : {}),
     ...(options.autoThinking !== undefined ? { autoThinking: options.autoThinking } : {}),
   }
@@ -125,7 +126,7 @@ const streamText = async (options: Pick<StreamTextOptions, 'messages' | 'prompt'
     })
 
     try {
-      const userConfig = await getModelUserConfig()
+      const userConfig = await getModelUserConfig({ model: options.modelId, endpointType: options.endpointType })
       const modelInfo = await getModel({
         ...userConfig,
         onLoadingModel: makeLoadingModelListener(port),
@@ -166,7 +167,7 @@ const streamText = async (options: Pick<StreamTextOptions, 'messages' | 'prompt'
 const generateTextAsync = async (options: Pick<GenerateTextOptions, 'messages' | 'prompt' | 'system' | 'maxTokens'> & ExtraGenerateOptionsWithTools) => {
   try {
     const response = originalGenerateText({
-      model: await getModel({ ...(await getModelUserConfig()), ...generateExtraModelOptions(options) }),
+      model: await getModel({ ...(await getModelUserConfig({ model: options.modelId, endpointType: options.endpointType })), ...generateExtraModelOptions(options) }),
       messages: options.messages,
       prompt: options.prompt,
       system: options.system,
@@ -195,7 +196,7 @@ const generateText = async (options: Pick<GenerateTextOptions, 'messages' | 'pro
     })
     try {
       const response = await originalGenerateText({
-        model: await getModel({ ...(await getModelUserConfig()), ...generateExtraModelOptions(options) }),
+        model: await getModel({ ...(await getModelUserConfig({ model: options.modelId, endpointType: options.endpointType })), ...generateExtraModelOptions(options) }),
         messages: options.messages,
         prompt: options.prompt,
         system: options.system,
@@ -235,7 +236,7 @@ const streamObjectFromSchema = async <S extends SchemaName>(options: Pick<Genera
       abortController.abort()
     })
     try {
-      const model = await getModel({ ...(await getModelUserConfig()), onLoadingModel: makeLoadingModelListener(port), ...generateExtraModelOptions(options) })
+      const model = await getModel({ ...(await getModelUserConfig({ model: options.modelId, endpointType: options.endpointType })), onLoadingModel: makeLoadingModelListener(port), ...generateExtraModelOptions(options) })
       if (MODELS_NOT_SUPPORTED_FOR_STRUCTURED_OUTPUT.some((pattern) => pattern.test(model.modelId))) {
         const schema = parseSchema(options)
         const s = zodSchema(schema)
@@ -306,7 +307,7 @@ export const generateObjectFromSchema = async <S extends SchemaName>(options: Pi
   const isEnum = s instanceof z.ZodEnum
   let ret
   try {
-    const modelInfo = { ...(await getModelUserConfig()), ...generateExtraModelOptions(options) }
+    const modelInfo = { ...(await getModelUserConfig({ model: options.modelId, endpointType: options.endpointType })), ...generateExtraModelOptions(options) }
     if (MODELS_NOT_SUPPORTED_FOR_STRUCTURED_OUTPUT.some((pattern) => pattern.test(modelInfo.model))) {
       const jsonSchema = zodSchema(s).jsonSchema
       const injectSchemaToSystemPrompt = (prompt?: string) => {

From e5c6dc460ac9477ea97da628b538b9126e65397a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 Oct 2025 01:52:44 +0000
Subject: [PATCH 09/25] chore(release): v1.11.0-beta.1

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32824a1e..3cf8d0dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## v1.11.0-beta.1
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.0...v1.11.0-beta.1)
+
+### 🚀 Enhancements
+
+- Add copy and retry actions for AI messages component. ([eec015b](https://github.com/NativeMindBrowser/NativeMindExtension/commit/eec015b))
+
+### 🩹 Fixes
+
+- **chat:** Add cleanup method for loading attachments in ReactiveHistoryManager ([befb170](https://github.com/NativeMindBrowser/NativeMindExtension/commit/befb170))
+
+### ❤️ Contributors
+
+- NekoWings ([@NekoWings](http://github.com/NekoWings))
+
 ## v1.11.0-beta.0
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.10.1...v1.11.0-beta.0)
diff --git a/package.json b/package.json
index 79440b4d..b0256b54 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativemind-extension",
-  "version": "1.11.0-beta.0",
+  "version": "1.11.0-beta.1",
   "private": false,
   "author": "NativeMind",
   "keywords": [

From 32d389d4b100d78a3cffae7416196dcc776421e4 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Wed, 22 Oct 2025 14:43:20 +0800
Subject: [PATCH 10/25] fix: Enhance tab capture functionality with cached
 window ID and optional host permissions

---
 utils/rpc/background-fns.ts | 14 ++++++++++----
 wxt.config.ts               |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/utils/rpc/background-fns.ts b/utils/rpc/background-fns.ts
index 9df7dcfe..521d4d94 100644
--- a/utils/rpc/background-fns.ts
+++ b/utils/rpc/background-fns.ts
@@ -761,10 +761,16 @@ function getTabCaptureMediaStreamId(tabId: number, consumerTabId?: number) {
   })
 }
 
-function captureVisibleTab(windowId?: number, options?: Browser.tabs.CaptureVisibleTabOptions) {
-  const wid = windowId ?? browser.windows.WINDOW_ID_CURRENT
-  const screenCaptureBase64Url = browser.tabs.captureVisibleTab(wid, options ?? {})
-  return screenCaptureBase64Url
+function captureVisibleTab(options?: Browser.tabs.CaptureVisibleTabOptions) {
+  const cachedWindowId = BackgroundWindowManager.getCurrentWindowId()
+  browser.permissions.request({ origins: ['<all_urls>'] })
+  if (cachedWindowId) {
+    const screenCaptureBase64Url = browser.tabs.captureVisibleTab(cachedWindowId, options ?? {})
+    return screenCaptureBase64Url
+  }
+  else {
+    throw new Error('No cached window ID available for capturing visible tab')
+  }
 }
 
 function getTabInfoByTabId(tabId: number) {
diff --git a/wxt.config.ts b/wxt.config.ts
index 5b182e46..8c190528 100644
--- a/wxt.config.ts
+++ b/wxt.config.ts
@@ -110,5 +110,6 @@ export default defineConfig({
       },
     ],
     host_permissions: ['*://*/*', 'ws://*/*', 'wss://*/*'],
+    optional_host_permissions: ['<all_urls>'],
   },
 })

From 4f6c6af656c5464afb14c1b52dfec78ea80049b3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 Oct 2025 06:47:11 +0000
Subject: [PATCH 11/25] chore(release): v1.11.0-beta.2

---
 CHANGELOG.md | 12 ++++++++++++
 package.json |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cf8d0dc..98eda46d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## v1.11.0-beta.2
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.1...v1.11.0-beta.2)
+
+### 🩹 Fixes
+
+- Enhance tab capture functionality with cached window ID and optional host permissions ([32d389d](https://github.com/NativeMindBrowser/NativeMindExtension/commit/32d389d))
+
+### ❤️ Contributors
+
+- NekoWings ([@NekoWings](http://github.com/NekoWings))
+
 ## v1.11.0-beta.1
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.0...v1.11.0-beta.1)
diff --git a/package.json b/package.json
index b0256b54..f4b66413 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativemind-extension",
-  "version": "1.11.0-beta.1",
+  "version": "1.11.0-beta.2",
   "private": false,
   "author": "NativeMind",
   "keywords": [

From 911d45d7021ef47bf633b3cece26d0d1d13fe15d Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Wed, 22 Oct 2025 16:12:52 +0800
Subject: [PATCH 12/25] fix: Update attachment limit to include captured-page
 type and improve error handling

---
 .../sidepanel/components/AttachmentSelector.vue  |  3 ++-
 .../sidepanel/components/Chat/CameraButton.vue   | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/entrypoints/sidepanel/components/AttachmentSelector.vue b/entrypoints/sidepanel/components/AttachmentSelector.vue
index 846b7459..617c18c9 100644
--- a/entrypoints/sidepanel/components/AttachmentSelector.vue
+++ b/entrypoints/sidepanel/components/AttachmentSelector.vue
@@ -388,7 +388,7 @@ const SUPPORTED_ATTACHMENT_TYPES: AttachmentItem[] = [
         showErrorMessage(t('chat.input.attachment_selector.unsupported_image_type'))
         return false
       }
-      else if (attachments.filter((attachment) => attachment.type === 'image').length >= MAX_IMAGE_COUNT) {
+      else if (attachments.filter((attachment) => attachment.type === 'image' || attachment.type === 'captured-page').length >= MAX_IMAGE_COUNT) {
         showErrorMessage(t('chat.input.attachment_selector.too_many_images', { max: MAX_IMAGE_COUNT }))
         return false
       }
@@ -551,6 +551,7 @@ defineExpose({
     // Add new captured-page attachment at the beginning
     attachments.value.unshift(attachment)
   },
+  showErrorMessage,
 })
 
 onChange(async (files) => {
diff --git a/entrypoints/sidepanel/components/Chat/CameraButton.vue b/entrypoints/sidepanel/components/Chat/CameraButton.vue
index 23823586..2ac709da 100644
--- a/entrypoints/sidepanel/components/Chat/CameraButton.vue
+++ b/entrypoints/sidepanel/components/Chat/CameraButton.vue
@@ -20,6 +20,7 @@ import { browser } from 'wxt/browser'
 
 import IconCamera from '@/assets/icons/camera.svg?component'
 import { CapturedPageAttachment, ContextAttachmentStorage } from '@/types/chat'
+import { useI18n } from '@/utils/i18n'
 import { generateRandomId } from '@/utils/id'
 import logger from '@/utils/logger'
 import { useLLMBackendStatusStore } from '@/utils/pinia-store/store'
@@ -36,10 +37,14 @@ const props = defineProps<{
 }>()
 
 const llmBackendStatusStore = useLLMBackendStatusStore()
+const { t } = useI18n()
 
 const isCapturing = ref(false)
 const supportsVision = ref(false)
 
+// Maximum number of images and screenshots allowed combined
+const MAX_IMAGE_COUNT = 5
+
 // Check if there's a captured-page attachment
 const hasCapturedPage = computed(() => {
   return props.contextAttachmentStorage?.attachments.some((a) => a.type === 'captured-page') ?? false
@@ -64,6 +69,17 @@ const showButton = computed(() => supportsVision.value)
 const handleCapture = async () => {
   if (isCapturing.value || !props.attachmentSelectorRef) return
 
+  // Check if adding a screenshot would exceed the combined limit
+  const currentAttachments = props.contextAttachmentStorage?.attachments ?? []
+  const imageAndScreenshotCount = currentAttachments.filter(
+    (attachment) => attachment.type === 'image' || attachment.type === 'captured-page',
+  ).length
+
+  if (imageAndScreenshotCount >= MAX_IMAGE_COUNT) {
+    props.attachmentSelectorRef?.showErrorMessage(t('chat.input.attachment_selector.too_many_images', { max: MAX_IMAGE_COUNT }))
+    return
+  }
+
   isCapturing.value = true
 
   try {

From e9c6c5288c254775d20ff3f4b5b3e3c2f722ea30 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 Oct 2025 08:16:29 +0000
Subject: [PATCH 13/25] chore(release): v1.11.0-beta.3

---
 CHANGELOG.md | 12 ++++++++++++
 package.json |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98eda46d..a846f5df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## v1.11.0-beta.3
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.2...v1.11.0-beta.3)
+
+### 🩹 Fixes
+
+- Update attachment limit to include captured-page type and improve error handling ([911d45d](https://github.com/NativeMindBrowser/NativeMindExtension/commit/911d45d))
+
+### ❤️ Contributors
+
+- NekoWings ([@NekoWings](http://github.com/NekoWings))
+
 ## v1.11.0-beta.2
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.1...v1.11.0-beta.2)
diff --git a/package.json b/package.json
index f4b66413..b92d95a4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativemind-extension",
-  "version": "1.11.0-beta.2",
+  "version": "1.11.0-beta.3",
   "private": false,
   "author": "NativeMind",
   "keywords": [

From 97fcf41d505c66ff497715ef5279b43516716028 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Thu, 23 Oct 2025 10:07:30 +0800
Subject: [PATCH 14/25] fix: Clean up incomplete agent task groups in history
 management

---
 entrypoints/sidepanel/utils/chat/chat.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/entrypoints/sidepanel/utils/chat/chat.ts b/entrypoints/sidepanel/utils/chat/chat.ts
index 4cb6a1c6..599eea30 100644
--- a/entrypoints/sidepanel/utils/chat/chat.ts
+++ b/entrypoints/sidepanel/utils/chat/chat.ts
@@ -46,6 +46,10 @@ export class ReactiveHistoryManager extends EventEmitter {
       if (item.role === 'task' && item.subTasks) {
         this.cleanUp(item.subTasks)
       }
+      if (item.role === 'agent-task-group' && item.tasks) {
+        // if task-group not done, remove the group
+        item.tasks = item.tasks.filter((task) => task.done)
+      }
       return item
     })
     history.length = 0

From 82efecc8acafa577fd8f6c0460e8fe6707a44c2f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Oct 2025 02:24:01 +0000
Subject: [PATCH 15/25] chore(release): v1.11.0-beta.4

---
 CHANGELOG.md | 12 ++++++++++++
 package.json |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a846f5df..e1885dc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## v1.11.0-beta.4
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.3...v1.11.0-beta.4)
+
+### 🩹 Fixes
+
+- Clean up incomplete agent task groups in history management ([97fcf41](https://github.com/NativeMindBrowser/NativeMindExtension/commit/97fcf41))
+
+### ❤️ Contributors
+
+- NekoWings ([@NekoWings](http://github.com/NekoWings))
+
 ## v1.11.0-beta.3
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.2...v1.11.0-beta.3)
diff --git a/package.json b/package.json
index b92d95a4..193dd945 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativemind-extension",
-  "version": "1.11.0-beta.3",
+  "version": "1.11.0-beta.4",
   "private": false,
   "author": "NativeMind",
   "keywords": [

From 03b4115d606e9e9a80fd90692255d2591df735b4 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Fri, 24 Oct 2025 11:22:35 +0800
Subject: [PATCH 16/25] fix: Improve tooltip boundary detection with container
 bounds for sidepanel

---
 components/ui/Tooltip.vue | 62 ++++++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/components/ui/Tooltip.vue b/components/ui/Tooltip.vue
index 004e8323..34a98386 100644
--- a/components/ui/Tooltip.vue
+++ b/components/ui/Tooltip.vue
@@ -128,6 +128,35 @@ const hideTooltip = () => {
   tooltipStyle.value.visibility = 'hidden'
 }
 
+/**
+ * Get container bounds for boundary detection
+ * Works with both regular containers and sidepanel
+ */
+const getContainerBounds = () => {
+  const container = rootElement as HTMLElement
+  if (!container || !container.getBoundingClientRect) {
+    // Fallback to window bounds if container is not available
+    return {
+      left: 0,
+      right: window.innerWidth,
+      top: 0,
+      bottom: window.innerHeight,
+      width: window.innerWidth,
+      height: window.innerHeight,
+    }
+  }
+
+  const containerRect = container.getBoundingClientRect()
+  return {
+    left: containerRect.left,
+    right: containerRect.right,
+    top: containerRect.top,
+    bottom: containerRect.bottom,
+    width: containerRect.width,
+    height: containerRect.height,
+  }
+}
+
 /**
  * Update tooltip position
  * @param useEstimatedSize - Whether to use estimated size
@@ -136,6 +165,7 @@ const updateTooltipPosition = (useEstimatedSize = false) => {
   if (!triggerRef.value) return
 
   const triggerRect = triggerRef.value.getBoundingClientRect()
+  const containerBounds = getContainerBounds()
 
   // Get tooltip dimensions
   let tooltipWidth: number
@@ -202,23 +232,35 @@ const updateTooltipPosition = (useEstimatedSize = false) => {
       break
   }
 
-  // Boundary checks
+  // Boundary checks based on container bounds
   if (['top', 'bottom', 'auto'].includes(positionToUse)) {
-    if (left < BOUNDARY_PADDING) left = BOUNDARY_PADDING
-    if (left + tooltipWidth / 2 > window.innerWidth - BOUNDARY_PADDING) {
-      left = window.innerWidth - tooltipWidth / 2 - BOUNDARY_PADDING
+    // For top/bottom positions with centered left: left value is center point
+    const leftEdge = left - tooltipWidth / 2
+    const rightEdge = left + tooltipWidth / 2
+
+    if (leftEdge < containerBounds.left + BOUNDARY_PADDING) {
+      left = containerBounds.left + BOUNDARY_PADDING + tooltipWidth / 2
+    }
+    if (rightEdge > containerBounds.right - BOUNDARY_PADDING) {
+      left = containerBounds.right - BOUNDARY_PADDING - tooltipWidth / 2
     }
   }
   else {
-    if (left < BOUNDARY_PADDING) left = BOUNDARY_PADDING
-    if (left + tooltipWidth > window.innerWidth - BOUNDARY_PADDING) {
-      left = window.innerWidth - tooltipWidth - BOUNDARY_PADDING
+    // For left/right positions: left value is the actual left edge
+    if (left < containerBounds.left + BOUNDARY_PADDING) {
+      left = containerBounds.left + BOUNDARY_PADDING
+    }
+    if (left + tooltipWidth > containerBounds.right - BOUNDARY_PADDING) {
+      left = containerBounds.right - tooltipWidth - BOUNDARY_PADDING
     }
   }
 
-  if (top < BOUNDARY_PADDING) top = BOUNDARY_PADDING
-  if (top + tooltipHeight > window.innerHeight - BOUNDARY_PADDING) {
-    top = window.innerHeight - tooltipHeight - BOUNDARY_PADDING
+  // Vertical boundary checks
+  if (top < containerBounds.top + BOUNDARY_PADDING) {
+    top = containerBounds.top + BOUNDARY_PADDING
+  }
+  if (top + tooltipHeight > containerBounds.bottom - BOUNDARY_PADDING) {
+    top = containerBounds.bottom - tooltipHeight - BOUNDARY_PADDING
   }
 
   tooltipStyle.value = {

From 0803ee238e76e5517e79ebaca5b4ac33b9d30e27 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Fri, 24 Oct 2025 11:35:20 +0800
Subject: [PATCH 17/25] fix: Exclude welcome and quick action messages from
 assistant action history

---
 entrypoints/sidepanel/components/Chat/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/entrypoints/sidepanel/components/Chat/index.vue b/entrypoints/sidepanel/components/Chat/index.vue
index 9576d58c..397e53ab 100644
--- a/entrypoints/sidepanel/components/Chat/index.vue
+++ b/entrypoints/sidepanel/components/Chat/index.vue
@@ -206,7 +206,10 @@ const assistantActionMessageIds = computed(() => {
 
   for (const item of history) {
     if (item.role === 'assistant' || item.role === 'agent') {
-      lastAssistantId = item.id
+      // Only consider messages scoped not including welcome or quick actions
+      if (!item.id.includes('welcomeMessage') && !item.id.includes('quickActions')) {
+        lastAssistantId = item.id
+      }
     }
     else if (item.role === 'user') {
       if (lastAssistantId) {

From 33e5fa76c966e521f6ac9f99a10d7072d2f7a0e1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Oct 2025 03:39:25 +0000
Subject: [PATCH 18/25] chore(release): v1.11.0-beta.5

---
 CHANGELOG.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1885dc0..4e88c23e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## v1.11.0-beta.5
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.4...v1.11.0-beta.5)
+
+### 🩹 Fixes
+
+- Improve tooltip boundary detection with container bounds for sidepanel ([03b4115](https://github.com/NativeMindBrowser/NativeMindExtension/commit/03b4115))
+- Exclude welcome and quick action messages from assistant action history ([0803ee2](https://github.com/NativeMindBrowser/NativeMindExtension/commit/0803ee2))
+
+### ❤️ Contributors
+
+- NekoWings ([@NekoWings](http://github.com/NekoWings))
+
 ## v1.11.0-beta.4
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.3...v1.11.0-beta.4)
diff --git a/package.json b/package.json
index 193dd945..4f0b753c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativemind-extension",
-  "version": "1.11.0-beta.4",
+  "version": "1.11.0-beta.5",
   "private": false,
   "author": "NativeMind",
   "keywords": [

From 9b397f9a27566f71dc119c58d46a79d7ec437de8 Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Tue, 28 Oct 2025 13:48:36 +0800
Subject: [PATCH 19/25] feat(writing-tools): Add button to open writing tools
 settings

---
 .../components/WritingTools/EditableEntry.vue       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/entrypoints/content/components/WritingTools/EditableEntry.vue b/entrypoints/content/components/WritingTools/EditableEntry.vue
index 9f01b377..09385363 100644
--- a/entrypoints/content/components/WritingTools/EditableEntry.vue
+++ b/entrypoints/content/components/WritingTools/EditableEntry.vue
@@ -51,6 +51,13 @@
             <IconSparkle class="w-4 h-4" />
             {{ t('writing_tools.sparkle') }}
           </button>
+          <button
+            class="bg-bg-primary border-0 cursor-pointer hover:bg-bg-hover h-7 w-7 flex items-center justify-center"
+            aria-label="Open writing tools settings"
+            @click.stop="onOpenSettings"
+          >
+            <IconDotsVertical class="w-4 h-4" />
+          </button>
           <!-- <button
             class="mr-1 text-text-secondary bg-bg-neutral-subtle hover:bg-bg-hover border-0 cursor-pointer p-1 rounded-full"
             @click="onCloseToolBar"
@@ -82,6 +89,7 @@
 import { useElementBounding, useEventListener } from '@vueuse/core'
 import { computed, ref, UnwrapRef, watch } from 'vue'
 
+import IconDotsVertical from '@/assets/icons/dots-vertical.svg?component'
 import IconList from '@/assets/icons/writing-tools-list.svg?component'
 import IconProofread from '@/assets/icons/writing-tools-proofread.svg?component'
 // import IconClose from '@/assets/icons/close.svg?component'
@@ -95,6 +103,7 @@ import { useRefSnapshot } from '@/composables/useRefSnapshot'
 import { MIN_SELECTION_LENGTH_TO_SHOW_WRITING_TOOLS } from '@/utils/constants'
 import { useI18n } from '@/utils/i18n'
 import { getCommonAncestorElement, getEditableElementSelectedText, getSelectionBoundingRectWithinElement, isContentEditableElement, isEditorFrameworkElement, isInputOrTextArea, replaceContentInRange } from '@/utils/selection'
+import { showSettings } from '@/utils/settings'
 import { extendedComputed } from '@/utils/vue/utils'
 
 import SuggestionCard from './SuggestionCard.vue'
@@ -193,6 +202,10 @@ const onMouseEnterToolBar = () => {
   snapshotForEnterToolBar.updateSnapshot()
 }
 
+const onOpenSettings = async () => {
+  await showSettings({ path: 'writing-tools' })
+}
+
 const updateEditableElementText = () => {
   if (props.editableElement.tagName === 'TEXTAREA' || props.editableElement.tagName === 'INPUT') {
     editableElementText.value = (props.editableElement as HTMLTextAreaElement | HTMLInputElement).value

From f7c0a932b07e8d77ae1214ee946294ea583bfa3e Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Tue, 28 Oct 2025 14:10:22 +0800
Subject: [PATCH 20/25] fix: Exclude reasoning parameter for WebLLM model
 compatibility

---
 utils/llm/models.ts                                            | 1 +
 .../providers/web-llm/openai-compatible-chat-language-model.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/utils/llm/models.ts b/utils/llm/models.ts
index c12409ff..fb32a516 100644
--- a/utils/llm/models.ts
+++ b/utils/llm/models.ts
@@ -112,6 +112,7 @@ export async function getModel(options: {
       },
     })
     options.onLoadingModel?.({ type: 'finished' })
+    // WebLLM does not support reasoning parameter, so we do not pass it
     model = new WebLLMChatLanguageModel(
       options.model,
       engine,
diff --git a/utils/llm/providers/web-llm/openai-compatible-chat-language-model.ts b/utils/llm/providers/web-llm/openai-compatible-chat-language-model.ts
index 102420e2..02d16342 100644
--- a/utils/llm/providers/web-llm/openai-compatible-chat-language-model.ts
+++ b/utils/llm/providers/web-llm/openai-compatible-chat-language-model.ts
@@ -144,7 +144,8 @@ export class WebLLMChatLanguageModel implements LanguageModelV1 {
       seed,
       ...providerMetadata?.[this.providerOptionsName],
 
-      reasoning_effort: providerMetadata?.[this.providerOptionsName]?.reasoningEffort ?? providerMetadata?.['openai-compatible']?.reasoningEffort,
+      // Note: WebLLM does not support reasoning_effort parameter
+      // This parameter is ignored for WebLLM models
 
       // messages:
       messages: convertToOpenAICompatibleChatMessages(prompt),

From 20f439026dd20efc5e7f5098ec4e7fccfee12332 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Oct 2025 06:13:49 +0000
Subject: [PATCH 21/25] chore(release): v1.11.0-beta.6

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e88c23e..8de8f274 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## v1.11.0-beta.6
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.5...v1.11.0-beta.6)
+
+### 🚀 Enhancements
+
+- **writing-tools:** Add button to open writing tools settings ([9b397f9](https://github.com/NativeMindBrowser/NativeMindExtension/commit/9b397f9))
+
+### 🩹 Fixes
+
+- Exclude reasoning parameter for WebLLM model compatibility ([f7c0a93](https://github.com/NativeMindBrowser/NativeMindExtension/commit/f7c0a93))
+
+### ❤️ Contributors
+
+- NekoWings ([@NekoWings](http://github.com/NekoWings))
+
 ## v1.11.0-beta.5
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.4...v1.11.0-beta.5)
diff --git a/package.json b/package.json
index 4f0b753c..2104232f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativemind-extension",
-  "version": "1.11.0-beta.5",
+  "version": "1.11.0-beta.6",
   "private": false,
   "author": "NativeMind",
   "keywords": [

From 277e38aae8d3db72807ec41a71ea80543b82053d Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Tue, 28 Oct 2025 16:29:22 +0800
Subject: [PATCH 22/25] fix: Add fill attribute to path in dots-vertical icon
 for color consistency

---
 assets/icons/dots-vertical.svg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/icons/dots-vertical.svg b/assets/icons/dots-vertical.svg
index 9efe31fb..5ed70c88 100644
--- a/assets/icons/dots-vertical.svg
+++ b/assets/icons/dots-vertical.svg
@@ -1,3 +1,4 @@
 <svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-  <path d="M10 6a2 2 0 110-4 2 2 0 010 4zM10 12a2 2 0 110-4 2 2 0 010 4zM10 18a2 2 0 110-4 2 2 0 010 4z" />
+  <path d="M10 6a2 2 0 110-4 2 2 0 010 4zM10 12a2 2 0 110-4 2 2 0 010 4zM10 18a2 2 0 110-4 2 2 0 010 4z"
+    fill="currentColor" />
 </svg>
\ No newline at end of file

From ee19549459fc1c1eb2b88f36782971a1611d4b7e Mon Sep 17 00:00:00 2001
From: NekoWings <NekoWings@outlook.com>
Date: Fri, 31 Oct 2025 11:40:55 +0800
Subject: [PATCH 23/25] fix: Improve model user config handling and fix webllm
 broken issue

---
 utils/llm/models.ts | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/utils/llm/models.ts b/utils/llm/models.ts
index fb32a516..1ea21bd7 100644
--- a/utils/llm/models.ts
+++ b/utils/llm/models.ts
@@ -5,6 +5,7 @@ import { getUserConfig } from '@/utils/user-config'
 
 import { ModelNotFoundError } from '../error'
 import { makeCustomFetch } from '../fetch'
+import logger from '../logger'
 import { loadModel as loadLMStudioModel } from './lm-studio'
 import { middlewares } from './middlewares'
 import { checkModelSupportThinking } from './ollama'
@@ -16,18 +17,15 @@ import { isToggleableThinkingModel } from './thinking-models'
 import { getWebLLMEngine, WebLLMSupportedModel } from './web-llm'
 
 export async function getModelUserConfig(overrides?: { model?: string, endpointType?: LLMEndpointType }) {
+  logger.debug('Detected override model', { overrides })
   const userConfig = await getUserConfig()
   const endpointType = overrides?.endpointType ?? userConfig.llm.endpointType.get()
   const model = overrides?.model ?? userConfig.llm.model.get()
-  const backendConfig = endpointType === 'lm-studio'
-    ? userConfig.llm.backends.lmStudio
-    : endpointType === 'ollama'
-      ? userConfig.llm.backends.ollama
-      : undefined
-  const baseUrl = backendConfig ? backendConfig.baseUrl.get() : ''
+
+  const baseUrl = userConfig.llm.backends[endpointType === 'lm-studio' ? 'lmStudio' : 'ollama'].baseUrl.get()
   const apiKey = userConfig.llm.apiKey.get()
-  const numCtx = backendConfig ? backendConfig.numCtx.get() : 0
-  const enableNumCtx = backendConfig ? backendConfig.enableNumCtx.get() : false
+  const numCtx = userConfig.llm.backends[endpointType === 'lm-studio' ? 'lmStudio' : 'ollama'].numCtx.get()
+  const enableNumCtx = userConfig.llm.backends[endpointType === 'lm-studio' ? 'lmStudio' : 'ollama'].enableNumCtx.get()
   const reasoningPreference = userConfig.llm.reasoning.get()
   const reasoning = getReasoningOptionForModel(reasoningPreference, model)
   if (!model) {
@@ -112,7 +110,6 @@ export async function getModel(options: {
       },
     })
     options.onLoadingModel?.({ type: 'finished' })
-    // WebLLM does not support reasoning parameter, so we do not pass it
     model = new WebLLMChatLanguageModel(
       options.model,
       engine,

From c823e8385acd6a380c9b83e90e4c9574f2b33628 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 31 Oct 2025 03:44:29 +0000
Subject: [PATCH 24/25] chore(release): v1.11.0-beta.7

---
 CHANGELOG.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8de8f274..c4b6de3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## v1.11.0-beta.7
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.6...v1.11.0-beta.7)
+
+### 🩹 Fixes
+
+- Add fill attribute to path in dots-vertical icon for color consistency ([277e38a](https://github.com/NativeMindBrowser/NativeMindExtension/commit/277e38a))
+- Improve model user config handling and fix webllm broken issue ([ee19549](https://github.com/NativeMindBrowser/NativeMindExtension/commit/ee19549))
+
+### ❤️ Contributors
+
+- NekoWings ([@NekoWings](http://github.com/NekoWings))
+
 ## v1.11.0-beta.6
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.5...v1.11.0-beta.6)
diff --git a/package.json b/package.json
index 2104232f..47f15d51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativemind-extension",
-  "version": "1.11.0-beta.6",
+  "version": "1.11.0-beta.7",
   "private": false,
   "author": "NativeMind",
   "keywords": [

From 2cd619ab994dcc6bae277fd94cd2a202821e5185 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 3 Nov 2025 01:42:57 +0000
Subject: [PATCH 25/25] chore(release): v1.11.0

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4b6de3f..72041627 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.11.0
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.7...v1.11.0)
+
 ## v1.11.0-beta.7
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.11.0-beta.6...v1.11.0-beta.7)
diff --git a/package.json b/package.json
index 47f15d51..6977cc60 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativemind-extension",
-  "version": "1.11.0-beta.7",
+  "version": "1.11.0",
   "private": false,
   "author": "NativeMind",
   "keywords": [